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

32721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mangesh-Khairnar
51228b5ee3 fix: make response handling more descriptive 2020-10-13 17:10:16 +05:30
Mangesh-Khairnar
faa0cce7a7 fix: pass mobile number to generate the stk push 2020-10-06 13:58:54 +05:30
Mangesh-Khairnar
862433febb fix: create custom field for mpesa receipt 2020-10-06 10:59:59 +05:30
Mangesh-Khairnar
8d54d61c28 fix: handle payment completion via payment request 2020-10-05 22:37:31 +05:30
Mangesh-Khairnar
1bef6a530c fix: create payment entry against payment request 2020-10-04 13:01:11 +05:30
Mangesh-Khairnar
8d12c3841f fix: process transaction callback 2020-09-28 19:40:42 +05:30
Mangesh-Khairnar
98658603dd Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration 2020-09-28 02:10:53 +05:30
Mangesh-Khairnar
a26c6b4c2d fix: fetch account balance info 2020-09-25 23:56:39 +05:30
rohitwaghchaure
7512565184
fix: Patient Appointment not able to save (#23434) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-09-25 12:45:47 +05:30
Saqib
2fa2a40b3f
chore: make asset movement transaction date match with purchase date & time (#23423) 2020-09-24 15:07:29 +05:30
Marica
481662469f
Merge pull request #23419 from marination/payment-entry-ux 
fix: Check Company in Payment Entry before selecting values
 2020-09-24 12:05:05 +05:30
marination
8370d9b997 fix: Check Company in Payment Entry before selecting values 2020-09-24 11:51:03 +05:30
Deepesh Garg
cfc5e29127
fix: Post cancellation accounting entry on posting date instaed of current (#23361) 2020-09-23 17:19:11 +05:30
Prssanna Desai
fd42af5b91
fix: ignore permission while creating supplier scorecard period in supplier scorecard (#23406) 2020-09-23 17:14:37 +05:30
Rucha Mahabal
46d4180381
refactor: Issue form cleaned up and renamed Minutes to First Response field (#23066) 
* refactor: re-order fields in Issue DocType

* refactor: rename Mins to First Response to First Response Time

* refactor: First Response Time Reports for Issue and Opportunity

* fix: added patch for renamed fields and setting durations

* chore: update CRM and Support Desk Pages for Response Time reports

* fix: first response time for opportunity report

* fix: patch

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2020-09-23 16:53:16 +05:30
Mangesh-Khairnar
4eb215badb fix: bind callback callback for realtime event 2020-09-23 15:55:21 +05:30
Marica
5a4725cac5
Merge pull request #23409 from AfshanKhan/fix-report-gp 
fix: escape apostrophe in cost centre and project if exist
 2020-09-23 15:37:28 +05:30
Marica
f804eacfb5
Merge branch 'develop' into fix-report-gp 2020-09-23 15:36:23 +05:30
Michelle Alva
879a8ef26b
fix: Change button label in Item (#23410) 2020-09-23 15:36:07 +05:30
Afshan
8be51e22c4 fix: escape apostrophe in cost centre and project if exist 2020-09-23 14:52:36 +05:30
Saqib
1831893b77
fix: failed workflow condition error message in update items (#23393) 2020-09-23 13:01:49 +05:30
gavin
639542c81d
Merge pull request #22867 from marination/youtube-analytics 
feat: Youtube interactions via Video
 2020-09-22 18:02:31 +05:30
marination
6087fcaa9b chore: Added video settings to List View Menu 2020-09-22 17:48:04 +05:30
rohitwaghchaure
27bccd7f81
Merge pull request #23397 from deepeshgarg007/search_field_batch_query 
feat: Show searchfields in batch query
 2020-09-22 16:59:24 +05:30
gavin
d935b2753f
Merge branch 'develop' into youtube-analytics 2020-09-22 15:36:00 +05:30
Deepesh Garg
a0d192eae4 feat: Show searchfields in batch query 2020-09-22 13:54:07 +05:30
Mangesh-Khairnar
97ab96c8bf fix: handle api changes from callbacks 2020-09-22 12:58:32 +05:30
Shivam Mishra
2b53b98c1d
fix: reload dashboard (#23380) 2020-09-22 12:18:12 +05:30
rohitwaghchaure
9e6d377eea
Merge pull request #23370 from prssanna/account-user-permission 
fix: apply user permissions in tax accounts query
 2020-09-22 10:34:35 +05:30
rohitwaghchaure
7230b0f9a0
Merge pull request #23360 from anupamvs/batch-wise 
fix: Batch-Wise Balance History filter validation
 2020-09-22 10:32:51 +05:30
Mangesh-Khairnar
e3c6128638
fix(plaid): do not send null list in account ids (#23376) 2020-09-21 18:50:22 +05:30
Saurabh
30dbfc31e2
Merge pull request #23369 from abhishekbalam/breadcrumbs_for_maintenance 
Fix(Maintenance): Breadcrumbs for Maintenance Visit and Schedule
 2020-09-21 17:03:46 +05:30
Saurabh
324cbe89f8
Merge pull request #23359 from abhishekbalam/activation 
fix(activation): Added New DocTypes in get_level()
 2020-09-21 15:38:45 +05:30
prssanna
de7a2bc4be fix: apply user permissions in tax accounts query 2020-09-21 13:57:04 +05:30
Rohan
e42f08085b
fix: use Plaid's new API (develop) (#23318) 
Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2020-09-21 13:14:07 +05:30
Abhishek Balam
97f61d233e fix: breadcrumbs for maintenance visit and schedule under support 2020-09-21 13:00:43 +05:30
Deepesh Garg
44c692ed40
Merge pull request #23278 from barry86m/patch-3 
fix: sql error on saving sales invoice without a sales order
 2020-09-20 20:40:16 +05:30
Deepesh Garg
c152b92ef4
Update erpnext/controllers/selling_controller.py 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-09-20 20:04:10 +05:30
Deepesh Garg
5c8dd6a0ed
Merge pull request #23355 from Anurag810/accounts_recievable 
fix: Cost Center filter in accounts receivable and payable report
 2020-09-20 19:36:30 +05:30
Saqib
f2ea3877c8
fix: depreciation start date ux fixes (#23339) 2020-09-20 19:31:18 +05:30
Saqib
4b25eb4db4
fix: mode of payment not fetched if no account is set (#23334) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-09-19 19:33:21 +05:30
Deepesh Garg
ffdb9d0ca0
Merge pull request #22966 from frappe/barredterra-patch-1 
fix(membership): currency should be a link
 2020-09-19 18:33:51 +05:30
Deepesh Garg
6bcfffda1d
Merge branch 'develop' into barredterra-patch-1 2020-09-19 18:33:14 +05:30
Deepesh Garg
c646a56d68
fix: Update modified timestamp 2020-09-19 18:28:20 +05:30
Deepesh Garg
88f2394103
Merge pull request #23311 from kwabena53/readme-links 
fix: inventory management link updated
 2020-09-19 18:21:19 +05:30
Deepesh Garg
e3ee63f677
Merge pull request #23346 from AfshanKhan/stock-entry-warehouse-address-filter 
fix: warehouse address filtered based on warehouse
 2020-09-19 18:17:08 +05:30
Deepesh Garg
095161ff60
Merge pull request #23328 from rohitwaghchaure/fixed-set-taxes-missing-error 
fix: set_taxes() missing 1 required positional argument: 'company'
 2020-09-19 18:07:08 +05:30
Deepesh Garg
0aff6d83af
Update erpnext/public/js/utils/party.js 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2020-09-19 18:05:58 +05:30
Mangesh-Khairnar
a3ac4bf681 fix: create payment request via pos 2020-09-18 19:47:33 +05:30
Saqib
7126e179c3 fix: button click event not working in POS custom fields (#23358) 2020-09-22 16:35:11 +05:30