Skip to content

[16.0][IMP] account_move_csv_import: support 'date_maturity' field in CSV, ODS, XLS, and XLSX #31

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.

Sign up for GitHub

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

Open
kaynnan wants to merge 1 commit into
base: 16.0
Choose a base branch
from
+25 −1
Open

[16.0][IMP] account_move_csv_import: support 'date_maturity' field in CSV, ODS, XLS, and XLSX #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion account_move_csv_import/wizard/account_move_import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ class AccountMoveImport(models.TransientModel):
file_with_header = fields.Boolean(
string='Has Header Line',
help="Indicate if the first line is a header line and should be ignored.")
use_date_maturity = fields.Boolean(
string='Use Date Maturity',
help='If enabled, the import will use the date maturity field from the file.')

@api.depends('file_format')
def _compute_force_required(self):
Expand Down Expand Up @@ -366,7 +369,7 @@ def genericcsv2pivot(self, fileobj):
fieldnames = [
'date', 'journal', 'account', 'partner',
'analytic', 'name', 'debit', 'credit',
'ref', 'reconcile_ref', 'move_name',
'ref', 'reconcile_ref', 'move_name', 'date_maturity',
]
# I use utf-8-sig instead of utf-8 to transparently handle BOM
# https://en.wikipedia.org/wiki/Byte_order_mark
Expand Down Expand Up @@ -402,6 +405,7 @@ def genericcsv2pivot(self, fileobj):
'ref': l.get('ref', ''),
'reconcile_ref': l.get('reconcile_ref', ''),
'move_name': l.get('move_name', ''),
'date_maturity': l.get('date_maturity', ''),
'line': i,
}
if l['analytic']:
Expand Down Expand Up @@ -448,6 +452,7 @@ def genericxlsx2pivot(self, fileobj):
'ref': len(row) > 8 and row[8].value or '',
'reconcile_ref': len(row) > 9 and row[9].value or '',
'move_name': len(row) > 10 and row[10].value or '',
'date_maturity': len(row) > 11 and row[11].value or False,
'line': i,
}
res.append(vals)
Expand Down Expand Up @@ -484,6 +489,7 @@ def genericxls2pivot(self, fileobj):
'credit': row[7].value,
'ref': len(row) > 8 and row[8].value or '',
'reconcile_ref': len(row) > 9 and row[9].value or '',
'date_maturity': len(row) > 11 and row[11].value and datetime(*xlrd.xldate_as_tuple(row[11].value, wb.datemode)) or False,
'line': i,
}
res.append(vals)
Expand All @@ -509,6 +515,7 @@ def genericods2pivot(self, fileobj):
('credit', rows.fields.FloatField),
('ref', rows.fields.TextField),
('reconcile_ref', rows.fields.TextField),
('date_maturity', rows.fields.DateField),
])

sh = rows.import_from_ods(fileobj.name, fields=fields_ods, skip_header=False)
Expand All @@ -531,6 +538,7 @@ def genericods2pivot(self, fileobj):
'credit': row.credit,
'ref': row.ref,
'reconcile_ref': row.reconcile_ref,
'date_maturity': getattr(row, 'date_maturity', False),
'line': i,
}
res.append(vals)
Expand Down Expand Up @@ -904,6 +912,19 @@ def _prepare_move_line(self, pivot_line, sequence):
'import_reconcile': pivot_line.get('reconcile_ref'),
'import_external_id': '%s-%s' % (sequence, pivot_line.get('line')),
}

if self.use_date_maturity and pivot_line.get('date_maturity'):
try:
if isinstance(pivot_line['date_maturity'], str):
vals['date_maturity'] = datetime.strptime(
pivot_line['date_maturity'], self.date_format)
else:
vals['date_maturity'] = pivot_line['date_maturity']
except Exception:
logger.warning(
"Could not parse date maturity '%s' for line %s",
pivot_line['date_maturity'], pivot_line.get('line'))

return vals

def reconcile_move_lines(self, moves):
Expand Down
3 changes: 3 additions & 0 deletions account_move_csv_import/wizard/account_move_import_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<field name="filename" invisible="1"/>
<field name="file_format" />
<field name="post_move" />
<field name="use_date_maturity"/>
<field name="file_encoding" attrs="{'invisible': [('file_format', 'not in', ('fec_txt', 'quadra', 'genericcsv'))], 'required': [('file_format', 'in', ('fec_txt', 'quadra', 'genericcsv'))]}"/>
<field name="delimiter" attrs="{'invisible': [('file_format', '!=', 'genericcsv')], 'required': [('file_format', '=', 'genericcsv')]}"/>
<!-- In v16, I also need to have a company_id field without group, to make the domain on force_journal_id work -->
Expand Down Expand Up @@ -63,6 +64,7 @@
<li>Ref (used as Journal Entry Ref)</li>
<li>Reconcile ref (used for reconciliation after import)</li>
<li>Journal entry number</li>
<li>Due Date (DD/MM/YYYY or configurable, optional)</li>
</ol></li>
</ul>
</div>
Expand All @@ -80,6 +82,7 @@
I. Ref (used as Journal Entry Ref)<br/>
J. Reconcile Ref (used for reconciliation after import)<br/>
K. Journal Entry Number<br/>
L. Due Date (must be a date field in the spreadsheet, optional)<br/>
</p>
</div>

Expand Down