details: http://code.openbravo.com/erp/devel/main/rev/53076318b676 changeset: 3533:53076318b676 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Apr 03 15:08:46 2009 +0200 summary: fixed bug 0008418: Switching from Grid to Edit mode in Languages shows the wrong one
details: http://code.openbravo.com/erp/devel/main/rev/ff85893b50fe changeset: 3534:ff85893b50fe user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Apr 03 16:50:35 2009 +0200 summary: Fixes bug 0008302: Cannot unprocess a tax payment diffstat: src-db/database/model/functions/C_TAXPAYMENT_POST.xml | 20 ++++++++++---------- src-wad/src/org/openbravo/wad/Wad.java | 2 +- src/org/openbravo/erpCommon/utility/TableSQLData.java | 5 ++--- 3 files changed, 13 insertions(+), 14 deletions(-) diffs (82 lines): diff -r c51ac510f7d3 -r ff85893b50fe src-db/database/model/functions/C_TAXPAYMENT_POST.xml --- a/src-db/database/model/functions/C_TAXPAYMENT_POST.xml Fri Apr 03 18:53:22 2009 -0400 +++ b/src-db/database/model/functions/C_TAXPAYMENT_POST.xml Fri Apr 03 16:50:35 2009 +0200 @@ -134,12 +134,12 @@ v_paymentrule := 'T'; v_currencyratetype := 'S'; - + select c_calendar_id into v_calendar_ID from ad_clientinfo where ad_client_id = v_client_id; - - select c_period_id into v_period_id + + select c_period_id into v_period_id from c_period where enddate = (select max(enddate) from c_period where enddate <=v_date and exists (select 1 from c_year where c_calendar_id = v_calendar_ID @@ -160,7 +160,7 @@ into v_gl_journalid, v_gl_journalbatchid, v_settlementid from c_taxpayment tp inner join gl_journal glj on tp.gl_journal_id=glj.gl_journal_id - inner join gl_journalbatch gljb on gljb.gl_journalbatch_id=glj.gl_journal_id + inner join gl_journalbatch gljb on gljb.gl_journalbatch_id=glj.gl_journalbatch_id where tp.C_TAXPAYMENT_ID = v_record_id; update gl_journal set docaction='RE' where gl_journal_id=v_gl_journalid; @@ -260,19 +260,19 @@ v_totalcredit := v_totalcredit+v_debit; end loop; - - select count(*) + + select count(*) into v_TRTcountY from c_taxregister_type tt where tt.issotrx='Y'; - - select count(*) + + select count(*) into v_TRTcountN from c_taxregister_type tt where tt.issotrx='N'; - + if v_TRTcountY=0 or v_TRTcountN=0 then RAISE_APPLICATION_ERROR(-20100, '@TwoRegisterTypesNeeded@'); end if; - + select case when tt.issotrx='Y' then max(glitem_debit_acct) else max(glitem_credit_acct) end, max(tt.c_glitem_id) into v_glitem_acct, v_glitem_id from c_taxregister_type tt diff -r c51ac510f7d3 -r ff85893b50fe src-wad/src/org/openbravo/wad/Wad.java --- a/src-wad/src/org/openbravo/wad/Wad.java Fri Apr 03 18:53:22 2009 -0400 +++ b/src-wad/src/org/openbravo/wad/Wad.java Fri Apr 03 16:50:35 2009 +0200 @@ -3468,7 +3468,7 @@ "org/openbravo/wad/Template_Relation", discard).createXmlDocument(); xmlDocument.setParameter("form", tabName + "_Edition.html"); xmlDocument.setParameter("tab", tabNamePresentation); - if (strTable.equals("111")) + if (strTab.equals("445")) keyColumnName = "AD_Language"; xmlDocument.setParameter("key", "inp" + Sqlc.TransformaNombreColumna(keyColumnName)); xmlDocument.setParameter("keyId", keyColumnName); diff -r c51ac510f7d3 -r ff85893b50fe src/org/openbravo/erpCommon/utility/TableSQLData.java --- a/src/org/openbravo/erpCommon/utility/TableSQLData.java Fri Apr 03 18:53:22 2009 -0400 +++ b/src/org/openbravo/erpCommon/utility/TableSQLData.java Fri Apr 03 16:50:35 2009 +0200 @@ -2063,10 +2063,9 @@ dataAux.setData("isidentifier", (prop.getProperty("IsIdentifier").equals("Y") ? "true" : "false")); - boolean isKey = (!getTableName().equals("AD_Language") + boolean isKey = (!getTabID().equals("445") && prop.getProperty("ColumnName").equals(getKeyColumn()) && !cloneRecord) - || (getTableName().equals("AD_Language") && prop.getProperty("ColumnName").equals( - "AD_Language")); + || (getTabID().equals("445") && prop.getProperty("ColumnName").equals("AD_Language")); dataAux.setData("iskey", isKey ? "true" : "false"); dataAux.setData("isvisible", ((prop.getProperty("IsDisplayed").equals("Y") && prop ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
