details:   /erp/devel/int/rev/456247093c6c
changeset: 6792:456247093c6c
user:      Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date:      Wed Mar 24 18:54:39 2010 +0530
summary:   Fixes issue 12112: in dimensional reports move the position of combo 
 currency.

details:   /erp/devel/int/rev/4e778aa6e6a8
changeset: 6793:4e778aa6e6a8
user:      Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date:      Wed Mar 24 19:57:34 2010 +0530
summary:   Fixes issue 8530: RFE: 2.50 Popup of copy lines for Goods Receipt - 
Attribute values

details:   /erp/devel/int/rev/a8ae98ebb651
changeset: 6794:a8ae98ebb651
user:      Iván Perdomo <ivan.perdomo <at> openbravo.com>
date:      Wed Mar 24 22:04:37 2010 +0100
summary:   Fixes issue 12756: Menu HTML code is not generated when using 
hideMenu

details:   /erp/devel/int/rev/916c4057ecd7
changeset: 6795:916c4057ecd7
user:      David Alsasua <david.alsasua <at> openbravo.com>
date:      Wed Mar 24 23:55:49 2010 +0100
summary:   fixes issue 12458: It is not possible to cancel a payment with 
witholding

diffstat:

 src-db/database/model/functions/C_SETTLEMENT_POST.xml                          
              |   4 +-
 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.xml          
              |   1 +
 src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql      
              |   5 +-
 src/org/openbravo/erpCommon/ad_forms/DocLinePayment_data.xsql                  
              |   4 +-
 src/org/openbravo/erpCommon/ad_forms/DocPayment.java                           
              |  72 +++++----
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html
 |  17 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html
   |  17 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html
        |  17 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesFilterJR.html
        |  17 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalysesFilter.html
       |  17 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html
            |  17 +-
 
src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJRFilter.html
         |  17 +-
 src/org/openbravo/erpCommon/security/Menu.java                                 
              |  14 +-
 src/org/openbravo/erpCommon/utility/VerticalMenu.java                          
              |  26 +++
 web/js/menuKeyboard.js                                                         
              |   9 +
 15 files changed, 142 insertions(+), 112 deletions(-)

diffs (truncated from 558 to 300 lines):

diff -r 5ff20b98e8d7 -r 916c4057ecd7 
src-db/database/model/functions/C_SETTLEMENT_POST.xml
--- a/src-db/database/model/functions/C_SETTLEMENT_POST.xml     Wed Mar 24 
16:10:19 2010 +0530
+++ b/src-db/database/model/functions/C_SETTLEMENT_POST.xml     Wed Mar 24 
23:55:49 2010 +0100
@@ -19,7 +19,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2009 Openbravo SLU
+* All portions are Copyright (C) 2001-2010 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -378,7 +378,7 @@
       v_ResultStr:='CheckingAmounts';
       --Calculating the non-paid amount to cancel
       SELECT COALESCE(SUM(C_Currency_Round(  
C_Currency_Convert((Amount-WriteOffAmt), C_Currency_ID, v_Currency, v_Date, 
NULL, v_AD_Client_ID, v_AD_Org_ID), v_Currency, NULL)), 0),
-      COALESCE(SUM(C_Currency_Round(  
C_Currency_Convert((coalesce(WithHoldingAmount,0)), C_Currency_ID, v_Currency, 
v_Date, NULL, v_AD_Client_ID, v_AD_Org_ID), v_Currency, NULL)), 0)
+      COALESCE(SUM(C_Currency_Round(  C_Currency_Convert((coalesce(case when 
(Amount-WriteOffAmt=0) then 0 else WithHoldingAmount end,0)), C_Currency_ID, 
v_Currency, v_Date, NULL, v_AD_Client_ID, v_AD_Org_ID), v_Currency, NULL)), 0)
       INTO v_CanceledNotChargeAmt,v_CanceledNotChargeAmt_WH
       FROM C_Debt_Payment_V
       WHERE C_Settlement_Cancel_ID=v_Record_ID
