MErge Main to Dev

build-images.sh

@@ -14,7 +14,7 @@ images=()
 repobase="${REPOBASE:-ghcr.io/geniusdynamics}"
 # Configure the image name
 reponame="erpnext"
-app_version="v15.31.5"
+app_version="v15.32.1-ns.1"
 # Create a new empty container image
 container=$(buildah from scratch)
 
@@ -45,7 +45,7 @@ buildah config --entrypoint=/ \
  --label="org.nethserver.authorizations=traefik@node:routeadm" \
  --label="org.nethserver.tcp-ports-demand=1" \
  --label="org.nethserver.rootfull=0" \
- --label="org.nethserver.images=docker.io/mariadb:10.11.5 docker.io/frappe/erpnext:${app_version} docker.io/redis:6.2-alpine" \
+ --label="org.nethserver.images=docker.io/mariadb:10.11.5 docker.io/geniusdynamics/custom-erpnext:${app_version} docker.io/redis:6.2-alpine" \
  "${container}"
 # Commit the image
 buildah commit "${container}" "${repobase}/${reponame}"

imageroot/actions/configure-module/10configure_environment_vars

@@ -14,20 +14,12 @@ import agent
 data = json.load(sys.stdin)
 
 #This is specific to you module, so you need to change it accordingly.
-# we read a json stdin {"vars1":true, "var2":"foo", "vars3": 3} and we writ it to .config/state/environment
-# Upper case to set environment variable and minor case to read from stdin
 
-# this values must exists in the json stdin
-# agent.set_env("MAIL_SERVER", data["mail_server"])
-# agent.set_env("LDAP_DOMAIN", data["ldap_domain"])
+ERP_NEXT_MODULES = data.get("erpSelectedModules", [])
 
-# you can add default values for the following variables
-# agent.set_env("MAIL_DOMAIN",data.get("mail_domain",""))
-# agent.set_env("WOWORKERSCOUNT",data.get("workers_count",3))
-# agent.set_env("AUXILIARYACCOUNT",data.get("auxiliary_account",True))
-# agent.set_env("ACTIVESYNC",data.get("activesync",False))
+agent.write_envfile("erpnext-modules.env", {
+ "ERP_NEXT_MODULES": ERP_NEXT_MODULES
+})
+agent.set_env("ERP_NEXT_MODULES", ERP_NEXT_MODULES)
 
-
-# Make sure everything is saved inside the environment file
-# just before starting systemd unit
-#agent.dump_env()
+agent.dump_env()

imageroot/actions/get-configuration/20read

@@ -14,13 +14,19 @@ import sys
 import json
 import agent
 
+
 # Prepare return variable
 config = {}
 
 # Read current configuration from the environment file
 config["host"] = os.getenv("TRAEFIK_HOST","")
 config["http2https"] = os.getenv("TRAEFIK_HTTP2HTTPS") == "True"
 config["lets_encrypt"] = os.getenv("TRAEFIK_LETS_ENCRYPT") == "True"
+config["erpSelectedModules"] = os.getenv("ERP_NEXT_MODULES", [])
+# Load erpnext-modules.env file
+
+erp_next_modules = "erpnext-modules.env"
+
 
 # Dump the configuration to stdout
 json.dump(config, fp=sys.stdout)

imageroot/bin/create-site

@@ -20,4 +20,14 @@
  fi
  done;
  echo "sites/common_site_config.json found";
- bench new-site --no-mariadb-socket --admin-password=admin --db-root-password="$MARIADB_ROOT_PASSWORD" --install-app erpnext --set-default frontend;
+ bench new-site frontend --no-mariadb-socket --admin-password=admin --db-root-password="$MARIADB_ROOT_PASSWORD" --install-app erpnext --set-default;
+ # Convert the JSON-like string to a bash array
+ ERPNEXT_MODULES=$(echo "$ERP_NEXT_MODULES" | tr -d "[]'" | tr -d ' ')
+ IFS=',' read -r -a ERP_NEXT_MODULES_ARRAY <<< "$ERPNEXT_MODULES"
+ # Iterate over the array
+ for module in "${ERP_NEXT_MODULES_ARRAY[@]}"; do
+ echo "Processing $module"
+ # Add your logic here, e.g., installing apps
+ bench --site frontend install-app "$module"
+ done
+

imageroot/systemd/user/backend.service

@@ -19,7 +19,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/backend.pid \
  --pod-id-file %t/erp-next.pod-id --replace -d --name backend \
  -v sites:/home/frappe/frappe-bench/sites \
  -v logs:/home/frappe/frappe-bench/logs \
- ${ERPNEXT_IMAGE}
+ ${CUSTOM_ERPNEXT_IMAGE}
 
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/backend.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP backend

imageroot/systemd/user/configurator.service

