mirror of
https://github.com/OCA/report-print-send.git
synced 2025-02-16 07:11:31 +02:00
[PORT] Finalize move of printer_tray to base_report_to_printer,
fix tests as report param is not a string but recordset
This commit is contained in:
@@ -1,24 +1,23 @@
|
||||
<?xml version="1.0"?>
|
||||
<odoo>
|
||||
|
||||
<record model="ir.ui.view" id="act_report_xml_view">
|
||||
<field name="name">ir.actions.report.printing</field>
|
||||
<field name="model">ir.actions.report</field>
|
||||
<field name="inherit_id" ref="base.act_report_xml_view" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//page[@name='security']" position="before" >
|
||||
<page string="Print" name="print" >
|
||||
<group>
|
||||
<field name="property_printing_action_id"/>
|
||||
<field name="printing_printer_id"/>
|
||||
<field name="printer_tray_id"/>
|
||||
</group>
|
||||
|
||||
<separator string="Specific actions per user"/>
|
||||
<field name="printing_action_ids"/>
|
||||
</page>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="act_report_xml_view">
|
||||
<field name="name">ir.actions.report.printing</field>
|
||||
<field name="model">ir.actions.report</field>
|
||||
<field name="inherit_id" ref="base.act_report_xml_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//page[@name='security']" position="before">
|
||||
<page string="Print" name="print">
|
||||
<group>
|
||||
<field name="property_printing_action_id"/>
|
||||
<field name="printing_printer_id"/>
|
||||
<field name="printer_tray_id"/>
|
||||
</group>
|
||||
<separator string="Specific actions per user"/>
|
||||
<field name="printing_action_ids"/>
|
||||
</page>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
|
||||
@@ -7,23 +7,22 @@
|
||||
<field name="arch" type="xml">
|
||||
<form string="Report Printing Actions">
|
||||
<group col="2">
|
||||
<field name="user_id"/>
|
||||
<field name="user_id" options="{'no_create': True}"/>
|
||||
<field name="action"/>
|
||||
<field name="printer_id" select="1"/>
|
||||
<field name="printer_id" options="{'no_create': True}"/>
|
||||
<field name="printer_tray_id"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="printing_report_xml_action_view_tree">
|
||||
<field name="name">printing.report.xml.action.tree</field>
|
||||
<field name="model">printing.report.xml.action</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Report Printing Actions">
|
||||
<field name="user_id"/>
|
||||
<tree string="Report Printing Actions" editable="bottom">
|
||||
<field name="user_id" options="{'no_create': True}"/>
|
||||
<field name="action"/>
|
||||
<field name="printer_id"/>
|
||||
<field name="printer_id" options="{'no_create': True}"/>
|
||||
<field name="printer_tray_id"/>
|
||||
</tree>
|
||||
</field>
|
||||
|
||||
@@ -62,9 +62,9 @@
|
||||
</record>
|
||||
|
||||
<menuitem name="Servers"
|
||||
sequence="10"
|
||||
id="printing_server_menu"
|
||||
parent="printing_menu"
|
||||
action="printing_server_action"/>
|
||||
sequence="10"
|
||||
id="printing_server_menu"
|
||||
parent="printing_menu"
|
||||
action="printing_server_action"/>
|
||||
|
||||
</odoo>
|
||||
|
||||
@@ -1,32 +1,34 @@
|
||||
<?xml version="1.0"?>
|
||||
<odoo>
|
||||
|
||||
<record model="ir.ui.view" id="view_users_form">
|
||||
<field name="name">res.users.form.printing.preferences</field>
|
||||
<field name="model">res.users</field>
|
||||
<field name="inherit_id" ref="base.view_users_form" />
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//group[@name='preferences']/ancestor::page" position="inside">
|
||||
<group string="Printing" name="printing">
|
||||
<field name="printing_action"/>
|
||||
<field name="printing_printer_id"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_users_form">
|
||||
<field name="name">res.users.form.printing.preferences</field>
|
||||
<field name="model">res.users</field>
|
||||
<field name="inherit_id" ref="base.view_users_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//group[@name='preferences']/ancestor::page" position="inside">
|
||||
<group string="Printing" name="printing">
|
||||
<field name="printing_action"/>
|
||||
<field name="printing_printer_id" options="{'no_create': True}"/>
|
||||
<field name="printer_tray_id" options="{'no_create': True}"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_users_form_simple_modif">
|
||||
<field name="name">res.users.form.printing</field>
|
||||
<field name="model">res.users</field>
|
||||
<field name="inherit_id" ref="base.view_users_form_simple_modif" />
|
||||
<field name="arch" type="xml">
|
||||
<footer position="before">
|
||||
<group string="Printing" name="printing">
|
||||
<field name="printing_action"/>
|
||||
<field name="printing_printer_id"/>
|
||||
</group>
|
||||
</footer>
|
||||
</field>
|
||||
</record>
|
||||
<record model="ir.ui.view" id="view_users_form_simple_modif">
|
||||
<field name="name">res.users.form.printing</field>
|
||||
<field name="model">res.users</field>
|
||||
<field name="inherit_id" ref="base.view_users_form_simple_modif"/>
|
||||
<field name="arch" type="xml">
|
||||
<footer position="before">
|
||||
<group string="Printing" name="printing">
|
||||
<field name="printing_action" readonly="0"/>
|
||||
<field name="printing_printer_id" readonly="0" options="{'no_create': True}"/>
|
||||
<field name="printer_tray_id" readonly="0" options="{'no_create': True}"/>
|
||||
</group>
|
||||
</footer>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
|
||||
Reference in New Issue
Block a user