diff -r 5ff20b98e8d7 -r 916c4057ecd7 
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.xml
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.xml     
Wed Mar 24 16:10:19 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.xml     
Wed Mar 24 23:55:49 2010 +0100
@@ -84,6 +84,7 @@
                <FIELD id="M_Product_ID_ATR" attribute="name" 
replace="yyyy">id</FIELD>
                <FIELD id="M_AttributeSetInstance_ID" attribute="name" 
replace="xxx">id</FIELD>
                <FIELD id="M_AttributeSetInstance_ID_R" attribute="name" 
replace="xxx">id</FIELD>
+        <FIELD id="M_AttributeSetInstance_ID_R" 
attribute="value">ATTRIBUTESETINSTANCENAME</FIELD>
                <FIELD id="M_Product_ID" attribute="name" 
replace="zzzz">id</FIELD>
                <FIELD id="M_Product_ID" attribute="value" >mProductId</FIELD>
                <FIELD id="fieldAttributeseinstance" attribute="onclick" 
replace="uuu">id</FIELD>
diff -r 5ff20b98e8d7 -r 916c4057ecd7 
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql 
Wed Mar 24 16:10:19 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql 
Wed Mar 24 23:55:49 2010 +0100
@@ -37,6 +37,9 @@
         (SELECT C_UOM.C_UOM_ID FROM M_PRODUCT_UOM, C_UOM WHERE 
M_PRODUCT_UOM_ID = l.M_PRODUCT_UOM_ID AND M_PRODUCT_UOM.C_UOM_ID = 
C_UOM.C_UOM_ID)        
         AND C_UOM_CONVERSION.C_UOM_TO_ID = l.C_UOM_ID),1)) 
         as SECQTY, l.M_PRODUCT_UOM_ID as SEC_PRODUCT_UOM_ID,
+        (SELECT M_ATTRIBUTEVALUE.NAME FROM M_ATTRIBUTESETINSTANCE, 
M_ATTRIBUTEINSTANCE, M_ATTRIBUTEVALUE WHERE l.M_ATTRIBUTESETINSTANCE_ID = 
M_ATTRIBUTESETINSTANCE.M_ATTRIBUTESETINSTANCE_ID 
+        AND M_ATTRIBUTEINSTANCE.M_ATTRIBUTESETINSTANCE_ID = 
M_ATTRIBUTESETINSTANCE.M_ATTRIBUTESETINSTANCE_ID
+        AND M_ATTRIBUTEINSTANCE.M_ATTRIBUTEVALUE_ID = 
M_ATTRIBUTEVALUE.M_ATTRIBUTEVALUE_ID ) as ATTRIBUTESETINSTANCENAME,
         (SELECT C_UOM.NAME FROM M_PRODUCT_UOM, C_UOM WHERE M_PRODUCT_UOM_ID = 
l.M_PRODUCT_UOM_ID AND M_PRODUCT_UOM.C_UOM_ID = C_UOM.C_UOM_ID) as SECUOMSYMBOL,
         COALESCE(l.M_PRODUCT_UOM_ID,null,'0') as HAVESEC,'' as HAVESECUOM,'' 
AS LOCATOR
         FROM C_ORDERLINE l left join  M_MATCHPO m on 
l.C_OrderLine_ID=m.C_OrderLine_ID
@@ -51,7 +54,7 @@
         AND l.M_Product_ID=p.M_Product_ID
         AND l.C_Order_ID = ? 
         GROUP BY o.C_ORDER_ID, o.DocumentNo, o.DateOrdered, o.GrandTotal, 
l.QtyOrdered,l.qtydelivered, 
-        
l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID, 
l.ad_org_id, l.DESCRIPTION, l.QUANTITYORDER, l.M_PRODUCT_UOM_ID
+        
l.C_UOM_ID,uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID, 
l.ad_org_id, l.DESCRIPTION, l.QUANTITYORDER, l.M_PRODUCT_UOM_ID, 
l.M_ATTRIBUTESETINSTANCE_ID
         HAVING (l.QtyOrdered-SUM(COALESCE(m.Qty,0))) <> 0
         ORDER BY NAME, l.Line
       ]]>
diff -r 5ff20b98e8d7 -r 916c4057ecd7 
src/org/openbravo/erpCommon/ad_forms/DocLinePayment_data.xsql
--- a/src/org/openbravo/erpCommon/ad_forms/DocLinePayment_data.xsql     Wed Mar 
24 16:10:19 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/DocLinePayment_data.xsql     Wed Mar 
24 23:55:49 2010 +0100
@@ -12,7 +12,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2008 Openbravo SLU
+ * All portions are Copyright (C) 2001-2010 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -26,7 +26,7 @@
       SELECT  DP.ISMANUAL, DP.ISRECEIPT,DP.AD_ORG_ID, DP.C_BPARTNER_ID, 
DP.DESCRIPTION, DP.C_DEBT_PAYMENT_ID,
       DP.AMOUNT, DP.WRITEOFFAMT, DP.ISPAID, DP.C_SETTLEMENT_CANCEL_ID, 
DP.C_SETTLEMENT_GENERATE_ID, DP.C_PROJECT_ID,
       '' AS DEBIT_ACCT, '' AS CREDIT_ACCT, '' AS C_GLITEM_ID, ISDIRECTPOSTING, 
DP.WithHoldingAmount,DP.C_INVOICE_ID,
-      CASE WHEN DP.C_SETTLEMENT_CANCEL_ID = ST.C_SETTLEMENT_ID AND DP.ISPAID = 
'Y' THEN C_WITHHOLDING_ID ELSE NULL END AS C_WITHHOLDING_ID,
+      CASE WHEN (DP.C_SETTLEMENT_CANCEL_ID = ST.C_SETTLEMENT_ID AND (DP.ISPAID 
= 'Y' or amount = writeoffamt)) THEN C_WITHHOLDING_ID ELSE NULL END AS 
C_WITHHOLDING_ID,
                        TRUNC(COALESCE((SELECT O.DATEACCT
                                          FROM C_ORDER O
                                                                WHERE 
DP.C_ORDER_ID = O.C_ORDER_ID),
diff -r 5ff20b98e8d7 -r 916c4057ecd7 
src/org/openbravo/erpCommon/ad_forms/DocPayment.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocPayment.java      Wed Mar 24 
16:10:19 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/DocPayment.java      Wed Mar 24 
23:55:49 2010 +0100
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2009 Openbravo SLU
+ * All portions are Copyright (C) 2001-2010 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -337,7 +337,7 @@
 
       // 6* PPA - Bank in transit default, paid DPs, (non manual and
       // manual non direct posting)
-      if (line.isPaid.equals("Y")
+      if ((line.isPaid.equals("Y") || line.Amount.equals(line.WriteOffAmt))
           && ((line.C_Settlement_Cancel_ID == null || 
line.C_Settlement_Cancel_ID.equals("")) || (line.C_Settlement_Cancel_ID
               .equals(Record_ID)))) {
         BigDecimal finalLineAmt = new BigDecimal(line.Amount);
@@ -353,38 +353,42 @@
               .equals("Y") ? sWithHoldAmt : ""), (line.isReceipt.equals("Y") ? 
"" : sWithHoldAmt),
               Fact_Acct_Group_ID, "999999", DocumentType, conn);
         }
-        if (line.WriteOffAmt != null && !line.WriteOffAmt.equals("")
-            && !line.WriteOffAmt.equals("0"))
-          finalLineAmt = finalLineAmt.subtract(new 
BigDecimal(line.WriteOffAmt));
-        String finalAmtTo = "";
-        String strcCurrencyId = "";
-        if (line.isManual.equals("N")) {
-          finalAmtTo = getConvertedAmt(finalLineAmt.toString(), 
line.C_Currency_ID_From,
-              C_Currency_ID, DateAcct, "", AD_Client_ID, AD_Org_ID, conn);
-          strcCurrencyId = C_Currency_ID;
-        } else { // For manual payment with direct posting = 'N' (no posting 
occurred at payment
-          // creation so no conversion, for currency gain-loss, is needed)
-          finalAmtTo = finalLineAmt.toString();
-          strcCurrencyId = line.C_Currency_ID_From;
-        }
-        finalLineAmt = new BigDecimal(finalAmtTo);
-        if (finalLineAmt.compareTo(new BigDecimal("0.00")) != 0) {
-          if (line.C_BANKSTATEMENTLINE_ID != null && 
!line.C_BANKSTATEMENTLINE_ID.equals("")) {
-            fact.createLine(line,
-                getAccountBankStatementLine(line.C_BANKSTATEMENTLINE_ID, as, 
conn), strcCurrencyId,
-                (line.isReceipt.equals("Y") ? finalAmtTo : ""), 
(line.isReceipt.equals("Y") ? ""
-                    : finalAmtTo), Fact_Acct_Group_ID, "999999", DocumentType, 
conn);
-          }// else if(line.C_CASHLINE_ID!=null &&
-          // !line.C_CASHLINE_ID.equals("")) fact.createLine(line,
-          // getAccountCashLine(line.C_CASHLINE_ID,
-          // as,conn),strcCurrencyId,
-          // 
(line.isReceipt.equals("Y")?finalAmtTo:""),(line.isReceipt.equals("Y")?"":finalAmtTo),
-          // Fact_Acct_Group_ID, "999999", DocumentType,conn);
-          else
-            fact.createLine(line, 
getAccount(AcctServer.ACCTTYPE_BankInTransitDefault, as, conn),
-                strcCurrencyId, (line.isReceipt.equals("Y") ? finalAmtTo : 
""), (line.isReceipt
-                    .equals("Y") ? "" : finalAmtTo), Fact_Acct_Group_ID, 
"999999", DocumentType,
-                conn);
+        if (line.isPaid.equals("Y")
+            && ((line.C_Settlement_Cancel_ID == null || 
line.C_Settlement_Cancel_ID.equals("")) || (line.C_Settlement_Cancel_ID
+                .equals(Record_ID)))) {
+          if (line.WriteOffAmt != null && !line.WriteOffAmt.equals("")
+              && !line.WriteOffAmt.equals("0"))
+            finalLineAmt = finalLineAmt.subtract(new 
BigDecimal(line.WriteOffAmt));
+          String finalAmtTo = "";
+          String strcCurrencyId = "";
+          if (line.isManual.equals("N")) {
+            finalAmtTo = getConvertedAmt(finalLineAmt.toString(), 
line.C_Currency_ID_From,
+                C_Currency_ID, DateAcct, "", AD_Client_ID, AD_Org_ID, conn);
+            strcCurrencyId = C_Currency_ID;
+          } else { // For manual payment with direct posting = 'N' (no posting 
occurred at payment
+            // creation so no conversion, for currency gain-loss, is needed)
+            finalAmtTo = finalLineAmt.toString();
+            strcCurrencyId = line.C_Currency_ID_From;
+          }
+          finalLineAmt = new BigDecimal(finalAmtTo);
+          if (finalLineAmt.compareTo(new BigDecimal("0.00")) != 0) {
+            if (line.C_BANKSTATEMENTLINE_ID != null && 
!line.C_BANKSTATEMENTLINE_ID.equals("")) {
+              fact.createLine(line, 
getAccountBankStatementLine(line.C_BANKSTATEMENTLINE_ID, as,
+                  conn), strcCurrencyId, (line.isReceipt.equals("Y") ? 
finalAmtTo : ""),
+                  (line.isReceipt.equals("Y") ? "" : finalAmtTo), 
Fact_Acct_Group_ID, "999999",
+                  DocumentType, conn);
+            }// else if(line.C_CASHLINE_ID!=null &&
+            // !line.C_CASHLINE_ID.equals("")) fact.createLine(line,
+            // getAccountCashLine(line.C_CASHLINE_ID,
+            // as,conn),strcCurrencyId,
+            // 
(line.isReceipt.equals("Y")?finalAmtTo:""),(line.isReceipt.equals("Y")?"":finalAmtTo),
+            // Fact_Acct_Group_ID, "999999", DocumentType,conn);
+            else
+              fact.createLine(line, 
getAccount(AcctServer.ACCTTYPE_BankInTransitDefault, as, conn),
+                  strcCurrencyId, (line.isReceipt.equals("Y") ? finalAmtTo : 
""), (line.isReceipt
+                      .equals("Y") ? "" : finalAmtTo), Fact_Acct_Group_ID, 
"999999", DocumentType,
+                  conn);
+          }
         }
       }
     } // END of the C_Debt_Payment loop
