details: https://code.openbravo.com/erp/devel/main/rev/957e0383b0af
changeset: 17883:957e0383b0af
user: Sandra Huguet <sandra.huguet <at> openbravo.com>
date: Tue Sep 18 18:35:14 2012 +0200
summary: Fixed bug 21679 The acct server process does not post reconciliations
diffstat:
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 19 ++++-----
1 files changed, 8 insertions(+), 11 deletions(-)
diffs (51 lines):
diff -r c501ca2ff03f -r 957e0383b0af
src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java Tue Sep
18 16:29:47 2012 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java Tue Sep
18 18:35:14 2012 +0200
@@ -1076,7 +1076,7 @@
}
// Exists line in closed period
for (FIN_FinaccTransaction line : transactionsToBePosted) {
- Period linePeriod = documentGetPeriod(line.getDateAcct());
+ Period linePeriod = documentGetPeriod(line.getDateAcct(),
reconciliation.getOrganization());
if (linePeriod == null) {
setStatus(STATUS_PeriodClosed);
return false;
@@ -1469,31 +1469,28 @@
return account;
}
- Period documentGetPeriod(Date date) {
+ Period documentGetPeriod(Date date, Organization org) {
OBCriteria<PeriodControl> obCriteria =
OBDal.getInstance().createCriteria(PeriodControl.class);
obCriteria.createAlias(PeriodControl.PROPERTY_PERIOD, "p");
obCriteria.createAlias("p." + Period.PROPERTY_YEAR, "y");
obCriteria.add(Restrictions.eq(PeriodControl.PROPERTY_PERIODSTATUS, "O"));
obCriteria.add(Restrictions.eq(PeriodControl.PROPERTY_DOCUMENTCATEGORY,
AcctServer.DOCTYPE_Reconciliation));
- obCriteria.add(Restrictions.eq("y." + Year.PROPERTY_CALENDAR,
getCalendar(AD_Org_ID)));
+ obCriteria.add(Restrictions.eq("y." + Year.PROPERTY_CALENDAR,
getCalendar(org)));
obCriteria.add(Restrictions.in(PeriodControl.PROPERTY_ORGANIZATION + "."
+ Organization.PROPERTY_ID,
OBContext.getOBContext().getOrganizationStructureProvider()
- .getNaturalTree(AD_Org_ID)));
+ .getNaturalTree(org.getId())));
+ obCriteria.add(Restrictions.eq("p." + PeriodControl.PROPERTY_CLIENT,
org.getClient()));
obCriteria.add(Restrictions.le("p." + Period.PROPERTY_STARTINGDATE, date));
obCriteria.add(Restrictions.ge("p." + Period.PROPERTY_ENDINGDATE, date));
obCriteria.setFilterOnReadableOrganization(false);
+ obCriteria.setFilterOnReadableClients(false);
List<PeriodControl> lines = obCriteria.list();
return lines.size() == 0 ? null : lines.get(0).getPeriod();
}
- Calendar getCalendar(String organization) {
- OBCriteria<Organization> obCriteria =
OBDal.getInstance().createCriteria(Organization.class);
- obCriteria.add(Restrictions.eq(Organization.PROPERTY_ID, organization));
- obCriteria.setFilterOnReadableClients(false);
- obCriteria.setFilterOnReadableOrganization(false);
- List<Organization> lines = obCriteria.list();
- Calendar calendar = lines.get(0).getCalendar();
+ Calendar getCalendar(Organization organization) {
+ Calendar calendar = organization.getCalendar();
if (calendar != null) {
return calendar;
} else {
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
