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

46319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ankush Menat
5169006085 fix: move company rename to long queue 2023-08-10 10:02:59 +05:30
s-aga-r
4a7fc1506f
fix: don't show disabled items in Item Shortage Report (#36550) 2023-08-10 09:40:58 +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
Anand Baburajan
ad33cd73e8
perf: asset depreciation entry posting [develop] (#36555) 
* perf: optimise post_depreciation_entries and make_depreciation_entry

* chore: fixing minor mistake

* chore: fix asset_value_adjustment test
 2023-08-09 20:26:28 +05:30
Deepesh Garg
32863b4922 fix: Make default sales update frequency as monthly instead of each transaction 2023-08-09 15:36:28 +05:30
Ankush Menat
5740942de9 fix: lowercase fieldnames 2023-08-09 15:32:26 +05:30
ruthra kumar
3866be4c2a
Merge pull request #36560 from ruthra-kumar/broken_bench_update 
fix: broken `bench update` after subscription refactor
 2023-08-09 14:44:54 +05:30
s-aga-r
e415cb2873
Merge pull request #36554 from barredterra/hide-description-in-print-and-report 
fix(RFQ): hide description in print and report
 2023-08-09 13:54:47 +05:30
ruthra kumar
9db8769e65 fix: broken bench update after subscription refactor 2023-08-09 13:54:26 +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
barredterra
4fb844ab70 fix(RFQ): hide description in print and report 2023-08-08 16:30:53 +02:00
s-aga-r
c1dd06065b
Merge pull request #36551 from barredterra/fix-rfq-link 
fix(RFQ): link to supplier portal
 2023-08-08 16:55:02 +05:30
barredterra
68ad62f7d0 test(RFQ): get_link 2023-08-08 12:31:37 +02:00
barredterra
fd91f2c2e0 fix(RFQ): link to supplier portal 2023-08-08 12:31:01 +02:00
rohitwaghchaure
0b36e7d10e
fix: stock reconciliation negative stock error (#36544) 
fix: stock reco negative stock error
 2023-08-08 15:18:27 +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
s-aga-r
ecba6ee183
fix: enqueue submit/cancel action for stock entry having more than 50 line items (#36532) 2023-08-07 19:36:19 +05:30
Raffael Meyer
8cc3df7c2c
feat(RFQ): make sending attachments configurable (#36359) 2023-08-07 19:11:01 +05:30
rohitwaghchaure
28dfc88789
fix: stock entry decimal issue (#36530) 2023-08-07 17:31:38 +05:30
Raffael Meyer
21080afd92
feat(RFQ): make email message fully configurable (#36353) 
feat: make RFQ message fully configurable
 2023-08-07 17:12:31 +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
Ankush Menat
2eea90a873 perf: defer holiday list imports 
Only used for configuring but loaded whenever
get_doc("holiday list", ...) is done
 2023-08-07 10:08:34 +05:30
Ankush Menat
10a2191e3f
Merge pull request #36519 from ankush/lang_separator 
fix: use correct lang separator for frappe
 2023-08-07 10:06:23 +05:30
Ankush Menat
f574ac11ea perf: defer babel import 
Only required when configuring but will get loaded everywhere
 2023-08-07 10:03:40 +05:30
Ankush Menat
0218ca538f fix: use correct lang separator for frappe 2023-08-07 09:59:54 +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
mergify[bot]
b717e2b5bf
chore: don't merge asset capitalization gl entries (copy #36514) (#36515) 
chore: don't merge asset capitalization gl entries

(cherry picked from commit 3c8f292ac3943ddad52a7041d8910552d47abf0a)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-08-06 23:44:22 +05:30
Bernd Oliver Sünderhauf
5435c641a2
fix: Refine supplier scorecard standings. (#36414) 
Co-authored-by: Bernd Oliver Sünderhauf <pancho@mailbox.org>
 2023-08-05 23:13:14 +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
Deepesh Garg
96035b87d5
fix: Lower deduction certificate for multi-company (#36491) 2023-08-05 22:21:06 +05:30
Corentin Flr
559d914c0b
fix(accounts): Translate columns in AP/AR report (#36503) 2023-08-05 22:18:36 +05:30
s-aga-r
758b31d895
fix: get incoming rate instead of BOM rate (#36496) 
* fix: get incoming rate instead of BOM rate

* test: add test case for SCR rm rate
 2023-08-05 19:28:38 +05:30
s-aga-r
e179499764
fix(ux): add Ordered Qty column in Get Items From > MR (#36486) 2023-08-05 19:26:11 +05:30
Michelle Alva
16bc1e228f
chore: typo in onboarding (#36504) 
* fix: typo in onboarding

* fix: typo
 2023-08-05 18:30:24 +05:30
ruthra kumar
a4be6b0f10
Merge pull request #36501 from ruthra-kumar/fix_failing_gain_loss_unit_tests 
fix(test): replace hardcoded reference to adv with dynamic one
 2023-08-05 14:43:42 +05:30
ruthra kumar
466734fb4b fix(test): replace hardcoded reference to adv with dynamic one 2023-08-05 14:11:57 +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
Sumit Jain
49be740736
fix: Contact Doctype doesn't have any field called job_title 
fix: Contact Doctype doesn't have any field called `job_title`
 2023-08-04 17:45:16 +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