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

fixes Issue #20, Issue #22, Issue #26 and Issue #29. It replaces PR #21 and PR #23 and contains alignments to the v2.2 specification #27

Merged
merged 4 commits into from
Mar 10, 2024

Conversation

MAKOMO
Copy link
Contributor

@MAKOMO MAKOMO commented Jan 20, 2024

  • corrects the NS_QDT name according to the zugferd22 specification
  • extends elements.py:DateTimeElement to allow the adjustment of the inner DateTimes namespace
  • updates references.py:ReferencedDocument to use NS_QDT for its DateTimeElement
  • corrects profiles in reference.py for various attributes according to the zugferd22 schemata
  • adds test zugferd_2p2_EN16931_ElektronischeAdresse2.xml as a variation of the official zugferd22 sample EN16931_ElektronischeAdresse.xml adding a FormattedIssueDateTime to the BuyerOrderReferencedDocument
  • moves SellerOrderReferencedDocument from trade.py to references.py
  • fixes DateTimeField namespace of AdvancePayment.received_date

- extends elements.py:DateTimeElement to allow the adjustment of the inner DateTimes namespace
- updates references.py:ReferencedDocument to use NS_QDT for its DateTimeElement
- corrects profiles in reference.py for various attributes according to the zugferd22 schemata
- adds test zugferd_2p2_EN16931_ElektronischeAdresse2.xml as a variation of the official zugferd22 sample EN16931_ElektronischeAdresse.xml adding a FormattedIssueDateTime to the BuyerOrderReferencedDocument
- moves SellerOrderReferencedDocument from trade.py to references.py
- fixes DateTimeField namespace of AdvancePayment.received_date
Copy link

codecov bot commented Jan 20, 2024

Codecov Report

Attention: Patch coverage is 90.54054% with 7 lines in your changes are missing coverage. Please review.

Project coverage is 90.46%. Comparing base (4019506) to head (a307f25).

Files Patch % Lines
drafthorse/models/fields.py 30.00% 7 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master      #27      +/-   ##
==========================================
- Coverage   91.09%   90.46%   -0.64%     
==========================================
  Files          17       17              
  Lines        1382     1384       +2     
==========================================
- Hits         1259     1252       -7     
- Misses        123      132       +9     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

…ctInstance) to product.py and adds the missing fields "id" (IDField) and "instance" (ProductInstance) to product.py:TradeProduct.

This commit also adds class PayerTradeParty (PayerTradeParty) to party.py and adds the missing field "payer" (PayerTradeParty) to trade.py:TradeSettlement.

This commit also removes the unused (and not needed) party.py:LineApplicableTradeTax class.

This commit also corrects profile and required tags according to the v2.2 specification as follows:

- references.py:LineAdditionalReferencedDocument
  .name profile COMFORT => BASIC (was COMFORT)
- tradelines.py:LineSettlement
  .trade_tax profile COMFORT => BASIC
  .period profile COMFORT => BASIC
  .allowance_charge profile COMFORT => BASIC
  .monetary_summation profile COMFORT => BASIC
  .additional_referenced_document profile EXTENDED => COMFORT
  .accounting_account profile EXTENDED => COMFORT
- product.py:ProductCharacteristic
  .type_code  required => optional
  .description profile EXTENDED => COMFORT
  .value profile EXTENDED => COMFORT
- product.py:ProductClassification
  .class_code required => optional; profile EXTENDED => COMFORT
  .value required => optional
- product.py:TradeProduct
  .name profile COMFORT => BASIC
  .characteristics EXTENDED => COMFORT
  .classifications EXTENDED => COMFORT
  .origins EXTENDED => COMFORT
- trade.py:TradeSettlement
  .tax_currency_code profile COMFORT => BASIC
  .invoicer profile COMFORT => EXTENDED
  .invoicee profile COMFORT => EXTENDED
  .payee profile COMFORT => BASIC
  .allowance_charge profile COMFORT => BASIC
  .service_charge profile COMFORT => EXTENDED
  .terms profile COMFORT => BASIC
  .accounting_account EXTENDED => BASIC
- accounting.py:ApplicableTradeTax
  .exemption_reason COMFORT => BASIC
  .category_code COMFORT => BASIC
  .exemption_reason_code EXTENDED => BASIC
@MAKOMO MAKOMO changed the title fixes Issue #20, Issue #22, and Issue 26 and replaces PR #21 and PR #23 fixes Issue #20, Issue #22, Issue #26 and Issue #29. It replaces PR #21 and PR #23 and contains alignments to the v2.2 specification Jan 26, 2024
MAKOMO added a commit to MAKOMO/python-drafthorse that referenced this pull request Jan 26, 2024
@raphaelm
Copy link
Member

Thanks a lot, and sorry for the long turnaround!

@raphaelm raphaelm merged commit cdfd45a into pretix:master Mar 10, 2024
4 of 6 checks passed
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.

2 participants