From 2020f159ab56841fe1af1dc9726eba7002ce20cc Mon Sep 17 00:00:00 2001
From: Daniel Mendieta <damendieta@gmail.com>
Date: Thu, 12 Oct 2017 20:48:21 -0500
Subject: [PATCH] [IMP] Improve v9 with changes made to v10 branch

---
 README.md             |   5 +++++
 __init__.pyc          | Bin 225 -> 0 bytes
 __openerp__.py        |   7 +++++--
 security/security.xml |  20 ++++++++------------
 stock.py              |  12 +++++++++---
 stock.pyc             | Bin 2041 -> 0 bytes
 stock_view.xml        |  15 +++++++++++++++
 users_view.xml        |  42 ++++++++++++++----------------------------
 8 files changed, 56 insertions(+), 45 deletions(-)
 delete mode 100644 __init__.pyc
 delete mode 100644 stock.pyc
 create mode 100644 stock_view.xml

diff --git a/README.md b/README.md
index 7bb0dcb..6de8333 100644
--- a/README.md
+++ b/README.md
@@ -19,3 +19,8 @@ For Support :
 * Website : www.techspawn.com
 * Facebook : www.facebook.com/techspawnsolutions/ 
 * Twitter : www.twitter.com/techspawn/
+
+Contributors:
+=============
+
+* F?brica de Software Libre: www.fslibre.com
\ No newline at end of file
diff --git a/__init__.pyc b/__init__.pyc
deleted file mode 100644
index b067e0a42d5bd9552aef7d512c3acabc43185015..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 225
zcmY+8y$ZrG5XUbqf(ULtL<TjhgNTE(gDxUMC`q89O|Rrq#0T*0d>dcDOX=cq_xp3)
zXZc+&KJWF-z+?sMk%LwY%Pyb=2m<Z`ge~AIOD=f9kQr&lpoFG5%RHMn;F2N#K@ZMV
zjln6Zf{*Its7cr>w1~Tr$_%_IY$|K9BQ?phimt|ioF32U=qN>RlFvO_`_3n=xBV;4
Q`M^G)9a?wDuTXyA2XjI+R{#J2

diff --git a/__openerp__.py b/__openerp__.py
index cf255e6..dc3e4d2 100644
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -37,8 +37,11 @@
     'depends': ['base', 'stock'],
 
     'data': [
-
         'users_view.xml',
-        'security/security.xml', 
+        'stock_view.xml',
+        'security/security.xml',
     ],
+    'installable': True,
+    'application': False,
+    'auto_install': False,
 }
\ No newline at end of file
diff --git a/security/security.xml b/security/security.xml
index 375e68e..92432cd 100644
--- a/security/security.xml
+++ b/security/security.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="filter_user_stock_picking_type_allowed" model="ir.rule">
-            <field name="name">Filter Stock Picking Type Allowed</field>
-            <field name="model_id" search="[('model','=','stock.picking.type')]" model="ir.model"/>
-            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
-            <field name="domain_force">[('id','in', [ p.id for p in user.default_picking_type_ids ])]</field>
-        </record>
-
-    </data>
-</openerp>
\ No newline at end of file
+<odoo>
+    <record id="filter_user_stock_picking_type_allowed" model="ir.rule">
+        <field name="name">Filter Stock Picking Type Allowed</field>
+        <field name="model_id" search="[('model','=','stock.picking.type')]" model="ir.model"/>
+        <field name="groups" eval="[(4, ref('base.group_user'))]"/>
+        <field name="domain_force">['|', ('allowed_user_ids','=', False), ('id','in', [ p.id for p in user.default_picking_type_ids ])]</field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/stock.py b/stock.py
index a0fd0e7..4cbc284 100644
--- a/stock.py
+++ b/stock.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-
 from openerp import models, fields, api, _
 from openerp.exceptions import Warning
 
+
 class ResUsers(models.Model):
     _inherit = 'res.users'
 
@@ -20,6 +20,14 @@ class ResUsers(models.Model):
         'user_id', 'picking_type_id', string='Default Warehouse Operations')
 
 
+class StockPickingType(models.Model):
+    _inherit = 'stock.picking.type'
+
+    allowed_user_ids = fields.Many2many(
+        'res.users', 'stock_picking_type_users_rel',
+        'picking_type_id', 'user_id', string='Allowed users', )
+
+
 class stock_move(models.Model):
     _inherit = 'stock.move'
 
@@ -38,5 +46,3 @@ def check_user_location_rights(self):
                 raise Warning(message % self.location_id.name)
             elif self.location_dest_id not in user_locations:
                 raise Warning(message % self.location_dest_id.name)
-
-
diff --git a/stock.pyc b/stock.pyc
deleted file mode 100644
index e439a4770e15cc5dfef2d3e742388fd4b0bdfd64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2041
zcmcgt&yU+g6n^6*PLoo$1zIRV!dj`w7ZM4n5(k7z=>>@v<mK1qVp*O^;>7kC&tz$&
z?WN(utq1;7{s8#iOXBUqnI`L(nfIP&zVH3o-e0%Ii$5OzlGEYS!|x+JZV93Br>G>V
z6wMS>0nGxcdNk`%)u&mX6ng|z4yX!g7GmEcqi8jxxgy=C--&ia=d&B62d^2z&M+c9
zq_g-2E-U`VC+=hALx{?1Q#x7B3sY+68Cup9Ug0;5S^6Qw&skd+^}_QRiE%$V)4Glh
zJ3PkYeu6N>EC3lSOpjK5X14=1V8b?KDj)#dK&wOA4QMtznueso0wzEnlfFs2z5=i0
zEPjj6A3?OnO*VYJyMrCD__oM>^sUV^U)b8c&5qvY>q&V~`A?uaZc=CRO<VYFDo$yq
zmotScuhK&Mo3FoCXm^7B8J~Q0nR}<Ztts*~A~f;a#`uqp>hz#aS)IxqX=_T)XI(Sl
zK28X;sTYple`4m@rt}d)Z<ZFXM&C82-II(t5|WHGt+UFcsUJg=rby_f<Si#EE$XEK
z*Q871V{1#3)t+G^kP^Bs1kUrRPqTXaSp^|Z{|XYK;6H$q-ebGY4#pTZx)Saj+v(C)
zX6mx4Xs1t%TYK9~t+w`ak<)yGJE~7Jt&zOx;pev_=R=l`SUJH{!8B>M$pEKI(C+a<
zg~3S>s@~x{!a7tEmOY8eUYM?A`Bf>|hgkf#WVupNov33e)}7QV_u0ObL#{|Z!g191
zc=&iPI-hxyaQyvkh_1ji;*GM(IT_q#{Ctha{RweNw30cn4yb*X(0*sE3TP!Q^g@Zp
zemkJ{6}K<20ndv-OhdX<v>qa>To;!|<!VIt;Pg__udl>!eDuQ+o!^+Q`PD#zQjZzo
zGvTD$Z0;Qp(Kq!)Ru;Nzfk||3H&LF|we?Zc+T1u7`DNiE4oKvRIycc4F4{)ylH1z1
zwuFm`j-iQ8AGp&=^gT)wRn8t6IvOvv(O0@EYSd}wZ99p%Ba^!jo+sE3?Z(KwGWCTh
zxV;iC?SuoLFnq~F!rtP+y^?UX2scqVQ_ejP4Qcx$Bqx)g0-0=K-c&*R4*?@zntUyj
zqHD~wEf!1f*y`Scpx%k<s}p>CYJ~NDtYRL*2~Wx777J#S1P~G-TN~*F#Fm4JkR~6)
zc1289|8u)C^!M>N?pbcvP(6#efh5+pF|}!%1bdQ!CFmuIGKmiMiFuxzMkf6}t=w`?
f`QMm~gM=@6qqJnwezBjsUvkL_y;F5NxPRv#si^sh

diff --git a/stock_view.xml b/stock_view.xml
new file mode 100644
index 0000000..b393e2d
--- /dev/null
+++ b/stock_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_picking_type_form" model="ir.ui.view">
+        <field name="name">Picking type allowed users form view</field>
+        <field name="model">stock.picking.type</field>
+        <field name="inherit_id" ref="stock.view_picking_type_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//sheet" position="inside">
+                <group string="Allowed users" groups="stock.group_stock_manager">
+                    <field name="allowed_user_ids" widget="many2many_tags"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/users_view.xml b/users_view.xml
index c882c69..db85f12 100644
--- a/users_view.xml
+++ b/users_view.xml
@@ -1,31 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_users_form" model="ir.ui.view">
-            <field name="name">usability.default_warehouse.res.users.form</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <group string="Menus Customization" position="inside">
+<odoo>
+    <record id="view_users_form" model="ir.ui.view">
+        <field name="name">usability.default_warehouse.res.users.form</field>
+        <field name="model">res.users</field>
+        <field name="inherit_id" ref="base.view_users_form"/>
+        <field name="arch" type="xml">
+            <group name="preferences" position="after">
+                <group string="Warehouse Restrictions">
                     <field name="default_picking_type_ids" widget="many2many_tags" attrs="{'invisible': [('login','=', 'admin')]}"/>
+                    <field name="restrict_locations" attrs="{'invisible': [('login','=', 'admin')]}"/>
+                    <field name="stock_location_ids" widget="many2many_tags" attrs="{'invisible': [('restrict_locations','!=', True)]}"/>
                 </group>
-            </field>
-        </record>
-
-        <record id="view_location_security_users_form" model="ir.ui.view">
-            <field name="name">location_security.users.form</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                    <group string="Menus Customization" position="inside">
-                        <field name="restrict_locations" attrs="{'invisible': [('login','=', 'admin')]}"/>
-                    </group>
-                    <page string="Preferences" position="after">
-                        <page string="Allowed Stock Locations" attrs="{'invisible': [('restrict_locations','!=', True)]}">
-                            <field name="stock_location_ids" nolabel="1" colspan="2"/>
-                        </page>
-                    </page>
-            </field>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file
+            </group>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file