From b378ef816a8c4906bc2540ae97f124d28cd3ad5c Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Tue, 31 Oct 2023 21:48:55 +0100 Subject: [PATCH 1/4] feat: additional filters and FEC with files refactor --- .../fichier_des_ecritures_comptables_[fec].js | 49 +++++- .../fichier_des_ecritures_comptables_[fec].py | 162 +++++++++++++----- 2 files changed, 158 insertions(+), 53 deletions(-) diff --git a/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js b/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js index 99735f99e7e..aaa4cc577b8 100644 --- a/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +++ b/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js @@ -17,6 +17,26 @@ frappe.query_reports["Fichier des Ecritures Comptables [FEC]"] = { "fieldtype": "Link", "options": "Fiscal Year", "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today()), + "reqd": 1, + on_change: function() { + const fiscal_year = frappe.query_report.get_filter_value('fiscal_year'); + const fiscal_year_dates = erpnext.utils.get_fiscal_year(fiscal_year, true) + frappe.query_report.set_filter_value('from_date', fiscal_year_dates[1]); + frappe.query_report.set_filter_value('to_date', fiscal_year_dates[2]); + } + }, + { + "fieldname": "from_date", + "label": __("From Date"), + "fieldtype": "Date", + "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[1], + "reqd": 1 + }, + { + "fieldname": "to_date", + "label": __("To Date"), + "fieldtype": "Date", + "default": erpnext.utils.get_fiscal_year(frappe.datetime.get_today(), true)[2], "reqd": 1 } ], @@ -49,12 +69,25 @@ const fec_export = function(query_report, with_files=false) { indicator: "green", }) - open_url_post(frappe.request.url, { - cmd: "erpnext.regional.report.fichier_des_ecritures_comptables_[fec].fichier_des_ecritures_comptables_[fec].export_report", - filters: { - fiscal_year: query_report.get_values().fiscal_year, - company:query_report.get_values().company, - }, - with_files: with_files - }) + if (with_files) { + frappe.call({ + method: "erpnext.regional.report.fichier_des_ecritures_comptables_[fec].fichier_des_ecritures_comptables_[fec].export_report", + args: { + filters: query_report.get_values(), + with_files: with_files + } + }).then(r => { + if (!r.exc) { + frappe.show_alert({ + message: __("Report generation in progress.
You will receive an email with a link to download the zip file in a few minutes."), + indicator: "orange" + }) + } + }) + } else { + open_url_post(frappe.request.url, { + cmd: "erpnext.regional.report.fichier_des_ecritures_comptables_[fec].fichier_des_ecritures_comptables_[fec].export_report", + filters: query_report.get_values() + }) + } }; \ No newline at end of file diff --git a/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py b/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py index 07fd74a60be..8e2664b3dc0 100644 --- a/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +++ b/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py @@ -7,15 +7,19 @@ import zipfile import frappe from frappe import _ -from frappe.utils import cstr, format_date, format_datetime, get_datetime, sbool +from frappe.utils import cstr, format_date, format_datetime, get_datetime, getdate, sbool + +from erpnext.accounts.utils import get_fiscal_year def execute(filters=None): validate_filters(filters) - columns = get_columns(filters) + columns = get_columns() data = get_result( company=filters["company"], fiscal_year=filters["fiscal_year"], + from_date=filters.get("from_date"), + to_date=filters.get("to_date"), ) return columns, data @@ -28,8 +32,18 @@ def validate_filters(filters): if not filters.get("fiscal_year"): frappe.throw(_("{0} is mandatory").format(_("Fiscal Year"))) + if getdate(filters.get("to_date")) < getdate(filters.get("from_date")): + frappe.throw(_("From date must be before To date")) + + fiscal_year = get_fiscal_year(filters.get("fiscal_year")) + if not (fiscal_year[1] <= getdate(filters.get("from_date")) <= fiscal_year[2]): + frappe.throw(_("From date must be within fiscal year {0}").format(fiscal_year[0])) + + if not (fiscal_year[1] <= getdate(filters.get("to_date")) <= fiscal_year[2]): + frappe.throw(_("To date must be within fiscal year {0}").format(fiscal_year[0])) + -def get_columns(filters): +def get_columns(): columns = [ {"label": "JournalCode", "fieldname": "JournalCode", "width": 90}, {"label": "JournalLib", "fieldname": "JournalLib", "width": 150}, @@ -61,7 +75,7 @@ def get_columns(filters): return columns -def get_gl_entries(company, fiscal_year): +def get_gl_entries(company, fiscal_year, from_date, to_date): gle = frappe.qb.DocType("GL Entry") sales_invoice = frappe.qb.DocType("Sales Invoice") purchase_invoice = frappe.qb.DocType("Purchase Invoice") @@ -140,11 +154,17 @@ def get_gl_entries(company, fiscal_year): .orderby(gle.posting_date, gle.voucher_no, gle.accounting_entry_number) ) + if from_date: + query = query.where(gle.posting_date >= from_date) + + if to_date: + query = query.where(gle.posting_date <= to_date) + return query.run(as_dict=True) -def get_result(company, fiscal_year): - data = get_gl_entries(company, fiscal_year) +def get_result(company, fiscal_year, from_date, to_date): + data = get_gl_entries(company, fiscal_year, from_date, to_date) result = [] @@ -301,7 +321,6 @@ def get_date_let(d, data): @frappe.whitelist() def export_report(filters, with_files=False): from frappe.utils.csvutils import to_csv - from PyPDF2 import PdfMerger, PdfReader filters = frappe._dict(frappe.parse_json(filters)) with_files = sbool(with_files) @@ -338,51 +357,104 @@ def export_report(filters, with_files=False): frappe.response["type"] = "txt" else: - files = [{"file_name": f"{title}.txt", "content": fec_csv_file}] - - references_added = [] - for line in report[1]: - if ( - line.get("PieceRef") - and line.get("PieceRef") not in references_added - and line.get("PieceRef") != "Sans Reference" - and line.get("PieceRefType") in ["Sales Invoice", "Purchase Invoice", "Expense Claim"] - ): - attached_files = frappe.get_all( - "File", - filters={ - "attached_to_doctype": line.get("PieceRefType"), - "attached_to_name": line.get("PieceRef"), - }, - fields=["name", "file_name", "file_url"], + frappe.enqueue( + schedule_fec_export, + title=title, + fec_csv_file=fec_csv_file, + report=report, + user=frappe.session.user, + queue="long", + timeout=3000, + ) + + +def schedule_fec_export(title, fec_csv_file, report, user): + from PyPDF2 import PdfMerger, PdfReader + + files = [{"file_name": f"{title}.txt", "content": fec_csv_file}] + + sales_invoice_default_print_format = frappe.get_meta("Sales Invoice").default_print_format + references_added = [] + for line in report[1]: + merger = PdfMerger() + if ( + line.get("PieceRef") + and line.get("PieceRef") not in references_added + and line.get("PieceRef") != "Sans Reference" + and line.get("PieceRefType") in ["Sales Invoice", "Purchase Invoice", "Expense Claim"] + ): + attached_files = frappe.get_all( + "File", + filters={ + "attached_to_doctype": line.get("PieceRefType"), + "attached_to_name": line.get("PieceRef"), + }, + fields=["name", "file_name", "file_url"], + ) + + if not attached_files and line.get("PieceRefType") == "Sales Invoice": + attached_file = frappe.attach_print( + line.get("PieceRefType"), + line.get("PieceRef"), + print_format=sales_invoice_default_print_format, ) + try: + content = io.BytesIO(attached_file["fcontent"]) + merger.append(PdfReader(content)) + except Exception as e: + continue + + for attached_file in attached_files: + if attached_file.file_name.endswith(".pdf"): + filedoc = frappe.get_doc("File", attached_file.name) + try: + content = io.BytesIO(filedoc.get_content()) + merger.append(PdfReader(content)) + except Exception: + continue + + if merger.pages: + merged_pdf = io.BytesIO() + merger.write(merged_pdf) + + merger.close() + merged_pdf.seek(0) - merger = PdfMerger() - for attached_file in attached_files: - # if attached_file.file_name == "Facture_FR45923584.pdf": - # print(line.get("PieceRef"), attached_file) - if attached_file.file_name.endswith(".pdf"): - filedoc = frappe.get_doc("File", attached_file.name) - try: - content = io.BytesIO(filedoc.get_content()) - merger.append(PdfReader(content)) - except Exception: - continue + files.append({"file_name": f'{line.get("PieceRef")}.pdf', "content": merged_pdf.read()}) - if merger.pages: - merged_pdf = io.BytesIO() - merger.write(merged_pdf) + references_added.append(line.get("PieceRef")) + + filename = f'FEC+Pieces_{get_datetime().strftime("%Y%m%d_%H%M%S")}.zip' + zip_file = zip_files(files) + file = save_fec_file(filename, zip_file) + send_email(file, user) + + +def save_fec_file(filename, content): + _file = frappe.get_doc( + { + "doctype": "File", + "file_name": filename, + "is_private": True, + "content": content, + } + ) + return _file.insert(ignore_if_duplicate=True) - merger.close() - merged_pdf.seek(0) - files.append({"file_name": f'{line.get("PieceRef")}.pdf', "content": merged_pdf.read()}) +def send_email(file, user): + """ + Sends the link to the FEC file + """ + msg = f"

{_('Hello')}

" + msg += "
" + msg = f"

{_('Your FEC is ready to be downloaded.')}

" + msg += "
" + msg += f"{_('[Download your file]({0})').format(file.get_full_path())}" - references_added.append(line.get("PieceRef")) + subject = _("Your FEC is ready - {0}").format(file.file_name) - frappe.response["filename"] = f'FEC+Pieces_{get_datetime().strftime("%Y%m%d_%H%M%S")}.zip' - frappe.response["filecontent"] = zip_files(files) - frappe.response["type"] = "download" + frappe.sendmail(recipients=[user], message=msg, subject=subject) def zip_files(files): -- GitLab From fa6aa80cc49e40f325df5de2ff1529c86350e0ca Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Thu, 30 Nov 2023 10:19:18 +0100 Subject: [PATCH 2/4] feat: Auto generate a FEC on period closing --- erpnext/hooks.py | 1 + erpnext/regional/france/utils.py | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 86eba89ccd7..606676bb947 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -436,6 +436,7 @@ doc_events = { "Supplier": {"validate": "erpnext.regional.france.extensions.supplier.validate"}, "Customer": {"validate": "erpnext.regional.france.extensions.customer.validate"}, "Global Defaults": {"on_update": "erpnext.regional.france.pappers.api.setup_pappers"}, + "Period Closing Voucher": {"before_submit": "erpnext.regional.france.utils.generate_fec_report"}, } # function should expect the variable and doc as arguments diff --git a/erpnext/regional/france/utils.py b/erpnext/regional/france/utils.py index 65dfd2db916..038f0ef6c8c 100644 --- a/erpnext/regional/france/utils.py +++ b/erpnext/regional/france/utils.py @@ -1,8 +1,31 @@ # Copyright (c) 2018, Frappe Technologies and contributors # For license information, please see license.txt +import frappe + +from erpnext.regional.report.fichier_des_ecritures_comptables.fichier_des_ecritures_comptables import ( + export_report, +) + # don't remove this function it is used in tests def test_method(): """test function""" return "overridden" + + +def generate_fec_report(doc, method): + filters = {"company": doc.company, "fiscal_year": doc.fiscal_year} + fec_file, title = export_report(filters, return_file=True) + + _file = frappe.get_doc( + { + "doctype": "File", + "file_name": f"{title}.txt", + "is_private": True, + "content": fec_file, + "attached_to_name": doc.name, + "attached_to_doctype": doc.doctype, + } + ) + return _file.insert(ignore_if_duplicate=True) -- GitLab From 32d35682b47b6f297862b3eca8ae31fe9ece873a Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Thu, 30 Nov 2023 10:19:42 +0100 Subject: [PATCH 3/4] refactor: rename report --- .../workspace/accounting/accounting.json | 6 ++-- erpnext/patches.txt | 1 + ...ier_des_ecritures_comptables_for_france.py | 2 +- erpnext/regional/france/setup.py | 2 +- .../__init__.py | 0 .../fichier_des_ecritures_comptables.js} | 6 ++-- .../fichier_des_ecritures_comptables.json | 19 +++++++++++++ .../fichier_des_ecritures_comptables.py} | 28 ++++++++++++------- ...ichier_des_ecritures_comptables_[fec].json | 19 ------------- erpnext/translations/af.csv | 2 +- erpnext/translations/am.csv | 2 +- erpnext/translations/ar.csv | 2 +- erpnext/translations/bg.csv | 2 +- erpnext/translations/bn.csv | 2 +- erpnext/translations/bs.csv | 2 +- erpnext/translations/ca.csv | 2 +- erpnext/translations/cs.csv | 2 +- erpnext/translations/da.csv | 2 +- erpnext/translations/de.csv | 2 +- erpnext/translations/el.csv | 2 +- erpnext/translations/es.csv | 2 +- erpnext/translations/et.csv | 2 +- erpnext/translations/fa.csv | 2 +- erpnext/translations/fi.csv | 2 +- erpnext/translations/fr.csv | 2 +- erpnext/translations/gu.csv | 2 +- erpnext/translations/he.csv | 2 +- erpnext/translations/hi.csv | 2 +- erpnext/translations/hr.csv | 2 +- erpnext/translations/hu.csv | 2 +- erpnext/translations/id.csv | 2 +- erpnext/translations/is.csv | 2 +- erpnext/translations/it.csv | 2 +- erpnext/translations/ja.csv | 2 +- erpnext/translations/km.csv | 2 +- erpnext/translations/kn.csv | 2 +- erpnext/translations/ko.csv | 2 +- erpnext/translations/ku.csv | 2 +- erpnext/translations/lo.csv | 2 +- erpnext/translations/lt.csv | 2 +- erpnext/translations/lv.csv | 2 +- erpnext/translations/mk.csv | 2 +- erpnext/translations/ml.csv | 2 +- erpnext/translations/mr.csv | 2 +- erpnext/translations/ms.csv | 2 +- erpnext/translations/my.csv | 2 +- erpnext/translations/nl.csv | 2 +- erpnext/translations/no.csv | 2 +- erpnext/translations/pl.csv | 2 +- erpnext/translations/ps.csv | 2 +- erpnext/translations/pt-BR.csv | 2 +- erpnext/translations/pt.csv | 2 +- erpnext/translations/ro.csv | 2 +- erpnext/translations/ru.csv | 2 +- erpnext/translations/rw.csv | 2 +- erpnext/translations/si.csv | 2 +- erpnext/translations/sk.csv | 2 +- erpnext/translations/sl.csv | 2 +- erpnext/translations/sq.csv | 2 +- erpnext/translations/sr.csv | 2 +- erpnext/translations/sv.csv | 2 +- erpnext/translations/sw.csv | 2 +- erpnext/translations/ta.csv | 2 +- erpnext/translations/te.csv | 2 +- erpnext/translations/th.csv | 2 +- erpnext/translations/tr.csv | 2 +- erpnext/translations/uk.csv | 2 +- erpnext/translations/ur.csv | 2 +- erpnext/translations/uz.csv | 2 +- erpnext/translations/vi.csv | 2 +- erpnext/translations/zh.csv | 2 +- 71 files changed, 108 insertions(+), 99 deletions(-) rename erpnext/regional/report/{fichier_des_ecritures_comptables_[fec] => fichier_des_ecritures_comptables}/__init__.py (100%) rename erpnext/regional/report/{fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js => fichier_des_ecritures_comptables/fichier_des_ecritures_comptables.js} (92%) create mode 100644 erpnext/regional/report/fichier_des_ecritures_comptables/fichier_des_ecritures_comptables.json rename erpnext/regional/report/{fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py => fichier_des_ecritures_comptables/fichier_des_ecritures_comptables.py} (96%) delete mode 100644 erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].json diff --git a/erpnext/accounts/workspace/accounting/accounting.json b/erpnext/accounts/workspace/accounting/accounting.json index 45e0d4e2f5c..7cebb98a4b9 100644 --- a/erpnext/accounts/workspace/accounting/accounting.json +++ b/erpnext/accounts/workspace/accounting/accounting.json @@ -292,9 +292,9 @@ "columns": 0, "hidden": 0, "is_query_report": 1, - "label": "Fichier des Ecritures Comptables [FEC]", + "label": "Fichier des Ecritures Comptables", "link_count": 0, - "link_to": "Fichier des Ecritures Comptables [FEC]", + "link_to": "Fichier des Ecritures Comptables", "link_type": "Report", "onboard": 0, "only_for": "France", @@ -733,7 +733,7 @@ "type": "Link" } ], - "modified": "2023-09-19 09:33:32.606327", + "modified": "2023-10-19 09:33:32.606327", "modified_by": "Administrator", "module": "Accounts", "name": "Accounting", diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 18b74f341e0..e41759409a8 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -274,6 +274,7 @@ execute:frappe.delete_doc_if_exists("Report", "Eway Bill") erpnext.patches.dokos.v3_0.set_all_leads_as_draft erpnext.patches.dokos.v3_0.update_remarks erpnext.patches.dokos.v3_0.single_accounting_journal_for_bank_transactions +execute:frappe.rename_doc("Report", "Fichier des Ecritures Comptables [FEC]", "Fichier des Ecritures Comptables", force=True) [post_model_sync] execute:frappe.delete_doc_if_exists('Workspace', 'ERPNext Integrations Settings') diff --git a/erpnext/patches/v10_0/fichier_des_ecritures_comptables_for_france.py b/erpnext/patches/v10_0/fichier_des_ecritures_comptables_for_france.py index 44497299c47..631a60edc68 100644 --- a/erpnext/patches/v10_0/fichier_des_ecritures_comptables_for_france.py +++ b/erpnext/patches/v10_0/fichier_des_ecritures_comptables_for_france.py @@ -8,6 +8,6 @@ from erpnext.setup.doctype.company.company import install_country_fixtures def execute(): - frappe.reload_doc("regional", "report", "fichier_des_ecritures_comptables_[fec]") + frappe.reload_doc("regional", "report", "fichier_des_ecritures_comptables") for d in frappe.get_all("Company", filters={"country": "France"}): install_country_fixtures(d.name) diff --git a/erpnext/regional/france/setup.py b/erpnext/regional/france/setup.py index aa2c2009505..c4e56e7bb57 100644 --- a/erpnext/regional/france/setup.py +++ b/erpnext/regional/france/setup.py @@ -123,7 +123,7 @@ def make_custom_fields(update=True): def add_custom_roles_for_reports(): - report_name = "Fichier des Ecritures Comptables [FEC]" + report_name = "Fichier des Ecritures Comptables" if not frappe.db.get_value("Custom Role", dict(report=report_name)): frappe.get_doc( diff --git a/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/__init__.py b/erpnext/regional/report/fichier_des_ecritures_comptables/__init__.py similarity index 100% rename from erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/__init__.py rename to erpnext/regional/report/fichier_des_ecritures_comptables/__init__.py diff --git a/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js b/erpnext/regional/report/fichier_des_ecritures_comptables/fichier_des_ecritures_comptables.js similarity index 92% rename from erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js rename to erpnext/regional/report/fichier_des_ecritures_comptables/fichier_des_ecritures_comptables.js index aaa4cc577b8..9f40c04bd1f 100644 --- a/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].js +++ b/erpnext/regional/report/fichier_des_ecritures_comptables/fichier_des_ecritures_comptables.js @@ -1,7 +1,7 @@ // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors // For license information, please see license.txt -frappe.query_reports["Fichier des Ecritures Comptables [FEC]"] = { +frappe.query_reports["Fichier des Ecritures Comptables"] = { "filters": [ { "fieldname": "company", @@ -71,7 +71,7 @@ const fec_export = function(query_report, with_files=false) { if (with_files) { frappe.call({ - method: "erpnext.regional.report.fichier_des_ecritures_comptables_[fec].fichier_des_ecritures_comptables_[fec].export_report", + method: "erpnext.regional.report.fichier_des_ecritures_comptables.fichier_des_ecritures_comptables.export_report", args: { filters: query_report.get_values(), with_files: with_files @@ -86,7 +86,7 @@ const fec_export = function(query_report, with_files=false) { }) } else { open_url_post(frappe.request.url, { - cmd: "erpnext.regional.report.fichier_des_ecritures_comptables_[fec].fichier_des_ecritures_comptables_[fec].export_report", + cmd: "erpnext.regional.report.fichier_des_ecritures_comptables.fichier_des_ecritures_comptables.export_report", filters: query_report.get_values() }) } diff --git a/erpnext/regional/report/fichier_des_ecritures_comptables/fichier_des_ecritures_comptables.json b/erpnext/regional/report/fichier_des_ecritures_comptables/fichier_des_ecritures_comptables.json new file mode 100644 index 00000000000..4936708d482 --- /dev/null +++ b/erpnext/regional/report/fichier_des_ecritures_comptables/fichier_des_ecritures_comptables.json @@ -0,0 +1,19 @@ +{ + "add_total_row": 0, + "apply_user_permissions": 0, + "creation": "2018-01-10 15:10:16.650129", + "disabled": 0, + "docstatus": 0, + "doctype": "Report", + "idx": 0, + "is_standard": "Yes", + "modified": "2023-11-11 10:27:25.595485", + "modified_by": "Administrator", + "module": "Regional", + "name": "Fichier des Ecritures Comptables", + "owner": "Administrator", + "ref_doctype": "GL Entry", + "report_name": "Fichier des Ecritures Comptables", + "report_type": "Script Report", + "roles": [] +} diff --git a/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py b/erpnext/regional/report/fichier_des_ecritures_comptables/fichier_des_ecritures_comptables.py similarity index 96% rename from erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py rename to erpnext/regional/report/fichier_des_ecritures_comptables/fichier_des_ecritures_comptables.py index 8e2664b3dc0..c675449be91 100644 --- a/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].py +++ b/erpnext/regional/report/fichier_des_ecritures_comptables/fichier_des_ecritures_comptables.py @@ -319,7 +319,7 @@ def get_date_let(d, data): @frappe.whitelist() -def export_report(filters, with_files=False): +def export_report(filters, with_files=False, return_file=False): from frappe.utils.csvutils import to_csv filters = frappe._dict(frappe.parse_json(filters)) @@ -352,9 +352,12 @@ def export_report(filters, with_files=False): ) if not with_files: - frappe.response["result"] = fec_csv_file - frappe.response["doctype"] = title - frappe.response["type"] = "txt" + if return_file: + return fec_csv_file, title + else: + frappe.response["result"] = fec_csv_file + frappe.response["doctype"] = title + frappe.response["type"] = "txt" else: frappe.enqueue( @@ -393,16 +396,21 @@ def schedule_fec_export(title, fec_csv_file, report, user): ) if not attached_files and line.get("PieceRefType") == "Sales Invoice": - attached_file = frappe.attach_print( - line.get("PieceRefType"), - line.get("PieceRef"), - print_format=sales_invoice_default_print_format, - ) try: + attached_file = frappe.attach_print( + line.get("PieceRefType"), + line.get("PieceRef"), + print_format=sales_invoice_default_print_format, + ) content = io.BytesIO(attached_file["fcontent"]) merger.append(PdfReader(content)) except Exception as e: - continue + frappe.log_error( + "FEC attachments generation for {0}: {1}".format( + line.get("PieceRefType"), line.get("PieceRef") + ), + str(e), + ) for attached_file in attached_files: if attached_file.file_name.endswith(".pdf"): diff --git a/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].json b/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].json deleted file mode 100644 index 9b48e114283..00000000000 --- a/erpnext/regional/report/fichier_des_ecritures_comptables_[fec]/fichier_des_ecritures_comptables_[fec].json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "add_total_row": 0, - "apply_user_permissions": 0, - "creation": "2018-01-10 15:10:16.650129", - "disabled": 0, - "docstatus": 0, - "doctype": "Report", - "idx": 0, - "is_standard": "Yes", - "modified": "2018-01-11 10:27:25.595485", - "modified_by": "Administrator", - "module": "Regional", - "name": "Fichier des Ecritures Comptables [FEC]", - "owner": "Administrator", - "ref_doctype": "GL Entry", - "report_name": "Fichier des Ecritures Comptables [FEC]", - "report_type": "Script Report", - "roles": [] -} \ No newline at end of file diff --git a/erpnext/translations/af.csv b/erpnext/translations/af.csv index a3cf5537775..d3357d5e48f 100644 --- a/erpnext/translations/af.csv +++ b/erpnext/translations/af.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Werknemerverlofbalans, Employee Leave Balance Summary,Werkopsommingsaldo-opsomming, Eway Bill,Eway Bill, Expiring Memberships,Vervaldatums, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Finale Assesseringsgraad, Fixed Asset Register,Vaste bateregister, Gross and Net Profit Report,Bruto en netto winsverslag, diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv index bbe052eb892..6c768388623 100644 --- a/erpnext/translations/am.csv +++ b/erpnext/translations/am.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,የሰራተኛ ፈቃድ ሒሳብ, Employee Leave Balance Summary,የሰራተኛ ቀሪ ሂሳብ ማጠቃለያ።, Eway Bill,Eway Bill, Expiring Memberships,አባካኝ አባልነት, -Fichier des Ecritures Comptables [FEC],የምዕራፍ ቅዱሳት መጻሕፍትን መዝገቦች [FEC], +Fichier des Ecritures Comptables,የምዕራፍ ቅዱሳት መጻሕፍትን መዝገቦች [FEC], Final Assessment Grades,የመጨረሻ ፈተናዎች ደረጃዎች, Fixed Asset Register,የቋሚ ንብረት ምዝገባ, Gross and Net Profit Report,ጠቅላላ እና የተጣራ ትርፍ ሪፖርት ፡፡, diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv index 713ed8898ea..8019a742c3a 100644 --- a/erpnext/translations/ar.csv +++ b/erpnext/translations/ar.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,رصيد اجازات الموظف, Employee Leave Balance Summary,الموظف إجازة ملخص الرصيد, Eway Bill,Eway بيل, Expiring Memberships,عضوية منتهية الصلاحية, -Fichier des Ecritures Comptables [FEC],فيشير ديس إكوريتورس كومبتابليز [فيك], +Fichier des Ecritures Comptables,فيشير ديس إكوريتورس كومبتابليز [فيك], Final Assessment Grades,درجات التقييم النهائية, Fixed Asset Register,سجل الأصول الثابتة, Gross and Net Profit Report,تقرير الربح الإجمالي والصافي, diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv index 4c38d84e773..169718a60eb 100644 --- a/erpnext/translations/bg.csv +++ b/erpnext/translations/bg.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Служител - полагащ се отпуск в д Employee Leave Balance Summary,Обобщение на баланса на служителите, Eway Bill,Еуей Бил, Expiring Memberships,Изтичащи членства, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Оценъчни оценки, Fixed Asset Register,Регистър на фиксирани активи, Gross and Net Profit Report,Отчет за брутната и нетната печалба, diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv index fb8e7996e28..08ed82ce193 100644 --- a/erpnext/translations/bn.csv +++ b/erpnext/translations/bn.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,কর্মচারী ছুটি ভারসাম Employee Leave Balance Summary,কর্মচারী ছুটির ব্যালেন্সের সারাংশ, Eway Bill,ইওয়ে বিল, Expiring Memberships,মেয়াদ শেষের সদস্যপদ, -Fichier des Ecritures Comptables [FEC],ফিসার ডেস ইকরিটেস কমপ্যাটবলস [এফকে], +Fichier des Ecritures Comptables,ফিসার ডেস ইকরিটেস কমপ্যাটবলস [এফকে], Final Assessment Grades,ফাইনাল অ্যাসেসমেন্ট গ্রেড, Fixed Asset Register,স্থির সম্পদ রেজিস্টার, Gross and Net Profit Report,গ্রস এবং নেট লাভের রিপোর্ট, diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv index 7652de0b0b3..56fc3816698 100644 --- a/erpnext/translations/bs.csv +++ b/erpnext/translations/bs.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Zaposlenik napuste balans, Employee Leave Balance Summary,Sažetak ravnoteže zaposlenika, Eway Bill,Eway Bill, Expiring Memberships,Istekao članstva, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Završne ocene, Fixed Asset Register,Registar fiksne imovine, Gross and Net Profit Report,Izvještaj o bruto i neto dobiti, diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv index 5365b0e8ed0..50b00df76f7 100644 --- a/erpnext/translations/ca.csv +++ b/erpnext/translations/ca.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Balanç d'absències d'empleat, Employee Leave Balance Summary,Resum del balanç de baixa dels empleats, Eway Bill,Eway Bill, Expiring Memberships,Expiració de membresies, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Qualificacions d'avaluació final, Fixed Asset Register,Registre d’actius fixos, Gross and Net Profit Report,Informe de benefici brut i net, diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv index 2723b2ce18d..0be84daa385 100644 --- a/erpnext/translations/cs.csv +++ b/erpnext/translations/cs.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Zaměstnanec Leave Balance, Employee Leave Balance Summary,Shrnutí zůstatku zaměstnanců, Eway Bill,Eway Bill, Expiring Memberships,Platnost členství, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Závěrečné hodnocení, Fixed Asset Register,Registr dlouhodobých aktiv, Gross and Net Profit Report,Hrubý a čistý zisk, diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv index 223617e23e0..0d91b5d0bda 100644 --- a/erpnext/translations/da.csv +++ b/erpnext/translations/da.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Medarbejder Leave Balance, Employee Leave Balance Summary,Oversigt over saldo for medarbejderorlov, Eway Bill,Eway Bill, Expiring Memberships,Udfaldne Medlemskaber, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Afsluttende bedømmelse, Fixed Asset Register,Fast aktivregister, Gross and Net Profit Report,Brutto- og resultatopgørelse, diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv index f5b042f8472..6bfeb5e3039 100644 --- a/erpnext/translations/de.csv +++ b/erpnext/translations/de.csv @@ -7610,7 +7610,7 @@ Employee Leave Balance,Übersicht der Urlaubskonten der Mitarbeiter, Employee Leave Balance Summary,Mitarbeiter Urlaubsguthaben Zusammenfassung, Eway Bill,Eway Bill, Expiring Memberships,Auslaufende Mitgliedschaften, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Endgültige Bewertungsmaßstäbe, Fixed Asset Register,Anlagebuch, Gross and Net Profit Report,Brutto- und Nettogewinnbericht, diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv index f990044106a..b1e254e7b23 100644 --- a/erpnext/translations/el.csv +++ b/erpnext/translations/el.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Υπόλοιπο αδείας υπαλλήλου, Employee Leave Balance Summary,Περίληψη ισοζυγίου εξόδου εργαζομένων, Eway Bill,Eway Bill, Expiring Memberships,Λήξη μελών, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Τελικοί βαθμοί αξιολόγησης, Fixed Asset Register,Μητρώο πάγιων περιουσιακών στοιχείων, Gross and Net Profit Report,Αναφορά ακαθάριστων κερδών και καθαρών κερδών, diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv index d9afc5f25bf..4549e609386 100644 --- a/erpnext/translations/es.csv +++ b/erpnext/translations/es.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Balance de ausencias de empleado, Employee Leave Balance Summary,Resumen de saldo de licencia de empleado, Eway Bill,Eway Bill, Expiring Memberships,Membresías Expiradas, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Grados de Evaluación Final, Fixed Asset Register,Registro de activos fijos, Gross and Net Profit Report,Informe de ganancias brutas y netas, diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv index 0276971a8b6..6b2545e62a9 100644 --- a/erpnext/translations/et.csv +++ b/erpnext/translations/et.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Töötaja Jäta Balance, Employee Leave Balance Summary,Töötaja lahkumisbilansi kokkuvõte, Eway Bill,Eway Bill, Expiring Memberships,Aegunud liikmelisus, -Fichier des Ecritures Comptables [FEC],Ficier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Ficier des Ecritures Comptables, Final Assessment Grades,Lõplik hindamisastmed, Fixed Asset Register,Põhivara register, Gross and Net Profit Report,Bruto - ja puhaskasumi aruanne, diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv index 31e4f95b88c..4f7ee51b040 100644 --- a/erpnext/translations/fa.csv +++ b/erpnext/translations/fa.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,کارمند مرخصی تعادل, Employee Leave Balance Summary,خلاصه مانده تراز کارمندان, Eway Bill,Eway Bill, Expiring Memberships,عضويت در پايان نامه, -Fichier des Ecritures Comptables [FEC],Ficier Des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Ficier des Ecritures Comptables, Final Assessment Grades,نمرات ارزیابی نهایی, Fixed Asset Register,ثبت نام دارایی های ثابت, Gross and Net Profit Report,گزارش سود ناخالص و خالص, diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv index 978cd8609a2..5a30cf64b97 100644 --- a/erpnext/translations/fi.csv +++ b/erpnext/translations/fi.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Työntekijän käytettävissä olevat vapaat, Employee Leave Balance Summary,Yhteenveto työntekijöiden lomasta, Eway Bill,Eway Bill, Expiring Memberships,Jäsenyyden päättyminen, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Loppuraportin arvosanat, Fixed Asset Register,Kiinteän omaisuuden rekisteri, Gross and Net Profit Report,Brutto- ja nettotulosraportti, diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv index ceb02f55da2..09835ddef3f 100644 --- a/erpnext/translations/fr.csv +++ b/erpnext/translations/fr.csv @@ -4486,7 +4486,7 @@ Fetch missing payments,Obtenir les paiement manquants, Fetched only {0} available serial numbers.,Seulement {0} numéros de série disponibles ont pu être récupérés, Fetching exchange rates ...,Récupération des taux de change..., Fetching...,Récupération..., -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Field Name,Nom du champ, Field in Bank Transaction,Champ dans la transaction bancaire, Field,Champs, diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv index 603cd5093aa..5db3b636357 100644 --- a/erpnext/translations/gu.csv +++ b/erpnext/translations/gu.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,કર્મચારી રજા બેલેન્સ, Employee Leave Balance Summary,કર્મચારી રજા બેલેન્સ સારાંશ, Eway Bill,ઇવે બિલ, Expiring Memberships,સમાપ્તિ સભ્યપદ, -Fichier des Ecritures Comptables [FEC],ફિચિયર ડેસ ઇક્ચિટર્સ કૉમ્પેટબલ્સ [એફઇસી], +Fichier des Ecritures Comptables,ફિચિયર ડેસ ઇક્ચિટર્સ કૉમ્પેટબલ્સ [એફઇસી], Final Assessment Grades,અંતિમ મૂલ્યાંકન ગ્રેડ, Fixed Asset Register,સ્થિર સંપત્તિ રજિસ્ટર, Gross and Net Profit Report,કુલ અને ચોખ્ખો નફો અહેવાલ, diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv index d053853b4a4..fe759c91862 100644 --- a/erpnext/translations/he.csv +++ b/erpnext/translations/he.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,עובד חופשת מאזן, Employee Leave Balance Summary,סיכום יתרת חופשות עובדים, Eway Bill,ביל אווי, Expiring Memberships,חברות בתוקף, -Fichier des Ecritures Comptables [FEC],פלטפורמות של קובץ קובץ [FEC], +Fichier des Ecritures Comptables,פלטפורמות של קובץ קובץ [FEC], Final Assessment Grades,ציוני הערכה אחרונים, Fixed Asset Register,רישום נכסים קבועים, Gross and Net Profit Report,דוח רווח גולמי ורווח נקי, diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv index fd03531b2f1..8b102bfbe06 100644 --- a/erpnext/translations/hi.csv +++ b/erpnext/translations/hi.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,कर्मचारी लीव बैलेंस, Employee Leave Balance Summary,कर्मचारी शेष राशि सारांश, Eway Bill,बिल बिल, Expiring Memberships,समाप्ति सदस्यता, -Fichier des Ecritures Comptables [FEC],फिचर्स डेस ऐक्रिटेशंस कॉप्टीबल्स [एफईसी], +Fichier des Ecritures Comptables,फिचर्स डेस ऐक्रिटेशंस कॉप्टीबल्स [एफईसी], Final Assessment Grades,अंतिम आकलन ग्रेड, Fixed Asset Register,फिक्स्ड एसेट रजिस्टर, Gross and Net Profit Report,सकल और शुद्ध लाभ रिपोर्ट, diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv index b90aa49e072..126162d5944 100644 --- a/erpnext/translations/hr.csv +++ b/erpnext/translations/hr.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Zaposlenik napuste balans, Employee Leave Balance Summary,Sažetak stanja ravnoteže zaposlenika, Eway Bill,Eway Bill, Expiring Memberships,Istječe članstva, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Konačna ocjena razreda, Fixed Asset Register,Registar fiksne imovine, Gross and Net Profit Report,Izvješće o bruto i neto dobiti, diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv index a015722f197..ba6a3c16ac8 100644 --- a/erpnext/translations/hu.csv +++ b/erpnext/translations/hu.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Alkalmazott távollét egyenleg, Employee Leave Balance Summary,Munkavállalói szabadságmérleg-összefoglaló, Eway Bill,Eway Bill, Expiring Memberships,Tagság megszűnése, -Fichier des Ecritures Comptables [FEC],Könyvelési tétel fájlok [FEC], +Fichier des Ecritures Comptables,Könyvelési tétel fájlok [FEC], Final Assessment Grades,Végső értékelési osztályok, Fixed Asset Register,Tárgyi nyilvántartás, Gross and Net Profit Report,Bruttó és nettó nyereségjelentés, diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv index 78694272d60..fbfdd6d68c3 100644 --- a/erpnext/translations/id.csv +++ b/erpnext/translations/id.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Nilai Cuti Karyawan, Employee Leave Balance Summary,Ringkasan Saldo Cuti Karyawan, Eway Bill,Eway Bill, Expiring Memberships,Kedaluwarsa Keanggotaan, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Penilaian Akhir Kelas, Fixed Asset Register,Daftar Aset Tetap, Gross and Net Profit Report,Laporan Laba Kotor dan Laba Bersih, diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv index f4bad49656e..839452a371d 100644 --- a/erpnext/translations/is.csv +++ b/erpnext/translations/is.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Starfsmaður Leave Balance, Employee Leave Balance Summary,Yfirlit yfir jafnvægi starfsmanna leyfis, Eway Bill,Eway Bill, Expiring Memberships,Lokandi félagsskapur, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Lokamat, Fixed Asset Register,Fast eignaskrá, Gross and Net Profit Report,Hagnaður og hagnaður, diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv index b401b158df8..b4e3f1dd4c7 100644 --- a/erpnext/translations/it.csv +++ b/erpnext/translations/it.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Saldo del Congedo Dipendete, Employee Leave Balance Summary,Riepilogo saldo congedo dipendente, Eway Bill,Eway Bill, Expiring Memberships,Soci in scadenza, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Gradi di valutazione finale, Fixed Asset Register,Registro delle attività fisse, Gross and Net Profit Report,Rapporto sugli utili lordi e netti, diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv index 6bc0bfb9057..96b0ad667ce 100644 --- a/erpnext/translations/ja.csv +++ b/erpnext/translations/ja.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,従業員の残休暇数, Employee Leave Balance Summary,従業員の休暇バランス概要, Eway Bill,エウェルビル, Expiring Memberships,期限切れの会員, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,最終評価グレード, Fixed Asset Register,固定資産台帳, Gross and Net Profit Report,総利益および純利益レポート, diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv index 7d5dc792712..0bf8e3b6387 100644 --- a/erpnext/translations/km.csv +++ b/erpnext/translations/km.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,បុគ្គលិកចាកចេញតុល្យ Employee Leave Balance Summary,របាយការណ៍សង្ខេបអំពីការឈប់សម្រាករបស់និយោជិក។, Eway Bill,Eway Bill, Expiring Memberships,សមាជិកដែលផុតកំណត់, -Fichier des Ecritures Comptables [FEC],ឯកសារស្តីអំពីការសរសេរឯកសាររបស់អ្នកនិពន្ធ [FEC], +Fichier des Ecritures Comptables,ឯកសារស្តីអំពីការសរសេរឯកសាររបស់អ្នកនិពន្ធ [FEC], Final Assessment Grades,ថ្នាក់វាយតម្លៃចុងក្រោយ, Fixed Asset Register,ចុះឈ្មោះទ្រព្យសម្បត្តិថេរ។, Gross and Net Profit Report,របាយការណ៍ប្រាក់ចំណេញដុលនិងសុទ្ធ។, diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv index 03e2af717fa..8535f05ed1a 100644 --- a/erpnext/translations/kn.csv +++ b/erpnext/translations/kn.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,ನೌಕರರ ಲೀವ್ ಬ್ಯಾಲೆನ್ Employee Leave Balance Summary,ನೌಕರರ ರಜೆ ಬ್ಯಾಲೆನ್ಸ್ ಸಾರಾಂಶ, Eway Bill,ಎವೇ ಬಿಲ್, Expiring Memberships,ಸದಸ್ಯತ್ವಗಳನ್ನು ಮುಕ್ತಾಯಗೊಳಿಸುವುದು, -Fichier des Ecritures Comptables [FEC],ಫಿಶಿಯರ್ ಡೆಸ್ ಎಕ್ರಿಕರ್ಸ್ ಕಾಂಪ್ಟೇಬಲ್ಸ್ [ಎಫ್.ಸಿ.ಸಿ], +Fichier des Ecritures Comptables,ಫಿಶಿಯರ್ ಡೆಸ್ ಎಕ್ರಿಕರ್ಸ್ ಕಾಂಪ್ಟೇಬಲ್ಸ್ [ಎಫ್.ಸಿ.ಸಿ], Final Assessment Grades,ಅಂತಿಮ ಮೌಲ್ಯಮಾಪನ ಶ್ರೇಣಿಗಳನ್ನು, Fixed Asset Register,ಸ್ಥಿರ ಆಸ್ತಿ ನೋಂದಣಿ, Gross and Net Profit Report,ಒಟ್ಟು ಮತ್ತು ನಿವ್ವಳ ಲಾಭ ವರದಿ, diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv index 508066bbb9e..f8e39a57e92 100644 --- a/erpnext/translations/ko.csv +++ b/erpnext/translations/ko.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,직원 허가 밸런스, Employee Leave Balance Summary,직원 휴가 잔액 요약, Eway Bill,Eway Bill, Expiring Memberships,만료 회원, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,최종 평가 성적, Fixed Asset Register,고정 자산 등록, Gross and Net Profit Report,총 이익 및 순이익 보고서, diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv index e8e0333bea0..adb28c90d59 100644 --- a/erpnext/translations/ku.csv +++ b/erpnext/translations/ku.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Xebatkarê Leave Balance, Employee Leave Balance Summary,Karmend Balana Piştgiriyê Bihêle, Eway Bill,Eway Bill, Expiring Memberships,Endamên endamdariyê, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Nirxandina Bingeha Dawîn, Fixed Asset Register,Xeydkirî Mîna Verastkirî, Gross and Net Profit Report,Raporta Profitiya Genc û Neto, diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv index b589e0c60e2..a9a4f9e9ef9 100644 --- a/erpnext/translations/lo.csv +++ b/erpnext/translations/lo.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,ພະນັກງານອອກຈາກດຸນ, Employee Leave Balance Summary,ໃບສະຫຼຸບຍອດເຫຼືອຂອງພະນັກງານ, Eway Bill,Eway Bill, Expiring Memberships,Expiring Memberships, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Accounts [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Accounts [FEC], Final Assessment Grades,ຂັ້ນຕອນການປະເມີນຂັ້ນສຸດທ້າຍ, Fixed Asset Register,ລົງທະບຽນຊັບສິນທີ່ມີ ກຳ ນົດ, Gross and Net Profit Report,ບົດລາຍງານລວມຍອດແລະຜົນ ກຳ ໄລສຸດທິ, diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv index c84c9ecb169..59163b1bc66 100644 --- a/erpnext/translations/lt.csv +++ b/erpnext/translations/lt.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Darbuotojų atostogos balansas, Employee Leave Balance Summary,Darbuotojų atostogų balanso suvestinė, Eway Bill,Eway Billas, Expiring Memberships,Nesibaigianti narystė, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Galutiniai vertinimo balai, Fixed Asset Register,Ilgalaikio turto registras, Gross and Net Profit Report,Bendrojo ir grynojo pelno ataskaita, diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv index 562b054deaa..0add3821527 100644 --- a/erpnext/translations/lv.csv +++ b/erpnext/translations/lv.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Darbinieku Leave Balance, Employee Leave Balance Summary,Darbinieku atvaļinājuma bilances kopsavilkums, Eway Bill,Eway Bill, Expiring Memberships,Beidzas dalība, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Nobeiguma novērtējuma pakāpes, Fixed Asset Register,Pamatlīdzekļu reģistrs, Gross and Net Profit Report,Bruto un neto peļņas pārskats, diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv index 96575bf49af..784d59dedd0 100644 --- a/erpnext/translations/mk.csv +++ b/erpnext/translations/mk.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Вработен Остави Биланс, Employee Leave Balance Summary,Резиме на остатокот од вработените, Eway Bill,Ева Бил, Expiring Memberships,Истекува членство, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Оценки за завршна оценка, Fixed Asset Register,Регистар на фиксни средства, Gross and Net Profit Report,Извештај за бруто и нето добивка, diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv index 0082024e905..0a2f5e578e8 100644 --- a/erpnext/translations/ml.csv +++ b/erpnext/translations/ml.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,ജീവനക്കാരുടെ അവധി ബാ Employee Leave Balance Summary,ജീവനക്കാരുടെ അവധി ബാലൻസ് സംഗ്രഹം, Eway Bill,ഈവേ ബിൽ, Expiring Memberships,കാലഹരണപ്പെടുന്ന അംഗത്വങ്ങൾ, -Fichier des Ecritures Comptables [FEC],ഫിചിയർ ഡെസ് ഇക്വിറ്ററീസ് കോംപ്ലബിൾസ് [FEC], +Fichier des Ecritures Comptables,ഫിചിയർ ഡെസ് ഇക്വിറ്ററീസ് കോംപ്ലബിൾസ് [FEC], Final Assessment Grades,അന്തിമ വിലയിരുത്തൽ ഗ്രേഡുകൾ, Fixed Asset Register,സ്ഥിര അസറ്റ് രജിസ്റ്റർ, Gross and Net Profit Report,"മൊത്ത, അറ്റ ലാഭ റിപ്പോർട്ട്", diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv index 26a1a364b76..4b9fbf88ecc 100644 --- a/erpnext/translations/mr.csv +++ b/erpnext/translations/mr.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,कर्मचारी रजा शिल्लक, Employee Leave Balance Summary,कर्मचारी रजा शिल्लक सारांश, Eway Bill,ईवे बिल, Expiring Memberships,कालबाह्यता सदस्यत्व, -Fichier des Ecritures Comptables [FEC],फिचर्स डेस इक्वेटरीज कॉप्पीटेबल [एफईसी], +Fichier des Ecritures Comptables,फिचर्स डेस इक्वेटरीज कॉप्पीटेबल [एफईसी], Final Assessment Grades,अंतिम मूल्यांकन ग्रेड, Fixed Asset Register,निश्चित मालमत्ता नोंदणी, Gross and Net Profit Report,एकूण आणि निव्वळ नफा अहवाल, diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv index ae49d72d244..c561110659f 100644 --- a/erpnext/translations/ms.csv +++ b/erpnext/translations/ms.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Pekerja Cuti Baki, Employee Leave Balance Summary,Ringkasan Baki Cuti Pekerja, Eway Bill,Eway Bill, Expiring Memberships,Keahlian yang akan tamat tempoh, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Gred Penilaian Akhir, Fixed Asset Register,Daftar Aset Tetap, Gross and Net Profit Report,Laporan Keuntungan Kasar dan Bersih, diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv index bbdd5603b8c..c00f8e989c2 100644 --- a/erpnext/translations/my.csv +++ b/erpnext/translations/my.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,ဝန်ထမ်းထွက်ခွာ Balance, Employee Leave Balance Summary,ဝန်ထမ်း Leave Balance အကျဉ်းချုပ်, Eway Bill,Eway ဘီလ်, Expiring Memberships,ကုန်ဆုံးမည့်အဖွဲ့ဝင်အဖြစ်, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,ဗိုလ်လုပွဲအကဲဖြတ်အတန်း, Fixed Asset Register,Fixed Asset မှတ်ပုံတင်မည်, Gross and Net Profit Report,စုစုပေါင်းနှင့် Net ကအမြတ်အစီရင်ခံစာ, diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv index 71f5a698af5..93e283d752a 100644 --- a/erpnext/translations/nl.csv +++ b/erpnext/translations/nl.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Werknemer Verlof Balans, Employee Leave Balance Summary,Werknemersverlofsaldo Samenvatting, Eway Bill,Eway Bill, Expiring Memberships,Verlopen Lidmaatschappen, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Eindbeoordeling, Fixed Asset Register,Vaste-activaregister, Gross and Net Profit Report,Bruto- en nettowinstrapport, diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv index 13b40d3eee2..846652361d4 100644 --- a/erpnext/translations/no.csv +++ b/erpnext/translations/no.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Ansatt La Balance, Employee Leave Balance Summary,Ansattes permisjonsbalanse Sammendrag, Eway Bill,Eway Bill, Expiring Memberships,Utløpende medlemsskap, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Final Assessment Grades, Fixed Asset Register,Fast eiendeleregister, Gross and Net Profit Report,Brutto og netto resultatrapport, diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv index df41e39862c..b659caf90d0 100644 --- a/erpnext/translations/pl.csv +++ b/erpnext/translations/pl.csv @@ -7412,7 +7412,7 @@ Employee Leave Balance,Bilans Nieobecności Pracownika, Employee Leave Balance Summary,Podsumowanie salda urlopu pracownika, Eway Bill,Eway Bill, Expiring Memberships,Wygaśnięcie członkostwa, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Oceny końcowe, Fixed Asset Register,Naprawiono rejestr aktywów, Gross and Net Profit Report,Raport zysku brutto i netto, diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv index c960216e4cc..89f6a02671a 100644 --- a/erpnext/translations/ps.csv +++ b/erpnext/translations/ps.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,د کارګر اجازه بیلانس, Employee Leave Balance Summary,د کارمند رخصت توازن لنډیز, Eway Bill,د تل لپاره, Expiring Memberships,د غړیتوب پای ته رسیدو, -Fichier des Ecritures Comptables [FEC],فیکیر des Ecritures لنډیزونه [FEC], +Fichier des Ecritures Comptables,فیکیر des Ecritures لنډیزونه [FEC], Final Assessment Grades,د ارزونې ارزونه, Fixed Asset Register,ثابت شتمني ثبت, Gross and Net Profit Report,د ناخالص او خالص ګټې راپور, diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv index 00d2acafb20..d4b2f99c086 100644 --- a/erpnext/translations/pt-BR.csv +++ b/erpnext/translations/pt-BR.csv @@ -7602,7 +7602,7 @@ Employee Leave Balance,Saldo de Licenças do Colaborador, Employee Leave Balance Summary,Resumo do Saldo de Empregados, Eway Bill,Conta de Saída, Expiring Memberships,Membros Vencedores, -Fichier des Ecritures Comptables [FEC],Fichier Des Ecritures Comptables [fec], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Avaliação Final de Notas, Fixed Asset Register,Registro de Ativo Fixo, Gross and Net Profit Report,Relatório de Lucro Bruto e Líquido, diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv index 8684276440f..3083d89a81d 100644 --- a/erpnext/translations/pt.csv +++ b/erpnext/translations/pt.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Balanço de Licenças do Funcionário, Employee Leave Balance Summary,Resumo do Saldo de Empregados, Eway Bill,Conta de saída, Expiring Memberships,Membros vencedores, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Avaliação final de notas, Fixed Asset Register,Registro de Ativo Fixo, Gross and Net Profit Report,Relatório de Lucro Bruto e Líquido, diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv index ac7e598e2d7..85efccc29e6 100644 --- a/erpnext/translations/ro.csv +++ b/erpnext/translations/ro.csv @@ -7489,7 +7489,7 @@ Employee Leave Balance,Bilant Concediu Angajat, Employee Leave Balance Summary,Rezumatul soldului concediilor angajaților, Eway Bill,Eway Bill, Expiring Memberships,Expirarea calității de membru, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptabile [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptabile [FEC], Final Assessment Grades,Evaluări finale, Fixed Asset Register,Registrul activelor fixe, Gross and Net Profit Report,Raport de profit brut și net, diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv index 3cffa405339..bbfaf1b9338 100644 --- a/erpnext/translations/ru.csv +++ b/erpnext/translations/ru.csv @@ -7521,7 +7521,7 @@ Employee Leave Balance,Сотрудник Оставить Баланс, Employee Leave Balance Summary,Сводный баланс по сотрудникам, Eway Bill,Eway Bill, Expiring Memberships,Срок действия членства, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Итоговые оценки, Fixed Asset Register,Регистр фиксированных активов, Gross and Net Profit Report,Отчет о валовой и чистой прибыли, diff --git a/erpnext/translations/rw.csv b/erpnext/translations/rw.csv index fa5c0150c22..83a2b67227f 100644 --- a/erpnext/translations/rw.csv +++ b/erpnext/translations/rw.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Umukozi Kureka Kuringaniza, Employee Leave Balance Summary,Umukozi Kureka Impirimbanyi, Eway Bill,Eway Bill, Expiring Memberships,Abanyamuryango barangiye, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Ibishobora gukoreshwa [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Ibishobora gukoreshwa [FEC], Final Assessment Grades,Impamyabumenyi Yanyuma, Fixed Asset Register,Kwiyandikisha k'umutungo utimukanwa, Gross and Net Profit Report,Raporo y'inyungu rusange, diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv index 82594aad5f6..a6960c840a0 100644 --- a/erpnext/translations/si.csv +++ b/erpnext/translations/si.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,සේවක නිවාඩු ශේෂ, Employee Leave Balance Summary,සේවක නිවාඩු ශේෂ සාරාංශය, Eway Bill,ඊවා බිල්, Expiring Memberships,සාමාජිකත්වය කල් ඉකුත් වීම, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,අවසාන ඇගයීම් ශ්රේණි, Fixed Asset Register,ස්ථාවර වත්කම් ලේඛනය, Gross and Net Profit Report,දළ සහ ශුද්ධ ලාභ වාර්තාව, diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv index a33f78e5c14..6dc153f4c4e 100644 --- a/erpnext/translations/sk.csv +++ b/erpnext/translations/sk.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Zostatok voľna pre zamestnanca, Employee Leave Balance Summary,Zhrnutie stavu zostatku zamestnancov, Eway Bill,Eway Bill, Expiring Memberships,Platnosť členstva, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Záverečné stupne hodnotenia, Fixed Asset Register,Register fixných aktív, Gross and Net Profit Report,Správa o hrubom a čistom zisku, diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv index c125f8b72ed..8892c86e3a3 100644 --- a/erpnext/translations/sl.csv +++ b/erpnext/translations/sl.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Zaposleni Leave Balance, Employee Leave Balance Summary,Povzetek salda zaposlenih, Eway Bill,Eway Bill, Expiring Memberships,Izguba članstva, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Končne ocene, Fixed Asset Register,Register nepremičnega premoženja, Gross and Net Profit Report,Poročilo o bruto in neto dobičku, diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv index 7989452ae47..db303fc3bbf 100644 --- a/erpnext/translations/sq.csv +++ b/erpnext/translations/sq.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Punonjës Pushimi Bilanci, Employee Leave Balance Summary,Përmbledhja e Bilancit të Punonjësve, Eway Bill,Eway Bill, Expiring Memberships,Anëtarët e skadimit, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Notat e vlerësimit përfundimtar, Fixed Asset Register,Regjistri i Pasurive Fikse, Gross and Net Profit Report,Raporti i fitimit bruto dhe neto, diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv index 914cb8b5cb9..45910e8ead8 100644 --- a/erpnext/translations/sr.csv +++ b/erpnext/translations/sr.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Запослени одсуство Биланс, Employee Leave Balance Summary,Резиме биланса напуштања запослених, Eway Bill,Еваи Билл, Expiring Memberships,Истиче чланства, -Fichier des Ecritures Comptables [FEC],Фицхиер дес Ецритурес Цомптаблес [ФЕЦ], +Fichier des Ecritures Comptables,Фицхиер дес Ецритурес Цомптаблес [ФЕЦ], Final Assessment Grades,Коначне оцене, Fixed Asset Register,Регистар фиксне имовине, Gross and Net Profit Report,Извештај о бруто и нето добити, diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv index e94e42a9795..c984b7de16e 100644 --- a/erpnext/translations/sv.csv +++ b/erpnext/translations/sv.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Anställd Avgångskostnad, Employee Leave Balance Summary,Sammanfattning av anställdas ledighet, Eway Bill,Eway Bill, Expiring Memberships,Utgående medlemskap, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Final Assessment Grades, Fixed Asset Register,Fast tillgångsregister, Gross and Net Profit Report,Brutto- och nettovinstrapport, diff --git a/erpnext/translations/sw.csv b/erpnext/translations/sw.csv index 0a19526268c..d824c1f26da 100644 --- a/erpnext/translations/sw.csv +++ b/erpnext/translations/sw.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Mizani ya Waajiriwa, Employee Leave Balance Summary,Muhtasari wa Akiba ya Mfanyikazi, Eway Bill,Bunge Bill, Expiring Memberships,Kuondoa Uanachama, -Fichier des Ecritures Comptables [FEC],Faili la Maandiko ya Comptables [FEC], +Fichier des Ecritures Comptables,Faili la Maandiko ya Comptables [FEC], Final Assessment Grades,Tathmini ya Mwisho ya Masomo, Fixed Asset Register,Rejista ya Mali isiyohamishika, Gross and Net Profit Report,Pato la jumla na faida ya Net, diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv index bd224527ed1..db4ab0e0f82 100644 --- a/erpnext/translations/ta.csv +++ b/erpnext/translations/ta.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,பணியாளர் விடுப்பு இர Employee Leave Balance Summary,பணியாளர் விடுப்பு இருப்பு சுருக்கம், Eway Bill,ஈவ் பில், Expiring Memberships,காலாவதியாகும் உறுப்பினர்கள், -Fichier des Ecritures Comptables [FEC],ஃபிஷியர் டெஸ் எக்சிரிச்சர் காம்பப்டுகள் [FEC], +Fichier des Ecritures Comptables,ஃபிஷியர் டெஸ் எக்சிரிச்சர் காம்பப்டுகள் [FEC], Final Assessment Grades,இறுதி மதிப்பீட்டு தரங்கள், Fixed Asset Register,நிலையான சொத்து பதிவு, Gross and Net Profit Report,மொத்த மற்றும் நிகர லாப அறிக்கை, diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv index 830f8fe99fa..a29c12b9d42 100644 --- a/erpnext/translations/te.csv +++ b/erpnext/translations/te.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,ఉద్యోగి సెలవు సంతులన Employee Leave Balance Summary,ఉద్యోగి సెలవు బ్యాలెన్స్ సారాంశం, Eway Bill,ఇవే బిల్, Expiring Memberships,ముగుస్తున్న సభ్యత్వాలు, -Fichier des Ecritures Comptables [FEC],ఫిషియర్ డెస్ ఈక్విట్రర్స్ కాంపెబుల్స్ [FEC], +Fichier des Ecritures Comptables,ఫిషియర్ డెస్ ఈక్విట్రర్స్ కాంపెబుల్స్ [FEC], Final Assessment Grades,ఫైనల్ అసెస్మెంట్ గ్రేడ్స్, Fixed Asset Register,స్థిర ఆస్తి రిజిస్టర్, Gross and Net Profit Report,స్థూల మరియు నికర లాభ నివేదిక, diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv index 4168065cef6..6852b752e0f 100644 --- a/erpnext/translations/th.csv +++ b/erpnext/translations/th.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,ยอดคงเหลือพนักงานออ Employee Leave Balance Summary,สรุปยอดการลาพนักงาน, Eway Bill,Eway Bill, Expiring Memberships,สมาชิกที่หมดอายุ, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,คะแนนการประเมินขั้นสุดท้าย, Fixed Asset Register,ทะเบียนสินทรัพย์ถาวร, Gross and Net Profit Report,รายงานกำไรขั้นต้นและกำไรสุทธิ, diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv index a474290c03e..b1ee8033fb5 100644 --- a/erpnext/translations/tr.csv +++ b/erpnext/translations/tr.csv @@ -7601,7 +7601,7 @@ Employee Leave Balance,Personelin Kalan İzni, Employee Leave Balance Summary,Personel İzin Bakiyesi Özeti, Eway Bill,Eway Bill, Expiring Memberships,Süregelen Üyelikler, -Fichier des Ecritures Comptables [FEC],Uyumlu Fichier des Ecritures [FEC], +Fichier des Ecritures Comptables,Uyumlu Fichier des Ecritures [FEC], Final Assessment Grades,Final Değerlendirme Notları, Fixed Asset Register,Sabit Kıymet Kaydı, Gross and Net Profit Report,Brüt ve Net Kar Raporu, diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv index 4ed72fb70cd..9e7dee391bf 100644 --- a/erpnext/translations/uk.csv +++ b/erpnext/translations/uk.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Залишок днів відпусток працівн Employee Leave Balance Summary,Підсумок залишків працівника, Eway Bill,Евей Білл, Expiring Memberships,"Членство, що закінчується", -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Остаточні оцінки, Fixed Asset Register,Реєстр фіксованих активів, Gross and Net Profit Report,Звіт про валовий та чистий прибуток, diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv index 0a53d622094..2994a8b9511 100644 --- a/erpnext/translations/ur.csv +++ b/erpnext/translations/ur.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,ملازم کی رخصت بیلنس, Employee Leave Balance Summary,ملازم لیون بیلنس کا خلاصہ۔, Eway Bill,ایو بل, Expiring Memberships,ختم ہونے والی رکنیت, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,حتمی تشخیصی گریڈ, Fixed Asset Register,فکسڈ اثاثہ کا اندراج۔, Gross and Net Profit Report,مجموعی اور خالص منافع کی رپورٹ۔, diff --git a/erpnext/translations/uz.csv b/erpnext/translations/uz.csv index 89e53331f11..91656a739b3 100644 --- a/erpnext/translations/uz.csv +++ b/erpnext/translations/uz.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Xodimlarning balansidan chiqishi, Employee Leave Balance Summary,Xodimlarning mehnat ta'tilining yakuniy xulosasi, Eway Bill,Evey Bill, Expiring Memberships,Registratsiya muddati tugaydi, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Kompartiyalari [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Kompartiyalari [FEC], Final Assessment Grades,Yakuniy chiqishlar Baholari, Fixed Asset Register,Ruxsat berilgan mulk registri, Gross and Net Profit Report,Yalpi va sof foyda haqida hisobot, diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv index 021fc76b2ee..7aa94592855 100644 --- a/erpnext/translations/vi.csv +++ b/erpnext/translations/vi.csv @@ -7611,7 +7611,7 @@ Employee Leave Balance,Để lại cân nhân viên, Employee Leave Balance Summary,Tóm tắt số dư nhân viên, Eway Bill,Eway Bill, Expiring Memberships,Thành viên hết hạn, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,Các lớp đánh giá cuối cùng, Fixed Asset Register,Đăng ký tài sản cố định, Gross and Net Profit Report,Báo cáo lợi nhuận gộp và lãi ròng, diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv index ab9f84c8608..0e9aaa31291 100644 --- a/erpnext/translations/zh.csv +++ b/erpnext/translations/zh.csv @@ -7603,7 +7603,7 @@ Employee Leave Balance,员工休假余额（天数）, Employee Leave Balance Summary,员工休假余额摘要, Eway Bill,Eway Bill, Expiring Memberships,即将到期的会员, -Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC], +Fichier des Ecritures Comptables,Fichier des Ecritures Comptables, Final Assessment Grades,最终评估等级, Fixed Asset Register,固定资产登记册, Gross and Net Profit Report,毛利润和净利润报告, -- GitLab From baad9073f10280d11810e3bfb7659f47b95264d5 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Thu, 30 Nov 2023 11:32:29 +0100 Subject: [PATCH 4/4] fix: check if country is France --- erpnext/regional/france/utils.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/erpnext/regional/france/utils.py b/erpnext/regional/france/utils.py index 038f0ef6c8c..8756060c2b1 100644 --- a/erpnext/regional/france/utils.py +++ b/erpnext/regional/france/utils.py @@ -15,17 +15,18 @@ def test_method(): def generate_fec_report(doc, method): - filters = {"company": doc.company, "fiscal_year": doc.fiscal_year} - fec_file, title = export_report(filters, return_file=True) + if frappe.db.get_value("Company", doc.company, "country") == "France": + filters = {"company": doc.company, "fiscal_year": doc.fiscal_year} + fec_file, title = export_report(filters, return_file=True) - _file = frappe.get_doc( - { - "doctype": "File", - "file_name": f"{title}.txt", - "is_private": True, - "content": fec_file, - "attached_to_name": doc.name, - "attached_to_doctype": doc.doctype, - } - ) - return _file.insert(ignore_if_duplicate=True) + _file = frappe.get_doc( + { + "doctype": "File", + "file_name": f"{title}.txt", + "is_private": True, + "content": fec_file, + "attached_to_name": doc.name, + "attached_to_doctype": doc.doctype, + } + ) + return _file.insert(ignore_if_duplicate=True) -- GitLab