@@ -20,7 +20,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/configurator.pid \
  -v logs:/home/frappe/frappe-bench/logs \
  -v %S/bin/configurator:/configurator:Z \
  --env-file=%S/state/configurator.env \
- ${ERPNEXT_IMAGE} /bin/bash -c "/configurator"
+ ${CUSTOM_ERPNEXT_IMAGE} /bin/bash -c "/configurator"
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/configurator.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP configurator
 SyslogIdentifier=%u

imageroot/systemd/user/create-site.service

@@ -15,7 +15,8 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/create-site.pid \
  -v logs:/home/frappe/frappe-bench/logs \
  -v %S/bin/create-site:/create-site:Z \
  --env-file=%S/state/database.env \
- ${ERPNEXT_IMAGE} /bin/bash -c "/create-site"
+ --env-file=%S/state/erpnext-modules.env \
+ ${CUSTOM_ERPNEXT_IMAGE} /bin/bash -c "/create-site"
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/create-site.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP create-site
 SyslogIdentifier=%u

imageroot/systemd/user/frontend.service

@@ -24,7 +24,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/frontend.pid \
  -e UPSTREAM_REAL_IP_RECURSIVE=off \
  -e PROXY_READ_TIMEOUT=120 \
  -e CLIENT_MAX_BODY_SIZE=50m \
- ${ERPNEXT_IMAGE} nginx-entrypoint.sh
+ ${CUSTOM_ERPNEXT_IMAGE} nginx-entrypoint.sh
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/frontend.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP frontend
 SyslogIdentifier=%u

imageroot/systemd/user/mariadb-app.service

@@ -24,7 +24,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/mariadb-app.pid \
  ${MARIADB_IMAGE} \
  --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --skip-character-set-client-handshake
 ExecStartPost=/usr/bin/podman exec mariadb-app /bin/bash -c 'printf "[client] \npassword=${MARIADB_ROOT_PASSWORD}" > /root/.my.cnf'
-ExecStartPost=/usr/bin/podman exec mariadb-app /bin/bash -c "while ! mysqladmin ping -h localhost -P 3306 -u root; do sleep 1; done"
+#ExecStartPost=/usr/bin/podman exec mariadb-app /bin/bash -c "while ! mysqladmin ping -h localhost -P 3306 -u root; do sleep 1; done"
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/mariadb-app.ctr-id -t 10
 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/mariadb-app.ctr-id
 ExecReload=/usr/bin/podman kill -s HUP mariadb-app

imageroot/systemd/user/queue-long.service

@@ -16,7 +16,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/queue-long.pid \
  --pod-id-file %t/erp-next.pod-id --replace -d --name queue-long \
  -v sites:/home/frappe/frappe-bench/sites \
  -v logs:/home/frappe/frappe-bench/logs \
- ${ERPNEXT_IMAGE} bench worker --queue long,default,short
+ ${CUSTOM_ERPNEXT_IMAGE} bench worker --queue long,default,short
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/queue-long.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP queue-long
 SyslogIdentifier=%u

imageroot/systemd/user/queue-short.service

@@ -15,7 +15,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/queue-short.pid \
  --pod-id-file %t/erp-next.pod-id --replace -d --name queue-short \
  -v sites:/home/frappe/frappe-bench/sites \
  -v logs:/home/frappe/frappe-bench/logs \
- ${ERPNEXT_IMAGE} bench worker --queue short,default
+ ${CUSTOM_ERPNEXT_IMAGE} bench worker --queue short,default
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/queue-short.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP queue-short
 SyslogIdentifier=%u

imageroot/systemd/user/scheduler.service

@@ -15,7 +15,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/scheduler.pid \
  --pod-id-file %t/erp-next.pod-id --replace -d --name scheduler \
  -v sites:/home/frappe/frappe-bench/sites \
  -v logs:/home/frappe/frappe-bench/logs \
- ${ERPNEXT_IMAGE} bench schedule
+ ${CUSTOM_ERPNEXT_IMAGE} bench schedule
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/scheduler.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP scheduler
 SyslogIdentifier=%u

imageroot/systemd/user/websocket.service

@@ -16,7 +16,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/websocket.pid \
  --pod-id-file %t/erp-next.pod-id --replace -d --name websocket \
  -v sites:/home/frappe/frappe-bench/sites \
  -v logs:/home/frappe/frappe-bench/logs \
- ${ERPNEXT_IMAGE} node /home/frappe/frappe-bench/apps/frappe/socketio.js
+ ${CUSTOM_ERPNEXT_IMAGE} node /home/frappe/frappe-bench/apps/frappe/socketio.js
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/websocket.ctr-id -t 10
 ExecReload=/usr/bin/podman kill -s HUP websocket
 SyslogIdentifier=%u

ui/src/views/Settings.vue

@@ -61,11 +61,30 @@
  $t("settings.enabled")
  }}</template>
  </cv-toggle>
