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

Feedback 1650 + 1649

develop
Ahmed Aly 2018-04-23 12:10:06 +02:00
parent a78b399760
commit a5f463a589
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/custom-addons/dp_custom/models/res_partner.py
View File

@ -272,6 +272,10 @@ class Partner(models.Model):
elif self.env.context.get('sst_14', False): elif self.env.context.get('sst_14', False):
common_list = ['firstname', 'lastname', 'midname', 'email', 'company_odoo_id', 'portal_id', 'opt_out'] common_list = ['firstname', 'lastname', 'midname', 'email', 'company_odoo_id', 'portal_id', 'opt_out']
return common_list return common_list
elif self.env.context.get('delivery_partner', False):
common_list = ['firstname', 'lastname', 'midname', 'street', 'street2', 'zip', 'city', 'country_id', 'fax',
'phone', 'mobile', 'email', 'portal_id']
return common_list
else: else:
return super(Partner, self)._get_specified_fields() return super(Partner, self)._get_specified_fields()

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

@ -176,7 +176,7 @@ class SaleOrder(models.Model):
if key.startswith('delivery_'): if key.startswith('delivery_'):
delivery_vals[key.replace('delivery_', '')] = vals[key] delivery_vals[key.replace('delivery_', '')] = vals[key]
delivery_vals = delivery_partner.with_context(sst_14=True).remove_not_specified_fields(delivery_vals) delivery_vals = delivery_partner.with_context(delivery_partner=True).remove_not_specified_fields(delivery_vals)
delivery_vals = delivery_partner.correct_values(delivery_vals) delivery_vals = delivery_partner.correct_values(delivery_vals)
delivery_vals['parent_id'] = partner.id delivery_vals['parent_id'] = partner.id

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

@ -146,11 +146,13 @@
</strong> </strong>
<br/> <br/>
</t> </t>
<span> <t t-if="order_line.intrastat_id">
<strong>Zolltarif Nr.:</strong> <span>
<span t-field="order_line.intrastat_id"/> <strong>Zolltarif Nr.:</strong>
</span> <span t-field="order_line.intrastat_id"/>
<br/> </span>
<br/>
</t>
<span t-field="order_line.name"/> <span t-field="order_line.name"/>
<t t-if="order_line.delivery_date"> <t t-if="order_line.delivery_date">
<br/> <br/>