Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,212 Commits 3 Branches 0 Tags 1 GiB
6d9cebfee9
Commit Graph

46212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
6d9cebfee9 fix: Tax withholding reversal on Debit Notes 2023-08-24 11:49:03 +05:30
ruthra kumar
3fd2778ae4
Merge pull request #36748 from ruthra-kumar/clean_up_reconcilition 
chore: clean up stale code in reconciliation tool
 2023-08-22 06:19:52 +05:30
ruthra kumar
e93b927051 chore: clean up stale code in reconciliation tool 2023-08-22 05:32:56 +05:30
ruthra kumar
3de9fed230
Merge pull request #36742 from ruthra-kumar/ar_summary_incorrect_gl_balance_on_multi_company 
fix: incorrect gl balance on AR summary rpt on multi company setup
 2023-08-21 22:06:47 +05:30
ruthra kumar
991770ed4a fix: incorrect gl balance on AR summary rpt on multi company setup 2023-08-21 21:32:23 +05:30
ruthra kumar
a4ff76c920
Merge pull request #36727 from ruthra-kumar/fix_broken_advance_field_in_ar_summary_rpt 
fix: broken advance field in Accounts Receivable summary rpt
 2023-08-21 20:53:03 +05:30
ruthra kumar
af52f21ece test: add test for receivable summary report 2023-08-21 17:56:50 +05:30
ruthra kumar
06f86ad5e0
Merge pull request #36728 from ruthra-kumar/fetch_gain_loss_in_ar_ap_report 
fix: include gain/loss journal in AR/AP reports
 2023-08-21 17:22:31 +05:30
