Merge pull request #2192 from expsa/manar_purchase_dev_22_1

UPDATE purchase_custom_stock

odex25_purchase/purchase_custom_stock/__manifest__.py

@@ -12,6 +12,8 @@
         'data/purchase_request.xml',
         'views/purchase_request.xml',
         'views/stock_warehouse.xml',
+        'views/stock_picking_view.xml',
+        'views/report_deliveryslip.xml',
         'wizards/picking_purchase_request.xml'
 
     ],

odex25_purchase/purchase_custom_stock/models/__init__.py

@@ -1,3 +1,4 @@
 
 from . import purchase_request
-from . import stock_warehouse
+from . import stock_warehouse
+from . import stock_picking

odex25_purchase/purchase_custom_stock/models/stock_picking.py

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+from odoo.exceptions import UserError, ValidationError
+from odoo import api, fields, models, _
+
+
+class StockPicking(models.Model):
+    _inherit = "stock.picking"
+
+    user_changed_to_done = fields.Many2one('res.users', string="User Who Changed to Done")
+
+    def write(self, vals):
+        res = super(StockPicking, self).write(vals)
+        if self.state == 'done' and not self.user_changed_to_done:
+            self.user_changed_to_done = self.env.user.id
+
+        return res
+

odex25_purchase/purchase_custom_stock/views/report_deliveryslip.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <template id="report_delivery_document_user_changed_to_done" inherit_id="stock.report_delivery_document">
+        <xpath expr="//div[@name='signature']" position="before">
+
+            <div name="user_changed_to_done" dir="rtl" style="float:right;">
+                <t t-if="o.picking_type_code == 'incoming'">
+                    <strong>مستلم بواسطة:</strong>
+                    <strong t-esc="o.user_changed_to_done.name"/>
+                </t>
+                <t t-if="o.picking_type_code == 'outgoing'">
+                    <strong>سلم بواسطة:</strong>
+                    <strong t-esc="o.user_changed_to_done.name"/>
+                </t>
+            </div>
+        </xpath>
+    </template>
+</odoo>

odex25_purchase/purchase_custom_stock/views/stock_picking_view.xml

@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="purchase_custom_stock_view_picking_form_inherit_view" model="ir.ui.view">
+        <field name="name">stock.picking.form.inherit</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="user_changed_to_done"  invisible="1"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>