[IMP] agreement: black, isort, prettier

This commit is contained in:
sergio-teruel
2021-02-14 09:20:21 +01:00
committed by Pedro M. Baeza
parent 8fcb64d283
commit 36038f0edb
9 changed files with 320 additions and 265 deletions

View File

@@ -2,27 +2,24 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{ {
'name': 'Agreement', "name": "Agreement",
'summary': "Adds an agreement object", "summary": "Adds an agreement object",
'version': '12.0.1.2.0', "version": "12.0.1.2.0",
'category': 'Contract', "category": "Contract",
'author': 'Akretion, ' "author": "Akretion, "
'Yves Goldberg (Ygol Internetwork), ' "Yves Goldberg (Ygol Internetwork), "
'Odoo Community Association (OCA)', "Odoo Community Association (OCA)",
'website': 'https://github.com/oca/contract', "website": "https://github.com/oca/contract",
'license': 'AGPL-3', "license": "AGPL-3",
'depends': ['mail'], "depends": ["mail"],
'data': [ "data": [
'security/ir.model.access.csv', "security/ir.model.access.csv",
'security/agreement_security.xml', "security/agreement_security.xml",
'views/agreement.xml', "views/agreement.xml",
'views/agreement_type.xml', "views/agreement_type.xml",
],
'demo': ['demo/demo.xml'],
'development_status': 'Beta',
'maintainers': [
'ygol',
'alexis-via',
], ],
'installable': True, "demo": ["demo/demo.xml"],
"development_status": "Beta",
"maintainers": ["ygol", "alexis-via",],
"installable": True,
} }

View File

@@ -1,63 +1,53 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<!-- <!--
© 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>) © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
--> -->
<odoo noupdate="1"> <odoo noupdate="1">
<record id="market1" model="agreement">
<field name="code">C2C-IT0042</field>
<record id="market1" model="agreement"> <field name="name">Hardware IT</field>
<field name="code">C2C-IT0042</field> <field name="partner_id" ref="base.res_partner_12" />
<field name="name">Hardware IT</field> <field name="signature_date">2017-09-10</field>
<field name="partner_id" ref="base.res_partner_12"/> <field name="start_date">2017-09-10</field>
<field name="signature_date">2017-09-10</field> <field name="end_date">2018-09-10</field>
<field name="start_date">2017-09-10</field> </record>
<field name="end_date">2018-09-10</field> <record id="market2" model="agreement">
</record> <field name="code">C2C-IT0043</field>
<field name="name">Fiber access office Lausanne</field>
<record id="market2" model="agreement"> <field name="partner_id" ref="base.res_partner_12" />
<field name="code">C2C-IT0043</field> <field name="signature_date" eval="time.strftime('%Y-01-01')" />
<field name="name">Fiber access office Lausanne</field> <field name="start_date" eval="time.strftime('%Y-01-01')" />
<field name="partner_id" ref="base.res_partner_12"/> <field name="end_date" eval="time.strftime('%Y-01-01')" />
<field name="signature_date" eval="time.strftime('%Y-01-01')"/> </record>
<field name="start_date" eval="time.strftime('%Y-01-01')"/> <record id="market3" model="agreement">
<field name="end_date" eval="time.strftime('%Y-01-01')"/> <field name="code">AGR-VETO001</field>
</record> <field name="name">Vétérinaire</field>
<field name="partner_id" ref="base.res_partner_2" />
<record id="market3" model="agreement"> <field name="signature_date">2017-08-01</field>
<field name="code">AGR-VETO001</field> <field name="start_date">2017-08-01</field>
<field name="name">Vétérinaire</field> <field name="end_date">2018-08-01</field>
<field name="partner_id" ref="base.res_partner_2"/> </record>
<field name="signature_date">2017-08-01</field> <record id="market4" model="agreement">
<field name="start_date">2017-08-01</field> <field name="code">AGR-TEL001</field>
<field name="end_date">2018-08-01</field> <field name="name">Wazo IPBX deployment and maintenance</field>
</record> <field name="partner_id" ref="base.res_partner_2" />
<field name="signature_date">2017-05-05</field>
<record id="market4" model="agreement"> <field name="start_date">2017-05-05</field>
<field name="code">AGR-TEL001</field> <field name="end_date">2018-09-10</field>
<field name="name">Wazo IPBX deployment and maintenance</field> </record>
<field name="partner_id" ref="base.res_partner_2"/> <record id="market5" model="agreement">
<field name="signature_date">2017-05-05</field> <field name="code">BUY-VOIP012</field>
<field name="start_date">2017-05-05</field> <field name="name">SIP Phones supply</field>
<field name="end_date">2018-09-10</field> <field name="partner_id" ref="base.res_partner_1" />
</record> <field name="signature_date" eval="time.strftime('%Y-01-01')" />
<field name="start_date" eval="time.strftime('%Y-01-01')" />
<record id="market5" model="agreement"> <field name="end_date" eval="time.strftime('%Y-01-01')" />
<field name="code">BUY-VOIP012</field> </record>
<field name="name">SIP Phones supply</field> <record id="market6" model="agreement">
<field name="partner_id" ref="base.res_partner_1"/> <field name="code">BUY-VOIP013</field>
<field name="signature_date" eval="time.strftime('%Y-01-01')"/> <field name="name">SIP-ISDN gateways</field>
<field name="start_date" eval="time.strftime('%Y-01-01')"/> <field name="partner_id" ref="base.res_partner_3" />
<field name="end_date" eval="time.strftime('%Y-01-01')"/> <field name="signature_date">2017-09-02</field>
</record> </record>
<record id="market6" model="agreement">
<field name="code">BUY-VOIP013</field>
<field name="name">SIP-ISDN gateways</field>
<field name="partner_id" ref="base.res_partner_3"/>
<field name="signature_date">2017-09-02</field>
</record>
</odoo> </odoo>

