From af85e168354eb54f3674497ead3e2f2a45cdaf0d Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Tue, 19 Dec 2023 23:13:36 +0100 Subject: [PATCH] [ADD] pos_multi_order_payment --- pos_multi_order_payment/README.rst | 81 ++++ pos_multi_order_payment/__init__.py | 1 + pos_multi_order_payment/__manifest__.py | 24 + pos_multi_order_payment/models/__init__.py | 1 + pos_multi_order_payment/models/pos_order.py | 44 ++ pos_multi_order_payment/pyproject.toml | 3 + .../readme/CONTRIBUTORS.md | 1 + pos_multi_order_payment/readme/DESCRIPTION.md | 3 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 425 ++++++++++++++++++ .../static/src/app/models.esm.js | 44 ++ .../payment_screen/payment_screen.esm.js | 118 +++++ .../screens/payment_screen/payment_screen.xml | 45 ++ .../receipt_screen/receipt_screen.esm.js | 32 ++ .../screens/receipt_screen/receipt_screen.xml | 47 ++ 15 files changed, 869 insertions(+) create mode 100644 pos_multi_order_payment/README.rst create mode 100644 pos_multi_order_payment/__init__.py create mode 100644 pos_multi_order_payment/__manifest__.py create mode 100644 pos_multi_order_payment/models/__init__.py create mode 100644 pos_multi_order_payment/models/pos_order.py create mode 100644 pos_multi_order_payment/pyproject.toml create mode 100644 pos_multi_order_payment/readme/CONTRIBUTORS.md create mode 100644 pos_multi_order_payment/readme/DESCRIPTION.md create mode 100644 pos_multi_order_payment/static/description/icon.png create mode 100644 pos_multi_order_payment/static/description/index.html create mode 100644 pos_multi_order_payment/static/src/app/models.esm.js create mode 100644 pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.esm.js create mode 100644 pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.xml create mode 100644 pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.esm.js create mode 100644 pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.xml diff --git a/pos_multi_order_payment/README.rst b/pos_multi_order_payment/README.rst new file mode 100644 index 0000000000..e6ed14fe68 --- /dev/null +++ b/pos_multi_order_payment/README.rst @@ -0,0 +1,81 @@ +======================= +Pos Multi Order Payment +======================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:0e30fc91c5776d9617abac03340249fc7e94642fd2781e3a0611ffd0e0c8b3d6 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github + :target: https://github.com/OCA/pos/tree/17.0/pos_multi_order_payment + :alt: OCA/pos +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/pos-17-0/pos-17-0-pos_multi_order_payment + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/pos&target_branch=17.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module will allow you to pay several open point of sale orders at +the same time. + +The principal order will return the other orders amount and the other +orders will be payed with this amount. + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +------- + +* Dixmit +* INVITU + +Contributors +------------ + +- Enric Tobella + +Maintainers +----------- + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/pos `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/pos_multi_order_payment/__init__.py b/pos_multi_order_payment/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/pos_multi_order_payment/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/pos_multi_order_payment/__manifest__.py b/pos_multi_order_payment/__manifest__.py new file mode 100644 index 0000000000..c7559ac3cc --- /dev/null +++ b/pos_multi_order_payment/__manifest__.py @@ -0,0 +1,24 @@ +# Copyright 2023 Dixmit +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Pos Multi Order Payment", + "summary": """ + Allow to pay multiple orders with the same payment""", + "version": "17.0.1.0.0", + "license": "AGPL-3", + "author": "Dixmit,INVITU,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/pos", + "depends": ["point_of_sale"], + "assets": { + "point_of_sale._assets_pos": [ + "pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.esm.js", + "pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.xml", + "pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.esm.js", + "pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.xml", + "pos_multi_order_payment/static/src/app/models.esm.js", + ], + }, + "data": [], + "demo": [], +} diff --git a/pos_multi_order_payment/models/__init__.py b/pos_multi_order_payment/models/__init__.py new file mode 100644 index 0000000000..e9ab911ddc --- /dev/null +++ b/pos_multi_order_payment/models/__init__.py @@ -0,0 +1 @@ +from . import pos_order diff --git a/pos_multi_order_payment/models/pos_order.py b/pos_multi_order_payment/models/pos_order.py new file mode 100644 index 0000000000..7a1f24e0ff --- /dev/null +++ b/pos_multi_order_payment/models/pos_order.py @@ -0,0 +1,44 @@ +# Copyright 2023 Dixmit +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import _, fields, models +from odoo.exceptions import UserError +from odoo.tools import float_is_zero + + +class PosOrder(models.Model): + _inherit = "pos.order" + + payment_order_id = fields.Many2one("pos.order", readonly=True) + + def _export_for_ui(self, order): + result = super()._export_for_ui(order) + result["payment_order_id"] = order.payment_order_id.id + return result + + def _process_payment_lines(self, pos_order, order, pos_session, draft): + super()._process_payment_lines(pos_order, order, pos_session, draft) + prec_acc = order.currency_id.decimal_places + if ( + not draft + and float_is_zero(order.amount_paid, prec_acc) + and pos_order.get("payment_order_id") + ): + order.write({"payment_order_id": pos_order["payment_order_id"]}) + cash_payment_method = pos_session.payment_method_ids.filtered( + "is_cash_count" + )[:1] + if not cash_payment_method: + raise UserError( + _( + "No cash statement found for this session. Unable to record a multiple order payment." + ) + ) + return_payment_vals = { + "name": _("Multi order payment"), + "pos_order_id": order.id, + "amount": order.amount_total, + "payment_date": fields.Datetime.now(), + "payment_method_id": cash_payment_method.id, + } + order.add_payment(return_payment_vals) diff --git a/pos_multi_order_payment/pyproject.toml b/pos_multi_order_payment/pyproject.toml new file mode 100644 index 0000000000..4231d0cccb --- /dev/null +++ b/pos_multi_order_payment/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/pos_multi_order_payment/readme/CONTRIBUTORS.md b/pos_multi_order_payment/readme/CONTRIBUTORS.md new file mode 100644 index 0000000000..6295fedfb3 --- /dev/null +++ b/pos_multi_order_payment/readme/CONTRIBUTORS.md @@ -0,0 +1 @@ + - Enric Tobella diff --git a/pos_multi_order_payment/readme/DESCRIPTION.md b/pos_multi_order_payment/readme/DESCRIPTION.md new file mode 100644 index 0000000000..c72121e887 --- /dev/null +++ b/pos_multi_order_payment/readme/DESCRIPTION.md @@ -0,0 +1,3 @@ +This module will allow you to pay several open point of sale orders at the same time. + +The principal order will return the other orders amount and the other orders will be payed with this amount. diff --git a/pos_multi_order_payment/static/description/icon.png b/pos_multi_order_payment/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/pos_multi_order_payment/static/description/index.html b/pos_multi_order_payment/static/description/index.html new file mode 100644 index 0000000000..c2341b7c22 --- /dev/null +++ b/pos_multi_order_payment/static/description/index.html @@ -0,0 +1,425 @@ + + + + + + +Pos Multi Order Payment + + + +
+

