Merge branch '6.4' of ssh://gitea.onecluster.org:6666/OneTeam/trytondo-sale_printer into 6.4

This commit is contained in:
sinergia 2023-07-30 14:06:40 -05:00
commit 74368ca1b4
2 changed files with 21 additions and 19 deletions

View File

@ -9,7 +9,11 @@ class Device(Model):
ip_address = fields.Char('IP Address or Network', help='IPv4 or IPv6 IP'
'address or network. Valid values include: 192.168.0.26 or '
'192.168.0.0/24')
class Api(Device, ModelSQL, ModelView):
'Api printer'
__name__ = 'sale.printer_api'
class Printer(Device, ModelSQL, ModelView):
'Printer'
__name__ = 'sale.printer'
@ -20,7 +24,4 @@ class Printer(Device, ModelSQL, ModelView):
shop = fields.Many2One('sale.shop', "Shop")
api = fields.Many2One('sale.printer_api', "API")
class Api(Device, ModelSQL, ModelView):
'Api printer'
__name__ = 'sale.printer_api'

View File

@ -10,21 +10,7 @@
<record model="ir.action.act_window" id="act_configuration_sale_printer_api_form">
<field name="name">APIs</field>
<field name="res_model">sale.printer_api</field>
</record>
<menuitem
name="Printers"
id="menu_sale_printer"
parent="sale.menu_configuration"/>
<menuitem
parent="menu_sale_printer"
action="act_configuration_sale_printer_api_form"
id="menu_configuration_printer_api"
sequence="10"/>
<menuitem
parent="menu_sale_printer"
action="act_configuration_sale_printer_form"
id="menu_configuration_printer"
sequence="20"/>
</record>
<record model="ir.ui.view" id="configuration_api_view_form">
<field name="model">sale.printer_api</field>
<field name="type">form</field>
@ -58,5 +44,20 @@
<field name="act_window" ref="act_configuration_sale_printer_form"/>
</record>
<menuitem
name="Printers"
id="menu_sale_printer"
parent="sale.menu_configuration"/>
<menuitem
parent="menu_sale_printer"
action="act_configuration_sale_printer_api_form"
id="menu_configuration_printer_api"
sequence="10"/>
<menuitem
parent="menu_sale_printer"
action="act_configuration_sale_printer_form"
id="menu_configuration_printer"
sequence="20"/>
</data>
</tryton>