Merge pull request #215 from webERP-team/release_4.15.2_updates

Release 4.15.2 updates

README.md

@@ -6,8 +6,8 @@ webERP is a free open-source ERP system, providing best practise, multi-user bus
 ## Demo
 A live demo of the latest release is available on the webERP support site, where you can login and experiment with all the webERP features: http://www.weberp.org/weberp/
 
-## Download
-The latest stable version is currently v4.15.1, and can be downloaded from SourceForge.
+## Download Now
+The latest stable version is currently v4.15.2, and can be downloaded from SourceForge.
 [![Download Latest Official Zen Cart® Release](https://a.fsdn.com/con/app/sf-download-button)
 Download the latest official webERP release](http://sourceforge.net/projects/web-erp/files/latest/download)
 

UpgradeDatabase.php

@@ -204,6 +204,9 @@
 				case '4.15':
 					$SQLScripts[] = './sql/mysql/upgrade4.15-4.15.1.sql';
 					break;
+				case '4.15.1':
+					$SQLScripts[] = './sql/mysql/upgrade4.15.1-4.15.2.sql';
+					break;
 			} //end switch
 		}
 	} else { //$DBType is not mysql or mysqli

build/make_release.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
 BASE_DIR=/var/www/html/webERP;
-OUTPUT_DIR=/home/user/Documents/webERP;
+OUTPUT_DIR=/home/Documents/webERP;
 MYSQL_USER=root;
 MYSQL_PWD=a;
 

doc/CHANGELOG.md

@@ -16,6 +16,61 @@ For changelogs earlier than v4.14.1, please refer to [CHANGELOG_ARCHIVE.md].
 | Description | Type | Author | Date | Details | Ref |
 |:-----------:|:----:|:------:|:----:|:-------:|:---:|
 
+## [v4.15.2] - 2021-11-27
+
+| Description | Type | Author | Date | Details | Ref |
+|:-----------:|:----:|:------:|:----:|:-------:|:---:|
+| MiscFunctions.js: Fixes the case where a negative payment is being made, without any allocation. Previously the payment was being blocked when the payment was less than the allocated amount, even when the payment was negative. | Fixed | Tim Schofield | 2021-10-28 | [View](https://github.com/webERP-team/webERP/commit/a7d97baf8bcdb10cb66801292af0d29bf9611c5b) | [Forum](https://www.weberp.org/forum/showthread.php?tid=8860) |
+| New themes and related improvements. | Added | Juergen Mueller | 2021-05-11 | [View](https://github.com/webERP-team/webERP/commit/bd6c006bdd33932144f8e25a81583cc7703a3061) | |
+| Z_importDebtors.php: Bugs in customer import script. | Fixed | Tim Schofield | 2021-05-04 | [View](https://github.com/webERP-team/webERP/commit/054f56ee642de5749bd3ff2f2b7e9d8868289366) | |
+| Use https protocol with geocode urls. | Changed | JanB | 2021-03-07 | [View](https://github.com/webERP-team/webERP/commit/9ce12156ffc3b7e0b690f6aa23d8692bd1bbc578) | [Sourceforge](https://sourceforge.net/p/web-erp/discussion/general/thread/939c342135/#1c75) |
+| Suppliers.php: fix typo in previous commit. | Fixed | PaulT | 2021-03-05 | [View](https://github.com/webERP-team/webERP/commit/a56b3a59a055ad111012b09f686c47d89a47c126) | |
+| Add missing 'key' parameter for geocoding. | Changed | JanB | 2021-02-28 | [View](https://github.com/webERP-team/webERP/commit/5c9019d79f301015e797f14ed71eafd908044c7c) | [SourceForge](https://sourceforge.net/p/web-erp/discussion/general/thread/939c342135/#088e) |
+| GLCashFlowsindirect.php: Fix syntax error with cast. | Fixed | PaulT | 2021-02-14 | [View](https://github.com/webERP-team/webERP/commit/100b450e163fea359e36a987d7f38d25aa084112) | |
+| StockUsageGraph.php: Set graph back to bars. (original value, assigned incorrectly) | Changed | PaulT | 2020-11-16 | [View](https://github.com/webERP-team/webERP/commit/282cc93055c4d25e95bd256ceaf1f0cec78cad36) | |
+| StockUsageGraph.php: Show zero counts within period. | Added | HDeriauFF (PaulT assist and commit) | 2020-11-15 | [View](https://github.com/webERP-team/webERP/commit/17afce45cc6b64a6327996721b9728fe39a3cafc) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8418) |
+| Finnish Translation | Added | Pekka Viiliainen (Phil commit) | 2020-10-24 | [View](https://github.com/webERP-team/webERP/commit/e5816a63a9f1be2fc253558ff30f0195910b1378) | |
+| GetPrice.inc: Correctly show price when one is expired and not replaced. | Fixed | Tim Schofield | 2020-10-06 | [View](https://github.com/webERP-team/webERP/commit/491f9c088e22c66208309be7beb2f6bbcfcbc4eb) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8407) |
+| Update SQL script path references. (reported by Tom Glare) | Changed | PaulT | 2020-09-12 | [View](https://github.com/webERP-team/webERP/commit/aa71a7b5e4fa7a0f1a13e0116233bd599123636a) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8409&pid=16137#pid16137) |
+| Form tags: Apply htmlspecialchars() or urlencode() to attribute values as needed. | Changed/Security | PaulT | 2020-08-15 | [View](https://github.com/webERP-team/webERP/commit/b28f0cf0a24e82b8db920b4b6b7d4e1c6d836d95) | |
+| Fix several reported vulnerabilities. | Security | Mario Riederer (Phil commit) | 2020-08-08 | [View](https://github.com/webERP-team/webERP/commit/c1569480a830f706e4e27447cad94238b254dced) | |
+| Silverwolf CSS: Remove the background image and use css to create the same affect. | Changed | Tim Schofield | 2020-06-11 | [View](https://github.com/webERP-team/webERP/commit/0f8bd3228aea7eb81aed267408e919c49739fc50) | |
+| session.php: Bug in variable sanitising routine. | Fixed | Tim Schofield | 2020-06-08 | [View](https://github.com/webERP-team/webERP/commit/3f0f0b5962b04fbdfece352af259a90f89e1ace8) | |
+| install/index.php: Improve the installer language handling so that the detected language is set as expected. | Changed | PaulT | 2020-06-06 |  [View](https://github.com/webERP-team/webERP/commit/7a43bc23b244e7637b0fb9b661efd32034c81739) | |
+| Fix LFI issue. (Reported by: [email protected], https://lyhinslab.org) | Security | Simon / PaulT | 2020-06-06 | [View](https://github.com/webERP-team/webERP/commit/baf43971019da0dbacf094e94d16fec2720722a3) | |
+|PDFPriceList.php: Apply alternating row shading to pricing rows. (forum request) | Added | PaulT | 2020-04-24 | [View](https://github.com/webERP-team/webERP/commit/a21c76905025518ee9bd3936a865177770a2dcc0) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8389&pid=16060#pid16060) |
+| <ol><li>default.sql, demo.sql: Correct DB structure missing AUTO_INCREMENT fields.</li><li>Login.php, session.php: Remove references to get_magic_quotes_gpc() which is removed in PHP7.4 and above.</li></ol> | <ol><li>Fixed</li><li>Changed</li></ol> | <ol><li>Tim Schofield</li><li>Confucius / Tim Schofield</li></ol> | 2020-04-23 | [View](https://github.com/webERP-team/webERP/commit/9aaeae890716c0a70123a800b865d0e820710557) | <ol><li>[Forum](http://www.weberp.org/forum/showthread.php?tid=8386&pid=16029#pid16029)</li><li>[Forum](http://www.weberp.org/forum/showthread.php?tid=8393)</li></ol>
+| Update Espanol locale | Update | Rafael Chacón | 2020-03-18 | [View](https://github.com/webERP-team/webERP/commit/86e5f1443c345925b645682b6b8f0483b9c5078d) | |
+| default.css: Minor style tweak. | Changed | Rafael Chacón | 2020-03-18 | [View](https://github.com/webERP-team/webERP/commit/0d78f93b57fbca8e030a145ec43d01769cc0538f) | |
+| demo.sql: Revised demo data. | Update | Tim Schofield | 2020-01-28 | [View](https://github.com/webERP-team/webERP/commit/f37c4687e38d70115ec6a5dc845bd8acb2f0e149) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8386&pid=16021#pid16021) |
+| Credit_Invoice.php: Round the freight cost, and the previous allocated amount to the required decimal places. | Fixed | Tim Schofield | 2020-01-28 | [View](https://github.com/webERP-team/webERP/commit/e1082b75832cde3b65ef4327d50db1fd77047e8d) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8385&pid=16020#pid16020) |
+| Z_DeleteCreditNote.php: Update feedback message in previous commit. | Fixed | PaulT | 2020-01-19 | [View](https://github.com/webERP-team/webERP/commit/e0c94a0de04d1437a729a29963ce05684df9d07f) | |
+| Z_DeleteCreditNote.php: Fix SQL error, add DELETE for stockserialmoves causing FK error. | Fixed | PaulT | 2020-01-18 | [View](https://github.com/webERP-team/webERP/commit/9bdf62ecdb1fea5f95ffb6a36cae751b8ea4316f) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8370) |
+| Update GetRptLinks function. | Fixed | PaulT | 2020-01-18 | [View](https://github.com/webERP-team/webERP/commit/afbbb76d1f071f228f17b792b880f72fc7c55a25) | [Forum](http://www.weberp.org/forum/showthread.php?tid=7996&pid=15926#pid15926) |
+| ConfirmDispatch_Invoice.php: Fix error where tax amount wasn't getting rounded to the required decimal places leading to potential rounding errors. | Fixed | Tim Schofield | 2020-01-18 | [View](https://github.com/webERP-team/webERP/commit/e3b693808e5e9e0fb56336684b62a87ff16120c5) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8385&pid=16011#pid16011) |
+| Dashboard.php: Fix the bug whereby sales person invoices were divulged to other sales people when a customer has more than one branch with different sales people attached. | Fixed | Tim Schofield | 2019-12-14 | [View](https://github.com/webERP-team/webERP/commit/f22ee88d2df54fbcb25ecdd6e9a8f41a9267b373) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8382) |
+| api/api_locations.php: Return API data format to include integer code as described in the manual. | Fixed | Express Achiever | 2019-11-20 | [View](https://github.com/webERP-team/webERP/commit/5bc70eb3c95dea3639641ffee922016a1d168a2c) | |
+| SupplierTenderCreate.php: Fix ambiguous SQL statement. | Fixed | Tim Schofield | 2019-11-18 | [View](https://github.com/webERP-team/webERP/commit/bc1c7968660fda46686b30a60dad3a9060d9356b) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8381&pid=15968#pid15968) |
+| PDFStockCheckComparison.php: Insert missing standard cost field. | Fixed | Express Achiever | 2019-11-15 | [View](https://github.com/webERP-team/webERP/commit/7d6c175feda7c139ee6887a6ebdaca5ea66ebbe7) | |
+| StockCounts.php: Add alternative method for user to enter stock counts. | Changed | Express Achiever| 2019-11-07 | [View](https://github.com/webERP-team/webERP/commit/6f29993e579810e33c7f2016fe329f88798bca46) | |
+| SelectSalesOrder.php Fix SQL error. Also apply whitespace and variable name formatting. | Fixed | PaulT | 2019-11-02 | [View](https://github.com/webERP-team/webERP/commit/912a3424fa58317f5c00911730d9036350d6b258) | |
+| Fix a few issues related to GL Posting for Stock Transfers. | Fixed | Express Achiever | 2019-10-12 | [View](https://github.com/webERP-team/webERP/commit/47e0a731883f1cbc1057afac9187ae262016a90e) | |
+| Demo mode tidy. | Changed | Phil Daintree | 2019-10-05 | [View](https://github.com/webERP-team/webERP/commit/501e26ede1c679842efcc12f605337563845ce9d) | |
+| Demo mode modifications. | Changed | Phil Daintree | 2019-10-05 | [View](https://github.com/webERP-team/webERP/commit/8a7cab0b7d104d6550424f618ee36d894d63eca8) | |
+| SalesCategories.php: Rework the script to conform with the project standards, and to make the use of it easier and more intuitive. | Changed | Tim Schofield | 2019-09-26 | [View](https://github.com/webERP-team/webERP/commit/6937e7887938d825f46152d408517172f8bda7ab) | |
+| InternalStockRequest.php: Fix inconsistent casing in variable names. | Fixed | Tim Schofield | 2019-09-23 | [View](https://github.com/webERP-team/webERP/commit/473203cc78f484236ab377b7407a07893700bd7d) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8366) |
+| PageSecurity.php: Fix typo in variable name. | Fixed | Tim Schofield | 2019-09-16 | [View](https://github.com/webERP-team/webERP/commit/c04ffce829b32b601860a59aec90b914f2995235) | |
+| Z_DeleteSalesTransActions.php: Fix utility script for new tables. | Fixed | Tim Schofield | 2019-08-16 | [View](https://github.com/webERP-team/webERP/commit/f8cfb455f696dadd29d90f53664eefaeb7ca2ce1) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8360) |
+| Check that the server has the correct permissions to upload part image. | Fixed | Tim Schofield | 2019-09-08 | [View](https://github.com/webERP-team/webERP/commit/d6223d61859475fcc791226de1861dfad9b64536) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8357) |
+| Fix purchase order item to flag as completed. | Fixed | Express Achiever | 2019-09-06 | [View](https://github.com/webERP-team/webERP/commit/638a7a739c867905e22d4c4e8ce1af7d2290cc60) | |
+| Fix stock movement records missing in report when there is no link to table custbranch. | Fixed | Express Achiever | 2019-09-06 | [View](https://github.com/webERP-team/webERP/commit/83f863a6628680b3a2ea6c62eba7a77b1dcff2c0) | |
+| Counter sales: UX improvements with to CounterSalesFunctions.js. | Changed | Express Achiever | 2019-09-06 | [View](https://github.com/webERP-team/webERP/commit/c7e033dbf90423d316b4c57f5e0dba735d8a1ae5) | |
+| MRP shortages incorrectly includes "Service/Labour" items. | Fixed | Alan Miller | 2019-09-01 | [View](https://github.com/webERP-team/webERP/commit/c1bce8f8f17fb3a1234c4d11d100916bdaa69dac) | [Forum](http://www.weberp.org/forum/showthread.php?tid=8347&highlight=MRPShortages) |
+| Restrict demo mode from alterations to security model. | Fixed | Phil Daintree | 2019-08-31 | [View](https://github.com/webERP-team/webERP/commit/de6466f35c5fc899b796e605e479eef0205d8009) | |
+| Counter sales: improve quick entry flow by pre-fetching stockmaster list and auto fill to the quick entry table. | Changed | Express Achiever | 2019-08-30 | [View](https://github.com/webERP-team/webERP/commit/3733fc8d73da932c9a7b063a44089d2b824b113f) | |
+| Missing parameter for Add_GRN_To_Trans | Fixed | Express Achiever | 2019-08-30 | [View](https://github.com/webERP-team/webERP/commit/96c8eb9566e983f5a51ef8b7fc64fb211cc60c26) | |
+| Fix language files | Fixed | Rafael Chacón | 2019-08-28 | [View](https://github.com/webERP-team/webERP/commit/2b2f591c1e06a68c30eeab8a121a0ef83b109565) | |
+
 ## [v4.15.1] - 2019-06-16
 
 | Description | Type | Author | Date | Details | Ref |
@@ -394,10 +449,10 @@ For changelogs earlier than v4.14.1, please refer to [CHANGELOG_ARCHIVE.md].
 | Add meta viewport for initial-scale=1 for working css in small devices. |  | RChacon | 2017-06-21 |  |  |
 
 
-[Unreleased]: https://github.com/webERP-team/webERP/compare/v4.15.1...HEAD
+[Unreleased]: https://github.com/webERP-team/webERP/compare/v4.15.2...HEAD
+[v4.15.2]: https://github.com/webERP-team/webERP/compare/v4.15.1...v4.15.2
 [v4.15.1]: https://github.com/webERP-team/webERP/compare/v4.15...v4.15.1
 [v4.15]: https://github.com/webERP-team/webERP/compare/v4.14.1...v4.15
-[v4.14.1]: https://github.com/webERP-team/webERP/compare/v4.14...v4.14.1
 [Semantic Versioning]: http://semver.org/spec/v2.0.0.html
 [Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
 [CHANGELOG_ARCHIVE.md]: CHANGELOG_ARCHIVE.md

includes/ConnectDB.inc

@@ -3,7 +3,7 @@
  * this value is saved in the $_SESSION['Versionumber'] when includes/GetConfig.php is run
  * if  VersionNumber is < $Version  then the DB update script is run */
 
-$Version='4.15.1'; //must update manually every time there is a DB change
+$Version='4.15.2'; //must update manually every time there is a DB change
 
 require_once ($PathPrefix .'includes/MiscFunctions.php');
 if (!isset($_SESSION['DatabaseName'])){

sql/mysql/upgrade4.15.1-4.15.2.sql

@@ -1,2 +1,3 @@
 INSERT INTO `config` (`confname`, `confvalue`) VALUES ('StockUsageShowZeroWithinPeriodRange', '0');
 ALTER TABLE `www_users` ADD COLUMN `fontsize` TINYINT NOT NULL DEFAULT '1' AFTER `pdflanguage`;
+UPDATE config SET confvalue='4.15.2' WHERE confname='VersionNumber';