This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit a39981f238f4e358f0cef9d8124e85d4ca352a24
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
Conflicts handled by hand in
applications/datamodel/data/demo/AccountingDemoData.xml
---
NOTICE | 2 +-
.../datamodel/data/demo/AccountingDemoData.xml | 69 +++++++++++++++++++---
2 files changed, 63 insertions(+), 8 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 35ef12e287..9e0516cc44 100644
--- a/applications/datamodel/data/demo/AccountingDemoData.xml
+++ b/applications/datamodel/data/demo/AccountingDemoData.xml
@@ -847,13 +847,56 @@ under the License.
<VarianceReasonGlAccount organizationPartyId="Company"
varianceReasonId="VAR_INTEGR" glAccountId="514000"/>
<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 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="2030-01-01 23:59:59.000" isClosed="N" periodNum="1"
periodName="2011-2030"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4900"
periodTypeId="FISCAL_YEAR" fromDate="2009-01-01 00:00:00.000"
thruDate="2010-01-01 00:00:00.000" isClosed="N" periodNum="1"
periodName="FY2009"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6010"
periodTypeId="FISCAL_YEAR" fromDate="2010-01-01 00:00:00.000"
thruDate="2011-01-01 00:00:00.000" isClosed="N" periodNum="2"
periodName="FY2010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6015"
periodTypeId="FISCAL_YEAR" fromDate="2011-01-01 00:00:00.000"
thruDate="2012-01-01 00:00:00.000" isClosed="N" periodNum="3"
periodName="FY2011"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5200"
periodTypeId="FISCAL_YEAR" fromDate="2012-01-01 00:00:00.000"
thruDate="2013-01-01 00:00:00.000" isClosed="N" periodNum="4"
periodName="FY2012"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5300"
periodTypeId="FISCAL_YEAR" fromDate="2013-01-01 00:00:00.000"
thruDate="2014-01-01 00:00:00.000" isClosed="N" periodNum="5"
periodName="FY2013"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5400"
periodTypeId="FISCAL_YEAR" fromDate="2014-01-01 00:00:00.000"
thruDate="2015-01-01 00:00:00.000" isClosed="N" periodNum="6"
periodName="FY2014"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5500"
periodTypeId="FISCAL_YEAR" fromDate="2015-01-01 00:00:00.000"
thruDate="2016-01-01 00:00:00.000" isClosed="N" periodNum="7"
periodName="FY2015"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5600"
periodTypeId="FISCAL_YEAR" fromDate="2016-01-01 00:00:00.000"
thruDate="2017-01-01 00:00:00.000" isClosed="N" periodNum="8"
periodName="FY2016"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5700"
periodTypeId="FISCAL_YEAR" fromDate="2017-01-01 00:00:00.000"
thruDate="2018-01-01 00:00:00.000" isClosed="N" periodNum="9"
periodName="FY2017"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5800"
periodTypeId="FISCAL_YEAR" fromDate="2018-01-01 00:00:00.000"
thruDate="2019-01-01 00:00:00.000" isClosed="N" periodNum="10"
periodName="FY2018"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5900"
periodTypeId="FISCAL_YEAR" fromDate="2019-01-01 00:00:00.000"
thruDate="2020-01-01 00:00:00.000" isClosed="N" periodNum="11"
periodName="FY2019"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6000"
periodTypeId="FISCAL_YEAR" fromDate="2020-01-01 00:00:00.000"
thruDate="2021-01-01 00:00:00.000" isClosed="N" periodNum="12"
periodName="FY2020"/>
+ <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"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4923"
periodTypeId="FISCAL_QUARTER" fromDate="2009-07-01 00:00:00.000"
thruDate="2009-10-01 00:00:00.000" isClosed="N" periodNum="3"
periodName="2009/Q3" parentPeriodId="4900"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4924"
periodTypeId="FISCAL_QUARTER" fromDate="2009-10-01 00:00:00.000"
thruDate="2010-01-01 00:00:00.000" isClosed="N" periodNum="4"
periodName="2009/Q4" parentPeriodId="4900"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4901"
periodTypeId="FISCAL_MONTH" fromDate="2009-01-01 00:00:00.000"
thruDate="2009-02-01 00:00:00.000" isClosed="N" periodNum="1"
periodName="2009/M01" parentPeriodId="4900"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4902"
periodTypeId="FISCAL_MONTH" fromDate="2009-02-01 00:00:00.000"
thruDate="2009-03-01 00:00:00.000" isClosed="N" periodNum="2"
periodName="2009/M02" parentPeriodId="4900"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4903"
periodTypeId="FISCAL_MONTH" fromDate="2009-03-01 00:00:00.000"
thruDate="2009-04-01 00:00:00.000" isClosed="N" periodNum="3"
periodName="2009/M03" parentPeriodId="4900"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4904"
periodTypeId="FISCAL_MONTH" fromDate="2009-04-01 00:00:00.000"
thruDate="2009-05-01 00:00:00.000" isClosed="N" periodNum="4"
periodName="2009/M04" parentPeriodId="4900"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4905"
periodTypeId="FISCAL_MONTH" fromDate="2009-05-01 00:00:00.000"
thruDate="2009-06-01 00:00:00.000" isClosed="N" periodNum="5"
periodName="2009/M05" parentPeriodId="4900"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4906"
periodTypeId="FISCAL_MONTH" fromDate="2009-06-01 00:00:00.000"
thruDate="2009-07-01 00:00:00.000" isClosed="N" periodNum="6"
periodName="2009/M06" parentPeriodId="4900"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4907"
periodTypeId="FISCAL_MONTH" fromDate="2009-07-01 00:00:00.000"
thruDate="2009-08-01 00:00:00.000" isClosed="N" periodNum="7"
periodName="2009/M07" parentPeriodId="4900"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4908"
periodTypeId="FISCAL_MONTH" fromDate="2009-08-01 00:00:00.000"
thruDate="2009-09-01 00:00:00.000" isClosed="N" periodNum="8"
periodName="2009/M08" parentPeriodId="4900"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4909"
periodTypeId="FISCAL_MONTH" fromDate="2009-09-01 00:00:00.000"
thruDate="2009-10-01 00:00:00.000" isClosed="N" periodNum="9"
periodName="2009/M09" parentPeriodId="4900"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4910"
periodTypeId="FISCAL_MONTH" fromDate="2009-10-01 00:00:00.000"
thruDate="2009-11-01 00:00:00.000" isClosed="N" periodNum="10"
periodName="2009/M10" parentPeriodId="4900"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4911"
periodTypeId="FISCAL_MONTH" fromDate="2009-11-01 00:00:00.000"
thruDate="2009-12-01 00:00:00.000" isClosed="N" periodNum="11"
periodName="2009/M11" parentPeriodId="4900"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="4912"
periodTypeId="FISCAL_MONTH" fromDate="2009-12-01 00:00:00.000"
thruDate="2010-01-01 00:00:00.000" isClosed="N" periodNum="12"
periodName="2009/M12" parentPeriodId="4900"/>
+
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="6011"
periodTypeId="FISCAL_QUARTER" fromDate="2010-01-01 00:00:00.000"
thruDate="2010-04-01 00:00:00.0" isClosed="N" periodNum="1"
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 00:00:00.0" isClosed="N" periodNum="2"
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 00:00:00.0" isClosed="N" periodNum="3"
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 00:00:00.0" isClosed="N" periodNum="4"
periodName="2010/Q4" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5001"
periodTypeId="FISCAL_MONTH" fromDate="2010-01-01 00:00:00.0"
thruDate="2010-02-01 00:00:00.0" isClosed="N" periodNum="1"
periodName="2010/M01" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5002"
periodTypeId="FISCAL_MONTH" fromDate="2010-02-01 00:00:00.0"
thruDate="2010-03-01 00:00:00.0" isClosed="N" periodNum="2"
periodName="2010/M02" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5003"
periodTypeId="FISCAL_MONTH" fromDate="2010-03-01 00:00:00.0"
thruDate="2010-04-01 00:00:00.0" isClosed="N" periodNum="3"
periodName="2010/M03" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5004"
periodTypeId="FISCAL_MONTH" fromDate="2010-04-01 00:00:00.0"
thruDate="2010-05-01 00:00:00.0" isClosed="N" periodNum="4"
periodName="2010/M04" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5005"
periodTypeId="FISCAL_MONTH" fromDate="2010-05-01 00:00:00.0"
thruDate="2010-06-01 00:00:00.0" isClosed="N" periodNum="5"
periodName="2010/M05" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5006"
periodTypeId="FISCAL_MONTH" fromDate="2010-06-01 00:00:00.0"
thruDate="2010-07-01 00:00:00.0" isClosed="N" periodNum="6"
periodName="2010/M06" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5007"
periodTypeId="FISCAL_MONTH" fromDate="2010-07-01 00:00:00.0"
thruDate="2010-08-01 00:00:00.0" isClosed="N" periodNum="7"
periodName="2010/M07" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5008"
periodTypeId="FISCAL_MONTH" fromDate="2010-08-01 00:00:00.0"
thruDate="2010-09-01 00:00:00.0" isClosed="N" periodNum="8"
periodName="2010/M08" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5009"
periodTypeId="FISCAL_MONTH" fromDate="2010-09-01 00:00:00.0"
thruDate="2010-10-01 00:00:00.0" isClosed="N" periodNum="9"
periodName="2010/M09" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5010"
periodTypeId="FISCAL_MONTH" fromDate="2010-10-01 00:00:00.0"
thruDate="2010-11-01 00:00:00.0" isClosed="N" periodNum="10"
periodName="2010/M10" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5011"
periodTypeId="FISCAL_MONTH" fromDate="2010-11-01 00:00:00.0"
thruDate="2010-12-01 00:00:00.0" isClosed="N" periodNum="11"
periodName="2010/M11" parentPeriodId="6010"/>
+ <CustomTimePeriod organizationPartyId="Company" customTimePeriodId="5012"
periodTypeId="FISCAL_MONTH" fromDate="2010-12-01 00:00:00.0"
thruDate="2011-01-01 00:00:00.0" isClosed="N" periodNum="12"
periodName="2010/M12" parentPeriodId="6010"/>
<!-- to convert demo invoice -->
<UomConversionDated uomId="USD" uomIdTo="EUR" fromDate="2001-01-01
00:00:00.0" conversionFactor="0.7"/>
@@ -992,6 +1035,14 @@ under the License.
<TaxAuthority taxAuthGeoId="ON" taxAuthPartyId="ON_TAXMAN"
includeTaxInPrice="Y"/>
<TaxAuthorityGlAccount taxAuthGeoId="ON" taxAuthPartyId="ON_TAXMAN"
organizationPartyId="Company" glAccountId="224209"/>
+ <!-- China TaxAuthority defs -->
+ <Party partyId="CHN_STA" partyTypeId="PARTY_GROUP"
preferredCurrencyUomId="CNY" statusId="PARTY_ENABLED" createdDate="2009-01-01
00:00:00.000"/>
+ <PartyGroup partyId="CHN_STA" groupName="State Taxation Administration"/>
+ <PartyRole partyId="CHN_STA" roleTypeId="TAX_AUTHORITY"/>
+ <TaxAuthority taxAuthGeoId="CHN" taxAuthPartyId="CHN_STA"
includeTaxInPrice="N" requireTaxIdForExemption="Y"
+ taxIdFormatPattern=""/>
+ <TaxAuthorityGlAccount taxAuthGeoId="CHN" taxAuthPartyId="CHN_STA"
organizationPartyId="Company" glAccountId="224209"/>
+
<!-- Party TaxAuthority info for Company -->
<!-- some interesting information at:
http://www.taxadmin.org/fta/rate/tax_stru.html -->
<PartyTaxAuthInfo partyId="Company" taxAuthGeoId="_NA_"
taxAuthPartyId="_NA_" fromDate="2001-05-13 00:00:00.001" isNexus="Y"/>
@@ -1601,4 +1652,8 @@ under the License.
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"/>
+
</entity-engine-xml>
