svn commit: r1743688 - in /ofbiz/branches/release15.12: ./ applications/accounting/data/ applications/accounting/src/or
Locked
svn commit: r1743688 - in /ofbiz/branches/release15.12: ./ applications/accounting/data/ applications/accounting/src/or
 
|
Author: jleroux
Date: Fri May 13 15:06:40 2016 New Revision: 1743688 URL: http://svn.apache.org/viewvc?rev=1743688&view=rev Log: "Applied fix from trunk for revision: 1743656" ------------------------------------------------------------------------ r1743656 | deepak | 2016-05-13 13:31:23 +0200 (ven. 13 mai 2016) | 1 ligne (OFBIZ-5740) Updated fromDate and thruDate filed type for CustomTimePeriod entity from date to date-time, and made chagnes accordingly. ------------------------------------------------------------------------ Modified: ofbiz/branches/release15.12/ (props changed) ofbiz/branches/release15.12/applications/accounting/data/DemoGlSetupData.xml ofbiz/branches/release15.12/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy ofbiz/branches/release15.12/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java ofbiz/branches/release15.12/framework/common/entitydef/entitymodel.xml Propchange: ofbiz/branches/release15.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri May 13 15:06:40 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412 +/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656 Modified: ofbiz/branches/release15.12/applications/accounting/data/DemoGlSetupData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/data/DemoGlSetupData.xml?rev=1743688&r1=1743687&r2=1743688&view=diff ============================================================================== --- ofbiz/branches/release15.12/applications/accounting/data/DemoGlSetupData.xml (original) +++ ofbiz/branches/release15.12/applications/accounting/data/DemoGlSetupData.xml Fri May 13 15:06:40 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/branches/release15.12/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java?rev=1743688&r1=1743687&r2=1743688&view=diff ============================================================================== --- ofbiz/branches/release15.12/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java (original) +++ ofbiz/branches/release15.12/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java Fri May 13 15:06:40 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/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy?rev=1743688&r1=1743687&r2=1743688&view=diff ============================================================================== --- ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy (original) +++ ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TrialBalance.groovy Fri May 13 15:06:40 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/branches/release15.12/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=1743688&r1=1743687&r2=1743688&view=diff ============================================================================== --- ofbiz/branches/release15.12/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java (original) +++ ofbiz/branches/release15.12/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java Fri May 13 15:06:40 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/branches/release15.12/framework/common/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/common/entitydef/entitymodel.xml?rev=1743688&r1=1743687&r2=1743688&view=diff ============================================================================== --- ofbiz/branches/release15.12/framework/common/entitydef/entitymodel.xml (original) +++ ofbiz/branches/release15.12/framework/common/entitydef/entitymodel.xml Fri May 13 15:06:40 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"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |