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

Merge branch 'develop' of ssh://gitlab.datenpol.at:122/odoo/tz-austria into develop

develop
Ahmed Aly 2018-11-15 13:12:54 +01:00
parent ce6a6d211f 3ecb2ec251
commit 19c9581213
6 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ class ProductTemplate(models.Model):
manufacturing_number = fields.Char(string='Herstellnummer')
product_color = fields.Char(string='Farbe')
@api.onchange('length', 'width', 'thickness')
@api.onchange('length', 'width', 'thickness', 'height')
def _onchange_measures(self):
if self.length>0 and self.width>0 and self.thickness>0:
self.volume = self.length*self.width*self.thickness / (1000*1000*1000)

7
ext/custom-addons/dp_custom/models/stock.py
View File

@ -52,6 +52,13 @@ class StockProductionLot(models.Model):
class StockPicking(models.Model):
_inherit = 'stock.picking'
dlv_partner_ref = fields.Text(compute='_get_partner_ref', store=False, string='Interne Referenz')
@api.multi
def _get_partner_ref(self):
for record in self:
record.dlv_partner_ref = record.partner_id.ref
@api.model
def _formatLang(self, value):
lang = self.partner_id.lang

3
ext/custom-addons/dp_custom/views/stock_views.xml
View File

@ -27,6 +27,9 @@
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="arch" type="xml">
<field name="partner_id" position="after">
<field name="dlv_partner_ref" string="Interne Referenz"/>
</field>
<xpath expr="//field[@name='move_lines']/tree//field[@name='product_id']" position="after">
<field name="manu_lots_visible" invisible="1"/>
<button name="action_show_lot" string="Lot for manufactoring parts" type="object" icon="fa-list" attrs="{'invisible': [('manu_lots_visible', '=', False)]}" options="{&quot;warn&quot;: true}"/>

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

@ -11,6 +11,10 @@
<div class="partner-data">
<span t-esc="o.partner_id.name"/>
<br/>
<t t-if="o.partner_id.name2">
<span t-esc="o.partner_id.name2"/>
<br/>
</t>
<span t-esc="o.partner_id.street"/>
<br/>
<span t-esc="o.partner_id.zip"/>

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

@ -14,6 +14,10 @@
<div class="partner-data">
<span t-esc="o.partner_shipping_id.name"/>
<br/>
<t t-if="o.partner_shipping_id.name2">
<span t-esc="o.partner_shipping_id.name2"/>
<br/>
</t>
<span t-esc="o.partner_shipping_id.street"/>
<br/>
<span t-esc="o.partner_shipping_id.zip"/>
@ -27,6 +31,10 @@
<div class="partner-data">
<span t-esc="o.partner_invoice_id.name"/>
<br/>
<t t-if="o.partner_invoice_id.name2">
<span t-esc="o.partner_invoice_id.name2"/>
<br/>
</t>
<span t-esc="o.partner_invoice_id.street"/>
<br/>
<span t-esc="o.partner_invoice_id.zip"/>

8
ext/custom-addons/dp_reports_stock/reports/stock.xml
View File

@ -18,6 +18,10 @@
<div class="partner-data">
<span t-esc="o.partner_id.name"/>
<br/>
<t t-if="o.partner_id.name2">
<span t-esc="o.partner_id.name2"/>
<br/>
</t>
<span t-esc="o.partner_id.street"/>
<br/>
<span t-esc="o.partner_id.zip"/>
@ -40,6 +44,10 @@
<div class="partner-data">
<span t-esc="o.sale_id.partner_id.name"/>
<br/>
<t t-if="o.sale_id.partner_id.name2">
<span t-esc="o.sale_id.partner_id.name2"/>
<br/>
</t>
<span t-esc="o.sale_id.partner_id.street"/>
<br/>
<span t-esc="o.sale_id.partner_id.zip"/>