Compare commits
128 Commits
14-adapt-u
...
16.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
864340850f | ||
|
|
1b80dd5957 | ||
|
|
6897acd3df | ||
|
|
74b2917875 | ||
|
|
93ca6631e0 | ||
|
|
b73a34e3d7 | ||
|
|
ce3f10b8ca | ||
|
|
8f4f4dafdf | ||
|
|
7033f8650f | ||
|
|
a9a205a08f | ||
|
|
1843e19e5f | ||
|
|
c18791fb60 | ||
|
|
cf694a5f85 | ||
|
|
e25785baf4 | ||
|
|
7b0b738510 | ||
|
|
9769393759 | ||
|
|
dc00366d80 | ||
|
|
ffb031de12 | ||
|
|
f600057b1b | ||
|
|
13756ec6c3 | ||
|
|
69baec2c43 | ||
|
|
e864e383ec | ||
|
|
dbd79c0ed0 | ||
|
|
934d1b8b02 | ||
|
|
e4504fae0e | ||
|
|
e05102d807 | ||
|
|
6567d6ad29 | ||
|
|
0c97c7e1b2 | ||
|
|
c82efba0af | ||
|
|
47b029c2d2 | ||
|
|
70647387d1 | ||
|
|
03d3f30df6 | ||
|
|
bd58dcf351 | ||
|
|
dd915b906b | ||
|
|
8cc20fa84f | ||
|
|
1b469946c0 | ||
|
|
89b27a4cab | ||
|
|
b9230b2cf5 | ||
|
|
af01ae8ff3 | ||
|
|
cb632c1fc5 | ||
|
|
f6071b8324 | ||
|
|
5a9bdcfd84 | ||
|
|
4503d3f89d | ||
|
|
287a2ab0fd | ||
|
|
90fc4c3562 | ||
|
|
61a2205539 | ||
|
|
195a0203ab | ||
|
|
26abf1c8d6 | ||
|
|
66f617e797 | ||
|
|
0aa31956e0 | ||
|
|
ebd6003f08 | ||
|
|
8200eb2dea | ||
|
|
e35ce49ee2 | ||
|
|
9f4392b6bd | ||
|
|
d84b4bc8ac | ||
|
|
2ca1279cb5 | ||
|
|
699ebd5893 | ||
|
|
d973ca6740 | ||
|
|
e009106e12 | ||
|
|
9ff6e15b45 | ||
|
|
33da5cd370 | ||
|
|
a7b8401cd7 | ||
|
|
96b4c9b094 | ||
|
|
2f6491be4a | ||
|
|
e8caa77d88 | ||
|
|
95b92d4027 | ||
|
|
bec65a009f | ||
|
|
3757b12f39 | ||
|
|
9913924202 | ||
|
|
cc29d1d29f | ||
|
|
7b55172537 | ||
|
|
5f227f9b72 | ||
|
|
c6fb47c1e2 | ||
|
|
c0edd6fa57 | ||
|
|
9ea7a79d21 | ||
|
|
d9b43df0f1 | ||
|
|
ba7406290b | ||
|
|
5af6c895d0 | ||
|
|
7bdd579b1c | ||
|
|
c9f0569516 | ||
|
|
c37b607f97 | ||
|
|
5f4929f819 | ||
|
|
59c7084159 | ||
|
|
a2952ca6b2 | ||
|
|
f5b8f1674a | ||
|
|
e22badc605 | ||
|
|
f93f17b27b | ||
|
|
74586cff13 | ||
|
|
48c0e02e94 | ||
|
|
a035748c2d | ||
|
|
594c3fb0ed | ||
|
|
02c082f966 | ||
|
|
97cf376e90 | ||
|
|
c3f007e716 | ||
|
|
a333bc4e84 | ||
|
|
9e5670934e | ||
|
|
c74a647945 | ||
|
|
fca7209056 | ||
|
|
6d9b4c92eb | ||
|
|
68327c28b6 | ||
|
|
592e40637a | ||
|
|
b6624f2491 | ||
|
|
3a11c99ccb | ||
|
|
36f277940c | ||
|
|
c09e3a1108 | ||
|
|
3b5b64349b | ||
|
|
efddeb3a3c | ||
|
|
c126a286c4 | ||
|
|
670ba212d9 | ||
|
|
c26ed6cdfb | ||
|
|
dd0841385f | ||
|
|
b91abe54a5 | ||
|
|
210af49098 | ||
|
|
19158d9309 | ||
|
|
4577524f0e | ||
|
|
8fd0cb5601 | ||
|
|
8d584871d6 | ||
|
|
a7fd6a1361 | ||
|
|
2b2293593c | ||
|
|
f1614afda2 | ||
|
|
227a7ec18d | ||
|
|
827557689f | ||
|
|
67ff087f6e | ||
|
|
9507be2943 | ||
|
|
740d167331 | ||
|
|
d07e38e1f3 | ||
|
|
55b84a170e | ||
|
|
252da11a30 |
@@ -1,2 +1 @@
|
||||
from . import account_invoice
|
||||
from . import account_invoice_report
|
||||
from . import models
|
||||
|
||||
@@ -1,24 +1,26 @@
|
||||
# Copyright 2015-2019 Akretion France (http://www.akretion.com)
|
||||
# Copyright 2015-2025 Akretion France (https://www.akretion.com)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
{
|
||||
'name': 'Account Invoice Margin',
|
||||
'version': '12.0.1.0.0',
|
||||
'version': '16.0.1.0.0',
|
||||
'category': 'Invoicing Management',
|
||||
'license': 'AGPL-3',
|
||||
'summary': 'Copy standard price on invoice line and compute margins',
|
||||
'description': """
|
||||
This module copies the field *standard_price* of the product on the invoice line when the invoice line is created. The allows the computation of the margin of the invoice.
|
||||
|
||||
A new measure *Margin* is available in the Invoice Analysis.
|
||||
|
||||
This module has been written by Alexis de Lattre from Akretion
|
||||
<alexis.delattre@akretion.com>.
|
||||
""",
|
||||
'author': 'Akretion',
|
||||
'website': 'http://www.akretion.com',
|
||||
'website': 'https://github.com/akretion/odoo-usability',
|
||||
'depends': ['account'],
|
||||
'data': [
|
||||
'account_invoice_view.xml',
|
||||
'views/account_move.xml',
|
||||
],
|
||||
'installable': False,
|
||||
'installable': True,
|
||||
}
|
||||
|
||||
@@ -1,152 +0,0 @@
|
||||
# Copyright 2015-2019 Akretion France (http://www.akretion.com)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import api, fields, models
|
||||
import odoo.addons.decimal_precision as dp
|
||||
|
||||
|
||||
class AccountInvoiceLine(models.Model):
|
||||
_inherit = 'account.invoice.line'
|
||||
|
||||
standard_price_company_currency = fields.Float(
|
||||
string='Cost Price in Company Currency', readonly=True,
|
||||
digits=dp.get_precision('Product Price'),
|
||||
help="Cost price in company currency in the unit of measure "
|
||||
"of the invoice line (which may be different from the unit "
|
||||
"of measure of the product).")
|
||||
standard_price_invoice_currency = fields.Float(
|
||||
string='Cost Price in Invoice Currency', readonly=True,
|
||||
compute='_compute_margin', store=True,
|
||||
digits=dp.get_precision('Product Price'),
|
||||
help="Cost price in invoice currency in the unit of measure "
|
||||
"of the invoice line")
|
||||
margin_invoice_currency = fields.Monetary(
|
||||
string='Margin in Invoice Currency', readonly=True, store=True,
|
||||
compute='_compute_margin', currency_field='currency_id')
|
||||
margin_company_currency = fields.Monetary(
|
||||
string='Margin in Company Currency', readonly=True, store=True,
|
||||
compute='_compute_margin', currency_field='company_currency_id')
|
||||
margin_rate = fields.Float(
|
||||
string="Margin Rate", readonly=True, store=True,
|
||||
compute='_compute_margin',
|
||||
digits=(16, 2), help="Margin rate in percentage of the sale price")
|
||||
|
||||
@api.depends(
|
||||
'standard_price_company_currency', 'invoice_id.currency_id',
|
||||
'invoice_id.type', 'invoice_id.company_id',
|
||||
'invoice_id.date_invoice', 'quantity', 'price_subtotal')
|
||||
def _compute_margin(self):
|
||||
for il in self:
|
||||
standard_price_inv_cur = 0.0
|
||||
margin_inv_cur = 0.0
|
||||
margin_comp_cur = 0.0
|
||||
margin_rate = 0.0
|
||||
inv = il.invoice_id
|
||||
if inv and inv.type in ('out_invoice', 'out_refund'):
|
||||
# it works in _get_current_rate
|
||||
# even if we set date = False in context
|
||||
# standard_price_inv_cur is in the UoM of the invoice line
|
||||
date = inv._get_currency_rate_date() or\
|
||||
fields.Date.context_today(self)
|
||||
company = inv.company_id
|
||||
company_currency = company.currency_id
|
||||
standard_price_inv_cur =\
|
||||
company_currency._convert(
|
||||
il.standard_price_company_currency,
|
||||
inv.currency_id, company, date)
|
||||
margin_inv_cur =\
|
||||
il.price_subtotal - il.quantity * standard_price_inv_cur
|
||||
margin_comp_cur = inv.currency_id._convert(
|
||||
margin_inv_cur, company_currency, company, date)
|
||||
if il.price_subtotal:
|
||||
margin_rate = 100 * margin_inv_cur / il.price_subtotal
|
||||
# for a refund, margin should be negative
|
||||
# but margin rate should stay positive
|
||||
if inv.type == 'out_refund':
|
||||
margin_inv_cur *= -1
|
||||
margin_comp_cur *= -1
|
||||
il.standard_price_invoice_currency = standard_price_inv_cur
|
||||
il.margin_invoice_currency = margin_inv_cur
|
||||
il.margin_company_currency = margin_comp_cur
|
||||
il.margin_rate = margin_rate
|
||||
|
||||
# We want to copy standard_price on invoice line for customer
|
||||
# invoice/refunds. We can't do that via on_change of product_id,
|
||||
# because it is not always played when invoice is created from code
|
||||
# => we inherit write/create
|
||||
# We write standard_price_company_currency even on supplier invoice/refunds
|
||||
# because we don't have access to the 'type' of the invoice
|
||||
@api.model
|
||||
def create(self, vals):
|
||||
if vals.get('product_id'):
|
||||
pp = self.env['product.product'].browse(vals['product_id'])
|
||||
std_price = pp.standard_price
|
||||
inv_uom_id = vals.get('uom_id')
|
||||
if inv_uom_id and inv_uom_id != pp.uom_id.id:
|
||||
inv_uom = self.env['uom.uom'].browse(inv_uom_id)
|
||||
std_price = pp.uom_id._compute_price(
|
||||
std_price, inv_uom)
|
||||
vals['standard_price_company_currency'] = std_price
|
||||
return super(AccountInvoiceLine, self).create(vals)
|
||||
|
||||
def write(self, vals):
|
||||
if not vals:
|
||||
vals = {}
|
||||
if 'product_id' in vals or 'uom_id' in vals:
|
||||
for il in self:
|
||||
if 'product_id' in vals:
|
||||
if vals.get('product_id'):
|
||||
pp = self.env['product.product'].browse(
|
||||
vals['product_id'])
|
||||
else:
|
||||
pp = False
|
||||
else:
|
||||
pp = il.product_id or False
|
||||
# uom_id is NOT a required field
|
||||
if 'uom_id' in vals:
|
||||
if vals.get('uom_id'):
|
||||
inv_uom = self.env['uom.uom'].browse(
|
||||
vals['uom_id'])
|
||||
else:
|
||||
inv_uom = False
|
||||
else:
|
||||
inv_uom = il.uom_id or False
|
||||
std_price = 0.0
|
||||
if pp:
|
||||
std_price = pp.standard_price
|
||||
if inv_uom and inv_uom != pp.uom_id:
|
||||
std_price = pp.uom_id._compute_price(
|
||||
std_price, inv_uom)
|
||||
il.write({'standard_price_company_currency': std_price})
|
||||
return super(AccountInvoiceLine, self).write(vals)
|
||||
|
||||
|
||||
class AccountInvoice(models.Model):
|
||||
_inherit = 'account.invoice'
|
||||
|
||||
margin_invoice_currency = fields.Monetary(
|
||||
string='Margin in Invoice Currency',
|
||||
compute='_compute_margin', store=True, readonly=True,
|
||||
currency_field='currency_id')
|
||||
margin_company_currency = fields.Monetary(
|
||||
string='Margin in Company Currency',
|
||||
compute='_compute_margin', store=True, readonly=True,
|
||||
currency_field='company_currency_id')
|
||||
|
||||
@api.depends(
|
||||
'type',
|
||||
'invoice_line_ids.margin_invoice_currency',
|
||||
'invoice_line_ids.margin_company_currency')
|
||||
def _compute_margin(self):
|
||||
res = self.env['account.invoice.line'].read_group(
|
||||
[('invoice_id', 'in', self.ids)],
|
||||
['invoice_id', 'margin_invoice_currency',
|
||||
'margin_company_currency'],
|
||||
['invoice_id'])
|
||||
for re in res:
|
||||
if re['invoice_id']:
|
||||
inv = self.browse(re['invoice_id'][0])
|
||||
if inv.type in ('out_invoice', 'out_refund'):
|
||||
inv.margin_invoice_currency = re['margin_invoice_currency']
|
||||
inv.margin_company_currency = re['margin_company_currency']
|
||||
@@ -1,60 +0,0 @@
|
||||
# Copyright 2018-2019 Akretion France (http://www.akretion.com)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import api, fields, models
|
||||
|
||||
|
||||
class AccountInvoiceReport(models.Model):
|
||||
_inherit = 'account.invoice.report'
|
||||
|
||||
margin = fields.Float(string='Margin', readonly=True)
|
||||
# why digits=0 ??? Why is it like that in the native "account" module
|
||||
user_currency_margin = fields.Float(
|
||||
string="Margin", compute='_compute_user_currency_margin', digits=0)
|
||||
|
||||
_depends = {
|
||||
'account.invoice': [
|
||||
'account_id', 'amount_total_company_signed',
|
||||
'commercial_partner_id', 'company_id',
|
||||
'currency_id', 'date_due', 'date_invoice', 'fiscal_position_id',
|
||||
'journal_id', 'number', 'partner_bank_id', 'partner_id',
|
||||
'payment_term_id', 'residual', 'state', 'type', 'user_id',
|
||||
],
|
||||
'account.invoice.line': [
|
||||
'account_id', 'invoice_id', 'price_subtotal', 'product_id',
|
||||
'quantity', 'uom_id', 'account_analytic_id',
|
||||
'margin_company_currency',
|
||||
],
|
||||
'product.product': ['product_tmpl_id'],
|
||||
'product.template': ['categ_id'],
|
||||
'uom.uom': ['category_id', 'factor', 'name', 'uom_type'],
|
||||
'res.currency.rate': ['currency_id', 'name'],
|
||||
'res.partner': ['country_id'],
|
||||
}
|
||||
|
||||
@api.depends('currency_id', 'date', 'margin')
|
||||
def _compute_user_currency_margin(self):
|
||||
user_currency = self.env.user.company_id.currency_id
|
||||
currency_rate = self.env['res.currency.rate'].search([
|
||||
('rate', '=', 1),
|
||||
'|',
|
||||
('company_id', '=', self.env.user.company_id.id),
|
||||
('company_id', '=', False)], limit=1)
|
||||
base_currency = currency_rate.currency_id
|
||||
for record in self:
|
||||
date = record.date or fields.Date.today()
|
||||
company = record.company_id
|
||||
record.user_currency_margin = base_currency._convert(
|
||||
record.margin, user_currency, company, date)
|
||||
|
||||
# TODO check for refunds
|
||||
def _sub_select(self):
|
||||
select_str = super(AccountInvoiceReport, self)._sub_select()
|
||||
select_str += ", SUM(ail.margin_company_currency) AS margin"
|
||||
return select_str
|
||||
|
||||
def _select(self):
|
||||
select_str = super(AccountInvoiceReport, self)._select()
|
||||
select_str += ", sub.margin AS margin"
|
||||
return select_str
|
||||
@@ -1,51 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
© 2015-2017 Akretion (http://www.akretion.com/)
|
||||
@author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="view_invoice_line_form" model="ir.ui.view">
|
||||
<field name="name">margin.account.invoice.line.form</field>
|
||||
<field name="model">account.invoice.line</field>
|
||||
<field name="inherit_id" ref="account.view_invoice_line_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='analytic_tag_ids']/.." position="inside">
|
||||
<field name="standard_price_company_currency"
|
||||
string="Cost Price in Comp. Cur."
|
||||
groups="base.group_no_one"/>
|
||||
<field name="standard_price_invoice_currency"
|
||||
string="Cost Price in Inv. Cur."
|
||||
groups="base.group_no_one"/>
|
||||
<field name="margin_invoice_currency"
|
||||
string="Margin in Inv. Cur."
|
||||
groups="base.group_no_one"/>
|
||||
<field name="margin_company_currency"
|
||||
string="Margin in Comp. Cur."
|
||||
groups="base.group_no_one"/>
|
||||
<label for="margin_rate" groups="base.group_no_one"/>
|
||||
<div name="margin_rate" groups="base.group_no_one">
|
||||
<field name="margin_rate" class="oe_inline"/> %
|
||||
</div>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="invoice_form" model="ir.ui.view">
|
||||
<field name="name">margin.account.invoice.form</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="inherit_id" ref="account.invoice_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="move_id" position="after">
|
||||
<field name="margin_invoice_currency"
|
||||
string="Margin in Inv. Cur." groups="base.group_no_one"/>
|
||||
<field name="margin_company_currency"
|
||||
string="Margin in Comp. Cur." groups="base.group_no_one"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
</odoo>
|
||||
98
account_invoice_margin/i18n/fr.po
Normal file
98
account_invoice_margin/i18n/fr.po
Normal file
@@ -0,0 +1,98 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * account_invoice_margin
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2025-01-16 16:24+0000\n"
|
||||
"PO-Revision-Date: 2025-01-16 16:24+0000\n"
|
||||
"Last-Translator: Alexis de Lattre <alexis.delattre@akretion.com>\n"
|
||||
"Language-Team: \n"
|
||||
"Language: fr\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: account_invoice_margin
|
||||
#: model:ir.model,name:account_invoice_margin.model_account_invoice_report
|
||||
msgid "Invoices Statistics"
|
||||
msgstr "Statistiques des factures"
|
||||
|
||||
#. module: account_invoice_margin
|
||||
#: model:ir.model,name:account_invoice_margin.model_account_move
|
||||
msgid "Journal Entry"
|
||||
msgstr "Pièce comptable"
|
||||
|
||||
#. module: account_invoice_margin
|
||||
#: model:ir.model,name:account_invoice_margin.model_account_move_line
|
||||
msgid "Journal Item"
|
||||
msgstr "Écriture comptable"
|
||||
|
||||
#. module: account_invoice_margin
|
||||
#: model:ir.model.fields,field_description:account_invoice_margin.field_account_invoice_report__margin
|
||||
#: model_terms:ir.ui.view,arch_db:account_invoice_margin.view_invoice_tree
|
||||
#: model_terms:ir.ui.view,arch_db:account_invoice_margin.view_move_form
|
||||
msgid "Margin"
|
||||
msgstr "Marge"
|
||||
|
||||
#. module: account_invoice_margin
|
||||
#: model_terms:ir.ui.view,arch_db:account_invoice_margin.view_move_form
|
||||
msgid "Margin %"
|
||||
msgstr "Marge %"
|
||||
|
||||
#. module: account_invoice_margin
|
||||
#: model:ir.model.fields,field_description:account_invoice_margin.field_account_move_line__margin_rate
|
||||
msgid "Margin Rate"
|
||||
msgstr "Taux de marge"
|
||||
|
||||
#. module: account_invoice_margin
|
||||
#: model:ir.model.fields,field_description:account_invoice_margin.field_account_bank_statement_line__margin_company_currency
|
||||
#: model:ir.model.fields,field_description:account_invoice_margin.field_account_move__margin_company_currency
|
||||
#: model:ir.model.fields,field_description:account_invoice_margin.field_account_move_line__margin_company_currency
|
||||
#: model:ir.model.fields,field_description:account_invoice_margin.field_account_payment__margin_company_currency
|
||||
msgid "Margin in Company Currency"
|
||||
msgstr "Marge dans la devise de la société"
|
||||
|
||||
#. module: account_invoice_margin
|
||||
#: model:ir.model.fields,field_description:account_invoice_margin.field_account_bank_statement_line__margin_invoice_currency
|
||||
#: model:ir.model.fields,field_description:account_invoice_margin.field_account_move__margin_invoice_currency
|
||||
#: model:ir.model.fields,field_description:account_invoice_margin.field_account_move_line__margin_invoice_currency
|
||||
#: model:ir.model.fields,field_description:account_invoice_margin.field_account_payment__margin_invoice_currency
|
||||
msgid "Margin in Invoice Currency"
|
||||
msgstr "Marge dans la devise de la facture"
|
||||
|
||||
#. module: account_invoice_margin
|
||||
#: model:ir.model.fields,help:account_invoice_margin.field_account_move_line__margin_rate
|
||||
msgid "Margin rate in percentage of the sale price"
|
||||
msgstr "Taux de marge en pourcentage du prix de vente"
|
||||
|
||||
#. module: account_invoice_margin
|
||||
#: model:ir.model.fields,field_description:account_invoice_margin.field_account_move_line__standard_price_company_currency
|
||||
msgid "Unit Cost in Company Currency"
|
||||
msgstr "Coût unitaire dans la devise de la société"
|
||||
|
||||
#. module: account_invoice_margin
|
||||
#: model:ir.model.fields,field_description:account_invoice_margin.field_account_move_line__standard_price_invoice_currency
|
||||
msgid "Unit Cost in Invoice Currency"
|
||||
msgstr "Coût unitaire dans la devise de la facture"
|
||||
|
||||
#. module: account_invoice_margin
|
||||
#: model:ir.model.fields,help:account_invoice_margin.field_account_move_line__standard_price_company_currency
|
||||
msgid ""
|
||||
"Unit Cost in company currency in the unit of measure of the invoice line "
|
||||
"(which may be different from the unit of measure of the product)."
|
||||
msgstr ""
|
||||
"Coût unitaire dans la devise de la société dans l'unité de mesure de la "
|
||||
"ligne de facture (qui peut être différente de l'unité de mesure du produit)."
|
||||
|
||||
#. module: account_invoice_margin
|
||||
#: model:ir.model.fields,help:account_invoice_margin.field_account_move_line__standard_price_invoice_currency
|
||||
msgid ""
|
||||
"Unit Cost in invoice currency in the unit of measure of the invoice line "
|
||||
"(which may be different from the unit of measure of the product)."
|
||||
msgstr ""
|
||||
"Coût unitaire dans la devise de la facture dans l'unité de mesure "
|
||||
"de la ligne de la facture (qui peut être différente de l'unité de mesure du produit)."
|
||||
2
account_invoice_margin/models/__init__.py
Normal file
2
account_invoice_margin/models/__init__.py
Normal file
@@ -0,0 +1,2 @@
|
||||
from . import account_move
|
||||
from . import account_invoice_report
|
||||
17
account_invoice_margin/models/account_invoice_report.py
Normal file
17
account_invoice_margin/models/account_invoice_report.py
Normal file
@@ -0,0 +1,17 @@
|
||||
# Copyright 2018-2025 Akretion France (https://www.akretion.com)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import api, fields, models
|
||||
|
||||
|
||||
class AccountInvoiceReport(models.Model):
|
||||
_inherit = 'account.invoice.report'
|
||||
|
||||
margin = fields.Float(string='Margin', readonly=True)
|
||||
|
||||
@api.model
|
||||
def _select(self):
|
||||
select_str = super()._select()
|
||||
select_str += ", line.margin_company_currency * currency_table.rate AS margin"
|
||||
return select_str
|
||||
109
account_invoice_margin/models/account_move.py
Normal file
109
account_invoice_margin/models/account_move.py
Normal file
@@ -0,0 +1,109 @@
|
||||
# Copyright 2015-2025 Akretion France (https://www.akretion.com)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import api, fields, models
|
||||
|
||||
|
||||
class AccountMoveLine(models.Model):
|
||||
_inherit = 'account.move.line'
|
||||
|
||||
standard_price_company_currency = fields.Float(
|
||||
compute='_compute_margin', store=True, digits='Product Price',
|
||||
string='Unit Cost in Company Currency',
|
||||
help="Unit Cost in company currency in the unit of measure "
|
||||
"of the invoice line (which may be different from the unit "
|
||||
"of measure of the product).")
|
||||
standard_price_invoice_currency = fields.Float(
|
||||
compute='_compute_margin', store=True, digits='Product Price',
|
||||
string='Unit Cost in Invoice Currency',
|
||||
help="Unit Cost in invoice currency in the unit of measure "
|
||||
"of the invoice line (which may be different from the unit "
|
||||
"of measure of the product).")
|
||||
margin_invoice_currency = fields.Monetary(
|
||||
compute='_compute_margin', store=True,
|
||||
string='Margin in Invoice Currency', currency_field='currency_id')
|
||||
margin_company_currency = fields.Monetary(
|
||||
compute='_compute_margin', store=True,
|
||||
string='Margin in Company Currency',
|
||||
currency_field='company_currency_id')
|
||||
margin_rate = fields.Float(
|
||||
string="Margin Rate", readonly=True, store=True,
|
||||
compute='_compute_margin',
|
||||
digits=(16, 2), help="Margin rate in percentage of the sale price")
|
||||
|
||||
@api.depends(
|
||||
'product_id', 'product_uom_id', 'display_type', 'quantity', 'price_subtotal',
|
||||
'move_id.currency_id', 'move_id.move_type', 'move_id.company_id', 'move_id.date')
|
||||
def _compute_margin(self):
|
||||
for ml in self:
|
||||
standard_price_comp_cur = 0.0
|
||||
standard_price_inv_cur = 0.0
|
||||
margin_inv_cur = 0.0
|
||||
margin_comp_cur = 0.0
|
||||
margin_rate = 0.0
|
||||
if (
|
||||
ml.display_type == 'product' and
|
||||
ml.product_id and
|
||||
ml.move_type in ('out_invoice', 'out_refund')):
|
||||
move = ml.move_id
|
||||
date = move.date
|
||||
company = move.company_id
|
||||
company_currency = company.currency_id
|
||||
move_currency = move.currency_id
|
||||
standard_price_comp_cur = ml.product_id.with_company(company.id).standard_price
|
||||
if ml.product_uom_id and ml.product_uom_id != ml.product_id.uom_id:
|
||||
standard_price_comp_cur = ml.product_id.uom_id._compute_price(
|
||||
standard_price_comp_cur, ml.product_uom_id)
|
||||
standard_price_inv_cur = company_currency._convert(
|
||||
standard_price_comp_cur, move_currency, company, date)
|
||||
margin_inv_cur =\
|
||||
ml.price_subtotal - (ml.quantity * standard_price_inv_cur)
|
||||
margin_comp_cur = move_currency._convert(
|
||||
margin_inv_cur, company_currency, company, date)
|
||||
if ml.price_subtotal:
|
||||
margin_rate = 100 * margin_inv_cur / ml.price_subtotal
|
||||
# for a refund, margin should be negative
|
||||
# but margin rate should stay positive
|
||||
if ml.move_type == 'out_refund':
|
||||
margin_inv_cur *= -1
|
||||
margin_comp_cur *= -1
|
||||
ml.standard_price_company_currency = standard_price_comp_cur
|
||||
ml.standard_price_invoice_currency = standard_price_inv_cur
|
||||
ml.margin_invoice_currency = margin_inv_cur
|
||||
ml.margin_company_currency = margin_comp_cur
|
||||
ml.margin_rate = margin_rate
|
||||
|
||||
|
||||
class AccountMove(models.Model):
|
||||
_inherit = 'account.move'
|
||||
|
||||
margin_invoice_currency = fields.Monetary(
|
||||
string='Margin in Invoice Currency',
|
||||
compute='_compute_margin', store=True,
|
||||
currency_field='currency_id')
|
||||
margin_company_currency = fields.Monetary(
|
||||
string='Margin in Company Currency',
|
||||
compute='_compute_margin', store=True,
|
||||
currency_field='company_currency_id')
|
||||
|
||||
@api.depends(
|
||||
'move_type',
|
||||
'invoice_line_ids.margin_invoice_currency',
|
||||
'invoice_line_ids.margin_company_currency')
|
||||
def _compute_margin(self):
|
||||
rg_res = self.env['account.move.line'].read_group(
|
||||
[
|
||||
('move_id', 'in', self.ids),
|
||||
('display_type', '=', 'product'),
|
||||
('move_id.move_type', 'in', ('out_invoice', 'out_refund')),
|
||||
],
|
||||
['move_id', 'margin_invoice_currency:sum', 'margin_company_currency:sum'],
|
||||
['move_id'])
|
||||
mapped_data = dict([(x['move_id'][0], {
|
||||
'margin_invoice_currency': x['margin_invoice_currency'],
|
||||
'margin_company_currency': x['margin_company_currency'],
|
||||
}) for x in rg_res])
|
||||
for move in self:
|
||||
move.margin_invoice_currency = mapped_data.get(move.id, {}).get('margin_invoice_currency')
|
||||
move.margin_company_currency = mapped_data.get(move.id, {}).get('margin_company_currency')
|
||||
55
account_invoice_margin/views/account_move.xml
Normal file
55
account_invoice_margin/views/account_move.xml
Normal file
@@ -0,0 +1,55 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2015-2025 Akretion (https://www.akretion.com/)
|
||||
@author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="view_move_form" model="ir.ui.view">
|
||||
<field name="name">margin.account.move.form</field>
|
||||
<field name="model">account.move</field>
|
||||
<field name="inherit_id" ref="account.view_move_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<group name="sale_info_group" position="inside">
|
||||
<field name="margin_invoice_currency"
|
||||
groups="base.group_no_one"
|
||||
attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund'))]}"/>
|
||||
<field name="margin_company_currency"
|
||||
groups="base.group_no_one"
|
||||
attrs="{'invisible': [('move_type', 'not in', ('out_invoice', 'out_refund'))]}"/>
|
||||
</group>
|
||||
<xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='price_total']" position="after">
|
||||
<field name="standard_price_invoice_currency" optional="hide" attrs="{'column_invisible': [('parent.move_type', 'not in', ('out_invoice', 'out_refund'))]}"/>
|
||||
<field name="margin_invoice_currency" optional="hide" attrs="{'column_invisible': [('parent.move_type', 'not in', ('out_invoice', 'out_refund'))]}" string="Margin"/>
|
||||
<field name="margin_rate" optional="hide" string="Margin %" attrs="{'column_invisible': [('parent.move_type', 'not in', ('out_invoice', 'out_refund'))]}"/>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='invoice_line_ids']/form//field[@name='price_total']/.." position="inside">
|
||||
<field name="standard_price_company_currency"
|
||||
groups="base.group_no_one" attrs="{'invisible': [('parent.move_type', 'not in', ('out_invoice', 'out_refund'))]}"/>
|
||||
<field name="standard_price_invoice_currency"
|
||||
groups="base.group_no_one" attrs="{'invisible': [('parent.move_type', 'not in', ('out_invoice', 'out_refund'))]}"/>
|
||||
<field name="margin_invoice_currency"
|
||||
groups="base.group_no_one" attrs="{'invisible': [('parent.move_type', 'not in', ('out_invoice', 'out_refund'))]}"/>
|
||||
<field name="margin_company_currency"
|
||||
groups="base.group_no_one" attrs="{'invisible': [('parent.move_type', 'not in', ('out_invoice', 'out_refund'))]}"/>
|
||||
<label for="margin_rate" groups="base.group_no_one" attrs="{'invisible': [('parent.move_type', 'not in', ('out_invoice', 'out_refund'))]}"/>
|
||||
<div name="margin_rate" groups="base.group_no_one" attrs="{'invisible': [('parent.move_type', 'not in', ('out_invoice', 'out_refund'))]}">
|
||||
<field name="margin_rate" class="oe_inline"/> %
|
||||
</div>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_invoice_tree" model="ir.ui.view">
|
||||
<field name="model">account.move</field>
|
||||
<field name="inherit_id" ref="account.view_invoice_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="amount_residual_signed" position="after">
|
||||
<field name="margin_company_currency" optional="hide" sum="1" invisible="context.get('default_move_type') not in ('out_invoice', 'out_refund')" string="Margin"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -23,14 +23,14 @@ This modules adds the following functions:
|
||||
|
||||
* Add an *Overdue* filter on invoice search view (this feature was previously
|
||||
located in te module *account_invoice_overdue_filter*)
|
||||
* Increase the default limit of 80 lines in account move and account move line view.
|
||||
* Increase the default limit of 80 lines in journal entries and journal items views.
|
||||
* disable reconciliation "guessing"
|
||||
* fast search on *Reconcile Ref* for account move line.
|
||||
* fast search on *Reconcile Ref* for journal items.
|
||||
* add sale dates to invoice report to be compliant with
|
||||
https://www.service-public.fr/professionnels-entreprises/vosdroits/F31808
|
||||
* Sale date on qweb invoices
|
||||
* A wizard to mark several invoices as sent at once (forward from v8)
|
||||
* Default date for Account Move Reversal is now D+1 instead of today
|
||||
* Default date for reversal journal entry is now D+1 instead of today
|
||||
* Track more fields on invoice (see details in account.py)
|
||||
* Add boolean fields `has_discount` and `has_attachment` on invoice
|
||||
* Add button "Delete line qty = 0" on supplier invoice
|
||||
@@ -41,8 +41,8 @@ This modules adds the following functions:
|
||||
* add direct search of journal using code
|
||||
* add copy=False on some fields
|
||||
* Add unicity constraint on analytic codes per company
|
||||
* Better default values on account move
|
||||
* Add link from account move line to invoice
|
||||
* Better default values on journal entry
|
||||
* Add link from journal items to to invoice
|
||||
* Add start_date and end_date on bank statements
|
||||
* Add transfer_account_id to invoicing config page
|
||||
* Improve domain reconciliation widget
|
||||
|
||||
@@ -30,9 +30,11 @@
|
||||
'wizard/account_invoice_mark_sent_view.xml',
|
||||
'wizard/account_group_generate_view.xml',
|
||||
'wizard/account_payment_register_views.xml',
|
||||
'wizard/account_move_reversal.xml',
|
||||
'security/ir.model.access.csv',
|
||||
# 'report/invoice_report.xml', # TODO
|
||||
],
|
||||
"views/res_partner.xml",
|
||||
],
|
||||
# 'qweb': ['static/src/xml/account_payment.xml'],
|
||||
'installable': True,
|
||||
# "post_init_hook": "post_init_hook",
|
||||
|
||||
@@ -1,691 +0,0 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * account_usability
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 14.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: account_usability
|
||||
#: code:addons/account_usability/wizard/account_group_generate.py:0
|
||||
#, python-format
|
||||
msgid ""
|
||||
"%d account groups already exists in company '%s'. This wizard is designed to"
|
||||
" generate account groups from scratch."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_account
|
||||
msgid "Account"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: code:addons/account_usability/wizard/account_group_generate.py:0
|
||||
#, python-format
|
||||
msgid "Account Groups"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_move_reversal
|
||||
msgid "Account Move Reversal"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_reconciliation_widget
|
||||
msgid "Account Reconciliation widget"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_journal__account_type_current_assets_id
|
||||
msgid "Account Type Current Assets"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_journal__account_type_current_liabilities_id
|
||||
msgid "Account Type Current Liabilities"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move_line__account_reconcile
|
||||
msgid "Allow Reconciliation"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.constraint,message:account_usability.constraint_account_analytic_account_code_company_unique
|
||||
msgid ""
|
||||
"An analytic account with the same code already exists in the same company!"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_analytic_account
|
||||
msgid "Analytic Account"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_bank_statement_form
|
||||
msgid "Are you sure to unreconcile all the entrie of the bank statement?"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,help:account_usability.field_account_bank_statement_line__partner_bank_id
|
||||
#: model:ir.model.fields,help:account_usability.field_account_move__partner_bank_id
|
||||
msgid ""
|
||||
"Bank Account Number to which the invoice will be paid. A Company bank "
|
||||
"account if this is a Customer Invoice or Vendor Credit Note, otherwise a "
|
||||
"Partner bank account number."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.ui.menu,name:account_usability.res_partner_bank_account_config_menu
|
||||
msgid "Bank Accounts"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_bank_statement
|
||||
msgid "Bank Statement"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.ui.menu,name:account_usability.res_bank_account_config_menu
|
||||
msgid "Banks"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.account_group_generate_form
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.account_invoice_mark_sent_form
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,help:account_usability.field_account_move_line__account_reconcile
|
||||
msgid ""
|
||||
"Check this box if this account allows invoices & payments matching of "
|
||||
"journal items."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_account_search
|
||||
msgid "Code"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_res_company
|
||||
msgid "Companies"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_res_config_settings
|
||||
msgid "Config Settings"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_res_partner
|
||||
msgid "Contact"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_group_generate__create_uid
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_invoice_mark_sent__create_uid
|
||||
msgid "Created by"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_group_generate__create_date
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_invoice_mark_sent__create_date
|
||||
msgid "Created on"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,help:account_usability.field_account_move_line__matched_credit_ids
|
||||
msgid "Credit journal items that are matched with this journal item."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_account_move_line_filter
|
||||
msgid "Current Year"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line__date
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move__date
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_payment__date
|
||||
msgid "Date"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,help:account_usability.field_account_move_line__matched_debit_ids
|
||||
msgid "Debit journal items that are matched with this journal item."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_account_move_line_filter
|
||||
msgid "Debit or Credit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_account__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_analytic_account__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_group_generate__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_incoterms__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_invoice_mark_sent__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_invoice_report__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_journal__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move_line__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move_reversal__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_partial_reconcile__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_product_supplierinfo__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_product_template__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_company__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_config_settings__display_name
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_partner__display_name
|
||||
msgid "Display Name"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line__invoice_date_due
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move__invoice_date_due
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_payment__invoice_date_due
|
||||
msgid "Due Date"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement__end_date
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_bank_statement_search
|
||||
msgid "End Date"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_fiscal_position
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line__fiscal_position_id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move__fiscal_position_id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_payment__fiscal_position_id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_partner__property_account_position_id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_users__property_account_position_id
|
||||
msgid "Fiscal Position"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_fiscalyear
|
||||
msgid "Fiscal Year"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,help:account_usability.field_account_bank_statement_line__fiscal_position_id
|
||||
#: model:ir.model.fields,help:account_usability.field_account_move__fiscal_position_id
|
||||
#: model:ir.model.fields,help:account_usability.field_account_payment__fiscal_position_id
|
||||
msgid ""
|
||||
"Fiscal positions are used to adapt taxes and accounts for particular "
|
||||
"customers or sales orders/invoices. The default value comes from the "
|
||||
"customer."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move_line__full_reconcile_id
|
||||
msgid "Full Reconcile"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_account_move_line_filter
|
||||
msgid "Fully Reconciled"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.account_group_generate_form
|
||||
msgid "Generate"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.actions.act_window,name:account_usability.account_group_generate_action
|
||||
#: model:ir.model,name:account_usability.model_account_group_generate
|
||||
#: model:ir.ui.menu,name:account_usability.account_group_generate_menu
|
||||
msgid "Generate Account Groups"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.account_group_generate_form
|
||||
msgid "Generate account groups"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_account_analytic_account_search
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_account_search
|
||||
msgid "Group"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_account_journal_search
|
||||
msgid "Group By"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line__has_attachment
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move__has_attachment
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_payment__has_attachment
|
||||
msgid "Has Attachment"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line__has_discount
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move__has_discount
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_payment__has_discount
|
||||
msgid "Has Discount"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement__hide_bank_statement_balance
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_journal__hide_bank_statement_balance
|
||||
msgid "Hide Bank Statement Balance"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_account__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_analytic_account__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_group_generate__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_incoterms__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_invoice_mark_sent__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_invoice_report__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_journal__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move_line__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move_reversal__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_partial_reconcile__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_product_supplierinfo__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_product_template__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_company__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_config_settings__id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_partner__id
|
||||
msgid "ID"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_incoterms
|
||||
msgid "Incoterms"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_config_settings__transfer_account_id
|
||||
msgid "Inter-Banks Transfer Account"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,help:account_usability.field_res_config_settings__transfer_account_id
|
||||
msgid ""
|
||||
"Intermediary account used when moving money from a liquidity account to "
|
||||
"another"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,help:account_usability.field_account_move_line__product_barcode
|
||||
msgid "International Article Number used for product identification."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_invoice
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_partner__invoice_warn
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_users__invoice_warn
|
||||
msgid "Invoice"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_company_form
|
||||
msgid "Invoice Legal Terms"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_invoice_line
|
||||
msgid "Invoice Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.account_invoice_report_tree
|
||||
msgid "Invoices Analysis"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_invoice_report
|
||||
msgid "Invoices Statistics"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_journal
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line__journal_id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move__journal_id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_payment__journal_id
|
||||
msgid "Journal"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_move
|
||||
msgid "Journal Entry"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_move_line
|
||||
msgid "Journal Item"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_account____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_analytic_account____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_group_generate____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_incoterms____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_invoice_mark_sent____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_invoice_report____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_journal____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move_line____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move_reversal____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_partial_reconcile____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_product_supplierinfo____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_product_template____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_company____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_config_settings____last_update
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_partner____last_update
|
||||
msgid "Last Modified on"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_group_generate__write_uid
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_invoice_mark_sent__write_uid
|
||||
msgid "Last Updated by"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_group_generate__write_date
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_invoice_mark_sent__write_date
|
||||
msgid "Last Updated on"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_company_form
|
||||
msgid "Legal Terms"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_res_company__static_invoice_terms
|
||||
msgid "Legal Terms on Invoice"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_group_generate__level
|
||||
msgid "Level"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.actions.act_window,name:account_usability.account_invoice_mark_sent_action
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.account_invoice_mark_sent_form
|
||||
msgid "Mark as Sent"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_invoice_mark_sent
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.account_invoice_mark_sent_form
|
||||
msgid "Mark invoices as sent"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_account_invoice_filter
|
||||
msgid "Missing Attachment"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_partial_reconcile
|
||||
msgid "Partial Reconcile"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move_line__matched_credit_ids
|
||||
msgid "Partial Reconcile Credit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move_line__matched_debit_ids
|
||||
msgid "Partial Reconcile Debit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_invoice_report__industry_id
|
||||
msgid "Partner Industry"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line__invoice_payment_term_id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move__invoice_payment_term_id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_payment__invoice_payment_term_id
|
||||
msgid "Payment Terms"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: code:addons/account_usability/models/account_move.py:0
|
||||
#, python-format
|
||||
msgid "Please post the following entries before reconciliation :"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_group_generate__name_prefix
|
||||
msgid "Prefix"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_account_reconcile_model
|
||||
msgid ""
|
||||
"Preset to create journal entries during a invoices and payments matching"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_account_move_line_filter
|
||||
msgid "Previous Year"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_move_form
|
||||
msgid "Print"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move_line__product_barcode
|
||||
msgid "Product Barcode"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_product_template
|
||||
msgid "Product Template"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_product_product__purchase_price_type
|
||||
#: model:ir.model.fields,field_description:account_usability.field_product_supplierinfo__purchase_price_type
|
||||
#: model:ir.model.fields,field_description:account_usability.field_product_template__purchase_price_type
|
||||
msgid "Purchase Price Type"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line__partner_bank_id
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move__partner_bank_id
|
||||
msgid "Recipient Bank"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line__ref
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move__ref
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_payment__ref
|
||||
msgid "Reference"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move_reversal__date
|
||||
msgid "Reversal date"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line__sale_dates
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move__sale_dates
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_payment__sale_dates
|
||||
msgid "Sale Dates"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_product_product__sale_price_type
|
||||
#: model:ir.model.fields,field_description:account_usability.field_product_template__sale_price_type
|
||||
msgid "Sale Price Type"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,help:account_usability.field_res_partner__invoice_warn
|
||||
#: model:ir.model.fields,help:account_usability.field_res_users__invoice_warn
|
||||
msgid ""
|
||||
"Selecting the \"Warning\" option will notify user with the message, "
|
||||
"Selecting \"Blocking Message\" will throw an exception with the message and "
|
||||
"block the flow. The Message has to be written in the next field."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_account_invoice_filter
|
||||
msgid "Sent"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement__start_date
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_bank_statement_search
|
||||
msgid "Start Date"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model,name:account_usability.model_product_supplierinfo
|
||||
msgid "Supplier Pricelist"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.product_supplierinfo_tree_view
|
||||
msgid "Tax"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: code:addons/account_usability/models/product.py:0
|
||||
#, python-format
|
||||
msgid "Tax excl."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: code:addons/account_usability/models/product.py:0
|
||||
#, python-format
|
||||
msgid "Tax incl."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: code:addons/account_usability/wizard/account_group_generate.py:0
|
||||
#, python-format
|
||||
msgid ""
|
||||
"The code of account '%s' is %d caracters. It cannot be inferior to level "
|
||||
"(%d)."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,help:account_usability.field_res_partner__property_account_position_id
|
||||
#: model:ir.model.fields,help:account_usability.field_res_users__property_account_position_id
|
||||
msgid ""
|
||||
"The fiscal position determines the taxes/accounts used for this contact."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: code:addons/account_usability/wizard/account_group_generate.py:0
|
||||
#, python-format
|
||||
msgid "The level must be >= 1."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,help:account_usability.field_account_bank_statement_line__sale_dates
|
||||
#: model:ir.model.fields,help:account_usability.field_account_move__sale_dates
|
||||
#: model:ir.model.fields,help:account_usability.field_account_payment__sale_dates
|
||||
msgid ""
|
||||
"This information appears on invoice qweb report (you may use it for your own"
|
||||
" report)"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.account_group_generate_form
|
||||
msgid ""
|
||||
"This wizard is designed to auto-generate account groups from the chart of "
|
||||
"account."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.account_invoice_mark_sent_form
|
||||
msgid ""
|
||||
"This wizard will mark as <i>sent</i> all the selected invoices in open or "
|
||||
"paid state."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_account_invoice_filter
|
||||
msgid "To Send"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_bank_statement_line__amount_total
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_move__amount_total
|
||||
#: model:ir.model.fields,field_description:account_usability.field_account_payment__amount_total
|
||||
msgid "Total"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.res_config_settings_view_form
|
||||
msgid ""
|
||||
"Transit account when you transfer money from a bank account of your company "
|
||||
"to another bank account of your company."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_account_journal_search
|
||||
msgid "Type"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_bank_statement_form
|
||||
msgid "Unreconcile All"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_account_move_line_filter
|
||||
msgid "Unreconciled or Partially Reconciled"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_bank_statement_form
|
||||
msgid "View Journal Entry"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability.view_move_line_tree
|
||||
msgid "View Journal Entry Form"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability
|
||||
#: model:ir.model.fields,help:account_usability.field_account_bank_statement__hide_bank_statement_balance
|
||||
#: model:ir.model.fields,help:account_usability.field_account_journal__hide_bank_statement_balance
|
||||
msgid ""
|
||||
"You may want to enable this option when your bank journal is generated from "
|
||||
"a bank statement file that doesn't handle start/end balance (QIF for "
|
||||
"instance) and you don't want to enter the start/end balance manually: it "
|
||||
"will prevent the display of wrong information in the accounting dashboard "
|
||||
"and on bank statements."
|
||||
msgstr ""
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2023-06-08 14:47+0000\n"
|
||||
"PO-Revision-Date: 2023-06-08 14:47+0000\n"
|
||||
"POT-Creation-Date: 2024-07-07 14:47+0000\n"
|
||||
"PO-Revision-Date: 2024-07-07 14:47+0000\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -23,7 +23,7 @@ msgid ""
|
||||
"%d account groups already exists in company '%s'. This wizard is designed to"
|
||||
" generate account groups from scratch."
|
||||
msgstr ""
|
||||
"%d des groupes de comptes existent déjà dans la société '%s'. Cet assistant "
|
||||
"%d groupes de comptes existent déjà dans la société '%s'. Cet assistant "
|
||||
"est conçu pour créer des groupes de comptes à partir de zéro."
|
||||
|
||||
#. module: account_usability_akretion
|
||||
@@ -34,6 +34,23 @@ msgid ""
|
||||
"A reverse journal entry <a href=# data-oe-model=account.move data-oe-"
|
||||
"id=%d>%s</a> has been generated."
|
||||
msgstr ""
|
||||
"Une extourne <a href=# data-oe-model=account.move data-oe-"
|
||||
"id=%d>%s</a> a été générée."
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#. odoo-python
|
||||
#: code:addons/account_usability_akretion/wizard/account_move_reversal.py:0
|
||||
#, python-format
|
||||
msgid "%s reversed by %s"
|
||||
msgstr "%s extourné par %s"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability_akretion.view_account_move_reversal
|
||||
msgid ""
|
||||
"You are about to reverse entries that have already been reversed or partially reversed (refund). Make sure it is intented.\n"
|
||||
" Already reversed entries are the following :"
|
||||
msgstr "Vous êtes sur le point d'extourner une pièce comptable déjà extournée, ou partiellement extournée (avoir). Vérifiez que c'est bien ce que vous souhaitez faire.\n"
|
||||
" Les pièces comptables déjà extournées sont les suivantes :"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model,name:account_usability_akretion.model_account_account
|
||||
@@ -50,7 +67,7 @@ msgstr "Groupes de comptes"
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model,name:account_usability_akretion.model_account_move_reversal
|
||||
msgid "Account Move Reversal"
|
||||
msgstr "Extourne d'écritures"
|
||||
msgstr "Extourne de l'écriture comptable"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_move_line__account_reconcile
|
||||
@@ -77,9 +94,10 @@ msgstr "Êtes-vous sûr de vouloir annuler cette facture ?"
|
||||
#. module: account_usability_akretion
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability_akretion.view_move_form
|
||||
msgid "Are you sure you want to cancel this journal entry?"
|
||||
msgstr "Êtes-vous sûr de vouloir annuler cette écriture ?"
|
||||
msgstr "Êtes-vous sûr de vouloir annuler cette pièce comptable ?"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model,name:account_usability_akretion.model_res_partner_bank
|
||||
#: model:ir.ui.menu,name:account_usability_akretion.res_partner_bank_account_config_menu
|
||||
msgid "Bank Accounts"
|
||||
msgstr "Comptes bancaires"
|
||||
@@ -101,18 +119,18 @@ msgid ""
|
||||
"Check this box if this account allows invoices & payments matching of "
|
||||
"journal items."
|
||||
msgstr ""
|
||||
"Cochez cette case si ce compte permet de faire du rapprochement entre "
|
||||
"Cochez cette case si ce compte permet de faire du lettrage entre "
|
||||
"factures et paiements."
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability_akretion.view_account_search
|
||||
msgid "Code"
|
||||
msgstr "Code"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability_akretion.view_account_invoice_filter
|
||||
msgid "Commercial Partner"
|
||||
msgstr "Parternaire commercial"
|
||||
msgstr "Partenaire commercial"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model,name:account_usability_akretion.model_res_company
|
||||
@@ -127,7 +145,7 @@ msgstr "Société"
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model,name:account_usability_akretion.model_res_partner
|
||||
msgid "Contact"
|
||||
msgstr "Contact"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_group_generate__create_uid
|
||||
@@ -144,12 +162,14 @@ msgstr "Créé le"
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.fields,help:account_usability_akretion.field_account_move_line__matched_credit_ids
|
||||
msgid "Credit journal items that are matched with this journal item."
|
||||
msgstr "Écritures comptables au crédit qui correspondent à cette écriture comptable."
|
||||
msgstr ""
|
||||
"Écritures comptables au crédit qui sont lettrées avec cette écriture comptable."
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.fields,help:account_usability_akretion.field_account_move_line__matched_debit_ids
|
||||
msgid "Debit journal items that are matched with this journal item."
|
||||
msgstr "Écritures comptables au débit qui correspondent avec cette écriture comptable."
|
||||
msgstr ""
|
||||
"Écritures comptables au débit qui sont lettrées avec cette écriture comptable."
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability_akretion.view_account_move_line_filter
|
||||
@@ -162,6 +182,14 @@ msgstr "Débit ou crédit"
|
||||
msgid "Display Name"
|
||||
msgstr "Nom affiché"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_bank_statement_line__blocked
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_move__blocked
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_payment__blocked
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability_akretion.view_account_invoice_filter
|
||||
msgid "Dispute"
|
||||
msgstr "Litige"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_bank_statement_line__invoice_date_due
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_move__invoice_date_due
|
||||
@@ -188,13 +216,13 @@ msgid ""
|
||||
"customer."
|
||||
msgstr ""
|
||||
"Les positions fiscales sont utilisées pour adapter les taxes et les comptes "
|
||||
"à des clients particuliers ou à des bons de commande/factures. La valeur "
|
||||
"par défaut provient du client."
|
||||
"à des clients spécifiques ou à des bons de commande/factures. La valeur par"
|
||||
" défaut provient de la fiche client."
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_move_line__full_reconcile_id
|
||||
msgid "Full Reconcile"
|
||||
msgstr "Marque de lettrage"
|
||||
msgstr "Lettrage total"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability_akretion.view_account_move_line_filter
|
||||
@@ -235,29 +263,29 @@ msgstr "Possède une pièce jointe"
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_move__has_discount
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_payment__has_discount
|
||||
msgid "Has Discount"
|
||||
msgstr "A une réduction"
|
||||
msgstr "A une remise"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_journal__hide_bank_statement_balance
|
||||
msgid "Hide and Disable Bank Statement Balance"
|
||||
msgstr "Masquer et désactiver le solde du relevé bancaire"
|
||||
msgstr "Masquer et désactiver le solde du relevé de compte"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_group_generate__id
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_invoice_mark_sent__id
|
||||
msgid "ID"
|
||||
msgstr "ID"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model,name:account_usability_akretion.model_account_incoterms
|
||||
msgid "Incoterms"
|
||||
msgstr "Incoterms"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.fields,help:account_usability_akretion.field_account_move_line__product_barcode
|
||||
msgid "International Article Number used for product identification."
|
||||
msgstr ""
|
||||
"Numéro d'article international (IAN) utilisé pour identifier cet article."
|
||||
"Numéro d'article international utilisé pour identifier cet article."
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_res_partner__invoice_warn
|
||||
@@ -273,7 +301,7 @@ msgstr "Mentions légales sur les factures"
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model,name:account_usability_akretion.model_account_invoice_report
|
||||
msgid "Invoices Statistics"
|
||||
msgstr "Statistiques des factures"
|
||||
msgstr "Statistiques de facturation"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model,name:account_usability_akretion.model_account_journal
|
||||
@@ -281,7 +309,7 @@ msgstr "Statistiques des factures"
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_move__journal_id
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_payment__journal_id
|
||||
msgid "Journal"
|
||||
msgstr "Journal"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model,name:account_usability_akretion.model_account_move
|
||||
@@ -353,13 +381,6 @@ msgstr "Divers"
|
||||
msgid "Missing Attachment"
|
||||
msgstr "Pièce jointe manquante"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#. odoo-python
|
||||
#: code:addons/account_usability_akretion/wizard/account_move_reversal.py:0
|
||||
#, python-format
|
||||
msgid "Move '%s' has already been reversed by move '%s'."
|
||||
msgstr "L'écritures '%s' a déjà été annulée par l'écritures '%s'."
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model,name:account_usability_akretion.model_account_partial_reconcile
|
||||
msgid "Partial Reconcile"
|
||||
@@ -383,7 +404,7 @@ msgstr "Secteur d’activité du partenaire"
|
||||
#. module: account_usability_akretion
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability_akretion.view_account_invoice_filter
|
||||
msgid "Payment Status"
|
||||
msgstr "Etat de paiement"
|
||||
msgstr "État de paiement"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_bank_statement_line__invoice_payment_term_id
|
||||
@@ -409,6 +430,11 @@ msgstr "Préfixe"
|
||||
msgid "Print"
|
||||
msgstr "Imprimer"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability_akretion.view_account_invoice_report_search
|
||||
msgid "Product"
|
||||
msgstr "Produit"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_move_line__product_barcode
|
||||
msgid "Product Barcode"
|
||||
@@ -437,7 +463,7 @@ msgid ""
|
||||
"block the flow. The Message has to be written in the next field."
|
||||
msgstr ""
|
||||
"Sélectionner l'option 'Avertissement' notifiera l'utilisateur avec le "
|
||||
"Message. Sélectionner 'Message Bloquant' lancera une exception avec le "
|
||||
"message. Sélectionner 'Message Bloquant' lancera une exception avec le "
|
||||
"message et bloquera le flux. Le Message doit être encodé dans le champ "
|
||||
"suivant."
|
||||
|
||||
@@ -468,8 +494,8 @@ msgid ""
|
||||
"The code of account '%s' is %d caracters. It cannot be inferior to level "
|
||||
"(%d)."
|
||||
msgstr ""
|
||||
"Le code du compte '%s' fait %d caractères. Il ne peut pas être de niveau "
|
||||
"inférieur à (%d)."
|
||||
"Le code du compte '%s' fait %d caractères. Il ne peut pas être "
|
||||
"inférieur au niveau (%d)."
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.fields,help:account_usability_akretion.field_res_partner__property_account_position_id
|
||||
@@ -486,6 +512,11 @@ msgstr ""
|
||||
msgid "The level must be >= 1."
|
||||
msgstr "Le niveau doit être >= 1."
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability_akretion.view_move_form
|
||||
msgid "This"
|
||||
msgstr "Ce"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model:ir.model.constraint,message:account_usability_akretion.constraint_account_incoterms_code_unique
|
||||
msgid "This incoterm code already exists."
|
||||
@@ -499,9 +530,8 @@ msgid ""
|
||||
"This information appear on invoice qweb report (you may use it for your own "
|
||||
"report)"
|
||||
msgstr ""
|
||||
"Cette information apparait sur le rapport qweb de la facture (vous "
|
||||
"pouvez les utiliser pour votre propre rapport)"
|
||||
|
||||
"Cette information apparait sur le rapport qweb de la facture (vous pouvez "
|
||||
"les utiliser pour votre propre rapport)"
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#. odoo-python
|
||||
@@ -511,7 +541,7 @@ msgid ""
|
||||
"This journal entry has been generated as the reverse of <a href=# data-oe-"
|
||||
"model=account.move data-oe-id=%d>%s</a>."
|
||||
msgstr ""
|
||||
"Cette écriture de journal a été générée comme extourne de <a href=# data-oe-"
|
||||
"Cette pièce comptable a été générée comme extourne de <a href=# data-oe-"
|
||||
"model=account.move data-oe-id=%d>%s</a>."
|
||||
|
||||
#. module: account_usability_akretion
|
||||
@@ -540,12 +570,12 @@ msgstr "À envoyer"
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_move__amount_total
|
||||
#: model:ir.model.fields,field_description:account_usability_akretion.field_account_payment__amount_total
|
||||
msgid "Total"
|
||||
msgstr "Total"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability_akretion.view_account_journal_search
|
||||
msgid "Type"
|
||||
msgstr "Type"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability_akretion.view_account_move_line_filter
|
||||
@@ -565,11 +595,16 @@ msgid ""
|
||||
"end balance is disabled. When you enable this option, you process the "
|
||||
"statement lines without considering the start/end balance and you regularly "
|
||||
"check the accounting balance of the bank account vs the amount of your bank "
|
||||
"account (the 2 processes are managed separately)."
|
||||
"account."
|
||||
msgstr ""
|
||||
"Lorsque cette option est activée, le solde de début et de fin ne s'affiche pas sur "
|
||||
"la vue du formulaire de relevé bancaire, et la vérification du solde final vs "
|
||||
"le solde final réel est désactivé. Lorsque vous activez cette option, vous traitez les "
|
||||
"lignes de relevé sans tenir compte du solde de début/fin et vous vérifiez régulièrement "
|
||||
"le solde du compte comptable bancaire vs le montant sur votre compte en banque"
|
||||
"(les 2 processus sont gérés séparément)."
|
||||
"Lorsque cette option est activée, le solde de début et de fin ne s'affiche "
|
||||
"pas sur la vue du formulaire du relevé de compte, et la vérification du solde"
|
||||
" final vs le solde final réel est désactivée. Lorsque vous activez cette "
|
||||
"option, vous traitez les lignes de relevé de compte sans tenir compte du solde de "
|
||||
"début/fin et vous vérifiez régulièrement le solde du compte "
|
||||
"bancaire vs le montant sur votre compte en banque."
|
||||
|
||||
#. module: account_usability_akretion
|
||||
#: model_terms:ir.ui.view,arch_db:account_usability_akretion.view_move_form
|
||||
msgid "is marked as <b>disputed</b>."
|
||||
msgstr "est marquée <b>en litige</b>."
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
diff --git a/addons/account/models/account_payment.py b/addons/account/models/account_payment.py
|
||||
index 2dd1f9cef83..62275fca65e 100644
|
||||
--- a/addons/account/models/account_payment.py
|
||||
+++ b/addons/account/models/account_payment.py
|
||||
@@ -262,6 +262,7 @@ class AccountPayment(models.Model):
|
||||
'credit': write_off_balance > 0.0 and write_off_balance or 0.0,
|
||||
'partner_id': self.partner_id.id,
|
||||
'account_id': write_off_line_vals.get('account_id'),
|
||||
+ 'analytic_account_id': write_off_line_vals.get('analytic_account_id'),
|
||||
})
|
||||
return line_vals_list
|
||||
|
||||
@@ -699,6 +700,7 @@ class AccountPayment(models.Model):
|
||||
'name': writeoff_lines[0].name,
|
||||
'amount': writeoff_amount * sign,
|
||||
'account_id': writeoff_lines[0].account_id.id,
|
||||
+ 'analytic_account_id': writeoff_lines[0].analytic_account_id.id,
|
||||
}
|
||||
else:
|
||||
write_off_line_vals = {}
|
||||
diff --git a/addons/account/wizard/account_payment_register.py b/addons/account/wizard/account_payment_register.py
|
||||
index 3fc91f716ad..35636774c7e 100644
|
||||
--- a/addons/account/wizard/account_payment_register.py
|
||||
+++ b/addons/account/wizard/account_payment_register.py
|
||||
@@ -93,6 +93,7 @@ class AccountPaymentRegister(models.TransientModel):
|
||||
], default='open', string="Payment Difference Handling")
|
||||
writeoff_account_id = fields.Many2one('account.account', string="Difference Account", copy=False,
|
||||
domain="[('deprecated', '=', False), ('company_id', '=', company_id)]")
|
||||
+ writeoff_analytic_account_id = fields.Many2one('account.analytic.account', string="Difference Analytic Account", copy=False, domain="[('company_id', '=', company_id)]")
|
||||
writeoff_label = fields.Char(string='Journal Item Label', default='Write-Off',
|
||||
help='Change label of the counterpart that will hold the payment difference')
|
||||
|
||||
@@ -422,6 +423,7 @@ class AccountPaymentRegister(models.TransientModel):
|
||||
'name': self.writeoff_label,
|
||||
'amount': self.payment_difference,
|
||||
'account_id': self.writeoff_account_id.id,
|
||||
+ 'analytic_account_id': self.writeoff_analytic_account_id.id or False,
|
||||
}
|
||||
return payment_vals
|
||||
|
||||
diff --git a/addons/account/wizard/account_payment_register_views.xml b/addons/account/wizard/account_payment_register_views.xml
|
||||
index 16eec30e265..b9386567baa 100644
|
||||
--- a/addons/account/wizard/account_payment_register_views.xml
|
||||
+++ b/addons/account/wizard/account_payment_register_views.xml
|
||||
@@ -65,6 +65,10 @@
|
||||
string="Post Difference In"
|
||||
options="{'no_create': True}"
|
||||
attrs="{'required': [('payment_difference_handling', '=', 'reconcile')]}"/>
|
||||
+ <label for="writeoff_analytic_account_id" class="oe_edit_only" string="Analytic Account" groups="analytic.group_analytic_accounting"/>
|
||||
+ <field name="writeoff_analytic_account_id"
|
||||
+ groups="analytic.group_analytic_accounting"
|
||||
+ options="{'no_create': True}" />
|
||||
<label for="writeoff_label" class="oe_edit_only" string="Label"/>
|
||||
<field name="writeoff_label" attrs="{'required': [('payment_difference_handling', '=', 'reconcile')]}"/>
|
||||
</div>
|
||||
@@ -9,3 +9,4 @@ from . import res_partner
|
||||
from . import res_company
|
||||
#from . import product
|
||||
from . import account_invoice_report
|
||||
from . import res_partner_bank
|
||||
|
||||
@@ -7,6 +7,8 @@ from odoo import models
|
||||
|
||||
class AccountAnalyticAccount(models.Model):
|
||||
_inherit = 'account.analytic.account'
|
||||
# native: _order = 'plan_id, name asc'
|
||||
_order = 'plan_id, code, name'
|
||||
|
||||
def name_get(self):
|
||||
if self._context.get('analytic_account_show_code_only'):
|
||||
|
||||
@@ -9,14 +9,13 @@ class AccountJournal(models.Model):
|
||||
_inherit = 'account.journal'
|
||||
|
||||
hide_bank_statement_balance = fields.Boolean(
|
||||
string='Hide and Disable Bank Statement Balance',
|
||||
string='Hide and Disable Bank Statement Balance', default=True,
|
||||
help="When this option is enabled, the start and end balance is "
|
||||
"not displayed on the bank statement form view, and the check of "
|
||||
"the end balance vs the real end balance is disabled. When you enable "
|
||||
"this option, you process the statement lines without considering "
|
||||
"the start/end balance and you regularly check the accounting balance "
|
||||
"of the bank account vs the amount of your bank account "
|
||||
"(the 2 processes are managed separately)."
|
||||
"of the bank account vs the amount of your bank account."
|
||||
)
|
||||
# Used to set default user_type_id on account fields via context
|
||||
# account_type_current_assets_id = fields.Many2one(
|
||||
@@ -56,3 +55,12 @@ class AccountJournal(models.Model):
|
||||
'search_default_posted': True,
|
||||
}
|
||||
return action
|
||||
|
||||
# field used in journal dashboard for bank journals
|
||||
# compute account_balance like in v14, using accounting and
|
||||
# NOT bank statement balance_start/balance_end
|
||||
def _compute_current_statement_balance(self):
|
||||
query_result = self._get_journal_dashboard_bank_running_balance()
|
||||
for journal in self:
|
||||
journal.has_statement_lines = query_result.get(journal.id)[0]
|
||||
journal.current_statement_balance = journal._get_journal_bank_account_balance()[0]
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from datetime import timedelta
|
||||
from collections import defaultdict
|
||||
import logging
|
||||
|
||||
from odoo import api, fields, models, _
|
||||
@@ -10,6 +11,7 @@ from odoo.exceptions import UserError
|
||||
from odoo.osv import expression
|
||||
from odoo.tools import float_is_zero
|
||||
from odoo.tools.misc import format_date
|
||||
from odoo.tools.safe_eval import safe_eval, time
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -36,7 +38,7 @@ class AccountMove(models.Model):
|
||||
compute="_compute_sales_dates",
|
||||
help="This information appear on invoice qweb report "
|
||||
"(you may use it for your own report)")
|
||||
# There is a native "blocked" field (bool) on account.move.line
|
||||
# There is a native "blocked" field (bool) on account.move.line
|
||||
# We want to have that field on invoices to improve usability
|
||||
# while keeping compatibility with the standard Odoo datamodel
|
||||
blocked = fields.Boolean(
|
||||
@@ -46,6 +48,8 @@ class AccountMove(models.Model):
|
||||
string="Dispute",
|
||||
tracking=True,
|
||||
)
|
||||
# Field search_account_id is just for search view
|
||||
search_account_id = fields.Many2one(related='line_ids.account_id')
|
||||
|
||||
@api.depends("line_ids", "line_ids.blocked")
|
||||
def _compute_blocked(self):
|
||||
@@ -201,33 +205,14 @@ class AccountMove(models.Model):
|
||||
move.suitable_journal_ids = self.env['account.journal'].search(domain)
|
||||
|
||||
def button_draft(self):
|
||||
super().button_draft()
|
||||
# Delete attached pdf invoice
|
||||
try:
|
||||
report_invoice = self.env['ir.actions.report']._get_report_from_name('account.report_invoice')
|
||||
except IndexError:
|
||||
report_invoice = False
|
||||
if report_invoice and report_invoice.attachment:
|
||||
for move in self.filtered(lambda x: x.move_type in ('out_invoice', 'out_refund')):
|
||||
# The pb is that the filename is dynamic and related to move.state
|
||||
# in v12, the feature was native and they used that kind of code:
|
||||
# with invoice.env.do_in_draft():
|
||||
# invoice.number, invoice.state = invoice.move_name, 'open'
|
||||
# attachment = self.env.ref('account.account_invoices').retrieve_attachment(invoice)
|
||||
# But do_in_draft() doesn't exists in v14
|
||||
# If you know how we could do that, please update the code below
|
||||
attachment = self.env['ir.attachment'].search([
|
||||
('name', '=', self._get_invoice_attachment_name()),
|
||||
('res_id', '=', move.id),
|
||||
('res_model', '=', self._name),
|
||||
('type', '=', 'binary'),
|
||||
], limit=1)
|
||||
if attachment:
|
||||
attachment.unlink()
|
||||
|
||||
def _get_invoice_attachment_name(self):
|
||||
self.ensure_one()
|
||||
return '%s.pdf' % (self.name and self.name.replace('/', '_') or 'INV')
|
||||
for move in self.filtered(lambda x: x.move_type in ('out_invoice', 'out_refund')):
|
||||
for report_xmlid in ('account.account_invoices', 'account.account_invoices_without_payment'):
|
||||
report = self.env.ref(report_xmlid)
|
||||
attach = report.retrieve_attachment(move)
|
||||
if attach:
|
||||
attach.unlink()
|
||||
super().button_draft()
|
||||
|
||||
def _get_accounting_date(self, invoice_date, has_tax):
|
||||
# On vendor bills/refunds, we want date = invoice_date unless
|
||||
|
||||
21
account_usability_akretion/models/res_partner_bank.py
Normal file
21
account_usability_akretion/models/res_partner_bank.py
Normal file
@@ -0,0 +1,21 @@
|
||||
# Copyright 2015-2022 Akretion France (http://www.akretion.com/)
|
||||
# @author: Mourad EL HADJ MIMOUNE <mourad.elhadj.mimoune@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import models
|
||||
|
||||
|
||||
class ResPartnerBank(models.Model):
|
||||
_inherit = 'res.partner.bank'
|
||||
|
||||
def name_get(self):
|
||||
res = []
|
||||
for acc in self:
|
||||
name = acc.acc_number
|
||||
if acc.currency_id:
|
||||
name = "%s (%s)" % (name, acc.currency_id.name)
|
||||
if acc.bank_id.name:
|
||||
name = "%s - %s" % (name, acc.bank_id.name)
|
||||
res += [(acc.id, name)]
|
||||
return res
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
<field name="inherit_id" ref="account.account_invoice_report_view_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="partner_id" position="after">
|
||||
<field name="commercial_partner_id" optional="hide"/>
|
||||
<field name="country_id" optional="hide"/>
|
||||
<field name="industry_id" optional="hide"/>
|
||||
<field name="fiscal_position_id" optional="hide"/>
|
||||
</field>
|
||||
<field name="commercial_partner_id" optional="hide"/>
|
||||
<field name="country_id" optional="hide"/>
|
||||
<field name="industry_id" optional="hide"/>
|
||||
<field name="fiscal_position_id" optional="hide"/>
|
||||
</field>
|
||||
<field name="quantity" position="after">
|
||||
<field name="product_uom_id" groups="uom.group_uom" optional="hide"/>
|
||||
</field>
|
||||
<field name="product_uom_id" groups="uom.group_uom" optional="hide"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -29,10 +29,31 @@
|
||||
<field name="model">account.invoice.report</field>
|
||||
<field name="inherit_id" ref="account.view_account_invoice_report_search"/>
|
||||
<field name="arch" type="xml">
|
||||
<filter name="category_product" position="after">
|
||||
<filter string="Product" name="product_groupby" context="{'group_by': 'product_id', 'residual_invisible':True}"/>
|
||||
</filter>
|
||||
<field name="partner_id" position="after">
|
||||
<field name="industry_id"/>
|
||||
</field>
|
||||
<filter name="category_product" position="after">
|
||||
<filter string="Product" name="product_groupby" context="{'group_by': 'product_id', 'residual_invisible':True}"/>
|
||||
<filter name="invoice_refund_groupby" string="Invoice/Refund" context="{'group_by': 'move_type'}"/>
|
||||
</filter>
|
||||
<!-- group by on commercial_partner_id by default -->
|
||||
<filter name="partner_id" position="attributes">
|
||||
<attribute name="invisible">1</attribute>
|
||||
</filter>
|
||||
<filter name="partner_id" position="after">
|
||||
<filter name="commercial_partner_groupby" string="Commercial Partner" context="{'group_by': 'commercial_partner_id'}"/>
|
||||
<filter name="industry_groupby" string="Partner Industry" context="{'group_by': 'industry_id'}"/>
|
||||
</filter>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Switch order: pivot in 1st position -->
|
||||
<record id="account.action_account_invoice_report_all_supp" model="ir.actions.act_window">
|
||||
<field name="view_mode">pivot,graph</field>
|
||||
</record>
|
||||
|
||||
<record id="account.action_account_invoice_report_all" model="ir.actions.act_window">
|
||||
<field name="view_mode">pivot,graph</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- TODO
|
||||
<record id="account_journal_dashboard_kanban_view" model="ir.ui.view">
|
||||
<field name="name">usability.account.journal.dashboard</field>
|
||||
<field name="model">account.journal</field>
|
||||
@@ -48,12 +47,12 @@
|
||||
<xpath expr="//div[@name='latest_statement']/.." position="attributes">
|
||||
<attribute name="t-if">dashboard.has_at_least_one_statement and dashboard.account_balance != dashboard.last_balance and !record.hide_bank_statement_balance.raw_value</attribute>
|
||||
</xpath>
|
||||
<!--
|
||||
<t t-esc="dashboard.outstanding_pay_account_balance" position="replace">
|
||||
<a name="open_outstanding_payments" type="object" title="Outstanding Payments/Receipts"><t t-esc="dashboard.outstanding_pay_account_balance"/></a>
|
||||
</t>
|
||||
</t> -->
|
||||
</field>
|
||||
</record>
|
||||
-->
|
||||
|
||||
<record id="view_account_journal_search" model="ir.ui.view">
|
||||
<field name="name">usability.account.journal.search</field>
|
||||
|
||||
@@ -81,6 +81,11 @@
|
||||
<field name="model">account.move</field>
|
||||
<field name="inherit_id" ref="account.view_account_invoice_filter"/>
|
||||
<field name="arch" type="xml">
|
||||
<filter name="invoice_date" position="before">
|
||||
<filter name="invoice" string="Invoices" domain="[('move_type', 'in', ('out_invoice', 'in_invoice'))]"/>
|
||||
<filter name="refund" string="Refunds" domain="[('move_type', 'in', ('out_refund', 'in_refund'))]"/>
|
||||
<separator/>
|
||||
</filter>
|
||||
<filter name="due_date" position="after">
|
||||
<separator/>
|
||||
<filter name="to_send" string="To Send" domain="[('is_move_sent', '=', False), ('state', '=', 'posted'), ('move_type', 'in', ('out_invoice', 'out_refund'))]"/>
|
||||
@@ -99,6 +104,16 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_account_move_filter" model="ir.ui.view">
|
||||
<field name="model">account.move</field>
|
||||
<field name="inherit_id" ref="account.view_account_move_filter"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="journal_id" position="after">
|
||||
<field name="search_account_id"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_move_line_form" model="ir.ui.view">
|
||||
<field name="model">account.move.line</field>
|
||||
<field name="inherit_id" ref="account.view_move_line_form"/>
|
||||
@@ -157,5 +172,12 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Inherit action called from button of account.account form view
|
||||
Make it similar to standard "Journal Items" menu account.action_account_moves_all_a -->
|
||||
<record id="account.action_move_line_select" model="ir.actions.act_window">
|
||||
<field name="domain">[('display_type', 'not in', ('line_section', 'line_note'))]</field>
|
||||
<field name="view_id" ref="account.view_move_line_tree"/>
|
||||
<field name="view_mode">tree,pivot,graph,kanban</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<notebook position="inside">
|
||||
<page string="Legal Terms" name="legal_terms">
|
||||
<group string="Invoice Legal Terms" name="static_invoice_terms">
|
||||
<field name="static_invoice_terms" nolabel="1"/>
|
||||
<field name="static_invoice_terms" nolabel="1" colspan="2"/>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
|
||||
20
account_usability_akretion/views/res_partner.xml
Normal file
20
account_usability_akretion/views/res_partner.xml
Normal file
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2014-2024 Akretion (http://www.akretion.com/)
|
||||
@author: Mourad EL HADJ MIMOUNE <mourad.elhadj.mimoune@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="view_partner_simple_form" model="ir.ui.view">
|
||||
<field name="name">base_usability.title.on.partner.simplified.form</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="account.view_partner_property_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='bank_ids']//field[@name='acc_number']" position="after">
|
||||
<field name="currency_id" optional="hide"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
@@ -2,7 +2,7 @@
|
||||
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import api, models, _
|
||||
from odoo import api, fields, models, _
|
||||
from dateutil.relativedelta import relativedelta
|
||||
from odoo.exceptions import UserError
|
||||
|
||||
@@ -10,6 +10,23 @@ from odoo.exceptions import UserError
|
||||
class AccountMoveReversal(models.TransientModel):
|
||||
_inherit = 'account.move.reversal'
|
||||
|
||||
already_reversed_warning = fields.Text(compute="_compute_already_reversed_warning")
|
||||
|
||||
@api.depends("move_ids")
|
||||
def _compute_already_reversed_warning(self):
|
||||
for wizard in self:
|
||||
moves = wizard.move_ids or self.env["account.move"].browse(self._context['active_ids'])
|
||||
reversed_moves = self.env["account.move"].search([('reversed_entry_id', 'in', moves.ids)])
|
||||
warning = ""
|
||||
for already_reversed_move in reversed_moves.reversed_entry_id:
|
||||
if warning:
|
||||
warning += "\n"
|
||||
reversed_by = " ; ".join(already_reversed_move.reversal_move_id.mapped("display_name"))
|
||||
move_detail = _("%s reversed by %s") % (already_reversed_move.display_name, reversed_by)
|
||||
warning += move_detail
|
||||
wizard.already_reversed_warning = warning or False
|
||||
|
||||
|
||||
# Set default reversal date to original move + 1 day
|
||||
# and raise error if original move has already been reversed
|
||||
@api.model
|
||||
@@ -20,10 +37,4 @@ class AccountMoveReversal(models.TransientModel):
|
||||
moves = amo.browse(self._context['active_ids'])
|
||||
if len(moves) == 1:
|
||||
res['date'] = moves.date + relativedelta(days=1)
|
||||
reversed_move = amo.search([('reversed_entry_id', 'in', moves.ids)], limit=1)
|
||||
if reversed_move:
|
||||
raise UserError(_(
|
||||
"Move '%s' has already been reversed by move '%s'.") % (
|
||||
reversed_move.reversed_entry_id.display_name,
|
||||
reversed_move.display_name))
|
||||
return res
|
||||
|
||||
24
account_usability_akretion/wizard/account_move_reversal.xml
Normal file
24
account_usability_akretion/wizard/account_move_reversal.xml
Normal file
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
|
||||
<record id="view_account_move_reversal" model="ir.ui.view">
|
||||
<field name="model">account.move.reversal</field>
|
||||
<field name="inherit_id" ref="account.view_account_move_reversal"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="residual" position="before">
|
||||
<div
|
||||
class="alert alert-warning"
|
||||
role="alert"
|
||||
attrs="{'invisible': [('already_reversed_warning', '=', False)]}"
|
||||
>
|
||||
You are about to reverse entries that have already been reversed or partially reversed (refund). Make sure it is intented.
|
||||
Already reversed entries are the following :
|
||||
<field
|
||||
name="already_reversed_warning"
|
||||
/>
|
||||
</div>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -15,7 +15,7 @@ class ResCompany(models.Model):
|
||||
|
||||
def _report_company_legal_name(self):
|
||||
self.ensure_one()
|
||||
if self.legal_type:
|
||||
if self.legal_type and not self.name.endswith(self.legal_type):
|
||||
name = '%s %s' % (self.name, self.legal_type)
|
||||
else:
|
||||
name = self.name
|
||||
|
||||
@@ -27,13 +27,13 @@ To use it, you need to do 2 or 3 things :
|
||||
|
||||
1) Add an entry in the domain field and the object you selected:
|
||||
|
||||
domain = fields.Selection(selection_add=[('risk.type', "Risk Type")], ondelete={"risk.type": "cascade"})
|
||||
domain = fields.Selection(selection_add=[('risk_type', "Risk Type")], ondelete={"risk_type": "cascade"})
|
||||
|
||||
2) Add the many2one field on your object:
|
||||
|
||||
risk_type_id = fields.Many2one(
|
||||
'dynamic.list', string="Risk Type",
|
||||
ondelete='restrict', domain=[('domain', '=', 'risk.type')])
|
||||
ondelete='restrict', domain=[('domain', '=', 'risk_type')])
|
||||
|
||||
|
||||
3) Optionally, you can add a dedicated action and a menu entry (otherwize, you can use the generic menu entry under *Settings > Technical > Dynamic Lists*:
|
||||
@@ -42,8 +42,8 @@ risk_type_id = fields.Many2one(
|
||||
<field name="name">Risk Type</field>
|
||||
<field name="res_model">dynamic.list</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('domain', '=', 'risk.type')]</field>
|
||||
<field name="context">{'default_domain': 'risk.type'}</field>
|
||||
<field name="domain">[('domain', '=', 'risk_type')]</field>
|
||||
<field name="context">{'default_domain': 'risk_type'}</field>
|
||||
</record>
|
||||
|
||||
<menuitem id="dynamic_list_risk_type_menu" action="dynamic_list_risk_type_action"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
{
|
||||
'name': 'Mail Sender Bcc',
|
||||
'version': '14.0.1.0.0',
|
||||
'version': '16.0.1.0.0',
|
||||
'category': 'Mail',
|
||||
'license': 'AGPL-3',
|
||||
'summary': "Always send a copy of the mail to the sender",
|
||||
@@ -17,5 +17,5 @@ With this module, when Odoo sends an outgoing email, it adds the sender as Bcc (
|
||||
'author': 'Akretion',
|
||||
'website': 'https://github.com/akretion/odoo-usability',
|
||||
'depends': ['base'],
|
||||
'installable': False,
|
||||
'installable': True,
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import models
|
||||
from odoo import models, tools
|
||||
|
||||
|
||||
class IrMailServer(models.Model):
|
||||
@@ -25,3 +25,13 @@ class IrMailServer(models.Model):
|
||||
message_id=message_id, references=references, object_id=object_id,
|
||||
subtype=subtype, headers=headers,
|
||||
body_alternative=body_alternative, subtype_alternative=subtype_alternative)
|
||||
|
||||
def _prepare_email_message(self, message, smtp_session):
|
||||
validated_to = self.env.context.get('send_validated_to') or []
|
||||
if message['Bcc']:
|
||||
email_bcc_normalized = tools.email_normalize_all(message['Bcc'])
|
||||
for email in email_bcc_normalized:
|
||||
if email not in validated_to:
|
||||
validated_to.append(email)
|
||||
return super(IrMailServer, self.with_context(send_validated_to=validated_to))._prepare_email_message(
|
||||
message, smtp_session)
|
||||
|
||||
@@ -4,13 +4,14 @@
|
||||
|
||||
from odoo import api, fields, models
|
||||
import re
|
||||
import logging
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class ResPartner(models.Model):
|
||||
_inherit = 'res.partner'
|
||||
|
||||
ref = fields.Char(copy=False) # To avoid blocking duplicate
|
||||
invalidate_display_name = fields.Boolean()
|
||||
|
||||
_sql_constraints = [(
|
||||
'ref_unique',
|
||||
@@ -19,7 +20,7 @@ class ResPartner(models.Model):
|
||||
)]
|
||||
|
||||
# add 'ref' in depends
|
||||
@api.depends('ref', 'invalidate_display_name')
|
||||
@api.depends('ref')
|
||||
def _compute_display_name(self):
|
||||
super()._compute_display_name()
|
||||
|
||||
@@ -28,7 +29,7 @@ class ResPartner(models.Model):
|
||||
name = partner.name or ''
|
||||
|
||||
# START modif of native method
|
||||
if partner.ref:
|
||||
if not self._context.get('show_address') and partner.ref:
|
||||
name = "[%s] %s" % (partner.ref, name)
|
||||
# END modif of native method
|
||||
if partner.company_name or partner.parent_id:
|
||||
@@ -39,7 +40,7 @@ class ResPartner(models.Model):
|
||||
# START modif of native name_get() method
|
||||
company_name = partner.commercial_company_name or\
|
||||
partner.sudo().parent_id.name
|
||||
if partner.parent_id.ref:
|
||||
if not self._context.get('show_address') and partner.parent_id.ref:
|
||||
company_name = "[%s] %s" % (partner.parent_id.ref, company_name)
|
||||
name = "%s, %s" % (company_name, name)
|
||||
# END modif of native name_get() method
|
||||
@@ -71,3 +72,12 @@ class ResPartner(models.Model):
|
||||
rec_childs = self.search([('id', 'child_of', recs.ids)])
|
||||
return rec_childs.name_get()
|
||||
return super().name_search(name=name, args=args, operator=operator, limit=limit)
|
||||
|
||||
@api.model
|
||||
def _script_invalidate_display_name(self):
|
||||
"""Script designed to regenerate the display_name"""
|
||||
logger.info('Start script to invalidate display_name')
|
||||
partners = self.with_context(active_test=False).search([])
|
||||
logger.info('Calling _compute_display_name on %d partners', len(partners))
|
||||
partners._compute_display_name()
|
||||
logger.info('End of the script to invalidate display_name')
|
||||
|
||||
@@ -9,4 +9,4 @@ def update_partner_display_name(cr, registry):
|
||||
env = api.Environment(cr, SUPERUSER_ID, {})
|
||||
partners = env['res.partner'].with_context(active_test=False).search(
|
||||
[('ref', '!=', False)])
|
||||
partners.write({'invalidate_display_name': True})
|
||||
partners._compute_display_name()
|
||||
|
||||
@@ -22,40 +22,9 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- show name and ref in separate columns -->
|
||||
<!-- ref is added in tree view by base_usability with optional="hide"
|
||||
<record id="view_partner_tree" model="ir.ui.view">
|
||||
<field name="name">Add ref in partner tree view</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="base.view_partner_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="display_name" position="after">
|
||||
<field name="name"/>
|
||||
<field name="ref" optional="hide"/>
|
||||
</field>
|
||||
<field name="display_name" position="attributes">
|
||||
<attribute name="invisible">1</attribute>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
-->
|
||||
|
||||
<!--
|
||||
The kanban view displays the field 'display_name', which has the [ref]
|
||||
prefix, so no need to add to the view
|
||||
<record id="res_partner_kanban_view" model="ir.ui.view">
|
||||
<field name="name">Add ref in partner kanban view</field>
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="base.res_partner_kanban_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="display_name" position="after">
|
||||
<field name="ref"/>
|
||||
</field>
|
||||
<li t-if="record.email.raw_value" position="after">
|
||||
<li t-if="record.ref.raw_value">Ref: <field name="ref"/></li>
|
||||
</li>
|
||||
</field>
|
||||
</record>
|
||||
Tree view: ref is added by base_usability with optional="hide"
|
||||
Kanban view: it displays the field 'display_name', which has the [ref] prefix
|
||||
-->
|
||||
|
||||
</odoo>
|
||||
|
||||
0
base_profile_akretion/__init__.py
Normal file
0
base_profile_akretion/__init__.py
Normal file
43
base_profile_akretion/__manifest__.py
Normal file
43
base_profile_akretion/__manifest__.py
Normal file
@@ -0,0 +1,43 @@
|
||||
# Copyright 2025 Akretion France (https://www.akretion.com)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
{
|
||||
'name': 'Base Profile by Akretion',
|
||||
'version': '16.0.1.0.0',
|
||||
'category': 'Tools',
|
||||
'license': 'AGPL-3',
|
||||
'summary': 'Base module set selected by Alexis de Lattre',
|
||||
'author': 'Akretion',
|
||||
'website': 'https://github.com/akretion/odoo-usability',
|
||||
'depends': [
|
||||
# PARTNER
|
||||
'partner_firstname', # OCA/partner-contact
|
||||
'partner_email_duplicate_warn', # OCA/partner-contact
|
||||
'partner_mobile_duplicate_warn', # OCA/partner-contact
|
||||
'contacts', # official addons
|
||||
# AUTH
|
||||
'auth_admin_passkey', # OCA/server-auth
|
||||
# REMOVE or FIX BAD NATIVE STUFF
|
||||
'disable_odoo_online', # OCA/server-brand
|
||||
'remove_odoo_enterprise', # OCA/server-brand
|
||||
'mail_debrand', # OCA/social
|
||||
'partner_disable_gravatar', # OCA/partner-contact
|
||||
'base_technical_features', # OCA/server-ux
|
||||
### WEB
|
||||
'web_responsive', # OCA/web
|
||||
'web_environment_ribbon', # OCA/web
|
||||
'web_no_bubble', # OCA/web
|
||||
'web_dialog_size', # OCA/web
|
||||
'web_chatter_position', # OCA/web
|
||||
### MISC
|
||||
'base_usability', # akretion/odoo-usability
|
||||
'mail_usability', # akretion/odoo-usability
|
||||
'eradicate_quick_create', # akretion/odoo-usability
|
||||
'base_company_extension', # akretion/odoo-usability
|
||||
# password_security will be enabled when the move to ir.config_parameter
|
||||
# will be backported
|
||||
#'password_security', # OCA/server-auth
|
||||
],
|
||||
'installable': True,
|
||||
}
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-03-27 10:15+0000\n"
|
||||
"PO-Revision-Date: 2024-03-27 10:15+0000\n"
|
||||
"POT-Creation-Date: 2024-07-04 13:46+0000\n"
|
||||
"PO-Revision-Date: 2024-07-04 13:46+0000\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -94,11 +94,21 @@ msgstr ""
|
||||
msgid "Field"
|
||||
msgstr ""
|
||||
|
||||
#. module: base_usability
|
||||
#: model:ir.model,name:base_usability.model_ir_model_fields
|
||||
msgid "Fields"
|
||||
msgstr ""
|
||||
|
||||
#. module: base_usability
|
||||
#: model_terms:ir.ui.view,arch_db:base_usability.res_country_search
|
||||
msgid "Group By"
|
||||
msgstr ""
|
||||
|
||||
#. module: base_usability
|
||||
#: model_terms:ir.ui.view,arch_db:base_usability.view_res_partner_filter
|
||||
msgid "Industry"
|
||||
msgstr ""
|
||||
|
||||
#. module: base_usability
|
||||
#: model_terms:ir.ui.view,arch_db:base_usability.view_module_filter
|
||||
msgid "Installable"
|
||||
|
||||
@@ -6,8 +6,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-03-27 10:15+0000\n"
|
||||
"PO-Revision-Date: 2024-03-27 10:15+0000\n"
|
||||
"POT-Creation-Date: 2024-07-04 13:47+0000\n"
|
||||
"PO-Revision-Date: 2024-07-04 13:47+0000\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -94,15 +94,25 @@ msgstr "EORI :"
|
||||
msgid "Field"
|
||||
msgstr "Champ"
|
||||
|
||||
#. module: base_usability
|
||||
#: model:ir.model,name:base_usability.model_ir_model_fields
|
||||
msgid "Fields"
|
||||
msgstr "Champs"
|
||||
|
||||
#. module: base_usability
|
||||
#: model_terms:ir.ui.view,arch_db:base_usability.res_country_search
|
||||
msgid "Group By"
|
||||
msgstr "Grouper par"
|
||||
|
||||
#. module: base_usability
|
||||
#: model_terms:ir.ui.view,arch_db:base_usability.view_res_partner_filter
|
||||
msgid "Industry"
|
||||
msgstr "Industrie"
|
||||
|
||||
#. module: base_usability
|
||||
#: model_terms:ir.ui.view,arch_db:base_usability.view_module_filter
|
||||
msgid "Installable"
|
||||
msgstr ""
|
||||
msgstr "Installable"
|
||||
|
||||
#. module: base_usability
|
||||
#: model:ir.model,name:base_usability.model_ir_mail_server
|
||||
@@ -119,7 +129,7 @@ msgstr "Portable :"
|
||||
#. module: base_usability
|
||||
#: model:ir.model,name:base_usability.model_ir_model
|
||||
msgid "Models"
|
||||
msgstr ""
|
||||
msgstr "Modèles"
|
||||
|
||||
#. module: base_usability
|
||||
#: model_terms:ir.ui.view,arch_db:base_usability.res_country_search
|
||||
@@ -181,7 +191,7 @@ msgstr "Tél :"
|
||||
#. module: base_usability
|
||||
#: model:ir.model,name:base_usability.model_res_users
|
||||
msgid "User"
|
||||
msgstr ""
|
||||
msgstr "Utilisateur"
|
||||
|
||||
#. module: base_usability
|
||||
#. odoo-python
|
||||
|
||||
@@ -5,3 +5,4 @@ from . import res_company
|
||||
from . import ir_mail_server
|
||||
from . import ir_model
|
||||
from . import ir_model_fields
|
||||
from . import misc
|
||||
|
||||
@@ -18,14 +18,24 @@ class IrMailServer(models.Model):
|
||||
smtp_ssl_certificate=None, smtp_ssl_private_key=None,
|
||||
smtp_debug=False, smtp_session=None):
|
||||
# Start copy from native method
|
||||
if not smtp_session:
|
||||
smtp_session = self.connect(
|
||||
smtp_server, smtp_port, smtp_user, smtp_password, smtp_encryption,
|
||||
smtp_from=message['From'], ssl_certificate=smtp_ssl_certificate,
|
||||
ssl_private_key=smtp_ssl_private_key,
|
||||
smtp_debug=smtp_debug, mail_server_id=mail_server_id)
|
||||
# _prepare_email_message() will remove the Bcc field in message
|
||||
# that's why we need to save it and re-inject it in message
|
||||
email_bcc = message['Bcc']
|
||||
smtp_from, smtp_to_list, message = self._prepare_email_message(
|
||||
message, smtp_session)
|
||||
message['Bcc'] = email_bcc
|
||||
# End copy from native method
|
||||
logger.info(
|
||||
"Sending email from '%s' to '%s' Cc '%s' Bcc '%s' "
|
||||
"with subject '%s'",
|
||||
"with subject '%s'. smtp_to_list=%s",
|
||||
smtp_from, message.get('To'), message.get('Cc'),
|
||||
message.get('Bcc'), message.get('Subject'))
|
||||
message.get('Bcc'), message.get('Subject'), smtp_to_list)
|
||||
return super().send_email(
|
||||
message, mail_server_id=mail_server_id,
|
||||
smtp_server=smtp_server, smtp_port=smtp_port,
|
||||
|
||||
36
base_usability/models/misc.py
Normal file
36
base_usability/models/misc.py
Normal file
@@ -0,0 +1,36 @@
|
||||
# Copyright 2016-2025 Akretion France (https://www.akretion.com/)
|
||||
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import models
|
||||
from odoo.tools import misc, float_compare
|
||||
|
||||
|
||||
class BaseUsabilityInstalled(models.AbstractModel):
|
||||
_name = "base.usability.installed"
|
||||
_description = "Base Usability Installed"
|
||||
|
||||
|
||||
formatLang_original = misc.formatLang
|
||||
|
||||
|
||||
def formatLang(
|
||||
env, value, digits=None, grouping=True,
|
||||
monetary=False, dp=False, currency_obj=False, int_no_digits=True):
|
||||
if (
|
||||
'base.usability.installed' in env and
|
||||
int_no_digits and
|
||||
not monetary and
|
||||
isinstance(value, float) and
|
||||
dp):
|
||||
prec = env['decimal.precision'].precision_get(dp)
|
||||
if not float_compare(value, int(value), precision_digits=prec):
|
||||
digits = 0
|
||||
dp = False
|
||||
res = formatLang_original(
|
||||
env, value, digits=digits, grouping=grouping,
|
||||
monetary=monetary, dp=dp, currency_obj=currency_obj)
|
||||
return res
|
||||
|
||||
|
||||
misc.formatLang = formatLang
|
||||
@@ -69,6 +69,10 @@ class ResCompany(models.Model):
|
||||
'value': hasattr(self, 'siren') and self.siren or False,
|
||||
'label': _('SIREN:'),
|
||||
},
|
||||
'rcs_siren': {
|
||||
'value': hasattr(self, 'siren') and self.siren and self.company_registry and f"{self.company_registry} {self.siren}",
|
||||
'label': 'RCS',
|
||||
},
|
||||
'eori': {
|
||||
'value': self._get_eori(),
|
||||
'label': _('EORI:'),
|
||||
@@ -82,6 +86,13 @@ class ResCompany(models.Model):
|
||||
# 'legal_type' added by base_company_extension
|
||||
if hasattr(self, 'legal_type') and self.legal_type:
|
||||
options['capital']['label'] = _('%s with a capital of') % self.legal_type
|
||||
# 'fax' added by OCA/partner-contact module 'partner_fax'
|
||||
if hasattr(self.partner_id, 'fax'):
|
||||
options['fax'] = {
|
||||
'value': self.partner_id.fax or False,
|
||||
'icon': '\U0001F5B7',
|
||||
'label': _('Fax:'),
|
||||
}
|
||||
return options
|
||||
|
||||
def _get_eori(self):
|
||||
@@ -102,7 +113,7 @@ class ResCompany(models.Model):
|
||||
"""This method is designed to be inherited"""
|
||||
# I decided not to put email in the default header because only a few very small
|
||||
# companies have a generic company email address
|
||||
line_details = [['phone', 'website', 'capital'], ['vat', 'siret', 'eori', 'ape']]
|
||||
line_details = [['phone', 'website', 'rcs_siren', 'capital'], ['vat', 'siret', 'eori', 'ape']]
|
||||
return line_details
|
||||
|
||||
# for reports
|
||||
|
||||
@@ -125,6 +125,20 @@ class ResPartner(models.Model):
|
||||
'label': _('Supplier Number:'),
|
||||
},
|
||||
}
|
||||
if hasattr(self, 'siren'):
|
||||
options['siren'] = {
|
||||
'value': self.siren,
|
||||
'label': _("SIREN:"),
|
||||
}
|
||||
if hasattr(self, 'siret'):
|
||||
if hasattr(self, 'siren'): # l10n_fr_siret is installed
|
||||
siret = self.siren and self.nic and self.siret or False
|
||||
else:
|
||||
siret = self.siret
|
||||
options['siret'] = {
|
||||
'value': siret,
|
||||
'label': _("SIRET:"),
|
||||
}
|
||||
res = []
|
||||
for detail in details:
|
||||
if options.get(detail) and options[detail]['value']:
|
||||
|
||||
@@ -20,6 +20,9 @@
|
||||
<div attrs="{'invisible': [('same_vat_partner_id', '=', False)]}" position="attributes">
|
||||
<attribute name="class">alert alert-warning</attribute>
|
||||
</div>
|
||||
<field name="industry_id" position="attributes">
|
||||
<attribute name="attrs">{'invisible': [('parent_id', '!=', False)]}</attribute>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -39,12 +42,30 @@
|
||||
<field name="model">res.partner</field>
|
||||
<field name="inherit_id" ref="base.view_partner_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<!-- By default, the tree view shows the field translated_display_name which is NOT stored
|
||||
so the user cannot order by this column. I prefer to show display_name which is
|
||||
a stored field. If the experience shows that some people prefer the native behavior
|
||||
we'll go back to display translated_display_name -->
|
||||
<field name="translated_display_name" position="attributes">
|
||||
<attribute name="invisible">1</attribute>
|
||||
</field>
|
||||
<field name="display_name" position="attributes">
|
||||
<attribute name="invisible">0</attribute>
|
||||
</field>
|
||||
<field name="display_name" position="after">
|
||||
<field name="ref" optional="hide"/>
|
||||
</field>
|
||||
<field name="phone" position="after">
|
||||
<field name="mobile" optional="show" widget="phone" class="o_force_ltr"/>
|
||||
</field>
|
||||
<field name="city" position="before">
|
||||
<field name="street" optional="hide"/>
|
||||
<field name="street2" optional="hide"/>
|
||||
<field name="zip" optional="hide"/>
|
||||
</field>
|
||||
<field name="category_id" position="after">
|
||||
<field name="industry_id" optional="hide"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -58,6 +79,9 @@
|
||||
<!-- for 'ref', change '=' to 'start with' -->
|
||||
<attribute name="filter_domain">['|', '|', '|', '|', ('display_name', 'ilike', self), ('ref', '=ilike', self + '%'), ('email', 'ilike', self), ('vat', 'ilike', self), ('company_registry', 'ilike', self)]</attribute>
|
||||
</field>
|
||||
<group name="group_by" position="inside">
|
||||
<filter name="group_industry" string="Industry" context="{'group_by': 'industry_id'}"/>
|
||||
</group>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
14
base_usability/web-buttons_14_max_instead_of_7.diff
Normal file
14
base_usability/web-buttons_14_max_instead_of_7.diff
Normal file
@@ -0,0 +1,14 @@
|
||||
diff --git a/addons/web/static/src/views/form/button_box/button_box.js b/addons/web/static/src/views/form/button_box/button_box.js
|
||||
index 0dd1184ca2b..43139ab6e58 100644
|
||||
--- a/addons/web/static/src/views/form/button_box/button_box.js
|
||||
+++ b/addons/web/static/src/views/form/button_box/button_box.js
|
||||
@@ -8,7 +8,8 @@ import { Component } from "@odoo/owl";
|
||||
export class ButtonBox extends Component {
|
||||
setup() {
|
||||
const ui = useService("ui");
|
||||
- this.getMaxButtons = () => [2, 2, 2, 4][ui.size] || 7;
|
||||
+ /* HACK button box on 2 lines: || 7 => || 14 */
|
||||
+ this.getMaxButtons = () => [2, 2, 2, 4][ui.size] || 14;
|
||||
}
|
||||
|
||||
getButtons() {
|
||||
@@ -1,21 +0,0 @@
|
||||
diff --git a/addons/web/controllers/export.py b/addons/web/controllers/export.py
|
||||
index 5a1bbcb6b02..04c70131660 100644
|
||||
--- a/addons/web/controllers/export.py
|
||||
+++ b/addons/web/controllers/export.py
|
||||
@@ -308,7 +308,6 @@ class Export(http.Controller):
|
||||
def get_fields(self, model, prefix='', parent_name='',
|
||||
import_compat=True, parent_field_type=None,
|
||||
parent_field=None, exclude=None):
|
||||
-
|
||||
fields = self.fields_get(model)
|
||||
if import_compat:
|
||||
if parent_field_type in ['many2one', 'many2many']:
|
||||
@@ -347,7 +346,7 @@ class Export(http.Controller):
|
||||
# Add name field when expand m2o and m2m fields in import-compatible mode
|
||||
val = prefix
|
||||
name = parent_name + (parent_name and '/' or '') + field['string']
|
||||
- record = {'id': ident, 'string': name,
|
||||
+ record = {'id': ident, 'string': name + f' ({field_name})',
|
||||
'value': val, 'children': False,
|
||||
'field_type': field.get('type'),
|
||||
'required': field.get('required'),
|
||||
3
commission_simple/__init__.py
Normal file
3
commission_simple/__init__.py
Normal file
@@ -0,0 +1,3 @@
|
||||
from . import models
|
||||
from . import wizards
|
||||
from . import reports
|
||||
47
commission_simple/__manifest__.py
Normal file
47
commission_simple/__manifest__.py
Normal file
@@ -0,0 +1,47 @@
|
||||
# Copyright 2019-2024 Akretion France (http://www.akretion.com)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
{
|
||||
'name': 'Commission Simple',
|
||||
'version': '16.0.1.0.0',
|
||||
'category': 'Sales',
|
||||
'license': 'AGPL-3',
|
||||
'summary': 'Compute commissions for salesman',
|
||||
'description': """
|
||||
Commission Simple
|
||||
=================
|
||||
|
||||
This module is a **simple** module to compute commission for salesman. From my experience, companies often use very specific methods to compute commissions and it's impossible to develop a module that can support all of them. So the goal of this module is just to have a simple base to build the company-specific commissionning system by inheriting this simple module.
|
||||
|
||||
Here is a short description of this module:
|
||||
|
||||
* create commission profiles using rules (per product category, per product, per product and customer, etc.),
|
||||
* the commission rules can have a start and end date (optional),
|
||||
* commissionning can happen on invoicing or on payment,
|
||||
* each invoice line can only be commissionned to one salesman,
|
||||
* commission reports are stored in Odoo.
|
||||
|
||||
This module has been written by Alexis de Lattre from Akretion
|
||||
<alexis.delattre@akretion.com>.
|
||||
""",
|
||||
'author': 'Akretion',
|
||||
'website': 'https://github.com/akretion/odoo-usability',
|
||||
'depends': [
|
||||
'account',
|
||||
'date_range',
|
||||
'report_xlsx',
|
||||
],
|
||||
'data': [
|
||||
'security/ir.model.access.csv',
|
||||
'security/rule.xml',
|
||||
'reports/report.xml',
|
||||
'data/decimal_precision.xml',
|
||||
'views/commission_profile.xml',
|
||||
'views/commission_rule.xml',
|
||||
'views/commission_result.xml',
|
||||
'views/account_move_line.xml',
|
||||
'wizards/commission_compute_view.xml',
|
||||
],
|
||||
'installable': True,
|
||||
}
|
||||
11
commission_simple/data/decimal_precision.xml
Normal file
11
commission_simple/data/decimal_precision.xml
Normal file
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo noupdate="1">
|
||||
|
||||
|
||||
<record forcecreate="True" id="commission_rate" model="decimal.precision">
|
||||
<field name="name">Commission Rate</field>
|
||||
<field name="digits">2</field>
|
||||
</record>
|
||||
|
||||
|
||||
</odoo>
|
||||
801
commission_simple/i18n/fr.po
Normal file
801
commission_simple/i18n/fr.po
Normal file
@@ -0,0 +1,801 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * commission_simple
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2025-09-02 11:22+0000\n"
|
||||
"PO-Revision-Date: 2025-09-02 11:23+0000\n"
|
||||
"Last-Translator: Alexis de Lattre <alexis.delattre@akretion.com>\n"
|
||||
"Language-Team: \n"
|
||||
"Language: fr\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.actions.report,print_report_name:commission_simple.commission_result_xlsx_report
|
||||
msgid ""
|
||||
"'commission-%s-%s' % (object.date_range_id.name.replace(' ', '_'), object."
|
||||
"partner_id.name.replace(' ', '_'))"
|
||||
msgstr ""
|
||||
"'commission-%s-%s' % (object.date_range_id.name.replace(' ', '_'), object."
|
||||
"partner_id.name.replace(' ', '_'))"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.constraint,message:commission_simple.constraint_commission_result_salesman_period_company_unique
|
||||
msgid ""
|
||||
"A commission result already exists for this salesman/agent for the same "
|
||||
"period."
|
||||
msgstr ""
|
||||
"Un état des commissions existe déjà pour ce vendeur/agent pour la même "
|
||||
"période."
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/models/commission_profile.py:0
|
||||
#, python-format
|
||||
msgid "A salesman must be selected when the assignment type is 'Salesman'."
|
||||
msgstr ""
|
||||
"Un vendeur doit être sélectionné lorsque le type d'affectation est "
|
||||
"\"Vendeur\"."
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/models/commission_rule.py:0
|
||||
#, python-format
|
||||
msgid "AND"
|
||||
msgstr "ET"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__message_needaction
|
||||
msgid "Action Needed"
|
||||
msgstr "Action requise"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile__active
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__active
|
||||
msgid "Active"
|
||||
msgstr "Actif"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__activity_ids
|
||||
msgid "Activities"
|
||||
msgstr "Activités"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__activity_exception_decoration
|
||||
msgid "Activity Exception Decoration"
|
||||
msgstr "Style d'affichage de l'activité-alerte"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__activity_state
|
||||
msgid "Activity State"
|
||||
msgstr "État de l'activité"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__activity_type_icon
|
||||
msgid "Activity Type Icon"
|
||||
msgstr "Îcone du type d'activité"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__applied_on
|
||||
msgid "Apply On"
|
||||
msgstr "Conditions"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_profile_form
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_rule_search
|
||||
msgid "Archived"
|
||||
msgstr "Archivé"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_form
|
||||
msgid "Are you sure you want to go back to draft?"
|
||||
msgstr "Êtes-vous sûr de vouloir revenir à l'état brouillon ?"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__assign_type
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_search
|
||||
msgid "Assign Type"
|
||||
msgstr "Type d'affectation"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile__assign_ids
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_profile_form
|
||||
msgid "Assignments"
|
||||
msgstr "Assignations"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__message_attachment_count
|
||||
msgid "Attachment Count"
|
||||
msgstr "Nombre de pièces jointes"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_form
|
||||
msgid "Back to Draft"
|
||||
msgstr "Remettre en brouillon"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_compute_form
|
||||
msgid "Cancel"
|
||||
msgstr "Annuler"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.view_move_line_form
|
||||
msgid "Commission"
|
||||
msgstr "Commission"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_account_move_line__commission_amount
|
||||
#, python-format
|
||||
msgid "Commission Amount"
|
||||
msgstr "Montant de la commission"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_account_move_line__commission_base
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__base
|
||||
#, python-format
|
||||
msgid "Commission Base"
|
||||
msgstr "Base de la commission"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__line_ids
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_form
|
||||
msgid "Commission Lines"
|
||||
msgstr "Lignes de commission"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_compute__date_range_type_id
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_res_company__commission_date_range_type_id
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_res_config_settings__commission_date_range_type_id
|
||||
msgid "Commission Periodicity"
|
||||
msgstr "Périodicité des commissions"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model,name:commission_simple.model_commission_profile
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__profile_id
|
||||
msgid "Commission Profile"
|
||||
msgstr "Profil de commission"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model,name:commission_simple.model_commission_profile_assignment
|
||||
msgid "Commission Profile Assignment"
|
||||
msgstr "Affectation des profils de commission"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.actions.act_window,name:commission_simple.commission_profile_action
|
||||
#: model:ir.ui.menu,name:commission_simple.commission_profile_menu
|
||||
msgid "Commission Profiles"
|
||||
msgstr "Profils de commission"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_account_move_line__commission_rate
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__rate
|
||||
#, python-format
|
||||
msgid "Commission Rate"
|
||||
msgstr "Taux de commission"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model,name:commission_simple.model_commission_result
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_account_move_line__commission_result_id
|
||||
msgid "Commission Result"
|
||||
msgstr "État des commissions"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model,name:commission_simple.model_report_commission_simple_report_xlsx
|
||||
msgid "Commission Result XLSX"
|
||||
msgstr "État des commission XLSX"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model,name:commission_simple.model_commission_rule
|
||||
msgid "Commission Rule"
|
||||
msgstr "Règle de commission"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.actions.act_window,name:commission_simple.commission_rule_action
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile__rule_ids
|
||||
#: model:ir.ui.menu,name:commission_simple.commission_rule_menu
|
||||
msgid "Commission Rules"
|
||||
msgstr "Règles de commission"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__amount_total
|
||||
msgid "Commission Total"
|
||||
msgstr "Total des commissions"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.actions.act_window,name:commission_simple.commission_result_action
|
||||
#: model:ir.ui.menu,name:commission_simple.commission_config_root
|
||||
#: model:ir.ui.menu,name:commission_simple.commission_result_menu
|
||||
#: model:ir.ui.menu,name:commission_simple.commission_root
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.res_config_settings_view_form
|
||||
msgid "Commissions"
|
||||
msgstr "Commissions"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/wizards/commission_compute.py:0
|
||||
#, python-format
|
||||
msgid "Commissions already exist for %(period)s in company %(company)s."
|
||||
msgstr ""
|
||||
"Des commissions existent déjà pour %(period)s dans la société %(company)s."
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#, python-format
|
||||
msgid "Commissions of %(partner)s for period %(period)s"
|
||||
msgstr "Commissions de %(partner)s pour la période %(period)s"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model,name:commission_simple.model_res_company
|
||||
msgid "Companies"
|
||||
msgstr "Sociétés"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_compute__company_id
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile__company_id
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile_assignment__company_id
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__company_id
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__company_id
|
||||
msgid "Company"
|
||||
msgstr "Société"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__company_currency_id
|
||||
msgid "Company Currency"
|
||||
msgstr "Devise de la société"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_compute_form
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_rule_form
|
||||
msgid "Compute"
|
||||
msgstr "Calculer"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.actions.act_window,name:commission_simple.commission_compute_action
|
||||
#: model:ir.model,name:commission_simple.model_commission_compute
|
||||
#: model:ir.ui.menu,name:commission_simple.commission_compute_menu
|
||||
msgid "Compute Commissions"
|
||||
msgstr "Calculer les commissions"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model,name:commission_simple.model_res_config_settings
|
||||
msgid "Config Settings"
|
||||
msgstr "Configuration"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_form
|
||||
msgid "Confirm"
|
||||
msgstr "Confirmer"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_compute__create_uid
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile__create_uid
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile_assignment__create_uid
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__create_uid
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__create_uid
|
||||
msgid "Created by"
|
||||
msgstr "Créé par"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_compute__create_date
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile__create_date
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile_assignment__create_date
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__create_date
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__create_date
|
||||
msgid "Created on"
|
||||
msgstr "Créé le"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#, python-format
|
||||
msgid "Currency"
|
||||
msgstr "Devise"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#, python-format
|
||||
msgid "Customer"
|
||||
msgstr "Client"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__partner_ids
|
||||
msgid "Customers"
|
||||
msgstr "Clients"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/models/commission_rule.py:0
|
||||
#, python-format
|
||||
msgid "Customers:"
|
||||
msgstr "Clients :"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_form
|
||||
msgid "Disc.%"
|
||||
msgstr "Rem.%"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_compute__display_name
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile__display_name
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile_assignment__display_name
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__display_name
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__display_name
|
||||
msgid "Display Name"
|
||||
msgstr "Nom affiché"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields.selection,name:commission_simple.selection__commission_result__state__done
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_search
|
||||
msgid "Done"
|
||||
msgstr "Terminé"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields.selection,name:commission_simple.selection__commission_result__state__draft
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_search
|
||||
msgid "Draft"
|
||||
msgstr "Brouillon"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.actions.report,name:commission_simple.commission_result_xlsx_report
|
||||
msgid "Détails Excel"
|
||||
msgstr "Détails Excel"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__date_end
|
||||
#, python-format
|
||||
msgid "End Date"
|
||||
msgstr "Date de fin"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_compute__date_end
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__date_end
|
||||
msgid "End date"
|
||||
msgstr "Date de fin"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_form
|
||||
msgid "Excel Export"
|
||||
msgstr "Export Excel"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__message_follower_ids
|
||||
msgid "Followers"
|
||||
msgstr "Abonnés"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__message_partner_ids
|
||||
msgid "Followers (Partners)"
|
||||
msgstr "Abonnés (partenaires)"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,help:commission_simple.field_commission_result__activity_type_icon
|
||||
msgid "Font awesome icon e.g. fa-tasks"
|
||||
msgstr "Îcone font-awesome, par exemple fa-task"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#, python-format
|
||||
msgid "Generated from Odoo on %s by %s"
|
||||
msgstr "Généré à partir d'Odoo le %s par %s"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/models/commission_rule.py:0
|
||||
#: model:ir.model.fields.selection,name:commission_simple.selection__commission_rule__applied_on__4_global
|
||||
#, python-format
|
||||
msgid "Global"
|
||||
msgstr "Global"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__has_message
|
||||
msgid "Has Message"
|
||||
msgstr "A un message"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_compute__id
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile__id
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile_assignment__id
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__id
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__id
|
||||
msgid "ID"
|
||||
msgstr "ID"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__activity_exception_icon
|
||||
msgid "Icon"
|
||||
msgstr "Îcone"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,help:commission_simple.field_commission_result__activity_exception_icon
|
||||
msgid "Icon to indicate an exception activity."
|
||||
msgstr "Îcone pour indiquer une activité-alerte"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,help:commission_simple.field_commission_result__message_needaction
|
||||
msgid "If checked, new messages require your attention."
|
||||
msgstr "Si activé, de nouveaux messages nécessitent votre attention."
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,help:commission_simple.field_commission_result__message_has_error
|
||||
msgid "If checked, some messages have a delivery error."
|
||||
msgstr "Si activé, des messages ont une erreur d'envoi."
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields.selection,name:commission_simple.selection__commission_profile__trigger_type__in_payment
|
||||
msgid "In Payment and Paid"
|
||||
msgstr "En paiement et payé"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#, python-format
|
||||
msgid "Invoice"
|
||||
msgstr "Facture"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#, python-format
|
||||
msgid "Invoice Date"
|
||||
msgstr "Date de facture"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields.selection,name:commission_simple.selection__commission_profile__trigger_type__invoice
|
||||
msgid "Invoiced"
|
||||
msgstr "Facturé"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields.selection,name:commission_simple.selection__commission_rule__base__invoiced
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_form
|
||||
msgid "Invoiced Amount"
|
||||
msgstr "Montant facturé"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__message_is_follower
|
||||
msgid "Is Follower"
|
||||
msgstr "Est abonné"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model,name:commission_simple.model_account_move_line
|
||||
msgid "Journal Item"
|
||||
msgstr "Écriture comptable"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_compute____last_update
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile____last_update
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile_assignment____last_update
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result____last_update
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule____last_update
|
||||
msgid "Last Modified on"
|
||||
msgstr "Dernière modification le"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_compute__write_uid
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile__write_uid
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile_assignment__write_uid
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__write_uid
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__write_uid
|
||||
msgid "Last Updated by"
|
||||
msgstr "Dernière mise à jour par"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_compute__write_date
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile__write_date
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile_assignment__write_date
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__write_date
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__write_date
|
||||
msgid "Last Updated on"
|
||||
msgstr "Dernière mise à jour le"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__message_main_attachment_id
|
||||
msgid "Main Attachment"
|
||||
msgstr "Pièce jointe principale"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields.selection,name:commission_simple.selection__commission_rule__base__margin
|
||||
msgid "Margin"
|
||||
msgstr "Marge"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_rule_form
|
||||
msgid "Match"
|
||||
msgstr "Correspondance"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__apply_description
|
||||
msgid "Match Criteria"
|
||||
msgstr "Critères de correspondance"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_account_move_line__commission_rule_id
|
||||
msgid "Matched Commission Rule"
|
||||
msgstr "Règle de commission associée"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__message_has_error
|
||||
msgid "Message Delivery error"
|
||||
msgstr "Erreur d'envoi du message"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__message_ids
|
||||
msgid "Messages"
|
||||
msgstr "Messages"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__my_activity_date_deadline
|
||||
msgid "My Activity Deadline"
|
||||
msgstr "Date butoir de l'activité"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile__name
|
||||
msgid "Name of the Profile"
|
||||
msgstr "Nom du profil"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__activity_calendar_event_id
|
||||
msgid "Next Activity Calendar Event"
|
||||
msgstr "Prochaine activité du calendrier"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__activity_date_deadline
|
||||
msgid "Next Activity Deadline"
|
||||
msgstr "Date butoir de l'activité suivante"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__activity_summary
|
||||
msgid "Next Activity Summary"
|
||||
msgstr "Résumé de l'activité suivante"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__activity_type_id
|
||||
msgid "Next Activity Type"
|
||||
msgstr "Type de l'activité suivante"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/wizards/commission_compute.py:0
|
||||
#, python-format
|
||||
msgid "No commissions generated."
|
||||
msgstr "Aucune commission n'a été générée."
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__message_needaction_counter
|
||||
msgid "Number of Actions"
|
||||
msgstr "Nombre d'actions"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__message_has_error_counter
|
||||
msgid "Number of errors"
|
||||
msgstr "Nombre d'erreurs"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,help:commission_simple.field_commission_result__message_needaction_counter
|
||||
msgid "Number of messages requiring action"
|
||||
msgstr "Nombre de messages nécessitant une action"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,help:commission_simple.field_commission_result__message_has_error_counter
|
||||
msgid "Number of messages with delivery error"
|
||||
msgstr "Nombre de messages en échec d'envoi"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields.selection,name:commission_simple.selection__commission_profile__trigger_type__paid
|
||||
msgid "Paid"
|
||||
msgstr "Payé"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_compute__date_range_id
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__date_range_id
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_search
|
||||
msgid "Period"
|
||||
msgstr "Période"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_form
|
||||
msgid "Price"
|
||||
msgstr "Prix"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#, python-format
|
||||
msgid "Product"
|
||||
msgstr "Produit"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__product_categ_ids
|
||||
#: model:ir.model.fields.selection,name:commission_simple.selection__commission_rule__applied_on__3_product_category
|
||||
msgid "Product Categories"
|
||||
msgstr "Catégories de produits"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields.selection,name:commission_simple.selection__commission_rule__applied_on__1_customer_product_category
|
||||
msgid "Product Categories and Customers"
|
||||
msgstr "Catégories de produits et clients"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/models/commission_rule.py:0
|
||||
#, python-format
|
||||
msgid "Product Categories:"
|
||||
msgstr "Catégories de produits :"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_account_move_line__product_categ_id
|
||||
msgid "Product Category"
|
||||
msgstr "Catégorie de produit"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__product_ids
|
||||
#: model:ir.model.fields.selection,name:commission_simple.selection__commission_rule__applied_on__2_product
|
||||
msgid "Products"
|
||||
msgstr "Produits"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields.selection,name:commission_simple.selection__commission_rule__applied_on__0_customer_product
|
||||
msgid "Products and Customers"
|
||||
msgstr "Produits et clients"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/models/commission_rule.py:0
|
||||
#, python-format
|
||||
msgid "Products:"
|
||||
msgstr "Produits :"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile_assignment__profile_id
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__profile_id
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_rule_search
|
||||
msgid "Profile"
|
||||
msgstr "Profil"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#, python-format
|
||||
msgid "Quantity"
|
||||
msgstr "Quantité"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_form
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_rule_tree
|
||||
msgid "Rate (%)"
|
||||
msgstr "Taux (%)"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.constraint,message:commission_simple.constraint_commission_rule_rate_positive
|
||||
msgid "Rate must be positive !"
|
||||
msgstr "Le taux doit être positif !"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__activity_user_id
|
||||
msgid "Responsible User"
|
||||
msgstr "Utilisateur responsable"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_profile_form
|
||||
msgid "Rules"
|
||||
msgstr "Règles"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/models/commission_profile.py:0
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile_assignment__user_id
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple.commission_result_search
|
||||
#, python-format
|
||||
msgid "Salesman"
|
||||
msgstr "Vendeur"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__partner_id
|
||||
msgid "Salesman/Agent"
|
||||
msgstr "Vendeur/Agent"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile__sequence
|
||||
msgid "Sequence"
|
||||
msgstr "Séquence"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_rule__date_start
|
||||
#, python-format
|
||||
msgid "Start Date"
|
||||
msgstr "Date de début"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_compute__date_start
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__date_start
|
||||
msgid "Start date"
|
||||
msgstr "Date de début"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__state
|
||||
msgid "State"
|
||||
msgstr "État"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,help:commission_simple.field_commission_result__activity_state
|
||||
msgid ""
|
||||
"Status based on activities\n"
|
||||
"Overdue: Due date is already passed\n"
|
||||
"Today: Activity date is today\n"
|
||||
"Planned: Future activities."
|
||||
msgstr ""
|
||||
"Statut basé sur les activités\n"
|
||||
"En retard : La date d'échéance est déjà dépassée\n"
|
||||
"Aujourd'hui : La date de l'activité est aujourd'hui\n"
|
||||
"Planifié : Activités futures."
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.constraint,message:commission_simple.constraint_commission_profile_assignment_company_user_uniq
|
||||
msgid "This salesman already has an assignment in this company."
|
||||
msgstr "Ce vendeur a déjà une assignation dans cette société."
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#, python-format
|
||||
msgid "Total Amount"
|
||||
msgstr "Montant total"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile__trigger_type
|
||||
msgid "Trigger"
|
||||
msgstr "Déclencheur"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_profile_assignment__assign_type
|
||||
msgid "Type"
|
||||
msgstr "Type"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,help:commission_simple.field_commission_result__activity_exception_decoration
|
||||
msgid "Type of the exception activity on record."
|
||||
msgstr "Type de l'activité-alerte sur l'enregistrement."
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/reports/commission_result_xlsx.py:0
|
||||
#, python-format
|
||||
msgid "Unit"
|
||||
msgstr "Unité"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,field_description:commission_simple.field_commission_result__website_message_ids
|
||||
msgid "Website Messages"
|
||||
msgstr "Messages du site Web"
|
||||
|
||||
#. module: commission_simple
|
||||
#: model:ir.model.fields,help:commission_simple.field_commission_result__website_message_ids
|
||||
msgid "Website communication history"
|
||||
msgstr "Historique des échanges sur le site Web"
|
||||
|
||||
#. module: commission_simple
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple/models/commission_result.py:0
|
||||
#, python-format
|
||||
msgid "You cannot delete commission result %s because it is in done state."
|
||||
msgstr ""
|
||||
"Vous ne pouvez pas supprimer l'état de commission %s parce qu'il est "
|
||||
"à l'état \"terminé\"."
|
||||
5
commission_simple/models/__init__.py
Normal file
5
commission_simple/models/__init__.py
Normal file
@@ -0,0 +1,5 @@
|
||||
from . import commission_profile
|
||||
from . import commission_rule
|
||||
from . import commission_result
|
||||
from . import account_move_line
|
||||
from . import account_invoice_report
|
||||
17
commission_simple/models/account_invoice_report.py
Normal file
17
commission_simple/models/account_invoice_report.py
Normal file
@@ -0,0 +1,17 @@
|
||||
# Copyright 2018-2019 Akretion France (http://www.akretion.com)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import api, fields, models
|
||||
|
||||
|
||||
class AccountInvoiceReport(models.Model):
|
||||
_inherit = 'account.invoice.report'
|
||||
|
||||
commission_amount = fields.Float(readonly=True)
|
||||
|
||||
@api.model
|
||||
def _select(self):
|
||||
select_str = super()._select()
|
||||
select_str += ", line.commission_amount * currency_table.rate AS commission_amount"
|
||||
return select_str
|
||||
105
commission_simple/models/account_move_line.py
Normal file
105
commission_simple/models/account_move_line.py
Normal file
@@ -0,0 +1,105 @@
|
||||
# Copyright 2019-2024 Akretion France (http://www.akretion.com/)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
|
||||
from odoo import api, fields, models
|
||||
from odoo.tools import float_is_zero
|
||||
|
||||
|
||||
class AccountMoveLine(models.Model):
|
||||
_inherit = 'account.move.line'
|
||||
|
||||
commission_result_id = fields.Many2one(
|
||||
'commission.result', string='Commission Result', check_company=True, index=True)
|
||||
commission_rule_id = fields.Many2one(
|
||||
'commission.rule', 'Matched Commission Rule', ondelete='restrict', check_company=True)
|
||||
commission_base = fields.Monetary('Commission Base', currency_field='company_currency_id')
|
||||
commission_rate = fields.Float('Commission Rate', digits='Commission Rate')
|
||||
commission_amount = fields.Monetary(
|
||||
string='Commission Amount', currency_field='company_currency_id',
|
||||
readonly=True, compute='_compute_commission_amount', store=True)
|
||||
# to display on commission line
|
||||
product_categ_id = fields.Many2one(
|
||||
related='product_id.product_tmpl_id.categ_id')
|
||||
|
||||
@api.depends('commission_rate', 'commission_base')
|
||||
def _compute_commission_amount(self):
|
||||
for line in self:
|
||||
commission_amount = False
|
||||
if line.display_type == 'product':
|
||||
commission_amount = line.company_currency_id.round(
|
||||
line.commission_rate * line.commission_base / 100.0)
|
||||
line.commission_amount = commission_amount
|
||||
|
||||
def _match_commission_rule(self, rules):
|
||||
# commission rules are already in the right order
|
||||
self.ensure_one()
|
||||
for rule in rules:
|
||||
if rule['date_start'] and rule['date_start'] > self.date:
|
||||
continue
|
||||
if rule['date_end'] and rule['date_end'] < self.date:
|
||||
continue
|
||||
if rule['applied_on'] == '0_customer_product':
|
||||
if (
|
||||
self.partner_id.id in
|
||||
rule['partner_ids'] and
|
||||
self.product_id.id in rule['product_ids']):
|
||||
return rule
|
||||
elif rule['applied_on'] == '1_customer_product_category':
|
||||
if (
|
||||
self.partner_id.id in
|
||||
rule['partner_ids'] and
|
||||
self.product_categ_id.id in rule['product_categ_ids']):
|
||||
return rule
|
||||
elif rule['applied_on'] == '2_product':
|
||||
if self.product_id.id in rule['product_ids']:
|
||||
return rule
|
||||
elif rule['applied_on'] == '3_product_category':
|
||||
if self.product_categ_id.id in rule['product_categ_ids']:
|
||||
return rule
|
||||
elif rule['applied_on'] == '4_global':
|
||||
return rule
|
||||
return False
|
||||
|
||||
def _prepare_commission_data(self, rule):
|
||||
self.ensure_one()
|
||||
rate_prec = self.env['decimal.precision'].precision_get('Commission Rate')
|
||||
lvals = {
|
||||
'commission_rule_id': rule['id'],
|
||||
# company currency
|
||||
# inherit this method to change the value below if you want to base on margin
|
||||
# or something else
|
||||
'commission_rate': rule['rate'],
|
||||
}
|
||||
if rule['base'] == 'margin':
|
||||
# What do we do if it's negative ? For the moment, it adds a negative commission line
|
||||
cost = 0
|
||||
if self.product_id and self.product_uom_id:
|
||||
# if the module account_invoice_margin from akretion/odoo-usability is installed
|
||||
if hasattr(self, 'margin_company_currency'):
|
||||
cost = self.margin_company_currency
|
||||
else:
|
||||
sign = self.move_id.move_type == 'out_refund' and -1 or 1
|
||||
cost = self.product_id.standard_price * self.product_uom_id._compute_quantity(self.quantity, self.product_id.uom_id) * sign
|
||||
lvals['commission_base'] = self.balance * -1 - cost
|
||||
else:
|
||||
lvals['commission_base'] = self.balance * -1
|
||||
if float_is_zero(lvals['commission_rate'], precision_digits=rate_prec) or self.company_currency_id.is_zero(lvals['commission_base']):
|
||||
return False
|
||||
return lvals
|
||||
|
||||
def _prepare_commission_xlsx(self):
|
||||
self.ensure_one()
|
||||
vals = {
|
||||
"inv.name": self.move_id.name,
|
||||
"inv.date": self.move_id.invoice_date,
|
||||
"inv.partner": self.move_id.commercial_partner_id.display_name,
|
||||
"product": self.product_id and self.product_id.display_name or self.name,
|
||||
"qty": self.quantity,
|
||||
"uom": self.product_uom_id.name,
|
||||
"commission_base": self.commission_base,
|
||||
"commission_rate": self.commission_rate / 100,
|
||||
"commission_amount": self.commission_amount,
|
||||
}
|
||||
return vals
|
||||
129
commission_simple/models/commission_profile.py
Normal file
129
commission_simple/models/commission_profile.py
Normal file
@@ -0,0 +1,129 @@
|
||||
# Copyright Akretion France (http://www.akretion.com/)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
|
||||
from odoo import fields, models, api, _
|
||||
from odoo.exceptions import ValidationError
|
||||
|
||||
|
||||
class CommissionProfile(models.Model):
|
||||
_name = 'commission.profile'
|
||||
_description = 'Commission Profile'
|
||||
_order = 'sequence, id'
|
||||
|
||||
name = fields.Char(string='Name of the Profile', required=True)
|
||||
active = fields.Boolean(string='Active', default=True)
|
||||
sequence = fields.Integer()
|
||||
company_id = fields.Many2one(
|
||||
'res.company', string='Company', ondelete='cascade',
|
||||
required=False, default=lambda self: self.env.company)
|
||||
assign_ids = fields.One2many(
|
||||
'commission.profile.assignment', 'profile_id', string="Assignments")
|
||||
rule_ids = fields.One2many(
|
||||
'commission.rule', 'profile_id', string='Commission Rules')
|
||||
trigger_type = fields.Selection([
|
||||
('invoice', 'Invoiced'),
|
||||
('paid', 'Paid'),
|
||||
('in_payment', 'In Payment and Paid'),
|
||||
], default='paid', string='Trigger', required=True)
|
||||
date_range_type_id = fields.Many2one(
|
||||
'date.range.type', string='Commission Periodicity', ondelete='restrict',
|
||||
domain="[('company_id', 'in', (False, company_id))]")
|
||||
|
||||
|
||||
class CommissionProfileAssignment(models.Model):
|
||||
_name = "commission.profile.assignment"
|
||||
_description = "Commission Profile Assignment"
|
||||
|
||||
profile_id = fields.Many2one('commission.profile', ondelete='cascade')
|
||||
company_id = fields.Many2one(
|
||||
'res.company', string='Company', ondelete='cascade',
|
||||
required=True, default=lambda self: self.env.company)
|
||||
assign_type = fields.Selection(
|
||||
'_assign_type_selection', default='user', required=True, string="Type")
|
||||
user_id = fields.Many2one(
|
||||
'res.users', compute="_compute_user_id", store=True, precompute=True, readonly=False,
|
||||
ondelete="restrict", string="Salesman",
|
||||
)
|
||||
|
||||
_sql_constraints = [
|
||||
(
|
||||
'company_user_uniq',
|
||||
'unique(user_id, company_id)',
|
||||
'This salesman already has an assignment in this company.')]
|
||||
|
||||
@api.model
|
||||
def _assign_type_selection(self):
|
||||
return [('user', _('Salesman'))]
|
||||
|
||||
@api.constrains('assign_type', 'user_id')
|
||||
def _check_user(self):
|
||||
for assignment in self:
|
||||
if assignment.assign_type == 'user' and not assignment.user_id:
|
||||
raise ValidationError(_("A salesman must be selected when the assignment type is 'Salesman'."))
|
||||
|
||||
@api.depends('assign_type')
|
||||
def _compute_user_id(self):
|
||||
for assign in self:
|
||||
if assign.assign_type != 'user':
|
||||
assign.user_id = False
|
||||
|
||||
def _get_partner(self):
|
||||
self.ensure_one()
|
||||
if self.assign_type == 'user':
|
||||
return self.user_id.partner_id
|
||||
return False
|
||||
|
||||
def _prepare_move_line_domain(self, date_range):
|
||||
self.ensure_one()
|
||||
domain = [
|
||||
('display_type', '=', 'product'),
|
||||
('move_id.move_type', 'in', ('out_invoice', 'out_refund')),
|
||||
('date', '<=', date_range.date_end),
|
||||
('company_id', '=', self.company_id.id),
|
||||
('commission_result_id', '=', False),
|
||||
('parent_state', '=', 'posted'),
|
||||
]
|
||||
if self.assign_type == 'user':
|
||||
domain.append(('move_id.invoice_user_id', '=', self.user_id.id))
|
||||
# TODO : for trigger 'paid' and 'in_payment', we would need to filter
|
||||
# out the invoices paid after the end date of the commission period
|
||||
if self.profile_id.trigger_type == 'paid':
|
||||
domain.append(('move_id.payment_state', 'in', ('paid', 'reversed')))
|
||||
elif self.profile_id.trigger_type == 'in_payment':
|
||||
domain.append(('move_id.payment_state', 'in', ('in_payment', 'paid', 'reversed')))
|
||||
elif self.profile_id.trigger_type == 'invoice':
|
||||
domain.append(('date', '>=', date_range.date_start))
|
||||
return domain
|
||||
|
||||
def _prepare_commission_result(self, date_range):
|
||||
vals = {
|
||||
'partner_id': self._get_partner().id,
|
||||
'profile_id': self.profile_id.id,
|
||||
'date_range_id': date_range.id,
|
||||
'assign_type': self.assign_type,
|
||||
'assignment_id': self.id,
|
||||
'company_id': self.company_id.id,
|
||||
}
|
||||
return vals
|
||||
|
||||
def _generate_commission_result(self, date_range, rules):
|
||||
self.ensure_one()
|
||||
ilines = self.env['account.move.line'].search(
|
||||
self._prepare_move_line_domain(date_range), order='date, move_id, sequence, id')
|
||||
profile = self.profile_id
|
||||
ilines2write = {}
|
||||
for iline in ilines:
|
||||
rule = iline._match_commission_rule(rules[profile.id])
|
||||
if rule:
|
||||
lvals = iline._prepare_commission_data(rule)
|
||||
if lvals:
|
||||
ilines2write[iline] = lvals
|
||||
if ilines2write:
|
||||
com_result = self.env['commission.result'].create(self._prepare_commission_result(date_range))
|
||||
for iline, vals in ilines2write.items():
|
||||
iline.write(dict(vals, commission_result_id=com_result.id))
|
||||
return com_result
|
||||
else:
|
||||
return False
|
||||
87
commission_simple/models/commission_result.py
Normal file
87
commission_simple/models/commission_result.py
Normal file
@@ -0,0 +1,87 @@
|
||||
# Copyright Akretion France (http://www.akretion.com/)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import fields, models, api, _
|
||||
from odoo.exceptions import UserError
|
||||
|
||||
|
||||
class CommissionResult(models.Model):
|
||||
_name = 'commission.result'
|
||||
_description = "Commission Result"
|
||||
_order = 'date_start desc'
|
||||
_inherit = ['mail.thread', 'mail.activity.mixin']
|
||||
|
||||
partner_id = fields.Many2one(
|
||||
'res.partner', string='Salesman/Agent', required=True, ondelete='restrict',
|
||||
readonly=True, tracking=True)
|
||||
profile_id = fields.Many2one(
|
||||
'commission.profile', string='Commission Profile', readonly=True, tracking=True)
|
||||
assignment_id = fields.Many2one(
|
||||
'commission.profile.assignment', string="Commission Profile Assignment", readonly=True)
|
||||
assign_type = fields.Selection('_assign_type_selection', readonly=True, tracking=True)
|
||||
company_id = fields.Many2one(
|
||||
'res.company', string='Company', ondelete='cascade',
|
||||
required=True, readonly=True, default=lambda self: self.env.company, tracking=True)
|
||||
company_currency_id = fields.Many2one(
|
||||
related='company_id.currency_id', string='Company Currency', store=True)
|
||||
date_range_id = fields.Many2one(
|
||||
'date.range', required=True, string='Period', readonly=True, tracking=True)
|
||||
date_start = fields.Date(related='date_range_id.date_start', store=True)
|
||||
date_end = fields.Date(related='date_range_id.date_end', store=True)
|
||||
line_ids = fields.One2many(
|
||||
'account.move.line', 'commission_result_id', string='Commission Lines',
|
||||
states={'done': [('readonly', True)]})
|
||||
amount_total = fields.Monetary(
|
||||
string='Commission Total', currency_field='company_currency_id',
|
||||
compute='_compute_totals', store=True, tracking=True)
|
||||
base_total = fields.Monetary(
|
||||
string="Commission Base Total", currency_field='company_currency_id',
|
||||
compute='_compute_totals', store=True, tracking=True)
|
||||
state = fields.Selection([
|
||||
('draft', 'Draft'),
|
||||
('done', 'Done'),
|
||||
], default='draft', tracking=True)
|
||||
# TODO copy amount to another field
|
||||
# help='This is the total amount at the date of the computation of the commission')
|
||||
|
||||
@api.model
|
||||
def _assign_type_selection(self):
|
||||
return self.env['commission.profile.assignment']._assign_type_selection()
|
||||
|
||||
@api.depends('line_ids.commission_amount', 'line_ids.commission_base')
|
||||
def _compute_totals(self):
|
||||
rg_res = self.env['account.move.line'].read_group([('commission_result_id', 'in', self.ids)], ['commission_result_id', 'commission_amount:sum', 'commission_base:sum'], ['commission_result_id'])
|
||||
mapped_data = dict([(x['commission_result_id'][0], {'amount': x['commission_amount'], 'base': x['commission_base']}) for x in rg_res])
|
||||
for rec in self:
|
||||
rec.amount_total = mapped_data.get(rec.id, {}).get('amount')
|
||||
rec.base_total = mapped_data.get(rec.id, {}).get('base')
|
||||
|
||||
def unlink(self):
|
||||
for result in self:
|
||||
if result.state == 'done':
|
||||
raise UserError(_(
|
||||
"You cannot delete commission result %s because it is in done state.") % result.display_name)
|
||||
return super().unlink()
|
||||
|
||||
def draft2done(self):
|
||||
self.filtered(lambda x: x.state == 'draft').write({'state': 'done'})
|
||||
|
||||
def backtodraft(self):
|
||||
self.write({'state': 'draft'})
|
||||
|
||||
def name_get(self):
|
||||
res = []
|
||||
for result in self:
|
||||
name = '%s (%s)' % (result.partner_id.name, result.date_range_id.name)
|
||||
res.append((result.id, name))
|
||||
return res
|
||||
|
||||
_sql_constraints = [(
|
||||
'salesman_period_company_unique',
|
||||
'unique(company_id, partner_id, date_range_id)',
|
||||
'A commission result already exists for this salesman/agent for the same period.')]
|
||||
|
||||
def _prepare_xlsx_lines(self):
|
||||
self.ensure_one()
|
||||
return self.line_ids.sorted(key=lambda x: x.move_id.invoice_date)
|
||||
72
commission_simple/models/commission_rule.py
Normal file
72
commission_simple/models/commission_rule.py
Normal file
@@ -0,0 +1,72 @@
|
||||
# Copyright Akretion France (http://www.akretion.com/)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
|
||||
from odoo import fields, models, api, _
|
||||
|
||||
|
||||
class CommissionRule(models.Model):
|
||||
_name = 'commission.rule'
|
||||
_description = 'Commission Rule'
|
||||
_order = 'profile_id, applied_on, rate desc'
|
||||
|
||||
partner_ids = fields.Many2many(
|
||||
'res.partner', string='Customers', domain=[('parent_id', '=', False)])
|
||||
product_categ_ids = fields.Many2many(
|
||||
'product.category', string="Product Categories")
|
||||
product_ids = fields.Many2many('product.product', string='Products')
|
||||
date_start = fields.Date('Start Date')
|
||||
date_end = fields.Date('End Date')
|
||||
profile_id = fields.Many2one(
|
||||
'commission.profile', string='Profile', ondelete='cascade')
|
||||
company_id = fields.Many2one(related='profile_id.company_id', store=True)
|
||||
rate = fields.Float('Commission Rate', digits="Commission Rate", copy=False)
|
||||
base = fields.Selection([
|
||||
('invoiced', 'Invoiced Amount'),
|
||||
('margin', 'Margin'),
|
||||
], default='invoiced', required=True, string="Commission Base")
|
||||
applied_on = fields.Selection([
|
||||
('0_customer_product', 'Products and Customers'),
|
||||
('1_customer_product_category', "Product Categories and Customers"),
|
||||
('2_product', "Products"),
|
||||
('3_product_category', "Product Categories"),
|
||||
('4_global', 'Global')],
|
||||
string='Apply On', default='4_global', required=True)
|
||||
active = fields.Boolean(string='Active', default=True)
|
||||
apply_description = fields.Html(compute='_compute_apply_description', string="Match Criteria")
|
||||
|
||||
_sql_constraints = [(
|
||||
'rate_positive',
|
||||
'CHECK(rate >= 0)',
|
||||
'Rate must be positive !')]
|
||||
|
||||
def _compute_apply_description(self):
|
||||
customer_label = "<strong>" + _("Customers:") + "</strong>"
|
||||
product_label = "<strong>" + _("Products:") + "</strong>"
|
||||
product_categ_label = "<strong>" + _("Product Categories:") + "</strong>"
|
||||
and_label = "<strong>" + _('AND') + "</strong>"
|
||||
for rule in self:
|
||||
desc = False
|
||||
if rule.applied_on == '0_customer_product':
|
||||
desc = f"{customer_label} {', '.join([part.ref or part.name for part in rule.partner_ids])} {and_label} {product_label} {', '.join([pp.default_code or pp.name for pp in rule.product_ids])}"
|
||||
elif rule.applied_on == '1_customer_product_category':
|
||||
desc = f"{customer_label} {', '.join([part.ref or part.name for part in rule.partner_ids])} {and_label} {product_categ_label} {', '.join([categ.display_name for categ in rule.product_categ_ids])}"
|
||||
elif rule.applied_on == '2_product':
|
||||
desc = f"{product_label} {', '.join([pp.default_code or pp.name for pp in rule.product_ids])}"
|
||||
elif rule.applied_on == '3_product_category':
|
||||
desc = f"{product_categ_label} {', '.join([categ.display_name for categ in rule.product_categ_ids])}"
|
||||
elif rule.applied_on == '4_global':
|
||||
desc = _('Global')
|
||||
rule.apply_description = desc
|
||||
|
||||
@api.model
|
||||
def load_all_rules(self):
|
||||
rules = self.search_read([('profile_id', '!=', False)])
|
||||
res = {} # key = profile, value = [rule1 recordset, rule2]
|
||||
for rule in rules:
|
||||
if rule['profile_id'][0] not in res:
|
||||
res[rule['profile_id'][0]] = [rule]
|
||||
else:
|
||||
res[rule['profile_id'][0]].append(rule)
|
||||
return res
|
||||
1
commission_simple/reports/__init__.py
Normal file
1
commission_simple/reports/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from . import commission_result_xlsx
|
||||
112
commission_simple/reports/commission_result_xlsx.py
Normal file
112
commission_simple/reports/commission_result_xlsx.py
Normal file
@@ -0,0 +1,112 @@
|
||||
# Copyright 2025 Akretion France (https://www.akretion.com/)
|
||||
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import api, fields, models, tools, Command, _
|
||||
from odoo.exceptions import UserError
|
||||
from datetime import datetime
|
||||
from odoo.tools.misc import format_datetime
|
||||
|
||||
|
||||
class CommissionResultXlsx(models.AbstractModel):
|
||||
_name = "report.commission_simple.report_xlsx"
|
||||
_inherit = "report.report_xlsx.abstract"
|
||||
_description = "Commission Result XLSX"
|
||||
|
||||
def generate_xlsx_report(self, workbook, data, objects):
|
||||
# for some strange reasons, lang is not kept in context
|
||||
self = self.with_context(lang=self.env.user.lang)
|
||||
result = objects[0]
|
||||
sheet = workbook.add_worksheet(result.date_range_id.name)
|
||||
styles = self._prepare_styles(workbook, result.company_id)
|
||||
title = _("Commissions of %(partner)s for period %(period)s", partner=result.partner_id.name, period=result.date_range_id.name)
|
||||
now_str = format_datetime(self.env, datetime.now())
|
||||
i = 0
|
||||
sheet.write(i, 0, title, styles['title'])
|
||||
sheet.write(i, 5, _('Generated from Odoo on %s by %s') % (now_str, self.env.user.name), styles['regular_small'])
|
||||
i += 1
|
||||
sheet.write(i, 0, _('Start Date'), styles['subtitle'])
|
||||
sheet.write(i, 1, result.date_start, styles['subtitle_date'])
|
||||
i += 1
|
||||
sheet.write(i, 0, _('End Date'), styles['subtitle'])
|
||||
sheet.write(i, 1, result.date_end, styles['subtitle_date'])
|
||||
i += 1
|
||||
sheet.write(i, 0, _('Currency'), styles['subtitle'])
|
||||
sheet.write(i, 1, result.company_id.currency_id.name, styles['subtitle'])
|
||||
i += 1
|
||||
sheet.write(i, 0, _('Base Total'), styles['subtitle'])
|
||||
sheet.write(i, 1, result.base_total, styles['subtitle_amount'])
|
||||
i += 1
|
||||
sheet.write(i, 0, _('Amount Total'), styles['subtitle'])
|
||||
sheet.write(i, 1, result.amount_total, styles['subtitle_amount'])
|
||||
i += 3
|
||||
cols = self._prepare_xlsx_cols()
|
||||
coldict = {}
|
||||
pos = 0
|
||||
for key, label, width, style_suffix in cols:
|
||||
coldict[key] = {
|
||||
"label": label,
|
||||
"width": width,
|
||||
"pos": pos,
|
||||
"style": style_suffix and f"regular_{style_suffix}" or "regular",
|
||||
}
|
||||
pos += 1
|
||||
# header
|
||||
for col_key, col_vals in coldict.items():
|
||||
sheet.write(i, col_vals['pos'], col_vals['label'], styles['col_title'])
|
||||
sheet.set_column(col_vals['pos'], col_vals['pos'], col_vals['width'])
|
||||
# table content
|
||||
for line in result._prepare_xlsx_lines():
|
||||
i += 1
|
||||
for col_key, value in line._prepare_commission_xlsx().items():
|
||||
sheet.write(i, coldict[col_key]["pos"], value, styles[coldict[col_key]["style"]])
|
||||
|
||||
def _prepare_xlsx_cols(self):
|
||||
cols = [ # key, label, width, style_suffix
|
||||
("inv.name", _("Invoice"), 14, False),
|
||||
("inv.date", _("Invoice Date"), 11, "date"),
|
||||
("inv.partner", _("Customer"), 50, False),
|
||||
("product", _("Product"), 35, False),
|
||||
("qty", _("Quantity"), 8, "qty"),
|
||||
("uom", _("Unit"), 8, False),
|
||||
("commission_base", _("Commission Base"), 14, "amount"),
|
||||
("commission_rate", _("Commission Rate"), 10, "rate"),
|
||||
("commission_amount", _("Commission Amount"), 14, "amount"),
|
||||
]
|
||||
return cols
|
||||
|
||||
def _prepare_styles(self, workbook, company):
|
||||
col_title_bg_color = '#eeeeee'
|
||||
prec_qty = self.env['decimal.precision'].precision_get('Product Unit of Measure')
|
||||
prec_rate = self.env['decimal.precision'].precision_get('Commission Rate')
|
||||
prec_price = self.env['decimal.precision'].precision_get('Product Price')
|
||||
regular_font_size = 10
|
||||
date_format = "dd/mm/yyyy" # TODO depend on lang
|
||||
num_format_amount = f"# ##0.{'0' * company.currency_id.decimal_places}"
|
||||
num_format_qty = f"# ##0.{'0' * prec_qty}"
|
||||
num_format_rate = f"""0.{'0' * prec_rate} " "%"""
|
||||
num_format_price = f"# ##0.{'0' * prec_price}"
|
||||
styles = {
|
||||
'title': workbook.add_format({
|
||||
'bold': True, 'font_size': regular_font_size + 10,
|
||||
'font_color': '#003b6f'}),
|
||||
'subtitle': workbook.add_format({
|
||||
'bold': True, 'font_size': regular_font_size}),
|
||||
'subtitle_date': workbook.add_format({
|
||||
'bold': True, 'font_size': regular_font_size, 'num_format': date_format}),
|
||||
'subtitle_amount': workbook.add_format({
|
||||
'bold': True, 'font_size': regular_font_size, 'num_format': num_format_amount}),
|
||||
'col_title': workbook.add_format({
|
||||
'bold': True, 'bg_color': col_title_bg_color,
|
||||
'text_wrap': True, 'font_size': regular_font_size,
|
||||
'align': 'center',
|
||||
}),
|
||||
'regular_date': workbook.add_format({'num_format': date_format}),
|
||||
'regular_amount': workbook.add_format({'num_format': num_format_amount}),
|
||||
'regular_rate': workbook.add_format({'num_format': num_format_rate}),
|
||||
'regular_qty': workbook.add_format({'num_format': num_format_qty}),
|
||||
'regular_price': workbook.add_format({'num_format': num_format_price}),
|
||||
'regular': workbook.add_format({}),
|
||||
'regular_small': workbook.add_format({'font_size': regular_font_size - 2}),
|
||||
}
|
||||
return styles
|
||||
20
commission_simple/reports/report.xml
Normal file
20
commission_simple/reports/report.xml
Normal file
@@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2025 Akretion France (https://www.akretion.com/)
|
||||
@author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
The licence is in the file __manifest__.py
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="commission_result_xlsx_report" model="ir.actions.report">
|
||||
<field name="name">Détails Excel</field>
|
||||
<field name="model">commission.result</field>
|
||||
<field name="report_type">xlsx</field>
|
||||
<field name="report_name">commission_simple.report_xlsx</field>
|
||||
<field name="report_file">commission_simple.report_xlsx</field>
|
||||
<field name="print_report_name">'commission-%s-%s' % (object.date_range_id.name.replace(' ', '_'), object.partner_id.name.replace(' ', '_'))</field>
|
||||
<field name="binding_model_id" ref="model_commission_result" />
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
11
commission_simple/security/ir.model.access.csv
Normal file
11
commission_simple/security/ir.model.access.csv
Normal file
@@ -0,0 +1,11 @@
|
||||
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
|
||||
access_commission_profile_read,Read access on commission.profile for employees,model_commission_profile,base.group_user,1,0,0,0
|
||||
access_commission_profile_full,Full access on commission.profile for financial manager,model_commission_profile,account.group_account_manager,1,1,1,1
|
||||
access_commission_profile_assignment_full,Full access on commission.profile.assignment for financial manager,model_commission_profile_assignment,account.group_account_manager,1,1,1,1
|
||||
access_commission_rule_full,Full access on commission.rule for financial manager,model_commission_rule,account.group_account_manager,1,1,1,1
|
||||
access_commission_rule_read,Read access on commission.rule for invoicing group,model_commission_rule,account.group_account_invoice,1,0,0,0
|
||||
access_commission_rule_audit,Read access on commission.rule for viewer group,model_commission_rule,account.group_account_readonly,1,0,0,0
|
||||
access_commission_result_full,Full access on commission.result to accountant,model_commission_result,account.group_account_user,1,1,1,1
|
||||
access_commission_result_read,Read access on commission.result to invoicing grp,model_commission_result,account.group_account_invoice,1,0,0,0
|
||||
access_commission_result_audit,Read access on commission.result to viewer grp,model_commission_result,account.group_account_readonly,1,0,0,0
|
||||
access_commission_compute_full,Full access to wizard commission.compute to Accountant,model_commission_compute,account.group_account_user,1,1,1,1
|
||||
|
29
commission_simple/security/rule.xml
Normal file
29
commission_simple/security/rule.xml
Normal file
@@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2019-2024 Akretion France (https://www.akretion.com)
|
||||
@author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
-->
|
||||
|
||||
<odoo noupdate="1">
|
||||
|
||||
|
||||
<record id="commission_profile_rule" model="ir.rule">
|
||||
<field name="name">Commission Profile multi-company</field>
|
||||
<field name="model_id" ref="model_commission_profile"/>
|
||||
<field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_rule_rule" model="ir.rule">
|
||||
<field name="name">Commission Rule multi-company</field>
|
||||
<field name="model_id" ref="model_commission_rule"/>
|
||||
<field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_result_rule" model="ir.rule">
|
||||
<field name="name">Commission Result multi-company</field>
|
||||
<field name="model_id" ref="model_commission_result"/>
|
||||
<field name="domain_force">[('company_id', 'in', company_ids)]</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
34
commission_simple/views/account_move_line.xml
Normal file
34
commission_simple/views/account_move_line.xml
Normal file
@@ -0,0 +1,34 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2024 Akretion France (https://www.akretion.com/)
|
||||
@author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
|
||||
<record id="view_move_line_form" model="ir.ui.view">
|
||||
<field name="model">account.move.line</field>
|
||||
<field name="inherit_id" ref="account.view_move_line_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<notebook position="inside">
|
||||
<page name="commission" string="Commission" attrs="{'invisible': [('display_type', '!=', 'product')]}">
|
||||
<group name="commission_grp">
|
||||
<field name="commission_base"/>
|
||||
<label for="commission_rate"/>
|
||||
<div name="commission_rate">
|
||||
<field name="commission_rate" class="oe_inline"/> %
|
||||
</div>
|
||||
<field name="commission_amount"/>
|
||||
<field name="commission_rule_id"/>
|
||||
<field name="display_type" invisible="1"/>
|
||||
<field name="company_currency_id" invisible="1"/>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
</odoo>
|
||||
206
commission_simple/views/commission.xml
Normal file
206
commission_simple/views/commission.xml
Normal file
@@ -0,0 +1,206 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2019 Akretion France (http://www.akretion.com)
|
||||
@author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<menuitem id="commission_root" name="Commissions" parent="account.menu_finance" sequence="11"/>
|
||||
<menuitem id="commission_config_root" name="Commissions" parent="account.menu_finance_configuration" sequence="110"/>
|
||||
|
||||
<!-- PROFILE -->
|
||||
<record id="commission_profile_form" model="ir.ui.view">
|
||||
<field name="name">commission.profile.form</field>
|
||||
<field name="model">commission.profile</field>
|
||||
<field name="arch" type="xml">
|
||||
<form>
|
||||
<sheet>
|
||||
<widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
|
||||
<group name="main">
|
||||
<field name="name"/>
|
||||
<field name="active" invisible="1"/>
|
||||
<field name="company_id" invisible="1"/>
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
<field name="trigger_type"/>
|
||||
</group>
|
||||
<group name="lines" string="Rules">
|
||||
<field name="line_ids" nolabel="1" colspan="2"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_profile_tree" model="ir.ui.view">
|
||||
<field name="name">commission.profile.tree</field>
|
||||
<field name="model">commission.profile</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree>
|
||||
<field name="sequence" widget="handle"/>
|
||||
<field name="name" decoration-bf="1"/>
|
||||
<field name="trigger_type" optional="show"/>
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_profile_action" model="ir.actions.act_window">
|
||||
<field name="name">Commission Profiles</field>
|
||||
<field name="res_model">commission.profile</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
<menuitem id="commission_profile_menu" action="commission_profile_action" parent="commission_config_root" sequence="18"/>
|
||||
|
||||
|
||||
<!-- RULE -->
|
||||
<record id="commission_rule_form" model="ir.ui.view">
|
||||
<field name="name">commission.rule.form</field>
|
||||
<field name="model">commission.rule</field>
|
||||
<field name="arch" type="xml">
|
||||
<form>
|
||||
<sheet>
|
||||
<group name="main">
|
||||
<field name="profile_id" invisible="not context.get('commission_rule_main_view')"/>
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
<field name="company_id" invisible="1"/>
|
||||
<field name="applied_on" widget="radio"/>
|
||||
</group>
|
||||
<group name="match" string="Match">
|
||||
<field name="partner_ids" attrs="{'invisible': [('applied_on', 'not in', ('0_customer_product', '1_customer_product_category'))], 'required': [('applied_on', 'in', ('0_customer_product', '1_customer_product_category'))]}"/>
|
||||
<field name="product_categ_ids" attrs="{'invisible': [('applied_on', 'not in', ('1_customer_product_category', '3_product_category'))], 'required': [('applied_on', 'in', ('1_customer_product_category', '3_product_category'))]}"/>
|
||||
<field name="product_ids" attrs="{'invisible': [('applied_on', 'not in', ('0_customer_product', '2_product'))], 'required': [('applied_on', 'in', ('0_customer_product', '2_product'))]}"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date_end"/>
|
||||
</group>
|
||||
<group name="compute" string="Compute">
|
||||
<label for="rate"/>
|
||||
<div name="rate">
|
||||
<field name="rate" class="oe_inline"/> %
|
||||
</div>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_rule_tree" model="ir.ui.view">
|
||||
<field name="name">commission.rule.tree</field>
|
||||
<field name="model">commission.rule</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree>
|
||||
<field name="profile_id" invisible="not context.get('commission_rule_main_view')"/>
|
||||
<field name="applied_on"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date_end"/>
|
||||
<field name="rate" string="Rate (%)"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_rule_search" model="ir.ui.view">
|
||||
<field name="name">commission.rule.search</field>
|
||||
<field name="model">commission.rule</field>
|
||||
<field name="arch" type="xml">
|
||||
<search>
|
||||
<filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
|
||||
<group name="groupby">
|
||||
<filter name="profile_groupby" string="Profile" context="{'group_by': 'profile_id'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="commission_rule_action" model="ir.actions.act_window">
|
||||
<field name="name">Commission Rules</field>
|
||||
<field name="res_model">commission.rule</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="context">{'commission_rule_main_view': True}</field>
|
||||
</record>
|
||||
|
||||
|
||||
<menuitem id="commission_rule_menu" action="commission_rule_action" parent="commission_config_root" sequence="20"/>
|
||||
|
||||
<!-- RESULT -->
|
||||
<record id="commission_result_form" model="ir.ui.view">
|
||||
<field name="name">commission.result.form</field>
|
||||
<field name="model">commission.result</field>
|
||||
<field name="arch" type="xml">
|
||||
<form>
|
||||
<group name="main">
|
||||
<group name="main-left">
|
||||
<field name="partner_id"/>
|
||||
<field name="profile_id" groups="account.group_account_manager"/>
|
||||
<field name="company_currency_id" invisible="1"/>
|
||||
<field name="company_id" invisible="1"/>
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
<field name="amount_total"/>
|
||||
</group>
|
||||
<group name="main-right">
|
||||
<field name="date_range_id"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date_end"/>
|
||||
</group>
|
||||
</group>
|
||||
<group name="lines" string="Commission Lines">
|
||||
<field nolabel="1" name="line_ids" colspan="2">
|
||||
<tree>
|
||||
<field name="move_id"/>
|
||||
<field name="move_line_id"/>
|
||||
<field name="base"/>
|
||||
<field name="rate" string="Rate (%)"/>
|
||||
<field name="amount" sum="1"/>
|
||||
<field name="rule_id"/>
|
||||
<field name="company_currency_id" invisible="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_result_tree" model="ir.ui.view">
|
||||
<field name="name">commission.result.tree</field>
|
||||
<field name="model">commission.result</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree>
|
||||
<field name="date_range_id" optional="show"/>
|
||||
<field name="date_start" optional="hide"/>
|
||||
<field name="date_end" optional="hide"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="profile_id" groups="account.group_account_manager"/>
|
||||
<field name="company_currency_id" invisible="1"/>
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
<field name="amount_total" sum="1" optional="show"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_result_search" model="ir.ui.view">
|
||||
<field name="name">commission.result.search</field>
|
||||
<field name="model">commission.result</field>
|
||||
<field name="arch" type="xml">
|
||||
<search>
|
||||
<field name="partner_id"/>
|
||||
<field name="date_range_id"/>
|
||||
<group name="groupby">
|
||||
<filter name="partner_groupby" string="Salesman" context="{'group_by': 'partner_id'}"/>
|
||||
<filter name="date_range_groupby" string="Period" context="{'group_by': 'date_range_id'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_result_action" model="ir.actions.act_window">
|
||||
<field name="name">Commissions</field>
|
||||
<field name="res_model">commission.result</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
<menuitem id="commission_result_menu" action="commission_result_action" parent="commission_root" sequence="10"/>
|
||||
|
||||
|
||||
</odoo>
|
||||
93
commission_simple/views/commission_profile.xml
Normal file
93
commission_simple/views/commission_profile.xml
Normal file
@@ -0,0 +1,93 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2019-2024 Akretion France (http://www.akretion.com)
|
||||
@author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<menuitem id="commission_root" name="Commissions" parent="account.menu_finance" sequence="11"/>
|
||||
<menuitem id="commission_config_root" name="Commissions" parent="account.menu_finance_configuration" sequence="110"/>
|
||||
|
||||
<record id="commission_profile_form" model="ir.ui.view">
|
||||
<field name="name">commission.profile.form</field>
|
||||
<field name="model">commission.profile</field>
|
||||
<field name="arch" type="xml">
|
||||
<form>
|
||||
<sheet>
|
||||
<widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
|
||||
<group name="main">
|
||||
<group name="main-left">
|
||||
<field name="name"/>
|
||||
<field name="active" invisible="1"/>
|
||||
<field name="trigger_type" widget="radio"/>
|
||||
<field name="date_range_type_id"/>
|
||||
</group>
|
||||
<group name="main-right">
|
||||
<field name="company_id" invisible="1"/>
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
</group>
|
||||
<notebook>
|
||||
<page name="assignments" string="Assignments">
|
||||
<field name="assign_ids">
|
||||
<tree editable="bottom">
|
||||
<field name="assign_type"/>
|
||||
<field name="user_id" attrs="{'required': [('assign_type', '=', 'user')], 'readonly': [('assign_type', '!=', 'user')]}"/>
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
<field name="company_id" invisible="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<page name="rules" string="Rules">
|
||||
<field name="rule_ids"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_profile_tree" model="ir.ui.view">
|
||||
<field name="name">commission.profile.tree</field>
|
||||
<field name="model">commission.profile</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree>
|
||||
<field name="sequence" widget="handle"/>
|
||||
<field name="name" decoration-bf="1"/>
|
||||
<field name="trigger_type" optional="show" widget="badge" decoration-info="trigger_type == 'invoice'" decoration-success="trigger_type == 'paid'" decoration-warning="trigger_type == 'in_payment'"/>
|
||||
<field name="date_range_type_id" optional="show"/>
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_profile_search" model="ir.ui.view">
|
||||
<field name="model">commission.profile</field>
|
||||
<field name="arch" type="xml">
|
||||
<search>
|
||||
<field name="name"/>
|
||||
<filter string="Invoiced" name="invoice" domain="[('trigger_type', '=', 'invoice')]"/>
|
||||
<filter string="Paid" name="paid" domain="[('trigger_type', '=', 'paid')]"/>
|
||||
<filter string="In Payment and Paid" name="in_payment" domain="[('trigger_type', '=', 'in_payment')]"/>
|
||||
<separator/>
|
||||
<filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
|
||||
<separator/>
|
||||
<group name="groupby">
|
||||
<filter name="date_range_type_groupby" string="Commission Periodicity" context="{'group_by': 'date_range_type_id'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_profile_action" model="ir.actions.act_window">
|
||||
<field name="name">Commission Profiles</field>
|
||||
<field name="res_model">commission.profile</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
<menuitem id="commission_profile_menu" action="commission_profile_action" parent="commission_config_root" sequence="18"/>
|
||||
|
||||
|
||||
</odoo>
|
||||
127
commission_simple/views/commission_result.xml
Normal file
127
commission_simple/views/commission_result.xml
Normal file
@@ -0,0 +1,127 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2024 Akretion France (http://www.akretion.com)
|
||||
@author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="commission_result_form" model="ir.ui.view">
|
||||
<field name="name">commission.result.form</field>
|
||||
<field name="model">commission.result</field>
|
||||
<field name="arch" type="xml">
|
||||
<form>
|
||||
<header>
|
||||
<button name="draft2done" type="object" states="draft" string="Confirm" class="btn-primary"/>
|
||||
<button name="backtodraft" type="object" states="done" string="Back to Draft" confirm="Are you sure you want to go back to draft?"/>
|
||||
<button name="%(commission_simple.commission_result_xlsx_report)d" type="action" string="Excel Export"/>
|
||||
<field name="state" widget="statusbar"/>
|
||||
</header>
|
||||
<group name="main">
|
||||
<group name="main-left">
|
||||
<field name="partner_id"/>
|
||||
<field name="date_range_id"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date_end"/>
|
||||
<field name="base_total"/>
|
||||
<field name="amount_total"/>
|
||||
<field name="company_currency_id" invisible="1"/>
|
||||
<field name="company_id" invisible="1"/>
|
||||
</group>
|
||||
<group name="main-right">
|
||||
<field name="profile_id" groups="account.group_account_manager"/>
|
||||
<field name="assign_type"/>
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
</group>
|
||||
<group name="lines" string="Commission Lines">
|
||||
<field nolabel="1" name="line_ids" colspan="2" widget="many2many">
|
||||
<tree>
|
||||
<field name="move_id"/>
|
||||
<field name="date" optional="hide"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="product_id"/>
|
||||
<field name="product_categ_id" optional="hide"/>
|
||||
<field name="name" optional="hide"/>
|
||||
<field name="quantity" optional="hide"/>
|
||||
<field name="product_uom_id" optional="hide" groups="uom.group_uom"/>
|
||||
<field name="price_unit" string="Price" optional="hide"/>
|
||||
<field name="discount" string="Disc.%" optional="hide"/>
|
||||
<field name="price_subtotal" optional="hide" string="Invoiced Amount"/>
|
||||
<field name="commission_base" sum="1"/>
|
||||
<field name="commission_rate" string="Rate (%)"/>
|
||||
<field name="commission_amount" sum="1"/>
|
||||
<field name="commission_rule_id" optional="hide"/>
|
||||
<field name="company_currency_id" invisible="1"/>
|
||||
<field name="currency_id" invisible="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
</group>
|
||||
<div class="oe_chatter">
|
||||
<field name="message_follower_ids" widget="mail_followers"/>
|
||||
<field name="activity_ids" widget="mail_activity"/>
|
||||
<field name="message_ids" widget="mail_thread"/>
|
||||
</div>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_result_tree" model="ir.ui.view">
|
||||
<field name="name">commission.result.tree</field>
|
||||
<field name="model">commission.result</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree decoration-info="state == 'draft'">
|
||||
<header>
|
||||
<button
|
||||
name="draft2done"
|
||||
type="object"
|
||||
string="Validate"
|
||||
/>
|
||||
</header>
|
||||
<field name="date_range_id" optional="show"/>
|
||||
<field name="date_start" optional="hide"/>
|
||||
<field name="date_end" optional="hide"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="profile_id" groups="account.group_account_manager"/>
|
||||
<field name="assign_type" optional="hide" widget="badge" decoration-warning="assign_type == 'user'"/>
|
||||
<field name="company_currency_id" invisible="1"/>
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
<field name="base_total" sum="1" optional="hide"/>
|
||||
<field name="amount_total" sum="1" optional="show"/>
|
||||
<field name="state" decoration-info="state == 'draft'" decoration-success="state == 'done'" widget="badge"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_result_search" model="ir.ui.view">
|
||||
<field name="name">commission.result.search</field>
|
||||
<field name="model">commission.result</field>
|
||||
<field name="arch" type="xml">
|
||||
<search>
|
||||
<field name="partner_id"/>
|
||||
<field name="date_range_id"/>
|
||||
<separator/>
|
||||
<filter name="draft" domain="[('state', '=', 'draft')]" string="Draft"/>
|
||||
<filter name="done" domain="[('state', '=', 'done')]" string="Done"/>
|
||||
<separator/>
|
||||
<filter name="user" domain="[('assign_type', '=', 'user')]" string="Salesman"/>
|
||||
<group name="groupby">
|
||||
<filter name="partner_groupby" string="Salesman" context="{'group_by': 'partner_id'}"/>
|
||||
<filter name="date_range_groupby" string="Period" context="{'group_by': 'date_range_id'}"/>
|
||||
<filter name="assign_type_groupby" string="Assign Type" context="{'group_by': 'assign_type'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_result_action" model="ir.actions.act_window">
|
||||
<field name="name">Commissions</field>
|
||||
<field name="res_model">commission.result</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
<menuitem id="commission_result_menu" action="commission_result_action" parent="commission_root" sequence="10"/>
|
||||
|
||||
|
||||
</odoo>
|
||||
81
commission_simple/views/commission_rule.xml
Normal file
81
commission_simple/views/commission_rule.xml
Normal file
@@ -0,0 +1,81 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2019 Akretion France (http://www.akretion.com)
|
||||
@author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="commission_rule_form" model="ir.ui.view">
|
||||
<field name="name">commission.rule.form</field>
|
||||
<field name="model">commission.rule</field>
|
||||
<field name="arch" type="xml">
|
||||
<form>
|
||||
<sheet>
|
||||
<group name="main">
|
||||
<field name="profile_id" invisible="not context.get('commission_rule_main_view')"/>
|
||||
<field name="applied_on" widget="radio"/>
|
||||
<field name="company_id" invisible="1"/>
|
||||
</group>
|
||||
<group name="match" string="Match">
|
||||
<field name="partner_ids" attrs="{'invisible': [('applied_on', 'not in', ('0_customer_product', '1_customer_product_category'))], 'required': [('applied_on', 'in', ('0_customer_product', '1_customer_product_category'))]}"/>
|
||||
<field name="product_categ_ids" attrs="{'invisible': [('applied_on', 'not in', ('1_customer_product_category', '3_product_category'))], 'required': [('applied_on', 'in', ('1_customer_product_category', '3_product_category'))]}"/>
|
||||
<field name="product_ids" attrs="{'invisible': [('applied_on', 'not in', ('0_customer_product', '2_product'))], 'required': [('applied_on', 'in', ('0_customer_product', '2_product'))]}"/>
|
||||
<field name="date_start"/>
|
||||
<field name="date_end"/>
|
||||
</group>
|
||||
<group name="compute" string="Compute">
|
||||
<label for="rate"/>
|
||||
<div name="rate">
|
||||
<field name="rate" class="oe_inline"/> %
|
||||
</div>
|
||||
<field name="base" widget="radio"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_rule_tree" model="ir.ui.view">
|
||||
<field name="name">commission.rule.tree</field>
|
||||
<field name="model">commission.rule</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree>
|
||||
<field name="profile_id" invisible="not context.get('commission_rule_main_view')"/>
|
||||
<field name="applied_on" widget="badge" decoration-danger="applied_on == '0_customer_product'" decoration-warning="applied_on == '1_customer_product_category'" decoration-info="applied_on == '2_product'" decoration-success="applied_on == '3_product_category'"/>
|
||||
<field name="apply_description"/>
|
||||
<field name="date_start" optional="show"/>
|
||||
<field name="date_end" optional="show"/>
|
||||
<field name="rate" string="Rate (%)"/>
|
||||
<field name="base" widget="badge" decoration-success="base == 'invoiced'" decoration-warning="base == 'margin'"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_rule_search" model="ir.ui.view">
|
||||
<field name="name">commission.rule.search</field>
|
||||
<field name="model">commission.rule</field>
|
||||
<field name="arch" type="xml">
|
||||
<search>
|
||||
<filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
|
||||
<group name="groupby">
|
||||
<filter name="profile_groupby" string="Profile" context="{'group_by': 'profile_id'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="commission_rule_action" model="ir.actions.act_window">
|
||||
<field name="name">Commission Rules</field>
|
||||
<field name="res_model">commission.rule</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="context">{'commission_rule_main_view': True}</field>
|
||||
</record>
|
||||
|
||||
|
||||
<menuitem id="commission_rule_menu" action="commission_rule_action" parent="commission_config_root" sequence="20"/>
|
||||
|
||||
|
||||
</odoo>
|
||||
1
commission_simple/wizards/__init__.py
Normal file
1
commission_simple/wizards/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from . import commission_compute
|
||||
95
commission_simple/wizards/commission_compute.py
Normal file
95
commission_simple/wizards/commission_compute.py
Normal file
@@ -0,0 +1,95 @@
|
||||
# Copyright 2019-2024 Akretion France (http://www.akretion.com)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import api, fields, models, _
|
||||
from datetime import datetime, timedelta
|
||||
from odoo.exceptions import UserError
|
||||
from odoo.tools.misc import format_date
|
||||
import logging
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class CommissionCompute(models.TransientModel):
|
||||
_name = 'commission.compute'
|
||||
_description = 'Compute Commissions'
|
||||
|
||||
company_id = fields.Many2one('res.company', required=True)
|
||||
date_start = fields.Date(string="Period Start Date", required=True)
|
||||
|
||||
@api.model
|
||||
def default_get(self, fields_list):
|
||||
res = super().default_get(fields_list)
|
||||
company = self.env.company
|
||||
last_commission_result = self.env['commission.result'].search([
|
||||
('company_id', '=', company.id),
|
||||
], order='date_start desc', limit=1)
|
||||
if last_commission_result:
|
||||
last_start_date = last_commission_result.date_start
|
||||
commissions_last_start_date = self.env['commission.result'].search([
|
||||
('date_start', '=', last_start_date),
|
||||
('company_id', '=', company.id),
|
||||
], order="date_end asc", limit=1)
|
||||
min_end_date = commissions_last_start_date.date_end
|
||||
date_start = min_end_date + timedelta(1)
|
||||
else:
|
||||
today = fields.Date.context_today(self)
|
||||
date_start = datetime(today.year, today.month, 1)
|
||||
res.update({
|
||||
'company_id': company.id,
|
||||
'date_start': date_start,
|
||||
})
|
||||
return res
|
||||
|
||||
def run(self):
|
||||
self.ensure_one()
|
||||
if not self.date_start:
|
||||
raise UserError(_("Missing Period Start Date."))
|
||||
creso = self.env['commission.result']
|
||||
existing_commissions = creso.search_read([
|
||||
('date_start', '=', self.date_start),
|
||||
('company_id', '=', self.company_id.id),
|
||||
], ['assignment_id'])
|
||||
exclude_assignment_ids = [x['assignment_id'][0] for x in existing_commissions if x['assignment_id']]
|
||||
com_result_ids = self._core_compute(exclude_assignment_ids)
|
||||
if not com_result_ids:
|
||||
raise UserError(_('No commissions generated.'))
|
||||
action = self.env['ir.actions.actions']._for_xml_id(
|
||||
'commission_simple.commission_result_action')
|
||||
action.update({
|
||||
'views': False,
|
||||
'domain': f"[('id', 'in', {com_result_ids})]",
|
||||
})
|
||||
return action
|
||||
|
||||
def _core_compute(self, exclude_assignment_ids):
|
||||
rules = self.env['commission.rule'].load_all_rules()
|
||||
com_result_ids = []
|
||||
assignments = self.env['commission.profile.assignment'].search(
|
||||
[('company_id', '=', self.company_id.id), ('id', 'not in', exclude_assignment_ids)])
|
||||
date_range_type2date_range = {}
|
||||
for assignment in assignments:
|
||||
profile = assignment.profile_id
|
||||
date_range_type = profile.date_range_type_id
|
||||
if not date_range_type:
|
||||
raise UserError(_("Missing commission periodicity on commission profile '%s'.") % profile.display_name)
|
||||
if date_range_type not in date_range_type2date_range:
|
||||
domain = [
|
||||
('date_start', '=', self.date_start),
|
||||
('type_id', '=', date_range_type.id),
|
||||
]
|
||||
date_range = self.env['date.range'].search(
|
||||
domain + [('company_id', '=', self.company_id.id)], limit=1)
|
||||
if not date_range:
|
||||
date_range = self.env['date.range'].search(
|
||||
domain + [('company_id', '=', False)], limit=1)
|
||||
if not date_range:
|
||||
logger.info('There is no date range with type %s starting on %s. Skipping commission generation for assignment ID %s', date_range_type.name, self.date_start, assignment.id)
|
||||
continue
|
||||
date_range_type2date_range[date_range_type] = date_range
|
||||
com_result = assignment._generate_commission_result(date_range_type2date_range[date_range_type], rules)
|
||||
if com_result:
|
||||
com_result_ids.append(com_result.id)
|
||||
else:
|
||||
logger.info("No commission for %s", assignment._get_partner().display_name)
|
||||
return com_result_ids
|
||||
38
commission_simple/wizards/commission_compute_view.xml
Normal file
38
commission_simple/wizards/commission_compute_view.xml
Normal file
@@ -0,0 +1,38 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2019-2024 Akretion France (https://www.akretion.com)
|
||||
@author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="commission_compute_form" model="ir.ui.view">
|
||||
<field name="name">commission.compute.form</field>
|
||||
<field name="model">commission.compute</field>
|
||||
<field name="arch" type="xml">
|
||||
<form>
|
||||
<group name="main">
|
||||
<field name="company_id" groups="base.group_multi_company"/>
|
||||
<field name="company_id" invisible="1"/>
|
||||
<field name="date_start"/>
|
||||
</group>
|
||||
<footer>
|
||||
<button name="run" type="object" string="Compute"
|
||||
class="btn-primary"/>
|
||||
<button special="cancel" string="Cancel"/>
|
||||
</footer>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="commission_compute_action" model="ir.actions.act_window">
|
||||
<field name="name">Compute Commissions</field>
|
||||
<field name="res_model">commission.compute</field>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="target">new</field>
|
||||
</record>
|
||||
|
||||
<menuitem id="commission_compute_menu" action="commission_compute_action" parent="commission_root" sequence="15"/>
|
||||
|
||||
</odoo>
|
||||
1
commission_simple_agent/__init__.py
Normal file
1
commission_simple_agent/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from . import models
|
||||
22
commission_simple_agent/__manifest__.py
Normal file
22
commission_simple_agent/__manifest__.py
Normal file
@@ -0,0 +1,22 @@
|
||||
# Copyright 2019-2024 Akretion France (http://www.akretion.com)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
{
|
||||
'name': 'Commission Simple Agent',
|
||||
'version': '16.0.1.0.0',
|
||||
'category': 'Sales',
|
||||
'license': 'AGPL-3',
|
||||
'summary': 'Glue module between commission_simple and sale_agent',
|
||||
'author': 'Akretion',
|
||||
'website': 'https://github.com/akretion/odoo-usability',
|
||||
'depends': [
|
||||
'commission_simple',
|
||||
'sale_agent',
|
||||
],
|
||||
'data': [
|
||||
'views/commission_profile.xml',
|
||||
'views/commission_result.xml',
|
||||
],
|
||||
'installable': True,
|
||||
}
|
||||
44
commission_simple_agent/i18n/fr.po
Normal file
44
commission_simple_agent/i18n/fr.po
Normal file
@@ -0,0 +1,44 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * commission_simple_agent
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-11-29 23:32+0000\n"
|
||||
"PO-Revision-Date: 2024-11-29 23:32+0000\n"
|
||||
"Last-Translator: Alexis de Lattre <alexis.delattre@akretion.com>\n"
|
||||
"Language-Team: \n"
|
||||
"Language: fr\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: commission_simple_agent
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple_agent/models/commission_profile_assignment.py:0
|
||||
#: model:ir.model.fields,field_description:commission_simple_agent.field_commission_profile_assignment__agent_id
|
||||
#: model_terms:ir.ui.view,arch_db:commission_simple_agent.commission_result_search
|
||||
#, python-format
|
||||
msgid "Agent"
|
||||
msgstr "Agent"
|
||||
|
||||
#. module: commission_simple_agent
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple_agent/models/commission_profile_assignment.py:0
|
||||
#, python-format
|
||||
msgid "An agent must be selected when the assignment type is 'Agent'."
|
||||
msgstr ""
|
||||
"Un agent doit être sélectionné lorsque le type d'affectation est \"Agent\"."
|
||||
|
||||
#. module: commission_simple_agent
|
||||
#: model:ir.model,name:commission_simple_agent.model_commission_profile_assignment
|
||||
msgid "Commission Profile Assignment"
|
||||
msgstr "Affectation du profil de commission"
|
||||
|
||||
#. module: commission_simple_agent
|
||||
#: model:ir.model.constraint,message:commission_simple_agent.constraint_commission_profile_assignment_company_agent_uniq
|
||||
msgid "This agent already has an assignment in this company."
|
||||
msgstr "Cet agent a déjà une affectation dans cette société."
|
||||
1
commission_simple_agent/models/__init__.py
Normal file
1
commission_simple_agent/models/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from . import commission_profile_assignment
|
||||
@@ -0,0 +1,51 @@
|
||||
# Copyright Akretion France (http://www.akretion.com/)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import api, fields, models, _
|
||||
from odoo.exceptions import ValidationError
|
||||
|
||||
|
||||
class CommissionProfileAssignment(models.Model):
|
||||
_inherit = "commission.profile.assignment"
|
||||
|
||||
agent_id = fields.Many2one(
|
||||
'res.partner', ondelete='restrict',
|
||||
compute="_compute_agent_id", store=True, precompute=True, readonly=False,
|
||||
domain=[('agent', '=', True)])
|
||||
|
||||
_sql_constraints = [
|
||||
(
|
||||
'company_agent_uniq',
|
||||
'unique(agent_id, company_id)',
|
||||
'This agent already has an assignment in this company.')]
|
||||
|
||||
@api.model
|
||||
def _assign_type_selection(self):
|
||||
sel = super()._assign_type_selection()
|
||||
sel.append(('agent', _('Agent')))
|
||||
return sel
|
||||
|
||||
@api.constrains('assign_type', 'agent_id')
|
||||
def _check_agent(self):
|
||||
for assignment in self:
|
||||
if assignment.assign_type == 'agent' and not assignment.agent_id:
|
||||
raise ValidationError(_("An agent must be selected when the assignment type is 'Agent'."))
|
||||
|
||||
@api.depends('assign_type')
|
||||
def _compute_agent_id(self):
|
||||
for assign in self:
|
||||
if assign.assign_type != 'agent':
|
||||
assign.agent_id = False
|
||||
|
||||
def _prepare_move_line_domain(self, date_range):
|
||||
domain = super()._prepare_move_line_domain(date_range)
|
||||
if self.assign_type == 'agent':
|
||||
domain.append(('move_id.invoice_agent_id', '=', self.agent_id.id))
|
||||
return domain
|
||||
|
||||
def _get_partner(self):
|
||||
self.ensure_one()
|
||||
if self.assign_type == 'agent':
|
||||
return self.agent_id
|
||||
return super()._get_partner()
|
||||
21
commission_simple_agent/views/commission_profile.xml
Normal file
21
commission_simple_agent/views/commission_profile.xml
Normal file
@@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2024 Akretion France (https://www.akretion.com)
|
||||
@author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="commission_profile_form" model="ir.ui.view">
|
||||
<field name="model">commission.profile</field>
|
||||
<field name="inherit_id" ref="commission_simple.commission_profile_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='assign_ids']/tree/field[@name='user_id']" position="after">
|
||||
<field name="agent_id" attrs="{'required': [('assign_type', '=', 'agent')], 'readonly': [('assign_type', '!=', 'agent')]}"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
</odoo>
|
||||
32
commission_simple_agent/views/commission_result.xml
Normal file
32
commission_simple_agent/views/commission_result.xml
Normal file
@@ -0,0 +1,32 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2024 Akretion France (https://www.akretion.com)
|
||||
@author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="commission_result_tree" model="ir.ui.view">
|
||||
<field name="model">commission.result</field>
|
||||
<field name="inherit_id" ref="commission_simple.commission_result_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="assign_type" position="attributes">
|
||||
<attribute name="decoration-danger">assign_type == 'agent'</attribute>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
<record id="commission_result_search" model="ir.ui.view">
|
||||
<field name="model">commission.result</field>
|
||||
<field name="inherit_id" ref="commission_simple.commission_result_search"/>
|
||||
<field name="arch" type="xml">
|
||||
<filter name="user" position="after">
|
||||
<filter name="agent" domain="[('assign_type', '=', 'agent')]" string="Agent"/>
|
||||
</filter>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
2
commission_simple_agent_purchase/__init__.py
Normal file
2
commission_simple_agent_purchase/__init__.py
Normal file
@@ -0,0 +1,2 @@
|
||||
from . import models
|
||||
from . import wizards
|
||||
23
commission_simple_agent_purchase/__manifest__.py
Normal file
23
commission_simple_agent_purchase/__manifest__.py
Normal file
@@ -0,0 +1,23 @@
|
||||
# Copyright 2019-2024 Akretion France (http://www.akretion.com)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
{
|
||||
'name': 'Commission Simple Agent Purchase',
|
||||
'version': '16.0.1.0.0',
|
||||
'category': 'Sales',
|
||||
'license': 'AGPL-3',
|
||||
'summary': 'Glue module between commission_simple_agent and purchase',
|
||||
'author': 'Akretion',
|
||||
'website': 'https://github.com/akretion/odoo-usability',
|
||||
'depends': [
|
||||
'commission_simple_agent',
|
||||
'purchase',
|
||||
],
|
||||
'data': [
|
||||
'views/commission_result.xml',
|
||||
'views/commission_profile.xml',
|
||||
'wizards/res_config_settings.xml',
|
||||
],
|
||||
'installable': True,
|
||||
}
|
||||
79
commission_simple_agent_purchase/i18n/fr.po
Normal file
79
commission_simple_agent_purchase/i18n/fr.po
Normal file
@@ -0,0 +1,79 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * commission_simple_agent_purchase
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-11-29 23:33+0000\n"
|
||||
"PO-Revision-Date: 2024-11-29 23:34+0000\n"
|
||||
"Last-Translator: Alexis de Lattre <alexis.delattre@akretion.com>\n"
|
||||
"Language-Team: \n"
|
||||
"Language: fr\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: commission_simple_agent_purchase
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple_agent_purchase/models/commission_result.py:0
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Cannot delete commission %(commission)s because it is linked to purchase "
|
||||
"order %(po)s. You must delete the purchase order first."
|
||||
msgstr ""
|
||||
"Impossible de supprimer la commission %(commission)s car elle est liée à la "
|
||||
"commande fournisseur %(po)s. Vous devez d'abord supprimer la commande "
|
||||
"fournisseur."
|
||||
|
||||
#. module: commission_simple_agent_purchase
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple_agent_purchase/models/commission_result.py:0
|
||||
#, python-format
|
||||
msgid "Commission %s"
|
||||
msgstr "Commission %s"
|
||||
|
||||
#. module: commission_simple_agent_purchase
|
||||
#: model:ir.model.fields,field_description:commission_simple_agent_purchase.field_res_company__commission_product_id
|
||||
#: model:ir.model.fields,field_description:commission_simple_agent_purchase.field_res_config_settings__commission_product_id
|
||||
msgid "Commission Product"
|
||||
msgstr "Produit de commission"
|
||||
|
||||
#. module: commission_simple_agent_purchase
|
||||
#: model:ir.model,name:commission_simple_agent_purchase.model_commission_result
|
||||
msgid "Commission Result"
|
||||
msgstr "État des commissions"
|
||||
|
||||
#. module: commission_simple_agent_purchase
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple_agent_purchase/models/commission_result.py:0
|
||||
#, python-format
|
||||
msgid "Commission product is not set on company %s."
|
||||
msgstr "Le produit de commission n'est pas défini sur la société %s."
|
||||
|
||||
#. module: commission_simple_agent_purchase
|
||||
#: model:ir.model,name:commission_simple_agent_purchase.model_res_company
|
||||
msgid "Companies"
|
||||
msgstr "Sociétés"
|
||||
|
||||
#. module: commission_simple_agent_purchase
|
||||
#: model:ir.model,name:commission_simple_agent_purchase.model_res_config_settings
|
||||
msgid "Config Settings"
|
||||
msgstr "Configuration"
|
||||
|
||||
#. module: commission_simple_agent_purchase
|
||||
#: model:ir.model.fields,field_description:commission_simple_agent_purchase.field_commission_result__purchase_id
|
||||
msgid "Purchase Order"
|
||||
msgstr "Commande fournisseur"
|
||||
|
||||
#. module: commission_simple_agent_purchase
|
||||
#. odoo-python
|
||||
#: code:addons/commission_simple_agent_purchase/models/commission_result.py:0
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Purchase Order %s has already been confirmed. You should cancel it first."
|
||||
msgstr ""
|
||||
"La commande fournisseur %s a déjà été confirmée. Vous devez d'abord "
|
||||
"l'annuler."
|
||||
3
commission_simple_agent_purchase/models/__init__.py
Normal file
3
commission_simple_agent_purchase/models/__init__.py
Normal file
@@ -0,0 +1,3 @@
|
||||
from . import commission_result
|
||||
from . import commission_profile
|
||||
from . import res_company
|
||||
@@ -0,0 +1,20 @@
|
||||
# Copyright Akretion France (http://www.akretion.com/)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
|
||||
from odoo import fields, models, api, _
|
||||
from odoo.exceptions import ValidationError
|
||||
|
||||
|
||||
class CommissionProfile(models.Model):
|
||||
_inherit = 'commission.profile'
|
||||
|
||||
commission_product_id = fields.Many2one(
|
||||
'product.product', string='Specific Commission Product', ondelete='restrict',
|
||||
check_company=True,
|
||||
domain=[('type', '=', 'service')],
|
||||
help="If not set, Odoo will use the commission product configured on the accounting "
|
||||
"configuration page."
|
||||
)
|
||||
|
||||
111
commission_simple_agent_purchase/models/commission_result.py
Normal file
111
commission_simple_agent_purchase/models/commission_result.py
Normal file
@@ -0,0 +1,111 @@
|
||||
# Copyright Akretion France (https://www.akretion.com/)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import fields, models, _
|
||||
from odoo.exceptions import UserError
|
||||
from odoo.tools.misc import format_amount, formatLang
|
||||
from markupsafe import Markup
|
||||
|
||||
|
||||
class CommissionResult(models.Model):
|
||||
_inherit = 'commission.result'
|
||||
|
||||
purchase_id = fields.Many2one('purchase.order', string="Purchase Order", tracking=True, readonly=True)
|
||||
|
||||
def draft2done(self):
|
||||
for result in self:
|
||||
if result.state == "draft" and result.assign_type == 'agent':
|
||||
if not result.purchase_id:
|
||||
vals = result._prepare_purchase_order()
|
||||
po = self.env['purchase.order'].create(vals)
|
||||
po.message_post(body=Markup(_("Generated from commission <a href=# data-oe-model=commission.result data-oe-id=%d>%s</a>.") % (result.id, result.display_name)))
|
||||
result.write({'purchase_id': po.id})
|
||||
else:
|
||||
po = self.purchase_id
|
||||
if po.state in ('draft', 'sent', 'cancel'):
|
||||
po.order_line.unlink()
|
||||
po.message_post(body=Markup(_("Purchase order lines re-generated from commission <a href=# data-oe-model=commission.result data-oe-id=%d>%s</a>.") % (result.id, result.display_name)))
|
||||
else:
|
||||
raise UserError(_("Purchase Order %s has already been confirmed. You should cancel it first.") % po.display_name)
|
||||
if po.state == 'cancel':
|
||||
po.button_draft()
|
||||
assert not po.order_line
|
||||
# create lines
|
||||
line_vals = []
|
||||
if not result.company_id.commission_po_config:
|
||||
raise UserError(_(
|
||||
"Purchase order configuration for commission is not set on "
|
||||
"the accounting configuration page of company '%s'.")
|
||||
% result.company_id.display_name)
|
||||
if result.company_id.commission_po_config == 'single_line':
|
||||
line_vals.append(result._prepare_purchase_order_line_single_line(po))
|
||||
else:
|
||||
for move_line in result.line_ids:
|
||||
line_vals.append(result._prepare_purchase_order_line(move_line, po))
|
||||
po_lines = self.env['purchase.order.line'].create(line_vals)
|
||||
po_lines._compute_tax_id()
|
||||
return super().draft2done()
|
||||
|
||||
def _prepare_purchase_order(self):
|
||||
self.ensure_one()
|
||||
fp = self.env['account.fiscal.position']._get_fiscal_position(self.partner_id)
|
||||
vals = {
|
||||
'partner_id': self.partner_id.id,
|
||||
'origin': _('Commission %s') % self.date_range_id.display_name,
|
||||
'company_id': self.company_id.id,
|
||||
'currency_id': self.company_id.currency_id.id,
|
||||
'fiscal_position_id': fp and fp.id or False,
|
||||
'payment_term_id': self.partner_id.property_supplier_payment_term_id.id,
|
||||
}
|
||||
return vals
|
||||
|
||||
def _prepare_purchase_order_line(self, move_line, order):
|
||||
self.ensure_one()
|
||||
move = move_line.move_id
|
||||
company_currency = move_line.company_id.currency_id
|
||||
lang = self.partner_id.lang or self.env.lang
|
||||
env = self.with_context(lang=lang).env
|
||||
product = self.profile_id.commission_product_id or self.company_id.commission_product_id
|
||||
if not product:
|
||||
raise UserError(_(
|
||||
"Commission product is not set on profile '%(profile)s' "
|
||||
"nor on company '%(company)s'.",
|
||||
profile=self.profile_id.display_name,
|
||||
company=self.company_id.display_name))
|
||||
vals = {
|
||||
'order_id': order.id,
|
||||
'product_id': product.id,
|
||||
'name': f"""{move.name} {move.commercial_partner_id.name}: {move_line.product_id.display_name} x {formatLang(env, move_line.quantity, dp='Product Unit of Measure')} {move_line.product_uom_id.display_name}\n{_('Base:')} {format_amount(env, move_line.commission_base, company_currency)} - {_('Rate:')} {formatLang(env, move_line.commission_rate, dp='Commission Rate')} %""",
|
||||
'product_qty': 1,
|
||||
'product_uom': product.uom_id.id,
|
||||
'price_unit': move_line.commission_amount,
|
||||
}
|
||||
return vals
|
||||
|
||||
def _prepare_purchase_order_line_single_line(self, order):
|
||||
product = self.profile_id.commission_product_id or self.company_id.commission_product_id
|
||||
if not product:
|
||||
raise UserError(_(
|
||||
"Commission product is not set on profile '%(profile)s' "
|
||||
"nor on company '%(company)s'.",
|
||||
profile=self.profile_id.display_name,
|
||||
company=self.company_id.display_name))
|
||||
vals = {
|
||||
'order_id': order.id,
|
||||
'product_id': product.id,
|
||||
'name': _("Commissions for period %(period)s", period=self.date_range_id.name),
|
||||
'product_qty': 1,
|
||||
'product_uom': product.uom_id.id,
|
||||
'price_unit': self.amount_total,
|
||||
}
|
||||
return vals
|
||||
|
||||
def unlink(self):
|
||||
for result in self:
|
||||
if result.purchase_id:
|
||||
raise UserError(_(
|
||||
"Cannot delete commission %(commission)s because it is linked to "
|
||||
"purchase order %(po)s. You must delete the purchase order first.",
|
||||
commission=result.display_name, po=result.purchase_id.display_name))
|
||||
return super().unlink()
|
||||
18
commission_simple_agent_purchase/models/res_company.py
Normal file
18
commission_simple_agent_purchase/models/res_company.py
Normal file
@@ -0,0 +1,18 @@
|
||||
# Copyright 2024 Akretion France (https://www.akretion.com/)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
|
||||
from odoo import fields, models
|
||||
|
||||
|
||||
class ResCompany(models.Model):
|
||||
_inherit = 'res.company'
|
||||
|
||||
commission_product_id = fields.Many2one(
|
||||
'product.product', string='Commission Product', ondelete='restrict', check_company=True,
|
||||
domain=[('type', '=', 'service')])
|
||||
commission_po_config = fields.Selection([
|
||||
('single_line', 'Single Line'),
|
||||
('details', 'One line per commission line'),
|
||||
], default='details', string="Purchase Order Configuration")
|
||||
@@ -0,0 +1,22 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2025 Akretion France (https://www.akretion.com)
|
||||
@author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="commission_profile_form" model="ir.ui.view">
|
||||
<field name="model">commission.profile</field>
|
||||
<field name="inherit_id" ref="commission_simple_agent.commission_profile_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<group name="main-right" position="inside">
|
||||
<field name="commission_product_id"/>
|
||||
</group>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
</odoo>
|
||||
|
||||
21
commission_simple_agent_purchase/views/commission_result.xml
Normal file
21
commission_simple_agent_purchase/views/commission_result.xml
Normal file
@@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2019 Akretion France (http://www.akretion.com)
|
||||
@author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="commission_result_form" model="ir.ui.view">
|
||||
<field name="model">commission.result</field>
|
||||
<field name="inherit_id" ref="commission_simple.commission_result_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<group name="main-right" position="inside">
|
||||
<field name="purchase_id" attrs="{'invisible': [('assign_type', '!=', 'agent')]}"/>
|
||||
</group>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
</odoo>
|
||||
1
commission_simple_agent_purchase/wizards/__init__.py
Normal file
1
commission_simple_agent_purchase/wizards/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from . import res_config_settings
|
||||
@@ -0,0 +1,13 @@
|
||||
# Copyright 2019-2024 Akretion France (https://www.akretion.com/)
|
||||
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import fields, models
|
||||
|
||||
|
||||
class ResConfigSettings(models.TransientModel):
|
||||
_inherit = 'res.config.settings'
|
||||
|
||||
commission_product_id = fields.Many2one(
|
||||
related='company_id.commission_product_id', readonly=False)
|
||||
commission_po_config = fields.Selection(related="company_id.commission_po_config", readonly=False)
|
||||
@@ -0,0 +1,38 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2019-2024 Akretion France (https://www.akretion.com)
|
||||
@author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
|
||||
<record id="res_config_settings_view_form" model="ir.ui.view">
|
||||
<field name="name">commission.res.config.settings.form</field>
|
||||
<field name="model">res.config.settings</field>
|
||||
<field name="inherit_id" ref="account.res_config_settings_view_form" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//div[@id='analytic']" position="after">
|
||||
<h2>Commissions</h2>
|
||||
<div class="row mt16 o_settings_container" id="commission_simple">
|
||||
<div class="col-12 col-lg-12 o_setting_box" id="commission_simple-settings">
|
||||
<div class="o_setting_left_pane" />
|
||||
<div class="o_setting_right_pane">
|
||||
<div class="row" id="commission_product_id">
|
||||
<label for="commission_product_id" class="col-md-5" />
|
||||
<field name="commission_product_id" context="{'default_type': 'service', 'default_purchase_ok': True, 'default_sale_ok': False, 'default_available_in_pos': False, 'default_purchase_method': 'purchase'}"/>
|
||||
</div>
|
||||
<div class="row" id="commission_po_config">
|
||||
<label for="commission_po_config" class="col-md-5" string="Purchase Order"/>
|
||||
<field name="commission_po_config" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
</odoo>
|
||||
66
crm_usability/i18n/fr.po
Normal file
66
crm_usability/i18n/fr.po
Normal file
@@ -0,0 +1,66 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * crm_usability
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-07-07 14:23+0000\n"
|
||||
"PO-Revision-Date: 2024-07-07 14:23+0000\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: crm_usability
|
||||
#: model_terms:ir.ui.view,arch_db:crm_usability.view_calendar_event_form
|
||||
msgid "CRM"
|
||||
msgstr "CRM"
|
||||
|
||||
#. module: crm_usability
|
||||
#: model_terms:ir.ui.view,arch_db:crm_usability.view_crm_case_opportunities_filter
|
||||
msgid "Customer"
|
||||
msgstr "Client"
|
||||
|
||||
#. module: crm_usability
|
||||
#: model_terms:ir.ui.view,arch_db:crm_usability.view_calendar_event_form
|
||||
msgid "Discard"
|
||||
msgstr "Ne pas sauvegarder"
|
||||
|
||||
#. module: crm_usability
|
||||
#: model:ir.model.fields,help:crm_usability.field_crm_lead__date_deadline
|
||||
msgid "Estimate of the date on which the opportunity will be won."
|
||||
msgstr "Estimation de la date à laquelle l'opportunité sera gagnée."
|
||||
|
||||
#. module: crm_usability
|
||||
#: model:ir.model.fields,field_description:crm_usability.field_crm_lead__date_deadline
|
||||
msgid "Expected Closing"
|
||||
msgstr "Date estimée"
|
||||
|
||||
#. module: crm_usability
|
||||
#: model:ir.model,name:crm_usability.model_crm_lead
|
||||
msgid "Lead/Opportunity"
|
||||
msgstr "Piste/Opportunité"
|
||||
|
||||
#. module: crm_usability
|
||||
#: model:ir.model.fields,field_description:crm_usability.field_crm_lead__name
|
||||
msgid "Opportunity"
|
||||
msgstr "Opportunité"
|
||||
|
||||
#. module: crm_usability
|
||||
#: model:ir.model.fields,field_description:crm_usability.field_crm_lead__probability
|
||||
msgid "Probability"
|
||||
msgstr "Probabilité"
|
||||
|
||||
#. module: crm_usability
|
||||
#: model_terms:ir.ui.view,arch_db:crm_usability.view_calendar_event_form
|
||||
msgid "Save & Close"
|
||||
msgstr "Sauvegarder et fermer"
|
||||
|
||||
#. module: crm_usability
|
||||
#: model_terms:ir.ui.view,arch_db:crm_usability.view_calendar_event_form
|
||||
msgid "Save & Send"
|
||||
msgstr "Sauvegarder et envoyer"
|
||||
@@ -19,4 +19,29 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="view_calendar_event_form" model="ir.ui.view">
|
||||
<field name="name">calendar.event.form.usability</field>
|
||||
<field name="model">calendar.event</field>
|
||||
<field name="inherit_id" ref="calendar.view_calendar_event_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<!-- Add "Opportunity" field on calendar event -->
|
||||
<notebook position="inside">
|
||||
<page name="crm" string="CRM">
|
||||
<group>
|
||||
<field name="opportunity_id" />
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
|
||||
<!-- Add "send & save" button next to "save & close" -->
|
||||
<form position="inside">
|
||||
<footer>
|
||||
<button name="action_open_composer" type="object" string="Save & Send" class="btn btn-primary" />
|
||||
<button string="Save & Close" special="save" />
|
||||
<button string="Discard" special="cancel"/>
|
||||
</footer>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
|
||||
31
delivery_usability/i18n/fr.po
Normal file
31
delivery_usability/i18n/fr.po
Normal file
@@ -0,0 +1,31 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * delivery_usability
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2024-07-07 14:40+0000\n"
|
||||
"PO-Revision-Date: 2024-07-07 14:40+0000\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: delivery_usability
|
||||
#: model:ir.model.fields,field_description:delivery_usability.field_stock_picking__carrier_id
|
||||
msgid "Carrier"
|
||||
msgstr "Transporteur"
|
||||
|
||||
#. module: delivery_usability
|
||||
#: model:ir.model.fields,field_description:delivery_usability.field_stock_picking__carrier_tracking_ref
|
||||
msgid "Tracking Reference"
|
||||
msgstr "Numéro de suivi"
|
||||
|
||||
#. module: delivery_usability
|
||||
#: model:ir.model,name:delivery_usability.model_stock_picking
|
||||
msgid "Transfer"
|
||||
msgstr "Transfert"
|
||||
1
hr_expense_usability_akretion/__init__.py
Normal file
1
hr_expense_usability_akretion/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from . import models
|
||||
23
hr_expense_usability_akretion/__manifest__.py
Normal file
23
hr_expense_usability_akretion/__manifest__.py
Normal file
@@ -0,0 +1,23 @@
|
||||
# Copyright 2025 Akretion France (http://www.akretion.com/)
|
||||
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
{
|
||||
'name': 'HR Expense Usability by Akretion',
|
||||
'version': '16.0.1.0.0',
|
||||
'category': 'Human Resources/Expenses',
|
||||
'license': 'AGPL-3',
|
||||
'summary': 'Usability improvements on expenses',
|
||||
'description': """
|
||||
This module includes several small usability improvements to expenses.
|
||||
|
||||
This module has been written by Alexis de Lattre from Akretion
|
||||
<alexis.delattre@akretion.com>.
|
||||
""",
|
||||
'author': 'Akretion',
|
||||
'maintainers': ['alexis-via'],
|
||||
'website': 'https://github.com/akretion/odoo-usability',
|
||||
'depends': ['hr_expense'],
|
||||
'data': [],
|
||||
'installable': True,
|
||||
}
|
||||
1
hr_expense_usability_akretion/models/__init__.py
Normal file
1
hr_expense_usability_akretion/models/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from . import hr_expense_sheet
|
||||
16
hr_expense_usability_akretion/models/hr_expense_sheet.py
Normal file
16
hr_expense_usability_akretion/models/hr_expense_sheet.py
Normal file
@@ -0,0 +1,16 @@
|
||||
# Copyright 2025 Akretion France (https://www.akretion.com/)
|
||||
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import models, Command
|
||||
|
||||
|
||||
class HrExpenseSheet(models.Model):
|
||||
_inherit = "hr.expense.sheet"
|
||||
|
||||
def _prepare_move_vals(self):
|
||||
"""Copy attachments from hr.expense.sheet to supplier invoice"""
|
||||
vals = super()._prepare_move_vals()
|
||||
if self.attachment_ids:
|
||||
vals['attachment_ids'] = [Command.create({'res_model': 'account.move', 'name': attach.name, 'datas': attach.datas}) for attach in self.attachment_ids]
|
||||
return vals
|
||||
1
hr_timesheet_sheet_usability_akretion/__init__.py
Normal file
1
hr_timesheet_sheet_usability_akretion/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from . import models
|
||||
18
hr_timesheet_sheet_usability_akretion/__manifest__.py
Normal file
18
hr_timesheet_sheet_usability_akretion/__manifest__.py
Normal file
@@ -0,0 +1,18 @@
|
||||
# Copyright 2025 Akretion France (http://www.akretion.com)
|
||||
# @author Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
{
|
||||
'name': 'HR Timesheet Sheet Usability Akretion',
|
||||
'version': '16.0.1.0.0',
|
||||
'category': 'Timesheet',
|
||||
'license': 'AGPL-3',
|
||||
'summary': 'Better usability in hr_timesheet_sheet module',
|
||||
'author': 'Akretion',
|
||||
'website': 'https://github.com/akretion/odoo-usability',
|
||||
'depends': ['hr_timesheet_sheet'],
|
||||
'data': [
|
||||
'views/hr_timesheet_sheet.xml',
|
||||
],
|
||||
'installable': True,
|
||||
}
|
||||
1
hr_timesheet_sheet_usability_akretion/models/__init__.py
Normal file
1
hr_timesheet_sheet_usability_akretion/models/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from . import hr_timesheet_sheet
|
||||
@@ -0,0 +1,28 @@
|
||||
# Copyright 2025 Akretion France (https://www.akretion.com/)
|
||||
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import fields, models, _
|
||||
from odoo.exceptions import UserError
|
||||
|
||||
|
||||
class HrTimesheetSheet(models.Model):
|
||||
_inherit = 'hr_timesheet.sheet'
|
||||
|
||||
def show_lines_fullscreen(self):
|
||||
self.ensure_one()
|
||||
action = self.env["ir.actions.actions"]._for_xml_id(
|
||||
"hr_timesheet.timesheet_action_all")
|
||||
action['domain'] = [('sheet_id', '=', self.id)]
|
||||
return action
|
||||
|
||||
# Inherit native method. We don't want tons of followers by default. We just want the manager.
|
||||
def _get_subscribers(self):
|
||||
self.ensure_one()
|
||||
subscribers = self._get_informables()
|
||||
return subscribers
|
||||
|
||||
def _check_can_review(self):
|
||||
if self.employee_id.user_id == self.env.user and self.employee_id.parent_id:
|
||||
raise UserError(_("You cannot approve your own timesheet!"))
|
||||
return super()._check_can_review()
|
||||
@@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2025 Akretion France (https://www.akretion.com/)
|
||||
@author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="hr_timesheet_sheet_form" model="ir.ui.view">
|
||||
<field name="model">hr_timesheet.sheet</field>
|
||||
<field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//sheet/field[@name='name']" position="before">
|
||||
<div class="oe_button_box" name="button_box">
|
||||
<button name="show_lines_fullscreen" type="object"
|
||||
class="oe_stat_button" icon="fa-bars" string="Détails plein écran"/>
|
||||
</div>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user