Skip to content

Commit

Permalink
[MIG][13.0] agreemnt_sale + black
Browse files Browse the repository at this point in the history
  • Loading branch information
Iryna Vyshnevska authored and i-vyshnevska committed Mar 1, 2021
1 parent 875a4f7 commit c91ea93
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 41 deletions.
39 changes: 16 additions & 23 deletions agreement_sale/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,21 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

{
'name': 'Agreement Sale',
'summary': "Agreement on sales",
'version': '12.0.1.0.0',
'category': 'Contract',
'author': 'Akretion, '
'Odoo Community Association (OCA)',
'website': 'https://github.com/oca/contract',
'license': 'AGPL-3',
'depends': [
'sale_management',
'agreement',
"name": "Agreement Sale",
"summary": "Agreement on sales",
"version": "13.0.1.0.0",
"category": "Contract",
"author": "Akretion, " "Odoo Community Association (OCA)",
"website": "https://github.com/oca/contract",
"license": "AGPL-3",
"depends": ["sale_management", "agreement"],
"data": [
"security/ir.model.access.csv",
"views/agreement.xml",
"views/sale_order.xml",
"views/res_config_settings.xml",
],
'data': [
'security/ir.model.access.csv',
'views/agreement.xml',
'views/sale_order.xml',
'views/res_config_settings.xml',
],
'development_status': 'Beta',
'maintainers': [
'alexis-via',
'bealdav',
],
'installable': True,
"development_status": "Beta",
"maintainers": ["alexis-via", "bealdav"],
"installable": True,
}
8 changes: 3 additions & 5 deletions agreement_sale/models/res_config_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@


class ResConfigSettings(models.TransientModel):
_inherit = 'res.config.settings'
_inherit = "res.config.settings"

group_use_agreement_type = fields.Boolean(
'Use agreement types',
implied_group='agreement.group_use_agreement_type'
"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'
"Use agreement template", implied_group="agreement.group_use_agreement_template"
)
25 changes: 17 additions & 8 deletions agreement_sale/models/sale.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,28 @@
# 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):
_inherit = 'sale.order'
_inherit = "sale.order"

agreement_id = fields.Many2one(
comodel_name='agreement', string='Agreement', ondelete='restrict',
track_visibility='onchange', readonly=True, copy=False,
states={'draft': [('readonly', False)], 'sent': [('readonly', False)]})
comodel_name="agreement",
string="Agreement",
ondelete="restrict",
track_visibility="onchange",
readonly=True,
copy=False,
states={"draft": [("readonly", False)], "sent": [("readonly", False)]},
)

agreement_type_id = fields.Many2one(
comodel_name="agreement.type", string="Agreement Type",
comodel_name="agreement.type",
string="Agreement Type",
ondelete="restrict",
track_visibility='onchange', readonly=True, copy=True,
states={'draft': [('readonly', False)], 'sent': [('readonly', False)]})
track_visibility="onchange",
readonly=True,
copy=True,
states={"draft": [("readonly", False)], "sent": [("readonly", False)]},
)
6 changes: 3 additions & 3 deletions agreement_sale/views/agreement.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<odoo>

<menuitem id="agreement.agreement_menu" action="agreement.agreement_action"
<menuitem id="base_contract.agreement_menu" action="base_contract.agreement_action"
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"/>
<menuitem id="base_contract.agreement_type_menu" action="base_contract.agreement_type_action"
parent="sale.menu_sale_config" sequence="101" groups="base_contract.group_use_agreement_type"/>

</odoo>
2 changes: 1 addition & 1 deletion agreement_sale/views/res_config_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</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"/>
<button name="%(base_contract.agreement_type_action)d" icon="fa-arrow-right" type="action" string="Agreement types" class="btn-link"/>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion agreement_sale/views/sale_order.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</field>
<field name="partner_id" position="after">
<field name="agreement_type_id"
groups="agreement.group_use_agreement_type"
groups="base_contract.group_use_agreement_type"
/>
</field>
</field>
Expand Down

0 comments on commit c91ea93

Please sign in to comment.