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.

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

fix: multiple fixes related to remarks for GL Report #42753

Merged
merged 8 commits into from
Sep 9, 2024

Conversation

vorasmit
Copy link
Collaborator

@vorasmit vorasmit commented Aug 13, 2024

Multiple fixes related to Remarks in General Ledger

  • Remarks is optional column disabled by default

Before

image

After

image

  • Show one of Remarks or Supplier Invoice Number to reduce redundancy
  • Create remarks even without date (patchable).
  • Update remarks on Submit. This will ensure that all available information before submit is used to add remarks.

@vorasmit vorasmit marked this pull request as draft August 13, 2024 12:44
@vorasmit vorasmit marked this pull request as ready for review August 20, 2024 07:58
@vorasmit vorasmit changed the title fix: show remarks in report only if it exists fix: multiple fixes related to remarks for GL Report Aug 20, 2024
@ruthra-kumar
Copy link
Member

You'll have to patch Payment Ledger Entry as well.

@vorasmit
Copy link
Collaborator Author

You'll have to patch Payment Ledger Entry as well.

I'll update this.
Where is remarks from Payment Ledger Entry used?

@ruthra-kumar
Copy link
Member

You'll have to patch Payment Ledger Entry as well.

I'll update this. Where is remarks from Payment Ledger Entry used?

Accounts Receivable / Payable reports

Copy link

stale bot commented Sep 8, 2024

This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

@stale stale bot added the inactive label Sep 8, 2024
@stale stale bot removed the inactive label Sep 9, 2024
@vorasmit vorasmit added the squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. label Sep 9, 2024
@vorasmit vorasmit enabled auto-merge (squash) September 9, 2024 01:45
@vorasmit vorasmit merged commit e5a49f7 into frappe:develop Sep 9, 2024
18 checks passed
mergify bot pushed a commit that referenced this pull request Sep 9, 2024
* fix: show remarks in report only if it exists

* fix: additional fixes to reduce redundancy in report print format

* fix: revert changes for supplier invoice reference

* fix: update remarks before submit to ensure all available details before submit are used

* fix: patch to update invoice remarks where it's not set

* fix: update remarks in payment ledger entry

(cherry picked from commit e5a49f7)
vorasmit added a commit that referenced this pull request Sep 9, 2024
…-42753

fix: multiple fixes related to remarks for GL Report (backport #42753)
frappe-pr-bot pushed a commit that referenced this pull request Sep 11, 2024
# [15.35.0](v15.34.2...v15.35.0) (2024-09-11)

### Bug Fixes

* `default_advance_account` field in Process Payment Reconciliation ([75cb298](75cb298))
* bom cost update is not working (backport [#43155](#43155)) ([#43157](#43157)) ([8c8dc24](8c8dc24))
* cancel common party advance jv while canceling the invoice ([9bd3d7a](9bd3d7a))
* Cannot read properties of null (reading 'doc') (backport [#43071](#43071)) ([#43118](#43118)) ([80b5c16](80b5c16))
* check multi-currency on jv for common party accounting with foreign currency ([d17badd](d17badd))
* concurrency issue while picking materials (backport [#43087](#43087)) ([#43152](#43152)) ([cd57e00](cd57e00))
* **Delivery Note:** translatability of validation errors ([ea4f736](ea4f736))
* ensure `SellingController.onload` gets called for SO & DN ([2c1f72e](2c1f72e))
* incorrect actual cost in Procurement Tracker report (backport [#43109](#43109)) ([#43138](#43138)) ([5110975](5110975))
* incorrect qty after transaction in SLE (backport [#43103](#43103)) ([#43105](#43105)) ([8447bf3](8447bf3))
* **minor:** reorder expected value validation ([6fde07d](6fde07d))
* multiple fixes related to remarks for GL Report ([#42753](#42753)) ([f45b1db](f45b1db))
* **Opening Invoice Creation Tool:** translatability of messages ([3fd9df0](3fd9df0))
* pass company from asset to asset capitalization ([9e72a84](9e72a84))
* permission on guest PR creation ([a23e8b1](a23e8b1))
* return type of `get_party_details` (backport [#43131](#43131)) ([#43134](#43134)) ([d2923ba](d2923ba))
* set today in 'On This Date' in Available Batch Report ([03e3374](03e3374))
* uncomment internal parties ([33174b1](33174b1))
* unhide action button after form redirect ([208bd2b](208bd2b))
* unreconcile allocation child table redirect url voucher no issue ([2dddd79](2dddd79))
* validate the item code when updating the other item's price rule ([8f4dc80](8f4dc80))

### Features

* added revaluation surplus and impairment acc in standard charts… ([#43022](#43022)) ([ea86bc2](ea86bc2))
* utility report to identify invalid ledger entries ([5929d50](5929d50))

### Performance Improvements

* timeout error (backport [#43154](#43154)) ([#43158](#43158)) ([c9f49ca](c9f49ca))
@ruthra-kumar
Copy link
Member

Traceback (most recent call last):
  File "apps/frappe/frappe/app.py", line 114, in application
    response = frappe.api.handle(request)
               ^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/api/__init__.py", line 49, in handle
    data = endpoint(**arguments)
           ^^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/api/v1.py", line 36, in handle_rpc_call
    return frappe.handler.handle()
           ^^^^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/handler.py", line 49, in handle
    data = execute_cmd(cmd)
           ^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/handler.py", line 85, in execute_cmd
    return frappe.call(method, **frappe.form_dict)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/__init__.py", line 1775, in call
    return fn(*args, **newargs)
           ^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/utils/typing_validations.py", line 31, in wrapper
    return func(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/desk/form/save.py", line 37, in savedocs
    doc.submit()
  File "apps/frappe/frappe/utils/typing_validations.py", line 31, in wrapper
    return func(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/model/document.py", line 1048, in submit
    return self._submit()
           ^^^^^^^^^^^^^^
  File "apps/frappe/frappe/model/document.py", line 1031, in _submit
    return self.save()
           ^^^^^^^^^^^
  File "apps/frappe/frappe/model/document.py", line 337, in save
    return self._save(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/model/document.py", line 373, in _save
    self.run_before_save_methods()
  File "apps/frappe/frappe/model/document.py", line 1095, in run_before_save_methods
    self.run_method("before_submit")
  File "apps/frappe/frappe/model/document.py", line 962, in run_method
    out = Document.hook(fn)(self, *args, **kwargs)
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/model/document.py", line 1322, in composer
    return composed(self, method, *args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/model/document.py", line 1304, in runner
    add_to_return_value(self, fn(self, *args, **kwargs))
                              ^^^^^^^^^^^^^^^^^^^^^^^^^
  File "apps/frappe/frappe/model/document.py", line 959, in fn
    return method_object(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py", line 425, in before_submit
    self.add_remarks()
  File "apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py", line 954, in add_remarks
    self.remarks += " " + _("dated {0}").format(formatdate(self.po_data))
                                                           ^^^^^^^^^^^^
AttributeError: 'SalesInvoice' object has no attribute 'po_data'

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-15-hotfix squash Meant to tell reviewers that this PR should be squashed into a single commit while merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants