Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4610] trunk
|
From: <dai...@us...> - 2011-07-02 01:34:10
|
Revision: 4610
http://web-erp.svn.sourceforge.net/web-erp/?rev=4610&view=rev
Author: daintree
Date: 2011-07-02 01:34:04 +0000 (Sat, 02 Jul 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/BankAccounts.php
trunk/MRP.php
trunk/PrintCustTrans.php
trunk/doc/Change.log
trunk/sql/mysql/upgrade3.11-3.11.1.sql
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2011-06-28 10:12:27 UTC (rev 4609)
+++ trunk/BankAccounts.php 2011-07-02 01:34:04 UTC (rev 4610)
@@ -9,7 +9,7 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Bank') . '" alt="" />' . ' ' . $title . '</p>';
-echo '<div class="page_help_text">' . _('Update Bank Account details. Account Code is for SWIFT or BSB type Bank Codes. Set Default for Invoices to "yes" to print Account details on Invoices (only one account can be set to "yes").') . '.</div><br />';
+echo '<div class="page_help_text">' . _('Update Bank Account details. Account Code is for SWIFT or BSB type Bank Codes. Set Default for Invoices to "Currency Default" of "Fallback Default" to print Account details on Invoices (only one account should be set to "Fall Back Default").') . '.</div><br />';
if (isset($_GET['SelectedBankAccount'])) {
$SelectedBankAccount=$_GET['SelectedBankAccount'];
@@ -133,6 +133,7 @@
echo '<br />';
unset($_POST['AccountCode']);
unset($_POST['BankAccountName']);
+ unset($_POST['BankAccountCode']);
unset($_POST['BankAccountNumber']);
unset($_POST['BankAddress']);
unset($_POST['CurrCode']);
@@ -207,8 +208,10 @@
}
if ($myrow['invoice']==0) {
$DefaultBankAccount=_('No');
- } else {
- $DefaultBankAccount=_('Yes');
+ } elseif ($myrow['invoice']==1) {
+ $DefaultBankAccount=_('Fall Back Default');
+ } elseif ($myrow['invoice']==2) {
+ $DefaultBankAccount=_('Currency Default');
}
printf('<td>%s<br /><font size=2>%s</font></td>
<td>%s</td>
@@ -363,15 +366,22 @@
$db);
while ($myrow = DB_fetch_array($result)) {
if ($myrow['invoice']== 1) {
- echo '<option selected value="1">'._('Yes').'</option>
+ echo '<option selected value="1">'._('Fall Back Default').'</option>
+ <option value="2">'._('Currency Default') . '</option>
<option value="0">'._('No').'</option>';
+ } elseif ($myrow['invoice']== 2) {
+ echo '<option value="0">'._('No').'</option>
+ <option selected value="2">'._('Currency Default') . '</option>
+ <option value="1">'._('Fall Back Default').'</option>';
} else {
echo '<option selected value="0">'._('No').'</option>
- <option value="1">'._('Yes').'</option>';
+ <option value="2">'._('Currency Default') . '</option>
+ <option value="1">'._('Fall Back Default').'</option>';
}
}//end while loop
} else {
- echo '<option value="1">'._('Yes').'</option>
+ echo '<option value="1">'._('Fall Back Default').'</option>
+ <option value="2">'._('Currency Default') . '</option>
<option value="0">'._('No').'</option>';
}
Modified: trunk/MRP.php
===================================================================
--- trunk/MRP.php 2011-06-28 10:12:27 UTC (rev 4609)
+++ trunk/MRP.php 2011-07-02 01:34:04 UTC (rev 4610)
@@ -45,7 +45,8 @@
$sql = "INSERT INTO passbom (part, sortpart)
SELECT bom.component AS part,
CONCAT(bom.parent,'%',bom.component) AS sortpart
- FROM bom LEFT JOIN bom as bom2 ON bom.parent = bom2.component
+ FROM bom LEFT JOIN bom as bom2
+ ON bom.parent = bom2.component
WHERE bom2.component IS NULL";
$result = DB_query($sql,$db);
@@ -116,11 +117,11 @@
$result = DB_query($sql,$db);
while ($myrow=DB_fetch_array($result)) {
$parts = explode('%',$myrow['sortpart']);
- $level = $myrow['level'];
+ $Level = $myrow['level'];
$ctr = 0;
foreach ($parts as $part) {
$ctr++;
- $newlevel = $level - $ctr;
+ $newlevel = $Level - $ctr;
$sql = "INSERT INTO bomlevels (part, level) VALUES('" . $part . "','" . $newlevel . "')";
$result2 = DB_query($sql,$db);
} // End of foreach
@@ -223,7 +224,9 @@
mrpdemandtype varchar(6),
orderno int(11),
directdemand smallint,
- whererequired char(20)) DEFAULT CHARSET=utf8";
+ whererequired char(20),
+ KEY part (part)
+ ) DEFAULT CHARSET=utf8";
$result = DB_query($sql,$db,_('Create of mrprequirements failed because'));
prnMsg(_('Loading requirements from sales orders'),'info');
@@ -314,7 +317,6 @@
prnMsg(_('Loading requirements based on reorder level'),'info');
flush();
- $result = DB_query("ALTER TABLE mrprequirements ADD INDEX part(part)",$db);
// In the following section, create mrpsupplies from open purchase orders,
// open work orders, and current quantity onhand from locstock
@@ -398,7 +400,7 @@
FROM locstock
WHERE quantity > 0 " .
$WhereLocation .
- 'GROUP BY stockid';
+ "GROUP BY stockid";
$result = DB_query($sql,$db);
prnMsg(_('Loading supplies from work orders'),'info');
@@ -434,14 +436,14 @@
flush();
$result = DB_query("DROP TABLE IF EXISTS mrpplannedorders",$db);
$sql = "CREATE TABLE mrpplannedorders (id int(11) NOT NULL auto_increment,
- part char(20),
- duedate date,
- supplyquantity double,
- ordertype varchar(6),
- orderno int(11),
- mrpdate date,
- updateflag smallint(6),
- PRIMARY KEY (id)) DEFAULT CHARSET=utf8";
+ part char(20),
+ duedate date,
+ supplyquantity double,
+ ordertype varchar(6),
+ orderno int(11),
+ mrpdate date,
+ updateflag smallint(6),
+ PRIMARY KEY (id)) DEFAULT CHARSET=utf8";
$result = DB_query($sql,$db,_('Create of mrpplannedorders failed because'));
// Find the highest and lowest level number
@@ -449,8 +451,8 @@
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
- $maxlevel = $myrow[0];
- $minlevel = $myrow[1];
+ $MaxLevel = $myrow[0];
+ $MinLevel = $myrow[1];
// At this point, have all requirements in mrprequirements and all supplies to satisfy
// those requirements in mrpsupplies. Starting at the top level, will read all parts one
@@ -458,17 +460,17 @@
// planned orders to satisfy requirements. If there is a net requirement from a higher level
// part, that serves as a gross requirement for a lower level part, so will read down through
// the Bill of Materials to generate those requirements in function LevelNetting().
- for ($level = $maxlevel; $level >= $minlevel; $level--) {
- $sql = "SELECT * FROM levels WHERE level = '" . $level ."' LIMIT 50000"; //should cover most eventualities!! ... yes indeed :-)
+ for ($Level = $MaxLevel; $Level >= $MinLevel; $Level--) {
+ $sql = "SELECT * FROM levels WHERE level = '" . $Level ."' LIMIT 50000"; //should cover most eventualities!! ... yes indeed :-)
- prnMsg('</br>------ ' . _('Processing level') .' ' . $level . ' ------','info');
+ prnMsg('------ ' . _('Processing level') .' ' . $Level . ' ------','info');
flush();
$result = DB_query($sql,$db);
while ($myrow=DB_fetch_array($result)) {
LevelNetting($db,$myrow['part'],$myrow['eoq'],$myrow['pansize'],$myrow['shrinkfactor']);
} //end of while loop
} // end of for
- echo '</br>' . _('End time') . ': ' . date('h:i:s') . '</br>';
+ echo '<br />' . _('End time') . ': ' . date('h:i:s') . '<br />';
// Create mrpparameters table
$sql = "DROP TABLE IF EXISTS mrpparameters";
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2011-06-28 10:12:27 UTC (rev 4609)
+++ trunk/PrintCustTrans.php 2011-07-02 01:34:04 UTC (rev 4610)
@@ -80,121 +80,121 @@
if ($InvOrCredit=='Invoice') {
$sql = "SELECT debtortrans.trandate,
- debtortrans.ovamount,
- debtortrans.ovdiscount,
- debtortrans.ovfreight,
- debtortrans.ovgst,
- debtortrans.rate,
- debtortrans.invtext,
- debtortrans.consignment,
- debtorsmaster.name,
- debtorsmaster.address1,
- debtorsmaster.address2,
- debtorsmaster.address3,
- debtorsmaster.address4,
- debtorsmaster.address5,
- debtorsmaster.address6,
- debtorsmaster.currcode,
- debtorsmaster.invaddrbranch,
- debtorsmaster.taxref,
- paymentterms.terms,
- salesorders.deliverto,
- salesorders.deladd1,
- salesorders.deladd2,
- salesorders.deladd3,
- salesorders.deladd4,
- salesorders.deladd5,
- salesorders.deladd6,
- salesorders.customerref,
- salesorders.orderno,
- salesorders.orddate,
- locations.locationname,
- shippers.shippername,
- custbranch.brname,
- custbranch.braddress1,
- custbranch.braddress2,
- custbranch.braddress3,
- custbranch.braddress4,
- custbranch.braddress5,
- custbranch.braddress6,
- custbranch.brpostaddr1,
- custbranch.brpostaddr2,
- custbranch.brpostaddr3,
- custbranch.brpostaddr4,
- custbranch.brpostaddr5,
- custbranch.brpostaddr6,
- salesman.salesmanname,
- debtortrans.debtorno,
- debtortrans.branchcode
- FROM debtortrans,
- debtorsmaster,
- custbranch,
- salesorders,
- shippers,
- salesman,
- locations,
- paymentterms
- WHERE debtortrans.order_ = salesorders.orderno
- AND debtortrans.type=10
- AND debtortrans.transno='" . $FromTransNo . "'
- AND debtortrans.shipvia=shippers.shipper_id
- AND debtortrans.debtorno=debtorsmaster.debtorno
- AND debtorsmaster.paymentterms=paymentterms.termsindicator
- AND debtortrans.debtorno=custbranch.debtorno
- AND debtortrans.branchcode=custbranch.branchcode
- AND custbranch.salesman=salesman.salesmancode
- AND salesorders.fromstkloc=locations.loccode";
+ debtortrans.ovamount,
+ debtortrans.ovdiscount,
+ debtortrans.ovfreight,
+ debtortrans.ovgst,
+ debtortrans.rate,
+ debtortrans.invtext,
+ debtortrans.consignment,
+ debtorsmaster.name,
+ debtorsmaster.address1,
+ debtorsmaster.address2,
+ debtorsmaster.address3,
+ debtorsmaster.address4,
+ debtorsmaster.address5,
+ debtorsmaster.address6,
+ debtorsmaster.currcode,
+ debtorsmaster.invaddrbranch,
+ debtorsmaster.taxref,
+ paymentterms.terms,
+ salesorders.deliverto,
+ salesorders.deladd1,
+ salesorders.deladd2,
+ salesorders.deladd3,
+ salesorders.deladd4,
+ salesorders.deladd5,
+ salesorders.deladd6,
+ salesorders.customerref,
+ salesorders.orderno,
+ salesorders.orddate,
+ locations.locationname,
+ shippers.shippername,
+ custbranch.brname,
+ custbranch.braddress1,
+ custbranch.braddress2,
+ custbranch.braddress3,
+ custbranch.braddress4,
+ custbranch.braddress5,
+ custbranch.braddress6,
+ custbranch.brpostaddr1,
+ custbranch.brpostaddr2,
+ custbranch.brpostaddr3,
+ custbranch.brpostaddr4,
+ custbranch.brpostaddr5,
+ custbranch.brpostaddr6,
+ salesman.salesmanname,
+ debtortrans.debtorno,
+ debtortrans.branchcode
+ FROM debtortrans,
+ debtorsmaster,
+ custbranch,
+ salesorders,
+ shippers,
+ salesman,
+ locations,
+ paymentterms
+ WHERE debtortrans.order_ = salesorders.orderno
+ AND debtortrans.type=10
+ AND debtortrans.transno='" . $FromTransNo . "'
+ AND debtortrans.shipvia=shippers.shipper_id
+ AND debtortrans.debtorno=debtorsmaster.debtorno
+ AND debtorsmaster.paymentterms=paymentterms.termsindicator
+ AND debtortrans.debtorno=custbranch.debtorno
+ AND debtortrans.branchcode=custbranch.branchcode
+ AND custbranch.salesman=salesman.salesmancode
+ AND salesorders.fromstkloc=locations.loccode";
if (isset($_POST['PrintEDI']) and $_POST['PrintEDI']=='No') {
$sql = $sql . " AND debtorsmaster.ediinvoices=0";
}
} else {
$sql = "SELECT debtortrans.trandate,
- debtortrans.ovamount,
- debtortrans.ovdiscount,
- debtortrans.ovfreight,
- debtortrans.ovgst,
- debtortrans.rate,
- debtortrans.invtext,
- debtorsmaster.invaddrbranch,
- debtorsmaster.name,
- debtorsmaster.address1,
- debtorsmaster.address2,
- debtorsmaster.address3,
- debtorsmaster.address4,
- debtorsmaster.address5,
- debtorsmaster.address6,
- debtorsmaster.currcode,
- debtorsmaster.taxref,
- custbranch.brname,
- custbranch.braddress1,
- custbranch.braddress2,
- custbranch.braddress3,
- custbranch.braddress4,
- custbranch.braddress5,
- custbranch.braddress6,
- custbranch.brpostaddr1,
- custbranch.brpostaddr2,
- custbranch.brpostaddr3,
- custbranch.brpostaddr4,
- custbranch.brpostaddr5,
- custbranch.brpostaddr6,
- salesman.salesmanname,
- debtortrans.debtorno,
- debtortrans.branchcode,
- paymentterms.terms
- FROM debtortrans,
- debtorsmaster,
- custbranch,
- salesman,
- paymentterms
- WHERE debtortrans.type=11
- AND debtorsmaster.paymentterms = paymentterms.termsindicator
- AND debtortrans.transno='" . $FromTransNo . "'
- AND debtortrans.debtorno=debtorsmaster.debtorno
- AND debtortrans.debtorno=custbranch.debtorno
- AND debtortrans.branchcode=custbranch.branchcode
- AND custbranch.salesman=salesman.salesmancode";
+ debtortrans.ovamount,
+ debtortrans.ovdiscount,
+ debtortrans.ovfreight,
+ debtortrans.ovgst,
+ debtortrans.rate,
+ debtortrans.invtext,
+ debtorsmaster.invaddrbranch,
+ debtorsmaster.name,
+ debtorsmaster.address1,
+ debtorsmaster.address2,
+ debtorsmaster.address3,
+ debtorsmaster.address4,
+ debtorsmaster.address5,
+ debtorsmaster.address6,
+ debtorsmaster.currcode,
+ debtorsmaster.taxref,
+ custbranch.brname,
+ custbranch.braddress1,
+ custbranch.braddress2,
+ custbranch.braddress3,
+ custbranch.braddress4,
+ custbranch.braddress5,
+ custbranch.braddress6,
+ custbranch.brpostaddr1,
+ custbranch.brpostaddr2,
+ custbranch.brpostaddr3,
+ custbranch.brpostaddr4,
+ custbranch.brpostaddr5,
+ custbranch.brpostaddr6,
+ salesman.salesmanname,
+ debtortrans.debtorno,
+ debtortrans.branchcode,
+ paymentterms.terms
+ FROM debtortrans,
+ debtorsmaster,
+ custbranch,
+ salesman,
+ paymentterms
+ WHERE debtortrans.type=11
+ AND debtorsmaster.paymentterms = paymentterms.termsindicator
+ AND debtortrans.transno='" . $FromTransNo . "'
+ AND debtortrans.debtorno=debtorsmaster.debtorno
+ AND debtortrans.debtorno=custbranch.debtorno
+ AND debtortrans.branchcode=custbranch.branchcode
+ AND custbranch.salesman=salesman.salesmancode";
if ($_POST['PrintEDI']=='No') {
$sql = $sql . " AND debtorsmaster.ediinvoices=0";
@@ -219,35 +219,35 @@
if ($InvOrCredit=='Invoice') {
$sql = "SELECT stockmoves.stockid,
- stockmaster.description,
- -stockmoves.qty as quantity,
- stockmoves.discountpercent,
- ((1 - stockmoves.discountpercent) * stockmoves.price * " . $ExchRate . "* -stockmoves.qty) AS fxnet,
- (stockmoves.price * " . $ExchRate . ") AS fxprice,
- stockmoves.narrative,
- stockmaster.units
- FROM stockmoves,
- stockmaster
- WHERE stockmoves.stockid = stockmaster.stockid
- AND stockmoves.type=10
- AND stockmoves.transno=" . $FromTransNo . "
- AND stockmoves.show_on_inv_crds=1";
+ stockmaster.description,
+ -stockmoves.qty as quantity,
+ stockmoves.discountpercent,
+ ((1 - stockmoves.discountpercent) * stockmoves.price * " . $ExchRate . "* -stockmoves.qty) AS fxnet,
+ (stockmoves.price * " . $ExchRate . ") AS fxprice,
+ stockmoves.narrative,
+ stockmaster.units
+ FROM stockmoves,
+ stockmaster
+ WHERE stockmoves.stockid = stockmaster.stockid
+ AND stockmoves.type=10
+ AND stockmoves.transno=" . $FromTransNo . "
+ AND stockmoves.show_on_inv_crds=1";
} else {
/* only credit notes to be retrieved */
$sql = "SELECT stockmoves.stockid,
- stockmaster.description,
- stockmoves.qty as quantity,
- stockmoves.discountpercent,
- ((1 - stockmoves.discountpercent) * stockmoves.price * " . $ExchRate . " * stockmoves.qty) AS fxnet,
- (stockmoves.price * " . $ExchRate . ") AS fxprice,
- stockmoves.narrative,
- stockmaster.units
- FROM stockmoves,
- stockmaster
- WHERE stockmoves.stockid = stockmaster.stockid
- AND stockmoves.type=11
- AND stockmoves.transno=" . $FromTransNo . "
- AND stockmoves.show_on_inv_crds=1";
+ stockmaster.description,
+ stockmoves.qty as quantity,
+ stockmoves.discountpercent,
+ ((1 - stockmoves.discountpercent) * stockmoves.price * " . $ExchRate . " * stockmoves.qty) AS fxnet,
+ (stockmoves.price * " . $ExchRate . ") AS fxprice,
+ stockmoves.narrative,
+ stockmaster.units
+ FROM stockmoves,
+ stockmaster
+ WHERE stockmoves.stockid = stockmaster.stockid
+ AND stockmoves.type=11
+ AND stockmoves.transno=" . $FromTransNo . "
+ AND stockmoves.show_on_inv_crds=1";
} // end else
$result=DB_query($sql,$db);
@@ -407,6 +407,36 @@
$YPos-=12;
$LeftOvers = $pdf->addTextWrap($Left_Margin+280,$YPos,220,$FontSize,$LeftOvers);
}
+ /*print out bank details */
+ /*Get currency default for the currency of the invocie */
+ $PrintBankDetails = true; //assume we print bank details by default
+ $BankResult = DB_query("SELECT bankaddress,
+ bankaccountnumber,
+ bankaccountcode
+ FROM bankaccounts
+ WHERE invoice=2
+ AND currcode='" . $myrow['currcode'] . "'",
+ $db);
+ if (DB_num_rows($BankResult)==0){
+ /* If no currency default check the fall back default */
+ $BankResult = DB_query("SELECT bankaddress,
+ bankaccountnumber,
+ bankaccountcode
+ FROM bankaccounts
+ WHERE invoice=1",
+ $db);
+ if (DB_num_rows($BankResult)==0){
+ $PrintBankDetails = false;
+ }
+ }
+ if ($PrintBankDetails){
+ $BankDetailsRow = DB_fetch_array($BankResult);
+ $YPos-=4;
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+280,$YPos,220,$FontSize,$BankDetailsRow['bankaddress']);
+ $YPos-=12;
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+280,$YPos,220,$FontSize,$BankDetailsRow['bankaccountcode'] . ' ' . _('Account No:') . ' ' . $BankDetailsRow['bankaccountnumber']);
+ }
+
/* Add Images for Visa / Mastercard / Paypal */
if (file_exists('companies/' . $_SESSION['DatabaseName'] . '/payment.jpg')) {
$pdf->addJpegFromFile('companies/' . $_SESSION['DatabaseName'] . '/payment.jpg',$Page_Width/2 -280,$YPos-20,0,40);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-06-28 10:12:27 UTC (rev 4609)
+++ trunk/doc/Change.log 2011-07-02 01:34:04 UTC (rev 4610)
@@ -1,5 +1,6 @@
webERP Change Log
+29/6/11 Phil: Bank account to allow default for invoice in currency and also a fall back default to show on invoice where no default for the currency. Modified BankAccounts.php and PrintCustTrans.php (Landscape only) to show the pertinent bank account given the currency of the invoice
28/6/11 Phil: Make assembly items explode into components on packing slips PrintCustOrder_generic.php
28/6/11 Exson: MRPDemands.php links missing ? now fixed - script fixed for quoting variable name CamelCasing
27/6/11 Exson: MRP.php fixed modulus arithmetic that prevented suggesting production quantities where the quantity was less than 1 - the calculation using PanSize should round up to the nearest whole unit to manufacture
Modified: trunk/sql/mysql/upgrade3.11-3.11.1.sql
===================================================================
--- trunk/sql/mysql/upgrade3.11-3.11.1.sql 2011-06-28 10:12:27 UTC (rev 4609)
+++ trunk/sql/mysql/upgrade3.11-3.11.1.sql 2011-07-02 01:34:04 UTC (rev 4610)
@@ -1,3 +1,4 @@
+USE saveurpacific;
SET FOREIGN_KEY_CHECKS=0;
ALTER TABLE accountgroups ADD CONSTRAINT `accountgroups_ibfk_1` FOREIGN KEY (`sectioninaccounts`) REFERENCES `accountsection` (`sectionid`);
ALTER TABLE audittrail ADD CONSTRAINT `audittrail_ibfk_1` FOREIGN KEY (`userid`) REFERENCES `www_users` (`userid`);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
