Menu
▾
▴
web-erp-svn
|
From: <dai...@us...> - 2013-04-27 22:07:58
|
Revision: 5856
http://sourceforge.net/p/web-erp/reponame/5856
Author: daintree
Date: 2013-04-27 22:07:54 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
Samudaya - PO_Items.php bug on deletion then readd to order
Modified Paths:
--------------
trunk/PO_Items.php
trunk/doc/Change.log
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2013-04-27 18:09:51 UTC (rev 5855)
+++ trunk/PO_Items.php 2013-04-27 22:07:54 UTC (rev 5856)
@@ -43,7 +43,7 @@
if (!is_numeric(filter_number_format($_POST['SuppQty'.$POLine->LineNo]))){
prnMsg(_('The quantity in the supplier units is expected to be numeric. Please re-enter as a number'),'error');
} else { //ok to update the PO object variables
- $_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Quantity = filter_number_format(round(filter_number_format($_POST['SuppQty'.$POLine->LineNo])*filter_number_format($_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor),$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->DecimalPlaces));
+ $_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->Quantity = round(filter_number_format($_POST['SuppQty'.$POLine->LineNo])*$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->ConversionFactor,$_SESSION['PO'.$identifier]->LineItems[$POLine->LineNo]->DecimalPlaces);
}
if (!is_numeric(filter_number_format($_POST['SuppPrice'.$POLine->LineNo]))){
prnMsg(_('The supplier price is expected to be numeric. Please re-enter as a number'),'error');
@@ -399,8 +399,7 @@
if(isset($_GET['Delete'])){
if($_SESSION['PO'.$identifier]->Some_Already_Received($_GET['Delete'])==0){
- $_SESSION['PO'.$identifier]->LineItems[$_GET['Delete']]->Deleted=True;
- $_SESSION['PO'.$identifier]->LinesOnOrder --;
+ $_SESSION['PO'.$identifier]->remove_from_order($_GET['Delete']);
include ('includes/PO_UnsetFormVbls.php');
} else {
prnMsg( _('This item cannot be deleted because some of it has already been received'),'warn');
@@ -1178,7 +1177,7 @@
if (DB_num_rows($PurchDataResult)>0) {
$PurchDataRow = DB_fetch_array($PurchDataResult);
$OrderUnits=$PurchDataRow['suppliersuom'];
- $ConversionFactor =$PurchDataRow['conversionfactor'];
+ $ConversionFactor = locale_number_format($PurchDataRow['conversionfactor'],'Variable');
} else {
$OrderUnits=$myrow['units'];
$ConversionFactor =1;
@@ -1205,4 +1204,4 @@
echo '</div>
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-04-27 18:09:51 UTC (rev 5855)
+++ trunk/doc/Change.log 2013-04-27 22:07:54 UTC (rev 5856)
@@ -1,5 +1,9 @@
OwebERP Change Log
-26/04/2013: Exson Fix the image broken problem for Manual/ManualGettingStarted.html Chinese version
+
+27/4/13 Samudaya: Fixed a bug in PO_Items.php when a line of a purchase order is deleted (other than the last line) and then subsequently a new line is added - the last line of the order is over-written.
+27/4/13 Samudaya: PO_Items.php When purchasing a non-stock item (asset), AssetID goes to wrong column in purchorderdetails table (Column name - suppliers_partno). Fixed the bug and now save the AssetID in the correct assetid column.
+27/4/13 Samudaya: Fixed the Page Navigation (Go, Previous, Next) problem. This problem occurs there are many assets and display as several pages.
+26/04/2013 Exson: Fix the image broken problem for Manual/ManualGettingStarted.html Chinese version
25/4/13 Tim: Selecting customer in Contracts form was not working - fixed
25/4/13 Bob Thomas: WorkOrderIssue.php was not showing the serialised items with a quantity that could be issued was showing them all in error
25/4/13 Phil: BOMs.php fixed error that allowed auto issue to be flagged on serialised items
|
|
From: <dai...@us...> - 2013-04-27 22:19:03
|
Revision: 5857
http://sourceforge.net/p/web-erp/reponame/5857
Author: daintree
Date: 2013-04-27 22:19:01 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
Samudaya - PO_Items.php bug on deletion then readd to order
Modified Paths:
--------------
trunk/Z_CurrencySuppliersBalances.php
trunk/includes/DefinePOClass.php
Modified: trunk/Z_CurrencySuppliersBalances.php
===================================================================
--- trunk/Z_CurrencySuppliersBalances.php 2013-04-27 22:07:54 UTC (rev 5856)
+++ trunk/Z_CurrencySuppliersBalances.php 2013-04-27 22:19:01 UTC (rev 5857)
@@ -2,7 +2,7 @@
/* $Id$*/
include('includes/session.inc');
-$Title=_('Currency Debtor Balances');
+$Title=_('Currency Supplier Balances');
include('includes/header.inc');
echo '<div class="centre"><h3>' . _('Suppliers Balances By Currency Totals') . '</h3></div>';
Modified: trunk/includes/DefinePOClass.php
===================================================================
--- trunk/includes/DefinePOClass.php 2013-04-27 22:07:54 UTC (rev 5856)
+++ trunk/includes/DefinePOClass.php 2013-04-27 22:19:01 UTC (rev 5857)
@@ -138,7 +138,6 @@
function remove_from_order(&$LineNo){
$this->LineItems[$LineNo]->Deleted = True;
- $this->LinesOnOrder--;
}
|
|
From: <dai...@us...> - 2013-05-01 08:19:37
|
Revision: 5873
http://sourceforge.net/p/web-erp/reponame/5873
Author: daintree
Date: 2013-05-01 08:19:32 +0000 (Wed, 01 May 2013)
Log Message:
-----------
Ricards string GLAccount.php remove numeric trap - fix PO line lead time calculation
Modified Paths:
--------------
trunk/GLAccounts.php
trunk/PO_Items.php
trunk/doc/Change.log
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2013-04-30 09:02:29 UTC (rev 5872)
+++ trunk/GLAccounts.php 2013-05-01 08:19:32 UTC (rev 5873)
@@ -28,11 +28,8 @@
//first off validate inputs sensible
- if (!is_long((integer)$_POST['AccountCode'])) {
+ if (mb_strlen($_POST['AccountName']) >50) {
$InputError = 1;
- prnMsg(_('The account code must be an integer'),'warn');
- } elseif (mb_strlen($_POST['AccountName']) >50) {
- $InputError = 1;
prnMsg( _('The account name must be fifty characters or less long'),'warn');
}
@@ -234,7 +231,7 @@
} else {
echo '<table class="selection">';
echo '<tr><td>' . _('Account Code') . ':</td>
- <td><input type="text" name="AccountCode" size="11" class="number" maxlength="20" /></td>
+ <td><input type="text" name="AccountCode" size="30" maxlength="30" /></td>
</tr>';
}
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2013-04-30 09:02:29 UTC (rev 5872)
+++ trunk/PO_Items.php 2013-05-01 08:19:32 UTC (rev 5873)
@@ -234,7 +234,12 @@
} /* end of the loop round the detail line items on the order */
echo '<p />';
prnMsg(_('Purchase Order') . ' ' . $_SESSION['PO'.$identifier]->OrderNo . ' ' . _('on') . ' ' . $_SESSION['PO'.$identifier]->SupplierName . ' ' . _('has been created'),'success');
+ if ($_SESSION['PO'.$identifier]->AllowPrintPO==1
+ AND ($_SESSION['PO'.$identifier]->Status=='Authorised'
+ OR $_SESSION['PO'.$identifier]->Status=='Printed')){
+ echo '<br /><div class="centre"><a target="_blank" href="'.$RootPath.'/PO_PDFPurchOrder.php?OrderNo=' . $_SESSION['PO'.$identifier]->OrderNo . '">' . _('Print Purchase Order') . '</a></div>';
+ }
} else { /*its an existing order need to update the old order info */
/*Check to see if there are any incomplete lines on the order */
@@ -384,8 +389,10 @@
$Result = DB_Txn_Commit($db);
/* Only show the link to auto receive the order if the user has permission to receive goods and permission to authorise and has authorised the order */
- if ($_SESSION['PO'.$identifier]->Status == 'Authorised' AND in_array($_SESSION['PageSecurityArray']['GoodsReceived.php'], $_SESSION['AllowedPageSecurityTokens'])){
- echo '<a href="SupplierInvoice.php?SupplierID=' . $_SESSION['PO'.$identifier]->SupplierID . '&ReceivePO=' . $_SESSION['PO'.$identifier]->OrderNo . '&DeliveryDate=' . $_SESSION['PO'.$identifier]->DeliveryDate . '">' . _('Receive and Enter Purchase Invoice') . '</a>';
+ if ($_SESSION['PO'.$identifier]->Status == 'Authorised'
+ AND in_array($_SESSION['PageSecurityArray']['GoodsReceived.php'], $_SESSION['AllowedPageSecurityTokens'])){
+
+ echo '<a href="SupplierInvoice.php?SupplierID=' . $_SESSION['PO'.$identifier]->SupplierID . '&ReceivePO=' . $_SESSION['PO'.$identifier]->OrderNo . '&DeliveryDate=' . $_SESSION['PO'.$identifier]->DeliveryDate . '">' . _('Receive and Enter Purchase Invoice') . '</a>';
}
unset($_SESSION['PO'.$identifier]); /*Clear the PO data to allow a newy to be input*/
@@ -634,10 +641,10 @@
$SuppliersPartNo = $PurchRow['suppliers_partno'];
$LeadTime = $PurchRow['leadtime'];
/* Work out the delivery date based on today + lead time
- * if > header DeliveryDate then set DeliveryDate to today + leadtime
- */
+ * if > header DeliveryDate then set DeliveryDate to today + leadtime
+ */
$DeliveryDate = DateAdd(Date($_SESSION['DefaultDateFormat']),'d',$LeadTime);
- if (! Date1GreaterThanDate2($DeliveryDate,$_SESSION['PO'.$identifier]->DeliveryDate)){
+ if (Date1GreaterThanDate2($_SESSION['PO'.$identifier]->DeliveryDate,$DeliveryDate)){
$DeliveryDate = $_SESSION['PO'.$identifier]->DeliveryDate;
}
} else { // no purchasing data setup
@@ -646,10 +653,10 @@
$SupplierDescription = $ItemRow['description'];
$SuppliersUnitOfMeasure = $ItemRow['units'];
$SuppliersPartNo = '';
- $LeadTime = 1;
+ $LeadTime=1;
$DeliveryDate = $_SESSION['PO'.$identifier]->DeliveryDate;
}
-
+
$_SESSION['PO'.$identifier]->add_to_order ($_SESSION['PO'.$identifier]->LinesOnOrder+1,
$ItemCode,
0, /*Serialised */
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-04-30 09:02:29 UTC (rev 5872)
+++ trunk/doc/Change.log 2013-05-01 08:19:32 UTC (rev 5873)
@@ -1,11 +1,14 @@
OwebERP Change Log
-04/30/2013 Exson Update the translation file for Chinese simplify locale
-04/30/2013 Exson: Fixed the bug in SystemParameters.php which missing a</select> tag and cannot display the config in $_SESSION correctly. Reported by Tim.
-04/30/3013 Exson: Create a new sql file 4.10-4.11.sql with the smtp setting statement.
-04/29/2013 Exson: Modify the PO_PDFPurchOrder.php to make it suitable for smtp setting.
-29/04/2013 Exson Fixed the smtp does not work for langaguage is change in utf8 code in file of smtp.php and HTMLMimeMail.php.
-29/04/2013 Exson Fixed the db_free_result() error messages due to the query returned a boolean value in SMTPServer.php
+1/5/13 Ricard: GLAccounts.php change error trap that only allows numeric GL accounts as now the chart of accounts can contain text accounts
+1/5/13 Phil: Fix purchase order lead time calculation as reported by MacPhotoBiker on forum
+1/5/13 Phil: Add link to print purchase order after placement as suggested by MacPhotoBiker on forum
+30/4/13 Exson Update the translation file for Chinese simplify locale
+30/4/13 Exson: Fixed the bug in SystemParameters.php which missing a</select> tag and cannot display the config in $_SESSION correctly. Reported by Tim.
+30/4/13 Exson: Create a new sql file 4.10-4.11.sql with the smtp setting statement.
+29/4/13 Exson: Modify the PO_PDFPurchOrder.php to make it suitable for smtp setting.
+29/04/13 Exson Fixed the smtp does not work for langaguage is change in utf8 code in file of smtp.php and HTMLMimeMail.php.
+29/04/13 Exson Fixed the db_free_result() error messages due to the query returned a boolean value in SMTPServer.php
27/4/13 Samudaya: Fixed a bug in PO_Items.php when a line of a purchase order is deleted (other than the last line) and then subsequently a new line is added - the last line of the order is over-written.
27/4/13 Samudaya: PO_Items.php When purchasing a non-stock item (asset), AssetID goes to wrong column in purchorderdetails table (Column name - suppliers_partno). Fixed the bug and now save the AssetID in the correct assetid column.
27/4/13 Samudaya: Fixed the Page Navigation (Go, Previous, Next) problem. This problem occurs there are many assets and display as several pages.
|
|
From: <dai...@us...> - 2013-05-02 10:38:01
|
Revision: 5887
http://sourceforge.net/p/web-erp/reponame/5887
Author: daintree
Date: 2013-05-02 10:37:58 +0000 (Thu, 02 May 2013)
Log Message:
-----------
fix Credit_Invoice.php not selecting location to credit into correctly
Modified Paths:
--------------
trunk/Credit_Invoice.php
trunk/doc/Change.log
trunk/includes/MiscFunctions.php
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2013-05-02 09:40:15 UTC (rev 5886)
+++ trunk/Credit_Invoice.php 2013-05-02 10:37:58 UTC (rev 5887)
@@ -206,7 +206,7 @@
}
-if (isset($_POST['Location']) AND !isset($_POST['ProcessCredit'])){
+if (isset($_POST['Location'])){
$_SESSION['CreditItems' . $identifier]->Location = $_POST['Location'];
$NewDispatchTaxProvResult = DB_query("SELECT taxprovinceid FROM locations WHERE loccode='" . $_POST['Location'] . "'",$db);
@@ -486,7 +486,7 @@
$OKToProcess = true;
-if ((isset($_POST['CreditType']) and$_POST['CreditType']=='WriteOff') AND !isset($_POST['WriteOffGLCode'])){
+if ((isset($_POST['CreditType']) AND $_POST['CreditType']=='WriteOff') AND !isset($_POST['WriteOffGLCode'])){
prnMsg (_('The GL code to write off the credit value to must be specified. Please select the appropriate GL code for the selection box'),'info');
$OKToProcess = false;
}
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-05-02 09:40:15 UTC (rev 5886)
+++ trunk/doc/Change.log 2013-05-02 10:37:58 UTC (rev 5887)
@@ -1,10 +1,12 @@
OwebERP Change Log
-2/5/2013 Exson: Revise the account code to 20 reported by Tim in GLAccounts.php.
-2/5/2013 Exson: Make correction for removing those functions not related with webERP committed last time in MiscFunctions.php. Thanks for Tim's review.
-2/5/2013 Exson: Make smtp available for PDFDeliveryDifferences.php.
-2/5/2013 Exson: Make smtp mail available for PDFDIFOT.php and fixed the bug that the result should be data within acceptable days instead of out of the range.
-02/05/2013 Exson: Make the smtp mail available for PrintCustTransPortrait.php
-02/05/2013 Exson: Add SendmailBySmtp function to MiscFunctions.php and make smtp mail workable for PrintCustTrans.php.
+
+2/5/13 Phil: Credit_Invoice.php was not setting the selected location to credit into as reported by Ricard
+2/5/13 Exson: Revise the account code to 20 reported by Tim in GLAccounts.php.
+2/5/13 Exson: Make correction for removing those functions not related with webERP committed last time in MiscFunctions.php. Thanks for Tim's review.
+2/5/13 Exson: Make smtp available for PDFDeliveryDifferences.php.
+2/5/13 Exson: Make smtp mail available for PDFDIFOT.php and fixed the bug that the result should be data within acceptable days instead of out of the range.
+02/05/13 Exson: Make the smtp mail available for PrintCustTransPortrait.php
+02/05/13 Exson: Add SendmailBySmtp function to MiscFunctions.php and make smtp mail workable for PrintCustTrans.php.
1/5/13 Ricard: GLAccounts.php change error trap that only allows numeric GL accounts as now the chart of accounts can contain text accounts
1/5/13 Phil: Fix purchase order lead time calculation as reported by MacPhotoBiker on forum
1/5/13 Phil: Add link to print purchase order after placement as suggested by MacPhotoBiker on forum
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2013-05-02 09:40:15 UTC (rev 5886)
+++ trunk/includes/MiscFunctions.php 2013-05-02 10:37:58 UTC (rev 5887)
@@ -401,22 +401,22 @@
return $IntegerNumber. $DecimalValue;
}
}
+
function SendMailBySmtp(&$mail,$To) {
- if(strpos('@',$_SESSION['SMTPSettings']['username'])){//user has set the fully mail address as user name
- $mail->setFrom($_SESSION['SMTPSettings']['username']);
- }else{//user only set it's name instead of fully mail address
- if(strpos('smtp',$_SESSION['SMTPSettings']['host'])){
- $HostDomain = substr($_SESSION['SMTPSettings']['host'],4);
- }
- if(!strpos('@',$_SESSION['SMTPSettings']['username'])){
- $SendFrom = $_SESSION['SMTPSettings']['username'].$HostDomain;
- }
- }
- $mail->setFrom($SendFrom);
- $result = $mail->send($To,'smtp');
- return $result;
+ if(IsEmailAddress($_SESSION['SMTPSettings']['username'])){//user has set the fully mail address as user name
+ $SendFrom = $_SESSION['SMTPSettings']['username'];
+ } else {//user only set it's name instead of fully mail address
+ if(strpos('smtp',$_SESSION['SMTPSettings']['host'])){
+ $HostDomain = substr($_SESSION['SMTPSettings']['host'],4);
+ }
+ if(!strpos('@',$_SESSION['SMTPSettings']['username'])){
+ $SendFrom = $_SESSION['SMTPSettings']['username'] . $HostDomain;
+ }
+ }
+ $mail->setFrom($SendFrom);
+ $result = $mail->send($To,'smtp');
+ return $result;
}
-
?>
|
|
From: <dai...@us...> - 2013-05-03 10:18:02
|
Revision: 5890
http://sourceforge.net/p/web-erp/reponame/5890
Author: daintree
Date: 2013-05-03 10:17:59 +0000 (Fri, 03 May 2013)
Log Message:
-----------
Ricard: new script to change GL account codes Z_ChangeGLAccountCode.php and SQL to upgrade to varchar account codes
Modified Paths:
--------------
trunk/doc/Change.log
trunk/sql/mysql/upgrade4.10-4.11.sql
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-05-02 14:57:03 UTC (rev 5889)
+++ trunk/doc/Change.log 2013-05-03 10:17:59 UTC (rev 5890)
@@ -1,4 +1,6 @@
OwebERP Change Log
+
+3/5/13 Ricard: new script to change GL account codes Z_ChangeGLAccountCode.php and SQL to upgrade to varchar account codes
2/5/2013 Exson: Fixed strpos error and make the smtp server name more generic when user not use a email address in function of SendmailBySmtp in MiscFunctions.php.
2/5/13 Phil: Credit_Invoice.php was not setting the selected location to credit into as reported by Ricard
2/5/13 Exson: Revise the account code to 20 reported by Tim in GLAccounts.php.
Modified: trunk/sql/mysql/upgrade4.10-4.11.sql
===================================================================
--- trunk/sql/mysql/upgrade4.10-4.11.sql 2013-05-02 14:57:03 UTC (rev 5889)
+++ trunk/sql/mysql/upgrade4.10-4.11.sql 2013-05-03 10:17:59 UTC (rev 5890)
@@ -1 +1,16 @@
INSERT INTO config VALUES('SmtpSetting',0);
+ALTER TABLE `companies` CHANGE `debtorsact` `debtorsact` VARCHAR( 20 ) NOT NULL DEFAULT '70000',
+CHANGE `pytdiscountact` `pytdiscountact` VARCHAR( 20 ) NOT NULL DEFAULT '55000',
+CHANGE `creditorsact` `creditorsact` VARCHAR( 20 ) NOT NULL DEFAULT '80000',
+CHANGE `payrollact` `payrollact` VARCHAR( 20 ) NOT NULL DEFAULT '84000',
+CHANGE `grnact` `grnact` VARCHAR( 20 ) NOT NULL DEFAULT '72000',
+CHANGE `exchangediffact` `exchangediffact` VARCHAR( 20 ) NOT NULL DEFAULT '65000',
+CHANGE `purchasesexchangediffact` `purchasesexchangediffact` VARCHAR( 20 ) NOT NULL DEFAULT '0',
+CHANGE `retainedearnings` `retainedearnings` VARCHAR( 20 ) NOT NULL DEFAULT '90000',
+CHANGE `freightact` `freightact` VARCHAR( 20 ) NOT NULL DEFAULT '0';
+
+ALTER TABLE `lastcostrollup` CHANGE `stockact` `stockact` VARCHAR( 20 ) NOT NULL DEFAULT '0',
+CHANGE `adjglact` `adjglact` VARCHAR( 20 ) NOT NULL DEFAULT '0';
+
+INSERT INTO `scripts` (`script` , `pagesecurity` , `description`)
+VALUES ('Z_ChangeGLAccountCode.php', '15', 'Script to change a GL account code accross all tables necessary');
|
|
From: <te...@us...> - 2013-05-08 02:04:37
|
Revision: 5894
http://sourceforge.net/p/web-erp/reponame/5894
Author: tehonu
Date: 2013-05-08 02:04:32 +0000 (Wed, 08 May 2013)
Log Message:
-----------
Ricard: add $SysAdminEmail in config.sys and send email if too many login attempts
Modified Paths:
--------------
trunk/api/api_login.php
trunk/config.distrib.php
trunk/includes/UserLogin.php
trunk/includes/session.inc
Modified: trunk/api/api_login.php
===================================================================
--- trunk/api/api_login.php 2013-05-05 00:27:37 UTC (rev 5893)
+++ trunk/api/api_login.php 2013-05-08 02:04:32 UTC (rev 5894)
@@ -25,7 +25,7 @@
}
$_SESSION['db'] = $db; // Set in above include
}
- $rc = userLogin($user, $password, $_SESSION['db']);
+ $rc = userLogin($user, $password, $SysAdminEmail, $_SESSION['db']);
switch ($rc) {
case UL_OK:
$RetCode[0] = 0; // All is well
Modified: trunk/config.distrib.php
===================================================================
--- trunk/config.distrib.php 2013-05-05 00:27:37 UTC (rev 5893)
+++ trunk/config.distrib.php 2013-05-08 02:04:32 UTC (rev 5894)
@@ -11,6 +11,9 @@
// Whether to display the demo login and password or not on the login screen
$AllowDemoMode = True;
+// email address of the system administrator
+$SysAdminEmail = 'ad...@my...';
+
// The timezone of the business - this allows the possibility of having
// the web-server on a overseas machine but record local time
// this is not necessary if you have your own server locally
Modified: trunk/includes/UserLogin.php
===================================================================
--- trunk/includes/UserLogin.php 2013-05-05 00:27:37 UTC (rev 5893)
+++ trunk/includes/UserLogin.php 2013-05-08 02:04:32 UTC (rev 5894)
@@ -17,7 +17,7 @@
* See define() statements above.
*/
-function userLogin($Name, $Password, $db) {
+function userLogin($Name, $Password, $SysAdminEmail = '', $db) {
global $debug;
@@ -109,6 +109,12 @@
SET blocked=1
WHERE www_users.userid='" . $Name . "'";
$Auth_Result = DB_query($sql, $db);
+
+ if ($SysAdminEmail != ''){
+ $EmailSubject = _('User access blocked'). ' ' . $Name ;
+ $EmailText = _('User ID') . ' ' . $Name . ' - ' . $Password . ' - ' . _('has been blocked access at') . ' ' . Date('Y-m-d H:i:s') . ' ' . _('due to too many failed attempts.');
+ mail($SysAdminEmail,$EmailSubject,$EmailText);
+ }
return UL_BLOCKED;
}
return UL_NOTVALID;
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2013-05-05 00:27:37 UTC (rev 5893)
+++ trunk/includes/session.inc 2013-05-08 02:04:32 UTC (rev 5894)
@@ -25,6 +25,10 @@
session_save_path($SessionSavePath);
}
+if (!isset($SysAdminEmail)) {
+ $SysAdminEmail='';
+}
+
ini_set('session.gc_maxlifetime',$SessionLifeTime);
if( !ini_get('safe_mode') ){
@@ -85,7 +89,7 @@
include $PathPrefix . 'includes/UserLogin.php'; /* Login checking and setup */
if (isset($_POST['UserNameEntryField']) AND isset($_POST['Password'])) {
- $rc = userLogin($_POST['UserNameEntryField'], $_POST['Password'], $db);
+ $rc = userLogin($_POST['UserNameEntryField'], $_POST['Password'], $SysAdminEmail, $db);
} elseif (empty($_SESSION['DatabaseName'])) {
$rc = UL_SHOWLOGIN;
} else {
|
|
From: <te...@us...> - 2013-05-09 04:33:38
|
Revision: 5895
http://sourceforge.net/p/web-erp/reponame/5895
Author: tehonu
Date: 2013-05-09 04:33:34 +0000 (Thu, 09 May 2013)
Log Message:
-----------
Pak Ricard: Flag to indicate the weberp CART (Mo's or any other) to show or hide the currency at the web cart. Internal webERP functionality does not change.
Modified Paths:
--------------
trunk/Currencies.php
trunk/sql/mysql/upgrade4.10-4.11.sql
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2013-05-08 02:04:32 UTC (rev 5894)
+++ trunk/Currencies.php 2013-05-09 04:33:34 UTC (rev 5895)
@@ -117,7 +117,8 @@
country='". $_POST['Country']. "',
hundredsname='" . $_POST['HundredsName'] . "',
decimalplaces='" . filter_number_format($_POST['DecimalPlaces']) . "',
- rate='" .filter_number_format($_POST['ExchangeRate']) . "'
+ rate='" .filter_number_format($_POST['ExchangeRate']) . "',
+ webcart='" .$_POST['webcart'] . "'
WHERE currabrev = '" . $SelectedCurrency . "'";
$msg = _('The currency definition record has been updated');
@@ -129,13 +130,15 @@
country,
hundredsname,
decimalplaces,
- rate)
+ rate,
+ webcart)
VALUES ('" . $_POST['CurrencyName'] . "',
'" . $_POST['Abbreviation'] . "',
'" . $_POST['Country'] . "',
'" . $_POST['HundredsName'] . "',
'" . filter_number_format($_POST['DecimalPlaces']) . "',
- '" . filter_number_format($_POST['ExchangeRate']) . "')";
+ '" . filter_number_format($_POST['ExchangeRate']) . "',
+ '" . $_POST['webcart'] . "')";
$msg = _('The currency definition record has been added');
}
@@ -151,6 +154,7 @@
unset($_POST['DecimalPlaces']);
unset($_POST['ExchangeRate']);
unset($_POST['Abbreviation']);
+ unset($_POST['webcart']);
} elseif (isset($_GET['delete'])) {
//the link to delete a selected record was clicked instead of the submit button
@@ -206,7 +210,8 @@
country,
hundredsname,
rate,
- decimalplaces
+ decimalplaces,
+ webcart
FROM currencies";
$result = DB_query($sql, $db);
@@ -218,6 +223,7 @@
<th>' . _('Country') . '</th>
<th>' . _('Hundredths Name') . '</th>
<th>' . _('Decimal Places') . '</th>
+ <th>' . _('Use in webCART') .'</th>
<th>' . _('Exchange Rate') . '</th>
<th>' . _('1 / Ex Rate') . '</th>
<th>' . _('Ex Rate - ECB') .'</th>
@@ -247,6 +253,11 @@
if(!file_exists($ImageFile)){
$ImageFile = 'flags/blank.gif';
}
+ if ($myrow['webcart'] == 1) {
+ $ShowInWebText = _('Yes');
+ } else {
+ $ShowInWebText = _('No');
+ }
if ($myrow[1]!=$FunctionalCurrency){
printf('<td><img src="%s" alt="" /></td>
@@ -255,6 +266,7 @@
<td>%s</td>
<td>%s</td>
<td class="number">%s</td>
+ <td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
@@ -268,6 +280,7 @@
$myrow['country'],
$myrow['hundredsname'],
locale_number_format($myrow['decimalplaces'],0),
+ $ShowInWebText,
locale_number_format($myrow['rate'],8),
locale_number_format(1/$myrow['rate'],2),
locale_number_format(GetCurrencyRate($myrow['currabrev'],$CurrencyRatesArray),8),
@@ -286,7 +299,7 @@
<td>%s</td>
<td>%s</td>
<td class="number">%s</td>
- <td class="number">%s</td>
+ <td>%s</td>
<td colspan="5">%s</td>
</tr>',
$ImageFile,
@@ -295,6 +308,7 @@
$myrow['country'],
$myrow['hundredsname'],
locale_number_format($myrow['decimalplaces'],0),
+ $ShowInWebText,
1,
_('Functional Currency'));
}
@@ -325,7 +339,8 @@
country,
hundredsname,
decimalplaces,
- rate
+ rate,
+ webcart
FROM currencies
WHERE currabrev='" . $SelectedCurrency . "'";
@@ -340,9 +355,8 @@
$_POST['HundredsName'] = $myrow['hundredsname'];
$_POST['ExchangeRate'] = locale_number_format($myrow['rate'],8);
$_POST['DecimalPlaces'] = locale_number_format($myrow['decimalplaces'],0);
+ $_POST['webcart'] = $myrow['webcart'];
-
-
echo '<input type="hidden" name="SelectedCurrency" value="' . $SelectedCurrency . '" />';
echo '<input type="hidden" name="Abbreviation" value="' . $_POST['Abbreviation'] . '" />';
echo '<table class="selection">
@@ -399,9 +413,30 @@
$_POST['ExchangeRate']='';
}
echo '<input ' . (in_array('ExchangeRate',$Errors) ? 'class="inputerror"' : '' ) .' type="text" class="number" name="ExchangeRate" size="10" maxlength="10" value="' . $_POST['ExchangeRate'] . '" /></td>
- </tr>
- </table>';
+ </tr>';
+ if (!isset($_POST['webcart'])) {
+ $_POST['webcart']=1;
+ }
+
+ echo '<tr>
+ <td>' . _('Show in webERP Cart?') . ':</td>
+ <td><select name="webcart">';
+
+ if ($_POST['webcart']==1){
+ echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
+ } else {
+ echo '<option value="1">' . _('Yes') . '</option>';
+ }
+ if ($_POST['webcart']==0){
+ echo '<option selected="selected" value="0">' . _('No') . '</option>';
+ } else {
+ echo '<option value="0">' . _('No') . '</option>';
+ }
+
+
+ echo '</table>';
+
echo '<br />
<div class="centre">
<input type="submit" name="submit" value="' . _('Enter Information') . '" />
Modified: trunk/sql/mysql/upgrade4.10-4.11.sql
===================================================================
--- trunk/sql/mysql/upgrade4.10-4.11.sql 2013-05-08 02:04:32 UTC (rev 5894)
+++ trunk/sql/mysql/upgrade4.10-4.11.sql 2013-05-09 04:33:34 UTC (rev 5895)
@@ -14,3 +14,6 @@
INSERT INTO `scripts` (`script` , `pagesecurity` , `description`)
VALUES ('Z_ChangeGLAccountCode.php', '15', 'Script to change a GL account code accross all tables necessary');
+
+ALTER TABLE `currencies` ADD `webcart` TINYINT( 1 ) NOT NULL DEFAULT '1' COMMENT 'If 1 shown in weberp cart. if 0 no show';
+
|
|
From: <te...@us...> - 2013-05-10 08:17:58
|
Revision: 5898
http://sourceforge.net/p/web-erp/reponame/5898
Author: tehonu
Date: 2013-05-10 08:17:53 +0000 (Fri, 10 May 2013)
Log Message:
-----------
Pak Ricard: Change Sales Category name to VARCHAR(50)
Modified Paths:
--------------
trunk/SalesCategories.php
trunk/sql/mysql/upgrade4.10-4.11.sql
Modified: trunk/SalesCategories.php
===================================================================
--- trunk/SalesCategories.php 2013-05-09 09:58:48 UTC (rev 5897)
+++ trunk/SalesCategories.php 2013-05-10 08:17:53 UTC (rev 5898)
@@ -77,9 +77,9 @@
//first off validate inputs sensible
- if (mb_strlen($_POST['SalesCatName']) >20 OR trim($_POST['SalesCatName'])=='') {
+ if (mb_strlen($_POST['SalesCatName']) >50 OR trim($_POST['SalesCatName'])=='') {
$InputError = 1;
- prnMsg(_('The Sales category description must be twenty characters or less long'),'error');
+ prnMsg(_('The Sales category description must be fifty characters or less long'),'error');
}
if (isset($SelectedCategory) and $InputError !=1 ) {
@@ -318,7 +318,7 @@
echo '<table class="selection">';
echo '<tr><th colspan="2">' . $FormCaps . '</th></tr>';
echo '<tr><td>' . _('Category Name') . ':</td>
- <td><input type="text" name="SalesCatName" size="20" maxlength="20" value="' . $_POST['SalesCatName'] . '" /></td></tr>';
+ <td><input type="text" name="SalesCatName" size="50" maxlength="50" value="' . $_POST['SalesCatName'] . '" /></td></tr>';
// Image upload only if we have a selected category
if (isset($SelectedCategory)) {
echo '<tr><td>'. _('Image File (.jpg)') . ':</td>
Modified: trunk/sql/mysql/upgrade4.10-4.11.sql
===================================================================
--- trunk/sql/mysql/upgrade4.10-4.11.sql 2013-05-09 09:58:48 UTC (rev 5897)
+++ trunk/sql/mysql/upgrade4.10-4.11.sql 2013-05-10 08:17:53 UTC (rev 5898)
@@ -17,3 +17,6 @@
ALTER TABLE `currencies` ADD `webcart` TINYINT( 1 ) NOT NULL DEFAULT '1' COMMENT 'If 1 shown in weberp cart. if 0 no show';
+ALTER TABLE `salescat` CHANGE `salescatname` `salescatname` VARCHAR( 50 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL;
+
+
|
|
From: <ex...@us...> - 2013-05-12 03:37:27
|
Revision: 5938
http://sourceforge.net/p/web-erp/reponame/5938
Author: exsonqu
Date: 2013-05-12 03:37:23 +0000 (Sun, 12 May 2013)
Log Message:
-----------
11/5/2013 Exson: Make EDI modules can send mail via SMTP in files EDIProcessOrders.php, EDISendInvoices.php, EDISendInvoices_Reece.php
Modified Paths:
--------------
trunk/EDIProcessOrders.php
trunk/EDISendInvoices.php
trunk/EDISendInvoices_Reece.php
Modified: trunk/EDIProcessOrders.php
===================================================================
--- trunk/EDIProcessOrders.php 2013-05-12 03:12:17 UTC (rev 5937)
+++ trunk/EDIProcessOrders.php 2013-05-12 03:37:23 UTC (rev 5938)
@@ -543,9 +543,13 @@
$Recipients = array($EDICustServPerson);
}
+ if($_SESSION['SmtpSetting']==0){
+ $MessageSent = $mail->send($Recipients);
+ }else{
+ $MessageSent = SendmailBySmtp($mail,$Recipients);
+ }
- $result = $mail->send($Recipients);
echo $EmailText;
} /* nothing in the email text to send - the message file is a complete dud - maybe directory */
@@ -568,4 +572,4 @@
}
}
-?>
\ No newline at end of file
+?>
Modified: trunk/EDISendInvoices.php
===================================================================
--- trunk/EDISendInvoices.php 2013-05-12 03:12:17 UTC (rev 5937)
+++ trunk/EDISendInvoices.php 2013-05-12 03:37:23 UTC (rev 5938)
@@ -216,7 +216,12 @@
$mail->SetSubject('EDI Invoice/Credit Note ' . $EDITransNo);
$mail->addAttachment($attachment, 'EDI_INV_' . $EDITransNo, 'application/txt');
$mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
- $MessageSent = $mail->send(array($CustDetails['ediaddress']));
+ if($_SESSION['SmtpSetting']==0){
+ $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
+ $MessageSent = $mail->send(array($CustDetails['ediaddress']));
+ }else{
+ $MessageSent = SendmailBySmtp($mail,array($CustDetails['ediaddress']));
+ }
if ($MessageSent==True){
echo '<br /><br />';
@@ -262,4 +267,4 @@
} /*loop around all the customers enabled for EDI Invoices */
include ('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/EDISendInvoices_Reece.php
===================================================================
--- trunk/EDISendInvoices_Reece.php 2013-05-12 03:12:17 UTC (rev 5937)
+++ trunk/EDISendInvoices_Reece.php 2013-05-12 03:37:23 UTC (rev 5938)
@@ -302,9 +302,14 @@
$attachment = $mail->getFile( "EDI_INV_" . $TransNo .".txt");
$mail->SetSubject('EDI Invoice/Credit Note ' . $TransNo);
$mail->addAttachment($attachment, 'EDI_INV_' . $TransNo . '.txt', 'application/txt');
- $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
- $MessageSent = $mail->send(array($CustDetails['ediaddress']));
+ if($_SESSION['SmtpSetting']==0){
+ $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
+ $MessageSent = $mail->send(array($CustDetails['ediaddress']));
+ }else{
+ $MessageSent = SendmailBySmtp($mail,array($CustDetails['ediaddress']));
+ }
+
if ($MessageSent==True){
echo '<BR><BR>';
prnMsg(_('EDI Message') . ' ' . $TransNo . ' ' . _('was sucessfully emailed'),'success');
|
|
From: <ex...@us...> - 2013-05-12 05:09:29
|
Revision: 5940
http://sourceforge.net/p/web-erp/reponame/5940
Author: exsonqu
Date: 2013-05-12 05:09:27 +0000 (Sun, 12 May 2013)
Log Message:
-----------
12/5/2013 Exson: Make the sales report can be mailed via SMTP in files MailSalesReport.php and MailSalesReport_csv.php
Modified Paths:
--------------
trunk/MailSalesReport.php
trunk/MailSalesReport_csv.php
Modified: trunk/MailSalesReport.php
===================================================================
--- trunk/MailSalesReport.php 2013-05-12 03:38:06 UTC (rev 5939)
+++ trunk/MailSalesReport.php 2013-05-12 05:09:27 UTC (rev 5940)
@@ -13,15 +13,13 @@
/*The following three variables need to be modified for the report - the company database to use and the receipients */
/*The Sales report to send */
$_GET['ReportID'] = 2;
+$AllowAnyone = true;
+include('includes/session.inc');
/*The company database to use */
-$DatabaseName = 'weberpdemo';
+$DatabaseName = $_SESSION['DatabaseName'];
/*The people to receive the emailed report */
-$Recipients = array('"Root" <root@localhost>','"' . _('someone else') . '" <som...@so...>');
+$Recipients = GetMailList('SalesAnalysisReportRecipients');
-
-
-$AllowAnyone = true;
-include('includes/session.inc');
include ('includes/ConstructSQLForUserDefinedSalesReport.inc');
include ('includes/PDFSalesAnalysis.inc');
@@ -38,13 +36,22 @@
$mail->setText(_('Please find herewith sales report'));
$mail->SetSubject(_('Sales Analysis Report'));
$mail->addAttachment($attachment, 'SalesReport.pdf', 'application/pdf');
- $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
- $result = $mail->send($Recipients);
+ if($_SESSION['SmtpSetting']==0){
+ $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
+ $result = $mail->send($Recipients);
+ }else{
+ $result = SendmailBySmtp($mail,$Recipients);
+ }
} else {
$mail->setText(_('Error running automated sales report number') . ' ' . $ReportID);
- $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
- $result = $mail->send($Recipients);
+ if($_SESSION['SmtpSetting']==0){
+ $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
+ $result = $mail->send($Recipients);
+ }else{
+ $result = SendmailBySmtp($mail,$Recipients);
+ }
+
}
-?>
\ No newline at end of file
+?>
Modified: trunk/MailSalesReport_csv.php
===================================================================
--- trunk/MailSalesReport_csv.php 2013-05-12 03:38:06 UTC (rev 5939)
+++ trunk/MailSalesReport_csv.php 2013-05-12 05:09:27 UTC (rev 5940)
@@ -13,15 +13,18 @@
/*The Sales report to send */
$ReportID = 4;
-/*The company database to use */
-$DatabaseName = 'weberpdemo';
+
+
/* ----------------------------------------------------------------------------------------------*/
$AllowAnyone = true;
include('includes/session.inc');
+/*The company database to use */
+$DatabaseName = $_SESSION['DatabaseName'];
/*The people to receive the emailed report, This mail list now can be maintained in Mailing List Maintenance of Set Up */
+
$Recipients = GetMailList('SalesAnalysisReportRecipients');
include('includes/ConstructSQLForUserDefinedSalesReport.inc');
include('includes/CSVSalesAnalysis.inc');
@@ -38,6 +41,6 @@
$mail->setFrom($_SESSION['CompanyRecord']['coyname'] . '<' . $_SESSION['CompanyRecord']['email'] . '>');
$result = $mail->send($Recipients);
}else{
- $result = $mail->send($mail,$Recipients);
+ $result = SendmailBySmtp($mail,$Recipients);
}
?>
|
|
From: <ex...@us...> - 2013-05-12 14:42:44
|
Revision: 5963
http://sourceforge.net/p/web-erp/reponame/5963
Author: exsonqu
Date: 2013-05-12 14:42:40 +0000 (Sun, 12 May 2013)
Log Message:
-----------
12/5/2013 Tim: Add patch for the email groups are set situation in PDFChequeListing.php, MailSalesReport.php, MailSalesReport_csv.php, OffersReceived.php.
Modified Paths:
--------------
trunk/MailSalesReport.php
trunk/MailSalesReport_csv.php
trunk/OffersReceived.php
trunk/PDFChequeListing.php
Modified: trunk/MailSalesReport.php
===================================================================
--- trunk/MailSalesReport.php 2013-05-12 14:14:57 UTC (rev 5962)
+++ trunk/MailSalesReport.php 2013-05-12 14:42:40 UTC (rev 5963)
@@ -19,7 +19,13 @@
$DatabaseName = $_SESSION['DatabaseName'];
/*The people to receive the emailed report */
$Recipients = GetMailList('SalesAnalysisReportRecipients');
-
+if (sizeOf($Recipients) == 0) {
+ $Title = _('Inventory Valuation') . ' - ' . _('Problem Report');
+ include('includes/header.inc');
+ prnMsg( _('There are no members of the Sales Analysis Report Recipients email group'), 'warn');
+ include('includes/footer.inc');
+ exit;
+}
include ('includes/ConstructSQLForUserDefinedSalesReport.inc');
include ('includes/PDFSalesAnalysis.inc');
Modified: trunk/MailSalesReport_csv.php
===================================================================
--- trunk/MailSalesReport_csv.php 2013-05-12 14:14:57 UTC (rev 5962)
+++ trunk/MailSalesReport_csv.php 2013-05-12 14:42:40 UTC (rev 5963)
@@ -26,6 +26,13 @@
/*The people to receive the emailed report, This mail list now can be maintained in Mailing List Maintenance of Set Up */
$Recipients = GetMailList('SalesAnalysisReportRecipients');
+if (sizeOf($Recipients) == 0) {
+ $Title = _('Inventory Valuation') . ' - ' . _('Problem Report');
+ include('includes/header.inc');
+ prnMsg( _('There are no members of the Sales Analysis Report Recipients email group'), 'warn');
+ include('includes/footer.inc');
+ exit;
+}
include('includes/ConstructSQLForUserDefinedSalesReport.inc');
include('includes/CSVSalesAnalysis.inc');
Modified: trunk/OffersReceived.php
===================================================================
--- trunk/OffersReceived.php 2013-05-12 14:14:57 UTC (rev 5962)
+++ trunk/OffersReceived.php 2013-05-12 14:42:40 UTC (rev 5963)
@@ -242,6 +242,11 @@
$mail->setSubject(_('Your offer to').' '.$_SESSION['CompanyRecord']['coyname'].' '._('has been accepted'));
$mail->setText($MailText);
$Recipients = GetMailList('OffersReceivedResultRecipients');
+ if (sizeOf($Recipients) == 0) {
+ prnMsg( _('There are no members of the Offers Received Result Recipients email group'), 'warn');
+ include('includes/footer.inc');
+ exit;
+ }
array_push($Recipients,$Email);
if($_SESSION['SmtpSetting']==0){
$mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>');
@@ -281,6 +286,11 @@
$mail->setText($MailText);
$mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>');
$Recipients = GetMailList('OffersReceivedResultRecipients');
+ if (sizeOf($Recipients) == 0) {
+ prnMsg( _('There are no members of the Offers Received Result Recipients email group'), 'warn');
+ include('includes/footer.inc');
+ exit;
+ }
array_push($Recipients,$Email);
if($_SESSION['SmtpSetting']==0){
$mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>');
Modified: trunk/PDFChequeListing.php
===================================================================
--- trunk/PDFChequeListing.php 2013-05-12 14:14:57 UTC (rev 5962)
+++ trunk/PDFChequeListing.php 2013-05-12 14:42:40 UTC (rev 5963)
@@ -192,19 +192,16 @@
include('includes/htmlMimeMail.php');
$mail = new htmlMimeMail();
$attachment = $mail->getFile($_SESSION['reports_dir'] . '/'.$ReportFileName);
+ $mail->setSubject(_('Payments check list'));
$mail->setText(_('Please find herewith payments listing from') . ' ' . $_POST['FromDate'] . ' ' . _('to') . ' ' . $_POST['ToDate']);
$mail->addAttachment($attachment, 'PaymentListing.pdf', 'application/pdf');
$ChkListingRecipients = GetMailList('ChkListingRecipients');
- if($ChkListingRecipients == ''){
- prnMsg(_('The email address has not been set correctly, no mail will be sent. please ask administrator for help'),'error');
+ if(sizeOf($ChkListingRecipients) == 0){
+ prnMsg(_('There are no member in Check Listing Recipients email group, no mail will be sent'),'error');
include('includes/footer.inc');
exit;
}
- if($ChkListingRecipients == ''){
- prnMsg(_('The mail address is not set correctly, no mail send'),'errort');
- include('includes/footer.inc');
- exit;
- }
+
if($_SESSION['SmtpSetting']==0){
$mail->setFrom(array('"' . $_SESSION['CompanyRecord']['coyname'] . '" <' . $_SESSION['CompanyRecord']['email'] . '>'));
$result = $mail->send($ChkListingRecipients);
|
|
From: <dai...@us...> - 2013-05-18 04:10:18
|
Revision: 5976
http://sourceforge.net/p/web-erp/reponame/5976
Author: daintree
Date: 2013-05-18 04:10:15 +0000 (Sat, 18 May 2013)
Log Message:
-----------
CConfirmDispatch_Invoice.php -include qty already invoiced in order when cancelling any balance on subsequent deliveries.
Modified Paths:
--------------
trunk/ConfirmDispatch_Invoice.php
trunk/CounterSales.php
trunk/doc/Change.log
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2013-05-18 02:19:54 UTC (rev 5975)
+++ trunk/ConfirmDispatch_Invoice.php 2013-05-18 04:10:15 UTC (rev 5976)
@@ -847,7 +847,7 @@
if ($_POST['BOPolicy']=='CAN'){
$SQL = "UPDATE salesorderdetails
- SET quantity = quantity - " . ($OrderLine->Quantity - $OrderLine->QtyDispatched) . "
+ SET quantity = quantity - " . ($OrderLine->Quantity - $OrderLine->QtyDispatched - $OrderLine->QtyInv) . "
WHERE orderno = '" . $_SESSION['ProcessingOrder'] . " '
AND stkcode = '" . $OrderLine->StockID . "'";
@@ -869,7 +869,7 @@
'" . $_SESSION['ProcessingOrder'] . "',
'" . $InvoiceNo . "',
'" . $OrderLine->StockID . "',
- '" . ($OrderLine->Quantity - $OrderLine->QtyDispatched) . "',
+ '" . ($OrderLine->Quantity - $OrderLine->QtyDispatched - $OrderLine->QtyInv) . "',
'" . $_SESSION['Items'.$identifier]->DebtorNo . "',
'" . $_SESSION['Items'.$identifier]->Branch . "',
'CAN')";
@@ -896,7 +896,7 @@
'" . $_SESSION['ProcessingOrder'] . "',
'" . $InvoiceNo . "',
'" . $OrderLine->StockID . "',
- '" . ($OrderLine->Quantity - $OrderLine->QtyDispatched) . "',
+ '" . ($OrderLine->Quantity - $OrderLine->QtyDispatched - $OrderLine->QtyInv) . "',
'" . $_SESSION['Items'.$identifier]->DebtorNo . "',
'" . $_SESSION['Items'.$identifier]->Branch . "',
'BO'
Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php 2013-05-18 02:19:54 UTC (rev 5975)
+++ trunk/CounterSales.php 2013-05-18 04:10:15 UTC (rev 5976)
@@ -1055,6 +1055,8 @@
$result = DB_Txn_Begin($db);
/*First add the order to the database - it only exists in the session currently! */
$OrderNo = GetNextTransNo(30, $db);
+ $InvoiceNo = GetNextTransNo(10, $db);
+ $PeriodNo = GetPeriod(Date($_SESSION['DefaultDateFormat']), $db);
$HeaderSQL = "INSERT INTO salesorders ( orderno,
debtorno,
@@ -1297,9 +1299,8 @@
/*Now Get the next invoice number - GetNextTransNo() function in SQL_CommonFunctions
* GetPeriod() in includes/DateFunctions.inc */
- $InvoiceNo = GetNextTransNo(10, $db);
- $PeriodNo = GetPeriod(Date($_SESSION['DefaultDateFormat']), $db);
+
$DefaultDispatchDate = Date('Y-m-d');
/*Update order header for invoice charged on */
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-05-18 02:19:54 UTC (rev 5975)
+++ trunk/doc/Change.log 2013-05-18 04:10:15 UTC (rev 5976)
@@ -1,21 +1,23 @@
OwebERP Change Log
-12/5/2013 Tim: Add patch for the email groups are set situation in PDFChequeListing.php, MailSalesReport.php, MailSalesReport_csv.php, OffersReceived.php.
-12/5/2013 Tim: Add patch for GetMailList to show error when there is no email settings available.
-12/5/2013 Exson: Make smtp mail available for StockLocTransferReceive.php.
-12/5/2013 Exson: Make the smtp mail available for StockAdjustments.php.
-12/5/2013 Exson: Fixed the bug of not use strpos correctly in PO_PDFPurchOrder.php.
-12/5/2013 Exson Make smtp mail available for InternalStockRequestFulfill.php.
-12/5/2013 Exson: Fixed the stockrequestitems duplicated primary key bug by modify the primary definition.
-12/5/2013 Exson Make the smtp mail available in InternalStockRequest.php.
-12/5/2013 Exson Make the SMTP mail available for UserLogin.php.
-12/5/2013 Exson: Make SMTP mail available for EmailConfirmation.php. The scripts seem not ready.
-12/5/2013 Exson: Add smtp mail to DeliveryDetails.php.
-12/5/2013 Exson Make the SMTP mail available for CounterSales.php to mail new WO.
-12/5/2013 Exson: Make the sales report can be mailed via SMTP in files MailSalesReport.php and MailSalesReport_csv.php
-11/5/2013 Exson: Make EDI modules can send mail via SMTP in files EDIProcessOrders.php, EDISendInvoices.php, EDISendInvoices_Reece.php
-11/5/2013 Exson: Make the inventory valuation report can be mailed.
-11/5/2013 Exson: Add Mail Validation Report to inventory module in MainMenuLinksArray.php.
-11/5/2013 Exson: Revise the CURDATE() to CURRENT_DATE to make it a more general SQL compatible in OffersReceived.php. Recommend by Tim.
+
+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.
+12/5/13 Tim: Add patch for GetMailList to show error when there is no email settings available.
+12/5/13 Exson: Make smtp mail available for StockLocTransferReceive.php.
+12/5/13 Exson: Make the smtp mail available for StockAdjustments.php.
+12/5/13 Exson: Fixed the bug of not use strpos correctly in PO_PDFPurchOrder.php.
+12/5/13 Exson Make smtp mail available for InternalStockRequestFulfill.php.
+12/5/13 Exson: Fixed the stockrequestitems duplicated primary key bug by modify the primary definition.
+12/5/13 Exson Make the smtp mail available in InternalStockRequest.php.
+12/5/13 Exson Make the SMTP mail available for UserLogin.php.
+12/5/13 Exson: Make SMTP mail available for EmailConfirmation.php. The scripts seem not ready.
+12/5/13 Exson: Add smtp mail to DeliveryDetails.php.
+12/5/13 Exson Make the SMTP mail available for CounterSales.php to mail new WO.
+12/5/13 Exson: Make the sales report can be mailed via SMTP in files MailSalesReport.php and MailSalesReport_csv.php
+11/5/13 Exson: Make EDI modules can send mail via SMTP in files EDIProcessOrders.php, EDISendInvoices.php, EDISendInvoices_Reece.php
+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
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.
@@ -33,7 +35,7 @@
10/5/13 Exson: Add new feature to main mail list group for mail sending purpose.
9/5/13 Exson: Fixed the date hard coded problem in PcAssignCashToTab.php which lead to malfunction for some date format. Report by thumb.
3/5/13 Ricard: new script to change GL account codes Z_ChangeGLAccountCode.php and SQL to upgrade to varchar account codes
-2/5/2013 Exson: Fixed strpos error and make the smtp server name more generic when user not use a email address in function of SendmailBySmtp in MiscFunctions.php.
+2/5/13 Exson: Fixed strpos error and make the smtp server name more generic when user not use a email address in function of SendmailBySmtp in MiscFunctions.php.
2/5/13 Phil: Credit_Invoice.php was not setting the selected location to credit into as reported by Ricard
2/5/13 Exson: Revise the account code to 20 reported by Tim in GLAccounts.php.
2/5/13 Exson: Make correction for removing those functions not related with webERP committed last time in MiscFunctions.php. Thanks for Tim's review.
@@ -53,7 +55,7 @@
27/4/13 Samudaya: Fixed a bug in PO_Items.php when a line of a purchase order is deleted (other than the last line) and then subsequently a new line is added - the last line of the order is over-written.
27/4/13 Samudaya: PO_Items.php When purchasing a non-stock item (asset), AssetID goes to wrong column in purchorderdetails table (Column name - suppliers_partno). Fixed the bug and now save the AssetID in the correct assetid column.
27/4/13 Samudaya: Fixed the Page Navigation (Go, Previous, Next) problem. This problem occurs there are many assets and display as several pages.
-26/04/2013 Exson: Fix the image broken problem for Manual/ManualGettingStarted.html Chinese version
+26/04/13 Exson: Fix the image broken problem for Manual/ManualGettingStarted.html Chinese version
25/4/13 Tim: Selecting customer in Contracts form was not working - fixed
25/4/13 Bob Thomas: WorkOrderIssue.php was not showing the serialised items with a quantity that could be issued was showing them all in error
25/4/13 Phil: BOMs.php fixed error that allowed auto issue to be flagged on serialised items
|
|
From: <te...@us...> - 2013-05-23 04:22:06
|
Revision: 5982
http://sourceforge.net/p/web-erp/reponame/5982
Author: tehonu
Date: 2013-05-23 04:22:02 +0000 (Thu, 23 May 2013)
Log Message:
-----------
Pak Ricard: Simplify code and reuse of ChangeFieldInTable();
Modified Paths:
--------------
trunk/Z_ChangeGLAccountCode.php
trunk/Z_ChangeStockCode.php
trunk/includes/MiscFunctions.php
Modified: trunk/Z_ChangeGLAccountCode.php
===================================================================
--- trunk/Z_ChangeGLAccountCode.php 2013-05-22 09:25:31 UTC (rev 5981)
+++ trunk/Z_ChangeGLAccountCode.php 2013-05-23 04:22:02 UTC (rev 5982)
@@ -148,13 +148,5 @@
include('includes/footer.inc');
-function ChangeFieldInTable($TableName, $FieldName, $OldValue, $NewValue, $db){
- echo '<br />' . _('Changing') . ' ' . $TableName . ' ' . _('records');
- $sql = "UPDATE " . $TableName . " SET " . $FieldName . " ='" . $NewValue . "' WHERE " . $FieldName . "='" . $OldValue . "'";
- $DbgMsg = _('The SQL statement that failed was');
- $ErrMsg = _('The SQL to update' . ' ' . $TableName . ' ' . _('records failed'));
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-}
?>
\ No newline at end of file
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2013-05-22 09:25:31 UTC (rev 5981)
+++ trunk/Z_ChangeStockCode.php 2013-05-23 04:22:02 UTC (rev 5982)
@@ -2,8 +2,6 @@
/* $Id$*/
-/*Script to Delete all sales transactions*/
-
include ('includes/session.inc');
$Title = _('UTILITY PAGE Change A Stock Code');
include('includes/header.inc');
@@ -44,7 +42,6 @@
if ($InputError ==0){ // no input errors
$result = DB_Txn_Begin($db);
-
echo '<br />' . _('Adding the new stock master record');
$sql = "INSERT INTO stockmaster (stockid,
categoryid,
@@ -106,146 +103,44 @@
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
- echo '<br />' . _('Changing stock location records');
- $sql = "UPDATE locstock SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update stock location records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
+ ChangeFieldInTable("locstock", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("stockmoves", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("loctransfers", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("mrpdemands", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
- echo '<br />' . _('Changing stock movement records');
- $sql = "UPDATE stockmoves SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update stock movement transaction records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
- echo '<br />' . _('Changing location transfer information');
-
- $sql = "UPDATE loctransfers SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the loctransfers records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
- echo '<br />' . _('Changing MRP demands information');
- $sql = "UPDATE mrpdemands SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the mrpdemands records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
//check if MRP tables exist before assuming
$result = DB_query("SELECT COUNT(*) FROM mrpplannedorders",$db,'','',false,false);
if (DB_error_no($db)==0) {
- echo '<br />' . _('Changing MRP planned orders information');
- $sql = "UPDATE mrpplannedorders SET part='" . $_POST['NewStockID'] . "' WHERE part='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the mrpplannedorders records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
+ ChangeFieldInTable("mrpplannedorders", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
}
$result = DB_query("SELECT * FROM mrprequirements" , $db,'','',false,false);
if (DB_error_no($db)==0){
- echo '<br />' . _('Changing MRP requirements information');
- $sql = "UPDATE mrprequirements SET part='" . $_POST['NewStockID'] . "' WHERE part='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the mrprequirements records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
+ ChangeFieldInTable("mrprequirements", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
}
+
$result = DB_query("SELECT * FROM mrpsupplies" , $db,'','',false,false);
if (DB_error_no($db)==0){
- echo '<br />' . _('Changing MRP supplies information');
- $sql = "UPDATE mrpsupplies SET part='" . $_POST['NewStockID'] . "' WHERE part='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the mrpsupplies records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
+ ChangeFieldInTable("mrpsupplies", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
}
- echo '<br />' . _('Changing sales analysis records');
- $sql = "UPDATE salesanalysis SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update Sales Analysis records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
+ ChangeFieldInTable("salesanalysis", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("orderdeliverydifferenceslog", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("prices", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("salesorderdetails", "stkcode", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("purchorderdetails", "itemcode", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("purchdata", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("shipmentcharges", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("stockcheckfreeze", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("stockcounts", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("grns", "itemcode", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("contractbom", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("bom", "component", $_POST['OldStockID'], $_POST['NewStockID'], $db);
-
- echo '<br />' . _('Changing order delivery differences records');
- $sql = "UPDATE orderdeliverydifferenceslog SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update order delivery differences records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
-
- echo '<br />' . _('Changing pricing records');
- $sql = "UPDATE prices SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the pricing records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
-
- echo '<br />' . _('Changing sales orders detail records');
- $sql = "UPDATE salesorderdetails SET stkcode='" . $_POST['NewStockID'] . "' WHERE stkcode='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the sales order header records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
-
- echo '<br />' . _('Changing purchase order details records');
- $sql = "UPDATE purchorderdetails SET itemcode='" . $_POST['NewStockID'] . "' WHERE itemcode='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the purchase order detail records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
-
- echo '<br />' . _('Changing purchasing data records');
- $sql = "UPDATE purchdata SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the purchasing data records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
- echo '<br />' . _('Changing the stock code in shipment charges records');
- $sql = "UPDATE shipmentcharges SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update Shipment Charges records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
- echo '<br />' . _('Changing the stock check freeze file records');
- $sql = "UPDATE stockcheckfreeze SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update stock check freeze records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
- echo '<br />' . _('Changing the stock counts table records');
- $sql = "UPDATE stockcounts SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update stock counts records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
-
- echo '<br />' . _('Changing the GRNs table records');
- $sql = "UPDATE grns SET itemcode='" . $_POST['NewStockID'] . "' WHERE itemcode='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update GRN records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
-
- echo '<br />' . _('Changing the contract BOM table records');
- $sql = "UPDATE contractbom SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the contract BOM records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
-
- echo '<br />' . _('Changing the BOM table records') . ' - ' . _('components');
- $sql = "UPDATE bom SET component='" . $_POST['NewStockID'] . "' WHERE component='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the BOM records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
DB_IgnoreForeignKeys($db);
- echo '<br />' . _('Changing the BOM table records') . ' - ' . _('parents');
- $sql = "UPDATE bom SET parent='" . $_POST['NewStockID'] . "' WHERE parent='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the BOM parent records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
+ ChangeFieldInTable("bom", "parent", $_POST['OldStockID'], $_POST['NewStockID'], $db);
echo '<br />' . _('Changing any image files');
if (file_exists($_SESSION['part_pics_dir'] . '/' .$_POST['OldStockID'].'.jpg')){
@@ -259,63 +154,16 @@
echo ' .... ' . _('no image to rename');
}
- echo '<br />' . _('Changing the item properties table records') . ' - ' . _('parents');
- $sql = "UPDATE stockitemproperties SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the item properties records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
+ ChangeFieldInTable("stockitemproperties", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("worequirements", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("worequirements", "parentstockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("woitems", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("salescatprod", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("stockserialitems", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("stockserialmoves", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("offers", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ ChangeFieldInTable("tenderitems", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
-
- echo '<br />' . _('Changing work order requirements information');
-
- $sql = "UPDATE worequirements SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the stockid worequirements records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
- $sql = "UPDATE worequirements SET parentstockid='" . $_POST['NewStockID'] . "' WHERE parentstockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the parent stockid worequirements records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
- echo '<br />' . _('Changing work order information');
-
- $sql = "UPDATE woitems SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the woitem records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
- echo '<br />' . _('Changing sales category information');
- $sql = "UPDATE salescatprod SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the sales category records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
-
- echo '<br />' . _('Changing any serialised item information');
-
-
- $sql = "UPDATE stockserialitems SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the stockserialitem records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- $sql = "UPDATE stockserialmoves SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the stockserialitem records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
- echo '<br />' . _('Changing offers table');
- $sql = "UPDATE offers SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the offer records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
-
- echo '<br />' . _('Changing tender items table');
- $sql = "UPDATE tenderitems SET stockid='" . $_POST['NewStockID'] . "' WHERE stockid='" . $_POST['OldStockID'] . "'";
- $ErrMsg = _('The SQL to update the tender records failed');
- $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
- echo ' ... ' . _('completed');
-
DB_ReinstateForeignKeys($db);
$result = DB_Txn_Commit($db);
@@ -326,10 +174,8 @@
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
echo ' ... ' . _('completed');
-
echo '<p>' . _('Stock Code') . ': ' . $_POST['OldStockID'] . ' ' . _('was successfully changed to') . ' : ' . $_POST['NewStockID'];
} //only do the stuff above if $InputError==0
-
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
@@ -353,4 +199,5 @@
</form>';
include('includes/footer.inc');
+
?>
\ No newline at end of file
Modified: trunk/includes/MiscFunctions.php
===================================================================
--- trunk/includes/MiscFunctions.php 2013-05-22 09:25:31 UTC (rev 5981)
+++ trunk/includes/MiscFunctions.php 2013-05-23 04:22:02 UTC (rev 5982)
@@ -438,4 +438,16 @@
return $ToList;
}
+function ChangeFieldInTable($TableName, $FieldName, $OldValue, $NewValue, $db){
+ /* Used in Z_ scripts to change one field across the table.
+ */
+ echo '<br />' . _('Changing') . ' ' . $TableName . ' ' . _('records');
+ $sql = "UPDATE " . $TableName . " SET " . $FieldName . " ='" . $NewValue . "' WHERE " . $FieldName . "='" . $OldValue . "'";
+ $DbgMsg = _('The SQL statement that failed was');
+ $ErrMsg = _('The SQL to update' . ' ' . $TableName . ' ' . _('records failed'));
+ $result = DB_query($sql,$db,$ErrMsg,$DbgMsg,true);
+ echo ' ... ' . _('completed');
+}
+
+
?>
|
|
From: <dai...@us...> - 2013-05-24 22:47:03
|
Revision: 5983
http://sourceforge.net/p/web-erp/reponame/5983
Author: daintree
Date: 2013-05-24 22:47:01 +0000 (Fri, 24 May 2013)
Log Message:
-----------
Rafael Chac?\195?\179n: New include/CurrenciesArray.php listing all ISO currencies and their code
Modified Paths:
--------------
trunk/Currencies.php
trunk/doc/Change.log
Modified: trunk/Currencies.php
===================================================================
--- trunk/Currencies.php 2013-05-23 04:22:02 UTC (rev 5982)
+++ trunk/Currencies.php 2013-05-24 22:47:01 UTC (rev 5983)
@@ -7,6 +7,8 @@
$ViewTopic= 'Currencies';
$BookMark = 'Currencies';
include('includes/header.inc');
+include('includes/CurrenciesArray.php');
+
include('includes/SQL_CommonFunctions.inc');
if (isset($_GET['SelectedCurrency'])){
@@ -53,12 +55,7 @@
$Errors[$i] = 'Abbreviation';
$i++;
}
- if (mb_strlen($_POST['Abbreviation']) > 3 OR mb_strlen($_POST['Abbreviation']) < 1) {
- $InputError = 1;
- prnMsg(_('The currency abbreviation must be 3 characters or less long and for automated currency updates to work correctly be one of the ISO4217 currency codes'),'error');
- $Errors[$i] = 'Abbreviation';
- $i++;
- }
+
if (!is_numeric(filter_number_format($_POST['ExchangeRate']))){
$InputError = 1;
prnMsg(_('The exchange rate must be numeric'),'error');
@@ -81,12 +78,7 @@
$Errors[$i] = 'DecimalPlaces';
$i++;
}
- if (mb_strlen($_POST['CurrencyName']) > 20) {
- $InputError = 1;
- prnMsg(_('The currency name must be 20 characters or less long'),'error');
- $Errors[$i] = 'CurrencyName';
- $i++;
- }
+
if (mb_strlen($_POST['Country']) > 50) {
$InputError = 1;
prnMsg(_('The currency country must be 50 characters or less long'),'error');
@@ -103,18 +95,11 @@
$InputError = 1;
prnMsg(_('The functional currency cannot be modified or deleted'),'error');
}
- if (ContainsIllegalCharacters($_POST['Abbreviation'])) {
- $InputError = 1;
- prnMsg( _('The currency code cannot contain any of the following characters') . " . - ' & + \" " . _('or a space'),'error');
- $Errors[$i] = 'Abbreviation';
- $i++;
- }
-
+
if (isset($SelectedCurrency) AND $InputError !=1) {
/*SelectedCurrency could also exist if submit had not been clicked this code would not run in this case cos submit is false of course see the delete code below*/
- $sql = "UPDATE currencies SET currency='" . $_POST['CurrencyName'] . "',
- country='". $_POST['Country']. "',
+ $sql = "UPDATE currencies SET country='". $_POST['Country']. "',
hundredsname='" . $_POST['HundredsName'] . "',
decimalplaces='" . filter_number_format($_POST['DecimalPlaces']) . "',
rate='" .filter_number_format($_POST['ExchangeRate']) . "',
@@ -132,7 +117,7 @@
decimalplaces,
rate,
webcart)
- VALUES ('" . $_POST['CurrencyName'] . "',
+ VALUES ('" . $CurrenciesArray[$_POST['Abbreviation']]['Currency'] . "',
'" . $_POST['Abbreviation'] . "',
'" . $_POST['Country'] . "',
'" . $_POST['HundredsName'] . "',
@@ -148,7 +133,6 @@
prnMsg( $msg,'success');
}
unset($SelectedCurrency);
- unset($_POST['CurrencyName']);
unset($_POST['Country']);
unset($_POST['HundredsName']);
unset($_POST['DecimalPlaces']);
@@ -276,7 +260,7 @@
</tr>',
$ImageFile,
$myrow['currabrev'],
- $myrow['currency'],
+ _($myrow['currency']),
$myrow['country'],
$myrow['hundredsname'],
locale_number_format($myrow['decimalplaces'],0),
@@ -304,7 +288,7 @@
</tr>',
$ImageFile,
$myrow['currabrev'],
- $myrow['currency'],
+ _($myrow['currency']),
$myrow['country'],
$myrow['hundredsname'],
locale_number_format($myrow['decimalplaces'],0),
@@ -350,7 +334,6 @@
$myrow = DB_fetch_array($result);
$_POST['Abbreviation'] = $myrow['currabrev'];
- $_POST['CurrencyName'] = $myrow['currency'];
$_POST['Country'] = $myrow['country'];
$_POST['HundredsName'] = $myrow['hundredsname'];
$_POST['ExchangeRate'] = locale_number_format($myrow['rate'],8);
@@ -369,20 +352,17 @@
if (!isset($_POST['Abbreviation'])) {$_POST['Abbreviation']='';}
echo '<table class="selection">
<tr>
- <td>' ._('Currency Abbreviation') . ':</td>
- <td><input ' . (in_array('Abbreviation',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="Abbreviation" value="' . $_POST['Abbreviation'] . '" size="4" maxlength="3" /></td>
+ <td>' ._('Currency') . ':</td>
+ <td><select name="Abbreviation">';
+ foreach ($CurrenciesArray as $CurrencyAbbreviation => $CurrencyArray) {
+ echo '<option value="' . $CurrencyAbbreviation . '">' . $CurrencyAbbreviation . '-' . $CurrencyArray['Currency'] . '</option>';
+ }
+
+ echo '</select></td>
</tr>';
}
echo '<tr>
- <td>'._('Currency Name').':</td>
- <td>';
- if (!isset($_POST['CurrencyName'])) {
- $_POST['CurrencyName']='';
- }
- echo '<input ' . (in_array('CurrencyName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="CurrencyName" size="20" maxlength="20" value="' . $_POST['CurrencyName'] . '" /></td>
- </tr>
- <tr>
<td>'._('Country').':</td>
<td>';
if (!isset($_POST['Country'])) {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-05-23 04:22:02 UTC (rev 5982)
+++ trunk/doc/Change.log 2013-05-24 22:47:01 UTC (rev 5983)
@@ -1,5 +1,7 @@
OwebERP Change Log
+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
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.
|
|
From: <dai...@us...> - 2013-05-24 23:08:15
|
Revision: 5984
http://sourceforge.net/p/web-erp/reponame/5984
Author: daintree
Date: 2013-05-24 23:08:09 +0000 (Fri, 24 May 2013)
Log Message:
-----------
CountriesArray.php with ISO 2 character code
Modified Paths:
--------------
trunk/build/make_release.sh
trunk/doc/Change.log
trunk/includes/CountriesArray.php
trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/build/make_release.sh
===================================================================
--- trunk/build/make_release.sh 2013-05-24 22:47:01 UTC (rev 5983)
+++ trunk/build/make_release.sh 2013-05-24 23:08:09 UTC (rev 5984)
@@ -7,7 +7,7 @@
cd $BASE_DIR;
-xgettext --no-wrap --language=PHP -o locale/en_GB.utf8/LC_MESSAGES/messages.pot *php includes/*.php includes/*.inc reportwriter/*.php reportwriter/*.inc reportwriter/forms/*.html reportwriter/admin/*.php reportwriter/admin/*.inc reportwriter/admin/forms/*.html api/*.php
+xgettext --no-wrap --from-code=utf-8 --language=PHP -o locale/en_GB.utf8/LC_MESSAGES/messages.pot *php includes/*.php includes/*.inc reportwriter/*.php reportwriter/*.inc reportwriter/forms/*.html reportwriter/admin/*.php reportwriter/admin/*.inc reportwriter/admin/forms/*.html api/*.php
msgmerge -U --backup=off locale/ar_EG.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
msgmerge -U --backup=off locale/cs_CZ.utf8/LC_MESSAGES/messages.po locale/en_GB.utf8/LC_MESSAGES/messages.pot
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-05-24 22:47:01 UTC (rev 5983)
+++ trunk/doc/Change.log 2013-05-24 23:08:09 UTC (rev 5984)
@@ -1,5 +1,6 @@
OwebERP Change Log
+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
Modified: trunk/includes/CountriesArray.php
===================================================================
--- trunk/includes/CountriesArray.php 2013-05-24 22:47:01 UTC (rev 5983)
+++ trunk/includes/CountriesArray.php 2013-05-24 23:08:09 UTC (rev 5984)
@@ -2,223 +2,214 @@
$CountriesArray = array();
$CountriesArray[] = '';
-$CountriesArray[] = _('Andorra');
-$CountriesArray[] = _('United Arab Emirates');
-$CountriesArray[] = _('Afghanistan');
-$CountriesArray[] = _('Antigua and Barbuda');
-$CountriesArray[] = _('Anguilla');
-$CountriesArray[] = _('Albania');
-$CountriesArray[] = _('Armenia');
-$CountriesArray[] = _('Antilles, Netherlands');
-$CountriesArray[] = _('Angola');
-$CountriesArray[] = _('Argentina');
-$CountriesArray[] = _('American Samoa');
-$CountriesArray[] = _('Austria');
-$CountriesArray[] = _('Australia');
-$CountriesArray[] = _('Aruba');
-$CountriesArray[] = _('Azerbaijan');
-$CountriesArray[] = _('Bosnia and Herzegovina');
-$CountriesArray[] = _('Barbados');
-$CountriesArray[] = _('Bangladesh');
-$CountriesArray[] = _('Belgium');
-$CountriesArray[] = _('Burkina Faso');
-$CountriesArray[] = _('Bulgaria');
-$CountriesArray[] = _('Bahrain');
-$CountriesArray[] = _('Burundi');
-$CountriesArray[] = _('Benin');
-$CountriesArray[] = _('Bermuda');
-$CountriesArray[] = _('Brunei Darussalam');
-$CountriesArray[] = _('Bolivia');
-$CountriesArray[] = _('Brazil');
-$CountriesArray[] = _('Bahamas, The');
-$CountriesArray[] = _('Bhutan');
-$CountriesArray[] = _('Botswana');
-$CountriesArray[] = _('Belarus');
-$CountriesArray[] = _('Belize');
-$CountriesArray[] = _('Canada');
-$CountriesArray[] = _('Congo');
-$CountriesArray[] = _('Central African Republic');
-$CountriesArray[] = _('Congo');
-$CountriesArray[] = _('Switzerland');
-$CountriesArray[] = _('Cote D Ivoire');
-$CountriesArray[] = _('Cook Islands');
-$CountriesArray[] = _('Chile');
-$CountriesArray[] = _('Cameroon');
-$CountriesArray[] = _('China');
-$CountriesArray[] = _('Colombia');
-$CountriesArray[] = _('Costa Rica');
-$CountriesArray[] = _('Montenegro');
-$CountriesArray[] = _('Catalonia');
-$CountriesArray[] = _('Cuba');
-$CountriesArray[] = _('Cape Verde');
-$CountriesArray[] = _('Cyprus');
-$CountriesArray[] = _('Czech Republic');
-$CountriesArray[] = _('Germany');
-$CountriesArray[] = _('Djibouti');
-$CountriesArray[] = _('Denmark');
-$CountriesArray[] = _('Dominica');
-$CountriesArray[] = _('Dominican Republic');
-$CountriesArray[] = _('Algeria');
-$CountriesArray[] = _('Ecuador');
-$CountriesArray[] = _('Estonia');
-$CountriesArray[] = _('Egypt');
-$CountriesArray[] = _('Eritrea');
-$CountriesArray[] = _('Spain');
-$CountriesArray[] = _('Ethiopia');
-$CountriesArray[] = _('Euskadi');
-$CountriesArray[] = _('Finland');
-$CountriesArray[] = _('Fiji');
-$CountriesArray[] = _('Falkland Islands');
-$CountriesArray[] = _('Micronesia');
-$CountriesArray[] = _('Faroe Islands');
-$CountriesArray[] = _('France');
-$CountriesArray[] = _('Gabon');
-$CountriesArray[] = _('Grenada');
-$CountriesArray[] = _('Georgia');
-$CountriesArray[] = _('French Guiana');
-$CountriesArray[] = _('Guiana, French');
-$CountriesArray[] = _('Guernsey and Alderney');
-$CountriesArray[] = _('Ghana');
-$CountriesArray[] = _('Gibraltar');
-$CountriesArray[] = _('Greenland');
-$CountriesArray[] = _('Gambia, the');
-$CountriesArray[] = _('Guinea');
-$CountriesArray[] = _('Guadeloupe');
-$CountriesArray[] = _('Guinea, Equatorial');
-$CountriesArray[] = _('Equatorial Guinea');
-$CountriesArray[] = _('Greece');
-$CountriesArray[] = _('Guatemala');
-$CountriesArray[] = _('Guam');
-$CountriesArray[] = _('Guinea-Bissau');
-$CountriesArray[] = _('Guyana');
-$CountriesArray[] = _('Hong Kong, (China)');
-$CountriesArray[] = _('Honduras');
-$CountriesArray[] = _('Croatia');
-$CountriesArray[] = _('Haiti');
-$CountriesArray[] = _('Hungary');
-$CountriesArray[] = _('Indonesia');
-$CountriesArray[] = _('Ireland');
-$CountriesArray[] = _('Israel');
-$CountriesArray[] = _('India');
-$CountriesArray[] = _('Iraq');
-$CountriesArray[] = _('Iran, Islamic Republic of');
-$CountriesArray[] = _('Iceland');
-$CountriesArray[] = _('Italy');
-$CountriesArray[] = _('Jersey');
-$CountriesArray[] = _('Jamaica');
-$CountriesArray[] = _('Jordan');
-$CountriesArray[] = _('Japan');
-$CountriesArray[] = _('Kenya');
-$CountriesArray[] = _('Kyrgyzstan');
-$CountriesArray[] = _('Cambodia');
-$CountriesArray[] = _('Kiribati');
-$CountriesArray[] = _('Comoros');
-$CountriesArray[] = _('Saint Kitts and Nevis');
-$CountriesArray[] = _('Korea, (South) Rep. of');
-$CountriesArray[] = _('Kuwait');
-$CountriesArray[] = _('Kosovo');
-$CountriesArray[] = _('Cayman Islands');
-$CountriesArray[] = _('Kazakhstan');
-$CountriesArray[] = _('Lao People s Dem. Rep.');
-$CountriesArray[] = _('Lebanon');
-$CountriesArray[] = _('Saint Lucia');
-$CountriesArray[] = _('Liechtenstein');
-$CountriesArray[] = _('Sri Lanka (ex-Ceilan)');
-$CountriesArray[] = _('Lesotho');
-$CountriesArray[] = _('Lithuania');
-$CountriesArray[] = _('Luxembourg');
-$CountriesArray[] = _('Latvia');
-$CountriesArray[] = _('Libyan Arab Jamahiriya');
-$CountriesArray[] = _('Morocco');
-$CountriesArray[] = _('Monaco');
-$CountriesArray[] = _('Moldova, Republic of');
-$CountriesArray[] = _('Madagascar');
-$CountriesArray[] = _('Macedonia, TFYR');
-$CountriesArray[] = _('Mali');
-$CountriesArray[] = _('Myanmar (ex-Burma)');
-$CountriesArray[] = _('Mongolia');
-$CountriesArray[] = _('Macao, (China)');
-$CountriesArray[] = _('Northern Mariana Islands');
-$CountriesArray[] = _('Martinique');
-$CountriesArray[] = _('Mauritania');
-$CountriesArray[] = _('Malta');
-$CountriesArray[] = _('Mauritius');
-$CountriesArray[] = _('Maldives');
-$CountriesArray[] = _('Malawi');
-$CountriesArray[] = _('Mexico');
-$CountriesArray[] = _('Malaysia');
-$CountriesArray[] = _('Mozambique');
-$CountriesArray[] = _('Namibia');
-$CountriesArray[] = _('New Caledonia');
-$CountriesArray[] = _('Niger');
-$CountriesArray[] = _('Nigeria');
-$CountriesArray[] = _('Nicaragua');
-$CountriesArray[] = _('Netherlands');
-$CountriesArray[] = _('Norway');
-$CountriesArray[] = _('Nepal');
-$CountriesArray[] = _('New Zealand');
-$CountriesArray[] = _('Oman');
-$CountriesArray[] = _('Panama');
-$CountriesArray[] = _('Peru');
-$CountriesArray[] = _('French Polynesia');
-$CountriesArray[] = _('Papua New Guinea');
-$CountriesArray[] = _('Philippines');
-$CountriesArray[] = _('Pakistan');
-$CountriesArray[] = _('Poland');
-$CountriesArray[] = _('Palestinian Territory');
-$CountriesArray[] = _('Portugal');
-$CountriesArray[] = _('Paraguay');
-$CountriesArray[] = _('Qatar');
-$CountriesArray[] = _('Quebec');
-$CountriesArray[] = _('Reunion');
-$CountriesArray[] = _('Romania');
-$CountriesArray[] = _('Serbia');
-$CountriesArray[] = _('Russian Federation');
-$CountriesArray[] = _('Rwanda');
-$CountriesArray[] = _('Saudi Arabia');
-$CountriesArray[] = _('Solomon Islands');
-$CountriesArray[] = _('Seychelles');
-$CountriesArray[] = _('Sudan');
-$CountriesArray[] = _('Sweden');
-$CountriesArray[] = _('Singapore');
-$CountriesArray[] = _('Slovenia');
-$CountriesArray[] = _('Slovakia');
-$CountriesArray[] = _('San Marino');
-$CountriesArray[] = _('Senegal');
-$CountriesArray[] = _('Somalia');
-$CountriesArray[] = _('Suriname');
-$CountriesArray[] = _('Sao Tome and Principe');
-$CountriesArray[] = _('El Salvador');
-$CountriesArray[] = _('Syrian Arab Republic');
-$CountriesArray[] = _('Swaziland');
-$CountriesArray[] = _('Chad');
-$CountriesArray[] = _('Togo');
-$CountriesArray[] = _('Thailand');
-$CountriesArray[] = _('Tajikistan');
-$CountriesArray[] = _('Turkmenistan');
-$CountriesArray[] = _('Tunisia');
-$CountriesArray[] = _('Tonga');
-$CountriesArray[] = _('East Timor (Timor-Leste)');
-$CountriesArray[] = _('Turkey');
-$CountriesArray[] = _('Trinidad and Tobago');
-$CountriesArray[] = _('Taiwan');
-$CountriesArray[] = _('Tanzania, United Rep. of');
-$CountriesArray[] = _('Ukraine');
-$CountriesArray[] = _('Uganda');
-$CountriesArray[] = _('United Kingdom');
-$CountriesArray[] = _('United States');
-$CountriesArray[] = _('Uruguay');
-$CountriesArray[] = _('Uzbekistan');
-$CountriesArray[] = _('St. Vincent and the Grenadines');
-$CountriesArray[] = _('Venezuela');
-$CountriesArray[] = _('British Virgin Islands');
-$CountriesArray[] = _('Virgin Islands, U.S.');
-$CountriesArray[] = _('Viet Nam');
-$CountriesArray[] = _('Vanuatu');
-$CountriesArray[] = _('Samoa');
-$CountriesArray[] = _('Yemen');
-$CountriesArray[] = _('Zambia');
-$CountriesArray[] = _('Zimbabwe');
+$CountriesArray['AD'] = _('Andorra');
+$CountriesArray['AE'] = _('United Arab Emirates');
+$CountriesArray['AF'] = _('Afghanistan');
+$CountriesArray['AG'] = _('Antigua and Barbuda');
+$CountriesArray['AI'] = _('Anguilla');
+$CountriesArray['AL'] = _('Albania');
+$CountriesArray['AM'] = _('Armenia');
+$CountriesArray['AO'] = _('Angola');
+$CountriesArray['AG'] = _('Argentina');
+$CountriesArray['AS'] = _('American Samoa');
+$CountriesArray['AT'] = _('Austria');
+$CountriesArray['AU'] = _('Australia');
+$CountriesArray['AW'] = _('Aruba');
+$CountriesArray['AZ'] = _('Azerbaijan');
+$CountriesArray['BA'] = _('Bosnia and Herzegovina');
+$CountriesArray['BB'] = _('Barbados');
+$CountriesArray['BD'] = _('Bangladesh');
+$CountriesArray['BE'] = _('Belgium');
+$CountriesArray['BF'] = _('Burkina Faso');
+$CountriesArray['BU'] = _('Bulgaria');
+$CountriesArray['BH'] = _('Bahrain');
+$CountriesArray['BI'] = _('Burundi');
+$CountriesArray['BJ'] = _('Benin');
+$CountriesArray['BM'] = _('Bermuda');
+$CountriesArray['BN'] = _('Brunei Darussalam');
+$CountriesArray['BO'] = _('Bolivia');
+$CountriesArray['BR'] = _('Brazil');
+$CountriesArray['BS'] = _('Bahamas');
+$CountriesArray['BT'] = _('Bhutan');
+$CountriesArray['BW'] = _('Botswana');
+$CountriesArray['BY'] = _('Belarus');
+$CountriesArray['BZ'] = _('Belize');
+$CountriesArray['CA'] = _('Canada');
+$CountriesArray['CG'] = _('Congo');
+$CountriesArray['CF'] = _('Central African Republic');
+$CountriesArray['CH'] = _('Switzerland');
+$CountriesArray['CI'] = _('Cote D Ivoire');
+$CountriesArray['CK'] = _('Cook Islands');
+$CountriesArray['CL'] = _('Chile');
+$CountriesArray['CM'] = _('Cameroon');
+$CountriesArray['CN'] = _('China');
+$CountriesArray['CO'] = _('Colombia');
+$CountriesArray['CR'] = _('Costa Rica');
+$CountriesArray['ME'] = _('Montenegro');
+$CountriesArray['CT'] = _('Catalonia');
+$CountriesArray['CU'] = _('Cuba');
+$CountriesArray['CV'] = _('Cape Verde');
+$CountriesArray['CY'] = _('Cyprus');
+$CountriesArray['CZ'] = _('Czech Republic');
+$CountriesArray['DE'] = _('Germany');
+$CountriesArray['DJ'] = _('Djibouti');
+$CountriesArray['DE'] = _('Denmark');
+$CountriesArray['DM'] = _('Dominica');
+$CountriesArray['DO'] = _('Dominican Republic');
+$CountriesArray['DZ'] = _('Algeria');
+$CountriesArray['EC'] = _('Ecuador');
+$CountriesArray['EE'] = _('Estonia');
+$CountriesArray['EG'] = _('Egypt');
+$CountriesArray['ER'] = _('Eritrea');
+$CountriesArray['ES'] = _('Spain');
+$CountriesArray['ET'] = _('Ethiopia');
+$CountriesArray['FI'] = _('Finland');
+$CountriesArray['FJ'] = _('Fiji');
+$CountriesArray['FK'] = _('Falkland Islands');
+$CountriesArray['FM'] = _('Micronesia');
+$CountriesArray['FO'] = _('Faroe Islands');
+$CountriesArray['FR'] = _('France');
+$CountriesArray['GA'] = _('Gabon');
+$CountriesArray['GD'] = _('Grenada');
+$CountriesArray['GE'] = _('Georgia');
+$CountriesArray['GF'] = _('French Guiana');
+$CountriesArray['GG'] = _('Guernsey and Alderney');
+$CountriesArray['GH'] = _('Ghana');
+$CountriesArray['GI'] = _('Gibraltar');
+$CountriesArray['GL'] = _('Greenland');
+$CountriesArray['GM'] = _('Gambia');
+$CountriesArray['GN'] = _('Guinea');
+$CountriesArray['GP'] = _('Guadeloupe');
+$CountriesArray['GR'] = _('Greece');
+$CountriesArray['GT'] = _('Guatemala');
+$CountriesArray['GU'] = _('Guam');
+$CountriesArray['GW'] = _('Guinea-Bissau');
+$CountriesArray['GY'] = _('Guyana');
+$CountriesArray['HK'] = _('Hong Kong)');
+$CountriesArray['HN'] = _('Honduras');
+$CountriesArray['HR'] = _('Croatia');
+$CountriesArray['HT'] = _('Haiti');
+$CountriesArray['HU'] = _('Hungary');
+$CountriesArray['ID'] = _('Indonesia');
+$CountriesArray['IE'] = _('Ireland');
+$CountriesArray['IL'] = _('Israel');
+$CountriesArray['IN'] = _('India');
+$CountriesArray['IQ'] = _('Iraq');
+$CountriesArray['IR'] = _('Iran');
+$CountriesArray['IS'] = _('Iceland');
+$CountriesArray['IT'] = _('Italy');
+$CountriesArray['JE'] = _('Jersey');
+$CountriesArray['JM'] = _('Jamaica');
+$CountriesArray['JO'] = _('Jordan');
+$CountriesArray['JP'] = _('Japan');
+$CountriesArray['KE'] = _('Kenya');
+$CountriesArray['KG'] = _('Kyrgyzstan');
+$CountriesArray['KH'] = _('Cambodia');
+$CountriesArray['KI'] = _('Kiribati');
+$CountriesArray['KM'] = _('Comoros');
+$CountriesArray['KN'] = _('Saint Kitts and Nevis');
+$CountriesArray['KR'] = _('Korea (South)');
+$CountriesArray['KW'] = _('Kuwait');
+$CountriesArray['KY'] = _('Cayman Islands');
+$CountriesArray['KZ'] = _('Kazakhstan');
+$CountriesArray['LA'] = _('Lao People s Dem. Rep.');
+$CountriesArray['LB'] = _('Lebanon');
+$CountriesArray['LC'] = _('Saint Lucia');
+$CountriesArray['LI'] = _('Liechtenstein');
+$CountriesArray['LK'] = _('Sri Lanka');
+$CountriesArray['LS'] = _('Lesotho');
+$CountriesArray['LT'] = _('Lithuania');
+$CountriesArray['LU'] = _('Luxembourg');
+$CountriesArray['LV'] = _('Latvia');
+$CountriesArray['LY'] = _('Libyan Arab Jamahiriya');
+$CountriesArray['MA'] = _('Morocco');
+$CountriesArray['MC'] = _('Monaco');
+$CountriesArray['MD'] = _('Moldova, Republic of');
+$CountriesArray['MG'] = _('Madagascar');
+$CountriesArray['MK'] = _('Macedonia, TFYR');
+$CountriesArray['ML'] = _('Mali');
+$CountriesArray['MM'] = _('Myanmar');
+$CountriesArray['MN'] = _('Mongolia');
+$CountriesArray['MO'] = _('Macao, (China)');
+$CountriesArray['MP'] = _('Northern Mariana Islands');
+$CountriesArray['MQ'] = _('Martinique');
+$CountriesArray['MR'] = _('Mauritania');
+$CountriesArray['MT'] = _('Malta');
+$CountriesArray['MU'] = _('Mauritius');
+$CountriesArray['MV'] = _('Maldives');
+$CountriesArray['MW'] = _('Malawi');
+$CountriesArray['MX'] = _('Mexico');
+$CountriesArray['MY'] = _('Malaysia');
+$CountriesArray['MZ'] = _('Mozambique');
+$CountriesArray['NA'] = _('Namibia');
+$CountriesArray['NC'] = _('New Caledonia');
+$CountriesArray['NE'] = _('Niger');
+$CountriesArray['NG'] = _('Nigeria');
+$CountriesArray['NI'] = _('Nicaragua');
+$CountriesArray['NE'] = _('Netherlands');
+$CountriesArray['NO'] = _('Norway');
+$CountriesArray['NP'] = _('Nepal');
+$CountriesArray['NZ'] = _('New Zealand');
+$CountriesArray['OM'] = _('Oman');
+$CountriesArray['PA'] = _('Panama');
+$CountriesArray['PE'] = _('Peru');
+$CountriesArray['PF'] = _('French Polynesia');
+$CountriesArray['PG'] = _('Papua New Guinea');
+$CountriesArray['PH'] = _('Philippines');
+$CountriesArray['PK'] = _('Pakistan');
+$CountriesArray['PL'] = _('Poland');
+$CountriesArray['PS'] = _('Palestinian Territory');
+$CountriesArray['PT'] = _('Portugal');
+$CountriesArray['PY'] = _('Paraguay');
+$CountriesArray['QA'] = _('Qatar');
+$CountriesArray['RO'] = _('Romania');
+$CountriesArray['RS'] = _('Serbia');
+$CountriesArray['RU'] = _('Russian Federation');
+$CountriesArray['RW'] = _('Rwanda');
+$CountriesArray['SA'] = _('Saudi Arabia');
+$CountriesArray['SB'] = _('Solomon Islands');
+$CountriesArray['SC'] = _('Seychelles');
+$CountriesArray['SD'] = _('Sudan');
+$CountriesArray['SE'] = _('Sweden');
+$CountriesArray['SG'] = _('Singapore');
+$CountriesArray['SI'] = _('Slovenia');
+$CountriesArray['SK'] = _('Slovakia');
+$CountriesArray['SM'] = _('San Marino');
+$CountriesArray['SN'] = _('Senegal');
+$CountriesArray['SO'] = _('Somalia');
+$CountriesArray['SR'] = _('Suriname');
+$CountriesArray['ST'] = _('Sao Tome and Principe');
+$CountriesArray['SV'] = _('El Salvador');
+$CountriesArray['SY'] = _('Syrian Arab Republic');
+$CountriesArray['SZ'] = _('Swaziland');
+$CountriesArray['TD'] = _('Chad');
+$CountriesArray['TG'] = _('Togo');
+$CountriesArray['TH'] = _('Thailand');
+$CountriesArray['TJ'] = _('Tajikistan');
+$CountriesArray['TM'] = _('Turkmenistan');
+$CountriesArray['TN'] = _('Tunisia');
+$CountriesArray['TO'] = _('Tonga');
+$CountriesArray['TL'] = _('East Timor (Timor-Leste)');
+$CountriesArray['TR'] = _('Turkey');
+$CountriesArray['TT'] = _('Trinidad and Tobago');
+$CountriesArray['TW'] = _('Taiwan');
+$CountriesArray['TZ'] = _('Tanzania, United Rep. of');
+$CountriesArray['UA'] = _('Ukraine');
+$CountriesArray['UG'] = _('Uganda');
+$CountriesArray['GB'] = _('United Kingdom');
+$CountriesArray['US'] = _('United States');
+$CountriesArray['UY'] = _('Uruguay');
+$CountriesArray['UZ'] = _('Uzbekistan');
+$CountriesArray['VC'] = _('St. Vincent and the Grenadines');
+$CountriesArray['VE'] = _('Venezuela');
+$CountriesArray['VG'] = _('British Virgin Islands');
+$CountriesArray['VI'] = _('Virgin Islands, U.S.');
+$CountriesArray['VN'] = _('Viet Nam');
+$CountriesArray['VU'] = _('Vanuatu');
+$CountriesArray['WS'] = _('Samoa');
+$CountriesArray['YE'] = _('Yemen');
+$CountriesArray['ZM'] = _('Zambia');
+$CountriesArray['ZW'] = _('Zimbabwe');
asort($CountriesArray);
-?>
+?>
\ No newline at end of file
Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2013-05-24 22:47:01 UTC (rev 5983)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot 2013-05-24 23:08:09 UTC (rev 5984)
@@ -8,15 +8,15 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-25 21:56+1300\n"
+"POT-Creation-Date: 2013-05-25 11:02+1200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: AccountGroups.php:7 includes/MainMenuLinksArray.php:356
+#: AccountGroups.php:7 includes/MainMenuLinksArray.php:358
msgid "Account Groups"
msgstr ""
@@ -139,12 +139,12 @@
#: AccountGroups.php:212 AccountGroups.php:247 AccountSections.php:133
#: Areas.php:115 Areas.php:124 BankAccounts.php:159 CreditStatus.php:125
-#: Currencies.php:167 Currencies.php:175 Currencies.php:183
+#: Currencies.php:155 Currencies.php:163 Currencies.php:171
#: CustomerBranches.php:290 CustomerBranches.php:300 CustomerBranches.php:310
#: CustomerBranches.php:320 Customers.php:294 Customers.php:303
#: Customers.php:311 Customers.php:319 CustomerTypes.php:147
#: CustomerTypes.php:157 Departments.php:141 Factors.php:134
-#: FixedAssetCategories.php:137 GLAccounts.php:83 GLAccounts.php:99
+#: FixedAssetCategories.php:137 GLAccounts.php:80 GLAccounts.php:96
#: Locations.php:249 Locations.php:257 Locations.php:268 Locations.php:277
#: Locations.php:286 Locations.php:295 Locations.php:304 Locations.php:313
#: Locations.php:321 MRPDemandTypes.php:87 PaymentMethods.php:142
@@ -153,10 +153,11 @@
#: SalesPeople.php:157 SalesPeople.php:163 SalesTypes.php:140
#: SalesTypes.php:150 Shippers.php:81 Shippers.php:93 StockCategories.php:188
#: Stocks.php:672 Stocks.php:681 Stocks.php:689 Stocks.php:697 Stocks.php:705
-#: Stocks.php:713 Suppliers.php:625 Suppliers.php:634 Suppliers.php:642
-#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:132
-#: TaxGroups.php:140 TaxProvinces.php:129 UnitsOfMeasure.php:135
-#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:83
+#: Stocks.php:713 Stocks.php:721 Stocks.php:729 Suppliers.php:625
+#: Suppliers.php:634 Suppliers.php:642 SupplierTypes.php:145
+#: TaxCategories.php:131 TaxGroups.php:132 TaxGroups.php:140
+#: TaxProvinces.php:129 UnitsOfMeasure.php:135 WorkCentres.php:89
+#: WorkCentres.php:95 WWW_Access.php:83
msgid "There are"
msgstr ""
@@ -208,18 +209,18 @@
#: AddCustomerContacts.php:27 AddCustomerNotes.php:101
#: AddCustomerTypeNotes.php:94 AgedDebtors.php:448 AgedSuppliers.php:276
#: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:17
-#: BOMExtendedQty.php:250 BOMIndented.php:246 BOMIndentedReverse.php:235
-#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:231 BOMs.php:858
+#: BOMExtendedQty.php:252 BOMIndented.php:246 BOMIndentedReverse.php:235
+#: BOMInquiry.php:187 BOMListing.php:109 BOMs.php:231 BOMs.php:860
#: COGSGLPostings.php:19 CompanyPreferences.php:155 CounterReturns.php:1607
-#: CounterSales.php:2074 CounterSales.php:2199 Credit_Invoice.php:270
-#: CreditStatus.php:21 Currencies.php:29 CustEDISetup.php:17
+#: CounterSales.php:2085 CounterSales.php:2210 Credit_Invoice.php:270
+#: CreditStatus.php:21 Currencies.php:31 CustEDISetup.php:17
#: DailyBankTransactions.php:15 DebtorsAtPeriodEnd.php:129
#: DiscountCategories.php:12 DiscountCategories.php:136 DiscountMatrix.php:16
#: EDIMessageFormat.php:105 FixedAssetLocations.php:13
#: FixedAssetRegister.php:13 FixedAssetRegister.php:253
#: FixedAssetTransfer.php:14 FormDesigner.php:129 GLBalanceSheet.php:382
#: GLBudgets.php:32 GLJournalInquiry.php:11 GLJournal.php:250
-#: InternalStockRequest.php:299 InventoryPlanning.php:379
+#: InternalStockRequest.php:308 InventoryPlanning.php:379
#: InventoryPlanningPrefSupplier.php:469 MRPReport.php:516 NoSalesItems.php:89
#: PcAssignCashToTab.php:59 PcAssignCashToTab.php:133
#: PcAssignCashToTab.php:149 PcAssignCashToTab.php:193 PDFPickingList.php:28
@@ -241,9 +242,9 @@
#: StockSerialItemResearch.php:30 SupplierPriceList.php:15
#: SupplierPriceList.php:217 SupplierPriceList.php:387
#: SupplierPriceList.php:391 SupplierPriceList.php:442
-#: SupplierPriceList.php:492 Suppliers.php:305 SupplierTenderCreate.php:522
-#: SupplierTenderCreate.php:628 SupplierTenders.php:322
-#: SupplierTenders.php:388 SupplierTransInquiry.php:10 TaxGroups.php:15
+#: SupplierPriceList.php:492 Suppliers.php:305 SupplierTenderCreate.php:546
+#: SupplierTenderCreate.php:652 SupplierTenders.php:323
+#: SupplierTenders.php:389 SupplierTransInquiry.php:10 TaxGroups.php:15
#: TaxProvinces.php:11 TopItems.php:114 UnitsOfMeasure.php:10
#: WhereUsedInquiry.php:18 WorkCentres.php:111 WorkCentres.php:162
#: WorkOrderCosting.php:22 WorkOrderEntry.php:11 WorkOrderIssue.php:22
@@ -271,14 +272,15 @@
msgstr ""
#: AccountGroups.php:306 AccountGroups.php:309 AccountGroups.php:444
-#: AccountGroups.php:446 BOMs.php:124 BOMs.php:772 BOMs.php:774
+#: AccountGroups.php:446 BOMs.php:124 BOMs.php:774 BOMs.php:776
#: CompanyPreferences.php:479 CompanyPreferences.php:481
#: CompanyPreferences.php:494 CompanyPreferences.php:496
#: CompanyPreferences.php:509 CompanyPreferences.php:511
-#: ContractCosting.php:198 CustomerBranches.php:414 Customers.php:601
+#: ContractCosting.php:198 Currencies.php:241 Currencies.php:407
+#: Currencies.php:409 CustomerBranches.php:414 Customers.php:601
#: Customers.php:969 Customers.php:975 Customers.php:978
-#: DailyBankTransactions.php:145 DeliveryDetails.php:1116
-#: DeliveryDetails.php:1159 DeliveryDetails.php:1162 GLTransInquiry.php:69
+#: DailyBankTransactions.php:145 DeliveryDetails.php:1125
+#: DeliveryDetails.php:1168 DeliveryDetails.php:1171 GLTransInquiry.php:69
#: Labels.php:591 Labels.php:593 Labels.php:618 Locations.php:617
#: Locations.php:619 MRPCalendar.php:224 MRP.php:540 MRP.php:544 MRP.php:548
#: MRP.php:552 PaymentMethods.php:204 PaymentMethods.php:205
@@ -287,7 +289,7 @@
#: PcAuthorizeExpenses.php:246 PDFChequeListing.php:65
#: PDFDeliveryDifferences.php:76 PDFDIFOT.php:76
#: PO_AuthorisationLevels.php:134 PO_AuthorisationLevels.php:139
-#: PO_Header.php:777 PO_PDFPurchOrder.php:394 PO_PDFPurchOrder.php:397
+#: PO_Header.php:777 PO_PDFPurchOrder.php:403 PO_PDFPurchOrder.php:406
#: PurchData.php:291 PurchData.php:662 PurchData.php:665
#: RecurringSalesOrders.php:493 RecurringSalesOrders.php:496
#: SalesAnalReptCols.php:284 SalesAnalReptCols.php:419
@@ -295,15 +297,16 @@
#: SalesAnalRepts.php:448 SalesAnalRepts.php:451 SalesAnalRepts.php:476
#: SalesAnalRepts.php:479 SalesPeople.php:219 SalesPeople.php:356
#: SalesPeople.php:358 SelectProduct.php:397 ShipmentCosting.php:667
-#: Stocks.php:1078 Stocks.php:1080 Stocks.php:1103 Stocks.php:1105
-#: SuppContractChgs.php:90 SystemParameters.php:408 SystemParameters.php:431
-#: SystemParameters.php:447 SystemParameters.php:519 SystemParameters.php:527
-#: SystemParameters.php:567 SystemParameters.php:647 SystemParameters.php:656
-#: SystemParameters.php:664 SystemParameters.php:682 SystemParameters.php:689
-#: SystemParameters.php:733 SystemParameters.php:829 SystemParameters.php:964
-#: SystemParameters.php:966 SystemParameters.php:976 SystemParameters.php:978
-#: SystemParameters.php:1032 SystemParameters.php:1044
-#: SystemParameters.php:1046 TaxGroups.php:311 TaxGroups.php:314
+#: Stocks.php:1096 Stocks.php:1098 Stocks.php:1121 Stocks.php:1123
+#: SuppContractChgs.php:90 SystemParameters.php:415 SystemParameters.php:438
+#: SystemParameters.php:454 SystemParameters.php:526 SystemParameters.php:534
+#: SystemParameters.php:574 SystemParameters.php:654 SystemParameters.php:663
+#: SystemParameters.php:671 SystemParameters.php:689 SystemParameters.php:696
+#: SystemParameters.php:740 SystemParameters.php:836 SystemParameters.php:971
+#: SystemParameters.php:973 SystemParameters.php:983 SystemParameters.php:985
+#: SystemParameters.php:1039 SystemParameters.php:1051
+#: SystemParameters.php:1053 SystemParameters.php:1091
+#: SystemParameters.php:1093 TaxGroups.php:311 TaxGroups.php:314
#: TaxGroups.php:371 WWW_Users.php:493 WWW_Users.php:495 WWW_Users.php:666
#: WWW_Users.php:668
msgid "Yes"
@@ -311,14 +314,15 @@
#: AccountGroups.php:312 AccountGroups.php:449 AccountGroups.php:451
#: BankAccounts.php:210 BankAccounts.php:379 BankAccounts.php:381
-#: BankAccounts.php:385 BankAccounts.php:393 BOMs.php:126 BOMs.php:771
-#: BOMs.php:775 CompanyPreferences.php:478 CompanyPreferences.php:482
+#: BankAccounts.php:385 BankAccounts.php:393 BOMs.php:126 BOMs.php:773
+#: BOMs.php:777 CompanyPreferences.php:478 CompanyPreferences.php:482
#: CompanyPreferences.php:493 CompanyPreferences.php:497
#: CompanyPreferences.php:508 CompanyPreferences.php:512
-#: ContractCosting.php:196 CustomerBranches.php:414 Customers.php:600
+#: ContractCosting.php:196 Currencies.php:243 Currencies.php:412
+#: Currencies.php:414 CustomerBranches.php:414 Customers.php:600
#: Customers.php:967 Customers.php:974 Customers.php:977
-#: DailyBankTransactions.php:147 DeliveryDetails.php:1117
-#: DeliveryDetails.php:1160 DeliveryDetails.php:1163 GLTransInquiry.php:90
+#: DailyBankTransactions.php:147 DeliveryDetails.php:1126
+#: DeliveryDetails.php:1169 DeliveryDetails.php:1172 GLTransInquiry.php:90
#: Labels.php:590 Labels.php:594 Labels.php:619 Locations.php:622
#: Locations.php:624 MRPCalendar.php:226 MRP.php:538 MRP.php:542 MRP.php:546
#: MRP.php:550 NoSalesItems.php:184 PaymentMethods.php:204
@@ -327,7 +331,7 @@
#: PaymentMethods.php:295 PcAuthorizeExpenses.php:244 PDFChequeListing.php:64
#: PDFDeliveryDifferences.php:75 PDFDIFOT.php:75
#: PO_AuthorisationLevels.php:136 PO_AuthorisationLevels.php:141
-#: PO_Header.php:776 PO_PDFPurchOrder.php:395 PO_PDFPurchOrder.php:398
+#: PO_Header.php:776 PO_PDFPurchOrder.php:404 PO_PDFPurchOrder.php:407
#: PurchData.php:294 PurchData.php:663 PurchData.php:666
#: RecurringSalesOrders.php:492 RecurringSalesOrders.php:495
#: SalesAnalReptCols.php:282 SalesAnalReptCols.php:420
@@ -335,15 +339,16 @@
#: SalesAnalRepts.php:447 SalesAnalRepts.php:450 SalesAnalRepts.php:475
#: SalesAnalRepts.php:478 SalesPeople.php:221 SalesPeople.php:361
#: SalesPeople.php:363 SelectProduct.php:399 ShipmentCosting.php:668
-#: Stocks.php:1073 Stocks.php:1075 Stocks.php:1098 Stocks.php:1100
-#: SuppContractChgs.php:92 SystemParameters.php:409 SystemParameters.php:432
-#: SystemParameters.php:448 SystemParameters.php:520 SystemParameters.php:528
-#: SystemParameters.php:568 SystemParameters.php:648 SystemParame...
[truncated message content] |
|
From: <te...@us...> - 2013-05-28 03:51:52
|
Revision: 5991
http://sourceforge.net/p/web-erp/reponame/5991
Author: tehonu
Date: 2013-05-28 03:51:49 +0000 (Tue, 28 May 2013)
Log Message:
-----------
PakRicard: Allow DB_maintenance be set to -1 ==> system will allow login only to SysAdmin users (15). Other users will receive message "system under maintenance"
Modified Paths:
--------------
trunk/SystemParameters.php
trunk/api/api_login.php
trunk/includes/UserLogin.php
trunk/includes/session.inc
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2013-05-28 02:35:48 UTC (rev 5990)
+++ trunk/SystemParameters.php 2013-05-28 03:51:49 UTC (rev 5991)
@@ -862,6 +862,11 @@
} else {
echo '<option value="0">'._('Never') . '</option>';
}
+ if ($_SESSION['DB_Maintenance']=='-1'){
+ echo '<option selected="selected" value="-1">'._('Allow SysAdmin Access Only') . '</option>';
+ } else {
+ echo '<option value="-1">'._('Allow SysAdmin Access Only') . '</option>';
+ }
echo '</select></td>
<td>' . _('Uses the function DB_Maintenance defined in ConnectDB_XXXX.inc to perform database maintenance tasks, to run at regular intervals - checked at each and every user login') . '</td>
Modified: trunk/api/api_login.php
===================================================================
--- trunk/api/api_login.php 2013-05-28 02:35:48 UTC (rev 5990)
+++ trunk/api/api_login.php 2013-05-28 03:51:49 UTC (rev 5991)
@@ -108,7 +108,7 @@
$db = $_SESSION['db']; // Used a bit in the following.
if(isset($_SESSION['DB_Maintenance'])){
- if ($_SESSION['DB_Maintenance']!=0) {
+ if ($_SESSION['DB_Maintenance']>0) {
if (DateDiff(Date($_SESSION['DefaultDateFormat']),
ConvertSQLDate($_SESSION['DB_Maintenance_LastRun'])
,'d') > $_SESSION['DB_Maintenance']){
Modified: trunk/includes/UserLogin.php
===================================================================
--- trunk/includes/UserLogin.php 2013-05-28 02:35:48 UTC (rev 5990)
+++ trunk/includes/UserLogin.php 2013-05-28 03:51:49 UTC (rev 5991)
@@ -93,12 +93,28 @@
return UL_CONFIGERR;
} else {
$i=0;
+ $UserIsSysAdmin = FALSE;
while ($myrow = DB_fetch_row($Sec_Result)){
+ if ($myrow[0] == 15){
+ $UserIsSysAdmin = TRUE;
+ }
$_SESSION['AllowedPageSecurityTokens'][$i] = $myrow[0];
$i++;
}
}
- // Temporary shift - disable log messages - how temporary?
+ // check if only maintenance users can access webERP
+ $sql = "SELECT confvalue FROM config WHERE confname = 'DB_Maintenance'";
+ $Maintenance_Result = DB_query($sql, $db);
+ if (DB_num_rows($Maintenance_Result)==0){
+ return UL_CONFIGERR;
+ } else {
+ $myMaintenanceRow = DB_fetch_row($Maintenance_Result);
+ if (($myMaintenanceRow[0] == -1) AND ($UserIsSysAdmin == FALSE)){
+ // the configuration setting has been set to -1 ==> Allow SysAdmin Access Only
+ // the user is NOT a SysAdmin
+ return UL_MAINTENANCE;
+ }
+ }
} else { // Incorrect password
// 5 login attempts, show failed login screen
if (!isset($_SESSION['AttemptsCounter'])) {
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2013-05-28 02:35:48 UTC (rev 5990)
+++ trunk/includes/session.inc 2013-05-28 03:51:49 UTC (rev 5991)
@@ -144,7 +144,7 @@
}
if(isset($_SESSION['DB_Maintenance'])){
- if ($_SESSION['DB_Maintenance']!=0) {
+ if ($_SESSION['DB_Maintenance']>0) {
if (DateDiff(Date($_SESSION['DefaultDateFormat']),
ConvertSQLDate($_SESSION['DB_Maintenance_LastRun'])
,'d') >= $_SESSION['DB_Maintenance']){
|
|
From: <dai...@us...> - 2013-05-29 09:28:19
|
Revision: 5995
http://sourceforge.net/p/web-erp/reponame/5995
Author: daintree
Date: 2013-05-29 09:28:15 +0000 (Wed, 29 May 2013)
Log Message:
-----------
added jquery 1.9 and validate
Modified Paths:
--------------
trunk/PO_Header.php
trunk/includes/header.inc
Added Paths:
-----------
trunk/javascripts/jquery-1.9.1.min.js
trunk/javascripts/jquery.validate.min.js
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2013-05-28 14:14:34 UTC (rev 5994)
+++ trunk/PO_Header.php 2013-05-29 09:28:15 UTC (rev 5995)
@@ -150,6 +150,11 @@
$ErrMsg = _('The order status could not be updated because');
$UpdateResult = DB_query($SQL, $db, $ErrMsg);
+
+ if ($_POST['Status']=='Completed' OR $_POST['Status']=='Cancelled' OR $_POST['Status']=='Rejected') {
+ $SQL = "UPDATE purchorderdetails SET completed=1 WHERE orderno='" . $_SESSION['ExistingOrder'] . "'";
+ $UpdateResult =DB_query($SQL,$db,$ErrMsg);
+ }
} //$OKToUpdateStatus == 1
} //end if there is actually a status change the class Status != the POST['Status']
} //End if user hit Update Status
Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc 2013-05-28 14:14:34 UTC (rev 5994)
+++ trunk/includes/header.inc 2013-05-29 09:28:15 UTC (rev 5995)
@@ -38,7 +38,9 @@
echo '<meta http-equiv="Content-Type" content="application/html; charset=utf-8" />';
}
echo '<link href="' . $RootPath . '/css/'. $_SESSION['Theme'] .'/default.css" rel="stylesheet" type="text/css" />';
- echo '<script type="text/javascript" src = "'.$RootPath.'/javascripts/MiscFunctions.js"></script>';
+ echo '<script type="text/javascript" src = "'.$RootPath.'/javascripts/MiscFunctions.js"></script>
+ <script type="text/javascript" src = "'.$RootPath.'/javascripts/MiscFunctions.js"></script>
+ <script type="text/javascript" src = "'.$RootPath.'/javascripts/jquery.validate.min.js"></script>';
echo '</head>';
echo '<body>';
Added: trunk/javascripts/jquery-1.9.1.min.js
===================================================================
--- trunk/javascripts/jquery-1.9.1.min.js (rev 0)
+++ trunk/javascripts/jquery-1.9.1.min.js 2013-05-29 09:28:15 UTC (rev 5995)
@@ -0,0 +1,5 @@
+/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery.min.map
+*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEventListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*"),r=d.getElementsByTagName("a")[0],!n||!r||!n.length)return{};s=o.createElement("select"),l=s.appendChild(o.createElement("option")),a=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={getSetAttribute:"t"!==d.className,leadingWhitespace:3===d.firstChild.nodeType,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:!!a.value,optSelected:l.selected,enctype:!!o.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==o.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===o.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!l.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}a=o.createElement("input"),a.setAttribute("value",""),t.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","t"),a.setAttribute("name","t"),u=o.createDocumentFragment(),u.appendChild(a),t.appendChecked=a.checked,t.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;return d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip,b(function(){var n,r,a,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",u=o.getElementsByTagName("body")[0];u&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",u.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",a=d.getElementsByTagName("td"),a[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===a[0].offsetHeight,a[0].style.display="",a[1].style.display="none",t.reliableHiddenOffsets=p&&0===a[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=4===d.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==u.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(o.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(u.style.zoom=1)),u.removeChild(n),n=d=a=r=null)}),n=s=u=l=r=a=null,t}();var O=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,B=/([A-Z])/g;function P(e,n,r,i){if(b.acceptData(e)){var o,a,s=b.expando,u="string"==typeof n,l=e.nodeType,p=l?b.cache:e,f=l?e[s]:e[s]&&s;if(f&&p[f]&&(i||p[f].data)||!u||r!==t)return f||(l?e[s]=f=c.pop()||b.guid++:f=s),p[f]||(p[f]={},l||(p[f].toJSON=b.noop)),("object"==typeof n||"function"==typeof n)&&(i?p[f]=b.extend(p[f],n):p[f].data=b.extend(p[f].data,n)),o=p[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[b.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[b.camelCase(n)])):a=o,a}}function R(e,t,n){if(b.acceptData(e)){var r,i,o,a=e.nodeType,s=a?b.cache:e,u=a?e[b.expando]:b.expando;if(s[u]){if(t&&(o=n?s[u]:s[u].data)){b.isArray(t)?t=t.concat(b.map(t,b.camelCase)):t in o?t=[t]:(t=b.camelCase(t),t=t in o?[t]:t.split(" "));for(r=0,i=t.length;i>r;r++)delete o[t[r]];if(!(n?$:b.isEmptyObject)(o))return}(n||(delete s[u].data,$(s[u])))&&(a?b.cleanData([e],!0):b.support.deleteExpando||s!=s.window?delete s[u]:s[u]=null)}}}b.extend({cache:{},expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?b.cache[e[b.expando]]:e[b.expando],!!e&&!$(e)},data:function(e,t,n){return P(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return P(e,t,n,!0)},_removeData:function(e,t){return R(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&b.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),b.fn.extend({data:function(e,n){var r,i,o=this[0],a=0,s=null;if(e===t){if(this.length&&(s=b.data(o),1===o.nodeType&&!b._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>a;a++)i=r[a].name,i.indexOf("data-")||(i=b.camelCase(i.slice(5)),W(o,i,s[i]));b._data(o,"parsedAttrs",!0)}return s}return"object"==typeof e?this.each(function(){b.data(this,e)}):b.access(this,function(n){return n===t?o?W(o,e,b.data(o,e)):null:(this.each(function(){b.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function W(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(B,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:O.test(r)?b.parseJSON(r):r}catch(o){}b.data(e,n,r)}else r=t}return r}function $(e){var t;for(t in e)if(("data"!==t||!b.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}b.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=b._data(e,n),r&&(!i||b.isArray(r)?i=b._data(e,n,b.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=b.queue(e,t),r=n.length,i=n.shift(),o=b._queueHooks(e,t),a=function(){b.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return b._data(e,n)||b._data(e,n,{empty:b.Callbacks("once memory").add(function(){b._removeData(e,t+"queue"),b._removeData(e,n)})})}}),b.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?b.queue(this[0],e):n===t?this:this.each(function(){var t=b.queue(this,e,n);b._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&b.dequeue(this,e)})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(e,t){return e=b.fx?b.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=b.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=b._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var I,z,X=/[\t\r\n]/g,U=/\r/g,V=/^(?:input|select|textarea|button|object)$/i,Y=/^(?:a|area)$/i,J=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,G=/^(?:checked|selected)$/i,Q=b.support.getSetAttribute,K=b.support.input;b.fn.extend({attr:function(e,t){return b.access(this,b.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,t){return b.access(this,b.prop,e,t,arguments.length>1)},removeProp:function(e){return e=b.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=b.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?b.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return b.isFunction(e)?this.each(function(n){b(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=b(this),u=t,l=e.match(w)||[];while(o=l[a++])u=r?u:!s.hasClass(o),s[u?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&b._data(this,"__className__",this.className),this.className=this.className||e===!1?"":b._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(X," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=b.isFunction(e),this.each(function(n){var o,a=b(this);1===this.nodeType&&(o=i?e.call(this,n,a.val()):e,null==o?o="":"number"==typeof o?o+="":b.isArray(o)&&(o=b.map(o,function(e){return null==e?"":e+""})),r=b.valHooks[this.type]||b.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=b.valHooks[o.type]||b.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(U,""):null==n?"":n)}}}),b.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;for(;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(b.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&b.nodeName(n.parentNode,"optgroup"))){if(t=b(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=b.makeArray(t);return b(e).find("option").each(function(){this.selected=b.inArray(b(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var o,a,s,u=e.nodeType;if(e&&3!==u&&8!==u&&2!==u)return typeof e.getAttribute===i?b.prop(e,n,r):(a=1!==u||!b.isXMLDoc(e),a&&(n=n.toLowerCase(),o=b.attrHooks[n]||(J.test(n)?z:I)),r===t?o&&a&&"get"in o&&null!==(s=o.get(e,n))?s:(typeof e.getAttribute!==i&&(s=e.getAttribute(n)),null==s?t:s):null!==r?o&&a&&"set"in o&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r):(b.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=b.propFix[n]||n,J.test(n)?!Q&&G.test(n)?e[b.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:b.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!b.support.radioValue&&"radio"===t&&b.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!b.isXMLDoc(e),a&&(n=b.propFix[n]||n,o=b.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):V.test(e.nodeName)||Y.test(e.nodeName)&&e.href?0:t}}}}),z={get:function(e,n){var r=b.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?K&&Q?null!=i:G.test(n)?e[b.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?b.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&b.propFix[n]||n,n):e[b.camelCase("default-"+n)]=e[n]=!0,n}},K&&Q||(b.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return b.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t},set:function(e,n,r){return b.nodeName(e,"input")?(e.defaultValue=n,t):I&&I.set(e,n,r)}}),Q||(I=b.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},b.attrHooks.contenteditable={get:I.get,set:function(e,t,n){I.set(e,""===t?!1:t,n)}},b.each(["width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),b.support.hrefNormalized||(b.each(["href","src","width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),b.each(["href","src"],function(e,t){b.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),b.support.style||(b.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),b.support.optSelected||(b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),b.support.enctype||(b.propFix.enctype="encoding"),b.support.checkOn||b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,n){return b.isArray(n)?e.checked=b.inArray(b(e).val(),n)>=0:t}})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}b.event={global:{},add:function(e,n,r,o,a){var s,u,l,c,p,f,d,h,g,m,y,v=b._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=b.guid++),(u=v.events)||(u=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof b===i||e&&b.event.triggered===e.type?t:b.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(w)||[""],l=n.length;while(l--)s=rt.exec(n[l])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),p=b.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=b.event.special[g]||{},d=b.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&b.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=u[g])||(h=u[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),b.event.global[g]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,p,f,d,h,g,m=b.hasData(e)&&b._data(e);if(m&&(c=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(s=rt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=b.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));u&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||b.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)b.event.remove(e,d+t[l],n,r,!0);b.isEmptyObject(c)&&(delete m.handle,b._removeData(e,"events"))}},trigger:function(n,r,i,a){var s,u,l,c,p,f,d,h=[i||o],g=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];if(l=f=i=i||o,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+b.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),u=0>g.indexOf(":")&&"on"+g,n=n[b.expando]?n:new b.Event(g,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:b.makeArray(r,[n]),p=b.event.special[g]||{},a||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!a&&!p.noBubble&&!b.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(l=l.parentNode);l;l=l.parentNode)h.push(l),f=l;f===(i.ownerDocument||o)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((l=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(b._data(l,"events")||{})[n.type]&&b._data(l,"handle"),s&&s.apply(l,r),s=u&&l[u],s&&b.acceptData(l)&&s.apply&&s.apply(l,r)===!1&&n.preventDefault();if(n.type=g,!(a||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===g&&b.nodeName(i,"a")||!b.acceptData(i)||!u||!i[g]||b.isWindow(i))){f=i[u],f&&(i[u]=null),b.event.triggered=g;try{i[g]()}catch(v){}b.event.triggered=t,f&&(i[u]=f)}return n.result}},dispatch:function(e){e=b.event.fix(e);var n,r,i,o,a,s=[],u=h.call(arguments),l=(b._data(t...
[truncated message content] |
|
From: <dai...@us...> - 2013-06-01 04:36:43
|
Revision: 6000
http://sourceforge.net/p/web-erp/reponame/6000
Author: daintree
Date: 2013-06-01 04:36:40 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
test jQuery validation
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/css/aguapop/default.css
trunk/css/default/default.css
trunk/css/fluid/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/professional/default.css
trunk/css/professional-rtl/default.css
trunk/css/silverwolf/default.css
trunk/css/wood/default.css
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2013-06-01 00:16:56 UTC (rev 5999)
+++ trunk/AccountGroups.php 2013-06-01 04:36:40 UTC (rev 6000)
@@ -11,6 +11,47 @@
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
+?>
+<script>
+ /* jQuery/javascript code */
+ jQuery(document).ready(function() {
+ jQuery('.noSpecialChars').bind('input', function() {
+ jQuery(this).val($(this).val().replace(/[^a-z0-9_\-]/gi, ''));
+ });
+ $('.number').bind('input', function() {
+ $(this).val($(this).val().replace(/[^0-9]/gi, ''));
+ });
+ jQuery('#AccountGroups').validate({
+ rules: {
+ GroupName: {
+ minlength: 3
+ },
+ SequenceInTB: {
+ digits: true
+ }
+ }, //end rules
+ messages : {
+ GroupName: {
+ required: "<?php echo _('The new account group name must be entered') ?>",
+ minlength: "<?php echo _('The account group is expected to be 3 characters or more long') ?>"
+ },
+ SequenceInTB: {
+ required: "<?php echo _('The sequence in the trial balance that the accounts under this account group should display must be entered') ?>",
+ digits: "<?php echo _('The sequence number can only contain digits') ?>"
+ }
+ }, //end messages
+
+ errorPlacement: function(error, element) {
+ error.insertAfter(element);
+ error.prepend('<br />');
+ } // end errorPlacement
+ }); //end validation
+ }
+ );
+</script>
+
+<?php
+
function CheckForRecursiveGroup ($ParentGroupName, $GroupName, $db) {
/* returns true ie 1 if the group contains the parent group as a child group
@@ -34,6 +75,9 @@
return false;
} //end of function CheckForRecursiveGroupName
+
+
+
// If $Errors is set, then unset it.
if (isset($Errors)) {
unset($Errors);
@@ -397,7 +441,7 @@
}
echo '<tr>
<td>' . _('Account Group Name') . ':' . '</td>
- <td><input tabindex="1" ' . (in_array('GroupName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="GroupName" size="50" maxlength="50" value="' . $_POST['GroupName'] . '" /></td>
+ <td><input tabindex="1" class="required noSpecialChars' . (in_array('GroupName',$Errors) ? ' inputerror' : '' ) . '" type="text" name="GroupName" size="30" maxlength="30" value="' . $_POST['GroupName'] . '" title="' . _('A unique name for the account group must be entered - at least 3 characters long and less than 30 characters long') . '" /></td>
</tr>
<tr>
<td>' . _('Parent Group') . ':' . '</td>
@@ -438,7 +482,7 @@
</tr>
<tr>
<td>' . _('Profit and Loss') . ':' . '</td>
- <td><select tabindex="4" name="PandL">';
+ <td><select tabindex="4" name="PandL" title="' . _('Select YES if this account group will contain accounts that will consist of only profit and loss accounts or NO if the group will contain balance sheet account') . '">';
if ($_POST['PandL']!=0 ) {
echo '<option selected="selected" value="1">' . _('Yes').'</option>';
@@ -455,7 +499,7 @@
</tr>
<tr>
<td>' . _('Sequence In TB') . ':' . '</td>
- <td><input tabindex="5" type="text" maxlength="4" name="SequenceInTB" class="number" value="' . $_POST['SequenceInTB'] . '" /></td>
+ <td><input tabindex="5" type="text" maxlength="4" name="SequenceInTB" class="number required" value="' . $_POST['SequenceInTB'] . '" title="' . _('Enter the sequence number that this account group and its child general ledger accounts should display in the trial balance') . '" /></td>
</tr>
<tr>
<td colspan="2"><div class="centre"><input tabindex="6" type="submit" name="submit" value="' . _('Enter Information') . '" /></div></td>
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2013-06-01 00:16:56 UTC (rev 5999)
+++ trunk/css/aguapop/default.css 2013-06-01 04:36:40 UTC (rev 6000)
@@ -108,10 +108,16 @@
input:hover{
background:#9ffffb;
}
-
select {
font-family: Arial, Verdana, Helvetica, sans-serif;
}
+input.inputerror, input.error, select.error, select.selecterror, label.error {
+ color:red;
+ border: 2px solid red;
+}
+input.required, select.required{
+ background-color:lightyellow;
+}
select:hover { /* drop down */
background:#9ffffb;
}
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2013-06-01 00:16:56 UTC (rev 5999)
+++ trunk/css/default/default.css 2013-06-01 04:36:40 UTC (rev 6000)
@@ -226,15 +226,17 @@
margin:0px;
padding:0px;
}
-input.inputerror{
- background-color:#fddbdb;
+input.inputerror, input.error, select.error, select.selecterror, label.error {
+ color:red;
+ border: 2px solid red;
}
+input.required, select.required{
+ background-color:lightyellow;
+}
textarea.texterror{
background-color:#fddbdb;
}
-select.selecterror{
- background-color:#fddbdb;
-}
+
.OsRow{
background-color:#234567;
color:white;
Modified: trunk/css/fluid/default.css
===================================================================
--- trunk/css/fluid/default.css 2013-06-01 00:16:56 UTC (rev 5999)
+++ trunk/css/fluid/default.css 2013-06-01 04:36:40 UTC (rev 6000)
@@ -85,9 +85,13 @@
input:hover{
background:lightblue;
}
-input.inputerror{
- background-color:#fddbdb;
+input.inputerror, input.error, select.error, select.selecterror, label.error {
+ color:red;
+ border: 2px solid red;
}
+input.required, select.required{
+ background-color:lightyellow;
+}
select{
font-family:Arial, Verdana, Helvetica;
}
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2013-06-01 00:16:56 UTC (rev 5999)
+++ trunk/css/fresh/default.css 2013-06-01 04:36:40 UTC (rev 6000)
@@ -103,6 +103,13 @@
font-family: Arial, Verdana, Helvetica, sans-serif;;
font-size:12px;
}
+input.inputerror, input.error, select.error, select.selecterror, label.error {
+ color:red;
+ border: 2px solid red;
+}
+input.required, select.required{
+ background-color:lightyellow;
+}
textarea{
}
textarea:hover{
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2013-06-01 00:16:56 UTC (rev 5999)
+++ trunk/css/gel/default.css 2013-06-01 04:36:40 UTC (rev 6000)
@@ -105,6 +105,13 @@
border-width:0px;
background-color: transparent;
}
+input.inputerror, input.error, select.error, select.selecterror, label.error {
+ color:red;
+ border: 2px solid red;
+}
+input.required, select.required{
+ background-color:lightyellow;
+}
select {
background:#eee;
color:#111;
Modified: trunk/css/professional/default.css
===================================================================
--- trunk/css/professional/default.css 2013-06-01 00:16:56 UTC (rev 5999)
+++ trunk/css/professional/default.css 2013-06-01 04:36:40 UTC (rev 6000)
@@ -145,9 +145,13 @@
input.small {
width: 50px;
}
-input.inputerror {
- background-color: #fddbdb;
+input.inputerror, input.error, select.error, select.selecterror, label.error {
+ color:red;
+ border: 2px solid red;
}
+input.required, select.required{
+ background-color:lightyellow;
+}
/* for buttons ***HJ***/
button{
Modified: trunk/css/professional-rtl/default.css
===================================================================
--- trunk/css/professional-rtl/default.css 2013-06-01 00:16:56 UTC (rev 5999)
+++ trunk/css/professional-rtl/default.css 2013-06-01 04:36:40 UTC (rev 6000)
@@ -153,10 +153,13 @@
input.small {
width: 50px;
}
-input.inputerror {
- background-color: #fddbdb;
+input.inputerror, input.error, select.error, select.selecterror, label.error {
+ color:red;
+ border: 2px solid red;
}
-
+input.required, select.required{
+ background-color:lightyellow;
+}
/* for buttons ***HJ***/
button{
font-size:10px;
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2013-06-01 00:16:56 UTC (rev 5999)
+++ trunk/css/silverwolf/default.css 2013-06-01 04:36:40 UTC (rev 6000)
@@ -127,7 +127,13 @@
border-width:0px;
background-color:transparent;
}
-
+input.inputerror, input.error, select.error, select.selecterror, label.error {
+ color:red;
+ border: 2px solid red;
+}
+input.required, select.required{
+ background-color:lightyellow;
+}
select{
font-family:Arial, Verdana, Helvetica, sans-serif;
font-size:100%;
Modified: trunk/css/wood/default.css
===================================================================
--- trunk/css/wood/default.css 2013-06-01 00:16:56 UTC (rev 5999)
+++ trunk/css/wood/default.css 2013-06-01 04:36:40 UTC (rev 6000)
@@ -122,7 +122,13 @@
select:hover { /* drop down */
background:#fff791;
}
-
+input.inputerror, input.error, select.error, select.selecterror, label.error {
+ color:red;
+ border: 2px solid red;
+}
+input.required, select.required{
+ background-color:lightyellow;
+}
textarea{
font-family: Arial, Verdana, Helvetica, sans-serif;
font-size: 100%;
|
|
From: <rc...@us...> - 2013-06-06 14:04:56
|
Revision: 6006
http://sourceforge.net/p/web-erp/reponame/6006
Author: rchacon
Date: 2013-06-06 14:04:52 +0000 (Thu, 06 Jun 2013)
Log Message:
-----------
Added: Sort purchase order detail by our item code. Deleted: Duplicated suppliers_partno in printing description.
Modified Paths:
--------------
trunk/PO_OrderDetails.php
trunk/PO_PDFPurchOrder.php
Modified: trunk/PO_OrderDetails.php
===================================================================
--- trunk/PO_OrderDetails.php 2013-06-04 06:25:18 UTC (rev 6005)
+++ trunk/PO_OrderDetails.php 2013-06-06 14:04:52 UTC (rev 6006)
@@ -135,7 +135,8 @@
FROM purchorderdetails
LEFT JOIN stockmaster
ON purchorderdetails.itemcode=stockmaster.stockid
- WHERE purchorderdetails.orderno = '" . $_GET['OrderNo'] ."'";
+ WHERE purchorderdetails.orderno = '" . $_GET['OrderNo'] ."'
+ ORDER BY itemcode"; /*- ADDED: Sort by our item code -*/
$LineItemsResult = DB_query($LineItemsSQL,$db, $ErrMsg);
@@ -214,4 +215,4 @@
echo '<br />';
include ('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2013-06-04 06:25:18 UTC (rev 6005)
+++ trunk/PO_PDFPurchOrder.php 2013-06-06 14:04:52 UTC (rev 6006)
@@ -213,7 +213,8 @@
suppliers_partno
FROM purchorderdetails LEFT JOIN stockmaster
ON purchorderdetails.itemcode=stockmaster.stockid
- WHERE orderno ='" . $OrderNo . "'";
+ WHERE orderno ='" . $OrderNo . "'
+ ORDER BY itemcode"; /*- ADDED: Sort by our item code -*/
$result = DB_query($sql, $db);
}
if ($OrderNo == 'Preview' or DB_num_rows($result) > 0) {
@@ -253,7 +254,7 @@
} else {
$DisplayLineTotal = '----';
}
- $Desc = $POLine['suppliers_partno'] . " " . $POLine['itemdescription'];
+ $Desc = /*- DELETED: $POLine['suppliers_partno'] . " " . -*/ $POLine['itemdescription']; /*- suppliers_partno is duplicated inside itemdescription -*/
$OrderTotal += ($POLine['unitprice'] * $POLine['quantityord']);
|
|
From: <rc...@us...> - 2013-06-06 16:33:26
|
Revision: 6008
http://sourceforge.net/p/web-erp/reponame/6008
Author: rchacon
Date: 2013-06-06 16:33:23 +0000 (Thu, 06 Jun 2013)
Log Message:
-----------
PO_PDFOrderPageHeader.inc: Includes CurrenciesArray.php to get the currency name. es_ES.utf8: Several translation ajustements.
Modified Paths:
--------------
trunk/includes/PO_PDFOrderPageHeader.inc
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/includes/PO_PDFOrderPageHeader.inc
===================================================================
--- trunk/includes/PO_PDFOrderPageHeader.inc 2013-06-06 15:05:33 UTC (rev 6007)
+++ trunk/includes/PO_PDFOrderPageHeader.inc 2013-06-06 16:33:23 UTC (rev 6008)
@@ -67,7 +67,8 @@
$LeftOvers = $pdf->addTextWrap($FormDesign->Comments->x, $Page_Height - $FormDesign->Comments->y-$line_height,$FormDesign->Comments->Length,$FormDesign->Comments->FontSize,$LeftOvers, 'left');
}
/*Now the currency the order is in */
-$pdf->addText($FormDesign->Currency->x,$Page_Height - $FormDesign->Currency->y,$FormDesign->Currency->FontSize, _('All amounts stated in').' - ' . $POHeader['currcode']);
+include($PathPrefix . 'includes/CurrenciesArray.php'); /* To get the currency name */
+$pdf->addText($FormDesign->Currency->x,$Page_Height - $FormDesign->Currency->y,$FormDesign->Currency->FontSize, _('All amounts stated in').' - ' . $POHeader['currcode'] . ' ' . $CurrencyArray[$POHeader['currcode']]['Currency']);
/*draw a square grid for entering line headings */
$pdf->Rectangle($FormDesign->HeaderRectangle->x, $Page_Height - $FormDesign->HeaderRectangle->y, $FormDesign->HeaderRectangle->width,$FormDesign->HeaderRectangle->height);
/*Set up headings */
@@ -80,4 +81,4 @@
$pdf->addText($FormDesign->Headings->Column7->x,$Page_Height - $FormDesign->Headings->Column7->y, $FormDesign->Headings->Column7->FontSize, _('Total') );
/*draw a rectangle to hold the data lines */
$pdf->Rectangle($FormDesign->DataRectangle->x, $Page_Height - $FormDesign->DataRectangle->y, $FormDesign->DataRectangle->width,$FormDesign->DataRectangle->height);
-?>
\ 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-06-06 15:05:33 UTC (rev 6007)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-06-06 16:33:23 UTC (rev 6008)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-05-25 11:02+1200\n"
-"PO-Revision-Date: 2013-06-06 08:52-0600\n"
+"PO-Revision-Date: 2013-06-06 09:12-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -16205,6 +16205,7 @@
msgid ""
"Your customer login will only allow you to view your own purchase orders"
msgstr ""
+"Su sesión de cliente sólo le permitirá ver sus propias órdenes de compra"
#: OrderDetails.php:70
msgid "Order Header Details For Order No"
@@ -19899,7 +19900,7 @@
#: PO_PDFPurchOrder.php:20 PO_PDFPurchOrder.php:123
#: includes/MainMenuLinksArray.php:176
msgid "Purchase Order Inquiry"
-msgstr "Consultar Órdenes de Compra"
+msgstr "Consultar órdenes de compra"
#: PO_PDFPurchOrder.php:30
msgid "This page must be called with a purchase order number to print"
|
|
From: <dai...@us...> - 2013-06-11 07:43:58
|
Revision: 6011
http://sourceforge.net/p/web-erp/reponame/6011
Author: daintree
Date: 2013-06-11 07:43:53 +0000 (Tue, 11 Jun 2013)
Log Message:
-----------
Thomas Lie translation string errors corrected
Modified Paths:
--------------
trunk/Credit_Invoice.php
trunk/InventoryPlanning.php
trunk/MailInventoryValuation.php
trunk/MailingGroupMaintenance.php
trunk/OffersReceived.php
trunk/includes/CountriesArray.php
trunk/includes/CurrenciesArray.php
Modified: trunk/Credit_Invoice.php
===================================================================
--- trunk/Credit_Invoice.php 2013-06-08 23:41:35 UTC (rev 6010)
+++ trunk/Credit_Invoice.php 2013-06-11 07:43:53 UTC (rev 6011)
@@ -405,7 +405,7 @@
echo '<td class="number">' . $DisplayTaxAmount . '</td>
<td class="number">' . $DisplayGrossLineTotal . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '&Delete=' . $LnItm->LineNumber . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this item from the credit?') . '\');">' . _('Delete') . '</a></td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier=' . $identifier . '&Delete=' . $LnItm->LineNumber . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this item from the credit?') . '\');">' . _('Delete') . '</a></td>
</tr>';
echo '<tr ' . $RowStarter . '>
Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php 2013-06-08 23:41:35 UTC (rev 6010)
+++ trunk/InventoryPlanning.php 2013-06-11 07:43:53 UTC (rev 6011)
@@ -338,7 +338,7 @@
$SuggestedTopUpOrder = $IdealStockHolding - $InventoryPlan['qoh'] + $TotalDemand - $OnOrdRow['qtyonorder'];
if ($SuggestedTopUpOrder <=0){
- $LeftOvers = $pdf->addTextWrap(720, $YPos, 40,$FontSize,_(' '),'right');
+ $LeftOvers = $pdf->addTextWrap(720, $YPos, 40,$FontSize,' ','right');
} else {
Modified: trunk/MailInventoryValuation.php
===================================================================
--- trunk/MailInventoryValuation.php 2013-06-08 23:41:35 UTC (rev 6010)
+++ trunk/MailInventoryValuation.php 2013-06-11 07:43:53 UTC (rev 6011)
@@ -20,8 +20,7 @@
if (sizeOf($Recipients) == 0) {
$Title = _('Inventory Valuation') . ' - ' . _('Problem Report');
include('includes/header.inc');
- prnMsg( _('There are no members of the Inventory Valuation
- Recipients email group'), 'warn');
+ prnMsg( _('There are no members of the Inventory Valuation Recipients email group'), 'warn');
include('includes/footer.inc');
exit;
}
Modified: trunk/MailingGroupMaintenance.php
===================================================================
--- trunk/MailingGroupMaintenance.php 2013-06-08 23:41:35 UTC (rev 6010)
+++ trunk/MailingGroupMaintenance.php 2013-06-11 07:43:53 UTC (rev 6011)
@@ -212,7 +212,7 @@
<div class="centre"><a href="<?php echo htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'); ?>" /><?php echo _('View All Groups'); ?></a>
<table class="selection">
- <th colspan="3"><div class="centre"><?php echo _('Assigend Users'); ?></div></th>
+ <th colspan="3"><div class="centre"><?php echo _('Assigned Users'); ?></div></th>
<th colspan="3"><div class="centre"><?php echo _('Available Users'); ?></div></th>
<?php
$k = 0;
Modified: trunk/OffersReceived.php
===================================================================
--- trunk/OffersReceived.php 2013-06-08 23:41:35 UTC (rev 6010)
+++ trunk/OffersReceived.php 2013-06-11 07:43:53 UTC (rev 6011)
@@ -302,7 +302,7 @@
prnMsg(_('The rejected offers from').' '.$SupplierName.' '._('have been removed from the system and an email sent to')
.' '.$Email, 'success');
}else{
- prnMsg(_('The rejected offers from').' '.$SupplierName.' '._('have been removed from the system and but the email does not sent to')
+ prnMsg(_('The rejected offers from').' '.$SupplierName.' '._('have been removed from the system and but no email was not sent to')
.' '.$Email, 'warn');
}
Modified: trunk/includes/CountriesArray.php
===================================================================
--- trunk/includes/CountriesArray.php 2013-06-08 23:41:35 UTC (rev 6010)
+++ trunk/includes/CountriesArray.php 2013-06-11 07:43:53 UTC (rev 6011)
@@ -85,7 +85,7 @@
$CountriesArray['GU'] = _('Guam');
$CountriesArray['GW'] = _('Guinea-Bissau');
$CountriesArray['GY'] = _('Guyana');
-$CountriesArray['HK'] = _('Hong Kong)');
+$CountriesArray['HK'] = _('Hong Kong');
$CountriesArray['HN'] = _('Honduras');
$CountriesArray['HR'] = _('Croatia');
$CountriesArray['HT'] = _('Haiti');
Modified: trunk/includes/CurrenciesArray.php
===================================================================
--- trunk/includes/CurrenciesArray.php 2013-06-08 23:41:35 UTC (rev 6010)
+++ trunk/includes/CurrenciesArray.php 2013-06-11 07:43:53 UTC (rev 6011)
@@ -532,7 +532,7 @@
$CurrenciesArray['XTS']['Currency'] = _('Code reserved for testing purposes');
$CurrenciesArray['XTS']['NumericCode'] = '963';
-$CurrenciesArray['XXX']['Currency'] = _('No currency ');
+$CurrenciesArray['XXX']['Currency'] = _('No currency');
$CurrenciesArray['XXX']['NumericCode'] = '999';
$CurrenciesArray['YER']['Currency'] = _('Yemeni rial');
|
|
From: <rc...@us...> - 2013-06-11 13:54:15
|
Revision: 6015
http://sourceforge.net/p/web-erp/reponame/6015
Author: rchacon
Date: 2013-06-11 13:54:12 +0000 (Tue, 11 Jun 2013)
Log Message:
-----------
Adds suppliers.address5
Modified Paths:
--------------
trunk/PO_PDFPurchOrder.php
trunk/companies/weberpdemo/FormDesigns/PurchaseOrder.xml
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2013-06-11 13:39:43 UTC (rev 6014)
+++ trunk/PO_PDFPurchOrder.php 2013-06-11 13:54:12 UTC (rev 6015)
@@ -82,6 +82,7 @@
suppliers.address2,
suppliers.address3,
suppliers.address4,
+ suppliers.address5,
purchorders.comments,
purchorders.orddate,
purchorders.rate,
@@ -167,6 +168,7 @@
$POHeader['address2'] = str_pad('', 40, 'x');
$POHeader['address3'] = str_pad('', 40, 'x');
$POHeader['address4'] = str_pad('', 30, 'x');
+ $POHeader['address5'] = str_pad('', 30, 'x');
$POHeader['comments'] = str_pad('', 50, 'x');
$POHeader['orddate'] = '1900-01-01';
$POHeader['rate'] = '0.0000';
Modified: trunk/companies/weberpdemo/FormDesigns/PurchaseOrder.xml
===================================================================
--- trunk/companies/weberpdemo/FormDesigns/PurchaseOrder.xml 2013-06-11 13:39:43 UTC (rev 6014)
+++ trunk/companies/weberpdemo/FormDesigns/PurchaseOrder.xml 2013-06-11 13:54:12 UTC (rev 6015)
@@ -109,7 +109,7 @@
<Line6 type="SimpleText" name="Line 6" id="DeliveryAddress6">
<FontSize>12</FontSize>
<x>448</x>
- <y>214</y>
+ <y>214</y>supplier
</Line6>
</DeliveryAddress>
<DeliveryAddressBox type="CurvedRectangle" name="Delivery address box" id="DeliveryAddressBox">
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-06-11 13:39:43 UTC (rev 6014)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-06-11 13:54:12 UTC (rev 6015)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-05-25 11:02+1200\n"
-"PO-Revision-Date: 2013-06-06 09:12-0600\n"
+"PO-Revision-Date: 2013-06-06 11:16-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -3455,7 +3455,7 @@
#: includes/PDFStockNegativesHeader.inc:32
#: includes/PO_PDFOrderPageHeader.inc:75
msgid "Item Description"
-msgstr "Descripción de artículo"
+msgstr "Descripción del artículo"
#: ConfirmDispatch_Invoice.php:288 GoodsReceived.php:101 GoodsReceived.php:105
#: PDFOrdersInvoiced.php:352 PDFOrderStatus.php:323 Shipments.php:401
@@ -26381,7 +26381,7 @@
#: SpecialOrder.php:692
msgid "Ordered item Description"
-msgstr "Descripción del artículo solicitado"
+msgstr "Descripción del artículo pedido"
#: SpecialOrder.php:743
msgid "Required Delivery Date"
@@ -27898,7 +27898,7 @@
#: Stocks.php:116 Z_ImportStocks.php:108
msgid "The stock item description cannot be a zero length string"
-msgstr "La descripción del artículo del inventario no puede estar vacía"
+msgstr "La descripción del artículo de inventario no puede estar vacía"
#: Stocks.php:116 Z_ImportStocks.php:108
msgid "a long description is required"
@@ -39666,9 +39666,8 @@
msgstr "Unidad"
#: includes/DefineTenderClass.php:45
-#, fuzzy
msgid " Item Description"
-msgstr "Descripción de artículo"
+msgstr "Descripción del artículo"
#: includes/DefineTenderClass.php:49
msgid "Tender received from"
|
|
From: <rc...@us...> - 2013-06-11 20:26:25
|
Revision: 6016
http://sourceforge.net/p/web-erp/reponame/6016
Author: rchacon
Date: 2013-06-11 20:26:21 +0000 (Tue, 11 Jun 2013)
Log Message:
-----------
PO_Header.php: Fix switched SuppDelAdd4/SuppDelAdd5. CurrenciesArray.php: Fix name on first line. Messages.mo/po: Fix reference "No Currency" (without space).
Modified Paths:
--------------
trunk/PO_Header.php
trunk/includes/CurrenciesArray.php
trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2013-06-11 13:54:12 UTC (rev 6015)
+++ trunk/PO_Header.php 2013-06-11 20:26:21 UTC (rev 6016)
@@ -1067,11 +1067,11 @@
</tr>
<tr>
<td>' . _('Address') . ' 4 :</td>
- <td><input type="text" name="SuppDelAdd5" size="21" maxlength="20" value="' . $_POST['SuppDelAdd5'] . '" /></td>
+ <td><input type="text" name="SuppDelAdd4" size="41" maxlength="40" value="' . $_POST['SuppDelAdd4'] . '" /></td>
</tr>
<tr>
<td>' . _('Address') . ' 5 :</td>
- <td><input type="text" name="SuppDelAdd4" size="41" maxlength="40" value="' . $_POST['SuppDelAdd4'] . '" /></td>
+ <td><input type="text" name="SuppDelAdd5" size="41" maxlength="40" value="' . $_POST['SuppDelAdd5'] . '" /></td>
</tr>
<tr>
<td>' . _('Phone') . ':</td>
@@ -1145,4 +1145,4 @@
echo '</div>
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/includes/CurrenciesArray.php
===================================================================
--- trunk/includes/CurrenciesArray.php 2013-06-11 13:54:12 UTC (rev 6015)
+++ trunk/includes/CurrenciesArray.php 2013-06-11 20:26:21 UTC (rev 6016)
@@ -1,5 +1,5 @@
<?php
-/* $Id: CurrencyCodesArray.php 2 2013-05-23 18:10:36Z chacon $*/
+/* $Id: CurrenciesArray.php 2 2013-05-23 18:10:36Z chacon $*/
/*
Currency codes based on the three-letter alphabetic code from
ISO 4217:2008 Codes for the representation of currencies and funds.
Modified: trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2013-06-11 13:54:12 UTC (rev 6015)
+++ trunk/locale/de_DE.utf8/LC_MESSAGES/messages.po 2013-06-11 20:26:21 UTC (rev 6016)
@@ -38987,7 +38987,7 @@
#: includes/CurrenciesArray.php:535
#, fuzzy
-msgid "No currency "
+msgid "No currency"
msgstr "Währung "
#: includes/CurrenciesArray.php:538
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/en_US.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2013-06-11 13:54:12 UTC (rev 6015)
+++ trunk/locale/en_US.utf8/LC_MESSAGES/messages.po 2013-06-11 20:26:21 UTC (rev 6016)
@@ -9,7 +9,7 @@
"Project-Id-Version: WebERP 4.10.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-05-25 11:02+1200\n"
-"PO-Revision-Date: 2013-06-01 11:23-0600\n"
+"PO-Revision-Date: 2013-06-11 10:48-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: WebERP Translation Team <web-erp-translation@lists."
"sourceforge.net>\n"
@@ -37333,8 +37333,8 @@
msgstr "Code reserved for testing purposes"
#: includes/CurrenciesArray.php:535
-msgid "No currency "
-msgstr "No currency "
+msgid "No currency"
+msgstr "No currency"
#: includes/CurrenciesArray.php:538
msgid "Yemeni rial"
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-06-11 13:54:12 UTC (rev 6015)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-06-11 20:26:21 UTC (rev 6016)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-05-25 11:02+1200\n"
-"PO-Revision-Date: 2013-06-06 11:16-0600\n"
+"PO-Revision-Date: 2013-06-11 10:49-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -7354,7 +7354,7 @@
#: SuppLoginSetup.php:248 WWW_Users.php:583 WWW_Users.php:585
#: WWW_Users.php:595 WWW_Users.php:597 WWW_Users.php:606 WWW_Users.php:608
msgid "landscape"
-msgstr "Vertical"
+msgstr "horizontal"
#: CustLoginSetup.php:209 CustLoginSetup.php:211 CustLoginSetup.php:215
#: CustLoginSetup.php:217 SuppLoginSetup.php:229 SuppLoginSetup.php:231
@@ -21272,7 +21272,7 @@
#: PrintCustTrans.php:512
msgid "Print Invoices or Credit Notes (Landscape Mode)"
-msgstr "Imprimir Facturas o Abonos (notas de crédito) (apaisado)"
+msgstr "Imprimir facturas o notas de crédito (modo horizontal)"
#: PrintCustTrans.php:514 PrintCustTransPortrait.php:546
#: includes/MainMenuLinksArray.php:97
@@ -39379,7 +39379,7 @@
msgstr "Reservado para pruebas"
#: includes/CurrenciesArray.php:535
-msgid "No currency "
+msgid "No currency"
msgstr "Sin divisa"
#: includes/CurrenciesArray.php:538
Modified: trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po 2013-06-11 13:54:12 UTC (rev 6015)
+++ trunk/locale/fr_CA.utf8/LC_MESSAGES/messages.po 2013-06-11 20:26:21 UTC (rev 6016)
@@ -39639,7 +39639,7 @@
msgstr "Code réservé pour effectuer des essais"
#: includes/CurrenciesArray.php:535
-msgid "No currency "
+msgid "No currency"
msgstr "Sans devise associée"
#: includes/CurrenciesArray.php:538
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2013-06-11 13:54:12 UTC (rev 6015)
+++ trunk/locale/fr_FR.utf8/LC_MESSAGES/messages.po 2013-06-11 20:26:21 UTC (rev 6016)
@@ -9,7 +9,7 @@
"Project-Id-Version: weberp 3.12\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-05-25 11:02+1200\n"
-"PO-Revision-Date: 2013-06-01 16:49-0600\n"
+"PO-Revision-Date: 2013-06-11 10:50-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: French <none>\n"
"Language: fr_FR\n"
@@ -40116,7 +40116,7 @@
msgstr "Code réservé pour effectuer des essais"
#: includes/CurrenciesArray.php:535
-msgid "No currency "
+msgid "No currency"
msgstr "Sans devise associée"
#: includes/CurrenciesArray.php:538
Modified: trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po 2013-06-11 13:54:12 UTC (rev 6015)
+++ trunk/locale/sv_SE.utf8/LC_MESSAGES/messages.po 2013-06-11 20:26:21 UTC (rev 6016)
@@ -38730,7 +38730,7 @@
#: includes/CurrenciesArray.php:535
#, fuzzy
-msgid "No currency "
+msgid "No currency"
msgstr "Valuta "
#: includes/CurrenciesArray.php:538
|
|
From: <dai...@us...> - 2013-06-13 10:00:43
|
Revision: 6018
http://sourceforge.net/p/web-erp/reponame/6018
Author: daintree
Date: 2013-06-13 10:00:40 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
Tomglare: improved selection of single supplier
Modified Paths:
--------------
trunk/GLTransInquiry.php
trunk/PO_Items.php
trunk/SelectSupplier.php
trunk/doc/Change.log
Modified: trunk/GLTransInquiry.php
===================================================================
--- trunk/GLTransInquiry.php 2013-06-11 21:23:50 UTC (rev 6017)
+++ trunk/GLTransInquiry.php 2013-06-13 10:00:40 UTC (rev 6018)
@@ -32,8 +32,8 @@
//
//========[ SHOW SYNOPSYS ]===========
//
- echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="'
- . _('Print') . '" alt="" />' . ' ' . $Title . '</p>';
+ echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="'
+ . _('Print') . '" alt="" />' . ' ' . $title . '</p>';
echo '<table class="selection">'; //Main table
echo '<tr>
<th colspan="7"><h2><b>' . $TransName . ' ' . $_GET['TransNo'] . '</b></h2></th>
@@ -59,7 +59,7 @@
periods.lastdate_in_period
FROM gltrans INNER JOIN chartmaster
ON gltrans.account = chartmaster.accountcode
- INNER JOIN periods
+ INNER JOIN periods
ON periods.periodno=gltrans.periodno
WHERE gltrans.type= '" . $_GET['TypeID'] . "'
AND gltrans.typeno = '" . $_GET['TransNo'] . "'
@@ -74,9 +74,6 @@
$TranDate = ConvertSQLDate($TransRow['trandate']);
$DetailResult = false;
- $AccountName = $TransRow['accountname'];
- $URL = $RootPath . '/GLAccountInquiry.php?Account=' . $TransRow['account'];
-
if ( $TransRow['amount'] > 0) {
$DebitAmount = locale_number_format($TransRow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
$DebitTotal += $TransRow['amount'];
@@ -90,54 +87,96 @@
$Posted = _('No');
}
if ( $TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact'] ) {
- $DetailSQL = "SELECT debtortrans.debtorno,
- debtorsmaster.name
- FROM debtortrans INNER JOIN debtorsmaster
- ON debtortrans.debtorno = debtorsmaster.debtorno
- WHERE debtortrans.type = '" . $TransRow['type'] . "'
- AND debtortrans.transno = '" . $_GET['TransNo']. "'";
- $DetailResult = DB_query($DetailSQL,$db);
+ $URL = $RootPath . '/CustomerInquiry.php?CustomerID=';
+ $date = '&TransAfterDate=' . $TranDate;
+
+ $DetailSQL = "SELECT debtortrans.debtorno,
+ debtortrans.ovamount,
+ debtortrans.ovgst,
+ debtortrans.ovfreight,
+ debtortrans.rate,
+ debtorsmaster.name
+ FROM debtortrans INNER JOIN debtorsmaster
+ ON debtortrans.debtorno = debtorsmaster.debtorno
+ WHERE debtortrans.type = '" . $TransRow['type'] . "'
+ AND debtortrans.transno = '" . $_GET['TransNo']. "'";
+ $DetailResult = DB_query($DetailSQL,$db);
} elseif ( $TransRow['account'] == $_SESSION['CompanyRecord']['creditorsact'] ) {
- $DetailSQL = "SELECT supptrans.supplierno,
- suppliers.suppname
- FROM supptrans INNER JOIN suppliers
- ON supptrans.supplierno = suppliers.supplierid
- WHERE supptrans.type = '" . $TransRow['type'] . "'
- AND supptrans.transno = '" . $_GET['TransNo'] . "'";
- $DetailResult = DB_query($DetailSQL,$db);
+ $URL = $RootPath . '/SupplierInquiry.php?SupplierID=';
+ $date = '&FromDate=' . $TranDate;
+
+ $DetailSQL = "SELECT supptrans.supplierno,
+ supptrans.ovamount,
+ supptrans.ovgst,
+ supptrans.rate,
+ suppliers.suppname
+ FROM supptrans INNER JOIN suppliers
+ ON supptrans.supplierno = suppliers.supplierid
+ WHERE supptrans.type = '" . $TransRow['type'] . "'
+ AND supptrans.transno = '" . $_GET['TransNo'] . "'";
+ $DetailResult = DB_query($DetailSQL,$db);
+ } else {
+ $URL = $RootPath . '/GLAccountInquiry.php?Account=' . $TransRow['account'];
+
+ if( mb_strlen($TransRow['narrative'])==0 ) {
+ $TransRow['narrative'] = ' ';
+ }
+
+ if ($j==1) {
+ echo '<tr class="OddTableRows">';
+ $j=0;
+ } else {
+ echo '<tr class="EvenTableRows">';
+ $j++;
+ }
+ echo '<td>' . $TranDate . '</td>
+ <td>' . MonthAndYearFromSQLDate($TransRow['lastdate_in_period']) . '</td>
+ <td><a href="' . $URL . '">' . $TransRow['accountname'] . '</a></td>
+ <td class="number">' . $DebitAmount . '</td>
+ <td class="number">' . $CreditAmount . '</td>
+ <td>' . $TransRow['narrative'] . '</td>
+ <td>' . $Posted . '</td>
+ </tr>';
}
+
if ($DetailResult) {
- $DetailRow = DB_fetch_array($DetailResult);// there can be only one
- if ($TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact']) {
- $URL = $RootPath . '/CustomerInquiry.php?CustomerID=' . $DetailRow['debtorno'] . '&TransAfterDate=' . $TranDate;
- $AccountName .= ' ' . $DetailRow['name'];
- } else { //its a supplier trans
- $URL = $RootPath . '/SupplierInquiry.php?SupplierID=' . $DetailRow['supplierno'] . '&FromDate=' . $TranDate;
- $AccountName .= ' ' . $DetailRow['suppname'];
+ while ( $DetailRow = DB_fetch_array($DetailResult) ) {
+ if ( $TransRow['amount'] > 0){
+ if ($TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact']) {
+ $Debit = locale_number_format(($DetailRow['ovamount'] + $DetailRow['ovgst']+ $DetailRow['ovreight']) / $DetailRow['rate'],$_SESSION['CompanyRecord']['decimalplaces']);
+ $Credit = ' ';
+ } else {
+ $Debit = locale_number_format((-$DetailRow['ovamount'] - $DetailRow['ovgst']) / $DetailRow['rate'],$_SESSION['CompanyRecord']['decimalplaces']);
+ $Credit = ' ';
+ }
+ } else {
+ if ($TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact']) {
+ $Credit = locale_number_format(-($DetailRow['ovamount'] + $DetailRow['ovgst'] + $DetailRow['ovfreight']) / $DetailRow['rate'],$_SESSION['CompanyRecord']['decimalplaces']);
+ $Debit = ' ';
+ } else {
+ $Credit = locale_number_format(($DetailRow['ovamount'] + $DetailRow['ovgst']) / $DetailRow['rate'],$_SESSION['CompanyRecord']['decimalplaces']);
+ $Debit = ' ';
+ }
+ }
+
+ if ($j==1) {
+ echo '<tr class="OddTableRows">';
+ $j=0;
+ } else {
+ echo '<tr class="EvenTableRows">';
+ $j++;
+ }
+ echo '<td>' . $TranDate . '</td>
+ <td>' . MonthAndYearFromSQLDate($TransRow['lastdate_in_period']) . '</td>
+ <td><a href="' . $URL . $DetailRow[0] . $date . '">' . $TransRow['accountname'] . ' - ' . $DetailRow[5] . '</a></td>
+ <td class="number">' . $Debit . '</td>
+ <td class="number">' . $Credit . '</td>
+ <td>' . $TransRow['narrative'] . '</td>
+ <td>' . $Posted . '</td>
+ </tr>';
}
DB_free_result($DetailResult);
}
-
-
- if( mb_strlen($TransRow['narrative'])==0 ) {
- $TransRow['narrative'] = ' ';
- }
-
- if ($j==1) {
- echo '<tr class="OddTableRows">';
- $j=0;
- } else {
- echo '<tr class="EvenTableRows">';
- $j++;
- }
- echo '<td>' . $TranDate . '</td>
- <td>' . MonthAndYearFromSQLDate($TransRow['lastdate_in_period']) . '</td>
- <td><a href="' . $URL . '">' . $AccountName . '</a></td>
- <td class="number">' . $DebitAmount . '</td>
- <td class="number">' . $CreditAmount . '</td>
- <td>' . $TransRow['narrative'] . '</td>
- <td>' . $Posted . '</td>
- </tr>';
}
DB_free_result($TransResult);
@@ -152,7 +191,5 @@
}
-
include('includes/footer.inc');
-
?>
\ No newline at end of file
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2013-06-11 21:23:50 UTC (rev 6017)
+++ trunk/PO_Items.php 2013-06-13 10:00:40 UTC (rev 6018)
@@ -498,6 +498,8 @@
if ($AllowUpdate == true){
//adding the non-stock item
+ //adding the non-stock item
+
$_SESSION['PO'.$identifier]->add_to_order($_SESSION['PO'.$identifier]->LinesOnOrder+1,
'',
0, /*Serialised */
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2013-06-11 21:23:50 UTC (rev 6017)
+++ trunk/SelectSupplier.php 2013-06-13 10:00:40 UTC (rev 6018)
@@ -135,12 +135,16 @@
$myrow = DB_fetch_row($result);
$SingleSupplierReturned = $myrow[0];
}
+ if (isset($SingleSupplierReturned)) { /*there was only one supplier returned */
+ $_SESSION['SupplierID'] = $SingleSupplierReturned;
+ unset($_POST['Keywords']);
+ unset($_POST['SupplierCode']);
+ unset($_POST['Search']);
+ } else {
+ unset($_SESSION['SupplierID']);
+ }
} //end of if search
-if (isset($SingleSupplierReturned)) { /*there was only one supplier returned */
- $_SESSION['SupplierID'] = $SingleSupplierReturned;
- unset($_POST['Keywords']);
- unset($_POST['SupplierCode']);
-}
+
if (isset($_SESSION['SupplierID'])) {
$SupplierName = '';
$SQL = "SELECT suppliers.suppname
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2013-06-11 21:23:50 UTC (rev 6017)
+++ trunk/doc/Change.log 2013-06-13 10:00:40 UTC (rev 6018)
@@ -1,5 +1,6 @@
OwebERP Change Log
+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
|
|
From: <rc...@us...> - 2013-06-14 16:13:50
|
Revision: 6022
http://sourceforge.net/p/web-erp/reponame/6022
Author: rchacon
Date: 2013-06-14 16:13:47 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
PDFQuotation.php: Sort Quotation Excluding Tax, Total Tax and Quotation Including Tax. includes/PDFQuotationPageHeader.inc: Add currency name from includes/CurrenciesArray.php.
Modified Paths:
--------------
trunk/PDFQuotation.php
trunk/includes/PDFQuotationPageHeader.inc
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/PDFQuotation.php
===================================================================
--- trunk/PDFQuotation.php 2013-06-14 15:36:22 UTC (rev 6021)
+++ trunk/PDFQuotation.php 2013-06-14 16:13:47 UTC (rev 6022)
@@ -230,12 +230,12 @@
} //end if need a new page headed up
$YPos -= ($line_height);
+ $LeftOvers = $pdf->addTextWrap(40,$YPos,655,$FontSize,_('Quotation Excluding Tax'),'right');
+ $LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize,locale_number_format($QuotationTotalEx,$myrow['currdecimalplaces']),'right');
+ $YPos -= 12;
$LeftOvers = $pdf->addTextWrap(40,$YPos,655,$FontSize,_('Total Tax'),'right');
$LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize,locale_number_format($TaxTotal,$myrow['currdecimalplaces']),'right');
$YPos -= 12;
- $LeftOvers = $pdf->addTextWrap(40,$YPos,655,$FontSize,_('Quotation Excluding Tax'),'right');
- $LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize,locale_number_format($QuotationTotalEx,$myrow['currdecimalplaces']),'right');
- $YPos -= 12;
$LeftOvers = $pdf->addTextWrap(40,$YPos,655,$FontSize,_('Quotation Including Tax'),'right');
$LeftOvers = $pdf->addTextWrap(700,$YPos,90,$FontSize,locale_number_format($QuotationTotal,$myrow['currdecimalplaces']),'right');
Modified: trunk/includes/PDFQuotationPageHeader.inc
===================================================================
--- trunk/includes/PDFQuotationPageHeader.inc 2013-06-14 15:36:22 UTC (rev 6021)
+++ trunk/includes/PDFQuotationPageHeader.inc 2013-06-14 16:13:47 UTC (rev 6022)
@@ -84,7 +84,8 @@
/*Finally join up to the top right corner where started */
$pdf->line($XPos+235, $YPos,$XPos+235, $YPos+60);
-$pdf->addText($Page_Width/2-60, $YPos-5, $FontSize, _('All amounts stated in') . ' - ' . $myrow['currcode']);
+include($PathPrefix . 'includes/CurrenciesArray.php'); /* To get the currency name */
+$pdf->addText($Page_Width/2-60, $YPos-5, $FontSize, _('All amounts stated in') . ' - ' . $myrow['currcode'] . ' ' . $CurrenciesArray[$myrow['currcode']]['Currency']);
$pdf->addText(620, 560,$FontSize, _('Number'). ':');
$pdf->addText(700, 560,$FontSize, $_GET['QuotationNo']);
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-06-14 15:36:22 UTC (rev 6021)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2013-06-14 16:13:47 UTC (rev 6022)
@@ -8,7 +8,7 @@
"Project-Id-Version: WebERP 4.081\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-05-25 11:02+1200\n"
-"PO-Revision-Date: 2013-06-14 09:28-0600\n"
+"PO-Revision-Date: 2013-06-14 09:47-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -17775,7 +17775,7 @@
#: includes/PDFQuotationPortraitPageHeader.inc:22
#: includes/PDFSalesOrder_generic.inc:34
msgid "Ph"
-msgstr "Tel."
+msgstr "Tel"
#: PDFCustomerList.php:368
msgid "Customer Details Listing"
|
×
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