View File

@@ -2,50 +2,57 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import _, api, models, fields from odoo import _, api, fields, models
class Agreement(models.Model): class Agreement(models.Model):
_name = 'agreement' _name = "agreement"
_description = 'Agreement' _description = "Agreement"
_inherit = ["mail.thread", "mail.activity.mixin"] _inherit = ["mail.thread", "mail.activity.mixin"]
code = fields.Char(required=True, track_visibility='onchange') code = fields.Char(required=True, track_visibility="onchange")
name = fields.Char(required=True, track_visibility='onchange') name = fields.Char(required=True, track_visibility="onchange")
partner_id = fields.Many2one( partner_id = fields.Many2one(
'res.partner', string='Partner', ondelete='restrict', "res.partner",
domain=[('parent_id', '=', False)], track_visibility='onchange') string="Partner",
ondelete="restrict",
domain=[("parent_id", "=", False)],
track_visibility="onchange",
)
company_id = fields.Many2one( company_id = fields.Many2one(
'res.company', string='Company', "res.company",
default=lambda self: self.env['res.company']._company_default_get()) string="Company",
default=lambda self: self.env["res.company"]._company_default_get(),
)
is_template = fields.Boolean( is_template = fields.Boolean(
string="Is a Template?", string="Is a Template?",
default=False, default=False,
copy=False, copy=False,
help="Set if the agreement is a template. " help="Set if the agreement is a template. "
"Template agreements don't require a partner." "Template agreements don't require a partner.",
) )
agreement_type_id = fields.Many2one( agreement_type_id = fields.Many2one(
'agreement.type', "agreement.type", string="Agreement Type", help="Select the type of agreement",
string="Agreement Type",
help="Select the type of agreement",
) )
domain = fields.Selection( domain = fields.Selection(
'_domain_selection', string='Domain', default='sale', "_domain_selection",
track_visibility='onchange') string="Domain",
default="sale",
track_visibility="onchange",
)
active = fields.Boolean(default=True) active = fields.Boolean(default=True)
signature_date = fields.Date(track_visibility='onchange') signature_date = fields.Date(track_visibility="onchange")
start_date = fields.Date(track_visibility='onchange') start_date = fields.Date(track_visibility="onchange")
end_date = fields.Date(track_visibility='onchange') end_date = fields.Date(track_visibility="onchange")
@api.model @api.model
def _domain_selection(self): def _domain_selection(self):
return [ return [
('sale', _('Sale')), ("sale", _("Sale")),
('purchase', _('Purchase')), ("purchase", _("Purchase")),
] ]
@api.onchange('agreement_type_id') @api.onchange("agreement_type_id")
def agreement_type_change(self): def agreement_type_change(self):
if self.agreement_type_id and self.agreement_type_id.domain: if self.agreement_type_id and self.agreement_type_id.domain:
self.domain = self.agreement_type_id.domain self.domain = self.agreement_type_id.domain
@@ -55,21 +62,23 @@ class Agreement(models.Model):
for agr in self: for agr in self:
name = agr.name name = agr.name
if agr.code: if agr.code:
name = '[%s] %s' % (agr.code, agr.name) name = "[{}] {}".format(agr.code, agr.name)
res.append((agr.id, name)) res.append((agr.id, name))
return res return res
_sql_constraints = [( _sql_constraints = [
'code_partner_company_unique', (
'unique(code, partner_id, company_id)', "code_partner_company_unique",
'This agreement code already exists for this partner!' "unique(code, partner_id, company_id)",
)] "This agreement code already exists for this partner!",
)
]
@api.returns('self', lambda value: value.id) @api.returns("self", lambda value: value.id)
def copy(self, default=None): def copy(self, default=None):
"""Always assign a value for code because is required""" """Always assign a value for code because is required"""
default = dict(default or {}) default = dict(default or {})
if default.get('code', False): if default.get("code", False):
return super().copy(default) return super().copy(default)
default.setdefault('code', _("%s (copy)") % (self.code)) default.setdefault("code", _("%s (copy)") % (self.code))
return super().copy(default) return super().copy(default)

View File

@@ -10,9 +10,8 @@ class AgreementType(models.Model):
name = fields.Char(string="Name", required=True) name = fields.Char(string="Name", required=True)
active = fields.Boolean(default=True) active = fields.Boolean(default=True)
domain = fields.Selection( domain = fields.Selection("_domain_selection", string="Domain", default="sale")
'_domain_selection', string='Domain', default='sale')
@api.model @api.model
def _domain_selection(self): def _domain_selection(self):
return self.env['agreement']._domain_selection() return self.env["agreement"]._domain_selection()

View File

@@ -1,26 +1,22 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<!-- <!--
© 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>) © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
--> -->
<odoo noupdate="1"> <odoo noupdate="1">
<record id="agreement_rule" model="ir.rule">
<field name="name">Agreement multi-company</field>
<record id="agreement_rule" model="ir.rule"> <field name="model_id" ref="model_agreement" />
<field name="name">Agreement multi-company</field> <field
<field name="model_id" ref="model_agreement"/> name="domain_force"
<field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field> >['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
</record> </record>
<record id="group_use_agreement_type" model="res.groups">
<record id="group_use_agreement_type" model="res.groups"> <field name="name">Use agreement type</field>
<field name="name">Use agreement type</field> <field name="category_id" ref="base.module_category_hidden" />
<field name="category_id" ref="base.module_category_hidden"/> </record>
</record> <record id="group_use_agreement_template" model="res.groups">
<field name="name">Use agreement template</field>
<record id="group_use_agreement_template" model="res.groups"> <field name="category_id" ref="base.module_category_hidden" />
<field name="name">Use agreement template</field> </record>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
</odoo> </odoo>

View File

@@ -1,120 +1,159 @@
<?xml version="1.0"?> <?xml version="1.0" ?>
<!-- <!--
© 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>) © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
--> -->
<odoo> <odoo>
<record id="agreement_form" model="ir.ui.view">
<field name="name">agreement.form</field>
<record id="agreement_form" model="ir.ui.view"> <field name="model">agreement</field>
<field name="name">agreement.form</field> <field name="arch" type="xml">
<field name="model">agreement</field> <form string="Agreement">
<field name="arch" type="xml"> <sheet>
<form string="Agreement"> <div class="oe_button_box" name="button_box">
<sheet> <button
<div class="oe_button_box" name="button_box"> name="toggle_active"
<button name="toggle_active" type="object" type="object"
class="oe_stat_button" icon="fa-archive"> class="oe_stat_button"
<field name="active" widget="boolean_button" icon="fa-archive"
options='{"terminology": "archive"}'/> >
</button> <field
</div> name="active"
<div class="oe_title"> widget="boolean_button"
<label for="name" class="oe_edit_only" string="Agreement Name"/> options='{"terminology": "archive"}'
<h1> />
<field name="name"/> </button>
</h1> </div>
</div> <div class="oe_title">
<group name="main"> <label
<group name="left"> for="name"
<field name="code"/> class="oe_edit_only"
<field name="partner_id" string="Agreement Name"
attrs="{'required': [('is_template', '=', False)]}"/> />
<field name="agreement_type_id" <h1>
groups="agreement.group_use_agreement_type"/> <field name="name" />
<field name="domain" widget="radio"/> </h1>
<field name="is_template" groups="agreement.group_use_agreement_template"/> </div>
</group> <group name="main">
<group name="right"> <group name="left">
<field name="signature_date"/> <field name="code" />
<field name="start_date"/> <field
<field name="end_date"/> name="partner_id"
<field name="company_id" groups="base.group_multi_company"/> attrs="{'required': [('is_template', '=', False)]}"
/>
<field
name="agreement_type_id"
groups="agreement.group_use_agreement_type"
/>
<field name="domain" widget="radio" />
<field
name="is_template"
groups="agreement.group_use_agreement_template"
/>
</group>
<group name="right">
<field name="signature_date" />
<field name="start_date" />
<field name="end_date" />
<field
name="company_id"
groups="base.group_multi_company"
/>
</group>
</group> </group>
<notebook>
<page
name="config"
string="Configuration"
attrs="{'invisible': True}"
/>
</notebook>
</sheet>
<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="agreement_tree" model="ir.ui.view">
<field name="name">agreement.tree</field>
<field name="model">agreement</field>
<field name="arch" type="xml">
<tree string="Agreements">
<field name="partner_id" />
<field name="code" />
<field name="name" />
<field name="signature_date" />
<field name="start_date" />
<field name="end_date" />
<field name="domain" />
<field name="company_id" groups="base.group_multi_company" />
</tree>
</field>
</record>
<record id="agreement_search" model="ir.ui.view">
<field name="name">agreement.search</field>
<field name="model">agreement</field>
<field name="arch" type="xml">
<search string="Search Agreements">
<field
name="name"
filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]"
string="Name or Number"
/>
<field name="partner_id" />
<separator />
<filter name="sale" string="Sale" domain="[('domain', '=', 'sale')]" />
<filter
name="purchase"
string="Purchase"
domain="[('domain', '=', 'purchase')]"
/>
<separator />
<filter
name="inactive"
string="Archived"
domain="[('active', '=', False)]"
/>
<group name="groupby">
<filter
name="partner_groupby"
string="Partner"
context="{'group_by': 'partner_id'}"
/>
<filter
name="signature_date_groupby"
string="Signature Date"
context="{'group_by': 'signature_date'}"
/>
<filter
name="domain_groupby"
string="Domain"
context="{'group_by': 'domain'}"
/>
</group> </group>
<notebook> </search>
<page name="config" string="Configuration" attrs="{'invisible': True}"/> </field>
</notebook> </record>
</sheet> <record id="agreement_action" model="ir.actions.act_window">
<div class="oe_chatter"> <field name="name">Agreements</field>
<field name="message_follower_ids" widget="mail_followers"/> <field name="res_model">agreement</field>
<field name="activity_ids" widget="mail_activity"/> <field name="view_mode">tree,form</field>
<field name="message_ids" widget="mail_thread"/> </record>
</div> <!-- Top menu item -->
</form> <menuitem
</field> id="agreement_menu_root"
</record> name="Agreements"
web_icon="agreement,static/description/icon.png"
<record id="agreement_tree" model="ir.ui.view"> sequence="10"
<field name="name">agreement.tree</field> />
<field name="model">agreement</field> <menuitem
<field name="arch" type="xml"> id="agreement_menu"
<tree string="Agreements"> name="Agreements"
<field name="partner_id"/> parent="agreement_menu_root"
<field name="code"/> sequence="0"
<field name="name"/> action="agreement_action"
<field name="signature_date"/> />
<field name="start_date"/>
<field name="end_date"/>
<field name="domain"/>
<field name="company_id" groups="base.group_multi_company"/>
</tree>
</field>
</record>
<record id="agreement_search" model="ir.ui.view">
<field name="name">agreement.search</field>
<field name="model">agreement</field>
<field name="arch" type="xml">
<search string="Search Agreements">
<field name="name" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]" string="Name or Number"/>
<field name="partner_id"/>
<separator/>
<filter name="sale" string="Sale" domain="[('domain', '=', 'sale')]"/>
<filter name="purchase" string="Purchase" domain="[('domain', '=', 'purchase')]"/>
<separator/>
<filter name="inactive" string="Archived" domain="[('active', '=', False)]"/>
<group name="groupby">
<filter name="partner_groupby" string="Partner"
context="{'group_by': 'partner_id'}"/>
<filter name="signature_date_groupby" string="Signature Date"
context="{'group_by': 'signature_date'}"/>
<filter name="domain_groupby" string="Domain"
context="{'group_by': 'domain'}"/>
</group>
</search>
</field>
</record>
<record id="agreement_action" model="ir.actions.act_window">
<field name="name">Agreements</field>
<field name="res_model">agreement</field>
<field name="view_mode">tree,form</field>
</record>
<!-- Top menu item -->
<menuitem id="agreement_menu_root"
name="Agreements"
web_icon="agreement,static/description/icon.png"
sequence="10"/>
<menuitem id="agreement_menu"
name="Agreements"
parent="agreement_menu_root"
sequence="0"
action="agreement_action"
/>
</odoo> </odoo>

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<!-- Agreement Type List View--> <!-- Agreement Type List View-->
<record model="ir.ui.view" id="agreement_type_list_view"> <record model="ir.ui.view" id="agreement_type_list_view">
@@ -6,12 +6,11 @@
<field name="model">agreement.type</field> <field name="model">agreement.type</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Agreement Types" default_order="name"> <tree string="Agreement Types" default_order="name">
<field name="name" string="Type Name"/> <field name="name" string="Type Name" />
<field name="domain"/> <field name="domain" />
</tree> </tree>
</field> </field>
</record> </record>
<!-- Agreement Type Form View --> <!-- Agreement Type Form View -->
<record model="ir.ui.view" id="agreement_type_form_view"> <record model="ir.ui.view" id="agreement_type_form_view">
<field name="name">Agreement Type Form</field> <field name="name">Agreement Type Form</field>
@@ -19,43 +18,62 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Agreement Type"> <form string="Agreement Type">
<div class="oe_button_box" name="button_box"> <div class="oe_button_box" name="button_box">
<button name="toggle_active" type="object" <button
class="oe_stat_button" icon="fa-archive"> name="toggle_active"
<field name="active" widget="boolean_button" type="object"
options='{"terminology": "archive"}'/> class="oe_stat_button"
icon="fa-archive"
>
<field
name="active"
widget="boolean_button"
options='{"terminology": "archive"}'
/>
</button> </button>
</div> </div>
<sheet> <sheet>
<div class="oe_title"> <div class="oe_title">
<label for="name" class="oe_edit_only"/> <label for="name" class="oe_edit_only" />
<h1><field name="name"/></h1> <h1>
<field name="name" />
</h1>
</div> </div>
<group name="main"> <group name="main">
<field name="domain" widget="radio"/> <field name="domain" widget="radio" />
</group> </group>
</sheet> </sheet>
</form> </form>
</field> </field>
</record> </record>
<record id="agreement_type_search" model="ir.ui.view"> <record id="agreement_type_search" model="ir.ui.view">
<field name="name">agreement.type.search</field> <field name="name">agreement.type.search</field>
<field name="model">agreement.type</field> <field name="model">agreement.type</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Agreement Type"> <search string="Agreement Type">
<field name="name"/> <field name="name" />
<separator/> <separator />
<filter name="sale" string="Sale" domain="[('domain', '=', 'sale')]"/> <filter name="sale" string="Sale" domain="[('domain', '=', 'sale')]" />
<filter name="purchase" string="Purchase" domain="[('domain', '=', 'purchase')]"/> <filter
<separator/> name="purchase"
<filter name="archived" string="Archived" domain="[('active', '=', False)]"/> string="Purchase"
domain="[('domain', '=', 'purchase')]"
/>
<separator />
<filter
name="archived"
string="Archived"
domain="[('active', '=', False)]"
/>
<group name="groupby"> <group name="groupby">
<filter name="domain_groupby" string="Domain" context="{'group_by': 'domain'}"/> <filter
name="domain_groupby"
string="Domain"
context="{'group_by': 'domain'}"
/>
</group> </group>
</search> </search>
</field> </field>
</record> </record>
<!-- Actions opening views on models --> <!-- Actions opening views on models -->
<record model="ir.actions.act_window" id="agreement_type_action"> <record model="ir.actions.act_window" id="agreement_type_action">
<field name="name">Agreement Types</field> <field name="name">Agreement Types</field>

View File

@@ -0,0 +1 @@
../../../../agreement

6
setup/agreement/setup.py Normal file
View File

@@ -0,0 +1,6 @@
import setuptools
setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)