tzaustria
/
odoo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fall 5370: Test-Feedback - Angebot / Aufträge

develop
Ahmed Aly 2018-04-04 14:41:30 +02:00
parent 344eb4d7a4
commit 934c2558ad
2 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/custom-addons/dp_custom/models/sale.py
View File

@ -50,7 +50,7 @@ class SaleOrder(models.Model):
positions = fields.Integer(string='Positionen', compute='_compute_positions') positions = fields.Integer(string='Positionen', compute='_compute_positions')
num_items = fields.Integer(string='Anzahl der Artikel', compute='_compute_num_items') num_items = fields.Integer(string='Anzahl der Artikel', compute='_compute_num_items')
weight_total = fields.Float(string='Gesamtgewicht', compute='_compute_weight_total') weight_total = fields.Float(string='Gesamtgewicht', compute='_compute_weight_total')
confirmation_nr = fields.Char('Freigabe-Nr.') confirmation_nr = fields.Char('Freigabenummer')
@api.multi @api.multi
@api.onchange('partner_invoice_id') @api.onchange('partner_invoice_id')

57
ext/custom-addons/dp_custom/views/sale_views.xml
View File

@ -6,9 +6,12 @@
<field name="model">sale.order</field> <field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/> <field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="client_order_ref" position="replace"/>
<field name="origin" position="replace"/>
<field name="payment_term_id" position="after"> <field name="payment_term_id" position="after">
<field name="assembled"/> <field name="client_order_ref"/>
<field name="line_id"/> <field name="origin"/>
<field name="confirmation_nr"/>
<field name="assembly_state"/> <field name="assembly_state"/>
</field> </field>
<field name="note" position="after"> <field name="note" position="after">
@ -27,20 +30,56 @@
</xpath> </xpath>
<xpath expr="//field[@name='order_line']/tree//field[@name='product_id']" position="after"> <xpath expr="//field[@name='order_line']/tree//field[@name='product_id']" position="after">
<field name="lot_id" options="{'no_open': True}"/> <field name="lot_id" options="{'no_open': True}"/>
<button name="action_show_lot" string="Lot" type="object" icon="fa-list" attrs="{'invisible': [('lot_id', '=', False)]}" options='{"warn": true}'/> <button name="action_show_lot" string="Lot" type="object" icon="fa-list"
attrs="{'invisible': [('lot_id', '=', False)]}" options='{"warn": true}'/>
<field name="from_designbox"/> <field name="from_designbox"/>
</xpath> </xpath>
<xpath expr="//field[@name='order_line']/kanban//field[@name='product_id']" position="after"> <xpath expr="//field[@name='order_line']/kanban//field[@name='product_id']" position="after">
<field name="lot_id"/> <field name="lot_id"/>
<field name="from_designbox"/> <field name="from_designbox"/>
</xpath> </xpath>
<group name="technical" position="replace"> <group name="technical" position="attributes">
<group string="Berichtswesen" name="technical"> <attribute name="groups"/>
<field name="origin"/> <attribute name="string">Berichtswesen</attribute>
</group>
</group> </group>
<field name="partner_shipping_id" position="after"> <xpath expr="//group[@name='sales_person']/.." position="attributes">
<field name="confirmation_nr"/> <attribute name="col">3</attribute>
</xpath>
<xpath expr="//group[@name='sales_person']" position="after">
<group name="positions" string="Position">
<field name="assembled"/>
<field name="line_id"/>
</group>
</xpath>
<xpath expr="//label[@for='carrier_id']" position="replace"/>
<xpath expr="//div[@name='carrier_selection']" position="replace"/>
<field name="picking_policy" position="after">
<label for="carrier_id"/>
<div name='carrier_selection'>
<div>
<field name="carrier_id" context="{'order_id': id}" class="oe_inline"
options="{'no_create': True, 'no_open': True}"
attrs="{'readonly':[('state','not in',('draft','sent'))]}"/>
<i class="fa fa-check text-success" aria-hidden="true"
attrs="{'invisible':['|','|',('carrier_id','=',False),('state','not in',('draft','sent')),('delivery_rating_success','=',False)]}"/>
</div>
<div>
<field name='delivery_price' widget='monetary' class="oe_inline"
options="{'currency_field': 'currency_id'}" nolabel="1"
attrs="{'invisible': [('carrier_id','=', False)]}" force_save="1"/>
<button name="get_delivery_price" string="Check price" type="object"
class="oe_inline fa fa-arrow-right oe_link"
attrs="{'invisible':['|',('carrier_id','=',False),('state','not in',('draft','sent'))]}"/>
<button name="set_delivery_line" string="Set price" type="object"
class="oe_inline fa fa-arrow-right oe_link"
attrs="{'invisible':['|','|',('carrier_id','=',False),('state','not in',('draft','sent')),('delivery_rating_success','=',False)]}"/>
<field name='delivery_rating_success' invisible="1" force_save="1"/>
</div>
<div class="alert alert-info" role="alert"
attrs="{'invisible': ['|',('carrier_id','=', False),('delivery_message','=',False)]}">
<field name='delivery_message' force_save="1"/>
</div>
</div>
</field> </field>
</field> </field>
</record> </record>