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

34639 Commits

Author SHA1 Message Date
Devin Slauenwhite
393bc25e2d
fix: don't get zero value entries for exchange rate calculation (#34475) 
* fix: multiply None by float

* chore: remove debug
 2023-03-28 16:34:24 +05:30
Deepesh Garg
50c1172f29
fix: Party Name in SOA print when viewed from Customer/Supplier master (#34597) 
fix: Party Name in SOA print when viewd from Customer/Supplier master
 2023-03-28 15:36:16 +05:30
Deepesh Garg
12ad2aa2e5
fix: Percentage billing in Sales Order (#34606) 2023-03-28 15:33:59 +05:30
ruthra kumar
f7780cdb58
refactor: additional filters and columns in Payment Ledger report (#34577) 
1. 'Party type' and 'Party' filters have been added
2. checkbox to include Amount in Acccount Currency
3. Grouping vouchers on Party
4. Replaced Company with Posting Date
 2023-03-24 12:25:03 +05:30
Raffael Meyer
8c7fa5712b
feat: deprecate get_customer_list (#34563) 2023-03-24 12:13:53 +05:30
Shram Kadia
0cd870fc29
fix: get batch_no. for item automatically (#34473) 
* fix: default pos conversion factor set to 1

* fix:get-batch-no-of-item-automatically
 2023-03-24 12:05:26 +05:30
Nabin Hait
282a0ee2ce
Merge pull request #34257 from deepeshgarg007/opening_entry 
feat: Closing balance for period closing and reporting
 2023-03-24 11:59:00 +05:30
rohitwaghchaure
980cca1772
Merge pull request #34573 from rohitwaghchaure/timer-buttons-not-working 
fix: Time buttons not working in the job card
 2023-03-23 22:35:43 +05:30
Rohit Waghchaure
34c190b7d6 fix: Time button not working in the job card 2023-03-23 22:32:11 +05:30
Anand Baburajan
e6b0196493
fix: recalculate wdv rate after asset repair [develop] (#34570) 
fix: recalculate wdv rate after asset repair
 2023-03-23 21:10:22 +05:30
Deepesh Garg
87108be11a
fix: Sales person variance report without item group (#34552) 
fix: Sales person variance report witout item group
 2023-03-23 19:19:46 +05:30
Deepesh Garg
8ce1da111e chore: Improve validation message 2023-03-23 19:14:12 +05:30
Deepesh Garg
f8cff09129 fix: CS financial statement param 2023-03-23 19:12:42 +05:30
Deepesh Garg
b7dcf27b01 fix: Partial trial balance view 2023-03-23 19:06:07 +05:30
Deepesh Garg
30eb6c8512 fix: Validation for cancelation 2023-03-23 19:05:25 +05:30
Deepesh Garg
3fd95200da chore: Fix Typo 2023-03-23 19:04:48 +05:30
Deepesh Garg
528ab503f2 fix: Don't validate if no GL Entry exists 2023-03-23 15:32:24 +05:30
Raffael Meyer
f7bf1b8a0c
fix: unset address and contact on trash (#34495) 
* fix(Customer): unset address and contact on trash

* fix(Supplier): unset address and contact on trash

---------

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2023-03-23 11:52:32 +05:30
Shariq Ansari
24a0833980
Merge branch 'develop' into crm-comments-overlap-fix 2023-03-22 11:40:58 +05:30
Shariq Ansari
76cea7dd6a fix: Note username overlapping with note content(CRM) 2023-03-22 11:28:58 +05:30
Anand Baburajan
6d6a7bcb50
fix: incorrect depr schedules after asset repair [develop] (#34544) 
* fix: backport missing changes from #30838

* fix: incorrect schedule after repair
 2023-03-21 20:07:27 +05:30
Deepesh Garg
fa991b2dcf Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry 2023-03-21 17:00:08 +05:30
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
Rohit Waghchaure
aaa4d1eb55 fix: E-commerce issue with Item Variants 2023-03-21 14:44:12 +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
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
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
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