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

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

develop
Andreas Osim 2018-03-01 14:00:28 +01:00
parent 121218d3b7 de160c5396
commit d1d7db88ac
7 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/custom-addons/dp_custom/__manifest__.py
View File

@ -35,6 +35,7 @@
'sale_stock', 'sale_stock',
'report_intrastat', 'report_intrastat',
'dp_intercompany_invoicing', 'dp_intercompany_invoicing',
'sale_partner_incoterm',
], ],
'data': [ 'data': [
'wizards/wizard_confirm_production.xml', 'wizards/wizard_confirm_production.xml',

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

@ -56,7 +56,7 @@ class SaleOrder(models.Model):
for record in self: for record in self:
sum = 0 sum = 0
for line in record.order_line: for line in record.order_line:
sum += line.product_id.weight * line.product_uom_qty sum += (line.lot_id.weight or line.product_id.weight) * line.product_uom_qty
record.weight_total = sum record.weight_total = sum
@api.multi @api.multi

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

@ -33,6 +33,11 @@
<field name="lot_id"/> <field name="lot_id"/>
<field name="from_designbox"/> <field name="from_designbox"/>
</xpath> </xpath>
<group name="technical" position="replace">
<group string="Berichtswesen" name="technical">
<field name="origin"/>
</group>
</group>
</field> </field>
</record> </record>

2
ext/custom-addons/dp_reports/reports/report_templates.xml
View File

@ -107,7 +107,7 @@
UID-Nr.: UID-Nr.:
<span t-esc="company.vat"/> <span t-esc="company.vat"/>
&#183; &#183;
EORI-Nr.: EORI-Nr.
<span t-esc="company.eori_nr"/> <span t-esc="company.eori_nr"/>
&#183; &#183;
Firmenbuch Nr.: Firmenbuch Nr.:

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

@ -37,26 +37,32 @@
</div> </div>
<div class="row mt32"/> <div class="row mt32"/>
<div class="row height-20"> <div class="row height-20">
<strong><span class="col-xs-2">Kundennr.:</span></strong> <div class="col-xs-3">
<span class="col-xs-2" t-field="o.partner_id.ref"/> <strong><span class="col-xs-8" style="padding: 0px">Kundennr.:</span></strong>
<span class="col-xs-4" style="padding: 0px" t-field="o.partner_id.ref"/>
</div>
<strong><span class="col-xs-2">Ansprechpartner:</span></strong> <strong><span class="col-xs-2">Ansprechpartner:</span></strong>
<span class="col-xs-2" t-field="o.user_id"/> <span class="col-xs-3" t-field="o.user_id"/>
<strong><span class="col-xs-2">Positionen:</span></strong> <strong><span class="col-xs-2">Positionen:</span></strong>
<span class="col-xs-2" t-field="o.positions"/> <span class="col-xs-2" t-field="o.positions"/>
</div> </div>
<div class="row height-20"> <div class="row height-20">
<strong><span class="col-xs-2">Rechnungsdatum:</span></strong> <div class="col-xs-3">
<span class="col-xs-2" t-field="o.date_invoice"/> <strong><span class="col-xs-8" style="padding: 0px">Rechnungsdatum:</span></strong>
<span class="col-xs-4" style="padding: 0px" t-field="o.date_invoice"/>
</div>
<strong><span class="col-xs-2">Email:</span></strong> <strong><span class="col-xs-2">Email:</span></strong>
<span class="col-xs-2" t-field="o.user_id.email"/> <span class="col-xs-3" t-field="o.user_id.email"/>
<strong><span class="col-xs-2">Artikel:</span></strong> <strong><span class="col-xs-2">Artikel:</span></strong>
<span class="col-xs-2" t-field="o.num_items"/> <span class="col-xs-2" t-field="o.num_items"/>
</div> </div>
<div class="row height-20"> <div class="row height-20">
<strong><span class="col-xs-2">Lieferdatum:</span></strong> <div class="col-xs-3">
<span class="col-xs-2">?????????</span> <strong><span class="col-xs-8" style="padding: 0px">Lieferdatum:</span></strong>
<span class="col-xs-4" style="padding: 0px">?????????</span>
</div>
<strong><span class="col-xs-2">Telefon:</span></strong> <strong><span class="col-xs-2">Telefon:</span></strong>
<span class="col-xs-2" t-field="o.user_id.phone"/> <span class="col-xs-3" t-field="o.user_id.phone"/>
<strong><span class="col-xs-2">Bezeichnung:</span></strong> <strong><span class="col-xs-2">Bezeichnung:</span></strong>
<span class="col-xs-2" t-field="o.number"/> <span class="col-xs-2" t-field="o.number"/>
</div> </div>

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

@ -36,26 +36,32 @@
</div> </div>
<div class="row mt32"/> <div class="row mt32"/>
<div class="row height-20"> <div class="row height-20">
<strong><span class="col-xs-2">Kundennr.:</span></strong> <div class="col-xs-3">
<span class="col-xs-2" t-field="o.partner_id.ref"/> <strong><span class="col-xs-8" style="padding: 0px">Kundennr.:</span></strong>
<span class="col-xs-4" style="padding: 0px" t-field="o.partner_id.ref"/>
</div>
<strong><span class="col-xs-2">Ansprechpartner:</span></strong> <strong><span class="col-xs-2">Ansprechpartner:</span></strong>
<span class="col-xs-2" t-field="o.user_id"/> <span class="col-xs-3" t-field="o.user_id"/>
<strong><span class="col-xs-2">Positionen:</span></strong> <strong><span class="col-xs-2">Positionen:</span></strong>
<span class="col-xs-2" t-field="o.positions"/> <span class="col-xs-2" t-field="o.positions"/>
</div> </div>
<div class="row height-20"> <div class="row height-20">
<strong><span class="col-xs-2">Angebotsdatum:</span></strong> <div class="col-xs-3">
<span class="col-xs-2" t-field="o.date_order" t-options='{"widget": "date"}'/> <strong><span class="col-xs-8" style="padding: 0px">Angebotsdatum:</span></strong>
<span class="col-xs-4" style="padding: 0px" t-field="o.date_order" t-options='{"widget": "date"}'/>
</div>
<strong><span class="col-xs-2">Email:</span></strong> <strong><span class="col-xs-2">Email:</span></strong>
<span class="col-xs-2" t-field="o.user_id.email"/> <span class="col-xs-3" t-field="o.user_id.email"/>
<strong><span class="col-xs-2">Artikel:</span></strong> <strong><span class="col-xs-2">Artikel:</span></strong>
<span class="col-xs-2" t-field="o.num_items"/> <span class="col-xs-2" t-field="o.num_items"/>
</div> </div>
<div class="row height-20"> <div class="row height-20">
<strong><span class="col-xs-2">Lieferdatum:</span></strong> <div class="col-xs-3">
<span class="col-xs-2" t-field="o.earliest_scheduled_date" t-options='{"widget": "date"}'/> <strong><span class="col-xs-6" style="padding: 0px">Lieferdatum:</span></strong>
<span class="col-xs-6" style="padding: 0px" t-field="o.earliest_scheduled_date" t-options='{"widget": "date"}'/>
</div>
<strong><span class="col-xs-2">Telefon:</span></strong> <strong><span class="col-xs-2">Telefon:</span></strong>
<span class="col-xs-2" t-field="o.user_id.phone"/> <span class="col-xs-3" t-field="o.user_id.phone"/>
<strong><span class="col-xs-2">Bezeichnung:</span></strong> <strong><span class="col-xs-2">Bezeichnung:</span></strong>
<span class="col-xs-2" t-field="o.quote_name"/> <span class="col-xs-2" t-field="o.quote_name"/>
</div> </div>

4
setup/lib/config.py
View File

@ -76,7 +76,7 @@ class Config(object):
'security_lead': 0, 'security_lead': 0,
# Einstellungen Finanzen # Einstellungen Finanzen
'tax_calculation_rounding_method': 'round_per_line', 'tax_calculation_rounding_method': 'round_globally',
'vat_check_vies': True, 'vat_check_vies': True,
'group_multi_currency': True, # Multiwährungsfunktion aktivieren 'group_multi_currency': True, # Multiwährungsfunktion aktivieren
'module_account_reports_followup': False, 'module_account_reports_followup': False,
@ -137,6 +137,8 @@ class Config(object):
'dp_retail_invoice', 'dp_retail_invoice',
'website_sale', 'website_sale',
'account_invoice_fiscal_position_update', 'account_invoice_fiscal_position_update',
'dp_sale_filter_partner_addresses',
'website_form_project',
] ]