-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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: Accounting for internal transfer invoices within same company #24021
Merged
nabinhait
merged 10 commits into
frappe:develop
from
deepeshgarg007:interware_transfer_accounting
Dec 11, 2020
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
26a93ce
fix: Accounting for internal transfer invoices within same company
deepeshgarg007 b671777
fix: warehouse fetching
deepeshgarg007 8a6e280
fix: Linting issues
deepeshgarg007 a385a4c
fix: GL entry fixes and validation for intercompany account
deepeshgarg007 f4596ca
fix: Account naming changes and other fixes
deepeshgarg007 8ee4dbd
fix: Add test for internal transfer
deepeshgarg007 29fb1d0
fix: Test Case
deepeshgarg007 4905125
fix: Add description for fields
deepeshgarg007 b3f0539
fix: Commonfied code
deepeshgarg007 677328a
fix: Map warehouse and serial no
deepeshgarg007 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
{ | ||
"actions": [], | ||
"allow_auto_repeat": 1, | ||
"allow_import": 1, | ||
"autoname": "naming_series:", | ||
"creation": "2013-05-21 16:16:39", | ||
|
@@ -127,6 +126,7 @@ | |
"write_off_cost_center", | ||
"advances_section", | ||
"allocate_advances_automatically", | ||
"adjust_advance_taxes", | ||
"get_advances", | ||
"advances", | ||
"payment_schedule_section", | ||
|
@@ -152,9 +152,11 @@ | |
"is_opening", | ||
"against_expense_account", | ||
"column_break_63", | ||
"unrealized_profit_loss_account", | ||
"status", | ||
"inter_company_invoice_reference", | ||
"is_internal_supplier", | ||
"represents_company", | ||
"remarks", | ||
"subscription_section", | ||
"from_date", | ||
|
@@ -1223,7 +1225,7 @@ | |
"fieldtype": "Select", | ||
"in_standard_filter": 1, | ||
"label": "Status", | ||
"options": "\nDraft\nReturn\nDebit Note Issued\nSubmitted\nPaid\nUnpaid\nOverdue\nCancelled", | ||
"options": "\nDraft\nReturn\nDebit Note Issued\nSubmitted\nPaid\nUnpaid\nOverdue\nCancelled\nInternal Transfer", | ||
"print_hide": 1 | ||
}, | ||
{ | ||
|
@@ -1330,13 +1332,37 @@ | |
"fieldtype": "Link", | ||
"label": "Project", | ||
"options": "Project" | ||
}, | ||
{ | ||
"default": "0", | ||
"description": "Taxes paid while advance payment will be adjusted against this invoice", | ||
"fieldname": "adjust_advance_taxes", | ||
"fieldtype": "Check", | ||
"label": "Adjust Advance Taxes" | ||
}, | ||
{ | ||
"depends_on": "eval:doc.is_internal_supplier", | ||
"description": "Unrealized Profit / Loss account for intra-company transfers", | ||
"fieldname": "unrealized_profit_loss_account", | ||
"fieldtype": "Link", | ||
"label": "Unrealized Profit / Loss Account", | ||
"options": "Account" | ||
}, | ||
{ | ||
"depends_on": "eval:doc.is_internal_supplier", | ||
"description": "Company which internal supplier represents", | ||
"fetch_from": "supplier.represents_company", | ||
"fieldname": "represents_company", | ||
"fieldtype": "Link", | ||
"label": "Represents Company", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add description |
||
"options": "Company" | ||
} | ||
], | ||
"icon": "fa fa-file-text", | ||
"idx": 204, | ||
"is_submittable": 1, | ||
"links": [], | ||
"modified": "2020-10-30 13:57:18.266978", | ||
"modified": "2020-12-11 12:46:12.796378", | ||
"modified_by": "Administrator", | ||
"module": "Accounts", | ||
"name": "Purchase Invoice", | ||
|
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add description