@ -9026,6 +9026,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
if ( agirdcolums [ j ] . dataIndex == 'FeeName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'FeeName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'CustomerName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'CustomerName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'UnitPrice' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'UnitPrice' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'TaxUnitPrice' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Quantity' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Quantity' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Amount' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Amount' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Currency' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Currency' ) agirdcolums [ j ] . hidden = false ;
@ -9042,6 +9043,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
if ( agirdcolums [ j ] . dataIndex == 'FeeName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'FeeName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'CustomerName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'CustomerName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'UnitPrice' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'UnitPrice' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'TaxUnitPrice' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Quantity' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Quantity' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Amount' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Amount' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Currency' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Currency' ) agirdcolums [ j ] . hidden = false ;
@ -9092,6 +9094,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
if ( agirdcolums [ j ] . dataIndex == 'FeeName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'FeeName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'CustomerName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'CustomerName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'UnitPrice' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'UnitPrice' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'TaxUnitPrice' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Quantity' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Quantity' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Amount' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Amount' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Currency' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Currency' ) agirdcolums [ j ] . hidden = false ;
@ -9106,6 +9109,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
if ( agirdcolums [ j ] . dataIndex == 'FeeName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'FeeName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'CustomerName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'CustomerName' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'UnitPrice' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'UnitPrice' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'TaxUnitPrice' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Quantity' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Quantity' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Amount' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Amount' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Currency' ) agirdcolums [ j ] . hidden = false ;
if ( agirdcolums [ j ] . dataIndex == 'Currency' ) agirdcolums [ j ] . hidden = false ;
@ -9350,7 +9354,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
var FEENAME = e . value ;
var FEENAME = e . value ;
}
}
var feecustomername = e . record . data [ 'CustomerName' ] ;
if ( records . getCount ( ) > 0 ) {
if ( records . getCount ( ) > 0 ) {
@ -9388,7 +9392,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
e . record . set ( 'TaxRate' , DefTaxRate ) ;
e . record . set ( 'TaxRate' , DefTaxRate ) ;
if ( _thisfee . ACCTAXRATESAMETAXRATE == 1 ) e . record . set ( 'AccTaxRate' , DefTaxRate ) ;
if ( _thisfee . ACCTAXRATESAMETAXRATE == 1 ) e . record . set ( 'AccTaxRate' , DefTaxRate ) ;
}
}
if ( CustomerN ame == '' ) {
if ( feecustomern ame == '' ) {
e . record . set ( 'CustomerName' , CustomerName ) ;
e . record . set ( 'CustomerName' , CustomerName ) ;
}
}
@ -9478,7 +9482,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
}
}
if ( FeeType == 2 ) {
if ( FeeType == 2 ) {
if ( _thisfee . stroplb != 'op_SeaeOrder' || ( _thisfee . stroplb == 'op_SeaeOrder' && CustomerName == '' ) ) {
if ( ( _thisfee . stroplb != 'op_SeaeOrder' && feecustomername == '' ) || ( _thisfee . stroplb == 'op_SeaeOrder' && CustomerName == '' ) ) {
var recordcust = DsStoreQueryBy ( this . StoreCustType , 'CUSTTYPE' , DefaultCreditRef ) ;
var recordcust = DsStoreQueryBy ( this . StoreCustType , 'CUSTTYPE' , DefaultCreditRef ) ;
if ( recordcust . getCount ( ) > 0 ) {
if ( recordcust . getCount ( ) > 0 ) {
var data = recordcust . getAt ( 0 ) . data ;
var data = recordcust . getAt ( 0 ) . data ;
@ -9516,7 +9520,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
}
}
if ( FeeType == 1 && _thisfee . stroplb != 'op_SeaeOrder' ) {
if ( FeeType == 1 && _thisfee . stroplb != 'op_SeaeOrder' ) {
if ( _thisfee . stroplb != 'op_SeaeOrder' || ( _thisfee . stroplb == 'op_SeaeOrder' && CustomerName == '' ) ) {
if ( ( _thisfee . stroplb != 'op_SeaeOrder' && feecustomername == '' ) || ( _thisfee . stroplb == 'op_SeaeOrder' && CustomerName == '' ) ) {
var recordcust = DsStoreQueryBy ( this . StoreCustType , 'CUSTTYPE' , DefaultDebitRef ) ;
var recordcust = DsStoreQueryBy ( this . StoreCustType , 'CUSTTYPE' , DefaultDebitRef ) ;
if ( recordcust . getCount ( ) > 0 ) {
if ( recordcust . getCount ( ) > 0 ) {
var data = recordcust . getAt ( 0 ) . data ;
var data = recordcust . getAt ( 0 ) . data ;