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

33922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
5572f8eb1e fix: Test case for subscription 2020-08-03 13:40:11 +05:30
Wolfram Schmidt
5e438cc853
Update lead_source.json (#22872) 
Allow Lead Source to be renamed. This is usefull for cleaning up data at a later point and allow correcting spelling errors.

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-03 12:46:50 +05:30
Nabin Hait
1a64d1a4ab
Reset home page based on product settings (#22876) 2020-08-03 10:43:56 +05:30
Nabin Hait
9cc2d340ba
Reset home page based on product settings (#22875) 2020-08-03 10:43:47 +05:30
Nabin Hait
826158c792
fix: Update modified timestamp in accounts settings (#22874) 2020-08-03 09:34:55 +05:30
Nabin Hait
4cc99286c0
fix: Update modified timestamp in accounts settings (#22873) 2020-08-03 09:33:31 +05:30
Anurag Mishra
804426023f fix: minor payroll_dashboard fixes (#22832) 
* fix: minor payroll_dashboard fixes

* Update erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-03 09:28:04 +05:30
Anurag Mishra
ba52dd8ba6
fix: minor payroll_dashboard fixes (#22832) 
* fix: minor payroll_dashboard fixes

* Update erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-03 08:57:49 +05:30
Deepesh Garg
7fd339bbd6
Merge pull request #22866 from deepeshgarg007/hybrid_loan 
fix: Loan Security shortfall calculation fixes
 2020-08-02 20:35:26 +05:30
Deepesh Garg
4104887abb fix: fieldname in filter 2020-08-02 18:23:54 +05:30
marination
e3495116dd chore: Error Logging and exception hnadling on connection failure 2020-08-02 17:13:34 +05:30
Deepesh Garg
d909669a18 fix: Test cases 2020-08-02 17:00:53 +05:30
marination
c16ace6732 fix: Codacy 2020-08-02 16:43:15 +05:30
marination
ccf4ab9f85 chore: Added Interactions Report and behaviour fixes 
- Youtube Interactions Report with Chart and Summary
- Statistics change in doc on refresh and get updated in db as well
 2020-08-02 16:26:36 +05:30
marination
ddc2be36ab Merge branch 'develop' of https://github.com/frappe/erpnext into youtube-analytics 2020-08-02 05:37:30 +05:30
marination
d4817c8685 feat: Track Youtube interactions via Video DocType 2020-08-02 05:35:45 +05:30
Deepesh Garg
b9dc21129c fix: Loan Seurity shortfall calculation fixes 2020-08-01 22:51:40 +05:30
Deepesh Garg
946e106714
Merge pull request #22863 from deepeshgarg007/taxjar_fix 
fix: Import pycountry and taxjar only if taxjar is enabled
 2020-08-01 13:52:40 +05:30
Deepesh Garg
dcb462f305 fix: Import pycountry and taxjar only if taxjar is enabled 2020-08-01 13:47:09 +05:30
marination
d36df92750 fix: Codacy and repositioned Returned Qty in DN Item 2020-07-31 20:22:55 +05:30
marination
e4dc7642bc Merge branch 'pr-dn-return' of https://github.com/marination/erpnext into pr-dn-return 2020-07-31 20:01:59 +05:30
marination
ba37fe796c chore: Delivery Note Return status 2020-07-31 20:01:06 +05:30
Anurag Mishra
2a4c90302b
fix: minor recritment analytics fixes (#22830) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-07-31 17:59:30 +05:30
Marica
8058a81dc1
Merge branch 'develop' into pr-dn-return 2020-07-31 16:02:17 +05:30
marination
66069df020 feat: Return tracking in PR/DN 2020-07-31 15:54:05 +05:30
Marica
cf00ee49ec
fix: PO/SO view title (#22858) 2020-07-31 15:14:50 +05:30
Deepesh Garg
7a004615a7
Merge pull request #22855 from nabinhait/gl-balance-fix-pre--v13 
fix: Ignore cancelled gl entries to get account balance
 2020-07-30 22:15:46 +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
38d5c2e04f fix: Ignore cancelled gl entries to get account balance 2020-07-30 20:53:07 +05:30
Nabin Hait
9837285bf1 fix: Ignore cancelled gl entries to get account balance 2020-07-30 20:52:20 +05:30
Rucha Mahabal
b6675f8dd4 feat: Lab Test Report Summary and Chart 2020-07-30 19:33:08 +05:30
Rucha Mahabal
c5ccf38cdf refactor: Lab Test Report 2020-07-30 18:56:16 +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
ca1b389c99 fix: validate negative quantity for sample collection 2020-07-30 16:58:19 +05:30
Rucha Mahabal
fa2c20ea9e chore: Sample Collection Form clean-up 2020-07-30 16:56:11 +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
afa001a1d1 fix: code clean-up 2020-07-30 15:25:04 +05:30
Rucha Mahabal
73edb12ab3 fix: msgprint for sample collection doc created on Lab Test creation 2020-07-30 14:50:30 +05:30
Rucha Mahabal
c33703d54c fix: move result value validations to server side 2020-07-30 14:25:40 +05:30
Rucha Mahabal
b00f870c77 fix: Lab Test Completed status not visible in list view 2020-07-30 13:49:13 +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
Rucha Mahabal
ff0b9bffcf feat: added dashboard for Lab Test Template 2020-07-30 12:16:56 +05:30
Rucha Mahabal
440c752529 chore: Lab Test Template form clean-up 2020-07-30 12:16:18 +05:30
Anupam K
6bab21483c report lost opportunity 2020-07-30 00:41:06 +05:30
barredterra
517df5fb0e fix: codacy (again) 2020-07-29 18:16:49 +02:00
barredterra
b719378ee5 fix: codacy 2020-07-29 18:11:04 +02:00