Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2017-08-12 03:47:27
|
Revision: 7815
http://sourceforge.net/p/web-erp/reponame/7815
Author: daintree
Date: 2017-08-12 03:47:24 +0000 (Sat, 12 Aug 2017)
Log Message:
-----------
Modified Paths:
--------------
trunk/css/aguapop/default.css
trunk/includes/header.php
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2017-08-12 03:09:19 UTC (rev 7814)
+++ trunk/css/aguapop/default.css 2017-08-12 03:47:24 UTC (rev 7815)
@@ -316,6 +316,7 @@
margin-top:7px;
}
#QuickMenuDiv ul{
+ margin-top:10px;
list-style:none;
float:right;
}
Modified: trunk/includes/header.php
===================================================================
--- trunk/includes/header.php 2017-08-12 03:09:19 UTC (rev 7814)
+++ trunk/includes/header.php 2017-08-12 03:47:24 UTC (rev 7815)
@@ -79,8 +79,7 @@
unset($_SESSION['Favourites'][$_POST['ScriptName']]);
}
if (isset($_SESSION['Favourites']) AND count($_SESSION['Favourites'])>0) {
- echo '<br />
- <ul>';
+ echo '<ul>';
foreach ($_SESSION['Favourites'] as $url=>$ttl) {
echo '<li><a href="' . $url . '">' . _($ttl) . '<a></li>';
@@ -90,20 +89,10 @@
echo '</li>'; //take off inline formatting, use CSS instead ===HJ===
if (count($_SESSION['AllowedPageSecurityTokens'])>1){
- echo '<li><a href="'.$RootPath.'/SelectCustomer.php">' . _('Customers') . '</a></li>';
- echo '<li><a href="'.$RootPath.'/SelectProduct.php">' . _('Items') . '</a></li>';
- echo '<li><a href="'.$RootPath.'/SelectSupplier.php">' . _('Suppliers') . '</a></li>';
-/* $DefaultManualLink = '<li><a rel="external" accesskey="8" href="' . $RootPath . '/doc/Manual/ManualContents.php'. $ViewTopic . $BookMark. '">' . _('Manual') . '</a></li>';
- if (mb_substr($_SESSION['Language'],0,2) != 'en'){
- if (file_exists('locale/'.$_SESSION['Language'].'/Manual/ManualContents.php')){
- echo '<li><a target="_blank" href="'.$RootPath.'/locale/'.$_SESSION['Language'].'/Manual/ManualContents.php'. $ViewTopic . $BookMark. '">' . _('Manual') . '</a></li>';
- } else {
- echo $DefaultManualLink;
- }
- } else {
- echo $DefaultManualLink;
- }*/
- echo '<li><a href="', $RootPath, '/ManualContents.php', $ViewTopic, $BookMark, '" rel="external" accesskey="8">', _('Manual'), '</a></li>';
+ echo '<li><a href="' , $RootPath , '/SelectCustomer.php">' , _('Customers') , '</a></li>';
+ echo '<li><a href="' , $RootPath , '/SelectProduct.php">' , _('Items') , '</a></li>';
+ echo '<li><a href="' , $RootPath , '/SelectSupplier.php">' , _('Suppliers') , '</a></li>';
+ echo '<li><a href="' , $RootPath , '/ManualContents.php', $ViewTopic , $BookMark , '" rel="external" accesskey="8">' , _('Manual'), '</a></li>';
}
echo '<li><a href="'.$RootPath.'/Logout.php" onclick="return confirm(\''._('Are you sure you wish to logout?').'\');">' . _('Logout') . '</a></li>';
|
|
From: <rc...@us...> - 2017-08-15 16:35:48
|
Revision: 7817
http://sourceforge.net/p/web-erp/reponame/7817
Author: rchacon
Date: 2017-08-15 16:35:42 +0000 (Tue, 15 Aug 2017)
Log Message:
-----------
Standardise text.
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/SelectSupplier.php
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
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.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.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.po
trunk/locale/hi_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/hr_HR.utf8/LC_MESSAGES/messages.po
trunk/locale/hu_HU.utf8/LC_MESSAGES/messages.po
trunk/locale/id_ID.utf8/LC_MESSAGES/messages.po
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
trunk/locale/ja_JP.utf8/LC_MESSAGES/messages.po
trunk/locale/ko_KR.utf8/LC_MESSAGES/messages.po
trunk/locale/lv_LV.utf8/LC_MESSAGES/messages.po
trunk/locale/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2017-08-15 15:44:06 UTC (rev 7816)
+++ trunk/SelectCustomer.php 2017-08-15 16:35:42 UTC (rev 7817)
@@ -214,7 +214,7 @@
// Customer maintenance options:
echo '<a href="', $RootPath, '/Customers.php">' . _('Add a New Customer') . '</a><br />';
echo '<a href="', $RootPath, '/Customers.php?DebtorNo=', urlencode($_SESSION['CustomerID']), '">' . _('Modify Customer Details') . '</a><br />';
- echo '<a href="', $RootPath, '/CustomerBranches.php?DebtorNo=', urlencode($_SESSION['CustomerID']), '">' . _('Add/Modify/Delete Customer Branches') . '</a><br />';
+ echo '<a href="', $RootPath, '/CustomerBranches.php?DebtorNo=', urlencode($_SESSION['CustomerID']), '">' . _('Add/Edit/Delete Customer Branches') . '</a><br />';
echo '<a href="', $RootPath, '/SelectProduct.php">' . _('Special Customer Prices') . '</a><br />';
echo '<a href="', $RootPath, '/CustEDISetup.php">' . _('Customer EDI Configuration') . '</a><br />';
echo '<a href="', $RootPath, '/CustLoginSetup.php">' . _('Customer Login Configuration'), '</a><br />';
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2017-08-15 15:44:06 UTC (rev 7816)
+++ trunk/SelectSupplier.php 2017-08-15 16:35:42 UTC (rev 7817)
@@ -190,7 +190,7 @@
echo '</td><td valign="top" class="select">'; /* Supplier Maintenance */
echo '<a href="' . $RootPath . '/Suppliers.php">' . _('Add a New Supplier') . '</a>
<br /><a href="' . $RootPath . '/Suppliers.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Modify Or Delete Supplier Details') . '</a>
- <br /><a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Add/Modify/Delete Supplier Contacts') . '</a>
+ <br /><a href="' . $RootPath . '/SupplierContacts.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Add/Edit/Delete Supplier Contacts') . '</a>
<br />
<br /><a href="' . $RootPath . '/SellThroughSupport.php?SupplierID=' . $_SESSION['SupplierID'] . '">' . _('Set Up Sell Through Support Deals') . '</a>
<br /><a href="' . $RootPath . '/Shipments.php?NewShipment=Yes">' . _('Set Up A New Shipment') . '</a>
Modified: trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-08-15 15:44:06 UTC (rev 7816)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-08-15 16:35:42 UTC (rev 7817)
@@ -27750,7 +27750,7 @@
msgstr ""
#: SelectCustomer.php:217
-msgid "Add/Modify/Delete Customer Branches"
+msgid "Add/Edit/Delete Customer Branches"
msgstr ""
#: SelectCustomer.php:219
@@ -28802,7 +28802,7 @@
msgstr ""
#: SelectSupplier.php:193
-msgid "Add/Modify/Delete Supplier Contacts"
+msgid "Add/Edit/Delete Supplier Contacts"
msgstr ""
#: SelectSupplier.php:195
Modified: trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2017-08-15 15:44:06 UTC (rev 7816)
+++ trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po 2017-08-15 16:35:42 UTC (rev 7817)
@@ -27260,7 +27260,7 @@
msgstr "تعديل بيانات زبون"
#: SelectCustomer.php:217
-msgid "Add/Modify/Delete Customer Branches"
+msgid "Add/Edit/Delete Customer Branches"
msgstr "اضافة/تعديل/حذف فروع زبون"
#: SelectCustomer.php:219
@@ -28334,7 +28334,7 @@
msgstr ""
#: SelectSupplier.php:193
-msgid "Add/Modify/Delete Supplier Contacts"
+msgid "Add/Edit/Delete Supplier Contacts"
msgstr ""
#: SelectSupplier.php:195
Modified: trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2017-08-15 15:44:06 UTC (rev 7816)
+++ trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po 2017-08-15 16:35:42 UTC (rev 7817)
@@ -28488,7 +28488,7 @@
msgstr "Změnit detaily zákazníka"
#: SelectCustomer.php:217
-msgid "Add/Modify/Delete Customer Branches"
+msgid "Add/Edit/Delete Customer Branches"
msgstr "Přidat / Upravit / Odstranit zákazníka Pobočky"
#: SelectCustomer.php:219
@@ -29576,7 +29576,7 @@
msgstr "Upravit nebo smazat Dodavatel Podrobnosti"
#: SelectSupplier.php:193
-msgid "Add/Modify/Delete Supplier Contacts"
+msgid "Add/Edit/Delete Supplier Contacts"
msgstr "Přidat / Upravit / Odstranit Dodavatel Kontakty"
#: SelectSupplier.php:195
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2017-08-15 15:44:06 UTC (rev 7816)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2017-08-15 16:35:42 UTC (rev 7817)
@@ -29376,7 +29376,7 @@
msgstr "Kundenangaben ändern"
#: SelectCustomer.php:217
-msgid "Add/Modify/Delete Customer Branches"
+msgid "Add/Edit/Delete Customer Branches"
msgstr "Kundenniederlassungen anlegen/ändern/löschen"
#: SelectCustomer.php:219
@@ -30492,7 +30492,7 @@
msgstr "Kreditor ändern / löschen"
#: SelectSupplier.php:193
-msgid "Add/Modify/Delete Supplier Contacts"
+msgid "Add/Edit/Delete Supplier Contacts"
msgstr "Ansprechpartner hinzufügen / ändern / löschen"
#: SelectSupplier.php:195
Modified: trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2017-08-15 15:44:06 UTC (rev 7816)
+++ trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po 2017-08-15 16:35:42 UTC (rev 7817)
@@ -29340,7 +29340,7 @@
msgstr "Τροποποίηση Στοιχεία Πελάτη"
#: SelectCustomer.php:217
-msgid "Add/Modify/Delete Customer Branches"
+msgid "Add/Edit/Delete Customer Branches"
msgstr "Προσθήκη / Τροποποίηση / Διαγραφή Υποκαταστήματα πελατών"
#: SelectCustomer.php:219
@@ -30447,7 +30447,7 @@
msgstr "Τροποποιήσει ή να διαγράψει στοιχεία προμηθευτή"
#: SelectSupplier.php:193
-msgid "Add/Modify/Delete Supplier Contacts"
+msgid "Add/Edit/Delete Supplier Contacts"
msgstr "Προσθήκη / Τροποποίηση / Διαγραφή Επαφές Προμηθευτή"
#: SelectSupplier.php:195
Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2017-08-15 15:44:06 UTC (rev 7816)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2017-08-15 16:35:42 UTC (rev 7817)
@@ -26315,7 +26315,7 @@
msgstr ""
#: SelectCustomer.php:217
-msgid "Add/Modify/Delete Customer Branches"
+msgid "Add/Edit/Delete Customer Branches"
msgstr ""
#: SelectCustomer.php:219
@@ -27301,7 +27301,7 @@
msgstr ""
#: SelectSupplier.php:193
-msgid "Add/Modify/Delete Supplier Contacts"
+msgid "Add/Edit/Delete Supplier Contacts"
msgstr ""
#: SelectSupplier.php:195
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2017-08-15 15:44:06 UTC (rev 7816)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2017-08-15 16:35:42 UTC (rev 7817)
@@ -27796,7 +27796,7 @@
msgstr ""
#: SelectCustomer.php:217
-msgid "Add/Modify/Delete Customer Branches"
+msgid "Add/Edit/Delete Customer Branches"
msgstr ""
#: SelectCustomer.php:219
@@ -28850,7 +28850,7 @@
msgstr "Modify Or Delete Vendor Details"
#: SelectSupplier.php:193
-msgid "Add/Modify/Delete Supplier Contacts"
+msgid "Add/Edit/Delete Supplier Contacts"
msgstr "Add/Modify/Delete Vendor Contacts"
#: SelectSupplier.php:195
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2017-08-15 15:44:06 UTC (rev 7816)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2017-08-15 16:35:42 UTC (rev 7817)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-12 12:01+1200\n"
-"PO-Revision-Date: 2017-08-15 09:41-0600\n"
+"PO-Revision-Date: 2017-08-15 10:31-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -246,14 +246,14 @@
#: AccountGroups.php:281 AddCustomerContacts.php:28 AddCustomerContacts.php:30
#: AddCustomerNotes.php:101 AddCustomerTypeNotes.php:94 AgedDebtors.php:454
-#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11
-#: BOMExtendedQty.php:256 BOMIndented_conflict-20150211-201247.php:249
-#: BOMIndented.php:249 BOMIndentedReverse.php:236 BOMInquiry.php:186
-#: BOMListing.php:110 BOMs.php:285 BOMs.php:990 BOMs_SingleLevel.php:231
-#: BOMs_SingleLevel.php:881 CollectiveWorkOrderCost.php:281
-#: CompanyPreferences.php:100 CounterReturns.php:1625 CounterSales.php:2101
-#: CounterSales.php:2197 Credit_Invoice.php:286 CreditStatus.php:21
-#: CustEDISetup.php:17 CustItem.php:120 CustItem.php:210 CustItem.php:238
+#: AgedSuppliers.php:276 Areas.php:144 AuditTrail.php:11 BOMExtendedQty.php:256
+#: BOMIndented_conflict-20150211-201247.php:249 BOMIndented.php:249
+#: BOMIndentedReverse.php:236 BOMInquiry.php:186 BOMListing.php:110
+#: BOMs.php:285 BOMs.php:990 BOMs_SingleLevel.php:231 BOMs_SingleLevel.php:881
+#: CollectiveWorkOrderCost.php:281 CompanyPreferences.php:100
+#: CounterReturns.php:1625 CounterSales.php:2101 CounterSales.php:2197
+#: Credit_Invoice.php:286 CreditStatus.php:21 CustEDISetup.php:17
+#: CustItem.php:120 CustItem.php:210 CustItem.php:238
#: DebtorsAtPeriodEnd.php:129 DiscountCategories.php:12
#: DiscountCategories.php:149 DiscountMatrix.php:16 EDIMessageFormat.php:105
#: FixedAssetLocations.php:13 FixedAssetRegister.php:16
@@ -262,34 +262,33 @@
#: HistoricalTestResults.php:42 InternalStockRequestInquiry.php:167
#: InternalStockRequest.php:316 InventoryPlanning.php:459
#: InventoryPlanningPrefSupplier.php:386 MaintenanceTasks.php:14
-#: MaintenanceUserSchedule.php:16 MasterSalesInquiry.php:1084
-#: MRPReport.php:543 NoSalesItems.php:91 PcAssignCashTabToTab.php:76
-#: PcAssignCashTabToTab.php:156 PcAssignCashTabToTab.php:212
-#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:144
-#: PcAssignCashToTab.php:160 PcAssignCashToTab.php:207 PDFPickingList.php:29
-#: PDFStockLocTransfer.php:16 PO_AuthorisationLevels.php:10 POReport.php:60
-#: POReport.php:64 POReport.php:68 PO_SelectOSPurchOrder.php:153
-#: PriceMatrix.php:16 PricesBasedOnMarkUp.php:8 Prices_Customer.php:35
-#: Prices.php:11 ProductSpecs.php:38 PurchaseByPrefSupplier.php:305
-#: PurchData.php:241 PurchData.php:373 PurchData.php:401 QATests.php:22
+#: MaintenanceUserSchedule.php:16 MasterSalesInquiry.php:1084 MRPReport.php:543
+#: NoSalesItems.php:91 PcAssignCashTabToTab.php:76 PcAssignCashTabToTab.php:156
+#: PcAssignCashTabToTab.php:212 PcAssignCashToTab.php:59
+#: PcAssignCashToTab.php:144 PcAssignCashToTab.php:160
+#: PcAssignCashToTab.php:207 PDFPickingList.php:29 PDFStockLocTransfer.php:16
+#: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64
+#: POReport.php:68 PO_SelectOSPurchOrder.php:153 PriceMatrix.php:16
+#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:11
+#: ProductSpecs.php:38 PurchaseByPrefSupplier.php:305 PurchData.php:241
+#: PurchData.php:373 PurchData.php:401 QATests.php:22
#: RecurringSalesOrders.php:320 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:39
#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:221
#: SelectCreditItems.php:292 SelectCustomer.php:258 SelectGLAccount.php:86
-#: SelectOrderItems.php:588 SelectOrderItems.php:1514
-#: SelectOrderItems.php:1614 SelectProduct.php:523 SelectQASamples.php:45
-#: SelectSalesOrder.php:545 SelectSupplier.php:14 SelectSupplier.php:222
-#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
-#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
-#: Shipt_Select.php:8 StockLocMovements.php:14 StockSerialItemResearch.php:30
-#: SupplierPriceList.php:14 SupplierPriceList.php:229
-#: SupplierPriceList.php:399 SupplierPriceList.php:458
-#: SupplierPriceList.php:503 Suppliers.php:304 SupplierTenderCreate.php:556
-#: SupplierTenderCreate.php:664 SupplierTenders.php:322
-#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TestPlanResults.php:27
-#: TopItems.php:118 UnitsOfMeasure.php:10 WhereUsedInquiry.php:18
-#: WorkCentres.php:113 WorkOrderCosting.php:22
+#: SelectOrderItems.php:588 SelectOrderItems.php:1514 SelectOrderItems.php:1614
+#: SelectProduct.php:523 SelectQASamples.php:45 SelectSalesOrder.php:545
+#: SelectSupplier.php:14 SelectSupplier.php:222 SelectWorkOrder.php:9
+#: SelectWorkOrder.php:174 SellThroughSupport.php:229 ShipmentCosting.php:11
+#: Shipments.php:17 Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
+#: StockLocMovements.php:14 StockSerialItemResearch.php:30
+#: SupplierPriceList.php:14 SupplierPriceList.php:229 SupplierPriceList.php:399
+#: SupplierPriceList.php:458 SupplierPriceList.php:503 Suppliers.php:304
+#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
+#: SupplierTenders.php:322 SupplierTenders.php:388 SupplierTransInquiry.php:10
+#: TestPlanResults.php:27 TopItems.php:118 UnitsOfMeasure.php:10
+#: WhereUsedInquiry.php:18 WorkCentres.php:113 WorkOrderCosting.php:22
#: WorkOrderEntry_conflict-20141122-150523.php:11 WorkOrderIssue.php:22
#: WorkOrderReceive.php:34 WorkOrderStatus.php:58 Z_BottomUpCosts.php:57
#: ../webSHOP/includes/header.php:217
@@ -348,56 +347,54 @@
#: QATests.php:293 QATests.php:295 QATests.php:306 QATests.php:308
#: QATests.php:319 QATests.php:321 QATests.php:332 QATests.php:334
#: QATests.php:345 QATests.php:347 QATests.php:414 QATests.php:419
-#: QATests.php:424 QATests.php:429 QATests.php:434
-#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496
-#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
-#: SalesAnalReptCols.php:422 SalesAnalRepts.php:420 SalesAnalRepts.php:423
-#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476
-#: SalesAnalRepts.php:479 SalesCategories.php:297 SalesCategories.php:384
-#: SalesCategories.php:388 SalesPeople.php:227 SalesPeople.php:367
-#: SalesPeople.php:369 SelectCustomer.php:757 SelectProduct.php:231
-#: SelectProduct.php:369 SelectQASamples.php:424 SelectQASamples.php:518
-#: SelectQASamples.php:520 SelectQASamples.php:574 SelectQASamples.php:576
-#: SelectQASamples.php:588 SelectQASamples.php:590 ShipmentCosting.php:667
-#: ShopParameters.php:289 ShopParameters.php:293 ShopParameters.php:337
-#: ShopParameters.php:341 ShopParameters.php:391 ShopParameters.php:395
-#: ShopParameters.php:413 ShopParameters.php:417 ShopParameters.php:495
-#: ShopParameters.php:499 StockClone.php:938 StockClone.php:940
-#: StockClone.php:963 StockClone.php:965 Stocks.php:1266 Stocks.php:1268
-#: Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90
+#: QATests.php:424 QATests.php:429 QATests.php:434 RecurringSalesOrders.php:493
+#: RecurringSalesOrders.php:496 SalesAnalReptCols.php:284
+#: SalesAnalReptCols.php:419 SalesAnalReptCols.php:422 SalesAnalRepts.php:420
+#: SalesAnalRepts.php:423 SalesAnalRepts.php:448 SalesAnalRepts.php:451
+#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:297
+#: SalesCategories.php:384 SalesCategories.php:388 SalesPeople.php:227
+#: SalesPeople.php:367 SalesPeople.php:369 SelectCustomer.php:757
+#: SelectProduct.php:231 SelectProduct.php:369 SelectQASamples.php:424
+#: SelectQASamples.php:518 SelectQASamples.php:520 SelectQASamples.php:574
+#: SelectQASamples.php:576 SelectQASamples.php:588 SelectQASamples.php:590
+#: ShipmentCosting.php:667 ShopParameters.php:289 ShopParameters.php:293
+#: ShopParameters.php:337 ShopParameters.php:341 ShopParameters.php:391
+#: ShopParameters.php:395 ShopParameters.php:413 ShopParameters.php:417
+#: ShopParameters.php:495 ShopParameters.php:499 StockClone.php:938
+#: StockClone.php:940 StockClone.php:963 StockClone.php:965 Stocks.php:1266
+#: Stocks.php:1268 Stocks.php:1291 Stocks.php:1293 SuppContractChgs.php:90
#: SystemParameters.php:479 SystemParameters.php:502 SystemParameters.php:543
#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
-#: SystemParameters.php:945 SystemParameters.php:1088
-#: SystemParameters.php:1090 SystemParameters.php:1100
-#: SystemParameters.php:1102 SystemParameters.php:1156
-#: SystemParameters.php:1168 SystemParameters.php:1170
-#: SystemParameters.php:1208 SystemParameters.php:1210
-#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:311
-#: TaxGroups.php:314 TaxGroups.php:365 TestPlanResults.php:304
-#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864
-#: TestPlanResults.php:924 TestPlanResults.php:928 UserGLAccounts.php:187
-#: UserGLAccounts.php:196 UserSettings.php:209 UserSettings.php:212
-#: UserSettings.php:224 UserSettings.php:227 WWW_Users.php:547
-#: WWW_Users.php:549 WWW_Users.php:718 WWW_Users.php:721 WWW_Users.php:734
-#: WWW_Users.php:737 WWW_Users.php:749 WWW_Users.php:752 WWW_Users.php:764
-#: WWW_Users.php:767
+#: SystemParameters.php:945 SystemParameters.php:1088 SystemParameters.php:1090
+#: SystemParameters.php:1100 SystemParameters.php:1102
+#: SystemParameters.php:1156 SystemParameters.php:1168
+#: SystemParameters.php:1170 SystemParameters.php:1208
+#: SystemParameters.php:1210 SystemParameters.php:1232
+#: SystemParameters.php:1234 TaxGroups.php:311 TaxGroups.php:314
+#: TaxGroups.php:365 TestPlanResults.php:304 TestPlanResults.php:532
+#: TestPlanResults.php:747 TestPlanResults.php:864 TestPlanResults.php:924
+#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196
+#: UserSettings.php:209 UserSettings.php:212 UserSettings.php:224
+#: UserSettings.php:227 WWW_Users.php:547 WWW_Users.php:549 WWW_Users.php:718
+#: WWW_Users.php:721 WWW_Users.php:734 WWW_Users.php:737 WWW_Users.php:749
+#: WWW_Users.php:752 WWW_Users.php:764 WWW_Users.php:767
msgid "Yes"
msgstr "Sí"
#: AccountGroups.php:312 AccountGroups.php:472 AccountGroups.php:475
#: AddCustomerContacts.php:165 AddCustomerContacts.php:274
-#: AddCustomerContacts.php:278 AddCustomerContacts.php:281
-#: BankAccounts.php:218 BankAccounts.php:412 BankAccounts.php:414
-#: BankAccounts.php:418 BankAccounts.php:426 BOMs.php:142 BOMs.php:895
-#: BOMs.php:899 BOMs_SingleLevel.php:127 BOMs_SingleLevel.php:792
-#: BOMs_SingleLevel.php:796 CompanyPreferences.php:422
-#: CompanyPreferences.php:426 CompanyPreferences.php:437
-#: CompanyPreferences.php:441 CompanyPreferences.php:452
-#: CompanyPreferences.php:456 ContractCosting.php:200 Currencies.php:344
-#: Currencies.php:525 Currencies.php:527 CustomerBranches.php:452
-#: Customers.php:658 Customers.php:1047 Customers.php:1054 Customers.php:1057
+#: AddCustomerContacts.php:278 AddCustomerContacts.php:281 BankAccounts.php:218
+#: BankAccounts.php:412 BankAccounts.php:414 BankAccounts.php:418
+#: BankAccounts.php:426 BOMs.php:142 BOMs.php:895 BOMs.php:899
+#: BOMs_SingleLevel.php:127 BOMs_SingleLevel.php:792 BOMs_SingleLevel.php:796
+#: CompanyPreferences.php:422 CompanyPreferences.php:426
+#: CompanyPreferences.php:437 CompanyPreferences.php:441
+#: CompanyPreferences.php:452 CompanyPreferences.php:456
+#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
+#: Currencies.php:527 CustomerBranches.php:452 Customers.php:658
+#: Customers.php:1047 Customers.php:1054 Customers.php:1057
#: DailyBankTransactions.php:217 DeliveryDetails.php:1159
#: DeliveryDetails.php:1200 DeliveryDetails.php:1203 FormDesigner.php:99
#: GLAccountUsers.php:183 GLAccountUsers.php:193 GLTransInquiry.php:93
@@ -441,20 +438,20 @@
#: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673
#: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781
#: SystemParameters.php:799 SystemParameters.php:806 SystemParameters.php:850
-#: SystemParameters.php:946 SystemParameters.php:1087
-#: SystemParameters.php:1091 SystemParameters.php:1099
-#: SystemParameters.php:1103 SystemParameters.php:1157
-#: SystemParameters.php:1167 SystemParameters.php:1171
-#: SystemParameters.php:1207 SystemParameters.php:1211
-#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:312
-#: TaxGroups.php:315 TaxGroups.php:367 TestPlanResults.php:306
-#: TestPlanResults.php:535 TestPlanResults.php:749 TestPlanResults.php:866
-#: TestPlanResults.php:925 TestPlanResults.php:927 UserGLAccounts.php:189
-#: UserGLAccounts.php:199 UserSettings.php:208 UserSettings.php:211
-#: UserSettings.php:223 UserSettings.php:226 WWW_Users.php:546
-#: WWW_Users.php:550 WWW_Users.php:717 WWW_Users.php:720 WWW_Users.php:733
-#: WWW_Users.php:736 WWW_Users.php:748 WWW_Users.php:751 WWW_Users.php:763
-#: WWW_Users.php:766 includes/PDFLowGPPageHeader.inc:44
+#: SystemParameters.php:946 SystemParameters.php:1087 SystemParameters.php:1091
+#: SystemParameters.php:1099 SystemParameters.php:1103
+#: SystemParameters.php:1157 SystemParameters.php:1167
+#: SystemParameters.php:1171 SystemParameters.php:1207
+#: SystemParameters.php:1211 SystemParameters.php:1231
+#: SystemParameters.php:1235 TaxGroups.php:312 TaxGroups.php:315
+#: TaxGroups.php:367 TestPlanResults.php:306 TestPlanResults.php:535
+#: TestPlanResults.php:749 TestPlanResults.php:866 TestPlanResults.php:925
+#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199
+#: UserSettings.php:208 UserSettings.php:211 UserSettings.php:223
+#: UserSettings.php:226 WWW_Users.php:546 WWW_Users.php:550 WWW_Users.php:717
+#: WWW_Users.php:720 WWW_Users.php:733 WWW_Users.php:736 WWW_Users.php:748
+#: WWW_Users.php:751 WWW_Users.php:763 WWW_Users.php:766
+#: includes/PDFLowGPPageHeader.inc:44
msgid "No"
msgstr "No"
@@ -502,12 +499,12 @@
#: Credit_Invoice.php:419 CreditStatus.php:176 Currencies.php:377
#: CustItem.php:167 CustomerReceipt.php:1009 Customers.php:1166
#: CustomerTypes.php:206 Departments.php:187 DiscountCategories.php:238
-#: DiscountMatrix.php:183 EDIMessageFormat.php:151
-#: FixedAssetCategories.php:191 FreightCosts.php:254 GeocodeSetup.php:174
-#: GLAccounts.php:336 GLJournal.php:431 GLTags.php:97
-#: ImportBankTransAnalysis.php:224 InternalStockCategoriesByRole.php:184
-#: InternalStockRequest.php:298 Labels.php:334 Labels.php:359 Labels.php:612
-#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
+#: DiscountMatrix.php:183 EDIMessageFormat.php:151 FixedAssetCategories.php:191
+#: FreightCosts.php:254 GeocodeSetup.php:174 GLAccounts.php:336
+#: GLJournal.php:431 GLTags.php:97 ImportBankTransAnalysis.php:224
+#: InternalStockCategoriesByRole.php:184 InternalStockRequest.php:298
+#: Labels.php:334 Labels.php:359 Labels.php:612 Locations.php:440
+#: MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
#: Manufacturers.php:261 MRPDemands.php:310 MRPDemandTypes.php:121
#: PaymentMethods.php:233 Payments.php:1283 PaymentTerms.php:206
#: PcAssignCashToTab.php:295 PcClaimExpensesFromTab.php:281 PcExpenses.php:227
@@ -521,18 +518,17 @@
#: SalesTypes.php:207 SecurityTokens.php:117 SelectCreditItems.php:776
#: SelectCustomer.php:734 SelectCustomer.php:760 SelectCustomer.php:815
#: SelectCustomer.php:833 SelectCustomer.php:857 SelectCustomer.php:874
-#: SelectOrderItems.php:1426 SelectQASamples.php:418
-#: SellThroughSupport.php:299 Shipments.php:438 Shippers.php:145
-#: SpecialOrder.php:667 StockCategories.php:297 StockCategories.php:626
-#: StockLocTransfer.php:325 SuppContractChgs.php:99 SuppCreditGRNs.php:117
-#: SuppFixedAssetChgs.php:86 SuppInvGRNs.php:151 SupplierContacts.php:166
-#: SupplierTenderCreate.php:422 SupplierTenderCreate.php:452
-#: SupplierTypes.php:172 SuppShiptChgs.php:90 SuppTransGLAnalysis.php:127
-#: TaxAuthorities.php:173 TaxCategories.php:186 TaxGroups.php:192
-#: TaxProvinces.php:180 TestPlanResults.php:920 UnitsOfMeasure.php:186
-#: WorkCentres.php:146 WorkOrderEntry.php:865 WOSerialNos.php:335
-#: WWW_Access.php:133 WWW_Users.php:392 includes/InputSerialItemsKeyed.php:60
-#: includes/OutputSerialItems.php:99
+#: SelectOrderItems.php:1426 SelectQASamples.php:418 SellThroughSupport.php:299
+#: Shipments.php:438 Shippers.php:145 SpecialOrder.php:667
+#: StockCategories.php:297 StockCategories.php:626 StockLocTransfer.php:325
+#: SuppContractChgs.php:99 SuppCreditGRNs.php:117 SuppFixedAssetChgs.php:86
+#: SuppInvGRNs.php:151 SupplierContacts.php:166 SupplierTenderCreate.php:422
+#: SupplierTenderCreate.php:452 SupplierTypes.php:172 SuppShiptChgs.php:90
+#: SuppTransGLAnalysis.php:127 TaxAuthorities.php:173 TaxCategories.php:186
+#: TaxGroups.php:192 TaxProvinces.php:180 TestPlanResults.php:920
+#: UnitsOfMeasure.php:186 WorkCentres.php:146 WorkOrderEntry.php:865
+#: WOSerialNos.php:335 WWW_Access.php:133 WWW_Users.php:392
+#: includes/InputSerialItemsKeyed.php:60 includes/OutputSerialItems.php:99
#, php-format
msgid "Delete"
msgstr "Suprimir"
@@ -577,16 +573,15 @@
msgid "Update"
msgstr "Actualizar"
-#: AccountGroups.php:378 AccountGroups.php:418
-#: AnalysisHorizontalIncome.php:125 AnalysisHorizontalIncome.php:526
-#: AnalysisHorizontalPosition.php:79 AnalysisHorizontalPosition.php:362
-#: DailyBankTransactions.php:256 GLAccountUsers.php:253 GLBalanceSheet.php:720
-#: GLCashFlowsIndirect.php:749 GLCashFlowsIndirect.php:782
-#: GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317 GLTrialBalance.php:740
-#: InternalStockRequestInquiry.php:263 PurchasesReport.php:231
-#: PurchasesReport.php:253 SecurityTokens.php:140 SecurityTokens.php:156
-#: UserGLAccounts.php:259 Z_GLAccountUsersCopyAuthority.php:96
-#: includes/Login.php:8
+#: AccountGroups.php:378 AccountGroups.php:418 AnalysisHorizontalIncome.php:125
+#: AnalysisHorizontalIncome.php:526 AnalysisHorizontalPosition.php:79
+#: AnalysisHorizontalPosition.php:362 DailyBankTransactions.php:256
+#: GLAccountUsers.php:253 GLBalanceSheet.php:720 GLCashFlowsIndirect.php:749
+#: GLCashFlowsIndirect.php:782 GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317
+#: GLTrialBalance.php:740 InternalStockRequestInquiry.php:263
+#: PurchasesReport.php:231 PurchasesReport.php:253 SecurityTokens.php:140
+#: SecurityTokens.php:156 UserGLAccounts.php:259
+#: Z_GLAccountUsersCopyAuthority.php:96 includes/Login.php:8
msgid "Return"
msgstr "Regresar"
@@ -714,12 +709,11 @@
msgid "New Account Section Details"
msgstr "Detalles de sección contable nueva"
-#: AccountSections.php:285 AddCustomerContacts.php:297
-#: AddCustomerNotes.php:242 AddCustomerTypeNotes.php:221 Areas.php:229
-#: BankAccounts.php:433 BOMs.php:916 BOMs_SingleLevel.php:809
-#: COGSGLPostings.php:371 CreditStatus.php:259 Currencies.php:537
-#: CustLoginSetup.php:273 Departments.php:258 DiscountMatrix.php:142
-#: EDIMessageFormat.php:248 FixedAssetCategories.php:350
+#: AccountSections.php:285 AddCustomerContacts.php:297 AddCustomerNotes.php:242
+#: AddCustomerTypeNotes.php:221 Areas.php:229 BankAccounts.php:433 BOMs.php:916
+#: BOMs_SingleLevel.php:809 COGSGLPostings.php:371 CreditStatus.php:259
+#: Currencies.php:537 CustLoginSetup.php:273 Departments.php:258
+#: DiscountMatrix.php:142 EDIMessageFormat.php:248 FixedAssetCategories.php:350
#: FixedAssetLocations.php:161 FreightCosts.php:371 GeocodeSetup.php:271
#: GLAccounts.php:285 Labels.php:647 Locations.php:716 Manufacturers.php:375
#: MRPDemands.php:424 MRPDemandTypes.php:188 OffersReceived.php:57
@@ -776,8 +770,7 @@
#: PcClaimExpensesFromTab.php:86 PcExpenses.php:98 PcTabs.php:124
#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
-#: SelectQASamp...
[truncated message content] |
|
From: <rc...@us...> - 2017-09-07 03:43:34
|
Revision: 7825
http://sourceforge.net/p/web-erp/reponame/7825
Author: rchacon
Date: 2017-09-07 03:43:31 +0000 (Thu, 07 Sep 2017)
Log Message:
-----------
Fix currency translation in PO_AuthorisationLevels.php.
Modified Paths:
--------------
trunk/PO_AuthorisationLevels.php
trunk/doc/Change.log
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/PO_AuthorisationLevels.php
===================================================================
--- trunk/PO_AuthorisationLevels.php 2017-09-06 06:08:38 UTC (rev 7824)
+++ trunk/PO_AuthorisationLevels.php 2017-09-07 03:43:31 UTC (rev 7825)
@@ -3,11 +3,15 @@
/* $Id$*/
include('includes/session.php');
-
$Title = _('Purchase Order Authorisation Maintenance');
+$ViewTopic = '';
+$BookMark = 'PO_AuthorisationLevels';
include('includes/header.php');
-echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/group_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p><br />';
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/group_add.png" title="', // Icon image.
+ $Title, '" /> ', // Icon title.
+ $Title, '</p>';// Page title.
/*Note: If CanCreate==0 then this means the user can create orders
@@ -127,6 +131,7 @@
<th>' . _('Create Order') . '</th>
<th>' . _('Can Release') . '<br />' . _('Invoices') . '</th>
<th>' . _('Authority Level') . '</th>
+ <th colspan="2"> </th>
</tr>';
while ($myrow=DB_fetch_array($Result)) {
@@ -143,7 +148,7 @@
echo '<tr>
<td>' . $myrow['userid'] . '</td>
<td>' . $myrow['realname'] . '</td>
- <td>' . $myrow['currency'] . '</td>
+ <td>', _($myrow['currency']), '</td>
<td>' . $DisplayCanCreate . '</td>
<td>' . $DisplayOffHold . '</td>
<td class="number">' . locale_number_format($myrow['authlevel'],$myrow['decimalplaces']) . '</td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-09-06 06:08:38 UTC (rev 7824)
+++ trunk/doc/Change.log 2017-09-07 03:43:31 UTC (rev 7825)
@@ -1,5 +1,6 @@
webERP Change Log
+17/09/06 RChacon: Fix currency translation in PO_AuthorisationLevels.php.
17/09/06 Exson: Fixed the bug that invoice cannot be issued by same transaction multiple times in SuppTrans.php.
17/08/30 Exson: Fixed the bug that can not display correctly while the same debtors has more than one transaction and make GL account which is not AR account or bank account transaction showing on too.
17/08/30 Exson: Fixed the default shipper does not work in CustomerBranches.php reported by Steven.
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2017-09-06 06:08:38 UTC (rev 7824)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2017-09-07 03:43:31 UTC (rev 7825)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-15 10:37-0600\n"
-"PO-Revision-Date: 2017-08-15 10:58-0600\n"
+"PO-Revision-Date: 2017-09-06 21:28-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -22829,7 +22829,7 @@
#: PO_AuthorisationLevels.php:7
msgid "Purchase Order Authorisation Maintenance"
-msgstr "Administrar la Autorización de Orden de Compra"
+msgstr "Administrar la autorización de orden de compra"
#: PO_AuthorisationLevels.php:53
msgid "There already exists an entry for this user/currency combination"
@@ -22850,7 +22850,7 @@
#: PO_AuthorisationLevels.php:127
msgid "Create Order"
-msgstr "Crear Pedido"
+msgstr "Crear pedido"
#: PO_AuthorisationLevels.php:128
msgid "Can Release"
|
|
From: <dai...@us...> - 2017-09-08 09:37:54
|
Revision: 7826
http://sourceforge.net/p/web-erp/reponame/7826
Author: daintree
Date: 2017-09-08 09:37:51 +0000 (Fri, 08 Sep 2017)
Log Message:
-----------
Andrew Couling work on Petty cash module tax - taken from Tim fork
Modified Paths:
--------------
trunk/doc/Change.log
trunk/doc/Manual/ManualPettyCash.html
trunk/includes/MainMenuLinksArray.php
trunk/includes/Z_POSDataCreation.php
trunk/includes/header.php
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/sql/mysql/country_sql/default.sql
trunk/sql/mysql/country_sql/demo.sql
trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-09-07 03:43:31 UTC (rev 7825)
+++ trunk/doc/Change.log 2017-09-08 09:37:51 UTC (rev 7826)
@@ -1,9 +1,10 @@
webERP Change Log
-17/09/06 RChacon: Fix currency translation in PO_AuthorisationLevels.php.
-17/09/06 Exson: Fixed the bug that invoice cannot be issued by same transaction multiple times in SuppTrans.php.
-17/08/30 Exson: Fixed the bug that can not display correctly while the same debtors has more than one transaction and make GL account which is not AR account or bank account transaction showing on too.
-17/08/30 Exson: Fixed the default shipper does not work in CustomerBranches.php reported by Steven.
+8/9/17 Andrew Couling: Petty cash improvements to tax taken from Tim's work
+6/9/17 RChacon: Fix currency translation in PO_AuthorisationLevels.php.
+6/9/17 Exson: Fixed the bug that invoice cannot be issued by same transaction multiple times in SuppTrans.php.
+30/8/17 Exson: Fixed the bug that can not display correctly while the same debtors has more than one transaction and make GL account which is not AR account or bank account transaction showing on too.
+30/8/17 Exson: Fixed the default shipper does not work in CustomerBranches.php reported by Steven.
10/8/17 PaulT: CounterSales.php and StockAdjustments.php: Apply fixes posted by Tim in weberp forums.
27/7/17 Exson: Fixed the search failure problem due to stock id code in SelectWorkOrder.php.
18/7/17 Exson: Add QR code for item issue and fg collection for WO in PDFWOPrint.php
Modified: trunk/doc/Manual/ManualPettyCash.html
===================================================================
--- trunk/doc/Manual/ManualPettyCash.html 2017-09-07 03:43:31 UTC (rev 7825)
+++ trunk/doc/Manual/ManualPettyCash.html 2017-09-08 09:37:51 UTC (rev 7826)
@@ -2,7 +2,7 @@
<h2>Overview</h2>
-<p>The Petty Cash module enables employees to submit expense claims directly into the system that can then be authorised by their immediate supervisor.</p>
+<p>The Petty Cash module enables employees to submit expense claims directly into the system that can then be authorised by their supervisor.</p>
<p>Petty cash expenses are controlled in a friendly way, enabling all employees (including those without accounting knowledge) to enter their expenses and get paid for them.</p>
@@ -9,6 +9,7 @@
<p>The Petty cash module uses a temporary GL table (pcashdetails), containing all information about payments and expenses entered as petty cash. When cash assignments or expenses are authorized by a supervisor, they are posted into the gltrans table and flagged.</p>
<p>Once any transaction in the petty cash system has been posted it cannot be modified, edited or deleted in any way. Once posted, that's it.</p>
+
<div class="floatright">
<a class="minitext" href="#top">⬆ Top</a>
</div>
@@ -18,11 +19,9 @@
<h4>Definition of expenses allowed to be used in the Petty Cash system.</h4>
-<p>This table is used to isolate non-accountant users (most of workers/users of webERP) from the technical details and names used in accounting. E.g.: Code Expense: FUEL-COMMERCIAL</p>
+<p>This table is used to isolate non-accountant users (most of workers/users of webERP) from the technical details and names used in accounting.</p>
-<p>Description: Fuel for cars used on commercial trips to customers</p>Account: 12345678 - Commercial car expenses
<p>So when the system posts a petty cash expense against gltrans table, it will be posted against the GL account code selected.
-<p>
<p>PcExpenses.php is used to maintain this table (pcexpenses).</p>
@@ -39,7 +38,7 @@
<p>Here we need to define which expenses are allowed to a certain type of tab. This table is used to prevent users assigning expenses for expenses not allowed. as example, a user with role "member of parlament" could have a tab of a type "all allowed, including night drinks in a pub", while a user with role "hard worker" could have a tab of a type "transport to workplace" only, so the system can achieve a better control of each one's expenses.</p>
-<p>Each company must define here the policy of petty cash pahyments.</p>
+<p>Each company must define here the policy of petty cash payments.</p>
<p>PcExpensesTypeTab.php is the script managing this.</p>
<div class="floatright">
@@ -53,7 +52,7 @@
<p>A petty cash tab contains:</p>
<ul>
- <li>Tab Code</li>
+ <li>Tab Code: The identity of the petty cash tab, limited to 20 characters.</li>
<li>User: User of the tab. Who is spending/receiving moeny for petty cash expenses. Must be a webERP user.</li>
@@ -61,15 +60,24 @@
<li>Currency: A tab will handle money in one currency only. So users allowed to spend in 2 or more currencies (e.g. international commercial team) will have 1 tab for each currency</li>
- <li>Limit: Maximum amount the user can spend, to have a better control. Nowadays it only issues a warning of the supervisor, but can be coded to work differently (better)</li>
+ <li>Limit: Maximum amount the user can spend, to have a better control. Nowadays it only issues a warning to the supervisor, but can be coded to work differently (better)</li>
- <li>Authorizer: User supervisor of the petty cash user. User authorizing (or not) expenses done, checking money is spent wisely and asigning cash to users</li>
+ <li>Cash assigner: The user who will assign cash to the tab. This would typically be the supervisor of the user who is claiming an expense.</li>
+
+ <li>Authorizer - Cash: The user who will authorise cash assigned to the tab. This could be the same user as 'Cash assigner', or perhaps someone higher up the hierarchy if greater financial control is required.</li>
+
+ <li>Authorizer - Expenses: The user who will authorise expense claims.</li>
<li>GL Account For Cash Assignment: GL account where the cash assigment comes from. It must be a bank account, so when assigning cash to a tab, the system will deduct the amount from the bank account and increase the petty cash account</li>
<li>GL Account Petty Cash Tab. In GL we should have an account (one per currency) to reflect "amount of money distributed among employees" or "Petty Cash Account". This is the account where the money goes after a cash assigment is done or where the money comes where an expense is posted</li>
-</ul>
+
+ <li>Default Tag: For each expenses entry, any of the pre-defined tags can be selected, but most users will have one which use most frequently.</li>
+
+ <li>Tax Group: The tax for each expense can be entered. Much like currencies, only one Tax Group can be applied to a tab. So users allowed to spend in 2 or more countries/territories will need 1 tab for each Tax Group.</li>
+ </ul>
+
<p>At this point we have the system ready to work.<br></p>
<div class="floatright">
<a class="minitext" href="#top">⬆ Top</a>
@@ -102,8 +110,12 @@
<li>Date</li>
<li>Code of expense (from the list his/her tab is allowed depending on the type of tab involved)</li>
+
+ <li>Tag</li>
- <li>Amount</li>
+ <li>Gross Amount: The total amount being claimed including taxes</li>
+
+ <li>Tax: The tax amount displayed on the receipt. Multiple tax fields will be displayed for Tax Groups with multiple tax authorites/rates.
<li>Notes: For any further detail needed to remember</li>
@@ -116,14 +128,24 @@
<h3><a id="AuthorizeExpense">Expense authorisation</a></h3>
-<p>Supervisor will need to authorize expenses and cash assignemnts reported.<br></p>
+<p>Once the expenses have been entered, a supervisor will need to authorize them.<br></p>
-<p>In script PcAuthorizeExpenses.php the supervisor must select a tab he/she is supervising<br></p>
+<p>In script PcAuthorizeExpenses.php the supervisor must select the tab he/she is supervising.<br></p>
-<p>If there is any assignment or expense not authorized yet, it can be checked and if correct just tick it. If incorrect or in doubt (an employee claiming 10.000.000 USD for fuel car) he can call/email/report him and sort it out. Because it's not authorized yet it can be modified (to 100 USD...)<br></p>
+<p>Expenses which have not yet been authorized will have a tick box alongside them. To authorize expenses, select the relevant tick boxes. If incorrect or in doubt (an employee claiming 10.000.000 USD for fuel car) he can call/email/report him and sort it out. Because it's not authorized yet it can be modified (to 100 USD...)<br></p>
-<p>Once the update button is pressed and there are some entried ticked, then GL posting occurs.</p>
+<p>When the update button is pressed and there are some expenses ticked, then GL posting occurs.</p>
+<h3><a id="AuthorizeCash">Cash authorisation</a></h3>
+
+<p>A supervisor will also need to authorize assigned cash (or payments). <br></p>
+
+<p>In script PcAuthorizeCash.php the supervisor must select the tab he/she is supervising.<br></p>
+
+<p>Assigned cash entries which have not yet been authorized will have a tick box alongside them. To authorize assigned cash entries, select the relevant tick boxes.</p>
+
+<p>When the update button is pressed and there are some assigned cash entries ticked, then GL posting occurs.</p>
+
<h3>Posting workflow</h3>
<p>If a cash assigment need to be posted then:</p>
@@ -158,7 +180,7 @@
<h4>About advance payments</h4>
-<p>About advance payments or refunds, we always run "open tabs", so employees asks for money first, and later on they spend it (we hope in an appropriate manner) and then report expenses incurred. Any difference will be settled "next report" or "next cash assignment".</p>
+<p>Many organisations run "open tabs", so employees asks for money first, and later on they spend it (we hope in an appropriate manner) and then report expenses incurred. Any difference will be settled "next report" or "next cash assignment".</p>
<p>That's the idea keeping expense report and cash assignment separate, as it's flexible and fits all situations:</p>
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2017-09-07 03:43:31 UTC (rev 7825)
+++ trunk/includes/MainMenuLinksArray.php 2017-09-08 09:37:51 UTC (rev 7826)
@@ -448,14 +448,16 @@
'/MaintenanceTasks.php');
$MenuItems['PC']['Transactions']['Caption'] = array(_('Assign Cash to PC Tab'),
- _('Cash Transfer Between Tabs'),
+ _('Transfer Assigned Cash Between PC Tabs'),
_('Claim Expenses From PC Tab'),
- _('Expenses Authorisation'));
+ _('Authorise Expenses'),
+ _('Authorise Assigned Cash'));
$MenuItems['PC']['Transactions']['URL'] = array('/PcAssignCashToTab.php',
'/PcAssignCashTabToTab.php',
'/PcClaimExpensesFromTab.php',
- '/PcAuthorizeExpenses.php');
+ '/PcAuthorizeExpenses.php',
+ '/PcAuthorizeCash.php');
$MenuItems['PC']['Reports']['Caption'] = array(_('PC Tab General Report'),
_('PC Expense General Report'),
Modified: trunk/includes/Z_POSDataCreation.php
===================================================================
--- trunk/includes/Z_POSDataCreation.php 2017-09-07 03:43:31 UTC (rev 7825)
+++ trunk/includes/Z_POSDataCreation.php 2017-09-08 09:37:51 UTC (rev 7826)
@@ -122,13 +122,11 @@
fwrite($FileHandle,"DELETE FROM stockmaster;\n");
- //$result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces, discountcategory FROM stockmaster WHERE (mbflag='B' OR mbflag='M' OR mbflag='D' OR mbflag='A') AND discontinued=0 AND controlled=0");
+ $result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces, discountcategory FROM stockmaster WHERE (mbflag='B' OR mbflag='M' OR mbflag='D' OR mbflag='A') AND discontinued=0 AND controlled=0");
- $result = DB_query("SELECT stockid, categoryid, description, longdescription, units, barcode, taxcatid, decimalplaces, discountcategory, controlled FROM stockmaster WHERE (mbflag='B' OR mbflag='M' OR mbflag='D' OR mbflag='A') AND discontinued=0");
-
while ($myrow = DB_fetch_array($result)) {
- fwrite($FileHandle,"INSERT INTO stockmaster VALUES ('" . SQLite_Escape($myrow['stockid']) . "', '" . SQLite_Escape($myrow['categoryid']) . "', '" . SQLite_Escape ($myrow['description']) . "', '" . SQLite_Escape(str_replace("\n", '', $myrow['longdescription'])) . "', '" . SQLite_Escape($myrow['units']) . "', '" . SQLite_Escape ($myrow['barcode']) . "', '" . $myrow['taxcatid'] . "', '" . $myrow['decimalplaces'] . "', '" . SQLite_Escape($myrow['discountcategory']) . "', '" . $myrow['controlled'] . "' );\n");
+ fwrite($FileHandle,"INSERT INTO stockmaster VALUES ('" . SQLite_Escape($myrow['stockid']) . "', '" . SQLite_Escape($myrow['categoryid']) . "', '" . SQLite_Escape ($myrow['description']) . "', '" . SQLite_Escape(str_replace("\n", '', $myrow['longdescription'])) . "', '" . SQLite_Escape($myrow['units']) . "', '" . SQLite_Escape ($myrow['barcode']) . "', '" . $myrow['taxcatid'] . "', '" . $myrow['decimalplaces'] . "', '" . SQLite_Escape($myrow['discountcategory']) . "' );\n");
}
fwrite($FileHandle,"DELETE FROM prices;\n");
Modified: trunk/includes/header.php
===================================================================
--- trunk/includes/header.php 2017-09-07 03:43:31 UTC (rev 7825)
+++ trunk/includes/header.php 2017-09-08 09:37:51 UTC (rev 7826)
@@ -55,10 +55,10 @@
if (isset($Title)) {
echo '<div id="AppInfoDiv">'; //===HJ===
echo '<div id="AppInfoCompanyDiv">';
- echo '<img alt="'._('Company').'" src="'.$RootPath.'/css/'.$Theme.'/images/company.png" title="'._('Company').'" />' . stripslashes($_SESSION['CompanyRecord']['coyname']);
+ echo '<img alt="'._('Company').'" src="'.$RootPath.'/css/'.$_SESSION['Theme'].'/images/company.png" title="'._('Company').'" />' . stripslashes($_SESSION['CompanyRecord']['coyname']);
echo '</div>';
echo '<div id="AppInfoUserDiv">';
- echo '<a href="'.$RootPath.'/UserSettings.php"><img alt="'._('User').'" src="'.$RootPath.'/css/'.$Theme.'/images/user.png" title="'._('User').'" />' . stripslashes($_SESSION['UsersRealName']) . '</a>';
+ echo '<a href="'.$RootPath.'/UserSettings.php"><img alt="'._('User').'" src="'.$RootPath.'/css/'.$_SESSION['Theme'].'/images/user.png" title="'._('User').'" />' . stripslashes($_SESSION['UsersRealName']) . '</a>';
echo '</div>';
echo '<div id="AppInfoModuleDiv">';
// Make the title text a class, can be set to display:none is some themes
@@ -89,10 +89,20 @@
echo '</li>'; //take off inline formatting, use CSS instead ===HJ===
if (count($_SESSION['AllowedPageSecurityTokens'])>1){
- echo '<li><a href="' , $RootPath , '/SelectCustomer.php">' , _('Customers') , '</a></li>';
- echo '<li><a href="' , $RootPath , '/SelectProduct.php">' , _('Items') , '</a></li>';
- echo '<li><a href="' , $RootPath , '/SelectSupplier.php">' , _('Suppliers') , '</a></li>';
- echo '<li><a href="' , $RootPath , '/ManualContents.php', $ViewTopic , $BookMark , '" rel="external" accesskey="8">' , _('Manual'), '</a></li>';
+ echo '<li><a href="'.$RootPath.'/SelectCustomer.php">' . _('Customers') . '</a></li>';
+ echo '<li><a href="'.$RootPath.'/SelectProduct.php">' . _('Items') . '</a></li>';
+ echo '<li><a href="'.$RootPath.'/SelectSupplier.php">' . _('Suppliers') . '</a></li>';
+/* $DefaultManualLink = '<li><a rel="external" accesskey="8" href="' . $RootPath . '/doc/Manual/ManualContents.php'. $ViewTopic . $BookMark. '">' . _('Manual') . '</a></li>';
+ if (mb_substr($_SESSION['Language'],0,2) != 'en'){
+ if (file_exists('locale/'.$_SESSION['Language'].'/Manual/ManualContents.php')){
+ echo '<li><a target="_blank" href="'.$RootPath.'/locale/'.$_SESSION['Language'].'/Manual/ManualContents.php'. $ViewTopic . $BookMark. '">' . _('Manual') . '</a></li>';
+ } else {
+ echo $DefaultManualLink;
+ }
+ } else {
+ echo $DefaultManualLink;
+ }*/
+ echo '<li><a href="', $RootPath, '/ManualContents.php', $ViewTopic, $BookMark, '" rel="external" accesskey="8">', _('Manual'), '</a></li>';
}
echo '<li><a href="'.$RootPath.'/Logout.php" onclick="return confirm(\''._('Are you sure you wish to logout?').'\');">' . _('Logout') . '</a></li>';
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 2017-09-07 03:43:31 UTC (rev 7825)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-09-08 09:37:51 UTC (rev 7826)
@@ -295,6 +295,7 @@
#: AccountGroups.php:476 AddCustomerContacts.php:165
#: AddCustomerContacts.php:275 AddCustomerContacts.php:279
#: AddCustomerContacts.php:282 BOMs.php:140 BOMs.php:896 BOMs.php:898
+#: BOMs_SingleLevel.php:125 BOMs_SingleLevel.php:793 BOMs_SingleLevel.php:795
#: CompanyPreferences.php:423 CompanyPreferences.php:425
#: CompanyPreferences.php:438 CompanyPreferences.php:440
#: CompanyPreferences.php:453 CompanyPreferences.php:455
@@ -344,20 +345,20 @@
#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
-#: SystemParameters.php:945 SystemParameters.php:1088 SystemParameters.php:1090
-#: SystemParameters.php:1100 SystemParameters.php:1102
-#: SystemParameters.php:1156 SystemParameters.php:1168
-#: SystemParameters.php:1170 SystemParameters.php:1208
-#: SystemParameters.php:1210 SystemParameters.php:1232
-#: SystemParameters.php:1234 TaxGroups.php:311 TaxGroups.php:314
-#: TaxGroups.php:365 TestPlanResults.php:304 TestPlanResults.php:532
-#: TestPlanResults.php:747 TestPlanResults.php:864 TestPlanResults.php:924
-#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196
-#: UserSettings.php:209 UserSettings.php:212 UserSettings.php:224
-#: UserSettings.php:227 WWW_Users.php:547 WWW_Users.php:549 WWW_Users.php:718
-#: WWW_Users.php:721 WWW_Users.php:734 WWW_Users.php:737 WWW_Users.php:749
-#: WWW_Users.php:752 WWW_Users.php:764 WWW_Users.php:767
-#: reportwriter/languages/en_US/reports.php:114
+#: SystemParameters.php:945 SystemParameters.php:1088
+#: SystemParameters.php:1090 SystemParameters.php:1100
+#: SystemParameters.php:1102 SystemParameters.php:1156
+#: SystemParameters.php:1168 SystemParameters.php:1170
+#: SystemParameters.php:1208 SystemParameters.php:1210
+#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:311
+#: TaxGroups.php:314 TaxGroups.php:365 TestPlanResults.php:304
+#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864
+#: TestPlanResults.php:924 TestPlanResults.php:928 UserGLAccounts.php:187
+#: UserGLAccounts.php:196 UserSettings.php:209 UserSettings.php:212
+#: UserSettings.php:224 UserSettings.php:227 WWW_Users.php:547
+#: WWW_Users.php:549 WWW_Users.php:718 WWW_Users.php:721 WWW_Users.php:734
+#: WWW_Users.php:737 WWW_Users.php:749 WWW_Users.php:752 WWW_Users.php:764
+#: WWW_Users.php:767
msgid "Yes"
msgstr "موافق"
@@ -415,21 +416,20 @@
#: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673
#: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781
#: SystemParameters.php:799 SystemParameters.php:806 SystemParameters.php:850
-#: SystemParameters.php:946 SystemParameters.php:1087 SystemParameters.php:1091
-#: SystemParameters.php:1099 SystemParameters.php:1103
-#: SystemParameters.php:1157 SystemParameters.php:1167
-#: SystemParameters.php:1171 SystemParameters.php:1207
-#: SystemParameters.php:1211 SystemParameters.php:1231
-#: SystemParameters.php:1235 TaxGroups.php:312 TaxGroups.php:315
-#: TaxGroups.php:367 TestPlanResults.php:306 TestPlanResults.php:535
-#: TestPlanResults.php:749 TestPlanResults.php:866 TestPlanResults.php:925
-#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199
-#: UserSettings.php:208 UserSettings.php:211 UserSettings.php:223
-#: UserSettings.php:226 WWW_Users.php:546 WWW_Users.php:550 WWW_Users.php:717
-#: WWW_Users.php:720 WWW_Users.php:733 WWW_Users.php:736 WWW_Users.php:748
-#: WWW_Users.php:751 WWW_Users.php:763 WWW_Users.php:766
-#: includes/PDFLowGPPageHeader.inc:44
-#: reportwriter/languages/en_US/reports.php:82
+#: SystemParameters.php:946 SystemParameters.php:1087
+#: SystemParameters.php:1091 SystemParameters.php:1099
+#: SystemParameters.php:1103 SystemParameters.php:1157
+#: SystemParameters.php:1167 SystemParameters.php:1171
+#: SystemParameters.php:1207 SystemParameters.php:1211
+#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:312
+#: TaxGroups.php:315 TaxGroups.php:367 TestPlanResults.php:306
+#: TestPlanResults.php:535 TestPlanResults.php:749 TestPlanResults.php:866
+#: TestPlanResults.php:925 TestPlanResults.php:927 UserGLAccounts.php:189
+#: UserGLAccounts.php:199 UserSettings.php:208 UserSettings.php:211
+#: UserSettings.php:223 UserSettings.php:226 WWW_Users.php:546
+#: WWW_Users.php:550 WWW_Users.php:717 WWW_Users.php:720 WWW_Users.php:733
+#: WWW_Users.php:736 WWW_Users.php:748 WWW_Users.php:751 WWW_Users.php:763
+#: WWW_Users.php:766 includes/PDFLowGPPageHeader.inc:44
msgid "No"
msgstr "ﻻ"
@@ -507,7 +507,6 @@
#: UnitsOfMeasure.php:186 WorkCentres.php:146 WorkOrderEntry.php:865
#: WOSerialNos.php:335 WWW_Access.php:133 WWW_Users.php:392
#: includes/InputSerialItemsKeyed.php:60 includes/OutputSerialItems.php:99
-#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
msgstr "حذف"
@@ -551,15 +550,16 @@
msgid "Update"
msgstr ""
-#: AccountGroups.php:378 AccountGroups.php:418 AnalysisHorizontalIncome.php:125
-#: AnalysisHorizontalIncome.php:526 AnalysisHorizontalPosition.php:79
-#: AnalysisHorizontalPosition.php:362 DailyBankTransactions.php:256
-#: GLAccountUsers.php:253 GLBalanceSheet.php:720 GLCashFlowsIndirect.php:749
-#: GLCashFlowsIndirect.php:782 GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317
-#: GLTrialBalance.php:740 InternalStockRequestInquiry.php:263
-#: PurchasesReport.php:231 PurchasesReport.php:253 SecurityTokens.php:140
-#: SecurityTokens.php:156 UserGLAccounts.php:259
-#: Z_GLAccountUsersCopyAuthority.php:96 includes/Login.php:8
+#: AccountGroups.php:378 AccountGroups.php:418
+#: AnalysisHorizontalIncome.php:125 AnalysisHorizontalIncome.php:526
+#: AnalysisHorizontalPosition.php:79 AnalysisHorizontalPosition.php:362
+#: DailyBankTransactions.php:256 GLAccountUsers.php:253 GLBalanceSheet.php:720
+#: GLCashFlowsIndirect.php:749 GLCashFlowsIndirect.php:782
+#: GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317 GLTrialBalance.php:740
+#: InternalStockRequestInquiry.php:263 PurchasesReport.php:231
+#: PurchasesReport.php:253 SecurityTokens.php:140 SecurityTokens.php:156
+#: UserGLAccounts.php:259 Z_GLAccountUsersCopyAuthority.php:96
+#: includes/Login.php:8
msgid "Return"
msgstr ""
@@ -789,8 +789,8 @@
#: WWW_Users.php:333 includes/PDFPickingListHeader.inc:25
#: includes/PDFStatementPageHeader.inc:76 includes/PDFTransPageHeader.inc:85
#: includes/PDFTransPageHeaderPortrait.inc:113 includes/PDFWOPageHeader.inc:19
-#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:298
-#: ../webSHOP/Register.php:595
+#: includes/PO_PDFOrderPageHeader.inc:29 ../webSHOP/Checkout.php:443
+#: ../webSHOP/Register.php:608
msgid "Email"
msgstr ""
@@ -835,16 +835,17 @@
msgstr ""
#: AddCustomerContacts.php:236 Factors.php:234 SupplierContacts.php:239
-#: ../webSHOP/Checkout.php:379 ../webSHOP/Register.php:610
+#: ../webSHOP/Checkout.php:527 ../webSHOP/Register.php:623
msgid "Contact Name"
msgstr ""
#: AddCustomerContacts.php:254 Contracts.php:788 PDFRemittanceAdvice.php:247
#: PO_Header.php:1026 PO_Header.php:1111 SelectCreditItems.php:246
-#: SelectCustomer.php:406 SelectOrderItems.php:626 SupplierTenderCreate.php:395
-#: includes/PDFStatementPageHeader.inc:72 includes/PDFTransPageHeader.inc:84
-#: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:389
-#: ../webSHOP/Register.php:255 ../webSHOP/Register.php:723
+#: SelectCustomer.php:406 SelectOrderItems.php:626
+#: SupplierTenderCreate.php:395 includes/PDFStatementPageHeader.inc:72
+#: includes/PDFTransPageHeader.inc:84
+#: includes/PDFTransPageHeaderPortrait.inc:109 ../webSHOP/Checkout.php:537
+#: ../webSHOP/Register.php:260 ../webSHOP/Register.php:737
msgid "Phone"
msgstr ""
@@ -916,7 +917,6 @@
#: includes/PDFQuotationPortraitPageHeader.inc:80
#: includes/PDFStatementPageHeader.inc:164 includes/PDFTransPageHeader.inc:51
#: includes/PDFTransPageHeaderPortrait.inc:62
-#: reportwriter/languages/en_US/reports.php:64
msgid "Date"
msgstr ""
@@ -1028,7 +1028,6 @@
#: StockSerialItemResearch.php:9 StockSerialItems.php:9 StockStatus.php:45
#: StockTransferControlled.php:14 SuppLoginSetup.php:24 WWW_Users.php:28
#: includes/MainMenuLinksArray.php:24
-#: reportwriter/languages/en_US/reports.php:243
msgid "Inventory"
msgstr ""
@@ -1037,13 +1036,14 @@
msgstr ""
#: AgedControlledInventory.php:42 MRPReschedules.php:124 MRPShortages.php:260
-#: StockClone.php:53 Stocks.php:63 reportwriter/languages/en_US/reports.php:103
+#: StockClone.php:53 Stocks.php:63
msgid "Stock"
msgstr ""
#: AgedControlledInventory.php:43 AutomaticTranslationDescriptions.php:37
#: BOMIndented.php:315 BOMIndentedReverse.php:293 BOMInquiry.php:109
-#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1014 CollectiveWorkOrderCost.php:53
+#: BOMInquiry.php:198 BOMs.php:656 BOMs.php:1014 BOMs_SingleLevel.php:558
+#: BOMs_SingleLevel.php:905 CollectiveWorkOrderCost.php:53
#: CollectiveWorkOrderCost.php:325 ContractBOM.php:241 ContractBOM.php:353
#: ContractOtherReqts.php:97 CounterReturns.php:1688 CounterSales.php:2112
#: CounterSales.php:2266 CreditStatus.php:152 CreditStatus.php:243
@@ -1092,8 +1092,8 @@
#: includes/PDFStockLocTransferHeader.inc:65
#: includes/PDFStockTransferHeader.inc:36 includes/PDFTopItemsHeader.inc:50
#: includes/PDFTransPageHeader.inc:211
-#: includes/PDFTransPageHeaderPortrait.inc:256 includes/DefineLabelClass.php:12
-#: includes/DefineLabelClass.php:45 ../webSHOP/includes/PlaceOrder.php:236
+#: includes/PDFTransPageHeaderPortrait.inc:256 api/api_xml-rpc.php:3489
+#: ../webSHOP/includes/PlaceOrder.php:250
msgid "Description"
msgstr ""
@@ -1140,10 +1140,10 @@
#: api/api_debtortransactions.php:1271 api/api_debtortransactions.php:1284
#: api/api_debtortransactions.php:1581 includes/PDFQuotationPageHeader.inc:119
#: includes/PDFQuotationPortraitPageHeader.inc:100
-#: includes/PO_PDFOrderPageHeader.inc:81
-#: reportwriter/languages/en_US/reports.php:107
-#: ../webSHOP/includes/DisplayShoppingCart.php:7
-#: ../webSHOP/includes/PlaceOrder.php:285
+#: includes/PO_PDFOrderPageHeader.inc:81 api/api_debtortransactions.php:1271
+#: api/api_debtortransactions.php:1284 api/api_debtortransactions.php:1581
+#: ../webSHOP/includes/DisplayShoppingCart.php:8
+#: ../webSHOP/includes/PlaceOrder.php:299
#, php-format
msgid "Total"
msgstr ""
@@ -1244,9 +1244,6 @@
#: Tax.php:310 Z_DataExport.php:72 Z_DataExport.php:168 Z_DataExport.php:259
#: Z_DataExport.php:308 Z_DataExport.php:347 Z_DataExport.php:383
#: Z_DataExport.php:419 Z_DataExport.php:471 Z_poRebuildDefault.php:41
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:188
-#: includes/ConstructSQLForUserDefinedSalesReport.inc:343
#: includes/PDFPaymentRun_PymtFooter.php:59
#: includes/PDFPaymentRun_PymtFooter.php:89
#: includes/PDFPaymentRun_PymtFooter.php:119
@@ -1253,6 +1250,9 @@
#: includes/PDFPaymentRun_PymtFooter.php:156
#: includes/PDFPaymentRun_PymtFooter.php:187
#: includes/PDFPaymentRun_PymtFooter.php:218
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:180
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:188
+#: includes/ConstructSQLForUserDefinedSalesReport.inc:343
msgid "Back to the menu"
msgstr ""
@@ -1303,9 +1303,10 @@
#: includes/PDFPaymentRun_PymtFooter.php:91
#: includes/PDFPaymentRun_PymtFooter.php:121
#: includes/PDFPaymentRun_PymtFooter.php:158
-#: includes/PDFPaymentRun_PymtFooter.php:189
+#: includes/PDFPaymentRun_PymtFooter.php:189 includes/ConnectDB_mysqli.inc:70
+#: includes/ConnectDB_mysql.inc:62
#: ../webSHOP/includes/DatabaseFunctions.php:60
-#: ../webSHOP/includes/Functions.php:438 ../webSHOP/includes/PlaceOrder.php:70
+#: ../webSHOP/includes/Functions.php:448 ../webSHOP/includes/PlaceOrder.php:68
msgid "The SQL that failed was"
msgstr ""
@@ -1462,7 +1463,7 @@
#: StockCategorySalesInquiry.php:154 StockCategorySalesInquiry.php:188
#: StockCategorySalesInquiry.php:189 StockCategorySalesInquiry.php:194
#: StockCategorySalesInquiry.php:217 StockCategorySalesInquiry.php:230
-#: TopItems.php:193 TopItems.php:194 ../webSHOP/includes/Functions.php:41
+#: TopItems.php:193 TopItems.php:194 ../webSHOP/includes/Functions.php:40
msgid "N/A"
msgstr ""
@@ -1472,12 +1473,13 @@
msgid "Horizontal Analysis of Statement of Comprehensive Income"
msgstr ""
-#: AnalysisHorizontalIncome.php:26 GLProfit_Loss.php:14 GLTagProfit_Loss.php:14
-#: Z_UpdateChartDetailsBFwd.php:14
+#: AnalysisHorizontalIncome.php:26 GLProfit_Loss.php:14
+#: GLTagProfit_Loss.php:14 Z_UpdateChartDetailsBFwd.php:14
msgid "The selected period from i...
[truncated message content] |
|
From: <dai...@us...> - 2017-09-08 09:40:31
|
Revision: 7827
http://sourceforge.net/p/web-erp/reponame/7827
Author: daintree
Date: 2017-09-08 09:40:28 +0000 (Fri, 08 Sep 2017)
Log Message:
-----------
Phil portrait invoice now has narrative fixed to show the correct invoice number
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
trunk/doc/Change.log
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2017-09-08 09:37:51 UTC (rev 7826)
+++ trunk/PrintCustTransPortrait.php 2017-09-08 09:40:28 UTC (rev 7827)
@@ -517,7 +517,6 @@
if(isset($_GET['Email'])) { //email the invoice to address supplied
include ('includes/htmlMimeMail.php');
- $FromTransNo--; //reverse the increment to retain the correct transaction number
$FileName = $_SESSION['reports_dir'] . '/' . $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf';
$pdf->Output($FileName,'F');
$mail = new htmlMimeMail();
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-09-08 09:37:51 UTC (rev 7826)
+++ trunk/doc/Change.log 2017-09-08 09:40:28 UTC (rev 7827)
@@ -1,5 +1,6 @@
webERP Change Log
+8/9/17 Phil: Fix portrait invoice email now has narrative of correct invocie number!
8/9/17 Andrew Couling: Petty cash improvements to tax taken from Tim's work
6/9/17 RChacon: Fix currency translation in PO_AuthorisationLevels.php.
6/9/17 Exson: Fixed the bug that invoice cannot be issued by same transaction multiple times in SuppTrans.php.
|
|
From: <dai...@us...> - 2017-09-08 09:45:44
|
Revision: 7828
http://sourceforge.net/p/web-erp/reponame/7828
Author: daintree
Date: 2017-09-08 09:45:40 +0000 (Fri, 08 Sep 2017)
Log Message:
-----------
Andrew Couling work on Petty cash module tax - taken from Tim fork
Modified Paths:
--------------
trunk/PcAnalysis.php
trunk/PcAssignCashTabToTab.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/PcExpensesTypeTab.php
trunk/PcReportExpense.php
trunk/PcReportTab.php
trunk/PcTabExpensesList.php
trunk/PcTabs.php
trunk/PcTypeTabs.php
trunk/Tax.php
Modified: trunk/PcAnalysis.php
===================================================================
--- trunk/PcAnalysis.php 2017-09-08 09:40:28 UTC (rev 7827)
+++ trunk/PcAnalysis.php 2017-09-08 09:45:40 UTC (rev 7828)
@@ -23,20 +23,20 @@
$SQL = "SELECT pcexpenses.codeexpense,";
// Creation of periods SQL query
- $period_today=GetPeriod(Date($_SESSION['DefaultDateFormat']), $db);
- $sqlPeriods = "SELECT periodno,
+ $PeriodToday=GetPeriod(Date($_SESSION['DefaultDateFormat']), $db);
+ $SQLPeriods = "SELECT periodno,
lastdate_in_period
FROM periods
- WHERE periodno <= ". $period_today ."
+ WHERE periodno <= ". $PeriodToday ."
ORDER BY periodno DESC
LIMIT 24";
- $Periods = DB_query($sqlPeriods);
- $numPeriod = 0;
+ $Periods = DB_query($SQLPeriods);
+ $NumPeriod = 0;
$LabelsArray = array();
- while ($myrow=DB_fetch_array($Periods,$db)){
+ while ($MyRow=DB_fetch_array($Periods,$db)){
- $numPeriod++;
- $LabelsArray[$numPeriod] = MonthAndYearFromSQLDate($myrow['lastdate_in_period']);
+ $NumPeriod++;
+ $LabelsArray[$NumPeriod] = MonthAndYearFromSQLDate($MyRow['lastdate_in_period']);
$SQL = $SQL . "(SELECT SUM(pcashdetails.amount)
FROM pcashdetails
WHERE pcashdetails.codeexpense = pcexpenses.codeexpense";
@@ -43,8 +43,8 @@
if ($TabToShow!='All'){
$SQL = $SQL." AND pcashdetails.tabcode = '". $TabToShow ."'";
}
- $SQL = $SQL . " AND date >= '" . beginning_of_month($myrow['lastdate_in_period']). "'
- AND date <= '" . $myrow['lastdate_in_period'] . "') AS expense_period".$numPeriod.", ";
+ $SQL = $SQL . " AND date >= '" . beginning_of_month($MyRow['lastdate_in_period']). "'
+ AND date <= '" . $MyRow['lastdate_in_period'] . "') AS expense_period".$NumPeriod.", ";
}
// Creation of final part of SQL
$SQL = $SQL." pcexpenses.description
@@ -51,8 +51,8 @@
FROM pcexpenses
ORDER BY pcexpenses.codeexpense";
- $result = DB_query($SQL);
- if (DB_num_rows($result) != 0){
+ $Result = DB_query($SQL);
+ if (DB_num_rows($Result) != 0){
// Create new PHPExcel object
$objPHPExcel = new PHPExcel();
@@ -66,89 +66,96 @@
->setKeywords("")
->setCategory("");
- $objPHPExcel->getActiveSheet()->getStyle('1')->getAlignment()->setWrapText(true);
- $objPHPExcel->getActiveSheet()->getStyle('C:AB')->getNumberFormat()->setFormatCode('#,###');
+ // Formatting
+ $objPHPExcel->getActiveSheet()->getStyle('C:AB')->getNumberFormat()->setFormatCode('#,##0.00');
+ $objPHPExcel->getActiveSheet()->getStyle('4')->getFont()->setBold(true);
+ $objPHPExcel->getActiveSheet()->getStyle('A2')->getFont()->setBold(true);
+ $objPHPExcel->getActiveSheet()->getStyle('A:B')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
+
// Add title data
$objPHPExcel->setActiveSheetIndex(0);
- $objPHPExcel->getActiveSheet()->setCellValue('A1', 'Code');
- $objPHPExcel->getActiveSheet()->setCellValue('B1', 'Description');
+ $objPHPExcel->getActiveSheet()->setCellValue('A2', 'Petty Cash Tab(s)');
+ $objPHPExcel->getActiveSheet()->setCellValue('B2', $TabToShow);
+ $objPHPExcel->getActiveSheet()->setCellValue('A4', 'Expense Code');
+ $objPHPExcel->getActiveSheet()->setCellValue('B4', 'Description');
- $objPHPExcel->getActiveSheet()->setCellValue('C1', 'Total 12 Months');
- $objPHPExcel->getActiveSheet()->setCellValue('D1', 'Average 12 Months');
+ $objPHPExcel->getActiveSheet()->setCellValue('C4', 'Total 12 Months');
+ $objPHPExcel->getActiveSheet()->setCellValue('D4', 'Average 12 Months');
- $objPHPExcel->getActiveSheet()->setCellValue('E1', $LabelsArray[24]);
- $objPHPExcel->getActiveSheet()->setCellValue('F1', $LabelsArray[23]);
- $objPHPExcel->getActiveSheet()->setCellValue('G1', $LabelsArray[22]);
- $objPHPExcel->getActiveSheet()->setCellValue('H1', $LabelsArray[21]);
- $objPHPExcel->getActiveSheet()->setCellValue('I1', $LabelsArray[20]);
- $objPHPExcel->getActiveSheet()->setCellValue('J1', $LabelsArray[19]);
- $objPHPExcel->getActiveSheet()->setCellValue('K1', $LabelsArray[18]);
- $objPHPExcel->getActiveSheet()->setCellValue('L1', $LabelsArray[17]);
- $objPHPExcel->getActiveSheet()->setCellValue('M1', $LabelsArray[16]);
- $objPHPExcel->getActiveSheet()->setCellValue('N1', $LabelsArray[15]);
- $objPHPExcel->getActiveSheet()->setCellValue('O1', $LabelsArray[14]);
- $objPHPExcel->getActiveSheet()->setCellValue('P1', $LabelsArray[13]);
- $objPHPExcel->getActiveSheet()->setCellValue('Q1', $LabelsArray[12]);
- $objPHPExcel->getActiveSheet()->setCellValue('R1', $LabelsArray[11]);
- $objPHPExcel->getActiveSheet()->setCellValue('S1', $LabelsArray[10]);
- $objPHPExcel->getActiveSheet()->setCellValue('T1', $LabelsArray[9]);
- $objPHPExcel->getActiveSheet()->setCellValue('U1', $LabelsArray[8]);
- $objPHPExcel->getActiveSheet()->setCellValue('V1', $LabelsArray[7]);
- $objPHPExcel->getActiveSheet()->setCellValue('W1', $LabelsArray[6]);
- $objPHPExcel->getActiveSheet()->setCellValue('X1', $LabelsArray[5]);
- $objPHPExcel->getActiveSheet()->setCellValue('Y1', $LabelsArray[4]);
- $objPHPExcel->getActiveSheet()->setCellValue('Z1', $LabelsArray[3]);
- $objPHPExcel->getActiveSheet()->setCellValue('AA1', $LabelsArray[2]);
- $objPHPExcel->getActiveSheet()->setCellValue('AB1', $LabelsArray[1]);
+ $objPHPExcel->getActiveSheet()->setCellValue('E4', $LabelsArray[24]);
+ $objPHPExcel->getActiveSheet()->setCellValue('F4', $LabelsArray[23]);
+ $objPHPExcel->getActiveSheet()->setCellValue('G4', $LabelsArray[22]);
+ $objPHPExcel->getActiveSheet()->setCellValue('H4', $LabelsArray[21]);
+ $objPHPExcel->getActiveSheet()->setCellValue('I4', $LabelsArray[20]);
+ $objPHPExcel->getActiveSheet()->setCellValue('J4', $LabelsArray[19]);
+ $objPHPExcel->getActiveSheet()->setCellValue('K4', $LabelsArray[18]);
+ $objPHPExcel->getActiveSheet()->setCellValue('L4', $LabelsArray[17]);
+ $objPHPExcel->getActiveSheet()->setCellValue('M4', $LabelsArray[16]);
+ $objPHPExcel->getActiveSheet()->setCellValue('N4', $LabelsArray[15]);
+ $objPHPExcel->getActiveSheet()->setCellValue('O4', $LabelsArray[14]);
+ $objPHPExcel->getActiveSheet()->setCellValue('P4', $LabelsArray[13]);
+ $objPHPExcel->getActiveSheet()->setCellValue('Q4', $LabelsArray[12]);
+ $objPHPExcel->getActiveSheet()->setCellValue('R4', $LabelsArray[11]);
+ $objPHPExcel->getActiveSheet()->setCellValue('S4', $LabelsArray[10]);
+ $objPHPExcel->getActiveSheet()->setCellValue('T4', $LabelsArray[9]);
+ $objPHPExcel->getActiveSheet()->setCellValue('U4', $LabelsArray[8]);
+ $objPHPExcel->getActiveSheet()->setCellValue('V4', $LabelsArray[7]);
+ $objPHPExcel->getActiveSheet()->setCellValue('W4', $LabelsArray[6]);
+ $objPHPExcel->getActiveSheet()->setCellValue('X4', $LabelsArray[5]);
+ $objPHPExcel->getActiveSheet()->setCellValue('Y4', $LabelsArray[4]);
+ $objPHPExcel->getActiveSheet()->setCellValue('Z4', $LabelsArray[3]);
+ $objPHPExcel->getActiveSheet()->setCellValue('AA4', $LabelsArray[2]);
+ $objPHPExcel->getActiveSheet()->setCellValue('AB4', $LabelsArray[1]);
// Add data
- $i = 2;
- while ($myrow = DB_fetch_array($result)) {
+ $i = 5;
+ while ($MyRow = DB_fetch_array($Result)) {
$objPHPExcel->setActiveSheetIndex(0);
- $objPHPExcel->getActiveSheet()->setCellValue('A'.$i, $myrow['codeexpense']);
- $objPHPExcel->getActiveSheet()->setCellValue('B'.$i, $myrow['description']);
+ $objPHPExcel->getActiveSheet()->setCellValue('A'.$i, $MyRow['codeexpense']);
+ $objPHPExcel->getActiveSheet()->setCellValue('B'.$i, $MyRow['description']);
$objPHPExcel->getActiveSheet()->setCellValue('C'.$i, '=SUM(Q'.$i.':AB'.$i.')');
$objPHPExcel->getActiveSheet()->setCellValue('D'.$i, '=AVERAGE(Q'.$i.':AB'.$i.')');
- $objPHPExcel->getActiveSheet()->setCellValue('E'.$i, -$myrow['expense_period24']);
- $objPHPExcel->getActiveSheet()->setCellValue('F'.$i, -$myrow['expense_period23']);
- $objPHPExcel->getActiveSheet()->setCellValue('G'.$i, -$myrow['expense_period22']);
- $objPHPExcel->getActiveSheet()->setCellValue('H'.$i, -$myrow['expense_period21']);
- $objPHPExcel->getActiveSheet()->setCellValue('I'.$i, -$myrow['expense_period20']);
- $objPHPExcel->getActiveSheet()->setCellValue('J'.$i, -$myrow['expense_period19']);
- $objPHPExcel->getActiveSheet()->setCellValue('K'.$i, -$myrow['expense_period18']);
- $objPHPExcel->getActiveSheet()->setCellValue('L'.$i, -$myrow['expense_period17']);
- $objPHPExcel->getActiveSheet()->setCellValue('M'.$i, -$myrow['expense_period16']);
- $objPHPExcel->getActiveSheet()->setCellValue('N'.$i, -$myrow['expense_period15']);
- $objPHPExcel->getActiveSheet()->setCellValue('O'.$i, -$myrow['expense_period14']);
- $objPHPExcel->getActiveSheet()->setCellValue('P'.$i, -$myrow['expense_period13']);
- $objPHPExcel->getActiveSheet()->setCellValue('Q'.$i, -$myrow['expense_period12']);
- $objPHPExcel->getActiveSheet()->setCellValue('R'.$i, -$myrow['expense_period11']);
- $objPHPExcel->getActiveSheet()->setCellValue('S'.$i, -$myrow['expense_period10']);
- $objPHPExcel->getActiveSheet()->setCellValue('T'.$i, -$myrow['expense_period9']);
- $objPHPExcel->getActiveSheet()->setCellValue('U'.$i, -$myrow['expense_period8']);
- $objPHPExcel->getActiveSheet()->setCellValue('V'.$i, -$myrow['expense_period7']);
- $objPHPExcel->getActiveSheet()->setCellValue('W'.$i, -$myrow['expense_period6']);
- $objPHPExcel->getActiveSheet()->setCellValue('X'.$i, -$myrow['expense_period5']);
- $objPHPExcel->getActiveSheet()->setCellValue('Y'.$i, -$myrow['expense_period4']);
- $objPHPExcel->getActiveSheet()->setCellValue('Z'.$i, -$myrow['expense_period3']);
- $objPHPExcel->getActiveSheet()->setCellValue('AA'.$i, -$myrow['expense_period2']);
- $objPHPExcel->getActiveSheet()->setCellValue('AB'.$i, -$myrow['expense_period1']);
+ $objPHPExcel->getActiveSheet()->setCellValue('E'.$i, -$MyRow['expense_period24']);
+ $objPHPExcel->getActiveSheet()->setCellValue('F'.$i, -$MyRow['expense_period23']);
+ $objPHPExcel->getActiveSheet()->setCellValue('G'.$i, -$MyRow['expense_period22']);
+ $objPHPExcel->getActiveSheet()->setCellValue('H'.$i, -$MyRow['expense_period21']);
+ $objPHPExcel->getActiveSheet()->setCellValue('I'.$i, -$MyRow['expense_period20']);
+ $objPHPExcel->getActiveSheet()->setCellValue('J'.$i, -$MyRow['expense_period19']);
+ $objPHPExcel->getActiveSheet()->setCellValue('K'.$i, -$MyRow['expense_period18']);
+ $objPHPExcel->getActiveSheet()->setCellValue('L'.$i, -$MyRow['expense_period17']);
+ $objPHPExcel->getActiveSheet()->setCellValue('M'.$i, -$MyRow['expense_period16']);
+ $objPHPExcel->getActiveSheet()->setCellValue('N'.$i, -$MyRow['expense_period15']);
+ $objPHPExcel->getActiveSheet()->setCellValue('O'.$i, -$MyRow['expense_period14']);
+ $objPHPExcel->getActiveSheet()->setCellValue('P'.$i, -$MyRow['expense_period13']);
+ $objPHPExcel->getActiveSheet()->setCellValue('Q'.$i, -$MyRow['expense_period12']);
+ $objPHPExcel->getActiveSheet()->setCellValue('R'.$i, -$MyRow['expense_period11']);
+ $objPHPExcel->getActiveSheet()->setCellValue('S'.$i, -$MyRow['expense_period10']);
+ $objPHPExcel->getActiveSheet()->setCellValue('T'.$i, -$MyRow['expense_period9']);
+ $objPHPExcel->getActiveSheet()->setCellValue('U'.$i, -$MyRow['expense_period8']);
+ $objPHPExcel->getActiveSheet()->setCellValue('V'.$i, -$MyRow['expense_period7']);
+ $objPHPExcel->getActiveSheet()->setCellValue('W'.$i, -$MyRow['expense_period6']);
+ $objPHPExcel->getActiveSheet()->setCellValue('X'.$i, -$MyRow['expense_period5']);
+ $objPHPExcel->getActiveSheet()->setCellValue('Y'.$i, -$MyRow['expense_period4']);
+ $objPHPExcel->getActiveSheet()->setCellValue('Z'.$i, -$MyRow['expense_period3']);
+ $objPHPExcel->getActiveSheet()->setCellValue('AA'.$i, -$MyRow['expense_period2']);
+ $objPHPExcel->getActiveSheet()->setCellValue('AB'.$i, -$MyRow['expense_period1']);
$i++;
}
// Freeze panes
- $objPHPExcel->getActiveSheet()->freezePane('E2');
-
+ $objPHPExcel->getActiveSheet()->freezePane('E5');
+
// Auto Size columns
- foreach(range('A','AB') as $columnID) {
- $objPHPExcel->getActiveSheet()->getColumnDimension($columnID)
+ for($col = 'A'; $col !== $objPHPExcel->getActiveSheet()->getHighestDataColumn(); $col++) {
+ $objPHPExcel->getActiveSheet()
+ ->getColumnDimension($col)
->setAutoSize(true);
- }
-
+}
+
// Rename worksheet
if ($TabToShow=='All'){
$objPHPExcel->getActiveSheet()->setTitle('All Accounts');
@@ -178,7 +185,7 @@
}else{
$Title = _('Excel file for Petty Cash Expenses Analysis');
include('includes/header.php');
- prnMsg('No data to analyse');
+ prnMsg('There is no data to analyse');
include('includes/footer.php');
}
}
@@ -190,6 +197,8 @@
// Display form fields. This function is called the first time
// the page is called.
$Title = _('Excel file for Petty Cash Expenses Analysis');
+ $ViewTopic = 'PettyCash';// Filename's id in ManualContents.php's TOC.
+ $BookMark = 'top';// Anchor's id in the manual's html document.
include('includes/header.php');
@@ -199,7 +208,7 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text">
- <img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Excel file for Petty Cash Expenses Analysis') . '" alt="" />' . ' ' . _('Excel file for Petty Cash Expenses Analysis') . '
+ <img src="' . $RootPath . '/css/' . $_SESSION['Theme'] . '/images/magnifier.png" title="' . _('Excel file for Petty Cash Expenses Analysis') . '" alt="" />' . ' ' . _('Excel file for Petty Cash Expenses Analysis') . '
</p>';
echo '<table class="selection">
@@ -207,15 +216,15 @@
<td>' . _('For Petty Cash Tabs') . ':</td>
<td><select name="Tabs">';
- $sql = "SELECT tabcode
+ $SQL = "SELECT tabcode
FROM pctabs
ORDER BY tabcode";
- $CatResult=DB_query($sql);
+ $CatResult = DB_query($SQL);
echo '<option value="All">' . _('All Tabs') . '</option>';
- while ($myrow=DB_fetch_array($CatResult)){
- echo '<option value="' . $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
+ while ($MyRow = DB_fetch_array($CatResult)){
+ echo '<option value="' . $MyRow['tabcode'] . '">' . $MyRow['tabcode'] . '</option>';
}
echo '</select>
</td>
@@ -235,12 +244,12 @@
} // End of function display()
-function beginning_of_month($date){
- $date2 = explode("-",$date);
- $m = $date2[1];
- $y = $date2[0];
- $first_of_month = $y . '-' . $m . '-01';
- return $first_of_month;
+function beginning_of_month($Date){
+ $Date2 = explode("-",$Date);
+ $M = $Date2[1];
+ $Y = $Date2[0];
+ $FirstOfMonth = $Y . '-' . $M . '-01';
+ return $FirstOfMonth;
}
?>
\ No newline at end of file
Modified: trunk/PcAssignCashTabToTab.php
===================================================================
--- trunk/PcAssignCashTabToTab.php 2017-09-08 09:40:28 UTC (rev 7827)
+++ trunk/PcAssignCashTabToTab.php 2017-09-08 09:45:40 UTC (rev 7828)
@@ -1,7 +1,7 @@
<?php
include('includes/session.php');
-$Title = _('Assignment of Cash From Tab To Tab');
+$Title = _('Assignment of Cash from Tab to Tab');
/* webERP manual links before header.php */
$ViewTopic= 'PettyCash';
$BookMark = 'CashAssignment';
@@ -13,6 +13,10 @@
$SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
}
+if (isset($_POST['SelectedTabsTo'])){
+ $SelectedTabsTo = mb_strtoupper($_POST['SelectedTabsTo']);
+}
+
if (isset($_POST['Days'])){
$Days = $_POST['Days'];
} elseif (isset($_GET['Days'])){
@@ -28,30 +32,30 @@
}
if (isset($_POST['Process'])) {
- if ($SelectedTabs=='') {
- prnMsg(_('You Must First Select a Petty Cash Tab To Assign Cash'),'error');
+ if ($SelectedTabs == '') {
+ prnMsg(_('You must first select a petty cash tab to assign cash'),'error');
unset($SelectedTabs);
}
- if ($SelectedTabs == mb_strtoupper($_POST['SelectedTabsTo'])) {
- prnMsg(_('The Tab selected From should not be the same as the selected To'),'error');
+ if ($SelectedTabs == $SelectedTabsTo) {
+ prnMsg(_('The tab selected FROM should not be the same as the selected TO'),'error');
unset($SelectedTabs);
- unset($_POST['SelectedTabsTo']);
+ unset($SelectedTabsTo);
unset($_POST['Process']);
}
//to ensure currency is the same
$CurrSQL = "SELECT currency
FROM pctabs
- WHERE tabcode IN ('" . $SelectedTabs . "','" . $_POST['SelectedTabsTo'] . "')";
+ WHERE tabcode IN ('" . $SelectedTabs . "','" . $SelectedTabsTo . "')";
$CurrResult = DB_query($CurrSQL);
- if (DB_num_rows($CurrResult)>0) {
+ if (DB_num_rows($CurrResult) > 0) {
$Currency = '';
while ($CurrRow = DB_fetch_array($CurrResult)) {
if ($Currency === '') {
$Currency = $CurrRow['currency'];
} elseif ($Currency != $CurrRow['currency']) {
- prnMsg (_('The currency transferred from shoud be the same with the transferred to'),'error');
+ prnMsg (_('The currency of the tab transferred from should be the same as the tab being transferred to'),'error');
unset($SelectedTabs);
- unset($_POST['SelectedTabsTo']);
+ unset($SelectedTabsTo);
unset($_POST['Process']);
}
}
@@ -61,10 +65,10 @@
if (isset($_POST['Go'])) {
$InputError = 0;
- if ($Days<=0) {
+ if ($Days <= 0) {
$InputError = 1;
prnMsg(_('The number of days must be a positive number'),'error');
- $Days=30;
+ $Days = 30;
}
}
@@ -72,39 +76,39 @@
//initialise no input errors assumed initially before we test
$InputError = 0;
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $Title. '</p>';
+ echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $_SESSION['Theme'] . '/images/money_add.png" title="' .
+ _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
/* actions to take once the user has clicked the submit button
ie the page has called itself with some user input */
- $i=1;
+ $i = 1;
- if ($_POST['Amount']==0) {
+ if ($_POST['Amount'] == 0) {
$InputError = 1;
prnMsg('<br />' . _('The Amount must be input'),'error');
}
- $sqlLimit = "SELECT tablimit,tabcode
+ $SQLLimit = "SELECT tablimit,tabcode
FROM pctabs
- WHERE tabcode IN ('" . $SelectedTabs . "','" . $_POST['SelectedTabsTo'] . "')";
+ WHERE tabcode IN ('" . $SelectedTabs . "','" . $SelectedTabsTo . "')";
- $ResultLimit = DB_query($sqlLimit,$db);
- while ($LimitRow=DB_fetch_array($ResultLimit)){
+ $ResultLimit = DB_query($SQLLimit,$db);
+ while ($LimitRow = DB_fetch_array($ResultLimit)){
if ($LimitRow['tabcode'] == $SelectedTabs) {
- if (($_POST['CurrentAmount']+$_POST['Amount'])>$LimitRow['tablimit']){
+ if (($_POST['CurrentAmount'] + $_POST['Amount']) > $LimitRow['tablimit']){
$InputError = 1;
prnMsg(_('The balance after this assignment would be greater than the specified limit for this PC tab') . ' ' . $LimitRow[1],'error');
}
- } elseif ($_POST['SelectedTabsToAmt'] - $_POST['Amount']>$LimitRow['tablimit']) {
+ } elseif ($_POST['SelectedTabsToAmt'] - $_POST['Amount'] > $LimitRow['tablimit']) {
$InputError = 1;
prnMsg(_('The balance after this assignment would be greater than the specified limit for this PC tab') . ' ' . $LimitRow[1],'error');
}
}
- if ($InputError !=1 ) {
- // Add these 2 new record on submit
- $sql = "INSERT INTO pcashdetails
+ if ($InputError != 1) {
+ // Add these 2 new records on submit
+ $SQL = "INSERT INTO pcashdetails
(counterindex,
tabcode,
date,
@@ -116,7 +120,7 @@
receipt)
VALUES (NULL,
'" . $_POST['SelectedTabs'] . "',
- '".FormatDateForSQL($_POST['Date'])."',
+ '" . FormatDateForSQL($_POST['Date']) . "',
'ASSIGNCASH',
'" . filter_number_format($_POST['Amount']) . "',
'0000-00-00',
@@ -125,7 +129,7 @@
'" . $_POST['Receipt'] . "'
),
(NULL,
- '" . $_POST['SelectedTabsTo'] . "',
+ '" . $SelectedTabsTo . "',
'" . FormatDateForSQL($_POST['Date']) . "',
'ASSIGNCASH',
'" . filter_number_format(-$_POST['Amount']) . "',
@@ -133,12 +137,12 @@
'0',
'" . $_POST['Notes'] . "',
'" . $_POST['Receipt'] . "')";
- $msg = _('Assignment of cash from PC Tab ') . ' ' . $_POST['SelectedTabs'] . ' ' . _('to') . $_POST['SelectedTabsTo'] . ' ' . _('has been created');
+ $msg = _('Assignment of cash from PC Tab ') . ' ' . $SelectedTabs . ' ' . _('to ') . $SelectedTabsTo . ' ' . _('has been created');
}
- if ( $InputError !=1) {
+ if ( $InputError != 1) {
//run the SQL from either of the above possibilites
- $result = DB_query($sql,$db);
+ $Result = DB_query($SQL,$db);
prnMsg($msg,'success');
unset($_POST['SelectedExpense']);
unset($_POST['Amount']);
@@ -152,8 +156,8 @@
if (!isset($SelectedTabs)){
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $Title. '</p>';
+ echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $_SESSION['Theme'] . '/images/money_add.png" title="' .
+ _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<div>';
@@ -161,39 +165,39 @@
$SQL = "SELECT tabcode
FROM pctabs
- WHERE assigner='" . $_SESSION['UserID'] . "'
+ WHERE assigner = '" . $_SESSION['UserID'] . "'
ORDER BY tabcode";
- $result = DB_query($SQL,$db);
+ $Result = DB_query($SQL,$db);
echo '<br /><table class="selection">'; //Main table
- echo '<tr><td>' . _('Petty Cash Tab To Assign Cash From') . ':</td>
+ echo '<tr><td>' . _('Petty cash tab to assign cash from') . ':</td>
<td><select name="SelectedTabs">';
- while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectTabs']) and $myrow['tabcode']==$_POST['SelectTabs']) {
+ while ($MyRow = DB_fetch_array($Result)) {
+ if (isset($_POST['SelectTabs']) AND $MyRow['tabcode'] == $_POST['SelectTabs']) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
}
- echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
+ echo $MyRow['tabcode'] . '">' . $MyRow['tabcode'] . '</option>';
}
echo '</select></td></tr>';
- echo '<tr><td>' . _('Petty Cash Tab To Assign Cash To') . ':</td>
+ echo '<tr><td>' . _('Petty cash tab to assign cash to') . ':</td>
<td><select name="SelectedTabsTo">';
- DB_data_seek($result,0);
- while ($myrow = DB_fetch_array($result)) {
- if (isset($_POST['SelectTabsTo']) AND $myrow['tabcode'] == $_POST['SelectTabs']) {
+ DB_data_seek($Result,0);
+ while ($MyRow = DB_fetch_array($Result)) {
+ if (isset($_POST['SelectTabsTo']) AND $MyRow['tabcode'] == $_POST['SelectTabs']) {
echo '<option selected="selected" value="';
} else {
echo '<option value="';
}
- echo $myrow['tabcode'] . '">' . $myrow['tabcode'] . '</option>';
+ echo $MyRow['tabcode'] . '">' . $MyRow['tabcode'] . '</option>';
}
echo '</select></td></tr>';
echo '</table>'; // close main table
- DB_free_result($result);
+ DB_free_result($Result);
echo '<br />
<div class="centre">
@@ -208,13 +212,22 @@
if (isset($_POST['Process']) OR isset($SelectedTabs)) {
if (!isset($_POST['submit'])) {
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/money_add.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $Title. '</p>';
+ echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $_SESSION['Theme'] . '/images/money_add.png" title="' .
+ _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
}
- echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Select another tab') . '</a></div>';
-
-
-
+ echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Select another pair of tabs') . '</a></div>';
+
+ echo '<br /><table class="selection">';
+ echo ' <tr>
+ <td>' . _('Petty cash tab to assign cash from') . ':</td>
+ <td>' . $SelectedTabs . '</td>
+ </tr>
+ <tr>
+ <td>' . _('Petty cash tab to assign cash to') . ':</td>
+ <td>' . $SelectedTabsTo . '</td>
+ </tr>';
+ echo '</table>';
+
if (! isset($_GET['edit']) OR isset ($_POST['GO'])){
if (isset($_POST['Cancel'])) {
@@ -225,23 +238,33 @@
}
if(!isset ($Days)){
- $Days=30;
+ $Days = 30;
}
/* Retrieve decimal places to display */
- $SqlDecimalPlaces="SELECT decimalplaces
+ $SQLDecimalPlaces = "SELECT decimalplaces
FROM currencies,pctabs
WHERE currencies.currabrev = pctabs.currency
- AND tabcode='" . $SelectedTabs . "'";
- $result = DB_query($SqlDecimalPlaces,$db);
- $myrow=DB_fetch_array($result);
- $CurrDecimalPlaces = $myrow['decimalplaces'];
+ AND tabcode = '" . $SelectedTabs . "'";
+ $Result = DB_query($SQLDecimalPlaces,$db);
+ $MyRow = DB_fetch_array($Result);
+ $CurrDecimalPlaces = $MyRow['decimalplaces'];
- $sql = "SELECT * FROM pcashdetails
+ $SQL = "SELECT counterindex,
+ tabcode,
+ tag,
+ date,
+ codeexpense,
+ amount,
+ authorized,
+ posted,
+ notes,
+ receipt
+ FROM pcashdetails
WHERE tabcode='" . $SelectedTabs . "'
- AND date >=DATE_SUB(CURDATE(), INTERVAL " . $Days . " DAY)
+ AND date >= DATE_SUB(CURDATE(), INTERVAL " . $Days . " DAY)
ORDER BY date, counterindex ASC";
- $result = DB_query($sql,$db);
+ $Result = DB_query($SQL,$db);
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
<div>
@@ -248,7 +271,7 @@
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
<tr>
- <th colspan="8">' . _('Detail Of PC Tab Movements For Last') .':
+ <th colspan="8">' . _('Detail of Tab Movements For Last') .':
<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />
<input type="text" class="number" name="Days" value="' . $Days . '" maxlength="3" size="4" /> ' . _('Days') . '
<input type="submit" name="Go" value="' . _('Go') . '" /></th>
@@ -257,63 +280,70 @@
<th>' . _('Date') . '</th>
<th>' . _('Expense Code') . '</th>
<th>' . _('Amount') . '</th>
- <th>' . _('Authorised') . '</th>
<th>' . _('Notes') . '</th>
<th>' . _('Receipt') . '</th>
+ <th>' . _('Date Authorised') . '</th>
</tr>';
- $k=0; //row colour counter
+ $k = 0; //row colour counter
- while ($myrow = DB_fetch_array($result)) {
- if ($k==1){
+ while ($MyRow = DB_fetch_array($Result)) {
+ if ($k == 1){
echo '<tr class="EvenTableRows">';
- $k=0;
+ $k = 0;
} else {
echo '<tr class="OddTableRows">';
- $k=1;
+ $k = 1;
}
- $sqldes="SELECT description
+ $SQLDes="SELECT description
FROM pcexpenses
- WHERE codeexpense='". $myrow['3'] . "'";
+ WHERE codeexpense='" . $MyRow['codeexpense'] . "'";
- $ResultDes = DB_query($sqldes,$db);
- $Description=DB_fetch_array($ResultDes);
-
- if (!isset($Description['0'])){
- $Description['0']='ASSIGNCASH';
+ $ResultDes = DB_query($SQLDes,$db);
+ $Description = DB_fetch_array($ResultDes);
+ if (!isset($Description[0])) {
+ $ExpenseCodeDes = 'ASSIGNCASH';
+ } else {
+ $ExpenseCodeDes = $MyRow['codeexpense'] . ' - ' . $Description[0];
}
+
+ if ($MyRow['authorized'] == '0000-00-00') {
+ $AuthorisedDate = _('Unauthorised');
+ } else {
+ $AuthorisedDate = ConvertSQLDate($MyRow['authorized']);
+ }
- if (($myrow['authorized'] == '0000-00-00') and ($Description['0'] == 'ASSIGNCASH')){
+ if (($MyRow['authorized'] == '0000-00-00') AND ($Description['0'] == 'ASSIGNCASH')){
// only cash assignations NOT authorized can be modified or deleted
- echo '<td>' . ConvertSQLDate($myrow['date']) . '</td>
- <td>' . $Description['0'] . '</td>
- <td class="number">' . locale_number_format($myrow['amount'],$CurrDecimalPlaces) . '</td>
- <td>' . ConvertSQLDate($myrow['authorized']) . '</td>
- <td>' . $myrow['notes'] . '</td>
- <td>' . $myrow['receipt'] . '</td>
+ echo '<td>' . ConvertSQLDate($MyRow['date']) . '</td>
+ <td>', $ExpenseCodeDes, '</td>
+ <td class="number">' . locale_number_format($MyRow['amount'],$CurrDecimalPlaces) . '</td>
+ <td>' . $MyRow['notes'] . '</td>
+ <td>' . $MyRow['receipt'] . '</td>
+ <td>' . $AuthorisedDate . '</td>
</tr>';
}else{
- echo '<td>' . ConvertSQLDate($myrow['date']) . '</td>
- <td>' . $Description['0'] . '</td>
- <td class="number">' . locale_number_format($myrow['amount'],$CurrDecimalPlaces) . '</td>
- <td>' . ConvertSQLDate($myrow['authorized']) . '</td>
- <td>' . $myrow['notes'] . '</td>
- <td>' . $myrow['receipt'] . '</td>
+ echo '<td>' . ConvertSQLDate($MyRow['date']) . '</td>
+ <td>', $ExpenseCodeDes, '</td>
+ <td class="number">' . locale_number_format($MyRow['amount'],$CurrDecimalPlaces) . '</td>
+ <td>' . $MyRow['notes'] . '</td>
+ <td>' . $MyRow['receipt'] . '</td>
+ <td>' . $AuthorisedDate . '</td>
</tr>';
}
}
//END WHILE LIST LOOP
- $sqlamount="SELECT sum(amount) as amt,
+ $SQLAmount="SELECT sum(amount) as amt,
tabcode
FROM pcashdetails
- WHERE tabcode IN ('".$SelectedTabs."','" . $_POST['SelectedTabsTo'] . "')
+ WHERE tabcode IN ('" . $SelectedTabs ...
[truncated message content] |
|
From: <tu...@us...> - 2017-09-08 17:58:42
|
Revision: 7829
http://sourceforge.net/p/web-erp/reponame/7829
Author: turbopt
Date: 2017-09-08 17:58:40 +0000 (Fri, 08 Sep 2017)
Log Message:
-----------
Z_ChangeLocationCode.php: Add missing locationusers table update, reported by Paul Becker in forums.
Modified Paths:
--------------
trunk/Z_ChangeLocationCode.php
trunk/doc/Change.log
Modified: trunk/Z_ChangeLocationCode.php
===================================================================
--- trunk/Z_ChangeLocationCode.php 2017-09-08 09:45:40 UTC (rev 7828)
+++ trunk/Z_ChangeLocationCode.php 2017-09-08 17:58:40 UTC (rev 7829)
@@ -138,6 +138,12 @@
$result = DB_query($sql,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
+ echo '<br />' . _('Changing the locationusers table records');
+ $sql = "UPDATE locationusers SET loccode='" . $_POST['NewLocationID'] . "' WHERE loccode='" . $_POST['OldLocationID'] . "'";
+ $ErrMsg = _('The SQL to update users records failed');
+ $result = DB_query($sql,$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');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-09-08 09:45:40 UTC (rev 7828)
+++ trunk/doc/Change.log 2017-09-08 17:58:40 UTC (rev 7829)
@@ -1,5 +1,6 @@
webERP Change Log
+8/9/17 PaulT: Z_ChangeLocationCode.php: Add missing locationusers table update, reported by Paul Becker in forums.
8/9/17 Phil: Fix portrait invoice email now has narrative of correct invocie number!
8/9/17 Andrew Couling: Petty cash improvements to tax taken from Tim's work
6/9/17 RChacon: Fix currency translation in PO_AuthorisationLevels.php.
|
|
From: <afc...@us...> - 2017-09-08 18:27:47
|
Revision: 7830
http://sourceforge.net/p/web-erp/reponame/7830
Author: afcouling
Date: 2017-09-08 18:27:45 +0000 (Fri, 08 Sep 2017)
Log Message:
-----------
Andrew Couling work on Petty cash module tax - taken from Tim fork (SQL correction & missing PcAuthorizeCash.php)
Modified Paths:
--------------
trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
Added Paths:
-----------
trunk/PcAuthorizeCash.php
Added: trunk/PcAuthorizeCash.php
===================================================================
--- trunk/PcAuthorizeCash.php (rev 0)
+++ trunk/PcAuthorizeCash.php 2017-09-08 18:27:45 UTC (rev 7830)
@@ -0,0 +1,308 @@
+<?php
+include('includes/session.php');
+$Title = _('Authorisation of Assigned Cash');
+/* webERP manual links before header.php */
+$ViewTopic = 'PettyCash';
+$BookMark = 'AuthorizeCash';
+include('includes/header.php');
+include('includes/SQL_CommonFunctions.inc');
+if (isset($_POST['SelectedTabs'])) {
+ $SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
+} elseif (isset($_GET['SelectedTabs'])) {
+ $SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
+}
+if (isset($_POST['SelectedIndex'])) {
+ $SelectedIndex = $_POST['SelectedIndex'];
+} elseif (isset($_GET['SelectedIndex'])) {
+ $SelectedIndex = $_GET['SelectedIndex'];
+}
+if (isset($_POST['Days'])) {
+ $Days = filter_number_format($_POST['Days']);
+} elseif (isset($_GET['Days'])) {
+ $Days = filter_number_format($_GET['Days']);
+}
+if (isset($_POST['Process'])) {
+ if ($SelectedTabs == '') {
+ prnMsg(_('You must first select a petty cash tab to authorise'), 'error');
+ unset($SelectedTabs);
+ }
+}
+if (isset($_POST['Go'])) {
+ if ($Days <= 0) {
+ prnMsg(_('The number of days must be a positive number'), 'error');
+ $Days = 30;
+ }
+}
+
+echo '<p class="page_title_text">
+ <img src="', $RootPath, '/css/', $_SESSION['Theme'], '/images/magnifier.png" title="', _('Petty Cash'), '" alt="" />', _('Authorisation of Assigned Cash '), '
+ </p>';
+
+if (isset($SelectedTabs)) {
+echo '<br /><table class="selection">';
+echo ' <tr>
+ <td>' . _('Petty Cash Tab') . ':</td>
+ <td>' . $SelectedTabs . '</td>
+ </tr>';
+echo '</table>';
+}
+
+if (isset($_POST['Submit']) or isset($_POST['update']) or isset($SelectedTabs) or isset($_POST['GO'])) {
+ echo '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '">';
+ echo '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
+ if (!isset($Days)) {
+ $Days = 30;
+ }
+ echo '<input type="hidden" name="SelectedTabs" value="', $SelectedTabs, '" />';
+ echo '<table class="selection">
+ <tr>
+ <th colspan="6">', _('Detail of Tab Movements For Last '), ':
+ <input type="text" class="number" name="Days" value="', $Days, '" maxlength="3" size="4" />', _('Days'), '
+ <input type="submit" name="Go" value="', _('Go'), '" />
+ </th>
+ </tr>';
+ $SQL = "SELECT pcashdetails.counterindex,
+ pcashdetails.tabcode,
+ pcashdetails.date,
+ pcashdetails.codeexpense,
+ pcashdetails.amount,
+ pcashdetails.authorized,
+ pcashdetails.posted,
+ pcashdetails.notes,
+ pcashdetails.receipt,
+ pctabs.glaccountassignment,
+ pctabs.glaccountpcash,
+ pctabs.usercode,
+ pctabs.currency,
+ currencies.rate,
+ currencies.decimalplaces
+ FROM pcashdetails, pctabs, currencies
+ WHERE pcashdetails.tabcode = pctabs.tabcode
+ AND pctabs.currency = currencies.currabrev
+ AND pcashdetails.tabcode = '" . $SelectedTabs . "'
+ AND pcashdetails.date >= DATE_SUB(CURDATE(), INTERVAL '" . $Days . "' DAY)
+ AND pcashdetails.codeexpense='ASSIGNCASH'
+ ORDER BY pcashdetails.date, pcashdetails.counterindex ASC";
+ $Result = DB_query($SQL);
+ echo '<tr>
+ <th>', _('Date'), '</th>
+ <th>', _('Expense Code'), '</th>
+ <th>', _('Amount'), '</th>
+ <th>', _('Notes'), '</th>
+ <th>', _('Receipt'), '</th>
+ <th>', _('Date Authorised'), '</th>
+ </tr>';
+ $k = 0; //row colour counter
+ $CurrDecimalPlaces = 2;
+ while ($MyRow = DB_fetch_array($Result)) {
+ $CurrDecimalPlaces = $MyRow['decimalplaces'];
+ //update database if update pressed
+ if (isset($_POST['Submit']) and $_POST['Submit'] == _('Update') and isset($_POST[$MyRow['counterindex']])) {
+ $PeriodNo = GetPeriod(ConvertSQLDate($MyRow['date']), $db);
+ if ($MyRow['rate'] == 1) { // functional currency
+ $Amount = $MyRow['amount'];
+ } else { // other currencies
+ $Amount = $MyRow['amount'] / $MyRow['rate'];
+ }
+ if ($MyRow['codeexpense'] == 'ASSIGNCASH') {
+ $type = 2;
+ $AccountFrom = $MyRow['glaccountassignment'];
+ $AccountTo = $MyRow['glaccountpcash'];
+ $TagTo = 0;
+ } else {
+ $type = 1;
+ $Amount = -$Amount;
+ $AccountFrom = $MyRow['glaccountpcash'];
+ $SQLAccExp = "SELECT glaccount,
+ tag
+ FROM pcexpenses
+ WHERE codeexpense = '" . $MyRow['codeexpense'] . "'";
+ $ResultAccExp = DB_query($SQLAccExp);
+ $MyRowAccExp = DB_fetch_array($ResultAccExp);
+ $AccountTo = $MyRowAccExp['glaccount'];
+ $TagTo = $MyRowAccExp['tag'];
+ }
+ //get typeno
+ $typeno = GetNextTransNo($type,$db);
+ //build narrative
+ $Narrative = _('PettyCash') . ' - ' . $MyRow['tabcode'] . ' - ' . $MyRow['codeexpense'] . ' - ' . DB_escape_string($MyRow['notes']) . ' - ' . $MyRow['receipt'];
+ //insert to gltrans
+ DB_Txn_Begin();
+ $SQLFrom = "INSERT INTO `gltrans` (`counterindex`,
+ `type`,
+ `typeno`,
+ `chequeno`,
+ `trandate`,
+ `periodno`,
+ `account`,
+ `narrative`,
+ `amount`,
+ `posted`,
+ `jobref`,
+ `tag`)
+ VALUES (NULL,
+ '" . $type . "',
+ '" . $typeno . "',
+ 0,
+ '" . $MyRow['date'] . "',
+ '" . $PeriodNo . "',
+ '" . $AccountFrom . "',
+ '" . $Narrative . "',
+ '" . -$Amount . "',
+ 0,
+ '',
+ '" . $TagTo ."')";
+ $ResultFrom = DB_Query($SQLFrom, '', '', true);
+ $SQLTo = "INSERT INTO `gltrans` (`counterindex`,
+ `type`,
+ `typeno`,
+ `chequeno`,
+ `trandate`,
+ `periodno`,
+ `account`,
+ `narrative`,
+ `amount`,
+ `posted`,
+ `jobref`,
+ `tag`
+ ) VALUES (NULL,
+ '" . $type . "',
+ '" . $typeno . "',
+ 0,
+ '" . $MyRow['date'] . "',
+ '" . $PeriodNo . "',
+ '" . $AccountTo . "',
+ '" . $Narrative . "',
+ '" . $Amount . "',
+ 0,
+ '',
+ '" . $TagTo ."'
+ )";
+ $ResultTo = DB_Query($SQLTo, '', '', true);
+ if ($MyRow['codeexpense'] == 'ASSIGNCASH') {
+ // if it's a cash assignation we need to updated banktrans table as well.
+ $ReceiptTransNo = GetNextTransNo(2, $db);
+ $SQLBank = "INSERT INTO banktrans (transno,
+ type,
+ bankact,
+ ref,
+ exrate,
+ functionalexrate,
+ transdate,
+ banktranstype,
+ amount,
+ currcode
+ ) VALUES (
+ '" . $ReceiptTransNo . "',
+ 1,
+ '" . $AccountFrom . "',
+ '" . $Narrative . "',
+ 1,
+ '" . $MyRow['rate'] . "',
+ '" . $MyRow['date'] . "',
+ 'Cash',
+ '" . -$MyRow['amount'] . "',
+ '" . $MyRow['currency'] . "'
+ )";
+ $ErrMsg = _('Cannot insert a bank transaction because');
+ $DbgMsg = _('Cannot insert a bank transaction with the SQL');
+ $ResultBank = DB_query($SQLBank, $ErrMsg, $DbgMsg, true);
+ }
+ $SQL = "UPDATE pcashdetails
+ SET authorized = CURRENT_DATE,
+ posted = 1
+ WHERE counterindex = '" . $MyRow['counterindex'] . "'";
+ $Resultupdate = DB_query($SQL, '', '', true);
+ DB_Txn_Commit();
+ prnMsg(_('Assigned cash has been correctly authorised'), 'success');
+ unset($_POST['Submit']);
+ unset($SelectedTabs);
+ unset($_POST['SelectedTabs']);
+ }
+ if ($k == 1) {
+ echo '<tr class="EvenTableRows">';
+ $k = 0;
+ } else {
+ echo '<tr class="OddTableRows">';
+ $k = 1;
+ }
+
+ /*
+ if ($MyRow['posted'] == 0) {
+ $Posted = _('No');
+ } else {
+ $Posted = _('Yes');
+ }
+ */
+
+ echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
+ <td>', $MyRow['codeexpense'], '</td>
+ <td class="number">', locale_number_format($MyRow['amount'], $CurrDecimalPlaces), '</td>
+ <td>', $MyRow['notes'], '</td>
+ <td>', $MyRow['receipt'], '</td>';
+ if (isset($_POST[$MyRow['counterindex']])) {
+ echo '<td>' . ConvertSQLDate(Date('Y-m-d'));
+ } else {
+ //compare against raw SQL format date, then convert for display.
+ if (($MyRow['authorized'] != '0000-00-00')) {
+ echo '<td>', ConvertSQLDate($MyRow['authorized']);
+ } else {
+ echo '<td align="right"><input type="checkbox" name="', $MyRow['counterindex'], '" />';
+ }
+ }
+ echo '<input type="hidden" name="SelectedIndex" value="', $MyRow['counterindex'], '" />
+ </td>
+ </tr>';
+ } //end of looping
+ $SQLamount = "SELECT sum(amount)
+ FROM pcashdetails
+ WHERE tabcode='" . $SelectedTabs . "'
+ AND codeexpense='ASSIGNCASH'";
+ $ResultAmount = DB_query($SQLamount);
+ $Amount = DB_fetch_array($ResultAmount);
+ if (!isset($Amount['0'])) {
+ $Amount['0'] = 0;
+ }
+ echo '<tr>
+ <td colspan="2" class="number">', _('Current balance'), ':</td>
+ <td class="number">', locale_number_format($Amount['0'], $CurrDecimalPlaces), '</td>
+ </tr>';
+ // Do the postings
+ include('includes/GLPostings.inc');
+ echo '</table>';
+ echo '<div class="centre">
+ <input type="submit" name="Submit" value="', _('Update'), '" />
+ </div>
+ </form>';
+} else {
+ /*The option to submit was not hit so display form */
+ echo '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '">';
+ echo '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
+ $SQL = "SELECT tabcode
+ FROM pctabs
+ WHERE authorizer='" . $_SESSION['UserID'] . "'";
+ $Result = DB_query($SQL);
+ echo '<table class="selection">
+ <tr>
+ <td>', _('Authorise cash assigned to petty cash tab'), ':</td>
+ <td><select required="required" name="SelectedTabs">';
+ while ($MyRow = DB_fetch_array($Result)) {
+ if (isset($_POST['SelectTabs']) and $MyRow['tabcode'] == $_POST['SelectTabs']) {
+ echo '<option selected="selected" value="', $MyRow['tabcode'], '">', $MyRow['tabcode'], '</option>';
+ } else {
+ echo '<option value="', $MyRow['tabcode'], '">', $MyRow['tabcode'], '</option>';
+ }
+ } //end while loop get type of tab
+ echo '</select>
+ </td>
+ </tr>';
+ echo '</table>'; // close main table
+ echo '<div class="centre">
+ <input type="submit" name="Process" value="', _('Accept'), '" />
+ <input type="submit" name="Cancel" value="', _('Cancel'), '" />
+ </div>';
+ echo '</form>';
+}
+/*end of else not submit */
+include('includes/footer.php');
+?>
\ No newline at end of file
Modified: trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
===================================================================
--- trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-09-08 17:58:40 UTC (rev 7829)
+++ trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-09-08 18:27:45 UTC (rev 7830)
@@ -11,4 +11,15 @@
UPDATE pctabs SET authorizerexpenses=authorizer
ALTER TABLE pcashdetails ADD COLUMN tag INT(11) NOT NULL DEFAULT 0 AFTER tabcode;
INSERT INTO `scripts` (`script` ,`pagesecurity` ,`description`) VALUES ('PcAuthorizeCash.php', '6', 'Authorisation of assigned cash');
-
+CREATE TABLE `pcashdetailtaxes` (
+ `counterindex` INT(20) NOT NULL AUTO_INCREMENT,
+ `pccashdetail` INT(20) NOT NULL DEFAULT 0,
+ `calculationorder` TINYINT(4) NOT NULL DEFAULT 0,
+ `description` VARCHAR(40) NOT NULL DEFAULT '',
+ `taxauthid` TINYINT(4) NOT NULL DEFAULT '0',
+ `purchtaxglaccount` VARCHAR(20) NOT NULL DEFAULT '',
+ `taxontax` TINYINT(4) NOT NULL DEFAULT 0,
+ `taxrate` DOUBLE NOT NULL DEFAULT 0.0,
+ `amount` DOUBLE NOT NULL DEFAULT 0.0,
+ PRIMARY KEY(counterindex)
+);
|
|
From: <afc...@us...> - 2017-09-11 14:55:46
|
Revision: 7832
http://sourceforge.net/p/web-erp/reponame/7832
Author: afcouling
Date: 2017-09-11 14:55:43 +0000 (Mon, 11 Sep 2017)
Log Message:
-----------
11/9/17 Andy Couling: Code consistency in PO_Items.php. http://www.weberp.org/forum/showthread.php?tid=4355
Modified Paths:
--------------
trunk/PO_Items.php
trunk/doc/Change.log
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2017-09-10 22:13:53 UTC (rev 7831)
+++ trunk/PO_Items.php 2017-09-11 14:55:43 UTC (rev 7832)
@@ -872,7 +872,7 @@
AND purchdata.supplierno='" . $_SESSION['PO'.$identifier]->SupplierID . "'
AND stockmaster.description " . LIKE . " '" . $SearchString ."'
GROUP BY stockmaster.stockid
- ORDER BY stockmaster.stockid";
+ ORDER BY stockmaster.stockid ";
} else { // not just supplier purchdata items
$sql = "SELECT stockmaster.stockid,
stockmaster.description,
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-09-10 22:13:53 UTC (rev 7831)
+++ trunk/doc/Change.log 2017-09-11 14:55:43 UTC (rev 7832)
@@ -1,5 +1,6 @@
webERP Change Log
+11/9/17 Andy Couling: Code consistency in PO_Items.php. http://www.weberp.org/forum/showthread.php?tid=4355
8/9/17 PaulT: Z_ChangeLocationCode.php: Add missing locationusers table update, reported by Paul Becker in forums.
8/9/17 Phil: Fix portrait invoice email now has narrative of correct invocie number!
8/9/17 Andrew Couling: Petty cash improvements to tax taken from Tim's work
|
|
From: <afc...@us...> - 2017-09-11 15:50:45
|
Revision: 7833
http://sourceforge.net/p/web-erp/reponame/7833
Author: afcouling
Date: 2017-09-11 15:50:42 +0000 (Mon, 11 Sep 2017)
Log Message:
-----------
Andy Couling: Fixed the onclick delete confirmation box call in ContractBOM.php, was 'MakeConfirm'.
Modified Paths:
--------------
trunk/ContractBOM.php
trunk/doc/Change.log
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2017-09-11 14:55:43 UTC (rev 7832)
+++ trunk/ContractBOM.php 2017-09-11 15:50:42 UTC (rev 7833)
@@ -268,7 +268,7 @@
<td>' . $ContractComponent->UOM . '</td>
<td class="number">' . locale_number_format($ContractComponent->ItemCost,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . $DisplayLineTotal . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '&Delete=' . $ContractComponent->ComponentID . '" onclick="return MakeConfirm(\'' . _('Are you sure you wish to delete this item from the contract BOM?') . ',' . _('Confirm Deletion') . '\');">' . _('Delete') . '</a></td></tr>';
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier. '&Delete=' . $ContractComponent->ComponentID . '" onclick=\'return confirm("' . _('Are you sure you wish to delete this item from the contract BOM?') . '");\'>' . _('Delete') . '</a></td></tr>';
$TotalCost += $LineTotal;
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-09-11 14:55:43 UTC (rev 7832)
+++ trunk/doc/Change.log 2017-09-11 15:50:42 UTC (rev 7833)
@@ -1,5 +1,6 @@
webERP Change Log
+11/9/17 Andy Couling: Fixed the onclick delete confirmation box call in ContractBOM.php, was 'MakeConfirm'.
11/9/17 Andy Couling: Code consistency in PO_Items.php. http://www.weberp.org/forum/showthread.php?tid=4355
8/9/17 PaulT: Z_ChangeLocationCode.php: Add missing locationusers table update, reported by Paul Becker in forums.
8/9/17 Phil: Fix portrait invoice email now has narrative of correct invocie number!
|
|
From: <dai...@us...> - 2017-09-17 01:31:59
|
Revision: 7834
http://sourceforge.net/p/web-erp/reponame/7834
Author: daintree
Date: 2017-09-17 01:31:57 +0000 (Sun, 17 Sep 2017)
Log Message:
-----------
VortecCPI SelectProduct image display reworked per WorkOrderEntry.php
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/doc/Change.log
Removed Paths:
-------------
trunk/PcAuthorizeCash.php
Deleted: trunk/PcAuthorizeCash.php
===================================================================
--- trunk/PcAuthorizeCash.php 2017-09-11 15:50:42 UTC (rev 7833)
+++ trunk/PcAuthorizeCash.php 2017-09-17 01:31:57 UTC (rev 7834)
@@ -1,308 +0,0 @@
-<?php
-include('includes/session.php');
-$Title = _('Authorisation of Assigned Cash');
-/* webERP manual links before header.php */
-$ViewTopic = 'PettyCash';
-$BookMark = 'AuthorizeCash';
-include('includes/header.php');
-include('includes/SQL_CommonFunctions.inc');
-if (isset($_POST['SelectedTabs'])) {
- $SelectedTabs = mb_strtoupper($_POST['SelectedTabs']);
-} elseif (isset($_GET['SelectedTabs'])) {
- $SelectedTabs = mb_strtoupper($_GET['SelectedTabs']);
-}
-if (isset($_POST['SelectedIndex'])) {
- $SelectedIndex = $_POST['SelectedIndex'];
-} elseif (isset($_GET['SelectedIndex'])) {
- $SelectedIndex = $_GET['SelectedIndex'];
-}
-if (isset($_POST['Days'])) {
- $Days = filter_number_format($_POST['Days']);
-} elseif (isset($_GET['Days'])) {
- $Days = filter_number_format($_GET['Days']);
-}
-if (isset($_POST['Process'])) {
- if ($SelectedTabs == '') {
- prnMsg(_('You must first select a petty cash tab to authorise'), 'error');
- unset($SelectedTabs);
- }
-}
-if (isset($_POST['Go'])) {
- if ($Days <= 0) {
- prnMsg(_('The number of days must be a positive number'), 'error');
- $Days = 30;
- }
-}
-
-echo '<p class="page_title_text">
- <img src="', $RootPath, '/css/', $_SESSION['Theme'], '/images/magnifier.png" title="', _('Petty Cash'), '" alt="" />', _('Authorisation of Assigned Cash '), '
- </p>';
-
-if (isset($SelectedTabs)) {
-echo '<br /><table class="selection">';
-echo ' <tr>
- <td>' . _('Petty Cash Tab') . ':</td>
- <td>' . $SelectedTabs . '</td>
- </tr>';
-echo '</table>';
-}
-
-if (isset($_POST['Submit']) or isset($_POST['update']) or isset($SelectedTabs) or isset($_POST['GO'])) {
- echo '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '">';
- echo '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
- if (!isset($Days)) {
- $Days = 30;
- }
- echo '<input type="hidden" name="SelectedTabs" value="', $SelectedTabs, '" />';
- echo '<table class="selection">
- <tr>
- <th colspan="6">', _('Detail of Tab Movements For Last '), ':
- <input type="text" class="number" name="Days" value="', $Days, '" maxlength="3" size="4" />', _('Days'), '
- <input type="submit" name="Go" value="', _('Go'), '" />
- </th>
- </tr>';
- $SQL = "SELECT pcashdetails.counterindex,
- pcashdetails.tabcode,
- pcashdetails.date,
- pcashdetails.codeexpense,
- pcashdetails.amount,
- pcashdetails.authorized,
- pcashdetails.posted,
- pcashdetails.notes,
- pcashdetails.receipt,
- pctabs.glaccountassignment,
- pctabs.glaccountpcash,
- pctabs.usercode,
- pctabs.currency,
- currencies.rate,
- currencies.decimalplaces
- FROM pcashdetails, pctabs, currencies
- WHERE pcashdetails.tabcode = pctabs.tabcode
- AND pctabs.currency = currencies.currabrev
- AND pcashdetails.tabcode = '" . $SelectedTabs . "'
- AND pcashdetails.date >= DATE_SUB(CURDATE(), INTERVAL '" . $Days . "' DAY)
- AND pcashdetails.codeexpense='ASSIGNCASH'
- ORDER BY pcashdetails.date, pcashdetails.counterindex ASC";
- $Result = DB_query($SQL);
- echo '<tr>
- <th>', _('Date'), '</th>
- <th>', _('Expense Code'), '</th>
- <th>', _('Amount'), '</th>
- <th>', _('Notes'), '</th>
- <th>', _('Receipt'), '</th>
- <th>', _('Date Authorised'), '</th>
- </tr>';
- $k = 0; //row colour counter
- $CurrDecimalPlaces = 2;
- while ($MyRow = DB_fetch_array($Result)) {
- $CurrDecimalPlaces = $MyRow['decimalplaces'];
- //update database if update pressed
- if (isset($_POST['Submit']) and $_POST['Submit'] == _('Update') and isset($_POST[$MyRow['counterindex']])) {
- $PeriodNo = GetPeriod(ConvertSQLDate($MyRow['date']), $db);
- if ($MyRow['rate'] == 1) { // functional currency
- $Amount = $MyRow['amount'];
- } else { // other currencies
- $Amount = $MyRow['amount'] / $MyRow['rate'];
- }
- if ($MyRow['codeexpense'] == 'ASSIGNCASH') {
- $type = 2;
- $AccountFrom = $MyRow['glaccountassignment'];
- $AccountTo = $MyRow['glaccountpcash'];
- $TagTo = 0;
- } else {
- $type = 1;
- $Amount = -$Amount;
- $AccountFrom = $MyRow['glaccountpcash'];
- $SQLAccExp = "SELECT glaccount,
- tag
- FROM pcexpenses
- WHERE codeexpense = '" . $MyRow['codeexpense'] . "'";
- $ResultAccExp = DB_query($SQLAccExp);
- $MyRowAccExp = DB_fetch_array($ResultAccExp);
- $AccountTo = $MyRowAccExp['glaccount'];
- $TagTo = $MyRowAccExp['tag'];
- }
- //get typeno
- $typeno = GetNextTransNo($type,$db);
- //build narrative
- $Narrative = _('PettyCash') . ' - ' . $MyRow['tabcode'] . ' - ' . $MyRow['codeexpense'] . ' - ' . DB_escape_string($MyRow['notes']) . ' - ' . $MyRow['receipt'];
- //insert to gltrans
- DB_Txn_Begin();
- $SQLFrom = "INSERT INTO `gltrans` (`counterindex`,
- `type`,
- `typeno`,
- `chequeno`,
- `trandate`,
- `periodno`,
- `account`,
- `narrative`,
- `amount`,
- `posted`,
- `jobref`,
- `tag`)
- VALUES (NULL,
- '" . $type . "',
- '" . $typeno . "',
- 0,
- '" . $MyRow['date'] . "',
- '" . $PeriodNo . "',
- '" . $AccountFrom . "',
- '" . $Narrative . "',
- '" . -$Amount . "',
- 0,
- '',
- '" . $TagTo ."')";
- $ResultFrom = DB_Query($SQLFrom, '', '', true);
- $SQLTo = "INSERT INTO `gltrans` (`counterindex`,
- `type`,
- `typeno`,
- `chequeno`,
- `trandate`,
- `periodno`,
- `account`,
- `narrative`,
- `amount`,
- `posted`,
- `jobref`,
- `tag`
- ) VALUES (NULL,
- '" . $type . "',
- '" . $typeno . "',
- 0,
- '" . $MyRow['date'] . "',
- '" . $PeriodNo . "',
- '" . $AccountTo . "',
- '" . $Narrative . "',
- '" . $Amount . "',
- 0,
- '',
- '" . $TagTo ."'
- )";
- $ResultTo = DB_Query($SQLTo, '', '', true);
- if ($MyRow['codeexpense'] == 'ASSIGNCASH') {
- // if it's a cash assignation we need to updated banktrans table as well.
- $ReceiptTransNo = GetNextTransNo(2, $db);
- $SQLBank = "INSERT INTO banktrans (transno,
- type,
- bankact,
- ref,
- exrate,
- functionalexrate,
- transdate,
- banktranstype,
- amount,
- currcode
- ) VALUES (
- '" . $ReceiptTransNo . "',
- 1,
- '" . $AccountFrom . "',
- '" . $Narrative . "',
- 1,
- '" . $MyRow['rate'] . "',
- '" . $MyRow['date'] . "',
- 'Cash',
- '" . -$MyRow['amount'] . "',
- '" . $MyRow['currency'] . "'
- )";
- $ErrMsg = _('Cannot insert a bank transaction because');
- $DbgMsg = _('Cannot insert a bank transaction with the SQL');
- $ResultBank = DB_query($SQLBank, $ErrMsg, $DbgMsg, true);
- }
- $SQL = "UPDATE pcashdetails
- SET authorized = CURRENT_DATE,
- posted = 1
- WHERE counterindex = '" . $MyRow['counterindex'] . "'";
- $Resultupdate = DB_query($SQL, '', '', true);
- DB_Txn_Commit();
- prnMsg(_('Assigned cash has been correctly authorised'), 'success');
- unset($_POST['Submit']);
- unset($SelectedTabs);
- unset($_POST['SelectedTabs']);
- }
- if ($k == 1) {
- echo '<tr class="EvenTableRows">';
- $k = 0;
- } else {
- echo '<tr class="OddTableRows">';
- $k = 1;
- }
-
- /*
- if ($MyRow['posted'] == 0) {
- $Posted = _('No');
- } else {
- $Posted = _('Yes');
- }
- */
-
- echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
- <td>', $MyRow['codeexpense'], '</td>
- <td class="number">', locale_number_format($MyRow['amount'], $CurrDecimalPlaces), '</td>
- <td>', $MyRow['notes'], '</td>
- <td>', $MyRow['receipt'], '</td>';
- if (isset($_POST[$MyRow['counterindex']])) {
- echo '<td>' . ConvertSQLDate(Date('Y-m-d'));
- } else {
- //compare against raw SQL format date, then convert for display.
- if (($MyRow['authorized'] != '0000-00-00')) {
- echo '<td>', ConvertSQLDate($MyRow['authorized']);
- } else {
- echo '<td align="right"><input type="checkbox" name="', $MyRow['counterindex'], '" />';
- }
- }
- echo '<input type="hidden" name="SelectedIndex" value="', $MyRow['counterindex'], '" />
- </td>
- </tr>';
- } //end of looping
- $SQLamount = "SELECT sum(amount)
- FROM pcashdetails
- WHERE tabcode='" . $SelectedTabs . "'
- AND codeexpense='ASSIGNCASH'";
- $ResultAmount = DB_query($SQLamount);
- $Amount = DB_fetch_array($ResultAmount);
- if (!isset($Amount['0'])) {
- $Amount['0'] = 0;
- }
- echo '<tr>
- <td colspan="2" class="number">', _('Current balance'), ':</td>
- <td class="number">', locale_number_format($Amount['0'], $CurrDecimalPlaces), '</td>
- </tr>';
- // Do the postings
- include('includes/GLPostings.inc');
- echo '</table>';
- echo '<div class="centre">
- <input type="submit" name="Submit" value="', _('Update'), '" />
- </div>
- </form>';
-} else {
- /*The option to submit was not hit so display form */
- echo '<form method="post" action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '">';
- echo '<input type="hidden" name="FormID" value="', $_SESSION['FormID'], '" />';
- $SQL = "SELECT tabcode
- FROM pctabs
- WHERE authorizer='" . $_SESSION['UserID'] . "'";
- $Result = DB_query($SQL);
- echo '<table class="selection">
- <tr>
- <td>', _('Authorise cash assigned to petty cash tab'), ':</td>
- <td><select required="required" name="SelectedTabs">';
- while ($MyRow = DB_fetch_array($Result)) {
- if (isset($_POST['SelectTabs']) and $MyRow['tabcode'] == $_POST['SelectTabs']) {
- echo '<option selected="selected" value="', $MyRow['tabcode'], '">', $MyRow['tabcode'], '</option>';
- } else {
- echo '<option value="', $MyRow['tabcode'], '">', $MyRow['tabcode'], '</option>';
- }
- } //end while loop get type of tab
- echo '</select>
- </td>
- </tr>';
- echo '</table>'; // close main table
- echo '<div class="centre">
- <input type="submit" name="Process" value="', _('Accept'), '" />
- <input type="submit" name="Cancel" value="', _('Cancel'), '" />
- </div>';
- echo '</form>';
-}
-/*end of else not submit */
-include('includes/footer.php');
-?>
\ No newline at end of file
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2017-09-11 15:50:42 UTC (rev 7833)
+++ trunk/SelectProduct.php 2017-09-17 01:31:57 UTC (rev 7834)
@@ -858,26 +858,30 @@
} else {
$ItemStatus ='';
}
- $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
- if (!empty($imagefile)){
- $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
- '&StockID='.urlencode($myrow['stockid']).
- '&text='. $myrow['stockid'] .
- '&width=100'.
- '&height=100'.
- '" alt="" />';
- }else{
- $StockImgLink = '<p>'._('No Image').'</p>';
- }
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ if(extension_loaded('gd') && function_exists('gd_info') && file_exists ($imagefile) ) {
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($myrow['stockid']).
+ '&text='. //$myrow['stockid'] .
+ '&width=100'.
+ '&height=100'.
+ '" alt="" />';
+ } else if(file_exists ($imagefile)) {
+ $StockImgLink = '<img src="' . $imagefile . '" height="100" width="100" />';
+ } else {
+ $StockImgLink = '<p>'._('No Image').'</p>';
+ }
+
echo '<td>' . $ItemStatus . '</td>
- <td><input type="submit" name="Select" value="' . $myrow['stockid'] . '" /></td>
- <td>'.$StockImgLink.'</td>
- <td title="'. $myrow['longdescription'] . '">' . $myrow['description'] . '</td>
- <td class="number">' . $qoh . '</td>
- <td>' . $myrow['units'] . '</td>
- <td><a target="_blank" href="' . $RootPath . '/StockStatus.php?StockID=' . urlencode($myrow['stockid']).'">' . _('View') . '</a></td>
- </tr>';
+ <td><input type="submit" name="Select" value="' . $myrow['stockid'] . '" /></td>
+ <td>'.$StockImgLink.'</td>
+ <td title="'. $myrow['longdescription'] . '">' . $myrow['description'] . '</td>
+ <td class="number">' . $qoh . '</td>
+ <td>' . $myrow['units'] . '</td>
+ <td><a target="_blank" href="' . $RootPath . '/StockStatus.php?StockID=' . urlencode($myrow['stockid']).'">' . _('View') . '</a></td>
+ </tr>';
/*
$j++;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-09-11 15:50:42 UTC (rev 7833)
+++ trunk/doc/Change.log 2017-09-17 01:31:57 UTC (rev 7834)
@@ -1,5 +1,6 @@
webERP Change Log
+17/9/17 VortecCPI: SelectProduct.php made image dispay code match that used in WorkOrderEntry.php
11/9/17 Andy Couling: Fixed the onclick delete confirmation box call in ContractBOM.php, was 'MakeConfirm'.
11/9/17 Andy Couling: Code consistency in PO_Items.php. http://www.weberp.org/forum/showthread.php?tid=4355
8/9/17 PaulT: Z_ChangeLocationCode.php: Add missing locationusers table update, reported by Paul Becker in forums.
|
|
From: <afc...@us...> - 2017-09-18 22:09:36
|
Revision: 7836
http://sourceforge.net/p/web-erp/reponame/7836
Author: afcouling
Date: 2017-09-18 22:09:33 +0000 (Mon, 18 Sep 2017)
Log Message:
-----------
Geocode bug fixes. http://www.weberp.org/forum/showthread.php?tid=4380
Modified Paths:
--------------
trunk/CustomerBranches.php
trunk/SelectSupplier.php
trunk/Suppliers.php
trunk/doc/Change.log
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2017-09-17 01:39:01 UTC (rev 7835)
+++ trunk/CustomerBranches.php 2017-09-18 22:09:33 UTC (rev 7836)
@@ -109,25 +109,18 @@
// check that some sane values are setup already in geocode tables, if not skip the geocoding but add the record anyway.
echo '<div class="warn">' . _('Warning - Geocode Integration is enabled, but no hosts are setup. Go to Geocode Setup') . '</div>';
} else {
- $address = $_POST['BrAddress1'] . ', ' . $_POST['BrAddress2'] . ', ' . $_POST['BrAddress3'] . ', ' . $_POST['BrAddress4'];
- $base_url = 'http://' . MAPS_HOST . '/maps/geo?output=xml&key=' . KEY;
- $request_url = $base_url . '&q=' . urlencode($address);
+ $address = urlencode($_POST['BrAddress1'] . ', ' . $_POST['BrAddress2'] . ', ' . $_POST['BrAddress3'] . ', ' . $_POST['BrAddress4']);
+ $base_url = "http://" . MAPS_HOST . "/maps/api/geocode/xml?address=";
+ $request_url = $base_url . $address . ',&sensor=true';
$xml = simplexml_load_string(utf8_encode(file_get_contents($request_url))) or die('url not loading');
- $Coordinates = $xml->Response->Placemark->Point->Coordinates;
- $CoordinatesSplit = explode(",", $Coordinates);
- // Format: Longitude, Latitude, Altitude
- $Latitude = $CoordinatesSplit[1];
- $Longitude = $CoordinatesSplit[0];
- $Status = $xml->Response->Status->code;
- if (strcmp($Status, '200') == 0) {
+ $Status = $xml->status;
+ if (strcmp($Status, 'OK') == 0) {
// Successful geocode
$Geocode_Pending = false;
- $Coordinates = $xml->Response->Placemark->Point->Coordinates;
- $CoordinatesSplit = explode(",", $Coordinates);
// Format: Longitude, Latitude, Altitude
- $Latitude = $CoordinatesSplit[1];
- $Longitude = $CoordinatesSplit[0];
+ $Latitude = $xml->result->geometry->location->lat;
+ $Longitude = $xml->result->geometry->location->lng;
} else {
// failure to geocode
$Geocode_Pending = false;
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2017-09-17 01:39:01 UTC (rev 7835)
+++ trunk/SelectSupplier.php 2017-09-18 22:09:33 UTC (rev 7836)
@@ -16,6 +16,16 @@
if (isset($_GET['SupplierID'])) {
$_SESSION['SupplierID']=$_GET['SupplierID'];
}
+if (isset($_POST['Select'])) { /*User has hit the button selecting a supplier */
+ $_SESSION['SupplierID'] = $_POST['Select'];
+ unset($_POST['Select']);
+ unset($_POST['Keywords']);
+ unset($_POST['SupplierCode']);
+ unset($_POST['Search']);
+ unset($_POST['Go']);
+ unset($_POST['Next']);
+ unset($_POST['Previous']);
+}
// only get geocode information if integration is on, and supplier has been selected
if ($_SESSION['geocode_integration'] == 1 AND isset($_SESSION['SupplierID'])) {
$sql = "SELECT * FROM geocode_param WHERE 1";
@@ -39,7 +49,7 @@
$map_height = $myrow['map_height'];
$map_width = $myrow['map_width'];
$map_host = $myrow['map_host'];
- echo '<script src="http://maps.google.com/maps?file=api&v=2&key=' . $api_key . '"';
+ echo '<script src="https://maps.google.com/maps?file=api&v=2&key=' . $api_key . '"';
echo ' type="text/javascript"></script>';
echo ' <script type="text/javascript">';
echo 'function load() {
@@ -67,16 +77,6 @@
$_POST['PageOffset'] = 1;
}
}
-if (isset($_POST['Select'])) { /*User has hit the button selecting a supplier */
- $_SESSION['SupplierID'] = $_POST['Select'];
- unset($_POST['Select']);
- unset($_POST['Keywords']);
- unset($_POST['SupplierCode']);
- unset($_POST['Search']);
- unset($_POST['Go']);
- unset($_POST['Next']);
- unset($_POST['Previous']);
-}
if (isset($_POST['Search'])
OR isset($_POST['Go'])
OR isset($_POST['Next'])
Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php 2017-09-17 01:39:01 UTC (rev 7835)
+++ trunk/Suppliers.php 2017-09-18 22:09:33 UTC (rev 7836)
@@ -422,29 +422,22 @@
if ($map_host=="") {
echo '<div class="warn">' . _('Warning - Geocode Integration is enabled, but no hosts are setup. Go to Geocode Setup') . '</div>';
} else {
- $address = $_POST['Address1'] . ', ' . $_POST['Address2'] . ', ' . $_POST['Address3'] . ', ' . $_POST['Address4'] . ', ' . $_POST['Address5']. ', ' . $_POST['Address6'];
+ $address = urlencode($_POST['Address1'] . ', ' . $_POST['Address2'] . ', ' . $_POST['Address3'] . ', ' . $_POST['Address4'] . ', ' . $_POST['Address5'] . ', ' . $_POST['Address6']);
+ $base_url = "http://" . MAPS_HOST . "/maps/api/geocode/xml?address=";
+ $request_url = $base_url . $address . ',&sensor=true';
- $base_url = 'http://' . MAPS_HOST . '/maps/geo?output=xml' . '&key=' . KEY;
- $request_url = $base_url . '&q=' . urlencode($address);
-
- $xml = simplexml_load_string(utf8_encode(file_get_contents($request_url))) or prnMsg(_('Goole map url not loading'),'warn');
+ $xml = simplexml_load_string(utf8_encode(file_get_contents($request_url))) or die("url not loading");
// $xml = simplexml_load_file($request_url) or die("url not loading");
$coordinates = $xml->Response->Placemark->Point->coordinates;
- $coordinatesSplit = explode(',', $coordinates);
- // Format: Longitude, Latitude, Altitude
- $latitude = $coordinatesSplit[1];
- $longitude = $coordinatesSplit[0];
- $status = $xml->Response->Status->code;
- if (strcmp($status, '200') == 0) {
+ $status = $xml->status;
+ if (strcmp($status, 'OK') == 0) {
// Successful geocode
$geocode_pending = false;
- $coordinates = $xml->Response->Placemark->Point->coordinates;
- $coordinatesSplit = explode(",", $coordinates);
// Format: Longitude, Latitude, Altitude
- $latitude = $coordinatesSplit[1];
- $longitude = $coordinatesSplit[0];
+ $latitude = $xml->result->geometry->location->lat;
+ $longitude = $xml->result->geometry->location->lng;
} else {
// failure to geocode
$geocode_pending = false;
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-09-17 01:39:01 UTC (rev 7835)
+++ trunk/doc/Change.log 2017-09-18 22:09:33 UTC (rev 7836)
@@ -1,5 +1,6 @@
webERP Change Log
+18/9/2017 Tim (committed by Andy): Geocode bug fixes. http://www.weberp.org/forum/showthread.php?tid=4380
17/9/17 VortecCPI: SelectProduct.php made image dispay code match that used in WorkOrderEntry.php
11/9/17 Andy Couling: Fixed the onclick delete confirmation box call in ContractBOM.php, was 'MakeConfirm'.
11/9/17 Andy Couling: Code consistency in PO_Items.php. http://www.weberp.org/forum/showthread.php?tid=4355
|
|
From: <rc...@us...> - 2017-09-27 23:48:30
|
Revision: 7841
http://sourceforge.net/p/web-erp/reponame/7841
Author: rchacon
Date: 2017-09-27 23:48:22 +0000 (Wed, 27 Sep 2017)
Log Message:
-----------
Increases accuracy in coordinates.
Modified Paths:
--------------
trunk/doc/Change.log
trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-09-26 12:24:24 UTC (rev 7840)
+++ trunk/doc/Change.log 2017-09-27 23:48:22 UTC (rev 7841)
@@ -1,5 +1,6 @@
webERP Change Log
+27/09/26 RChacon: Increases accuracy in coordinates.
17/09/26 Exson: Fixed the wrong price retrieved bug in PO_Header.php.
17/09/26 Exson: Fixed the vendor price bug to ensure only the effective price showed by suppliers in SelectProduct.php.
17/09/20 Exson: Fixed the bug to make GRN reverse workable.
Modified: trunk/sql/mysql/upgrade4.14.1-4.14.2.sql
===================================================================
--- trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-09-26 12:24:24 UTC (rev 7840)
+++ trunk/sql/mysql/upgrade4.14.1-4.14.2.sql 2017-09-27 23:48:22 UTC (rev 7841)
@@ -23,3 +23,8 @@
`amount` DOUBLE NOT NULL DEFAULT 0.0,
PRIMARY KEY(counterindex)
);
+
+ALTER TABLE `custbranch` CHANGE `lat` `lat` FLOAT(12,8) NOT NULL DEFAULT '0.00000000';
+ALTER TABLE `custbranch` CHANGE `lng` `lng` FLOAT(12,8) NOT NULL DEFAULT '0.00000000'
+
+
|
|
From: <rc...@us...> - 2017-10-02 07:55:26
|
Revision: 7842
http://sourceforge.net/p/web-erp/reponame/7842
Author: rchacon
Date: 2017-10-02 07:55:23 +0000 (Mon, 02 Oct 2017)
Log Message:
-----------
Standardise and add icons for usability.
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/SelectProduct.php
trunk/SelectSupplier.php
trunk/doc/Change.log
trunk/index.php
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2017-09-27 23:48:22 UTC (rev 7841)
+++ trunk/SelectCustomer.php 2017-10-02 07:55:23 UTC (rev 7842)
@@ -8,11 +8,6 @@
$BookMark = 'SelectCustomer';
include('includes/header.php');
-echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/customer.png" title="',// Icon image.
- _('Customer'), '" /> ',// Icon title.
- _('Customers'), '</p>';// Page title.
-
include('includes/SQL_CommonFunctions.inc');
if(isset($_GET['Select'])) {
@@ -147,7 +142,25 @@
}
}// end of if search
+$TableHead =
+ '<table cellpadding="4" width="90%" class="selection">
+ <thead>
+ <tr>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/reports.png" title="' . _('Inquiries and Reports') . '" />' .
+ _('Customer Inquiries') . '</th>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/transactions.png" title="' . _('Transactions') . '" />' .
+ _('Customer Transactions') . '</th>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . _('Maintenance') . '" />' .
+ _('Customer Maintenance') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
+
if($_SESSION['CustomerID'] != '' AND !isset($_POST['Search']) AND !isset($_POST['CSV'])) {
+ // A customer is selected
if(!isset($_SESSION['BranchCode'])) {
// !isset($_SESSION['BranchCode'])
$SQL = "SELECT debtorsmaster.name,
@@ -179,20 +192,11 @@
echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/customer.png" title="',// Icon image.
_('Customer'), '" /> ',// Icon title.
- _('Customer'), ' : ', $_SESSION['CustomerID'], ' - ', $CustomerName, ' - ', $PhoneNo, _(' has been selected'), '</p>';// Page title.
-
- echo '<div class="page_help_text">', _('Select a menu option to operate using this customer'), '.</div>
- <br />
- <table cellpadding="4" width="90%" class="selection">
- <thead>
- <tr>
- <th style="width:33%">', _('Customer Inquiries'), '</th>
- <th style="width:33%">', _('Customer Transactions'), '</th>
- <th style="width:33%">', _('Customer Maintenance'), '</th>
- </tr>
- </thead>
- <tbody>
- <tr>
+ _('Customer'), ': ', $_SESSION['CustomerID'], ' - ', $CustomerName, ' - ', $PhoneNo, /*_(' has been selected'), */'</p>',// Page title.
+ '<div class="page_help_text">', _('Select a menu option to operate using this customer'), '.</div>',// Page help text.
+ '<br />',
+ $TableHead,
+ '<tr>
<td valign="top" class="select">';
// Customer inquiries options:
echo '<a href="', $RootPath, '/CustomerInquiry.php?CustomerID=', urlencode($_SESSION['CustomerID']), '">' . _('Customer Transaction Inquiries') . '</a><br />';
@@ -225,26 +229,22 @@
<tbody>
</table>';
} else {
- echo '<table cellpadding="4" width="90%" class="selection">
- <thead>
- <tr>
- <th style="width:33%">', _('Customer Inquiries'), '</th>
- <th style="width:33%">', _('Customer Transactions'), '</th>
- <th style="width:33%">', _('Customer Maintenance'), '</th>
- </tr>
- </thead>
- <tbody>';
- echo '<tr>
- <td class="select"></td>
- <td class="select"></td>
- <td class="select">';
+ // Customer is not selected yet
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/customer.png" title="', // Icon image.
+ _('Customers'), '" /> ', // Icon title.
+ _('Customers'), '</p>',// Page title.
+ '<br />',
+ $TableHead,
+ '<tr>',
+ '<td class="select"></td>',// Customer inquiries options.
+ '<td class="select"></td>',// Customer transactions options.
+ '<td class="select">';
if(!isset($_SESSION['SalesmanLogin']) OR $_SESSION['SalesmanLogin'] == '') {
- echo '<a href="', $RootPath, '/Customers.php">' . _('Add a New Customer') . '</a><br />';
+ echo '<a href="', $RootPath, '/Customers.php">', _('Add a New Customer'), '</a><br />';
}
- echo '</td>
- </tr>
- <tbody>
- </table>';
+ echo '</td>',// Item maintenance options.
+ '</tr><tbody></table>';
}
// Search for customers:
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2017-09-27 23:48:22 UTC (rev 7841)
+++ trunk/SelectProduct.php 2017-10-02 07:55:23 UTC (rev 7842)
@@ -8,11 +8,10 @@
include ('includes/session.php');
$Title = _('Search Inventory Items');
-/* webERP manual links before header.php */
$ViewTopic= 'Inventory';
$BookMark = 'SelectingInventory';
+include ('includes/header.php');
-include ('includes/header.php');
include ('includes/SQL_CommonFunctions.inc');
if (isset($_GET['StockID'])) {
@@ -20,7 +19,7 @@
$_GET['StockID'] = trim(mb_strtoupper($_GET['StockID']));
$_POST['Select'] = trim(mb_strtoupper($_GET['StockID']));
}
-echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/inventory.png" title="' . _('Inventory Items') . '" alt="" />' . ' ' . _('Inventory Items') . '</p>';
+
if (isset($_GET['NewSearch']) or isset($_POST['Next']) or isset($_POST['Previous']) or isset($_POST['Go'])) {
unset($StockID);
unset($_SESSION['SelectedStockItem']);
@@ -50,6 +49,22 @@
}
// end of showing search facilities
/* displays item options if there is one and only one selected */
+$TableHead =
+ '<table cellpadding="4" width="90%" class="selection">
+ <thead>
+ <tr>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/reports.png" title="' . _('Inquiries and Reports') . '" />' .
+ _('Item Inquiries') . '</th>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/transactions.png" title="' . _('Transactions') . '" />' .
+ _('Item Transactions') . '</th>
+ <th style="width:33%">' .
+ '<img alt="" src="' . $RootPath . '/css/' . $Theme . '/images/maintenance.png" title="' . _('Maintenance') . '" />' .
+ _('Item Maintenance') . '</th>
+ </tr>
+ </thead>
+ <tbody>';
if (!isset($_POST['Search']) AND (isset($_POST['Select']) OR isset($_SESSION['SelectedStockItem']))) {
if (isset($_POST['Select'])) {
$_SESSION['SelectedStockItem'] = $_POST['Select'];
@@ -86,13 +101,18 @@
} else {
$ItemStatus = '';
}
+/* echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/inventory.png" title="', // Icon image.
+ _('Inventory Item'), '" /> ', // Icon title.
+ '<b title="', $myrow['longdescription'], '">',
+ _('Inventory Item'), ': ', $StockID, ' - ', $myrow['description'], '</b> ', $ItemStatus, '</p>';// Page title.*/
+ echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/inventory.png" title="', // Icon image.
+ _('Inventory Item'), '" /> ', // Icon title.
+ _('Inventory Item'), ': ', $StockID, ' - ', $myrow['description'], ' ', $ItemStatus, '</p>';// Page title.
+
echo '<table width="90%">
- <tr>
- <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>
+ <tr>
<td style="width:40%" valign="top">
<table>'; //nested table
echo '<tr><th class="number">' . _('Category') . ':</th> <td colspan="6" class="select">' . $myrow['categorydescription'] , '</td></tr>';
@@ -205,7 +225,7 @@
$PropertiesResult = DB_query($sql);
$PropertyCounter = 0;
$PropertyWidth = array();
- while ($PropertyRow = DB_fetch_array($PropertiesResult)) {
+ while($PropertyRow = DB_fetch_array($PropertiesResult)) {
$PropValResult = DB_query("SELECT value
FROM stockitemproperties
WHERE stockid='" . $StockID . "'
@@ -234,289 +254,284 @@
}
break;
} //end switch
- echo '</td></tr>';
- $PropertyCounter++;
-} //end loop round properties for the item category
-echo '</table></td>'; //end of Item Category Property mod
-echo '<td style="width:15%; vertical-align:top">
- <table>'; //nested table to show QOH/orders
-$QOH = 0;
-switch ($myrow['mbflag']) {
- case 'A':
- case 'D':
- case 'K':
- $QOH = _('N/A');
- $QOO = _('N/A');
- break;
- case 'M':
- case 'B':
- $QOHResult = DB_query("SELECT sum(quantity)
- FROM locstock
- WHERE stockid = '" . $StockID . "'");
- $QOHRow = DB_fetch_row($QOHResult);
- $QOH = locale_number_format($QOHRow[0], $myrow['decimalplaces']);
+ echo '</td></tr>';
+ $PropertyCounter++;
+ } //end loop round properties for the item category
+ echo '</table></td>'; //end of Item Category Property mod
+ echo '<td style="width:15%; vertical-align:top">
+ <table>'; //nested table to show QOH/orders
+ $QOH = 0;
+ switch ($myrow['mbflag']) {
+ case 'A':
+ case 'D':
+ case 'K':
+ $QOH = _('N/A');
+ $QOO = _('N/A');
+ break;
+ case 'M':
+ case 'B':
+ $QOHResult = DB_query("SELECT sum(quantity)
+ FROM locstock
+ WHERE stockid = '" . $StockID . "'");
+ $QOHRow = DB_fetch_row($QOHResult);
+ $QOH = locale_number_format($QOHRow[0], $myrow['decimalplaces']);
- // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc
- $QOO = GetQuantityOnOrderDueToPurchaseOrders($StockID, '');
- // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc
- $QOO += GetQuantityOnOrderDueToWorkOrders($StockID, '');
+ // Get the QOO due to Purchase orders for all locations. Function defined in SQL_CommonFunctions.inc
+ $QOO = GetQuantityOnOrderDueToPurchaseOrders($StockID, '');
+ // Get the QOO dues to Work Orders for all locations. Function defined in SQL_CommonFunctions.inc
+ $QOO += GetQuantityOnOrderDueToWorkOrders($StockID, '');
- $QOO = locale_number_format($QOO, $myrow['decimalplaces']);
- break;
-}
-$Demand = 0;
-$DemResult = DB_query("SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
- FROM salesorderdetails INNER JOIN salesorders
- ON salesorders.orderno = salesorderdetails.orderno
- INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
- WHERE salesorderdetails.completed=0
- AND salesorders.quotation=0
- AND salesorderdetails.stkcode='" . $StockID . "'");
-$DemRow = DB_fetch_row($DemResult);
-$Demand = $DemRow[0];
-$DemAsComponentResult = DB_query("SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
- FROM salesorderdetails INNER JOIN salesorders
- ON salesorders.orderno = salesorderdetails.orderno
- INNER JOIN bom ON salesorderdetails.stkcode=bom.parent
- INNER JOIN stockmaster ON stockmaster.stockid=bom.parent
- INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
- WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
- AND bom.component='" . $StockID . "'
- AND stockmaster.mbflag='A'
- AND salesorders.quotation=0");
-$DemAsComponentRow = DB_fetch_row($DemAsComponentResult);
-$Demand+= $DemAsComponentRow[0];
-//Also the demand for the item as a component of works orders
-$sql = "SELECT SUM(qtypu*(woitems.qtyreqd - woitems.qtyrecd)) AS woqtydemo
- FROM woitems INNER JOIN worequirements
- ON woitems.stockid=worequirements.parentstockid
- INNER JOIN workorders
- ON woitems.wo=workorders.wo
- AND woitems.wo=worequirements.wo
- INNER JOIN locationusers ON locationusers.loccode=workorders.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
- WHERE worequirements.stockid='" . $StockID . "'
- AND workorders.closed=0";
-$ErrMsg = _('The workorder component demand for this product cannot be retrieved because');
-$DemandResult = DB_query($sql, $ErrMsg);
-if (DB_num_rows($DemandResult) == 1) {
- $DemandRow = DB_fetch_row($DemandResult);
- $Demand+= $DemandRow[0];
-}
-echo '<tr>
- <th class="number" style="width:15%">' . _('Quantity On Hand') . ':</th>
- <td style="width:17%; text-align:right" class="select">' . $QOH . '</td>
- </tr>
- <tr>
- <th class="number" style="width:15%">' . _('Quantity Demand') . ':</th>
- <td style="width:17%; text-align:right" class="select">' . locale_number_format($Demand, $myrow['decimalplaces']) . '</td>
- </tr>
- <tr>
- <th class="number" style="width:15%">' . _('Quantity On Order') . ':</th>
- <td style="width:17%; text-align:right" class="select">' . $QOO . '</td>
- </tr>
- </table>'; //end of nested table
-echo '</td>'; //end cell of master table
+ $QOO = locale_number_format($QOO, $myrow['decimalplaces']);
+ break;
+ }
+ $Demand = 0;
+ $DemResult = DB_query("SELECT SUM(salesorderdetails.quantity-salesorderdetails.qtyinvoiced) AS dem
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
+ WHERE salesorderdetails.completed=0
+ AND salesorders.quotation=0
+ AND salesorderdetails.stkcode='" . $StockID . "'");
+ $DemRow = DB_fetch_row($DemResult);
+ $Demand = $DemRow[0];
+ $DemAsComponentResult = DB_query("SELECT SUM((salesorderdetails.quantity-salesorderdetails.qtyinvoiced)*bom.quantity) AS dem
+ FROM salesorderdetails INNER JOIN salesorders
+ ON salesorders.orderno = salesorderdetails.orderno
+ INNER JOIN bom ON salesorderdetails.stkcode=bom.parent
+ INNER JOIN stockmaster ON stockmaster.stockid=bom.parent
+ INNER JOIN locationusers ON locationusers.loccode=salesorders.fromstkloc AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
+ WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
+ AND bom.component='" . $StockID . "'
+ AND stockmaster.mbflag='A'
+ AND salesorders.quotation=0");
+ $DemAsComponentRow = DB_fetch_row($DemAsComponentResult);
+ $Demand+= $DemAsComponentRow[0];
+ //Also the demand for the item as a component of works orders
+ $sql = "SELECT SUM(qtypu*(woitems.qtyreqd - woitems.qtyrecd)) AS woqtydemo
+ FROM woitems INNER JOIN worequirements
+ ON woitems.stockid=worequirements.parentstockid
+ INNER JOIN workorders
+ ON woitems.wo=workorders.wo
+ AND woitems.wo=worequirements.wo
+ INNER JOIN locationusers ON locationusers.loccode=workorders.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
+ WHERE worequirements.stockid='" . $StockID . "'
+ AND workorders.closed=0";
+ $ErrMsg = _('The workorder component demand for this product cannot be retrieved because');
+ $DemandResult = DB_query($sql, $ErrMsg);
+ if (DB_num_rows($DemandResult) == 1) {
+ $DemandRow = DB_fetch_row($DemandResult);
+ $Demand+= $DemandRow[0];
+ }
+ echo '<tr>
+ <th class="number" style="width:15%">' . _('Quantity On Hand') . ':</th>
+ <td style="width:17%; text-align:right" class="select">' . $QOH . '</td>
+ </tr>
+ <tr>
+ <th class="number" style="width:15%">' . _('Quantity Demand') . ':</th>
+ <td style="width:17%; text-align:right" class="select">' . locale_number_format($Demand, $myrow['decimalplaces']) . '</td>
+ </tr>
+ <tr>
+ <th class="number" style="width:15%">' . _('Quantity On Order') . ':</th>
+ <td style="width:17%; text-align:right" class="select">' . $QOO . '</td>
+ </tr>
+ </table>'; //end of nested table
+ echo '</td>'; //end cell of master table
-if (($myrow['mbflag'] == 'B' OR ($myrow['mbflag'] == 'M'))
- AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))){
+ if (($myrow['mbflag'] == 'B' OR ($myrow['mbflag'] == 'M'))
+ AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))){
- echo '<td style="width:50%" valign="top"><table>
- <tr><th style="width:20%">' . _('Supplier') . '</th>
- <th stlye="width:15%">' . _('Code') . '</th>
- <th style="width:15%">' . _('Cost') . '</th>
- <th style="width:5%">' . _('Curr') . '</th>
- <th style="width:10%">' . _('Lead Time') . '</th>
- <th style="width:10%">' . _('Min Order Qty') . '</th>
- <th style="width:5%">' . _('Prefer') . '</th></tr>';
- $SuppResult = DB_query("SELECT suppliers.suppname,
- suppliers.currcode,
- suppliers.supplierid,
- purchdata.price,
- purchdata.suppliers_partno,
- purchdata.leadtime,
- purchdata.conversionfactor,
- purchdata.minorderqty,
- purchdata.preferred,
- currencies.decimalplaces,
- purchdata.effectivefrom
- FROM purchdata INNER JOIN suppliers
- ON purchdata.supplierno=suppliers.supplierid
- INNER JOIN currencies
- ON suppliers.currcode=currencies.currabrev
- WHERE purchdata.stockid = '" . $StockID . "'
- AND purchdata.effectivefrom=(SELECT max(a.effectivefrom) FROM purchdata a WHERE purchdata.supplierno=a.supplierno and a.stockid=purchdata.stockid)
- GROUP BY suppliers.suppname,
- suppliers.currcode,
- suppliers.supplierid,
- purchdata.price,
- purchdata.suppliers_partno,
- purchdata.leadtime,
- purchdata.conversionfactor,
- purchdata.minorderqty,
- purchdata.preferred,
- currencies.decimalplaces
- ORDER BY purchdata.preferred DESC");
+ echo '<td style="width:50%" valign="top"><table>
+ <tr><th style="width:20%">' . _('Supplier') . '</th>
+ <th stlye="width:15%">' . _('Code') . '</th>
+ <th style="width:15%">' . _('Cost') . '</th>
+ <th style="width:5%">' . _('Curr') . '</th>
+ <th style="width:10%">' . _('Lead Time') . '</th>
+ <th style="width:10%">' . _('Min Order Qty') . '</th>
+ <th style="width:5%">' . _('Prefer') . '</th></tr>';
+ $SuppResult = DB_query("SELECT suppliers.suppname,
+ suppliers.currcode,
+ suppliers.supplierid,
+ purchdata.price,
+ purchdata.suppliers_partno,
+ purchdata.leadtime,
+ purchdata.conversionfactor,
+ purchdata.minorderqty,
+ purchdata.preferred,
+ currencies.decimalplaces,
+ purchdata.effectivefrom
+ FROM purchdata INNER JOIN suppliers
+ ON purchdata.supplierno=suppliers.supplierid
+ INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE purchdata.stockid = '" . $StockID . "'
+ AND purchdata.effectivefrom=(SELECT max(a.effectivefrom) FROM purchdata a WHERE purchdata.supplierno=a.supplierno and a.stockid=purchdata.stockid)
+ GROUP BY suppliers.suppname,
+ suppliers.currcode,
+ suppliers.supplierid,
+ purchdata.price,
+ purchdata.suppliers_partno,
+ purchdata.leadtime,
+ purchdata.conversionfactor,
+ purchdata.minorderqty,
+ purchdata.preferred,
+ currencies.decimalplaces
+ ORDER BY purchdata.preferred DESC");
- while ($SuppRow = DB_fetch_array($SuppResult)) {
- echo '<tr>
- <td class="select">' . $SuppRow['suppname'] . '</td>
- <td class="select">' . $SuppRow['suppliers_partno'] . '</td>
- <td class="select" style="text-align:right">' . locale_number_format($SuppRow['price'] / $SuppRow['conversionfactor'], $SuppRow['decimalplaces']) . '</td>
- <td class="select">' . $SuppRow['currcode'] . '</td>
- <td class="select" style="text-align:right">' . $SuppRow['leadtime'] . '</td>
- <td class="select" style="text-align:right">' . $SuppRow['minorderqty'] . '</td>';
+ while ($SuppRow = DB_fetch_array($SuppResult)) {
+ echo '<tr>
+ <td class="select">' . $SuppRow['suppname'] . '</td>
+ <td class="select">' . $SuppRow['suppliers_partno'] . '</td>
+ <td class="select" style="text-align:right">' . locale_number_format($SuppRow['price'] / $SuppRow['conversionfactor'], $SuppRow['decimalplaces']) . '</td>
+ <td class="select">' . $SuppRow['currcode'] . '</td>
+ <td class="select" style="text-align:right">' . $SuppRow['leadtime'] . '</td>
+ <td class="select" style="text-align:right">' . $SuppRow['minorderqty'] . '</td>';
- if ($SuppRow['preferred']==1) { //then this is the preferred supplier
- echo '<td class="select">' . _('Yes') . '</td>';
- } else {
- echo '<td class="select">' . _('No') . '</td>';
+ if ($SuppRow['preferred']==1) { //then this is the preferred supplier
+ echo '<td class="select">' . _('Yes') . '</td>';
+ } else {
+ echo '<td class="select">' . _('No') . '</td>';
+ }
+ echo '<td class="select"><a href="' . $RootPath . '/PO_Header.php?NewOrder=Yes&SelectedSupplier=' .
+ $SuppRow['supplierid'] . '&StockID=' . urlencode($StockID) . '&Quantity='.$SuppRow['minorderqty'].'&LeadTime='.$SuppRow['leadtime'] . '">' . _('Order') . ' </a></td>';
+ echo '</tr>';
}
- echo '<td class="select"><a href="' . $RootPath . '/PO_Header.php?NewOrder=Yes&SelectedSupplier=' .
- $SuppRow['supplierid'] . '&StockID=' . urlencode($StockID) . '&Quantity='.$SuppRow['minorderqty'].'&LeadTime='.$SuppRow['leadtime'] . '">' . _('Order') . ' </a></td>';
- echo '</tr>';
+ echo '</table>';
+ DB_data_seek($result, 0);
}
- echo '</table>';
- DB_data_seek($result, 0);
-}
-echo '</td>
- </tr>
- </table>
- <br />'; // end first item details table
-echo '<table width="90%">
- <tr>
- <th style="width:33%">' . _('Item Inquiries') . '</th>
- <th style="width:33%">' . _('Item Transactions') . '</th>
- <th style="width:33%">' . _('Item Maintenance') . '</th>
+ echo '</td>
</tr>
- <tr>
- <td valign="top" class="select">';
-/*Stock Inquiry Options */
-echo '<a href="' . $RootPath . '/StockMovements.php?StockID=' . urlencode($StockID) . '">' . _('Show Stock Movements') . '</a><br />';
-if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $RootPath . '/StockStatus.php?StockID=' . urlencode($StockID) . '">' . _('Show Stock Status') . '</a><br />';
- echo '<a href="' . $RootPath . '/StockUsage.php?StockID=' . urlencode($StockID) . '">' . _('Show Stock Usage') . '</a><br />';
-}
-echo '<a href="' . $RootPath . '/SelectSalesOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search Outstanding Sales Orders') . '</a><br />';
-echo '<a href="' . $RootPath . '/SelectCompletedOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search Completed Sales Orders') . '</a><br />';
-if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
- echo '<a href="' . $RootPath . '/PO_SelectOSPurchOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search Outstanding Purchase Orders') . '</a><br />';
- echo '<a href="' . $RootPath . '/PO_SelectPurchOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search All Purchase Orders') . '</a><br />';
+ </table>',// End first item details table
+ '<div class="page_help_text">', _('Select a menu option to operate using this inventory item.'), '</div>',// Page help text.
+ '<br />',
+ $TableHead,
+ '<tr>
+ <td valign="top" class="select">';
+ /*Stock Inquiry Options */
+ echo '<a href="' . $RootPath . '/StockMovements.php?StockID=' . urlencode($StockID) . '">' . _('Show Stock Movements') . '</a><br />';
+ if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
+ echo '<a href="' . $RootPath . '/StockStatus.php?StockID=' . urlencode($StockID) . '">' . _('Show Stock Status') . '</a><br />';
+ echo '<a href="' . $RootPath . '/StockUsage.php?StockID=' . urlencode($StockID) . '">' . _('Show Stock Usage') . '</a><br />';
+ }
+ echo '<a href="' . $RootPath . '/SelectSalesOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search Outstanding Sales Orders') . '</a><br />';
+ echo '<a href="' . $RootPath . '/SelectCompletedOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search Completed Sales Orders') . '</a><br />';
+ if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
+ echo '<a href="' . $RootPath . '/PO_SelectOSPurchOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search Outstanding Purchase Orders') . '</a><br />';
+ echo '<a href="' . $RootPath . '/PO_SelectPurchOrder.php?SelectedStockItem=' . urlencode($StockID) . '">' . _('Search All Purchase Orders') . '</a><br />';
- $SupportedImgExt = array('png','jpg','jpeg');
- $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $StockID . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
- echo '<a href="' . $RootPath . '/' . $imagefile . '" target="_blank">' . _('Show Part Picture (if available)') . '</a><br />';
-}
-if ($Its_A_Dummy == False) {
- echo '<a href="' . $RootPath . '/BOMInquiry.php?StockID=' . urlencode($StockID) . '">' . _('View Costed Bill Of Material') . '</a><br />';
- echo '<a href="' . $RootPath . '/WhereUsedInquiry.php?StockID=' . urlencode($StockID) . '">' . _('Where This Item Is Used') . '</a><br />';
-}
-if ($Its_A_Labour_Item == True) {
- echo '<a href="' . $RootPath . '/WhereUsedInquiry.php?StockID=' . urlencode($StockID) . '">' . _('Where This Labour Item Is Used') . '</a><br />';
-}
-wikiLink('Product', $StockID);
-echo '</td><td valign="top" class="select">';
-/* Stock Transactions */
-if ($Its_A_Kitset_Assembly_Or_Dummy == false) {
- echo '<a href="' . $RootPath . '/StockAdjustments.php?StockID=' . urlencode($StockID) . '">' . _('Quantity Adjustments') . '</a><br />';
- echo '<a href="' . $RootPath . '/StockTransfers.php?StockID=' . urlencode($StockID) . '&NewTransfer=true">' . _('Location Transfers') . '</a><br />';
+ $SupportedImgExt = array('png','jpg','jpeg');
+ $imagefile = reset((glob($_SESSION['part_pics_dir'] . '/' . $StockID . '.{' . implode(",", $SupportedImgExt) . '}', GLOB_BRACE)));
+ echo '<a href="' . $RootPath . '/' . $imagefile . '" target="_blank">' . _('Show Part Picture (if available)') . '</a><br />';
+ }
+ if ($Its_A_Dummy == False) {
+ echo '<a href="' . $RootPath . '/BOMInquiry.php?StockID=' . urlencode($StockID) . '">' . _('View Costed Bill Of Material') . '</a><br />';
+ echo '<a href="' . $RootPath . '/WhereUsedInquiry.php?StockID=' . urlencode($StockID) . '">' . _('Where This Item Is Used') . '</a><br />';
+ }
+ if ($Its_A_Labour_Item == True) {
+ echo '<a href="' . $RootPath . '/WhereUsedInquiry.php?StockID=' . urlencode($StockID) . '">' . _('Where This Labour Item Is Used') . '</a><br />';
+ }
+ wikiLink('Product', $StockID);
+ echo '</td><td valign="top" class="select">';
+ /* Stock Transactions */
+ if ($Its_A_Kitset_Assembly_Or_Dummy == false) {
+ echo '<a href="' . $RootPath . '/StockAdjustments.php?StockID=' . urlencode($StockID) . '">' . _('Quantity Adjustments') . '</a><br />';
+ echo '<a href="' . $RootPath . '/StockTransfers.php?StockID=' . urlencode($StockID) . '&NewTransfer=true">' . _('Location Transfers') . '</a><br />';
- //show the item image if it has been uploaded
- if ( extension_loaded ('gd') && function_exists ('gd_info') && file_exists ($imagefile) ) {
- if ($_SESSION['ShowStockidOnImages'] == '0'){
- $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
- '&StockID='.urlencode($StockID).
- '&text='.
- '&width=200'.
- '&height=200'.
- '" alt="" />';
+ //show the item image if it has been uploaded
+ if ( extension_loaded ('gd') && function_exists ('gd_info') && file_exists ($imagefile) ) {
+ if ($_SESSION['ShowStockidOnImages'] == '0'){
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='.
+ '&width=200'.
+ '&height=200'.
+ '" alt="" />';
+ } else {
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='. $StockID .
+ '&width=200'.
+ '&height=200'.
+ '" alt="" />';
+ }
+ } else if (file_exists ($imagefile)) {
+ $StockImgLink = '<img src="' . $imagefile . '" height="200" width="200" />';
} else {
- $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
- '&StockID='.urlencode($StockID).
- '&text='. $StockID .
- '&width=200'.
- '&height=200'.
- '" alt="" />';
+ $StockImgLink = _('No Image');
}
- } else if (file_exists ($imagefile)) {
- $StockImgLink = '<img src="' . $imagefile . '" height="200" width="200" />';
- } else {
- $StockImgLink = _('No Image');
- }
- echo '<div class="centre">' . $StockImgLink . '</div>';
+ echo '<div class="centre">' . $StockImgLink . '</div>';
- if (($myrow['mbflag'] == 'B')
- AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))
- AND $myrow['discontinued']==0){
- echo '<br />';
- $SuppResult = DB_query("SELECT suppliers.suppname,
- suppliers.supplierid,
- purchdata.preferred,
- purchdata.minorderqty,
- purchdata.leadtime
- FROM purchdata INNER JOIN suppliers
- ON purchdata.supplierno=suppliers.supplierid
- WHERE purchdata.stockid='" . $StockID . "'
- ORDER BY purchdata.effectivefrom DESC");
- $LastSupplierShown = "";
- while ($SuppRow = DB_fetch_array($SuppResult)) {
- if ($LastSupplierShown != $SuppRow['supplierid']){
- if (($myrow['eoq'] < $SuppRow['minorderqty'])) {
- $EOQ = $SuppRow['minorderqty'];
- } else {
- $EOQ = $myrow['eoq'];
+ if (($myrow['mbflag'] == 'B')
+ AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens'])...
[truncated message content] |
|
From: <rc...@us...> - 2017-10-02 16:31:04
|
Revision: 7843
http://sourceforge.net/p/web-erp/reponame/7843
Author: rchacon
Date: 2017-10-02 16:30:58 +0000 (Mon, 02 Oct 2017)
Log Message:
-----------
Rebuild languages files
Modified Paths:
--------------
trunk/SelectCustomer.php
trunk/SelectSupplier.php
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.mo
trunk/locale/ar_SY.utf8/LC_MESSAGES/messages.po
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.mo
trunk/locale/cs_CZ.utf8/LC_MESSAGES/messages.po
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.mo
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.mo
trunk/locale/el_GR.utf8/LC_MESSAGES/messages.po
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.mo
trunk/locale/et_EE.utf8/LC_MESSAGES/messages.po
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fa_IR.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/he_IL.utf8/LC_MESSAGES/messages.mo
trunk/locale/he_IL.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/ko_KR.utf8/LC_MESSAGES/messages.mo
trunk/locale/ko_KR.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/mr_IN.utf8/LC_MESSAGES/messages.po
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.mo
trunk/locale/nl_NL.utf8/LC_MESSAGES/messages.po
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.mo
trunk/locale/pl_PL.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_BR.utf8/LC_MESSAGES/messages.po
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.mo
trunk/locale/pt_PT.utf8/LC_MESSAGES/messages.po
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.mo
trunk/locale/ro_RO.utf8/LC_MESSAGES/messages.po
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.mo
trunk/locale/ru_RU.utf8/LC_MESSAGES/messages.po
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.mo
trunk/locale/sq_AL.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sw_KE.utf8/LC_MESSAGES/messages.po
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.mo
trunk/locale/tr_TR.utf8/LC_MESSAGES/messages.po
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.mo
trunk/locale/vi_VN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_CN.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_HK.utf8/LC_MESSAGES/messages.po
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.mo
trunk/locale/zh_TW.utf8/LC_MESSAGES/messages.po
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2017-10-02 07:55:23 UTC (rev 7842)
+++ trunk/SelectCustomer.php 2017-10-02 16:30:58 UTC (rev 7843)
@@ -192,8 +192,8 @@
echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/customer.png" title="',// Icon image.
_('Customer'), '" /> ',// Icon title.
- _('Customer'), ': ', $_SESSION['CustomerID'], ' - ', $CustomerName, ' - ', $PhoneNo, /*_(' has been selected'), */'</p>',// Page title.
- '<div class="page_help_text">', _('Select a menu option to operate using this customer'), '.</div>',// Page help text.
+ _('Customer'), ': ', $_SESSION['CustomerID'], ' - ', $CustomerName, ' - ', $PhoneNo, '</p>',// Page title.
+ '<div class="page_help_text">', _('Select a menu option to operate using this customer.'), '</div>',// Page help text.
'<br />',
$TableHead,
'<tr>
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2017-10-02 07:55:23 UTC (rev 7842)
+++ trunk/SelectSupplier.php 2017-10-02 16:30:58 UTC (rev 7843)
@@ -176,7 +176,7 @@
echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
'/images/supplier.png" title="', // Icon image.
_('Supplier'), '" /> ', // Icon title.
- _('Supplier'), ': ', $_SESSION['SupplierID'], ' - ', $SupplierName, /*' ', _('has been selected'), */'</p>',// Page title.
+ _('Supplier'), ': ', $_SESSION['SupplierID'], ' - ', $SupplierName, '</p>',// Page title.
'<div class="page_help_text">', _('Select a menu option to operate using this supplier.'), '</div>',// Page help text.
'<br />',
$TableHead,
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 2017-10-02 07:55:23 UTC (rev 7842)
+++ trunk/locale/ar_EG.utf8/LC_MESSAGES/messages.po 2017-10-02 16:30:58 UTC (rev 7843)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-15 10:37-0600\n"
-"PO-Revision-Date: 2013-06-01 11:19-0600\n"
+"POT-Creation-Date: 2017-10-02 10:22-0600\n"
+"PO-Revision-Date: 2017-10-02 10:22-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Arabic <ar...@li...>\n"
"Language: ar\n"
@@ -15,7 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.7.1\n"
"X-Launchpad-Export-Date: 2012-03-07 23:01+0000\n"
#: AccountGroups.php:6 includes/MainMenuLinksArray.php:403
@@ -158,8 +158,8 @@
#: AccountGroups.php:212 AccountGroups.php:247 AccountSections.php:130
#: Areas.php:115 Areas.php:124 BankAccounts.php:165 CreditStatus.php:125
#: Currencies.php:247 Currencies.php:255 Currencies.php:263 Currencies.php:273
-#: CustomerBranches.php:300 CustomerBranches.php:310 CustomerBranches.php:320
-#: CustomerBranches.php:330 CustomerBranches.php:340 Customers.php:296
+#: CustomerBranches.php:293 CustomerBranches.php:303 CustomerBranches.php:313
+#: CustomerBranches.php:323 CustomerBranches.php:333 Customers.php:296
#: Customers.php:305 Customers.php:313 Customers.php:324 Customers.php:334
#: CustomerTypes.php:146 CustomerTypes.php:156 Departments.php:141
#: Factors.php:134 FixedAssetCategories.php:137 GLAccounts.php:110
@@ -167,12 +167,12 @@
#: Locations.php:307 Locations.php:316 Locations.php:325 Locations.php:334
#: Locations.php:343 Locations.php:351 Manufacturers.php:185
#: MRPDemandTypes.php:87 PaymentMethods.php:162 PaymentTerms.php:146
-#: PaymentTerms.php:153 PcExpenses.php:161 SalesCategories.php:146
+#: PaymentTerms.php:153 PcExpenses.php:115 SalesCategories.php:146
#: SalesCategories.php:153 SalesPeople.php:159 SalesPeople.php:166
#: SalesPeople.php:172 SalesTypes.php:140 SalesTypes.php:150 Shippers.php:81
#: Shippers.php:93 StockCategories.php:216 Stocks.php:767 Stocks.php:776
#: Stocks.php:784 Stocks.php:792 Stocks.php:800 Stocks.php:808 Stocks.php:816
-#: Stocks.php:824 Suppliers.php:646 Suppliers.php:655 Suppliers.php:663
+#: Stocks.php:824 Suppliers.php:639 Suppliers.php:648 Suppliers.php:656
#: SupplierTypes.php:126 TaxCategories.php:132 TaxGroups.php:135
#: TaxGroups.php:143 TaxProvinces.php:129 UnitsOfMeasure.php:135
#: WorkCentres.php:91 WorkCentres.php:97 WWW_Access.php:88
@@ -242,26 +242,25 @@
#: InternalStockRequest.php:316 InventoryPlanning.php:459
#: InventoryPlanningPrefSupplier.php:386 MaintenanceTasks.php:14
#: MaintenanceUserSchedule.php:16 MRPReport.php:543 NoSalesItems.php:91
-#: PcAssignCashTabToTab.php:76 PcAssignCashTabToTab.php:156
-#: PcAssignCashTabToTab.php:212 PcAssignCashToTab.php:59
-#: PcAssignCashToTab.php:144 PcAssignCashToTab.php:160
-#: PcAssignCashToTab.php:207 PDFPickingList.php:29 PDFStockLocTransfer.php:16
-#: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64
-#: POReport.php:68 PO_SelectOSPurchOrder.php:153 PriceMatrix.php:16
-#: PricesBasedOnMarkUp.php:8 Prices_Customer.php:35 Prices.php:11
-#: ProductSpecs.php:38 PurchaseByPrefSupplier.php:305 PurchData.php:241
-#: PurchData.php:373 PurchData.php:401 QATests.php:22
-#: RecurringSalesOrders.php:320 SalesAnalReptCols.php:51 SalesAnalRepts.php:14
-#: SalesCategories.php:11 SalesGLPostings.php:19 SalesGraph.php:39
-#: SalesPeople.php:28 SalesTypes.php:20 SelectAsset.php:48
-#: SelectCompletedOrder.php:11 SelectContract.php:69 SelectCreditItems.php:221
-#: SelectCreditItems.php:292 SelectCustomer.php:258 SelectGLAccount.php:86
-#: SelectOrderItems.php:588 SelectOrderItems.php:1514 SelectOrderItems.php:1614
-#: SelectProduct.php:523 SelectQASamples.php:45 SelectSalesOrder.php:545
-#: SelectSupplier.php:14 SelectSupplier.php:222 SelectWorkOrder.php:9
-#: SelectWorkOrder.php:174 SellThroughSupport.php:229 ShipmentCosting.php:11
-#: Shipments.php:17 Shippers.php:123 Shippers.php:160 Shipt_Select.php:8
-#: StockLocMovements.php:14 StockSerialItemResearch.php:30
+#: PcAssignCashTabToTab.php:80 PcAssignCashTabToTab.php:160
+#: PcAssignCashTabToTab.php:216 PcAssignCashToTab.php:49
+#: PcAssignCashToTab.php:121 PcAssignCashToTab.php:136
+#: PcAssignCashToTab.php:170 PDFPickingList.php:29 PDFStockLocTransfer.php:16
+#: POReport.php:60 POReport.php:64 POReport.php:68
+#: PO_SelectOSPurchOrder.php:153 PriceMatrix.php:16 PricesBasedOnMarkUp.php:8
+#: Prices_Customer.php:35 Prices.php:11 ProductSpecs.php:38
+#: PurchaseByPrefSupplier.php:305 PurchData.php:241 PurchData.php:373
+#: PurchData.php:401 QATests.php:22 RecurringSalesOrders.php:320
+#: SalesAnalReptCols.php:51 SalesAnalRepts.php:14 SalesCategories.php:11
+#: SalesGLPostings.php:19 SalesGraph.php:39 SalesPeople.php:28
+#: SalesTypes.php:20 SelectAsset.php:48 SelectCompletedOrder.php:11
+#: SelectContract.php:69 SelectCreditItems.php:221 SelectCreditItems.php:292
+#: SelectCustomer.php:258 SelectGLAccount.php:86 SelectOrderItems.php:588
+#: SelectOrderItems.php:1514 SelectOrderItems.php:1614 SelectProduct.php:539
+#: SelectQASamples.php:45 SelectSalesOrder.php:545 SelectSupplier.php:233
+#: SelectWorkOrder.php:9 SelectWorkOrder.php:174 SellThroughSupport.php:229
+#: ShipmentCosting.php:11 Shipments.php:17 Shippers.php:123 Shippers.php:160
+#: Shipt_Select.php:8 StockLocMovements.php:14 StockSerialItemResearch.php:30
#: SupplierPriceList.php:14 SupplierPriceList.php:229 SupplierPriceList.php:399
#: SupplierPriceList.php:458 SupplierPriceList.php:503 Suppliers.php:304
#: SupplierTenderCreate.php:556 SupplierTenderCreate.php:664
@@ -295,12 +294,11 @@
#: AccountGroups.php:476 AddCustomerContacts.php:165
#: AddCustomerContacts.php:275 AddCustomerContacts.php:279
#: AddCustomerContacts.php:282 BOMs.php:140 BOMs.php:896 BOMs.php:898
-#: BOMs_SingleLevel.php:125 BOMs_SingleLevel.php:793 BOMs_SingleLevel.php:795
#: CompanyPreferences.php:423 CompanyPreferences.php:425
#: CompanyPreferences.php:438 CompanyPreferences.php:440
#: CompanyPreferences.php:453 CompanyPreferences.php:455
#: ContractCosting.php:202 Currencies.php:342 Currencies.php:520
-#: Currencies.php:522 CustomerBranches.php:452 Customers.php:659
+#: Currencies.php:522 CustomerBranches.php:445 Customers.php:659
#: Customers.php:1049 Customers.php:1055 Customers.php:1058
#: DailyBankTransactions.php:215 DeliveryDetails.php:1158
#: DeliveryDetails.php:1199 DeliveryDetails.php:1202 FormDesigner.php:101
@@ -312,10 +310,9 @@
#: MRP.php:566 MRP.php:570 PaymentMethods.php:227 PaymentMethods.php:228
#: PaymentMethods.php:229 PaymentMethods.php:230 PaymentMethods.php:301
#: PaymentMethods.php:308 PaymentMethods.php:315 PaymentMethods.php:322
-#: PcAuthorizeExpenses.php:249 PDFChequeListing.php:65
-#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:80 PDFWOPrint.php:608
-#: PDFWOPrint.php:612 PO_AuthorisationLevels.php:134
-#: PO_AuthorisationLevels.php:139 PO_Header.php:807 PO_PDFPurchOrder.php:413
+#: PDFChequeListing.php:65 PDFDeliveryDifferences.php:76 PDFDIFOT.php:80
+#: PDFWOPrint.php:608 PDFWOPrint.php:612 PO_AuthorisationLevels.php:139
+#: PO_AuthorisationLevels.php:144 PO_Header.php:809 PO_PDFPurchOrder.php:413
#: PO_PDFPurchOrder.php:416 ProductSpecs.php:188 ProductSpecs.php:409
#: ProductSpecs.php:414 ProductSpecs.php:420 ProductSpecs.php:425
#: ProductSpecs.php:430 ProductSpecs.php:562 ProductSpecs.php:608
@@ -332,7 +329,7 @@
#: SalesAnalRepts.php:476 SalesAnalRepts.php:479 SalesCategories.php:297
#: SalesCategories.php:384 SalesCategories.php:388 SalesPeople.php:227
#: SalesPeople.php:367 SalesPeople.php:369 SelectCustomer.php:757
-#: SelectProduct.php:231 SelectProduct.php:369 SelectQASamples.php:424
+#: SelectProduct.php:251 SelectProduct.php:390 SelectQASamples.php:424
#: SelectQASamples.php:518 SelectQASamples.php:520 SelectQASamples.php:574
#: SelectQASamples.php:576 SelectQASamples.php:588 SelectQASamples.php:590
#: ShipmentCosting.php:667 ShopParameters.php:289 ShopParameters.php:293
@@ -345,20 +342,20 @@
#: SystemParameters.php:624 SystemParameters.php:632 SystemParameters.php:672
#: SystemParameters.php:763 SystemParameters.php:772 SystemParameters.php:780
#: SystemParameters.php:798 SystemParameters.php:805 SystemParameters.php:849
-#: SystemParameters.php:945 SystemParameters.php:1088
-#: SystemParameters.php:1090 SystemParameters.php:1100
-#: SystemParameters.php:1102 SystemParameters.php:1156
-#: SystemParameters.php:1168 SystemParameters.php:1170
-#: SystemParameters.php:1208 SystemParameters.php:1210
-#: SystemParameters.php:1232 SystemParameters.php:1234 TaxGroups.php:311
-#: TaxGroups.php:314 TaxGroups.php:365 TestPlanResults.php:304
-#: TestPlanResults.php:532 TestPlanResults.php:747 TestPlanResults.php:864
-#: TestPlanResults.php:924 TestPlanResults.php:928 UserGLAccounts.php:187
-#: UserGLAccounts.php:196 UserSettings.php:209 UserSettings.php:212
-#: UserSettings.php:224 UserSettings.php:227 WWW_Users.php:547
-#: WWW_Users.php:549 WWW_Users.php:718 WWW_Users.php:721 WWW_Users.php:734
-#: WWW_Users.php:737 WWW_Users.php:749 WWW_Users.php:752 WWW_Users.php:764
-#: WWW_Users.php:767
+#: SystemParameters.php:945 SystemParameters.php:1088 SystemParameters.php:1090
+#: SystemParameters.php:1100 SystemParameters.php:1102
+#: SystemParameters.php:1156 SystemParameters.php:1168
+#: SystemParameters.php:1170 SystemParameters.php:1208
+#: SystemParameters.php:1210 SystemParameters.php:1232
+#: SystemParameters.php:1234 TaxGroups.php:311 TaxGroups.php:314
+#: TaxGroups.php:365 TestPlanResults.php:304 TestPlanResults.php:532
+#: TestPlanResults.php:747 TestPlanResults.php:864 TestPlanResults.php:924
+#: TestPlanResults.php:928 UserGLAccounts.php:187 UserGLAccounts.php:196
+#: UserSettings.php:209 UserSettings.php:212 UserSettings.php:224
+#: UserSettings.php:227 WWW_Users.php:547 WWW_Users.php:549 WWW_Users.php:718
+#: WWW_Users.php:721 WWW_Users.php:734 WWW_Users.php:737 WWW_Users.php:749
+#: WWW_Users.php:752 WWW_Users.php:764 WWW_Users.php:767
+#: reportwriter/languages/en_US/reports.php:114
msgid "Yes"
msgstr "موافق"
@@ -371,7 +368,7 @@
#: CompanyPreferences.php:437 CompanyPreferences.php:441
#: CompanyPreferences.php:452 CompanyPreferences.php:456
#: ContractCosting.php:200 Currencies.php:344 Currencies.php:525
-#: Currencies.php:527 CustomerBranches.php:452 Customers.php:658
+#: Currencies.php:527 CustomerBranches.php:445 Customers.php:658
#: Customers.php:1047 Customers.php:1054 Customers.php:1057
#: DailyBankTransactions.php:217 DeliveryDetails.php:1159
#: DeliveryDetails.php:1200 DeliveryDetails.php:1203 FormDesigner.php:99
@@ -383,53 +380,54 @@
#: MRP.php:564 MRP.php:568 NoSalesItems.php:191 PaymentMethods.php:227
#: PaymentMethods.php:228 PaymentMethods.php:229 PaymentMethods.php:230
#: PaymentMethods.php:302 PaymentMethods.php:309 PaymentMethods.php:316
-#: PaymentMethods.php:323 PcAuthorizeExpenses.php:247 PDFChequeListing.php:64
-#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:79 PDFWOPrint.php:609
-#: PDFWOPrint.php:613 PO_AuthorisationLevels.php:136
-#: PO_AuthorisationLevels.php:141 PO_Header.php:806 PO_PDFPurchOrder.php:414
-#: PO_PDFPurchOrder.php:417 ProductSpecs.php:191 ProductSpecs.php:411
-#: ProductSpecs.php:417 ProductSpecs.php:422 ProductSpecs.php:427
-#: ProductSpecs.php:432 ProductSpecs.php:613 ProductSpecs.php:615
-#: ProductSpecs.php:626 ProductSpecs.php:628 ProductSpecs.php:639
-#: ProductSpecs.php:641 ProductSpecs.php:652 ProductSpecs.php:654
-#: PurchData.php:299 PurchData.php:668 PurchData.php:671 QATests.php:298
-#: QATests.php:300 QATests.php:311 QATests.php:313 QATests.php:324
-#: QATests.php:326 QATests.php:337 QATests.php:339 QATests.php:350
-#: QATests.php:352 QATests.php:416 QATests.php:421 QATests.php:426
-#: QATests.php:431 QATests.php:436 RecurringSalesOrders.php:492
-#: RecurringSalesOrders.php:495 SalesAnalReptCols.php:282
-#: SalesAnalReptCols.php:420 SalesAnalReptCols.php:423 SalesAnalRepts.php:419
-#: SalesAnalRepts.php:422 SalesAnalRepts.php:447 SalesAnalRepts.php:450
-#: SalesAnalRepts.php:475 SalesAnalRepts.php:478 SalesCategories.php:299
-#: SalesCategories.php:385 SalesCategories.php:387 SalesPeople.php:229
-#: SalesPeople.php:372 SalesPeople.php:374 SelectCustomer.php:757
-#: SelectProduct.php:233 SelectProduct.php:371 SelectQASamples.php:426
-#: SelectQASamples.php:523 SelectQASamples.php:525 SelectQASamples.php:579
-#: SelectQASamples.php:581 SelectQASamples.php:593 SelectQASamples.php:595
-#: ShipmentCosting.php:668 ShopParameters.php:290 ShopParameters.php:292
-#: ShopParameters.php:338 ShopParameters.php:340 ShopParameters.php:392
-#: ShopParameters.php:394 ShopParameters.php:414 ShopParameters.php:416
-#: ShopParameters.php:496 ShopParameters.php:498 StockClone.php:933
-#: StockClone.php:935 StockClone.php:958 StockClone.php:960 Stocks.php:1261
-#: Stocks.php:1263 Stocks.php:1286 Stocks.php:1288 SuppContractChgs.php:92
+#: PaymentMethods.php:323 PDFChequeListing.php:64 PDFDeliveryDifferences.php:75
+#: PDFDIFOT.php:79 PDFWOPrint.php:609 PDFWOPrint.php:613
+#: PO_AuthorisationLevels.php:141 PO_AuthorisationLevels.php:146
+#: PO_Header.php:808 PO_PDFPurchOrder.php:414 PO_PDFPurchOrder.php:417
+#: ProductSpecs.php:191 ProductSpecs.php:411 ProductSpecs.php:417
+#: ProductSpecs.php:422 ProductSpecs.php:427 ProductSpecs.php:432
+#: ProductSpecs.php:613 ProductSpecs.php:615 ProductSpecs.php:626
+#: ProductSpecs.php:628 ProductSpecs.php:639 ProductSpecs.php:641
+#: ProductSpecs.php:652 ProductSpecs.php:654 PurchData.php:299
+#: PurchData.php:668 PurchData.php:671 QATests.php:298 QATests.php:300
+#: QATests.php:311 QATests.php:313 QATests.php:324 QATests.php:326
+#: QATests.php:337 QATests.php:339 QATests.php:350 QATests.php:352
+#: QATests.php:416 QATests.php:421 QATests.php:426 QATests.php:431
+#: QATests.php:436 RecurringSalesOrders.php:492 RecurringSalesOrders.php:495
+#: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420
+#: SalesAnalReptCols.php:423 SalesAnalRepts.php:419 SalesAnalRepts.php:422
+#: SalesAnalRepts.php:447 SalesAnalRepts.php:450 SalesAnalRepts.php:475
+#: SalesAnalRepts.php:478 SalesCategories.php:299 SalesCategories.php:385
+#: SalesCategories.php:387 SalesPeople.php:229 SalesPeople.php:372
+#: SalesPeople.php:374 SelectCustomer.php:757 SelectProduct.php:253
+#: SelectProduct.php:392 SelectQASamples.php:426 SelectQASamples.php:523
+#: SelectQASamples.php:525 SelectQASamples.php:579 SelectQASamples.php:581
+#: SelectQASamples.php:593 SelectQASamples.php:595 ShipmentCosting.php:668
+#: ShopParameters.php:290 ShopParameters.php:292 ShopParameters.php:338
+#: ShopParameters.php:340 ShopParameters.php:392 ShopParameters.php:394
+#: ShopParameters.php:414 ShopParameters.php:416 ShopParameters.php:496
+#: ShopParameters.php:498 StockClone.php:933 StockClone.php:935
+#: StockClone.php:958 StockClone.php:960 Stocks.php:1261 Stocks.php:1263
+#: Stocks.php:1286 Stocks.php:1288 SuppContractChgs.php:92
#: SystemParameters.php:480 SystemParameters.php:503 SystemParameters.php:544
#: SystemParameters.php:625 SystemParameters.php:633 SystemParameters.php:673
#: SystemParameters.php:764 SystemParameters.php:773 SystemParameters.php:781
#: SystemParameters.php:799 SystemParameters.php:806 SystemParameters.php:850
-#: SystemParameters.php:946 SystemParameters.php:1087
-#: SystemParameters.php:1091 SystemParameters.php:1099
-#: SystemParameters.php:1103 SystemParameters.php:1157
-#: SystemParameters.php:1167 SystemParameters.php:1171
-#: SystemParameters.php:1207 SystemParameters.php:1211
-#: SystemParameters.php:1231 SystemParameters.php:1235 TaxGroups.php:312
-#: TaxGroups.php:315 TaxGroups.php:367 TestPlanResults.php:306
-#: TestPlanResults.php:535 TestPlanResults.php:749 TestPlanResults.php:866
-#: TestPlanResults.php:925 TestPlanResults.php:927 UserGLAccounts.php:189
-#: UserGLAccounts.php:199 UserSettings.php:208 UserSettings.php:211
-#: UserSettings.php:223 UserSettings.php:226 WWW_Users.php:546
-#: WWW_Users.php:550 WWW_Users.php:717 WWW_Users.php:720 WWW_Users.php:733
-#: WWW_Users.php:736 WWW_Users.php:748 WWW_Users.php:751 WWW_Users.php:763
-#: WWW_Users.php:766 includes/PDFLowGPPageHeader.inc:44
+#: SystemParameters.php:946 SystemParameters.php:1087 SystemParameters.php:1091
+#: SystemParameters.php:1099 SystemParameters.php:1103
+#: SystemParameters.php:1157 SystemParameters.php:1167
+#: SystemParameters.php:1171 SystemParameters.php:1207
+#: SystemParameters.php:1211 SystemParameters.php:1231
+#: SystemParameters.php:1235 TaxGroups.php:312 TaxGroups.php:315
+#: TaxGroups.php:367 TestPlanResults.php:306 TestPlanResults.php:535
+#: TestPlanResults.php:749 TestPlanResults.php:866 TestPlanResults.php:925
+#: TestPlanResults.php:927 UserGLAccounts.php:189 UserGLAccounts.php:199
+#: UserSettings.php:208 UserSettings.php:211 UserSettings.php:223
+#: UserSettings.php:226 WWW_Users.php:546 WWW_Users.php:550 WWW_Users.php:717
+#: WWW_Users.php:720 WWW_Users.php:733 WWW_Users.php:736 WWW_Users.php:748
+#: WWW_Users.php:751 WWW_Users.php:763 WWW_Users.php:766
+#: includes/PDFLowGPPageHeader.inc:44
+#: reportwriter/languages/en_US/reports.php:82
msgid "No"
msgstr "ﻻ"
@@ -437,7 +435,7 @@
#: AddCustomerNotes.php:137 AddCustomerTypeNotes.php:131 Areas.php:164
#: BankAccounts.php:243 BOMs.php:198 COGSGLPostings.php:115
#: COGSGLPostings.php:222 CreditStatus.php:175 Currencies.php:374
-#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:456
+#: Currencies.php:391 CustItem.php:166 CustomerBranches.php:449
#: Customers.php:1131 Customers.php:1165 CustomerTypes.php:205
#: Departments.php:186 EDIMessageFormat.php:150 Factors.php:334
#: FixedAssetCategories.php:190 FixedAssetLocations.php:111
@@ -446,8 +444,8 @@
#: Labels.php:358 Locations.php:439 MailingGroupMaintenance.php:178
#: MaintenanceTasks.php:118 Manufacturers.php:260 MRPDemands.php:309
#: MRPDemandTypes.php:120 PaymentMethods.php:232 PaymentTerms.php:205
-#: PcAssignCashToTab.php:291 PcClaimExpensesFromTab.php:280 PcExpenses.php:226
-#: PcTabs.php:256 PcTypeTabs.php:180 PO_AuthorisationLevels.php:151
+#: PcAssignCashToTab.php:271 PcClaimExpensesFromTab.php:330 PcExpenses.php:177
+#: PcTabs.php:214 PcTypeTabs.php:124 PO_AuthorisationLevels.php:156
#: PriceMatrix.php:293 Prices_Customer.php:286 Prices.php:253
#: ProductSpecs.php:465 PurchData.php:312 QATests.php:467
#: SalesCategories.php:305 SalesGLPostings.php:137 SalesGLPostings.php:255
@@ -474,7 +472,7 @@
#: AddCustomerNotes.php:138 AddCustomerTypeNotes.php:132 Areas.php:165
#: BankAccounts.php:244 BOMs.php:200 COGSGLPostings.php:116
#: COGSGLPostings.php:223 ContractBOM.php:271 ContractOtherReqts.php:123
-#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:419
+#: CounterReturns.php:740 CounterSales.php:836 Credit_Invoice.php:429
#: CreditStatus.php:176 Currencies.php:377 CustItem.php:167
#: CustomerReceipt.php:1009 Customers.php:1166 CustomerTypes.php:206
#: Departments.php:187 DiscountCategories.php:238 DiscountMatrix.php:183
@@ -485,9 +483,9 @@
#: Locations.php:440 MailingGroupMaintenance.php:179 MaintenanceTasks.php:119
#: Manufacturers.php:261 MRPDemands.php:310 MRPDemandTypes.php:121
#: PaymentMethods.php:233 Payments.php:1283 PaymentTerms.php:206
-#: PcAssignCashToTab.php:295 PcClaimExpensesFromTab.php:281 PcExpenses.php:227
-#: PcExpensesTypeTab.php:186 PcTabs.php:257 PcTypeTabs.php:181
-#: PO_AuthorisationLevels.php:153 PO_Items.php:768 PriceMatrix.php:292
+#: PcAssignCashToTab.php:272 PcClaimExpensesFromTab.php:331 PcExpenses.php:178
+#: PcExpensesTypeTab.php:156 PcTabs.php:215 PcTypeTabs.php:125
+#: PO_AuthorisationLevels.php:158 PO_Items.php:768 PriceMatrix.php:292
#: Prices_Customer.php:287 Prices.php:254 ProductSpecs.php:466
#: PurchData.php:314 PurchData.php:721 QATests.php:468
#: RelatedItemsUpdate.php:161 RelatedItemsUpdate.php:176
@@ -507,6 +505,7 @@
#: UnitsOfMeasure.php:186 WorkCentres.php:146 WorkOrderEntry.php:865
#: WOSerialNos.php:335 WWW_Access.php:133 WWW_Users.php:392
#: includes/InputSerialItemsKeyed.php:60 includes/OutputSerialItems.php:99
+#: reportwriter/languages/en_US/reports.php:141
#, php-format
msgid "Delete"
msgstr "حذف"
@@ -531,7 +530,7 @@
#: AccountGroups.php:376 CompanyPreferences.php:466
#: ConfirmDispatch_Invoice.php:656 ConfirmDispatch_Invoice.php:1707
-#: Credit_Invoice.php:1633 CustItem.php:452 FixedAssetItems.php:132
+#: Credit_Invoice.php:1643 CustItem.php:452 FixedAssetItems.php:132
#: FixedAssetItems.php:683 GLAccountUsers.php:153 GLBudgets.php:240
#: GLCashFlowsSetup.php:172 GLTags.php:68 GoodsReceived.php:298
#: GoodsReceived.php:304 GoodsReceived.php:311 GoodsReceived.php:819
@@ -539,7 +538,8 @@
#: InternalStockRequestAuthorisation.php:123
#: InternalStockRequestFulfill.php:364 InternalStockRequest.php:255
#: LocationUsers.php:177 MRPCalendar.php:315 Payments.php:1109
-#: Payments.php:1350 PcAuthorizeExpenses.php:109 PcAuthorizeExpenses.php:294
+#: Payments.php:1350 PcAuthorizeCash.php:100 PcAuthorizeCash.php:274
+#: PcAuthorizeExpenses.php:140 PcAuthorizeExpenses.php:361
#: PO_AuthoriseMyOrders.php:142 PricesByCost.php:223 PurchData.php:758
#: ReorderLevelLocation.php:140 RevisionTranslations.php:111
#: SecurityTokens.php:136 SelectCreditItems.php:954 SellThroughSupport.php:476
@@ -550,16 +550,15 @@
msgid "Update"
msgstr ""
-#: AccountGroups.php:378 AccountGroups.php:418
-#: AnalysisHorizontalIncome.php:125 AnalysisHorizontalIncome.php:526
-#: AnalysisHorizontalPosition.php:79 AnalysisHorizontalPosition.php:362
-#: DailyBankTransactions.php:256 GLAccountUsers.php:253 GLBalanceSheet.php:720
-#: GLCashFlowsIndirect.php:749 GLCashFlowsIndirect.php:782
-#: GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317 GLTrialBalance.php:740
-#: InternalStockRequestInquiry.php:263 PurchasesReport.php:231
-#: PurchasesReport.php:253 SecurityTokens.php:140 SecurityTokens.php:156
-#: UserGLAccounts.php:259 Z_GLAccountUsersCopyAuthority.php:96
-#: includes/Login.php:8
+#: AccountGroups.php:378 AccountGroups.php:418 AnalysisHorizontalIncome.php:125
+#: AnalysisHorizontalIncome.php:526 AnalysisHorizontalPosition.php:79
+#: AnalysisHorizontalPosition.php:362 DailyBankTransactions.php:256
+#: GLAccountUsers.php:253 GLBalanceSheet.php:720 GLCashFlowsIndirect.php:749
+#: GLCashFlowsIndirect.php:782 GLCashFlowsSetup.php:180 GLProfit_Loss.php:1317
+#: GLTrialBalance.php:740 InternalStockRequestInquiry.php:263
+#: PurchasesReport.php:231 PurchasesReport.php:253 SecurityTokens.php:140
+#: SecurityTokens.php:156 UserGLAccounts.php:259
+#: Z_GLAccountUsersCopyAuthority.php:96 includes/Login.php:8
msgid "Return"
msgstr ""
@@ -685,7 +684,7 @@
#: GLAccounts.php:285 Labels.php:647 Locations.php:716 Manufacturers.php:375
#: MRPDemands.php:424 MRPDemandTypes.php:188 OffersReceived.php:57
#: OffersReceived.php:146 PaymentMethods.php:332 PaymentTerms.php:310
-#: PO_AuthorisationLevels.php:264 PriceMatrix.php:236 Prices_Customer.php:369
+#: PO_AuthorisationLevels.php:269 PriceMatrix.php:236 Prices_Customer.php:369
#: ProductSpecs.php:661 QATests.php:359 SalesAnalReptCols.php:552
#: SalesAnalRepts.php:519 SalesGLPostings.php:427 SalesPeople.php:381
#: SelectQASamples.php:531 SelectQASamples.php:601 Shippers.php:203
@@ -733,11 +732,11 @@
#: AddCustomerContacts.php:63 AddCustomerNotes.php:51
#: AddCustomerTypeNotes.php:48 Areas.php:72 CustomerTypes.php:68
#: DeliveryDetails.php:809 DeliveryDetails.php:826 Factors.php:105
-#: FixedAssetItems.php:255 MRPCalendar.php:176 PcAssignCashToTab.php:102
-#: PcClaimExpensesFromTab.php:86 PcExpenses.php:98 PcTabs.php:124
-#: PcTypeTabs.php:63 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76
+#: FixedAssetItems.php:255 MRPCalendar.php:176 PcAssignCashToTab.php:83
+#: PcClaimExpensesFromTab.php:69 PcExpenses.php:63 PcTabs.php:76
+#: PcTypeTabs.php:38 PO_Items.php:380 ProductSpecs.php:315 QATests.php:76
#: SalesAnalReptCols.php:129 SalesPeople.php:105 SalesTypes.php:66
-#: SelectQASamples.php:85 Stocks.php:594 Suppliers.php:531 SupplierTypes.php:68
+#: SelectQASamples.php:85 Stocks.php:594 Suppliers.php:524 SupplierTypes.php:68
msgid "has been updated"
msgstr ""
@@ -750,13 +749,13 @@
msgstr ""
#: AddCustomerContacts.php:133 CompanyPreferences.php:171
-#: CustomerBranches.php:409 Cus...
[truncated message content] |
|
From: <rc...@us...> - 2017-10-05 18:55:03
|
Revision: 7845
http://sourceforge.net/p/web-erp/reponame/7845
Author: rchacon
Date: 2017-10-05 18:55:01 +0000 (Thu, 05 Oct 2017)
Log Message:
-----------
Minor: Adjust labels.
Modified Paths:
--------------
trunk/GLTrialBalance.php
trunk/SalesGraph.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2017-10-03 10:19:22 UTC (rev 7844)
+++ trunk/GLTrialBalance.php 2017-10-05 18:55:01 UTC (rev 7845)
@@ -52,7 +52,7 @@
/*Show a form to allow input of criteria for TB to show */
echo '<table class="selection">
<tr>
- <td>' . _('Select Period From:') . '</td>
+ <td>' . _('Select Period From') . ':</td>
<td><select name="FromPeriod">';
$NextYear = date('Y-m-d',strtotime('+1 Year'));
$sql = "SELECT periodno,
@@ -88,7 +88,7 @@
}
echo '<tr>
- <td>' . _('Select Period To:') . '</td>
+ <td>' . _('Select Period To') . ':</td>
<td><select name="ToPeriod">';
$RetResult = DB_data_seek($Periods,0);
Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php 2017-10-03 10:19:22 UTC (rev 7844)
+++ trunk/SalesGraph.php 2017-10-05 18:55:01 UTC (rev 7845)
@@ -39,7 +39,7 @@
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
echo '<table class="selection">
- <tr><td>' . _('Select Period From:') . '</td>
+ <tr><td>' . _('Select Period From') . ':</td>
<td><select name="FromPeriod">';
if (Date('m') > $_SESSION['YearEnd']){
@@ -75,7 +75,7 @@
}
echo '<tr>
- <td>' . _('Select Period To:') . '</td>
+ <td>' . _('Select Period To') . ':</td>
<td><select name="ToPeriod">';
$RetResult = DB_data_seek($Periods,0);
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2017-10-03 10:19:22 UTC (rev 7844)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2017-10-05 18:55:01 UTC (rev 7845)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.13\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-02 10:21-0600\n"
-"PO-Revision-Date: 2017-10-02 10:27-0600\n"
+"PO-Revision-Date: 2017-10-05 12:52-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -15685,11 +15685,11 @@
#: GLProfit_Loss.php:51 GLTagProfit_Loss.php:41 Z_RePostGLFromPeriod.php:18
#: Z_UpdateChartDetailsBFwd.php:24
msgid "Select Period From"
-msgstr "Seleccionar Período Desde"
+msgstr "Seleccionar el período desde"
#: GLProfit_Loss.php:91 GLTagProfit_Loss.php:81 Z_UpdateChartDetailsBFwd.php:42
msgid "Select Period To"
-msgstr "Seleccionar Período Hasta"
+msgstr "Seleccionar el período hasta"
#: GLProfit_Loss.php:199
msgid "Print Profit and Loss Error"
@@ -15845,11 +15845,11 @@
#: GLTrialBalance.php:55 SalesGraph.php:42
msgid "Select Period From:"
-msgstr "Seleccionar Período desde:"
+msgstr "Seleccionar el período desde:"
#: GLTrialBalance.php:91 SalesGraph.php:78
msgid "Select Period To:"
-msgstr "Hata Período:"
+msgstr "Seleccionar el período hasta:"
#: GLTrialBalance.php:110
msgid "Show Trial Balance"
|
|
From: <rc...@us...> - 2017-10-11 17:05:12
|
Revision: 7849
http://sourceforge.net/p/web-erp/reponame/7849
Author: rchacon
Date: 2017-10-11 17:05:10 +0000 (Wed, 11 Oct 2017)
Log Message:
-----------
Improve currency showing and set decimals variable for exchange rate
Modified Paths:
--------------
trunk/Payments.php
trunk/doc/Change.log
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2017-10-11 11:01:43 UTC (rev 7848)
+++ trunk/Payments.php 2017-10-11 17:05:10 UTC (rev 7849)
@@ -3,17 +3,25 @@
/* Entry of bank account payments either against an AP account or a general ledger payment - if the AP-GL link in company preferences is set */
include('includes/DefinePaymentClass.php');
+
include('includes/session.php');
$Title = _('Payment Entry');
-if(isset($_GET['SupplierID'])) {
+if(isset($_GET['SupplierID'])) {// Links to Manual before header.php
$ViewTopic = 'AccountsPayable';
$BookMark = 'SupplierPayments';
+ $PageTitleText = _('Enter a Payment to, or Receipt from the Supplier');
} else {
$ViewTopic= 'GeneralLedger';
$BookMark = 'BankAccountPayments';
+ $PageTitleText = _('Bank Account Payments Entry');
}
include('includes/header.php');
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/transactions.png" title="', // Icon image.
+ $PageTitleText, '" /> ', // Icon title.
+ $PageTitleText, '</p>';// Page title.
+
include('includes/SQL_CommonFunctions.inc');
if(isset($_POST['PaymentCancelled'])) {
@@ -21,12 +29,13 @@
include('includes/footer.php');
exit();
}
+
if(empty($_GET['identifier'])) {
- /*unique session identifier to ensure that there is no conflict with other order enty session on the same machine */
- $identifier=date('U');
+ $identifier = date('U');// Unique session identifier to ensure that there is no conflict with other order entry session on the same machine.
} else {
- $identifier=$_GET['identifier'];//edit GLItems
+ $identifier = $_GET['identifier'];
}
+
if(isset($_GET['NewPayment']) AND $_GET['NewPayment']=='Yes') {
unset($_SESSION['PaymentDetail'.$identifier]->GLItems);
unset($_SESSION['PaymentDetail'.$identifier]);
@@ -37,22 +46,16 @@
$_SESSION['PaymentDetail'.$identifier]->GLItemCounter = 1;
}
-if((isset($_POST['UpdateHeader'])
- AND $_POST['BankAccount']=='')
+if((isset($_POST['UpdateHeader']) AND $_POST['BankAccount']=='')
OR (isset($_POST['Process']) AND $_POST['BankAccount']=='')) {
prnMsg(_('A bank account must be selected to make this payment from'), 'warn');
- $BankAccountEmpty=true;
+ $BankAccountEmpty = true;
} else {
-
- $BankAccountEmpty=false;
+ $BankAccountEmpty = false;
}
-echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
- '/images/transactions.png" title="',// Icon image.
- _('Bank Account Payments Entry'), '" /> ',// Icon title.
- _('Bank Account Payments Entry'), '</p>';// Page title.
-echo '<div class="page_help_text">' . _('Use this screen to enter payments FROM your bank account.<br />Note: To enter a payment FROM a supplier, first select the Supplier, click Enter a Payment to, or Receipt from the Supplier, and use a negative Payment amount on this form.') . '</div>
+echo '<div class="page_help_text">', _('Use this screen to enter payments FROM your bank account.<br />Note: To enter a payment FROM a supplier, first select the Supplier, click Enter a Payment to, or Receipt from the Supplier, and use a negative Payment amount on this form.'), '</div>
<br />';
if(isset($_GET['SupplierID'])) {
@@ -126,12 +129,13 @@
if(isset($_POST['BankAccount']) AND $_POST['BankAccount']!='') {
- $_SESSION['PaymentDetail'.$identifier]->Account=$_POST['BankAccount'];
- /*Get the bank account currency and set that too */
+ $_SESSION['PaymentDetail'.$identifier]->Account = $_POST['BankAccount'];
+ // Get the bank account currency and set that too
$ErrMsg = _('Could not get the currency of the bank account');
$result = DB_query("SELECT currcode,
decimalplaces
- FROM bankaccounts INNER JOIN currencies
+ FROM bankaccounts
+ INNER JOIN currencies
ON bankaccounts.currcode = currencies.currabrev
WHERE accountcode ='" . $_POST['BankAccount'] . "'",
$ErrMsg);
@@ -158,7 +162,7 @@
$_SESSION['PaymentDetail'.$identifier]->ExRate=filter_number_format($_POST['ExRate']); //ex rate between payment currency and account currency
}
if(isset($_POST['FunctionalExRate']) AND $_POST['FunctionalExRate']!='') {
- $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate=filter_number_format($_POST['FunctionalExRate']); //ex rate between bank account currency and functional (business home) currency
+ $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate = filter_number_format($_POST['FunctionalExRate']); //ex rate between bank account currency and functional (business home) currency
}
if(isset($_POST['Paymenttype']) AND $_POST['Paymenttype']!='') {
$_SESSION['PaymentDetail'.$identifier]->Paymenttype = $_POST['Paymenttype'];
@@ -165,11 +169,11 @@
//lets validate the paymenttype here
$sql = "SELECT usepreprintedstationery
FROM paymentmethods
- WHERE paymentname='" . $_SESSION['PaymentDetail' . $identifier]->Paymenttype . "'";
+ WHERE paymentname='" . $_SESSION['PaymentDetail'.$identifier]->Paymenttype . "'";
$result = DB_query($sql);
$myrow = DB_fetch_row($result);
- if ($myrow[0] == 1) {
- if (empty($_POST['ChequeNum'])) {
+ if($myrow[0] == 1) {
+ if(empty($_POST['ChequeNum'])) {
prnMsg(_('The cheque number should not be empty'),'warn');
$Errors[] = 'ChequeNum';
} else {
@@ -177,7 +181,7 @@
$ErrMsg = _('Failed to retrieve cheque number data');
$cheqresult = DB_query($cheqsql,$ErrMsg);
$cheqrow = DB_fetch_row($cheqresult);
- if ($cheqrow[0]>0) {
+ if($cheqrow[0]>0) {
prnMsg(_('The cheque has already been used'),'warn');
$Errors[] = 'ChequeNum';
}
@@ -340,11 +344,11 @@
AND ($myrow[0] == 1)) {
// it is a supplier payment by cheque and haven't printed yet so print cheque
//check the cheque number
- if (empty($_POST['ChequeNum'])) {
+ if(empty($_POST['ChequeNum'])) {
prnMsg(_('There are no Check Number input'),'error');
include('includes/footer.inc');
exit;
- } elseif (!is_numeric($_POST['ChequeNum'])){//check if this cheque no has been used
+ } elseif(!is_numeric($_POST['ChequeNum'])) {//check if this cheque no has been used
prnMsg(_('The cheque no should be numeric'),'error');
include('includes/footer.inc');
exit;
@@ -353,7 +357,7 @@
$ErrMsg = _('Failed to retrieve cheque number data');
$cheqresult = DB_query($cheqsql,$ErrMsg);
$cheqrow = DB_fetch_row($cheqresult);
- if ($cheqrow[0]>0) {
+ if($cheqrow[0]>0) {
prnMsg(_('The cheque has already been used'),'error');
include('includes/footer.inc');
exit;
@@ -362,11 +366,11 @@
//store the paid array here;
$PaidArray = array();
foreach ($_POST as $name=>$Value) {
- if (substr($name, 0, 4) == 'paid' AND $Value>0) {
+ if(substr($name, 0, 4) == 'paid' AND $Value>0) {
$PaidArray[substr($name, 4)] = $Value;
}
}
- if (!empty($PaidArray)) {
+ if(!empty($PaidArray)) {
$PaidJ = base64_encode(serialize($PaidArray));
$PaidInput = '<input type="hidden" name="PaidArray" value="' . $PaidJ . '" />';
} else {
@@ -385,7 +389,7 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo _('Has the cheque been printed') . '?
<br />
- <br />'
+ <br />'
. $PaidInput . '
<input type="hidden" name="BankTransRef" value="' . $_POST['BankTransRef'] . '" />
<input type="hidden" name="ChequeNum" value="' . $_POST['ChequeNum'] . '" />
@@ -474,11 +478,11 @@
/*Make sure to use the same rate if the transfer is between two bank accounts in the same currency */
$TrfToBankExRate = $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate;
}
- if ($_SESSION['PaymentDetail' . $identifier]->Currency == $TrfToBankCurrCode) {
+ if($_SESSION['PaymentDetail'.$identifier]->Currency == $TrfToBankCurrCode) {
$ExRate = 1;
- $TrfToBankExRate = $_SESSION['PaymentDetail' . $identifier]->ExRate;
+ $TrfToBankExRate = $_SESSION['PaymentDetail'.$identifier]->ExRate;
} else {
- $ExRate = ($_SESSION['PaymentDetail'.$identifier]->ExRate * $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate)/$TrfFromBankExRate;
+ $ExRate = ($_SESSION['PaymentDetail'.$identifier]->ExRate * $_SESSION['PaymentDetail'.$identifier]->FunctionalExRate)/$TrfFromBankExRate;
}
/*Consider an example
@@ -538,12 +542,12 @@
}
}
} else {
-
+
/* Get an array of suuptans id fields that were paid */
- if (!isset($_POST['PaidArray'])) {
+ if(!isset($_POST['PaidArray'])) {
$PaidArray = array();
foreach ($_POST as $name=>$Value) {
- if (substr($name, 0, 4) == 'paid' AND $Value>0) {
+ if(substr($name, 0, 4) == 'paid' AND $Value>0) {
$PaidArray[substr($name, 4)] = $Value;
}
}
@@ -588,7 +592,7 @@
$Result = DB_query($SQL,'','',true);
$MyRow = DB_fetch_array($Result);
$PaymentID = $MyRow['id'];
- if (sizeof($PaidArray) > 0) {
+ if(sizeof($PaidArray) > 0) {
foreach ($PaidArray as $PaidID=>$PaidAmount) {
/* Firstly subtract from the payment the amount of the invoice */
$SQL = "UPDATE supptrans SET alloc=alloc-" . $PaidAmount . " WHERE id='" . $PaymentID . "'";
@@ -607,7 +611,7 @@
transid_allocto
) VALUES (
'" . $PaidAmount . "',
- '" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
+ '" . FormatDateForSQL($_SESSION['PaymentDetail'.$identifier]->DatePaid) . "',
'" . $PaymentID . "',
'" . $PaidID . "'
)";
@@ -795,7 +799,7 @@
$_POST['Narrative'] = $_SESSION['PaymentDetail'.$identifier]->Narrative;
} elseif(isset($_POST['Process']) AND !$BankAccountEmpty) { //user hit submit a new GL Analysis line into the payment
- if (!empty($_POST['Cheque'])) {
+ if(!empty($_POST['Cheque'])) {
$ChequeNoSQL="SELECT transno FROM supptrans WHERE chequeno='" . $_POST['Cheque'] ."'";
$ChequeNoResult=DB_query($ChequeNoSQL);
}
@@ -967,47 +971,57 @@
}
echo '<tr>
- <td>', _('Date Paid'), ':</td>
+ <td>', _('Date'), ':</td>
<td><input alt="', $_SESSION['DefaultDateFormat'], '" class="date" maxlength="10" name="DatePaid" onchange="isDate(this, this.value, ', "'", $_SESSION['DefaultDateFormat'], "'", ')" required="required" size="10" type="text" value="', $_SESSION['PaymentDetail'.$identifier]->DatePaid, '" /></td>
</tr>';
-
-if($_SESSION['PaymentDetail'.$identifier]->SupplierID=='') {
- echo '<tr>
- <td>' . _('Currency of Payment') . ':</td>
- <td><select name="Currency" required="required" onchange="ReloadForm(UpdateHeader)">';
- $SQL = "SELECT currency, currabrev, rate FROM currencies";
- $result=DB_query($SQL);
-
- if(DB_num_rows($result)==0) {
- echo '</select></td>
+// Currency of payment:
+echo '<tr>
+ <td>', _('Currency'), ':</td>
+ <td>';
+/*$result = DB_query("SELECT currency, currabrev, rate FROM currencies");*/
+$result = DB_query("SELECT currabrev FROM currencies");
+if(DB_num_rows($result) == 0) {
+ prnMsg( _('No currencies are defined yet. Payments cannot be entered until a currency is defined'),'error');
+ echo '</td>
+ </tr>';
+} else {
+ include('includes/CurrenciesArray.php');// To get the currency name from the currency code.
+ if($_SESSION['PaymentDetail'.$identifier]->SupplierID == '') {
+ echo '<select name="Currency" onchange="ReloadForm(UpdateHeader)" required="required">';
+ while($myrow=DB_fetch_array($result)) {
+ echo '<option ';
+ if($_SESSION['PaymentDetail'.$identifier]->Currency == $myrow['currabrev']) {
+ echo 'selected="selected" ';
+ }
+ echo 'value="', $myrow['currabrev'], '">', $CurrencyName[$myrow['currabrev']], '</option>';
+ }
+ echo '</select>', _('The transaction currency does not need to be the same as the bank account currency'), '</td>
</tr>';
- prnMsg( _('No currencies are defined yet. Payments cannot be entered until a currency is defined'),'error');
- } else {
- include('includes/CurrenciesArray.php'); // To get the currency name from the currency code.
+ } else { /*It is a supplier payment so it must be in the supplier's currency */
+ echo '<input name="Currency" type="hidden" value="', $_SESSION['PaymentDetail'.$identifier]->Currency, '" />';
+ echo '<select disabled="disabled">';
while($myrow=DB_fetch_array($result)) {
echo '<option ';
- if($_SESSION['PaymentDetail'.$identifier]->Currency==$myrow['currabrev']) {
+ if($_SESSION['PaymentDetail'.$identifier]->Currency == $myrow['currabrev']) {
echo 'selected="selected" ';
}
echo 'value="', $myrow['currabrev'], '">', $CurrencyName[$myrow['currabrev']], '</option>';
}
- echo '</select> <i>', _('The transaction currency does not need to be the same as the bank account currency'), '</i></td>
- </tr>';
+ echo '</select>';
+ echo ' ', _('It is a supplier payment so it should be in the supplier\'s currency'), '</td>
+ </tr>';// Sometimes some people pay in a currency different from supplier's document currency (e.g. invoice in euros paid in dollars).
+
+ /*get the default rate from the currency table if it has not been set */
+ if(!isset($_POST['ExRate']) OR $_POST['ExRate'] == '') {
+ $SQL = "SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail'.$identifier]->Currency . "'";
+ $Result = DB_query($SQL);
+ $myrow = DB_fetch_row($Result);
+ $_POST['ExRate'] = locale_number_format($myrow[0], 'Variable');
+ }// RChacon: Should be for both cases (Bank_payment and supplier_payment) ?
}
-} else { /*its a supplier payment so it must be in the suppliers currency */
- echo '<tr>';
- echo '<td><input type="hidden" name="Currency" value="' . $_SESSION['PaymentDetail'.$identifier]->Currency . '" />
- ' . _('Supplier Currency') . ':</td>
- <td>' . $_SESSION['PaymentDetail'.$identifier]->Currency . '</td>
- </tr>';
- /*get the default rate from the currency table if it has not been set */
- if(!isset($_POST['ExRate']) OR $_POST['ExRate']=='') {
- $SQL = "SELECT rate FROM currencies WHERE currabrev='" . $_SESSION['PaymentDetail'.$identifier]->Currency ."'";
- $Result=DB_query($SQL);
- $myrow=DB_fetch_row($Result);
- $_POST['ExRate']=locale_number_format($myrow[0],'Variable');
- }
+ // RChacon: Set ExRate from the currency table if it has not been set ?
+ // RChacon: Set SuggestedExRate from the currency table if it has not been set ?
}
if(!isset($_POST['ExRate'])) {
@@ -1018,34 +1032,34 @@
$_POST['FunctionalExRate']=1;
}
if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency != $_SESSION['PaymentDetail'.$identifier]->Currency AND isset($_SESSION['PaymentDetail'.$identifier]->AccountCurrency)) {
- if (isset($SuggestedExRate) AND ($_POST['ExRate'] == 1 OR $_POST['Currency'] != $_POST['PreviousCurrency'] OR $_POST['PreviousBankAccount'] != $_SESSION['PaymentDetail' . $identifier]->Account)) {
- $_POST['ExRate'] = locale_number_format($SuggestedExRate,12);
+ if(isset($SuggestedExRate) AND ($_POST['ExRate'] == 1 OR $_POST['Currency'] != $_POST['PreviousCurrency'] OR $_POST['PreviousBankAccount'] != $_SESSION['PaymentDetail'.$identifier]->Account)) {
+ $_POST['ExRate'] = locale_number_format($SuggestedExRate, 'Variable');
}
if(isset($SuggestedExRate)) {
- $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . ' = ' . locale_number_format($SuggestedExRate,12) . ' ' . $_SESSION['PaymentDetail'.$identifier]->Currency . '</b>';
+ $SuggestedExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . ' = ' . locale_number_format($SuggestedExRate, 'Variable') . ' ' . $_SESSION['PaymentDetail'.$identifier]->Currency . '</b>';
} else {
$SuggestedExRateText = '1 ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . ' = ? ' . $_SESSION['PaymentDetail'.$identifier]->Currency;
}
echo '<tr>
<td>', _('Payment Exchange Rate'), ':</td>
- <td><input class="number" maxlength="12" name="ExRate" size="14" title="', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '" type="text" value="', $_POST['ExRate'], '" /> ', $SuggestedExRateText, '. <i>', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '.</i></td>
+ <td><input class="number" maxlength="12" name="ExRate" size="14" title="', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '" type="text" value="', $_POST['ExRate'], '" /> ', $SuggestedExRateText, ' ', _('The exchange rate between the currency of the bank account currency and the currency of the payment'), '</td>
</tr>';
}
if($_SESSION['PaymentDetail'.$identifier]->AccountCurrency != $_SESSION['CompanyRecord']['currencydefault'] AND isset($_SESSION['PaymentDetail'.$identifier]->AccountCurrency)) {
- if (isset($SuggestedFunctionalExRate) AND ($_POST['FunctionalExRate']==1 OR $_POST['Currency'] != $_POST['PreviousCurrency'] OR $_POST['PreviousBankAccount'] != $_SESSION['PaymentDetail' . $identifier]->Account)) {
- $_POST['FunctionalExRate'] = locale_number_format($SuggestedFunctionalExRate,'Variable');
+ if(isset($SuggestedFunctionalExRate) AND ($_POST['FunctionalExRate']==1 OR $_POST['Currency'] != $_POST['PreviousCurrency'] OR $_POST['PreviousBankAccount'] != $_SESSION['PaymentDetail'.$identifier]->Account)) {
+ $_POST['FunctionalExRate'] = locale_number_format($SuggestedFunctionalExRate, 'Variable');
}
if(isset($SuggestedFunctionalExRate)) {
- $SuggestedFunctionalExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ' . locale_number_format($SuggestedFunctionalExRate,8) . ' ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . '</b>';
+ $SuggestedFunctionalExRateText = '<b>' . _('Suggested rate:') . ' 1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ' . locale_number_format($SuggestedFunctionalExRate, 'Variable') . ' ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency . '</b>';
} else {
$SuggestedFunctionalExRateText = '1 ' . $_SESSION['CompanyRecord']['currencydefault'] . ' = ? ' . $_SESSION['PaymentDetail'.$identifier]->AccountCurrency;
}
echo '<tr>
<td>', _('Functional Exchange Rate'), ':</td>
- <td><input class="number" maxlength="12" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="14" title="', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '" type="text" value="', $_POST['FunctionalExRate'], '" /> ', $SuggestedFunctionalExRateText, '. <i>', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '.</i></td>
+ <td><input class="number" maxlength="16" name="FunctionalExRate" pattern="[0-9\.,]*" required="required" size="18" type="text" value="', $_POST['FunctionalExRate'], '" /> ', $SuggestedFunctionalExRateText, ' ', _('The exchange rate between the currency of the business (the functional currency) and the currency of the bank account'), '</td>
</tr>';
}
echo '<tr>
@@ -1070,7 +1084,7 @@
if(!isset($_POST['ChequeNum'])) {
$_POST['ChequeNum']='';
}
-if (!empty($Errors)) {
+if(!empty($Errors)) {
$ErrClass = 'class="error"';
} else {
$ErrClass = '';
@@ -1087,7 +1101,7 @@
}
echo '<tr>
<td>', _('Reference'), ':</td>
- <td><input maxlength="50" name="BankTransRef" size="52" type="text" value="', stripslashes($_POST['BankTransRef']), '" /> ', _('Reference in banking transactions'), '</td>
+ <td><input maxlength="50" name="BankTransRef" size="52" type="text" value="', stripslashes($_POST['BankTransRef']), '" /> <i>', _('Reference on Bank Transactions Inquiry'), '.</i></td>
</tr>';
// Info to be inserted on `gltrans`.`narrative` varchar(200):
@@ -1094,18 +1108,18 @@
if(!isset($_POST['Narrative'])) {
$_POST['Narrative'] = '';
}
-if (!isset($_POST['Currency'])) {
+if(!isset($_POST['Currency'])) {
$_POST['Currency'] = '';
}
echo '<tr>
<td>', _('Narrative'), ':</td>
- <td><input maxlength="200" name="Narrative" size="52" type="text" value="', stripslashes($_POST['Narrative']), '" /> ', _('Narrative on General Ledger Account Inquiry'), '</td>
+ <td><input maxlength="200" name="Narrative" size="52" type="text" value="', stripslashes($_POST['Narrative']), '" /> <i>', _('Narrative on General Ledger Account Inquiry'), '.</i></td>
</tr>';
echo '<tr>
<td colspan="2"><div class="centre">
<input name="PreviousCurrency" type="hidden" value="', $_POST['Currency'], '" />
- <input type="hidden" name="PreviousBankAccount" value="' . $_SESSION['PaymentDetail' . $identifier]->Account . '" />
+ <input type="hidden" name="PreviousBankAccount" value="' . $_SESSION['PaymentDetail'.$identifier]->Account . '" />
<input name="UpdateHeader" type="submit" value="', _('Update'), '" />
</div></td>
</tr>
@@ -1276,7 +1290,7 @@
echo '<tr>
<td>' . $PaymentItem->Cheque . '</td>
- <td class="number">' . locale_number_format($PaymentItem->Amount,$_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format($PaymentItem->Amount, $_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces) . '</td>
<td>' . $PaymentItem->GLCode . ' - ' . $PaymentItem->GLActName . '</td>
<td>' . stripslashes($PaymentItem->Narrative) . '</td>
<td>' . $PaymentItem->Tag . ' - ' . $TagName . '</td>
@@ -1286,7 +1300,7 @@
}
echo '<tr>
<td></td>
- <td class="number"><b>' . locale_number_format($PaymentTotal,$_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces) . '</b></td>
+ <td class="number"><b>' . locale_number_format($PaymentTotal, $_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces) . '</b></td>
<td></td>
<td></td>
<td></td>
@@ -1330,7 +1344,7 @@
$ids = '';
while ($myrow = DB_fetch_array($Result)) {
$ids .= $i>0?';' . $myrow['id']:$myrow['id'];
- if (!isset($_POST['paid'.$myrow['id']])) {
+ if(!isset($_POST['paid'.$myrow['id']])) {
$_POST['paid'.$myrow['id']] = 0;
}
echo '<tr>
@@ -1338,9 +1352,9 @@
<td>' . $myrow['typename'] . '</td>
<td>' . $myrow['transno'] . '</td>
<td>' . $myrow['suppreference'] . '</td>
- <td class="number">' . locale_number_format($myrow['amount'],$_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces) . '</td>
+ <td class="number">' . locale_number_format($myrow['amount'], $_SESSION['PaymentDetail'.$identifier]->CurrDecimalPlaces) . '</td>
<td><input onclick="AddAmount(this,'.$myrow['id'].');" type="checkbox" name="check'.$myrow['id'] . '" value="' . $myrow['amount'] . '" />' . _('Pay') . '</td>
- <td><input type="text" class="number" id="'.$myrow['id'].'" name="paid'.$myrow['id'].'" value="'.$_POST['paid'.$myrow['id']].'" />
+ <td><input type="text" class="number" id="'.$myrow['id'].'" name="paid'.$myrow['id'].'" value="'.$_POST['paid'.$myrow['id']].'" />
<input type="hidden" name="remainamt'.$myrow['id'] .'" value="'.$myrow['amount'].'" />
</td>
</tr>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-11 11:01:43 UTC (rev 7848)
+++ trunk/doc/Change.log 2017-10-11 17:05:10 UTC (rev 7849)
@@ -1,5 +1,6 @@
webERP Change Log
+17/10/11 RChacon: Improve currency showing and set decimals variable for exchange rate.
17/10/11 Exson: Fix the indian_number_format bug in MiscFunctions.php.
17/10/09 Exson: Fixed the non-balance bug in CustomerReceipt.php. And fixed the non rollback problem when there is a non-balance existed. Fixed error noises.
17/10/03 Exson: Add html view to SuppPriceList.php.
|
|
From: <rc...@us...> - 2017-10-11 18:16:43
|
Revision: 7850
http://sourceforge.net/p/web-erp/reponame/7850
Author: rchacon
Date: 2017-10-11 18:16:40 +0000 (Wed, 11 Oct 2017)
Log Message:
-----------
Set decimals variable for exchange rate in Currencies.php
Modified Paths:
--------------
trunk/Currencies.php
trunk/doc/Change.log
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2017-10-11 17:05:10 UTC (rev 7849)
+++ trunk/Currencies.php 2017-10-11 18:16:40 UTC (rev 7850)
@@ -28,10 +28,10 @@
$Errors = array();
-echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
- '/images/currency.png" title="' .// Icon image.
- _('Currencies') . '" /> ' .// Icon title.
- _('Currencies Maintenance') . '</p>';// Page title.
+echo '<p class="page_title_text"><img alt="" src="', $RootPath, '/css/', $Theme,
+ '/images/currency.png" title="', // Icon image.
+ _('Currencies'), '" /> ', // Icon title.
+ _('Currencies Maintenance'), '</p>';// Page title.
if (isset($_POST['submit'])) {
@@ -196,7 +196,7 @@
'" . FormatDateForSQL($PostingDate) . "',
'" . $PeriodNo . "',
'" . $_SESSION['CompanyRecord']['exchangediffact'] . "',
- '" . $myrowBankAccount['bankaccountname'] . ' ' . _('currency rate adjustment to') . ' ' . locale_number_format($NewRate,8) . ' ' . $SelectedCurrency . '/' . $_SESSION['CompanyRecord']['currencydefault']. "',
+ '" . $myrowBankAccount['bankaccountname'] . ' ' . _('currency rate adjustment to') . ' ' . locale_number_format($NewRate, 'Variable') . ' ' . $SelectedCurrency . '/' . $_SESSION['CompanyRecord']['currencydefault']. "',
'" . (-$DifferenceToAdjust) . "')";
$ErrMsg = _('Cannot insert a GL entry for the exchange difference because');
@@ -214,11 +214,11 @@
'" . FormatDateForSQL($PostingDate) . "',
'" . $PeriodNo . "',
'" . $myrowBankAccount['accountcode'] . "',
- '" . $myrowBankAccount['bankaccountname'] . ' ' . _('currency rate adjustment to') . ' ' . locale_number_format($NewRate,8) . ' ' . $SelectedCurrency . '/' . $_SESSION['CompanyRecord']['currencydefault']. "',
+ '" . $myrowBankAccount['bankaccountname'] . ' ' . _('currency rate adjustment to') . ' ' . locale_number_format($NewRate, 'Variable') . ' ' . $SelectedCurrency . '/' . $_SESSION['CompanyRecord']['currencydefault']. "',
'" . ($DifferenceToAdjust) . "')";
$result = DB_query($SQL,$ErrMsg,$DbgMsg,true);
- prnMsg(_('Bank Account') . ' ' . $myrowBankAccount['bankaccountname'] . ' ' . _('Currency Rate difference of') . ' ' . locale_number_format($DifferenceToAdjust,$_SESSION['CompanyRecord']['decimalplaces']) . ' ' . _('has been posted'),'success');
+ prnMsg(_('Bank Account') . ' ' . $myrowBankAccount['bankaccountname'] . ' ' . _('Currency Rate difference of') . ' ' . locale_number_format($DifferenceToAdjust, $_SESSION['CompanyRecord']['decimalplaces']) . ' ' . _('has been posted'),'success');
}
}
}
@@ -364,11 +364,11 @@
$CurrencyName[$myrow['currabrev']],
$myrow['country'],
$myrow['hundredsname'],
- locale_number_format($myrow['decimalplaces'],0),
+ locale_number_format($myrow['decimalplaces'], 0),
$ShowInWebText,
- locale_number_format($myrow['rate'],8),
- locale_number_format(1/$myrow['rate'],2),
- locale_number_format(GetCurrencyRate($myrow['currabrev'],$CurrencyRatesArray),8),
+ locale_number_format($myrow['rate'], 'Variable'),
+ locale_number_format(1/$myrow['rate'], 2),
+ locale_number_format(GetCurrencyRate($myrow['currabrev'],$CurrencyRatesArray), 8),
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$myrow['currabrev'],
_('Edit'),
@@ -442,8 +442,8 @@
$_POST['Abbreviation'] = $myrow['currabrev'];
$_POST['Country'] = $myrow['country'];
$_POST['HundredsName'] = $myrow['hundredsname'];
- $_POST['ExchangeRate'] = locale_number_format($myrow['rate'],8);
- $_POST['DecimalPlaces'] = locale_number_format($myrow['decimalplaces'],0);
+ $_POST['ExchangeRate'] = locale_number_format($myrow['rate'], 'Variable');
+ $_POST['DecimalPlaces'] = locale_number_format($myrow['decimalplaces'], 0);
$_POST['webcart'] = $myrow['webcart'];
echo '<input type="hidden" name="SelectedCurrency" value="' . $SelectedCurrency . '" />';
@@ -502,10 +502,10 @@
$_POST['ExchangeRate'] = 1;
}
if ($_POST['Abbreviation'] != $FunctionalCurrency) {
- echo '<td><input type="text" class="number" name="ExchangeRate" size="10" required="required" minlength="1" maxlength="10" value="' . $_POST['ExchangeRate'] . '" /></td>';
+ echo '<td><input class="number" maxlength="16" minlength="1" name="ExchangeRate" required="required" size="16" type="text" value="', $_POST['ExchangeRate'], '" /></td>';
} else {
- echo '<td>' . $_POST['ExchangeRate'] . '</td>';
- echo '<input type="hidden" class="number" name="ExchangeRate" value="' . $_POST['ExchangeRate'] . '" />';
+ echo '<td>', $_POST['ExchangeRate'], '</td>',
+ '<input class="number" name="ExchangeRate" type="hidden" value="', $_POST['ExchangeRate'], '" />';
}
echo '</tr>';
if (!isset($_POST['webcart'])) {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-11 17:05:10 UTC (rev 7849)
+++ trunk/doc/Change.log 2017-10-11 18:16:40 UTC (rev 7850)
@@ -1,6 +1,7 @@
webERP Change Log
-17/10/11 RChacon: Improve currency showing and set decimals variable for exchange rate.
+17/10/11 RChacon: Set decimals variable for exchange rate in Currencies.php.
+17/10/11 RChacon: Improve currency showing and set decimals variable for exchange rate in Payments.php.
17/10/11 Exson: Fix the indian_number_format bug in MiscFunctions.php.
17/10/09 Exson: Fixed the non-balance bug in CustomerReceipt.php. And fixed the non rollback problem when there is a non-balance existed. Fixed error noises.
17/10/03 Exson: Add html view to SuppPriceList.php.
|
|
From: <rc...@us...> - 2017-10-11 19:05:03
|
Revision: 7851
http://sourceforge.net/p/web-erp/reponame/7851
Author: rchacon
Date: 2017-10-11 19:05:01 +0000 (Wed, 11 Oct 2017)
Log Message:
-----------
If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text (simplifies code using css
)
Modified Paths:
--------------
trunk/GLCashFlowsIndirect.php
trunk/GLCashFlowsSetup.php
trunk/doc/Change.log
trunk/includes/header.php
Modified: trunk/GLCashFlowsIndirect.php
===================================================================
--- trunk/GLCashFlowsIndirect.php 2017-10-11 18:16:40 UTC (rev 7850)
+++ trunk/GLCashFlowsIndirect.php 2017-10-11 19:05:01 UTC (rev 7851)
@@ -470,7 +470,7 @@
INNER JOIN chartdetails ON chartmaster.accountcode=chartdetails.accountcode
INNER JOIN accountgroups ON chartmaster.group_=accountgroups.groupname
WHERE accountgroups.pandl=1";
- $Result = DB_query($Sql);
+ $Result = DB_query($Sql);
$MyRow1 = DB_fetch_array($Result);
echo colDebitCredit($MyRow1['ActualProfit']),
colDebitCredit($MyRow1['LastProfit']),
@@ -753,14 +753,14 @@
'/images/reports.png" title="', // Icon image.
$Title, '" /> ', // Icon title.
$Title, '</p>';// Page title.
- if(!isset($_SESSION['ShowPageHelp']) OR $_SESSION['ShowPageHelp']) {// If it is not set the $_SESSION['ShowPageHelp'] parameter OR it is TRUE, shows the page help text:
- echo '<div class="page_help_text">',
- _('The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities.'), '<br />',
- _('The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.'), '<br />',
- _('The statement of cash flows represents a period of time. This contrasts with the statement of financial position, which represents a single moment in time.'), '<br />',
- _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'),
- '</div>';
- }
+
+ echo '<div class="page_help_text">',
+ _('The statement of cash flows, also known as the successor of the old source and application of funds statement, reports how changes in balance sheet accounts and income affect cash and cash equivalents, and breaks the analysis down to operating, investing and financing activities.'), '<br />',
+ _('The purpose of the statement of cash flows is to show where the company got their money from and how it was spent during the period being reported for a user selectable range of periods.'), '<br />',
+ _('The statement of cash flows represents a period of time. This contrasts with the statement of financial position, which represents a single moment in time.'), '<br />',
+ _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.'),
+ '</div>';
+
// Shows a form to allow input of criteria for the report to generate:
echo '<br />',
'<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">',
Modified: trunk/GLCashFlowsSetup.php
===================================================================
--- trunk/GLCashFlowsSetup.php 2017-10-11 18:16:40 UTC (rev 7850)
+++ trunk/GLCashFlowsSetup.php 2017-10-11 19:05:01 UTC (rev 7851)
@@ -145,14 +145,12 @@
'/images/maintenance.png" title="', // Icon image.
$Title, '" /> ', // Icon title.
$Title, '</p>';// Page title.
- // BEGIN menu.
-if(!isset($page_help) OR $page_help) {
- // If it is not set the $page_help parameter OR it is TRUE, shows the page help text:
- echo '<div class="page_help_text">',
- _('The statement of cash flows, using direct and indirect methods, is partitioned into three sections: operating activities, investing activities and financing activities.'), '<br />',
- _('You must classify all accounts in any of those three sections of the cash flow statement, or as no effect on cash flow, or as cash or cash equivalent.'),
- '</div>';
-}
+
+echo '<div class="page_help_text">',
+ _('The statement of cash flows, using direct and indirect methods, is partitioned into three sections: operating activities, investing activities and financing activities.'), '<br />',
+ _('You must classify all accounts in any of those three sections of the cash flow statement, or as no effect on cash flow, or as cash or cash equivalent.'),
+ '</div>';
+
// Show a form to allow input of the action for the script to do:
echo '<br />',
'<form action="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '" method="post">',
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-11 18:16:40 UTC (rev 7850)
+++ trunk/doc/Change.log 2017-10-11 19:05:01 UTC (rev 7851)
@@ -1,5 +1,7 @@
webERP Change Log
+17/10/11 RChacon: If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text (simplifies code using css
+).
17/10/11 RChacon: Set decimals variable for exchange rate in Currencies.php.
17/10/11 RChacon: Improve currency showing and set decimals variable for exchange rate in Payments.php.
17/10/11 Exson: Fix the indian_number_format bug in MiscFunctions.php.
Modified: trunk/includes/header.php
===================================================================
--- trunk/includes/header.php 2017-10-11 18:16:40 UTC (rev 7850)
+++ trunk/includes/header.php 2017-10-11 19:05:01 UTC (rev 7851)
@@ -43,8 +43,12 @@
'<link href="', $RootPath, '/css/', $_SESSION['Theme'], '/default.css" rel="stylesheet" type="text/css" media="screen"/>',
'<meta name="viewport" content="width=device-width, initial-scale=1">',//To tell the small device that the website is a responsive site (keep relationship between CSS pixels and device pixels).
'<script type="text/javascript" src="', $RootPath, '/javascripts/MiscFunctions.js"></script>',
- '<title>', $Title, '</title>',
- '</head>',
+ '<title>', $Title, '</title>';
+ // If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text:
+ if(isset($_SESSION['ShowPageHelp']) AND !$_SESSION['ShowPageHelp']) {
+ echo '<style>.page_help_text, DIV.page_help_text {display:none;}</style>';
+ }
+ echo '</head>',
'<body>',
'<div id="CanvasDiv">',
|
|
From: <afc...@us...> - 2017-10-15 22:17:07
|
Revision: 7853
http://sourceforge.net/p/web-erp/reponame/7853
Author: afcouling
Date: 2017-10-15 22:17:04 +0000 (Sun, 15 Oct 2017)
Log Message:
-----------
Missing $Id comments added back in to Petty Cash scripts.
Modified Paths:
--------------
trunk/PcAnalysis.php
trunk/PcAssignCashTabToTab.php
trunk/PcAssignCashToTab.php
trunk/PcAuthorizeCash.php
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpenses.php
trunk/PcExpensesTypeTab.php
trunk/PcReportExpense.php
trunk/PcReportTab.php
trunk/PcTabExpensesList.php
trunk/PcTabs.php
trunk/PcTypeTabs.php
trunk/Tax.php
trunk/doc/Change.log
Modified: trunk/PcAnalysis.php
===================================================================
--- trunk/PcAnalysis.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcAnalysis.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id: PcAnalysis.php 7751 2017-04-13 16:34:26Z rchacon $*/
+
require_once ('Classes/PHPExcel.php');
include('includes/session.php');
Modified: trunk/PcAssignCashTabToTab.php
===================================================================
--- trunk/PcAssignCashTabToTab.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcAssignCashTabToTab.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,5 @@
<?php
+/* $Id: PcAssignCashTabToTab.php 7751 2017-04-13 16:34:26Z rchacon $*/
include('includes/session.php');
$Title = _('Assignment of Cash from Tab to Tab');
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcAssignCashToTab.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
$Title = _('Assignment of Cash to Petty Cash Tab');
/* webERP manual links before header.php */
Modified: trunk/PcAuthorizeCash.php
===================================================================
--- trunk/PcAuthorizeCash.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcAuthorizeCash.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id: PcAuthorizeCash.php 7751 2017-04-13 16:34:26Z rchacon $*/
+
include('includes/session.php');
$Title = _('Authorisation of Assigned Cash');
/* webERP manual links before header.php */
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcAuthorizeExpenses.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
$Title = _('Authorisation of Petty Cash Expenses');
/* webERP manual links before header.php */
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcClaimExpensesFromTab.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
$Title = _('Claim Petty Cash Expenses From Tab');
/* webERP manual links before header.php */
Modified: trunk/PcExpenses.php
===================================================================
--- trunk/PcExpenses.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcExpenses.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
$Title = _('Maintenance Of Petty Cash Of Expenses');
/* webERP manual links before header.php */
Modified: trunk/PcExpensesTypeTab.php
===================================================================
--- trunk/PcExpensesTypeTab.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcExpensesTypeTab.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
$Title = _('Maintenance Of Petty Cash Expenses For a Type Tab');
/* webERP manual links before header.php */
Modified: trunk/PcReportExpense.php
===================================================================
--- trunk/PcReportExpense.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcReportExpense.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,5 @@
<?php
+/* $Id: PcReportExpense.php 7751 2017-04-13 16:34:26Z rchacon $*/
include ('includes/session.php');
$Title = _('Petty Cash Expense Management Report');
Modified: trunk/PcReportTab.php
===================================================================
--- trunk/PcReportTab.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcReportTab.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,6 +1,5 @@
<?php
-/* $Id$ */
-/* */
+/* $Id$*/
include ('includes/session.php');
$Title = _('Petty Cash Management Report');
Modified: trunk/PcTabExpensesList.php
===================================================================
--- trunk/PcTabExpensesList.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcTabExpensesList.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id: PcTabExpensesList.php 7751 2017-04-13 16:34:26Z rchacon $*/
+
require_once ('Classes/PHPExcel.php');
include('includes/session.php');
Modified: trunk/PcTabs.php
===================================================================
--- trunk/PcTabs.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcTabs.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
$Title = _('Maintenance Of Petty Cash Tabs');
/* webERP manual links before header.php */
Modified: trunk/PcTypeTabs.php
===================================================================
--- trunk/PcTypeTabs.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/PcTypeTabs.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
$Title = _('Maintenance Of Petty Cash Type of Tabs');
/* webERP manual links before header.php */
Modified: trunk/Tax.php
===================================================================
--- trunk/Tax.php 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/Tax.php 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,4 +1,6 @@
<?php
+/* $Id$*/
+
include('includes/session.php');
if (isset($_POST['TaxAuthority']) and isset($_POST['PrintPDF']) and isset($_POST['NoOfPeriods']) and isset($_POST['ToPeriod'])) {
$SQL = "SELECT lastdate_in_period
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-12 11:27:49 UTC (rev 7852)
+++ trunk/doc/Change.log 2017-10-15 22:17:04 UTC (rev 7853)
@@ -1,5 +1,5 @@
webERP Change Log
-
+15/10/17 Andy Couling: Missing $Id comments added to Petty Cash scripts.
17/10/12 Exson: Fixed the bug that Narrative information will loss when add or remove controlled items lot no in StockAdjustments.php.
17/10/11 RChacon: If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text (simplifies code using css
).
|
|
From: <afc...@us...> - 2017-10-15 22:23:51
|
Revision: 7854
http://sourceforge.net/p/web-erp/reponame/7854
Author: afcouling
Date: 2017-10-15 22:23:49 +0000 (Sun, 15 Oct 2017)
Log Message:
-----------
Fixed expense deletion dialogue box in PcClaimExpensesFromTab.php.
Modified Paths:
--------------
trunk/PcClaimExpensesFromTab.php
trunk/doc/Change.log
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2017-10-15 22:17:04 UTC (rev 7853)
+++ trunk/PcClaimExpensesFromTab.php 2017-10-15 22:23:49 UTC (rev 7854)
@@ -330,7 +330,7 @@
<td>', $MyRow['receipt'], '</td>
<td>', $AuthorisedDate, '</td>
<td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&edit=yes">' . _('Edit') . '</a></td>
- <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&Delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this code and the expenses it may have set up?') . '", \'Confirm Delete\', this);\'>' . _('Delete') . '</a></td>
+ <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&Delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this code and the expenses it may have set up?') . '");\'>' . _('Delete') . '</a></td>
</tr>';
} else {
echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-15 22:17:04 UTC (rev 7853)
+++ trunk/doc/Change.log 2017-10-15 22:23:49 UTC (rev 7854)
@@ -1,4 +1,5 @@
webERP Change Log
+15/10/17 Andy Couling: Fixed expense deletion dialogue box in PcClaimExpensesFromTab.php.
15/10/17 Andy Couling: Missing $Id comments added to Petty Cash scripts.
17/10/12 Exson: Fixed the bug that Narrative information will loss when add or remove controlled items lot no in StockAdjustments.php.
17/10/11 RChacon: If it is set the $_SESSION['ShowPageHelp'] parameter AND it is FALSE, hides the page help text (simplifies code using css
|
|
From: <afc...@us...> - 2017-10-15 22:28:00
|
Revision: 7855
http://sourceforge.net/p/web-erp/reponame/7855
Author: afcouling
Date: 2017-10-15 22:27:58 +0000 (Sun, 15 Oct 2017)
Log Message:
-----------
Table header labels corrected in PcClaimExpensesFromTab.php and PcAuthorizeExpenses.php.
Modified Paths:
--------------
trunk/PcAuthorizeExpenses.php
trunk/PcClaimExpensesFromTab.php
trunk/doc/Change.log
Modified: trunk/PcAuthorizeExpenses.php
===================================================================
--- trunk/PcAuthorizeExpenses.php 2017-10-15 22:23:49 UTC (rev 7854)
+++ trunk/PcAuthorizeExpenses.php 2017-10-15 22:27:58 UTC (rev 7855)
@@ -91,7 +91,7 @@
<th>', _('Date of Expense'), '</th>
<th>', _('Expense Code'), '</th>
<th>', _('Gross Amount'), '</th>
- <th>', _('Total Tax'), '</th>
+ <th>', _('Tax'), '</th>
<th>', _('Tax Group'), '</th>
<th>', _('Tag'), '</th>
<th>', _('Notes'), '</th>
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2017-10-15 22:23:49 UTC (rev 7854)
+++ trunk/PcClaimExpensesFromTab.php 2017-10-15 22:27:58 UTC (rev 7855)
@@ -257,7 +257,7 @@
<th>', _('Date of Expense'), '</th>
<th>', _('Expense Code'), '</th>
<th>', _('Gross Amount'), '</th>
- <th>', _('Total Tax'), '</th>
+ <th>', _('Tax'), '</th>
<th>', _('Tax Group'), '</th>
<th>', _('Tag'), '</th>
<th>', _('Notes'), '</th>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-15 22:23:49 UTC (rev 7854)
+++ trunk/doc/Change.log 2017-10-15 22:27:58 UTC (rev 7855)
@@ -1,4 +1,5 @@
webERP Change Log
+15/10/17 Andy Couling: Table header labels corrected in PcClaimExpensesFromTab.php and PcAuthorizeExpenses.php.
15/10/17 Andy Couling: Fixed expense deletion dialogue box in PcClaimExpensesFromTab.php.
15/10/17 Andy Couling: Missing $Id comments added to Petty Cash scripts.
17/10/12 Exson: Fixed the bug that Narrative information will loss when add or remove controlled items lot no in StockAdjustments.php.
|
|
From: <afc...@us...> - 2017-10-15 23:16:14
|
Revision: 7856
http://sourceforge.net/p/web-erp/reponame/7856
Author: afcouling
Date: 2017-10-15 23:16:12 +0000 (Sun, 15 Oct 2017)
Log Message:
-----------
Fixed the edit/delete cash assignment functionality in PcAssignCashToTab.php
Modified Paths:
--------------
trunk/PcAssignCashToTab.php
trunk/doc/Change.log
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2017-10-15 22:27:58 UTC (rev 7855)
+++ trunk/PcAssignCashToTab.php 2017-10-15 23:16:12 UTC (rev 7856)
@@ -262,7 +262,7 @@
$AuthorisedDate = ConvertSQLDate($MyRow['authorized']);
}
- if (($MyRow['authorized'] == '0000-00-00') and ($Description['0'] == 'ASSIGNCASH')) {
+ if (($MyRow['authorized'] == '0000-00-00') and ($ExpenseCodeDes == 'ASSIGNCASH')) {
// only cash assignations NOT authorized can be modified or deleted
echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
<td>', $ExpenseCodeDes, '</td>
@@ -271,7 +271,7 @@
<td>', $MyRow['receipt'], '</td>
<td>', $AuthorisedDate, '</td>
<td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=', $SelectedTabs, '&Days=', $Days, '&edit=yes">', _('Edit'), '</a></td>
- <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=', $SelectedTabs, '&Days=', $Days, '&delete=yes" onclick="return confirm(\'', _('Are you sure you wish to delete this code and the expense it may have set up?'), '\', \'Confirm Delete\', this);">', _('Delete'), '</a></td>
+ <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8'), '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=', $SelectedTabs, '&Days=', $Days, '&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this assigned cash?') . '");\'>' . _('Delete') . '</a></td>
</tr>';
} else {
echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-15 22:27:58 UTC (rev 7855)
+++ trunk/doc/Change.log 2017-10-15 23:16:12 UTC (rev 7856)
@@ -1,4 +1,5 @@
webERP Change Log
+15/10/17 Andy Couling: Fixed the edit/delete cash assignment functionality in PcAssignCashToTab.php
15/10/17 Andy Couling: Table header labels corrected in PcClaimExpensesFromTab.php and PcAuthorizeExpenses.php.
15/10/17 Andy Couling: Fixed expense deletion dialogue box in PcClaimExpensesFromTab.php.
15/10/17 Andy Couling: Missing $Id comments added to Petty Cash scripts.
|
|
From: <afc...@us...> - 2017-10-15 23:18:55
|
Revision: 7857
http://sourceforge.net/p/web-erp/reponame/7857
Author: afcouling
Date: 2017-10-15 23:18:52 +0000 (Sun, 15 Oct 2017)
Log Message:
-----------
New Expenses/Update Expense table header in PcClaimExpensesFromTab.php
Modified Paths:
--------------
trunk/PcClaimExpensesFromTab.php
trunk/doc/Change.log
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2017-10-15 23:16:12 UTC (rev 7856)
+++ trunk/PcClaimExpensesFromTab.php 2017-10-15 23:18:52 UTC (rev 7857)
@@ -330,7 +330,7 @@
<td>', $MyRow['receipt'], '</td>
<td>', $AuthorisedDate, '</td>
<td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&edit=yes">' . _('Edit') . '</a></td>
- <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&Delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this code and the expenses it may have set up?') . '");\'>' . _('Delete') . '</a></td>
+ <td><a href="', htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?SelectedIndex=', $MyRow['counterindex'], '&SelectedTabs=' . $SelectedTabs . '&Days=' . $Days . '&Delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this expense?') . '");\'>' . _('Delete') . '</a></td>
</tr>';
} else {
echo '<td>', ConvertSQLDate($MyRow['date']), '</td>
@@ -392,16 +392,25 @@
if (!isset($_POST['Date'])) {
$_POST['Date'] = Date($_SESSION['DefaultDateFormat']);
}
- echo '<table class="selection">
- <tr>
- <td>', _('Date of Expense'), ':</td>
- <td>
- <input type="text" class="date" alt="', $_SESSION['DefaultDateFormat'], '" name="Date" size="10" required="required" maxlength="10" value="', $_POST['Date'], '" />
- </td>
- </tr>
- <tr>
- <td>', _('Code of Expense'), ':</td>
- <td>
+ echo '<table class="selection">';
+ if (isset($_GET['SelectedIndex'])) {
+ echo '<tr>
+ <th colspan="2"><h3>', _('Update Expense'), '</h3></th>
+ </tr>';
+ } else {
+ echo '<tr>
+ <th colspan="2"><h3>', _('New Expense'), '</h3></th>
+ </tr>';
+ }
+ echo '<tr>
+ <td>', _('Date of Expense'), ':</td>
+ <td>
+ <input type="text" class="date" alt="', $_SESSION['DefaultDateFormat'], '" name="Date" size="10" required="required" maxlength="10" value="', $_POST['Date'], '" />
+ </td>
+ </tr>
+ <tr>
+ <td>', _('Code of Expense'), ':</td>
+ <td>
<select required="required" name="SelectedExpense">';
DB_free_result($Result);
$SQL = "SELECT pcexpenses.codeexpense,
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-15 23:16:12 UTC (rev 7856)
+++ trunk/doc/Change.log 2017-10-15 23:18:52 UTC (rev 7857)
@@ -1,4 +1,5 @@
webERP Change Log
+15/10/17 Andy Couling: New Expenses/Update Expense table header in PcClaimExpensesFromTab.php
15/10/17 Andy Couling: Fixed the edit/delete cash assignment functionality in PcAssignCashToTab.php
15/10/17 Andy Couling: Table header labels corrected in PcClaimExpensesFromTab.php and PcAuthorizeExpenses.php.
15/10/17 Andy Couling: Fixed expense deletion dialogue box in PcClaimExpensesFromTab.php.
|
|
From: <dai...@us...> - 2017-10-17 08:02:51
|
Revision: 7858
http://sourceforge.net/p/web-erp/reponame/7858
Author: daintree
Date: 2017-10-17 08:02:49 +0000 (Tue, 17 Oct 2017)
Log Message:
-----------
Phil:Fix InventoryPlanning report
Modified Paths:
--------------
trunk/InventoryPlanning.php
trunk/doc/Change.log
trunk/includes/PDFInventoryPlanPageHeader.inc
Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php 2017-10-15 23:18:52 UTC (rev 7857)
+++ trunk/InventoryPlanning.php 2017-10-17 08:02:49 UTC (rev 7858)
@@ -106,13 +106,14 @@
include('includes/footer.php');
exit;
}
- $Period_0_Name = GetMonthText(mktime(0,0,0,Date('m'),Date('d'),Date('Y')));
- $Period_1_Name = GetMonthText(mktime(0,0,0,Date('m')-1,Date('d'),Date('Y')));
- $Period_2_Name = GetMonthText(mktime(0,0,0,Date('m')-2,Date('d'),Date('Y')));
- $Period_3_Name = GetMonthText(mktime(0,0,0,Date('m')-3,Date('d'),Date('Y')));
- $Period_4_Name = GetMonthText(mktime(0,0,0,Date('m')-4,Date('d'),Date('Y')));
- $Period_5_Name = GetMonthText(mktime(0,0,0,Date('m')-5,Date('d'),Date('Y')));
+ $Period_0_Name = GetMonthText(date('m', mktime(0,0,0,Date('m'),Date('d'),Date('Y'))));
+ $Period_1_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-1,Date('d'),Date('Y'))));
+ $Period_2_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-2,Date('d'),Date('Y'))));
+ $Period_3_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-3,Date('d'),Date('Y'))));
+ $Period_4_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-4,Date('d'),Date('Y'))));
+ $Period_5_Name = GetMonthText(date('m', mktime(0,0,0,Date('m')-5,Date('d'),Date('Y'))));
+
include ('includes/PDFInventoryPlanPageHeader.inc');
$Category = '';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2017-10-15 23:18:52 UTC (rev 7857)
+++ trunk/doc/Change.log 2017-10-17 08:02:49 UTC (rev 7858)
@@ -1,4 +1,6 @@
webERP Change Log
+
+17/10/17 Phil: Fix InventoryPlanning.php and includes/PDFInventoryPlanPageHeader.inc to display categories selected and fix month headings displayed
15/10/17 Andy Couling: New Expenses/Update Expense table header in PcClaimExpensesFromTab.php
15/10/17 Andy Couling: Fixed the edit/delete cash assignment functionality in PcAssignCashToTab.php
15/10/17 Andy Couling: Table header labels corrected in PcClaimExpensesFromTab.php and PcAuthorizeExpenses.php.
@@ -10,13 +12,13 @@
17/10/11 RChacon: Set decimals variable for exchange rate in Currencies.php.
17/10/11 RChacon: Improve currency showing and set decimals variable for exchange rate in Payments.php.
17/10/11 Exson: Fix the indian_number_format bug in MiscFunctions.php.
-17/10/09 Exson: Fixed the non-balance bug in CustomerReceipt.php. And fixed the non rollback problem when there is a non-balance existed. Fixed error noises.
+17/10/09 Exson: Fixed the non-balance bug in CustomerReceipt.php. And fixed the non rollback problem when there is a non-balance existed. Fixed error noises.
17/10/03 Exson: Add html view to SuppPriceList.php.
01/10/26 RChacon: Standardise and add icons for usability.
27/09/26 RChacon: Increases accuracy in coordinates.
17/09/26 Exson: Fixed the wrong price retrieved bug in PO_Header.php.
17/09/26 Exson: Fixed the vendor price bug to ensure only the effective price showed by suppliers in SelectProduct.php.
-17/09/20 Exson: Fixed the bug to make GRN reverse workable.
+17/09/20 Exson: Fixed the bug to make GRN reverse workable.
17/09/19 Exson: Fixed customer information missing in CustomerReceipt.php. Reported by Steven Fu.
18/9/2017 Tim (committed by Andy): Geocode bug fixes. http://www.weberp.org/forum/showthread.php?tid=4380
17/9/17 VortecCPI: SelectProduct.php made image dispay code match that used in WorkOrderEntry.php
Modified: trunk/includes/PDFInventoryPlanPageHeader.inc
===================================================================
--- trunk/includes/PDFInventoryPlanPageHeader.inc 2017-10-15 23:18:52 UTC (rev 7857)
+++ trunk/includes/PDFInventoryPlanPageHeader.inc 2017-10-17 08:02:49 UTC (rev 7858)
@@ -16,19 +16,18 @@
$FontSize=10;
-if (isset($_POST['SupplierID']) and $_POST['SupplierID']=="0"){ //no supplier selected its a stock category report
- $ReportTitle = _('Inventory Planning for Categories Between') . ' ' . $_POST['FromCriteria'] . ' ' . _('and') . ' ' . $_POST['ToCriteria'];
-} else { //supplier selected its just planning for products from the supplier
- $ReportTitle = _('Inventory Planning for Products Category') . ' ' . $_POST['FromCriteria'];
+$ReportTitle = _('Inventory Planning for Product Categories');
+foreach ($_POST['Categories'] as $Category) {
+ $ReportTitle .= ' ' . $Category;
}
if ($_POST['Location']=='All'){
- $LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos,450,$FontSize, $ReportTitle . ' ' . _('for all stock locations'));
+ $LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos,600,$FontSize, $ReportTitle . ' ' . _('for all stock locations'));
} else {
- $LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos,450,$FontSize, $ReportTitle . ' ' . _('for stock at') . ' ' . $_POST['Location']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos,600,$FontSize, $ReportTitle . ' ' . _('for stock at') . ' ' . $_POST['Location']);
}
|
Thanks for helping keep SourceForge clean.
X