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

Sales: Assembly_positions 

Report_Production: Warenkorb
develop
Andreas Osim 2020-08-17 13:08:20 +02:00
parent 019c155715
commit cf5a530b87
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,7 @@ class SaleOrder(models.Model):
earliest_scheduled_date = fields.Datetime(compute='_compute_earliest_scheduled_date') earliest_scheduled_date = fields.Datetime(compute='_compute_earliest_scheduled_date')
positions = fields.Integer(string='Positionen', compute='_compute_positions') positions = fields.Integer(string='Positionen', compute='_compute_positions')
production_positions = fields.Integer(string='Positionen', compute='_compute_positions', store=False) production_positions = fields.Integer(string='Positionen', compute='_compute_positions', store=False)
assembly_positions = fields.Integer(string='Positionen', compute='_compute_positions', store=False)
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('Freigabenummer',track_visibility='onchange') confirmation_nr = fields.Char('Freigabenummer',track_visibility='onchange')
@ -177,8 +178,11 @@ class SaleOrder(models.Model):
pg_complete = True pg_complete = True
p = 0 p = 0
pp = 0 pp = 0
pa = 0
for line in record.order_line: for line in record.order_line:
p += 1 p += 1
if line.lot_id.assembled:
pa += 1
if line.product_id.material_type_id.production_relevant: if line.product_id.material_type_id.production_relevant:
pp += 1 pp += 1
if line.product_uom_qty > line.qty_delivered and line.from_designbox: if line.product_uom_qty > line.qty_delivered and line.from_designbox:
@ -187,6 +191,7 @@ class SaleOrder(models.Model):
record.pg9_complete = pg_complete record.pg9_complete = pg_complete
record.positions = p record.positions = p
record.production_positions = pp record.production_positions = pp
record.assembly_positions = pa
@api.multi @api.multi
def _compute_num_items(self): def _compute_num_items(self):

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

@ -145,6 +145,7 @@
<xpath expr="//group[@name='sales_person']" position="after"> <xpath expr="//group[@name='sales_person']" position="after">
<group name="production" string="Produktion"> <group name="production" string="Produktion">
<field name="assembled"/> <field name="assembled"/>
<field name="assembly_positions" string = "Anzahl zusammengebaut:"/>
<field name="line_id"/> <field name="line_id"/>
<field name="clerk_id" options="{'no_create': True, 'no_open': True}"/> <field name="clerk_id" options="{'no_create': True, 'no_open': True}"/>
</group> </group>

24
ext/custom-addons/tz_reports_production/reports/report_production.xml
View File

@ -53,6 +53,10 @@
<span class="col-xs-2">Positionen:</span> <span class="col-xs-2">Positionen:</span>
</strong> </strong>
<span class="col-xs-2" t-field="o.production_positions"/> <span class="col-xs-2" t-field="o.production_positions"/>
<strong>
<span class="col-xs-2">Zusammengebaut:</span>
</strong>
<span class="col-xs-2" t-field="o.assembly_positions"/>
</div> </div>
<div class="row height-20"> <div class="row height-20">
<div class="col-xs-3" style="padding-right: 4px"> <div class="col-xs-3" style="padding-right: 4px">
@ -66,12 +70,10 @@
<span class="col-xs-2">Email:</span> <span class="col-xs-2">Email:</span>
</strong> </strong>
<span class="col-xs-3" t-field="res_company.email"/> <span class="col-xs-3" t-field="res_company.email"/>
<p t-if="o.origin"> <strong>
<strong> <span class="col-xs-2">Zusammengebaut:</span>
<span class="col-xs-2">Warenkorb/Ref:</span> </strong>
</strong> <span class="col-xs-2" t-field="o.assembly_positions"/>
<span class="col-xs-2" t-field="o.origin"/>
</p>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-3" style="padding-right: 4px"> <div class="col-xs-3" style="padding-right: 4px">
@ -85,6 +87,16 @@
<span class="col-xs-2">Telefon:</span> <span class="col-xs-2">Telefon:</span>
</strong> </strong>
<span class="col-xs-3" t-field="o.user_id.phone"/> <span class="col-xs-3" t-field="o.user_id.phone"/>
<p t-if="o.origin">
<strong>
<span class="col-xs-2">Warenkorb/Ref:</span>
</strong>
<span class="col-xs-2" t-field="o.origin"/>
</p>
</div>
<div class="row">
<div class="col-xs-8" style="padding-right: 4px">
</div>
<strong> <strong>
<span class="col-xs-2">Freigabe-Nr:</span> <span class="col-xs-2">Freigabe-Nr:</span>
</strong> </strong>