Author: deepak
Date: Fri May 13 11:31:23 2016
New Revision: 1743656
URL: http://svn.apache.org/viewvc?rev=1743656&view=rev
Log:
(OFBIZ-5740) Updated fromDate and thruDate filed type for CustomTimePeriod
entity from date to date-time, and made chagnes accordingly.
Modified:
ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
ofbiz/trunk/framework/common/entitydef/entitymodel.xml
Modified: ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml?rev=1743656&r1=1743655&r2=1743656&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml (original)
+++ ofbiz/trunk/applications/accounting/data/DemoGlSetupData.xml Fri May 13
11:31:23 2016
@@ -392,16 +392,16 @@ under the License.
<VarianceReasonGlAccount organizationPartyId="Company"
varianceReasonId="VAR_SAMPLE" glAccountId="625000"/>
<!-- Some Sample Time Periods, two Years with Quarters -->
- <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6010"
periodTypeId="FISCAL_YEAR" fromDate="2010-01-01" thruDate="2011-01-01"
isClosed="N" periodNum="1" periodName="2010"/>
- <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6011"
periodTypeId="FISCAL_QUARTER" fromDate="2010-01-01" thruDate="2010-04-01"
isClosed="N" periodNum="2" periodName="2010/Q1" parentPeriodId="6010"/>
- <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6012"
periodTypeId="FISCAL_QUARTER" fromDate="2010-04-01" thruDate="2010-07-01"
isClosed="N" periodNum="3" periodName="2010/Q2" parentPeriodId="6010"/>
- <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6013"
periodTypeId="FISCAL_QUARTER" fromDate="2010-07-01" thruDate="2010-10-01"
isClosed="N" periodNum="4" periodName="2010/Q3" parentPeriodId="6010"/>
- <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6014"
periodTypeId="FISCAL_QUARTER" fromDate="2010-10-01" thruDate="2011-01-01"
isClosed="N" periodNum="5" periodName="2010/Q4" parentPeriodId="6010"/>
- <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6015"
periodTypeId="FISCAL_YEAR" fromDate="2011-01-01" thruDate="2020-01-01"
isClosed="N" periodNum="1" periodName="2011-2020"/>
- <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6016"
periodTypeId="FISCAL_QUARTER" fromDate="2011-01-01" thruDate="2011-04-01"
isClosed="N" periodNum="2" periodName="2011/Q1" parentPeriodId="6015"/>
- <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6017"
periodTypeId="FISCAL_QUARTER" fromDate="2011-04-01" thruDate="2011-07-01"
isClosed="N" periodNum="3" periodName="2011/Q2" parentPeriodId="6015"/>
- <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6018"
periodTypeId="FISCAL_QUARTER" fromDate="2011-07-01" thruDate="2011-10-01"
isClosed="N" periodNum="4" periodName="2011/Q3" parentPeriodId="6015"/>
- <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6019"
periodTypeId="FISCAL_QUARTER" fromDate="2011-10-01" thruDate="2012-01-01"
isClosed="N" periodNum="5" periodName="2011/Q4" parentPeriodId="6015"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6010"
periodTypeId="FISCAL_YEAR" fromDate="2010-01-01 00:00:00.000"
thruDate="2011-01-01 23:59:59.000" isClosed="N" periodNum="1"
periodName="2010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6011"
periodTypeId="FISCAL_QUARTER" fromDate="2010-01-01 00:00:00.000"
thruDate="2010-04-01 23:59:59.000" isClosed="N" periodNum="2"
periodName="2010/Q1" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6012"
periodTypeId="FISCAL_QUARTER" fromDate="2010-04-01 00:00:00.000"
thruDate="2010-07-01 23:59:59.000" isClosed="N" periodNum="3"
periodName="2010/Q2" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6013"
periodTypeId="FISCAL_QUARTER" fromDate="2010-07-01 00:00:00.000"
thruDate="2010-10-01 23:59:59.000" isClosed="N" periodNum="4"
periodName="2010/Q3" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6014"
periodTypeId="FISCAL_QUARTER" fromDate="2010-10-01 00:00:00.000"
thruDate="2011-01-01 23:59:59.000" isClosed="N" periodNum="5"
periodName="2010/Q4" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6015"
periodTypeId="FISCAL_YEAR" fromDate="2011-01-01 00:00:00.000"
thruDate="2020-01-01 23:59:59.000" isClosed="N" periodNum="1"
periodName="2011-2020"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6016"
periodTypeId="FISCAL_QUARTER" fromDate="2011-01-01 00:00:00.000"
thruDate="2011-04-01 23:59:59.000" isClosed="N" periodNum="2"
periodName="2011/Q1" parentPeriodId="6015"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6017"
periodTypeId="FISCAL_QUARTER" fromDate="2011-04-01 00:00:00.000"
thruDate="2011-07-01 23:59:59.000" isClosed="N" periodNum="3"
periodName="2011/Q2" parentPeriodId="6015"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6018"
periodTypeId="FISCAL_QUARTER" fromDate="2011-07-01 00:00:00.000"
thruDate="2011-10-01 23:59:59.000" isClosed="N" periodNum="4"
periodName="2011/Q3" parentPeriodId="6015"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6019"
periodTypeId="FISCAL_QUARTER" fromDate="2011-10-01 00:00:00.000"
thruDate="2012-01-01 23:59:59.000" isClosed="N" periodNum="5"
periodName="2011/Q4" parentPeriodId="6015"/>
<!-- to convert demo invoice -->
<UomConversionDated uomId="USD" uomIdTo="EUR" fromDate="2001-01-01
00:00:00.0" conversionFactor="0.7"/>
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java?rev=1743656&r1=1743655&r2=1743656&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java
(original)
+++
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java
Fri May 13 11:31:23 2016
@@ -74,9 +74,9 @@ public class PeriodServices {
GenericValue closedTimePeriod =
EntityQuery.use(delegator).from("CustomTimePeriod").select("customTimePeriodId",
"periodTypeId", "isClosed", "fromDate", "thruDate")
.where(findClosedConditions).orderBy("thruDate
DESC").queryFirst();
- if (closedTimePeriod != null && closedTimePeriod.get("thruDate")
!= null) {
+ if (UtilValidate.isNotEmpty(closedTimePeriod) &&
UtilValidate.isNotEmpty(closedTimePeriod.get("thruDate"))) {
lastClosedTimePeriod = closedTimePeriod;
- lastClosedDate =
UtilDateTime.toTimestamp(lastClosedTimePeriod.getDate("thruDate"));
+ lastClosedDate = lastClosedTimePeriod.getTimestamp("thruDate");
} else {
// uh oh, no time periods have been closed? in that case,
just find the earliest beginning of a time period for this organization
// and optionally, for this period type
@@ -85,8 +85,8 @@ public class PeriodServices {
findParams.put("periodTypeId", periodTypeId);
}
GenericValue timePeriod =
EntityQuery.use(delegator).from("CustomTimePeriod").where(findParams).orderBy("fromDate
ASC").queryFirst();
- if (timePeriod != null && timePeriod.get("fromDate") != null) {
- lastClosedDate =
UtilDateTime.toTimestamp(timePeriod.getDate("fromDate"));
+ if (UtilValidate.isNotEmpty(timePeriod) &&
UtilValidate.isNotEmpty(timePeriod.get("fromDate"))) {
+ lastClosedDate = timePeriod.getTimestamp("fromDate");
} else {
return
ServiceUtil.returnError(UtilProperties.getMessage(resource,
"AccountingPeriodCannotGet", locale));
}
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy?rev=1743656&r1=1743655&r2=1743656&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy
Fri May 13 11:31:23 2016
@@ -32,8 +32,8 @@ if (parameters.customTimePeriodId) {
customTimePeriod = from("CustomTimePeriod").where("customTimePeriodId",
parameters.customTimePeriodId).cache(true).queryOne();
exprList = [];
exprList.add(EntityCondition.makeCondition('organizationPartyId',
EntityOperator.IN, partyIds))
- exprList.add(EntityCondition.makeCondition('fromDate',
EntityOperator.LESS_THAN, customTimePeriod.getDate('thruDate').toTimestamp()))
-
exprList.add(EntityCondition.makeCondition(EntityCondition.makeCondition('thruDate',
EntityOperator.GREATER_THAN_EQUAL_TO,
customTimePeriod.getDate('fromDate').toTimestamp()), EntityOperator.OR,
EntityCondition.makeCondition('thruDate', EntityOperator.EQUALS, null)))
+ exprList.add(EntityCondition.makeCondition('fromDate',
EntityOperator.LESS_THAN, customTimePeriod.getTimestamp('thruDate')))
+
exprList.add(EntityCondition.makeCondition(EntityCondition.makeCondition('thruDate',
EntityOperator.GREATER_THAN_EQUAL_TO,
customTimePeriod.getTimestamp('fromDate')), EntityOperator.OR,
EntityCondition.makeCondition('thruDate', EntityOperator.EQUALS, null)))
List organizationGlAccounts =
from("GlAccountOrganizationAndClass").where(exprList).orderBy("accountCode").queryList();
accountBalances = []
Modified:
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=1743656&r1=1743655&r2=1743656&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
(original)
+++
ofbiz/trunk/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
Fri May 13 11:31:23 2016
@@ -465,7 +465,7 @@ public class MrpServices {
return
ServiceUtil.returnError(UtilProperties.getMessage(resource,
"ManufacturingMrpCannotFindCustomTimePeriod", locale));
}
if (customTimePeriod != null) {
- if (customTimePeriod.getDate("thruDate") != null &&
customTimePeriod.getDate("thruDate").before(UtilDateTime.nowDate())) {
+ if
(UtilValidate.isNotEmpty(customTimePeriod.getTimestamp("thruDate")) &&
customTimePeriod.getTimestamp("thruDate").before(UtilDateTime.nowTimestamp())) {
continue;
} else {
List<GenericValue> salesForecastDetails = null;
Modified: ofbiz/trunk/framework/common/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/entitydef/entitymodel.xml?rev=1743656&r1=1743655&r2=1743656&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/framework/common/entitydef/entitymodel.xml Fri May 13 11:31:23
2016
@@ -406,8 +406,8 @@ under the License.
<field name="periodTypeId" type="id"></field>
<field name="periodNum" type="numeric"></field>
<field name="periodName" type="name"></field>
- <field name="fromDate" type="date"></field>
- <field name="thruDate" type="date"></field>
+ <field name="fromDate" type="date-time"></field>
+ <field name="thruDate" type="date-time"></field>
<field name="isClosed" type="indicator"></field>
<prim-key field="customTimePeriodId"/>
<relation type="one" fk-name="ORG_PRD_PARPER" title="Parent"
rel-entity-name="CustomTimePeriod">
