Skip to content

Commit f214b39

Browse files
compgeniusescompgeniuses
authored
Merge pull request #40 from geniusdynamics/dev
Dev
2 parents 695372f + a0fd532 commit f214b39

File tree

2 files changed

+116
-91
lines changed

2 files changed

+116
-91
lines changed

‎build-images.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repobase="${REPOBASE:-ghcr.io/geniusdynamics}"
1515
# Configure the image name
1616
reponame="erpnext"
1717

18-
app_version="15.83.2"
18+
app_version="15.88.1"
1919

2020
# Create a new empty container image
2121
container=$(buildah from scratch)

‎ui/src/views/Settings.vue‎

Lines changed: 115 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -146,65 +146,86 @@ export default {
146146
isLetsEncryptEnabled: false,
147147
isHttpToHttpsEnabled: true,
148148
hasBackup: false,
149+
149150
erpNextModules: [
150151
{
151152
label: "ERPNext",
152153
value: "erpnext",
153154
name: "erpnext",
154155
disabled: false,
155156
},
157+
{
158+
label: "Payments",
159+
value: "payments",
160+
name: "payments",
161+
disabled: false,
162+
},
163+
{
164+
label: "Navari CSF KE",
165+
value: "navari_csf_ke",
166+
name: "navari_csf_ke",
167+
disabled: false,
168+
},
156169
{ label: "HRMS", value: "hrms", name: "hrms", disabled: false },
157170
{
158-
label: "Education",
159-
value: "education",
160-
name: "education",
171+
label: "Mpesa Payments",
172+
value: "frappe-mpsa-payments",
173+
name: "frappe-mpsa-payments",
161174
disabled: false,
162175
},
163176
{
164-
label: "Employee Self Service",
165-
value: "employee_self_service",
166-
name: "employee_self_service",
177+
label: "Attendance Timesheet",
178+
value: "nl-attendance-timesheet",
179+
name: "nl-attendance-timesheet",
167180
disabled: false,
168181
},
169182
{
170-
label: "Expenses",
171-
value: "erpnext_expenses",
172-
name: "erpnext_expenses",
183+
label: "Piece Rate Pay",
184+
value: "nl-piece-rate-pay",
185+
name: "nl-piece-rate-pay",
173186
disabled: false,
174187
},
175188
{
176-
label: "payments",
177-
value: "payments",
178-
name: "payments",
189+
label: "Whatsapp (Frappe)",
190+
value: "frappe_whatsapp",
191+
name: "frappe_whatsapp",
179192
disabled: false,
180193
},
181194
{
182-
label: "Paystack",
183-
value: "frappe_paystack",
184-
name: "frappe_paystack",
195+
label: "Whatsapp Chat",
196+
value: "whatsapp_chat",
197+
name: "whatsapp_chat",
185198
disabled: false,
186199
},
187200
{
188-
label: "Mpesa Payments",
189-
value: "frappe_mpsa_payments",
190-
name: "frappe-mpesa-payments",
201+
label: "Education",
202+
value: "education",
203+
name: "education",
204+
disabled: false,
205+
},
206+
{ label: "LMS", value: "lms", name: "lms", disabled: false },
207+
{ label: "Wiki", value: "wiki", name: "wiki", disabled: false },
208+
{
209+
label: "Paystack",
210+
value: "frappe_paystack",
211+
name: "frappe_paystack",
191212
disabled: false,
192213
},
193214
{
194-
label: "KE Etims Compliance",
195-
value: "kenya_compliance",
196-
name: "kenya-compliance",
215+
label: "Print Designer",
216+
value: "print_designer",
217+
name: "print_designer",
197218
disabled: false,
198219
},
199220
{
200-
label: "Whatsapp",
201-
value: "frappe_whatsapp",
202-
name: "whatsapp_chat",
221+
label: "Webshop",
222+
value: "webshop",
223+
name: "webshop",
203224
disabled: false,
204225
},
205226
{
206-
label: "PibiDav",
207-
value: "pibidav",
227+
label: "PibiDAV",
228+
value: "pibiDAV",
208229
name: "pibiDAV",
209230
disabled: false,
210231
},
@@ -214,129 +235,133 @@ export default {
214235
name: "pibicard",
215236
disabled: false,
216237
},
217-
{
218-
label: "Pibicut",
219-
value: "pibicut",
220-
name: "pibicut",
221-
disabled: false,
222-
},
223238
{
224239
label: "Lending",
225240
value: "lending",
226241
name: "lending",
227242
disabled: false,
228243
},
229-
{ label: "Etims", value: "etims", name: "Etims", disabled: false },
230244
{
231-
label: "Utility Billing",
232-
value: "utility-billing",
233-
name: "utility-billing",
245+
label: "Helpdesk",
246+
value: "helpdesk",
247+
name: "helpdesk",
234248
disabled: false,
235249
},
236250
{
237-
label: "PibiCal",
238-
value: "pibical",
239-
name: "pibical",
251+
label: "Pibicut",
252+
value: "pibicut",
253+
name: "pibicut",
240254
disabled: false,
241255
},
242256
{
243-
label: "ProjectIT",
244-
value: "projectit",
245-
name: "ProjectIT",
257+
label: "PDF on Submit",
258+
value: "erpnext_pdf-on-submit",
259+
name: "erpnext_pdf-on-submit",
246260
disabled: false,
247261
},
248262
{
249-
label: "Junior School",
250-
value: "junior-school",
251-
name: "Junior-School",
263+
label: "Insights",
264+
value: "insights",
265+
name: "insights",
252266
disabled: false,
253267
},
254268
{
255-
label: "Print Designer",
256-
value: "print_designer",
257-
name: "print_designer",
269+
label: "Jobcard Planning",
270+
value: "jobcard_planning",
271+
name: "jobcard_planning",
258272
disabled: false,
259273
},
260-
{ label: "Beam Barcode", value: "beam", name: "beam", disabled: false },
274+
{ label: "Marley", value: "marley", name: "marley", disabled: false },
275+
{ label: "Raven", value: "raven", name: "raven", disabled: false },
276+
{ label: "CRM", value: "crm", name: "crm", disabled: false },
261277
{
262-
label: "QR CODE",
263-
value: "frappe_qrcode",
264-
name: "Frappe-QR-Code",
278+
label: "Builder",
279+
value: "builder",
280+
name: "builder",
265281
disabled: false,
266282
},
267283
{
268-
label: "PDF on submit",
269-
value: "pdf_on_submit",
270-
name: "erpnext_pdf-on-submit",
284+
label: "Check Run",
285+
value: "check_run",
286+
name: "check_run",
271287
disabled: false,
272288
},
273289
{
274-
label: "Whitelabel",
275-
value: "whitelabel",
276-
name: "whitelabel",
290+
label: "Inventory Tools",
291+
value: "inventory_tools",
292+
name: "inventory_tools",
277293
disabled: false,
278294
},
279295
{
280-
label: "Cloud Storage",
281-
value: "cloud_storage",
282-
name: "cloud_storage",
296+
label: "Employee Self Service",
297+
value: "employee_self_service",
298+
name: "employee_self_service",
283299
disabled: false,
284300
},
285301
{
286-
label: "Check Run",
287-
value: "check_run",
288-
name: "check_run",
302+
label: "Expenses",
303+
value: "erpnext-expense-management-module",
304+
name: "erpnext-expense-management-module",
289305
disabled: false,
290306
},
291307
{
292-
label: "Inventory tools",
293-
value: "inventory_tools",
294-
name: "inventory_tools",
308+
label: "QR Code",
309+
value: "Frappe-QR-Code",
310+
name: "Frappe-QR-Code",
295311
disabled: false,
296312
},
313+
{ label: "Drive", value: "drive", name: "drive", disabled: false },
297314
{
298315
label: "POS Awesome",
299-
value: "posawesome",
316+
value: "POS-Awesome",
300317
name: "POS-Awesome",
301318
disabled: false,
302319
},
303-
{ label: "GetPOS", value: "getpos", name: "GETPOS", disabled: false },
304-
{ label: "PropMS", value: "propms", name: "PropMS", disabled: false },
305-
{ label: "LMS (SA)", value: "lms", name: "lms", disabled: false },
306-
{ label: "Wiki (SA)", value: "wiki", name: "wiki", disabled: false },
320+
{ label: "PropMS", value: "PropMS", name: "PropMS", disabled: false },
321+
{ label: "Etims", value: "Etims", name: "Etims", disabled: false },
307322
{
308-
label: "Helpdesk (SA)",
309-
value: "helpdesk",
310-
name: "helpdesk",
323+
label: "Utility Billing",
324+
value: "utility-billing",
325+
name: "utility-billing",
311326
disabled: false,
312327
},
313328
{
314-
label: "Insights (SA)",
315-
value: "insights",
316-
name: "insights",
329+
label: "PibiCal",
330+
value: "pibical",
331+
name: "pibical",
317332
disabled: false,
318333
},
319334
{
320-
label: "Builder (SA)",
321-
value: "builder",
322-
name: "builder",
335+
label: "Junior School",
336+
value: "Junior-School",
337+
name: "Junior-School",
323338
disabled: false,
324339
},
325-
{ label: "CRM (SA)", value: "crm", name: "crm", disabled: false },
326-
{ label: "Raven (SA)", value: "raven", name: "raven", disabled: false },
327340
{
328-
label: "Gameplan (SA)",
329-
value: "gameplan",
330-
name: "gameplan",
341+
label: "KE Compliance",
342+
value: "kenya-compliance-via-slade",
343+
name: "kenya-compliance-via-slade",
331344
disabled: false,
332345
},
333-
{ label: "Drive (SA)", value: "drive", name: "drive", disabled: false },
334346
{
335-
label: "Webshop",
336-
value: "webshop",
337-
name: "webshop",
347+
label: "ProjectIT",
348+
value: "ProjectIT",
349+
name: "ProjectIT",
350+
disabled: false,
351+
},
352+
{
353+
label: "Whitelabel",
354+
value: "whitelabel",
355+
name: "whitelabel",
356+
disabled: false,
357+
},
358+
{
359+
label: "SMPP Gateway",
360+
value: "smpp_gateway",
361+
name: "smpp_gateway",
338362
disabled: false,
339363
},
364+
{ label: "URY", value: "ury", name: "ury", disabled: false },
340365
],
341366
erpSelectedModules: [],
342367
loading: {

0 commit comments

Comments
 (0)