Standard filter for invoices 'not canceled'; additional search-filter for delivery-date in orders; div. report modifications
parent
ea39bed9ed
commit
1cab4e69e7
|
|
@ -44,5 +44,43 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<record id="view_account_invoice_filter_active" model="ir.ui.view">
|
||||
<field name="name">account.invoice.select</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="inherit_id" ref="account.view_account_invoice_filter"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//filter[@name='late']" position="after">
|
||||
<filter name="active" string="Nicht abgebrochen" domain="[('state', '!=', 'cancel')]"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_invoice_tree1" model="ir.actions.act_window">
|
||||
<field name="name">Customer Invoices</field>
|
||||
<field name="res_model">account.invoice</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,kanban,form,calendar,pivot,graph</field>
|
||||
<field eval="False" name="view_id"/>
|
||||
<field name="domain">[('type','=','out_invoice')]</field>
|
||||
<field name="context">{'type':'out_invoice', 'journal_type': 'sale',"search_default_active":1}</field>
|
||||
<field name="search_view_id" ref="account.view_account_invoice_filter"/>
|
||||
<field name="help" type="html">
|
||||
<p class="oe_view_nocontent_create">
|
||||
Click to create a customer invoice.
|
||||
</p><p>
|
||||
Odoo's electronic invoicing allows to ease and fasten the
|
||||
collection of customer payments. Your customer receives the
|
||||
invoice by email and he can pay online and/or import it
|
||||
in his own system.
|
||||
</p><p>
|
||||
The discussions with your customer are automatically displayed at
|
||||
the bottom of each invoice.
|
||||
</p>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.menu" id="account.menu_action_invoice_tree1">
|
||||
<field name="action" ref="action_invoice_tree1"/>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@
|
|||
</field>
|
||||
<field name="name" position="after">
|
||||
<field name="order_type"/>
|
||||
<field name="team_id"/>
|
||||
<!-- <field name="team_id"/> -->
|
||||
<field name="confirmation_nr"/>
|
||||
</field>
|
||||
</field>
|
||||
|
|
@ -195,9 +195,12 @@
|
|||
</field>
|
||||
<field name="name" position="after">
|
||||
<field name="order_type"/>
|
||||
<field name="team_id"/>
|
||||
<!-- <field name="team_id"/> -->
|
||||
<field name="confirmation_nr"/>
|
||||
</field>
|
||||
<field name="confirmation_date" position="after">
|
||||
<field name="delivery_date"/>
|
||||
</field>
|
||||
<field name="invoice_status" position="after">
|
||||
<field name="assembly_state"/>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ from odoo import api, fields, models
|
|||
class SaleOrder(models.Model):
|
||||
_inherit = 'sale.order'
|
||||
|
||||
delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date')
|
||||
delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date',store=True,index=True)
|
||||
|
||||
@api.multi
|
||||
def _compute_delivery_date(self):
|
||||
|
|
|
|||
|
|
@ -21,6 +21,16 @@
|
|||
<span t-esc="o.partner_shipping_id.city"/>
|
||||
<br/>
|
||||
<span t-esc="o.partner_shipping_id.country_id.name"/>
|
||||
<t t-if="o.partner_shipping_id.email">
|
||||
<br/>
|
||||
<span t-esc="o.partner_shipping_id.email"/>
|
||||
</t>
|
||||
<t t-if="o.partner_shipping_id.phone">
|
||||
<br/>
|
||||
<span t-esc="o.partner_shipping_id.phone"/>
|
||||
</t>
|
||||
<br/>
|
||||
<strong><span>Kdnr: </span></strong><span t-esc="o.partner_shipping_id.ref"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue