Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[14.0][MIG] l10n_it_fatturapa_out_triple_discount #3269

Conversation

odooNextev
Copy link
Contributor

No description provided.

SimoRubi and others added 30 commits April 11, 2023 19:08
it fixes:
 - removes xs:dateTime if bogus and not mandatory
   i.e. 0001-01-01T00:00:00.000+02:00 where python raises
   OverflowError
 - removes timezone from xs:date to make pyxb able to compare with
   1-1-1970, it also removes the need of patching pyxb
 - removes space only strings if not mandatory, else replace with
   a dash

breaking change:
  modules needs to import binding.fatturapa instead of
  bindings.fatturapa_v_1_2, this would be asl useful for
  new specs
…e now rounded to the nearest even result instead of away from zero".

See https://docs.python.org/3/whatsnew/3.0.html#builtins

Examples:

>>> '%.2f' % 75.845
'75.84'
>>> '%.2f' % 75.855
'75.86'
>>> round(2.5)
2
>>> round(3.5)
4
…scount: modifica del type di Importo in ScontoMaggiorazioneType (OCA#1875)

* [IMP] l10n_it_fatturapa_out: change precision_rounding of ScontoMaggiorazioneType according to e-invoicing specs 1.6

* [IMP] l10n_it_fatturapa_out_triple_discount: change precision_rounding of ScontoMaggiorazioneType according to e-invoicing specs 1.6
it fixes:
 - removes xs:dateTime if bogus and not mandatory
   i.e. 0001-01-01T00:00:00.000+02:00 where python raises
   OverflowError
 - removes timezone from xs:date to make pyxb able to compare with
   1-1-1970, it also removes the need of patching pyxb
 - removes space only strings if not mandatory, else replace with
   a dash

breaking change:
  modules needs to import binding.fatturapa instead of
  bindings.fatturapa_v_1_2, this would be asl useful for
  new specs
@odooNextev odooNextev force-pushed the 14.0-mig-l10n_it_fatturapa_out_triple_discount branch from 54464d5 to b954f21 Compare April 12, 2023 12:39
@francesco-ooops
Copy link
Contributor

@odooNextev vi è chiaro come procedere su questa?

@odooNextev
Copy link
Contributor Author

@odooNextev vi è chiaro come procedere su questa?

Dobbiamo prima risolvere la issue in fatturapa_in #3274

@odooNextev
Copy link
Contributor Author

Nel modulo l10n_it_fatturapa_in https://github.com/OCA/l10n-italy/blob/14.0/l10n_it_fatturapa_in/models/account.py#L321 processando le righe negative salta il controllo che il movimento sia "quadrato". Questo è corretto oppure va rivisto?

@odooNextev odooNextev changed the title 14.0 mig l10n it fatturapa out triple discount [14.0][MIG] l10n_it_fatturapa_out_triple_discount Aug 2, 2023
@sergiocorato
Copy link
Contributor

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

@sergiocorato The rebase process failed, because command git rebase origin/14.0 failed with output:

First, rewinding head to replay your work on top of it...
Applying: [ADD] l10n_it_fatturapa_out_triple_discount
Applying: [UPD] Update l10n_it_fatturapa_out_triple_discount.pot
Applying: FIX l10n_it_fatturapa_out_triple_discount adapt to new set_sequences API and to new file names
Applying: [ADD] icon.png
Applying: l10n_it_fatturapa: xml doctor for fatturapa
Applying: [UPD] README.rst
Applying: [MIG] 10n_it_fatturapa_out_triple_discount: Migration to 12.0
Applying: [UPD] Update l10n_it_fatturapa_out_triple_discount.pot
Applying: [UPD] README.rst
Applying: Use float_round from odoo because in python 3 "Exact halfway cases are now rounded to the nearest even result instead of away from zero".
Applying: l10n_it_fatturapa_out_triple_discount 12.0.1.0.1
Applying: l10n_it_fatturapa_out_triple_discount: disable tests because unstable
Applying: l10n_it_fatturapa_out_triple_discount 12.0.1.0.2
Applying: merge PR 1264 1717 1728 1737 1739
Applying: FIX license LGPL-3 conflicts
Applying: l10n_it_fatturapa_out_triple_discount 12.0.1.0.4
Applying: [12.0][IMP] l10n_it_fatturapa_out and l10n_it_fatturapa_out_triple_discount: modifica del type di Importo in ScontoMaggiorazioneType (#1875)
Applying: l10n_it_fatturapa_out_triple_discount 12.0.2.0.0
Applying: [FIX][l10n_it_fatturapa_out_triple_discount] change rounding to avoid discard
Applying: l10n_it_fatturapa_out_triple_discount 12.0.2.0.1
Applying: [REF] l10n_it_fatturapa_out: Extract discounted price computation
Applying: [MIG] l10n_it_fatturapa_out_triple_discount: Migration to 14.0
Applying: [IMP]Add sale_triple_discount on manifest
Using index info to reconstruct a base tree...
M	l10n_it_fatturapa_out_sp/README.rst
M	l10n_it_fatturapa_out_sp/static/description/index.html
Falling back to patching base and 3-way merge...
Removing setup/l10n_it_fatturapa_out_sp/setup.py
Removing setup/l10n_it_fatturapa_out_sp/odoo/addons/l10n_it_fatturapa_out_sp
Removing l10n_it_fatturapa_out_sp/wizard/wizard_export_fatturapa.py
Removing l10n_it_fatturapa_out_sp/wizard/__init__.py
Removing l10n_it_fatturapa_out_sp/tests/test_fatturapa_xml_validation.py
Removing l10n_it_fatturapa_out_sp/tests/fatturapa_common.py
Removing l10n_it_fatturapa_out_sp/tests/data/IT06363391001_00004.xml
Removing l10n_it_fatturapa_out_sp/tests/__init__.py
CONFLICT (modify/delete): l10n_it_fatturapa_out_sp/static/description/index.html deleted in [IMP]Add sale_triple_discount on manifest and modified in HEAD. Version HEAD of l10n_it_fatturapa_out_sp/static/description/index.html left in tree.
Removing l10n_it_fatturapa_out_sp/static/description/icon.png
Removing l10n_it_fatturapa_out_sp/readme/DESCRIPTION.rst
Removing l10n_it_fatturapa_out_sp/readme/CONTRIBUTORS.rst
Removing l10n_it_fatturapa_out_sp/i18n/l10n_it_fatturapa_out_sp.pot
Removing l10n_it_fatturapa_out_sp/i18n/it.po
Removing l10n_it_fatturapa_out_sp/__manifest__.py
Removing l10n_it_fatturapa_out_sp/__init__.py
CONFLICT (modify/delete): l10n_it_fatturapa_out_sp/README.rst deleted in [IMP]Add sale_triple_discount on manifest and modified in HEAD. Version HEAD of l10n_it_fatturapa_out_sp/README.rst left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0023 [IMP]Add sale_triple_discount on manifest
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

@LorenzoC0
Copy link
Contributor

Prendendo spunto da questa PR, ne ho creato una nuova con alcuni fix e senza conflitti sul branch

@francesco-ooops
Copy link
Contributor

@odooNextev chiudiamo questa?

@odooNextev
Copy link
Contributor Author

superseded #3681

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.