From 881a76dbcf47c877feb5efa14943010309d22eaf Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sun, 6 Oct 2013 13:26:08 +0200
Subject: [PATCH] [IMP] Technical menu reorg, remove depreacted requests. Moved
 low levels object to database structure. Removed res.request models bu keep
 res.request.link, res.request.link is used to flag models worth to be linked
 by references fields. Moved currency and state to the approriate directory.

bzr revid: al@openerp.com-20131006112608-3qucrevmkf43kq20
---
 openerp/addons/base/__openerp__.py            |   6 +-
 openerp/addons/base/base_menu.xml             |   1 -
 .../addons/base/data/administration-hover.png | Bin 2119 -> 0 bytes
 openerp/addons/base/data/administration.png   | Bin 1252 -> 0 bytes
 openerp/addons/base/data/sales-hover.png      | Bin 2324 -> 0 bytes
 openerp/addons/base/data/sales.png            | Bin 1234 -> 0 bytes
 openerp/addons/base/ir/ir_attachment_view.xml |   2 +-
 .../base/{data => res}/res.country.state.csv  |   0
 .../res_currency_data.xml}                    |   0
 openerp/addons/base/res/res_partner_demo.xml  |   8 --
 openerp/addons/base/res/res_request.py        |  76 ------------------
 openerp/addons/base/res/res_request_view.xml  |   5 +-
 .../addons/base/security/ir.model.access.csv  |   4 -
 13 files changed, 6 insertions(+), 96 deletions(-)
 delete mode 100644 openerp/addons/base/data/administration-hover.png
 delete mode 100644 openerp/addons/base/data/administration.png
 delete mode 100644 openerp/addons/base/data/sales-hover.png
 delete mode 100644 openerp/addons/base/data/sales.png
 rename openerp/addons/base/{data => res}/res.country.state.csv (100%)
 rename openerp/addons/base/{currency_data.xml => res/res_currency_data.xml} (100%)

diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index f2df88506f5..fd2d514791b 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -35,21 +35,21 @@ The kernel of OpenERP, needed for all installation.
     'depends': [],
     'data': [
         'base_data.xml',
-        'currency_data.xml',
+        'res/res_currency_data.xml',
         'res/res_country_data.xml',
         'security/base_security.xml',
         'base_menu.xml',
         'res/res_security.xml',
         'res/res_config.xml',
-        'data/res.country.state.csv',
+        'res/res.country.state.csv',
         'ir/wizard/wizard_menu_view.xml',
         'ir/ir_actions.xml',
-        'ir/ir_attachment_view.xml',
         'ir/ir_config_parameter_view.xml',
         'ir/ir_cron_view.xml',
         'ir/ir_filters.xml',
         'ir/ir_mail_server_view.xml',
         'ir/ir_model_view.xml',
+        'ir/ir_attachment_view.xml',
         'ir/ir_rule_view.xml',
         'ir/ir_sequence_view.xml',
         'ir/ir_translation_view.xml',
diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml
index 2e6a6d3a27f..19f1e8465e2 100644
--- a/openerp/addons/base/base_menu.xml
+++ b/openerp/addons/base/base_menu.xml
@@ -27,7 +27,6 @@
                 <menuitem id="menu_email" name="Email" parent="menu_custom" sequence="1"/>
                 <menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
                 <menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" sequence="24"/>
-                <menuitem id="next_id_4" name="Low Level Objects" parent="menu_custom" sequence="30"/>
 
         <record id="action_client_base_menu" model="ir.actions.client">
             <field name="name">Open Settings Menu</field>
diff --git a/openerp/addons/base/data/administration-hover.png b/openerp/addons/base/data/administration-hover.png
deleted file mode 100644
index 5d10833d2e45ea8d9017861fe3c38e03a1cdb5ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2119
zcmV-N2)Or&P)<h;3K|Lk000e1NJLTq003kF003kN0{{R3M?7U_00009a7bBm000XU
z000XU0RWnu7ytkQZBR^9MgRZ*J_-p<W@=r3hhT<`W_^BVl9_2E3~6(2X@iAsZf<aX
zcX5AvdRsz!qNjX{iG4E{euH;_dTxPDI*UabjjXMXV^5WsikDO>n!doG!o{XjAE#d`
zsZ$iGTNSEA2C7{etj5W%OAoG+YOhrhvQ87Sva+*L5wxtOwO$pqY&W(|3ARufxX#YF
z)6=<xRk_dAx_L{xR1>^a8@yf-y<`}_wy(fk8^c^3!-`VGRu;ry6U1v2#aI@_S`Efw
zAjV`I$Z8(RUmM9{AIW4N%3&JHW*N$K8OvrN%witRWgpFIBF)Xs&R!DEXdlmO9nWti
z&|wwOa3RrbBhhgt(R&)v<>b<IC)0l()Ndoya3<AuDb=~E)^sM;c_-F-E7pS{*LEh?
zcOlnzC)jx>*ncb8crV#{DA{`}*?cJ3gfH2KA=!;J+I%S5f-Bp6D%*T6+kPn9ek$94
zE8BlC+leyVek$C5F5HVI-GD3If-K#GEZu`I-i9vTh%erzP~V9!-;FWgiZS4hGT@Uo
z;KHrph%e!fGvSXl;*mAtlP%(tHsayo<BKxmi#6kxGvk&x<Ci((m^I^>I^&!><c%}r
zjy2?%Jmi}^<eWI<oIK>Iapd*%<(xj{o;>BAKINZ2=AJ_4pg-oLLFcYd=gqk2rbXze
zMd-X}=-ScgpEv2JOX;XZ>8VHQtVik5z3Qn?>aI!ZzK!dwPwTHs>$Onpx`FH2$?ULA
z?6OPjvrO%&OYN^y?X^wq?d|TYOzyZ=@6D(1zF6?Zj_}#S@wiLz<k#{1{PMIw^0r6w
z^Yiq}bNB7!`ts}h`}zV=wyOXD00DGTPE!Ct=GbNc00nbNL_t(&-tCx8j~q!6hM&mH
zs_LGe_RRQey=!~zy|I7**+N1-&IO4(`~>cZf4~`u3kZ-9AaQ{cw_S+?0)aRn?eMW!
z_y7mQ&Vm_#Oiy=pRb^#naHw`qujN5gqvclbq19QHk#9!C8_}VL0RsjM7%*VKfB^&g
zK+eDQ=ihjq)(f-uod^F1lAnG3qkE^{-aoIYJvYf;4ogY#1^n~6{PV{i*Mlp?_1~W^
zzj>v&er{WL=ArZQBf)tu@_O^m>3Y2I?@Z?#J0{b6y-7a!$>&GJ7cq@D|5SPZuYa#!
z-%vk3xHemF*_!?1i+w#gD1Z9p%T&Zw+P0s(yX$u^U0!c!t}gQ*eUBO-g5`~!-~IY5
zU(Qh1dq4cbo?F`0H5F+dy-nEKP|Do#*Uw^!Hj+Tpzw!Qq`@KBT=_ejH6GTBkk?k)j
zt0YAWHE&sNA2aG4QK)w(huSwMIA3q-{3xT%I@cp))OAKiY%@h6U{CUS-^9<WXQLpg
z%~~Kc3F?;IL$(fZEh^A-!mv><AYn)zVgLwAO28a&2r7~U!K`v>$&)mc{Yhe_DN#D`
z+Coy$&>5H)4GhRJc_#5f#aO1$G}>sJ5RwV&VEC6bX$+E^%x;nD-ky}R#%oYWpr8nA
zBH4()h{0Qv)!gmvNv$)DDQ&9ym0wX!J`WOHs$yS~ST~}2j^^iq7*&eu<fMPNs?jS>
z>}Vy&gE~6hY6^z1sCtL%WEoz%Z|;@WBPt4#nMAa0TR@ZHbB}-4U&4#=DS=XW>foc+
z7;wSaz$HOFC0HL>iiY|E5^hHADm{QNsH-O01_F-U=BB<f^MTa84><AtE51CsK}??9
zljC!?CUYN3zY`!5)9#&$D*4lE#KpYnOVR|ASqN0Hgb>Ef?)d%L<JCcLolLHlT4`4@
zq6o~-6r(xQlV)b7&RJDWDfz`wNx{?VR-R?qbowa5@lruWM50U5wEfkk)e?^(vbyS%
z5fg~teF%K&;n!#npE!Ve1cahYO>==R-1q_|xK*pt=f}Hh<F^2Q@rcETs%7poZ+uti
zc6p;WiL`qaF3@o}fOJ%$k5G^&P#2PuYYwiv#dX`4#C-MppAnMS(|(lIxZMvQ8h~_V
z+q!yPNmw$9zb~a9$-Unm|7InOv<iorl&(NmtWOKdw3=lM2}9B!-|rc&BZ^gO*lQ+I
zj7LR#cwAvJfR^I+PP1s*Iy4R0s&SkCi7x=MVmrH9y*3$FNJ)Df_d4e4=FT0)RLj}C
zsjE5w)U&=M%j|BsQ%L@rGXUOVc5Xc@v+kgD`PwamN2XIq;mFr<F_Qig-oF2IC)@lD
zH0I`PvDc-<?Y}ur5G)C@@fdB(tB1WwwkW2V%Qvc1luz$`uqc7atvfqwtplDYwxBo3
zlF@SPCPFv6C0df^w_o=PNMQw&8NdlZTG)#IBp^=4ojf6H$h2ugNTNpbK=he|ZlW|`
z$6hW#vPJEkmm)$-YDwD0Hfd5K(L|#~OWrt}DG`Khc_B|URMFO=w2;tNgNY<X6iXx;
z2@dGe=7W|OA(=&z7$6Cxq-a0|5(ESZHi$7)f+Hl2;UXkSL$t}DDhc%{(BcSyv8y4n
zFenCy>MlaUGfXm&pd$BO??`}YyG9~d7C_#zMQbk6e@vzJNwb;&5Lampn<f@;!HpI+
zUy1_D3wZJ$u-$y!9lkN0%7$$Y5k_qDZeNlSoRlN}=f4RJ5I02sc5hD>v%81w>GBoB
zv|WE>Eu$N0@yWg<*W{0%d+^Vf9)`1RZa@CR?we;ek5@nb<-rfeHGQz{i?7_<@8!w<
x!LR<-i-UQ(y?>7Z0|pEjFkrxd0Ruh`{1?h5tE%|~;HLlp002ovPDHLkV1g)CBk%wK

diff --git a/openerp/addons/base/data/administration.png b/openerp/addons/base/data/administration.png
deleted file mode 100644
index ba4e403ff33c19d3c8c553453a692905a535a827..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1252
zcmV<A1RMK_P)<h;3K|Lk000e1NJLTq003kF003kN0{{R3M?7U_00009a7bBm000XU
z000XU0RWnu7ytkOs8CE)MgRZ*BO@a|K0Z=XQdwD9UteEgVPRxsWM^k*Yinz6Zf<aJ
zaC38Wc6N4qdwYC*e13j@fPjF4f`W#IhKY%Zi;IhljEs$qjgXL#l9G~>larU1mzbEC
zo12@Rot>YbpP-<iqN1Xtq@<;#rKzc@tE;Q5tgNrEuduMNva+(ZwY9mqxxT)>z`(%9
z#>UOf&C}D<+S=OU;o<4&>Fw?9@9*#P^Yi=r`WJoAD*ylh0d!JMQvg8b*k%9#1Jy}H
zK~!ko?O08(+e8#S=h}{wyp~piif-8;Au0r@sQ-V-3f64-5<&v;9_`DA?>#KWV>{&K
zDPzjcM^>UqX6DTOzGGm)f&~i}ELgB$!GaQ0*H8U&C#y2*=b!!hKOE<)O>=_n>#LX6
zSI@lL!&>FhUcP((g1l*L^UXN?y0M%8F3Fo+$H~y{T-(DdCQ&GF-|k*nj1$zf-xia+
z`*~X{Ylmv?f!*I-{+HDOx^0f=Sz*5a_@X4d@cS3Pe9%HrKZpKD{ciK2#s$Cm8qWv{
z5CFsd?&bG|Brl#e5FkQ?z=$<E4YMiM+GRBeqR`&{Sg5Z0$sPs>AR(%@U_F|EGGQ$d
zO0qDlI+of*`2hq9@?LdG8X*J_0ur+r-W8L$n-HT`lR2_v5Cz$EMU=a6q*WTV-hcB{
z+`+CkBTh6bOasM3enS8TA}&w594CSlgTlmrZ7~&y0U9rJJR->vlhZNI9pgkC0V<Y6
z5z|$AEHwoPQ4z(4kKk3wPdOUH%O&x!3p=K8Ipfg`b?Kqqg+8<BoIbi4HsLt|5Phgv
z3d)=X(ux@*liid5$a_W+UeO?E8t3ICh+{J<MF1@j*@4U|qY`a4&m6<+EEueLcW_Um
zO?N}NMzeEXoTzIo<&^*cnL)?RCwoy1epu;5J!D)ClSjH07tE)Q&=}CH*Fl*Fbnujx
z*%$qo<HDin^^g>=Fz|RV0db`EC!S77WGM;N1gOjb0uc^)2w+Fa01O+mFE(X0{?nhf
z(-faFzDHj+B&&$==p?{<yDOCB=6H8fT411}#=h@}j?Pf3mdw*W|E|;~tooG1I?QNh
zvG2Nilm0zc>slTPMK%UImV1{;FtTFfbwz<L1)mcD_kY&)ihv?q;R+FCdBj`ml^M-|
zRdUp-?HqR$z^-ansj^!Gxa8^@FOL)3c9osF$Eu6&EkLN=u5I-1nv$ZqpAn3#Ec;Ua
zWm_LQ31GXiscVXiIo%3C(0J18$yTcn02-M)m0W>i-X(}k+bBgeB}sj7NVGno40C6Y
z5C|JuIw^njoG>RjBrndq&MB;eY0@j?&KOE9CfNr&5E9G#E+`Z!A1U8K2D<d5-aCbS
zXihH-2$9Y_*?E#biO4C1XHD|;hWFgYE70E#HC4ZzjKCSaFcc=Av=wK)*HB8V=bA&}
zKIVEo;C(}_NspnpO(l4Ad(g8VKCtTY%7}>ep!0TH7b+fC;Z{mgwYN{7_?2%Q2-SZ3
zY*pOVzx@5LqSqp}{iyh2+N@tlyp|yhWZf)p_7*HyuwcQ01q&9uAN&IZR3T!09?22_
O0000<MNUMnLSTY4M^-cd

diff --git a/openerp/addons/base/data/sales-hover.png b/openerp/addons/base/data/sales-hover.png
deleted file mode 100644
index 01249ee3dfdbf93d2ffb86bfc9892811e490654c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2324
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

diff --git a/openerp/addons/base/data/sales.png b/openerp/addons/base/data/sales.png
deleted file mode 100644
index 0025e04b932212c142efa74036b74acd73a3c2b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1234
zcmV;@1TFiCP)<h;3K|Lk000e1NJLTq003kF003kN0{{R3M?7U_0001}P)t-s|Ns9)
zL_|kNM@&piR8&(~SXW+NU1MWoZEbCGacy~cc!!6FlarH}n3$oVp`xOqqobpxrKP5(
zrl_c>tE;Q5tgNoCuCTDMv$M0cw6nFfwYRsoxVX5wy1Kl)yuH1>z`(%5!otPH#m2_Q
z$;rve%F4{l%+Jry(9qG+($dw{)!5kB-QC>b;o;@w<>~3^?d|RH@$&Ze_WAku`TF|%
z`~3X;`u+X=XW3oX00001bW%=J06^y0W&i*K*hxe|RCwC$m|1h8OcaJuljyk6G$0s}
zxPTa0WEma)|38~^x_ju(d{=4ts^)^H@Rq0Evr(lnFfcGMFfcGM@bA&KO<mVjT|e6Y
z$?&VLiag8GG`(K4yr}vYwLi-|OPS#Fa!HaTiZ6Nnt5-*J%K)i}<2X7UPifVk;sGgy
z;u96;I0D7-c-SAZrmq-<P+$yHfCCkW{r)3}%3d5b#sGzgfr^uGgkczb6g@a9St)d&
z1tmfeY&Y-O^Nv)+xBv+&77qfB9Vj-w?>}p)r9$*WsTFs4o|iw@b1}9ehT3urf-$_c
z>-x86W;YkjP^M}+8jZLjfE*q;9NP|`SeR0bEj-;+%|L=J7qxO7a9C#CY8NXN3$8YU
zNrVD|Kn`jV)6pK}LQ#lj?3S+}d7I9cT;aM7CB!t%!%xj1{Dz$6{)O}L=ns>nzXpW^
zwL)yo3A^zO=WfOQmyv?U6qJGlIo`EKD`jPpV;jDzj@N)I2vZQ#E4B6z%LJeTugHGE
z%d{}bayA*y(P421fwquTt6CA3>BK9An=wVlI4`m^ubTCiO%;cr<)l%sHs=}Sy=5Jl
zet5X!?&W|E0YP@Ph9qSf<PF(QSd!&h^jj)8eyK6Q31(mlvEb7Yv&>Asf6~Em3yr?V
zDBvmhg0DuL@!P_bF*@w*`=_OfPykPNL#}d!C-c7@7NP0m`;sGO;MbOaHvCLkl$WJR
z6a_%9cMS<<2$@3Mscp4T&dQ3A9wb<%?&HU9h+7oP?zBvmAc(C|uKI)-M5XW)+Bj2Q
z)<i#qWhEVmlYhVQk2Ai%Q*>iX_GL6-l7&<tUZJs!SD$rTD$v0-CY$7is-SeEb0KpN
zGOT$sZ0pN{uXwpEbO<Qf*BX+_#|-j@kj3Q3$|UIEqwGrsp5x@MA-Nw|26;o~xE^n_
z+1r>;mnxyu$qgM+oF}Vm2APgj#*w8!tzD%hsXQnGU<$@x96_imC`}$(lJ-nY3HC%f
zW?3W^fVH`4IWUT%Aa>qF%lQ=YOzfiE$`A}_yC$E~fzW+g)-TZgi?6l=AVF#9(uC~P
z!cT${r5EV1shhQiHl=5hFIb8MM^A8Wj3+2;Q&j-(p7-7*5gcmcDKaV*j3`MWH3poV
zuri(`vlWAEhIG)dG@d43|3`uC?i`28=z&{c!kdX2qf-z!u8m%(V^>jh*zgOo#^{N*
zI5-5~ulB;W=q4#!qd%Jb<Wr(_!lLdjx!sL^xtHl_=erI>a9r<wpX3$4yM24AvcUfi
w(!3~Z8KQsM$Nm0jje&uIfq{X6fq{RK-$CuUvof|r`2YX_07*qoM6N<$g8VdXr~m)}

diff --git a/openerp/addons/base/ir/ir_attachment_view.xml b/openerp/addons/base/ir/ir_attachment_view.xml
index 7b224f71b61..02ccfe73a25 100644
--- a/openerp/addons/base/ir/ir_attachment_view.xml
+++ b/openerp/addons/base/ir/ir_attachment_view.xml
@@ -89,7 +89,7 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_attachment_search"/>
         </record>
-        <menuitem action="action_attachment" id="menu_action_attachment" parent="base.next_id_4"/>
+        <menuitem action="action_attachment" id="menu_action_attachment" parent="base.next_id_9"/>
 
     </data>
 </openerp>
diff --git a/openerp/addons/base/data/res.country.state.csv b/openerp/addons/base/res/res.country.state.csv
similarity index 100%
rename from openerp/addons/base/data/res.country.state.csv
rename to openerp/addons/base/res/res.country.state.csv
diff --git a/openerp/addons/base/currency_data.xml b/openerp/addons/base/res/res_currency_data.xml
similarity index 100%
rename from openerp/addons/base/currency_data.xml
rename to openerp/addons/base/res/res_currency_data.xml
diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index a8f0aa4eec7..3f5d50efa27 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -410,15 +410,7 @@
             <field name="website">vauxoo.com</field>
             <field name="image">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</field>
         </record>
-        <!--
-        Resource: res.request
-        -->
 
-        <record id="res_partner_asustek_request" model="res.request">
-            <field name="name">ASUSTEK-Subject</field>
-            <field name="act_to" ref="user_demo"/>
-            <field name="ref_doc1" ref="res_partner_1"/>
-        </record>
     </data>
 </openerp>
 
diff --git a/openerp/addons/base/res/res_request.py b/openerp/addons/base/res/res_request.py
index e91ebacbe2a..5a01f146d97 100644
--- a/openerp/addons/base/res/res_request.py
+++ b/openerp/addons/base/res/res_request.py
@@ -29,64 +29,6 @@ def _links_get(self, cr, uid, context=None):
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
     return [(r['object'], r['name']) for r in res]
 
-class res_request(osv.osv):
-    _name = 'res.request'
-
-    def request_send(self, cr, uid, ids, *args):
-        for id in ids:
-            cr.execute('update res_request set state=%s,date_sent=%s where id=%s', ('waiting', time.strftime('%Y-%m-%d %H:%M:%S'), id))
-            cr.execute('select act_from,act_to,body,date_sent from res_request where id=%s', (id,))
-            values = cr.dictfetchone()
-            if values['body'] and (len(values['body']) > 128):
-                values['name'] = values['body'][:125] + '...'
-            else:
-                values['name'] = values['body'] or '/'
-            values['req_id'] = id
-            self.pool.get('res.request.history').create(cr, uid, values)
-        return True
-
-    def request_reply(self, cr, uid, ids, *args):
-        for id in ids:
-            cr.execute("update res_request set state='active', act_from=%s, act_to=act_from, trigger_date=NULL, body='' where id=%s", (uid,id))
-        return True
-
-    def request_close(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state':'closed'})
-        return True
-
-    def request_get(self, cr, uid):
-        cr.execute('select id from res_request where act_to=%s and (trigger_date<=%s or trigger_date is null) and active=True and state != %s', (uid,time.strftime('%Y-%m-%d'), 'closed'))
-        ids = map(lambda x:x[0], cr.fetchall())
-        cr.execute('select id from res_request where act_from=%s and (act_to<>%s) and (trigger_date<=%s or trigger_date is null) and active=True and state != %s', (uid,uid,time.strftime('%Y-%m-%d'), 'closed'))
-        ids2 = map(lambda x:x[0], cr.fetchall())
-        return ids, ids2
-
-    _columns = {
-        'create_date': fields.datetime('Created Date', readonly=True),
-        'name': fields.char('Subject', states={'waiting':[('readonly',True)],'active':[('readonly',True)],'closed':[('readonly',True)]}, required=True, size=128),
-        'active': fields.boolean('Active'),
-        'priority': fields.selection([('0','Low'),('1','Normal'),('2','High')], 'Priority', states={'waiting':[('readonly',True)],'closed':[('readonly',True)]}, required=True),
-        'act_from': fields.many2one('res.users', 'From', required=True, readonly=True, states={'closed':[('readonly',True)]}, select=1),
-        'act_to': fields.many2one('res.users', 'To', required=True, states={'waiting':[('readonly',True)],'closed':[('readonly',True)]}, select=1),
-        'body': fields.text('Request', states={'waiting':[('readonly',True)],'closed':[('readonly',True)]}),
-        'date_sent': fields.datetime('Date', readonly=True),
-        'trigger_date': fields.datetime('Trigger Date', states={'waiting':[('readonly',True)],'closed':[('readonly',True)]}, select=1),
-        'ref_partner_id':fields.many2one('res.partner', 'Partner Ref.', states={'closed':[('readonly',True)]}),
-        'ref_doc1':fields.reference('Document Ref 1', selection=_links_get, size=128, states={'closed':[('readonly',True)]}),
-        'ref_doc2':fields.reference('Document Ref 2', selection=_links_get, size=128, states={'closed':[('readonly',True)]}),
-        'state': fields.selection([('draft','draft'),('waiting','waiting'),('active','active'),('closed','closed')], 'Status', required=True, readonly=True),
-        'history': fields.one2many('res.request.history','req_id', 'History')
-    }
-    _defaults = {
-        'act_from': lambda obj,cr,uid,context=None: uid,
-        'state': 'draft',
-        'active': True,
-        'priority': '1',
-    }
-    _order = 'priority desc, trigger_date, create_date desc'
-    _table = 'res_request'
-res_request()
-
 class res_request_link(osv.osv):
     _name = 'res.request.link'
     _columns = {
@@ -98,25 +40,7 @@ class res_request_link(osv.osv):
         'priority': 5,
     }
     _order = 'priority'
-res_request_link()
 
-class res_request_history(osv.osv):
-    _name = 'res.request.history'
-    _columns = {
-        'name': fields.char('Summary', size=128, states={'active':[('readonly',True)],'waiting':[('readonly',True)]}, required=True),
-        'req_id': fields.many2one('res.request', 'Request', required=True, ondelete='cascade', select=True),
-        'act_from': fields.many2one('res.users', 'From', required=True, readonly=True),
-        'act_to': fields.many2one('res.users', 'To', required=True, states={'waiting':[('readonly',True)]}),
-        'body': fields.text('Body', states={'waiting':[('readonly',True)]}),
-        'date_sent': fields.datetime('Date sent', states={'waiting':[('readonly',True)]}, required=True)
-    }
-    _defaults = {
-        'name': 'NoName',
-        'act_from': lambda obj,cr,uid,context=None: uid,
-        'act_to': lambda obj,cr,uid,context=None: uid,
-        'date_sent': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-    }
-res_request_history()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/res/res_request_view.xml b/openerp/addons/base/res/res_request_view.xml
index 7ad47a53c2e..03713f79926 100644
--- a/openerp/addons/base/res/res_request_view.xml
+++ b/openerp/addons/base/res/res_request_view.xml
@@ -35,16 +35,15 @@
                 </search>
             </field>
         </record>
-
         <record id="res_request_link-act" model="ir.actions.act_window">
-            <field name="name">Request Reference Types</field>
+            <field name="name">Referencable Models</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.request.link</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="res_request_link_search_view"/>
         </record>
-        <menuitem action="res_request_link-act" id="menu_res_request_link_act" parent="base.next_id_4" />
+        <menuitem action="res_request_link-act" id="menu_res_request_link_act" parent="base.next_id_9"/>
 
     </data>
 </openerp>
diff --git a/openerp/addons/base/security/ir.model.access.csv b/openerp/addons/base/security/ir.model.access.csv
index 9783d37874f..1efd28b9afa 100644
--- a/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@ -69,10 +69,6 @@
 "access_res_partner_category_group_partner_manager","res_partner_category group_partner_manager","model_res_partner_category","group_partner_manager",1,1,1,1
 "access_res_partner_title_group_user","res_partner_title group_user","model_res_partner_title","group_partner_manager",1,1,1,1
 "access_res_partner_title_group_partner_manager","res_partner_title group_partner_manager","model_res_partner_title",,1,0,0,0
-"access_res_request_group_user","res_request group_user","model_res_request","base.group_user",1,1,1,1
-"access_res_request_history_group_user","res_request_history group_user","model_res_request_history","base.group_user",1,1,1,1
-"access_res_request_group_user_all","res_request group_user all","model_res_request",,1,0,0,0
-"access_res_request_history_group_user_all","res_request_history group_user all","model_res_request_history",,1,0,0,0
 "access_res_request_link_group_system","res_request_link group_system","model_res_request_link","group_system",1,1,1,1
 "access_res_request_link_group_user","res_request_link group_user","model_res_request_link",,1,0,0,0
 "access_res_users_all","res_users all","model_res_users",,1,0,0,0