Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6864] trunk
|
From: <te...@us...> - 2014-09-05 02:19:34
|
Revision: 6864
http://sourceforge.net/p/web-erp/reponame/6864
Author: tehonu
Date: 2014-09-05 02:19:24 +0000 (Fri, 05 Sep 2014)
Log Message:
-----------
Added condition to MRP to use / not use reorder level to calculate requirements and some typos fixed.
Modified Paths:
--------------
trunk/MRP.php
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2014-09-05 01:17:11 UTC (rev 6863)
+++ trunk/MRP.php 2014-09-05 02:19:24 UTC (rev 6864)
@@ -284,51 +284,52 @@
AND stockmaster.discontinued = 0";
$result = DB_query($sql,$db);
- $sql = "INSERT INTO mrprequirements (part,
- daterequired,
- quantity,
- mrpdemandtype,
- orderno,
- directdemand,
- whererequired)
- SELECT mrpdemands.stockid,
- mrpdemands.duedate,
- mrpdemands.quantity,
- mrpdemands.mrpdemandtype,
- mrpdemands.demandid,
- '1',
- mrpdemands.stockid
- FROM mrpdemands, stockmaster
- WHERE mrpdemands.stockid = stockmaster.stockid
- AND stockmaster.discontinued = 0";
- if ($_POST['UserMRPDemands'] == 'y') {
+ if ($_POST['UseMRPDemands'] == 'y') {
+ $sql = "INSERT INTO mrprequirements (part,
+ daterequired,
+ quantity,
+ mrpdemandtype,
+ orderno,
+ directdemand,
+ whererequired)
+ SELECT mrpdemands.stockid,
+ mrpdemands.duedate,
+ mrpdemands.quantity,
+ mrpdemands.mrpdemandtype,
+ mrpdemands.demandid,
+ '1',
+ mrpdemands.stockid
+ FROM mrpdemands, stockmaster
+ WHERE mrpdemands.stockid = stockmaster.stockid
+ AND stockmaster.discontinued = 0";
$result = DB_query($sql,$db);
prnMsg(_('Loading requirements based on mrpdemands'),'info');
flush();
}
- $sql = "INSERT INTO mrprequirements (part,
- daterequired,
- quantity,
- mrpdemandtype,
- orderno,
- directdemand,
- whererequired)
- SELECT locstock.stockid,
- '" . date('Y-m-d') . "',
- (locstock.reorderlevel - locstock.quantity) AS reordqty,
- 'REORD',
- '1',
- '1',
- locstock.stockid
- FROM locstock, stockmaster
- WHERE stockmaster.stockid = locstock.stockid
- AND stockmaster.discontinued = 0
- AND reorderlevel > quantity";
- $result = DB_query($sql,$db);
- prnMsg(_('Loading requirements based on reorder level'),'info');
- flush();
+ if ($_POST['UseRLDemands'] == 'y') {
+ $sql = "INSERT INTO mrprequirements (part,
+ daterequired,
+ quantity,
+ mrpdemandtype,
+ orderno,
+ directdemand,
+ whererequired)
+ SELECT locstock.stockid,
+ '" . date('Y-m-d') . "',
+ (locstock.reorderlevel - locstock.quantity) AS reordqty,
+ 'REORD',
+ '1',
+ '1',
+ locstock.stockid
+ FROM locstock, stockmaster
+ WHERE stockmaster.stockid = locstock.stockid
+ AND stockmaster.discontinued = 0
+ AND reorderlevel > quantity";
+ $result = DB_query($sql,$db);
+ prnMsg(_('Loading requirements based on reorder level'),'info');
+ flush();
+ }
-
// In the following section, create mrpsupplies from open purchase orders,
// open work orders, and current quantity onhand from locstock
prnMsg(_('Creating supplies table'),'info');
@@ -495,6 +496,7 @@
shrinkageflag varchar(5),
eoqflag varchar(5),
usemrpdemands varchar(5),
+ userldemands varchar(5),
leeway smallint) DEFAULT CHARSET=utf8";
$result = DB_query($sql,$db);
// Create entry for location field from $_POST['location'], which is an array
@@ -514,6 +516,7 @@
shrinkageflag,
eoqflag,
usemrpdemands,
+ userldemands,
leeway)
VALUES (CURRENT_TIMESTAMP,
'" . $locparm . "',
@@ -521,6 +524,7 @@
'" . $_POST['ShrinkageFlag'] . "',
'" . $_POST['EOQFlag'] . "',
'" . $_POST['UseMRPDemands'] . "',
+ '" . $_POST['UseRLDemands'] . "',
'" . filter_number_format($_POST['Leeway']) . "')";
$result = DB_query($sql,$db);
@@ -541,6 +545,10 @@
if ($myrow['usemrpdemands'] == 'y') {
$UseMRPDemands = _('Yes');
}
+ $UseRLDemands = _('No');
+ if ($myrow['userldemands'] == 'y') {
+ $UseRLDemands = _('Yes');
+ }
$useeoq = _('No');
if ($myrow['eoqflag'] == 'y') {
$useeoq = _('Yes');
@@ -570,9 +578,13 @@
</tr>
<tr>
<td>' . _('Use MRP Demands') . ':</td>
- <td>' . $UserMRPDemands . '</td>
+ <td>' . $UseMRPDemands . '</td>
</tr>
<tr>
+ <td>' . _('Use Reorder Level Demands') . ':</td>
+ <td>' . $UseRLDemands . '</td>
+ </tr>
+ <tr>
<td>' . _('Use EOQ') . ':</td>
<td>' . $useeoq . '</td>
</tr>
@@ -619,6 +631,10 @@
<td><input type="checkbox" name="UseMRPDemands" value="y" checked="checked" /></td>
</tr>
<tr>
+ <td>' ._('Use Reorder Level Demands?') . ':</td>
+ <td><input type="checkbox" name="UseRLDemands" value="y" checked="checked" /></td>
+ </tr>
+ <tr>
<td>' ._('Use EOQ?') . ':</td>
<td><input type="checkbox" name="EOQFlag" value="y" checked="checked" /></td>
</tr>
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-09-05 01:17:11 UTC (rev 6863)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-09-05 02:19:24 UTC (rev 6864)
@@ -74,6 +74,8 @@
ON www_users.userid = locationusers.userid
AND locations.loccode = locationusers.loccode
WHERE locationusers.userid IS NULL;
+
+ALTER TABLE `mrpparameters` ADD `userldemands` VARCHAR( 5 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'use RL requirements or not' AFTER `usemrpdemands`;
UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
|
