details: https://code.openbravo.com/erp/devel/pi/rev/6d2f8cffd4b1 changeset: 18077:6d2f8cffd4b1 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Sep 28 14:02:51 2012 +0200 summary: CI: update AD_MODULE to version 18066
details: https://code.openbravo.com/erp/devel/pi/rev/e952e0c0f83e changeset: 18078:e952e0c0f83e user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Sep 28 14:37:39 2012 +0200 summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 11 + modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml | 12 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java | 36 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 12 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java | 12 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 26 + modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 6 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-number.js | 6 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 5 + modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- src-db/database/sourcedata/AD_AUXILIARINPUT.xml | 11 + src-db/database/sourcedata/AD_COLUMN.xml | 4 +- src-db/database/sourcedata/AD_FIELD.xml | 1 + src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_REFERENCE.xml | 12 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 26 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 236 ++++++++++ src/org/openbravo/erpCommon/info/PriceListVersionFilterExpressionName.java | 163 ++++++ 57 files changed, 658 insertions(+), 83 deletions(-) diffs (truncated from 1693 to 300 lines): diff -r 3b92f8d1358a -r e952e0c0f83e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Fri Sep 28 14:37:39 2012 +0200 @@ -220,6 +220,17 @@ <!--44973749BE9E47989F1E9D4A1C52EDEF--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--44973749BE9E47989F1E9D4A1C52EDEF--></AD_MESSAGE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--><AD_MESSAGE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <AD_MESSAGE_ID><![CDATA[48898A3B7F9141C0B9BFBDD9AE5FCF8F]]></AD_MESSAGE_ID> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <VALUE><![CDATA[APRM_PeriodNotAvailableClearedItem]]></VALUE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <MSGTEXT><![CDATA[The period of the cleared item <%s> is not open or available.]]></MSGTEXT> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--48898A3B7F9141C0B9BFBDD9AE5FCF8F--></AD_MESSAGE> + <!--49C16126D1A141C398175B0632C08F95--><AD_MESSAGE> <!--49C16126D1A141C398175B0632C08F95--> <AD_MESSAGE_ID><![CDATA[49C16126D1A141C398175B0632C08F95]]></AD_MESSAGE_ID> <!--49C16126D1A141C398175B0632C08F95--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 3b92f8d1358a -r e952e0c0f83e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 28 14:37:39 2012 +0200 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.17992]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.18066]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r 3b92f8d1358a -r e952e0c0f83e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Sep 28 14:37:39 2012 +0200 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.17992]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.18066]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.17992]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.18066]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3b92f8d1358a -r e952e0c0f83e modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml Fri Sep 28 14:37:39 2012 +0200 @@ -33,6 +33,18 @@ <!--575E470ABADB4C278132C957A78C47E3--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--575E470ABADB4C278132C957A78C47E3--></AD_VAL_RULE> +<!--E00B19370995405C8014D48E2DE98FD1--><AD_VAL_RULE> +<!--E00B19370995405C8014D48E2DE98FD1--> <AD_VAL_RULE_ID><![CDATA[E00B19370995405C8014D48E2DE98FD1]]></AD_VAL_RULE_ID> +<!--E00B19370995405C8014D48E2DE98FD1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--E00B19370995405C8014D48E2DE98FD1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--E00B19370995405C8014D48E2DE98FD1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--E00B19370995405C8014D48E2DE98FD1--> <NAME><![CDATA[AD_Org show product's child organizations]]></NAME> +<!--E00B19370995405C8014D48E2DE98FD1--> <DESCRIPTION><![CDATA[It only shows the child organizations of the organization of the product.]]></DESCRIPTION> +<!--E00B19370995405C8014D48E2DE98FD1--> <TYPE><![CDATA[S]]></TYPE> +<!--E00B19370995405C8014D48E2DE98FD1--> <CODE><![CDATA[AD_ISORGINCLUDED(ad_org.ad_org_id, @Product_Org@, ad_org.ad_client_id)<>-1 AND IsReady = 'Y']]></CODE> +<!--E00B19370995405C8014D48E2DE98FD1--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--E00B19370995405C8014D48E2DE98FD1--></AD_VAL_RULE> + <!--FF8080812E448A62012E44943A160017--><AD_VAL_RULE> <!--FF8080812E448A62012E44943A160017--> <AD_VAL_RULE_ID><![CDATA[FF8080812E448A62012E44943A160017]]></AD_VAL_RULE_ID> <!--FF8080812E448A62012E44943A160017--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 3b92f8d1358a -r e952e0c0f83e 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 Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/Reconciliation.java Fri Sep 28 14:37:39 2012 +0200 @@ -46,6 +46,7 @@ import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; +import org.openbravo.dal.service.OBQuery; import org.openbravo.data.FieldProvider; import org.openbravo.erpCommon.utility.DateTimeData; import org.openbravo.erpCommon.utility.OBError; @@ -214,6 +215,19 @@ return; } + String identifier = linesInNotAvailablePeriod(reconciliation.getId()); + if (!identifier.equalsIgnoreCase("")) { + msg.setType("Error"); + msg.setTitle(Utility.messageBD(this, "Error", vars.getLanguage())); + msg.setMessage(String.format( + Utility.messageBD(this, "APRM_PeriodNotAvailableClearedItem", vars.getLanguage()), + identifier)); + vars.setMessage(strTabId, msg); + msg = null; + printPageClosePopUpAndRefreshParent(response, vars); + return; + } + for (APRM_FinaccTransactionV finacctrxv : reconciliation.getAPRMFinaccTransactionVList()) { if (reconciliation.getEndingDate().compareTo( finacctrxv.getFinancialAccountTransaction().getTransactionDate()) < 0) { @@ -461,4 +475,26 @@ return "This servlet manages manual transactions reconciliations."; } + private String linesInNotAvailablePeriod(String reconciliationId) { + final StringBuilder hql = new StringBuilder(); + + hql.append(" as rl "); + hql.append(" where rl.reconciliation.id = '").append(reconciliationId).append("' "); + hql.append(" and c_chk_open_period(rl.organization, rl.transactionDate, 'REC', null) = 0 "); + hql.append(" order by rl.transactionDate"); + + final OBQuery<FIN_ReconciliationLine_v> obqRL = OBDal.getInstance().createQuery( + FIN_ReconciliationLine_v.class, hql.toString()); + obqRL.setMaxResult(1); + + List<FIN_ReconciliationLine_v> obqRLlist = obqRL.list(); + + if (obqRLlist.size() == 0) { + return ""; + } else { + return obqRLlist.get(0).getIdentifier(); + } + + } + } diff -r 3b92f8d1358a -r e952e0c0f83e modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Fri Sep 28 14:37:39 2012 +0200 @@ -39,6 +39,7 @@ import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.database.ConnectionProvider; +import org.openbravo.erpCommon.utility.OBDateUtils; import org.openbravo.erpCommon.utility.OBError; import org.openbravo.erpCommon.utility.Utility; import org.openbravo.model.common.businesspartner.BusinessPartner; @@ -103,6 +104,17 @@ dao.createAPRMReadyPreference(); } + if (!FIN_Utility.isPeriodOpen(payment.getClient().getId(), payment.getDocumentType() + .getDocumentCategory(), payment.getOrganization().getId(), OBDateUtils + .formatDate(payment.getPaymentDate()))) { + msg.setType("Error"); + msg.setTitle(Utility.messageBD(conProvider, "Error", language)); + msg.setMessage(Utility.parseTranslation(conProvider, vars, language, + "@PeriodNotAvailable@")); + bundle.setResult(msg); + OBDal.getInstance().rollbackAndClose(); + return; + } Set<String> documentOrganizations = OBContext.getOBContext() .getOrganizationStructureProvider(payment.getClient().getId()) .getNaturalTree(payment.getOrganization().getId()); diff -r 3b92f8d1358a -r e952e0c0f83e modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java Fri Sep 28 14:37:39 2012 +0200 @@ -30,6 +30,8 @@ import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.database.ConnectionProvider; +import org.openbravo.erpCommon.ad_forms.AcctServer; +import org.openbravo.erpCommon.utility.OBDateUtils; import org.openbravo.erpCommon.utility.OBError; import org.openbravo.erpCommon.utility.Utility; import org.openbravo.model.common.currency.ConversionRateDoc; @@ -66,6 +68,16 @@ // *********************** // Process Transaction // *********************** + if (!FIN_Utility.isPeriodOpen(transaction.getClient().getId(), + AcctServer.DOCTYPE_FinAccTransaction, transaction.getOrganization().getId(), + OBDateUtils.formatDate(transaction.getDateAcct()))) { + msg.setType("Error"); + msg.setTitle(Utility.messageBD(conProvider, "Error", language)); + msg.setMessage(Utility.parseTranslation(conProvider, vars, language, + "@PeriodNotAvailable@")); + bundle.setResult(msg); + return; + } final FIN_FinancialAccount financialAccount = transaction.getAccount(); financialAccount.setCurrentBalance(financialAccount.getCurrentBalance().add( transaction.getDepositAmount().subtract(transaction.getPaymentAmount()))); diff -r 3b92f8d1358a -r e952e0c0f83e modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Fri Sep 28 14:37:39 2012 +0200 @@ -38,6 +38,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DateUtils; import org.apache.log4j.Logger; +import org.hibernate.Query; +import org.hibernate.Session; import org.hibernate.criterion.Restrictions; import org.openbravo.advpaymentmngt.dao.AdvPaymentMngtDao; import org.openbravo.base.secureApp.VariablesSecureApp; @@ -1029,4 +1031,28 @@ } } + public static boolean isPeriodOpen(String client, String documentType, String org, String dateAcct) { + final Session session = OBDal.getInstance().getSession(); + + final StringBuilder hql = new StringBuilder(); + hql.append("select max(p.id) as period "); + hql.append(" from FinancialMgmtPeriodControl pc "); + hql.append(" left join pc.period p "); + hql.append(" where p.client = '").append(client).append("' "); + hql.append(" and pc.documentCategory = '").append(documentType).append("' "); + hql.append(" and pc.periodStatus = 'O' "); + hql.append(" and pc.organization = ad_org_getcalendarowner('").append(org).append("') "); + hql.append(" and to_date('").append(dateAcct).append("') >= p.startingDate "); + hql.append(" and to_date('").append(dateAcct).append("') < p.endingDate + 1 "); + + final Query qry = session.createQuery(hql.toString()); + + String period = (String) (qry.list().get(0)); + + if (period == null) { + return false; + } else { + return true; + } + } } diff -r 3b92f8d1358a -r e952e0c0f83e modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 28 14:37:39 2012 +0200 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.17992]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.18066]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r 3b92f8d1358a -r e952e0c0f83e modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Sep 28 14:37:39 2012 +0200 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.17992]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.18066]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 3b92f8d1358a -r e952e0c0f83e modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Fri Sep 28 14:37:39 2012 +0200 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.17992]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.18066]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> diff -r 3b92f8d1358a -r e952e0c0f83e modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 27 19:37:28 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Sep 28 14:37:39 2012 +0200 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.17992]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.18066]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.17992]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.18066]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.17992]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.18066]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -49,7 +49,7 @@ ------------------------------------------------------------------------------ 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
