parent
							
								
									019c155715
								
							
						
					
					
						commit
						cf5a530b87
					
				|  | @ -67,6 +67,7 @@ class SaleOrder(models.Model): | |||
|     earliest_scheduled_date = fields.Datetime(compute='_compute_earliest_scheduled_date') | ||||
|     positions = fields.Integer(string='Positionen', compute='_compute_positions') | ||||
|     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') | ||||
|     weight_total = fields.Float(string='Gesamtgewicht', compute='_compute_weight_total') | ||||
|     confirmation_nr = fields.Char('Freigabenummer',track_visibility='onchange') | ||||
|  | @ -177,8 +178,11 @@ class SaleOrder(models.Model): | |||
|             pg_complete = True | ||||
|             p = 0 | ||||
|             pp = 0 | ||||
|             pa = 0 | ||||
|             for line in record.order_line: | ||||
|                 p += 1 | ||||
|                 if line.lot_id.assembled: | ||||
|                     pa += 1 | ||||
|                 if line.product_id.material_type_id.production_relevant: | ||||
|                     pp += 1 | ||||
|                     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.positions = p | ||||
|             record.production_positions = pp | ||||
|             record.assembly_positions = pa | ||||
| 
 | ||||
|     @api.multi | ||||
|     def _compute_num_items(self): | ||||
|  |  | |||
|  | @ -145,6 +145,7 @@ | |||
|             <xpath expr="//group[@name='sales_person']" position="after"> | ||||
|                 <group name="production" string="Produktion"> | ||||
|                     <field name="assembled"/> | ||||
|                     <field name="assembly_positions" string = "Anzahl zusammengebaut:"/> | ||||
|                     <field name="line_id"/> | ||||
|                     <field name="clerk_id" options="{'no_create': True, 'no_open': True}"/> | ||||
|                 </group> | ||||
|  |  | |||
|  | @ -53,6 +53,10 @@ | |||
|                         <span class="col-xs-2">Positionen:</span> | ||||
|                     </strong> | ||||
|                     <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 class="row height-20"> | ||||
|                     <div class="col-xs-3" style="padding-right: 4px"> | ||||
|  | @ -66,12 +70,10 @@ | |||
|                         <span class="col-xs-2">Email:</span> | ||||
|                     </strong> | ||||
|                     <span class="col-xs-3" t-field="res_company.email"/> | ||||
|                     <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> | ||||
|                     <strong> | ||||
|                         <span class="col-xs-2">Zusammengebaut:</span> | ||||
|                     </strong> | ||||
|                     <span class="col-xs-2" t-field="o.assembly_positions"/> | ||||
|                 </div> | ||||
|                 <div class="row"> | ||||
|                     <div class="col-xs-3" style="padding-right: 4px"> | ||||
|  | @ -85,6 +87,16 @@ | |||
|                         <span class="col-xs-2">Telefon:</span> | ||||
|                     </strong> | ||||
|                     <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> | ||||
|                         <span class="col-xs-2">Freigabe-Nr:</span> | ||||
|                     </strong> | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue