transfer commit
This commit is contained in:
jopster
parent
70cb009780
commit
f53b6c21e9
|
|
@ -19,6 +19,7 @@
|
||||||
'views/dbtools_state.xml',
|
'views/dbtools_state.xml',
|
||||||
'views/dbtools_branche.xml',
|
'views/dbtools_branche.xml',
|
||||||
'views/dbtools_documents.xml',
|
'views/dbtools_documents.xml',
|
||||||
|
'views/dbtools_rentalhistory.xml',
|
||||||
'views/dbtools_tools.xml',
|
'views/dbtools_tools.xml',
|
||||||
'views/menu.xml',
|
'views/menu.xml',
|
||||||
],
|
],
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -49,6 +49,17 @@ class dbtools_toolsbase(models.Model):
|
||||||
return str('IL')
|
return str('IL')
|
||||||
|
|
||||||
def dorental(self):
|
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
|
return self
|
||||||
|
|
||||||
def finrental(self):
|
def finrental(self):
|
||||||
|
|
@ -129,16 +140,16 @@ class dbtools_toolrentalhistory(models.Model):
|
||||||
|
|
||||||
_name = "dbtools.rentalhistory"
|
_name = "dbtools.rentalhistory"
|
||||||
_description = "ToolManagement Vermietungshistorie"
|
_description = "ToolManagement Vermietungshistorie"
|
||||||
_rec_name = "entryname"
|
_rec_name = "rental_partner"
|
||||||
_inherit = ['mail.thread']
|
_inherit = ['mail.thread']
|
||||||
uuid = fields.Char(default=lambda self: self._default_uuid(), required=True, readonly=True, copy=False, string='UUID')
|
uuid = fields.Char(default=lambda self: self._default_uuid(), required=True, readonly=True, copy=False, string='UUID')
|
||||||
tool = fields.Many2one('dbtools.tools',string='Werkzeug')
|
tool = fields.Many2one('dbtools.tools',string='Werkzeug')
|
||||||
entryname = fields.Char('Entryname', required=True)
|
rental_partner = fields.Many2one('res.partner',string='Leihpartner', required=True)
|
||||||
rental_partner = fields.Char('Leihpartner')
|
|
||||||
rental_start = fields.Datetime('Vermietungsbegin')
|
rental_start = fields.Datetime('Vermietungsbegin')
|
||||||
rental_ende = fields.Datetime('Vermietungsende')
|
rental_ende = fields.Datetime('Vermietungsende')
|
||||||
rental_returndate = fields.Datetime('Rückgabe am')
|
rental_returndate = fields.Datetime('Rückgabe am')
|
||||||
rental_takedate = fields.Datetime('Abholung 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
|
@api.model
|
||||||
def _default_uuid(self):
|
def _default_uuid(self):
|
||||||
|
|
|
||||||
|
|
@ -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_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_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_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
|
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
|
||||||
|
|
|
@ -0,0 +1,94 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<odoo>
|
||||||
|
|
||||||
|
<record id="dbtools_rentalhistory_view_form" model="ir.ui.view">
|
||||||
|
<field name="name">dbtools_rentalhistory_form</field>
|
||||||
|
<field name="model">dbtools.rentalhistory</field>
|
||||||
|
<field eval="2" name="priority"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<form>
|
||||||
|
<sheet>
|
||||||
|
<group>
|
||||||
|
<field name="tool" readonly="1"/>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<field name="rental_partner"/>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<field name="rental_takedate"/>
|
||||||
|
<field name="rental_start"/>
|
||||||
|
<field name="rental_ende"/>
|
||||||
|
<field name="rental_returndate"/>
|
||||||
|
</group>
|
||||||
|
</sheet>
|
||||||
|
</form>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
<record id="dbtools_new_rental_view_form" model="ir.ui.view">
|
||||||
|
<field name="name">dbtools_rentalhistory_form</field>
|
||||||
|
<field name="model">dbtools.rentalhistory</field>
|
||||||
|
<field eval="2" name="priority"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<form>
|
||||||
|
<sheet>
|
||||||
|
<group>
|
||||||
|
<field name="tool" readonly="1"/>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<field name="rental_partner"/>
|
||||||
|
</group>
|
||||||
|
<group>
|
||||||
|
<field name="rental_takedate"/>
|
||||||
|
<field name="rental_start"/>
|
||||||
|
<field name="rental_ende"/>
|
||||||
|
<field name="rental_returndate"/>
|
||||||
|
</group>
|
||||||
|
</sheet>
|
||||||
|
</form>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
<record id="dbtools_rentalhistory_view_tree" model="ir.ui.view">
|
||||||
|
<field name="name">dbtools_rentalhistory_tree</field>
|
||||||
|
<field name="model">dbtools.rentalhistory</field>
|
||||||
|
<field name="priority" eval="16"/>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<tree string="Strukturuebersicht">
|
||||||
|
<field name="rental_partner"/>
|
||||||
|
<field name="rental_takedate"/>
|
||||||
|
<field name="rental_start"/>
|
||||||
|
<field name="rental_ende"/>
|
||||||
|
<field name="rental_returndate"/>
|
||||||
|
</tree>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
<record id="action_dbtools_rentalhistory_view" model="ir.actions.act_window">
|
||||||
|
<field name="name">ToolManagement Vermietung</field>
|
||||||
|
<field name="type">ir.actions.act_window</field>
|
||||||
|
<field name="res_model">dbtools.rentalhistory</field>
|
||||||
|
<field name="view_mode">tree,form</field>
|
||||||
|
<field name="context">{}</field>
|
||||||
|
<field name="help" type="html">
|
||||||
|
<p class="'o_view_nocontent_smiling_face">
|
||||||
|
Neuen Hersteller erstellen
|
||||||
|
</p>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
<record id="action_dbtools_new_rental_view" model="ir.actions.act_window">
|
||||||
|
<field name="name">ToolManagement Vermietung</field>
|
||||||
|
<field name="type">ir.actions.act_window</field>
|
||||||
|
<field name="res_model">dbtools.rentalhistory</field>
|
||||||
|
<field name="view_mode">form</field>
|
||||||
|
<field name="context">{}</field>
|
||||||
|
<field name="help" type="html">
|
||||||
|
<p class="'o_view_nocontent_smiling_face">
|
||||||
|
Neuen Hersteller erstellen
|
||||||
|
</p>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
|
||||||
|
</odoo>
|
||||||
|
|
@ -56,9 +56,24 @@
|
||||||
<group>
|
<group>
|
||||||
<field name="tool_rental_date" readonly="1"/>
|
<field name="tool_rental_date" readonly="1"/>
|
||||||
<field name="tool_rental_partner" readonly="1"/>
|
<field name="tool_rental_partner" readonly="1"/>
|
||||||
|
<field name="tool_rental_takedate" readonly="1"/>
|
||||||
|
<field name="tool_rental_returndate" readonly="1"/>
|
||||||
</group>
|
</group>
|
||||||
</div>
|
</div>
|
||||||
<hr></hr>
|
<hr></hr>
|
||||||
|
<div class='row'>
|
||||||
|
<h1>Mietverlauf</h1>
|
||||||
|
</div>
|
||||||
|
<hr></hr>
|
||||||
|
<field name="tool_rental_history" string="Vermietungshistorie">
|
||||||
|
<tree string="Werkzeugdokumente" editable="False" create="False">
|
||||||
|
<field name="rental_partner" string="Mieter"/>
|
||||||
|
<field name="rental_takedate" string="Abholung"/>
|
||||||
|
<field name="rental_start" string="Mietbegin"/>
|
||||||
|
<field name="rental_returndate" string="Rückgabe"/>
|
||||||
|
<field name="rental_ende" string="Mietende"/>
|
||||||
|
</tree>
|
||||||
|
</field>
|
||||||
</page>
|
</page>
|
||||||
<page name="history" string="Historie">
|
<page name="history" string="Historie">
|
||||||
</page>
|
</page>
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,12 @@
|
||||||
parent="menu_dbtools_config"
|
parent="menu_dbtools_config"
|
||||||
sequence="4"/>
|
sequence="4"/>
|
||||||
|
|
||||||
|
<menuitem
|
||||||
|
id="menu_dbtools_internsetup_error"
|
||||||
|
name="Fehlerbereinigung"
|
||||||
|
parent="menu_dbtools_config"
|
||||||
|
sequence="4"/>
|
||||||
|
|
||||||
<menuitem
|
<menuitem
|
||||||
id="menu_dbtools_tools"
|
id="menu_dbtools_tools"
|
||||||
name="Werkzeuge verwalten"
|
name="Werkzeuge verwalten"
|
||||||
|
|
@ -72,4 +78,13 @@
|
||||||
action="action_dbtools_state_view"
|
action="action_dbtools_state_view"
|
||||||
sequence="30"/>
|
sequence="30"/>
|
||||||
|
|
||||||
|
<menuitem
|
||||||
|
id="menu_dbtools_rentalhistory"
|
||||||
|
name="Vermietungsverlauf anpassen"
|
||||||
|
parent="menu_dbtools_internsetup_error"
|
||||||
|
action="action_dbtools_rentalhistory_view"
|
||||||
|
sequence="30"/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</odoo>
|
</odoo>
|
||||||
Loading…
Reference in New Issue