From 5ef0b3cfbe1de27cedc8d0d9dd30b81fb611c717 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Fri, 20 May 2022 14:02:31 -0700 Subject: [PATCH 1/3] Update XML files to use new XSD references for the 3.0.0 release series --- MoquiConf.xml | 2 +- component.xml | 2 +- screen/marble.xml | 2 +- screen/marble/dashboard.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MoquiConf.xml b/MoquiConf.xml index b16059c..e9adecc 100644 --- a/MoquiConf.xml +++ b/MoquiConf.xml @@ -1,6 +1,6 @@ - + - diff --git a/screen/marble.xml b/screen/marble.xml index 456084a..980d216 100644 --- a/screen/marble.xml +++ b/screen/marble.xml @@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication along with this software (see the LICENSE.md file). If not, see . --> - diff --git a/screen/marble/dashboard.xml b/screen/marble/dashboard.xml index 8a1cd45..669791f 100644 --- a/screen/marble/dashboard.xml +++ b/screen/marble/dashboard.xml @@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication along with this software (see the LICENSE.md file). If not, see . --> - From d438b92b024b4103439d1435f7f610a2e9fdf257 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Tue, 24 May 2022 12:49:21 -0700 Subject: [PATCH 2/3] In component.xml bump versions for upcoming release --- component.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/component.xml b/component.xml index 5cc7a1f..f579674 100644 --- a/component.xml +++ b/component.xml @@ -1,8 +1,6 @@ + name="MarbleERP" version="1.0.0"> - - - + From 6f6b52cb51343bdc8b3241a1e931ecf364082959 Mon Sep 17 00:00:00 2001 From: David E Jones Date: Mon, 30 May 2022 15:22:26 -0700 Subject: [PATCH 3/3] Add more release notes from review of commits since last release, update year in AUTHORS --- AUTHORS | 4 ++-- README.md | 2 +- ReleaseNotes.md | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 ReleaseNotes.md diff --git a/AUTHORS b/AUTHORS index 329a32f..69151c6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -34,7 +34,7 @@ that are otherwise encumbered. Signed by git commit adding my legal name and git username: -Written in 2020 by David E. Jones - jonesde +Written in 2020-2022 by David E. Jones - jonesde =========================================================================== @@ -56,6 +56,6 @@ litigation is filed. Signed by git commit adding my legal name and git username: -Written in 2020 by David E. Jones - jonesde +Written in 2020-2022 by David E. Jones - jonesde =========================================================================== diff --git a/README.md b/README.md index 66fce5b..fa5d039 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Moqui Marble ERP is a planning and management application for businesses that pr This is a comprehensive ERP application rather than being focused on goods like POP Commerce ERP or services like HiveMind PM & Admin. Part of the reason for the combination is that goods oriented businesses also have projects and tasks to manage even if they don't sell them, and services oriented businesses also have equipment and supplies to manage even if they don't sell goods. -Moqui Marble ERP is designed around business activities in 3 categories by the primary roles in the system: Internal, Supplier, and Customer. These activities fit into high level business processes such as Produce to Pay (Supplier interactions) and Order to Cash (Customer interactions), and are combined to support a complete end to end flow. +Moqui Marble ERP is designed around business activities in 3 categories by the primary roles in the system: Internal, Supplier, and Customer. These activities fit into high level business processes such as Procure to Pay (Supplier interactions) and Order to Cash (Customer interactions), and are combined to support a complete end to end flow. ### Build and Run Locally diff --git a/ReleaseNotes.md b/ReleaseNotes.md new file mode 100644 index 0000000..aac133f --- /dev/null +++ b/ReleaseNotes.md @@ -0,0 +1,17 @@ +# Moqui Marble ERP Release Notes + +## Release 1.0.0 - 31 May 2022 + +Moqui Marble ERP 1.0.0 is the first release. Marble ERP has a combination of functionality from POPC ERP, +HiveMind Admin, and HiveMind PM. + +This application is focused on the customer & client facing process of quote to cash, and the supplier & worker +facing process of procure to pay. Outside these two main processes there are configuration, accounting, and +management of employees, contractors, equipment, supplies, and light manufacturing. + +For a complete list of changes see: + +https://github.com/moqui/MarbleERP/compare/41e7fc5a^...v1.5.0 + +Most changes come from screens reused from SimpleScreens. +