Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,185 Commits 3 Branches 0 Tags 1 GiB
cbde04d3da
Commit Graph

32185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
cf00ee49ec
fix: PO/SO view title (#22858) 2020-07-31 15:14:50 +05:30
Deepesh Garg
01e0d50eba
Merge pull request #22854 from nabinhait/gl-balance-fix 
fix: Ignore cancelled gl entries to get account balance
 2020-07-30 22:15:23 +05:30
Nabin Hait
9837285bf1 fix: Ignore cancelled gl entries to get account balance 2020-07-30 20:52:20 +05:30
Rucha Mahabal
00175c9621
Merge pull request #22851 from saurabh6790/develop 
fix: validate theme_scss attribute
 2020-07-30 18:30:20 +05:30
Saurabh
a14618efe4 fix: validate theme_scss attribute 2020-07-30 17:22:29 +05:30
Rucha Mahabal
9087689d90
fix: subtitle for onboarding 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-30 16:10:05 +05:30
Rucha Mahabal
621529adfb
fix: unlink item from healthcare service unit type (#22828) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-30 13:18:41 +05:30
Marica
00f25842d0
Merge pull request #22829 from ruchamahabal/validate-patient-transfer-time 
fix: validate check out and check in time for inpatient occupancy
 2020-07-30 13:12:30 +05:30
Marica
c0ea2bc804
Merge branch 'develop' into validate-patient-transfer-time 2020-07-30 13:10:19 +05:30
Saqib
031768f49d
chore: asset form reorder (#22833) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-30 12:40:53 +05:30
Prssanna Desai
9e81bb9a11
fix: add range filters to oldest items chart (#22842) 2020-07-29 17:28:30 +05:30
Rucha Mahabal
4bbcf3ed93
Merge pull request #22836 from akurungadam/fix-dev-1 
fix: Sales Invoice Get Healthcare Services - exclude Cancelled appointments
 2020-07-28 22:24:38 +05:30
anoop
5903002039 fix: exclude Cancelled appointments while Get Items in Sales Invoice 2020-07-28 21:15:54 +05:30
Rucha Mahabal
a695971596
fix: show the standard validation message 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-28 20:15:29 +05:30
Rucha Mahabal
7cbc7946af fix: validate check out and check in time for inpatient occupancy 2020-07-28 14:11:12 +05:30
Deepesh Garg
212648044f
Merge pull request #22302 from P-Froggy/fix-payment-entry-wrong-bank-account-fetch-develop 
fix: Set Value of wrong Bank Account Field in Payment Entry
 2020-07-28 13:56:42 +05:30
Marica
c1e46d8131
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop 2020-07-28 12:29:47 +05:30
Rucha Mahabal
81ae6c3240
fix: reload HR Settings to fix failing setup (#22802) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-28 12:27:41 +05:30
Nabin Hait
701474cbaa
fix: POS patch fix (#22818) 2020-07-28 09:11:37 +05:30
Shivam Mishra
48be7d37b8
fix: add order_by explicitly for lead (#22820) 2020-07-28 09:00:09 +05:30
Deepesh Garg
9119b4c538
fix: Unable to submit backdated stock transactions for different items (#22648) 
* fix: Unable to submit backdated stock transactions for different items

* fix: Test cases

* fix: Test Cases

* fix: Test Cases

* fix: Test for stock account JV

* fix: Journal Entry Test
 2020-07-28 08:49:44 +05:30
Rucha Mahabal
fdcaecb58c
Merge branch 'develop' into education-dashboard 2020-07-27 22:23:08 +05:30
Rucha Mahabal
9a2cc74414 feat: onboarding for Education module 2020-07-27 21:33:00 +05:30
Rucha Mahabal
6c11f26a11 feat: Education dashboard charts and number cards 2020-07-27 18:50:04 +05:30
Rucha Mahabal
49140ccbfd feat: Program wise Fee Collection Query Report 2020-07-27 18:48:15 +05:30
Shivam Mishra
3c136ebf92
Merge pull request #22819 from scmmishra/iff 2020-07-27 17:26:02 +05:30
Shivam Mishra
97a316c09a feat: add create customer button to member 2020-07-27 15:27:09 +05:30
Shivam Mishra
9e3776e001 feat: improve webhook logging 2020-07-27 14:26:37 +05:30
Shivam Mishra
e43d362d53 feat: verbose logging for verification 2020-07-27 14:19:36 +05:30
Shivam Mishra
4e40b9bdbe feat: log everything 2020-07-27 14:19:36 +05:30
bhavesh95863
bcb49e59e7
fix: Add missing translation function (#22813) 
* fix: Add missing translation function

Add missing translation function

* fix: Add missing function for translation

* fix: Add missing translation function

* fix: Add missing translation function
 2020-07-26 14:02:16 +05:30
Deepesh Garg
b2fccc1d05
Merge pull request #22800 from ruchamahabal/fix-assessment-report 
fix(Education): course wise assessment report labels
 2020-07-24 19:12:24 +05:30
Deepesh Garg
c591b77613
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop 2020-07-24 19:04:05 +05:30
Mangesh-Khairnar
8721530b4b
fix(payment-request): do not set guest as administrator (#22801) 2020-07-24 17:19:56 +05:30
Rucha Mahabal
860a824a7c fix: change label for final grade 2020-07-24 14:32:36 +05:30
Rucha Mahabal
27835b7789 fix: add labels to chart datasets in course wise assessment 2020-07-24 14:07:00 +05:30
Rucha Mahabal
1010feefe0
feat: Patient Progress Page (#22474) 
* feat: add patient progress page

* feat: patient progress sidebar

* feat: Patient Progress Charts

* feat: set up sidebar links

* feat: added heatmap chart for patient interactions

* fix: styles

* fix: add markers for max score in assessment charts

* fix(style): mobile view css

* fix: heatmap and percentage chart filters

* feat: add time span filters to line charts

* fix: make date fields mandatory in healthcare doctypes for better analytics

* fix: title and filter styles

* fix: handle null state for charts

* feat: add Patient Progress Page to desk

* feat: add date range filter to all charts

* fix: code clean-up

* fix: assign roles for Patient Progress Page

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-07-24 10:49:04 +05:30
Afshan
ecb1460440
fix: update the project after task deletion so that the % completed s… (#22591) 
* fix: update the project after task deletion so that the % completed shows correct value

* fix: patch to correct % complete of previous projects

* fix: for version-13

* fix: removed patch from v13

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-07-24 10:48:16 +05:30
Afshan
91fe10666e
fix: buying price for non stock item in gross profit report (#22616) 
* fix: buying price for non stock item in gross profit report

* fix: refactor query
 2020-07-24 09:49:17 +05:30
Nabin Hait
39969647ca
fix: Added missing project field in Purchase invoice (#22799) 2020-07-24 09:48:54 +05:30
Nabin Hait
6bbd4d0c14
fix: Other charges on income tax (#22797) 2020-07-24 09:20:48 +05:30
Deepesh Garg
7cb1613173
Merge pull request #22622 from AfshanKhan/add-age-range-in-stock-ageing 
feat: added range for age in stock ageing
 2020-07-23 21:56:45 +05:30
Afshan
73b86d241c fix: conversion to float 2020-07-23 21:09:27 +05:30
Rucha Mahabal
89f9346185
fix(Education): descriptions not copied while creating fees from fee structure (#22792) 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-07-23 20:59:56 +05:30
Deepesh Garg
9843e9f917
fix: Expnese claim outstanding while making payment entry (#22735) 2020-07-23 20:58:57 +05:30
Afshan
13d2a34548 Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing 
Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing
 2020-07-23 20:35:21 +05:30
Afshan
7965f655a2 Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing 
Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing
 2020-07-23 20:33:43 +05:30
Afshan
775fbe74c5 fix: fixed the logic 2020-07-23 20:33:07 +05:30
Sun Howwrongbum
9bd5f1e4b0
fix: incorrect available_qty being set (#22539) 
* fix: incorrect available_qty being set

* style: descriptive variables
 2020-07-23 20:06:26 +05:30
Afshan
aa94abf601
fix: asset dashboard report changes (#22759) 
* fix: asset dashboard report changes

* fix: moved static filters to dynamic filters

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-23 19:12:38 +05:30