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

1710 Commits

Author SHA1 Message Date
ruthra kumar
244cec64b2 test: report output if party is missing 2023-10-17 20:40:50 +05:30
ruthra kumar
601ab4567e refactor: use account in key while grouping voucher in ar/ap report 2023-10-17 17:48:04 +05:30
ruthra kumar
dd099be690
Merge pull request #37478 from ruthra-kumar/tds_from_journals 
refactor: back calculate total amt for TDS
 2023-10-15 10:51:42 +05:30
ruthra kumar
f4a294c5ce
Merge pull request #37495 from ruthra-kumar/keyerror_on_comparison_report 
fix: keyerror on gl and pl comparision report
 2023-10-14 12:15:19 +05:30
ruthra kumar
8ca0e4eacc
Merge pull request #37435 from rtdany10/sp-gp-fix 
fix(gp): wrong `allocated_amount` when grouped by Sales Person
 2023-10-14 12:12:14 +05:30
ruthra kumar
ad00df0af6 fix: keyerror on gl and pl comparision report 2023-10-13 15:39:54 +05:30
ruthra kumar
2c56ee97c7 refactor: back calculate total amt for TDS 2023-10-12 16:03:26 +05:30
Dany Robert
bda82bf1e9 fix(gp): wrong allocated_amount on multi sales person invoice 2023-10-10 10:30:09 +00:00
ruthra kumar
40e7c43ce3 refactor: import financial_statement in erpnext bundle 2023-10-07 21:03:31 +05:30
ruthra kumar
ab378196bd
Merge pull request #37304 from GursheenK/party-totals-payable-report 
fix: only float row values for total in AP summary
 2023-10-03 19:45:03 +05:30
ruthra kumar
67440c38ae refactor: use isinstance over type 2023-10-03 17:38:43 +05:30
Deepesh Garg
964cd75f6e
Merge pull request #37235 from niyazrazak/patch-13 
fix: set route options to cost center
 2023-10-02 10:54:02 +05:30
Gursheen Anand
1dab195560 fix: add only float row values for total 2023-09-29 18:20:02 +05:30
ruthra kumar
2c7d6aec89 test: multi select party filter in AR report 2023-09-28 11:17:38 +05:30
Gursheen Anand
59e8abfd57 fix: party format in test 2023-09-27 13:57:49 +05:30
Gursheen Anand
f7cb68a45f fix: summary report filters 2023-09-27 13:03:37 +05:30
Gursheen Anand
e7239e02d4 fix: query for multiselect filter 2023-09-27 13:02:52 +05:30
Gursheen Anand
9d15124a6a fix: set route filter values for AR 2023-09-27 13:01:48 +05:30
Gursheen Anand
888ed36eed fix: set route filter values for AP 2023-09-27 13:01:18 +05:30
Gursheen Anand
76a5d94f37 fix: set new AP summary filters 2023-09-26 15:11:54 +05:30
Gursheen Anand
7d96044d8e fix: change filters for AR summary 2023-09-26 15:10:16 +05:30
NIYAZ RAZAK
5e4b73918d
fix: set route to cost center 
cost center mapping is not correct
 2023-09-25 22:15:08 +03:00
