Skip to content

[16.0][MIG] fiscal_epos_print#3060

Merged
OCA-git-bot merged 44 commits into
OCA:16.0from
Borruso:16.0-mig-fiscal_epos_print
Oct 4, 2024
Merged

[16.0][MIG] fiscal_epos_print#3060
OCA-git-bot merged 44 commits into
OCA:16.0from
Borruso:16.0-mig-fiscal_epos_print

Conversation

@Borruso

@Borruso Borruso commented Nov 22, 2022

Copy link
Copy Markdown
Contributor

Migrazione v16

--
Confermo di aver firmato il CLA https://odoo-community.org/page/cla e di aver letto le linee guida su https://odoo-community.org/page/contributing

@stevech091

Copy link
Copy Markdown

@Borruso ma l'E-POS sulla V16 non lo sta facendo Odoo SA ?

@Borruso Borruso force-pushed the 16.0-mig-fiscal_epos_print branch from 160239a to 963c8f6 Compare December 12, 2022 07:46
@tafaRU

tafaRU commented Jan 19, 2023

Copy link
Copy Markdown
Member

/ocabot migration fiscal_epos_print

@OCA-git-bot OCA-git-bot added this to the 16.0 milestone Jan 19, 2023
@OCA-git-bot OCA-git-bot mentioned this pull request Jan 19, 2023
81 tasks
@tafaRU

tafaRU commented Feb 17, 2023

Copy link
Copy Markdown
Member

@Borruso riporto qui quanto deciso nella chiamata di stamattina.
Ripartire dalla versione ora presente sulla 14.0 aggiungendo parti nuove in un commit a parte rispetto a quello della migrazione. Grazie!

@Borruso Borruso force-pushed the 16.0-mig-fiscal_epos_print branch from 963c8f6 to da8e7fe Compare February 22, 2023 16:12
@micheledic

Copy link
Copy Markdown
Contributor

ragazzi ci sono update in merito ?

JSON.stringify(tag_list_names) +
"\n" +
JSON.stringify(add_info);
// TODO is push_orders or push_single_order

@are-agilebg are-agilebg May 24, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK push_single_order è più corretto in quanto esegue il flush soltanto di questo ordine particolare, mentre push_orders può anche essere eseguito passando un singolo ordine ma questo viene aggiunto al localStorage degli ordini locali che poi vengono sincronizzati in toto.

