Merge remote-tracking branch 'origin/develop' into develop

develop
Andreas Osim 2018-11-16 09:21:08 +01:00
commit 3084e105fd
1 changed files with 5 additions and 0 deletions

View File

@ -162,6 +162,7 @@
</field> </field>
<field name="name" position="after"> <field name="name" position="after">
<field name="order_type"/> <field name="order_type"/>
<field name="team_id"/>
<field name="confirmation_nr"/> <field name="confirmation_nr"/>
</field> </field>
</field> </field>
@ -178,6 +179,7 @@
</field> </field>
<field name="name" position="after"> <field name="name" position="after">
<field name="order_type"/> <field name="order_type"/>
<field name="team_id"/>
<field name="confirmation_nr"/> <field name="confirmation_nr"/>
</field> </field>
<field name="invoice_status" position="after"> <field name="invoice_status" position="after">
@ -197,6 +199,8 @@
<field name="confirmation_nr"/> <field name="confirmation_nr"/>
<field name="assembly_state"/> <field name="assembly_state"/>
<field name="order_type"/> <field name="order_type"/>
<filter string="IR Heizpaneele" domain="[('team_id.name','=', 'IR Heizpaneele')]" name="from_website_ir_heizpaneele"/>
<filter string="Heizpaneele" domain="[('team_id.name','=', 'Heizpaneele')]" name="from_website_heizpaneele"/>
</field> </field>
<!-- <!--
<field name="partner_id" position="after"> <field name="partner_id" position="after">
@ -211,6 +215,7 @@
<filter string="PG Status" domain="[]" context="{'group_by':'assembly_state'}"/> <filter string="PG Status" domain="[]" context="{'group_by':'assembly_state'}"/>
<filter string="Rechnungsadresse" domain="[]" context="{'group_by':'partner_invoice_id'}"/> <filter string="Rechnungsadresse" domain="[]" context="{'group_by':'partner_invoice_id'}"/>
<filter string="Auftragsart" domain="[]" context="{'group_by':'order_type'}"/> <filter string="Auftragsart" domain="[]" context="{'group_by':'order_type'}"/>
<filter string="Vertriebskanal" domain="[]" context="{'group_by':'team_id'}"/>
</filter> </filter>
</field> </field>
</record> </record>