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

23242 Commits

Author SHA1 Message Date
Deepesh Garg
41a4999711
Merge pull request #22843 from nextchamp-saqib/asset-adj-dimension-fix 
fix: cannot submit value adjustment with custom dimension
 2020-08-10 10:12:41 +05:30
Deepesh Garg
097d89f550
Merge pull request #22946 from deepeshgarg007/gst_export_wopay 
fix: GSTR 1 report for exports without payment of Tax
 2020-08-10 09:56:12 +05:30
Mangesh-Khairnar
a53f15ca35
fix: remove mentions of display items in stock (#22963) 2020-08-09 13:12:47 +05:30
Deepesh Garg
7882c70244
Merge pull request #22959 from deepeshgarg007/gst_rcm_fixes_v13 
fix: Taxable value for RCM
 2020-08-08 22:34:36 +05:30
Deepesh Garg
d4ecf426b7 fix: Place of supply fix 2020-08-08 22:33:18 +05:30
Deepesh Garg
5ac2fd94f0 fix: Taxable value for RCM 2020-08-08 22:28:13 +05:30
Deepesh Garg
72fc188706
Merge pull request #21756 from deepeshgarg007/loan_patch_and_fixes 
fix: Description for fields and patch for old loans
 2020-08-07 17:08:31 +05:30
Deepesh Garg
bad269c354 fix: Parent income account check 2020-08-07 16:21:41 +05:30
Afshan
1f3cc7553c fix: grand_total assigment before reference 2020-08-07 15:57:31 +05:30
Deepesh Garg
ab611d5fd8 fix: GSTR 1 report for exports without payment of Tax 2020-08-07 14:47:40 +05:30
Deepesh Garg
b98088bb01
Merge branch 'develop' into loan_patch_and_fixes 2020-08-07 13:27:40 +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
Raffael Meyer
d854d39c00
fix: show only company's bank accounts 2020-08-06 15:09:22 +02: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
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
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
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