details: https://code.openbravo.com/erp/devel/pi/rev/f486e74d6d83 changeset: 13640:f486e74d6d83 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Aug 31 10:53:40 2011 +0200 summary: Fixes issue 18270: User Contact shown instead of Sales Representative.
details: https://code.openbravo.com/erp/devel/pi/rev/7f5542d9f0b5 changeset: 13641:7f5542d9f0b5 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Wed Aug 31 13:05:48 2011 +0200 summary: Fixes issue 18272: It would be nice to have default values in mandatory fields. diffstat: modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java | 20 +++++++-- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 4 +- 2 files changed, 17 insertions(+), 7 deletions(-) diffs (66 lines): diff -r ecb8f9e371a5 -r 7f5542d9f0b5 modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java --- a/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java Wed Aug 31 23:13:41 2011 +0200 +++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java Wed Aug 31 13:05:48 2011 +0200 @@ -32,12 +32,15 @@ import org.openbravo.base.filter.ValueListFilter; import org.openbravo.base.secureApp.HttpSecureAppServlet; import org.openbravo.base.secureApp.VariablesSecureApp; +import org.openbravo.dal.core.DalUtil; +import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBDal; import org.openbravo.data.FieldProvider; import org.openbravo.data.Sqlc; import org.openbravo.erpCommon.businessUtility.WindowTabs; import org.openbravo.erpCommon.info.SelectorUtilityData; import org.openbravo.erpCommon.utility.ComboTableData; +import org.openbravo.erpCommon.utility.DateTimeData; import org.openbravo.erpCommon.utility.LeftTabsBar; import org.openbravo.erpCommon.utility.NavigationBar; import org.openbravo.erpCommon.utility.OBError; @@ -62,7 +65,7 @@ VariablesSecureApp vars = new VariablesSecureApp(request); if (vars.commandIn("DEFAULT")) { - String strOrg = vars.getGlobalVariable("inpOrg", "PaymentReport|Organization", ""); + String strOrg = vars.getGlobalVariable("inpOrg", "PaymentReport|Organization", "0"); String strInclSubOrg = vars.getGlobalVariable("inpInclSubOrg", "PaymentReport|IncludeSubOrganization", ""); String strDueDateFrom = vars.getGlobalVariable("inpDueDateFrom", "PaymentReport|DueDateFrom", @@ -92,11 +95,18 @@ "PaymentReport|FinancialAccountId", "", IsIDFilter.instance); String strcCurrency = vars.getGlobalVariable("inpcCurrencyId", "PaymentReport|Currency", "", IsIDFilter.instance); - String strConvertCurrency = vars.getGlobalVariable("inpConvertCurrencyId", - "PaymentReport|ConvertCurrency", ""); + String strConvertCurrency = null; + strConvertCurrency = vars.getGlobalVariable("inpConvertCurrencyId", + "PaymentReport|ConvertCurrency", + (String) DalUtil.getId(OBContext.getOBContext().getCurrentClient().getCurrency())); + if (strConvertCurrency == null) { + strConvertCurrency = vars.getGlobalVariable("inpConvertCurrencyId", + "PaymentReport|ConvertCurrency", ""); + } String strConversionDate = vars.getGlobalVariable("inpConversionDate", - "PaymentReport|ConversionDate", ""); - String strPaymType = vars.getGlobalVariable("inpPaymType", "PaymentReport|PaymentType", ""); + "PaymentReport|ConversionDate", DateTimeData.today(this)); + String strPaymType = vars.getGlobalVariable("inpPaymType", "PaymentReport|PaymentType", + "FINPR_RecPay"); String strOverdue = vars.getGlobalVariable("inpOverdue", "PaymentReport|Overdue", ""); String strGroupCrit = vars.getGlobalVariable("inpGroupCrit", "PaymentReport|GroupCrit", ""); String strOrdCrit = vars.getInGlobalVariable("inpShown", "PaymentReport|OrdCrit", "", diff -r ecb8f9e371a5 -r 7f5542d9f0b5 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 Aug 31 23:13:41 2011 +0200 +++ b/modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java Wed Aug 31 13:05:48 2011 +0200 @@ -477,9 +477,9 @@ FieldProviderFactory.setField(data[i], "PROJECT", ""); // salesPerson if (FIN_PaymentScheduleDetail[i].getInvoicePaymentSchedule().getInvoice() - .getUserContact() != null) { + .getSalesRepresentative() != null) { FieldProviderFactory.setField(data[i], "SALES_PERSON", FIN_PaymentScheduleDetail[i] - .getInvoicePaymentSchedule().getInvoice().getUserContact().getIdentifier()); + .getInvoicePaymentSchedule().getInvoice().getSalesRepresentative().getIdentifier()); } else { FieldProviderFactory.setField(data[i], "SALES_PERSON", ""); } ------------------------------------------------------------------------------ Special Offer -- Download ArcSight Logger for FREE! Finally, a world-class log management solution at an even better price-free! And you'll get a free "Love Thy Logs" t-shirt when you download Logger. Secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsisghtdev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
