diff --git a/__init__.py b/__init__.py
index 9f33685f7a64fe619233a7b80ccf411f56a4648e..0f7b147d0888b381094eb445375b2dd7b0064798 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,3 @@
# License GPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-from . import models
from . import wizard
diff --git a/__manifest__.py b/__manifest__.py
index 6aa6c876c5173e9507b0b527354e83a1a817f8b3..d1dd849a0ec3df78a54b669650967269eb64d4c0 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -3,13 +3,12 @@
'summary': '''
Export des journaux pour import outil comptable pour les frais
''',
- 'description': '''
- Export des journaux pour import dans outils comptable pour les frais
- ''',
'author': 'LE FILAMENT',
'version': '12.0.1.0.0',
'license': "GPL-3",
- 'depends': ['lefilament_export_journal', 'hr_expense'],
+ 'depends': [
+ 'lefilament_export_journal',
+ 'hr_expense'],
'qweb': [],
'auto_install': True,
'data': [
diff --git a/models/__init__.py b/models/__init__.py
deleted file mode 100644
index 03c8d8c0b7ec4fdde72b4b1b94b58d61a692dfa9..0000000000000000000000000000000000000000
--- a/models/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# License GPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-
-from . import hr_expense
diff --git a/models/hr_expense.py b/models/hr_expense.py
deleted file mode 100644
index d5e3dbd78ca85bfe696cbc9ce1c670bcb8172f56..0000000000000000000000000000000000000000
--- a/models/hr_expense.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 2004-2015 Odoo S.A. for original function
-# (under LGPL license orginally)
-# Copyright 2019 Le Filament (<http://www.le-filament.com>)
-# License GPL-3 or later (http://www.gnu.org/licenses/gpl.html).
-
-from odoo import api, models, _
-from odoo.exceptions import UserError
-
-
-class LeFilamentHrExpense(models.Model):
- _name = 'hr.expense'
- _inherit = 'hr.expense'
-
- # Modifie la fonction action_move_create de hr_expense
- # Ajoute la référence de la note de frais dans le champ
- # 'narration' de account_move
- # Modifie la variable 'aml' pour lui donner le format suivant :
- # ligne de frais - Prénom NOM
-
- @api.multi
- def action_move_create(self):
- '''
- main function that is called when trying to create the accounting
- entries related to an expense
- '''
- for expense in self:
- journal = (expense.sheet_id.bank_journal_id
- if expense.payment_mode == 'company_account'
- else expense.sheet_id.journal_id)
- # create the move that will contain the accounting entries
- acc_date = expense.sheet_id.accounting_date or expense.date
- move = self.env['account.move'].create({
- 'journal_id': journal.id,
- 'company_id': self.env.user.company_id.id,
- 'date': acc_date,
- 'ref': expense.sheet_id.name,
- 'narration': expense.reference,
- # force the name to the default value, to avoid an eventual
- # 'default_name' in the context to set it to '' which cause
- # no number to be given to the account.move when posted.
- 'name': '/',
- })
- company_currency = expense.company_id.currency_id
- diff_currency_p = expense.currency_id != company_currency
- # one account.move.line per expense (+taxes..)
- move_lines = expense._move_line_get()
-
- # create one more move line, a counterline for the total on
- # payable account
- payment_id = False
- total, total_currency, move_lines = (
- expense._compute_expense_totals(
- company_currency, move_lines, acc_date))
- if expense.payment_mode == 'company_account':
- journal = expense.sheet_id.bank_journal_id
- if not journal.default_credit_account_id:
- raise UserError(
- _("No credit account found for the %s journal, \
- please configure one.")
- % (journal.name))
- emp_account = journal.default_credit_account_id.id
- # create payment
- payment_methods = (
- journal.outbound_payment_method_ids if total < 0
- else journal.inbound_payment_method_ids)
- journal_currency = (journal.currency_id
- or journal.company_id.currency_id)
- payment = self.env['account.payment'].create({
- 'payment_method_id': (payment_methods[0].id
- if payment_methods else False),
- 'payment_type': total < 0 and 'outbound' or 'inbound',
- 'partner_id': (expense.employee_id.address_home_id
- .commercial_partner_id.id),
- 'partner_type': 'supplier',
- 'journal_id': journal.id,
- 'payment_date': expense.date,
- 'state': 'reconciled',
- 'currency_id': (expense.currency_id.id if diff_currency_p
- else journal_currency.id),
- 'amount': (abs(total_currency) if diff_currency_p
- else abs(total)),
- 'name': expense.name,
- })
- payment_id = payment.id
- else:
- if not expense.employee_id.address_home_id:
- raise UserError(
- _("No Home Address found for the employee %s, \
- please configure one.") % (expense.employee_id.name))
- emp_account = expense.employee_id.address_home_id\
- .property_account_payable_id.id
-
- aml_name = (expense.name.split('\n')[0][:64]
- + ' - ' + expense.employee_id.name)
- move_lines.append({
- 'type': 'dest',
- 'name': aml_name,
- 'price': total,
- 'account_id': emp_account,
- 'date_maturity': acc_date,
- 'amount_currency': (total_currency if diff_currency_p
- else False),
- 'currency_id': (expense.currency_id.id if diff_currency_p
- else False),
- 'payment_id': payment_id,
- })
-
- # convert eml into an osv-valid format
- lines = [(0, 0, expense._prepare_move_line(x)) for x in move_lines]
- move.with_context(
- dont_create_taxes=True).write({'line_ids': lines})
- expense.sheet_id.write({'account_move_id': move.id})
- move.post()
- if expense.payment_mode == 'company_account':
- expense.sheet_id.paid_expense_sheets()
- return True
diff --git a/wizard/datas_export.py b/wizard/datas_export.py
index cab598dd3f769101cdf52558441115fa27a6ce16..710d68f7bd5fb4acb5b65397aa52e9293387639d 100644
--- a/wizard/datas_export.py
+++ b/wizard/datas_export.py
@@ -18,27 +18,26 @@ class HRDatasExportWizard(models.TransientModel):
class HRDatasExport(AccountDatasExport):
def datas_export_frais(self, format, date_start, date_end,
nom_outil_compta):
- request.cr.execute("""
- SELECT l.date,
- 'NDF' AS journal,
- a.code AS compte,
- '' AS auxiliaire,
- l.debit,
- l.credit,
- (CASE WHEN l.user_type_id = 2
- THEN a.name
- ELSE CONCAT(m.ref,' - ', l.name) END) AS libelle,
- m.name AS piece,
- '' AS echeance,
- m.narration AS ref_piece
- FROM account_move_line AS l
- LEFT JOIN account_account AS a ON l.account_id = a.id
- LEFT JOIN account_journal AS j ON l.journal_id = j.id
- LEFT JOIN account_move AS m ON m.id = l.move_id
- WHERE j.code = 'NDF' AND l.date >= %s AND l.date <= %s
- ORDER BY l.date, l.move_id, a.code DESC;
- """, (date_start, date_end))
- lignes_export = request.cr.dictfetchall()
+
+ move_lines = request.env['account.move.line'].search([
+ ('date', '>=', date_start),
+ ('date', '<=', date_end),
+ ('journal_id.code', '=', 'NDF')])
+
+ lignes_export = []
+ for line in move_lines:
+ lignes_export.append({
+ 'echeance': '',
+ 'ref_piece': line.expense_id.reference,
+ 'date': line.date,
+ 'credit': line.credit,
+ 'journal': 'NDF',
+ 'compte': line.account_id.code,
+ 'piece': line.move_id.name,
+ 'libelle': line.name,
+ 'debit': line.debit,
+ 'auxiliaire': ''
+ })
if nom_outil_compta == 'ibiza':
header = HEADER_DEFAULT