Compare commits
26 Commits
10.0-accou
...
10-account
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9a9d10cb56 | ||
|
|
0afe9a39a6 | ||
|
|
159f163da5 | ||
|
|
d0620a4c83 | ||
|
|
5d2d5b1e63 | ||
|
|
ab1144850b | ||
|
|
4995403bf5 | ||
|
|
a415744f11 | ||
|
|
8800b94e5b | ||
|
|
ca5238a03c | ||
|
|
5f15d83c3c | ||
|
|
6370dc0ec8 | ||
|
|
0d27c0a830 | ||
|
|
5f6107f2e8 | ||
|
|
ebb8f1ad86 | ||
|
|
04118bbf46 | ||
|
|
9cba31b68a | ||
|
|
21d1454ab9 | ||
|
|
d4e673103e | ||
|
|
9ebf7cdb4c | ||
|
|
f34a731d95 | ||
|
|
6ef322be4c | ||
|
|
dd15e3d194 | ||
|
|
f0bb02edf1 | ||
|
|
dc05ed3b5d | ||
|
|
2c1b8fe657 |
@@ -12,17 +12,21 @@
|
||||
<field name="model">account.invoice.line</field>
|
||||
<field name="inherit_id" ref="account.view_invoice_line_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="discount" position="after">
|
||||
<field name="company_id" position="after">
|
||||
<field name="standard_price_company_currency"
|
||||
groups="account.group_account_user"/>
|
||||
groups="base.group_no_one"/>
|
||||
<field name="standard_price_invoice_currency"
|
||||
widget="monetary"
|
||||
options="{'currency_field': 'currency_id'}"
|
||||
groups="account.group_account_user"/>
|
||||
groups="base.group_no_one"/>
|
||||
<field name="margin_invoice_currency"
|
||||
groups="account.group_account_user"/>
|
||||
groups="base.group_no_one"/>
|
||||
<field name="margin_company_currency"
|
||||
groups="account.group_account_user"/>
|
||||
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>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
@@ -34,18 +38,10 @@
|
||||
<field name="arch" type="xml">
|
||||
<field name="move_id" position="after">
|
||||
<field name="margin_invoice_currency"
|
||||
string="Margin" groups="account.group_account_user"/>
|
||||
string="Margin" groups="base.group_no_one"/>
|
||||
<field name="margin_company_currency"
|
||||
groups="account.group_account_user"/>
|
||||
groups="base.group_no_one"/>
|
||||
</field>
|
||||
<xpath expr="//field[@name='invoice_line_ids']/tree/field[@name='price_subtotal']" position="after">
|
||||
<field name="standard_price_invoice_currency" groups="base.group_no_one" widget="monetary" options="{'currency_field': 'currency_id'}"/>
|
||||
<field name="standard_price_company_currency" groups="base.group_no_one" widget="monetary" options="{'currency_field': 'company_currency_id'}"/>
|
||||
<field name="margin_invoice_currency" groups="base.group_no_one"/>
|
||||
<field name="margin_company_currency" groups="base.group_no_one"/>
|
||||
<field name="margin_rate" groups="base.group_no_one"/>
|
||||
<field name="company_currency_id" invisible="1"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ class AccountMoveLineFilterWizard(models.TransientModel):
|
||||
account_reconcile = fields.Boolean(
|
||||
related='account_id.reconcile', readonly=True)
|
||||
reconcile = fields.Selection([
|
||||
('unreconciled', 'Unreconciled'),
|
||||
('unreconciled', 'Unreconciled or Partially Reconciled'),
|
||||
('reconciled', 'Fully Reconciled'),
|
||||
# ('partial_reconciled', 'Partially Reconciled'),
|
||||
], string='Reconciliation Filter')
|
||||
|
||||
@@ -114,7 +114,7 @@ class AccountInvoiceLine(models.Model):
|
||||
related='invoice_id.date_invoice', store=True, readonly=True)
|
||||
commercial_partner_id = fields.Many2one(
|
||||
related='invoice_id.partner_id.commercial_partner_id',
|
||||
store=True, readonly=True)
|
||||
store=True, readonly=True, compute_sudo=True)
|
||||
state = fields.Selection(
|
||||
related='invoice_id.state', store=True, readonly=True,
|
||||
string='Invoice State')
|
||||
@@ -225,7 +225,7 @@ class AccountAccount(models.Model):
|
||||
journal_accounts_bank_type += account
|
||||
accounts = aao.search([
|
||||
('user_type_id', '=', bank_type.id)], order='company_id, code')
|
||||
for account in aao.search([('user_type_id', '=', bank_type.id)]):
|
||||
for account in accounts:
|
||||
if account not in journal_accounts_bank_type:
|
||||
account.user_type_id = asset_type.id
|
||||
logger.info(
|
||||
@@ -243,9 +243,7 @@ class AccountAnalyticAccount(models.Model):
|
||||
if self._context.get('analytic_account_show_code_only'):
|
||||
res = []
|
||||
for record in self:
|
||||
res.append((
|
||||
record.id,
|
||||
record.code or record._get_one_full_name(record)))
|
||||
res.append((record.id, record.code or record.name))
|
||||
return res
|
||||
else:
|
||||
return super(AccountAnalyticAccount, self).name_get()
|
||||
@@ -265,6 +263,7 @@ class AccountMove(models.Model):
|
||||
# By default, we can still modify "ref" when account move is posted
|
||||
# which seems a bit lazy for me...
|
||||
ref = fields.Char(states={'posted': [('readonly', True)]})
|
||||
date = fields.Date(copy=False)
|
||||
|
||||
|
||||
class AccountMoveLine(models.Model):
|
||||
@@ -278,6 +277,7 @@ class AccountMoveLine(models.Model):
|
||||
|
||||
# Update field only to add a string (there is no string in account module)
|
||||
invoice_id = fields.Many2one(string='Invoice')
|
||||
date_maturity = fields.Date(copy=False)
|
||||
|
||||
@api.onchange('credit')
|
||||
def _credit_onchange(self):
|
||||
|
||||
@@ -19,6 +19,9 @@
|
||||
<field name="invoice_line_ids" position="before">
|
||||
<button name="delete_lines_qty_zero" states="draft" string="⇒ Delete lines qty=0" type="object" class="oe_link oe_right" groups="account.group_account_invoice"/>
|
||||
</field>
|
||||
<xpath expr="//field[@name='tax_line_ids']/tree/field[@name='amount']" position="before">
|
||||
<field name="base" readonly="1"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -35,6 +38,9 @@
|
||||
<field name="move_id" position="before">
|
||||
<field name="sent"/>
|
||||
</field>
|
||||
<xpath expr="//field[@name='tax_line_ids']/tree/field[@name='amount']" position="before">
|
||||
<field name="base" readonly="1"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -241,6 +247,17 @@ module -->
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_account_payment_form" model="ir.ui.view">
|
||||
<field name="name">usability.account.payment.form</field>
|
||||
<field name="model">account.payment</field>
|
||||
<field name="inherit_id" ref="account.view_account_payment_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="communication" position="after">
|
||||
<field name="payment_reference"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- model account.move.line / Journal Items -->
|
||||
<record id="account.action_account_moves_all_a" model="ir.actions.act_window">
|
||||
<field name="limit">200</field>
|
||||
@@ -299,6 +316,9 @@ module -->
|
||||
<field name="name" position="attributes">
|
||||
<attribute name="string">Name or Reference</attribute>
|
||||
</field>
|
||||
<field name="partner_id" position="attributes">
|
||||
<attribute name="domain">['|', ('parent_id', '=', False), ('is_company', '=', True)]</attribute>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -332,6 +352,17 @@ module -->
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_account_move_filter" model="ir.ui.view">
|
||||
<field name="name">account_usability.account_move_search</field>
|
||||
<field name="model">account.move</field>
|
||||
<field name="inherit_id" ref="account.view_account_move_filter"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="partner_id" position="attributes">
|
||||
<attribute name="domain">['|', ('parent_id', '=', False), ('is_company', '=', True)]</attribute>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_account_search" model="ir.ui.view">
|
||||
<field name="name">account.account.search</field>
|
||||
<field name="model">account.account</field>
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
diff --git a/addons/account/models/account_payment.py b/addons/account/models/account_payment.py
|
||||
index b1d8012329d..b8a8e2a673d 100644
|
||||
--- a/addons/account/models/account_payment.py
|
||||
+++ b/addons/account/models/account_payment.py
|
||||
@@ -210,6 +210,7 @@ class account_payment(models.Model):
|
||||
payment_difference = fields.Monetary(compute='_compute_payment_difference', readonly=True)
|
||||
payment_difference_handling = fields.Selection([('open', 'Keep open'), ('reconcile', 'Mark invoice as fully paid')], default='open', string="Payment Difference", copy=False)
|
||||
writeoff_account_id = fields.Many2one('account.account', string="Difference Account", domain=[('deprecated', '=', False)], copy=False)
|
||||
+ writeoff_analytic_account_id = fields.Many2one('account.analytic.account', string="Difference Analytic Account", copy=False)
|
||||
|
||||
# FIXME: ondelete='restrict' not working (eg. cancel a bank statement reconciliation with a payment)
|
||||
move_line_ids = fields.One2many('account.move.line', 'payment_id', readonly=True, copy=False, ondelete='restrict')
|
||||
@@ -431,6 +432,7 @@ class account_payment(models.Model):
|
||||
amount_currency_wo = -abs(amount_currency_wo)
|
||||
writeoff_line['name'] = _('Counterpart')
|
||||
writeoff_line['account_id'] = self.writeoff_account_id.id
|
||||
+ writeoff_line['analytic_account_id'] = self.writeoff_analytic_account_id.id or False
|
||||
writeoff_line['debit'] = debit_wo
|
||||
writeoff_line['credit'] = credit_wo
|
||||
writeoff_line['amount_currency'] = amount_currency_wo
|
||||
diff --git a/addons/account/views/account_payment_view.xml b/addons/account/views/account_payment_view.xml
|
||||
index 2460458fbaa..4065d8f9952 100644
|
||||
--- a/addons/account/views/account_payment_view.xml
|
||||
+++ b/addons/account/views/account_payment_view.xml
|
||||
@@ -206,6 +206,8 @@
|
||||
</div>
|
||||
<field name="writeoff_account_id" string="Post Difference In"
|
||||
attrs="{'invisible': [('payment_difference_handling','=','open')], 'required': [('payment_difference_handling', '=', 'reconcile')]}"/>
|
||||
+ <field name="writeoff_analytic_account_id" string="Post Difference In Analytic Account"
|
||||
+ attrs="{'invisible': [('payment_difference_handling','=','open')]}"/>
|
||||
</group>
|
||||
</group>
|
||||
</sheet>
|
||||
@@ -31,6 +31,7 @@ A group by 'State' is added to module search view.
|
||||
'security/group.xml',
|
||||
'security/ir.model.access.csv',
|
||||
'partner_view.xml',
|
||||
'partner_bank_view.xml',
|
||||
'users_view.xml',
|
||||
'country_view.xml',
|
||||
'module_view.xml',
|
||||
|
||||
22
base_usability/partner_bank_view.xml
Normal file
22
base_usability/partner_bank_view.xml
Normal file
@@ -0,0 +1,22 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2018 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_partner_bank_tree" model="ir.ui.view">
|
||||
<field name="name">base_usability.res.partner.bank.tree</field>
|
||||
<field name="model">res.partner.bank</field>
|
||||
<field name="inherit_id" ref="base.view_partner_bank_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="sequence" position="attributes">
|
||||
<attribute name="invisible">0</attribute>
|
||||
<attribute name="widget">handle</attribute>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -19,6 +19,10 @@
|
||||
<xpath expr="//field[@name='child_ids']/form//field[@name='email']" position="attributes">
|
||||
<attribute name="widget">email</attribute>
|
||||
</xpath>
|
||||
<!-- Show title not only on Contacts -->
|
||||
<xpath expr="//field[@name='child_ids']/form//field[@name='title']" position="attributes">
|
||||
<attribute name="attrs"></attribute>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@ def formatLang(
|
||||
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)
|
||||
@@ -33,4 +34,5 @@ def formatLang(
|
||||
grouping=grouping, monetary=monetary, dp=dp, currency_obj=currency_obj)
|
||||
return res
|
||||
|
||||
|
||||
report_sxw.rml_parse.formatLang = formatLang
|
||||
|
||||
37
base_user_auth_log/README.rst
Normal file
37
base_user_auth_log/README.rst
Normal file
@@ -0,0 +1,37 @@
|
||||
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
|
||||
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
|
||||
:alt: License: AGPL-3
|
||||
|
||||
========================
|
||||
User Authentication Logs
|
||||
========================
|
||||
|
||||
This module adds user authentication logs in Odoo. It logs both authentication success and failures.
|
||||
|
||||
Usage
|
||||
=====
|
||||
|
||||
The authentication logs can be seen:
|
||||
|
||||
* on the users's form view in the *Auth Logs* tab,
|
||||
* in the menu *Settings > Technical > Security > Authentication Logs*.
|
||||
|
||||
Authentication failure logs are displayed in red. Authentication success logs are displayed in black.
|
||||
|
||||
To have read access to the logs, you need to be part of the *Access Rights* group.
|
||||
|
||||
Bug Tracker
|
||||
===========
|
||||
|
||||
Bugs are tracked on `GitHub Issues
|
||||
<https://github.com/akretion/odoo-usability/issues>`_. In case of trouble, please
|
||||
check there if your issue has already been reported. If you spotted it first,
|
||||
help us smashing it by providing a detailed and welcomed feedback.
|
||||
|
||||
Credits
|
||||
=======
|
||||
|
||||
Contributors
|
||||
------------
|
||||
|
||||
* Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
3
base_user_auth_log/__init__.py
Normal file
3
base_user_auth_log/__init__.py
Normal file
@@ -0,0 +1,3 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from . import models
|
||||
22
base_user_auth_log/__manifest__.py
Normal file
22
base_user_auth_log/__manifest__.py
Normal file
@@ -0,0 +1,22 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright 2017-2018 Akretion France
|
||||
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
{
|
||||
'name': 'Users authentification logs',
|
||||
'version': '10.0.1.0.0',
|
||||
'category': 'Tools',
|
||||
'license': 'AGPL-3',
|
||||
'summary': 'Adds users authentication logs',
|
||||
'author': 'Akretion',
|
||||
'website': 'http://www.akretion.com',
|
||||
'depends': ['base'],
|
||||
'data': [
|
||||
'security/ir.model.access.csv',
|
||||
'views/res_users_auth_log.xml',
|
||||
'views/res_users.xml',
|
||||
'data/ir_cron.xml',
|
||||
],
|
||||
'installable': True,
|
||||
}
|
||||
25
base_user_auth_log/data/ir_cron.xml
Normal file
25
base_user_auth_log/data/ir_cron.xml
Normal file
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2017-2018 Akretion France
|
||||
@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="purge_auth_log_cron" model="ir.cron">
|
||||
<field name="name">Purge old authentication logs</field>
|
||||
<field name="active" eval="True"/>
|
||||
<field name="user_id" ref="base.user_root"/>
|
||||
<field name="interval_number">1</field>
|
||||
<field name="interval_type">months</field>
|
||||
<field name="numbercall">-1</field> <!-- don't limit the number of calls -->
|
||||
<field name="doall" eval="False"/>
|
||||
<field name="model" eval="'res.users.auth.log'"/>
|
||||
<field name="function" eval="'_purge_old_auth_logs'" />
|
||||
<field name="args" eval="'()'"/>
|
||||
</record>
|
||||
|
||||
|
||||
</odoo>
|
||||
4
base_user_auth_log/models/__init__.py
Normal file
4
base_user_auth_log/models/__init__.py
Normal file
@@ -0,0 +1,4 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from . import res_users_auth_log
|
||||
from . import res_users
|
||||
46
base_user_auth_log/models/res_users.py
Normal file
46
base_user_auth_log/models/res_users.py
Normal file
@@ -0,0 +1,46 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright 2017-2018 Akretion France
|
||||
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import models, fields, registry, SUPERUSER_ID
|
||||
import logging
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class ResUsers(models.Model):
|
||||
_inherit = 'res.users'
|
||||
|
||||
auth_log_ids = fields.One2many(
|
||||
'res.users.auth.log', 'user_id', string='Authentication Logs')
|
||||
|
||||
@classmethod
|
||||
def _login(cls, db, login, password):
|
||||
user_id = super(ResUsers, cls)._login(db, login, password)
|
||||
with registry(db).cursor() as cr:
|
||||
if user_id:
|
||||
result = 'success'
|
||||
user_log_id = user_id
|
||||
else:
|
||||
# To write a null value, psycopg2 wants None
|
||||
user_log_id = None
|
||||
result = 'failure'
|
||||
cr.execute(
|
||||
"SELECT id FROM res_users WHERE login=%s", (login, ))
|
||||
user_select = cr.fetchall()
|
||||
if user_select:
|
||||
user_log_id = user_select[0][0]
|
||||
|
||||
cr.execute("""
|
||||
INSERT INTO res_users_auth_log (
|
||||
create_uid,
|
||||
create_date,
|
||||
date,
|
||||
login,
|
||||
result,
|
||||
user_id
|
||||
) VALUES (
|
||||
%s, NOW() AT TIME ZONE 'UTC', NOW() AT TIME ZONE 'UTC',
|
||||
%s, %s, %s)""", (SUPERUSER_ID, login, result, user_log_id))
|
||||
logger.info('Auth log created for login %s type %s', login, result)
|
||||
return user_id
|
||||
44
base_user_auth_log/models/res_users_auth_log.py
Normal file
44
base_user_auth_log/models/res_users_auth_log.py
Normal file
@@ -0,0 +1,44 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import models, fields, api, _
|
||||
from odoo.exceptions import UserError
|
||||
from datetime import datetime, timedelta
|
||||
import logging
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class ResUsersAuthLog(models.Model):
|
||||
_name = 'res.users.auth.log'
|
||||
_description = 'Users Authentication Logs'
|
||||
_order = 'date desc'
|
||||
_rec_name = 'date'
|
||||
|
||||
user_id = fields.Many2one(
|
||||
'res.users', string='User', ondelete='cascade', readonly=True)
|
||||
login = fields.Char(string='Login', readonly=True)
|
||||
date = fields.Datetime(
|
||||
string='Authentication Date', required=True, readonly=True)
|
||||
result = fields.Selection([
|
||||
('success', 'Success'),
|
||||
('failure', 'Failure'),
|
||||
], string='Result', required=True, readonly=True)
|
||||
|
||||
@api.model
|
||||
def create(self, vals):
|
||||
if not self._context.get('authenticate_create'):
|
||||
raise UserError(_(
|
||||
"You cannot manually create an authentication log."))
|
||||
return super(ResUsersAuthLog, self).create(vals)
|
||||
|
||||
@api.multi
|
||||
def write(self, vals):
|
||||
raise UserError(_("You cannot modify an authentication log."))
|
||||
|
||||
@api.model
|
||||
def _purge_old_auth_logs(self):
|
||||
expiry_date = datetime.today() - timedelta(days=365)
|
||||
self._cr.execute(
|
||||
"DELETE FROM res_users_auth_log WHERE date <= %s", (expiry_date, ))
|
||||
logger.info('Auth logs older than %s have been purged', expiry_date)
|
||||
2
base_user_auth_log/security/ir.model.access.csv
Normal file
2
base_user_auth_log/security/ir.model.access.csv
Normal file
@@ -0,0 +1,2 @@
|
||||
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
|
||||
access_res_users_auth_log,Read access to Access rights group,model_res_users_auth_log,base.group_erp_manager,1,0,0,0
|
||||
|
25
base_user_auth_log/views/res_users.xml
Normal file
25
base_user_auth_log/views/res_users.xml
Normal file
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2017-2018 Akretion France
|
||||
@author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
|
||||
<record id="view_users_form" model="ir.ui.view">
|
||||
<field name="name">auth_logs.res.users.form</field>
|
||||
<field name="model">res.users</field>
|
||||
<field name="inherit_id" ref="base.view_users_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<notebook position="inside">
|
||||
<page string="Auth Logs" name="auth_logs">
|
||||
<field name="auth_log_ids" nolabel="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
</odoo>
|
||||
80
base_user_auth_log/views/res_users_auth_log.xml
Normal file
80
base_user_auth_log/views/res_users_auth_log.xml
Normal file
@@ -0,0 +1,80 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2017-2018 Akretion France
|
||||
@author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
|
||||
<record id="res_users_auth_log_form" model="ir.ui.view">
|
||||
<field name="name">res.users.auth.logs.form</field>
|
||||
<field name="model">res.users.auth.log</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Authentication Log">
|
||||
<group name="main">
|
||||
<field name="date"/>
|
||||
<field name="user_id"/>
|
||||
<field name="login"/>
|
||||
<field name="result"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="res_users_auth_log_tree" model="ir.ui.view">
|
||||
<field name="name">res.users.auth.logs.tree</field>
|
||||
<field name="model">res.users.auth.log</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Authentication Logs" colors="red:result=='failure'">
|
||||
<field name="date"/>
|
||||
<field name="user_id" invisible="not context.get('auth_logs_main_view')"/>
|
||||
<field name="login" invisible="not context.get('auth_logs_main_view')"/>
|
||||
<field name="result"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="res_users_auth_log_search" model="ir.ui.view">
|
||||
<field name="name">res.users.auth.logs.search</field>
|
||||
<field name="model">res.users.auth.log</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Authentication Logs">
|
||||
<field name="user_id"/>
|
||||
<filter name="success" string="Success" domain="[('result', '=', 'success')]"/>
|
||||
<filter name="failure" string="Failure" domain="[('result', '=', 'failure')]"/>
|
||||
<group string="Group By" name="groupby">
|
||||
<filter name="day_groupby" string="Day" context="{'group_by': 'date:day'}"/>
|
||||
<filter name="week_groupby" string="Week" context="{'group_by': 'date:week'}"/>
|
||||
<filter name="month_groupby" string="Month" context="{'group_by': 'date:month'}"/>
|
||||
<filter name="user_groupby" string="User" context="{'group_by': 'user_id'}"/>
|
||||
<filter name="result_groupby" string="Result" context="{'group_by': 'result'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="res_users_auth_log_graph" model="ir.ui.view">
|
||||
<field name="name">res.users.auth.logs.graph</field>
|
||||
<field name="model">res.users.auth.log</field>
|
||||
<field name="arch" type="xml">
|
||||
<graph string="Analyze Authentication Logs" type="pivot">
|
||||
<field name="date" type="row" interval="week"/>
|
||||
<field name="user_id" type="col"/>
|
||||
</graph>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="res_users_auth_log_action" model="ir.actions.act_window">
|
||||
<field name="name">Authentication Logs</field>
|
||||
<field name="res_model">res.users.auth.log</field>
|
||||
<field name="view_mode">tree,form,graph</field>
|
||||
<field name="context">{'auth_logs_main_view': True}</field>
|
||||
</record>
|
||||
|
||||
<menuitem id="res_users_auth_log_menu" action="res_users_auth_log_action"
|
||||
parent="base.menu_security" sequence="100"/>
|
||||
|
||||
|
||||
</odoo>
|
||||
@@ -1,2 +1,3 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from . import stock
|
||||
|
||||
@@ -24,6 +24,7 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
|
||||
'data': [
|
||||
'delivery_view.xml',
|
||||
'sale_view.xml',
|
||||
'stock_view.xml',
|
||||
],
|
||||
'installable': True,
|
||||
}
|
||||
|
||||
12
delivery_usability/stock.py
Normal file
12
delivery_usability/stock.py
Normal file
@@ -0,0 +1,12 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright 2018 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).
|
||||
|
||||
from odoo import fields, models
|
||||
|
||||
|
||||
class StockPicking(models.Model):
|
||||
_inherit = 'stock.picking'
|
||||
|
||||
carrier_id = fields.Many2one(track_visibility='onchange')
|
||||
23
delivery_usability/stock_view.xml
Normal file
23
delivery_usability/stock_view.xml
Normal file
@@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright 2018 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
-->
|
||||
|
||||
<odoo>
|
||||
|
||||
<record id="view_picking_withcarrier_out_form" model="ir.ui.view">
|
||||
<field name="name">delivery_usability.stock.picking.form</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="carrier_id" position="attributes">
|
||||
<!-- Sometimes we have to modify carrier_id when state is done
|
||||
so remove readonly when state = done from view and add tracking on_change in
|
||||
field definition -->
|
||||
<attribute name="attrs">{}</attribute>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -103,7 +103,7 @@ class HrExpense(models.Model):
|
||||
string='Untaxed Amount', currency_field='currency_id',
|
||||
readonly=True, states={'draft': [('readonly', False)]})
|
||||
company_currency_id = fields.Many2one(
|
||||
related='company_id.currency_id', readonly=True, store=True)
|
||||
related='company_id.currency_id', readonly=True, store=True, compute_sudo=True)
|
||||
total_amount_company_currency = fields.Monetary(
|
||||
compute='compute_amount_company_currency', readonly=True,
|
||||
store=True, string='Total in Company Currency',
|
||||
@@ -309,7 +309,7 @@ class HrExpenseSheet(models.Model):
|
||||
responsible_id = fields.Many2one(track_visibility='onchange')
|
||||
accounting_date = fields.Date(track_visibility='onchange')
|
||||
company_currency_id = fields.Many2one(
|
||||
related='company_id.currency_id', readonly=True, store=True)
|
||||
related='company_id.currency_id', readonly=True, store=True, compute_sudo=True)
|
||||
total_amount_company_currency = fields.Monetary(
|
||||
compute='compute_total_company_currency',
|
||||
currency_field='company_currency_id', readonly=True, store=True,
|
||||
|
||||
@@ -9,7 +9,7 @@ class PurchaseConfigSettings(models.TransientModel):
|
||||
_inherit = 'purchase.config.settings'
|
||||
|
||||
lunch_voucher_product_id = fields.Many2one(
|
||||
related='company_id.lunch_voucher_product_id')
|
||||
related='company_id.lunch_voucher_product_id', compute_sudo=True)
|
||||
lunch_voucher_employer_price = fields.Monetary(
|
||||
related='company_id.lunch_voucher_employer_price',
|
||||
currency_field='company_currency_id')
|
||||
currency_field='company_currency_id', compute_sudo=True)
|
||||
|
||||
@@ -10,6 +10,6 @@ class PurchaseConfigSettings(models.TransientModel):
|
||||
_inherit = 'purchase.config.settings'
|
||||
|
||||
lunch_voucher_natixis_customer_code = fields.Char(
|
||||
related='company_id.lunch_voucher_natixis_customer_code')
|
||||
related='company_id.lunch_voucher_natixis_customer_code', compute_sudo=True)
|
||||
lunch_voucher_natixis_delivery_code = fields.Char(
|
||||
related='company_id.lunch_voucher_natixis_delivery_code')
|
||||
related='company_id.lunch_voucher_natixis_delivery_code', compute_sudo=True)
|
||||
|
||||
@@ -223,7 +223,7 @@ class HrHolidays(models.Model):
|
||||
readonly=True)
|
||||
limit = fields.Boolean( # pose des pbs de droits
|
||||
related='holiday_status_id.limit', string='Allow to Override Limit',
|
||||
readonly=True)
|
||||
readonly=True, compute_sudo=True)
|
||||
payslip_date = fields.Date(
|
||||
string='Transfer to Payslip Date', track_visibility='onchange',
|
||||
readonly=True)
|
||||
@@ -245,7 +245,7 @@ class HrHolidays(models.Model):
|
||||
# by default, there is no company_id field on hr.holidays !
|
||||
company_id = fields.Many2one(
|
||||
related='employee_id.resource_id.company_id', store=True,
|
||||
readonly=True)
|
||||
readonly=True, compute_sudo=True)
|
||||
state = fields.Selection(default='draft') # hr_holidays, default='confirm'
|
||||
|
||||
@api.constrains(
|
||||
@@ -441,4 +441,4 @@ class BaseConfigSettings(models.TransientModel):
|
||||
_inherit = 'base.config.settings'
|
||||
|
||||
mass_allocation_default_holiday_status_id = fields.Many2one(
|
||||
related='company_id.mass_allocation_default_holiday_status_id')
|
||||
related='company_id.mass_allocation_default_holiday_status_id', compute_sudo=True)
|
||||
|
||||
@@ -41,3 +41,41 @@ class ResPartner(models.Model):
|
||||
message, force_send=force_send,
|
||||
send_after_commit=send_after_commit,
|
||||
user_signature=user_signature)
|
||||
|
||||
|
||||
class TemplatePreview(models.TransientModel):
|
||||
_inherit = "email_template.preview"
|
||||
|
||||
res_id = fields.Integer(compute='_compute_res_id')
|
||||
object_id = fields.Reference(selection='_reference_models')
|
||||
|
||||
@api.model
|
||||
def default_get(self, fields):
|
||||
result = super(TemplatePreview, self).default_get(fields)
|
||||
if result.get('model_id'):
|
||||
model = self.env['ir.model'].browse(result['model_id'])
|
||||
result['object_id'] = model.model
|
||||
return result
|
||||
|
||||
def _reference_models(self):
|
||||
result = self.default_get(['model_id'])
|
||||
if result.get('model_id'):
|
||||
model = self.env['ir.model'].browse(result['model_id'])
|
||||
return [(model.model, model.name)]
|
||||
else:
|
||||
models = self.env['ir.model'].search([('state', '!=', 'manual')])
|
||||
return [(model.model, model.name)
|
||||
for model in models
|
||||
if not model.model.startswith('ir.')]
|
||||
|
||||
@api.depends('object_id')
|
||||
def _compute_res_id(self):
|
||||
for record in self:
|
||||
if self.object_id:
|
||||
record.res_id = self.object_id.id
|
||||
|
||||
def send(self):
|
||||
template = self.env['mail.template'].browse(
|
||||
self._context['template_id'])
|
||||
template.send_mail(
|
||||
self.res_id, force_send=True, raise_exception=True)
|
||||
|
||||
@@ -19,4 +19,23 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="email_template_preview_form" model="ir.ui.view">
|
||||
<field name="model">email_template.preview</field>
|
||||
<field name="inherit_id" ref="mail.email_template_preview_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="res_id" position="attributes">
|
||||
<attribute name="invisible">True</attribute>
|
||||
</field>
|
||||
<field name="res_id" position="after">
|
||||
<field name="object_id"/>
|
||||
</field>
|
||||
<footer position="inside">
|
||||
<button
|
||||
string="Send"
|
||||
name="send"
|
||||
class="btn-primary"
|
||||
type='object'/>
|
||||
</footer>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
|
||||
3
product_unit_manager_group/__init__.py
Normal file
3
product_unit_manager_group/__init__.py
Normal file
@@ -0,0 +1,3 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# © 2017 Chafique DELLI @ Akretion
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||
24
product_unit_manager_group/__manifest__.py
Normal file
24
product_unit_manager_group/__manifest__.py
Normal file
@@ -0,0 +1,24 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# © 2017 Chafique DELLI @ Akretion
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||
{
|
||||
'name': 'Product Unit Manager Group',
|
||||
'summary': 'Add a group Product Unit of Measure Manager',
|
||||
'version': '10.0.1.0.1',
|
||||
'category': 'Product',
|
||||
'description': 'Splits the use from the mangement for uom rights',
|
||||
'website': 'https://akretion.com',
|
||||
'author': 'Akretion',
|
||||
'license': 'AGPL-3',
|
||||
'installable': True,
|
||||
'depends': [
|
||||
'sale',
|
||||
'purchase',
|
||||
'mrp',
|
||||
],
|
||||
'data': [
|
||||
'security/product_security.xml',
|
||||
'security/ir.model.access.csv',
|
||||
'views/product_view.xml',
|
||||
],
|
||||
}
|
||||
29
product_unit_manager_group/i18n/fr.po
Normal file
29
product_unit_manager_group/i18n/fr.po
Normal file
@@ -0,0 +1,29 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * product_unit_manager_group
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 8.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2017-03-13 15:35+0000\n"
|
||||
"PO-Revision-Date: 2017-03-13 15:35+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: product_unit_manager_group
|
||||
#: model:res.groups,comment:product_unit_manager_group.group_uom_manager
|
||||
#: model:res.groups,name:product_unit_manager_group.group_uom_manager
|
||||
msgid "Manage Multiple Units of Measure"
|
||||
msgstr "Gérer plusieurs unités de mesure"
|
||||
|
||||
#. module: product_unit_manager_group
|
||||
#: model:res.groups,comment:product.group_uom
|
||||
#: model:res.groups,name:product.group_uom
|
||||
msgid "Use Multiple Units of Measure"
|
||||
msgstr "Utiliser plusieurs unités de mesure"
|
||||
|
||||
13
product_unit_manager_group/security/ir.model.access.csv
Normal file
13
product_unit_manager_group/security/ir.model.access.csv
Normal file
@@ -0,0 +1,13 @@
|
||||
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
|
||||
access_product_uom_manager,product.uom.manager,product.model_product_uom,group_uom_manager,1,1,1,1
|
||||
access_product_uom_categ_manager,product.uom.categ.manager,product.model_product_uom_categ,group_uom_manager,1,1,1,1
|
||||
access_product_uom_user,product.uom.user,product.model_product_uom,product.group_uom,1,0,0,0
|
||||
access_product_uom_categ_user,product.uom.categ.user,product.model_product_uom_categ,product.group_uom,1,0,0,0
|
||||
sale.access_product_uom_sale_manager,product.uom salemanager,product.model_product_uom,sales_team.group_sale_manager,1,0,0,0
|
||||
sale.access_product_uom_categ_sale_manager,product.uom.categ salemanager,product.model_product_uom_categ,sales_team.group_sale_manager,1,0,0,0
|
||||
purchase.access_product_uom_purchase_manager,product.uom purchase_manager,product.model_product_uom,purchase.group_purchase_manager,1,0,0,0
|
||||
purchase.access_product_uom_categ_purchase_manager,product.uom.categ purchase_manager,product.model_product_uom_categ,purchase.group_purchase_manager,1,0,0,0
|
||||
mrp.access_product_uom_mrp_manager,product.uom mrp_manager,product.model_product_uom,mrp.group_mrp_manager,1,0,0,0
|
||||
mrp.access_product_uom_categ_mrp_manager,product.uom.categ mrp_manager,product.model_product_uom_categ,mrp.group_mrp_manager,1,0,0,0
|
||||
stock.access_product_uom_stock_manager,product.uom stock_manager,product.model_product_uom,stock.group_stock_manager,1,0,0,0
|
||||
stock.access_product_uom_categ_stock_manager,product.uom.categ stock_manager,product.model_product_uom_categ,stock.group_stock_manager,1,0,0,0
|
||||
|
19
product_unit_manager_group/security/product_security.xml
Normal file
19
product_unit_manager_group/security/product_security.xml
Normal file
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
<data noupdate="0">
|
||||
|
||||
<record id="product.group_uom" model="res.groups">
|
||||
<field name="name">Use Multiple Units of Measure</field>
|
||||
<field name="comment">Use multiple units of measure</field>
|
||||
</record>
|
||||
|
||||
<record id="group_uom_manager" model="res.groups">
|
||||
<field name="name">Manage Multiple Units of Measure (Manager)</field>
|
||||
<field name="comment">Manage Multiple Units of Measure</field>
|
||||
<field name="category_id" ref="base.module_category_hidden"/>
|
||||
<field name="users" eval="[(4, ref('base.user_root'))]"/>
|
||||
<field name="implied_ids" eval="[(6, 0, [ref('product.group_uom')])]"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
39
product_unit_manager_group/views/product_view.xml
Normal file
39
product_unit_manager_group/views/product_view.xml
Normal file
@@ -0,0 +1,39 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<odoo>
|
||||
<data>
|
||||
|
||||
<record id="sale.next_id_16" model="ir.ui.menu">
|
||||
<field name="groups_id" eval="[(6, 0, [ref('product_unit_manager_group.group_uom_manager')])]"/>
|
||||
</record>
|
||||
|
||||
<record id="sale.menu_product_uom_form_action" model="ir.ui.menu">
|
||||
<field name="groups_id" eval="[(6, 0, [ref('product_unit_manager_group.group_uom_manager')])]"/>
|
||||
</record>
|
||||
|
||||
<record id="sale.menu_product_uom_categ_form_action" model="ir.ui.menu">
|
||||
<field name="groups_id" eval="[(6, 0, [ref('product_unit_manager_group.group_uom_manager')])]"/>
|
||||
</record>
|
||||
|
||||
<record id="stock.menu_stock_unit_measure_stock" model="ir.ui.menu">
|
||||
<field name="groups_id" eval="[(6, 0, [ref('product_unit_manager_group.group_uom_manager')])]"/>
|
||||
</record>
|
||||
|
||||
<record id="stock.menu_stock_uom_categ_form_action" model="ir.ui.menu">
|
||||
<field name="groups_id" eval="[(6, 0, [ref('product_unit_manager_group.group_uom_manager')])]"/>
|
||||
</record>
|
||||
|
||||
<record id="stock.menu_stock_uom_form_action" model="ir.ui.menu">
|
||||
<field name="groups_id" eval="[(6, 0, [ref('product_unit_manager_group.group_uom_manager')])]"/>
|
||||
</record>
|
||||
|
||||
<record id="purchase.menu_purchase_uom_categ_form_action" model="ir.ui.menu">
|
||||
<field name="groups_id" eval="[(6, 0, [ref('product_unit_manager_group.group_uom_manager')])]"/>
|
||||
</record>
|
||||
|
||||
<record id="purchase.menu_purchase_uom_form_action" model="ir.ui.menu">
|
||||
<field name="groups_id" eval="[(6, 0, [ref('product_unit_manager_group.group_uom_manager')])]"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
@@ -1,5 +1,4 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# © 2015-2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
|
||||
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import models, fields
|
||||
@@ -70,5 +69,5 @@ class ProductPriceHistory(models.Model):
|
||||
_inherit = 'product.price.history'
|
||||
|
||||
company_currency_id = fields.Many2one(
|
||||
related='company_id.currency_id', readonly=True,
|
||||
related='company_id.currency_id', readonly=True, compute_sudo=True,
|
||||
string='Company Currency')
|
||||
|
||||
@@ -88,11 +88,15 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- It also adds on product.product search view -->
|
||||
<record id="product_template_search_view" model="ir.ui.view">
|
||||
<field name="name">usability.product.template.search</field>
|
||||
<field name="model">product.template</field>
|
||||
<field name="inherit_id" ref="product.product_template_search_view" />
|
||||
<field name="arch" type="xml">
|
||||
<field name="categ_id" position="after">
|
||||
<field name="seller_ids" string="Supplier" filter_domain="[('seller_ids.name', 'ilike', self)]"/>
|
||||
</field>
|
||||
<field name="pricelist_id" position="after">
|
||||
<group string="Group By" name="groupby">
|
||||
<filter name="categ_groupby" string="Internal Category" context="{'group_by': 'categ_id'}"/>
|
||||
|
||||
31
purchase_order_buyer/README.rst
Normal file
31
purchase_order_buyer/README.rst
Normal file
@@ -0,0 +1,31 @@
|
||||
.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
|
||||
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
|
||||
:alt: License: AGPL-3
|
||||
|
||||
====================
|
||||
Purchase Order Buyer
|
||||
====================
|
||||
|
||||
Adds a buyer on the Purchase Order. (Like a vendor on sales).
|
||||
|
||||
A prefered buyer can be set on the supplier.
|
||||
|
||||
Usage
|
||||
=====
|
||||
|
||||
To use this module, you need to go to Purchase > Purchase Order: there a new field "Buyer"
|
||||
It will use by default the user_id of the supplier and fallback to current user.
|
||||
|
||||
Credits
|
||||
=======
|
||||
|
||||
|
||||
Contributors
|
||||
------------
|
||||
|
||||
* Raphaël Reverdy <raphael.reverdy@akretion.com>
|
||||
|
||||
Maintainer
|
||||
----------
|
||||
|
||||
Akretion
|
||||
2
purchase_order_buyer/__init__.py
Normal file
2
purchase_order_buyer/__init__.py
Normal file
@@ -0,0 +1,2 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from . import models
|
||||
19
purchase_order_buyer/__manifest__.py
Normal file
19
purchase_order_buyer/__manifest__.py
Normal file
@@ -0,0 +1,19 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright 2018 Akretion (https://akretion.com)
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||
|
||||
{
|
||||
"name": "Purchase Order Buyer",
|
||||
"summary": "Add a buyer (user) on POs",
|
||||
"version": "10.0.1.1.0",
|
||||
"author": "Akretion",
|
||||
"website": "https://github.com/akretion/odoo-usability",
|
||||
"category": "Purchases",
|
||||
"depends": ["purchase"],
|
||||
"data": [
|
||||
'views/purchase_order.xml',
|
||||
],
|
||||
"license": "AGPL-3",
|
||||
"installable": True,
|
||||
"application": False,
|
||||
}
|
||||
3
purchase_order_buyer/models/__init__.py
Normal file
3
purchase_order_buyer/models/__init__.py
Normal file
@@ -0,0 +1,3 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from . import purchase_order
|
||||
28
purchase_order_buyer/models/purchase_order.py
Normal file
28
purchase_order_buyer/models/purchase_order.py
Normal file
@@ -0,0 +1,28 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright 2018 Raphael Reverdy https://akretion.com
|
||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||
|
||||
from odoo import api, fields, models
|
||||
|
||||
|
||||
class PurchaseOrder(models.Model):
|
||||
_inherit = 'purchase.order'
|
||||
|
||||
user_id = fields.Many2one(
|
||||
'res.users',
|
||||
string='Buyer', index=True,
|
||||
track_visibility='onchange',
|
||||
default=lambda self: self.env.user)
|
||||
|
||||
@api.multi
|
||||
@api.onchange('partner_id')
|
||||
def onchange_partner_id(self):
|
||||
"""Update the user_id (buyer)"""
|
||||
for rec in self:
|
||||
if rec.partner_id and rec.partner_id.user_id:
|
||||
user_id = rec.partner_id.user_id.id
|
||||
else:
|
||||
user_id = self.env.user
|
||||
return rec.update({
|
||||
'user_id': user_id,
|
||||
})
|
||||
BIN
purchase_order_buyer/static/description/icon.png
Normal file
BIN
purchase_order_buyer/static/description/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.5 KiB |
26
purchase_order_buyer/views/purchase_order.xml
Normal file
26
purchase_order_buyer/views/purchase_order.xml
Normal file
@@ -0,0 +1,26 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
|
||||
<record id="purchase_order_tree" model="ir.ui.view">
|
||||
<field name="name">purchase.order.tree</field>
|
||||
<field name="model">purchase.order</field>
|
||||
<field name="inherit_id" ref="purchase.purchase_order_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="partner_id" position="after">
|
||||
<field name="user_id" />
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="purchase_order_form" model="ir.ui.view">
|
||||
<field name="name">purchase.order.form</field>
|
||||
<field name="model">purchase.order</field>
|
||||
<field name="inherit_id" ref="purchase.purchase_order_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="partner_id" position="after">
|
||||
<field name="user_id" />
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -4,6 +4,7 @@
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from odoo import models, fields, api
|
||||
from odoo.tools.misc import formatLang
|
||||
|
||||
|
||||
class PurchaseOrder(models.Model):
|
||||
@@ -54,6 +55,20 @@ class PurchaseOrder(models.Model):
|
||||
self, 'purchase.report_purchaseorder')
|
||||
return action
|
||||
|
||||
# Re-write native name_get() to use amount_untaxed instead of amount_total
|
||||
@api.multi
|
||||
@api.depends('name', 'partner_ref')
|
||||
def name_get(self):
|
||||
result = []
|
||||
for po in self:
|
||||
name = po.name
|
||||
if po.partner_ref:
|
||||
name += ' ('+po.partner_ref+')'
|
||||
if po.amount_untaxed:
|
||||
name += ': ' + formatLang(self.env, po.amount_untaxed, currency_obj=po.currency_id)
|
||||
result.append((po.id, name))
|
||||
return result
|
||||
|
||||
|
||||
class StockPicking(models.Model):
|
||||
_inherit = 'stock.picking'
|
||||
|
||||
@@ -23,7 +23,8 @@ class CrmLeadLost(models.TransientModel):
|
||||
])
|
||||
if quotes:
|
||||
quotes.action_cancel()
|
||||
quotes.message_post(_(
|
||||
"Quotation automatically cancelled upon marking "
|
||||
"the related opportunity as lost."))
|
||||
for quote in quotes:
|
||||
quote.message_post(_(
|
||||
"Quotation automatically cancelled upon marking "
|
||||
"the related opportunity as lost."))
|
||||
return super(CrmLeadLost, self).action_lost_reason_apply()
|
||||
|
||||
@@ -14,7 +14,7 @@ class SaleOrderLine(models.Model):
|
||||
# Also defined in bi_sale_company_currency
|
||||
company_currency_id = fields.Many2one(
|
||||
related='order_id.company_id.currency_id',
|
||||
readonly=True, store=True, string='Company Currency')
|
||||
readonly=True, store=True, compute_sudo=True, string='Company Currency')
|
||||
standard_price_company_currency = fields.Float(
|
||||
string='Cost Price in Company Currency', readonly=True,
|
||||
digits=dp.get_precision('Product Price'),
|
||||
@@ -33,7 +33,7 @@ class SaleOrderLine(models.Model):
|
||||
string='Margin in Company Currency', readonly=True, store=True,
|
||||
compute='_compute_margin', currency_field='company_currency_id')
|
||||
margin_rate = fields.Float(
|
||||
string="Margin (%)", readonly=True, store=True,
|
||||
string="Margin Rate", readonly=True, store=True,
|
||||
compute='_compute_margin',
|
||||
digits=(16, 2), help="Margin rate in percentage of the sale price")
|
||||
|
||||
@@ -108,7 +108,7 @@ class SaleOrder(models.Model):
|
||||
|
||||
# Also defined in bi_sale_company_currency
|
||||
company_currency_id = fields.Many2one(
|
||||
related='company_id.currency_id', readonly=True, store=True,
|
||||
related='company_id.currency_id', readonly=True, store=True, compute_sudo=True,
|
||||
string="Company Currency")
|
||||
margin_sale_currency = fields.Monetary(
|
||||
string='Margin in Sale Currency',
|
||||
|
||||
@@ -20,13 +20,17 @@
|
||||
groups="account.group_account_user"/>
|
||||
<field name="company_currency_id" invisible="1"/>
|
||||
</field>
|
||||
<xpath expr="//field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">
|
||||
<field name="standard_price_sale_currency" groups="base.group_no_one" string="Cost Price Sale Cur."/>
|
||||
<field name="standard_price_company_currency" groups="base.group_no_one" string="Cost Price Comp. Cur."/>
|
||||
<field name="margin_sale_currency" groups="base.group_no_one" string="Margin Sale Cur."/>
|
||||
<field name="margin_company_currency" groups="base.group_no_one" string="Margin Comp. Cur."/>
|
||||
<field name="margin_rate" groups="base.group_no_one"/>
|
||||
<xpath expr="//field[@name='order_line']/form//field[@name='analytic_tag_ids']/.." position="after">
|
||||
<field name="standard_price_sale_currency" groups="base.group_no_one"/>
|
||||
<field name="standard_price_company_currency" groups="base.group_no_one"/>
|
||||
<field name="margin_sale_currency" groups="base.group_no_one"/>
|
||||
<field name="margin_company_currency" groups="base.group_no_one"/>
|
||||
<label for="margin_rate"/>
|
||||
<div name="margin_rate">
|
||||
<field name="margin_rate" groups="base.group_no_one" class="oe_inline"/> %
|
||||
</div>
|
||||
<field name="company_currency_id" invisible="1"/>
|
||||
<field name="currency_id" invisible="1"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -15,7 +15,9 @@
|
||||
<xpath expr="//field[@name='order_line']/form//label[@for='analytic_tag_ids']" position="attributes">
|
||||
<attribute name="invisible">1</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='order_line']/form//field[@name='analytic_tag_ids']/.." position="replace"/>
|
||||
<xpath expr="//field[@name='order_line']/form//field[@name='analytic_tag_ids']/.." position="attributes">
|
||||
<attribute name="invisible">1</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='order_line']/tree/field[@name='analytic_tag_ids']" position="attributes">
|
||||
<attribute name="invisible">1</attribute>
|
||||
</xpath>
|
||||
|
||||
@@ -9,4 +9,4 @@ class MrpBom(models.Model):
|
||||
_inherit = 'mrp.bom'
|
||||
_rec_name = 'product_id'
|
||||
|
||||
sale_ok = fields.Boolean(related='product_id.sale_ok', store=True)
|
||||
sale_ok = fields.Boolean(related='product_id.sale_ok', store=True, compute_sudo=True)
|
||||
|
||||
@@ -32,6 +32,13 @@
|
||||
<button name="action_cancel" type="object" position="attributes">
|
||||
<attribute name="confirm">Are you sure you want to cancel this picking?</attribute>
|
||||
</button>
|
||||
<!-- This sum is useful to check the 'number of items' to transfer... -->
|
||||
<xpath expr="//field[@name='pack_operation_product_ids']/tree/field[@name='product_qty']" position="attributes">
|
||||
<attribute name="sum">1</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='pack_operation_product_ids']/tree/field[@name='qty_done']" position="attributes">
|
||||
<attribute name="sum">1</attribute>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user