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

32577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
1afe177a4f
Merge branch 'develop' into education-dashboard 2020-08-06 14:12:00 +05:30
Deepesh Garg
44d62ad0d7
Merge pull request #22921 from ruchamahabal/fix-payment-entry-ref 
fix: condition for checking reference details for Payment Entry
 2020-08-05 23:16:14 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. (#22913) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-05 19:42:25 +05:30
Rucha Mahabal
5da067b689 fix: condition for checking reference detail for Payment Entry 2020-08-05 18:18:57 +05:30
Marica
0c818927a5
fix: get_regional_address_details missing positional arg 'company' (#22915) 2020-08-05 16:47:41 +05:30
Rucha Mahabal
f9143e9bb0
Merge branch 'develop' into education-dashboard 2020-08-05 16:28:14 +05:30
Rucha Mahabal
8edace1a58 fix: covert Program wise Fee Collection to a Script Report 2020-08-05 16:24:21 +05:30
Rucha Mahabal
d67c2ea0d4 fix: make program field mandatory in Fees 2020-08-05 14:13:14 +05:30
gavin
6c81f59f6f
Merge pull request #22728 from frappe/dependabot/npm_and_yarn/lodash-4.17.19 
build(deps): bump lodash from 4.17.15 to 4.17.19
 2020-08-05 14:02:55 +05:30
gavin
786e0606f5
Merge branch 'develop' into dependabot/npm_and_yarn/lodash-4.17.19 2020-08-04 17:59:17 +05:30
Nabin Hait
a042d4721e
fix: Bank Clearance of POS purchase invoice (#22882) 2020-08-03 20:42:15 +05:30
Rucha Mahabal
b7311c8fc1
fix: SQL query in accounts receivable, payable reports (#22888) 2020-08-03 20:41:25 +05:30
Marica
e211bb7a53
fix: Reposition description in Warehouse (#22895) 2020-08-03 20:40:09 +05:30
Nabin Hait
48163e31c5
Dunning cleanup (#22898) 
* fix: Dunning cleanup

* fix: Added dashboard for Dunning
 2020-08-03 20:38:28 +05:30
Rucha Mahabal
101fe2b769
fix: Assessment Result child table not visible when accessed via dashboard (#22880) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-03 19:42:24 +05:30
Anupam Kumar
1895e9b89a
fix: Shopping cart issue v13 (#22868) 
* refactoring shopping cart settings

* adding column_break in shopping cart settings

* fix: mandatory depend on fix company

* fix: resetting company, price_list, default_customer_group, quotation_series when card is diabled.
 2020-08-03 18:50:11 +05:30
Rucha Mahabal
b50b20458e
fix: TypeError while concatenating account number and name in COA (#22885) 
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-08-03 15:51:57 +05:30
Marica
dd97524db5
fix: Misleading description in Warehouse (#22877) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-03 14:55:40 +05:30
Prssanna Desai
1dfd9fd756
fix: check if row['delay'] exists (#22889) 2020-08-03 14:48:45 +05:30
Deepesh Garg
2f2de2264d
Merge pull request #22887 from deepeshgarg007/subscription_test 
fix: Test case for subscription
 2020-08-03 14:31:21 +05:30
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
9cc2d340ba
Reset home page based on product settings (#22875) 2020-08-03 10:43:47 +05:30
Nabin Hait
4cc99286c0
fix: Update modified timestamp in accounts settings (#22873) 2020-08-03 09:33:31 +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
Deepesh Garg
d909669a18 fix: Test cases 2020-08-02 17:00:53 +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
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
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
Anupam K
6bab21483c report lost opportunity 2020-07-30 00:41:06 +05:30
Shivam Mishra
5b056988a6 Merge branch 'develop' of https://github.com/frappe/erpnext into support-search 2020-07-29 21:16:35 +05:30
Prssanna Desai
9e81bb9a11
fix: add range filters to oldest items chart (#22842) 2020-07-29 17:28:30 +05:30
Anupam K
61bfb8c817 Merge branch 'develop' of https://github.com/frappe/erpnext into crm-reports 2020-07-29 15:45:55 +05:30
Saqib Ansari
8cfa00920e fix: cannot submit value adjustment with custom dimension 2020-07-29 15:24:03 +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