Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,720 Commits 3 Branches 0 Tags 1 GiB
06d1bc4d12
Commit Graph

44720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
f9397a87ac fix: Ignore opening entries if PCV posted 2023-03-21 16:59:22 +05:30
Richard Case
d8e73b63f3
fix: remove non-maintained Tax Detail report and missing workspace links (#34192) 
* fix: remove non-maintained Tax Detail report and missing workspace links

* patch: delete report "Tax Detail"

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-03-21 16:23:27 +05:30
Raffael Meyer
79911734e9
fix: translations and UX in alternative item mapping (#34433) 
* fix: disable deletion in alternative item mapping

* feat: german translations

* fix: make string translatable

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-03-21 16:20:11 +05:30
Raffael Meyer
0df3a1a3af
fix: remove unused translation (#34519) 2023-03-21 16:18:45 +05:30
Shram Kadia
08fc686513
fix: default pos conversion factor set to 1 (#34437) 2023-03-21 15:51:18 +05:30
Raffael Meyer
59c2e7ec3e
fix: german translations (#34312) 
fix: some german translations
 2023-03-21 15:48:27 +05:30
Vishal Dhayagude
6966fa4d88
fix: POS not picking up pos profile company address instead fetch any random company address (#34521) 2023-03-21 15:43:57 +05:30
Deepesh Garg
ee6c107d58
fix(client): Amount calculation for 0 qty debit notes (#34455) 
fix(client): Amount calculaton for 0 qty debit notes

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-03-21 15:38:39 +05:30
ruthra kumar
2d19cee713
Merge pull request #34501 from ruthra-kumar/incorrect_currency_symbol_for_bank_accounts_in_reconciliation_tool 
refactor(bank reconciliation tool): currency symbol fix and concurrent usage
 2023-03-21 15:30:50 +05:30
rohitwaghchaure
af5f59e856
Merge pull request #34528 from rohitwaghchaure/no-stock-still-option-to-add-in-cart 
fix: E-commerce issue with Item Variants
 2023-03-21 14:46:20 +05:30
Rohit Waghchaure
aaa4d1eb55 fix: E-commerce issue with Item Variants 2023-03-21 14:44:12 +05:30
s-aga-r
f858f657a0 feat: add Stock Reservation Entry ref in SO connections 2023-03-21 13:28:31 +05:30
s-aga-r
50de868285 chore: add Stock Reserved Qty field in SO Item 2023-03-21 13:17:58 +05:30
s-aga-r
0700063379 chore: add Reserve Stock check field in Sales Order 2023-03-20 23:55:33 +05:30
s-aga-r
1b7fb6d7e7 chore: make Stock UOM required in SRE 2023-03-20 22:41:22 +05:30
s-aga-r
4848a054a8 chore: make Submitted default status for Stock Reservation Entry 2023-03-20 22:40:06 +05:30
s-aga-r
2946de40d8 fix: make Project and Is Cancelled field read-only in SRE 2023-03-20 21:18:37 +05:30
s-aga-r
0d1332942c feat: add Status and Delivered Qty fields in Stock Reservation Entry 2023-03-20 19:01:37 +05:30
Ankush Menat
109a9f1390
perf: index against_sales_invoice field on DN items (#34509) 
This is used on Sales invoice dashboard and takes a lot of time to load
as db size increases.

Results:

Before: ~10-20 seconds to load dashboard
After: few milliseconds because of index

[skip ci]
 2023-03-20 14:46:26 +05:30
s-aga-r
da1455198e chore: field validation for Stock Reservation Entry 2023-03-20 13:42:11 +05:30
s-aga-r
7eb2075265 feat: add settings for Stock Reservation in Stock Settings 2023-03-20 11:45:35 +05:30
s-aga-r
085d9ce004 feat: add DocType Stock Reservation Entry 2023-03-20 11:20:30 +05:30
Deepesh Garg
44053db010 chore: Remove unnecessary list comprehension 2023-03-19 19:46:01 +05:30
Deepesh Garg
fc86a8568f
fix: Supplier RFQ email link (#34338) 2023-03-19 18:09:18 +05:30
Raffael Meyer
d791dc11a3
fix: patch depends on Currency Exchange Settings (#34494) 2023-03-19 18:05:12 +05:30
ruthra kumar
1eea585d29 refactor: allow for concurrent use of reconciliation tool 
1. set default filter dates a period of one month from current date
 2023-03-19 14:20:03 +05:30
ruthra kumar
2d14d92b32 fix: incorrect currency symbol in Bank Reconciliation tool 2023-03-19 12:47:29 +05:30
Deepesh Garg
0aadb680eb chore: Add missing validations 2023-03-19 12:46:42 +05:30
Deepesh Garg
00fe3042b2 chore: Simplify query 2023-03-18 20:05:43 +05:30
Deepesh Garg
7f11373b58 fix: Account sub query 2023-03-17 16:59:23 +05:30
Deepesh Garg
d11a64ddcb Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry 2023-03-17 16:50:49 +05:30
Danny
ca10e2bb9f
fix: bad strings format for command get-untraslated (#34361) 
* fix: bad string foramt

* fix: bad string format

* fix: pre-commit format

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-03-17 16:13:32 +05:30
Sagar Sharma
2ac079210d
Merge pull request #34440 from s-aga-r/FIX-34354 
chore: `Allow Zero Valuation Rate` msg in SE
 2023-03-17 16:02:52 +05:30
Sagar Sharma
f2c78163bf
Merge branch 'develop' into FIX-34354 2023-03-17 15:58:46 +05:30
Deepesh Garg
d8ece86463
fix: Update account number from parent company (#34474) 2023-03-17 15:55:11 +05:30
Deepesh Garg
7b630217bd
fix: Multiple accounting dimension filtering in AR/AP reports (#34464) 
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-03-17 15:51:33 +05:30
Deepesh Garg
be723bb9d4
chore: Update user manual link (#34478) 2023-03-17 15:39:33 +05:30
ruthra kumar
6b0dc62681
Merge pull request #34456 from ruthra-kumar/gp_return_invoice_issue 
fix: Gross Profit reports Invoices with -ve qty for Invoices with Cr Notes
 2023-03-17 15:26:41 +05:30
Sagar Sharma
0753aa5ab7
Merge branch 'develop' into FIX-34354 2023-03-17 15:16:41 +05:30
ruthra kumar
6e0f1c6ad6
Merge pull request #34466 from ruthra-kumar/difference_amount_issue_while_reconciling 
fix: unwanted difference amt while reconciling vouchers from base currency account
 2023-03-17 14:51:41 +05:30
ruthra kumar
cc61daeec4 test: Gross Profit report output for Cr notes 
2 New test cases added.
1. Standalone Cr notes will be reported as normal Invoices
2. Cr notes against an Invoice will not overallocate qty if there are
multiple instances of same item
 2023-03-17 14:48:57 +05:30
ruthra kumar
d0715a82eb refactor: Ignore linked Cr Notes in Report output 2023-03-17 14:48:57 +05:30
ruthra kumar
e2f19c6a14 fix: Overallocation of 'qty' from Cr Notes to Parent Invoice 
Cr Notes 'qty' are overallocated to parent invoice, when there are
mulitple instances of same item in Invoice.
 2023-03-17 14:48:57 +05:30
ruthra kumar
ec075122b6 refactor: difference amt validation for same currency accounts 2023-03-17 14:14:17 +05:30
ruthra kumar
861387f164 test: difference amount should not be calculated for base currency 2023-03-17 14:14:17 +05:30
ruthra kumar
48fae0c1ce fix: difference amount calculation for company currency accounts 2023-03-17 14:14:17 +05:30
rohitwaghchaure
1d767d58f2
Merge pull request #34279 from s-aga-r/fix-22-23-05686 
fix: `Blanket Order`
 2023-03-17 10:14:37 +05:30
rohitwaghchaure
558db13040
Merge branch 'develop' into fix-22-23-05686 2023-03-17 08:57:37 +05:30
Anand Baburajan
563ee92043
Merge branch 'develop' into FIX-34354 2023-03-16 18:22:13 +05:30
Anand Baburajan
b6b8392413
fix: refactor asset depr schedule and remove unnecessary depr method (#34434) 
* fix: remove depr method from depr schedule and refactor assetdeprsch

* chore: use assetdeprsch's depr method, not deprschedule's

* fix: use default 0 value for NDB and OAD

* chore: fix rounded numbers

* chore: correct rounding in test_website_item_price_for_logged_in_user
 2023-03-16 18:18:47 +05:30