You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2020/01/03 16:51:09 UTC
[ofbiz-framework] branch release17.12 updated (e707e94 -> 1dd8d5e)
This is an automated email from the ASF dual-hosted git repository.
jacopoc pushed a change to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.
from e707e94 Improved: Equivalent of svn:auto-props properties on the server (OFBIZ-OFBIZ-11279)
new 1e73375 Fixed: Extend the thru date of the demo financial period (and simplify some related demo data for easier future maintenance) in order to fix some tests that are failing in the new year.
new 1dd8d5e Fixed: Update budget demo data to reflect recent changes to the demo finacial period data.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
applications/accounting/data/BudgetDemoData.xml | 2 +-
applications/accounting/data/GlSetupDemoData.xml | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
[ofbiz-framework] 01/02: Fixed: Extend the thru date of the demo
financial period (and simplify some related demo data for easier future
maintenance) in order to fix some tests that are failing in the new year.
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jacopoc pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 1e73375bbbfd17dfe6257d3ced4b8ca245651d68
Author: Jacopo Cappellato <ja...@gmail.com>
AuthorDate: Fri Jan 3 13:46:04 2020 +0100
Fixed: Extend the thru date of the demo financial period (and simplify
some related demo data for easier future maintenance) in order to fix
some tests that are failing in the new year.
---
applications/accounting/data/GlSetupDemoData.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/applications/accounting/data/GlSetupDemoData.xml b/applications/accounting/data/GlSetupDemoData.xml
index dca9fd7..b2a6e02 100644
--- a/applications/accounting/data/GlSetupDemoData.xml
+++ b/applications/accounting/data/GlSetupDemoData.xml
@@ -397,11 +397,7 @@ under the License.
<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"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6015" periodTypeId="FISCAL_YEAR" fromDate="2011-01-01 00:00:00.000" thruDate="2030-01-01 23:59:59.000" isClosed="N" periodNum="1" periodName="2011-2030"/>
<!-- to convert demo invoice -->
<UomConversionDated uomId="USD" uomIdTo="EUR" fromDate="2001-01-01 00:00:00.0" conversionFactor="0.7"/>
[ofbiz-framework] 02/02: Fixed: Update budget demo data to reflect
recent changes to the demo finacial period data.
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jacopoc pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 1dd8d5e757c3f1a527fce6380e506ce55a046b76
Author: Jacopo Cappellato <ja...@gmail.com>
AuthorDate: Fri Jan 3 17:32:18 2020 +0100
Fixed: Update budget demo data to reflect recent changes to the demo
finacial period data.
---
applications/accounting/data/BudgetDemoData.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/applications/accounting/data/BudgetDemoData.xml b/applications/accounting/data/BudgetDemoData.xml
index 8f7a1ec..22819ce 100644
--- a/applications/accounting/data/BudgetDemoData.xml
+++ b/applications/accounting/data/BudgetDemoData.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
<entity-engine-xml>
- <Budget budgetId="DemoBudget001" budgetTypeId="CAPITAL_BUDGET" customTimePeriodId="6016" comments="Demo for budget 001"/>
+ <Budget budgetId="DemoBudget001" budgetTypeId="CAPITAL_BUDGET" customTimePeriodId="6015" comments="Demo for budget 001"/>
<Budget budgetId="DemoBudget002" budgetTypeId="OPERATING_BUDGET" customTimePeriodId="6010" comments="Demo for budget 002"/>
<BudgetStatus budgetId="DemoBudget001" statusId="BG_CREATED" statusDate="2009-01-09 00:00:00.000"/>