Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2013-09-28 10:36:43
|
Revision: 6340
http://sourceforge.net/p/web-erp/reponame/6340
Author: daintree
Date: 2013-09-28 10:36:40 +0000 (Sat, 28 Sep 2013)
Log Message:
-----------
WH HSN: fix regular expression to prevent back slashes and double quotes
Modified Paths:
--------------
trunk/doc/Change.log
trunk/javascripts/MiscFunctions.js
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-09-28 05:16:53 UTC (rev 6339)
+++ trunk/doc/Change.log 2013-09-28 10:36:40 UTC (rev 6340)
@@ -1,5 +1,6 @@
webERP Change Log
+28/9/13 wh_hsn: help with regular expression to trap quotes and backslashes for data-type="no-illegal-chars"
28/9/13 Phil: Followed Exson's example to set pattern to prevent dodgy characters in other scripts that were using a pattern that only allowed [a-zA-Z0-9] thus making it impossible to enter non latin characters.
11/9/13 icedlava: SelectCompletedOrder.php Fix SQL typo.
7/9/13 Exson: using javascript to set the pattern attribute based on a new attribute data-type and first script Stocks.php
Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js 2013-09-28 05:16:53 UTC (rev 6339)
+++ trunk/javascripts/MiscFunctions.js 2013-09-28 10:36:40 UTC (rev 6340)
@@ -319,7 +319,7 @@
ds[i].onclick=clickDate;
ds[i].onchange=changeDate;
}
- if(ds[i].getAttribute("data-type") == 'no-illegal-chars') ds[i].pattern="(?!^ +$)[^?\'\"+.&\\><]*";
+ if(ds[i].getAttribute("data-type") == 'no-illegal-chars') ds[i].pattern="(?!^ +$)[^?\'\u0022+.&\\\\><]*";
if (ds[i].className=="number") ds[i].onkeypress=rTN;
if (ds[i].className=="integer") ds[i].onkeypress=rTI;
if (ds[i].className=="number"){
|
|
From: <dai...@us...> - 2013-10-02 07:31:36
|
Revision: 6341
http://sourceforge.net/p/web-erp/reponame/6341
Author: daintree
Date: 2013-10-02 07:31:32 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
David Lynn: added url to suppliers
Modified Paths:
--------------
trunk/SelectSupplier.php
trunk/Suppliers.php
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2013-09-28 10:36:40 UTC (rev 6340)
+++ trunk/SelectSupplier.php 2013-10-02 07:31:32 UTC (rev 6341)
@@ -94,7 +94,8 @@
address3,
address4,
telephone,
- email
+ email,
+ url
FROM suppliers
ORDER BY suppname";
} else {
@@ -110,7 +111,8 @@
address3,
address4,
telephone,
- email
+ email,
+ url
FROM suppliers
WHERE suppname " . LIKE . " '" . $SearchString . "'
ORDER BY suppname";
@@ -124,7 +126,8 @@
address3,
address4,
telephone,
- email
+ email,
+ url
FROM suppliers
WHERE supplierid " . LIKE . " '%" . $_POST['SupplierCode'] . "%'
ORDER BY supplierid";
@@ -283,6 +286,7 @@
<th class="ascending">' . _('Address 4') . '</th>
<th class="ascending">' . _('Telephone') . '</th>
<th class="ascending">' . _('Email') . '</th>
+ <th class="ascending">' . _('URL') . '</th>
</tr>';
$k = 0; //row counter to determine background colour
$RowIndex = 0;
@@ -306,6 +310,7 @@
<td>' . $myrow['address4'] . '</td>
<td>' . $myrow['telephone'] . '</td>
<td><a href="mailto://'.$myrow['email'].'">' . $myrow['email']. '</a></td>
+ <td><a href="'.$myrow['url'].'"target="_blank">' . $myrow['url']. '</a></td>
</tr>';
$RowIndex = $RowIndex + 1;
//end of page full new headings if
Modified: trunk/Suppliers.php
===================================================================
--- trunk/Suppliers.php 2013-09-28 10:36:40 UTC (rev 6340)
+++ trunk/Suppliers.php 2013-10-02 07:31:32 UTC (rev 6341)
@@ -376,6 +376,12 @@
$Errors[$i] = 'Email';
$i++;
}
+ if (mb_strlen($_POST['URL']) >50) {
+ $InputError = 1;
+ prnMsg(_('The URL address must be 50 characters or less long'),'error');
+ $Errors[$i] = 'URL';
+ $i++;
+ }
if (mb_strlen($_POST['BankRef']) > 12) {
$InputError = 1;
prnMsg(_('The bank reference text must be less than 12 characters long'),'error');
@@ -473,6 +479,7 @@
telephone='". $_POST['Phone'] ."',
fax = '". $_POST['Fax']."',
email = '" . $_POST['Email'] . "',
+ url = '" . $_POST['URL'] . "',
supptype = '".$_POST['SupplierType']."',
currcode='" . $_POST['CurrCode'] . "',
suppliersince='".$SQL_SupplierSince . "',
@@ -501,6 +508,7 @@
telephone='" . $_POST['Phone']."',
fax = '" . $_POST['Fax'] . "',
email = '" . $_POST['Email'] . "',
+ url = '" . $_POST['URL'] . "',
supptype = '".$_POST['SupplierType']."',
suppliersince='" . $SQL_SupplierSince . "',
paymentterms='" . $_POST['PaymentTerms'] . "',
@@ -536,6 +544,7 @@
telephone,
fax,
email,
+ url,
supptype,
currcode,
suppliersince,
@@ -560,6 +569,7 @@
'" . $_POST['Phone'] . "',
'" . $_POST['Fax'] . "',
'" . $_POST['Email'] . "',
+ '" . $_POST['URL'] . "',
'".$_POST['SupplierType']."',
'" . $_POST['CurrCode'] . "',
'" . $SQL_SupplierSince . "',
@@ -592,6 +602,7 @@
unset($_POST['Phone']);
unset($_POST['Fax']);
unset($_POST['Email']);
+ unset($_POST['URL']);
unset($_POST['SupplierType']);
unset($_POST['CurrCode']);
unset($SQL_SupplierSince);
@@ -673,26 +684,31 @@
echo '<tr><td>' . _('Supplier Code') . ':</td>
<td><input type="text" data-type="no-illegal-chars" title="'._('The supplier id should not be within 10 legal characters and cannot be blank').'" required="required" name="SupplierID" placeholder="'._('within 10 characters').'" size="11" maxlength="10" /></td>
</tr>';
- echo '<tr><td>' . _('Supplier Name') . ':</td>
+ echo '<tr>
+ <td>' . _('Supplier Name') . ':</td>
<td><input type="text" pattern="(?!^\s+$)[^<>+-]{1,40}" required="required" title="'._('The supplier name should not be blank and should be less than 40 legal characters').'" name="SuppName" size="42" placeholder="'._('Within 40 legal characters').'" maxlength="40" /></td>
- </tr>';
- echo '<tr><td>' . _('Address Line 1 (Street)') . ':</td>
+ </tr>
+ <tr>
+ <td>' . _('Address Line 1 (Street)') . ':</td>
<td><input type="text" pattern=".{1,40}" title="'._('The input should be less than 40 characters').'" placeholder="'._('Less than 40 characters').'" name="Address1" size="42" maxlength="40" /></td>
- </tr>';
- echo '<tr><td>' . _('Address Line 2 (Street)') . ':</td>
+ </tr>
+ <tr>
+ <td>' . _('Address Line 2 (Street)') . ':</td>
<td><input type="text" name="Address2" pattern=".{1,40}" title="'._('The input should be less than 40 characters').'" placeholder="'._('Less than 40 characters').'" size="42" maxlength="40" /></td>
- </tr>';
- echo '<tr><td>' . _('Address Line 3 (Suburb/City)') . ':</td>
+ </tr>
+ <tr>
+ <td>' . _('Address Line 3 (Suburb/City)') . ':</td>
<td><input type="text" title="'._('The input should be less than 40 characters').'" placeholder="'._('Less than 40 characters').'" name="Address3" size="42" maxlength="40" /></td>
- </tr>';
- echo '<tr><td>' . _('Address Line 4 (State/Province)') . ':</td>
+ </tr>
+ <tr>
+ <td>' . _('Address Line 4 (State/Province)') . ':</td>
<td><input type="text" name="Address4" placeholder="'._('Less than 50 characters').'" size="42" maxlength="50" /></td>
- </tr>';
- echo '<tr><td>' . _('Address Line 5 (Postal Code)') . ':</td>
+ </tr>
+ <tr>
+ <td>' . _('Address Line 5 (Postal Code)') . ':</td>
<td><input type="text" name="Address5" size="42" placeholder="'._('Less than 40 characters').'" maxlength="40" /></td>
- </tr>';
-
- echo '<tr>
+ </tr>
+ <tr>
<td>' . _('Country') . ':</td>
<td><select name="Address6">';
foreach ($CountriesArray as $CountryEntry => $CountryName){
@@ -705,41 +721,54 @@
}
}
echo '</select></td>
- </tr>';
-
- echo '<tr><td>' . _('Telephone') . ':</td>
+ </tr>
+ <tr>
+ <td>' . _('Telephone') . ':</td>
<td><input type="tel" pattern="[\s\d+)(-]{1,40}" title="'._('The input should be phone number').'" placeholder="'._('only number + - ( and ) allowed').'" name="Phone" size="30" maxlength="40" /></td>
- </tr>';
- echo '<tr><td>' . _('Facsimile') . ':</td>
+ </tr>
+ <tr>
+ <td>' . _('Facsimile') . ':</td>
<td><input type="tel" pattern="[\s\d+)(-]{1,40}" title="'._('The input should be fax number').'" placeholder="'._('only number + - ( and ) allowed').'" name="Fax" size="30" maxlength="40" /></td>
- </tr>';
- echo '<tr><td>' . _('Email Address') . ':</td>
- <td><input type="email" name="Email" title="'._('Only email address are allowed').'" placeholder="'._('email format such as xx...@ma...').'" size="30" maxlength="40" pattern="[a-z0-9!#$%&\'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*" /></td>
- </tr>';
- echo '<tr><td>' . _('Supplier Type') . ':</td>
+ </tr>
+ <tr>
+ <td>' . _('Email Address') . ':</td>
+ <td><input type="email" name="Email" title="'._('Only email address are allowed').'" placeholder="'._('email format such as xx...@ma...').'" size="30" maxlength="50" pattern="[a-z0-9!#$%&\'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*" /></td>
+ </tr>
+ <tr>
+ <td>' . _('URL') . ':</td>
+ <td><input type="url" name="url" title="'._('Only URL address are allowed').'" placeholder="'._('URL format such as www.example.com').'" size="30" maxlength="50" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Supplier Type') . ':</td>
<td><select name="SupplierType">';
$result=DB_query("SELECT typeid, typename FROM suppliertype", $db);
while ($myrow = DB_fetch_array($result)) {
echo '<option value="' . $myrow['typeid'] . '">' . $myrow['typename'] . '</option>';
} //end while loop
- echo '</select></td></tr>';
+ echo '</select></td>
+ </tr>';
$DateString = Date($_SESSION['DefaultDateFormat']);
- echo '<tr><td>' . _('Supplier Since') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td>
+ echo '<tr>
+ <td>' . _('Supplier Since') . ' (' . $_SESSION['DefaultDateFormat'] . '):</td>
<td><input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] .'" name="SupplierSince" value="' . $DateString . '" size="12" maxlength="10" /></td>
- </tr>';
- echo '<tr><td>' . _('Bank Particulars') . ':</td>
+ </tr>
+ <tr>
+ <td>' . _('Bank Particulars') . ':</td>
<td><input type="text" name="BankPartics" size="13" maxlength="12" /></td>
- </tr>';
- echo '<tr><td>' . _('Bank reference') . ':</td>
+ </tr>
+ <tr>
+ <td>' . _('Bank reference') . ':</td>
<td><input type="text" name="BankRef" value="0" size="13" maxlength="12" /></td>
- </tr>';
- echo '<tr><td>' . _('Bank Account No') . ':</td>
+ </tr>
+ <tr>
+ <td>' . _('Bank Account No') . ':</td>
<td><input type="text" placeholder="'._('Less than 30 characters').'" name="BankAct" size="31" maxlength="30" /></td></tr>';
$result=DB_query("SELECT terms, termsindicator FROM paymentterms", $db);
- echo '<tr><td>' . _('Payment Terms') . ':</td>
+ echo '<tr>
+ <td>' . _('Payment Terms') . ':</td>
<td><select name="PaymentTerms">';
while ($myrow = DB_fetch_array($result)) {
@@ -750,7 +779,8 @@
$result=DB_query("SELECT id, coyname FROM factorcompanies", $db);
- echo '<tr><td>' . _('Factor Company') . ':</td>
+ echo '<tr>
+ <td>' . _('Factor Company') . ':</td>
<td><select name="FactorID">';
echo '<option value="0">' . _('None') . '</option>';
while ($myrow = DB_fetch_array($result)) {
@@ -761,8 +791,10 @@
}
} //end while loop
DB_data_seek($result, 0);
- echo '</select></td></tr>';
- echo '<tr><td>' . _('Tax Reference') . ':</td>
+ echo '</select></td>
+ </tr>
+ <tr>
+ <td>' . _('Tax Reference') . ':</td>
<td><input type="text" name="TaxRef" placehoder="'._('Within 20 characters').'" size="21" maxlength="20" /></td></tr>';
$result=DB_query("SELECT currency, currabrev FROM currencies", $db);
@@ -772,7 +804,8 @@
$_POST['CurrCode'] = $myrow[0];
}
- echo '<tr><td>' . _('Supplier Currency') . ':</td>
+ echo '<tr>
+ <td>' . _('Supplier Currency') . ':</td>
<td><select name="CurrCode">';
while ($myrow = DB_fetch_array($result)) {
if ($_POST['CurrCode'] == $myrow['currabrev']){
@@ -783,15 +816,17 @@
} //end while loop
DB_data_seek($result, 0);
- echo '</select></td></tr>
- <tr><td>' . _('Remittance Advice') . ':</td>
- <td><select name="Remittance">';
- echo '<option value="0">' . _('Not Required') . '</option>';
- echo '<option value="1">' . _('Required') . '</option>';
-
- echo '</select></td></tr>';
-
- echo '<tr><td>' . _('Tax Group') . ':</td>
+ echo '</select></td>
+ </tr>
+ <tr>
+ <td>' . _('Remittance Advice') . ':</td>
+ <td><select name="Remittance">
+ <option value="0">' . _('Not Required') . '</option>
+ <option value="1">' . _('Required') . '</option>
+ </select></td>
+ </tr>
+ <tr>
+ <td>' . _('Tax Group') . ':</td>
<td><select name="TaxGroup">';
DB_data_seek($result, 0);
@@ -807,7 +842,8 @@
}
} //end while loop
- echo '</select></td></tr>
+ echo '</select></td>
+ </tr>
</table>
<br />
<div class="centre"><input type="submit" name="submit" value="' . _('Insert New Supplier') . '" /></div>';
@@ -835,6 +871,7 @@
telephone,
fax,
email,
+ url,
supptype,
currcode,
suppliersince,
@@ -863,6 +900,7 @@
$_POST['Phone'] = $myrow['telephone'];
$_POST['Fax'] = $myrow['fax'];
$_POST['Email'] = $myrow['email'];
+ $_POST['URL'] = $myrow['url'];
$_POST['SupplierType'] = $myrow['supptype'];
$_POST['SupplierSince'] = ConvertSQLDate($myrow['suppliersince']);
$_POST['PaymentTerms'] = $myrow['paymentterms'];
@@ -917,6 +955,8 @@
<td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="tel" pattern="[\s\d+()-]{1,40}" placeholder="'._('Only digit blank ( ) and - allowed').'" name="Fax" value="' . $_POST['Fax'] . '" size="42" maxlength="40" /></td></tr>';
echo '<tr><td>' . _('Email Address') . ':</td>
<td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="email" title="'._('The input must be in email format').'" name="Email" value="' . $_POST['Email'] . '" size="42" maxlength="40" placeholder="'._('email format such as xx...@ma...').'" pattern="[a-z0-9!#$%&\'*+/=?^_`{|}~.-]+@[a-z0-9-]+(\.[a-z0-9-]+)*" /></td></tr>';
+ echo '<tr><td>' . _('URL') . ':</td>
+ <td><input '.(in_array('Name',$Errors) ? 'class="inputerror"' : '').' type="url" title="'._('The input must be in url format').'" name="URL" value="' . $_POST['URL'] . '" size="42" maxlength="40" placeholder="'._('url format such as www.example.com').'" /></td></tr>';
echo '<tr><td>' . _('Supplier Type') . ':</td>
<td><select name="SupplierType">';
$result=DB_query("SELECT typeid, typename FROM suppliertype", $db);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-09-28 10:36:40 UTC (rev 6340)
+++ trunk/doc/Change.log 2013-10-02 07:31:32 UTC (rev 6341)
@@ -1,5 +1,6 @@
webERP Change Log
+2/10/13 David Lynn: Added new field url to suppliers modified SelectSupplier.php and Suppliers.php
28/9/13 wh_hsn: help with regular expression to trap quotes and backslashes for data-type="no-illegal-chars"
28/9/13 Phil: Followed Exson's example to set pattern to prevent dodgy characters in other scripts that were using a pattern that only allowed [a-zA-Z0-9] thus making it impossible to enter non latin characters.
11/9/13 icedlava: SelectCompletedOrder.php Fix SQL typo.
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2013-09-28 10:36:40 UTC (rev 6340)
+++ trunk/doc/Manual/ManualContributors.html 2013-10-02 07:31:32 UTC (rev 6341)
@@ -80,6 +80,8 @@
<br />
David Luo<br />
<br />
+ David Lynn<br />
+ <br />
Martha Madjack<br />
<br />
Wayne McDougall<br />
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2013-09-28 10:36:40 UTC (rev 6340)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2013-10-02 07:31:32 UTC (rev 6341)
@@ -1,4 +1,5 @@
INSERT INTO scripts VALUES ('Z_UpdateSalesAnalysisWithLatestCustomerData.php','15','Update sales analysis with latest customer and branch salesperson sales area and salestype irrespective of what these settings were when the sale was made');
INSERT INTO scripts VALUES ('PurchaseByPrefSupplier.php','2','Purchase ordering by preferred supplier');
+ALTER TABLE `suppliers` ADD COLUMN `url` varchar(50) NOT NULL DEFAULT '';
#--UPDATE config SET confvalue='4.11.0' WHERE confname='VersionNumber';
|
|
From: <ice...@us...> - 2013-10-03 06:42:42
|
Revision: 6342
http://sourceforge.net/p/web-erp/reponame/6342
Author: icedlava
Date: 2013-10-03 06:42:40 +0000 (Thu, 03 Oct 2013)
Log Message:
-----------
PO_Items.php with non-stock items still require GL Code in case of modified order at invoice time else SQL error is generated due to invalid GL Code.
Modified Paths:
--------------
trunk/PO_Items.php
trunk/doc/Change.log
trunk/doc/Manual/ManualContributors.html
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2013-10-02 07:31:32 UTC (rev 6341)
+++ trunk/PO_Items.php 2013-10-03 06:42:40 UTC (rev 6342)
@@ -109,7 +109,7 @@
prnMsg( _('You do not have permission to authorise this purchase order').'.<br />' . _('This order is for').' '.
$_SESSION['PO'.$identifier]->CurrCode . ' '. $_SESSION['PO'.$identifier]->Order_Value() .'. '.
$AuthMessage .
- _('If you think this is a mistake please contact the systems administrator') . '<br />' .
+ _('If you think this is a mistake please contact the systems administrator') . '<br />' .
_('The order will be created with a status of pending and will require authorisation'), 'warn');
$_SESSION['PO'.$identifier]->AllowPrintPO=0;
@@ -440,7 +440,10 @@
/*It's not a stock item */
/*need to check GL Code is valid if GLLink is active */
- if ($_SESSION['PO'.$identifier]->GLLink==1){
+ /* [icedlava] GL Code is required for non stock item variance in price vs purchase order when supplier invoice generated else
+ there will be an sql error in SupplierInvoice.php without a valid GL Code
+ */
+ //if ($_SESSION['PO'.$identifier]->GLLink==1){
$sql = "SELECT accountname
FROM chartmaster
@@ -464,10 +467,10 @@
$myrow = DB_fetch_row($GLValidResult);
$GLAccountName = $myrow[0];
}
- } /* dont bother checking the GL Code if there is no GL code to check ie not linked to GL */
- else {
- $_POST['GLCode']=0;
- }
+ //} /* dont bother checking the GL Code if there is no GL code to check ie not linked to GL */
+ //else {
+ // $_POST['GLCode']=0;
+ //}
if ($_POST['AssetID'] !='Not an Asset'){
$ValidAssetResult = DB_query("SELECT assetid,
description,
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-10-02 07:31:32 UTC (rev 6341)
+++ trunk/doc/Change.log 2013-10-03 06:42:40 UTC (rev 6342)
@@ -1,6 +1,7 @@
webERP Change Log
-2/10/13 David Lynn: Added new field url to suppliers modified SelectSupplier.php and Suppliers.php
+3/10/13 icedlava: PO_Items.php with non-stock items still require GL Code in case of modified order at invoice time else SQL error is generated due to invalid GL Code.
+2/10/13 David Lynn: Added new field url to suppliers modified SelectSupplier.php and Suppliers.php
28/9/13 wh_hsn: help with regular expression to trap quotes and backslashes for data-type="no-illegal-chars"
28/9/13 Phil: Followed Exson's example to set pattern to prevent dodgy characters in other scripts that were using a pattern that only allowed [a-zA-Z0-9] thus making it impossible to enter non latin characters.
11/9/13 icedlava: SelectCompletedOrder.php Fix SQL typo.
Modified: trunk/doc/Manual/ManualContributors.html
===================================================================
--- trunk/doc/Manual/ManualContributors.html 2013-10-02 07:31:32 UTC (rev 6341)
+++ trunk/doc/Manual/ManualContributors.html 2013-10-03 06:42:40 UTC (rev 6342)
@@ -58,6 +58,8 @@
<br />
Tomáš Horáček (barcodepack)<br />
<br />
+ Icedlava<br />
+ <br />
Hindra Joshua<br />
<br />
Alan Jones<br />
|
|
From: <rc...@us...> - 2013-10-04 16:42:42
|
Revision: 6343
http://sourceforge.net/p/web-erp/reponame/6343
Author: rchacon
Date: 2013-10-04 16:42:37 +0000 (Fri, 04 Oct 2013)
Log Message:
-----------
Fixes Letter_Landscape mismatch between FormDesigner.php and PDFStarter.php.
Modified Paths:
--------------
trunk/FormDesigner.php
trunk/includes/PDFStarter.php
Modified: trunk/FormDesigner.php
===================================================================
--- trunk/FormDesigner.php 2013-10-03 06:42:40 UTC (rev 6342)
+++ trunk/FormDesigner.php 2013-10-04 16:42:37 UTC (rev 6343)
@@ -157,7 +157,7 @@
}
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/reports.png" title="' . _('Form Design') . '" alt="" />' . ' ' . _('Form Design') . '<br />' . $FormDesign['name'] . '</p>';
echo '<div class="page_help_text">' . _('Enter the changes that you want in the form layout below.') . '<br /> '. _('All measurements are in points') . '.</div><br />';
-$Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A3_Landscape', 'A3_Portrait', 'letter_Portrait', 'letter_Landscape', 'legal_Portrait', 'legal_Landscape'); // Possible paper sizes/orientations
+$Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A3_Landscape', 'A3_Portrait', 'letter_Portrait', 'Letter_Landscape', 'legal_Portrait', 'legal_Landscape'); // Possible paper sizes/orientations
echo '<form method="post" id="Form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
Modified: trunk/includes/PDFStarter.php
===================================================================
--- trunk/includes/PDFStarter.php 2013-10-03 06:42:40 UTC (rev 6342)
+++ trunk/includes/PDFStarter.php 2013-10-04 16:42:37 UTC (rev 6343)
@@ -119,7 +119,7 @@
$Right_Margin = 36; // Half inch = 72/2
break;
- case 'letter_landscape':
+ case 'Letter_Landscape': // 279mm x 216mm
$DocumentPaper = 'LETTER';
$DocumentOrientation ='L';
|
|
From: <rc...@us...> - 2013-10-04 17:10:48
|
Revision: 6344
http://sourceforge.net/p/web-erp/reponame/6344
Author: rchacon
Date: 2013-10-04 17:10:45 +0000 (Fri, 04 Oct 2013)
Log Message:
-----------
Fixes capital letter mismatch between FormDesigner.php and PDFStarter.php for paper size. Minor changes (info).
Modified Paths:
--------------
trunk/FormDesigner.php
trunk/includes/PDFStarter.php
Modified: trunk/FormDesigner.php
===================================================================
--- trunk/FormDesigner.php 2013-10-04 16:42:37 UTC (rev 6343)
+++ trunk/FormDesigner.php 2013-10-04 17:10:45 UTC (rev 6344)
@@ -157,7 +157,7 @@
}
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/reports.png" title="' . _('Form Design') . '" alt="" />' . ' ' . _('Form Design') . '<br />' . $FormDesign['name'] . '</p>';
echo '<div class="page_help_text">' . _('Enter the changes that you want in the form layout below.') . '<br /> '. _('All measurements are in points') . '.</div><br />';
-$Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A3_Landscape', 'A3_Portrait', 'letter_Portrait', 'Letter_Landscape', 'legal_Portrait', 'legal_Landscape'); // Possible paper sizes/orientations
+$Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A3_Landscape', 'A3_Portrait', 'Letter_Portrait', 'Letter_Landscape', 'Legal_Portrait', 'Legal_Landscape'); // Possible paper sizes/orientations
echo '<form method="post" id="Form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">';
echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
Modified: trunk/includes/PDFStarter.php
===================================================================
--- trunk/includes/PDFStarter.php 2013-10-04 16:42:37 UTC (rev 6343)
+++ trunk/includes/PDFStarter.php 2013-10-04 17:10:45 UTC (rev 6344)
@@ -93,7 +93,7 @@
$Right_Margin=40;
break;
- case 'A3_landscape':
+ case 'A3_Landscape':
$DocumentPaper = 'A3';
$DocumentOrientation ='L';
@@ -106,7 +106,7 @@
$Right_Margin=40;
break;
- case 'letter':
+ case 'Letter': // 216mm x 279mm
$DocumentPaper = 'LETTER';
$DocumentOrientation ='P';
@@ -132,30 +132,30 @@
$Right_Margin = 36; // Half inch = 72/2
break;
- case 'legal':
+ case 'Legal': // 216mm x 356mm
$DocumentPaper = 'LEGAL';
$DocumentOrientation ='P';
- $Page_Width=612;
- $Page_Height=1008;
- $Top_Margin=50;
- $Bottom_Margin=40;
- $Left_Margin=30;
- $Right_Margin=25;
+ $Page_Width=612; // 72 * 8.5 inch
+ $Page_Height=1008; // 72 * 14 inch
+ $Top_Margin = 36; // Half inch = 72/2
+ $Bottom_Margin = 36; // Half inch = 72/2
+ $Left_Margin = 36; // Half inch = 72/2
+ $Right_Margin = 36; // Half inch = 72/2
break;
- case 'legal_landscape':
+ case 'Legal_Landscape': // 356mm x 216mm
$DocumentPaper = 'LEGAL';
$DocumentOrientation ='L';
- $Page_Width=1008;
- $Page_Height=612;
- $Top_Margin=50;
- $Bottom_Margin=40;
- $Left_Margin=30;
- $Right_Margin=25;
+ $Page_Width=1008; // 72 * 14 inch
+ $Page_Height=612; // 72 * 8.5 inch
+ $Top_Margin = 36; // Half inch = 72/2
+ $Bottom_Margin = 36; // Half inch = 72/2
+ $Left_Margin = 36; // Half inch = 72/2
+ $Right_Margin = 36; // Half inch = 72/2
break;
default:
$DocumentOrientation = 'L';
|
|
From: <dai...@us...> - 2013-10-04 21:26:54
|
Revision: 6345
http://sourceforge.net/p/web-erp/reponame/6345
Author: daintree
Date: 2013-10-04 21:26:52 +0000 (Fri, 04 Oct 2013)
Log Message:
-----------
Check for AP->GL link before setting GL code to 0
Modified Paths:
--------------
trunk/PO_Items.php
trunk/ShopParameters.php
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2013-10-04 17:10:45 UTC (rev 6344)
+++ trunk/PO_Items.php 2013-10-04 21:26:52 UTC (rev 6345)
@@ -437,14 +437,13 @@
prnMsg( _('Cannot Enter this order line') . '</b><br />' . _('The date entered must be in the format') . ' ' . $_SESSION['DefaultDateFormat'], 'error');
}
- /*It's not a stock item */
+ /*It's not a stock item
+ * need to check GL Code is valid if GLLink is active
+ * [icedlava] GL Code is required for non stock item variance in price vs purchase order when supplier invoice generated even if stock not linked to GL, but AP is else
+ * there will be an sql error in SupplierInvoice.php without a valid GL Code
+ */
+ if ($_SESSION['PO'.$identifier]->GLLink==1 OR $_SESSION['CompanyRecord']['gllink_creditors']==1){
- /*need to check GL Code is valid if GLLink is active */
- /* [icedlava] GL Code is required for non stock item variance in price vs purchase order when supplier invoice generated else
- there will be an sql error in SupplierInvoice.php without a valid GL Code
- */
- //if ($_SESSION['PO'.$identifier]->GLLink==1){
-
$sql = "SELECT accountname
FROM chartmaster
WHERE accountcode ='" . $_POST['GLCode'] . "'";
@@ -467,10 +466,10 @@
$myrow = DB_fetch_row($GLValidResult);
$GLAccountName = $myrow[0];
}
- //} /* dont bother checking the GL Code if there is no GL code to check ie not linked to GL */
- //else {
- // $_POST['GLCode']=0;
- //}
+ } /* dont bother checking the GL Code if there is no GL code to check ie not linked to GL */
+ else {
+ $_POST['GLCode']=0;
+ }
if ($_POST['AssetID'] !='Not an Asset'){
$ValidAssetResult = DB_query("SELECT assetid,
description,
Modified: trunk/ShopParameters.php
===================================================================
--- trunk/ShopParameters.php 2013-10-04 17:10:45 UTC (rev 6344)
+++ trunk/ShopParameters.php 2013-10-04 21:26:52 UTC (rev 6345)
@@ -107,6 +107,9 @@
if ($_SESSION['ShopPayPalBankAccount'] != $_POST['X_ShopPayPalBankAccount'] ) {
$SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopPayPalBankAccount']."' WHERE confname = 'ShopPayPalBankAccount'";
}
+ if ($_SESSION['ShopFreightModule'] != $_POST['X_ShopFreightModule'] ) {
+ $SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopFreightModule']."' WHERE confname = 'ShopFreightModule'";
+ }
if (!$AllowDemoMode) {
if ($_SESSION['ShopCreditCardGateway'] != $_POST['X_ShopCreditCardGateway'] ) {
@@ -355,6 +358,27 @@
</tr>';
echo '<tr>
+ <td>' . _('Freight Calculations') . ':</td>
+ <td><select name="X_ShopFreightModule">';
+
+$FreightModules = array(array('MethodName'=>'No Freight','MethodCode'=>'NoFreight'),
+ array('MethodName'=>'webERP calculation','MethodCode'=>'webERPDefault'),
+ array('MethodName'=>'Australia Post API','MethodCode'=>'AusPost'));
+
+foreach($FreightModules as $FreightCalc){
+ if ($_SESSION['ShopFreightModule'] ==$FreightCalc['MethodCode']) {
+ echo '<option selected="selected" value="' . $FreightCalc['MethodCode'] . '">' . $FreightCalc['MethodName'] . '</option>';
+ } else {
+ echo '<option value="' . $FreightCalc['MethodCode'] . '">' . $FreightCalc['MethodName'] . '</option>';
+ }
+}
+echo '</select></td>
+ <td>' . _('Select the freight calculation method to use for the webSHOP') . '</td>
+ </tr>';
+
+
+
+echo '<tr>
<th colspan="3">' . _('Bank Transfer Settings') . '</th></tr>';
echo $TableHeader;
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2013-10-04 17:10:45 UTC (rev 6344)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2013-10-04 21:26:52 UTC (rev 6345)
@@ -1,5 +1,6 @@
INSERT INTO scripts VALUES ('Z_UpdateSalesAnalysisWithLatestCustomerData.php','15','Update sales analysis with latest customer and branch salesperson sales area and salestype irrespective of what these settings were when the sale was made');
INSERT INTO scripts VALUES ('PurchaseByPrefSupplier.php','2','Purchase ordering by preferred supplier');
ALTER TABLE `suppliers` ADD COLUMN `url` varchar(50) NOT NULL DEFAULT '';
+INSERT INTO config ('ShopFreightModule','webERPDefault');
#--UPDATE config SET confvalue='4.11.0' WHERE confname='VersionNumber';
|
|
From: <dai...@us...> - 2013-10-11 23:23:12
|
Revision: 6350
http://sourceforge.net/p/web-erp/reponame/6350
Author: daintree
Date: 2013-10-11 23:23:08 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
Tim: link to allocations and manual links
Modified Paths:
--------------
trunk/InternalStockRequest.php
trunk/InternalStockRequestAuthorisation.php
trunk/InternalStockRequestFulfill.php
trunk/PO_Header.php
trunk/Payments.php
trunk/ShopParameters.php
trunk/doc/Change.log
trunk/doc/Manual/ManualInventory.html
trunk/includes/FreightCalculation.inc
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/InternalStockRequest.php
===================================================================
--- trunk/InternalStockRequest.php 2013-10-09 17:37:21 UTC (rev 6349)
+++ trunk/InternalStockRequest.php 2013-10-11 23:23:08 UTC (rev 6350)
@@ -6,6 +6,8 @@
include('includes/session.inc');
$Title = _('Create an Internal Materials Request');
+$ViewTopic = 'Inventory';
+$BookMark = 'CreateRequest';
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/InternalStockRequestAuthorisation.php
===================================================================
--- trunk/InternalStockRequestAuthorisation.php 2013-10-09 17:37:21 UTC (rev 6349)
+++ trunk/InternalStockRequestAuthorisation.php 2013-10-11 23:23:08 UTC (rev 6350)
@@ -5,6 +5,8 @@
include('includes/session.inc');
$Title = _('Authorise Internal Stock Requests');
+$ViewTopic = 'Inventory';
+$BookMark = 'AuthoriseRequest';
include('includes/header.inc');
Modified: trunk/InternalStockRequestFulfill.php
===================================================================
--- trunk/InternalStockRequestFulfill.php 2013-10-09 17:37:21 UTC (rev 6349)
+++ trunk/InternalStockRequestFulfill.php 2013-10-11 23:23:08 UTC (rev 6350)
@@ -5,6 +5,8 @@
include('includes/session.inc');
$Title = _('Fulfill Stock Requests');
+$ViewTopic = 'Inventory';
+$BookMark = 'FulfilRequest';
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2013-10-09 17:37:21 UTC (rev 6349)
+++ trunk/PO_Header.php 2013-10-11 23:23:08 UTC (rev 6350)
@@ -1015,7 +1015,7 @@
</tr>
<tr>
<td>' . _('Phone') . ':</td>
- <td><input type="tel" name="Tel" pattern="[0-9+\-\s]*" size="31" maxlength="30" value="' . $_SESSION['PO' . $identifier]->Tel . '" /></td>
+ <td><input type="tel" name="Tel" pattern="[0-9+()\-\s]*" size="31" maxlength="30" value="' . $_SESSION['PO' . $identifier]->Tel . '" /></td>
</tr>
<tr>
<td>' . _('Delivery By') . ':</td>
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2013-10-09 17:37:21 UTC (rev 6349)
+++ trunk/Payments.php 2013-10-11 23:23:08 UTC (rev 6350)
@@ -602,7 +602,7 @@
'" . $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate . "',
'" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
'" . $_SESSION['PaymentDetail' . $identifier]->Paymenttype . "',
- '" . -$PaymentItem->Amount . "',
+ '" . -$_SESSION['PaymentDetail' . $identifier]->Amount . "',
'" . $_SESSION['PaymentDetail' . $identifier]->Currency . "' )";
$ErrMsg = _('Cannot insert a bank transaction because');
@@ -629,12 +629,15 @@
/*Set up a newy in case user wishes to enter another */
if (isset($LastSupplier) and $LastSupplier!='') {
- $sql="SELECT suppname FROM suppliers
+ $SupplierSQL="SELECT suppname FROM suppliers
WHERE supplierid='".$LastSupplier."'";
- $result=DB_query($sql, $db);
- $myrow=DB_fetch_array($result);
- echo '<br /><a href="' . $RootPath . '/Payments.php?SupplierID=' . $LastSupplier . '">' .
- _('Enter another Payment for') . ' ' . $myrow['suppname'] . '</a>';
+ $SupplierResult = DB_query($SupplierSQL, $db);
+ $SupplierRow = DB_fetch_array($SupplierResult);
+ $TransSQL = "SELECT id FROM supptrans WHERE type=22 AND transno='" . $TransNo . "'";
+ $TransResult = DB_query($IdSQL, $db);
+ $TransRow = DB_fetch_array($IdResult);
+ echo '<br /><a href="' . $RootPath . '/SupplierAllocations.php?AllocTrans=' . $TransRow['id'] . '">' . _('Allocate this payment') . '</a>';
+ echo '<br /><a href="' . $RootPath . '/Payments.php?SupplierID=' . $LastSupplier . '">' . _('Enter another Payment for') . ' ' . $SupplierRow['suppname'] . '</a>';
} else {
echo '<br /><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Enter another General Ledger Payment') . '</a><br />';
}
Modified: trunk/ShopParameters.php
===================================================================
--- trunk/ShopParameters.php 2013-10-09 17:37:21 UTC (rev 6349)
+++ trunk/ShopParameters.php 2013-10-11 23:23:08 UTC (rev 6350)
@@ -107,8 +107,8 @@
if ($_SESSION['ShopPayPalBankAccount'] != $_POST['X_ShopPayPalBankAccount'] ) {
$SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopPayPalBankAccount']."' WHERE confname = 'ShopPayPalBankAccount'";
}
- if ($_SESSION['ShopFreightModule'] != $_POST['X_ShopFreightModule'] ) {
- $SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopFreightModule']."' WHERE confname = 'ShopFreightModule'";
+ if ($_SESSION['ShopFreightMethod'] != $_POST['X_ShopFreightMethod'] ) {
+ $SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopFreightMethod']."' WHERE confname = 'ShopFreightMethod'";
}
if (!$AllowDemoMode) {
@@ -165,9 +165,8 @@
$ErrMsg = _('The shop configuration could not be updated because');
$DbgMsg = _('The SQL that failed was:');
- //print_r($SQL);
-
if (sizeof($SQL) > 0 ) {
+
$result = DB_Txn_Begin($db);
foreach ($SQL as $SqlLine) {
$result = DB_query($SqlLine,$db,$ErrMsg,$DbgMsg,true);
@@ -359,17 +358,17 @@
echo '<tr>
<td>' . _('Freight Calculations') . ':</td>
- <td><select name="X_ShopFreightModule">';
+ <td><select name="X_ShopFreightMethod">';
-$FreightModules = array(array('MethodName'=>'No Freight','MethodCode'=>'NoFreight'),
- array('MethodName'=>'webERP calculation','MethodCode'=>'webERPDefault'),
+$FreightMethods = array(array('MethodName'=>'No Freight','MethodCode'=>'NoFreight'),
+ array('MethodName'=>'webERP calculation','MethodCode'=>'webERPCalculation'),
array('MethodName'=>'Australia Post API','MethodCode'=>'AusPost'));
-foreach($FreightModules as $FreightCalc){
- if ($_SESSION['ShopFreightModule'] ==$FreightCalc['MethodCode']) {
- echo '<option selected="selected" value="' . $FreightCalc['MethodCode'] . '">' . $FreightCalc['MethodName'] . '</option>';
+foreach($FreightMethods as $FreightMethod){
+ if ($_SESSION['ShopFreightMethod'] == $FreightMethod['MethodCode']) {
+ echo '<option selected="selected" value="' . $FreightMethod['MethodCode'] . '">' . $FreightMethod['MethodName'] . '</option>';
} else {
- echo '<option value="' . $FreightCalc['MethodCode'] . '">' . $FreightCalc['MethodName'] . '</option>';
+ echo '<option value="' . $FreightMethod['MethodCode'] . '">' . $FreightMethod['MethodName'] . '</option>';
}
}
echo '</select></td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-10-09 17:37:21 UTC (rev 6349)
+++ trunk/doc/Change.log 2013-10-11 23:23:08 UTC (rev 6350)
@@ -1,5 +1,8 @@
webERP Change Log
-2013/10/09 Exson: commit the fixed "Unable to Locate Purchase Order Number" error when the PO is created by SO interface. Fixed provided by Tim and reported by Merci from webERP forum.
+
+11/10/13 Tim: Links for manual internal transfers and supplier payment link to allocations
+9/10/13 Exson: commit the fixed "Unable to Locate Purchase Order Number" error when the PO is created by SO interface. Fixed provided by Tim and reported by Merci from webERP forum.
+6/10/13 Phil: New script to show a grid of items by preferred supplier for placing purchase orders to the users's default inventory location - orders will be authorised if the user has authority and the auto-authorise config option is enabled.
3/10/13 icedlava: PO_Items.php with non-stock items still require GL Code in case of modified order at invoice time else SQL error is generated due to invalid GL Code.
2/10/13 David Lynn: Added new field url to suppliers modified SelectSupplier.php and Suppliers.php
28/9/13 wh_hsn: help with regular expression to trap quotes and backslashes for data-type="no-illegal-chars"
Modified: trunk/doc/Manual/ManualInventory.html
===================================================================
--- trunk/doc/Manual/ManualInventory.html 2013-10-09 17:37:21 UTC (rev 6349)
+++ trunk/doc/Manual/ManualInventory.html 2013-10-11 23:23:08 UTC (rev 6350)
@@ -481,18 +481,18 @@
<ul>
<li>
- <h3>Create a New Internal Stock Request</h3>
+ <h3><a id="CreateRequest">Create a New Internal Stock Request</a></h3
<p>An internal stock request is created in two parts. Firstly the header, which contains the Department that requires the items, the location that you wish the request to be fulfilled from, the date by which you require the items, and any narrative you wish to add to the request.</p>
<p>Secondly the items required are selected and the quantities required are entered.</p>
<p>Once you are happy that you have all the items and quantities enetered, submit the request for authorisation.</p>
</li>
<li>
- <h3>Authorise Internal Stock Requests</h3>
+ <h3><a id="AuthoriseRequest">Authorise Internal Stock Requests</a></h3>
<p>When a user chooses this option they will see all unauthorised stock requests that they are allowed to authorise. No other requests will appear. By ticking the authorise checkbox, and clicking on the update button they will authorise this request to be fulfilled.</p>
</li>
<li>
- <h3>Fulfil Internal Stock Requests</h3>
+ <h3><a id="FulfilRequest">Fulfil Internal Stock Requests</a></h3>
<p>When the warehouse open this option for their own warehouse, they will see any internal stock requests that are awaiting fulfillment. They can either fulfil all or part of a request. If not all of the request is fulfilled, but the rest will not be, the request can be marked as completed. Also a GL tag can be chosen to tag that entry against.</p>
</li>
</ul>
Modified: trunk/includes/FreightCalculation.inc
===================================================================
--- trunk/includes/FreightCalculation.inc 2013-10-09 17:37:21 UTC (rev 6349)
+++ trunk/includes/FreightCalculation.inc 2013-10-11 23:23:08 UTC (rev 6350)
@@ -51,7 +51,7 @@
AND destinationcountry = '" . $BrAddCountry . "'
AND maxkgs > " . $TotalWeight . "
AND maxcub >" . $TotalVolume . " ";
- if (($BrAdd2 != "") OR ($BrAdd3 != "") OR ($BrAdd4 != "") OR ($BrAdd5 != "")){
+ if (($BrAdd2 != '') OR ($BrAdd3 != '') OR ($BrAdd4 != '') OR ($BrAdd5 != '')){
// if there is some details of the address besides the country
$sql .= " AND (";
foreach ($FindCity as $City) {
@@ -61,7 +61,7 @@
/* For international shipments empty destination (ANY) is allowed */
$sql = $sql . " destination = '' OR";
}
- $sql = mb_substr($sql, 0, strrpos($sql,' OR')) . ')';
+ $sql = mb_substr($sql, 0, mb_strrpos($sql,' OR')) . ')';
}
$CalcFreightCostResult = DB_query($sql,$db);
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2013-10-09 17:37:21 UTC (rev 6349)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2013-10-11 23:23:08 UTC (rev 6350)
@@ -1,6 +1,6 @@
INSERT INTO scripts VALUES ('Z_UpdateSalesAnalysisWithLatestCustomerData.php','15','Update sales analysis with latest customer and branch salesperson sales area and salestype irrespective of what these settings were when the sale was made');
INSERT INTO scripts VALUES ('PurchaseByPrefSupplier.php','2','Purchase ordering by preferred supplier');
ALTER TABLE `suppliers` ADD COLUMN `url` varchar(50) NOT NULL DEFAULT '';
-INSERT INTO config ('ShopFreightModule','webERPDefault');
+INSERT INTO config VALUES ('ShopFreightMethod','webERPDefault');
#--UPDATE config SET confvalue='4.11.0' WHERE confname='VersionNumber';
|
|
From: <rc...@us...> - 2013-10-12 16:40:09
|
Revision: 6351
http://sourceforge.net/p/web-erp/reponame/6351
Author: rchacon
Date: 2013-10-12 16:40:02 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
Adding translation for the table title.
Modified Paths:
--------------
trunk/GLTransInquiry.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/GLTransInquiry.php
===================================================================
--- trunk/GLTransInquiry.php 2013-10-11 23:23:08 UTC (rev 6350)
+++ trunk/GLTransInquiry.php 2013-10-12 16:40:02 UTC (rev 6351)
@@ -36,7 +36,7 @@
. _('Print') . '" alt="" />' . ' ' . $Title . '</p>';
echo '<table class="selection">'; //Main table
echo '<tr>
- <th colspan="7"><h2><b>' . $TransName . ' ' . $_GET['TransNo'] . '</b></h2></th>
+ <th colspan="7"><h2><b>' . _($TransName) . ' ' . $_GET['TransNo'] . '</b></h2></th>
</tr>
<tr>
<th>' . _('Date') . '</th>
@@ -197,4 +197,4 @@
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
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 2013-10-11 23:23:08 UTC (rev 6350)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-10-12 16:40:02 UTC (rev 6351)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-09-06 21:34+1200\n"
-"PO-Revision-Date: 2013-10-08 15:09-0600\n"
+"PO-Revision-Date: 2013-10-12 10:38-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -19624,7 +19624,7 @@
#: PDFPeriodStockTransListing.php:46
msgid "Purchase Order Delivery"
-msgstr "Despacho de Orden de Compra"
+msgstr "Recepción de orden de compra"
#: PDFPeriodStockTransListing.php:47
msgid "Work Order Receipt"
|
|
From: <tu...@us...> - 2013-10-16 01:12:23
|
Revision: 6355
http://sourceforge.net/p/web-erp/reponame/6355
Author: turbopt
Date: 2013-10-16 01:12:19 +0000 (Wed, 16 Oct 2013)
Log Message:
-----------
Rename variable: OrderNumber to OrderNo
Modified Paths:
--------------
trunk/GoodsReceived.php
trunk/doc/Change.log
Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php 2013-10-15 16:47:55 UTC (rev 6354)
+++ trunk/GoodsReceived.php 2013-10-16 01:12:19 UTC (rev 6355)
@@ -359,7 +359,7 @@
}
echo '<div class="centre"><a href="' . $RootPath . '/PO_SelectOSPurchOrder.php">' .
_('Select a different purchase order for receiving goods against') . '</a></div>';
- echo '<div class="centre"><a href="' . $RootPath . '/GoodsReceived.php?PONumber=' . $_SESSION['PO'.$identifier]->OrderNumber . '">' . _('Re-read the updated purchase order for receiving goods against'). '</a></div>';
+ echo '<div class="centre"><a href="' . $RootPath . '/GoodsReceived.php?PONumber=' . $_SESSION['PO'.$identifier]->OrderNo . '">' . _('Re-read the updated purchase order for receiving goods against'). '</a></div>';
unset($_SESSION['PO'.$identifier]->LineItems);
unset($_SESSION['PO'.$identifier]);
unset($_POST['ProcessGoodsReceived']);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-10-15 16:47:55 UTC (rev 6354)
+++ trunk/doc/Change.log 2013-10-16 01:12:19 UTC (rev 6355)
@@ -1,5 +1,6 @@
webERP Change Log
+15/10/13 Paul T: change variable name from OrderNumber to OrderNo.
11/10/13 Tim: Links for manual internal transfers and supplier payment link to allocations
9/10/13 Exson: commit the fixed "Unable to Locate Purchase Order Number" error when the PO is created by SO interface. Fixed provided by Tim and reported by Merci from webERP forum.
6/10/13 Phil: New script to show a grid of items by preferred supplier for placing purchase orders to the users's default inventory location - orders will be authorised if the user has authority and the auto-authorise config option is enabled.
@@ -72,14 +73,14 @@
2013/08/14 Exson: Fixed INSERT sql errors and href link error and make it html5 compatible in WOSerialNos.php.
04/8/13 icedlava: Update Manual - Using the webERP Installer - rework of some text due to new installer, and updated screen shots
03/8/13 icedlava: Obfuscate database name in login, do not show company in login if directory/company not wanted.
-29/7/13 Serge Gélinas: Profit and loss now has option to show all accounts and by default just shows those with a balance
+29/7/13 Serge Gélinas: Profit and loss now has option to show all accounts and by default just shows those with a balance
29/7/13 icedlava: Hard code the page title in Installer html, previously missing - no language strings available at this time - used English
28/7/13 icedlava: Installer - strip inline styles, add html5/css to pretty up, fix small typo/bugs and spelling/grammar. No logic changes.
28/7/13 icedlava: Allow ampersands in company name eg Matthew & Sons Ltd
26/7/13 icedlava: Move Supplier Contact Detail review link to top of page away from Delete button
26/7/13 icedlava: Fix Form Designer xml for GL Journal
26/7/13 icedlava: Fix PO PDF Preview when $result returns Bool in some environments.
-25/7/13 Serge Gélinas: Balance sheet now has option to show all accounts and by default just shows those with a balance
+25/7/13 Serge Gélinas: Balance sheet now has option to show all accounts and by default just shows those with a balance
24/7/13 Exson: Fixed that empty password should be allowed. Reported by Tim.
24/7/13 Exson: Add the html5 mark for some input fields in WWW_Users.php.
22/7/13 Exson: Fixed the document.form not defined error in GLJournal.php.
@@ -111,8 +112,8 @@
12/6/13 tomglare: SelectSupplier - improve handling if single supplier selected
25/5/13 Phil: CountriesArray.php now uses the index as the ISO 2 character code for the country.
25/5/13 Phil: Currencies.php now takes advantage of Rafael's new CurrenciesArray - to ensure correct ISO 3 letter abbreviation is selected - also allows for translation of currency names
-25/5/13 Rafael Chacón: New include/CurrenciesArray.php listing all ISO currencies and their code
-22/5/13 Rafael Chacón: include/PO_PDFOrderPageHeader.inc now allows different length labels for date and intiator without running into the field data - needed for translations of different lengths
+25/5/13 Rafael Chacón: New include/CurrenciesArray.php listing all ISO currencies and their code
+22/5/13 Rafael Chacón: include/PO_PDFOrderPageHeader.inc now allows different length labels for date and intiator without running into the field data - needed for translations of different lengths
18/5/13 Exson: Stop session.inc execution when there is no config.php found.
17/5/13 Phil: ConfirmDispatch_Invoice.php -include qty already invoiced in order when cancelling any balance on subsequent deliveries.
12/5/13 Tim: Add patch for the email groups are set situation in PDFChequeListing.php, MailSalesReport.php, MailSalesReport_csv.php, OffersReceived.php.
@@ -132,7 +133,7 @@
11/5/13 Exson: Make the inventory valuation report can be mailed.
11/5/13 Exson: Add Mail Validation Report to inventory module in MainMenuLinksArray.php.
11/5/13 Exson: Revise the CURDATE() to CURRENT_DATE to make it a more general SQL compatible in OffersReceived.php. Recommend by Tim.
-12/5/13 Rafael Chacón: Spanish translation update
+12/5/13 Rafael Chacón: Spanish translation update
11/5/13 Exson: Add OffersRecievedResultRecipients group to mailgroups in ugrade4.10-4.11.sql/mysql/upgrade4.10-4.11.sql
11/5/13 Exson: Add OffersReceivedRecipients Group, added feature to use mail instead of smtp mail only, fixed the problem that item with single quotation mark cannot be stored and the same date comparison problem.
11/5/13 Exson: Add MailSalesReport_csv to scripts and add SalesAnalysisReportRecipients for mailing list in sql/mysql/upgrade4.10-4.11.sql
@@ -203,7 +204,7 @@
18/2/13 Fahad Hatib: Committed by Phil - added BookMarks and ViewTopic links in the General Ledger scripts and modifications to the general ledger manual to add these bookmarks.
18/2/13 Tim Schofield: Z_ImportPriceList.php to import a price list from a csv file
15/2/13 Gilberto Dos Santos Alves: Updated Brazilian Portuguese (pt_BR.utf8) translation
-15/2/13 Rafael Chacón: Corrected CRC flag
+15/2/13 Rafael Chacón: Corrected CRC flag
13/2/13 Phil: Fix bugs in labelling of fields in view customer details in Customers.php
12/2/13 Paul Harness: Fix of serialized transfer quantities/includes, StockTransferControlled.php
11/2/13 Fahad Hatib: Committed by Phil - added Manual links for AR, Fixed Assets and AP manual sections
@@ -269,7 +270,7 @@
13/10/12 Samudaya Nanayakkara: Typo fox in FixedAssetLocations.php and FixedAssetTransfer.php added location to search for existing assets to transfer
12/10/12 Phil: Fix pagination/selection of order items in SelectOrderItems.php and CounterSales.php
12/10/12 Phil: SelectAsset.php now goes to FixedAssetItems.php when an item is selected to display the asset for editing
-12/10/12 Rafael Chacón: Updated CRC - Costa Rica flag image
+12/10/12 Rafael Chacón: Updated CRC - Costa Rica flag image
10/10/12 Harald Ringehahn: Updated German translation
9/10/2012 Exson: fixed typo in CounterSales.php reported by thumb.
9/10/12 Exson: installation would not allow demo to be installed - install/index.php
@@ -289,7 +290,7 @@
6/9/12 Thomas Timothy Lie and baliboss.com Team: updated Indonesian translation
1/9/12 Carlos Rubio: AccountGroups.php now has option to move to alternative accountgroups
30/8/2012 Exson: fixed sql problem reported bymodpr0be
-24/8/12 Serge Gélinas: Added new fr_CA.utf8 French Quebec translation
+24/8/12 Serge Gélinas: Added new fr_CA.utf8 French Quebec translation
21/8/12 Phil: Stock.php could not change an item to an assembly if there were any old completed or deleted/rejected purchase orders for the item.
20/8/2012 Phil: StockCounts.php now allows entry Bar Codes or stock codes
20/8/2012 Phil: Now allow labour type category items to be selected searched for in CounterSales.php and SelectOrderItems.php
@@ -334,7 +335,7 @@
02/06/2012 Exson: Fixed the order cancel function failure in SelectOrderItems.php. Reported by Pak Richard.
2/6/12 Phil: Settle counter sales and receipts should be set - now fixed.
28/5/2012 Phil: Configure xmlrpc api to work correctly with utf-8 character encoding.
-26/5/2012 Phil: Fix barcode printing on PDFPrintLabel.php - barcode functionality is unreliable so used (http://www.barcodepack.com) by Tomáš Horáček very simple and clean
+26/5/2012 Phil: Fix barcode printing on PDFPrintLabel.php - barcode functionality is unreliable so used (http://www.barcodepack.com) by Tomáš Horá�ek very simple and clean
23/5/2012 Klaus: PO_PDFPurchOrders.php print purchase orders with supplier's code where it is available in the purchasing data
23/5/2012 Exson: Revise GLAccounts.php to make more than 10 digits account code is allowed.
2012/05/22 Exson: Modify accountcode to varchar(20) to meet some countries accounting regulation for more digits account code.
@@ -378,7 +379,7 @@
3/4/2012 Exson: Fixed typo in PurchData.php.
3/4/2012 Tim: fixed Supplier Code and Supplier part code inconsistent with database field length definition in PurchData.php. Reported by rfthomas.
2/4/2012 Vitaly: BOMs delete function requires Location and WorkCentre to be set
-2/4/2012 Billy Chang,劉世琪: add Chinese Traditional TW locale
+2/4/2012 Billy Chang,劉世�: add Chinese Traditional TW locale
2/4/2012 Exson: fixed CopyBOM.php sql errors and header already sent error.
31/3/2012 Exson: Fixed for PcAuthorizeExpenses.php cannot authorized expenses due to no applying gettext function to 'Update'
31/3/2012: PakRichard: Fixed problem that on PCAssignCashToTab.php it should be used the decimal places of the currency of the tab, not the decimal places of the functional currency.The same in PcClaimExpensesFromTab.php
@@ -475,7 +476,7 @@
Release 4.06.6
-7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
+7/1/12 Phil: José Roberge (robergej) reported that purchase invoice tax on tax was not being processed correctly although it was appearing on the supplier invoice during entry of the invoice the processing was not calculating the tax on tax. Fixed SupplierInvoice.php
7/1/12 Phil: Brian May reported that was unable to add completed (fully received) lines off a purchase order against a shipment. Removed trap to allow completed (fully received) lines to be added.
5/1/12 Phil: Brian May reported issues with entering shipments discovered parameter DecimalPlaces missed off adding line to shipment also quotation error in entering shipment ETA date.
@@ -781,8 +782,8 @@
10/3/11: Tims: launchpad fixes brought in MRP.php fix for table charset utf8 so joins work correctly; typeo in PO_Header preventing purchasing data being retrieved ($result not $Result); correct sql on searching for customer in SelectCreditItems.php; StockStatus.php pricing history bug resolved (4450); StockQuantityByDate.php now allowed to show for all categories - enclosed 'All' in gettext
8/3/11: Tim/Phil: PO_Items.php in committing an order detail the assetid of 'Not an Asset' was being inserted to an integer field. Modified $_POST['AssetID'] to = 0 if it was 'Not an Asset' as advised by Tim
8/3/11: Phil: fix SalesAnalysis reports for TCPDF as reported by Joe Zhou
-5/3/11: Kovács Attila: fix to Stocks.php to use ANSI GROUP BY for aggregate functions SQL
-5/3/11: Kovács Attila: fix to LanguageSetup.php to use utf-8 not ISO-8859-1. Phil hardcoded UTF-8 now as no dynamic changing of character set required all translations are utf-8
+5/3/11: Kovács Attila: fix to Stocks.php to use ANSI GROUP BY for aggregate functions SQL
+5/3/11: Kovács Attila: fix to LanguageSetup.php to use utf-8 not ISO-8859-1. Phil hardcoded UTF-8 now as no dynamic changing of character set required all translations are utf-8
3/3/11: Exson/Baran/Phil fix to customer login to ensure that other customers orders are not displayed when searching by customer ref or order no
3/3/11: Tim launchpad mods to revision 4441 including change to allow supplier currency to be changed if there are no transactions already against the supplier. Ensure credit note session variable is unset before attempting to create a new credit note from the supplier form. Tim's work to add perisable expiry dates to the serial items logic - affects quite a few scripts. Headings to stock check script even if no quantity is shown. Portrait quotations. Not included change to default delivery date to the date the customer requested - left to be the current day's date. Not included Tim's unit pricing work .. yet launchpad revisions 4442-4447 inclusive
27/2/11: Phil/Tim/Peter launchpad added category option for MRPShortages.php links with matching quotes in WorkOrderEntry
@@ -1316,15 +1317,15 @@
23/04/10 Matt Taylor: Z_BottomUpCost.php : Add script for batch updating BOM costs.
22/04/10 Zhiguo: SelectProduct.php - Add a link to StockStatus.php direct from the selection page.
22/04/10 Lindsay: add missing ; to second last line of upgrade3.11.1-3.12.sql
-22/04/10 Zhiguo: index.php - Change SID to sid, so as to solve the locale issue of Turkish I(ı) & İ(i)
-22/04/10 Zhiguo: PrintCustStatements.php - Change addInfo() to addinfo() and also change INTERVAL() to interval(), so as to solve the locale issue of Turkish I(ı) & İ(i)
-22/04/10 Zhiguo: PDFOrdersInvoiced.php - Change addInfo() to addinfo() and Is_Date() to is_date() also change SID to sid, so as to solve the locale issue of Turkish I(ı) & İ(i)
-22/04/10 Zhiguo: PDFDIFOT.php - Change addInfo() to addinfo() and also change SID to sid, so as to solve the locale issue of Turkish I(ı) & İ(i)
-22/04/10 Zhiguo: PDFDeliveryDifferences.php - Change addInfo() to addinfo() and also change SID to sid, so as to solve the locale issue of Turkish I(ı) & İ(i)
-22/04/10 Zhiguo: ConnectDB_mysql.inc - Change INTERVAL() to interval(), so as to solve the locale issue of Turkish I(ı) & İ(i)
-22/04/10 Zhiguo: ConnectDB_mysqli.inc - Change INTERVAL() to interval(), so as to solve the locale issue of Turkish I(ı) & İ(i)
-22/04/10 Zhiguo: DateFunctions.inc - Change Is_Date() to is_date(), so as to solve the locale issue of Turkish I(ı) & İ(i)
-22/04/10 Zhiguo: class.pdf.php - Change addInfo() to addinfo(), so as to solve the locale issue of Turkish I(ı) & İ(i)
+22/04/10 Zhiguo: index.php - Change SID to sid, so as to solve the locale issue of Turkish I(ı) & İ(i)
+22/04/10 Zhiguo: PrintCustStatements.php - Change addInfo() to addinfo() and also change INTERVAL() to interval(), so as to solve the locale issue of Turkish I(ı) & İ(i)
+22/04/10 Zhiguo: PDFOrdersInvoiced.php - Change addInfo() to addinfo() and Is_Date() to is_date() also change SID to sid, so as to solve the locale issue of Turkish I(ı) & İ(i)
+22/04/10 Zhiguo: PDFDIFOT.php - Change addInfo() to addinfo() and also change SID to sid, so as to solve the locale issue of Turkish I(ı) & İ(i)
+22/04/10 Zhiguo: PDFDeliveryDifferences.php - Change addInfo() to addinfo() and also change SID to sid, so as to solve the locale issue of Turkish I(ı) & İ(i)
+22/04/10 Zhiguo: ConnectDB_mysql.inc - Change INTERVAL() to interval(), so as to solve the locale issue of Turkish I(ı) & İ(i)
+22/04/10 Zhiguo: ConnectDB_mysqli.inc - Change INTERVAL() to interval(), so as to solve the locale issue of Turkish I(ı) & İ(i)
+22/04/10 Zhiguo: DateFunctions.inc - Change Is_Date() to is_date(), so as to solve the locale issue of Turkish I(ı) & İ(i)
+22/04/10 Zhiguo: class.pdf.php - Change addInfo() to addinfo(), so as to solve the locale issue of Turkish I(ı) & İ(i)
21/04/10 Matt Taylor: Z_ImportStocks.php : Fix bug in checking of perishable field.
18/04/10 Ricard: InventoryPlanning.php - Remove discontinued items from inventory planning reports.
15/04/10 Kalmer Piiskop: MiscFunctions.js - Update IsDAte() function for all date formats.
@@ -1582,8 +1583,8 @@
30/10/09 Tim: WorkOrderReceive.php - Layout improvements.
30/10/09 Tim: upgrade3.11-3.11.1 - Remove change to www_users as not a bug in 3.11
30/10/09 Tim: Update images to ensure that all themes have the same images
-30/10/09 Tim: StockDispatch - New version for StockDispatch with some printing improvements and also with an option to choose a “simple” or “standard” form, depending on the company needs.
-30/10/09 Pak Ricard: StockDispatch - New version for StockDispatch with some printing improvements and also with an option to choose a “simple” or “standard” form, depending on the company needs.
+30/10/09 Tim: StockDispatch - New version for StockDispatch with some printing improvements and also with an option to choose a “simple� or “standard� form, depending on the company needs.
+30/10/09 Pak Ricard: StockDispatch - New version for StockDispatch with some printing improvements and also with an option to choose a “simple� or “standard� form, depending on the company needs.
30/10/09 Pak Ricard: PrintCustTransPortrait.php - Allows PrintCustTransPortrait to use prices from salesordersdetails, instead of stockmoves, to solve the multicurrency issue with large exchage rates.
30/10/09 Pak Ricard: PrintCustTrans.php - Allows PrintCustTrans to use prices from salesordersdetails, instead of stockmoves, to solve the multicurrency issue with large exchage rates.
30/10/09 Tim: upgrade3.11-3.12.sql - Remove duplicated indexes
@@ -1846,8 +1847,8 @@
17/07/09 Ricard Andreu: InventoryValuation.php - Changes to allow longer part descriptions
16/07/09 Nagaraj Potti: New installer from Moxx consulting
16/07/09 Tim: SelectOrderItems.php - Button labels not formatted for gettext
-16/07/09 Tim: ManualHeader.html - Change manual to work with utf-8 as per Javier de Lorenzo-Cáceres
-16/07/09 Tim: ManualContributors.html - Javier de Lorenzo-Cáceres
+16/07/09 Tim: ManualHeader.html - Change manual to work with utf-8 as per Javier de Lorenzo-Cáceres
+16/07/09 Tim: ManualContributors.html - Javier de Lorenzo-Cáceres
16/07/09 Tim: ShipmentCosting.php - Correct typo
16/07/09 Tim: WorkOrderReceive.php - Correct typo
16/07/09 Tim: Payments.php - Correct typo
@@ -2172,7 +2173,7 @@
02/05/09 Tim: StockCategories.php - Correct form refresh to show changes in stock types when a category is being edited
30/4/09 Phil: Add field to Stocks.php for NextSerialNo - where > 0 and Serialised then automatically allocates serial numbers for quantities on new work orders - and work orders will not allow quantities to change once created
29/04/09 Tim: StockCategories.php - Change default behaviour to show Stock GL Code
-29/04/09 Ricard Andreu: InventoryPlanning.php - InventoryPlanning.php now allowing 1, 1.5, 2, 3 and 4 months of 'Maximum number of Months Holding' instead of 3 or 4 as used to be. Also the “Nil” on Suggested order column gets right justified as all the other fields.
+29/04/09 Ricard Andreu: InventoryPlanning.php - InventoryPlanning.php now allowing 1, 1.5, 2, 3 and 4 months of 'Maximum number of Months Holding' instead of 3 or 4 as used to be. Also the “Nil� on Suggested order column gets right justified as all the other fields.
28/04/09 Murray: fix some HTML typos in DeliveryDetails and remove 6 digit price restriction from Credit_Invoice
27/04/09 Tim: api/api_xml-rpc.php - Corrections to enable API documentation to be shown
27/04/09 Tim: doc/Manual/ManualAPIFunctions.php - Corrections to enable API documentation to be shown
@@ -2603,7 +2604,7 @@
10/9/08 Tim: Add field for suppliers tax reference
10/9/08 KStan: Insert link back to SelectProduct.php on successful insert of new strock item
09/9/08 Tim: Fixed colour scheme problem
-09/9/08 Björn Paulsen: Fixed bug in PDFStockLocTransferHeader.inc for translation error, and improved layout.
+09/9/08 Björn Paulsen: Fixed bug in PDFStockLocTransferHeader.inc for translation error, and improved layout.
09/9/08 Ashish Shukla: Fixed bug in AuditTrauil.php where the field value contains a comma, as per Ashish Shukla
09/9/08 Thomas Pulina: Correct typo in Payments.php
09/9/08 Tim: Correct bug in MiscFunctions.php for when default currency is not in the ECB list
@@ -3052,7 +3053,7 @@
9/12/05 Obscure bug in GetPrice.inc - if special prices set up for a salestype/customer combo but not default price set up for the salestype then the special price is picked up for customers belonging to the sales type even though it is specific to a different customer! - now fixed
9/12/05 Danie - StockLocTransfers.php -now checks for positive stock in the location before allowing a transfer.
6/12/05 Updated the webERP php-gettext to the latest version 1.05
-3/12/05 Jo� - WWW_Users.php now options to set theme and language before user logs in. Previously had to be set from the user settings when the user logged in themselves now the sysadmin can change them. Changed locale setting to LC_ALL then changed the LC_NUMERIC back to en_GB.
+3/12/05 Jo� - WWW_Users.php now options to set theme and language before user logs in. Previously had to be set from the user settings when the user logged in themselves now the sysadmin can change them. Changed locale setting to LC_ALL then changed the LC_NUMERIC back to en_GB.
21/11/05 Dave Premo - report writer tool - allows adding reports on any web erp data and formating thereof provided some knowledge of the tables etc. Export to PDF, CSV - import and export of reports too. New directory for the files reportwriter as well as changes to session.inc, header.inc, config.php, footer.inc
16/11/05 Tech Nossomy Credit status - tidied up consistency of wording "Disallow invoices". Also used white and black in .css files instead of #FFFFFF and #000000 respectively
|
|
From: <rc...@us...> - 2013-10-17 16:16:50
|
Revision: 6358
http://sourceforge.net/p/web-erp/reponame/6358
Author: rchacon
Date: 2013-10-17 16:16:46 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Adjusts titles and translations to es_ES.
Modified Paths:
--------------
trunk/FormDesigner.php
trunk/includes/MainMenuLinksArray.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/FormDesigner.php
===================================================================
--- trunk/FormDesigner.php 2013-10-17 15:29:32 UTC (rev 6357)
+++ trunk/FormDesigner.php 2013-10-17 16:16:46 UTC (rev 6358)
@@ -2,7 +2,11 @@
/* $Id$ */
include('includes/session.inc');
-$Title = _('Form Designer');
+$Title = _('Form Design');
+/*
+$ViewTopic = 'to_add_topic'; // This is to do.
+$BookMark = 'to_add_bookmark'; // This is to do.
+*/
include('includes/header.inc');
function FontSizes() {
return array(6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 20, 22, 24); //Possible font sizes
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2013-10-17 15:29:32 UTC (rev 6357)
+++ trunk/includes/MainMenuLinksArray.php 2013-10-17 16:16:46 UTC (rev 6358)
@@ -440,7 +440,7 @@
_('Report Builder Tool'),
_('View Audit Trail'),
_('Geocode Setup'),
- _('Form Layout Editor'),
+ _('Form Design'),
_('Web-Store Configuration'),
_('SMTP Server Details'),
_('Mailing Group Maintenance') );
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 2013-10-17 15:29:32 UTC (rev 6357)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-10-17 16:16:46 UTC (rev 6358)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-09-06 21:34+1200\n"
-"PO-Revision-Date: 2013-10-15 10:42-0600\n"
+"PO-Revision-Date: 2013-10-17 10:05-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -12387,7 +12387,7 @@
#: FormDesigner.php:134
msgid "Select the form to edit"
-msgstr "Seleccione el formulario de editar"
+msgstr "Seleccione el formulario a editar"
#: FormDesigner.php:147
msgid "Edit Form Layout"
@@ -12395,7 +12395,7 @@
#: FormDesigner.php:158
msgid "Form Design"
-msgstr "Diseño de Formulario"
+msgstr "Diseño del formulario"
#: FormDesigner.php:159
msgid "Enter the changes that you want in the form layout below."
@@ -12408,11 +12408,11 @@
#: FormDesigner.php:166
msgid "Form Name"
-msgstr "Nombre del Formulario"
+msgstr "Nombre del formulario"
#: FormDesigner.php:168
msgid "Paper Size"
-msgstr "Tamaño del Papel"
+msgstr "Tamaño del papel"
#: FormDesigner.php:183
msgid "Line Height"
@@ -12450,11 +12450,11 @@
#: FormDesigner.php:282
msgid "Preview the Form Layout"
-msgstr "Vista Previa del Diseño del Formulario"
+msgstr "Vista previa del diseño del formulario"
#: FormDesigner.php:283
msgid "Save the Form Layout"
-msgstr "Guardar el Diseño del Formulario"
+msgstr "Guardar el diseño del formulario"
#: FreightCosts.php:6 includes/MainMenuLinksArray.php:479
msgid "Freight Costs Maintenance"
@@ -43316,7 +43316,7 @@
#: includes/MainMenuLinksArray.php:441
msgid "Form Layout Editor"
-msgstr "Editor de Formulario de Presentación"
+msgstr "Editor de diseño de formulario"
#: includes/MainMenuLinksArray.php:442
#, fuzzy
|
|
From: <te...@us...> - 2013-10-19 06:21:12
|
Revision: 6362
http://sourceforge.net/p/web-erp/reponame/6362
Author: tehonu
Date: 2013-10-19 06:21:08 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
Maintenance of ShopPaypalCommissionAccount setting for webSHOP
Modified Paths:
--------------
trunk/ShopParameters.php
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/ShopParameters.php
===================================================================
--- trunk/ShopParameters.php 2013-10-19 02:23:53 UTC (rev 6361)
+++ trunk/ShopParameters.php 2013-10-19 06:21:08 UTC (rev 6362)
@@ -107,6 +107,9 @@
if ($_SESSION['ShopPayPalBankAccount'] != $_POST['X_ShopPayPalBankAccount'] ) {
$SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopPayPalBankAccount']."' WHERE confname = 'ShopPayPalBankAccount'";
}
+ if ($_SESSION['ShopPayPalCommissionAccount'] != $_POST['X_ShopPayPalCommissionAccount'] ) {
+ $SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopPayPalCommissionAccount']."' WHERE confname = 'ShopPayPalCommissionAccount'";
+ }
if ($_SESSION['ShopFreightMethod'] != $_POST['X_ShopFreightMethod'] ) {
$SQL[] = "UPDATE config SET confvalue = '".$_POST['X_ShopFreightMethod']."' WHERE confname = 'ShopFreightMethod'";
}
@@ -432,7 +435,28 @@
<td>' . _('Select the webERP bank account to use for receipts processed by Pay Pal') . '</td>
</tr>';
+
echo '<tr>
+ <td>' . _('Pay Pal Commission Account') . ':</td>
+ <td><select name="X_ShopPayPalCommissionAccount">';
+$AccountsResult = DB_query("SELECT accountcode,
+ accountname
+ FROM chartmaster INNER JOIN accountgroups
+ ON chartmaster.group_=accountgroups.groupname
+ WHERE accountgroups.pandl=1
+ ORDER BY chartmaster.accountcode",$db);
+while ($AccountRow = DB_fetch_array($AccountsResult)){
+ if ($_SESSION['ShopPayPalCommissionAccount'] == $AccountRow['accountcode']) {
+ echo '<option selected="selected" value="' . $AccountRow['accountcode'] . '">' . $AccountRow['accountname'] . '</option>';
+ } else {
+ echo '<option value="' . $AccountRow['accountcode'] . '">' . $AccountRow['accountname'] . '</option>';
+ }
+}
+echo '</select></td>
+ <td>' . _('Select the webERP P/L account to use for commissions (transaction fees) charged by Pay Pal') . '</td>
+ </tr>';
+
+echo '<tr>
<td>' . _('PayPal Surcharge') . ':</td>
<td><input type="text" class="number" size="5" maxlength="5" name="X_ShopPayPalSurcharge" value="' . $_SESSION['ShopPayPalSurcharge'] . '" /></td>
<td>' . _('The PayPal surcharge') . '</td>
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2013-10-19 02:23:53 UTC (rev 6361)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2013-10-19 06:21:08 UTC (rev 6362)
@@ -1,6 +1,7 @@
INSERT INTO scripts VALUES ('Z_UpdateSalesAnalysisWithLatestCustomerData.php','15','Update sales analysis with latest customer and branch salesperson sales area and salestype irrespective of what these settings were when the sale was made');
INSERT INTO scripts VALUES ('PurchaseByPrefSupplier.php','2','Purchase ordering by preferred supplier');
ALTER TABLE `suppliers` ADD COLUMN `url` varchar(50) NOT NULL DEFAULT '';
-INSERT INTO config VALUES ('ShopFreightMethod','webERPDefault');
+INSERT INTO config VALUES ('ShopFreightMethod','webERPCalculation');
+INSERT INTO config VALUES ('ShopPaypalCommissionAccount', '7220');
#--UPDATE config SET confvalue='4.11.0' WHERE confname='VersionNumber';
|
|
From: <ice...@us...> - 2013-10-20 15:23:18
|
Revision: 6363
http://sourceforge.net/p/web-erp/reponame/6363
Author: icedlava
Date: 2013-10-20 15:23:15 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Add StockClone.php - script to create a new item with the same properties, image, cost, purchasing and pricing data as the selected item. Allow modification of image and general item details before cloning.
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/doc/Change.log
trunk/sql/mysql/upgrade4.11-4.12.sql
Added Paths:
-----------
trunk/StockClone.php
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2013-10-19 06:21:08 UTC (rev 6362)
+++ trunk/SelectProduct.php 2013-10-20 15:23:15 UTC (rev 6363)
@@ -499,6 +499,7 @@
echo '<a href="' . $RootPath . '/Prices_Customer.php?Item=' . $StockID . '">' . _('Special Prices for customer') . ' - ' . $_SESSION['CustomerID'] . '</a><br />';
}
echo '<a href="' . $RootPath . '/DiscountCategories.php?StockID=' . $StockID . '">' . _('Maintain Discount Category') . '</a><br />';
+ echo '<a href="' . $RootPath . '/StockClone.php?OldStockID=' . $StockID . '">' . _('Clone This Item') . '</a><br />';
}
echo '</td></tr></table>';
} else {
Added: trunk/StockClone.php
===================================================================
--- trunk/StockClone.php (rev 0)
+++ trunk/StockClone.php 2013-10-20 15:23:15 UTC (rev 6363)
@@ -0,0 +1,1100 @@
+<?php
+/* $Id: StockClone.php $*/
+
+include('includes/session.inc');
+$Title = _('Clone Item');
+/* webERP manual links before header.inc */
+$ViewTopic= 'Inventory';
+$BookMark = 'CloneItem';
+include('includes/header.inc');
+include('includes/SQL_CommonFunctions.inc');
+
+if (isset($_GET['OldStockID']) || isset($_POST['OldStockID']) ){ //we are cloning
+ $_POST['OldStockID'] = isset($_GET['OldStockID']) && !empty($_GET['OldStockID']) ? $_GET['OldStockID']:$_POST['OldStockID'];
+ $_POST['OldStockID'] =trim(mb_strtoupper($_POST['OldStockID']));
+ $_POST['New']= 1;
+ if (isset($_POST['StockID']) ) {
+ $_POST['StockID'] =trim(mb_strtoupper($_POST['StockID']));
+ } else {
+ $_POST['StockID'] = '';
+ }
+} else {
+ $_POST['New'] = 0;
+ $_POST['OldStockID'] = '';
+ $_POST['StockID'] = '';
+ $InputError = 1;
+ $Errors[0] = 'OldStockID';
+ prnMsg(_('To use this script it must be called with the Stock ID of the item to be cloned passed in as $OldStockID. Please use the Clone This Item option in the Items Menu.'),'error');
+}
+
+$ItemDescriptionLanguages = explode(',',$_SESSION['ItemDescriptionLanguages']);
+
+if (isset($_POST['StockID']) && !empty($_POST['StockID']) && !isset($_POST['UpdateCategories'])) {
+ $sql = "SELECT COUNT(stockid)
+ FROM stockmaster
+ WHERE stockid='".$_POST['StockID']."'
+ GROUP BY stockid";
+
+ $result = DB_query($sql,$db);
+ $myrow = DB_fetch_row($result);
+ if (($myrow[0]==0) && ($_POST['OldStockID'] != '')) {
+ $_POST['New'] =1;
+ } else {
+ $_POST['New']=0;
+ }
+}
+
+echo '<a href="' . $RootPath . '/SelectProduct.php">' . _('Back to Items') . '</a>
+ <br />
+ <p class="page_title_text">
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/inventory.png" title="' . _('Stock') . '" alt="" />' . ' ' . $Title . '
+ </p>';
+echo '<div class="page_help_text">' . _('Cloning will create a new item with the same properties, image, cost, purchasing and pricing data as the selected item. Item image and general item details can be changed below prior to cloning.') . '.</div><br />';
+if (!empty($_POST['OldStockID'])) { //only show this if there is a valid call to this script
+ if (isset($_FILES['ItemPicture']) AND $_FILES['ItemPicture']['name'] !='') { //we are uploading a new file
+ $newfilename = ($_POST['OldStockID'] == $_POST['StockID']) || $_POST['StockID'] == ''? $_POST['OldStockID'].'-TEMP': $_POST['StockID'] ; //so we can add a new file but not remove an existing item file
+ $result = $_FILES['ItemPicture']['error'];
+ $UploadTheFile = 'Yes'; //Assume all is well to start off with
+ $filename = $_SESSION['part_pics_dir'] . '/' . $newfilename . '.jpg';
+
+ //But check for the worst
+ if (mb_strtoupper(mb_substr(trim($_FILES['ItemPicture']['name']),mb_strlen($_FILES['ItemPicture']['name'])-3))!='JPG'){
+ prnMsg(_('Only jpg files are supported - a file extension of .jpg is expected'),'warn');
+ $UploadTheFile ='No';
+ } elseif ( $_FILES['ItemPicture']['size'] > ($_SESSION['MaxImageSize']*1024)) { //File Size Check
+ prnMsg(_('The image file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $_SESSION['MaxImageSize'],'warn');
+ $UploadTheFile ='No';
+ } elseif ( $_FILES['ItemPicture']['type'] == 'text/plain' ) { //File Type Check
+ prnMsg( _('Only graphics files can be uploaded'),'warn');
+ $UploadTheFile ='No';
+ } elseif ( $_FILES['ItemPicture']['error'] == 6 ) { //upload temp directory check
+ prnMsg( _('No tmp directory set. You must have a tmp directory set in your PHP for upload of files. '),'warn');
+ $UploadTheFile ='No';
+ } elseif (file_exists($filename)){
+ prnMsg(_('Attempting to overwrite an existing item image'),'warn');
+ $result = unlink($filename);
+ if (!$result){
+ prnMsg(_('The existing image could not be removed'),'error');
+ $UploadTheFile ='No';
+ }
+ }
+ //first remove any temp file that ight be there
+ @unlink($filename);
+ if ($UploadTheFile=='Yes'){
+ $result = move_uploaded_file($_FILES['ItemPicture']['tmp_name'], $filename);
+ $message = ($result)?_('File url') . '<a href="' . $filename .'">' . $filename . '</a>' : _('Something is wrong with uploading a file');
+ }
+ } elseif (!empty($_POST['StockID']) AND ($_POST['StockID'] != $_POST['OldStockID']) AND file_exists($_SESSION['part_pics_dir'] . '/' . $_POST['OldStockID'].'-TEMP'.'.jpg') ) {
+ //rename the temp one to the new name
+ $oldfile = $_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP'.'.jpg';
+ if (!copy($oldfile, $_SESSION['part_pics_dir'] . '/' .$_POST['StockID'].'.jpg')) {
+ prnMsg(_('There was an image file to clone but there was an error copying. Please upload a new image if required.'),'warn');
+ }
+ @unlink($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP'.'.jpg');
+ if (is_file($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP'.'.jpg')) {
+ prnMsg(_('Unable to delete the temporary image file for cloned item.'),'error');
+ } else {
+ $StockImgLink = _('No Image');
+ }
+ } elseif (isset( $_POST['OldStockID']) AND file_exists($_SESSION['part_pics_dir'] . '/' . $_POST['OldStockID'].'.jpg') AND !file_exists($_SESSION['part_pics_dir'] . '/' . $_POST['OldStockID'].'-TEMP'.'.jpg') ) {
+ //we should copy
+ if (!copy($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg', $_SESSION['part_pics_dir'] . '/' .$_POST['StockID'].'.jpg')) {
+ prnMsg(_('There was an image file to clone but there was an error copying. Please upload a new image if required.'),'warn');
+ }
+ }
+}
+if (isset($Errors)) {
+ unset($Errors);
+}
+$Errors = array();
+$InputError = 0;
+if (isset($_POST['submit'])) {
+ //initialise no input errors assumed initially before we test
+ /* actions to take once the user has clicked the submit button
+ ie the page has called itself with some user input */
+
+ //first off validate inputs sensible
+ $i=1;
+
+ if (!isset($_POST['Description']) OR mb_strlen($_POST['Description']) > 50 OR mb_strlen($_POST['Description'])==0) {
+ $InputError = 1;
+ prnMsg (_('The stock item description must be entered and be fifty characters or less long') . '. ' . _('It cannot be a zero length string either') . ' - ' . _('a description is required'),'error');
+ $Errors[$i] = 'Description';
+ $i++;
+ }
+ if (mb_strlen($_POST['LongDescription'])==0) {
+ $InputError = 1;
+ prnMsg (_('The stock item description cannot be a zero length string') . ' - ' . _('a long description is required'),'error');
+ $Errors[$i] = 'LongDescription';
+ $i++;
+ }
+ if ($_POST['StockID'] == $_POST['OldStockID']) {
+ $InputError = 1;
+ prnMsg (_('The Stock Item code must be unique. Please re-enter a unique Stock Item code.'),'error');
+ $Errors[$i] = 'StockID';
+ $i++;
+ }
+ if (mb_strlen($_POST['StockID']) ==0) {
+ $InputError = 1;
+ prnMsg (_('The Stock Item code cannot be empty. Please enter a unique Stock Item code.'),'error');
+ $Errors[$i] = 'StockID';
+ $i++;
+ }
+ if (ContainsIllegalCharacters($_POST['StockID']) OR mb_strpos($_POST['StockID'],' ')) {
+ $InputError = 1;
+ prnMsg(_('The stock item code cannot contain any of the following characters') . " - ' & + \" \\ ." . _('or a space'),'error');
+ $Errors[$i] = 'StockID';
+ $i++;
+ $_POST['StockID']='';
+ }
+ if (mb_strlen($_POST['Units']) >20) {
+ $InputError = 1;
+ prnMsg(_('The unit of measure must be 20 characters or less long'),'error');
+ $Errors[$i] = 'Units';
+ $i++;
+ }
+ if (mb_strlen($_POST['BarCode']) >20) {
+ $InputError = 1;
+ prnMsg(_('The barcode must be 20 characters or less long'),'error');
+ $Errors[$i] = 'BarCode';
+ $i++;
+ }
+ if (!is_numeric(filter_number_format($_POST['Volume']))) {
+ $InputError = 1;
+ prnMsg (_('The volume of the packaged item in cubic metres must be numeric') ,'error');
+ $Errors[$i] = 'Volume';
+ $i++;
+ }
+ if (filter_number_format($_POST['Volume']) <0) {
+ $InputError = 1;
+ prnMsg(_('The volume of the packaged item must be a positive number'),'error');
+ $Errors[$i] = 'Volume';
+ $i++;
+ }
+ if (!is_numeric(filter_number_format($_POST['GrossWeight']))) {
+ $InputError = 1;
+ prnMsg(_('The weight of the packaged item in Gross Weight must be numeric'),'error');
+ $Errors[$i] = 'GrossWeight';
+ $i++;
+ }
+ if (filter_number_format($_POST['GrossWeight'])<0) {
+ $InputError = 1;
+ prnMsg(_('The weight of the packaged item must be a positive number'),'error');
+ $Errors[$i] = 'GrossWeight';
+ $i++;
+ }
+ if (!is_numeric(filter_number_format($_POST['NetWeight']))) {
+ $InputError = 1;
+ prnMsg(_('The net weight of the item in Net Weight must be numeric'),'error');
+ $Errors[$i] = 'NetWeight';
+ $i++;
+ }
+ if (filter_number_format($_POST['NetWeight'])<0) {
+ $InputError = 1;
+ prnMsg(_('The net weight of the item must be a positive number'),'error');
+ $Errors[$i] = 'NetWeight';
+ $i++;
+ }
+ if (!is_numeric(filter_number_format($_POST['EOQ']))) {
+ $InputError = 1;
+ prnMsg(_('The economic order quantity must be numeric'),'error');
+ $Errors[$i] = 'EOQ';
+ $i++;
+ }
+ if (filter_number_format($_POST['EOQ']) <0) {
+ $InputError = 1;
+ prnMsg (_('The economic order quantity must be a positive number'),'error');
+ $Errors[$i] = 'EOQ';
+ $i++;
+ }
+ if ($_POST['Controlled']==0 AND $_POST['Serialised']==1){
+ $InputError = 1;
+ prnMsg(_('The item can only be serialised if there is lot control enabled already') . '. ' . _('Batch control') . ' - ' . _('with any number of items in a lot/bundle/roll is enabled when controlled is enabled') . '. ' . _('Serialised control requires that only one item is in the batch') . '. ' . _('For serialised control') . ', ' . _('both controlled and serialised must be enabled'),'error');
+ $Errors[$i] = 'Serialised';
+ $i++;
+ }
+ if ($_POST['NextSerialNo']!=0 AND $_POST['Serialised']==0){
+ $InputError = 1;
+ prnMsg(_('The item can only have automatically generated serial numbers if it is a serialised item'),'error');
+ $Errors[$i] = 'NextSerialNo';
+ $i++;
+ }
+ if ($_POST['NextSerialNo']!=0 AND $_POST['MBFlag']!='M'){
+ $InputError = 1;
+ prnMsg(_('The item can only have automatically generated serial numbers if it is a manufactured item'),'error');
+ $Errors[$i] = 'NextSerialNo';
+ $i++;
+ }
+ if (($_POST['MBFlag']=='A'
+ OR $_POST['MBFlag']=='K'
+ OR $_POST['MBFlag']=='D'
+ OR $_POST['MBFlag']=='G')
+ AND $_POST['Controlled']==1){
+
+ $InputError = 1;
+ prnMsg(_('Assembly/Kitset/Phantom/Service/Labour items cannot also be controlled items') . '. ' . _('Assemblies/Dummies/Phantom and Kitsets are not physical items and batch/serial control is therefore not appropriate'),'error');
+ $Errors[$i] = 'Controlled';
+ $i++;
+ }
+ if (trim($_POST['CategoryID'])==''){
+ $InputError = 1;
+ prnMsg(_('There are no inventory categories defined. All inventory items must belong to a valid inventory category,'),'error');
+ $Errors[$i] = 'CategoryID';
+ $i++;
+ }
+ if (!is_numeric(filter_number_format($_POST['Pansize']))) {
+ $InputError = 1;
+ prnMsg(_('Pansize quantity must be numeric'),'error');
+ $Errors[$i] = 'Pansize';
+ $i++;
+ }
+ if (!is_numeric(filter_number_format($_POST['ShrinkFactor']))) {
+ $InputError = 1;
+ prnMsg(_('Shrinkage factor quantity must be numeric'),'error');
+ $Errors[$i] = 'ShrinkFactor';
+ $i++;
+ }
+
+ if ($InputError !=1){
+ if ($_POST['Serialised']==1){ /*Not appropriate to have several dp on serial items */
+ $_POST['DecimalPlaces']=0;
+ }
+ if ($_POST['New'] !=0) { //it is a NEW CLONED part
+ //but lets be really sure here
+ $result = DB_query("SELECT stockid
+ FROM stockmaster
+ WHERE stockid='" . $_POST['StockID'] ."'",$db);
+ if (DB_num_rows($result)==1){
+ prnMsg(_('The stock code entered is already in the database - duplicate stock codes are prohibited by the system. Try choosing an alternative stock code'),'error');
+ exit;
+ } else {
+ $sql = "INSERT INTO stockmaster (stockid,
+ description,
+ longdescription,
+ categoryid,
+ units,
+ mbflag,
+ eoq,
+ discontinued,
+ controlled,
+ serialised,
+ perishable,
+ volume,
+ grossweight,
+ netweight,
+ barcode,
+ discountcategory,
+ taxcatid,
+ decimalplaces,
+ shrinkfactor,
+ pansize)
+ VALUES ('".$_POST['StockID']."',
+ '" . $_POST['Description'] . "',
+ '" . $_POST['LongDescription'] . "',
+ '" . $_POST['CategoryID'] . "',
+ '" . $_POST['Units'] . "',
+ '" . $_POST['MBFlag'] . "',
+ '" . filter_number_format($_POST['EOQ']) . "',
+ '" . $_POST['Discontinued'] . "',
+ '" . $_POST['Controlled'] . "',
+ '" . $_POST['Serialised']. "',
+ '" . $_POST['Perishable']. "',
+ '" . filter_number_format($_POST['Volume']) . "',
+ '" . filter_number_format($_POST['GrossWeight']) . "',
+ '" . filter_number_format($_POST['NetWeight']) . "',
+ '" . $_POST['BarCode'] . "',
+ '" . $_POST['DiscountCategory'] . "',
+ '" . $_POST['TaxCat'] . "',
+ '" . $_POST['DecimalPlaces']. "',
+ '" . filter_number_format($_POST['ShrinkFactor']) . "',
+ '" . filter_number_format($_POST['Pansize']) . "')";
+
+ $ErrMsg = _('The item could not be added because');
+ $DbgMsg = _('The SQL that was used to add the item failed was');
+ $result = DB_query($sql,$db, $ErrMsg, $DbgMsg);
+ if (DB_error_no($db) ==0) {
+ //now insert the language descriptions
+ $ErrMsg = _('Could not update the language description because');
+ $DbgMsg = _('The SQL that was used to update the language description and failed was');
+ if (count($ItemDescriptionLanguages)>0){
+ foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ if ($DescriptionLanguage!=''){
+ $result = DB_query("INSERT INTO stockdescriptiontranslations VALUES('" . $_POST['StockID'] . "','" . $DescriptionLanguage . "', '" . $_POST['Description_' . str_replace('.','_',$DescriptionLanguage)] . "')",$db,$ErrMsg,$DbgMsg,true);
+ }
+ }
+ }
+ //now insert any item properties
+ for ($i=0;$i<$_POST['PropertyCounter'];$i++){
+
+ if ($_POST['PropType' . $i] ==2){
+ if ($_POST['PropValue' . $i]=='on'){
+ $_POST['PropValue' . $i]=1;
+ } else {
+ $_POST['PropValue' . $i]=0;
+ }
+ }
+
+ if ($_POST['PropNumeric' .$i]==1){
+ $_POST['PropValue' . $i]=filter_number_format($_POST['PropValue' . $i]);
+ } else {
+ $_POST['PropValue' . $i]=$_POST['PropValue' . $i];
+ }
+
+ $result = DB_query("INSERT INTO stockitemproperties (stockid,
+ stkcatpropid,
+ value)
+ VALUES ('" . $_POST['StockID'] . "',
+ '" . $_POST['PropID' . $i] . "',
+ '" . $_POST['PropValue' . $i] . "')",
+ $db,$ErrMsg,$DbgMsg,true);
+ } //end of loop around properties defined for the category
+
+ //Add data to locstock
+
+ $sql = "INSERT INTO locstock (loccode,
+ stockid)
+ SELECT locations.loccode,
+ '" . $_POST['StockID'] . "'
+ FROM locations";
+
+ $ErrMsg = _('The locations for the item') . ' ' . $_POST['StockID'] . ' ' . _('could not be added because');
+ $DbgMsg = _('NB Locations records can be added by opening the utility page') . ' <i>Z_MakeStockLocns.php</i> ' . _('The SQL that was used to add the location records that failed was');
+ $InsResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
+
+ //check for any purchase data
+ $sql = "SELECT purchdata.supplierno,
+ suppliers.suppname,
+ purchdata.price,
+ suppliers.currcode,
+ purchdata.effectivefrom,
+ purchdata.suppliersuom,
+ purchdata.supplierdescription,
+ purchdata.leadtime,
+ purchdata.suppliers_partno,
+ purchdata.minorderqty,
+ purchdata.preferred,
+ purchdata.conversionfactor,
+ currencies.decimalplaces AS currdecimalplaces
+ FROM purchdata INNER JOIN suppliers
+ ON purchdata.supplierno=suppliers.supplierid
+ INNER JOIN currencies
+ ON suppliers.currcode=currencies.currabrev
+ WHERE purchdata.stockid = '" . $_POST['OldStockID'] . "'
+ ORDER BY purchdata.effectivefrom DESC";
+ $ErrMsg = _('The supplier purchasing details for the selected part could not be retrieved because');
+ $PurchDataResult = DB_query($sql, $db, $ErrMsg);
+ if (DB_num_rows($PurchDataResult) == 0 and $_POST['OldStockID'] != '') {
+ //prnMsg(_('There is no purchasing data set up for the part selected'), 'info');
+ $NoPurchasingData=1;
+ } else {
+ while ($myrow = DB_fetch_array($PurchDataResult)) { //clone the purchase data
+
+ $sql = "INSERT INTO purchdata (supplierno,
+ stockid,
+ price,
+ effectivefrom,
+ suppliersuom,
+ conversionfactor,
+ supplierdescription,
+ suppliers_partno,
+ leadtime,
+ minorderqty,
+ preferred)
+ VALUES ('" . $myrow['supplierno'] . "',
+ '" . $_POST['StockID'] . "',
+ '" . $myrow['price'] . "',
+ '" . $myrow['effectivefrom'] . "',
+ '" . $myrow['suppliersuom'] . "',
+ '" . $myrow['conversionfactor'] . "',
+ '" . DB_escape_string($myrow['supplierdescription']) . "',
+ '" . $myrow['suppliers_partno'] . "',
+ '" . $myrow['leadtime'] . "',
+ '" . $myrow['minorderqty'] . "',
+ '" . $myrow['preferred'] . "')";
+ $ErrMsg = _('The cloned supplier purchasing details could not be added to the database because');
+ $DbgMsg = _('The SQL that failed was');
+ $AddResult = DB_query($sql, $db, $ErrMsg, $DbgMsg);
+ }
+ }
+
+ //For both the following - assume the data taken from the tables has already been validated.
+ //check for price data
+ $sql = "SELECT currencies.currency,
+ salestypes.sales_type,
+ prices.price,
+ prices.stockid,
+ prices.typeabbrev,
+ prices.currabrev,
+ prices.startdate,
+ prices.enddate,
+ prices.debtorno,
+ currencies.decimalplaces AS currdecimalplaces
+ FROM prices
+ INNER JOIN salestypes
+ ON prices.typeabbrev = salestypes.typeabbrev
+ INNER JOIN currencies
+ ON prices.currabrev=currencies.currabrev
+ WHERE prices.stockid='".$_POST['OldStockID']."'
+
+ ORDER BY prices.currabrev,
+ prices.typeabbrev,
+ prices.startdate";
+
+ $PricingDataResult = DB_query($sql,$db);
+ //AND prices.debtorno=''
+ if (DB_num_rows($PricingDataResult) == 0 and $_POST['OldStockID'] != '') {
+ prnMsg(_('There is no purchasing data set up for the part selected'), 'info');
+ $NoPricingData=1;
+ } else {
+ while ($myrow = DB_fetch_array($PricingDataResult)) { //clone the purchase data
+ $sql = "INSERT INTO prices (stockid,
+ typeabbrev,
+ currabrev,
+ debtorno,
+ startdate,
+ enddate,
+ price)
+ VALUES ('" . $_POST['StockID']. "',
+ '" . $myrow['typeabbrev'] . "',
+ '" . $myrow['currabrev'] . "',
+ '" . $myrow['debtorno'] . "',
+ '" . $myrow['startdate'] . "',
+ '" . $myrow['enddate']. "',
+ '" . $myrow['price'] . "')";
+ $ErrMsg = _('The cloned pricing could not be added');
+ $result = DB_query($sql,$db,$ErrMsg);
+ }
+ }
+ //What about cost data?
+ //get any existing cost data
+ $sql = "SELECT materialcost,
+ labourcost,
+ overheadcost,
+ mbflag,
+ sum(quantity) as totalqoh
+ FROM stockmaster INNER JOIN locstock
+ ON stockmaster.stockid=locstock.stockid
+ WHERE stockmaster.stockid='".$_POST['OldStockID']."'
+ GROUP BY description,
+ units,
+ lastcost,
+ actualcost,
+ materialcost,
+ labourcost,
+ overheadcost,
+ mbflag";
+ $ErrMsg = _('The entered item code does not exist');
+ $OldResult = DB_query($sql,$db,$ErrMsg);
+ $OldRow = DB_fetch_array($OldResult);
+
+ //now update cloned item costs
+ $Result = DB_Txn_Begin($db);
+ $SQL = "UPDATE stockmaster SET materialcost='" . $OldRow['materialcost'] . "',
+ labourcost ='" . $OldRow['labourcost'] . "',
+ overheadcost ='" . $OldRow['overheadcost'] . "',
+ lastcost ='" . $OldRow['lastcost'] . "',
+ lastcostupdate ='" . Date('Y-m-d')."'
+ WHERE stockid='" . $_POST['StockID'] . "'";
+ $ErrMsg = _('The cost details for the cloned stock item could not be updated because');
+ $DbgMsg = _('The SQL that failed was');
+ $Result = DB_query($SQL,$db,$ErrMsg,$DbgMsg,true);
+ $Result = DB_Txn_Commit($db);
+
+ //finish up
+ if (DB_error_no($db) ==0) {
+ prnMsg( _('New Cloned Item') .' ' . '<a href="SelectProduct.php?StockID=' . $_POST['StockID'] . '">' . $_POST['StockID'] . '</a> '. _('has been added to the database') .
+ '<br />' . _('We also attempted to setup item purchase data and pricing.'));
+
+ if ($NoPricingData==1)
+ {
+ prnMsg(_('There is no pricing data to clone. Use the following link to add pricing.'));
+ }
+
+ prnMsg('<br />' . '<a target="_blank" href="Prices.php?Item=' . $_POST['StockID'] . '">' . _('Review Item Prices') . '</a> ','success');
+
+ if ($NoPurchasingData==1)
+ {
+ prnMsg(_('There is no purchasing data to clone .Use the following link to add purchasing data.'));
+ }
+ prnMsg('<br />' . '<a target="_blank" href="PurchData.php?StockID=' . $_POST['StockID'] . '">' . _('Review Item Purchase Data.') . '</a> ','success') .
+ prnMsg(_('Costing was updated for this cloned item.').
+ '<br />' . '<a target="_blank" href="StockCostUpdate.php?StockID=' . $_POST['StockID'] . '">' . _('Review Item Cost') . '</a>', 'success');
+
+ echo '<br />';
+ unset($_POST['Description']);
+ unset($_POST['LongDescription']);
+ unset($_POST['EOQ']);
+ // Leave Category ID set for ease of batch entry
+ //unset($_POST['CategoryID']);
+ unset($_POST['Units']);
+ unset($_POST['MBFlag']);
+ unset($_POST['Discontinued']);
+ unset($_POST['Controlled']);
+ unset($_POST['Serialised']);
+ unset($_POST['Perishable']);
+ unset($_POST['Volume']);
+ unset($_POST['GrossWeight']);
+ unset($_POST['NetWeight']);
+ unset($_POST['BarCode']);
+ unset($_POST['ReorderLevel']);
+ unset($_POST['DiscountCategory']);
+ unset($_POST['DecimalPlaces']);
+ unset($_POST['ShrinkFactor']);
+ unset($_POST['Pansize']);
+ unset($_POST['StockID']);
+ unset($_POST['OldStockID']);
+ foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ unset($_POST['Description_' . str_replace('.','_',$DescriptionLanguage)]);
+ $_POST['New'] = 0; //do not show input form again
+ }
+ }//Reset the form variables
+ }//Stock records finished
+ }//End of check for existing item
+ } //END Cloned item
+ } else {
+ $_POST['New'] = 1;
+ echo '<br />'. "\n";
+ prnMsg( _('Validation failed, no updates or deletes took place'), 'error');
+ }
+
+}
+
+
+echo '<form name="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
+
+echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <input type="hidden" name="New" value="'.$_POST['New'].'" />
+ <table class="selection">';
+
+if ($_POST['StockID'] == '' || ($_POST['StockID'] == $_POST['OldStockID']) ||isset($_POST['UpdateCategories'])) {
+
+/*If the page was called without $StockID or empty $StockID then a new cloned stock item is to be entered. Show a form with a part Code field,
+ otherwise show form for editing with only a hidden OldStockID field. */
+
+ if ($_POST['New']==1) {
+ $StockIDStyle= !empty($_POST['StockID']) && ($_POST['StockID'] != $_POST['OldStockID'])? '' : ' style="color:red;border: 2px solid red;background-color:#fddbdb;" ';
+ $StockID= !empty($_POST['StockID'])? $_POST['StockID']:$_POST['OldStockID'];
+ echo '<tr>
+ <td>'. _('Cloned Item Code'). ':</td>
+ <td><input type="text" ' . (in_array('StockID',$Errors) ? 'class="inputerror"' : '' ) .'" "'.$StockIDStyle.'" data-type="no-illegal-chars" autofocus="autofocus" required="required" value="' . $StockID . '" name="StockID" size="21" maxlength="20" />
+ <input type="hidden" name="OldStockID" value="'.$_POST['OldStockID'].'" /> '. _('Enter a unique item code for the new item.') .'
+ </td>
+
+ </tr>';
+ }
+
+}
+if ( (!isset($_POST['UpdateCategories']) AND ($InputError!=1)) OR $_POST['New']== 1 ) { // Must be modifying an existing item and no changes made yet
+
+ $selectedStockID = $_POST['OldStockID'];
+ $sql = "SELECT stockid,
+ description,
+ longdescription,
+ categoryid,
+ units,
+ mbflag,
+ discontinued,
+ controlled,
+ serialised,
+ perishable,
+ eoq,
+ volume,
+ grossweight,
+ netweight,
+ barcode,
+ discountcategory,
+ taxcatid,
+ decimalplaces,
+ nextserialno,
+ pansize,
+ shrinkfactor
+ FROM stockmaster
+ WHERE stockid = '".$selectedStockID."'";
+
+ $result = DB_query($sql, $db);
+ $myrow = DB_fetch_array($result);
+
+ $_POST['LongDescription'] = $myrow['longdescription'];
+ $_POST['Description'] = $myrow['description'];
+ $_POST['EOQ'] = $myrow['eoq'];
+ $_POST['CategoryID'] = $myrow['categoryid'];
+ $_POST['Units'] = $myrow['units'];
+ $_POST['MBFlag'] = $myrow['mbflag'];
+ $_POST['Discontinued'] = $myrow['discontinued'];
+ $_POST['Controlled'] = $myrow['controlled'];
+ $_POST['Serialised'] = $myrow['serialised'];
+ $_POST['Perishable'] = $myrow['perishable'];
+ $_POST['Volume'] = $myrow['volume'];
+ $_POST['GrossWeight'] = $myrow['grossweight'];
+ $_POST['NetWeight'] = $myrow['netweight'];
+ $_POST['BarCode'] = $myrow['barcode'];
+ $_POST['DiscountCategory'] = $myrow['discountcategory'];
+ $_POST['TaxCat'] = $myrow['taxcatid'];
+ $_POST['DecimalPlaces'] = $myrow['decimalplaces'];
+ $_POST['NextSerialNo'] = $myrow['nextserialno'];
+ $_POST['Pansize'] = $myrow['pansize'];
+ $_POST['ShrinkFactor'] = $myrow['shrinkfactor'];
+
+ $sql = "SELECT descriptiontranslation, language_id FROM stockdescriptiontranslations WHERE stockid='" . $selectedStockID . "' AND (";
+ foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ $sql .= "language_id='" . $DescriptionLanguage ."' OR ";
+ }
+ $sql = mb_substr($sql,0,mb_strlen($sql)-3) . ')';
+ $result = DB_query($sql,$db);
+ while ($myrow = DB_fetch_array($result)){
+ $_POST['Description_' . str_replace('.','_',$myrow['language_id'])] = $myrow['descriptiontranslation'];
+ }
+
+}
+
+if ($_POST['New'] == 1) {
+ if (isset($_POST['Description'])) {
+ $Description = $_POST['Description'];
+ } else {
+ $Description ='';
+ }
+ echo '<tr>
+ <td>' . _('Part Description') . ' (' . _('short') . '):</td>
+ <td><input ' . (in_array('Description',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="Description" size="52" maxlength="50" value="' . $Description . '" /></td>
+ </tr>';
+
+ foreach ($ItemDescriptionLanguages as $DescriptionLanguage) {
+ if ($DescriptionLanguage!=''){
+ //unfortunately cannot have points in POST variables so have to mess with the language id
+ $PostVariableName = 'Description_' . str_replace('.','_',$DescriptionLanguage);
+ if (!isset($_POST[$PostVariableName])){
+ $_POST[$PostVariableName] ='';
+ }
+ echo '<tr>
+ <td>' . $LanguagesArray[$DescriptionLanguage]['LanguageName'] . ' ' . _('Description') . ':</td>
+ <td><input type="text" name="'. $PostVariableName . '" size="52" maxlength="50" value="' . $_POST[$PostVariableName] . '" /></td>
+ </tr>';
+ }
+ }
+
+ if (isset($_POST['LongDescription'])) {
+ $LongDescription = AddCarriageReturns($_POST['LongDescription']);
+ } else {
+ $LongDescription ='';
+ }
+ echo '<tr>
+ <td>' . _('Part Description') . ' (' . _('long') . '):</td>
+ <td><textarea ' . (in_array('LongDescription',$Errors) ? 'class="texterror"' : '' ) .' name="LongDescription" cols="40" rows="3">' . stripslashes($LongDescription) . '</textarea></td>
+ </tr>
+ <tr>
+ <td>'. _('Image File (.jpg)') . ':</td>
+ <td><input type="file" id="ItemPicture" name="ItemPicture" />
+ <br />
+ <input type="checkbox" name="ClearImage" id="ClearImage" value="1" /> '._('Clear Image').'
+ </td>';
+
+ // if this is the first time displaying the form, there will only be a picture with the OldStockID name, if any, else there can be a $_POST['OldStockID'].'-TEMP'. '.jpg' file if one was uploaded
+ if (empty($_POST['StockID']) OR ($_POST['StockID'] == $_POST['OldStockID'])) {
+ $tempid = $_POST['OldStockID'].'-TEMP';
+ } else {
+ $tempid = $_POST['StockID'];
+ }
+
+ if (function_exists('imagecreatefromjpg') && isset($tempfile)){
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($tempid).
+ '&text='.
+ '&width=100'.
+ '&height=100'.
+ '" alt="" />';
+ } else {
+ if( !empty($tempid) AND file_exists($_SESSION['part_pics_dir'] . '/' .$tempid.'.jpg') ) {
+ $StockImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/' . $tempid . '.jpg" height="100" width="100" />';
+ if (isset($_POST['ClearImage']) ) {
+ //workaround for many variations of permission issues that could cause unlink fail
+ @unlink($_SESSION['part_pics_dir'] . '/' .$tempid.'.jpg');
+ if (is_file($_SESSION['part_pics_dir'] . '/' .$tempid.'.jpg')) {
+ prnMsg(_('You do not have access to delete this item image file.'),'error');
+ } else {
+ $StockImgLink = _('No Image');
+ }
+ }
+ } elseif ( !empty($tempid) AND !file_exists($_SESSION['part_pics_dir'] . '/' .$tempid.'.jpg') AND file_exists($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg')) {
+ if (!copy($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg', $_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP'.'.jpg')) {
+ $StockImgLink = _('No Image');
+ } else {
+ $StockImgLink = '<img src="' . $_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'-TEMP'.'.jpg" height="100" width="100" />';
+ }
+ } else {
+ $StockImgLink = _('No Image');
+ }
+ }
+
+ if ($StockImgLink!=_('No Image')) {
+ echo '<td>' . _('Image') . '<br />' . $StockImgLink . '</td>';
+ }
+ echo '</tr>';
+
+ echo '<tr>
+ <td>' . _('Category') . ':</td>
+ <td><select name="CategoryID" onchange="ReloadForm(ItemForm.UpdateCategories)">';
+
+ $sql = "SELECT categoryid, categorydescription FROM stockcategory";
+ $ErrMsg = _('The stock categories could not be retrieved because');
+ $DbgMsg = _('The SQL used to retrieve stock categories and failed was');
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
+
+ while ($myrow=DB_fetch_array($result)){
+ if (!isset($_POST['CategoryID']) OR $myrow['categoryid']==$_POST['CategoryID']){
+ echo '<option selected="selected" value="'. $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
+ } else {
+ echo '<option value="'. $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
+ }
+ $Category=$myrow['categoryid'];
+ }
+
+ if (!isset($_POST['CategoryID'])) {
+ $_POST['CategoryID']=$Category;
+ }
+
+ echo '</select><a target="_blank" href="'. $RootPath . '/StockCategories.php">' . _('Add or Modify Stock Categories') . '</a></td>
+ </tr>';
+
+ if (!isset($_POST['EOQ']) OR $_POST['EOQ']==''){
+ $_POST['EOQ']=0;
+ }
+
+ if (!isset($_POST['Volume']) OR $_POST['Volume']==''){
+ $_POST['Volume']=0;
+ }
+ if (!isset($_POST['GrossWeight']) OR $_POST['GrossWeight']==''){
+ $_POST['GrossWeight']=0;
+ }
+ if (!isset($_POST['NetWeight']) OR $_POST['NetWeight']==''){
+ $_POST['NetWeight']=0;
+ }
+ if (!isset($_POST['Controlled']) OR $_POST['Controlled']==''){
+ $_POST['Controlled']=0;
+ }
+ if (!isset($_POST['Serialised']) OR $_POST['Serialised']=='' || $_POST['Controlled']==0){
+ $_POST['Serialised']=0;
+ }
+ if (!isset($_POST['DecimalPlaces']) OR $_POST['DecimalPlaces']==''){
+ $_POST['DecimalPlaces']=0;
+ }
+ if (!isset($_POST['Discontinued']) OR $_POST['Discontinued']==''){
+ $_POST['Discontinued']=0;
+ }
+ if (!isset($_POST['Pansize'])) {
+ $_POST['Pansize']=0;
+ }
+ if (!isset($_POST['ShrinkFactor'])) {
+ $_POST['ShrinkFactor']=0;
+ }
+ if (!isset($_POST['NextSerialNo'])) {
+ $_POST['NextSerialNo']=0;
+ }
+
+
+ echo '<tr>
+ <td>' . _('Economic Order Quantity') . ':</td>
+ <td><input ' . (in_array('EOQ',$Errors) ? 'class="inputerror"' : '' ) .' type="text" class="number" name="EOQ" size="12" maxlength="10" value="' . locale_number_format($_POST['EOQ'],'Variable') . '" /></td></tr>';
+
+ echo '<tr>
+ <td>' . _('Packaged Volume (metres cubed)') . ':</td>
+ <td><input ' . (in_array('Volume',$Errors) ? 'class="inputerror"' : '' ) .' type="text" class="number" name="Volume" size="12" maxlength="10" value="' . locale_number_format($_POST['Volume'],'Variable') . '" /></td>
+ </tr>';
+
+ echo '<tr>
+ <td>' . _('Packaged Gross Weight (KGs)') . ':</td><td><input ' . (in_array('GrossWeight',$Errors) ? 'class="inputerror"' : '' ) .' type="text" class="number" name="GrossWeight" size="12" maxlength="10" value="' . locale_number_format($_POST['GrossWeight'],'Variable') . '" /></td>
+ </tr>';
+
+ echo '<tr>
+ <td>' . _('Net Weight (KGs)') . ':</td><td><input ' . (in_array('NetWeight',$Errors) ? 'class="inputerror"' : '' ) .' type="text" class="number" name="NetWeight" size="12" maxlength="10" value="' . locale_number_format($_POST['NetWeight'],'Variable') . '" /></td>
+ </tr>';
+
+ echo '<tr>
+ <td>' . _('Units of Measure') . ':</td>
+ <td><select ' . (in_array('Description',$Errors) ? 'class="selecterror"' : '' ) .' name="Units">';
+
+ $sql = "SELECT unitname FROM unitsofmeasure ORDER by unitname";
+ $UOMResult = DB_query($sql,$db);
+
+ if (!isset($_POST['Units'])) {
+ $UOMrow['unitname']=_('each');
+ }
+ while( $UOMrow = DB_fetch_array($UOMResult) ) {
+ if (isset($_POST['Units']) AND $_POST['Units']==$UOMrow['unitname']){
+ echo '<option selected="selected" value="' . $UOMrow['unitname'] . '">' . $UOMrow['unitname'] . '</option>';
+ } else {
+ echo '<option value="' . $UOMrow['unitname'] . '">' . $UOMrow['unitname'] . '</option>';
+ }
+ }
+
+ echo '</select></td>
+ </tr>';
+
+ echo '<tr>
+ <td>' . _('Assembly, Kit, Manufactured or Service/Labour') . ':</td>
+ <td><select name="MBFlag">';
+ if ($_POST['MBFlag']=='A'){
+ echo '<option selected="selected" value="A">' . _('Assembly') . '</option>';
+ } else {
+ echo '<option value="A">' . _('Assembly') . '</option>';
+ }
+ if (!isset($_POST['MBFlag']) OR $_POST['MBFlag']=='K'){
+ echo '<option selected="selected" value="K">' . _('Kit') . '</option>';
+ } else {
+ echo '<option value="K">' . _('Kit') . '</option>';
+ }
+ if (!isset($_POST['MBFlag']) OR $_POST['MBFlag']=='M'){
+ echo '<option selected="selected" value="M">' . _('Manufactured') . '</option>';
+ } else {
+ echo '<option value="M">' . _('Manufactured') . '</option>';
+ }
+ if (!isset($_POST['MBFlag']) OR $_POST['MBFlag']=='G' OR !isset($_POST['MBFlag']) OR $_POST['MBFlag']==''){
+ echo '<option selected="selected" value="G">' . _('Phantom') . '</option>';
+ } else {
+ echo '<option value="G">' . _('Phantom') . '</option>';
+ }
+ if (!isset($_POST['MBFlag']) OR $_POST['MBFlag']=='B' OR !isset($_POST['MBFlag']) OR $_POST['MBFlag']==''){
+ echo '<option selected="selected" value="B">' . _('Purchased') . '</option>';
+ } else {
+ echo '<option value="B">' . _('Purchased') . '</option>';
+ }
+
+ if (isset($_POST['MBFlag']) AND $_POST['MBFlag']=='D'){
+ echo '<option selected="selected" value="D">' . _('Service/Labour') . '</option>';
+ } else {
+ echo '<option value="D">' . _('Service/Labour') . '</option>';
+ }
+
+ echo '</select></td>
+ </tr>';
+
+ echo '<tr>
+ <td>' . _('Current or Obsolete') . ':</td>
+ <td><select name="Discontinued">';
+
+ if ($_POST['Discontinued']==0){
+ echo '<option selected="selected" value="0">' . _('Current') . '</option>';
+ } else {
+ echo '<option value="0">' . _('Current') . '</option>';
+ }
+ if ($_POST['Discontinued']==1){
+ echo '<option selected="selected" value="1">' . _('Obsolete') . '</option>';
+ } else {
+ echo '<option value="1">' . _('Obsolete') . '</option>';
+ }
+ echo '</select></td>
+ </tr>';
+
+ echo '<tr>
+ <td>' . _('Batch, Serial or Lot Control') . ':</td>
+ <td><select name="Controlled">';
+
+ if ($_POST['Controlled']==0){
+ echo '<option selected="selected" value="0">' . _('No Control') . '</option>';
+ } else {
+ echo '<option value="0">' . _('No Control') . '</option>';
+ }
+ if ($_POST['Controlled']==1){
+ echo '<option selected="selected" value="1">' . _('Controlled'). '</option>';
+ } else {
+ echo '<option value="1">' . _('Controlled'). '</option>';
+ }
+ echo '</select></td></tr>';
+
+ echo '<tr><td>' . _('Serialised') . ':</td><td><select ' . (in_array('Serialised',$Errors) ? 'class="selecterror"' : '' ) .' name="Serialised">';
+
+ if ($_POST['Serialised']==0){
+ echo '<option selected="selected" value="0">' . _('No'). '</option>';
+ } else {
+ echo '<option value="0">' . _('No'). '</option>';
+ }
+ if ($_POST['Serialised']==1){
+ echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
+ } else {
+ echo '<option value="1">' . _('Yes'). '</option>';
+ }
+ echo '</select><i>' . _('Note') . ', ' . _('this has no effect if the item is not Controlled') . '</i></td>
+ </tr>';
+
+ if ($_POST['Serialised']==1 AND $_POST['MBFlag']=='M'){
+ echo '<tr>
+ <td>' . _('Next Serial No (>0 for auto numbering)') . ':</td>
+ <td><input ' . (in_array('NextSerialNo',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="NextSerialNo" size="15" maxlength="15" value="' . $_POST['NextSerialNo'] . '" /></td></tr>';
+ } else {
+ echo '<tr><td><input type="hidden" name="NextSerialNo" value="0" /></td></tr>';
+ }
+
+ echo '<tr>
+ <td>' . _('Perishable') . ':</td>
+ <td><select name="Perishable">';
+
+ if (!isset($_POST['Perishable']) OR $_POST['Perishable']==0){
+ echo '<option selected="selected" value="0">' . _('No'). '</option>';
+ } else {
+ echo '<option value="0">' . _('No'). '</option>';
+ }
+ if (isset($_POST['Perishable']) AND $_POST['Perishable']==1){
+ echo '<option selected="selected" value="1">' . _('Yes'). '</option>';
+ } else {
+ echo '<option value="1">' . _('Yes'). '</option>';
+ }
+ echo '</select></td></tr>';
+
+ echo '<tr>
+ <td>' . _('Decimal Places for display Quantity') . ':</td>
+ <td><input type="text" class="number" name="DecimalPlaces" size="1" maxlength="1" value="' . $_POST['DecimalPlaces'] . '" /></td>
+ </tr>';
+
+ if (isset($_POST['BarCode'])) {
+ $BarCode = $_POST['BarCode'];
+ } else {
+ $BarCode='';
+ }
+ echo '<tr>
+ <td>' . _('Bar Code') . ':</td>
+ <td><input ' . (in_array('BarCode',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="BarCode" size="22" maxlength="20" value="' . $BarCode . '" /></td>
+ </tr>';
+
+ if (isset($_POST['DiscountCategory'])) {
+ $DiscountCategory = $_POST['DiscountCategory'];
+ } else {
+ $DiscountCategory='';
+ }
+ echo '<tr>
+ <td>' . _('Discount Category') . ':</td>
+ <td><input type="text" name="DiscountCategory" size="2" maxlength="2" value="' . $DiscountCategory . '" /></td>
+ </tr>';
+
+ echo '<tr>
+ <td>' . _('Tax Category') . ':</td>
+ <td><select name="TaxCat">';
+ $sql = "SELECT taxcatid, taxcatname FROM taxcategories ORDER BY taxcatname";
+ $result = DB_query($sql, $db);
+
+ if (!isset($_POST['TaxCat'])){
+ $_POST['TaxCat'] = $_SESSION['DefaultTaxCategory'];
+ }
+
+ while ($myrow = DB_fetch_array($result)) {
+ if ($_POST['TaxCat'] == $myrow['taxcatid']){
+ echo '<option selected="selected" value="' . $myrow['taxcatid'] . '">' . $myrow['taxcatname'] . '</option>';
+ } else {
+ echo '<option value="' . $myrow['taxcatid'] . '">' . $myrow['taxcatname'] . '</option>';
+ }
+ } //end while loop
+
+ echo '</select></td>
+ </tr>';
+
+ echo '<tr>
+ <td>' . _('Pan Size') . ':</td>
+ <td><input type="text" class="number" name="Pansize" size="6" maxlength="6" value="' . locale_number_format($_POST['Pansize'],0) . '" /></td>
+ </tr>
+ <tr>
+ <td>' . _('Shrinkage Factor') . ':</td>
+ <td><input type="text" class="number" name="ShrinkFactor" size="6" maxlength="6" value="' . locale_number_format($_POST['ShrinkFactor'],0) . '" /></td>
+ </tr>';
+
+ echo '</table>
+ <div class="centre">';
+
+ if (!isset($_POST['CategoryID'])) {
+ $_POST['CategoryID'] = '';
+ }
+
+ $sql = "SELECT stkcatpropid,
+ label,
+ controltype,
+ defaultvalue,
+ numericvalue,
+ minimumvalue,
+ maximumvalue
+ FROM stockcatproperties
+ WHERE categoryid ='" . $_POST['CategoryID'] . "'
+ AND reqatsalesorder =0
+ ORDER BY stkcatpropid";
+
+ $PropertiesResult = DB_query($sql,$db);
+ $PropertyCounter = 0;
+ $PropertyWidth = array();
+
+ if (DB_num_rows($PropertiesResult)>0) {
+ echo '<br />
+ <table class="selection">';
+ echo '<tr>
+ <th colspan="2">' . _('Item Category Properties') . '</th>
+ </tr>';
+
+ while ($PropertyRow=DB_fetch_array($PropertiesResult)){
+
+ if (isset($_POST['StockID']) && !empty($_POST['StockID'])) {
+ $PropValResult = DB_query("SELECT value FROM
+ stockitemproperties
+ WHERE stockid='" . $_POST['StockID'] . "'
+ AND stkcatpropid ='" . $PropertyRow['stkcatpropid']."'",
+ $db);
+ $PropValRow = DB_fetch_row($PropValResult);
+ $PropertyValue = $PropValRow[0];
+ } else {
+ $PropertyValue = '';
+ }
+ echo '<tr>
+ <td>';
+ echo '<input type="hidden" name="PropID' . $PropertyCounter . '" value="' .$PropertyRow['stkcatpropid'] .'" />';
+ echo '<input type="hidden" name="PropNumeric' . $PropertyCounter . '" value="' .$PropertyRow['numericvalue'] .'" />';
+ echo $PropertyRow['label'] . '</td>
+
+ <td>';
+ switch ($PropertyRow['controltype']) {
+ case 0; //textbox
+ if ($PropertyRow['numericvalue']==1) {
+ echo '<input type="hidden" name="PropMin' . $PropertyCounter . '" value="' . $PropertyRow['minimumvalue'] . '" />';
+ echo '<input type="hidden" name="PropMax' . $PropertyCounter . '" value="' . $PropertyRow['maximumvalue'] . '" />';
+
+ echo '<input type="text" class="number" name="PropValue' . $PropertyCounter . '" size="20" maxlength="100" value="' . locale_number_format($PropertyValue,'Variable') . '" />';
+ echo _('A number between') . ' ' . locale_number_format($PropertyRow['minimumvalue'],'Variable') . ' ' . _('and') . ' ' . locale_number_format($PropertyRow['maximumvalue'],'Variable') . ' ' . _('is expected');
+ } else {
+ echo '<input type="text" name="PropValue' . $PropertyCounter . '" size="20" maxlength="100" value="' . $PropertyValue . '" />';
+ }
+ break;
+ case 1; //select box
+ $OptionValues = explode(',',$PropertyRow['defaultvalue']);
+ echo '<select name="PropValue' . $PropertyCounter . '">';
+ foreach ($OptionValues as $PropertyOptionValue){
+ if ($PropertyOptionValue == $PropertyValue){
+ echo '<option selected="selected" value="' . $PropertyOptionValue . '">' . $PropertyOptionValue . '</option>';
+ } else {
+ echo '<option value="' . $PropertyOptionValue . '">' . $PropertyOptionValue . '</option>';
+ }
+ }
+ echo '</select>';
+ break;
+ case 2; //checkbox
+ echo '<input type="checkbox" name="PropValue' . $PropertyCounter . '"';
+ if ($PropertyValue==1){
+ echo 'checked';
+ }
+ echo ' />';
+ break;
+ } //end switch
+ echo '<input type="hidden" name="PropType' . $PropertyCounter .'" value="' . $PropertyRow['controltype'] . '" />';
+ echo '</td></tr>';
+ $PropertyCounter++;
+
+ } //end loop round properties for the item category
+ unset($StockID);
+ echo '</table>';
+ }
+ echo '<input type="hidden" name="PropertyCounter" value="' . $PropertyCounter . '" />';
+ echo '<br />';
+
+ echo '<input type="submit" name="submit" value="' . _('Insert New Item') . '" />';
+ echo '<input type="submit" name="UpdateCategories" style="visibility:hidden;width:1px" value="' . _('Categories') . '" />';
+
+}
+echo '</div>
+ </div>
+ </form>';
+include('includes/footer.inc');
+
+?>
\ No newline at end of file
Property changes on: trunk/StockClone.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-10-19 06:21:08 UTC (rev 6362)
+++ trunk/doc/Change.log 2013-10-20 15:23:15 UTC (rev 6363)
@@ -1,10 +1,10 @@
webERP Change Log
-
-18/10/13 Paul T: ManualSecuritySchema.html, add missing tr tags, reduced doubled-closing td tags to one, and changed & to & for HTML.
+20/10/13 icedlava: Add StockClone.php script to create a new item with the same properties, image, cost, purchasing and pricing data as the selected item, and allow modification of image and general item details before cloning.
+18/10/13 Paul T: ManualSecuritySchema.html, add missing tr tags, reduced doubled-closing td tags to one, and changed & to & for HTML.
18/10/13 Paul T: ManualInventory.html, add bracket to complete closing h3 tag.
15/10/13 Paul T: GoodsReceived.php, change variable name from OrderNumber to OrderNo.
11/10/13 Tim: Links for manual internal transfers and supplier payment link to allocations
-9/10/13 Exson: commit the fixed "Unable to Locate Purchase Order Number" error when the PO is created by SO interface. Fixed provided by Tim and reported by Merci from webERP forum.
+9/10/13 Exson: commit the fixed "Unable to Locate Purchase Order Number" error when the PO is created by SO interface. Fixed provided by Tim and reported by Merci from webERP forum.
6/10/13 Phil: New script to show a grid of items by preferred supplier for placing purchase orders to the users's default inventory location - orders will be authorised if the user has authority and the auto-authorise config option is enabled.
3/10/13 icedlava: PO_Items.php with non-stock items still require GL Code in case of modified order at invoice time else SQL error is generated due to invalid GL Code.
2/10/13 David Lynn: Added new field url to suppliers modified SelectSupplier.php and Suppliers.php
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2013-10-19 06:21:08 UTC (rev 6362)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2013-10-20 15:23:15 UTC (rev 6363)
@@ -3,5 +3,6 @@
ALTER TABLE `suppliers` ADD COLUMN `url` varchar(50) NOT NULL DEFAULT '';
INSERT INTO config VALUES ('ShopFreightMethod','webERPCalculation');
INSERT INTO config VALUES ('ShopPaypalCommissionAccount', '7220');
+INSERT INTO `scripts` (`script` , `pagesecurity` , `description`) VALUES ('StockClone.php', '11', 'Script to copy a stock item and associated properties, image, price, purchase and cost data');
#--UPDATE config SET confvalue='4.11.0' WHERE confname='VersionNumber';
|
|
From: <tu...@us...> - 2013-10-25 03:36:45
|
Revision: 6367
http://sourceforge.net/p/web-erp/reponame/6367
Author: turbopt
Date: 2013-10-25 03:36:42 +0000 (Fri, 25 Oct 2013)
Log Message:
-----------
Minor tag other formatting corrections.
Modified Paths:
--------------
trunk/MailingGroupMaintenance.php
trunk/doc/Change.log
Modified: trunk/MailingGroupMaintenance.php
===================================================================
--- trunk/MailingGroupMaintenance.php 2013-10-22 15:05:54 UTC (rev 6366)
+++ trunk/MailingGroupMaintenance.php 2013-10-25 03:36:42 UTC (rev 6367)
@@ -137,7 +137,7 @@
}
if(!isset($_GET['Edit'])){//display the input form
?>
- <form id="MailGroups" action="<?php echo htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'); ?>" method="post" />
+ <form id="MailGroups" action="<?php echo htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'); ?>" method="post">
<input type="hidden" name="FormID" value="<?php echo $_SESSION['FormID']; ?>" />
<label for="MailGroup"><?php echo _('Mail Group'); ?></label>
<input type="text" required="required" autofocus="autofocus" name="MailGroup" maxlength="100" size="20" />
@@ -176,7 +176,7 @@
<tr><td><?php echo $myrow['groupname']; ?></td>
<td><?php echo '<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'?GroupId='.$myrow['id'].'&Edit=1&GroupName='.$myrow['groupname'].'" >' . _('Edit') . '</a>'; ?></td>
- <td><?php echo '<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'?Id='.$myrow['id'].'&Delete=1" onclick="return confirm(\'' ._('Are you sure you wish to delete this group?').'\');">' . _('Delete'); ?></a></td>
+ <td><?php echo '<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'?Id='.$myrow['id'].'&Delete=1" onclick="return confirm(\'' ._('Are you sure you wish to delete this group?').'\');">' . _('Delete') . '</a>'; ?></td>
</tr>
<?php
@@ -209,11 +209,13 @@
?>
<div class="centre"><?php echo _('Current Mail Group').' : '.$GroupName; ?></div>
- <div class="centre"><a href="<?php echo htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'); ?>" /><?php echo _('View All Groups'); ?></a>
+ <div class="centre"><a href="<?php echo htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'); ?>"><?php echo _('View All Groups'); ?></a></div>
<table class="selection">
- <th colspan="3"><div class="centre"><?php echo _('Assigned Users'); ?></div></th>
- <th colspan="3"><div class="centre"><?php echo _('Available Users'); ?></div></th>
+ <tr>
+ <th colspan="3"><?php echo _('Assigned Users'); ?></th>
+ <th colspan="3"><?php echo _('Available Users'); ?></th>
+ </tr>
<?php
$k = 0;
while($myrow=DB_fetch_array($result)){
@@ -233,7 +235,7 @@
?>
<td><?php echo $myrow['userid']; ?></td>
<td><?php echo $myrow['realname']; ?></td>
- <td><a href="<?php echo htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'?UserId='.$myrow['userid'].'&GroupName='.$GroupName.'&Remove=1&GroupId='.$GroupId; ?>" onclick="return confirm('" . _('Are you sure you wish to remove this user from this mail group?'). "); " /><?php echo _('Remove'); ?></a></td>
+ <td><a href="<?php echo htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'?UserId='.$myrow['userid'].'&GroupName='.$GroupName.'&Remove=1&GroupId='.$GroupId . '" onclick="return confirm(\'' . _('Are you sure you wish to remove this user from this mail group?') . '\');'; ?>"><?php echo _('Remove'); ?></a></td>
<td> </td>
<td> </td>
<td> </td>
@@ -245,7 +247,7 @@
<td> </td>
<td><?php echo $myrow['userid']; ?></td>
<td><?php echo $myrow['realname']; ?></td>
- <td><a href="<?php echo htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'?UserId='.$myrow['userid'].'&Add=1&GroupName='.$GroupName.'&GroupId='.$GroupId; ?>" /><?php echo _('Add'); ?></a></td>
+ <td><a href="<?php echo htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8').'?UserId='.$myrow['userid'].'&Add=1&GroupName='.$GroupName.'&GroupId='.$GroupId; ?>"><?php echo _('Add'); ?></a></td>
<?php
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-10-22 15:05:54 UTC (rev 6366)
+++ trunk/doc/Change.log 2013-10-25 03:36:42 UTC (rev 6367)
@@ -1,4 +1,5 @@
webERP Change Log
+24/10/13 MailingGroupMaintenance.php, minor tag and other formatting corrections.
20/10/13 icedlava: Add StockClone.php script to create a new item with the same properties, image, cost, purchasing and pricing data as the selected item, and allow modification of image and general item details before cloning.
18/10/13 Paul T: ManualSecuritySchema.html, add missing tr tags, reduced doubled-closing td tags to one, and changed & to & for HTML.
18/10/13 Paul T: ManualInventory.html, add bracket to complete closing h3 tag.
|
|
From: <rc...@us...> - 2013-10-26 17:25:42
|
Revision: 6368
http://sourceforge.net/p/web-erp/reponame/6368
Author: rchacon
Date: 2013-10-26 17:25:40 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
Allows to separate register of Payment (Bank Account) info to be inserted on banktrans.ref and on gltrans.narrative. Translation adjustements.
Modified Paths:
--------------
trunk/Payments.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2013-10-25 03:36:42 UTC (rev 6367)
+++ trunk/Payments.php 2013-10-26 17:25:40 UTC (rev 6368)
@@ -206,7 +206,9 @@
}
-
+if (isset($_POST['BankTransRef']) AND $_POST['BankTransRef']!=''){ // Reference on Bank Transactions Inquiry
+ $_SESSION['PaymentDetail' . $identifier]->BankTransRef=$_POST['BankTransRef'];
+}
if (isset($_POST['Narrative']) AND $_POST['Narrative']!=''){
$_SESSION['PaymentDetail' . $identifier]->Narrative=$_POST['Narrative'];
}
@@ -570,7 +572,7 @@
VALUES ('" . $TransNo . "',
'" . $TransType . "',
'" . $_SESSION['PaymentDetail' . $identifier]->Account . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Narrative . "',
+ '" . $_SESSION['PaymentDetail' . $identifier]->BankTransRef . "',
'" . $_SESSION['PaymentDetail' . $identifier]->ExRate . "',
'" . $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate . "',
'" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
@@ -597,7 +599,7 @@
VALUES ('" . $TransNo . "',
'" . $TransType . "',
'" . $_SESSION['PaymentDetail' . $identifier]->Account . "',
- '" . $_SESSION['PaymentDetail' . $identifier]->Narrative . "',
+ '" . $_SESSION['PaymentDetail' . $identifier]->BankTransRef . "',
'" . $_SESSION['PaymentDetail' . $identifier]->ExRate . "',
'" . $_SESSION['PaymentDetail' . $identifier]->FunctionalExRate . "',
'" . FormatDateForSQL($_SESSION['PaymentDetail' . $identifier]->DatePaid) . "',
@@ -907,19 +909,25 @@
if (!isset($_POST['ChequeNum'])) {
$_POST['ChequeNum']='';
}
-
echo '<tr>
<td>' . _('Cheque Number') . ':</td>
<td><input type="text" name="ChequeNum" maxlength="8" size="10" value="' . $_POST['ChequeNum'] . '" /> ' . _('(if using pre-printed stationery)') . '</td>
</tr>';
-if (!isset($_POST['Narrative'])) {
+if (!isset($_POST['BankTransRef'])) { // Payment (Bank Account) info to be inserted on banktrans.ref, varchar(50).
+ $_POST['BankTransRef']='';
+}
+echo '<tr>
+ <td>' . _('Reference') . ':</td>
+ <td colspan="2"><input type="text" name="BankTransRef" maxlength="50" size="52" value="' . stripslashes($_POST['BankTransRef'] ) . '" /> ' . _('Reference on Bank Transactions Inquiry (Max. length 50 characters)') . '</td>
+ </tr>';
+
+if (!isset($_POST['Narrative'])) { // Payment (Bank Account) info to be inserted on gltrans.narrative, varchar(200).
$_POST['Narrative']='';
}
-
echo '<tr>
- <td>' . _('Reference / Narrative') . ':</td>
- <td colspan="2"><input type="text" name="Narrative" maxlength="80" size="82" value="' . stripslashes($_POST['Narrative'] ) . '" /> ' . _('(Max. length 80 characters)') . '</td>
+ <td>' . _('Narrative') . ':</td>
+ <td colspan="2"><input type="text" name="Narrative" maxlength="80" size="82" value="' . stripslashes($_POST['Narrative'] ) . '" /> ' . _('Narrative on GL Trans') . '</td>
</tr>
<td><input type="hidden" name="PreviousCurrency" value="' . $_POST['Currency'].'" /></td>
<td colspan="3"><div class="centre"><input type="submit" name="UpdateHeader" value="' . _('Update'). '" /></div></td>
@@ -1035,7 +1043,7 @@
<td><input type="text" name="Cheque" maxlength="12" size="12" /></td>
</tr>';
- if (isset($_POST['GLNarrative'])) {
+ if (isset($_POST['GLNarrative'])) { // General Ledger Payment (Different than Bank Account) info to be inserted on gltrans.narrative, varchar(200).
echo '<tr>
<td>' . _('GL Narrative') . ':</td>
<td><input type="text" name="GLNarrative" maxlength="50" size="52" value="' . stripslashes($_POST['GLNarrative']) . '" /></td>
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 2013-10-25 03:36:42 UTC (rev 6367)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-10-26 17:25:40 UTC (rev 6368)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-09-06 21:34+1200\n"
-"PO-Revision-Date: 2013-10-22 09:03-0600\n"
+"PO-Revision-Date: 2013-10-26 11:04-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -1689,7 +1689,7 @@
#: CustomerReceipt.php:769 DailyBankTransactions.php:37 Payments.php:774
#: PDFChequeListing.php:46 TaxAuthorities.php:151 TaxAuthorities.php:318
msgid "Bank Account"
-msgstr "Cuenta Bancaria"
+msgstr "Cuenta bancaria"
#: BankMatching.php:127 ShopParameters.php:298 ShopParameters.php:302
msgid "Show"
@@ -1843,7 +1843,7 @@
#: includes/PDFGLJournalHeader.inc:22 ../webSHOP/CreditCardPayFlowPro.php:276
#: ../webSHOP/CreditCardPayPalPro.php:338
msgid "Amount"
-msgstr "Importe"
+msgstr "Monto"
#: BankMatching.php:280 BankReconciliation.php:217 BankReconciliation.php:294
#: PDFOrdersInvoiced.php:361 PDFOrderStatus.php:332
@@ -5787,7 +5787,7 @@
#: includes/PDFTransPageHeaderPortrait.inc:212
#: includes/PO_PDFOrderPageHeader.inc:71
msgid "All amounts stated in"
-msgstr "Todos los precios se muestran en"
+msgstr "Todos los montos en"
#: Contracts.php:840 SelectContract.php:31 SelectContract.php:41
#: SuppContractChgs.php:132
@@ -6105,7 +6105,7 @@
#: CounterReturns.php:197 CounterSales.php:227
msgid "all amounts in"
-msgstr "todas las cantidades en"
+msgstr "todos los montos en"
#: CounterReturns.php:204 CounterSales.php:234
msgid "Item description has been used in search"
@@ -8992,7 +8992,7 @@
#: GLAccountReport.php:269 Payments.php:935 StockAdjustments.php:477
#: SuppTransGLAnalysis.php:168
msgid "Select Tag"
-msgstr "Seleccionar Centro de Costo"
+msgstr "Seleccione centro de costo"
#: CustomerReceipt.php:1051 GLBudgets.php:52 Payments.php:1017
msgid "No General ledger accounts have been set up yet"
@@ -13430,7 +13430,7 @@
#: GLBudgets.php:40 GLJournal.php:296 Payments.php:1011
msgid "Select GL Account"
-msgstr "Seleccionar cuenta contable"
+msgstr "Seleccione cuenta contable"
#: GLBudgets.php:52
msgid "budgets cannot be allocated until the GL accounts are set up"
@@ -13835,7 +13835,7 @@
#: GLTagProfit_Loss.php:97
msgid "Select tag"
-msgstr "Seleccionar Centro de Costo"
+msgstr "Seleccione centro de costo"
#: GLTagProfit_Loss.php:128
msgid "Show Statement of Income and Expenditure"
@@ -18125,7 +18125,7 @@
#: Payments.php:807
msgid "Currency of Payment"
-msgstr "Moneda del Pago"
+msgstr "Moneda de pago"
#: Payments.php:815
msgid ""
@@ -18184,7 +18184,7 @@
#: Payments.php:959 Payments.php:964
msgid "Enter GL Account Manually"
-msgstr "Introduzca Manualmente la Cuenta Contable"
+msgstr "Introduzca manualmente la cuenta contable"
#: Payments.php:960 Payments.php:965
#, fuzzy
@@ -18198,7 +18198,7 @@
#: Payments.php:970
msgid "Select GL Group"
-msgstr "Seleccionar un Grupo de Cuentas Contables"
+msgstr "Seleccione grupo contable"
#: Payments.php:981
msgid "No General ledger account groups have been set up yet"
@@ -30981,9 +30981,8 @@
msgstr "Las cantidad debe ser numérica"
#: SuppContractChgs.php:165
-#, fuzzy
msgid "Non zero amount"
-msgstr "Importe Neto"
+msgstr "Monto no nulo"
#: SuppContractChgs.php:172
#, fuzzy
@@ -31231,9 +31230,8 @@
msgstr "Seleccionar de la lista"
#: SuppFixedAssetChgs.php:154 SuppTransGLAnalysis.php:220
-#, fuzzy
msgid "The amount must be numeric and cannot be zero"
-msgstr "La cantidad no puede ser cero"
+msgstr "El monto debe ser numérico y no puede ser cero"
#: SuppFixedAssetChgs.php:160
msgid "Enter Fixed Asset"
@@ -44074,7 +44072,7 @@
#: includes/PDFCustTransListingPageHeader.inc:53
#: includes/PDFSuppTransListingPageHeader.inc:53
msgid "Total Amount"
-msgstr "Monto Total"
+msgstr "Monto total"
#: includes/PDFDebtorBalsPageHeader.inc:17
msgid "Customer Balances For Customers between"
@@ -47710,6 +47708,8 @@
#: ../webSHOP/Checkout.php:607
msgid "Please deposit the amount due (in full) to our bank account."
msgstr ""
+"Por favor deposite el monto adeudado (en su totalidad) en nuestra cuenta "
+"bancaria."
#: ../webSHOP/Checkout.php:610
msgid ""
|
|
From: <rc...@us...> - 2013-10-30 16:11:27
|
Revision: 6377
http://sourceforge.net/p/web-erp/reponame/6377
Author: rchacon
Date: 2013-10-30 16:11:22 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
Allow insert different data on banktrans.ref and gltrans.narrative for the bank account on CustomerReceipt.php. Match the page_title_text with the MainMenuLinksArray option for Bank Account Payments Entry and Bank Account Receipts Entry. Regroup the General Ledger Transactions menu.
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/Payments.php
trunk/doc/Change.log
trunk/includes/MainMenuLinksArray.php
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2013-10-30 10:12:05 UTC (rev 6376)
+++ trunk/CustomerReceipt.php 2013-10-30 16:11:22 UTC (rev 6377)
@@ -147,8 +147,7 @@
$SuggestedExRate = $TableExRate/$SuggestedFunctionalExRate;
}
-
-
+ $_SESSION['ReceiptBatch']->BankTransRef = $_POST['BankTransRef'];
$_SESSION['ReceiptBatch']->Narrative = $_POST['BatchNarrative'];
} elseif (isset($_GET['Delete'])) {
@@ -463,7 +462,7 @@
12,
'" . $_SESSION['ReceiptBatch']->BatchNo . "',
'" . $_SESSION['ReceiptBatch']->Account . "',
- '" . $_SESSION['ReceiptBatch']->Narrative . "',
+ '" . $_SESSION['ReceiptBatch']->BankTransRef . "',
'" . $_SESSION['ReceiptBatch']->ExRate . "',
'" . $_SESSION['ReceiptBatch']->FunctionalExRate . "',
'" . FormatDateForSQL($_SESSION['ReceiptBatch']->DateBanked) . "',
@@ -758,7 +757,7 @@
$AccountsResults = DB_query($SQL,$db,$ErrMsg,$DbgMsg);
if (isset($_POST['GLEntry'])) {
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Enter Receipt') . '" alt="" />' . ' ' . _('General Ledger Receipt Entry') . '</p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Bank Account Receipts Entry') . '" alt="" />' . ' ' . _('Bank Account Receipts Entry') . '</p>';
} else {
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Enter Receipt') . '" alt="" />' . ' ' . _('Enter Customer Receipt') . '</p>';
echo '<div class="page_help_text">' . _('To enter a payment TO a customer (ie. to pay out a credit note), enter a negative payment amount.') . '</div>';
@@ -873,7 +872,8 @@
<td><select tabindex="6" name="ReceiptType">';
include('includes/GetPaymentMethods.php');
-/* The array ReceiptTypes is defined from the setup tab of the main menu under payment methods - the array is populated from the include file GetPaymentMethods.php */
+/* The array ReceiptTypes is defined from the setup tab of the main menu under
+payment methods - the array is populated from the include file GetPaymentMethods.php */
foreach ($ReceiptTypes as $RcptType) {
if (isset($_POST['ReceiptType']) and $_POST['ReceiptType']==$RcptType){
@@ -884,6 +884,17 @@
}
echo '</select></td>
</tr>';
+
+/* Receipt (Bank Account) info to be inserted on banktrans.ref, varchar(50). */
+if (!isset($_SESSION['ReceiptBatch']->BankTransRef)) {
+ $_SESSION['ReceiptBatch']->BankTransRef='';
+}
+echo '<tr>
+ <td>' . _('Reference') . ':</td>
+ <td><input tabindex="7" type="text" name="BankTransRef" maxlength="50" size="52" value="' . $_SESSION['ReceiptBatch']->BankTransRef . '" /> ' . _('Reference on Bank Transactions Inquiry') . '</td>
+ </tr>';
+
+/* Receipt (Bank Account) info to be inserted on gltrans.narrative, varchar(200). */
if (!isset($_SESSION['ReceiptBatch']->Narrative)) {
$_SESSION['ReceiptBatch']->Narrative='';
}
@@ -892,13 +903,13 @@
}
echo '<tr>
<td>' . _('Narrative') . ':</td>
- <td><input tabindex="7" type="text" name="BatchNarrative" maxlength="50" size="52" value="' . $_SESSION['ReceiptBatch']->Narrative . '" /></td>
+ <td><input tabindex="8" type="text" name="BatchNarrative" maxlength="200" size="52" value="' . $_SESSION['ReceiptBatch']->Narrative . '" /> ' . _('Narrative on General Ledger Account Inquiry') . '</td>
</tr>
<input type="hidden" name="PreviousCurrency" value="' . $_POST['Currency'] . '" />
<tr>
<td colspan="3">
<div class="centre">
- <input tabindex="8" type="submit" name="BatchInput" value="' . _('Accept') . '" />
+ <input tabindex="9" type="submit" name="BatchInput" value="' . _('Accept') . '" />
</div>
</td>
</tr>
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2013-10-30 10:12:05 UTC (rev 6376)
+++ trunk/Payments.php 2013-10-30 16:11:22 UTC (rev 6377)
@@ -52,8 +52,8 @@
}
echo '<p class="page_title_text">
- <img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Payment Entry')
-. '" alt="" />' . ' ' . _('Payment Entry') . '
+ <img src="'.$RootPath.'/css/'.$Theme.'/images/transactions.png" title="' . _('Bank Account Payments Entry')
+. '" alt="" />' . ' ' . _('Bank Account Payments Entry') . '
</p>';
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 />';
@@ -919,7 +919,7 @@
}
echo '<tr>
<td>' . _('Reference') . ':</td>
- <td colspan="2"><input type="text" name="BankTransRef" maxlength="50" size="52" value="' . stripslashes($_POST['BankTransRef'] ) . '" /> ' . _('Reference on Bank Transactions Inquiry (Max. length 50 characters)') . '</td>
+ <td colspan="2"><input type="text" name="BankTransRef" maxlength="50" size="52" value="' . stripslashes($_POST['BankTransRef'] ) . '" /> ' . _('Reference on Bank Transactions Inquiry') . '</td>
</tr>';
if (!isset($_POST['Narrative'])) { // Payment (Bank Account) info to be inserted on gltrans.narrative, varchar(200).
@@ -927,7 +927,7 @@
}
echo '<tr>
<td>' . _('Narrative') . ':</td>
- <td colspan="2"><input type="text" name="Narrative" maxlength="80" size="82" value="' . stripslashes($_POST['Narrative'] ) . '" /> ' . _('Narrative on GL Trans') . '</td>
+ <td colspan="2"><input type="text" name="Narrative" maxlength="200" size="52" value="' . stripslashes($_POST['Narrative'] ) . '" /> ' . _('Narrative on General Ledger Account Inquiry') . '</td>
</tr>
<td><input type="hidden" name="PreviousCurrency" value="' . $_POST['Currency'].'" /></td>
<td colspan="3"><div class="centre"><input type="submit" name="UpdateHeader" value="' . _('Update'). '" /></div></td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-10-30 10:12:05 UTC (rev 6376)
+++ trunk/doc/Change.log 2013-10-30 16:11:22 UTC (rev 6377)
@@ -1,4 +1,5 @@
webERP Change Log
+30/10/2013 rchacon: Allow insert different data on banktrans.ref and gltrans.narrative for the bank account on CustomerReceipt.php. Match the page_title_text with the MainMenuLinksArray option for Bank Account Payments Entry and Bank Account Receipts Entry. Regroup the General Ledger Transactions menu.
30/10/2013 Exson: Add required attribute for Z_MakeNewCompany.php to avoid file void error and make it more user friendly.
30/10/2013: Exson modify the locstock table change the bin to NULL to avoid stick sql standard constraint failed for those items without bin.
30/10/2013 Exson: Modify the the insert new stocks event to transaction.
Modified: trunk/includes/MainMenuLinksArray.php
===================================================================
--- trunk/includes/MainMenuLinksArray.php 2013-10-30 10:12:05 UTC (rev 6376)
+++ trunk/includes/MainMenuLinksArray.php 2013-10-30 16:11:22 UTC (rev 6377)
@@ -327,16 +327,16 @@
$MenuItems['GL']['Transactions']['Caption'] = array( _('Bank Account Payments Entry'),
_('Bank Account Receipts Entry'),
_('Import Bank Transactions'),
- _('Journal Entry'),
_('Bank Account Payments Matching'),
- _('Bank Account Receipts Matching'));
+ _('Bank Account Receipts Matching'),
+ _('Journal Entry'));
$MenuItems['GL']['Transactions']['URL'] = array('/Payments.php?NewPayment=Yes',
'/CustomerReceipt.php?NewReceipt=Yes&Type=GL',
'/ImportBankTrans.php',
- '/GLJournal.php?NewJournal=Yes',
'/BankMatching.php?Type=Payments',
- '/BankMatching.php?Type=Receipts');
+ '/BankMatching.php?Type=Receipts',
+ '/GLJournal.php?NewJournal=Yes');
$MenuItems['GL']['Reports']['Caption'] = array( _('Trial Balance'),
_('Account Inquiry'),
|
|
From: <rc...@us...> - 2013-10-30 18:10:53
|
Revision: 6378
http://sourceforge.net/p/web-erp/reponame/6378
Author: rchacon
Date: 2013-10-30 18:10:51 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
Allow translation for the button "Order some". Standardized to "Insert New Item". Some Spanish translation improvements.
Modified Paths:
--------------
trunk/PO_Items.php
trunk/SelectProduct.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2013-10-30 16:11:22 UTC (rev 6377)
+++ trunk/PO_Items.php 2013-10-30 18:10:51 UTC (rev 6378)
@@ -1140,7 +1140,7 @@
<td><input type="text" name="StockCode" size="15" maxlength="18" value="' . $_POST['StockCode'] . '" /></td>
</tr>
<tr><td></td>
- <td><b>' . _('OR') . ' </b><a target="_blank" href="'.$RootPath.'/Stocks.php">' . _('Create a New Stock Item') . '</a></td></tr>
+ <td><b>' . _('OR') . ' </b><a target="_blank" href="'.$RootPath.'/Stocks.php">' . _('Insert New Item') . '</a></td></tr>
</table>
<br />
@@ -1218,7 +1218,7 @@
#end of while loop
echo '</table>';
echo '<input type="hidden" name="PO_ItemsResubmitFormValue" value="' . $_SESSION['PO_ItemsResubmitForm' . $identifier] . '" />';
- echo '<a name="end"></a><br /><div class="centre"><input type="submit" name="NewItem" value="Order some" /></div>';
+ echo '<a name="end"></a><br /><div class="centre"><input type="submit" name="NewItem" value="' . _('Order some') . '" /></div>';
}#end if SearchResults to show
echo '</div>
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2013-10-30 16:11:22 UTC (rev 6377)
+++ trunk/SelectProduct.php 2013-10-30 18:10:51 UTC (rev 6378)
@@ -481,7 +481,7 @@
} /* end of ($Its_A_Kitset_Assembly_Or_Dummy == False) */
echo '</td><td valign="top" class="select">';
/* Stock Maintenance Options */
-echo '<a href="' . $RootPath . '/Stocks.php?">' . _('Add Inventory Items') . '</a><br />';
+echo '<a href="' . $RootPath . '/Stocks.php?">' . _('Insert New Item') . '</a><br />';
echo '<a href="' . $RootPath . '/Stocks.php?StockID=' . $StockID . '">' . _('Modify Item Details') . '</a><br />';
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
echo '<a href="' . $RootPath . '/StockReorderLevel.php?StockID=' . $StockID . '">' . _('Maintain Reorder Levels') . '</a><br />';
@@ -516,7 +516,7 @@
/* Stock Transactions */
echo '</td><td class="select">';
/*Stock Maintenance Options */
- echo '<a href="' . $RootPath . '/Stocks.php?">' . _('Add Inventory Items') . '</a><br />';
+ echo '<a href="' . $RootPath . '/Stocks.php?">' . _('Insert New Item') . '</a><br />';
echo '</td></tr></table>';
} // end displaying item options if there is one and only one record
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
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 2013-10-30 16:11:22 UTC (rev 6377)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-10-30 18:10:51 UTC (rev 6378)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-09-06 21:34+1200\n"
-"PO-Revision-Date: 2013-10-26 11:53-0600\n"
+"PO-Revision-Date: 2013-10-30 11:57-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -2574,7 +2574,7 @@
#: SupplierTenderCreate.php:606 SupplierTenderCreate.php:712
#: SupplierTenders.php:445 WorkOrderEntry.php:638 WorkOrderIssue.php:690
msgid "Search Now"
-msgstr "Buscar Ahora"
+msgstr "Buscar ahora"
#: BOMInquiry.php:47 BOMs.php:805 ContractBOM.php:52 MRPDemands.php:56
#: MRPReport.php:578 PO_Items.php:855 PO_SelectOSPurchOrder.php:65
@@ -4941,7 +4941,7 @@
#: ContractBOM.php:299 PO_Items.php:1103
msgid "Search For Stock Items"
-msgstr "Buscar Artículos de Existencias"
+msgstr "Buscar artículos de inventario"
#: ContractBOM.php:327 PO_Items.php:1130 SelectCompletedOrder.php:529
#: SelectCreditItems.php:1002
@@ -4968,7 +4968,7 @@
#: ContractBOM.php:337 PO_Items.php:1141
msgid "Create a New Stock Item"
-msgstr "Crear un Nuevo Artículo de Existencias"
+msgstr "Crear un nuevo artículo de inventario"
#: ContractBOM.php:356 FixedAssetItems.php:503 Stocks.php:1020
#: SupplierTenderCreate.php:850 SupplierTenders.php:689
@@ -30588,7 +30588,7 @@
#: Stocks.php:1382
msgid "Insert New Item"
-msgstr "Agregar Nuevo Artículo"
+msgstr "Agregar nuevo artículo"
#: Stocks.php:1383 Stocks.php:1390 ../webSHOP/includes/Functions.php:127
#: ../webSHOP/includes/ShowSalesCategoriesMenu.php:15
@@ -47946,9 +47946,8 @@
msgstr ""
#: ../webSHOP/index.php:131
-#, fuzzy
msgid "Searching for:"
-msgstr "Buscar Ahora"
+msgstr "Buscando:"
#: ../webSHOP/index.php:138
#, fuzzy
|
|
From: <rc...@us...> - 2013-11-01 21:56:34
|
Revision: 6379
http://sourceforge.net/p/web-erp/reponame/6379
Author: rchacon
Date: 2013-11-01 21:56:30 +0000 (Fri, 01 Nov 2013)
Log Message:
-----------
Allow translate the name of the currency on CustomerReceipt.php and Payments.php.
Modified Paths:
--------------
trunk/CustomerReceipt.php
trunk/Payments.php
trunk/doc/Change.log
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2013-10-30 18:10:51 UTC (rev 6378)
+++ trunk/CustomerReceipt.php 2013-11-01 21:56:30 UTC (rev 6379)
@@ -813,11 +813,12 @@
prnMsg(_('No currencies are defined yet') . '. ' . _('Receipts cannot be entered until a currency is defined'),'warn');
} else {
+ include($PathPrefix . 'includes/CurrenciesArray.php'); // To get the currency name.
while ($myrow=DB_fetch_array($result)){
if ($_SESSION['ReceiptBatch']->Currency==$myrow['currabrev']){
- echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
+ echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . _($CurrenciesArray[$myrow['currabrev']]['Currency']) . '</option>';
} else {
- echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
+ echo '<option value="' . $myrow['currabrev'] . '">' . _($CurrenciesArray[$myrow['currabrev']]['Currency']) . '</option>';
}
}
echo '</select></td>
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2013-10-30 18:10:51 UTC (rev 6378)
+++ trunk/Payments.php 2013-11-01 21:56:30 UTC (rev 6379)
@@ -164,7 +164,7 @@
if (isset($_POST['Currency']) AND $_POST['Currency']!=''){
/* Payment currency is the currency that is being paid */
- $_SESSION['PaymentDetail' . $identifier]->Currency=$_POST['Currency']; //payment currency
+ $_SESSION['PaymentDetail' . $identifier]->Currency=$_POST['Currency']; // Payment currency
if ($_SESSION['PaymentDetail' . $identifier]->AccountCurrency==$_SESSION['CompanyRecord']['currencydefault']){
@@ -803,7 +803,7 @@
echo '<tr>
<td>' . _('Date Paid') . ':</td>
- <td><input type="text" name="DatePaid" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" required="required" maxlength="10" size="11" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_SESSION['PaymentDetail' . $identifier]->DatePaid . '" /></td>
+ <td><input type="text" name="DatePaid" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" required="required" maxlength="10" size="10" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_SESSION['PaymentDetail' . $identifier]->DatePaid . '" /></td>
</tr>';
@@ -819,11 +819,12 @@
</tr>';
prnMsg( _('No currencies are defined yet. Payments cannot be entered until a currency is defined'),'error');
} else {
+ include($PathPrefix . 'includes/CurrenciesArray.php'); // To get the currency name.
while ($myrow=DB_fetch_array($result)){
if ($_SESSION['PaymentDetail' . $identifier]->Currency==$myrow['currabrev']){
- echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
+ echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . _($CurrenciesArray[$myrow['currabrev']]['Currency']) . '</option>';
} else {
- echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
+ echo '<option value="' . $myrow['currabrev'] . '">' . _($CurrenciesArray[$myrow['currabrev']]['Currency']) . '</option>';
}
}
echo '</select></td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-10-30 18:10:51 UTC (rev 6378)
+++ trunk/doc/Change.log 2013-11-01 21:56:30 UTC (rev 6379)
@@ -1,4 +1,5 @@
webERP Change Log
+30/10/2013 rchacon: Allow translate the name of the currency on CustomerReceipt.php and Payments.php.
30/10/2013 rchacon: Allow insert different data on banktrans.ref and gltrans.narrative for the bank account on CustomerReceipt.php. Match the page_title_text with the MainMenuLinksArray option for Bank Account Payments Entry and Bank Account Receipts Entry. Regroup the General Ledger Transactions menu.
30/10/2013 Exson: Add required attribute for Z_MakeNewCompany.php to avoid file void error and make it more user friendly.
30/10/2013: Exson modify the locstock table change the bin to NULL to avoid stick sql standard constraint failed for those items without bin.
|
|
From: <rc...@us...> - 2013-11-02 05:07:20
|
Revision: 6380
http://sourceforge.net/p/web-erp/reponame/6380
Author: rchacon
Date: 2013-11-02 05:07:18 +0000 (Sat, 02 Nov 2013)
Log Message:
-----------
Allow translate the name of the currency on Currencies.php. Minor translations.
Modified Paths:
--------------
trunk/Currencies.php
trunk/doc/Change.log
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2013-11-01 21:56:30 UTC (rev 6379)
+++ trunk/Currencies.php 2013-11-02 05:07:18 UTC (rev 6380)
@@ -8,7 +8,6 @@
$BookMark = 'Currencies';
include('includes/header.inc');
include('includes/CurrenciesArray.php');
-
include('includes/SQL_CommonFunctions.inc');
if (isset($_GET['SelectedCurrency'])){
@@ -351,7 +350,7 @@
</tr>',
$ImageFile,
$myrow['currabrev'],
- _($myrow['currency']),
+ _($CurrenciesArray[$myrow['currabrev']]['Currency']), // To get the currency name from the Currencies Array.
$myrow['country'],
$myrow['hundredsname'],
locale_number_format($myrow['decimalplaces'],0),
@@ -379,7 +378,7 @@
</tr>',
$ImageFile,
$myrow['currabrev'],
- _($myrow['currency']),
+ _($CurrenciesArray[$myrow['currabrev']]['Currency']), // To get the currency name from the Currencies Array.
$myrow['country'],
$myrow['hundredsname'],
locale_number_format($myrow['decimalplaces'],0),
@@ -518,4 +517,4 @@
} //end if record deleted no point displaying form to add record
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-11-01 21:56:30 UTC (rev 6379)
+++ trunk/doc/Change.log 2013-11-02 05:07:18 UTC (rev 6380)
@@ -1,5 +1,6 @@
webERP Change Log
-30/10/2013 rchacon: Allow translate the name of the currency on CustomerReceipt.php and Payments.php.
+01/11/2013 rchacon: Allow translate the name of the currency on Currencies.php.
+31/10/2013 rchacon: Allow translate the name of the currency on CustomerReceipt.php and Payments.php.
30/10/2013 rchacon: Allow insert different data on banktrans.ref and gltrans.narrative for the bank account on CustomerReceipt.php. Match the page_title_text with the MainMenuLinksArray option for Bank Account Payments Entry and Bank Account Receipts Entry. Regroup the General Ledger Transactions menu.
30/10/2013 Exson: Add required attribute for Z_MakeNewCompany.php to avoid file void error and make it more user friendly.
30/10/2013: Exson modify the locstock table change the bin to NULL to avoid stick sql standard constraint failed for those items without bin.
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 2013-11-01 21:56:30 UTC (rev 6379)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-11-02 05:07:18 UTC (rev 6380)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-09-06 21:34+1200\n"
-"PO-Revision-Date: 2013-10-30 11:57-0600\n"
+"PO-Revision-Date: 2013-11-01 22:27-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -24762,7 +24762,7 @@
#: SalesCategories.php:348
msgid "Display in webSHOP?"
-msgstr ""
+msgstr "¿Mostrar en webSHOP?"
#: SalesCategories.php:371
msgid "Submit Information"
@@ -27187,14 +27187,12 @@
msgstr "Porcentaje de rebaja"
#: SellThroughSupport.php:465
-#, fuzzy
msgid "Support Start Date"
-msgstr "Fecha Inicio"
+msgstr "Fecha inicio del soporte"
#: SellThroughSupport.php:469
-#, fuzzy
msgid "Support End Date"
-msgstr "No hay Fecha Final"
+msgstr "Fecha final del soporte"
#: ShipmentCosting.php:6
msgid "Shipment Costing"
@@ -27743,9 +27741,8 @@
msgstr "El código de artículo"
#: ShopParameters.php:203 ShopParameters.php:206
-#, fuzzy
msgid "Test"
-msgstr "Empezar de nuevo"
+msgstr "Prueba"
#: ShopParameters.php:204 ShopParameters.php:207
#, fuzzy
Modified: trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po 2013-11-01 21:56:30 UTC (rev 6379)
+++ trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po 2013-11-02 05:07:18 UTC (rev 6380)
@@ -8,7 +8,7 @@
"Project-Id-Version: 3.13rc0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-09-06 21:34+1200\n"
-"PO-Revision-Date: 2013-08-11 19:08-0600\n"
+"PO-Revision-Date: 2013-11-01 22:48-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: Swedish <LL...@li...>\n"
"Language: sv\n"
@@ -40812,9 +40812,8 @@
msgstr "Område"
#: includes/CurrenciesArray.php:34
-#, fuzzy
msgid "Australian dollar"
-msgstr "Audit Trail"
+msgstr "Australisk dollar"
#: includes/CurrenciesArray.php:37
msgid "Aruban florin"
@@ -40872,7 +40871,7 @@
#: includes/CurrenciesArray.php:76
msgid "Bahamian dollar"
-msgstr ""
+msgstr "Bahamansk dollar"
#: includes/CurrenciesArray.php:79
msgid "Bhutanese ngultrum"
@@ -40887,13 +40886,12 @@
msgstr ""
#: includes/CurrenciesArray.php:88
-#, fuzzy
msgid "Belize dollar"
-msgstr "Storlek"
+msgstr "Belizisk dollar"
#: includes/CurrenciesArray.php:91
msgid "Canadian dollar"
-msgstr ""
+msgstr "Kanadensisk dollar"
#: includes/CurrenciesArray.php:94
#, fuzzy
@@ -40927,16 +40925,15 @@
#: includes/CurrenciesArray.php:115
msgid "Colombian peso"
-msgstr ""
+msgstr "Colombiansk peso"
#: includes/CurrenciesArray.php:118
msgid "Colombian Unidad de Valor Real"
msgstr ""
#: includes/CurrenciesArray.php:121
-#, fuzzy
msgid "Costa Rican colon"
-msgstr "Kostnad krävs"
+msgstr "Costaricansk colon"
#: includes/CurrenciesArray.php:124
msgid "Cuban peso convertible"
@@ -41251,9 +41248,8 @@
msgstr "Netto försäljningsvärde"
#: includes/CurrenciesArray.php:343
-#, fuzzy
msgid "New Zealand dollar"
-msgstr "Nya Depn"
+msgstr "Nyzeeländsk dollar"
#: includes/CurrenciesArray.php:346
msgid "Omani rial"
@@ -41331,7 +41327,7 @@
#: includes/CurrenciesArray.php:397
msgid "Swedish krona"
-msgstr ""
+msgstr "Svensk krona"
#: includes/CurrenciesArray.php:400
#, fuzzy
@@ -41415,12 +41411,11 @@
#: includes/CurrenciesArray.php:457
msgid "Ugandan shilling"
-msgstr ""
+msgstr "Ugandisk shilling"
#: includes/CurrenciesArray.php:460
-#, fuzzy
msgid "United States dollar"
-msgstr "Organisationsenhet"
+msgstr "Amerikansk dollar"
#: includes/CurrenciesArray.php:463
msgid "United States dollar next day (funds code)"
@@ -42083,7 +42078,7 @@
#: includes/LanguagesArray.php:129
msgid "Swedish"
-msgstr ""
+msgstr "Svenska"
#: includes/LanguagesArray.php:134
msgid "Kiswahili"
|
|
From: <rc...@us...> - 2013-11-03 00:26:39
|
Revision: 6381
http://sourceforge.net/p/web-erp/reponame/6381
Author: rchacon
Date: 2013-11-03 00:26:36 +0000 (Sun, 03 Nov 2013)
Log Message:
-----------
Simplifies translation of the name of the currency (Thanks Phil Daintree). Minor translations improvements.
Modified Paths:
--------------
trunk/Currencies.php
trunk/CustomerReceipt.php
trunk/Payments.php
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2013-11-02 05:07:18 UTC (rev 6380)
+++ trunk/Currencies.php 2013-11-03 00:26:36 UTC (rev 6381)
@@ -350,7 +350,7 @@
</tr>',
$ImageFile,
$myrow['currabrev'],
- _($CurrenciesArray[$myrow['currabrev']]['Currency']), // To get the currency name from the Currencies Array.
+ $CurrenciesArray[$myrow['currabrev']]['Currency'], // To get the currency name from the Currencies Array.
$myrow['country'],
$myrow['hundredsname'],
locale_number_format($myrow['decimalplaces'],0),
@@ -378,7 +378,7 @@
</tr>',
$ImageFile,
$myrow['currabrev'],
- _($CurrenciesArray[$myrow['currabrev']]['Currency']), // To get the currency name from the Currencies Array.
+ $CurrenciesArray[$myrow['currabrev']]['Currency'], // To get the currency name from the Currencies Array.
$myrow['country'],
$myrow['hundredsname'],
locale_number_format($myrow['decimalplaces'],0),
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2013-11-02 05:07:18 UTC (rev 6380)
+++ trunk/CustomerReceipt.php 2013-11-03 00:26:36 UTC (rev 6381)
@@ -816,9 +816,9 @@
include($PathPrefix . 'includes/CurrenciesArray.php'); // To get the currency name.
while ($myrow=DB_fetch_array($result)){
if ($_SESSION['ReceiptBatch']->Currency==$myrow['currabrev']){
- echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . _($CurrenciesArray[$myrow['currabrev']]['Currency']) . '</option>';
+ echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $CurrenciesArray[$myrow['currabrev']]['Currency'] . '</option>';
} else {
- echo '<option value="' . $myrow['currabrev'] . '">' . _($CurrenciesArray[$myrow['currabrev']]['Currency']) . '</option>';
+ echo '<option value="' . $myrow['currabrev'] . '">' . $CurrenciesArray[$myrow['currabrev']]['Currency'] . '</option>';
}
}
echo '</select></td>
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2013-11-02 05:07:18 UTC (rev 6380)
+++ trunk/Payments.php 2013-11-03 00:26:36 UTC (rev 6381)
@@ -822,9 +822,9 @@
include($PathPrefix . 'includes/CurrenciesArray.php'); // To get the currency name.
while ($myrow=DB_fetch_array($result)){
if ($_SESSION['PaymentDetail' . $identifier]->Currency==$myrow['currabrev']){
- echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . _($CurrenciesArray[$myrow['currabrev']]['Currency']) . '</option>';
+ echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $CurrenciesArray[$myrow['currabrev']]['Currency'] . '</option>';
} else {
- echo '<option value="' . $myrow['currabrev'] . '">' . _($CurrenciesArray[$myrow['currabrev']]['Currency']) . '</option>';
+ echo '<option value="' . $myrow['currabrev'] . '">' . $CurrenciesArray[$myrow['currabrev']]['Currency'] . '</option>';
}
}
echo '</select></td>
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 2013-11-02 05:07:18 UTC (rev 6380)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-11-03 00:26:36 UTC (rev 6381)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-09-06 21:34+1200\n"
-"PO-Revision-Date: 2013-11-01 22:27-0600\n"
+"PO-Revision-Date: 2013-11-02 18:01-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -8992,7 +8992,7 @@
#: GLAccountReport.php:269 Payments.php:935 StockAdjustments.php:477
#: SuppTransGLAnalysis.php:168
msgid "Select Tag"
-msgstr "Seleccione centro de costo"
+msgstr "Seleccionar centro de costo"
#: CustomerReceipt.php:1051 GLBudgets.php:52 Payments.php:1017
msgid "No General ledger accounts have been set up yet"
@@ -33904,7 +33904,7 @@
#: SystemParameters.php:432
msgid "Romalpa Clause"
-msgstr "Cláusula Rot (Romalpa)"
+msgstr "Cláusula de reserva de titularidad (cláusula Romalpa)"
#: SystemParameters.php:434
msgid ""
@@ -33971,14 +33971,15 @@
#: SystemParameters.php:467
msgid "Languages to Maintain Translations for Item Descriptions"
-msgstr ""
+msgstr "Idiomas para tener traducciones de las descripciones de artículos"
#: SystemParameters.php:478
-#, fuzzy
msgid ""
"Select all the languages for which item description translations are to be "
"maintained."
-msgstr "Introduzca la fecha en que las transacciones se deben listar"
+msgstr ""
+"Seleccionar todos los idiomas en los cuales se mantendrán las descripciones "
+"de artículos."
#: SystemParameters.php:484
msgid "A picking note must be produced before an order can be delivered"
@@ -34033,7 +34034,7 @@
#: SystemParameters.php:511
msgid "Laser Printed"
-msgstr "Imprimir en una Láser"
+msgstr "Imprimir en una láser"
#: SystemParameters.php:512
msgid "Special Stationery"
@@ -34045,7 +34046,7 @@
#: SystemParameters.php:518
msgid "Invoice Orientation"
-msgstr "Orientación de la Factura"
+msgstr "Orientación de la factura"
#: SystemParameters.php:523
msgid "Select the invoice layout"
@@ -34059,11 +34060,11 @@
#: SystemParameters.php:529
msgid "Show Company Details"
-msgstr "Mostrar Detalles de la Compañía"
+msgstr "Mostrar detalles de la compañía"
#: SystemParameters.php:530
msgid "Hide Company Details"
-msgstr "Ocultar Detalles de la Compañía"
+msgstr "Ocultar detalles de la compañía"
#: SystemParameters.php:532
msgid ""
@@ -34081,15 +34082,15 @@
#: SystemParameters.php:537
msgid "Working Days on a Week"
-msgstr "Días de Trabajo en una Semana"
+msgstr "Días de trabajo en una semana"
#: SystemParameters.php:539 SystemParameters.php:540 SystemParameters.php:541
msgid "working days"
-msgstr "Días de Trabajo"
+msgstr "Días de trabajo"
#: SystemParameters.php:543
msgid "Number of working days on a week"
-msgstr "Número de días laborables en una semana: "
+msgstr "Número de días laborales en una semana"
#: SystemParameters.php:548
msgid "Dispatch Cut-Off Time"
@@ -34136,12 +34137,12 @@
#: SystemParameters.php:575
msgid "Default Price List"
-msgstr "Lista de Precios Predeterminada"
+msgstr "Lista de precios predeterminada"
#: SystemParameters.php:578 SystemParameters.php:594 SystemParameters.php:638
#: SystemParameters.php:657
msgid "Unavailable"
-msgstr "No Disponible"
+msgstr "No disponible"
#: SystemParameters.php:585
msgid ""
@@ -34158,7 +34159,7 @@
#: SystemParameters.php:591
msgid "Default Shipper"
-msgstr "Transportista Predeterminado"
+msgstr "Transportista predeterminado"
#: SystemParameters.php:601
msgid ""
@@ -34170,7 +34171,7 @@
#: SystemParameters.php:604
msgid "Do Freight Calculation"
-msgstr "Calcular Flete"
+msgstr "Calcular flete"
#: SystemParameters.php:609
msgid ""
@@ -34259,7 +34260,7 @@
#: SystemParameters.php:670
msgid "Decimal Places to be used in Standard Cost"
-msgstr "Decimales que se Utilizarán en el Costo Estándar"
+msgstr "Decimales que se usarán en el costo estándar"
#: SystemParameters.php:673
msgid "Number Of Periods Of StockUsage"
|
|
From: <rc...@us...> - 2013-11-03 18:36:21
|
Revision: 6388
http://sourceforge.net/p/web-erp/reponame/6388
Author: rchacon
Date: 2013-11-03 18:36:18 +0000 (Sun, 03 Nov 2013)
Log Message:
-----------
Allow translate the name of the currency on CompanyPreferences.php.
Modified Paths:
--------------
trunk/CompanyPreferences.php
trunk/doc/Change.log
Modified: trunk/CompanyPreferences.php
===================================================================
--- trunk/CompanyPreferences.php 2013-11-03 12:50:45 UTC (rev 6387)
+++ trunk/CompanyPreferences.php 2013-11-03 18:36:18 UTC (rev 6388)
@@ -231,6 +231,7 @@
$result=DB_query("SELECT currabrev, currency FROM currencies",$db);
+include($PathPrefix . 'includes/CurrenciesArray.php'); // To get the currency name.
echo '<tr>
<td>' . _('Home Currency') . ':</td>
@@ -238,9 +239,9 @@
while ($myrow = DB_fetch_array($result)) {
if ($_POST['CurrencyDefault']==$myrow['currabrev']){
- echo '<option selected="selected" value="'. $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
+ echo '<option selected="selected" value="'. $myrow['currabrev'] . '">' . $CurrenciesArray[$myrow['currabrev']]['Currency'] . '</option>';
} else {
- echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency']. '</option>';
+ echo '<option value="' . $myrow['currabrev'] . '">' . $CurrenciesArray[$myrow['currabrev']]['Currency'] . '</option>';
}
} //end while loop
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-11-03 12:50:45 UTC (rev 6387)
+++ trunk/doc/Change.log 2013-11-03 18:36:18 UTC (rev 6388)
@@ -1,5 +1,6 @@
webERP Change Log
+03/11/2013 rchacon: Allow translate the name of the currency on CompanyPreferences.php.
3/11/2013 Exson fixed the bug that discount id for category cannot be set and add an error message when there is no stockid set for the respective category.
03/11/2013 Exson: Fi3/11/2013 Exson: fixed bug by removing pattern and add no-illegal-chars to stockid in StockReorderLevel.php.xed bug in MiscFunctions.js allow '0' input as number.
01/11/2013 rchacon: Allow translate the name of the currency on Currencies.php.
|
|
From: <ice...@us...> - 2013-11-04 03:03:58
|
Revision: 6389
http://sourceforge.net/p/web-erp/reponame/6389
Author: icedlava
Date: 2013-11-04 03:03:55 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
Change insert new clone stock event to transaction as in Stocks.php for new item.
Modified Paths:
--------------
trunk/StockClone.php
trunk/doc/Change.log
Modified: trunk/StockClone.php
===================================================================
--- trunk/StockClone.php 2013-11-03 18:36:18 UTC (rev 6388)
+++ trunk/StockClone.php 2013-11-04 03:03:55 UTC (rev 6389)
@@ -272,6 +272,7 @@
$Errors[$i] = 'DuplicateStockID';
//exit;
} else {
+ DB_Txn_Begin($db);
$sql = "INSERT INTO stockmaster (stockid,
description,
longdescription,
@@ -315,7 +316,7 @@
$ErrMsg = _('The item could not be added because');
$DbgMsg = _('The SQL that was used to add the item failed was');
- $result = DB_query($sql,$db, $ErrMsg, $DbgMsg);
+ $result = DB_query($sql,$db, $ErrMsg, $DbgMsg,'',true);
if (DB_error_no($db) ==0) {
//now insert the language descriptions
$ErrMsg = _('Could not update the language description because');
@@ -364,7 +365,7 @@
$ErrMsg = _('The locations for the item') . ' ' . $_POST['StockID'] . ' ' . _('could not be added because');
$DbgMsg = _('NB Locations records can be added by opening the utility page') . ' <i>Z_MakeStockLocns.php</i> ' . _('The SQL that was used to add the location records that failed was');
$InsResult = DB_query($sql,$db,$ErrMsg,$DbgMsg);
-
+ DB_Txn_Commit($db);
//check for any purchase data
$sql = "SELECT purchdata.supplierno,
suppliers.suppname,
@@ -1101,4 +1102,4 @@
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-11-03 18:36:18 UTC (rev 6388)
+++ trunk/doc/Change.log 2013-11-04 03:03:55 UTC (rev 6389)
@@ -1,14 +1,15 @@
webERP Change Log
+04/11/2013 icedlava: change insert new clone stock event to transaction as in Stocks.php for new item.
03/11/2013 rchacon: Allow translate the name of the currency on CompanyPreferences.php.
3/11/2013 Exson fixed the bug that discount id for category cannot be set and add an error message when there is no stockid set for the respective category.
-03/11/2013 Exson: Fi3/11/2013 Exson: fixed bug by removing pattern and add no-illegal-chars to stockid in StockReorderLevel.php.xed bug in MiscFunctions.js allow '0' input as number.
+03/11/2013 Exson: Fi3/11/2013 Exson: fixed bug by removing pattern and add no-illegal-chars to stockid in StockReorderLevel.php.xed bug in MiscFunctions.js allow '0' input as number.
01/11/2013 rchacon: Allow translate the name of the currency on Currencies.php.
31/10/2013 rchacon: Allow translate the name of the currency on CustomerReceipt.php and Payments.php.
30/10/2013 rchacon: Allow insert different data on banktrans.ref and gltrans.narrative for the bank account on CustomerReceipt.php. Match the page_title_text with the MainMenuLinksArray option for Bank Account Payments Entry and Bank Account Receipts Entry. Regroup the General Ledger Transactions menu.
30/10/2013 Exson: Add required attribute for Z_MakeNewCompany.php to avoid file void error and make it more user friendly.
30/10/2013: Exson modify the locstock table change the bin to NULL to avoid stick sql standard constraint failed for those items without bin.
-30/10/2013 Exson: Modify the the insert new stocks event to transaction.
+30/10/2013 Exson: Modify the the insert new stocks event to transaction.
24/10/13 MailingGroupMaintenance.php, minor tag and other formatting corrections.
20/10/13 icedlava: Add StockClone.php script to create a new item with the same properties, image, cost, purchasing and pricing data as the selected item, and allow modification of image and general item details before cloning.
18/10/13 Paul T: ManualSecuritySchema.html, add missing tr tags, reduced doubled-closing td tags to one, and changed & to & for HTML.
|
|
From: <rc...@us...> - 2013-11-06 13:23:28
|
Revision: 6392
http://sourceforge.net/p/web-erp/reponame/6392
Author: rchacon
Date: 2013-11-06 13:23:25 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
Allow multiline printing of salesorderdetails.narrative in quotations.
Modified Paths:
--------------
trunk/PDFQuotation.php
trunk/PDFQuotationPortrait.php
trunk/doc/Change.log
Modified: trunk/PDFQuotation.php
===================================================================
--- trunk/PDFQuotation.php 2013-11-05 01:31:20 UTC (rev 6391)
+++ trunk/PDFQuotation.php 2013-11-06 13:23:25 UTC (rev 6392)
@@ -204,14 +204,19 @@
$LeftOvers = $pdf->addTextWrap(585,$YPos,85,$FontSize,$DisplayTaxClass,'right');
$LeftOvers = $pdf->addTextWrap(650,$YPos,85,$FontSize,$DisplayTaxAmount,'right');
$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90, $YPos, 90, $FontSize, $DisplayTotal,'right');
- if (mb_strlen($myrow2['narrative'])>1){
- $YPos -= ($line_height);
- $LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,870,$FontSize,$myrow2['narrative']);
- if (mb_strlen($LeftOvers) >1){
- $YPos -= 11;
- $LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,870,$FontSize,$LeftOvers);
+
+ // Prints salesorderdetails.narrative
+ $Split = explode("\r\n", wordwrap($myrow2['narrative'], 130, "\r\n"));
+ foreach ($Split as $TextLine) {
+ $YPos -= $line_height; // rchacon's suggestion: $YPos -= $FontSize;
+ if ($YPos < ($Bottom_Margin + $line_height)){ // Begins new page
+ $PageNumber++;
+ include ('includes/PDFQuotationPageHeader.inc');
}
+ $LeftOvers = $pdf->addTextWrap($XPos+1, $YPos, 870, $FontSize, $TextLine);
}
+ $YPos -= $line_height;
+
$QuotationTotal +=$LineTotal;
$QuotationTotalEx +=$SubTot;
$TaxTotal +=$TaxAmount;
Modified: trunk/PDFQuotationPortrait.php
===================================================================
--- trunk/PDFQuotationPortrait.php 2013-11-05 01:31:20 UTC (rev 6391)
+++ trunk/PDFQuotationPortrait.php 2013-11-06 13:23:25 UTC (rev 6392)
@@ -204,14 +204,19 @@
$LeftOvers = $pdf->addTextWrap(330,$YPos,85,$FontSize,$DisplayTaxClass,'right');
$LeftOvers = $pdf->addTextWrap(410,$YPos,85,$FontSize,$DisplayTaxAmount,'center');
$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-90, $YPos, 90, $FontSize, $DisplayTotal,'right');
- if (mb_strlen($myrow2['narrative'])>1){
- $YPos -= 10;
- $LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,750,10,$myrow2['narrative']);
- if (mb_strlen($LeftOvers>1)){
- $YPos -= 10;
- $LeftOvers = $pdf->addTextWrap($XPos+1,$YPos,750,10,$LeftOvers);
+
+ // Prints salesorderdetails.narrative
+ $Split = explode("\r\n", wordwrap($myrow2['narrative'], 130, "\r\n"));
+ foreach ($Split as $TextLine) {
+ $YPos -= $line_height; // rchacon's suggestion: $YPos -= $FontSize;
+ if ($YPos < ($Bottom_Margin + $line_height)){ // Begins new page
+ $PageNumber++;
+ include ('includes/PDFQuotationPageHeader.inc');
}
+ $LeftOvers = $pdf->addTextWrap($XPos+1, $YPos, 750, 10, $TextLine);
}
+ $YPos -= $line_height;
+
$QuotationTotal +=$LineTotal;
$QuotationTotalEx +=$SubTot;
$TaxTotal +=$TaxAmount;
@@ -272,4 +277,4 @@
$pdf->OutputI($_SESSION['DatabaseName'] . '_Quotation_' . date('Y-m-d') . '.pdf');
$pdf->__destruct();
}
-?>
\ No newline at end of file
+?>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-11-05 01:31:20 UTC (rev 6391)
+++ trunk/doc/Change.log 2013-11-06 13:23:25 UTC (rev 6392)
@@ -1,4 +1,5 @@
webERP Change Log
+06/11/2013 rchacon: Allow multiline printing of salesorderdetails.narrative in Quotations.
5/11/2013 Phil: Fixed the warning error in GLAccountInquiry.php add change variable type to array to make min() and max() reasonable. Reported by Jo
04/11/2013 icedlava: change insert new clone stock event to transaction as in Stocks.php for new item.
03/11/2013 rchacon: Allow translate the name of the currency on CompanyPreferences.php.
|
|
From: <dai...@us...> - 2013-11-07 07:41:32
|
Revision: 6394
http://sourceforge.net/p/web-erp/reponame/6394
Author: daintree
Date: 2013-11-07 07:41:29 +0000 (Thu, 07 Nov 2013)
Log Message:
-----------
not sure there is anything here
Modified Paths:
--------------
trunk/Locations.php
trunk/PO_Header.php
Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php 2013-11-07 00:54:12 UTC (rev 6393)
+++ trunk/Locations.php 2013-11-07 07:41:29 UTC (rev 6394)
@@ -7,6 +7,7 @@
$Title = _('Location Maintenance');
include('includes/header.inc');
+include('includes/CountriesArray.php');
if (isset($_GET['SelectedLocation'])){
$SelectedLocation = $_GET['SelectedLocation'];
@@ -552,36 +553,46 @@
<td><input type="text" name="Contact" required="required" value="' . $_POST['Contact'] . '" title="' . _('Enter the name of the responsible person to contact for this inventory location') . '" size="31" maxlength="30" /></td>
</tr>
<tr>
- <td>' . _('Delivery Address 1') . ':' . '</td>
+ <td>' . _('Delivery Address 1 (Building)') . ':' . '</td>
<td><input type="text" name="DelAdd1" value="' . $_POST['DelAdd1'] . '" size="41" maxlength="40" /></td>
</tr>
<tr>
- <td>' . _('Delivery Address 2') . ':' . '</td>
+ <td>' . _('Delivery Address 2 (Street)') . ':' . '</td>
<td><input type="text" name="DelAdd2" value="' . $_POST['DelAdd2'] . '" size="41" maxlength="40" /></td>
</tr>
<tr>
- <td>' . _('Delivery Address 3') . ':' . '</td>
+ <td>' . _('Delivery Address 3 (Suburb)') . ':' . '</td>
<td><input type="text" name="DelAdd3" value="' . $_POST['DelAdd3'] . '" size="41" maxlength="40" /></td>
</tr>
<tr>
- <td>' . _('Delivery Address 4') . ':' . '</td>
+ <td>' . _('Delivery Address 4 (City)') . ':' . '</td>
<td><input type="text" name="DelAdd4" value="' . $_POST['DelAdd4'] . '" size="41" maxlength="40" /></td>
</tr>
<tr>
- <td>' . _('Delivery Address 5') . ':' . '</td>
+ <td>' . _('Delivery Address 5 (Zip Code)') . ':' . '</td>
<td><input type="text" name="DelAdd5" value="' . $_POST['DelAdd5'] . '" size="21" maxlength="20" /></td>
</tr>
<tr>
- <td>' . _('Delivery Address 6') . ':' . '</td>
- <td><input type="text" name="DelAdd6" value="' . $_POST['DelAdd6'] . '" size="16" maxlength="15" /></td>
+ <td>' . _('Country') . ':</td>
+ <td><select name="DelAdd6">';
+ foreach ($CountriesArray as $CountryEntry => $CountryName){
+ if (isset($_POST['DelAdd6']) AND (strtoupper($_POST['DelAdd6']) == strtoupper($CountryName))){
+ echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
+ }elseif (!isset($_POST['Address6']) AND $CountryName == "") {
+ echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName . '</option>';
+ } else {
+ echo '<option value="' . $CountryName . '">' . $CountryName . '</option>';
+ }
+ }
+ echo '</select></td>
</tr>
<tr>
<td>' . _('Telephone No') . ':' . '</td>
- <td><input type="tel" name="Tel" pattern="[0-9\+\s\(\)]*" value="' . $_POST['Tel'] . '" size="31" maxlength="30" title="' . _('The phone number should consist of numbers, spaces, parentheses, or the + character') . '" /></td>
+ <td><input type="tel" name="Tel" pattern="[0-9+\-\s()]*" value="' . $_POST['Tel'] . '" size="31" maxlength="30" title="' . _('The phone number should consist of numbers, spaces, parentheses, or the + character') . '" /></td>
</tr>
<tr>
<td>' . _('Facsimile No') . ':' . '</td>
- <td><input type="tel" name="Fax" pattern="[0-9\+\s\(\)]*" value="' . $_POST['Fax'] . '" size="31" maxlength="30" title="' . _('The fax number should consist of numbers, parentheses, spaces or the + character') . '"/></td>
+ <td><input type="tel" name="Fax" pattern="[0-9+\-\s()]*" value="' . $_POST['Fax'] . '" size="31" maxlength="30" title="' . _('The fax number should consist of numbers, parentheses, spaces or the + character') . '"/></td>
</tr>
<tr>
<td>' . _('Email') . ':' . '</td>
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2013-11-07 00:54:12 UTC (rev 6393)
+++ trunk/PO_Header.php 2013-11-07 07:41:29 UTC (rev 6394)
@@ -1015,7 +1015,7 @@
</tr>
<tr>
<td>' . _('Phone') . ':</td>
- <td><input type="tel" name="Tel" pattern="[0-9+()\-\s]*" size="31" maxlength="30" value="' . $_SESSION['PO' . $identifier]->Tel . '" /></td>
+ <td><input type="tel" name="Tel" pattern="[0-9+\-\s()]*" size="31" maxlength="30" value="' . $_SESSION['PO' . $identifier]->Tel . '" /></td>
</tr>
<tr>
<td>' . _('Delivery By') . ':</td>
@@ -1100,7 +1100,7 @@
</tr>
<tr>
<td>' . _('Phone') . ':</td>
- <td><input type="tel" name="SuppTel" pattern="[0-9+\-\s]*" size="31" maxlength="30" value="' . $_SESSION['PO' . $identifier]->SuppTel . '" /></td>
+ <td><input type="tel" name="SuppTel" pattern="[0-9+\-\s()]*" size="31" maxlength="30" value="' . $_SESSION['PO' . $identifier]->SuppTel . '" /></td>
</tr>';
$result = DB_query("SELECT terms, termsindicator FROM paymentterms", $db);
|
|
From: <rc...@us...> - 2013-11-07 22:51:09
|
Revision: 6399
http://sourceforge.net/p/web-erp/reponame/6399
Author: rchacon
Date: 2013-11-07 22:51:06 +0000 (Thu, 07 Nov 2013)
Log Message:
-----------
Allow translation of the key name in FormDesigner.php.
Modified Paths:
--------------
trunk/FormDesigner.php
trunk/doc/Change.log
Modified: trunk/FormDesigner.php
===================================================================
--- trunk/FormDesigner.php 2013-11-07 11:16:56 UTC (rev 6398)
+++ trunk/FormDesigner.php 2013-11-07 22:51:06 UTC (rev 6399)
@@ -189,7 +189,7 @@
foreach ($FormDesign as $key) {
switch ($key['type']) {
case 'image':
- echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="8">' . $key['name'] . '</th></tr>';
+ echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="8">' . _($key['name']) . '</th></tr>';
echo '<tr>';
echo '<td class="number">' . _('x').' = ' . '</td><td><input type="text" class="number" name="'.$key['id'].'x" size="4" maxlength="4" value="'.$key->x.'" /></td>';
echo '<td class="number">' . _('y').' = ' . '</td><td><input type="text" class="number" name="'.$key['id'].'y" size="4" maxlength="4" value="'.$key->y.'" /></td>';
@@ -200,7 +200,7 @@
$counter=$counter+1;
break;
case 'SimpleText':
- echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">' . $key['name'] . '</th></tr>' . "\n";
+ echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">' . _($key['name']) . '</th></tr>' . "\n";
echo '<tr>';
SimpleTextLine($key);
echo '</tr>';
@@ -208,7 +208,7 @@
$counter=$counter+1;
break;
case 'MultiLineText':
- echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="4">' . $key['name'] . '</th></tr>' . "\n";
+ echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="4">' . _($key['name']) . '</th></tr>' . "\n";
echo '<tr>';
MultiTextLine($key);
echo '</tr>';
@@ -216,7 +216,7 @@
$counter=$counter+1;
break;
case 'ElementArray':
- echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="7">' . $key['name'] . '</th></tr>' . "\n";
+ echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="7">' . _($key['name']) . '</th></tr>' . "\n";
foreach ($key as $subkey) {
if ($subkey['type']=='SimpleText') {
echo '<tr>';
@@ -243,7 +243,7 @@
$counter=$counter+1;
break;
case 'CurvedRectangle':
- echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">' . $key['name'] . '</th></tr>';
+ echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">' . _($key['name']) . '</th></tr>';
echo '<tr>';
echo '<td class="number">' . _('x').' = ' . '</td><td><input type="text" class="number" name="'.$key['id'].'x" size="4" maxlength="4" value="'.$key->x.'" /></td>';
echo '<td class="number">' . _('y').' = ' . '</td><td><input type="text" class="number" name="'.$key['id'].'y" size="4" maxlength="4" value="'.$key->y.'" /></td>';
@@ -255,7 +255,7 @@
$counter=$counter+1;
break;
case 'Rectangle':
- echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">' . $key['name'] . '</th></tr>';
+ echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">' . _($key['name']) . '</th></tr>';
echo '<tr>';
echo '<td class="number">' . _('x').' = ' . '</td><td><input type="text" class="number" name="'.$key['id'].'x" size="4" maxlength="4" value="'.$key->x.'" /></td>';
echo '<td class="number">' . _('y').' = ' . '</td><td><input type="text" class="number" name="'.$key['id'].'y" size="4" maxlength="4" value="'.$key->y.'" /></td></tr><tr>';
@@ -266,7 +266,7 @@
$counter=$counter+1;
break;
case 'Line':
- echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">' . $key['name'] . '</th></tr>';
+ echo '<td colspan="1" valign="top"><table width="100%" border="1"><tr><th colspan="6">' . _($key['name']) . '</th></tr>';
echo '<tr>';
echo '<td class="number">' . _('Start x co-ordinate').' = ' . '</td><td><input type="text" class="number" name="'.$key['id'].'startx" size="4" maxlength="4" value="'.$key->startx.'" /></td>';
echo '<td class="number">' . _('Start y co-ordinate').' = ' . '</td><td><input type="text" class="number" name="'.$key['id'].'starty" size="4" maxlength="4" value="'.$key->starty.'" /></td></tr><tr>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-11-07 11:16:56 UTC (rev 6398)
+++ trunk/doc/Change.log 2013-11-07 22:51:06 UTC (rev 6399)
@@ -1,7 +1,8 @@
webERP Change Log
+07/11/2013 rchacon: Allow translation of the key name in FormDesigner.php.
7/11/2013 Exson: Add check box to allow user to decide weather raw material is sellable or not.
7/11/2013 Exson Revise the bin definition to NOT NULL DEFAULT '' as suggest by Tim to make it more ISO compatible.
-06/11/2013 rchacon: Allow multiline printing of salesorderdetails.narrative in Quotations.
+06/11/2013 rchacon: Allow multiline printing of salesorderdetails.narrative in quotations.
5/11/2013 Phil: Fixed the warning error in GLAccountInquiry.php add change variable type to array to make min() and max() reasonable. Reported by Jo
04/11/2013 icedlava: change insert new clone stock event to transaction as in Stocks.php for new item.
03/11/2013 rchacon: Allow translate the name of the currency on CompanyPreferences.php.
|
|
From: <rc...@us...> - 2013-11-13 02:10:45
|
Revision: 6400
http://sourceforge.net/p/web-erp/reponame/6400
Author: rchacon
Date: 2013-11-13 02:10:42 +0000 (Wed, 13 Nov 2013)
Log Message:
-----------
Allow translation of the subkey name in FormDesigner.php.
Modified Paths:
--------------
trunk/FormDesigner.php
trunk/doc/Change.log
Modified: trunk/FormDesigner.php
===================================================================
--- trunk/FormDesigner.php 2013-11-07 22:51:06 UTC (rev 6399)
+++ trunk/FormDesigner.php 2013-11-13 02:10:42 UTC (rev 6400)
@@ -220,18 +220,18 @@
foreach ($key as $subkey) {
if ($subkey['type']=='SimpleText') {
echo '<tr>';
- echo '<td>' . $subkey['name'] . '</td>';
+ echo '<td>' . _($subkey['name']) . '</td>';
SimpleTextLine($subkey);
echo '</tr>';
} else if ($subkey['type']=='MultiLineText') {
echo '<tr>';
- echo '<td>' . $subkey['name'] . '</td>';
+ echo '<td>' . _($subkey['name']) . '</td>';
MultiTextLine($subkey);
echo '</tr>';
} else {
echo '<tr>';
if ($subkey['type']=='DataText') {
- echo '<td>' . $subkey['name'] . '</td>';
+ echo '<td>' . _($subkey['name']) . '</td>';
DataTextLine($subkey);
} elseif ($subkey['type']=='StartLine') {
echo '<td colspan="3">' . $subkey['name'].' = ' . '</td><td><input type="text" class="number" name="StartLine" size="4" maxlength="4" value="'.$key->y.'" /></td>';
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-11-07 22:51:06 UTC (rev 6399)
+++ trunk/doc/Change.log 2013-11-13 02:10:42 UTC (rev 6400)
@@ -1,4 +1,5 @@
webERP Change Log
+12/11/2013 rchacon: Allow translation of the subkey name in FormDesigner.php.
07/11/2013 rchacon: Allow translation of the key name in FormDesigner.php.
7/11/2013 Exson: Add check box to allow user to decide weather raw material is sellable or not.
7/11/2013 Exson Revise the bin definition to NOT NULL DEFAULT '' as suggest by Tim to make it more ISO compatible.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X