Browse Source

Merge PR #383 into 12.0

Signed-off-by max3903
pull/399/head
OCA-git-bot 5 years ago
parent
commit
313ebf4c46
  1. 1
      agreement/__manifest__.py
  2. 1
      agreement/models/__init__.py
  3. 14
      agreement/models/agreement.py
  4. 12
      agreement/models/agreement_type.py
  5. 1
      agreement/readme/CONTRIBUTORS.rst
  6. 6
      agreement/readme/DESCRIPTION.rst
  7. 9
      agreement/security/agreement_security.xml
  8. 6
      agreement/views/agreement.xml
  9. 54
      agreement/views/agreement_type.xml
  10. 9
      agreement_legal/models/agreement.py
  11. 3
      agreement_legal/models/agreement_type.py
  12. 2
      agreement_legal/security/res_groups.xml
  13. 31
      agreement_legal/views/agreement_type.xml
  14. 9
      agreement_legal_sale/views/sale_order.xml
  15. 2
      agreement_sale/__manifest__.py
  16. 1
      agreement_sale/models/__init__.py
  17. 14
      agreement_sale/models/res_config_settings.py
  18. 6
      agreement_sale/models/sale.py
  19. 2
      agreement_sale/security/ir.model.access.csv
  20. 4
      agreement_sale/views/agreement.xml
  21. 48
      agreement_sale/views/res_config_settings.xml
  22. 19
      agreement_sale/views/sale_order.xml

1
agreement/__manifest__.py

@ -16,6 +16,7 @@
'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',
], ],
'demo': ['demo/demo.xml'], 'demo': ['demo/demo.xml'],
'development_status': 'Beta', 'development_status': 'Beta',

1
agreement/models/__init__.py

@ -1 +1,2 @@
from . import agreement from . import agreement
from . import agreement_type

14
agreement/models/agreement.py

@ -12,11 +12,23 @@ class Agreement(models.Model):
code = fields.Char(required=True, copy=False) code = fields.Char(required=True, copy=False)
name = fields.Char(required=True) name = fields.Char(required=True)
partner_id = fields.Many2one( partner_id = fields.Many2one(
'res.partner', string='Partner', ondelete='restrict', required=True,
'res.partner', string='Partner', ondelete='restrict',
domain=[('parent_id', '=', False)]) domain=[('parent_id', '=', False)])
company_id = fields.Many2one( company_id = fields.Many2one(
'res.company', string='Company', 'res.company', string='Company',
default=lambda self: self.env['res.company']._company_default_get()) default=lambda self: self.env['res.company']._company_default_get())
is_template = fields.Boolean(
string="Is a Template?",
default=False,
copy=False,
help="Set if the agreement is a template. "
"Template agreements don't require a partner."
)
agreement_type_id = fields.Many2one(
'agreement.type',
string="Agreement Type",
help="Select the type of agreement",
)
active = fields.Boolean(default=True) active = fields.Boolean(default=True)
signature_date = fields.Date() signature_date = fields.Date()
start_date = fields.Date() start_date = fields.Date()

12
agreement/models/agreement_type.py

@ -0,0 +1,12 @@
# Copyright (C) 2018 - TODAY, Pavlov Media
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import fields, models
class AgreementType(models.Model):
_name = "agreement.type"
_description = "Agreement Types"
name = fields.Char(string="Name", required=True)
active = fields.Boolean(default=True)

1
agreement/readme/CONTRIBUTORS.rst

@ -1,2 +1,3 @@
* Alexis de Lattre <alexis.delattre@akretion.com> * Alexis de Lattre <alexis.delattre@akretion.com>
* Yves Goldberg <yves@ygol.com> * Yves Goldberg <yves@ygol.com>
* Alexandre Fayolle <alexandre.fayolle@camptocamp.com>

6
agreement/readme/DESCRIPTION.rst

@ -6,3 +6,9 @@ This module adds an *Agreement* object with the following properties:
* signature date. * signature date.
* start date. * start date.
* end date. * end date.
Optionally, you can also enable using:
* agreement types
* a flag to set an agreement as a template agreement
(Install agreement_sale to get the configuration settings for these).

