Graeme Gellatly cc8e61d558 Merge branch '11.0-refactor-options' into 11.0-printer-tray ...

# Conflicts:
#	base_report_to_printer/models/ir_actions_report.py
#	base_report_to_printer/models/printing_printer.py
#	base_report_to_printer/tests/test_ir_actions_report.py
#	base_report_to_printer/tests/test_printing_printer.py
#	base_report_to_printer/views/printing_report.xml
#	base_report_to_printer/views/res_users.xml

2017-12-06 21:43:35 +13:00

..

__init__.py

[PORT] Finalize move of printer_tray to base_report_to_printer,

2017-12-06 21:35:18 +13:00

test_ir_actions_report.py

[PORT] Finalize move of printer_tray to base_report_to_printer,

2017-12-06 21:35:18 +13:00

test_printing_job.py

[PORT] Finalize move of printer_tray to base_report_to_printer,

2017-12-06 21:35:18 +13:00

test_printing_printer_tray.py

Merge branch '11.0-refactor-options' into 11.0-printer-tray

2017-12-06 21:43:35 +13:00

test_printing_printer_wizard.py

[PORT] Finalize move of printer_tray to base_report_to_printer,

2017-12-06 21:35:18 +13:00

test_printing_printer.py

[PORT] Finalize move of printer_tray to base_report_to_printer,

2017-12-06 21:35:18 +13:00

test_printing_report_xml_action.py

[PORT] Finalize move of printer_tray to base_report_to_printer,

2017-12-06 21:35:18 +13:00

test_printing_server.py

[PORT] Finalize move of printer_tray to base_report_to_printer,

2017-12-06 21:35:18 +13:00

test_printing_tray.py

[PORT] Finalize move of printer_tray to base_report_to_printer,

2017-12-06 21:35:18 +13:00

test_report.py

Merge branch '11.0-refactor-options' into 11.0-printer-tray

2017-12-06 21:43:35 +13:00

test_res_users.py

[PORT] Finalize move of printer_tray to base_report_to_printer,

2017-12-06 21:35:18 +13:00