Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# ignores files generated by pydebug
**/__pycache__/
2 changes: 1 addition & 1 deletion accounting_pdf_reports/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
'name': 'Odoo 18 Accounting Financial Reports',
'version': '1.0.2',
'version': '1.0.3',
'category': 'Invoicing Management',
'description': 'Accounting Reports For Odoo 18, Accounting Financial Reports, '
'Odoo 18 Financial Reports',
Expand Down
729 changes: 511 additions & 218 deletions accounting_pdf_reports/i18n/fr.po

Large diffs are not rendered by default.

28 changes: 7 additions & 21 deletions accounting_pdf_reports/report/report_tax.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,39 +15,25 @@ def _get_report_values(self, docids, data=None):
'lines': self.get_lines(data.get('form')),
}

def _sql_from_amls_one(self):
sql = """SELECT "account_move_line".tax_line_id, COALESCE(SUM("account_move_line".debit-"account_move_line".credit), 0)
FROM %s
WHERE %s GROUP BY "account_move_line".tax_line_id"""
return sql

def _sql_from_amls_two(self):
sql = """SELECT r.account_tax_id, COALESCE(SUM("account_move_line".debit-"account_move_line".credit), 0)
def _sql_from_amls(self):
sql = """SELECT "account_move_line".tax_line_id, SUM("account_move_line".credit), SUM("account_move_line".tax_base_amount)
FROM %s
INNER JOIN account_move_line_account_tax_rel r ON ("account_move_line".id = r.account_move_line_id)
INNER JOIN account_tax t ON (r.account_tax_id = t.id)
WHERE %s GROUP BY r.account_tax_id"""
INNER JOIN account_tax t ON ("account_move_line".tax_line_id = t.id)
WHERE %s
GROUP BY "account_move_line".tax_line_id"""
return sql

def _compute_from_amls(self, options, taxes):
#compute the tax amount
sql = self._sql_from_amls_one()
sql = self._sql_from_amls()
tables, where_clause, where_params = self.env['account.move.line']._query_get()
query = sql % (tables, where_clause)
self.env.cr.execute(query, where_params)
results = self.env.cr.fetchall()
for result in results:
if result[0] in taxes:
taxes[result[0]]['tax'] = abs(result[1])

#compute the net amount
sql2 = self._sql_from_amls_two()
query = sql2 % (tables, where_clause)
self.env.cr.execute(query, where_params)
results = self.env.cr.fetchall()
for result in results:
if result[0] in taxes:
taxes[result[0]]['net'] = abs(result[1])
taxes[result[0]]['net'] = abs(result[2])

@api.model
def get_lines(self, options):
Expand Down
2 changes: 1 addition & 1 deletion accounting_pdf_reports/report/report_tax.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<template id="report_tax">
<t t-call="web.html_container">
<t t-set="data_report_margin_top" t-value="12"/>
<t t-set="data_report_header_spacing" t-value="9"/>
<t t-set="data_report_header_spacing" t-value="12"/>
<t t-set="data_report_dpi" t-value="110"/>
<t t-call="web.internal_layout">
<div class="page">
Expand Down
84 changes: 37 additions & 47 deletions om_account_accountant/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 15.0-20220319\n"
"Project-Id-Version: Odoo Server 18.0-20250218\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-06-12 03:13+0000\n"
"PO-Revision-Date: 2022-07-05 23:59+0200\n"
"Last-Translator: Sylvain Lc\n"
"POT-Creation-Date: 2025-03-14 15:02+0000\n"
"PO-Revision-Date: 2025-03-14 15:02+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
"X-Generator: Poedit 3.1\n"

#. module: om_account_accountant
#: model:ir.actions.act_window,name:om_account_accountant.action_account_group_action
Expand All @@ -27,12 +25,7 @@ msgstr "Groupes de comptes"
#: model:ir.actions.act_window,name:om_account_accountant.action_account_account_tag
#: model:ir.ui.menu,name:om_account_accountant.menu_account_tag
msgid "Account Tags"
msgstr "Balises de compte"

#. module: om_account_accountant
#: model:ir.ui.menu,name:om_account_accountant.account_type_menu
msgid "Account Types"
msgstr "Types de compte"
msgstr "Étiquettes de compte"

#. module: om_account_accountant
#: model_terms:ir.ui.view,arch_db:om_account_accountant.res_config_settings_view_form
Expand All @@ -43,7 +36,7 @@ msgstr "Comptabilité"
#. module: om_account_accountant
#: model_terms:ir.ui.view,arch_db:om_account_accountant.res_config_settings_view_form
msgid "Anglo-Saxon Accounting"
msgstr "Comptabilité anglo-saxone"
msgstr "Comptabilité anglo-saxonne"

#. module: om_account_accountant
#: model:ir.ui.menu,name:om_account_accountant.menu_accounting_statement_bank
Expand All @@ -52,44 +45,34 @@ msgstr "Relevés bancaires"