Pos Multi Order Payment

+ + +

Beta License: AGPL-3 OCA/pos Translate me on Weblate Try me on Runboat

+

This module will allow you to pay several open point of sale orders at +the same time.

+

The principal order will return the other orders amount and the other +orders will be payed with this amount.

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Dixmit
    • +
  • INVITU
    • +
+
+
+

Contributors

+
    +
  • Enric Tobella
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/pos project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/pos_multi_order_payment/static/src/app/models.esm.js b/pos_multi_order_payment/static/src/app/models.esm.js new file mode 100644 index 0000000000..e088316f75 --- /dev/null +++ b/pos_multi_order_payment/static/src/app/models.esm.js @@ -0,0 +1,44 @@ +/** @odoo-module **/ + +import {Order, Payment} from "@point_of_sale/app/store/models"; + +import {patch} from "@web/core/utils/patch"; + +patch(Order.prototype, { + setup() { + this.payment_order_id = false; + super.setup(...arguments); + }, + init_from_JSON(json) { + super.init_from_JSON(...arguments); + this.payment_order_id = json.payment_order_id; + }, + export_as_JSON() { + const json = super.export_as_JSON(...arguments); + if (this.payment_order_id) { + json.payment_order_id = this.payment_order_id.server_id; + } + return json; + }, + add_paymentline_amount(payment_method, due) { + this.assert_editable(); + if (this.electronic_payment_in_progress()) { + return false; + } + var newPaymentline = new Payment( + {env: this.env}, + {order: this, payment_method: payment_method, pos: this.pos} + ); + this.paymentlines.add(newPaymentline); + this.select_paymentline(newPaymentline); + if (this.pos.config.cash_rounding) { + this.selected_paymentline.set_amount(0); + } + newPaymentline.set_amount(due); + + if (payment_method.payment_terminal) { + newPaymentline.set_payment_status("pending"); + } + return newPaymentline; + }, +}); diff --git a/pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.esm.js b/pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.esm.js new file mode 100644 index 0000000000..2f44607b31 --- /dev/null +++ b/pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.esm.js @@ -0,0 +1,118 @@ +/** @odoo-module **/ + +import {ErrorPopup} from "@point_of_sale/app/errors/popups/error_popup"; +import {PaymentScreen} from "@point_of_sale/app/screens/payment_screen/payment_screen"; +import {PaymentScreenStatus} from "@point_of_sale/app/screens/payment_screen/payment_status/payment_status"; +import {_t} from "@web/core/l10n/translation"; +import {patch} from "@web/core/utils/patch"; +import {roundPrecision as round_pr} from "@web/core/utils/numbers"; +import {usePos} from "@point_of_sale/app/store/pos_hook"; +import {useState} from "@odoo/owl"; + +patch(PaymentScreenStatus.prototype, { + setup() { + super.setup(); + this.pos = usePos(); + }, + get totalDueText() { + var change = + this.props.order.get_total_with_tax() + + this.props.order.get_rounding_applied(); + for (const order of Object.values(this.props.selectedExtraOrders)) { + change = change + order.get_total_with_tax() + order.get_rounding_applied(); + } + return this.env.utils.formatCurrency(change); + }, + get remainingText() { + var due = this.props.order.get_due(); + for (const order of Object.values(this.props.selectedExtraOrders)) { + due += order.get_due(); + } + return this.env.utils.formatCurrency(due > 0 ? due : 0); + }, + get changeText() { + var change = this.props.order.get_change(); + for (const order of Object.values(this.props.selectedExtraOrders)) { + change = + change + + order.get_total_paid() - + order.get_total_with_tax() - + order.get_rounding_applied(); + } + return this.env.utils.formatCurrency( + round_pr(Math.max(0, change), this.pos.currency.rounding) + ); + }, +}); + +patch(PaymentScreen.prototype, { + setup() { + super.setup(...arguments); + this.selectedExtraOrders = useState({orders: {}}); + }, + appendOrder(order) { + var orders = this.selectedExtraOrders.orders; + if (this.selectedExtraOrders.orders[order.cid] === undefined) { + orders[order.cid] = order; + } else { + delete orders[order.cid]; + } + this.selectedExtraOrders.orders = {...orders}; + }, + addNewPaymentLine(paymentMethod) { + if (Object.keys(this.selectedExtraOrders.orders).length === 0) { + return super.addNewPaymentLine(...arguments); + } + var due = this.currentOrder.get_due(); + for (const order of Object.values(this.selectedExtraOrders.orders)) { + due += order.get_due(); + } + const result = this.currentOrder.add_paymentline_amount(paymentMethod, due); + if (result) { + this.numberBuffer.reset(); + return true; + } + this.popup.add(ErrorPopup, { + title: _t("Error"), + body: _t("There is already an electronic payment in progress."), + }); + return false; + }, + async _finalizeValidation() { + await super._finalizeValidation(...arguments); + for (const order_key in this.selectedExtraOrders.orders) { + const order = this.selectedExtraOrders.orders[order_key]; + if (!order.finalized) { + /* + This should only happen on offline mode + */ + order.finalized = true; + order.payment_order_id = this.currentOrder; + } + } + }, + async afterOrderValidation() { + await super.afterOrderValidation(...arguments); + for (const order_key in this.selectedExtraOrders.orders) { + /* + We need to set all the selected extra orders as payed. + */ + const order = this.selectedExtraOrders.orders[order_key]; + order.finalized = true; + order.date_order = luxon.DateTime.now(); + order.payment_order_id = this.currentOrder; + var syncOrderResult = await this.pos.push_single_order(order); + if ( + syncOrderResult && + syncOrderResult.length > 0 && + order.wait_for_push_order() + ) { + await this._postPushOrderResolve( + order, + syncOrderResult.map((res) => res.id) + ); + } + this.pos.db.remove_unpaid_order(order); + } + }, +}); diff --git a/pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.xml b/pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.xml new file mode 100644 index 0000000000..7f3f66cf04 --- /dev/null +++ b/pos_multi_order_payment/static/src/app/screens/payment_screen/payment_screen.xml @@ -0,0 +1,45 @@ + + + + + + selectedExtraOrders.orders + + + selectedExtraOrders.orders + + + + + +
+

