Add search on supplier on product search view
Move margin fields to sale order line form view (instead of tree view)
This commit is contained in:
@@ -18,7 +18,7 @@ class AccountMoveLineFilterWizard(models.TransientModel):
|
|||||||
account_reconcile = fields.Boolean(
|
account_reconcile = fields.Boolean(
|
||||||
related='account_id.reconcile', readonly=True)
|
related='account_id.reconcile', readonly=True)
|
||||||
reconcile = fields.Selection([
|
reconcile = fields.Selection([
|
||||||
('unreconciled', 'Unreconciled'),
|
('unreconciled', 'Unreconciled or Partially Reconciled'),
|
||||||
('reconciled', 'Fully Reconciled'),
|
('reconciled', 'Fully Reconciled'),
|
||||||
# ('partial_reconciled', 'Partially Reconciled'),
|
# ('partial_reconciled', 'Partially Reconciled'),
|
||||||
], string='Reconciliation Filter')
|
], string='Reconciliation Filter')
|
||||||
|
|||||||
@@ -241,6 +241,17 @@ module -->
|
|||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
<record id="view_account_payment_form" model="ir.ui.view">
|
||||||
|
<field name="name">usability.account.payment.form</field>
|
||||||
|
<field name="model">account.payment</field>
|
||||||
|
<field name="inherit_id" ref="account.view_account_payment_form"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<field name="communication" position="after">
|
||||||
|
<field name="payment_reference"/>
|
||||||
|
</field>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
<!-- model account.move.line / Journal Items -->
|
<!-- model account.move.line / Journal Items -->
|
||||||
<record id="account.action_account_moves_all_a" model="ir.actions.act_window">
|
<record id="account.action_account_moves_all_a" model="ir.actions.act_window">
|
||||||
<field name="limit">200</field>
|
<field name="limit">200</field>
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
# © 2015-2016 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).
|
||||||
|
|
||||||
from odoo import models, fields
|
from odoo import models, fields
|
||||||
|
|||||||
@@ -88,11 +88,15 @@
|
|||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
<!-- It also adds on product.product search view -->
|
||||||
<record id="product_template_search_view" model="ir.ui.view">
|
<record id="product_template_search_view" model="ir.ui.view">
|
||||||
<field name="name">usability.product.template.search</field>
|
<field name="name">usability.product.template.search</field>
|
||||||
<field name="model">product.template</field>
|
<field name="model">product.template</field>
|
||||||
<field name="inherit_id" ref="product.product_template_search_view" />
|
<field name="inherit_id" ref="product.product_template_search_view" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
|
<field name="categ_id" position="after">
|
||||||
|
<field name="seller_ids" string="Supplier" filter_domain="[('seller_ids.name', 'ilike', self)]"/>
|
||||||
|
</field>
|
||||||
<field name="pricelist_id" position="after">
|
<field name="pricelist_id" position="after">
|
||||||
<group string="Group By" name="groupby">
|
<group string="Group By" name="groupby">
|
||||||
<filter name="categ_groupby" string="Internal Category" context="{'group_by': 'categ_id'}"/>
|
<filter name="categ_groupby" string="Internal Category" context="{'group_by': 'categ_id'}"/>
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ class SaleOrderLine(models.Model):
|
|||||||
string='Margin in Company Currency', readonly=True, store=True,
|
string='Margin in Company Currency', readonly=True, store=True,
|
||||||
compute='_compute_margin', currency_field='company_currency_id')
|
compute='_compute_margin', currency_field='company_currency_id')
|
||||||
margin_rate = fields.Float(
|
margin_rate = fields.Float(
|
||||||
string="Margin (%)", readonly=True, store=True,
|
string="Margin Rate", readonly=True, store=True,
|
||||||
compute='_compute_margin',
|
compute='_compute_margin',
|
||||||
digits=(16, 2), help="Margin rate in percentage of the sale price")
|
digits=(16, 2), help="Margin rate in percentage of the sale price")
|
||||||
|
|
||||||
|
|||||||
@@ -20,13 +20,17 @@
|
|||||||
groups="account.group_account_user"/>
|
groups="account.group_account_user"/>
|
||||||
<field name="company_currency_id" invisible="1"/>
|
<field name="company_currency_id" invisible="1"/>
|
||||||
</field>
|
</field>
|
||||||
<xpath expr="//field[@name='order_line']/tree/field[@name='price_subtotal']" position="after">
|
<xpath expr="//field[@name='order_line']/form//field[@name='analytic_tag_ids']/.." position="after">
|
||||||
<field name="standard_price_sale_currency" groups="base.group_no_one" string="Cost Price Sale Cur."/>
|
<field name="standard_price_sale_currency" groups="base.group_no_one"/>
|
||||||
<field name="standard_price_company_currency" groups="base.group_no_one" string="Cost Price Comp. Cur."/>
|
<field name="standard_price_company_currency" groups="base.group_no_one"/>
|
||||||
<field name="margin_sale_currency" groups="base.group_no_one" string="Margin Sale Cur."/>
|
<field name="margin_sale_currency" groups="base.group_no_one"/>
|
||||||
<field name="margin_company_currency" groups="base.group_no_one" string="Margin Comp. Cur."/>
|
<field name="margin_company_currency" groups="base.group_no_one"/>
|
||||||
<field name="margin_rate" groups="base.group_no_one"/>
|
<label for="margin_rate"/>
|
||||||
|
<div name="margin_rate">
|
||||||
|
<field name="margin_rate" groups="base.group_no_one" class="oe_inline"/> %
|
||||||
|
</div>
|
||||||
<field name="company_currency_id" invisible="1"/>
|
<field name="company_currency_id" invisible="1"/>
|
||||||
|
<field name="currency_id" invisible="1"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|||||||
@@ -15,7 +15,9 @@
|
|||||||
<xpath expr="//field[@name='order_line']/form//label[@for='analytic_tag_ids']" position="attributes">
|
<xpath expr="//field[@name='order_line']/form//label[@for='analytic_tag_ids']" position="attributes">
|
||||||
<attribute name="invisible">1</attribute>
|
<attribute name="invisible">1</attribute>
|
||||||
</xpath>
|
</xpath>
|
||||||
<xpath expr="//field[@name='order_line']/form//field[@name='analytic_tag_ids']/.." position="replace"/>
|
<xpath expr="//field[@name='order_line']/form//field[@name='analytic_tag_ids']/.." position="attributes">
|
||||||
|
<attribute name="invisible">1</attribute>
|
||||||
|
</xpath>
|
||||||
<xpath expr="//field[@name='order_line']/tree/field[@name='analytic_tag_ids']" position="attributes">
|
<xpath expr="//field[@name='order_line']/tree/field[@name='analytic_tag_ids']" position="attributes">
|
||||||
<attribute name="invisible">1</attribute>
|
<attribute name="invisible">1</attribute>
|
||||||
</xpath>
|
</xpath>
|
||||||
|
|||||||
Reference in New Issue
Block a user