diff -r 5ff20b98e8d7 -r 916c4057ecd7 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html
--- 
a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html
      Wed Mar 24 16:10:19 2010 +0530
+++ 
b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html
      Wed Mar 24 23:55:49 2010 +0100
@@ -368,12 +368,6 @@
                   <td class="TitleCell"><span class="LabelText">Less 
Than</span></td>
                   <td class="TextBox_ContentCell"> <input 
dojoType="openbravo:RealNumberTextbox" greaterThan="paramMayor" 
class="TextBox_OneCell_width" type="text" name="inpMenor" maxlength="10" 
id="paramMenor" value="" 
outputformat="euroEdition"></input><script>djConfig.searchIds.push("paramMenor");</script>
                   </td>
-                  <td class="TitleCell"><span 
class="LabelText">Currency</span></td>
-                  <td class="Combo_ContentCell">
-                               <select name="inpCurrencyId" id="inpCurrencyId" 
class="ComboKey Combo_OneCell_width" required="true">
-                       <option value=""><div 
id="reportC_Currency_ID"></div></option>
-                               </select>
-                                 </td>
                 </tr>
                 <tr>
                   <td colspan="6">
@@ -845,7 +839,7 @@
                         </button>
                       </div>
                     </td>
-                    <td class="Button_LeftAlign_ContentCell" colspan="2">
+                    <td class="Button_LeftAlign_ContentCell" colspan="0">
                       <div>
                         <button type="button" 
                           class="ButtonLink" 
