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 41808aa..f2b7bb9 100644 Binary files a/models/__pycache__/dbtools.cpython-311.pyc and b/models/__pycache__/dbtools.cpython-311.pyc differ 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