Dai test che abbiamo eseguito è piuttosto importante che venga ripristinata l'istruzione di push a questo punto altrimenti al termine di ogni emissione scontrino sul POS (dalla seconda in avanti, non alla prima) viene visualizzato il popup con conferma "Ordini non sincronizzati residui" che richiede intervento manuale dell'operatore (vedi il blocco finally all'interno di _finalizeValidation() in PaymentScreen.js di point_of_sale)

@Borruso Borruso Oct 5, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aggiornato la PR
@are-agilebg puoi riprovare a fare quel test?

@Borruso Borruso force-pushed the 16.0-mig-fiscal_epos_print branch 7 times, most recently from dc3d939 to 35ac919 Compare October 5, 2023 12:52

@TonyMasciI TonyMasciI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Due note:

  • i commenti che ho lasciato "Eliminare" li ho messi perché dato che esiste la PR mi aspetto che quelle parti non sono servite, e per il caso dei paths dei file nel manifest mi apsetto che vengano eliminati
  • Magari serve sicuramente un'altra persona che controlli la parte JS che diciamo non mi fideri più di tanto di me ;)

Comment thread fiscal_epos_print/models/pos_order.py Outdated
Comment on lines +46 to +59
# def _prepare_done_order_for_pos(self):
# res = super(PosOrder, self)._prepare_done_order_for_pos()
# res["lottery_code"] = self.lottery_code
# res["refund_date"] = self.refund_date
# res["refund_report"] = self.refund_report
# res["refund_doc_num"] = self.refund_doc_num
# res["refund_cash_fiscal_serial"] = self.refund_cash_fiscal_serial
# res["fiscal_receipt_number"] = self.fiscal_receipt_number
# res["fiscal_receipt_amount"] = self.fiscal_receipt_amount
# res["fiscal_receipt_date"] = self.fiscal_receipt_date
# res["fiscal_z_rep_number"] = self.fiscal_z_rep_number
# res["fiscal_printer_serial"] = self.fiscal_printer_serial
# res["fiscal_printer_debug_info"] = self.fiscal_printer_debug_info
# return res

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Se non serve eliminare

Comment on lines +187 to +229
// TODO CONTROLLARE SE SERVE
// compute_all(taxes, price_unit, quantity, currency_rounding, handle_price_include=true) {
// var res = super.compute_all(...arguments);
// var self = this;
//
// var total_excluded = round_pr(price_unit * quantity, currency_rounding);
// var total_included = total_excluded;
// var base = total_excluded;
// var list_taxes = res.taxes;
// Amount_type 'group' not handled (used only for purchases, in Italy)
// _(taxes).each(function(tax) {
// _(taxes).each(function (tax, index) {
// if (!no_map_tax) {
// tax = self._map_tax_fiscal_position(tax);
// }
// if (!tax) {
// return;
// }
// var tax_amount = self._compute_all(tax[0], base, quantity);
// tax_amount = round_pr(tax_amount, currency_rounding);
// if (!tax_amount) {
// // Intervene here: also add taxes with 0 amount
// if (tax[0].price_include) {
// total_excluded -= tax_amount;
// base -= tax_amount;
// } else {
// total_included += tax_amount;
// }
// if (tax[0].include_base_amount) {
// base += tax_amount;
// }
// var data = {
// id: tax[0].id,
// amount: tax_amount,
// name: tax[0].name,
// };
// list_taxes.push(data);
// }
// });
// res.taxes = list_taxes;
//
// return res;
// }

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eliminare

Comment on lines +272 to +281
// Class FiscalEposPrintPosModel extends PosModel {
// constructor(obj, options) {
// super(...arguments);
// var tax_model = _.find(this.models, function (model) {
// return model.model === "account.tax";
// });
// tax_model.fields.push("fpdeptax");
// }
// }
// Registries.Model.add(FiscalEposPrintPosModel);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eliminare

Comment thread fiscal_epos_print/__manifest__.py Outdated
Comment on lines +37 to +39
# TODO is this necessary?
# "fiscal_epos_print/static/src/js/popups.js",
# "fiscal_epos_print/static/src/js/pos_order_mgmt.js",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Elimiare

Comment thread fiscal_epos_print/__manifest__.py Outdated
Comment on lines +62 to +64
# TODO To be converted with new components system
# "fiscal_epos_print/static/src/xml/pos.xml",
# "fiscal_epos_print/static/src/xml/lottery.xml",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eliminare

@Borruso Borruso force-pushed the 16.0-mig-fiscal_epos_print branch from 35ac919 to 134da6d Compare October 5, 2023 16:33
@Borruso

Borruso commented Oct 5, 2023

Copy link
Copy Markdown
Contributor Author

Due note:

  • i commenti che ho lasciato "Eliminare" li ho messi perché dato che esiste la PR mi aspetto che quelle parti non sono servite, e per il caso dei paths dei file nel manifest mi apsetto che vengano eliminati
  • Magari serve sicuramente un'altra persona che controlli la parte JS che diciamo non mi fideri più di tanto di me ;)

fatto

@Borruso Borruso requested a review from TonyMasciI October 5, 2023 16:34
@Borruso Borruso requested a review from are-agilebg October 6, 2023 12:45
@Borruso Borruso force-pushed the 16.0-mig-fiscal_epos_print branch from 134da6d to 73ad49f Compare October 6, 2023 13:01
@matteoopenf

Copy link
Copy Markdown
Contributor

ci sono novita'?

@BitStab

BitStab commented Nov 18, 2023

Copy link
Copy Markdown

Se volete date un'occhiata qui: https://github.com/BitStab/l10n-italy/tree/16.0-mig-fiscal_epos_print/fiscal_epos_print
È una versione già in uso, ma customizzata con operatori fiscali, void (annullamento) e refund (reso parziale) funzionanti. Ho corretto un paio di errori che saltavano ognitanto, quando si chiudeva un operazione.

PR verso repository di Borruso è già aperto.

Borruso added a commit to DinamicheAziendali/l10n-italy that referenced this pull request Jan 3, 2024
@OCA-git-bot

Copy link
Copy Markdown
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@SirAionTech SirAionTech removed the needs fixing Has conflicts or is failing mandatory CI checks label Sep 19, 2024
@sergiocorato

Copy link
Copy Markdown
Contributor

/ocabot merge nobump

@OCA-git-bot

Copy link
Copy Markdown
Contributor

On my way to merge this fine PR!
Prepared branch 16.0-ocabot-merge-pr-3060-by-sergiocorato-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Oct 4, 2024
Signed-off-by sergiocorato
@OCA-git-bot

Copy link
Copy Markdown
Contributor

It looks like something changed on 16.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 16.0-ocabot-merge-pr-3060-by-sergiocorato-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Oct 4, 2024
Signed-off-by sergiocorato
@OCA-git-bot

Copy link
Copy Markdown
Contributor

It looks like something changed on 16.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 16.0-ocabot-merge-pr-3060-by-sergiocorato-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Oct 4, 2024
Signed-off-by sergiocorato
@OCA-git-bot

Copy link
Copy Markdown
Contributor

It looks like something changed on 16.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 16.0-ocabot-merge-pr-3060-by-sergiocorato-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 1c50936 into OCA:16.0 Oct 4, 2024
@OCA-git-bot

Copy link
Copy Markdown
Contributor

Congratulations, your PR was merged at bfae041. Thanks a lot for contributing to OCA. ❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.