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
b98088bb01
Merge branch 'develop' into loan_patch_and_fixes 2020-08-07 13:27:40 +05:30
Deepesh Garg
4c4c0df7bd
Merge pull request #22939 from frappe/barredterra-patch-1 
fix: show only company's bank accounts
 2020-08-06 20:59:55 +05:30
Deepesh Garg
a306af8c08 fix: Add help link in navbar settings 2020-08-06 20:52:02 +05:30
Shivam Mishra
124eabaac8
Merge branch 'develop' into barredterra-patch-1 2020-08-06 14:16:48 +00:00
Rucha Mahabal
a78336e77d
fix: remove patch for retaining permissions for Video DocType (#22932) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-06 19:01:42 +05:30
Shivam Mishra
d119db856b
Merge pull request #22937 from scmmishra/fix-item-configure-13-beta 2020-08-06 13:23:45 +00:00
Shivam Mishra
5994600717
Merge pull request #22940 from scmmishra/fix-item-configure-13-beta 2020-08-06 13:20:11 +00:00
Raffael Meyer
d854d39c00
fix: show only company's bank accounts 2020-08-06 15:09:22 +02:00
Shivam Mishra
b110e5842f fix: unbound error in product configurator 2020-08-06 18:30:55 +05:30
marination
0702fbd206 fix: Show Add to Cart Button anyway 
- add to cart wasnt visible if show price is disabled in shopping cart settings (product_info = null), creating confusion
 2020-08-06 18:28:55 +05:30
marination
72fdc1302c fix: product action instead of info 2020-08-06 18:28:55 +05:30
Shivam Mishra
aa4f8cf4fc fix: handle product_info null 2020-08-06 18:28:55 +05:30
Shivam Mishra
5de8a7a775
Merge pull request #22936 from marination/item-configure 2020-08-06 12:55:12 +00:00
marination
63513f1b14 fix: Show Add to Cart Button anyway 
- add to cart wasnt visible if show price is disabled in shopping cart settings (product_info = null), creating confusion
 2020-08-06 18:22:28 +05:30
marination
ccf44a1bfd fix: product action instead of info 2020-08-06 17:34:38 +05:30
Shivam Mishra
01f664a88f fix: handle product_info null 2020-08-06 17:24:02 +05:30
Shivam Mishra
33a5fdfb78 fix: unbound error in product configurator 2020-08-06 17:23:51 +05:30
Afshan
085061fa21
fix: show or hide section or attributes depending on other attributes… (#22861) 
* fix: show or hide section or attributes depending on other attributes for better UI

* Update erpnext/stock/doctype/item/item.js

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: made has_variants checkbox to read_only if stock_exists

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-06 14:36:34 +05:30
Marica
67d829b5ed
Merge pull request #22825 from ruchamahabal/education-dashboard 
feat: Education Desk, Dashboard, and Onboarding
 2020-08-06 14:30:40 +05:30
Marica
1afe177a4f
Merge branch 'develop' into education-dashboard 2020-08-06 14:12:00 +05:30
Saurabh
a91acb62df Merge branch 'version-13-beta-pre-release' into version-13-beta 2020-08-06 13:30:21 +05:30
Saurabh
5ad9c2a1a0 bumped to version 13.0.0-beta.4 2020-08-06 13:50:20 +05:50
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
8d05514260
refactor: Format and sanitise user inputs to search queries. (#22922) 
* 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 20:07:30 +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
Suraj Shetty
1e67693c53
Merge pull request #22908 from marination/blanket-order-duplicate-method 
fix: Remove Duplicate Blanket order method
 2020-08-04 14:05:28 +05:30
marination
6823e8ed03 fix: Remove Duplicate Banket order method 2020-08-04 14:04:15 +05:30
Nabin Hait
a042d4721e
fix: Bank Clearance of POS purchase invoice (#22882) 2020-08-03 20:42:15 +05:30
Nabin Hait
a1d3537f2a
fix: Bank Clearance of POS purchase invoice (#22883) 2020-08-03 20:42:00 +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
5e548b4387
Dunning cleanup beta (#22899) 
* fix: Dunning cleanup

* fix: Added dashboard for Dunning
 2020-08-03 20:39:15 +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
cb665dc4d1
fix: Assessment Result child table not visible when accessed via dashboard (#22881) 2020-08-03 19:43:17 +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
25ee4328d3
card company issue (#22900) 2020-08-03 19:39:55 +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
Prssanna Desai
b44ee186cd
fix: check if row['delay'] exists (#22892) 2020-08-03 15:18:35 +05:30
Marica
4e0989d0cb
fix: Misleading description in Warehouse (#22878) 2020-08-03 14:56:20 +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