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

9098 Commits

Author SHA1 Message Date
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
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
d01f0f2e96 refactor: filter for journal entries 2023-08-21 20:50:34 +05:30
ruthra kumar
86bac2cf52 refactor: filter on advance payments 2023-08-21 20:50:34 +05:30
ruthra kumar
52f609e67a refactor: filter on cr/dr notes 2023-08-21 20:50:34 +05:30
ruthra kumar
e48f8139eb refactor: trigger on value change 2023-08-21 20:50:34 +05:30
ruthra kumar
7a381affce refactor: limit output to 50 in reconciliation tool 2023-08-21 20:50:32 +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
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
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
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
ruthra kumar
8f695123cd refactor: criteria for Credit Note Issued and Debit Note Issued 2023-08-18 10:13:48 +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
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
ruthra kumar
f6e4ac2b62 refactor(test): payments to invoice with -ve outstanding 2023-08-16 16:19:53 +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
0e2fb1188a refactor(test): ledger entries will be against itself 2023-08-15 09:03:02 +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
ruthra kumar
b30c1e1abf refactor(test): return invoice will have -ve outstanding 2023-08-13 15:52:45 +05:30
ruthra kumar
00878707ae refactor: remove return_against for cr/dr note filter 2023-08-13 15:52:42 +05:30
ruthra kumar
db76e8a277 refactor: cr notes will post for itself 2023-08-13 15:30:17 +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
Devin Slauenwhite
dedf24b86d
fix: don't allow negative rates (#36027) 
* fix: don't allow negative rate

* test: don't allow negative rate

* fix: only check for -rate on items child table
 2023-08-02 16:26:55 +05:30
Gursheen Anand
002bf77314 test: balance sheet report 2023-08-01 23:24:18 +05:30
Gursheen Anand
cd98be6088 fix: check root type only when not none 2023-08-01 23:22:49 +05:30
Ritvik Sardana
17771a55fb fix: added code for batched items in POS 2023-08-01 19:28:40 +05:30
Corentin Flr
bd3fc7c434
fix: Fix query for financial statement report 2023-08-01 14:35:11 +02:00
ruthra kumar
ab933df5bb
fix: overallocation validation misfire on normal invoices (#36349) 
* fix: overallocation validation misfire on normal invoices

* test: assert misfire doesn't happen
 2023-08-01 13:12:16 +05:30
Anand Baburajan
2ab3d75274
feat: asset activity (#36391) 
* feat: asset activity

* chore: add more actions to asset activity

* chore: fix failing test due to timestamp mismatch error

* chore: rewriting asset activity messages

* chore: add report and add it to workspace

* chore: show user in list view
 2023-08-01 12:00:24 +05:30
ruthra kumar
a93ae9c826
Merge pull request #36434 from ruthra-kumar/replace_get_cached_with_get_single_value 
fix: incorrect usage `get_cached_value` on single doctypes
 2023-08-01 10:02:33 +05:30
abdosaeed95
4f473eb090
fix: typo in loyalty program throw message (#36432) 2023-08-01 10:01:01 +05:30
ruthra kumar
ba15810639 fix: incorrect usage get_cached_value on single doctypes 2023-08-01 07:58:09 +05:30
Gursheen Kaur Anand
11bd15e580
fix: root type in account map for balance sheet (#36303) 
* fix: root type in account map

* fix: fetch gle by root type in consolidated financial statement

* refactor: consolidated financial statement gle query

* fix: filter accounts by root type
 2023-07-31 23:27:16 +05:30
Gursheen Kaur Anand
1ddfaa7605
fix: ignore cancelled gle in voucher-wise balance report (#36417) 
fix: ignore cancelled gle
 2023-07-31 14:29:20 +05:30
Deepesh Garg
70c5df056d Merge branch 'develop' of https://github.com/frappe/erpnext into demo_data_on_install 2023-07-31 13:02:34 +05:30
Deepesh Garg
c6d8f15b10
Merge pull request #36389 from AlexandreLumertz/patch-2 
fix: Party type translation in error message
 2023-07-30 18:42:01 +05:30
Deepesh Garg
eeddeeeeb3
Merge pull request #36369 from ashish-greycube/patch-11 
fix: in payment_entry 'Unallocated Amount' cal is broken
 2023-07-30 14:37:24 +05:30
Deepesh Garg
3698af834b Merge branch 'develop' of https://github.com/frappe/erpnext into demo_data_on_install 2023-07-29 17:12:06 +05:30
Deepesh Garg
f999b75ed6 Merge branch 'develop' of https://github.com/frappe/erpnext into balancing-accounting-dimensions 2023-07-29 11:53:03 +05:30
Deepesh Garg
ecca9cb023 fix: Add company filters for account 2023-07-29 11:52:54 +05:30
ruthra kumar
3b58055410
refactor(test): introduce and make use of mixins in unit tests (#36382) 
* refactor(test): create and use test mixin

* chore(test): replace get_user_default with variable
 2023-07-28 21:02:21 +05:30
xdlumertz
bc470591ac
fix: translate 
fix: translate
 2023-07-28 12:31:29 -03:00
Gursheen Anand
f5761e7965 refactor: future payments query 2023-07-28 16:01:30 +05:30
Gursheen Anand
e355dea4b5 fix: AP and AR summary 2023-07-28 14:51:28 +05:30
Gursheen Anand
fd5c4e0a64 fix: fetch ple for all party types 2023-07-28 11:41:03 +05:30