Append orders

+ + +
+
+ + + +
+
+ + +
+ + + + diff --git a/pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.esm.js b/pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.esm.js new file mode 100644 index 0000000000..845715a19b --- /dev/null +++ b/pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.esm.js @@ -0,0 +1,32 @@ +/** @odoo-module **/ + +import {ReceiptScreen} from "@point_of_sale/app/screens/receipt_screen/receipt_screen"; +import {patch} from "@web/core/utils/patch"; + +patch(ReceiptScreen.prototype, { + get printOtherOrders() { + return ( + this.pos.orders.filter((order) => { + return order.finalized && order.cid !== this.currentOrder.cid; + }).length > 0 + ); + }, + isResumeVisible() { + return super.isResumeVisible() && !this.printOtherOrders; + }, + printNextOrder() { + this.pos.removeOrder(this.currentOrder); + this.pos.set_order( + this.pos.orders.find((order) => { + return order.finalized && order.cid !== this.currentOrder.cid; + }) + ); + // As we are reusing the same view, we need to do this stuff... + this.currentOrder = this.pos.get_order(); + const partner = this.currentOrder.get_partner(); + this.orderUiState = this.currentOrder.uiState.ReceiptScreen; + this.orderUiState.inputEmail = + this.orderUiState.inputEmail || (partner && partner.email) || ""; + this.pos.showScreen("ReceiptScreen"); + }, +}); diff --git a/pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.xml b/pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.xml new file mode 100644 index 0000000000..439f9ee178 --- /dev/null +++ b/pos_multi_order_payment/static/src/app/screens/receipt_screen/receipt_screen.xml @@ -0,0 +1,47 @@ + + + + + + + + + !printOtherOrders + + +
+ Print next +
+ + + !printOtherOrders + + + +