Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: column formatting in Bank Reconciliation Tool #35540

Merged
merged 4 commits into from
Jun 7, 2023
Merged

fix: column formatting in Bank Reconciliation Tool #35540

merged 4 commits into from
Jun 7, 2023

Conversation

barredterra
Copy link
Collaborator

@barredterra barredterra commented Jun 2, 2023 •
edited
Loading

  • format "Date" column
  • format "Party" column as (dynamic) link
  • fix closing tag and quoting in "Actions" button

Bildschirmfoto 2023-06-02 um 16 15 38

@barredterra barredterra changed the title bank reco row formatting fix: row formatting in Bank Reconciliation Tool Jun 2, 2023
@barredterra barredterra changed the title fix: row formatting in Bank Reconciliation Tool fix: column formatting in Bank Reconciliation Tool Jun 2, 2023
marination
marination reviewed Jun 5, 2023
View reviewed changes
Copy link
Collaborator

@marination marination left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Translate the 'Get Unreconciled Entries' text in change_custom_button_type. There is no primary action when the system is in german

@barredterra
Copy link
Collaborator Author

@marination that seems to be unrelated to this PR, but I fixed it here: #35564

@deepeshgarg007 deepeshgarg007 merged commit e9d7b9f into frappe:develop Jun 7, 2023
@batonac batonac mentioned this pull request Aug 4, 2023
Merged
batonac added a commit to batonac/erpnext that referenced this pull request Aug 4, 2023
@batonac
fix: format_row broke Document Name link validation
3dad871 
frappe#35540 broke Voucher Matching, leading to an invalid link exception on submission. This is because the format_row() function overwrites the row data instead of just providing a formatter on the DataTable column, and therefore passes through the formatted (linked) column data instead of the Document Name only.

This patch moves the appropriate frappe.form.formatters.Link function to a dedicated format hook on the DataTable columns definition, both fixing the error and retaining the functionality of frappe#35540.
deepeshgarg007 pushed a commit that referenced this pull request Aug 14, 2023
@batonac
fix: Document Name link validation in Bank Reconciliation Tool (#36495)
7ab55b1 
fix: format_row broke Document Name link validation

#35540 broke Voucher Matching, leading to an invalid link exception on submission. This is because the format_row() function overwrites the row data instead of just providing a formatter on the DataTable column, and therefore passes through the formatted (linked) column data instead of the Document Name only.

This patch moves the appropriate frappe.form.formatters.Link function to a dedicated format hook on the DataTable columns definition, both fixing the error and retaining the functionality of #35540.
mergify bot pushed a commit that referenced this pull request Aug 14, 2023
@batonac @mergify
fix: Document Name link validation in Bank Reconciliation Tool (#36495)
83cbc1b 
fix: format_row broke Document Name link validation

#35540 broke Voucher Matching, leading to an invalid link exception on submission. This is because the format_row() function overwrites the row data instead of just providing a formatter on the DataTable column, and therefore passes through the formatted (linked) column data instead of the Document Name only.

This patch moves the appropriate frappe.form.formatters.Link function to a dedicated format hook on the DataTable columns definition, both fixing the error and retaining the functionality of #35540.

(cherry picked from commit 7ab55b1)

# Conflicts:
#	erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
frappe-pr-bot pushed a commit that referenced this pull request Aug 23, 2023
@frappe-bot
chore(release): Bumped to Version 14.36.0
d1b2ce3 
# [14.36.0](v14.35.2...v14.36.0) (2023-08-23)

### Bug Fixes

* Accounts Payable Currency bug ([94612b9](94612b9))
* Add company filters for account ([e62ffa9](e62ffa9))
* add missing items labels back ([#36737](#36737)) ([3634e80](3634e80))
* broken advance field in Accounts Receivable summary rpt ([296a4d7](296a4d7))
* broken consolidated report due to finance book filter ([5bd2a09](5bd2a09))
* check tax and charges if it is passed ([1f76c69](1f76c69))
* clear dimension defaults after test ([2a467a9](2a467a9))
* dict value for dimension for gl entries defined without the dimension ([11ba553](11ba553))
* dimension name in remark ([01ae513](01ae513))
* divide offsetting amount for multiple dimensions ([1269f2d](1269f2d))
* divide offsetting amount only when account exists ([2c8c3a0](2c8c3a0))
* Document Name link validation in Bank Reconciliation Tool ([#36495](#36495)) ([83cbc1b](83cbc1b)), closes [#35540](#35540) [#35540](#35540)
* don't throw if item does not have default BOM (backport [#36709](#36709)) ([#36734](#36734)) ([e1bd9a7](e1bd9a7))
* duplicate acc dimension in test ([cdb66bf](cdb66bf))
* fetch acc dimensions correctly when fieldname is different from name ([7ac35b4](7ac35b4))
* fetch accounting dimension details specific to company ([c1f1a21](c1f1a21))
* include gain/loss journal in AR/AP reports ([4606079](4606079))
* incorrect gl balance on multi company setup ([cb9aad3](cb9aad3))
* incorrect schedule in asset value adjustment ([#36725](#36725)) ([a0575ed](a0575ed))
* make offsetting entry for acc dimensions ([3198f26](3198f26))
* make offsetting entry for all doctypes ([f578c32](f578c32))
* mode of payment fetched from pos profile company in POS ([c74a414](c74a414))
* not able to make stock entry ([#36759](#36759)) ([873ee38](873ee38))
* Procurement Tracker report not showing material request items ([#36768](#36768)) ([6a9935c](6a9935c))
* reset dimension defaults when company changedin test ([37ef6e9](37ef6e9))
* **RFQ:** make "update password" and "submit quotation" buttons the same size (backport [#36667](#36667)) ([#36686](#36686)) ([36147ec](36147ec))
* timeout error coming during reposting ([#36715](#36715)) ([620b21f](620b21f))
* **ux:** change batch selection message to alert (backport [#36500](#36500)) ([#36697](#36697)) ([0a4947a](0a4947a))
* **UX:** Ignore prepared report ([3e23e1f](3e23e1f))

### Features

* **RFQ:** make email message fully configurable (backport [#36353](#36353)) ([#36531](#36531)) ([c308bd5](c308bd5))
* Tick on checkbox to include draft timesheets (backport [#36577](#36577)) ([#36640](#36640)) ([9668615](9668615))
* utility to repost accounting ledgers without cancellation ([#36469](#36469)) ([f8d6fe6](f8d6fe6))

### Performance Improvements

* pull latest details only for referenced vouchers ([47345e8](47345e8))
@barredterra barredterra deleted the bank-reco-row-formatting branch August 23, 2023 08:55
@ankush ankush mentioned this pull request Oct 20, 2023
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@marination marination marination approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@barredterra @marination @deepeshgarg007