#. module: om_account_accountant
#: model:ir.ui.menu,name:om_account_accountant.menu_accounting_bank_and_cash
#: model:ir.ui.menu,name:om_account_accountant.menu_action_account_moves_journal_bank_cash
msgid "Bank and Cash"
msgstr "Banque et liquidités"
msgstr "Banque et caisse"

#. module: om_account_accountant
#: model:ir.ui.menu,name:om_account_accountant.menu_accounting_statement_cash
msgid "Cash Registers"
msgstr "Caisses"

#. module: om_account_accountant
#: model:ir.ui.menu,name:om_account_accountant.menu_account_coa_template
msgid "Chart of Accounts Templates"
msgstr "Modèles de plans de comptes"

#. module: om_account_accountant
#: model:ir.model,name:om_account_accountant.model_res_config_settings
msgid "Config Settings"
msgstr "Paramètres de Configuration"

#. module: om_account_accountant
#: model:ir.actions.act_window,name:om_account_accountant.action_account_fiscal_position_template
#: model:ir.ui.menu,name:om_account_accountant.menu_account_fiscal_position_template
msgid "Fiscal Position Templates"
msgstr "Modèles de situation financière"
msgstr "Caisses enregistreuses"

#. module: om_account_accountant
#: model_terms:ir.ui.view,arch_db:om_account_accountant.view_account_payment_method_search
msgid "Group By"
msgstr "Grouper par"
msgstr "Regrouper par"

#. module: om_account_accountant
#: model:ir.ui.menu,name:om_account_accountant.menu_finance_entries_accounting_journals
msgid "Journals"
msgstr "Journaux"

#. module: om_account_accountant
#: model:ir.model,name:om_account_accountant.model_account_move
msgid "Journal Entry"
msgstr "Pièce comptable"
#: model:ir.ui.menu,name:om_account_accountant.menu_action_account_moves_journal_misc
msgid "Miscellaneous"
msgstr "Divers"

#. module: om_account_accountant
#: model_terms:ir.ui.view,arch_db:om_account_accountant.view_account_payment_method_search
msgid "Payment Method"
msgstr "Moyen de paiement"
msgstr "Méthode de paiement"

#. module: om_account_accountant
#: model:ir.actions.act_window,name:om_account_accountant.action_account_payment_method
Expand All @@ -105,34 +88,41 @@ msgstr "Méthodes de paiement"
msgid "Payment Type"
msgstr "Type de paiement"

#. module: om_account_accountant
#: model:ir.ui.menu,name:om_account_accountant.menu_action_account_moves_journal_purchase
msgid "Purchases"
msgstr "Achats"

#. module: om_account_accountant
#: model:ir.actions.server,name:om_account_accountant.action_account_reconciliation
msgid "Reconcile"
msgstr "Lettrer"
msgstr "Rapprocher"

#. module: om_account_accountant
#: model_terms:ir.ui.view,arch_db:om_account_accountant.res_config_settings_view_form
msgid ""
"Record the cost of a good as an expense when this good is\n"
" invoiced to a final customer (instead of "
"recording the cost as soon\n"
" invoiced to a final customer (instead of recording the cost as soon\n"
" as the product is received in stock)."
msgstr ""
"Enregistrer le coût d’un bien comme une dépense lorsque ce bien est\n"
" facturé à un client final (au lieu "
"d’enregistrer le coût dès que possible)\n"
" au fur et à mesure que le produit est reçu "
"en stock)."
"Enregistrer le coût d'un bien comme une dépense lorsque ce bien est\n"
" facturé à un client final (au lieu d'enregistrer le coût dès que\n"
" le produit est reçu en stock)."

#. module: om_account_accountant
#: model:ir.model.fields,help:om_account_accountant.field_res_config_settings__anglo_saxon_accounting
msgid ""
"Record the cost of a good as an expense when this good is invoiced to a "
"final customer."
msgstr ""
"Enregistrez le coût dun bien comme une dépense lorsque ce bien est facturé "
"Enregistrer le coût d'un bien comme une dépense lorsque ce bien est facturé "
"à un client final."

#. module: om_account_accountant
#: model:ir.ui.menu,name:om_account_accountant.menu_action_account_moves_journal_sales
msgid "Sales"
msgstr "Ventes"

#. module: om_account_accountant
#: model:ir.ui.menu,name:om_account_accountant.menu_account_templates
msgid "Templates"
Expand All @@ -141,4 +131,4 @@ msgstr "Modèles"
#. module: om_account_accountant
#: model:ir.model.fields,field_description:om_account_accountant.field_res_config_settings__anglo_saxon_accounting
msgid "Use anglo-saxon accounting"
msgstr "Utiliser la comptabilité anglo-saxone"
msgstr "Utiliser la comptabilité anglo-saxonne"
Loading