details: https://code.openbravo.com/erp/devel/pi/rev/b71fe7fa5c07 changeset: 18093:b71fe7fa5c07 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Fri Sep 28 14:31:55 2012 +0200 summary: Related to issue 20814: Html numbers appearing fixed.
details: https://code.openbravo.com/erp/devel/pi/rev/14cd97e452fb changeset: 18094:14cd97e452fb user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Mon Oct 01 12:04:35 2012 +0200 summary: Related to issue 21738: Reconciliation header date taken into account. diffstat: modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java | 14 ++++++++++ src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.xml | 8 ++-- 2 files changed, 18 insertions(+), 4 deletions(-) diffs (56 lines): diff -r 8196ffa8a2e2 -r 14cd97e452fb modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java Mon Oct 01 08:59:55 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java Mon Oct 01 12:04:35 2012 +0200 @@ -48,6 +48,7 @@ import org.openbravo.dal.service.OBDal; import org.openbravo.dal.service.OBQuery; import org.openbravo.data.FieldProvider; +import org.openbravo.erpCommon.ad_forms.AcctServer; import org.openbravo.erpCommon.utility.DateTimeData; import org.openbravo.erpCommon.utility.OBError; import org.openbravo.erpCommon.utility.Utility; @@ -215,6 +216,19 @@ return; } + if (FIN_Utility.isPeriodOpen(reconciliation.getClient().getId(), + AcctServer.DOCTYPE_Reconciliation, reconciliation.getOrganization().getId(), + strStatementDate)) { + msg.setType("Error"); + msg.setTitle(Utility.messageBD(this, "Error", vars.getLanguage())); + msg.setMessage(Utility.parseTranslation(this, vars, vars.getLanguage(), + "@PeriodNotAvailable@")); + vars.setMessage(strTabId, msg); + msg = null; + printPageClosePopUpAndRefreshParent(response, vars); + return; + } + String identifier = linesInNotAvailablePeriod(reconciliation.getId()); if (!identifier.equalsIgnoreCase("")) { msg.setType("Error"); diff -r 8196ffa8a2e2 -r 14cd97e452fb src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.xml --- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.xml Mon Oct 01 08:59:55 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.xml Mon Oct 01 12:04:35 2012 +0200 @@ -78,8 +78,8 @@ <FUNCTION id="fieldTotalacctcrSum" name="SUM" format="euroInform" attribute="value">totalacctcr</FUNCTION> <FUNCTION id="fieldTotalacctSubSum" name="SUM" format="euroInform" attribute="value">totalacctsub</FUNCTION> - <FUNCTION id="fieldAmtacctdrprevsum" name="SUM" format="euroInform">amtacctdrprevsum</FUNCTION> - <FUNCTION id="fieldAmtacctcrprevsum" name="SUM" format="euroInform">amtacctcrprevsum</FUNCTION> + <FUNCTION id="fieldAmtacctdrprevsum" name="SUM" format="euroInform" attribute="value">amtacctdrprevsum</FUNCTION> + <FUNCTION id="fieldAmtacctcrprevsum" name="SUM" format="euroInform" attribute="value">amtacctcrprevsum</FUNCTION> <!-- Function adding the partial amounts and the previous amounts --> <FUNCTION id="fieldTotalDrAdded" name="ADD" arg1="fieldTotalDebit" arg2="fieldAmtacctdrprevsum" format="euroInform"/> <FUNCTION id="fieldTotalCrAdded" name="ADD" arg1="fieldTotalCredit" arg2="fieldAmtacctcrprevsum" format="euroInform"/> @@ -152,8 +152,8 @@ <FUNCTION id="fieldTotalacctdrSum2" name="SUM" format="euroInform" attribute="value">totalacctdr</FUNCTION> <FUNCTION id="fieldTotalacctcrSum2" name="SUM" format="euroInform" attribute="value">totalacctcr</FUNCTION> - <FUNCTION id="fieldAmtacctdrprevsum2" name="SUM" format="euroInform">amtacctdrprevsum</FUNCTION> - <FUNCTION id="fieldAmtacctcrprevsum2" name="SUM" format="euroInform">amtacctcrprevsum</FUNCTION> + <FUNCTION id="fieldAmtacctdrprevsum2" name="SUM" format="euroInform" attribute="value">amtacctdrprevsum</FUNCTION> + <FUNCTION id="fieldAmtacctcrprevsum2" name="SUM" format="euroInform" attribute="value">amtacctcrprevsum</FUNCTION> <!-- Function adding the total and the total previously--> <FUNCTION id="fieldTotalDrAdded2" name="ADD" arg1="fieldTotalDebit2" arg2="fieldAmtacctdrprevsum2" format="euroInform"/> <FUNCTION id="fieldTotalCrAdded2" name="ADD" arg1="fieldTotalCredit2" arg2="fieldAmtacctcrprevsum2" format="euroInform"/> ------------------------------------------------------------------------------ Got visibility? Most devs has no idea what their production app looks like. Find out how fast your code is with AppDynamics Lite. http://ad.doubleclick.net/clk;262219671;13503038;y? http://info.appdynamics.com/FreeJavaPerformanceDownload.html _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
