Skip to content

Commit

Permalink
Merge pull request #3 from moqui/release3
Browse files Browse the repository at this point in the history
Release 1.0.0 changes
  • Loading branch information
jonesde authored May 31, 2022
2 parents a971e92 + 6f6b52c commit cf14307
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 11 deletions.
4 changes: 2 additions & 2 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -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

===========================================================================

Expand All @@ -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

===========================================================================
2 changes: 1 addition & 1 deletion MoquiConf.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- No copyright or license for configuration file, details here are not considered a creative work. -->
<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd">
<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
<screen-facade>
<screen location="component://webroot/screen/webroot/apps.xml">
<subscreens-item name="marble" menu-title="Marble ERP" menu-index="6"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 17 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -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.

8 changes: 3 additions & 5 deletions component.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd"
name="MarbleERP" version="1.0.0">
<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd"
name="MarbleERP" version="1.0.0">
<depends-on name="moqui-fop" version="1.1.2"/>
<depends-on name="mantle-udm" version="2.1.2"/>
<depends-on name="mantle-usl" version="2.1.2"/>
<depends-on name="SimpleScreens" version="2.1.2"/>
<depends-on name="SimpleScreens" version="2.2.0"/>
</component>
2 changes: 1 addition & 1 deletion screen/marble.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
default-menu-title="Marble ERP" menu-image="fa fa-cogs" menu-image-type="icon" server-static="vuet,qvt">

<always-actions>
Expand Down
2 changes: 1 addition & 1 deletion screen/marble/dashboard.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
<http://creativecommons.org/publicdomain/zero/1.0/>.
-->
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
default-menu-title="Dashboard" default-menu-index="1" menu-image="fa fa-dashboard" menu-image-type="icon">

<widgets>
Expand Down

0 comments on commit cf14307

Please sign in to comment.