add shopping_cart_ref to delivery slip

ext/custom-addons/dp_custom/models/sale.py

@@ -383,9 +383,9 @@ class SaleOrder(models.Model):
                 if order_id.state == 'sale' and (order_id.assembly_state == 'created'):
                     vals['assembly_state'] = 'approved'
                     vals['message_post'] = 'PG9 autoreleased'
-                order_id.write(vals)
                 if (order_id.state == 'draft' or order_id.state == 'sent') and (order_id.assembly_state == 'created'):
                     order_id.action_confirm()
+                order_id.write(vals)
                 return {'id': order_id.id, 'name': order_id.name}
             else:
                 cq = self.env['res.confirmation_queue'].search([('origin', '=', origin)])
@@ -496,6 +496,10 @@ class SaleOrder(models.Model):
         if dv:
             vals['desired_delivery_date'] = datetime.strptime(dv,'%d.%m.%Y').date()
 
+        dv = vals.get('order_delivery_date',False)
+        if dv:
+            vals['delivery_date'] = datetime.strptime(dv,'%d.%m.%Y').date()
+
         shipping_type = vals.get('shipping_type',False)
         carrier_id = False
         if shipping_type:
@@ -614,19 +618,20 @@ class SaleOrder(models.Model):
     def _get_specified_fields(self):
         return ['origin', 'client_order_ref', 'note', 'date_order', 'assembled', 'line_id', 'partner_id',
                 'fiscal_position_id', 'user_id', 'payment_term_id', 'partner_delivery_id', 'partner_invoice_id', 'shipping_type',
-                'assembly_state', 'confirmation_nr', 'confirm_order', 'order_type', 'internal_notes', 'from_designbox', 'discount', 'hide_discount', 'desired_delivery_date', 'sequence']
+                'assembly_state', 'confirmation_nr', 'confirm_order', 'order_type', 'internal_notes', 'from_designbox', 'discount',
+                'hide_discount', 'desired_delivery_date', 'order_delivery_date', 'sequence']
 
-    @api.model
-    def create(self,vals):
-        order = super(SaleOrder, self).create(vals)
-        current_sequence = 0
-        for order_line in order.order_line:
-            current_sequence += 1
-            order_line.update({'sequence': current_sequence,})
-
-        # order.partner_id.last_order_changed = datetime.now()
-
-        return order
+    # @api.model
+    # def create(self,vals):
+    #     order = super(SaleOrder, self).create(vals)
+    #     current_sequence = 0
+    #     for order_line in order.order_line:
+    #         current_sequence += 1
+    #         order_line.update({'sequence': current_sequence,})
+    #
+    #     # order.partner_id.last_order_changed = datetime.now()
+    #
+    #     return order
 
     @api.multi
     def write(self, vals):
@@ -841,8 +846,12 @@ class SaleOrderLine(models.Model):
     sequence = fields.Integer(string='Sequence', default=9999)
     item_notes = fields.Text(string='Notes', related='lot_id.notes', store=False)
     item_warn = fields.Boolean(string='Notes!!!', compute='_compute_item_warn', store=False)
-    price_change = fields.Boolean(string='R', help='Preis aus Artikelstamm auslesen',default=False, store=False, track_visibility='always')
-    read_price = fields.Boolean(string='R',default=False, store=False, help='Preis aus Artikelstamm auslesen', track_visibility='always')
+
+    # price_change = fields.Boolean(string='R', help='Preis aus Artikelstamm auslesen',default=False, store=False, track_visibility='always')
+    # read_price = fields.Boolean(string='R',default=False, store=False, help='Preis aus Artikelstamm auslesen', track_visibility='always')
+
+    price_change = fields.Boolean(string='R', help='Preis aus Artikelstamm auslesen',default=False, store=False)
+    read_price = fields.Boolean(string='R',default=False, store=False, help='Preis aus Artikelstamm auslesen')
 
     @api.multi
     def _compute_item_warn(self):

ext/custom-addons/dp_custom/views/sale_views.xml

@@ -30,7 +30,7 @@
                 <field name="editor_id" options="{'no_create': True, 'no_open': True}"/>
                 <field name="carrier_id" options="{'no_create': True}" attrs="{'readonly':False}"/>
             </field>
-            <field name="delivery_date" position="before">
+            <field name="validity_date" position="after">
                 <field name="delivery_date_warning" position="before" attrs="{'readonly':True, 'invisible':True}"/>
                 <field name="desired_delivery_date" position="before" class="oe_highlight_blink urgent" attrs="{'readonly':True, 'invisible':['|',('desired_delivery_date','=',False),('delivery_date_warning','=',False)]}"/>
                 <field name="desired_delivery_date" position="before" attrs="{'readonly':True, 'invisible':['|',('desired_delivery_date','=',False),('delivery_date_warning','!=',False)]}"/>

ext/custom-addons/dp_reports_stock/reports/stock.xml

@@ -116,6 +116,9 @@
                                 <th t-if="o.origin">
                                     <strong>Order (Origin)</strong>
                                 </th>
+                                <th t-if="o.shopping_cart_ref">
+                                    <strong>Shopping-Basket:</strong>
+                                </th>
                                 <th name="td_sched_date_h">
                                     <strong>Date</strong>
                                 </th>
@@ -135,6 +138,9 @@
                                 <td t-if="o.origin">
                                     <span t-field="o.origin"/>
                                 </td>
+                                <td t-if="o.shopping_cart_ref">
+                                    <span t-field="o.shopping_cart_ref"/>
+                                </td>
 <!--
                                 <td name="td_sched_date">
                                     <t t-if="o.state == 'done'">

ext/custom-addons/dp_sale_delivery_date/models/sale_order.py

@@ -3,26 +3,25 @@
 
 from odoo import api, fields, models
 
-
 class SaleOrder(models.Model):
     _inherit = 'sale.order'
 
-#    delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date',store=True,index=True, track_visibility='onchange')
-    delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date',index=True)
+    delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date',store=True,index=True, track_visibility='onchange')
+#    delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date')
 
     @api.multi
 #    @api.depends('state','write_date','order_line.delivery_date','order_line.write_date')
-    @api.depends('state')
+#    @api.depends('order_line.delivery_date')
     def _compute_delivery_date(self):
         for order in self:
-            lines = order.order_line.filtered(lambda d: d.delivery_date)
-            lines = lines.sorted(key=lambda d: fields.Date.from_string(d.delivery_date))
-            if lines:
-                order.delivery_date = lines[0].delivery_date
+            if order.has_delivery:
+                lines = order.order_line.filtered(lambda d: d.delivery_date)
+                lines = lines.sorted(key=lambda d: fields.Date.from_string(d.delivery_date))
+                if lines:
+                    order.delivery_date = lines[0].delivery_date
 
     @api.multi
 #    @api.depends('state','write_date','order_line.delivery_date','order_line.write_date')
-    @api.depends('state')
     def _inverse_delivery_date(self):
         for order in self:
             for line in order.order_line:

ext/custom-addons/dp_sale_delivery_date/models/sale_order_line.py

@@ -8,6 +8,7 @@ class SaleOrderLine(models.Model):
     _inherit = 'sale.order.line'
 
     delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date', inverse='_inverse_delivery_date')
+#    delivery_date = fields.Date('Lieferdatum', compute='_compute_delivery_date')
 
     @api.multi
     def _compute_delivery_date(self):