+ <div>Selected Modules: {{erpSelectedModules}} </div>
+ <cv-multi-select
+ :label="'ERP Next Modules to be installed'"
+ :options="erpNextModules"
+ :title="'ERP Next Modules to be installed'"
+ v-model="erpSelectedModules"
+ >
+ </cv-multi-select>
  <!-- advanced options -->
  <cv-accordion ref="accordion" class="maxwidth mg-bottom">
  <cv-accordion-item :open="toggleAccordion[0]">
  <template slot="title">{{ $t("settings.advanced") }}</template>
  <template slot="content">
+
+ <div v-for="module in erpNextModules" :key="module.value">
+ <cv-toggle
+ :label="module.value"
+ :value="module.value"
+ v-model="erpSelectedModules"
+ :disabled="loading.getConfiguration || loading.configureModule"
+ class="mg-bottom">
+
+ </cv-toggle>
+ </div>
  </template>
  </cv-accordion-item>
  </cv-accordion>
@@ -125,6 +144,37 @@ export default {
  host: "",
  isLetsEncryptEnabled: false,
  isHttpToHttpsEnabled: true,
+ erpNextModules:[
+ { "label": "Insights", "value": "insights", "name": "insights", "disabled": false },
+ { "label": "Hrms", "value": "hrms", "name": "hrms", "disabled": false },
+ { "label": "Nl Attendance Timesheet", "value": "nl_attendance_timesheet", "name": "nl-attendance-timesheet", "disabled": false },
+ { "label": "Nl Piece Rate Pay", "value": "nl_piece_rate_pay", "name": "nl-piece-rate-pay", "disabled": false },
+ { "label": "Wiki", "value": "wiki", "name": "wiki", "disabled": false },
+ { "label": "HealthCare", "value": "healthcare", "name": "healthcare", "disabled": false },
+ { "label": "PropertyMS", "value": "propms", "name": "propms", "disabled": false },
+ { "label": "Education", "value": "education", "name": "education", "disabled": false },
+ { "label": "LMS", "value": "lms", "name": "lms", "disabled": false },
+ { "label": "Webshop", "value": "webshop", "name": "webshop", "disabled": false },
+ { "label": "Helpdesk", "value": "helpdesk", "name": "helpdesk", "disabled": false },
+ { "label": "CRM", "value": "crm", "name": "crm", "disabled": false },
+ { "label": "payments", "value": "payments", "name": "payments", "disabled": false },
+ { "label": "Paystack", "value": "frappe_paystack", "name": "frappe_paystack", "disabled": false },
+ { "label": "Mpesa Payments", "value": "frappe_mpesa_payments", "name": "frappe-mpesa-payments", "disabled": false },
+ { "label": "Mpesa B2C", "value": "navari_mpesa_b2c", "name": "navari-mpesa-b2c", "disabled": false },
+ { "label": "Kenya Compliance", "value": "kenya_compliance", "name": "kenya-compliance", "disabled": false },
+ { "label": "Csf Ke", "value": "csf_ke", "name": "csf_ke", "disabled": false },
+ { "label": "Lending", "value": "lending", "name": "lending", "disabled": false },
+ { "label": "Whatsapp", "value": "frappe_whatsapp", "name": "frappe_whatsapp", "disabled": false },
+ { "label": "PibiDav", "value": "pibidav", "name": "pibidav", "disabled": false },
+ { "label": "PibiCard", "value": "pibicard", "name": "pibicard", "disabled": false },
+ { "label": "Pibicut", "value": "pibicut", "name": "pibicut", "disabled": false },
+ { "label": "Print Designer", "value": "print_designer", "name": "print_designer", "disabled": false },
+ { "label": "PDF on submit", "value": "pdf_on_submit", "name": "pdf_on_submit", "disabled": false },
+ { "label": "Jobcard Planning", "value": "jobcard_planning", "name": "jobcard_planning", "disabled": false },
+ { "label": "Whitelabel", "value": "whitelabel", "name": "whitelabel", "disabled": false },
+ ]
+ ,
+ erpSelectedModules: [],
  loading: {
  getConfiguration: false,
  configureModule: false,
@@ -202,6 +252,7 @@ export default {
  this.host = config.host;
  this.isLetsEncryptEnabled = config.lets_encrypt;
  this.isHttpToHttpsEnabled = config.http2https;
+ this.erpSelectedModules = config.erpSelectedModules;
 
  this.loading.getConfiguration = false;
  this.focusElement("host");
@@ -271,6 +322,7 @@ export default {
  host: this.host,
  lets_encrypt: this.isLetsEncryptEnabled,
  http2https: this.isHttpToHttpsEnabled,
+ erpSelectedModules: this.erpSelectedModules,
  },
  extra: {
  title: this.$t("settings.instance_configuration", {