details: https://code.openbravo.com/erp/devel/pi/rev/64013f8575a8 changeset: 15196:64013f8575a8 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Dec 23 14:01:30 2011 +0100 summary: Fixes issue 18818, Fixes issue 19363
details: https://code.openbravo.com/erp/devel/pi/rev/df041b51d172 changeset: 15197:df041b51d172 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Fri Jan 13 18:27:34 2012 +0100 summary: [Payment report]: propper status shorting and payment method in xls details: https://code.openbravo.com/erp/devel/pi/rev/062b0023a252 changeset: 15198:062b0023a252 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Tue Jan 24 12:33:41 2012 +0100 summary: Fixes issue 19550, fixes issue 19549 details: https://code.openbravo.com/erp/devel/pi/rev/da35017d6fbc changeset: 15199:da35017d6fbc user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Tue Jan 24 13:09:07 2012 +0100 summary: fixes bug 19551 details: https://code.openbravo.com/erp/devel/pi/rev/d4f465cbd744 changeset: 15200:d4f465cbd744 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Tue Jan 24 19:13:25 2012 +0100 summary: Fixes bug 19557 details: https://code.openbravo.com/erp/devel/pi/rev/655961089105 changeset: 15201:655961089105 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Wed Jan 25 10:35:51 2012 +0100 summary: [Payment report]: Status sequence details: https://code.openbravo.com/erp/devel/pi/rev/8c5a12fb14d6 changeset: 15202:8c5a12fb14d6 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Wed Jan 25 13:50:58 2012 +0100 summary: Applies code review feedback to Reconciliation messaging when posting error occurs. Invalid Account diffstat: modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 30 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml | 1153 +++------ src-db/database/sourcedata/AD_MESSAGE.xml | 242 ++ src-db/database/sourcedata/AD_REF_LIST.xml | 8 + src/org/openbravo/erpCommon/ad_callouts/SE_CalculateExchangeRate.java | 2 +- src/org/openbravo/erpCommon/ad_forms/AcctServer.java | 117 +- src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java | 36 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 29 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 183 +- src/org/openbravo/erpCommon/ad_forms/DocInOut.java | 118 +- src/org/openbravo/erpCommon/ad_forms/DocInventory.java | 27 +- src/org/openbravo/erpCommon/ad_reports/ReportNotPosted_data.xsql | 26 +- 12 files changed, 1091 insertions(+), 880 deletions(-) diffs (truncated from 2724 to 300 lines): diff -r 85a366534d3c -r 8c5a12fb14d6 modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java --- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java Wed Jan 25 10:13:04 2012 +0100 +++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java Wed Jan 25 13:50:58 2012 +0100 @@ -111,7 +111,8 @@ OBContext.setAdminMode(); try { - hsqlScript.append(" as fpsd "); + hsqlScript + .append("select fpsd.id, (select a.sequenceNumber from ADList a where a.reference.id = '575BCB88A4694C27BC013DE9C73E6FE7' and a.searchKey = coalesce(pay.status, 'RPAP')) as a from FIN_Payment_ScheduleDetail as fpsd "); hsqlScript.append(" left outer join fpsd.paymentDetails.finPayment pay"); hsqlScript.append(" left outer join pay.businessPartner paybp"); hsqlScript.append(" left outer join paybp.businessPartnerCategory paybpc"); @@ -336,7 +337,7 @@ hsqlScript.append("), "); } - hsqlScript.append(" coalesce(pay."); + hsqlScript.append(" a, coalesce(pay."); hsqlScript.append(FIN_Payment.PROPERTY_STATUS); hsqlScript.append(", 'RPAP')"); @@ -383,11 +384,25 @@ hsqlScript.append(FIN_PaymentScheduleDetail.PROPERTY_INVOICEPAYMENTSCHEDULE); hsqlScript.append("."); hsqlScript.append(FIN_PaymentSchedule.PROPERTY_ID); + final Session session = OBDal.getInstance().getSession(); + final Query query = session.createQuery(hsqlScript.toString()); - final OBQuery<FIN_PaymentScheduleDetail> obqPSD = OBDal.getInstance().createQuery( - FIN_PaymentScheduleDetail.class, hsqlScript.toString(), parameters); - obqPSD.setFilterOnReadableOrganization(false); - java.util.List<FIN_PaymentScheduleDetail> obqPSDList = obqPSD.list(); + boolean firstMember = true; + java.util.List<FIN_PaymentScheduleDetail> obqPSDList = new ArrayList<FIN_PaymentScheduleDetail>(); + for (Object resultObject : query.list()) { + if (resultObject.getClass().isArray()) { + final Object[] values = (Object[]) resultObject; + for (Object value : values) { + if (firstMember) { + obqPSDList.add(OBDal.getInstance().get(FIN_PaymentScheduleDetail.class, + (String) value)); + firstMember = false; + } else { + firstMember = true; + } + } + } + } data = FieldProviderFactory.getFieldProviderArray(obqPSDList); FIN_PaymentScheduleDetail[] FIN_PaymentScheduleDetail = new FIN_PaymentScheduleDetail[0]; @@ -484,7 +499,8 @@ .getCurrency(); FieldProviderFactory.setField(data[i], "TRANS_CURRENCY", transCurrency.getISOCode()); // paymentMethod - FieldProviderFactory.setField(data[i], "PAYMENT_METHOD", ""); + FieldProviderFactory.setField(data[i], "PAYMENT_METHOD", FIN_PaymentScheduleDetail[i] + .getInvoicePaymentSchedule().getFinPaymentmethod().getIdentifier()); // payment FieldProviderFactory.setField(data[i], "PAYMENT", ""); // payment_id diff -r 85a366534d3c -r 8c5a12fb14d6 modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml --- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml Wed Jan 25 10:13:04 2012 +0100 +++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml Wed Jan 25 13:50:58 2012 +0100 @@ -1,210 +1,65 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!-- Created with iReport - A designer for JasperReports --> -<!DOCTYPE jasperReport PUBLIC "//JasperReports//DTD Report Design//EN" "http://jasperreports.sourceforge.net/dtds/jasperreport.dtd";> -<jasperReport - name="PaymentReportExcel" - columnCount="1" - printOrder="Vertical" - orientation="Landscape" - pageWidth="1385" - pageHeight="595" - columnWidth="1325" - columnSpacing="0" - leftMargin="30" - rightMargin="30" - topMargin="20" - bottomMargin="20" - whenNoDataType="NoDataSection" - isTitleNewPage="false" - isSummaryNewPage="false"> - <property name="ireport.scriptlethandling" value="0" /> - <property name="ireport.encoding" value="UTF-8" /> - <import value="java.util.*" /> - <import value="net.sf.jasperreports.engine.*" /> - <import value="net.sf.jasperreports.engine.data.*" /> - - <style - name="default" - isDefault="false" - vAlign="Middle" - fontName="Bitstream Vera Sans" - fontSize="8" - > - </style> - <style - name="Report_Title" - isDefault="false" - fontName="Bitstream Vera Sans" - fontSize="18" - > - </style> - <style - name="Report_Subtitle" - isDefault="false" - forecolor="#555555" - fontName="Bitstream Vera Sans" - fontSize="14" - > - </style> - <style - name="Report_Data_Label" - isDefault="false" - fontName="Bitstream Vera Sans" - fontSize="11" - isBold="true" - > - </style> - <style - name="Report_Data_Field" - isDefault="false" - fontName="Bitstream Vera Sans" - fontSize="11" - isBold="false" - > - </style> - <style - name="Total_Field" - isDefault="false" - mode="Opaque" - forecolor="#000000" - backcolor="#CCCCCC" - vAlign="Middle" - fontName="Bitstream Vera Sans" - fontSize="11" - isBold="true" - > - </style> - <style - name="GroupHeader_DarkGray" - isDefault="false" - mode="Opaque" - forecolor="#FFFFFF" - backcolor="#555555" - vAlign="Middle" - fontName="Bitstream Vera Sans" - fontSize="12" - isBold="true" - > - </style> - <style - name="Group_Data_Label" - isDefault="false" - fontName="Bitstream Vera Sans" - fontSize="11" - isBold="true" - > - </style> - <style - name="Group_Data_Field" - isDefault="false" - fontName="Bitstream Vera Sans" - fontSize="11" - > - </style> - <style - name="Detail_Header" - isDefault="false" - mode="Opaque" - forecolor="#FFFFFF" - backcolor="#5D5D5D" - vAlign="Middle" - fontName="Bitstream Vera Sans" - fontSize="10" - isBold="true" - > - </style> - <style - name="Detail_Line" - isDefault="false" - fontName="Bitstream Vera Sans" - fontSize="8" - > - +<?xml version="1.0" encoding="UTF-8"?> +<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd"; name="PaymentReportExcel" pageWidth="1800" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="1740" leftMargin="30" rightMargin="30" topMargin="20" bottomMargin="20"> + <property name="ireport.scriptlethandling" value="0"/> + <property name="ireport.encoding" value="UTF-8"/> + <property name="ireport.zoom" value="1.0"/> + <property name="ireport.x" value="0"/> + <property name="ireport.y" value="0"/> + <import value="net.sf.jasperreports.engine.*"/> + <import value="java.util.*"/> + <import value="net.sf.jasperreports.engine.data.*"/> + <style name="default" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="8"/> + <style name="Report_Title" fontName="Bitstream Vera Sans" fontSize="18"/> + <style name="Report_Subtitle" forecolor="#555555" fontName="Bitstream Vera Sans" fontSize="14"/> + <style name="Report_Data_Label" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/> + <style name="Report_Data_Field" fontName="Bitstream Vera Sans" fontSize="11" isBold="false"/> + <style name="Total_Field" mode="Opaque" forecolor="#000000" backcolor="#CCCCCC" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/> + <style name="GroupHeader_DarkGray" mode="Opaque" forecolor="#FFFFFF" backcolor="#555555" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="12" isBold="true"/> + <style name="Group_Data_Label" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/> + <style name="Group_Data_Field" fontName="Bitstream Vera Sans" fontSize="11"/> + <style name="Detail_Header" mode="Opaque" forecolor="#FFFFFF" backcolor="#5D5D5D" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="10" isBold="true"/> + <style name="Detail_Line" fontName="Bitstream Vera Sans" fontSize="8"> <conditionalStyle> <conditionExpression><![CDATA[new Boolean($V{REPORT_COUNT}.intValue()%2==0)]]></conditionExpression> - <style - name="Detail_Line" - isDefault="false" - mode="Opaque" - backcolor="#CCCCCC" - > - </style> + <style mode="Opaque" backcolor="#CCCCCC"/> </conditionalStyle> </style> - <style - name="Total_Gray" - isDefault="false" - mode="Opaque" - forecolor="#000000" - backcolor="#CCCCCC" - > - </style> - <style - name="Detail_Data_Label" - isDefault="false" - mode="Opaque" - backcolor="#CCCCCC" - fontName="Bitstream Vera Sans" - fontSize="10" - isBold="true" - > - </style> - <style - name="Detail_Data_Field" - isDefault="false" - mode="Opaque" - backcolor="#CCCCCC" - fontName="Bitstream Vera Sans" - fontSize="10" - > - </style> - <style - name="Group_Footer" - isDefault="false" - fontName="Bitstream Vera Sans" - fontSize="11" - isBold="true" - > - </style> - <style - name="Report_Footer" - isDefault="true" - vAlign="Middle" - fontName="Bitstream Vera Sans" - fontSize="11" - > - </style> - - <parameter name="GROUP_CRIT" isForPrompting="false" class="java.lang.String"/> - <parameter name="ORG_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="INCL_SUBORG_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="DUEDATEFROM_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="DUEDATETO_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="AMTFROM_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="AMTTO_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="DOCDATEFROM_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="DOCDATETO_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="BPARTNER_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="BPGROUP_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="PROJECT_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="STATUS_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="CURRENCY_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="CONVERSIONDATE_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="PAYMTYPE_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="OVERDUE_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="GROUPCRIT_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="ORDCRIT_SHOW" isForPrompting="false" class="java.lang.String"/> - <parameter name="ONE_ASTERISK_SHOW" isForPrompting="false" class="java.lang.Boolean"> - <defaultValueExpression ><![CDATA[new Boolean(false)]]></defaultValueExpression> + <style name="Total_Gray" mode="Opaque" forecolor="#000000" backcolor="#CCCCCC"/> + <style name="Detail_Data_Label" mode="Opaque" backcolor="#CCCCCC" fontName="Bitstream Vera Sans" fontSize="10" isBold="true"/> + <style name="Detail_Data_Field" mode="Opaque" backcolor="#CCCCCC" fontName="Bitstream Vera Sans" fontSize="10"/> + <style name="Group_Footer" fontName="Bitstream Vera Sans" fontSize="11" isBold="true"/> + <style name="Report_Footer" isDefault="true" vAlign="Middle" fontName="Bitstream Vera Sans" fontSize="11"/> + <parameter name="GROUP_CRIT" class="java.lang.String" isForPrompting="false"/> + <parameter name="ORG_SHOW" class="java.lang.String" isForPrompting="false"/> + <parameter name="INCL_SUBORG_SHOW" class="java.lang.String" isForPrompting="false"/> + <parameter name="DUEDATEFROM_SHOW" class="java.lang.String" isForPrompting="false"/> + <parameter name="DUEDATETO_SHOW" class="java.lang.String" isForPrompting="false"/> + <parameter name="AMTFROM_SHOW" class="java.lang.String" isForPrompting="false"/> + <parameter name="AMTTO_SHOW" class="java.lang.String" isForPrompting="false"/> + <parameter name="DOCDATEFROM_SHOW" class="java.lang.String" isForPrompting="false"/> + <parameter name="DOCDATETO_SHOW" class="java.lang.String" isForPrompting="false"/> ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-d2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
