Skip to content
Extraits de code Groupes Projets
Valider 6030985c rédigé par lee's avatar lee
Parcourir les fichiers

[FIX] legicoop_timsheet :

 -fixed order not updating when using Group By
 -added date_time desc by default
[FIX] legicoop_invoice :
 -fixed totals not showing when using Group By
 -replaced TTC amount with amount HT  in Dashboard Kanban
parent e6bb4370
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * account
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 12.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-11-14 07:33+0000\n"
"PO-Revision-Date: 2018-08-24 09:14+0000\n"
"Last-Translator: Thomas Deleval <thd@odoo.com>, 2021\n"
"Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. module: account
#: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
msgid "Invoices to Validate"
msgstr "Factures à valider (HT)"
...@@ -2,3 +2,4 @@ ...@@ -2,3 +2,4 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from . import account_invoice from . import account_invoice
from . import account_journal_dashboard
# Copyright 2022 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo import models
class AccountJournal(models.Model):
_inherit = "account.journal"
def _get_draft_bills_query(self):
"""
Surcharger pour prendre amount_untaxed_signed (Stored=True) et non
amount_untaxed_invoice_signed (pas Stored).
Ce qui permet d'afficher les sommes lors de la regroupement
"""
return (
"""
SELECT
state,
amount_untaxed_signed AS amount_total,
inv.currency_id AS currency,
inv.type,
inv.date_invoice,
inv.company_id
FROM account_invoice inv
WHERE journal_id = %(journal_id)s AND state = 'draft';""",
{"journal_id": self.id},
)
...@@ -19,5 +19,30 @@ ...@@ -19,5 +19,30 @@
</xpath> </xpath>
</field> </field>
</record> </record>
<record id="legicoop_invoice_tree" model="ir.ui.view">
<field name="name">legicoop.account.invoice.tree</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_tree" />
<field name="arch" type="xml">
<xpath
expr="//field[@name='amount_untaxed_invoice_signed']"
position="attributes"
>
<attribute name="invisible">1</attribute>
</xpath>
<xpath
expr="//field[@name='amount_untaxed_invoice_signed']"
position="before"
>
<field
name="amount_untaxed_signed"
string="Total HT"
sum="Total HT"
/>
</xpath>
</field>
</record>
</data> </data>
</odoo> </odoo>
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter