|
@@ -54,10 +54,10 @@ class GCHR:
|
|
|
self.last_year2 = str(int(self.current_year) - 2)
|
|
|
self.next_year = str(int(self.current_year) + 1)
|
|
|
|
|
|
- def header(self, makes, sites):
|
|
|
+ def header(self, makes, sites, main_site):
|
|
|
return {
|
|
|
"Country": "DE",
|
|
|
- "MainBmCode": sites[0]["Standort_HBV"],
|
|
|
+ "MainBmCode": main_site,
|
|
|
"Month": self.current_month,
|
|
|
"Year": self.current_year,
|
|
|
"Currency": "EUR",
|
|
@@ -188,7 +188,9 @@ class GCHR:
|
|
|
df["Decimals"] = 2
|
|
|
# df['OpeningBalance'] = 0.0
|
|
|
logging.info(df.shape)
|
|
|
- self.export_xml(df.to_dict(orient="records"), self.bookkeep_filter, period_no, makes, sites)
|
|
|
+ self.export_xml(
|
|
|
+ df.to_dict(orient="records"), self.bookkeep_filter, period_no, makes, sites, sites[0]["Standort_HBV"]
|
|
|
+ )
|
|
|
|
|
|
# Join auf Übersetzung - nicht zugeordnet
|
|
|
df_ignored = df_bookings.merge(df_translate, how="left", on="Konto_Nr_Händler")
|
|
@@ -431,11 +433,11 @@ class GCHR:
|
|
|
def export_filename_for_period(self, year, month):
|
|
|
return f"{self.base_dir}/Export/{year}/export_{year}-{month}.xml"
|
|
|
|
|
|
- def export_xml(self, records, bk_filter, period_no, makes, sites):
|
|
|
+ def export_xml(self, records, bk_filter, period_no, makes, sites, main_site):
|
|
|
record_elements = ACCOUNT_INFO + ["Decimals"] + list(bk_filter.values())[:period_no] + ["CumulatedYear"]
|
|
|
root = ET.Element("HbvData")
|
|
|
h = ET.SubElement(root, "Header")
|
|
|
- for k, v in self.header(makes, sites).items():
|
|
|
+ for k, v in self.header(makes, sites, main_site).items():
|
|
|
ET.SubElement(h, k).text = str(v)
|
|
|
|
|
|
make_list = ET.SubElement(root, "MakeList")
|
|
@@ -484,7 +486,7 @@ class GCHR:
|
|
|
sites = [{"Make": "01", "Site": "01", "Marke_HBV": "1844"}]
|
|
|
with open(csvfile, "r", encoding="latin-1") as frh:
|
|
|
csv_reader = csv.DictReader(frh, delimiter=";")
|
|
|
- self.export_xml(csv_reader, self.bookkeep_filter(), 1, makes, sites, xmlfile)
|
|
|
+ self.export_xml(csv_reader, self.bookkeep_filter(), 1, makes, sites, sites[0]["Standort_HBV"], xmlfile)
|
|
|
|
|
|
|
|
|
def gchr_local():
|