Ankush Menat
86cac1e1d2
fix: add missing items labels back (#36737) 
[skip ci]
 2023-08-21 15:59:52 +05:30
s-aga-r
450949cadd
Merge pull request #36709 from s-aga-r/FIX-36695 
fix: don't throw if item does not have default BOM
 2023-08-21 14:43:03 +05:30
ruthra kumar
0dc5e5c430 refactor: use payment ledger to fetch advance amount 2023-08-21 09:19:38 +05:30
ruthra kumar
896b123fb1 fix: broken advance field in Accounts Receivable summary rpt 2023-08-20 21:17:27 +05:30
ruthra kumar
e3104f1898 fix: include gain/loss journal in AR/AP reports 2023-08-20 20:13:31 +05:30
Deepesh Garg
a7f921a557
Merge pull request #36666 from batonac/batonac-plaid-fixes 
fix: Plaid Integration status and categories
 2023-08-20 16:02:30 +05:30
Deepesh Garg
ddd929ef9b
Merge pull request #36696 from RitvikSardana/develop-ritvik-pos-mode-of-payment 
fix: mode of payment fetched from pos profile company in POS
 2023-08-20 15:37:15 +05:30
mergify[bot]
87d02511a3
fix: timeout error coming during reposting (backport #36715) (#36717) 
fix: timeout error coming during reposting (#36715)

(cherry picked from commit 620b21fec59e40178fde96085003d419804f21e0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-08-19 15:37:33 +05:30
ruthra kumar
a34cb8a8dc
Merge pull request #36710 from ruthra-kumar/fix_broken_consolidated_financial_report 
fix: broken consolidated report due to finance book filter
 2023-08-18 14:54:03 +05:30
ruthra kumar
96847db0ec fix: broken consolidated report due to finance book filter 2023-08-18 14:04:46 +05:30
s-aga-r
2e22b019a0 fix: throw if BOM No is not set 2023-08-18 13:24:49 +05:30
s-aga-r
268c19e745 fix: don't throw if item does not have default BOM 2023-08-18 13:14:53 +05:30
Deepesh Garg
21e6db2bc7
Merge pull request #36060 from rtdany10/skip_tcs 
fix: skip tax witholding category if not account set for company
 2023-08-17 20:56:37 +05:30
Ritvik Sardana
1bdd43d0f6 fix: mode of payment fetched from pos profile company in POS 2023-08-17 17:29:01 +05:30
Deepesh Garg
c70abaa43a
Merge pull request #36684 from deepeshgarg007/gl_transaction_currency 
feat: Transaction currency columns in GL report
 2023-08-17 16:06:23 +05:30
rohitwaghchaure
3f6ff8e0b7
perf: enabled indexing for voucher no in SABB (#36688) 2023-08-17 13:48:37 +05:30
Shariq Ansari
5d9dde92fa
Merge pull request #36685 from shariquerik/api-fix 2023-08-17 13:09:14 +05:30
Ankush Menat
6bf79f18c8 chore: skip demo banner if another one present 2023-08-17 12:37:29 +05:30
Shariq Ansari
21c1141fdb
chore: linter fix 2023-08-17 12:14:13 +05:30
Raffael Meyer
552bbb1d46
fix(RFQ): make "update password" and "submit quotation" buttons the same size (#36667) 
fix(RFQ): button styling
 2023-08-17 12:04:05 +05:30
Shariq Ansari
7ec6909159 fix: check tax and charges if it is passed 2023-08-17 11:59:47 +05:30
Deepesh Garg
35be3ac5a1 feat: Transaction currency columns in GL report 2023-08-17 11:31:40 +05:30
Deepesh Garg
98adfb4c9a
Merge pull request #36492 from RitvikSardana/develop-ritvik-POS-runtime-effect 
fix: POS runtime effect
 2023-08-17 10:54:48 +05:30
ruthra kumar
3345165206
Merge pull request #36649 from ruthra-kumar/perf_latest_details_only_pulled_for_linked_vouchers 
perf: pull latest details only for referenced vouchers
 2023-08-17 09:00:29 +05:30
Deepesh Garg
8601e5b3a4
Merge pull request #36677 from deepeshgarg007/ignore_prepared_report 
fix(UX): Ignore prepared report
 2023-08-16 21:31:50 +05:30
Deepesh Garg
124c0dbd88 fix(UX): Ignore prepared report 2023-08-16 19:10:39 +05:30
Ritvik Sardana
0d95fc0f20 fix: test_serial_no_case_1 test case works 2023-08-16 11:41:24 +05:30
Kevin Shenk
43f530b077
fix: Plaid Integration status and categories 
"pending" is a boolean not a string, and "category" doesn't exist in some edge cases
 2023-08-15 13:34:59 -04:00
ruthra kumar
924911e743
Merge pull request #36663 from ruthra-kumar/readd_permissions_in_journal 
fix: re-add permission that was unintentionally removed
 2023-08-15 17:06:24 +05:30
ruthra kumar
45662fa646 fix: re-add permission that was unintentionally removed 
Remove `Reversal OF ITC` and re-add permissions. Both of them
unintended changes
 2023-08-15 16:23:47 +05:30
Anand Baburajan
e0c79d3b53
chore: add validation for depreciation expense account in asset category (#36659) 2023-08-15 10:17:15 +00:00
Deepesh Garg
1e07f6eef9
fix(demo): More exception handling on demo data generation (#36652) 2023-08-15 10:45:36 +05:30
Babuuu
89e89de961
Fix tax amount in customer portal (#36453) 
The net total is the value that is currently being displayed instead of the tax amount.
 2023-08-15 08:54:06 +05:30
ruthra kumar
d77b0295fa
Merge pull request #36642 from ruthra-kumar/toggle_for_negative_rates 
refactor: toggle for negative item rates in Selling Settings
 2023-08-15 08:12:10 +05:30
ruthra kumar
a0fc68538f refactor: toggle for negative rates in Selling Settings 2023-08-15 07:34:33 +05:30
ruthra kumar
deb0d71294 perf: pull latest details only for referenced vouchers 2023-08-15 05:26:26 +05:30
Kevin Shenk
7ab55b1bb2
fix: Document Name link validation in Bank Reconciliation Tool (#36495) 
fix: format_row broke Document Name link validation

#35540 broke Voucher Matching, leading to an invalid link exception on submission. This is because the format_row() function overwrites the row data instead of just providing a formatter on the DataTable column, and therefore passes through the formatted (linked) column data instead of the Document Name only.

This patch moves the appropriate frappe.form.formatters.Link function to a dedicated format hook on the DataTable columns definition, both fixing the error and retaining the functionality of #35540.
 2023-08-14 19:03:01 +05:30
abdosaeed95
670d9e5556
fix: validate loyalty_amount against rounded_total instead of grand_total (#36466) 2023-08-14 18:54:01 +05:30
HarryPaulo
843e77e72d
fix: standard formula to calculate the "difference" (#36612) 2023-08-14 18:51:30 +05:30
Deepesh Garg
985ff9781b
fix: Tax withholding post LDC limit consumed (#36611) 
* fix: Tax withholding post LDC limit consumed

* fix: LDC condition check
 2023-08-14 18:19:15 +05:30
Gursheen Kaur Anand
12a6f3b997
feat: add invoice totals in tax withholding report (#36567) 
* fix: add invoice totals in tax withholding report

* fix: naming series col in tax withholding report

* fix: tds computation summary cols
 2023-08-14 18:15:47 +05:30
mergify[bot]
1ff80fcbee
fix: Button Alignment center in hero slider (backport #36607) (#36638) 
fix: Button Alignment center in hero slider (#36607)

fix: speling in CSS (Button alignment center is not working on hero slider)#36561
(cherry picked from commit b131f70ed6a8e3b763d59106084440e08a73b815)

Co-authored-by: ViralKansodiya <141210323+viralkansodiya@users.noreply.github.com>
 2023-08-14 16:25:38 +05:30