@@ -869,9 +863,12 @@
                         </button>
                       </div>
                     </td>
-                    <td class="ContentCell"></input>
-                    </td>
-                    <td class="ContentCell"></td>
+                    <td class="TitleCell"><span 
class="LabelText">Currency</span></td>
+                  <td class="Combo_ContentCell">
+                               <select name="inpCurrencyId" id="inpCurrencyId" 
class="ComboKey Combo_OneCell_width" required="true">
+                       <option value=""><div 
id="reportC_Currency_ID"></div></option>
+                               </select>
+                                 </td>
                   </tr>
 
 </table>
diff -r 5ff20b98e8d7 -r 916c4057ecd7 
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html
--- 
a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html
        Wed Mar 24 16:10:19 2010 +0530
+++ 
b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html
        Wed Mar 24 23:55:49 2010 +0100
@@ -365,12 +365,6 @@
                   <td class="TitleCell"><span class="LabelText">Less 
Than</span></td>
                   <td class="TextBox_ContentCell"> <input 
dojoType="openbravo:RealNumberTextbox" greaterThan="paramMayor" 
class="TextBox_OneCell_width" type="text" name="inpMenor" maxlength="10" 
id="paramMenor" value="" 
outputformat="euroEdition"></input><script>djConfig.searchIds.push("paramMenor");</script>
                   </td>
-                  <td class="TitleCell"><span 
class="LabelText">Currency</span></td>
-                  <td class="Combo_ContentCell">
-                       <select name="inpCurrencyId" id="inpCurrencyId" 
class="ComboKey Combo_OneCell_width" required="true">
-                    <option value=""><div 
id="reportC_Currency_ID"></div></option>
-                    </select>
-                  </td>    
                 </tr>
                 <tr>
                   <td colspan="6">
