diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapterByWeek.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapterByWeek.java index 6c72d4c..12b2be8 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapterByWeek.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapterByWeek.java @@ -455,7 +455,8 @@ class WeekInvoiceData { public void add(ItemCollection invoice) { String spaceName = invoice.getItemValueString("space.name"); String currency = invoice.getItemValueString("invoice.currency"); - Double total = invoice.getItemValueDouble("invoice.total"); + // Double total = invoice.getItemValueDouble("invoice.total"); + Double total = invoice.getItemValueDouble("invoice.saldo"); if ("EUR".equals(currency)) { totalEUR = totalEUR + total; } else { diff --git a/reports/cargosoft/doc/neue Schnittstelle/CargoSoftInvoice-2024.1.xsd b/reports/cargosoft/doc/neue Schnittstelle/CargoSoftInvoice-2024.1.xsd new file mode 100644 index 0000000..44692b4 --- /dev/null +++ b/reports/cargosoft/doc/neue Schnittstelle/CargoSoftInvoice-2024.1.xsd @@ -0,0 +1,495 @@ + + + + + + + + + Illustration of invoices in CargoSoft + + + + + + + + + + + + + eafako_t.mandant + db field: eafako_t.mandant + + + + + eafako_t.niederlassung + db field: eafako_t.niederlassung + + + + + On Import: If null, CargoSoft will generate the + invoice number from a number range based on the invoice type On + Export: CS will send this number eafako_t.rechnr + + db field: eafako_t.rechnr + + + + + invoice, creditnote, cancellationeafako_t.art_kennz + + + + + + eafako_t.fk_wg_sch + + + + + + true/falseeafako_t.bu_per + db field: eafako_t.bu_per + + + + + eafako_t.buchungstext + db field:eafako_t.buchungstext + + + + + yyyymm: etc: 201002eafako_t.bu_per + db field: eafako_t.bu_per + + + + + true/falseeafako_t.gebucht + db field: eafako_t.bu_per + + + + + true/falseeafako_t.storniert + db field: eafako_t.bu_per + + + + + eafako_t.beleg_storniert + db field: eafako_t.rechnr + + + + + true/falseeafako_t.storniert + db field: eafako_t.bu_per + + + + + eafako_t.beleg_korrigiert + db field: eafako_t.rechnr + + + + + eafako_t.kontierung + db field: eafako_t.bu_per + + + + + + + + + + + true/falseeafako_t.lr_bezahlt + + + + + true/falseeafako_t.kurs_sicher + + + + + eafako_t.fk_kst_mc + + + + + eafako_t.barcode + + + + + eafako_t.redatum + db field: eafako_t.redatum + + + + + + Payment conditions + + + + + + Payment condition codeeafako_t.fk_zb_kz + + dbfield: eafako_t.fk_zb_kz + + + + + + + + + + + + eafako_t.valdatum + db field: eafako_t.val_datum + + + + + + + + + + Information about date, time and + usereafako_t.fk_mitarb_logineafako_t.systemdateafako_t.systemzeit + + + + + + + + db field: eafako_t.system_datum + + + + + + + db field: eafako-t.systemzeit + + + + + + User information + + + + + + Optional will not be + processed + + db field: + eafako_t.fk_mitarb_login + + + + + + Optional will not be + processed + + + + + + + Optional will not be + processed + + + + + + + Optional will not be + processed + + + + + + + Optional will not be + processed + + + + + + + + + + + + + + eafako_t.rech_referenz + + + + + + + + + + + + + eafako_t.leistdatum + db field: eafako_t.leistdatum + + + + + + fibuko_t oder eafako_t + + + + + + + + + + + + + eafapo_t.zeile + db field: eafapo_t.zeile + + + + + + eafapo_t.fk_eakopf_posnr + + + + + + Billing codeseafapo_t.fk_aart_nr + + db field: eafapo_t.fk_aart_nr + + + + + + Billing Text (5 rows possible) + + + + + + + Optional will not be + processed + + db field: eafapo_t.abr_text, + eafapo_t.abr_text2, + eafapo_t.abr_text3,eafapo_t.abr_text4, + eafapo_t.abr_text5 + + + + + + + + + + eafako_t.fk_kst_mc + + + + + Activity type codeeafapo_t.fk_lart_nr + + db field: eafapo_t.fk_lart_nr + + + + + + + + yyyymm: etc: 201002eafako_t.bu_per + + db field: eafako_t.bu_per + + + + + + + + + + + + + + + Currency Code of shiip + exchange rate, eafapo_t.fk_wg_schiffskurs + + db_field: eafako_t.fk_wg_sch + + + + + + Based on the domestic + currency, eafapo_t.schiffskurs + + + + + + Inverse rate is the opposite + ratio of the exchange rate, value: + true/false , eafapo_t.schiffskurs_invers + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + eafako_t.fk_eakopf_posnr + + + + + + eafako_t.bereich + + + + + + + + + + + eakopf_t.hauptabteilung + + + + + eakopf_t.unterabteilung + + + + + eafako_t.anzahl_kolli + + + + + eafako_t.inhalt + + + + + eafako_t.gewicht + + + + + eafako_t.cbm + + + + + eafako_t.frachtpfl_gewicht + + + + + eafako_t.cont_20_ctr + + + + + eafako_t.cont_40_ctr + + + + + eafako_t.cont_45_ctr + + + + + + AWB or BL Number + + + + + diff --git a/reports/cargosoft/doc/neue Schnittstelle/Sample_File_InvoiceExport.xml b/reports/cargosoft/doc/neue Schnittstelle/Sample_File_InvoiceExport.xml new file mode 100644 index 0000000..d390ff1 --- /dev/null +++ b/reports/cargosoft/doc/neue Schnittstelle/Sample_File_InvoiceExport.xml @@ -0,0 +1,200 @@ + + + + + CARGOSOFT + CUSTOMER + UTC + 1 + + 2013-07-05T08:17:52 + + + + + + Cargosoft GmbH + + 001 + + + + CargoSoft GmbH + + BRE + + + 889456 + + Ausgangsrechnung + + R + + + + EURO + + EUR + + + + + + + EURO + + EUR + + + 100.00 + 0.00 + + + + + steuerfrei + + 0 + + 0.00 + + + + + EURO + + EUR + + + 0.00 + 0.00 + + + + + false + Buchungstext + 201307 + false + COST + + Export Allgemein + + 130 + + + Barcode + 2013-07-05T00:00:00Z + + + G532939 + + + Cargosoft GmbH + Linzer Straße 3 + 28359 + Bremen + + DE + Deutschland + + + + XX + XX + XX + XX + XX + XX + + + + + Zahlbar innerhalb von 30 Tagen + + 30 + + + 30 + 2013-07-30T00:00:00Z + + + 2013-07-05T00:00:00Z + 14:20:00.0Z + + hmeyer + Hans Meyer + hmeyer@cargosoft.de + +49 421 98500 0 + +49 421 98500 191 + + + + R123 G467 + + + + + 1 + 1234567847 + + HANDLING FEE + + HAND + + + + HANDLING FEE + + + + + + EURO + + EUR + + + 100.00 + 0.00 + + + + + steuerfrei + + 0 + + 0.00 + + + + + EURO + + EUR + + + 0.00 + 0.00 + + + + + + Export Allgemein + + 130 + + + + Handling + + HAND + + + Buchungstext + + + + diff --git a/reports/cargosoft/doc/neue Schnittstelle/XML Exporting of Invoices 2024.1.pdf b/reports/cargosoft/doc/neue Schnittstelle/XML Exporting of Invoices 2024.1.pdf new file mode 100644 index 0000000..98689e8 Binary files /dev/null and b/reports/cargosoft/doc/neue Schnittstelle/XML Exporting of Invoices 2024.1.pdf differ diff --git a/reports/cargosoft/doc/neue Schnittstelle/steuerbescheid-beispiel.xml b/reports/cargosoft/doc/neue Schnittstelle/steuerbescheid-beispiel.xml new file mode 100644 index 0000000..66283c3 --- /dev/null +++ b/reports/cargosoft/doc/neue Schnittstelle/steuerbescheid-beispiel.xml @@ -0,0 +1,69 @@ + + + + + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + String + String + + 2001-12-17T09:30:47Z + + + 2021.4 + 2021.4 + String + String + String + String + + + + + + 2001-12-17T09:30:47Z + + String + String + + + + 0 + String + String + + 2001-12-17T09:30:47Z + + String + 0 + + UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhiUjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhiUjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi + + + + 001 + 100012234 + LR + G45677 + USD + 12.12.2022 + 1234.78 + 47.11 + 1.000283 + ATC400009450420242452 + 202404 + 04.04.2024 + ATLAS Steuerbescheid + ZOLL + 1000.00 + 0 + LA-ZEL-2403-004 + EUST + 234.78 + 0 + LA-ZEL-2403-00 + + + \ No newline at end of file