Skip to content

Commit

Permalink
Rename field type to agreement_type
Browse files Browse the repository at this point in the history
Small fix in view
  • Loading branch information
alexis-via committed Sep 17, 2017
1 parent 90fda6b commit a6a96f0
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 22 deletions.
12 changes: 6 additions & 6 deletions agreement_account/demo/demo.xml
Expand Up @@ -11,47 +11,47 @@
<field name="code">C2C-IT0042</field>
<field name="name">Hardware IT</field>
<field name="partner_id" ref="base.res_partner_12"/>
<field name="type">sale</field>
<field name="agreement_type">sale</field>
<field name="signature_date">2017-09-10</field>
</record>

<record id="market2" model="agreement">
<field name="code">C2C-IT0043</field>
<field name="name">Fiber access office Lausanne</field>
<field name="partner_id" ref="base.res_partner_12"/>
<field name="type">sale</field>
<field name="agreement_type">sale</field>
<field name="signature_date" eval="time.strftime('%Y-01-01')"/>
</record>

<record id="market3" model="agreement">
<field name="code">AGR-VETO001</field>
<field name="name">Vétérinaire</field>
<field name="partner_id" ref="base.res_partner_2"/>
<field name="type">sale</field>
<field name="agreement_type">sale</field>
<field name="signature_date">2017-08-01</field>
</record>

<record id="market4" model="agreement">
<field name="code">AGR-TEL001</field>
<field name="name">Wazo IPBX deployment and maintenance</field>
<field name="partner_id" ref="base.res_partner_2"/>
<field name="type">sale</field>
<field name="agreement_type">sale</field>
<field name="signature_date">2017-05-05</field>
</record>

<record id="market5" model="agreement">
<field name="code">BUY-VOIP012</field>
<field name="name">SIP Phones supply</field>
<field name="partner_id" ref="base.res_partner_1"/>
<field name="type">purchase</field>
<field name="agreement_type">purchase</field>
<field name="signature_date" eval="time.strftime('%Y-01-01')"/>
</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="type">purchase</field>
<field name="agreement_type">purchase</field>
<field name="signature_date">2017-09-02</field>
</record>

Expand Down
2 changes: 1 addition & 1 deletion agreement_account/models/agreement.py
Expand Up @@ -13,7 +13,7 @@ class Agreement(models.Model):
code = fields.Char(
string='Code', required=True, copy=False)
name = fields.Char(string='Name', required=True)
type = fields.Selection([
agreement_type = fields.Selection([
('sale', 'Sale'),
('purchase', 'Purchase'),
], string='Type', required=True)
Expand Down
8 changes: 4 additions & 4 deletions agreement_account/views/account_invoice.xml
Expand Up @@ -14,8 +14,8 @@
<field name="arch" type="xml">
<xpath expr="//page/group/group/field[@name='name']" position="after">
<field name="agreement_id"
domain="[('partner_id', 'child_of', commercial_partner_id), ('type', '=', 'sale')]"
context="{'default_partner_id': commercial_partner_id, 'default_type': 'sale'}"/>
domain="[('partner_id', 'child_of', commercial_partner_id), ('agreement_type', '=', 'sale')]"
context="{'default_partner_id': commercial_partner_id, 'default_agreement_type': 'sale'}"/>
<field name="commercial_partner_id" invisible="1"/>
</xpath>
</field>
Expand All @@ -28,8 +28,8 @@
<field name="arch" type="xml">
<xpath expr="//page/group/group/field[@name='company_id']" position="after">
<field name="agreement_id"
domain="[('partner_id', 'child_of', commercial_partner_id), ('type', '=', 'purchase')]"
context="{'default_partner_id': commercial_partner_id, 'default_type': 'purchase'}"/>
domain="[('partner_id', 'child_of', commercial_partner_id), ('agreement_type', '=', 'purchase')]"
context="{'default_partner_id': commercial_partner_id, 'default_agreement_type': 'purchase'}"/>
<field name="commercial_partner_id" invisible="1"/>
</xpath>
</field>
Expand Down
16 changes: 8 additions & 8 deletions agreement_account/views/agreement.xml
Expand Up @@ -23,14 +23,14 @@
<field name="partner_id"/>
<field name="name"/>
<field name="code"/>
<field name="type"/>
<field name="agreement_type"/>
<field name="signature_date"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<group string="Customer Invoices" name="out_invoices" attrs="{'invisible': [('type', '!=', 'sale')]}">
<group string="Customer Invoices" name="out_invoices" attrs="{'invisible': [('agreement_type', '!=', 'sale')]}">
<field name="out_invoice_ids" nolabel="1"/>
</group>
<group string="Supplier Invoices" name="in_invoices" attrs="{'invisible': [('type', '!=', 'purchase')]}">
<group string="Supplier Invoices" name="in_invoices" attrs="{'invisible': [('agreement_type', '!=', 'purchase')]}">
<field name="in_invoice_ids" nolabel="1"/>
</group>
</form>
Expand All @@ -45,7 +45,7 @@
<field name="partner_id"/>
<field name="code"/>
<field name="name"/>
<field name="type"/>
<field name="agreement_type"/>
<field name="signature_date"/>
<field name="company_id" groups="base.group_multi_company"/>
</tree>
Expand All @@ -59,17 +59,17 @@
<search string="Search Agreements">
<field name="name" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]" string="Name or Number"/>
<field name="partner_id"/>
<filter name="sale" string="Sale" domain="[('type', '=', 'sale')]"/>
<filter name="purchase" string="Purchase" domain="[('type', '=', 'purchase')]"/>
<filter name="sale" string="Sale" domain="[('agreement_type', '=', 'sale')]"/>
<filter name="purchase" string="Purchase" domain="[('agreement_type', '=', 'purchase')]"/>
<separator/>
<filter name="inactive" string="Archived" domain="[('active', '=', False)]"/>
<group name="groupby">
<filter name="partner_groupby" string="Customer"
context="{'group_by': 'partner_id'}"/>
<filter name="signature_date_groupby" string="Signature Date"
context="{'group_by': 'signature_date'}"/>
<filter name="type_groupby" string="Type"
context="{'group_by': 'type'}"/>
<filter name="agreement_type_groupby" string="Type"
context="{'group_by': 'agreement_type'}"/>
</group>
</search>
</field>
Expand Down
2 changes: 1 addition & 1 deletion agreement_sale/views/agreement.xml
Expand Up @@ -13,7 +13,7 @@
<field name="inherit_id" ref="agreement_account.agreement_form"/>
<field name="arch" type="xml">
<group name="in_invoices" position="after">
<group name="sale_orders" string="Sales Orders">
<group name="sale_orders" string="Sales Orders" attrs="{'invisible': [('agreement_type', '!=', 'sale')]}">
<field name="sale_ids" nolabel="1"/>
</group>
</group>
Expand Down
4 changes: 2 additions & 2 deletions agreement_sale/views/sale_order.xml
Expand Up @@ -14,8 +14,8 @@
<field name="arch" type="xml">
<field name="client_order_ref" position="after">
<field name="agreement_id"
domain="[('partner_id', 'child_of', commercial_partner_id), ('type', '=', sale')]"
context="{'default_partner_id': commercial_partner_id, 'default_type', 'sale'}"/>
domain="[('partner_id', 'child_of', commercial_partner_id), ('agreement_type', '=', 'sale')]"
context="{'default_partner_id': commercial_partner_id, 'default_agreement_type': 'sale'}"/>
</field>
</field>
</record>
Expand Down

0 comments on commit a6a96f0

Please sign in to comment.