@@ -798,7 +792,7 @@
                         </button>
                       </div>
                     </td>
-                    <td class="Button_LeftAlign_ContentCell" colspan="2">
+                    <td class="Button_LeftAlign_ContentCell" colspan="0">
                       <div>
                         <button type="button" 
                           class="ButtonLink" 
@@ -822,9 +816,12 @@
                         </button>
                       </div>
                     </td>
-                    <td class="ContentCell"></input>
-                    </td>
-                    <td class="ContentCell"></td>
+                    <td class="TitleCell"><span 
class="LabelText">Currency</span></td>
+                       <td class="Combo_ContentCell">
+                       <select name="inpCurrencyId" id="inpCurrencyId" 
class="ComboKey Combo_OneCell_width" required="true">
+                    <option value=""><div 
id="reportC_Currency_ID"></div></option>
+                    </select>
+                  </td> 
                   </tr>
 
               </table>
diff -r 5ff20b98e8d7 -r 916c4057ecd7 
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html
--- 
a/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html
     Wed Mar 24 16:10:19 2010 +0530
+++ 
b/src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html
     Wed Mar 24 23:55:49 2010 +0100
@@ -366,12 +366,6 @@
                   <td class="TitleCell"><span class="LabelText">Less 
than</span></td>
                   <td class="TextBox_ContentCell"> <input 
dojoType="openbravo:RealNumberTextbox" greaterThan="paramMayor" 
class="TextBox_OneCell_width" type="text" name="inpMenor" maxlength="10" 
id="paramMenor" value="" 
outputformat="qtyEdition"></input><script>djConfig.searchIds.push("paramMenor");</script>
                   </td>
-                  <td class="TitleCell"><span 
class="LabelText">Currency</span></td>
-                  <td class="Combo_ContentCell">
-                    <select name="inpCurrencyId" id="inpCurrencyId" 
class="ComboKey Combo_OneCell_width" required="true">
-                    <option value=""><div 
id="reportC_Currency_ID"></div></option>
-                    </select>
-                  </td> 
                 </tr>
                 <tr>
                   <td colspan="6">
@@ -793,7 +787,7 @@
                         </button>
                       </div>
                     </td>
-                    <td class="Button_LeftAlign_ContentCell" colspan="2">
+                    <td class="Button_LeftAlign_ContentCell" colspan="0">
                       <div>
                         <button type="button" 
                           class="ButtonLink" 
@@ -817,9 +811,12 @@
                         </button>
                       </div>
                     </td>
-                    <td class="ContentCell"></input>
-                    </td>
-                    <td class="ContentCell"></td>
+                  <td class="TitleCell"><span 
class="LabelText">Currency</span></td>
+                  <td class="Combo_ContentCell">
+                    <select name="inpCurrencyId" id="inpCurrencyId" 
class="ComboKey Combo_OneCell_width" required="true">
+                    <option value=""><div 
id="reportC_Currency_ID"></div></option>
+                    </select>
+                  </td> 
                   </tr>
 
 </table>
diff -r 5ff20b98e8d7 -r 916c4057ecd7 
src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesFilterJR.html
--- 
a/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesFilterJR.html
     Wed Mar 24 16:10:19 2010 +0530
+++ 
b/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesFilterJR.html
     Wed Mar 24 23:55:49 2010 +0100
@@ -366,12 +366,6 @@
                   <td class="TitleCell"><span class="LabelText">Less 
Than</span></td>
                   <td class="TextBox_ContentCell"> <input 
dojoType="openbravo:RealNumberTextbox" greaterThan="paramMayor" 
class="TextBox_OneCell_width" type="text" name="inpMenor" maxlength="10" 
id="paramMenor" value="" 
outputformat="euroEdition"></input><script>djConfig.searchIds.push("paramMenor");</script>

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to