9
agreement/security/agreement_security.xml

@ -13,5 +13,14 @@
<field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field> <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'child_of', [user.company_id.id])]</field>
</record> </record>
<record id="group_use_agreement_type" model="res.groups">
<field name="name">Use agreement type</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="group_use_agreement_template" model="res.groups">
<field name="name">Use agreement template</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
</odoo> </odoo>

6
agreement/views/agreement.xml

@ -21,7 +21,11 @@
</div> </div>
<group name="main"> <group name="main">
<group name="left"> <group name="left">
<field name="partner_id"/>
<field name="agreement_type_id"
groups="agreement.group_use_agreement_type"/>
<field name="is_template" groups="agreement.group_use_agreement_template"/>
<field name="partner_id"
attrs="{'required': [('is_template', '=', False)]}"/>
<field name="name"/> <field name="name"/>
<field name="signature_date"/> <field name="signature_date"/>
</group> </group>

54
agreement/views/agreement_type.xml

@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!-- Agreement Type List View-->
<record model="ir.ui.view" id="agreement_type_list_view">
<field name="name">Agreement Type List</field>
<field name="model">agreement.type</field>
<field name="arch" type="xml">
<tree string="Agreement Types" default_order="name">
<field name="name" string="Type Name"/>
</tree>
</field>
</record>
<!-- Agreement Type Form View -->
<record model="ir.ui.view" id="agreement_type_form_view">
<field name="name">Agreement Type Form</field>
<field name="model">agreement.type</field>
<field name="arch" type="xml">
<form string="Agreement Type">
<div class="oe_button_box" name="button_box">
<button name="toggle_active" type="object"
class="oe_stat_button" icon="fa-archive">
<field name="active" widget="boolean_button"
options='{"terminology": "archive"}'/>
</button>
</div>
<sheet>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
</div>
</sheet>
</form>
</field>
</record>
<record id="agreement_type_search" model="ir.ui.view">
<field name="name">agreement.type.search</field>
<field name="model">agreement.type</field>
<field name="arch" type="xml">
<search string="Agreement Type">
<field name="name"/>
<filter name="archived" string="Archived" domain="[('active', '=', False)]"/>
</search>
</field>
</record>
<!-- Actions opening views on models -->
<record model="ir.actions.act_window" id="agreement_type_action">
<field name="name">Agreement Types</field>
<field name="res_model">agreement.type</field>
<field name="view_mode">tree,form</field>
</record>
</odoo>

9
agreement_legal/models/agreement.py

@ -10,11 +10,6 @@ class Agreement(models.Model):
# General # General
name = fields.Char(string="Title", required=True) name = fields.Char(string="Title", required=True)
is_template = fields.Boolean(
string="Is a Template?",
default=False,
copy=False,
help="Make this agreement a template.")
version = fields.Integer( version = fields.Integer(
string="Version", string="Version",
default=1, default=1,
@ -170,10 +165,8 @@ class Agreement(models.Model):
string="Dynamic Parties", string="Dynamic Parties",
help="Compute dynamic parties") help="Compute dynamic parties")
agreement_type_id = fields.Many2one( agreement_type_id = fields.Many2one(
"agreement.type",
string="Agreement Type",
track_visibility="onchange", track_visibility="onchange",
help="Select the type of agreement.")
)
agreement_subtype_id = fields.Many2one( agreement_subtype_id = fields.Many2one(
"agreement.subtype", "agreement.subtype",
string="Agreement Sub-type", string="Agreement Sub-type",

3
agreement_legal/models/agreement_type.py

@ -5,10 +5,9 @@ from odoo import fields, models
class AgreementType(models.Model): class AgreementType(models.Model):
_name = "agreement.type"
_inherit = "agreement.type"
_description = "Agreement Types" _description = "Agreement Types"
name = fields.Char(string="Name", required=True)
agreement_subtypes_ids = fields.One2many( agreement_subtypes_ids = fields.One2many(
"agreement.subtype", "agreement.subtype",
"agreement_type_id", "agreement_type_id",

2
agreement_legal/security/res_groups.xml

@ -9,7 +9,7 @@
<record id="group_agreement_readonly" model="res.groups"> <record id="group_agreement_readonly" model="res.groups">
<field name="name">Read-Only Users</field> <field name="name">Read-Only Users</field>
<field name="category_id" ref="module_agreement_legal_category"/> <field name="category_id" ref="module_agreement_legal_category"/>
<field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
<field name="implied_ids" eval="[(4, ref('base.group_user')), (4, ref('agreement.group_use_agreement_type')), (4, ref('agreement.group_use_agreement_template'))]"/>
</record> </record>
<!-- User group --> <!-- User group -->

31
agreement_legal/views/agreement_type.xml

@ -5,33 +5,28 @@
<record model="ir.ui.view" id="partner_agreement_type_list_view"> <record model="ir.ui.view" id="partner_agreement_type_list_view">
<field name="name">Agreement Type List</field> <field name="name">Agreement Type List</field>
<field name="model">agreement.type</field> <field name="model">agreement.type</field>
<field name="inherit_id" ref="agreement.agreement_type_list_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Agreement Types" default_order='name'>
<field name="name" string="Type Name"/>
<field name="name" position="after">
<field name="agreement_subtypes_ids" string="Sub-Types"/> <field name="agreement_subtypes_ids" string="Sub-Types"/>
</tree>
</field>
</field>
</field>
</record> </record>
<!-- Agreement Type Form View --> <!-- Agreement Type Form View -->
<record model="ir.ui.view" id="partner_agreement_type_form_view"> <record model="ir.ui.view" id="partner_agreement_type_form_view">
<field name="name">Agreement Type Form</field> <field name="name">Agreement Type Form</field>
<field name="model">agreement.type</field> <field name="model">agreement.type</field>
<field name="inherit_id" ref="agreement.agreement_type_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Agreement Type">
<sheet>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
</div>
<field name="agreement_subtypes_ids"
nolabel="1">
<tree editable="bottom">
<field name="name"/>
</tree>
</field>
</sheet>
</form>
<xpath expr="//sheet" position="inside">
<field name="agreement_subtypes_ids"
nolabel="1">
<tree editable="bottom">
<field name="name"/>
</tree>
</field>
</xpath>
</field> </field>
</record> </record>

9
agreement_legal_sale/views/sale_order.xml

@ -7,12 +7,11 @@
<record id="sale_order_agreement_form_view" model="ir.ui.view"> <record id="sale_order_agreement_form_view" model="ir.ui.view">
<field name="name">sale.order.agreement.form.view</field> <field name="name">sale.order.agreement.form.view</field>
<field name="model">sale.order</field> <field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="inherit_id" ref="agreement_sale.sale_order_agreement_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="client_order_ref" position="after">
<field name="agreement_id"
readonly="1"
attrs="{'invisible': [('agreement_id', '=', False)]}"/>
<field name="agreement_id" position="attributes">
<attribute name="readonly" eval='1'/>
<attribute name="attrs">{'invisible': [('agreement_id', '=', False)]}</attribute>
</field> </field>
<field name="partner_id" position="after"> <field name="partner_id" position="after">
<field name="agreement_template_id"/> <field name="agreement_template_id"/>

2
agreement_sale/__manifest__.py

@ -17,6 +17,8 @@
'data': [ 'data': [
'security/ir.model.access.csv', 'security/ir.model.access.csv',
'views/agreement.xml', 'views/agreement.xml',
'views/sale_order.xml',
'views/res_config_settings.xml',
], ],
'development_status': 'Beta', 'development_status': 'Beta',
'maintainers': [ 'maintainers': [

1
agreement_sale/models/__init__.py

@ -1 +1,2 @@
from . import sale from . import sale
from . import res_config_settings

14
agreement_sale/models/res_config_settings.py

@ -0,0 +1,14 @@
from odoo import fields, models
class ResConfigSettings(models.TransientModel):
_inherit = 'res.config.settings'
group_use_agreement_type = fields.Boolean(
'Use agreement types',
implied_group='agreement.group_use_agreement_type'
)
group_use_agreement_template = fields.Boolean(
'Use agreement template',
implied_group='agreement.group_use_agreement_template'
)

6
agreement_sale/models/sale.py

@ -12,3 +12,9 @@ class SaleOrder(models.Model):
comodel_name='agreement', string='Agreement', ondelete='restrict', comodel_name='agreement', string='Agreement', ondelete='restrict',
track_visibility='onchange', readonly=True, copy=False, track_visibility='onchange', readonly=True, copy=False,
states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}) states={'draft': [('readonly', False)], 'sent': [('readonly', False)]})
agreement_type_id = fields.Many2one(
comodel_name="agreement.type", string="Agreement Type",
ondelete="restrict",
track_visibility='onchange', readonly=True, copy=True,
states={'draft': [('readonly', False)], 'sent': [('readonly', False)]})

2
agreement_sale/security/ir.model.access.csv

@ -1,2 +1,4 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
agreement.access_agreement_full,Full access on agreement grp,agreement.model_agreement,sales_team.group_sale_manager,1,1,1,1 agreement.access_agreement_full,Full access on agreement grp,agreement.model_agreement,sales_team.group_sale_manager,1,1,1,1
agreement_sale.access_agreement_type_full,Full access on agreement type grp,agreement.model_agreement_type,sales_team.group_sale_manager,1,1,1,1
agreement_sale.access_agreement_type_read,Read access on agreement grp,agreement.model_agreement_type,base.group_user,1,0,0,0

4
agreement_sale/views/agreement.xml

@ -2,7 +2,9 @@
<odoo> <odoo>
<menuitem id="agreement.agreement_menu" action="agreement.agreement_action"
<menuitem id="agreement.agreement_menu" action="agreement.agreement_action"
parent="sale.menu_sale_config" sequence="100"/> parent="sale.menu_sale_config" sequence="100"/>
<menuitem id="agreement.agreement_type_menu" action="agreement.agreement_type_action"
parent="sale.menu_sale_config" sequence="101" groups="agreement.group_use_agreement_type"/>
</odoo> </odoo>

48
agreement_sale/views/res_config_settings.xml

@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="res_config_settings_view_form" model="ir.ui.view">
<field name="name">res.config.settings.view.form.inherit.agreement</field>
<field name="model">res.config.settings</field>
<field name="priority" eval="11"/>
<field name="inherit_id" ref="sale.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@data-key='sale_management']" position="inside">
<h2>Agreements</h2>
<div class="row mt16 o_settings_container">
<div id="sales_settings_agreement_type_group"
class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="group_use_agreement_type"/>
</div>
<div class="o_setting_right_pane">
<label for="group_use_agreement_type"/>
<div class="text-muted">
Manage agreements by types
</div>
<div class="content-group" attrs="{'invisible': [('group_use_agreement_type','=',False)]}">
<div class="mt16">
<button name="%(agreement.agreement_type_action)d" icon="fa-arrow-right" type="action" string="Agreement types" class="btn-link"/>
</div>
</div>
</div>
</div>
<div class="col-12 col-md-6 o_setting_box"
id="sales_settings_agreement_template_group">
<div class="col-12 col-lg-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="group_use_agreement_template"/>
</div>
<div class="o_setting_right_pane">
<label for="group_use_agreement_template"/>
<div class="text-muted">
Have a special kind of agreements which act as templates
</div>
</div>
</div>
</div>
</div>
</xpath>
</field>
</record>
</odoo>

19
agreement_sale/views/sale_order.xml

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="sale_order_agreement_form_view" model="ir.ui.view">
<field name="name">sale.order.agreement.form.view</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<field name="client_order_ref" position="after">
<field name="agreement_id"/>
</field>
<field name="partner_id" position="after">
<field name="agreement_type_id"
groups="agreement.group_use_agreement_type"
/>
</field>
</field>
</record>
</odoo>
Loading…
Cancel
Save