feat: Sales/Purchase Details Report (additional fields and filters) - #17740
Closed
SaiFi0102 wants to merge 63 commits into
Closed
feat: Sales/Purchase Details Report (additional fields and filters)#17740SaiFi0102 wants to merge 63 commits into
SaiFi0102 wants to merge 63 commits into
Conversation
-Several visual and client-side calculation bug fixes
…ax-Exclusive-PL-Rate # Conflicts: # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/buying/doctype/purchase_order_item/purchase_order_item.json # erpnext/buying/doctype/supplier_quotation/supplier_quotation.json # erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/sales_order/sales_order.json # erpnext/selling/doctype/sales_order_item/sales_order_item.json # erpnext/stock/doctype/delivery_note/delivery_note.json # erpnext/stock/doctype/delivery_note_item/delivery_note_item.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
…ax-Exclusive-PL-Rate
…Tax-Exclusive-PL-Rate-V12 # Conflicts: # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/buying/doctype/purchase_order_item/purchase_order_item.json # erpnext/buying/doctype/supplier_quotation/supplier_quotation.json # erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/sales_order/sales_order.json # erpnext/selling/doctype/sales_order_item/sales_order_item.json # erpnext/stock/doctype/delivery_note/delivery_note.json # erpnext/stock/doctype/delivery_note_item/delivery_note_item.json # erpnext/stock/doctype/purchase_receipt/purchase_receipt.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
and made it the grid view total column
…SaiFi0102/erpnext.git into Tax-Exclusive-PL-Rate-V12 # Conflicts: # erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json # erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
…SaiFi0102/erpnext.git into Tax-Exclusive-PL-Rate-V12
for Taxes and Charges total_before_discount_amount field
…SaiFi0102/erpnext.git into Tax-Exclusive-PL-Rate-V12
…ax-Exclusive-PL-Rate # Conflicts: # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json # erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json # erpnext/selling/doctype/sales_order_item/sales_order_item.json # erpnext/stock/doctype/delivery_note_item/delivery_note_item.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
…Tax-Exclusive-PL-Rate-V12 # Conflicts: # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json # erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json # erpnext/patches.txt # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/selling/doctype/sales_order_item/sales_order_item.json # erpnext/stock/doctype/delivery_note_item/delivery_note_item.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
…-Purchase-Details-Report
which field should be shown
…-Purchase-Details-Report
…/saifi0102@github.com/SaiFi0102/erpnext.git into Tax-Exclusive-Sales-Purchase-Details-Report-V12
…/saifi0102@github.com/SaiFi0102/erpnext.git into Tax-Exclusive-Sales-Purchase-Details-Report-V12
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within a week 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. |
Member
|
Hi can you re-push by resolving the conflicts |
|
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within a week 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. |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 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.
Requires frappe/frappe#7455 and frappe/datatable#66 for grouping feature
Includes #16656
Extension of #17739
You can choose the columns you need
(this is feature is included the other PR #17740 that has prerequisites)