From f53b6c21e9c70f14aed312a6c63208449576d24c Mon Sep 17 00:00:00 2001 From: jopster Date: Mon, 18 Mar 2024 20:41:56 +0100 Subject: [PATCH] transfer commit --- __manifest__.py | 1 + models/__pycache__/dbtools.cpython-311.pyc | Bin 10053 -> 12093 bytes models/dbtools.py | 17 +++- security/ir.model.access.csv | 3 +- views/dbtools_rentalhistory.xml | 94 +++++++++++++++++++++ views/dbtools_tools.xml | 15 ++++ views/menu.xml | 15 ++++ 7 files changed, 141 insertions(+), 4 deletions(-) create mode 100755 views/dbtools_rentalhistory.xml diff --git a/__manifest__.py b/__manifest__.py index 63ed6b7..7147f5f 100755 --- a/__manifest__.py +++ b/__manifest__.py @@ -19,6 +19,7 @@ 'views/dbtools_state.xml', 'views/dbtools_branche.xml', 'views/dbtools_documents.xml', + 'views/dbtools_rentalhistory.xml', 'views/dbtools_tools.xml', 'views/menu.xml', ], diff --git a/models/__pycache__/dbtools.cpython-311.pyc b/models/__pycache__/dbtools.cpython-311.pyc index 41808aa87ef7230b8869735469f210ec2b463aa5..f2b7bb98fda9f08619653c91f0e78137f91a3f23 100644 GIT binary patch delta 3073 zcmbtWX>1cm6yDu932~hGHjYga$GHgPXiErCfs;s7NHhe(kP=~b#k?^tzagq9s)PSe3zFjQ*R{u;FW2-9DS8Y$MHCW`f_nR0HK zJE7C-d=V3!w#6^VO5qZQT1pc+7!Ei9>4>e;^4h#NK zDHIOk{p8f5vuq>TR5Z%2BW9b8{8rS&K11#mEhRS=7kQ4-wNEeynK6wD0AkCs{aKb= zEVOwLM<;L@tHjQ~hS@xr6h(RS&4*YTq{{>yWRY$y9UO$0k>5ROmvFN%6qbT=2!8nq zNk+j5)quodA>t47aFWTU?G!f&vM?eB=$X<1eEOWcEKcyLv+{eTEh0oqp>e;kpO=Mz z*pRR0iSl06Fd>CU`Jtd37Wai!PC{xiKODsTzJQ;X5H?U!4IH-8AGILO2#)F@>-CKT zD`+pYjY5n`n(fn0#r15${M=P@`xSHhg$ku-N1|t^((zK<+@CP_Uo{V3F%RElm{GQm zyTve;o!lJ_rwWo)wTY^gQw39pc!qi4a>r^pb zO#9spOUXTbKkJ*@R@};pssnB%b7U-rBUna4SX6Df_OP%=)U4KAYdRY+q@|i42qMvs z&9skK18fA?1kgo3H7w!QaC1K!&al2@dE-p)NnUAckC%5O$~zRDE9qV~({{35S-vjr z_9fgtMd!TkYM7}z*`h4#yiliXd0BA{#9adk*8uUCwipfhwwp{Amdt%tdW~f_l4iGy zoH89{*J?Q#tj;Ib+$E&f?1*j#8XW+sD=_137-;4#(CY!%3IHz#ZwG)p!#eD*--lh;E z$L-TPFacAdSiU899hX>!1hZxi&TQn%%Ww?n%JQ%P~CWf@t3vNulx@$+=%q<8x~G4b?@ zI3Up)DvyLx#ZeMXYH3EQH|6MXJru*Qx0BQl&P*97z zL}@g=9Mzc$aJa!?${{c)j!3d<%&~|v5+k5ZS z;7!^>e^7{J|E?RVV=pX9T35xok|qziZfGJGJr3SpbF6oopMB-KCS_}{V(*LF`x5rP zSa;IuJ=Qkeu2ip#TiX)WHX3EAI#xH`qIg%tEv*SlYwX3Ovwo)Fr14B?+_@^@T&3vj zNk{Fm;pyOPAns^QI9g+yiLq+A4j82i){n&L{gVAq6NNv$6WLNw8-?$^+#7!qLHGdH zc#LxOKFkAnkG6EVvery522+De%@aalRW}w2$|{FN>?7xE`h1|TY9a3rj*N&{&EKSb z9Kfe_O8+#CISfOs7HXwLdmY+dU8K9#ssEh1;k!BX4;il|jVo9x`VRuVQo}8<-?{G` eBQ15mH=5Y0o6LhSTksJLp!PfWoi)Tzzvh3UO#Gby delta 1450 zcmbu9Ur19?7{Kp0r`6n?^UkiD>C!3gy6GwkinKH<|73~;3VRS__gb26c{fR=*a9U7 zk>n@jLoX7j6oGZ=DS9atf`T69(&(*Tiz1>RI^R{+`Uj#H&Tr?Q@0{=a?)kH)-79T5 z3l@usV^53mi#*5Q$|-=!hZWZ$OM-Kp$fE`wh8qUVEsLuU3~O*$cJ=S2?(|3%&^ zy|2F!0wt1XoC}mnBBNWXWGs`sERj!jXPS(-Pw2syyIR15g6RTI3;8%>ssbNAGkI{? z?8W`&@?1a5^Jxb|oLjT#U1_bFMvj%9d+|O#25eg)CLFy#Y9i_531Z++@ce zyr-*7|L#OlTpTA+!?C5{!g4LM@?}LCcopNKom!6zvO#lyogz}g^U7DVC3wmLi?IIzA@L#JCMG3SO zktv2aYTj(@EJ#2Ihw@+JlH)maGE0X+8Nw-NcteygtcV3@@HRzO0pe z;QJycu9nPhh(=1q*a!_wljOIs@9mVsPlywAUD_tiEQN!^gK{X^+czNp^HA97GOXXR z7}W>^=y$I`j9Dk~t+)i&^!2@0c{z1l^RUUw$0le%n)+6bY=UxZVtps6AK?lssr8)^ zs7Z8a89kAxX6%oILz+R6m0FzebwML0eU5tl3hF0bKTY~Z>7S~n{QbUu+gURhmWBu9 uW6Euo7-+6nSW|_*GGKo(e`7Z5j`<_CfBqG0#qU)~j8_+6T{Vw>f6h+^JTKM& diff --git a/models/dbtools.py b/models/dbtools.py index eb63b7f..856bcc8 100755 --- a/models/dbtools.py +++ b/models/dbtools.py @@ -49,6 +49,17 @@ class dbtools_toolsbase(models.Model): return str('IL') def dorental(self): + action = self.env['ir.actions.act_window'].with_context({'default_tool': self.id})._for_xml_id('ToolManagement.action_dbtools_new_rental_view') + action['display_name'] = self.tool_short_name +# action['domain'] = '[["projectid","=","4"]]' +# context = action['context'].replace('', str(self.id)) +# context = ast.literal_eval(context) +# context.update({ +# 'create': self.active, +# 'active_test': self.active +# }) +# action['context'] = context + return action return self def finrental(self): @@ -129,16 +140,16 @@ class dbtools_toolrentalhistory(models.Model): _name = "dbtools.rentalhistory" _description = "ToolManagement Vermietungshistorie" - _rec_name = "entryname" + _rec_name = "rental_partner" _inherit = ['mail.thread'] uuid = fields.Char(default=lambda self: self._default_uuid(), required=True, readonly=True, copy=False, string='UUID') tool = fields.Many2one('dbtools.tools',string='Werkzeug') - entryname = fields.Char('Entryname', required=True) - rental_partner = fields.Char('Leihpartner') + rental_partner = fields.Many2one('res.partner',string='Leihpartner', required=True) rental_start = fields.Datetime('Vermietungsbegin') rental_ende = fields.Datetime('Vermietungsende') rental_returndate = fields.Datetime('Rückgabe am') rental_takedate = fields.Datetime('Abholung am') + rental_rentalstate = fields.Selection([('REN','Vermietung'),('RES','Reserviert'),('VER','Verkauf'),('SON','Sonstiges')],string='Status der Buchung') @api.model def _default_uuid(self): diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv index 6bd690d..d38a6e9 100755 --- a/security/ir.model.access.csv +++ b/security/ir.model.access.csv @@ -5,4 +5,5 @@ toolmanagement_dbtools_classes_group_user,access.dbtools.classes,model_dbtools_c toolmanagement_dbtools_category_group_user,access.dbtools.category,model_dbtools_category,base.group_user,1,1,1,1 toolmanagement_dbtools_branche_group_user,access.dbtools.branche,model_dbtools_branche,base.group_user,1,1,1,1 toolmanagement_dbtools_documents_group_user,access.dbtools.documents,model_dbtools_documents,base.group_user,1,1,1,1 -toolmanagement_dbtools_state_group_user,access.dbtools.state,model_dbtools_state,base.group_user,1,1,1,1 \ No newline at end of file +toolmanagement_dbtools_state_group_user,access.dbtools.state,model_dbtools_state,base.group_user,1,1,1,1 +toolmanagement_dbtools_rentalhistory_group_user,access.dbtools.rentalhistory,model_dbtools_rentalhistory,base.group_user,1,1,1,1 \ No newline at end of file diff --git a/views/dbtools_rentalhistory.xml b/views/dbtools_rentalhistory.xml new file mode 100755 index 0000000..191e8e4 --- /dev/null +++ b/views/dbtools_rentalhistory.xml @@ -0,0 +1,94 @@ + + + + + dbtools_rentalhistory_form + dbtools.rentalhistory + + +
+ + + + + + + + + + + + + + +
+ + + + + dbtools_rentalhistory_form + dbtools.rentalhistory + + +
+ + + + + + + + + + + + + + +
+ + + + + dbtools_rentalhistory_tree + dbtools.rentalhistory + + + + + + + + + + + + + + ToolManagement Vermietung + ir.actions.act_window + dbtools.rentalhistory + tree,form + {} + +

+ Neuen Hersteller erstellen +

+ + + + + ToolManagement Vermietung + ir.actions.act_window + dbtools.rentalhistory + form + {} + +

+ Neuen Hersteller erstellen +

+ + + + + diff --git a/views/dbtools_tools.xml b/views/dbtools_tools.xml index 0bab064..e604772 100755 --- a/views/dbtools_tools.xml +++ b/views/dbtools_tools.xml @@ -56,9 +56,24 @@ + +
+
+

Mietverlauf

+
+
+ + + + + + + + + diff --git a/views/menu.xml b/views/menu.xml index 41f97cf..98979f3 100755 --- a/views/menu.xml +++ b/views/menu.xml @@ -30,6 +30,12 @@ parent="menu_dbtools_config" sequence="4"/> + + + + + + \ No newline at end of file