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

9098 Commits

Author SHA1 Message Date
Sagar Vora
1b853857aa chore: remove unused variable job 2023-09-06 14:14:22 +05:30
Anand Baburajan
174f95d699
fix: ask for asset related accounts only when needed (#36960) 
* fix: only ask for asset_received_but_not_billed account when needed

* chore: remove unnecessary if condition

* fix: only ask for expenses_included_in_asset_valuation account when needed
 2023-09-05 17:45:23 +05:30
ruthra kumar
ccd2e2b086
Merge pull request #36963 from ruthra-kumar/index_error_on_receivable_report 
fix: index error on Receivable report based on payment terms
 2023-09-05 16:12:38 +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
d2f03c8a65
fix: payment recon not showing payment entry when party_type is Student (#36920) 
* fix: payment recon not showing payment entry when party_type is Student

* chore: code cleanup

* fix: payment recon based on account_type which is fetched from Party Type master
 2023-09-05 12:00:54 +05:30
ruthra kumar
f7865da4d2 refactor: gain/loss should use same posting date as payment 2023-09-04 21:40:40 +05:30
ruthra kumar
04bc353e7f
Merge pull request #36940 from ruthra-kumar/invalid_gain_loss_in_expense_claim 
fix: invalid gain/loss JE created on base currency Expense Claim
 2023-09-04 13:56:01 +05:30
ruthra kumar
75d95acb23 fix: invalid gain/loss JE created on base currency Expense Claim 2023-09-04 13:05:57 +05:30
ruthra kumar
27e0dd9fdc
Merge pull request #36911 from ruthra-kumar/deduplicate_gain_loss_journal_creation 
fix: deduplicate gain/loss JE creation for journals as payment
 2023-09-03 10:11:43 +05:30
ruthra kumar
d6a3b9a5c7 refactor: use payment's CC for gain/loss if company default is unset 2023-09-03 09:21:23 +05:30
Deepesh Garg
2e7548462d
Merge pull request #36895 from blaggacao/fix-coa-dill-down-on-startup 
fix(startup): coa drill down
 2023-09-02 17:12:18 +05:30
Deepesh Garg
f3282b1bb3
Merge pull request #36908 from barredterra/unreconcile-bank-transaction 
fix: only show "Unreconcile" if reconciled
 2023-09-02 17:11:56 +05:30
Deepesh Garg
30aba9414c
Merge pull request #36900 from GursheenK/pcv-request-timeout 
fix: reduce threshold for background job in PCV
 2023-09-02 17:11:08 +05:30
ruthra kumar
79c6f0165b fix: deduplicate gain/loss JE creation for journals as payment 2023-09-02 13:29:31 +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
barredterra
91e574609f fix: only show "Unreconcile" if reconciled 2023-09-01 19:23:27 +02:00
ruthra kumar
0e517227ee
Merge pull request #36899 from ruthra-kumar/use_own_exchange_rate_on_references 
fix: difference amount calculation logic in Payment Entry UI
 2023-09-01 17:37:23 +05:30
Gursheen Anand
b6e6f2ef8d fix: reduce threshold for bg job fn 2023-09-01 12:36:40 +05:30
ruthra kumar
a7e0709ae8 fix: difference amount in UI should not be calculated 2023-09-01 12:18:55 +05:30
Dany Robert
3e1065a561 fix: company is ambiguous 2023-09-01 04:58:59 +00:00
ruthra kumar
0d26f67be5
Merge pull request #36888 from ruthra-kumar/gain_loss_refactor_issue_01_patch_failed 
fix: calcuate received/paid amount on exchange rate change in Payment Entry
 2023-08-31 18:37:39 +05:30
ruthra kumar
64d835374b fix: calcuate received/paid amount on rate change in PE 2023-08-31 17:58:26 +05:30
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
Corentin Flr
5c4df3e0e3
fix: Setup flake8 to stop turning trailing commas into tuples (#36850) 2023-08-29 10:59:58 +05:30
Deepesh Garg
1c237f455e
fix(demo): COA fixes for Mexico country (#36840) 2023-08-29 10:50:12 +05:30
Gursheen Kaur Anand
26e8b8f959
fix: create entries for only PR items present in LCV (#36852) 
* fix: check if item code exists in lcv before creating gle

* refactor: use qb to fetch lcv items
 2023-08-29 09:03:31 +05:30
ruthra kumar
9895bc3246
Merge pull request #36844 from ruthra-kumar/validation_error_on_payment_entry 
fix: allocation error on partial payment against sales order
 2023-08-28 15:11:36 +05:30
ruthra kumar
2fdbe82835 test: assert rounded amount is calculated 2023-08-28 14:30:37 +05:30
ruthra kumar
67a0969b78 test: allocation err misfire on Sales Order 2023-08-28 14:21:21 +05:30
ruthra kumar
714b8289c1 fix: fetch rounded total while pulling reference details on SO 2023-08-28 14:01:12 +05:30
ruthra kumar
d40504b973 test: Exchange Rate Revaluation functions and its impact on ledger 2023-08-27 14:33:34 +05:30
Abdo
6b75c03f34
chore: translate currency (#36777) 
chore: translate currency
 2023-08-26 19:37:28 +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
Deepesh Garg
1449e38b39
Merge pull request #36799 from deepeshgarg007/tds_on_debit_note 
fix: Tax withholding reversal on Debit Notes
 2023-08-24 19:30:54 +05:30
Deepesh Garg
abc5fdd47b
Merge pull request #36804 from deepeshgarg007/demo_coa 
fix(demo): Default accounts for demo company
 2023-08-24 19:30:17 +05:30
Deepesh Garg
299e32befd chore: Linting Issues 2023-08-24 18:02:06 +05:30
Deepesh Garg
5f75aea6fa fix(demo): Default accounts for demo company 2023-08-24 17:58:51 +05:30
Deepesh Garg
6349b67df4 fix(demo): Default accounts for demo company 2023-08-24 17:54:14 +05:30
Gursheen Anand
7c1417e199 chore: fix linting issues 2023-08-24 12:55:54 +05:30
Gursheen Anand
8f1e00906f fix: fetch JVs with no party selected in filters 2023-08-24 12:55:00 +05:30
Deepesh Garg
6d9cebfee9 fix: Tax withholding reversal on Debit Notes 2023-08-24 11:49:03 +05:30
ruthra kumar
758ea7bfe1
Merge pull request #35330 from ruthra-kumar/cr_note_posts_gl_for_itself 
refactor: cr/dr note should be standalone even when created from another invoice
 2023-08-23 20:38:14 +05:30
ruthra kumar
60eee564bf refactor: Payment btn criteria for Cr/Dr notes 2023-08-23 17:58:15 +05:30
ruthra kumar
bf6bf79ae3
Merge pull request #36650 from ruthra-kumar/refactor_payment_reconcliation_ui 
perf: improve responsiveness of payment reconciliation tool
 2023-08-23 09:12:36 +05:30
RitvikSardana
9349bc77c5 fix: Accounts Payable Currency bug 2023-08-22 14:12:42 +05:30