fix: Accounting for internal transfer invoices within same company #24021
Conversation
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
nabinhait
requested changes
Dec 11, 2020
Comment on lines
574
to
600
| def set_inter_company_account(self): | ||
| """ | ||
| Set intercompany account for inter warehouse transactions | ||
| This account will be used in case billing company and internal customer's | ||
| representation company is same | ||
| """ | ||
|
|
||
| if self.is_internal_transfer() and not self.unrealized_profit_loss_account: | ||
| unrealized_profit_loss_account = frappe.db.get_value('Company', self.company, 'unrealized_profit_loss_account') | ||
|
|
||
| if not unrealized_profit_loss_account: | ||
| msg = _("Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}").format( | ||
| frappe.bold(self.company)) | ||
| frappe.throw(msg) | ||
|
|
||
| self.unrealized_profit_loss_account = unrealized_profit_loss_account | ||
|
|
||
| def is_internal_transfer(self): | ||
| """ | ||
| It will an internal transfer if its an internal customer and representation | ||
| company is same as billing company | ||
| """ | ||
| if self.is_internal_customer and (self.represents_company == self.company): | ||
| return True | ||
|
|
||
| return False | ||
|
|
There was a problem hiding this comment.
This is repetitive, the same as PI. Move those functions to accounts_controller.py?
| # expense account | ||
| # expense account/ target_warehouse / source_warehouse | ||
| if item_row.get('target_warehouse'): | ||
| warehouse = item_row.get('target_warehouse') |
There was a problem hiding this comment.
against value in line 97 should also be based on this.
| "depends_on": "eval:doc.is_internal_supplier", | ||
| "fieldname": "unrealized_profit_loss_account", | ||
| "fieldtype": "Link", | ||
| "label": "Unrealized Profit / Loss Account", |
| "fetch_from": "supplier.represents_company", | ||
| "fieldname": "represents_company", | ||
| "fieldtype": "Link", | ||
| "label": "Represents Company", |
nabinhait
approved these changes
Dec 11, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Expected GL Entries for stock transfers:
Sales:
Purchase:
Default Inter - company account can be set for company incase no inter company account is selected in Company:
Inter - company account in transaction:
Sales Transaction GL Entries:
Purchase GL Entries:
