[MIG][13.0] agreemnt_sale + black

This commit is contained in:
Iryna Vyshnevska
2019-10-16 18:08:48 +03:00
committed by Pierrick Brun
parent ba1b2085f5
commit ca44eddb48
6 changed files with 83 additions and 65 deletions

View File

@@ -2,28 +2,21 @@
# 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 Sale', "name": "Agreement Sale",
'summary': "Agreement on sales", "summary": "Agreement on sales",
'version': '12.0.1.0.0', "version": "13.0.1.0.0",
'category': 'Contract', "category": "Contract",
'author': 'Akretion, ' "author": "Akretion, " "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": ["sale_management", "agreement"],
'depends': [ "data": [
'sale_management', "security/ir.model.access.csv",
'agreement', "views/agreement.xml",
"views/sale_order.xml",
"views/res_config_settings.xml",
], ],
'data': [ "development_status": "Beta",
'security/ir.model.access.csv', "maintainers": ["alexis-via", "bealdav"],
'views/agreement.xml', "installable": True,
'views/sale_order.xml',
'views/res_config_settings.xml',
],
'development_status': 'Beta',
'maintainers': [
'alexis-via',
'bealdav',
],
'installable': True,
} }

View File

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

View File

@@ -2,19 +2,28 @@
# 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 models, fields from odoo import fields, models
class SaleOrder(models.Model): class SaleOrder(models.Model):
_inherit = 'sale.order' _inherit = "sale.order"
agreement_id = fields.Many2one( agreement_id = fields.Many2one(
comodel_name='agreement', string='Agreement', ondelete='restrict', comodel_name="agreement",
track_visibility='onchange', readonly=True, copy=False, string="Agreement",
states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}) ondelete="restrict",
track_visibility="onchange",
readonly=True,
copy=False,
states={"draft": [("readonly", False)], "sent": [("readonly", False)]},
)
agreement_type_id = fields.Many2one( agreement_type_id = fields.Many2one(
comodel_name="agreement.type", string="Agreement Type", comodel_name="agreement.type",
string="Agreement Type",
ondelete="restrict", ondelete="restrict",
track_visibility='onchange', readonly=True, copy=True, track_visibility="onchange",
states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}) readonly=True,
copy=True,
states={"draft": [("readonly", False)], "sent": [("readonly", False)]},
)

View File

@@ -1,10 +1,16 @@
<?xml version="1.0"?> <?xml version="1.0" ?>
<odoo> <odoo>
<menuitem
<menuitem id="agreement.agreement_menu" action="agreement.agreement_action" id="agreement.agreement_menu"
parent="sale.menu_sale_config" sequence="100"/> action="agreement.agreement_action"
<menuitem id="agreement.agreement_type_menu" action="agreement.agreement_type_action" parent="sale.menu_sale_config"
parent="sale.menu_sale_config" sequence="101" groups="agreement.group_use_agreement_type"/> 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>

View File

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

View File

@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<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="sale.view_order_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="client_order_ref" position="after"> <field name="client_order_ref" position="after">
<field name="agreement_id"/> <field name="agreement_id" />
</field> </field>
<field name="partner_id" position="after"> <field name="partner_id" position="after">
<field name="agreement_type_id" <field
name="agreement_type_id"
groups="agreement.group_use_agreement_type" groups="agreement.group_use_agreement_type"
/> />
</field> </field>
</field> </field>
</record> </record>
</odoo> </odoo>