Deepesh Garg
06a45897de feat: Toggle net values in Trial Balance report 2023-09-23 14:34:11 +05:30
NandhiniDevi
6be567dbf6
fix: add item group filter added in item-wise purchase register (#36937) 
fix: add item group filter added in item-wise purchase register (#36937)
 2023-09-19 19:25:46 +05:30
ruthra kumar
2a575d9dc2
Merge pull request #37131 from ruthra-kumar/more_generic_customer_filter_in_ar_report 
refactor: more generic filters in Accounts Receivable report
 2023-09-18 16:59:25 +05:30
ruthra kumar
08d91ab831 refactor(test): AR output filtered on USD customers 2023-09-18 16:28:06 +05:30
ruthra kumar
083c82c206 chore: remove stale code 2023-09-18 16:28:06 +05:30
ruthra kumar
ac650d2e7a refactor: replace 'customer' filter with 'party_type' and 'party' 2023-09-18 16:28:02 +05:30
Gursheen Kaur Anand
099468e3cf
fix: company wise deferred accounting fields in item (#37023) 
* fix: move deferred accounts in accounting section

* fix: move deferred check boxes in item accounting

* fix: show company wise acc in filters

* fix: fetch item deferred account from child table

* fix: tests using deferred acc

* refactor: use cached value

* fix: cached value call

* feat: patch to migrate deferred acc

* fix: hardcode education module doctypes in patch

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-09-16 21:25:31 +05:30
Abdo
6f4f5be990
chore: Translate Voucher Type in General Ledger Report (#36874) 
chore: Translate Voucher Type in  General Ledger Report
 2023-09-13 20:38:45 +05:30
Deepesh Garg
88f7e57edf
Merge pull request #37055 from deepeshgarg007/dimension_filters_gl 
fix: Apply dimension filter, irrespective of dimension columns
 2023-09-13 10:05:58 +05:30
Deepesh Garg
769db0b3bc fix: Apply dimension filter, irrespective of dimesion columns 2023-09-12 21:14:08 +05:30
Deepesh Garg
c849a012d5
Merge pull request #36974 from GursheenK/tax_withholding_category_base_total_for_si 
fix: tax category field in tax withholding details report
 2023-09-10 11:40:36 +05:30
Gursheen Anand
175870ce8d test: tax withholding details report 2023-09-05 18:51:41 +05:30
Gursheen Anand
8eea4eb56e fix: remove tax category from common fields 2023-09-05 18:50:53 +05:30
ruthra kumar
b9c556c4a9 fix: index error on Receivable report based on payment terms 
cr note's don't have payment terms. So, skip for them.
 2023-09-05 15:07:07 +05:30
RitvikSardana
e599f75a51
fix: account payable currency and value (#36859) 
* fix: account payable currency and value

* fix: added party_type and party in accounts payable report

* chore: code cleanup

* fix: customer group test case failure

* fix: added test case of the issue

* fix: filter toggle for party_type

* fix: filter toggle for party_type

* chore: fix typo

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-09-02 13:08:08 +05:30
Dany Robert
3e1065a561 fix: company is ambiguous 2023-09-01 04:58:59 +00:00
Gursheen Anand
d73daafe77 fix: tax accounts in sales register 2023-08-31 15:19:46 +05:30
Deepesh Garg
92e503f75b fix: Sales/Purchase register showing duplicate records 2023-08-29 20:45:57 +05:30
ruthra kumar
447b73fa77
Merge pull request #36821 from ruthra-kumar/increase_test_coverage_for_receivable_payable_report 
test: use mixin and increase coverage in receivable report
 2023-08-25 18:09:16 +05:30
ruthra kumar
ce81ffd844 test: increase coverage in ar/ap report 2023-08-25 17:28:54 +05:30
ruthra kumar
bb7bed4c1a refactor(test): make use of mixin in ar/ap report tests 2023-08-25 14:46:10 +05:30
Deepesh Garg
91ca2309da
Merge pull request #36802 from GursheenK/tax_withholding_jvs_with_no_partytype 
fix: fetch JVs without party value in tax withholding report
 2023-08-25 14:43:41 +05:30
ViralKansodiya
388a42ec7e
fix: Asset Category filter is not working in asset depreciation and b… (#36806) 
fix: Asset Category filter is not working in asset depreciation and balances

Co-authored-by: ubuntu <viralkansodiya167@gmail.com>
 2023-08-25 11:44:05 +05:30
Gursheen Anand
8f1e00906f fix: fetch JVs with no party selected in filters 2023-08-24 12:55:00 +05:30
RitvikSardana
9349bc77c5 fix: Accounts Payable Currency bug 2023-08-22 14:12:42 +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