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

9018 Commits

Author SHA1 Message Date
ruthra kumar
e3104f1898 fix: include gain/loss journal in AR/AP reports 2023-08-20 20:13:31 +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
Ritvik Sardana
0d95fc0f20 fix: test_serial_no_case_1 test case works 2023-08-16 11:41:24 +05:30
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
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
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
Ritvik Sardana
d4cc9daca1 chore: code clean up 2023-08-14 11:52:49 +05:30
Ritvik Sardana
68df3f9729 fix: get_items call improved 2023-08-14 11:44:47 +05:30
Deepesh Garg
fbb5058531
fix: AR/AP report based on payment terms (#36574) 
* fix: AR/AP report based on payment terms

* fix: AR/AP report based on payment terms
 2023-08-14 08:32:07 +05:30
Naufal Afif
ce25f9e8c9
fix: wrong currency on financial-statement based reports (#36524) 
* add missing field options on financial_statement Total field

* format financial statement code
 2023-08-13 13:26:56 +05:30
ruthra kumar
3c7702c53c
Merge pull request #36309 from ruthra-kumar/fix_incorrect_validation_on_partial_pay_for_so 
fix: allocation validation blocks partial payment for SO and PO
 2023-08-13 08:42:42 +05:30
Deepesh Garg
7f062a71f1
Merge pull request #36582 from deepeshgarg007/final_total 
fix: Group Account total not showing in Financial Statements
 2023-08-11 21:56:44 +05:30
Ankush Menat
581d98c5ae
Merge pull request #35777 from deepeshgarg007/demo_data_on_install 
feat: Demo setup
 2023-08-11 14:38:38 +05:30
ruthra kumar
5bed119de9
Merge pull request #36593 from ruthra-kumar/update_permission_for_semi_auto_reconciliation_tool 
chore: update permissions for Process Payment Reconciliation
 2023-08-11 11:42:47 +05:30
ruthra kumar
cd28d15292 chore: update permissions for Process Payment Reconciliation 2023-08-11 10:56:57 +05:30
Ankush Menat
940b1d9e67 feat(ux): account workspace number cards 2023-08-10 17:46:35 +05:30
Ritvik Sardana
526f1d18fb fix: added test for runtime effect 2023-08-10 17:35:12 +05:30
Deepesh Garg
baf5cddd1b fix: Group Account total not showing in Financial Statements 2023-08-10 16:09:38 +05:30
Ankush Menat
ba6de0b4ff Merge branch 'develop' into demo_data_on_install 2023-08-10 15:22:52 +05:30
ruthra kumar
4ed4b0240d refactor: enable 'no-copy' 2023-08-10 14:32:37 +05:30
ruthra kumar
de17eaef38 refactor: set flag display condition 2023-08-10 10:05:25 +05:30
ruthra kumar
3997aa77d4 refactor: add is_system_generated field to Journal Entry 2023-08-09 20:50:11 +05:30
ruthra kumar
47cb349362 fix: better remarks on Cr note created by Reconciliation 2023-08-09 20:43:51 +05:30
Ankush Menat
b0c79a0467
perf(invoice): Faster return amount query (#36556) 
perf: Faster return amount query
 2023-08-09 13:37:19 +05:30
ruthra kumar
e64b004eca
feat: utility to repost accounting ledgers without cancellation (#36469) 
* feat: introduce doctypes for repost

* refactor: basic filters and validations

* chore: basic validations

* chore: added barebones function to generate ledger entries

* chore: repost on submit

* chore: repost in background

* chore: include payment entry and journal entry

* chore: ignore repost doc on cancel

* chore: preview method

* chore: rudimentary form of preview

* refactor: preview template

* refactor: basic background colors to differentiate old and new

* chore: remove commented code

* test: basic functionality

* chore: fix conflict

* chore: prevent repost on invoices with deferred accounting

* refactor(test): rename and test basic validations and methods

* refactor(test): test all validations

* fix(test): use proper name account name

* refactor(test): fix failing test case

* refactor(test): clear old entries

* refactor(test): simpler logic to clear old records

* refactor(test): make use of deletion flag

* refactor(test): split into multiple test cases
 2023-08-08 20:27:12 +05:30
ruthra kumar
11d5327d1b
refactor: use base_tax_withholding_net_total for treshold validation (#36528) 
* refactor: use base_tax_withholding_net_total for treshold validation

* fix: only for non payment entry doctypes
 2023-08-08 14:14:30 +05:30
Deepesh Garg
492ea3bcc8
fix: Debit credit difference while submitting Sales Invoice (#36523) 
* fix: Debit credit difference while submitting Sales Invoice

* test(fix): Update gl entry comparison

* test(fix): Update gl entry comparison
 2023-08-08 11:39:44 +05:30
ruthra kumar
b86747c9d4
feat: ledger comparison report (#36485) 
* feat: Accounting Ledger comparison report

* chore: barebones methods

* chore: working state

* chore: refactor internal logic

* chore: working multi select filter on Account

* chore: working voucher no filter

* chore: remove debugging statements

* chore: report with currency symbol

* chore: working start and end date filter

* test: basic report function

* refactor(test): test all filters
 2023-08-07 11:28:07 +05:30
Himanshu
38805603db
feat: subscription refactor (#30963) 
* feat: subscription refactor

* fix: linter changes

* chore: linter changes

* chore: linter changes

* chore: Update tests

* chore: Remove commits

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-07 08:33:47 +05:30
Deepesh Garg
93767eb7fc
fix: Tax withholding against order via Payment Entry (#36493) 
* fix: Tax withholding against order via Payment Entry

* test: Add test case

* fix: Nonetype exceptions
 2023-08-05 22:22:03 +05:30
Corentin Flr
559d914c0b
fix(accounts): Translate columns in AP/AR report (#36503) 2023-08-05 22:18:36 +05:30
Ritvik Sardana
b483364649 Merge branch 'develop' of https://github.com/frappe/erpnext into develop-ritvik-POS-runtime-effect 2023-08-05 11:26:47 +05:30
Ritvik Sardana
dbc000d655 fix: batched items method giving wrong quantity, so changed it back to previous way 2023-08-05 11:23:07 +05:30
mergify[bot]
b65ee6c2db
fix: cross connect delivery note and sales invoice (backport #36183) (#36457) 
fix: cross connect delivery note and sales invoice (#36183)

* fix: cross connect delivery note and sales invoice

* chore: remove unnecessary non_standard_fieldname

(cherry picked from commit 8501a1182ae8323d91438da30ddc8d93cf8c2789)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-08-05 10:57:23 +05:30
RitvikSardana
b86afb2964
feat: Financial Ratio Report (#36130) 
* feat: Financial Ratio report added

* fix: Made columns dynamic

* fix: Changed fieldtype of year column

* fix: Added Financial Ratios for all Fiscal Years

* fix: Added Validation of only Parent Having account_type of Direct Income, Indirect Income, Current Asset and Current Liability

* fix: Added 4 more ratios

* fix: added a function for repeated code

* fix: added account_type in accounts utils and cleaned report code

* fix: created function for avg_ratio_values

* fix: cleaning code

* fix: basic ratios completed

* fix: cleaned the code

* chore: code cleanup

* chore: remove comments

* chore: code cleanup

* chore: cleanup account query

* chore: Remove unused variables

---------

Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-04 22:05:30 +05:30
Gursheen Kaur Anand
edbefee10c
fix: payment allocation in invoice payment schedule (#36440) 
* fix: payment allocation in invoice payment schedule

* test: payment allocation for payment terms

* chore: linting issues
 2023-08-04 17:49:17 +05:30
Deepesh Garg
17585f08ba
Merge pull request #36333 from GursheenK/AP-GL-not-matching 
fix: AP report does not show expense claim payables
 2023-08-04 17:42:54 +05:30
Ritvik Sardana
510543680b fix: batched items in POS 2023-08-04 16:55:30 +05:30
Ritvik Sardana
c9d5a62350 fix: POS Runtime Effect completed 2023-08-04 16:47:49 +05:30
Deepesh Garg
7276d593c3
Merge pull request #36458 from GursheenK/consolidated-financial-statements-roottype 
test: balance sheet report
 2023-08-04 09:55:36 +05:30
Deepesh Garg
04820b14da
Merge pull request #35644 from ruthra-kumar/book_gain_loss_in_je 
refactor: booking exchange gain/loss amount through journal
 2023-08-04 09:53:26 +05:30
Ritvik Sardana
5b1aa07ecb fix: fixed SABB error 2023-08-03 16:10:28 +05:30
Husam Hammad
27ebf14f9d
fix: handle None value in payment_term_outstanding 
* Fix payment entry bug: Handle None value in payment_term_outstanding

* fix: Handle None value in payment_term_outstanding V2

fix linting issue
 2023-08-02 16:28:05 +05:30