PR1: add support for accounting export and expense creations #72
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
NileshPant1999
had a problem deploying
to
CI Environment
GitHub Actions
Failure
NileshPant1999
had a problem deploying
to
CI Environment
GitHub Actions
Failure
NileshPant1999
had a problem deploying
to
CI Environment
GitHub Actions
Failure
NileshPant1999
temporarily deployed
to
CI Environment
GitHub Actions
Inactive
|
NileshPant1999
changed the title
NileshPant1999
temporarily deployed
to
CI Environment
GitHub Actions
Inactive
|
NileshPant1999
commented
Nov 10, 2023
apps/fyle/models.py
Outdated
| ) | ||
|
|
||
| # Doing this to avoid circular import | ||
| AccountingExport = import_string('apps.accounting_exports.models.AccountingExport') |
There was a problem hiding this comment.
this is to avoid circular import
Shwetabhk
reviewed
Nov 10, 2023
apps/fyle/models.py
Outdated
| AccountingExport = import_string('apps.accounting_exports.models.AccountingExport') | ||
|
|
||
| # Check if an AccountingExport related to the expense object already exists | ||
| if not AccountingExport.objects.filter(expenses__id=expense_object.id).first(): |
There was a problem hiding this comment.
expenses_with_accounting_export = Expense.objects.filter(accountingexport__isnull=False).distinct()Try something like this
Shwetabhk
requested changes
Nov 10, 2023
apps/accounting_exports/models.py
Outdated
| @@ -50,6 +100,56 @@ class AccountingExport(BaseForeignWorkspaceModel): | |||
| class Meta: | |||
| db_table = 'accounting_exports' | |||
|
|
|||
| @staticmethod | |||
| def create_accounting_export_report_id(expense_objects: List[Expense], fund_source: str, workspace_id): | |||
There was a problem hiding this comment.
Suggested change
| def create_accounting_export_report_id(expense_objects: List[Expense], fund_source: str, workspace_id): | |
| def create_accounting_export(expense_objects: List[Expense], fund_source: str, workspace_id): |
apps/accounting_exports/models.py
Outdated
| reimbursable_expense_date = export_setting.reimbursable_expense_date | ||
|
|
||
| if fund_source == 'CCC': | ||
| group_fields = ['report_id', 'claim_number'] if credit_card_expense_grouped_by == 'REPORT' else ['expense_id', 'expense_number'] |
There was a problem hiding this comment.
{
'CCC': {
'REPORT': [..],
'EXPENSE': [..]
}
}
apps/accounting_exports/models.py
Outdated
| if credit_card_expense_date != 'LAST_SPENT_AT': | ||
| group_fields.append(credit_card_expense_date.lower()) | ||
|
|
||
| if fund_source == 'PERSONAL': |
There was a problem hiding this comment.
the group fields are same, you can merge the two condition
|
|
||
| # Extract expense IDs from the provided expenses | ||
| expense_ids = [expense.id for expense in expenses] | ||
|
|
There was a problem hiding this comment.
add something like
group_fields.append(fund_source)
apps/accounting_exports/models.py
Outdated
|
|
||
| # Format date fields according to the specified format | ||
| for key in expense_group: | ||
| if key in ALLOWED_FORM_INPUT['export_date_type']: |
There was a problem hiding this comment.
ALLOWED_FORM_INPUT and all is not required
apps/accounting_exports/models.py
Outdated
| expense_group_fields = ['employee_email', 'fund_source'] | ||
|
|
||
| # Group expenses based on specified fields and fund_source | ||
| expense_groups = _group_expenses(expense_objects, expense_group_fields, export_setting, fund_source) |
There was a problem hiding this comment.
user term accounting_exports everywhere
remove expense_groups completely
apps/accounting_exports/models.py
Outdated
|
|
||
| for expense_group in expense_groups: | ||
| # Determine the date field based on fund_source | ||
| if fund_source == 'PERSONAL': |
There was a problem hiding this comment.
the conditions can be cleaned up using dictionaties
There was a problem hiding this comment.
data = EXPORT_SETTINGS_CONFIG[fund_source]['date_field']
Shwetabhk
reviewed
Nov 10, 2023
apps/accounting_exports/models.py
Outdated
| from apps.fyle.models import Expense | ||
|
|
||
|
|
||
| ALLOWED_FIELDS = [ |
Shwetabhk
approved these changes
Nov 10, 2023
NileshPant1999
temporarily deployed
to
CI Environment
GitHub Actions
Inactive
|
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.
No description provided.