This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit d27f2a4048c456c03529b6de964663acce161b62
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Mon Jan 1 16:49:53 2024 +0100
Fixed: Updates to 2024
This was preventing integration tests to pass
Conflict handled by hand in NOTICE
---
NOTICE | 2 +-
applications/datamodel/data/demo/AccountingDemoData.xml | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/NOTICE b/NOTICE
index c7b96edffc..01c2d3eb9e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache OFBiz
-Copyright 2001-2022 The Apache Software Foundation
+Copyright 2001-2024 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/applications/datamodel/data/demo/AccountingDemoData.xml
b/applications/datamodel/data/demo/AccountingDemoData.xml
index 802463d4e8..aef54bbcc3 100644
--- a/applications/datamodel/data/demo/AccountingDemoData.xml
+++ b/applications/datamodel/data/demo/AccountingDemoData.xml
@@ -863,6 +863,7 @@ under the License.
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6100"
periodTypeId="FISCAL_YEAR" fromDate="2021-01-01 00:00:00.000"
thruDate="2022-01-01 00:00:00.000" isClosed="N" periodNum="13"
periodName="FY2021"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6200"
periodTypeId="FISCAL_YEAR" fromDate="2022-01-01 00:00:00.000"
thruDate="2023-01-01 00:00:00.000" isClosed="N" periodNum="14"
periodName="FY2022"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6300"
periodTypeId="FISCAL_YEAR" fromDate="2023-01-01 00:00:00.000"
thruDate="2024-01-01 00:00:00.000" isClosed="N" periodNum="15"
periodName="FY2023"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6400"
periodTypeId="FISCAL_YEAR" fromDate="2024-01-01 00:00:00.000"
thruDate="2025-01-01 00:00:00.000" isClosed="N" periodNum="15"
periodName="FY2024"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4921"
periodTypeId="FISCAL_QUARTER" fromDate="2009-01-01 00:00:00.000"
thruDate="2009-04-01 00:00:00.000" isClosed="N" periodNum="1"
periodName="2009/Q1" parentPeriodId="4900"/>
<CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4922"
periodTypeId="FISCAL_QUARTER" fromDate="2009-04-01 00:00:00.000"
thruDate="2009-07-01 00:00:00.000" isClosed="N" periodNum="2"
periodName="2009/Q2" parentPeriodId="4900"/>
@@ -1651,7 +1652,7 @@ under the License.
<InventoryItem facilityId="WebStoreWarehouse" locationSeqId="TLTLTLUL01"
datetimeReceived="2008-08-01 08:00:00.000"
inventoryItemId="9030"
inventoryItemTypeId="NON_SERIAL_INV_ITEM" productId="MAT_B_COST"
ownerPartyId="Company" currencyUomId="USD" unitCost="7.0"/>
<InventoryItemDetail inventoryItemId="9030"
inventoryItemDetailSeqId="0001" effectiveDate="2001-05-13 12:00:00.0"
availableToPromiseDiff="20" quantityOnHandDiff="20"
accountingQuantityDiff="20"/>
-
+
<!-- defaut template screen use for Company -->
<CustomScreen customScreenId="DEFAULT_INV_TPL"
customScreenTypeId="CST_INVOICE_TPL" customScreenName="DefaultInvoicePDF"
customScreenLocation="component://accounting/widget/AccountingPrintScreens.xml"/>
<PartyPrefDocTypeTpl partyPrefDocTypeTplId="InvTplInvoice"
partyId="Company" fromDate="2001-05-13 00:00:00" invoiceTypeId="INVOICE"
customScreenId="DEFAULT_INV_TPL"/>
