Fall 5399: CR1 - Neues Feld Freigabenr.

dev/scripts/interfaces/sst03_pg_create_quotation.py

@@ -29,6 +29,7 @@ values = {
     "date_order": "2017-11-21",
     "assembled": True,
     "line_id": "0000",
+    'confirmation_nr': 'FR000001',
     "portal_id": "59-0001",
     "portal_delivery_id": "111112",
     "delivery_firstname": "Huber",

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

@@ -50,6 +50,7 @@ class SaleOrder(models.Model):
     positions = fields.Integer(string='Positionen', compute='_compute_positions')
     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('Freigabe-Nr.')
 
     @api.multi
     def _compute_weight_total(self):
@@ -259,7 +260,7 @@ 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',
-                'assembly_state']
+                'assembly_state', 'confirmation_nr']
 
     @api.multi
     def write(self, vals):

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

@@ -39,6 +39,9 @@
                     <field name="origin"/>
                 </group>
             </group>
+            <field name="partner_shipping_id" position="after">
+                <field name="confirmation_nr"/>
+            </field>
         </field>
     </record>
 
@@ -50,6 +53,9 @@
             <field name="partner_id" position="after">
                 <field name="partner_invoice_id"/>
             </field>
+            <field name="name" position="after">
+                <field name="confirmation_nr"/>
+            </field>
         </field>
     </record>
 
@@ -61,6 +67,9 @@
             <field name="partner_id" position="after">
                 <field name="partner_invoice_id"/>
             </field>
+            <field name="name" position="after">
+                <field name="confirmation_nr"/>
+            </field>
             <field name="invoice_status" position="after">
                 <field name="assembly_state"/>
             </field>

ext/custom-addons/dp_reports_account/models/account_invoice.py

@@ -24,4 +24,7 @@ class AccountInvoice(models.Model):
                 for line in category['lines']:
                     price_subtotal += line.price_subtotal
                 category['price_subtotal'] = price_subtotal
+                sale_order = self.env['sale.order'].search([('name', '=', category['name'])])
+                if sale_order:
+                    category['confirmation_nr'] = sale_order.confirmation_nr
         return res

ext/custom-addons/dp_reports_account/reports/invoice.xml

@@ -104,7 +104,7 @@
                                 <tr t-if="layout_category['name'] != 'Uncategorized'">
                                     <td colspan="6">
                                         <strong>
-                                            <t t-esc="layout_category['name']"/> - <t t-esc="o.partner_id.ref"/>
+                                            <t t-esc="layout_category['name']"/> - <t t-esc="o.partner_id.ref"/><t t-if="layout_category['confirmation_nr']"> - <t t-esc="layout_category['confirmation_nr']"/></t>
                                         </strong>
                                     </td>
                                     <td class="text-right" t-if="discount_is_set"/>