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

Merge branch 'develop'

develop
Andreas Brückl 2018-09-05 15:22:20 +02:00
parent 1109f0d977 c5c3ed3b72
commit 14f0f47add
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/custom-addons/dp_reports_account/reports/invoice.xml
View File

@ -171,7 +171,7 @@
</td>
<td class="text-right"/>
<td class="text-left">
<t t-if="invoice_line.product_id.default_code">
<t t-if="invoice_line.product_id.default_code and invoice_line.product_id.material_type_id.print_default_code">
<strong>
<span t-field="invoice_line.product_id.default_code"/>
</strong>

2
ext/custom-addons/dp_reports_sale/reports/sale.xml
View File

@ -146,7 +146,7 @@
<td class="text-right">
</td>
<td rowspan="2" class="text-left">
<t t-if="order_line.product_id.default_code">
<t t-if="order_line.product_id.default_code and order_line.product_id.material_type_id.print_default_code">
<strong>
<span t-field="order_line.product_id.default_code"/>
</strong>

16
ext/custom-addons/tz_carrier_allow_tracking_modification/views/delivery_carrier_track.xml
View File

@ -9,6 +9,9 @@
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='move_lines']/tree//field[@name='product_id']" position="after">
<field name="name" class="o_data_cell o_list_text o_required_modifier" readonly="1"/>
</xpath>
<field name="carrier_tracking_ref" position="replace">
<!-- <field name="carrier_tracking_ref" class="oe_inline" attrs="{'readonly': [('state', '=', 'done')]}"/> -->
<field name="carrier_tracking_ref" class="oe_inline"/>
@ -16,4 +19,17 @@
</field>
</record>
<!--
<record id="view_picking_with_desc_form_tz" model="ir.ui.view">
<field name="name">view.picking.with_desc.form.tz</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='move_lines']/form//field[@name='product_id']" position="after">
<field name="name"/>
</xpath>
</field>
</record>
-->
</odoo>