fix: Trial Balance is pushing back opening balance into previous years#1
Open
saadsafda wants to merge 3815 commits into
Open
fix: Trial Balance is pushing back opening balance into previous years#1saadsafda wants to merge 3815 commits into
saadsafda wants to merge 3815 commits into
Conversation
saadsafda
commented
Feb 29, 2024
saadsafda
commented
Collaborator
…frappe#38985) * fix(Org Chart): check if company is set before loading children * refactor: avoid assigning undefined values, use empty strings, null instead * fix: returning to org chart view from employee master does not render chart - the check for company field is truthy from the employee doctype, so it does not render company field again. Explicitly check for company field on the same page * fix(Org Chart Mobile): check if company is set before loading children
fix: remove bad defaults (frappe#38986) Child tables can't have a default. (cherry picked from commit b71b0d5) Co-authored-by: Ankush Menat <ankush@frappe.io>
fix: Opening balance in bank reconciliation tool (frappe#38977) (cherry picked from commit bbee9b5) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
* feat: fetch payments and journals * refactor: use single qb query for PE and PI * feat: fetch PE along with SI * refactor: move repeating code to common controller * fix: fetch cost center for PE * feat: fetch JV with PE * fix: validate party filter for fetching payments * fix: linting issues * refactor: use qb to fetch PE JV and Inv * refactor: move fn to fetch advance taxes to utils & use qb * fix: filtering through accounting dimensions * chore: remove debugging print statements * fix: modify rows and columns for ledger view * refactor: filter accounting dimensions using qb * fix: show additional table cols from india compliance api call * chore: fix typo * test: purchase register and ledger view * fix: filter by party in opening row calculation * fix: exclude cancelled gl entries for opening balance * chore: change column format for report * fix: check gl entry status using is_cancelled * fix: running balance after sorting * fix: gst itemised registers for india compliance api call * fix: additional query cols for gst itemised registers * fix: additional query cols for sales register * fix: PE in sales register * fix: tax accounts in sales register * fix: Sales/Purchase register showing duplicate records * fix: avoid fetching advance account for party * refactor: remove unnecessary condition * fix: remove checking for advance accounts in payments --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
…rappe#39013) fix: Validate account in Sales/Purchase Taxes and Charges Template (frappe#39013) (cherry picked from commit cd37fd7) Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
…ly (backport frappe#38992) (frappe#39027) * fix: work order with multi level, fetch operting cost from sub-assembly (frappe#38992) (cherry picked from commit 70abedc) # Conflicts: # erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py # erpnext/manufacturing/doctype/work_order/test_work_order.py * chore: fix conflicts * chore: fix conflicts * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
…ort frappe#38147) (frappe#39046) * fix: issue occured when creating supplier with contact details (cherry picked from commit 7842c9f) # Conflicts: # erpnext/selling/doctype/customer/customer.py * fix: Suppier name was not taken when creating address from supplier (cherry picked from commit 545ef3c) * chore: fix conflicts * chore: fix linter issues --------- Co-authored-by: kunhi <kunhimohamed6@gmail.com> Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
…mt (backport frappe#39056) (frappe#39057) fix: take quantity into account when setting asset's gross purchase amt (frappe#39056) fix: take quantity into account when setting asset's gross purchase amount (cherry picked from commit 0346f47) Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
…ppe#39062) * fix(DX): capture tracebacks with context (frappe#39060) (cherry picked from commit 510fdf7) # Conflicts: # erpnext/manufacturing/doctype/bom_creator/bom_creator.py * Delete erpnext/manufacturing/doctype/bom_creator/bom_creator.py --------- Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit a517125)
…fix/pr-39023 refactor(perf): replace account subquery with 'in' condition (backport frappe#39023)
'Budget' and 'Budget Account' doesn't have support for dynamic dimension. It only supports hard-coded ones - Project and Cost Center (cherry picked from commit 92bc962) # Conflicts: # erpnext/accounts/report/profitability_analysis/profitability_analysis.js
(cherry picked from commit 1a9e091)
…fix/pr-39067 fix: undefined error in Budget Variance and Profitability report (backport frappe#39067)
…38513) * fix: Add missing french translations (frappe#38368) fix: Add missing french translation Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com> (cherry picked from commit a1e0197) # Conflicts: # erpnext/translations/fr.csv * chore: resolve merge conflicts --------- Co-authored-by: noec764 <58433943+noec764@users.noreply.github.com> Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
…rappe#39087) perf: index item_code in bom explosion item (frappe#39085) (cherry picked from commit 739434b) Co-authored-by: Ankush Menat <ankush@frappe.io>
file name is actually reversed.
In [1]: from premailer import Premailer
...:
...: from frappe.utils.jinja_globals import bundled_asset
...:
...: # get email css files from hooks
...: css_files = frappe.get_hooks("email_css")
...: css_files = [frappe.utils.jinja_globals.bundled_asset(path) for path in
...: css_files]
...: css_files = [path.lstrip("/") for path in css_files]
In [2]: css_files
Out[2]:
['assets/frappe/dist/css/email.bundle.ELTO33N3.css',
'email_erpnext.bundle.css',
'assets/css/email.css']
In [3]: css_files = [css_file for css_file in css_files if os.path.exists(os.pat
...: h.abspath(css_file))]
In [4]: css_files
Out[4]: ['assets/frappe/dist/css/email.bundle.ELTO33N3.css', 'assets/css/email.css']
chore: release v14
# [14.58.0](frappe/erpnext@v14.57.0...v14.58.0) (2024-01-03) ### Bug Fixes * Add missing french translations (backport [frappe#38368](frappe#38368)) ([frappe#38513](frappe#38513)) ([2c90ee2](frappe@2c90ee2)) * **DX:** capture tracebacks with context (backport [frappe#39060](frappe#39060)) ([frappe#39062](frappe#39062)) ([fe9acc8](frappe@fe9acc8)) * **Hierarchy Chart:** check if company is set before loading children ([frappe#38985](frappe#38985)) ([e4d6df3](frappe@e4d6df3)) * issue occured when creating supplier with contact details (backport [frappe#38147](frappe#38147)) ([frappe#39046](frappe#39046)) ([81ef7b4](frappe@81ef7b4)) * Opening balance in bank reconciliation tool ([frappe#38977](frappe#38977)) ([a2cba1b](frappe@a2cba1b)) * remove bad defaults (backport [frappe#38986](frappe#38986)) ([frappe#38987](frappe#38987)) ([29d383a](frappe@29d383a)) * select options should dynamically load dimensions ([bfc94cf](frappe@bfc94cf)) * take quantity into account when setting asset's gross purchase amt (backport [frappe#39056](frappe#39056)) ([frappe#39057](frappe#39057)) ([b8dce3e](frappe@b8dce3e)) * undefined error in Budget Variance and Profitability report ([cad15cd](frappe@cad15cd)) * use `Stock Qty` while getting `POS Reserved Qty` (backport [frappe#38962](frappe#38962)) ([frappe#38982](frappe#38982)) ([7ad42ec](frappe@7ad42ec)) * Validate account in Sales/Purchase Taxes and Charges Template ([frappe#39013](frappe#39013)) ([c0b5980](frappe@c0b5980)) * work order with multi level, fetch operting cost from sub-assembly (backport [frappe#38992](frappe#38992)) ([frappe#39027](frappe#39027)) ([88e5c9e](frappe@88e5c9e)) ### Features * Merge taxes from mapped docs ([frappe#38346](frappe#38346)) ([c74e6aa](frappe@c74e6aa)) * Show Ledger view for Purchase & Sales Register ([frappe#38801](frappe#38801)) ([04fb215](frappe@04fb215)) ### Performance Improvements * index item_code in bom explosion item (backport [frappe#39085](frappe#39085)) ([frappe#39087](frappe#39087)) ([558861b](frappe@558861b))
…rappe#39104) fix: Ignore UP on "allowed to transact with" (frappe#39103) If a customer is allowed to transact with some company it usually doesn't imply that customer is somehow "linked with" that company. (cherry picked from commit 6401908) Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 1bc74bd)
…frappe#39118) (frappe#39119) fix(UX): dont override framework's permission check messages (frappe#39118) (cherry picked from commit e84c9f7) Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 7da9ffa)
(cherry picked from commit 7da9ffa)
…fix/pr-39116 fix: typerror on multi select dialog (backport frappe#39116)
…39116 fix: typerror on multi select dialog (backport frappe#39116)
## [14.58.1](frappe/erpnext@v14.58.0...v14.58.1) (2024-01-03) ### Bug Fixes * typerror on multi select dialog ([43cc7e4](frappe@43cc7e4))
(cherry picked from commit 0f1be03)
(cherry picked from commit e912e95)
…fix/pr-39489 fix: fetch correct quantity and amount for grouped asset (backport frappe#39489)
(cherry picked from commit 53b44cc)
(cherry picked from commit fc67781)
…fix/pr-39562 fix: enqueue JV submission when > 100 accounts (backport frappe#39562)
…rappe#39606) (frappe#39614) fix amount not updated when change rate in material request (frappe#39606) * fix amount not updated when change rate in material request * make code consistent (cherry picked from commit efade9b) Co-authored-by: Jeffry Suryadharma <41689493+jeffrysurya@users.noreply.github.com>
(cherry picked from commit 49cb11c)
(cherry picked from commit 079cd30)
…fix/pr-39616 fix(minor): do not auto-populate item delivery date from qtn (backport frappe#39616)
…rappe#39606) (backport frappe#39614) (frappe#39621) fix amount not updated when change rate in material request (backport frappe#39606) (frappe#39614) fix amount not updated when change rate in material request (frappe#39606) * fix amount not updated when change rate in material request * make code consistent (cherry picked from commit efade9b) Co-authored-by: Jeffry Suryadharma <41689493+jeffrysurya@users.noreply.github.com> (cherry picked from commit 2389b41) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…fix/pr-39054 refactor: provision to filter on dimensions in reconciliation tool (backport frappe#39054)
(cherry picked from commit 6f2fae1) # Conflicts: # erpnext/controllers/accounts_controller.py
(cherry picked from commit 8bdc760)
(cherry picked from commit bdca718) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
…fix/pr-39559 fix: prevent Return Invoices(Credit/Debit Note) from using a different account (backport frappe#39559)
* fix: do not picked rejected materials * test: test case for pick list without rejected materials
…rappe#39641) fix: perf issue while submitting stock entry (frappe#39634) (cherry picked from commit b14886b) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
chore: release v14
## [14.61.3](frappe/erpnext@v14.61.2...v14.61.3) (2024-01-30) ### Bug Fixes * Asset Depreciation WDV as per Income Tax Act ([b840eb9](frappe@b840eb9)) * asset module test cases ([f604798](frappe@f604798)) * **Batch:** reload doc after splitting ([c759406](frappe@c759406)) * default enable closing stock balance (backport [frappe#39551](frappe#39551)) ([frappe#39553](frappe#39553)) ([1e32c62](frappe@1e32c62)) * do not auto-populate item delivery date ([1e341f0](frappe@1e341f0)) * do not consider rejected warehouses in pick list ([frappe#39539](frappe#39539)) ([f6725e4](frappe@f6725e4)) * do not delete batches implicitly ([9a5995a](frappe@9a5995a)) * **ecom:** do not create a new contact if a contact already exists ([frappe#39290](frappe#39290)) ([47c591c](frappe@47c591c)) * email list for auto reorder material request ([780c069](frappe@780c069)) * enqueue JV submission when more than 100 accounts ([66be3c5](frappe@66be3c5)) * fetch correct quantity and amount for grouped asset ([1dacb79](frappe@1dacb79)) * incorrect amount in the material request item (backport [frappe#39567](frappe#39567)) ([frappe#39568](frappe#39568)) ([c26f7bb](frappe@c26f7bb)) * linter issue ([941f882](frappe@941f882)) * not able to edit / change address from portal ([e3fdb6f](frappe@e3fdb6f)) * not able to edit address through portal ([b310a55](frappe@b310a55)) * Payment Terms Status for Sales Order report should show all payment terms from order not only this comming from template ([2953959](frappe@2953959)) * perf issue while submitting stock entry (backport [frappe#39634](frappe#39634)) ([frappe#39641](frappe#39641)) ([3ee0555](frappe@3ee0555)) * prevent extra transfer against inter transfer transaction (backport [frappe#39213](frappe#39213)) ([frappe#39595](frappe#39595)) ([bf61030](frappe@bf61030)) * qtn tests using delivery date ([c50988b](frappe@c50988b)) * return doc obj after submit ([0472879](frappe@0472879)) * RM valuation rate in SCR ([frappe#39541](frappe#39541)) ([9fd1692](frappe@9fd1692)) * typo's and parameter changes ([41c074d](frappe@41c074d))
(cherry picked from commit f8ca5c5)
…39689 chore: flag for barcode scanner (backport frappe#39689)
fix: correctly calculate diff amount for included taxes (frappe#39655) (cherry picked from commit 772f540) (cherry picked from commit 350b2cd) Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
## [14.61.4](frappe/erpnext@v14.61.3...v14.61.4) (2024-02-05) ### Bug Fixes * correctly calculate diff amount for included taxes ([frappe#39655](frappe#39655)) ([33ae0fa](frappe@33ae0fa))
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
19 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.