From 2bbe464f59e2808a35f2d8d2bc938e05b6ef8af2 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 24 Jul 2020 17:53:22 +0530 Subject: [PATCH 001/259] feat: Allow skip tables during backups --- frappe/utils/backups.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 3b905de6bd..d0867e40e6 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -148,7 +148,11 @@ class BackupGenerator: args = dict([item[0], frappe.utils.esc(str(item[1]), '$ ')] for item in self.__dict__.copy().items()) - cmd_string = """mysqldump --single-transaction --quick --lock-tables=false -u %(user)s -p%(password)s %(db_name)s -h %(db_host)s -P %(db_port)s | gzip > %(backup_path_db)s """ % args + if self.verbose: + print("Skipping Tables: {0}\n".format(", ".join(frappe.conf.ignore_tables_in_backup))) + + args["skip_tables"] = " ".join(["--ignore-table={0}.{1}".format(frappe.conf.db_name, table) for table in frappe.conf.ignore_tables_in_backup]) + cmd_string = """mysqldump --single-transaction --quick --lock-tables=false -u %(user)s -p%(password)s %(db_name)s -h %(db_host)s -P %(db_port)s %(skip_tables)s | gzip > %(backup_path_db)s """ % args if self.db_type == 'postgres': cmd_string = "pg_dump postgres://{user}:{password}@{db_host}:{db_port}/{db_name} | gzip > {backup_path_db}".format( From befea91e6d5b7081960807976107f823ab559d18 Mon Sep 17 00:00:00 2001 From: gavin Date: Mon, 27 Jul 2020 11:01:01 +0530 Subject: [PATCH 002/259] fix: empty conf value for ignore_tables_in_backup Co-authored-by: Faris Ansari --- frappe/utils/backups.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index d0867e40e6..e475cef276 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -151,7 +151,7 @@ class BackupGenerator: if self.verbose: print("Skipping Tables: {0}\n".format(", ".join(frappe.conf.ignore_tables_in_backup))) - args["skip_tables"] = " ".join(["--ignore-table={0}.{1}".format(frappe.conf.db_name, table) for table in frappe.conf.ignore_tables_in_backup]) + args["skip_tables"] = " ".join(["--ignore-table={0}.{1}".format(frappe.conf.db_name, table) for table in frappe.conf.ignore_tables_in_backup or []]) cmd_string = """mysqldump --single-transaction --quick --lock-tables=false -u %(user)s -p%(password)s %(db_name)s -h %(db_host)s -P %(db_port)s %(skip_tables)s | gzip > %(backup_path_db)s """ % args if self.db_type == 'postgres': From 6cb6a18b48a050efc7ee1e307f180d3e4ba55ec3 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 23 Sep 2020 13:18:04 +0530 Subject: [PATCH 003/259] feat: Ability to exclude/include certain doctypes from conf or via CLI --- frappe/commands/site.py | 18 +++++++- frappe/utils/backups.py | 92 +++++++++++++++++++++++++++++++++-------- 2 files changed, 90 insertions(+), 20 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index c5008b32a5..a727341b73 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -387,10 +387,13 @@ def use(site, sites_path='.'): @click.command('backup') @click.option('--with-files', default=False, is_flag=True, help="Take backup with files") +@click.option('--ignore-backup-conf', default=False, is_flag=True, help="Ignore excludes/includes set in config") +@click.option('--include', default="", type=str, help="Specify the DocTypes to backup seperated by commas") +@click.option('--exclude', default="", type=str, help="Specify the DocTypes to not backup seperated by commas") @click.option('--verbose', default=False, is_flag=True) @pass_context def backup(context, with_files=False, backup_path_db=None, backup_path_files=None, - backup_path_private_files=None, quiet=False, verbose=False): + backup_path_private_files=None, quiet=False, verbose=False, ignore_backup_conf=False, include="", exclude=""): "Backup" from frappe.utils.backups import scheduled_backup verbose = verbose or context.verbose @@ -399,10 +402,21 @@ def backup(context, with_files=False, backup_path_db=None, backup_path_files=Non try: frappe.init(site=site) frappe.connect() - odb = scheduled_backup(ignore_files=not with_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, backup_path_private_files=backup_path_private_files, force=True, verbose=verbose) + odb = scheduled_backup( + ignore_files=not with_files, + backup_path_db=backup_path_db, + backup_path_files=backup_path_files, + backup_path_private_files=backup_path_private_files, + ignore_conf=ignore_backup_conf, + include_doctypes=include, + exclude_doctypes=exclude, + verbose=verbose, + force=True, + ) except Exception as e: if verbose: print("Backup failed for {0}. Database or site_config.json may be corrupted".format(site)) + print(e) exit_code = 1 continue diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 4d29134abd..d3a063cd89 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -18,6 +18,7 @@ from frappe.utils import cstr, get_url, now_datetime # backup variable for backwards compatibility verbose = False _verbose = verbose +base_tables = ["__Auth", "__global_search", "__UserSettings"] class BackupGenerator: @@ -29,7 +30,7 @@ class BackupGenerator: """ def __init__(self, db_name, user, password, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, db_host="localhost", db_port=None, verbose=False, - db_type='mariadb', backup_path_conf=None): + db_type='mariadb', backup_path_conf=None, ignore_conf=False, include_doctypes="", exclude_doctypes=""): global _verbose self.db_host = db_host self.db_port = db_port @@ -41,6 +42,9 @@ class BackupGenerator: self.backup_path_db = backup_path_db self.backup_path_files = backup_path_files self.backup_path_private_files = backup_path_private_files + self.ignore_conf = ignore_conf + self.include_doctypes = include_doctypes + self.exclude_doctypes = exclude_doctypes if not self.db_type: self.db_type = 'mariadb' @@ -54,6 +58,7 @@ class BackupGenerator: self.site_slug = site.replace('.', '_') self.verbose = verbose self.setup_backup_directory() + self.setup_backup_tables() _verbose = verbose def setup_backup_directory(self): @@ -68,6 +73,35 @@ class BackupGenerator: dir = os.path.dirname(file_path) os.makedirs(dir, exist_ok=True) + def setup_backup_tables(self): + """Sets self.backup_includes, self.backup_excludes based on passed args + """ + def get_tables(doctypes): + tables = [] + for doctype in doctypes: + if doctype: + if doctype.startswith("tab"): + tables.append(doctype) + else: + tables.append("tab" + doctype) + return tables + + passed_tables = { + "include": get_tables(self.include_doctypes.strip().split(",")), + "exclude": get_tables(self.exclude_doctypes.strip().split(",")) + } + conf_tables = { + "include": get_tables(frappe.conf.backup.get("includes", [])) + base_tables, + "exclude": get_tables(frappe.conf.backup.get("excludes", [])) + } + + self.backup_includes = passed_tables["include"] + self.backup_excludes = passed_tables["exclude"] + + if not self.ignore_conf: + self.backup_includes = self.backup_includes or conf_tables["include"] + self.backup_excludes = self.backup_excludes or conf_tables["exclude"] + @property def site_config_backup_path(self): # For backwards compatibility @@ -189,23 +223,42 @@ class BackupGenerator: args = dict([item[0], frappe.utils.esc(str(item[1]), '$ ')] for item in self.__dict__.copy().items()) - if self.verbose: - print("Skipping Tables: {0}\n".format(", ".join(frappe.conf.ignore_tables_in_backup))) - - args["skip_tables"] = " ".join(["--ignore-table={0}.{1}".format(frappe.conf.db_name, table) for table in frappe.conf.ignore_tables_in_backup or []]) - cmd_string = """mysqldump --single-transaction --quick --lock-tables=false -u %(user)s -p%(password)s %(db_name)s -h %(db_host)s -P %(db_port)s %(skip_tables)s | gzip > %(backup_path_db)s """ % args + if self.backup_includes: + print("Backing Up Tables: {0}\n".format(", ".join(self.backup_includes))) + elif self.backup_excludes: + print("Skipping Tables: {0}\n".format(", ".join(self.backup_excludes))) if self.db_type == 'postgres': - cmd_string = "pg_dump postgres://{user}:{password}@{db_host}:{db_port}/{db_name} | gzip > {backup_path_db}".format( - user=args.get('user'), - password=args.get('password'), - db_host=args.get('db_host'), - db_port=args.get('db_port'), - db_name=args.get('db_name'), - backup_path_db=args.get('backup_path_db') - ) + if self.backup_includes: + args["include"] = " ".join(["--table='{0}'".format(table) for table in self.backup_includes]) + elif self.backup_excludes: + args["exclude"] = " ".join(["--exclude-table='{0}'".format(table) for table in self.backup_excludes]) - err, out = frappe.utils.execute_in_shell(cmd_string) + cmd_string = "pg_dump postgres://{user}:{password}@{db_host}:{db_port}/{db_name} {include} {exclude} | gzip > {backup_path_db}" + + else: + if self.backup_includes: + args["include"] = " ".join(["'{0}'".format(x) for x in self.backup_includes]) + + elif self.backup_excludes: + args["exclude"] = " ".join(["--ignore-table='{0}.{1}'".format(frappe.conf.db_name, table) for table in self.backup_excludes]) + + cmd_string = "mysqldump --single-transaction --quick --lock-tables=false -u {user} -p{password} {db_name} -h {db_host} -P {db_port} {include} {exclude} | gzip > {backup_path_db}" + + command = cmd_string.format( + user=args.get('user'), + password=args.get('password'), + db_host=args.get('db_host'), + db_port=args.get('db_port'), + db_name=args.get('db_name'), + backup_path_db=args.get('backup_path_db'), + exclude=args.get('exclude', ''), + include=args.get('include', '') + ) + + print(command) + + err, out = frappe.utils.execute_in_shell(command) def send_email(self): """ @@ -279,14 +332,14 @@ def fetch_latest_backups(): } -def scheduled_backup(older_than=6, ignore_files=False, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, force=False, verbose=False): +def scheduled_backup(older_than=6, ignore_files=False, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, force=False, verbose=False, ignore_conf=False, include_doctypes="", exclude_doctypes=""): """this function is called from scheduler deletes backups older than 7 days takes backup""" - odb = new_backup(older_than, ignore_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, force=force, verbose=verbose) + odb = new_backup(older_than, ignore_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, force=force, verbose=verbose, ignore_conf=ignore_conf, include_doctypes=include_doctypes, exclude_doctypes=exclude_doctypes) return odb -def new_backup(older_than=6, ignore_files=False, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, force=False, verbose=False): +def new_backup(older_than=6, ignore_files=False, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, force=False, verbose=False, ignore_conf=False, include_doctypes="", exclude_doctypes=""): delete_temp_backups(older_than = frappe.conf.keep_backups_for_hours or 24) odb = BackupGenerator(frappe.conf.db_name, frappe.conf.db_name,\ frappe.conf.db_password, @@ -295,6 +348,9 @@ def new_backup(older_than=6, ignore_files=False, backup_path_db=None, backup_pat db_host = frappe.db.host, db_port = frappe.db.port, db_type = frappe.conf.db_type, + ignore_conf=ignore_conf, + include_doctypes=include_doctypes, + exclude_doctypes=exclude_doctypes, verbose=verbose) odb.get_backup(older_than, ignore_files, force=force) return odb From bb2a1910e86c959286f461ededdf7678dffa6dfc Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 24 Sep 2020 11:34:43 +0530 Subject: [PATCH 004/259] fix: Handle excludes or includes explicitly * Take backup only if doctype exists * Show mysql command only if verbose is passed --- frappe/utils/backups.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index d3a063cd89..b8d1da299a 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -76,10 +76,11 @@ class BackupGenerator: def setup_backup_tables(self): """Sets self.backup_includes, self.backup_excludes based on passed args """ + existing_doctypes = set([x.name for x in frappe.get_all("DocType")]) def get_tables(doctypes): tables = [] for doctype in doctypes: - if doctype: + if doctype and doctype in existing_doctypes: if doctype.startswith("tab"): tables.append(doctype) else: @@ -98,7 +99,7 @@ class BackupGenerator: self.backup_includes = passed_tables["include"] self.backup_excludes = passed_tables["exclude"] - if not self.ignore_conf: + if not (self.backup_includes or self.backup_excludes) and not self.ignore_conf: self.backup_includes = self.backup_includes or conf_tables["include"] self.backup_excludes = self.backup_excludes or conf_tables["exclude"] @@ -239,7 +240,6 @@ class BackupGenerator: else: if self.backup_includes: args["include"] = " ".join(["'{0}'".format(x) for x in self.backup_includes]) - elif self.backup_excludes: args["exclude"] = " ".join(["--ignore-table='{0}.{1}'".format(frappe.conf.db_name, table) for table in self.backup_excludes]) @@ -256,7 +256,8 @@ class BackupGenerator: include=args.get('include', '') ) - print(command) + if self.verbose: + print(command) err, out = frappe.utils.execute_in_shell(command) From bde7adeb2f597ef59d7c173ad5265b4b1fab6c27 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 7 Oct 2020 14:06:28 +0530 Subject: [PATCH 005/259] style: Black + flake8 --- frappe/utils/backups.py | 445 ++++++++++++++++++++++++++++------------ 1 file changed, 314 insertions(+), 131 deletions(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 25147f2085..b59f5526e9 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -2,7 +2,6 @@ # MIT License. See license.txt # imports - standard imports -import json import os from calendar import timegm from datetime import datetime @@ -25,12 +24,31 @@ base_tables = ["__Auth", "__global_search", "__UserSettings"] class BackupGenerator: """ - This class contains methods to perform On Demand Backup + This class contains methods to perform On Demand Backup - To initialize, specify (db_name, user, password, db_file_name=None, db_host="localhost") - If specifying db_file_name, also append ".sql.gz" + To initialize, specify (db_name, user, password, db_file_name=None, db_host="localhost") + If specifying db_file_name, also append ".sql.gz" """ - def __init__(self, db_name, user, password, backup_path=None, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, db_host="localhost", db_port=None, db_type='mariadb', backup_path_conf=None, ignore_conf=False, compress_files=False, include_doctypes="", exclude_doctypes="", verbose=False): + + def __init__( + self, + db_name, + user, + password, + backup_path=None, + backup_path_db=None, + backup_path_files=None, + backup_path_private_files=None, + db_host="localhost", + db_port=None, + db_type="mariadb", + backup_path_conf=None, + ignore_conf=False, + compress_files=False, + include_doctypes="", + exclude_doctypes="", + verbose=False, + ): global _verbose self.compress_files = compress_files or compress self.db_host = db_host @@ -49,22 +67,29 @@ class BackupGenerator: self.exclude_doctypes = exclude_doctypes if not self.db_type: - self.db_type = 'mariadb' + self.db_type = "mariadb" - if not self.db_port and self.db_type == 'mariadb': - self.db_port = 3306 - elif not self.db_port and self.db_type == 'postgres': - self.db_port = 5432 + if not self.db_port: + if self.db_type == "mariadb": + self.db_port = 3306 + if self.db_type == "postgres": + self.db_port = 5432 site = frappe.local.site or frappe.generate_hash(length=8) - self.site_slug = site.replace('.', '_') + self.site_slug = site.replace(".", "_") self.verbose = verbose self.setup_backup_directory() self.setup_backup_tables() _verbose = verbose def setup_backup_directory(self): - specified = self.backup_path or self.backup_path_db or self.backup_path_files or self.backup_path_private_files or self.backup_path_conf + specified = ( + self.backup_path + or self.backup_path_db + or self.backup_path_files + or self.backup_path_private_files + or self.backup_path_conf + ) if not specified: backups_folder = get_backup_path() @@ -74,15 +99,22 @@ class BackupGenerator: if self.backup_path: os.makedirs(self.backup_path, exist_ok=True) - for file_path in set([self.backup_path_files, self.backup_path_db, self.backup_path_private_files, self.backup_path_conf]): + for file_path in set( + [ + self.backup_path_files, + self.backup_path_db, + self.backup_path_private_files, + self.backup_path_conf, + ] + ): if file_path: dir = os.path.dirname(file_path) os.makedirs(dir, exist_ok=True) def setup_backup_tables(self): - """Sets self.backup_includes, self.backup_excludes based on passed args - """ + """Sets self.backup_includes, self.backup_excludes based on passed args""" existing_doctypes = set([x.name for x in frappe.get_all("DocType")]) + def get_tables(doctypes): tables = [] for doctype in doctypes: @@ -95,11 +127,11 @@ class BackupGenerator: passed_tables = { "include": get_tables(self.include_doctypes.strip().split(",")), - "exclude": get_tables(self.exclude_doctypes.strip().split(",")) + "exclude": get_tables(self.exclude_doctypes.strip().split(",")), } conf_tables = { "include": get_tables(frappe.conf.backup.get("includes", [])) + base_tables, - "exclude": get_tables(frappe.conf.backup.get("excludes", [])) + "exclude": get_tables(frappe.conf.backup.get("excludes", [])), } self.backup_includes = passed_tables["include"] @@ -112,24 +144,43 @@ class BackupGenerator: @property def site_config_backup_path(self): # For backwards compatibility - click.secho("BackupGenerator.site_config_backup_path has been deprecated in favour of BackupGenerator.backup_path_conf", fg="yellow") + click.secho( + "BackupGenerator.site_config_backup_path has been deprecated in favour of" + " BackupGenerator.backup_path_conf", + fg="yellow", + ) return getattr(self, "backup_path_conf", None) def get_backup(self, older_than=24, ignore_files=False, force=False): """ - Takes a new dump if existing file is old - and sends the link to the file as email + Takes a new dump if existing file is old + and sends the link to the file as email """ - #Check if file exists and is less than a day old - #If not Take Dump + # Check if file exists and is less than a day old + # If not Take Dump if not force: - last_db, last_file, last_private_file, site_config_backup_path = self.get_recent_backup(older_than) + ( + last_db, + last_file, + last_private_file, + site_config_backup_path, + ) = self.get_recent_backup(older_than) else: - last_db, last_file, last_private_file, site_config_backup_path = False, False, False, False + last_db, last_file, last_private_file, site_config_backup_path = ( + False, + False, + False, + False, + ) - self.todays_date = now_datetime().strftime('%Y%m%d_%H%M%S') + self.todays_date = now_datetime().strftime("%Y%m%d_%H%M%S") - if not (self.backup_path_conf and self.backup_path_db and self.backup_path_files and self.backup_path_private_files): + if not ( + self.backup_path_conf + and self.backup_path_db + and self.backup_path_files + and self.backup_path_private_files + ): self.set_backup_file_name() if not (last_db and last_file and last_private_file and site_config_backup_path): @@ -145,7 +196,7 @@ class BackupGenerator: self.backup_path_conf = site_config_backup_path def set_backup_file_name(self): - #Generate a random name using today's date and a 8 digit random number + # Generate a random name using today's date and a 8 digit random number for_conf = self.todays_date + "-" + self.site_slug + "-site_config_backup.json" for_db = self.todays_date + "-" + self.site_slug + "-database.sql.gz" ext = "tgz" if self.compress_files else "tar" @@ -191,8 +242,7 @@ class BackupGenerator: return file_path latest_backups = { - file_type: get_latest(pattern) - for file_type, pattern in file_type_slugs.items() + file_type: get_latest(pattern) for file_type, pattern in file_type_slugs.items() } recent_backups = { @@ -208,32 +258,40 @@ class BackupGenerator: def zip_files(self): # For backwards compatibility - pre v13 - click.secho("BackupGenerator.zip_files has been deprecated in favour of BackupGenerator.backup_files", fg="yellow") + click.secho( + "BackupGenerator.zip_files has been deprecated in favour of" + " BackupGenerator.backup_files", + fg="yellow", + ) return self.backup_files() def get_summary(self): summary = { "config": { "path": self.backup_path_conf, - "size": get_file_size(self.backup_path_conf, format=True) + "size": get_file_size(self.backup_path_conf, format=True), }, "database": { "path": self.backup_path_db, - "size": get_file_size(self.backup_path_db, format=True) - } + "size": get_file_size(self.backup_path_db, format=True), + }, } - if os.path.exists(self.backup_path_files) and os.path.exists(self.backup_path_private_files): - summary.update({ - "public": { - "path": self.backup_path_files, - "size": get_file_size(self.backup_path_files, format=True) - }, - "private": { - "path": self.backup_path_private_files, - "size": get_file_size(self.backup_path_private_files, format=True) + if os.path.exists(self.backup_path_files) and os.path.exists( + self.backup_path_private_files + ): + summary.update( + { + "public": { + "path": self.backup_path_files, + "size": get_file_size(self.backup_path_files, format=True), + }, + "private": { + "path": self.backup_path_private_files, + "size": get_file_size(self.backup_path_private_files, format=True), + }, } - }) + ) return summary @@ -249,13 +307,17 @@ class BackupGenerator: for folder in ("public", "private"): files_path = frappe.get_site_path(folder, "files") - backup_path = self.backup_path_files if folder=="public" else self.backup_path_private_files + backup_path = ( + self.backup_path_files if folder == "public" else self.backup_path_private_files + ) if self.compress_files: cmd_string = "tar cf - {1} | gzip > {0}" else: cmd_string = "tar -cf {0} {1}" - output = subprocess.check_output(cmd_string.format(backup_path, files_path), shell=True) + output = subprocess.check_output( + cmd_string.format(backup_path, files_path), shell=True + ) if self.verbose and output: print(output.decode("utf8")) @@ -271,39 +333,57 @@ class BackupGenerator: import frappe.utils # escape reserved characters - args = dict([item[0], frappe.utils.esc(str(item[1]), '$ ')] - for item in self.__dict__.copy().items()) + args = dict( + [item[0], frappe.utils.esc(str(item[1]), "$ ")] + for item in self.__dict__.copy().items() + ) if self.backup_includes: print("Backing Up Tables: {0}\n".format(", ".join(self.backup_includes))) elif self.backup_excludes: print("Skipping Tables: {0}\n".format(", ".join(self.backup_excludes))) - if self.db_type == 'postgres': + if self.db_type == "postgres": if self.backup_includes: - args["include"] = " ".join(["--table='{0}'".format(table) for table in self.backup_includes]) + args["include"] = " ".join( + ["--table='{0}'".format(table) for table in self.backup_includes] + ) elif self.backup_excludes: - args["exclude"] = " ".join(["--exclude-table='{0}'".format(table) for table in self.backup_excludes]) + args["exclude"] = " ".join( + ["--exclude-table='{0}'".format(table) for table in self.backup_excludes] + ) - cmd_string = "pg_dump postgres://{user}:{password}@{db_host}:{db_port}/{db_name} {include} {exclude} | gzip > {backup_path_db}" + cmd_string = ( + "pg_dump postgres://{user}:{password}@{db_host}:{db_port}/{db_name}" + " {include} {exclude} | gzip > {backup_path_db}" + ) else: if self.backup_includes: args["include"] = " ".join(["'{0}'".format(x) for x in self.backup_includes]) elif self.backup_excludes: - args["exclude"] = " ".join(["--ignore-table='{0}.{1}'".format(frappe.conf.db_name, table) for table in self.backup_excludes]) + args["exclude"] = " ".join( + [ + "--ignore-table='{0}.{1}'".format(frappe.conf.db_name, table) + for table in self.backup_excludes + ] + ) - cmd_string = "mysqldump --single-transaction --quick --lock-tables=false -u {user} -p{password} {db_name} -h {db_host} -P {db_port} {include} {exclude} | gzip > {backup_path_db}" + cmd_string = ( + "mysqldump --single-transaction --quick --lock-tables=false -u {user}" + " -p{password} {db_name} -h {db_host} -P {db_port} {include} {exclude}" + " | gzip > {backup_path_db}" + ) command = cmd_string.format( - user=args.get('user'), - password=args.get('password'), - db_host=args.get('db_host'), - db_port=args.get('db_port'), - db_name=args.get('db_name'), - backup_path_db=args.get('backup_path_db'), - exclude=args.get('exclude', ''), - include=args.get('include', '') + user=args.get("user"), + password=args.get("password"), + db_host=args.get("db_host"), + db_port=args.get("db_port"), + db_name=args.get("db_name"), + backup_path_db=args.get("backup_path_db"), + exclude=args.get("exclude", ""), + include=args.get("include", ""), ) if self.verbose: @@ -313,13 +393,17 @@ class BackupGenerator: def send_email(self): """ - Sends the link to backup file located at erpnext/backups + Sends the link to backup file located at erpnext/backups """ from frappe.email import get_system_managers recipient_list = get_system_managers() - db_backup_url = get_url(os.path.join('backups', os.path.basename(self.backup_path_db))) - files_backup_url = get_url(os.path.join('backups', os.path.basename(self.backup_path_files))) + db_backup_url = get_url( + os.path.join("backups", os.path.basename(self.backup_path_db)) + ) + files_backup_url = get_url( + os.path.join("backups", os.path.basename(self.backup_path_files)) + ) msg = """Hello, @@ -331,11 +415,13 @@ Your backups are ready to be downloaded. This link will be valid for 24 hours. A new backup will be available for download only after 24 hours.""" % { "db_backup_url": db_backup_url, - "files_backup_url": files_backup_url + "files_backup_url": files_backup_url, } datetime_str = datetime.fromtimestamp(os.stat(self.backup_path_db).st_ctime) - subject = datetime_str.strftime("%d/%m/%Y %H:%M:%S") + """ - Backup ready to be downloaded""" + subject = ( + datetime_str.strftime("%d/%m/%Y %H:%M:%S") + """ - Backup ready to be downloaded""" + ) frappe.sendmail(recipients=recipient_list, msg=msg, subject=subject) return recipient_list @@ -344,16 +430,25 @@ download only after 24 hours.""" % { @frappe.whitelist() def get_backup(): """ - This function is executed when the user clicks on - Toos > Download Backup + This function is executed when the user clicks on + Toos > Download Backup """ delete_temp_backups() - odb = BackupGenerator(frappe.conf.db_name, frappe.conf.db_name,\ - frappe.conf.db_password, db_host = frappe.db.host,\ - db_type=frappe.conf.db_type, db_port=frappe.conf.db_port) + odb = BackupGenerator( + frappe.conf.db_name, + frappe.conf.db_name, + frappe.conf.db_password, + db_host=frappe.db.host, + db_type=frappe.conf.db_type, + db_port=frappe.conf.db_port, + ) odb.get_backup() recipient_list = odb.send_email() - frappe.msgprint(_("Download link for your backup will be emailed on the following email address: {0}").format(', '.join(recipient_list))) + frappe.msgprint( + _( + "Download link for your backup will be emailed on the following email address: {0}" + ).format(", ".join(recipient_list)) + ) @frappe.whitelist() @@ -375,44 +470,86 @@ def fetch_latest_backups(): ) database, public, private, config = odb.get_recent_backup(older_than=24 * 30) - return { - "database": database, - "public": public, - "private": private, - "config": config - } + return {"database": database, "public": public, "private": private, "config": config} -def scheduled_backup(older_than=6, ignore_files=False, backup_path=None, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, backup_path_conf=None, ignore_conf=False, include_doctypes="", exclude_doctypes="", compress=False, force=False, verbose=False): +def scheduled_backup( + older_than=6, + ignore_files=False, + backup_path=None, + backup_path_db=None, + backup_path_files=None, + backup_path_private_files=None, + backup_path_conf=None, + ignore_conf=False, + include_doctypes="", + exclude_doctypes="", + compress=False, + force=False, + verbose=False, +): """this function is called from scheduler - deletes backups older than 7 days - takes backup""" - odb = new_backup(older_than=older_than, ignore_files=ignore_files, backup_path=None, backup_path_db=backup_path_db, backup_path_files=backup_path_files, backup_path_private_files=backup_path_private_files, backup_path_conf=backup_path_conf, ignore_conf=ignore_conf, include_doctypes=include_doctypes, exclude_doctypes=exclude_doctypes, compress=compress, force=force, verbose=verbose) + deletes backups older than 7 days + takes backup""" + odb = new_backup( + older_than=older_than, + ignore_files=ignore_files, + backup_path=None, + backup_path_db=backup_path_db, + backup_path_files=backup_path_files, + backup_path_private_files=backup_path_private_files, + backup_path_conf=backup_path_conf, + ignore_conf=ignore_conf, + include_doctypes=include_doctypes, + exclude_doctypes=exclude_doctypes, + compress=compress, + force=force, + verbose=verbose, + ) return odb -def new_backup(older_than=6, ignore_files=False, backup_path=None, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, backup_path_conf=None, ignore_conf=False, include_doctypes="", exclude_doctypes="", compress=False, force=False, verbose=False): - delete_temp_backups(older_than = frappe.conf.keep_backups_for_hours or 24) - odb = BackupGenerator(frappe.conf.db_name, frappe.conf.db_name,\ - frappe.conf.db_password, - db_host = frappe.db.host, - db_port = frappe.db.port, - db_type = frappe.conf.db_type, - backup_path=backup_path, - backup_path_db=backup_path_db, - backup_path_files=backup_path_files, - backup_path_private_files=backup_path_private_files, - backup_path_conf=backup_path_conf, - ignore_conf=ignore_conf, - include_doctypes=include_doctypes, - exclude_doctypes=exclude_doctypes, - verbose=verbose, - compress_files=compress) + +def new_backup( + older_than=6, + ignore_files=False, + backup_path=None, + backup_path_db=None, + backup_path_files=None, + backup_path_private_files=None, + backup_path_conf=None, + ignore_conf=False, + include_doctypes="", + exclude_doctypes="", + compress=False, + force=False, + verbose=False, +): + delete_temp_backups(older_than=frappe.conf.keep_backups_for_hours or 24) + odb = BackupGenerator( + frappe.conf.db_name, + frappe.conf.db_name, + frappe.conf.db_password, + db_host=frappe.db.host, + db_port=frappe.db.port, + db_type=frappe.conf.db_type, + backup_path=backup_path, + backup_path_db=backup_path_db, + backup_path_files=backup_path_files, + backup_path_private_files=backup_path_private_files, + backup_path_conf=backup_path_conf, + ignore_conf=ignore_conf, + include_doctypes=include_doctypes, + exclude_doctypes=exclude_doctypes, + verbose=verbose, + compress_files=compress, + ) odb.get_backup(older_than, ignore_files, force=force) return odb + def delete_temp_backups(older_than=24): """ - Cleans up the backup_link_path directory by deleting files older than 24 hours + Cleans up the backup_link_path directory by deleting files older than 24 hours """ backup_path = get_backup_path() if os.path.exists(backup_path): @@ -422,54 +559,72 @@ def delete_temp_backups(older_than=24): if is_file_old(this_file_path, older_than): os.remove(this_file_path) + def is_file_old(db_file_name, older_than=24): - """ - Checks if file exists and is older than specified hours - Returns -> - True: file does not exist or file is old - False: file is new - """ - if os.path.isfile(db_file_name): - from datetime import timedelta - #Get timestamp of the file - file_datetime = datetime.fromtimestamp\ - (os.stat(db_file_name).st_ctime) - if datetime.today() - file_datetime >= timedelta(hours = older_than): - if _verbose: - print("File is old") - return True - else: - if _verbose: - print("File is recent") - return False + """ + Checks if file exists and is older than specified hours + Returns -> + True: file does not exist or file is old + False: file is new + """ + if os.path.isfile(db_file_name): + from datetime import timedelta + + # Get timestamp of the file + file_datetime = datetime.fromtimestamp(os.stat(db_file_name).st_ctime) + if datetime.today() - file_datetime >= timedelta(hours=older_than): + if _verbose: + print("File is old") + return True else: if _verbose: - print("File does not exist") - return True + print("File is recent") + return False + else: + if _verbose: + print("File does not exist") + return True + def get_backup_path(): backup_path = frappe.utils.get_site_path(conf.get("backup_path", "private/backups")) return backup_path -def backup(with_files=False, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, backup_path_conf=None, quiet=False): + +def backup( + with_files=False, + backup_path_db=None, + backup_path_files=None, + backup_path_private_files=None, + backup_path_conf=None, + quiet=False, +): "Backup" - odb = scheduled_backup(ignore_files=not with_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, backup_path_private_files=backup_path_private_files, backup_path_conf=backup_path_conf, force=True) + odb = scheduled_backup( + ignore_files=not with_files, + backup_path_db=backup_path_db, + backup_path_files=backup_path_files, + backup_path_private_files=backup_path_private_files, + backup_path_conf=backup_path_conf, + force=True, + ) return { "backup_path_db": odb.backup_path_db, "backup_path_files": odb.backup_path_files, - "backup_path_private_files": odb.backup_path_private_files + "backup_path_private_files": odb.backup_path_private_files, } if __name__ == "__main__": """ - is_file_old db_name user password db_host db_type db_port - get_backup db_name user password db_host db_type db_port + is_file_old db_name user password db_host db_type db_port + get_backup db_name user password db_host db_type db_port """ import sys + cmd = sys.argv[1] - db_type = 'mariadb' + db_type = "mariadb" try: db_type = sys.argv[6] except IndexError: @@ -482,19 +637,47 @@ if __name__ == "__main__": pass if cmd == "is_file_old": - odb = BackupGenerator(sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5] or "localhost", db_type=db_type, db_port=db_port) + odb = BackupGenerator( + sys.argv[2], + sys.argv[3], + sys.argv[4], + sys.argv[5] or "localhost", + db_type=db_type, + db_port=db_port, + ) is_file_old(odb.db_file_name) if cmd == "get_backup": - odb = BackupGenerator(sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5] or "localhost", db_type=db_type, db_port=db_port) + odb = BackupGenerator( + sys.argv[2], + sys.argv[3], + sys.argv[4], + sys.argv[5] or "localhost", + db_type=db_type, + db_port=db_port, + ) odb.get_backup() if cmd == "take_dump": - odb = BackupGenerator(sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5] or "localhost", db_type=db_type, db_port=db_port) + odb = BackupGenerator( + sys.argv[2], + sys.argv[3], + sys.argv[4], + sys.argv[5] or "localhost", + db_type=db_type, + db_port=db_port, + ) odb.take_dump() if cmd == "send_email": - odb = BackupGenerator(sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5] or "localhost", db_type=db_type, db_port=db_port) + odb = BackupGenerator( + sys.argv[2], + sys.argv[3], + sys.argv[4], + sys.argv[5] or "localhost", + db_type=db_type, + db_port=db_port, + ) odb.send_email("abc.sql.gz") if cmd == "delete_temp_backups": From bd6f52305eb1e48f370217de89608a16976e207c Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 7 Oct 2020 14:32:18 +0530 Subject: [PATCH 006/259] fix: Show traceback if verbose --- frappe/commands/site.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index dc5d8b838e..446166d44c 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -422,6 +422,8 @@ def backup(context, with_files=False, backup_path=None, backup_path_db=None, bac ) except Exception: click.secho("Backup failed for Site {0}. Database or site_config.json may be corrupted".format(site), fg="red") + if verbose: + print(frappe.get_traceback()) exit_code = 1 continue From 7519ba5e1c81a721bc248762b28f03657b12210a Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 7 Oct 2020 14:32:40 +0530 Subject: [PATCH 007/259] fix: Backup tables correctly ? --- frappe/utils/backups.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index b59f5526e9..5a91ad656e 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -129,9 +129,12 @@ class BackupGenerator: "include": get_tables(self.include_doctypes.strip().split(",")), "exclude": get_tables(self.exclude_doctypes.strip().split(",")), } + specified_tables = get_tables(frappe.conf.get("backup", {}).get("includes", [])) + include_tables = (specified_tables + base_tables) if specified_tables else [] + conf_tables = { - "include": get_tables(frappe.conf.backup.get("includes", [])) + base_tables, - "exclude": get_tables(frappe.conf.backup.get("excludes", [])), + "include": include_tables, + "exclude": get_tables(frappe.conf.get("backup", {}).get("excludes", [])), } self.backup_includes = passed_tables["include"] @@ -387,7 +390,7 @@ class BackupGenerator: ) if self.verbose: - print(command) + print(command + "\n") err, out = frappe.utils.execute_in_shell(command) From 7d638d298c098036fcf509d3a6086418644e4b57 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 7 Oct 2020 14:33:02 +0530 Subject: [PATCH 008/259] chore: remove old comment that lied --- frappe/utils/backups.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 5a91ad656e..5b1f6b0616 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -619,10 +619,6 @@ def backup( if __name__ == "__main__": - """ - is_file_old db_name user password db_host db_type db_port - get_backup db_name user password db_host db_type db_port - """ import sys cmd = sys.argv[1] From 26387401b39517f61fd50f965a5bf84c99e9817a Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 7 Oct 2020 21:06:23 +0530 Subject: [PATCH 009/259] test: Added tests for bench backup skip tables * Added utils for coloured outputs * Fixed bug during last branch update --- frappe/tests/test_commands.py | 112 +++++++++++++++++++++++++++++++++- frappe/utils/backups.py | 2 +- 2 files changed, 110 insertions(+), 4 deletions(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index e7e639c775..39d76aaba5 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -1,10 +1,13 @@ # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors # imports - standard imports +import json import os import shlex import subprocess +import sys import unittest +import gzip from glob import glob # imports - module imports @@ -12,12 +15,66 @@ import frappe from frappe.utils.backups import fetch_latest_backups +# TODO: check frappe.cli.coloured_output to set coloured output! + +def supports_color(): + """ + Returns True if the running system's terminal supports color, and False + otherwise. + """ + plat = sys.platform + supported_platform = plat != 'Pocket PC' and (plat != 'win32' or 'ANSICON' in os.environ) + # isatty is not always implemented, #6223. + is_a_tty = hasattr(sys.stdout, 'isatty') and sys.stdout.isatty() + return supported_platform and is_a_tty + + +class color(dict): + nc = '\033[0m' + blue = '\033[94m' + green = '\033[92m' + yellow = '\033[93m' + red = '\033[91m' + silver = '\033[90m' + + def __getattr__(self, key): + if supports_color(): + ret = self.get(key) + else: + ret = "" + return ret + + def clean(value): - if isinstance(value, (bytes, str)): - value = value.decode().strip() + """Strips and converts bytes to str + + Args: + value ([type]): [description] + + Returns: + [type]: [description] + """ + if isinstance(value, bytes): + value = value.decode() + if isinstance(value, str): + value = value.strip() return value +def exists_in_backup(doctypes, file): + """Checks if the list of doctypes exist in the database.sql.gz file supplied + + Args: + doctypes (list): List of DocTypes to be checked + file (str): Path of the database file + + Returns: + bool: True if all tables exist + """ + with gzip.open(file, 'rb') as f: + content = f.read().decode("utf8") + return all(["CREATE TABLE `tab{}`".format(doctype).lower() in content.lower() for doctype in doctypes]) + class BaseTestCommands(unittest.TestCase): def execute(self, command, kwargs=None): site = {"site": frappe.local.site} @@ -25,7 +82,8 @@ class BaseTestCommands(unittest.TestCase): kwargs.update(site) else: kwargs = site - command = command.replace("\n", " ").format(**kwargs) + command = " ".join(command.split()).format(**kwargs) + print("{0}$ {1}{2}".format(color.silver, command, color.nc)) command = shlex.split(command) self._proc = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) self.stdout = clean(self._proc.stdout) @@ -54,6 +112,21 @@ class TestCommands(BaseTestCommands): self.assertEquals(self.stdout[1:-1], frappe.bold(text='DocType')) def test_backup(self): + backup = { + "includes": { + "includes": [ + "ToDo", + "Note", + ] + }, + "excludes": { + "excludes": [ + "Activity Log", + "Access Log", + "Error Log" + ] + } + } home = os.path.expanduser("~") site_backup_path = frappe.utils.get_site_path("private", "backups") @@ -119,3 +192,36 @@ class TestCommands(BaseTestCommands): # test 6: take a backup with --verbose self.execute("bench --site {site} backup --verbose") self.assertEquals(self.returncode, 0) + + # test 7: take a backup with frappe.conf.backup.includes + self.execute("bench --site {site} set-config backup '{includes}' --as-dict", {"includes": json.dumps(backup["includes"])}) + self.execute("bench --site {site} backup --verbose") + self.assertEquals(self.returncode, 0) + database = fetch_latest_backups()["database"] + self.assertTrue(exists_in_backup(backup["includes"]["includes"], database)) + + # test 8: take a backup with frappe.conf.backup.excludes + self.execute("bench --site {site} set-config backup '{excludes}' --as-dict", {"excludes": json.dumps(backup["excludes"])}) + self.execute("bench --site {site} backup --verbose") + self.assertEquals(self.returncode, 0) + database = fetch_latest_backups()["database"] + self.assertFalse(exists_in_backup(backup["excludes"]["excludes"], database)) + self.assertTrue(exists_in_backup(backup["includes"]["includes"], database)) + + # test 9: take a backup with --include (with frappe.conf.excludes still set) + self.execute("bench --site {site} backup --include '{include}'", {"include": ",".join(backup["includes"]["includes"])}) + self.assertEquals(self.returncode, 0) + database = fetch_latest_backups()["database"] + self.assertTrue(exists_in_backup(backup["includes"]["includes"], database)) + + # test 10: take a backup with --exclude + self.execute("bench --site {site} backup --exclude '{exclude}'", {"exclude": ",".join(backup["excludes"]["excludes"])}) + self.assertEquals(self.returncode, 0) + database = fetch_latest_backups()["database"] + self.assertFalse(exists_in_backup(backup["excludes"]["excludes"], database)) + + # test 11: take a backup with --ignore-backup-conf + self.execute("bench --site {site} backup --ignore-backup-conf") + self.assertEquals(self.returncode, 0) + database = fetch_latest_backups()["database"] + self.assertTrue(exists_in_backup(backup["excludes"]["excludes"], database)) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 5b1f6b0616..43dd7c17f1 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -497,7 +497,7 @@ def scheduled_backup( odb = new_backup( older_than=older_than, ignore_files=ignore_files, - backup_path=None, + backup_path=backup_path, backup_path_db=backup_path_db, backup_path_files=backup_path_files, backup_path_private_files=backup_path_private_files, From ff1f1e755da30f028ff52e7b878a3ee48905e4ca Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 8 Oct 2020 15:45:15 +0530 Subject: [PATCH 010/259] fix: Dynamic summary spacing --- frappe/utils/backups.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 43dd7c17f1..1ae976807a 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -302,8 +302,12 @@ class BackupGenerator: backup_summary = self.get_summary() print("Backup Summary for {0} at {1}".format(frappe.local.site, now())) + title = max([len(x) for x in backup_summary]) + path = max([len(x["path"]) for x in backup_summary.values()]) + for _type, info in backup_summary.items(): - print("{0:8}: {1:85} {2}".format(_type.title(), info["path"], info["size"])) + template = "{{0:{0}}}: {{1:{1}}} {{2}}".format(title, path) + print(template.format(_type.title(), info["path"], info["size"])) def backup_files(self): import subprocess From 104186906f3ecf8abe130c35e34c4c4ba9b21e36 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 8 Oct 2020 16:23:14 +0530 Subject: [PATCH 011/259] feat: Show command execution summary in message format --- frappe/tests/test_commands.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index 39d76aaba5..b63a886a2f 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -82,14 +82,25 @@ class BaseTestCommands(unittest.TestCase): kwargs.update(site) else: kwargs = site - command = " ".join(command.split()).format(**kwargs) - print("{0}$ {1}{2}".format(color.silver, command, color.nc)) - command = shlex.split(command) + self.command = " ".join(command.split()).format(**kwargs) + print("{0}$ {1}{2}".format(color.silver, self.command, color.nc)) + command = shlex.split(self.command) self._proc = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) self.stdout = clean(self._proc.stdout) self.stderr = clean(self._proc.stderr) self.returncode = clean(self._proc.returncode) + def _formatMessage(self, msg, standardMsg): + output = super(BaseTestCommands, self)._formatMessage(msg, standardMsg) + cmd_execution_summary = "\n".join([ + "-" * 70, + "Last Command Execution Summary:", + "Command: {}".format(self.command) if self.command else "", + "Standard Output: {}".format(self.stdout) if self.stdout else "", + "Standard Error: {}".format(self.stderr) if self.stderr else "", + "Return Code: {}".format(self.returncode) if self.returncode else "", + ]).strip() + return "{}\n\n{}".format(output, cmd_execution_summary) class TestCommands(BaseTestCommands): def test_execute(self): From 44a09191b38f13682ef6f8a0ce21058ce3c25756 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 8 Oct 2020 18:56:29 +0530 Subject: [PATCH 012/259] fix: Use public schema for postgres site tx @surajshetty3416 --- frappe/tests/test_commands.py | 9 +++++++-- frappe/utils/backups.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index b63a886a2f..e7cb9f5d40 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -71,9 +71,14 @@ def exists_in_backup(doctypes, file): Returns: bool: True if all tables exist """ - with gzip.open(file, 'rb') as f: + predicate = ( + 'CREATE TABLE public."tab{}"' + if frappe.conf.db_type == "postgres" + else "CREATE TABLE `tab{}`" + ) + with gzip.open(file, "rb") as f: content = f.read().decode("utf8") - return all(["CREATE TABLE `tab{}`".format(doctype).lower() in content.lower() for doctype in doctypes]) + return all([predicate.format(doctype).lower() in content.lower() for doctype in doctypes]) class BaseTestCommands(unittest.TestCase): def execute(self, command, kwargs=None): diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 1ae976807a..ab5783006c 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -353,7 +353,7 @@ class BackupGenerator: if self.db_type == "postgres": if self.backup_includes: args["include"] = " ".join( - ["--table='{0}'".format(table) for table in self.backup_includes] + ["--table='public.\"{0}\"'".format(table) for table in self.backup_includes] ) elif self.backup_excludes: args["exclude"] = " ".join( From 368a031da3b389bb65b859a3165cc9640bf56e0b Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 9 Oct 2020 11:19:16 +0530 Subject: [PATCH 013/259] fix: Update postgres exlcude table data --- frappe/tests/test_commands.py | 2 +- frappe/utils/backups.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index e7cb9f5d40..19fd90e99c 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -72,7 +72,7 @@ def exists_in_backup(doctypes, file): bool: True if all tables exist """ predicate = ( - 'CREATE TABLE public."tab{}"' + 'COPY public."tab{}"' if frappe.conf.db_type == "postgres" else "CREATE TABLE `tab{}`" ) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index ab5783006c..552debbaa1 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -357,7 +357,7 @@ class BackupGenerator: ) elif self.backup_excludes: args["exclude"] = " ".join( - ["--exclude-table='{0}'".format(table) for table in self.backup_excludes] + ["--exclude-table-data='public.\"{0}\"'".format(table) for table in self.backup_excludes] ) cmd_string = ( From d19973a357bdb942caf523cdfadefc4510bbe3dc Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 9 Oct 2020 11:27:18 +0530 Subject: [PATCH 014/259] fix: Support for multi-site list-apps summary --- frappe/commands/site.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 1f4642658f..d4fcaba3b5 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -226,11 +226,26 @@ def install_app(context, apps): @pass_context def list_apps(context): "List apps in site" - site = get_site(context) - frappe.init(site=site) - frappe.connect() - print("\n".join(frappe.get_installed_apps())) - frappe.destroy() + import click + titled = False + + if len(context.sites) > 1: + titled = True + + for site in context.sites: + frappe.init(site=site) + frappe.connect() + apps = sorted(frappe.get_installed_apps()) + + if titled: + summary = "{}{}".format(click.style(site + ": ", fg="green"), ", ".join(apps)) + else: + summary = "\n".join(apps) + + if apps and summary.strip(): + print(summary) + + frappe.destroy() @click.command('add-system-manager') @click.argument('email') From 5c5703b8f68c2a76e000f4712a5e60fa501fba57 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 9 Oct 2020 11:31:18 +0530 Subject: [PATCH 015/259] feat: Show apps excluding frappe using --only-apps --- frappe/commands/site.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index d4fcaba3b5..189d6eedd4 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -223,8 +223,9 @@ def install_app(context, apps): @click.command('list-apps') +@click.option('--only-apps', is_flag=True) @pass_context -def list_apps(context): +def list_apps(context, only_apps): "List apps in site" import click titled = False @@ -237,6 +238,9 @@ def list_apps(context): frappe.connect() apps = sorted(frappe.get_installed_apps()) + if only_apps: + apps.remove("frappe") + if titled: summary = "{}{}".format(click.style(site + ": ", fg="green"), ", ".join(apps)) else: From 9219db4c2a4dbb0709cc0f893622262cc4defc2e Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 16 Oct 2020 14:09:35 +0530 Subject: [PATCH 016/259] fix: validate email id before passing to formataddr --- frappe/utils/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index d3bf1dd10c..9640bcd394 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -66,9 +66,14 @@ def get_email_address(user=None): def get_formatted_email(user, mail=None): """get Email Address of user formatted as: `John Doe `""" fullname = get_fullname(user) + if not mail: - mail = get_email_address(user) - return cstr(make_header(decode_header(formataddr((fullname, mail))))) + mail = get_email_address(user) or validate_email_address(user) + + if not mail: + return '' + else: + return cstr(make_header(decode_header(formataddr((fullname, mail))))) def extract_email_id(email): """fetch only the email part of the Email Address""" From 59d35cb5aeadd161701c1b5651cf0aad21facc7e Mon Sep 17 00:00:00 2001 From: marination Date: Tue, 20 Oct 2020 20:21:07 +0530 Subject: [PATCH 017/259] fix: Conditionally set parent field only on DocType rename --- frappe/model/rename_doc.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 7a2129e76e..e04d59ab6a 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -249,8 +249,11 @@ def update_link_field_values(link_fields, old, new, doctype): # or no longer exists pass else: + parent = field['parent'] + # because the table hasn't been renamed yet! - parent = field['parent'] if field['parent']!=new else old + if field['parent'] == new and doctype == "DocType": + parent = old frappe.db.sql(""" update `tab{table_name}` set `{fieldname}`=%s From 969aa86e68c0726d202a73bc1d488f9f89e72bc2 Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 27 Oct 2020 17:46:21 +0530 Subject: [PATCH 018/259] fix: calculate chart data from beginning of period - show period as label --- .../dashboard_chart/dashboard_chart.py | 24 +++++++++++++++---- frappe/utils/data.py | 11 +++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 7e2d952928..c9b54561ea 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -8,8 +8,7 @@ from frappe import _ import datetime import json from frappe.utils.dashboard import cache_source, get_from_date_from_timespan -from frappe.utils import nowdate, add_to_date, getdate, get_last_day, formatdate,\ - get_datetime, cint, now_datetime +from frappe.utils import * from frappe.model.naming import append_number_if_name_exists from frappe.boot import get_allowed_reports from frappe.model.document import Document @@ -156,6 +155,7 @@ def add_chart_to_dashboard(args): def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date): if not from_date: from_date = get_from_date_from_timespan(to_date, timespan) + from_date = get_period_beginning(from_date, timegrain) if not to_date: to_date = now_datetime() @@ -163,7 +163,6 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date): datefield = chart.based_on aggregate_function = get_aggregate_function(chart.chart_type) value_field = chart.value_based_on or '1' - from_date = from_date.strftime('%Y-%m-%d') to_date = to_date filters.append([doctype, datefield, '>=', from_date, False]) @@ -185,7 +184,7 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date): result = get_result(data, timegrain, from_date, to_date) chart_config = { - "labels": [formatdate(r[0].strftime('%Y-%m-%d')) for r in result], + "labels": [get_period(r[0], timegrain) for r in result], "datasets": [{ "name": chart.name, "values": [r[1] for r in result] @@ -282,7 +281,7 @@ def get_result(data, timegrain, from_date, to_date): start_date = getdate(from_date) end_date = getdate(to_date) - result = [[start_date, 0.0]] + result = [] while start_date < end_date: next_date = get_next_expected_date(start_date, timegrain) @@ -304,6 +303,21 @@ def get_next_expected_date(date, timegrain): next_date = get_period_ending(add_to_date(date, days=1), timegrain) return getdate(next_date) +def get_period_beginning(date, timegrain): + as_str = True + if timegrain == 'Daily': + pass + elif timegrain == 'Weekly': + date = get_first_day_of_week(date, as_str=as_str) + elif timegrain == 'Monthly': + date = get_first_day(date, as_str=as_str) + elif timegrain == 'Quarterly': + date = get_quarter_start(date, as_str=as_str) + elif timegrain == 'Yearly': + date = get_year_start(date, as_str=as_str) + + return date + def get_period_ending(date, timegrain): date = getdate(date) if timegrain == 'Daily': diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 41f247da45..f189b6aa53 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -441,6 +441,17 @@ def get_timespan_date_range(timespan): return date_range_map.get(timespan) +def get_period(date, interval='Monthly'): + date = getdate(date) + months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] + return { + 'Daily': date.strftime('%d-%m-%y'), + 'Weekly': date.strftime('%d-%m-%y'), + 'Monthly': str(months[date.month - 1]) + ' ' + str(date.year), + 'Quarterly': 'Quarter ' + str(((date.month-1)//3)+1) + ' ' + str(date.year), + 'Yearly': str(date.year) + }[interval] + def global_date_format(date, format="long"): """returns localized date in the form of January 1, 2012""" date = getdate(date) From 6334f2b6d1a4fa2427aced54e6a683c5405a38a7 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 27 Oct 2020 21:23:26 +0530 Subject: [PATCH 019/259] fix: Commit after rename tables to avoid floating tables --- frappe/core/doctype/doctype/doctype.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 8a9c130fbe..d45542a9d0 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -387,12 +387,14 @@ class DocType(Document): def after_rename(self, old, new, merge=False): """Change table name using `RENAME TABLE` if table exists. Or update `doctype` property for Single type.""" + if self.issingle: frappe.db.sql("""update tabSingles set doctype=%s where doctype=%s""", (new, old)) frappe.db.sql("""update tabSingles set value=%s where doctype=%s and field='name' and value = %s""", (new, new, old)) else: frappe.db.sql("rename table `tab%s` to `tab%s`" % (old, new)) + frappe.db.commit() def rename_files_and_folders(self, old, new): # move files From 650ff243b85d7b6751e4c950e50cbefd1cbc5f9e Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 27 Oct 2020 21:24:16 +0530 Subject: [PATCH 020/259] fix: Rename files after successful database update --- frappe/core/doctype/doctype/doctype.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index d45542a9d0..d7cc9ba919 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -380,10 +380,6 @@ class DocType(Document): if merge: frappe.throw(_("DocType can not be merged")) - # Do not rename and move files and folders for custom doctype - if not self.custom and not frappe.flags.in_test and not frappe.flags.in_patch: - self.rename_files_and_folders(old, new) - def after_rename(self, old, new, merge=False): """Change table name using `RENAME TABLE` if table exists. Or update `doctype` property for Single type.""" @@ -396,6 +392,10 @@ class DocType(Document): frappe.db.sql("rename table `tab%s` to `tab%s`" % (old, new)) frappe.db.commit() + # Do not rename and move files and folders for custom doctype + if not self.custom and not frappe.flags.in_test and not frappe.flags.in_patch: + self.rename_files_and_folders(old, new) + def rename_files_and_folders(self, old, new): # move files new_path = get_doc_path(self.module, 'doctype', new) From c73e779373a5d7a0954df9045e9663cbb6bc232d Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 27 Oct 2020 21:26:47 +0530 Subject: [PATCH 021/259] fix: Validate existing doctype names too --- frappe/model/rename_doc.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 7a2129e76e..291a709119 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -49,9 +49,7 @@ def rename_doc(doctype, old, new, force=False, merge=False, ignore_permissions=F old_doc = frappe.get_doc(doctype, old) out = old_doc.run_method("before_rename", old, new, merge) or {} new = (out.get("new") or new) if isinstance(out, dict) else (out or new) - - if doctype != "DocType": - new = validate_rename(doctype, new, meta, merge, force, ignore_permissions) + new = validate_rename(doctype, new, meta, merge, force, ignore_permissions) if not merge: rename_parent_and_child(doctype, old, new, meta) From 7f43169c4a7f195c9b462cb076d3c7f6ef947884 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 28 Oct 2020 00:11:43 +0530 Subject: [PATCH 022/259] refactor: reorganise date functions indashboard_chart.py --- .../dashboard_chart/dashboard_chart.py | 75 ++----------------- frappe/utils/dashboard.py | 15 ---- frappe/utils/data.py | 32 +++++--- frappe/utils/dateutils.py | 62 ++++++++++++++- 4 files changed, 85 insertions(+), 99 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index c9b54561ea..587f3c02b0 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -7,8 +7,11 @@ import frappe from frappe import _ import datetime import json -from frappe.utils.dashboard import cache_source, get_from_date_from_timespan -from frappe.utils import * +from frappe.utils.dashboard import cache_source +from frappe.utils import nowdate, add_to_date, getdate, formatdate,\ + get_datetime, cint, now_datetime +from frappe.utils.dateutils import\ + get_period, get_period_beginning, get_period_ending, get_from_date_from_timespan from frappe.model.naming import append_number_if_name_exists from frappe.boot import get_allowed_reports from frappe.model.document import Document @@ -303,74 +306,6 @@ def get_next_expected_date(date, timegrain): next_date = get_period_ending(add_to_date(date, days=1), timegrain) return getdate(next_date) -def get_period_beginning(date, timegrain): - as_str = True - if timegrain == 'Daily': - pass - elif timegrain == 'Weekly': - date = get_first_day_of_week(date, as_str=as_str) - elif timegrain == 'Monthly': - date = get_first_day(date, as_str=as_str) - elif timegrain == 'Quarterly': - date = get_quarter_start(date, as_str=as_str) - elif timegrain == 'Yearly': - date = get_year_start(date, as_str=as_str) - - return date - -def get_period_ending(date, timegrain): - date = getdate(date) - if timegrain == 'Daily': - pass - elif timegrain == 'Weekly': - date = get_week_ending(date) - elif timegrain == 'Monthly': - date = get_month_ending(date) - elif timegrain == 'Quarterly': - date = get_quarter_ending(date) - elif timegrain == 'Yearly': - date = get_year_ending(date) - - return getdate(date) - -def get_week_ending(date): - # week starts on monday - from datetime import timedelta - start = date - timedelta(days = date.weekday()) - end = start + timedelta(days=6) - - return end - -def get_month_ending(date): - month_of_the_year = int(date.strftime('%m')) - # first day of next month (note month starts from 1) - - date = add_to_date('{}-01-01'.format(date.year), months = month_of_the_year) - # last day of this month - return add_to_date(date, days=-1) - -def get_quarter_ending(date): - date = getdate(date) - - # find the earliest quarter ending date that is after - # the given date - for month in (3, 6, 9, 12): - quarter_end_month = getdate('{}-{}-01'.format(date.year, month)) - quarter_end_date = getdate(get_last_day(quarter_end_month)) - if date <= quarter_end_date: - date = quarter_end_date - break - - return date - -def get_year_ending(date): - ''' returns year ending of the given date ''' - - # first day of next year (note year starts from 1) - date = add_to_date('{}-01-01'.format(date.year), months = 12) - # last day of this month - return add_to_date(date, days=-1) - @frappe.whitelist() @frappe.validate_and_sanitize_search_inputs def get_charts_for_user(doctype, txt, searchfield, start, page_len, filters): diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py index 7eaf470767..e386dcd881 100644 --- a/frappe/utils/dashboard.py +++ b/frappe/utils/dashboard.py @@ -61,21 +61,6 @@ def generate_and_cache_results(args, function, cache_key, chart): frappe.db.set_value("Dashboard Chart", args.chart_name, "last_synced_on", frappe.utils.now(), update_modified = False) return results -def get_from_date_from_timespan(to_date, timespan): - days = months = years = 0 - if timespan == "Last Week": - days = -7 - if timespan == "Last Month": - months = -1 - elif timespan == "Last Quarter": - months = -3 - elif timespan == "Last Year": - years = -1 - elif timespan == "All Time": - years = -50 - return add_to_date(to_date, years=years, months=months, days=days, - as_datetime=True) - def get_dashboards_with_link(docname, doctype): dashboards = [] links = [] diff --git a/frappe/utils/data.py b/frappe/utils/data.py index f189b6aa53..34659e1cac 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -221,6 +221,27 @@ def get_last_day(dt): """ return get_first_day(dt, 0, 1) + datetime.timedelta(-1) +def get_quarter_ending(date): + date = getdate(date) + + # find the earliest quarter ending date that is after + # the given date + for month in (3, 6, 9, 12): + quarter_end_month = getdate('{}-{}-01'.format(date.year, month)) + quarter_end_date = getdate(get_last_day(quarter_end_month)) + if date <= quarter_end_date: + date = quarter_end_date + break + + return date + +def get_year_ending(date): + ''' returns year ending of the given date ''' + + # first day of next year (note year starts from 1) + date = add_to_date('{}-01-01'.format(date.year), months = 12) + # last day of this month + return add_to_date(date, days=-1) def get_time(time_str): if isinstance(time_str, datetime.datetime): @@ -441,17 +462,6 @@ def get_timespan_date_range(timespan): return date_range_map.get(timespan) -def get_period(date, interval='Monthly'): - date = getdate(date) - months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] - return { - 'Daily': date.strftime('%d-%m-%y'), - 'Weekly': date.strftime('%d-%m-%y'), - 'Monthly': str(months[date.month - 1]) + ' ' + str(date.year), - 'Quarterly': 'Quarter ' + str(((date.month-1)//3)+1) + ' ' + str(date.year), - 'Yearly': str(date.year) - }[interval] - def global_date_format(date, format="long"): """returns localized date in the form of January 1, 2012""" date = getdate(date) diff --git a/frappe/utils/dateutils.py b/frappe/utils/dateutils.py index 90abdeb6cd..2895eb0568 100644 --- a/frappe/utils/dateutils.py +++ b/frappe/utils/dateutils.py @@ -7,8 +7,8 @@ import frappe.defaults import datetime from frappe.utils import get_datetime from frappe.utils import add_to_date, getdate -from frappe.utils.data import get_last_day_of_week -from frappe.desk.doctype.dashboard_chart.dashboard_chart import get_period_ending +from frappe.utils.data import get_first_day, get_first_day_of_week, get_quarter_start, get_year_start,\ + get_last_day, get_last_day_of_week, get_quarter_ending, get_year_ending from six import string_types # global values -- used for caching @@ -102,4 +102,60 @@ def get_dates_from_timegrain(from_date, to_date, timegrain="Daily"): else: date = get_period_ending(add_to_date(dates[-1], years=years, months=months, days=days), timegrain) dates.append(date) - return dates \ No newline at end of file + return dates + +def get_from_date_from_timespan(to_date, timespan): + days = months = years = 0 + if timespan == "Last Week": + days = -7 + if timespan == "Last Month": + months = -1 + elif timespan == "Last Quarter": + months = -3 + elif timespan == "Last Year": + years = -1 + elif timespan == "All Time": + years = -50 + return add_to_date(to_date, years=years, months=months, days=days, + as_datetime=True) + +def get_period(date, interval='Monthly'): + date = getdate(date) + months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"] + return { + 'Daily': date.strftime('%d-%m-%y'), + 'Weekly': date.strftime('%d-%m-%y'), + 'Monthly': str(months[date.month - 1]) + ' ' + str(date.year), + 'Quarterly': 'Quarter ' + str(((date.month-1)//3)+1) + ' ' + str(date.year), + 'Yearly': str(date.year) + }[interval] + +def get_period_beginning(date, timegrain): + as_str = True + if timegrain == 'Daily': + pass + elif timegrain == 'Weekly': + date = get_first_day_of_week(date, as_str=as_str) + elif timegrain == 'Monthly': + date = get_first_day(date, as_str=as_str) + elif timegrain == 'Quarterly': + date = get_quarter_start(date, as_str=as_str) + elif timegrain == 'Yearly': + date = get_year_start(date, as_str=as_str) + + return date + +def get_period_ending(date, timegrain): + date = getdate(date) + if timegrain == 'Daily': + pass + elif timegrain == 'Weekly': + date = get_last_day_of_week(date) + elif timegrain == 'Monthly': + date = get_last_day(date) + elif timegrain == 'Quarterly': + date = get_quarter_ending(date) + elif timegrain == 'Yearly': + date = get_year_ending(date) + + return getdate(date) From 7302c85f55fe5cca5f222468235913057d03e03e Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 28 Oct 2020 00:37:34 +0530 Subject: [PATCH 023/259] fix: dashboard chart tests --- .../dashboard_chart/test_dashboard_chart.py | 30 ++++--------- frappe/utils/dateutils.py | 45 ++++++++----------- 2 files changed, 27 insertions(+), 48 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py index 5e39998e62..13fea8282d 100644 --- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py @@ -4,9 +4,9 @@ from __future__ import unicode_literals import unittest, frappe -from frappe.utils import getdate, formatdate, get_last_day -from frappe.desk.doctype.dashboard_chart.dashboard_chart import (get, - get_period_ending) +from frappe.utils import getdate, formatdate +from frappe.utils.dateutils import get_period_ending, get_period_beginning, get_period +from frappe.desk.doctype.dashboard_chart.dashboard_chart import get from datetime import datetime from dateutil.relativedelta import relativedelta @@ -53,15 +53,11 @@ class TestDashboardChart(unittest.TestCase): cur_date = datetime.now() - relativedelta(years=1) result = get(chart_name='Test Dashboard Chart', refresh=1) - self.assertEqual(result.get('labels')[0], formatdate(cur_date.strftime('%Y-%m-%d'))) - - if formatdate(cur_date.strftime('%Y-%m-%d')) == formatdate(get_last_day(cur_date).strftime('%Y-%m-%d')): - cur_date += relativedelta(months=1) + self.assertEqual(result.get('labels')[0], get_period(cur_date)) for idx in range(1, 13): - month = get_last_day(cur_date) month = formatdate(month.strftime('%Y-%m-%d')) - self.assertEqual(result.get('labels')[idx], month) + self.assertEqual(result.get('labels')[idx], get_period(month)) cur_date += relativedelta(months=1) frappe.db.rollback() @@ -87,15 +83,11 @@ class TestDashboardChart(unittest.TestCase): cur_date = datetime.now() - relativedelta(years=1) result = get(chart_name ='Test Empty Dashboard Chart', refresh=1) - self.assertEqual(result.get('labels')[0], formatdate(cur_date.strftime('%Y-%m-%d'))) - - if formatdate(cur_date.strftime('%Y-%m-%d')) == formatdate(get_last_day(cur_date).strftime('%Y-%m-%d')): - cur_date += relativedelta(months=1) + self.assertEqual(result.get('labels')[0], get_period(cur_date)) for idx in range(1, 13): - month = get_last_day(cur_date) month = formatdate(month.strftime('%Y-%m-%d')) - self.assertEqual(result.get('labels')[idx], month) + self.assertEqual(result.get('labels')[idx], get_period(month)) cur_date += relativedelta(months=1) frappe.db.rollback() @@ -124,15 +116,11 @@ class TestDashboardChart(unittest.TestCase): cur_date = datetime.now() - relativedelta(years=1) result = get(chart_name ='Test Empty Dashboard Chart 2', refresh = 1) - self.assertEqual(result.get('labels')[0], formatdate(cur_date.strftime('%Y-%m-%d'))) - - if formatdate(cur_date.strftime('%Y-%m-%d')) == formatdate(get_last_day(cur_date).strftime('%Y-%m-%d')): - cur_date += relativedelta(months=1) + self.assertEqual(result.get('labels')[0], get_period(cur_date)) for idx in range(1, 13): - month = get_last_day(cur_date) month = formatdate(month.strftime('%Y-%m-%d')) - self.assertEqual(result.get('labels')[idx], month) + self.assertEqual(result.get('labels')[idx], get_period(month)) cur_date += relativedelta(months=1) # only 1 data point with value diff --git a/frappe/utils/dateutils.py b/frappe/utils/dateutils.py index 2895eb0568..06b434a512 100644 --- a/frappe/utils/dateutils.py +++ b/frappe/utils/dateutils.py @@ -5,8 +5,7 @@ from __future__ import unicode_literals import frappe import frappe.defaults import datetime -from frappe.utils import get_datetime -from frappe.utils import add_to_date, getdate +from frappe.utils import get_datetime, add_to_date, getdate from frappe.utils.data import get_first_day, get_first_day_of_week, get_quarter_start, get_year_start,\ get_last_day, get_last_day_of_week, get_quarter_ending, get_year_ending from six import string_types @@ -130,32 +129,24 @@ def get_period(date, interval='Monthly'): 'Yearly': str(date.year) }[interval] -def get_period_beginning(date, timegrain): - as_str = True - if timegrain == 'Daily': - pass - elif timegrain == 'Weekly': - date = get_first_day_of_week(date, as_str=as_str) - elif timegrain == 'Monthly': - date = get_first_day(date, as_str=as_str) - elif timegrain == 'Quarterly': - date = get_quarter_start(date, as_str=as_str) - elif timegrain == 'Yearly': - date = get_year_start(date, as_str=as_str) - - return date +def get_period_beginning(date, timegrain, as_str=True): + return getdate({ + 'Daily': date, + 'Weekly': get_first_day_of_week(date), + 'Monthly': get_first_day(date), + 'Quarterly': get_quarter_start(date), + 'Yearly': get_year_start(date) + }[timegrain]) def get_period_ending(date, timegrain): date = getdate(date) if timegrain == 'Daily': - pass - elif timegrain == 'Weekly': - date = get_last_day_of_week(date) - elif timegrain == 'Monthly': - date = get_last_day(date) - elif timegrain == 'Quarterly': - date = get_quarter_ending(date) - elif timegrain == 'Yearly': - date = get_year_ending(date) - - return getdate(date) + return date + else: + return getdate({ + 'Daily': date, + 'Weekly': get_last_day_of_week(date), + 'Monthly': get_last_day(date), + 'Quarterly': get_quarter_ending(date), + 'Yearly': get_year_ending(date) + }[timegrain]) From 04b1e40023c3709d4788aa0728082700e0d22185 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Wed, 28 Oct 2020 10:59:32 +0530 Subject: [PATCH 024/259] chore: remove twilio integration --- frappe/core/doctype/role/role.py | 4 +-- .../doctype/notification/notification.js | 15 +++----- .../doctype/notification/notification.json | 20 +++-------- .../doctype/notification/notification.py | 21 ++--------- .../desk_page/integrations/integrations.json | 4 +-- .../doctype/twilio_number_group/__init__.py | 0 .../twilio_number_group.json | 36 ------------------- .../twilio_number_group.py | 10 ------ .../doctype/twilio_settings/__init__.py | 0 .../twilio_settings/test_twilio_settings.py | 10 ------ .../twilio_settings/twilio_settings.js | 8 ----- 11 files changed, 16 insertions(+), 112 deletions(-) delete mode 100644 frappe/integrations/doctype/twilio_number_group/__init__.py delete mode 100644 frappe/integrations/doctype/twilio_number_group/twilio_number_group.json delete mode 100644 frappe/integrations/doctype/twilio_number_group/twilio_number_group.py delete mode 100644 frappe/integrations/doctype/twilio_settings/__init__.py delete mode 100644 frappe/integrations/doctype/twilio_settings/test_twilio_settings.py delete mode 100644 frappe/integrations/doctype/twilio_settings/twilio_settings.js diff --git a/frappe/core/doctype/role/role.py b/frappe/core/doctype/role/role.py index e458b401e4..1920189f78 100644 --- a/frappe/core/doctype/role/role.py +++ b/frappe/core/doctype/role/role.py @@ -37,7 +37,7 @@ class Role(Document): def get_info_based_on_role(role, field='email'): ''' Get information of all users that have been assigned this role ''' users = frappe.get_list("Has Role", filters={"role": role, "parenttype": "User"}, - fields=["parent"]) + fields=["parent as user_name"]) return get_user_info(users, field) @@ -45,7 +45,7 @@ def get_user_info(users, field='email'): ''' Fetch details about users for the specified field ''' info_list = [] for user in users: - user_info, enabled = frappe.db.get_value("User", user.parent, [field, "enabled"]) + user_info, enabled = frappe.db.get_value("User", user.get("user_name"), [field, "enabled"]) if enabled and user_info not in ["admin@example.com", "guest@example.com"]: info_list.append(user_info) return info_list diff --git a/frappe/email/doctype/notification/notification.js b/frappe/email/doctype/notification/notification.js index 2cc027acd6..27fcd0e453 100644 --- a/frappe/email/doctype/notification/notification.js +++ b/frappe/email/doctype/notification/notification.js @@ -97,14 +97,7 @@ frappe.notification = { }, setup_example_message: function(frm) { let template = ''; - if (frm.doc.channel === 'WhatsApp') { - template = `
Warning:
Only Use Pre-Approved WhatsApp for Business Template -
Message Example
- -
-Your appointment is coming up on {{ doc.date }} at {{ doc.time }}
-
`; - } else if (frm.doc.channel === 'Email') { + if (frm.doc.channel === 'Email') { template = `
Message Example
<h3>Order Overdue</h3>
@@ -124,7 +117,7 @@ Last comment: {{ comments[-1].comment }} by {{ comments[-1].by }}
 </ul>
`; - } else { + } else if (in_list(['Slack', 'System Notification', 'SMS'], frm.doc.channel)) { template = `
Message Example
*Order Overdue*
@@ -142,7 +135,9 @@ Last comment: {{ comments[-1].comment }} by {{ comments[-1].by }}
 • Amount: {{ doc.grand_total }}
`; } - frm.set_df_property('message_examples', 'options', template); + if (template) { + frm.set_df_property('message_examples', 'options', template); + } } }; diff --git a/frappe/email/doctype/notification/notification.json b/frappe/email/doctype/notification/notification.json index 2a8ee1aeb1..73a84e1d3e 100644 --- a/frappe/email/doctype/notification/notification.json +++ b/frappe/email/doctype/notification/notification.json @@ -10,7 +10,6 @@ "enabled", "column_break_2", "channel", - "twilio_number", "slack_webhook_url", "filters", "subject", @@ -61,7 +60,7 @@ "fieldname": "channel", "fieldtype": "Select", "label": "Channel", - "options": "Email\nSlack\nSystem Notification\nWhatsApp\nSMS", + "options": "Email\nSlack\nSystem Notification\nSMS", "reqd": 1, "set_only_once": 1 }, @@ -80,14 +79,14 @@ "label": "Filters" }, { - "depends_on": "eval: !in_list(['SMS', 'WhatsApp'], doc.channel)", + "depends_on": "eval: in_list(['Email', 'Slack', 'System Notification'], doc.channel)", "description": "To add dynamic subject, use jinja tags like\n\n
{{ doc.name }} Delivered
", "fieldname": "subject", "fieldtype": "Data", "ignore_xss_filter": 1, "in_list_view": 1, "label": "Subject", - "mandatory_depends_on": "eval:!in_list(['SMS', 'WhatsApp'], doc.channel)" + "mandatory_depends_on": "eval: in_list(['Email', 'Slack', 'System Notification'], doc.channel)" }, { "fieldname": "document_type", @@ -208,7 +207,7 @@ "label": "Value To Be Set" }, { - "depends_on": "eval:in_list(['Email', 'SMS', 'WhatsApp'], doc.channel)", + "depends_on": "eval:in_list(['Email', 'SMS'], doc.channel)", "fieldname": "column_break_5", "fieldtype": "Section Break", "label": "Recipients" @@ -263,15 +262,6 @@ "label": "Print Format", "options": "Print Format" }, - { - "depends_on": "eval: doc.channel==='WhatsApp'", - "description": "To use WhatsApp for Business, initialize Twilio Settings.", - "fieldname": "twilio_number", - "fieldtype": "Link", - "label": "Twilio Number", - "mandatory_depends_on": "eval: doc.channel==='WhatsApp'", - "options": "Twilio Number Group" - }, { "default": "0", "depends_on": "eval: doc.channel !== 'System Notification'", @@ -291,7 +281,7 @@ "icon": "fa fa-envelope", "index_web_pages_for_search": 1, "links": [], - "modified": "2020-09-03 10:33:23.084590", + "modified": "2020-10-28 11:04:54.955567", "modified_by": "Administrator", "module": "Email", "name": "Notification", diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py index 62be313b82..75281d427e 100644 --- a/frappe/email/doctype/notification/notification.py +++ b/frappe/email/doctype/notification/notification.py @@ -14,7 +14,6 @@ from frappe.utils.safe_exec import get_safe_globals from frappe.modules.utils import export_module_json, get_doc_module from six import string_types from frappe.integrations.doctype.slack_webhook_url.slack_webhook_url import send_slack_message -from frappe.integrations.doctype.twilio_settings.twilio_settings import send_whatsapp_message from frappe.core.doctype.sms_settings.sms_settings import send_sms from frappe.desk.doctype.notification_log.notification_log import enqueue_create_notification @@ -29,7 +28,7 @@ class Notification(Document): self.name = self.subject def validate(self): - if self.channel not in ('WhatsApp', 'SMS'): + if self.channel in ("Email", "Slack", "System Notification"): validate_template(self.subject) validate_template(self.message) @@ -43,7 +42,6 @@ class Notification(Document): self.validate_forbidden_types() self.validate_condition() self.validate_standard() - self.validate_twilio_settings() frappe.cache().hdel('notifications', self.document_type) def on_update(self): @@ -70,11 +68,6 @@ def get_context(context): if self.is_standard and not frappe.conf.developer_mode: frappe.throw(_('Cannot edit Standard Notification. To edit, please disable this and duplicate it')) - def validate_twilio_settings(self): - if self.enabled and self.channel == "WhatsApp" \ - and not frappe.db.get_single_value("Twilio Settings", "enabled"): - frappe.throw(_("Please enable Twilio settings to send WhatsApp messages")) - def validate_condition(self): temp_doc = frappe.new_doc(self.document_type) if self.condition: @@ -137,9 +130,6 @@ def get_context(context): if self.channel == 'Slack': self.send_a_slack_msg(doc, context) - if self.channel == 'WhatsApp': - self.send_whatsapp_msg(doc, context) - if self.channel == 'SMS': self.send_sms(doc, context) @@ -230,13 +220,6 @@ def get_context(context): reference_doctype=doc.doctype, reference_name=doc.name) - def send_whatsapp_msg(self, doc, context): - send_whatsapp_message( - sender=self.twilio_number, - receiver_list=self.get_receiver_list(doc, context), - message=frappe.render_template(self.message, context), - ) - def send_sms(self, doc, context): send_sms( receiver_list=self.get_receiver_list(doc, context), @@ -302,7 +285,7 @@ def get_context(context): # For sending messages to the owner's mobile phone number if recipient.receiver_by_document_field == 'owner': - receiver_list.append(get_user_info(doc.get('owner'), 'mobile_no')) + receiver_list += get_user_info([dict(user_name=doc.get('owner'))], 'mobile_no') # For sending messages to the number specified in the receiver field elif recipient.receiver_by_document_field: receiver_list.append(doc.get(recipient.receiver_by_document_field)) diff --git a/frappe/integrations/desk_page/integrations/integrations.json b/frappe/integrations/desk_page/integrations/integrations.json index cbf7c9c085..1acf4e6c4a 100644 --- a/frappe/integrations/desk_page/integrations/integrations.json +++ b/frappe/integrations/desk_page/integrations/integrations.json @@ -23,7 +23,7 @@ { "hidden": 0, "label": "Settings", - "links": "[\n {\n \"description\": \"Webhooks calling API requests into web apps\",\n \"label\": \"Webhook\",\n \"name\": \"Webhook\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Slack Webhooks for internal integration\",\n \"label\": \"Slack Webhook URL\",\n \"name\": \"Slack Webhook URL\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Twilio Settings for WhatsApp integration\",\n \"label\": \"Twilio Settings\",\n \"name\": \"Twilio Settings\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"SMS Settings for sending sms\",\n \"label\": \"SMS Settings\",\n \"name\": \"SMS Settings\",\n \"type\": \"doctype\"\n }\n]" + "links": "[\n {\n \"description\": \"Webhooks calling API requests into web apps\",\n \"label\": \"Webhook\",\n \"name\": \"Webhook\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Slack Webhooks for internal integration\",\n \"label\": \"Slack Webhook URL\",\n \"name\": \"Slack Webhook URL\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"SMS Settings for sending sms\",\n \"label\": \"SMS Settings\",\n \"name\": \"SMS Settings\",\n \"type\": \"doctype\"\n }\n]" } ], "category": "Administration", @@ -38,7 +38,7 @@ "idx": 0, "is_standard": 1, "label": "Integrations", - "modified": "2020-08-20 23:04:04.528572", + "modified": "2020-10-28 10:25:54.792363", "modified_by": "Administrator", "module": "Integrations", "name": "Integrations", diff --git a/frappe/integrations/doctype/twilio_number_group/__init__.py b/frappe/integrations/doctype/twilio_number_group/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/integrations/doctype/twilio_number_group/twilio_number_group.json b/frappe/integrations/doctype/twilio_number_group/twilio_number_group.json deleted file mode 100644 index 9d51e4b452..0000000000 --- a/frappe/integrations/doctype/twilio_number_group/twilio_number_group.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "actions": [], - "autoname": "field:phone_number", - "creation": "2020-02-24 13:58:58.036914", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "phone_number" - ], - "fields": [ - { - "fieldname": "phone_number", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Phone Number", - "options": "Phone", - "show_days": 1, - "show_seconds": 1, - "unique": 1 - } - ], - "index_web_pages_for_search": 1, - "istable": 1, - "links": [], - "modified": "2020-08-20 22:48:57.166791", - "modified_by": "Administrator", - "module": "Integrations", - "name": "Twilio Number Group", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/frappe/integrations/doctype/twilio_number_group/twilio_number_group.py b/frappe/integrations/doctype/twilio_number_group/twilio_number_group.py deleted file mode 100644 index 04cb9ae146..0000000000 --- a/frappe/integrations/doctype/twilio_number_group/twilio_number_group.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -# import frappe -from frappe.model.document import Document - -class TwilioNumberGroup(Document): - pass diff --git a/frappe/integrations/doctype/twilio_settings/__init__.py b/frappe/integrations/doctype/twilio_settings/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/integrations/doctype/twilio_settings/test_twilio_settings.py b/frappe/integrations/doctype/twilio_settings/test_twilio_settings.py deleted file mode 100644 index bcb1368d68..0000000000 --- a/frappe/integrations/doctype/twilio_settings/test_twilio_settings.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and Contributors -# See license.txt -from __future__ import unicode_literals - -# import frappe -import unittest - -class TestTwilioSettings(unittest.TestCase): - pass diff --git a/frappe/integrations/doctype/twilio_settings/twilio_settings.js b/frappe/integrations/doctype/twilio_settings/twilio_settings.js deleted file mode 100644 index 59ebcf2e7d..0000000000 --- a/frappe/integrations/doctype/twilio_settings/twilio_settings.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2020, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Twilio Settings', { - refresh: function(frm) { - frm.dashboard.set_headline(__("For more information, {0}.", [`${__('Click here')}`])); - } -}); From 2dd9ae212755d24afd464d9167310adc90ac7f49 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 28 Oct 2020 11:10:58 +0530 Subject: [PATCH 025/259] fix: remove unused imports --- frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 2 +- frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 587f3c02b0..c2e0f78624 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -8,7 +8,7 @@ from frappe import _ import datetime import json from frappe.utils.dashboard import cache_source -from frappe.utils import nowdate, add_to_date, getdate, formatdate,\ +from frappe.utils import nowdate, add_to_date, getdate,\ get_datetime, cint, now_datetime from frappe.utils.dateutils import\ get_period, get_period_beginning, get_period_ending, get_from_date_from_timespan diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py index 13fea8282d..d723171337 100644 --- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import unittest, frappe from frappe.utils import getdate, formatdate -from frappe.utils.dateutils import get_period_ending, get_period_beginning, get_period +from frappe.utils.dateutils import get_period_ending, get_period from frappe.desk.doctype.dashboard_chart.dashboard_chart import get from datetime import datetime From 99a260e32acda6e680b37c71c6d552f8e1e72278 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 28 Oct 2020 11:56:15 +0530 Subject: [PATCH 026/259] fix: chart tests --- .../dashboard_chart/dashboard_chart.py | 4 ++-- .../dashboard_chart/test_dashboard_chart.py | 19 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index c2e0f78624..184fef7634 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -166,6 +166,7 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date): datefield = chart.based_on aggregate_function = get_aggregate_function(chart.chart_type) value_field = chart.value_based_on or '1' + from_date = from_date.strftime('%Y-%m-%d') to_date = to_date filters.append([doctype, datefield, '>=', from_date, False]) @@ -283,8 +284,7 @@ def get_aggregate_function(chart_type): def get_result(data, timegrain, from_date, to_date): start_date = getdate(from_date) end_date = getdate(to_date) - - result = [] + result = [[start_date, 0.0]] if timegrain == 'Daily' else [] while start_date < end_date: next_date = get_next_expected_date(start_date, timegrain) diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py index d723171337..dcdebe6cd2 100644 --- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import unittest, frappe -from frappe.utils import getdate, formatdate +from frappe.utils import getdate, formatdate, get_last_day from frappe.utils.dateutils import get_period_ending, get_period from frappe.desk.doctype.dashboard_chart.dashboard_chart import get @@ -53,10 +53,9 @@ class TestDashboardChart(unittest.TestCase): cur_date = datetime.now() - relativedelta(years=1) result = get(chart_name='Test Dashboard Chart', refresh=1) - self.assertEqual(result.get('labels')[0], get_period(cur_date)) - for idx in range(1, 13): - month = formatdate(month.strftime('%Y-%m-%d')) + for idx in range(13): + month = get_last_day(cur_date) self.assertEqual(result.get('labels')[idx], get_period(month)) cur_date += relativedelta(months=1) @@ -83,10 +82,9 @@ class TestDashboardChart(unittest.TestCase): cur_date = datetime.now() - relativedelta(years=1) result = get(chart_name ='Test Empty Dashboard Chart', refresh=1) - self.assertEqual(result.get('labels')[0], get_period(cur_date)) - for idx in range(1, 13): - month = formatdate(month.strftime('%Y-%m-%d')) + for idx in range(13): + month = get_last_day(cur_date) self.assertEqual(result.get('labels')[idx], get_period(month)) cur_date += relativedelta(months=1) @@ -116,10 +114,9 @@ class TestDashboardChart(unittest.TestCase): cur_date = datetime.now() - relativedelta(years=1) result = get(chart_name ='Test Empty Dashboard Chart 2', refresh = 1) - self.assertEqual(result.get('labels')[0], get_period(cur_date)) - for idx in range(1, 13): - month = formatdate(month.strftime('%Y-%m-%d')) + for idx in range(13): + month = get_last_day(cur_date) self.assertEqual(result.get('labels')[idx], get_period(month)) cur_date += relativedelta(months=1) @@ -171,7 +168,7 @@ class TestDashboardChart(unittest.TestCase): timeseries = 1 )).insert() - result = get(chart_name ='Test Daily Dashboard Chart', refresh = 1) + result = get(chart_name = 'Test Daily Dashboard Chart', refresh = 1) self.assertEqual(result.get('datasets')[0].get('values'), [200.0, 400.0, 300.0, 0.0, 100.0, 0.0]) self.assertEqual( From 044da8a5757be170cce29a7f986ef8a1af919fac Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 30 Oct 2020 14:04:03 +0530 Subject: [PATCH 027/259] fix: create auto_repeat field if docfield/custom field does not exist --- frappe/core/doctype/doctype/doctype.py | 3 ++- frappe/custom/doctype/customize_form/customize_form.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 8a9c130fbe..1d15de9ab5 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -570,7 +570,8 @@ class DocType(Document): def make_repeatable(self): """If allow_auto_repeat is set, add auto_repeat custom field.""" if self.allow_auto_repeat: - if not frappe.db.exists('Custom Field', {'fieldname': 'auto_repeat', 'dt': self.name}): + if not frappe.db.exists('Custom Field', {'fieldname': 'auto_repeat', 'dt': self.name}) and \ + not frappe.db.exists('DocField', {'fieldname': 'auto_repeat', 'parent': self.name}): insert_after = self.fields[len(self.fields) - 1].fieldname df = dict(fieldname='auto_repeat', label='Auto Repeat', fieldtype='Link', options='Auto Repeat', insert_after=insert_after, read_only=1, no_copy=1, print_hide=1) create_custom_field(self.name, df) diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index 61ecdd88b9..f3e67bba7b 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -76,8 +76,8 @@ class CustomizeForm(Document): def create_auto_repeat_custom_field_if_requried(self, meta): if self.allow_auto_repeat: - if not frappe.db.exists('Custom Field', {'fieldname': 'auto_repeat', - 'dt': self.doc_type}): + if not frappe.db.exists('Custom Field', {'fieldname': 'auto_repeat', 'dt': self.doc_type}) and \ + not frappe.db.exists('DocField', {'fieldname': 'auto_repeat', 'parent': self.name}): insert_after = self.fields[len(self.fields) - 1].fieldname df = dict( fieldname='auto_repeat', From 4c1cb83e16e7e417c92aa27f00356184452232cc Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 30 Oct 2020 17:24:42 +0530 Subject: [PATCH 028/259] fix: Move unnecessary compileall outside migrate --- frappe/commands/site.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 38e70534a5..f8ff07db1d 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -265,14 +265,12 @@ def disable_user(context, email): user.save(ignore_permissions=True) frappe.db.commit() - @click.command('migrate') @click.option('--skip-failing', is_flag=True, help="Skip patches that fail to run") @click.option('--skip-search-index', is_flag=True, help="Skip search indexing for web documents") @pass_context def migrate(context, skip_failing=False, skip_search_index=False): "Run patches, sync schema and rebuild files/translations" - import compileall import re from frappe.migrate import migrate @@ -291,9 +289,6 @@ def migrate(context, skip_failing=False, skip_search_index=False): if not context.sites: raise SiteNotSpecifiedError - print("Compiling Python files...") - compileall.compile_dir('../apps', quiet=1, rx=re.compile('.*node_modules.*')) - @click.command('migrate-to') @click.argument('frappe_provider') @pass_context From ea0af8d2e20d23536a903c8479829a5a48ae172e Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Mon, 2 Nov 2020 13:25:22 +0530 Subject: [PATCH 029/259] chore: remove twilio from requirements --- .../twilio_settings/twilio_settings.json | 67 ------------------- .../twilio_settings/twilio_settings.py | 63 ----------------- requirements.txt | 2 - 3 files changed, 132 deletions(-) delete mode 100644 frappe/integrations/doctype/twilio_settings/twilio_settings.json delete mode 100644 frappe/integrations/doctype/twilio_settings/twilio_settings.py diff --git a/frappe/integrations/doctype/twilio_settings/twilio_settings.json b/frappe/integrations/doctype/twilio_settings/twilio_settings.json deleted file mode 100644 index 9eb2c0c512..0000000000 --- a/frappe/integrations/doctype/twilio_settings/twilio_settings.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "actions": [], - "creation": "2020-01-28 15:21:44.457163", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "enabled", - "account_sid", - "auth_token", - "column_break_2", - "twilio_number" - ], - "fields": [ - { - "fieldname": "account_sid", - "fieldtype": "Data", - "label": "Account SID", - "mandatory_depends_on": "eval: doc.enabled" - }, - { - "fieldname": "auth_token", - "fieldtype": "Password", - "label": "Auth Token", - "mandatory_depends_on": "eval: doc.enabled" - }, - { - "fieldname": "column_break_2", - "fieldtype": "Column Break" - }, - { - "fieldname": "twilio_number", - "fieldtype": "Table", - "label": "Twilio Number", - "options": "Twilio Number Group" - }, - { - "default": "0", - "fieldname": "enabled", - "fieldtype": "Check", - "label": "Enabled" - } - ], - "index_web_pages_for_search": 1, - "issingle": 1, - "links": [], - "modified": "2020-09-03 10:17:21.318743", - "modified_by": "Administrator", - "module": "Integrations", - "name": "Twilio Settings", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "print": 1, - "read": 1, - "role": "System Manager", - "share": 1, - "write": 1 - } - ], - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/frappe/integrations/doctype/twilio_settings/twilio_settings.py b/frappe/integrations/doctype/twilio_settings/twilio_settings.py deleted file mode 100644 index b8f991e829..0000000000 --- a/frappe/integrations/doctype/twilio_settings/twilio_settings.py +++ /dev/null @@ -1,63 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -from frappe.model.document import Document -from frappe import _ -from frappe.utils.password import get_decrypted_password -from twilio.rest import Client -from six import string_types -from json import loads - -class TwilioSettings(Document): - def on_update(self): - if self.enabled: - self.validate_twilio_credentials() - - def validate_twilio_credentials(self): - try: - auth_token = get_decrypted_password("Twilio Settings", "Twilio Settings", 'auth_token') - client = Client(self.account_sid, auth_token) - client.api.accounts(self.account_sid).fetch() - except Exception: - frappe.throw(_("Invalid Account SID or Auth Token.")) - -def send_whatsapp_message(sender, receiver_list, message): - twilio_settings = frappe.get_doc("Twilio Settings") - if not twilio_settings.enabled: - frappe.throw(_("Please enable twilio settings before sending WhatsApp messages")) - - if isinstance(receiver_list, string_types): - receiver_list = loads(receiver_list) - if not isinstance(receiver_list, list): - receiver_list = [receiver_list] - - auth_token = get_decrypted_password("Twilio Settings", "Twilio Settings", 'auth_token') - client = Client(twilio_settings.account_sid, auth_token) - args = { - "from_": 'whatsapp:+{}'.format(sender), - "body": message - } - - failed_delivery = [] - - for rec in receiver_list: - args.update({"to": 'whatsapp:{}'.format(rec)}) - resp = _send_whatsapp(args, client) - if not resp or resp.error_message: - failed_delivery.append(rec) - - if failed_delivery: - frappe.log_error(_("The message wasn't correctly delivered to: {}".format(", ".join(failed_delivery))), _('Delivery Failed')) - - -def _send_whatsapp(message_dict, client): - response = frappe._dict() - try: - response = client.messages.create(**message_dict) - except Exception as e: - frappe.log_error(e, title = _('Twilio WhatsApp Message Error')) - - return response \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 30f0220af7..de9e675a67 100644 --- a/requirements.txt +++ b/requirements.txt @@ -72,7 +72,5 @@ zxcvbn-python==4.4.24 pycryptodome==3.9.8 paytmchecksum==1.7.0 wrapt==1.10.11 -twilio==6.44.2 razorpay==1.2.0 - rsa>=4.1 # not directly required, pinned by Snyk to avoid a vulnerability \ No newline at end of file From 8fde766b8f3a0f4a8e87d7ea2a17d2d2a10a33f7 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 2 Nov 2020 18:47:14 +0530 Subject: [PATCH 030/259] fix: use get_dates_from_timegrain function --- .../dashboard_chart/dashboard_chart.py | 19 +++---------------- .../dashboard_chart/test_dashboard_chart.py | 3 +++ 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 184fef7634..c814f324f5 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -11,7 +11,7 @@ from frappe.utils.dashboard import cache_source from frappe.utils import nowdate, add_to_date, getdate,\ get_datetime, cint, now_datetime from frappe.utils.dateutils import\ - get_period, get_period_beginning, get_period_ending, get_from_date_from_timespan + get_period, get_period_beginning, get_period_ending, get_from_date_from_timespan, get_dates_from_timegrain from frappe.model.naming import append_number_if_name_exists from frappe.boot import get_allowed_reports from frappe.model.document import Document @@ -282,15 +282,8 @@ def get_aggregate_function(chart_type): def get_result(data, timegrain, from_date, to_date): - start_date = getdate(from_date) - end_date = getdate(to_date) - result = [[start_date, 0.0]] if timegrain == 'Daily' else [] - - while start_date < end_date: - next_date = get_next_expected_date(start_date, timegrain) - result.append([next_date, 0.0]) - start_date = next_date - + dates = get_dates_from_timegrain(from_date, to_date, timegrain) + result = [[date, 0] for date in dates] data_index = 0 if data: for i, d in enumerate(result): @@ -300,12 +293,6 @@ def get_result(data, timegrain, from_date, to_date): return result -def get_next_expected_date(date, timegrain): - next_date = None - # given date is always assumed to be the period ending date - next_date = get_period_ending(add_to_date(date, days=1), timegrain) - return getdate(next_date) - @frappe.whitelist() @frappe.validate_and_sanitize_search_inputs def get_charts_for_user(doctype, txt, searchfield, start, page_len, filters): diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py index dcdebe6cd2..b9503ee167 100644 --- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py @@ -56,6 +56,7 @@ class TestDashboardChart(unittest.TestCase): for idx in range(13): month = get_last_day(cur_date) + month = formatdate(month.strftime('%Y-%m-%d')) self.assertEqual(result.get('labels')[idx], get_period(month)) cur_date += relativedelta(months=1) @@ -85,6 +86,7 @@ class TestDashboardChart(unittest.TestCase): for idx in range(13): month = get_last_day(cur_date) + month = formatdate(month.strftime('%Y-%m-%d')) self.assertEqual(result.get('labels')[idx], get_period(month)) cur_date += relativedelta(months=1) @@ -117,6 +119,7 @@ class TestDashboardChart(unittest.TestCase): for idx in range(13): month = get_last_day(cur_date) + month = formatdate(month.strftime('%Y-%m-%d')) self.assertEqual(result.get('labels')[idx], get_period(month)) cur_date += relativedelta(months=1) From ba33aa1b78424cd45cc9b7bf26da599d5c895361 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 2 Nov 2020 19:06:42 +0530 Subject: [PATCH 031/259] fix: remove unused imports --- frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index c814f324f5..9cfc0a04c8 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -8,10 +8,10 @@ from frappe import _ import datetime import json from frappe.utils.dashboard import cache_source -from frappe.utils import nowdate, add_to_date, getdate,\ +from frappe.utils import nowdate, getdate, get_datetime,\ get_datetime, cint, now_datetime from frappe.utils.dateutils import\ - get_period, get_period_beginning, get_period_ending, get_from_date_from_timespan, get_dates_from_timegrain + get_period, get_period_beginning, get_from_date_from_timespan, get_dates_from_timegrain from frappe.model.naming import append_number_if_name_exists from frappe.boot import get_allowed_reports from frappe.model.document import Document From 875ba903b987bbdaffa4e838ad16f89174e3b1a4 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 2 Nov 2020 19:18:56 +0530 Subject: [PATCH 032/259] fix: chart test date format --- frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 3 +-- .../desk/doctype/dashboard_chart/test_dashboard_chart.py | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 9cfc0a04c8..3f8d7c3c79 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -8,8 +8,7 @@ from frappe import _ import datetime import json from frappe.utils.dashboard import cache_source -from frappe.utils import nowdate, getdate, get_datetime,\ - get_datetime, cint, now_datetime +from frappe.utils import nowdate, getdate, get_datetime, cint, now_datetime from frappe.utils.dateutils import\ get_period, get_period_beginning, get_from_date_from_timespan, get_dates_from_timegrain from frappe.model.naming import append_number_if_name_exists diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py index b9503ee167..3c37ad4a09 100644 --- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py @@ -176,8 +176,7 @@ class TestDashboardChart(unittest.TestCase): self.assertEqual(result.get('datasets')[0].get('values'), [200.0, 400.0, 300.0, 0.0, 100.0, 0.0]) self.assertEqual( result.get('labels'), - [formatdate('2019-01-06'), formatdate('2019-01-07'), formatdate('2019-01-08'),\ - formatdate('2019-01-09'), formatdate('2019-01-10'), formatdate('2019-01-11')] + ['06-01-19', '07-01-19', '08-01-19', '09-01-19', '10-01-19', '11-01-19'] ) frappe.db.rollback() @@ -206,7 +205,10 @@ class TestDashboardChart(unittest.TestCase): result = get(chart_name ='Test Weekly Dashboard Chart', refresh = 1) self.assertEqual(result.get('datasets')[0].get('values'), [50.0, 300.0, 800.0, 0.0]) - self.assertEqual(result.get('labels'), [formatdate('2018-12-30'), formatdate('2019-01-06'), formatdate('2019-01-13'), formatdate('2019-01-20')]) + self.assertEqual( + result.get('labels'), + ['30-12-18', '06-01-19', '13-01-19', '20-01-19'] + ) frappe.db.rollback() From 50f6f83912e08bf1ea7331bc8f23f81509235dc2 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 3 Nov 2020 15:11:10 +0530 Subject: [PATCH 033/259] test: Added tests for dt controller + db sync --- frappe/tests/test_document.py | 39 ++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py index c96076cfba..38f081343a 100644 --- a/frappe/tests/test_document.py +++ b/frappe/tests/test_document.py @@ -251,6 +251,7 @@ class TestDocument(unittest.TestCase): def test_rename_doc(self): from random import choice, sample + from frappe.model.base_document import get_controller available_documents = [] doctype = "ToDo" @@ -288,4 +289,40 @@ class TestDocument(unittest.TestCase): self.assertEqual(merged_todo_doc.priority, second_todo_doc.priority) for docname in available_documents: - frappe.delete_doc(doctype, docname) \ No newline at end of file + frappe.delete_doc(doctype, docname) + + # test 3: rename doctypes with controller code + doctype = frappe._dict({ + "old": "Test Rename Document Old", + "new": "Test Rename Document New", + }) + doc = frappe.get_doc({ + "doctype": "DocType", + "module": "Custom", + "name": doctype.old, + "custom": 0, + "fields": [ + { + "label": "Some Field", + "fieldname": "some_fieldname", + "fieldtype": "Data" + } + ], + "permissions": [ + {"role": "System Manager", "read": 1} + ], + }) + doc.save() + # check if module exists exists; + # if custom, get_controller will return Document class + # if not custom, a different class will be returned + self.assertNotEqual(get_controller(doctype.old), frappe.model.document.Document) + + # rename doc via wrapper API accessible via /desk + frappe.rename_doc("DocType", doctype.old, doctype.new) + + # check if database and controllers are updated + self.assertTrue(frappe.db.exists("DocType", doctype.new)) + self.assertFalse(frappe.db.exists("DocType", doctype.old)) + with self.assertRaises(ImportError): + get_controller(doctype.old) From 5ba92a3ae18a3af2b36e87698e91a4e41ef7bc5e Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 3 Nov 2020 15:42:52 +0530 Subject: [PATCH 034/259] test: Use insert instead of save --- frappe/tests/test_document.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py index 38f081343a..6409195f92 100644 --- a/frappe/tests/test_document.py +++ b/frappe/tests/test_document.py @@ -312,7 +312,7 @@ class TestDocument(unittest.TestCase): {"role": "System Manager", "read": 1} ], }) - doc.save() + doc.insert() # check if module exists exists; # if custom, get_controller will return Document class # if not custom, a different class will be returned From 841f2f4a36d984d9745146f656f2465abe183e1e Mon Sep 17 00:00:00 2001 From: marination Date: Tue, 3 Nov 2020 21:51:37 +0530 Subject: [PATCH 035/259] chore: Rename Doctype Test and more explicit comment - Better decription of why the fix is done, what case it handles - Test for Renaming Doctype and Record having same name as DocType --- frappe/model/rename_doc.py | 10 ++++++++-- frappe/tests/test_document.py | 37 ++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index e04d59ab6a..789a7f51cf 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -251,8 +251,14 @@ def update_link_field_values(link_fields, old, new, doctype): else: parent = field['parent'] - # because the table hasn't been renamed yet! - if field['parent'] == new and doctype == "DocType": + # Handles the case where one of the link fields belongs to + # the DocType being renamed. + # Here this field could have the current DocType as its value too. + + # In this case while updating link field value, the field's parent + # or the current DocType table name hasn't been renamed yet, + # so consider it's old name. + if parent == new and doctype == "DocType": parent = old frappe.db.sql(""" diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py index c96076cfba..4e9984e89a 100644 --- a/frappe/tests/test_document.py +++ b/frappe/tests/test_document.py @@ -288,4 +288,39 @@ class TestDocument(unittest.TestCase): self.assertEqual(merged_todo_doc.priority, second_todo_doc.priority) for docname in available_documents: - frappe.delete_doc(doctype, docname) \ No newline at end of file + frappe.delete_doc(doctype, docname) + + def test_rename_doctype(self): + from frappe.core.doctype.doctype.test_doctype import new_doctype + + fields =[{ + "label": "Linked To", + "fieldname": "linked_to_doctype", + "fieldtype": "Link", + "options": "DocType", + "unique": 0 + }] + if not frappe.db.exists("DocType", "Rename This"): + new_doctype("Rename This", unique=0, fields=fields).insert() + + to_rename_record = frappe.get_doc({ + "doctype": "Rename This", + "linked_to_doctype": "Rename This" + }) + to_rename_record.insert() + + # Rename doctype + self.assertEqual("Renamed Doc", frappe.rename_doc("DocType", "Rename This", "Renamed Doc", force=True)) + + # Test if Doctype value has changed in Link field + renamed_doctype_record = frappe.get_doc("Renamed Doc", to_rename_record.name) + self.assertEqual(renamed_doctype_record.linked_to_doctype, "Renamed Doc") + + # Test if there are conflicts between a record and a DocType + # having the same name + old_name = to_rename_record.name + new_name = "ToDo" + self.assertEqual(new_name, frappe.rename_doc("Renamed Doc", old_name, new_name, force=True)) + + frappe.delete_doc_if_exists("Renamed Doc", "ToDo") + frappe.delete_doc_if_exists("DocType", "Renamed Doc") \ No newline at end of file From f15b2cb04a8b78367183c8ac72de8c0045e6e925 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 4 Nov 2020 14:35:00 +0530 Subject: [PATCH 036/259] fix: don't throw if filter is invalid --- frappe/public/js/frappe/ui/filters/filter_list.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js index 9b424f9ed2..e269c35ca5 100644 --- a/frappe/public/js/frappe/ui/filters/filter_list.js +++ b/frappe/public/js/frappe/ui/filters/filter_list.js @@ -67,7 +67,11 @@ frappe.ui.FilterGroup = class { && !frappe.meta.has_field(doctype, fieldname) && !frappe.model.std_fields_list.includes(fieldname)) { - frappe.throw(__("Invalid filter: {0}", [fieldname.bold()])); + frappe.msgprint({ + message: __('Invalid filter: {0}', [fieldname.bold()]), + indicator: 'red', + }); + return false; } return true; From a185d8866e4a6183c874406a05628d19c72ea2d4 Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Date: Wed, 4 Nov 2020 15:18:30 +0530 Subject: [PATCH 037/259] refactor: add namespaces to build_summary_item, generate_route, shorten_number, get_number_system --- frappe/public/js/frappe/utils/utils.js | 13 +++++-- .../js/frappe/views/reports/query_report.js | 4 +-- .../public/js/frappe/widgets/chart_widget.js | 5 +-- .../public/js/frappe/widgets/links_widget.js | 5 +-- .../js/frappe/widgets/number_card_widget.js | 7 ++-- .../js/frappe/widgets/onboarding_widget.js | 5 +-- .../js/frappe/widgets/shortcut_widget.js | 5 +-- frappe/public/js/frappe/widgets/utils.js | 34 ++++++++++++------- 8 files changed, 50 insertions(+), 28 deletions(-) diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index b8eeefb046..7695ace85a 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -2,7 +2,9 @@ // MIT License. See license.txt import deep_equal from "fast-deep-equal"; -frappe.provide('frappe.utils'); +import { generate_route, shorten_number, get_number_system } from "../widgets/utils"; + +frappe.provide("frappe.utils"); Object.assign(frappe.utils, { get_random: function(len) { @@ -892,7 +894,14 @@ Object.assign(frappe.utils, { hide_seconds: docfield.hide_seconds }; return duration_options; - } + }, + + generate_route: generate_route, + + shorten_number: shorten_number, + + get_number_system: get_number_system, + }); // Array de duplicate diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 53cee5b348..720261e306 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1,8 +1,8 @@ // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors // MIT License. See license.txt import DataTable from 'frappe-datatable'; -import { build_summary_item } from "../../widgets/utils"; +frappe.provide('frappe.widget.utils'); frappe.provide('frappe.views'); frappe.provide('frappe.query_reports'); @@ -631,7 +631,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { render_summary(data) { data.forEach((summary) => { - build_summary_item(summary).appendTo(this.$summary); + frappe.widget.utils.build_summary_item(summary).appendTo(this.$summary); }) this.$summary.show(); diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index c89ee96520..eee240444f 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -1,5 +1,6 @@ import Widget from "./base_widget.js"; -import { build_summary_item } from "./utils"; + +frappe.provide('frappe.widget.utils'); frappe.provide("frappe.dashboards"); frappe.provide("frappe.dashboards.chart_sources"); @@ -80,7 +81,7 @@ export default class ChartWidget extends Widget { } this.summary.forEach(summary => { - build_summary_item(summary).appendTo(this.$summary); + frappe.widget.utils.build_summary_item(summary).appendTo(this.$summary); }); this.summary.length && this.$summary.show(); } diff --git a/frappe/public/js/frappe/widgets/links_widget.js b/frappe/public/js/frappe/widgets/links_widget.js index f7bca23c47..39a7eb17b3 100644 --- a/frappe/public/js/frappe/widgets/links_widget.js +++ b/frappe/public/js/frappe/widgets/links_widget.js @@ -1,5 +1,6 @@ import Widget from "./base_widget.js"; -import { generate_route } from "./utils"; + +frappe.provide("frappe.utils"); export default class LinksWidget extends Widget { constructor(opts) { @@ -55,7 +56,7 @@ export default class LinksWidget extends Widget { return ` ${item.label ? item.label : item.name}`; - return ` + return ` ${item.label ? item.label : item.name}`; }; diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js index 6b38412ebd..9667fe0721 100644 --- a/frappe/public/js/frappe/widgets/number_card_widget.js +++ b/frappe/public/js/frappe/widgets/number_card_widget.js @@ -1,5 +1,6 @@ import Widget from "./base_widget.js"; -import { generate_route, shorten_number } from "./utils"; + +frappe.provide("frappe.utils"); export default class NumberCardWidget extends Widget { constructor(opts) { @@ -74,7 +75,7 @@ export default class NumberCardWidget extends Widget { set_route() { const is_document_type = this.card_doc.type !== 'Report'; const name = is_document_type ? this.card_doc.document_type : this.card_doc.report_name; - const route = generate_route({ + const route = frappe.utils.generate_route({ name: name, type: is_document_type ? 'doctype' : 'report', is_query_report: !is_document_type, @@ -203,7 +204,7 @@ export default class NumberCardWidget extends Widget { get_formatted_number(df) { const default_country = frappe.sys_defaults.country; - const shortened_number = shorten_number(this.number, default_country); + const shortened_number = frappe.utils.shorten_number(this.number, default_country); let number_parts = shortened_number.split(' '); const symbol = number_parts[1] || ''; diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js index 8c1d2cbb5b..e23aaf509f 100644 --- a/frappe/public/js/frappe/widgets/onboarding_widget.js +++ b/frappe/public/js/frappe/widgets/onboarding_widget.js @@ -1,5 +1,6 @@ import Widget from "./base_widget.js"; -import { generate_route } from "./utils"; + +frappe.provide("frappe.utils"); export default class OnboardingWidget extends Widget { constructor(opts) { @@ -92,7 +93,7 @@ export default class OnboardingWidget extends Widget { } open_report(step) { - let route = generate_route({ + let route = frappe.utils.generate_route({ name: step.reference_report, type: "report", is_query_report: ["Query Report", "Script Report"].includes( diff --git a/frappe/public/js/frappe/widgets/shortcut_widget.js b/frappe/public/js/frappe/widgets/shortcut_widget.js index 7174ba0d2a..734e29e2bc 100644 --- a/frappe/public/js/frappe/widgets/shortcut_widget.js +++ b/frappe/public/js/frappe/widgets/shortcut_widget.js @@ -1,5 +1,6 @@ import Widget from "./base_widget.js"; -import { generate_route } from "./utils"; + +frappe.provide("frappe.utils"); export default class ShortcutWidget extends Widget { constructor(opts) { @@ -25,7 +26,7 @@ export default class ShortcutWidget extends Widget { this.widget.click(() => { if (this.in_customize_mode) return; - let route = generate_route({ + let route = frappe.utils.generate_route({ route: this.route, name: this.link_to, type: this.type, diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js index 9a255d0776..120e47ea59 100644 --- a/frappe/public/js/frappe/widgets/utils.js +++ b/frappe/public/js/frappe/widgets/utils.js @@ -1,3 +1,5 @@ +frappe.provide('frappe.widget.utils'); + function generate_route(item) { const type = item.type.toLowerCase() if (type === "doctype") { @@ -126,22 +128,28 @@ function generate_grid(data) { return grid_template_area } -const build_summary_item = (summary) => { - let df = { fieldtype: summary.datatype }; - let doc = null; +frappe.widget.utils = { + build_summary_item: function(summary) { + let df = { fieldtype: summary.datatype }; + let doc = null; - if (summary.datatype == "Currency") { - df.options = "currency"; - doc = { currency: summary.currency }; - } + if (summary.datatype == "Currency") { + df.options = "currency"; + doc = { currency: summary.currency }; + } - let value = frappe.format(summary.value, df, null, doc); - let indicator = summary.indicator ? `indicator ${summary.indicator.toLowerCase()}` : ''; + let value = frappe.format(summary.value, df, null, doc); + let indicator = summary.indicator + ? `indicator ${summary.indicator.toLowerCase()}` + : ""; - return $(`
- ${summary.label} -

${ value}

+ return $(`
+ ${ + summary.label + } +

${value}

`); + }, }; function shorten_number(number, country) { @@ -190,4 +198,4 @@ function get_number_system(country) { return number_system_map[country]; } -export { generate_route, generate_grid, build_summary_item, shorten_number }; +export { generate_route, generate_grid, shorten_number, get_number_system }; From 766d5fedf9269adf47117c0581ed93c1f956f285 Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Date: Wed, 4 Nov 2020 15:36:53 +0530 Subject: [PATCH 038/259] refactor: fix indentation --- frappe/public/js/frappe/widgets/utils.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js index 120e47ea59..787a8b1a21 100644 --- a/frappe/public/js/frappe/widgets/utils.js +++ b/frappe/public/js/frappe/widgets/utils.js @@ -143,12 +143,11 @@ frappe.widget.utils = { ? `indicator ${summary.indicator.toLowerCase()}` : ""; - return $(`
- ${ - summary.label - } -

${value}

-
`); + return $( + `
${ + summary.label + }

${value}

` + ); }, }; From 0245b0ff4fd03162f68ab040b4a80bd528e03a93 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 4 Nov 2020 16:22:16 +0530 Subject: [PATCH 039/259] fix: delete prepared reports in batches --- .../prepared_report/prepared_report.py | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py index 2c02d99dad..2c4d933440 100644 --- a/frappe/core/doctype/prepared_report/prepared_report.py +++ b/frappe/core/doctype/prepared_report/prepared_report.py @@ -89,20 +89,18 @@ def delete_expired_prepared_reports(): 'creation': ['<', frappe.utils.add_days(frappe.utils.now(), -expiry_period)] }) - args = { - 'reports': prepared_reports_to_delete, - 'limit': 50 - } - - enqueue(method=delete_prepared_reports, job_name="delete_prepared_reports", **args) + batches = frappe.utils.create_batch(prepared_reports_to_delete, 50) + for batch in batches: + args = { + 'reports': batch, + } + enqueue(method=delete_prepared_reports, job_name="delete_prepared_reports", **args) @frappe.whitelist() -def delete_prepared_reports(reports, limit=None): +def delete_prepared_reports(reports): reports = frappe.parse_json(reports) - for index, doc in enumerate(reports): - if limit and index == limit: - return - frappe.delete_doc('Prepared Report', doc['name'], ignore_permissions=True) + for report in reports: + frappe.delete_doc('Prepared Report', report['name'], ignore_permissions=True) def create_json_gz_file(data, dt, dn): # Storing data in CSV file causes information loss From 63907e4006057aebe9bb93fddc548889781787d0 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 4 Nov 2020 16:45:56 +0530 Subject: [PATCH 040/259] feat: Allow kwargs in frappe.get_last_doc --- frappe/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index c5f13f2295..a38154f18d 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -796,9 +796,9 @@ def get_doc(*args, **kwargs): return doc -def get_last_doc(doctype): +def get_last_doc(doctype, **kwargs): """Get last created document of this type.""" - d = get_all(doctype, ["name"], order_by="creation desc", limit_page_length=1) + d = get_all(doctype, ["name"], order_by="creation desc", limit_page_length=1, **kwargs) if d: return get_doc(doctype, d[0].name) else: From 3523323c649fbfa753de51a4d76c57587ad63287 Mon Sep 17 00:00:00 2001 From: Anupam Date: Wed, 4 Nov 2020 19:09:41 +0530 Subject: [PATCH 041/259] fix: frappe.utils.formatdate not working in the jinja template --- frappe/utils/safe_exec.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 12382e85cd..fee6b404ac 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -277,5 +277,6 @@ VALID_UTILS = ( "to_markdown", "md_to_html", "is_subset", -"generate_hash" +"generate_hash", +"formatdate" ) \ No newline at end of file From 94d17590414c94027f44166662f64947dec28917 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 5 Nov 2020 13:46:12 +0530 Subject: [PATCH 042/259] feat: Validate sql file before restoring site --- frappe/commands/site.py | 10 ++++++---- frappe/exceptions.py | 1 + frappe/installer.py | 27 +++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 38e70534a5..6a2e665efd 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -103,11 +103,11 @@ def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=N @click.option('--install-app', multiple=True, help='Install app after installation') @click.option('--with-public-files', help='Restores the public files of the site, given path to its tar file') @click.option('--with-private-files', help='Restores the private files of the site, given path to its tar file') -@click.option('--force', is_flag=True, default=False, help='Ignore the site downgrade warning, if applicable') +@click.option('--force', is_flag=True, default=False, help='Ignore the validations and downgrade warnings. This action is not recommended') @pass_context def restore(context, sql_file_path, mariadb_root_username=None, mariadb_root_password=None, db_name=None, verbose=None, install_app=None, admin_password=None, force=None, with_public_files=None, with_private_files=None): "Restore site database from an sql file" - from frappe.installer import extract_sql_gzip, extract_files, is_downgrade + from frappe.installer import extract_sql_gzip, extract_files, is_downgrade, validate_database_sql force = context.force or force # Extract the gzip file if user has passed *.sql.gz file instead of *.sql file @@ -127,6 +127,7 @@ def restore(context, sql_file_path, mariadb_root_username=None, mariadb_root_pas else: decompressed_file_name = sql_file_path + validate_database_sql(decompressed_file_name, _raise=force) site = get_site(context) frappe.init(site=site) @@ -310,15 +311,16 @@ def migrate_to(context, frappe_provider): @click.command('run-patch') @click.argument('module') +@click.option('--force', is_flag=True) @pass_context -def run_patch(context, module): +def run_patch(context, module, force): "Run a particular patch" import frappe.modules.patch_handler for site in context.sites: frappe.init(site=site) try: frappe.connect() - frappe.modules.patch_handler.run_single(module, force=context.force) + frappe.modules.patch_handler.run_single(module, force=force or context.force) finally: frappe.destroy() if not context.sites: diff --git a/frappe/exceptions.py b/frappe/exceptions.py index 88428b875c..23e5f0d1b6 100644 --- a/frappe/exceptions.py +++ b/frappe/exceptions.py @@ -109,3 +109,4 @@ class DocumentAlreadyRestored(Exception): pass class InvalidAuthorizationHeader(CSRFTokenError): pass class InvalidAuthorizationPrefix(CSRFTokenError): pass class InvalidAuthorizationToken(CSRFTokenError): pass +class InvalidDatabaseFile(ValidationError): pass \ No newline at end of file diff --git a/frappe/installer.py b/frappe/installer.py index 27fca9088a..6baa7bc589 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -406,3 +406,30 @@ def is_downgrade(sql_file_path, verbose=False): print("Your site will be downgraded from Frappe {0} to {1}".format(current_version, backup_version)) return downgrade + + +def validate_database_sql(path, _raise=True): + """Check if file has contents and if DefaultValue table exists + + Args: + path (str): Path of the decompressed SQL file + _raise (bool, optional): Raise exception if invalid file. Defaults to True. + """ + _raise = False + error_message = "" + + if not os.path.getsize(path): + error_message = f"{path} is an empty file!" + _raise = True + + if not _raise: + with open(path, "r") as f: + for line in f: + if 'tabDefaultValue' in line: + error_message = "Table `tabDefaultValue` not found in file." + _raise = True + + if error_message and _raise: + import click + click.secho(error_message, fg="red") + raise frappe.InvalidDatabaseFile From 22d3824fee3ac7e4253edc677ba4c98834e88d37 Mon Sep 17 00:00:00 2001 From: Steffen Brennscheidt Date: Thu, 5 Nov 2020 11:32:06 +0000 Subject: [PATCH 043/259] fix: No redis dependency during tests and install Adding a user during after_install hook caused error during install of an app --- frappe/core/doctype/user/user.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 2c5865fb69..0cec7a511c 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -98,15 +98,16 @@ class User(Document): self.share_with_self() clear_notifications(user=self.name) frappe.clear_cache(user=self.name) + now=frappe.flags.in_test or frappe.flags.in_install self.send_password_notification(self.__new_password) frappe.enqueue( 'frappe.core.doctype.user.user.create_contact', user=self, ignore_mandatory=True, - now=frappe.flags.in_test or frappe.flags.in_install + now=now ) if self.name not in ('Administrator', 'Guest') and not self.user_image: - frappe.enqueue('frappe.core.doctype.user.user.update_gravatar', name=self.name) + frappe.enqueue('frappe.core.doctype.user.user.update_gravatar', name=self.name, now=now) def has_website_permission(self, ptype, user, verbose=False): """Returns true if current user is the session user""" From 476f21eb4dfdcb93a17582b76fd052ee6c3c3d3a Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 5 Nov 2020 18:26:36 +0530 Subject: [PATCH 044/259] fix: load doc from db in get_transitions --- frappe/model/workflow.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/model/workflow.py b/frappe/model/workflow.py index 7239b202bd..72ce8c9ce4 100644 --- a/frappe/model/workflow.py +++ b/frappe/model/workflow.py @@ -29,6 +29,8 @@ def get_transitions(doc, workflow = None, raise_exception=False): if doc.is_new(): return [] + doc.load_from_db() + frappe.has_permission(doc, 'read', throw=True) roles = frappe.get_roles() From 9e0d2abc6a9c333cae3106acf61ddae16caed5db Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 6 Nov 2020 14:04:52 +0530 Subject: [PATCH 045/259] fix: permission not applied on fetching goal chart --- frappe/utils/goal.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/utils/goal.py b/frappe/utils/goal.py index e7cffc3ddf..4c63eb9fc4 100644 --- a/frappe/utils/goal.py +++ b/frappe/utils/goal.py @@ -57,6 +57,10 @@ def get_monthly_goal_graph_data(title, doctype, docname, goal_value_field, goal_ from frappe.utils.formatters import format_value import json + # should have atleast read perm + if not frappe.has_permission(goal_doctype): + return None + meta = frappe.get_meta(doctype) doc = frappe.get_doc(doctype, docname) From 9446da31d6d7dc5f7fcae78d7e463086aab0829c Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 6 Nov 2020 14:05:27 +0530 Subject: [PATCH 046/259] fix: dashboard show even if no data is present --- frappe/public/js/frappe/form/layout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 2195568317..6ea21e6e63 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -113,7 +113,7 @@ frappe.ui.form.Layout = Class.extend({ label: __('Dashboard'), cssClass: 'form-dashboard', collapsible: 1, - //hidden: 1 + hidden: 1 }); }, From ad603487a3d012d5a20b71f34f13ff5916a43551 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 6 Nov 2020 15:25:07 +0530 Subject: [PATCH 047/259] feat: Allow configurable filters and order_by for frappe.get_last_doc --- frappe/__init__.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index a38154f18d..5e36107310 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -796,11 +796,17 @@ def get_doc(*args, **kwargs): return doc -def get_last_doc(doctype, **kwargs): +def get_last_doc(doctype, filters=None, order_by="creation desc"): """Get last created document of this type.""" - d = get_all(doctype, ["name"], order_by="creation desc", limit_page_length=1, **kwargs) + d = get_all( + doctype, + filters=filters, + limit_page_length=1, + order_by=order_by, + pluck="name" + ) if d: - return get_doc(doctype, d[0].name) + return get_doc(doctype, d[0]) else: raise DoesNotExistError From 03c8a23d77261b9e6fe8a1f2253a7f11d5fa70dc Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 6 Nov 2020 15:34:06 +0530 Subject: [PATCH 048/259] style: Trim the fat (whitepsace) --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 5e36107310..fac0927428 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -348,7 +348,7 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, as_list=False, if as_table and type(msg) in (list, tuple): out.as_table = 1 - + if as_list and type(msg) in (list, tuple) and len(msg) > 1: out.as_list = 1 From 5296403e0474cf80ab21d802847a1ce6900792ad Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Date: Fri, 6 Nov 2020 17:27:51 +0530 Subject: [PATCH 049/259] refactor: move standard utils to standard utils --- frappe/public/js/frappe/utils/utils.js | 124 +++++++++++++++++++++- frappe/public/js/frappe/widgets/utils.js | 126 +---------------------- 2 files changed, 122 insertions(+), 128 deletions(-) diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 7695ace85a..7d00a946e5 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -896,12 +896,130 @@ Object.assign(frappe.utils, { return duration_options; }, - generate_route: generate_route, + generate_route: function(item) { + const type = item.type.toLowerCase() + if (type === "doctype") { + item.doctype = item.name; + } + let route = ""; + if (!item.route) { + if (item.link) { + route = strip(item.link, "#"); + } else if (type === "doctype") { + if (frappe.model.is_single(item.doctype)) { + route = "Form/" + item.doctype; + } else { + if (!item.doc_view) { + if (frappe.model.is_tree(item.doctype)) { + item.doc_view = "Tree"; + } else { + item.doc_view = "List"; + } + } + switch (item.doc_view) { + case "List": + if (item.filters) { + frappe.route_options = item.filters; + } + route = "List/" + item.doctype; + break; + case "Tree": + route = "Tree/" + item.doctype; + break; + case "Report Builder": + route = "List/" + item.doctype + "/Report"; + break; + case "Dashboard": + route = "List/" + item.doctype + "/Dashboard"; + break; + case "New": + route = "Form/" + item.doctype + "/New " + item.doctype; + break; + case "Calendar": + route = "List/" + item.doctype + "/Calendar/Default"; + break; + default: + frappe.throw({ message: __("Not a valid DocType view:") + item.doc_view, title: __("Unknown View") }); + route = ""; + } + } + } else if (type === "report" && item.is_query_report) { + route = "query-report/" + item.name; + } else if (type === "report") { + route = "List/" + item.doctype + "/Report/" + item.name; + } else if (type === "page") { + route = item.name; + } else if (type === "dashboard") { + route = "dashboard/" + item.name; + } - shorten_number: shorten_number, + route = "#" + route; + } else { + route = item.route; + } - get_number_system: get_number_system, + if (item.route_options) { + route += + "?" + + $.map(item.route_options, function (value, key) { + return ( + encodeURIComponent(key) + "=" + encodeURIComponent(value) + ); + }).join("&"); + } + // if(type==="page" || type==="help" || type==="report" || + // (item.doctype && frappe.model.can_read(item.doctype))) { + // item.shown = true; + // } + return route; + }, + + shorten_number: function (number, country) { + country = (country == 'India') ? country : ''; + const number_system = this.get_number_system(country); + let x = Math.abs(Math.round(number)); + for (const map of number_system) { + const condition = map.condition ? map.condition(x) : x >= map.divisor; + if (condition) { + return (number/map.divisor).toFixed(2) + ' ' + map.symbol; + } + } + return number.toFixed(); + }, + + get_number_system: function (country) { + let number_system_map = { + 'India': + [{ + divisor: 1.0e+7, + symbol: 'Cr' + }, + { + divisor: 1.0e+5, + symbol: 'Lakh' + }], + '': + [{ + divisor: 1.0e+12, + symbol: 'T' + }, + { + divisor: 1.0e+9, + symbol: 'B' + }, + { + divisor: 1.0e+6, + symbol: 'M' + }, + { + divisor: 1.0e+3, + symbol: 'K', + condition: (num) => num.toFixed().length > 5 + }] + }; + return number_system_map[country]; + }, }); // Array de duplicate diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js index 787a8b1a21..d85a6fc53f 100644 --- a/frappe/public/js/frappe/widgets/utils.js +++ b/frappe/public/js/frappe/widgets/utils.js @@ -1,84 +1,5 @@ frappe.provide('frappe.widget.utils'); -function generate_route(item) { - const type = item.type.toLowerCase() - if (type === "doctype") { - item.doctype = item.name; - } - let route = ""; - if (!item.route) { - if (item.link) { - route = strip(item.link, "#"); - } else if (type === "doctype") { - if (frappe.model.is_single(item.doctype)) { - route = "Form/" + item.doctype; - } else { - if (!item.doc_view) { - if (frappe.model.is_tree(item.doctype)) { - item.doc_view = "Tree"; - } else { - item.doc_view = "List"; - } - } - switch (item.doc_view) { - case "List": - if (item.filters) { - frappe.route_options = item.filters; - } - route = "List/" + item.doctype; - break; - case "Tree": - route = "Tree/" + item.doctype; - break; - case "Report Builder": - route = "List/" + item.doctype + "/Report"; - break; - case "Dashboard": - route = "List/" + item.doctype + "/Dashboard"; - break; - case "New": - route = "Form/" + item.doctype + "/New " + item.doctype; - break; - case "Calendar": - route = "List/" + item.doctype + "/Calendar/Default"; - break; - default: - frappe.throw({ message: __("Not a valid DocType view:") + item.doc_view, title: __("Unknown View") }); - route = ""; - } - } - } else if (type === "report" && item.is_query_report) { - route = "query-report/" + item.name; - } else if (type === "report") { - route = "List/" + item.doctype + "/Report/" + item.name; - } else if (type === "page") { - route = item.name; - } else if (type === "dashboard") { - route = "dashboard/" + item.name; - } - - route = "#" + route; - } else { - route = item.route; - } - - if (item.route_options) { - route += - "?" + - $.map(item.route_options, function (value, key) { - return ( - encodeURIComponent(key) + "=" + encodeURIComponent(value) - ); - }).join("&"); - } - - // if(type==="page" || type==="help" || type==="report" || - // (item.doctype && frappe.model.can_read(item.doctype))) { - // item.shown = true; - // } - return route; -} - function generate_grid(data) { function add(a, b) { return a + b; @@ -151,50 +72,5 @@ frappe.widget.utils = { }, }; -function shorten_number(number, country) { - country = (country == 'India') ? country : ''; - const number_system = get_number_system(country); - let x = Math.abs(Math.round(number)); - for (const map of number_system) { - const condition = map.condition ? map.condition(x) : x >= map.divisor; - if (condition) { - return (number/map.divisor).toFixed(2) + ' ' + map.symbol; - } - } - return number.toFixed(); -} -function get_number_system(country) { - let number_system_map = { - 'India': - [{ - divisor: 1.0e+7, - symbol: 'Cr' - }, - { - divisor: 1.0e+5, - symbol: 'Lakh' - }], - '': - [{ - divisor: 1.0e+12, - symbol: 'T' - }, - { - divisor: 1.0e+9, - symbol: 'B' - }, - { - divisor: 1.0e+6, - symbol: 'M' - }, - { - divisor: 1.0e+3, - symbol: 'K', - condition: (num) => num.toFixed().length > 5 - }] - }; - return number_system_map[country]; -} - -export { generate_route, generate_grid, shorten_number, get_number_system }; +export { generate_grid }; From aaa27e5587a4a76aaca65604eaf6bd4ffe9c0907 Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Date: Fri, 6 Nov 2020 17:41:44 +0530 Subject: [PATCH 050/259] refactor: solve sider issues --- frappe/public/js/frappe/utils/utils.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 5d20bd3aec..4bf9c5bbd8 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -2,7 +2,6 @@ // MIT License. See license.txt import deep_equal from "fast-deep-equal"; -import { generate_route, shorten_number, get_number_system } from "../widgets/utils"; frappe.provide("frappe.utils"); @@ -902,7 +901,7 @@ Object.assign(frappe.utils, { }, generate_route: function(item) { - const type = item.type.toLowerCase() + const type = item.type.toLowerCase(); if (type === "doctype") { item.doctype = item.name; } From 44bc0dd81c567f0b6a6a72223caf4f6f2f98fb3f Mon Sep 17 00:00:00 2001 From: Frappe PR Bot Date: Sat, 7 Nov 2020 16:45:30 +0530 Subject: [PATCH 051/259] chore: Update translations (#11895) Co-authored-by: frappe --- frappe/translations/af.csv | 39 ++++++------- frappe/translations/am.csv | 39 ++++++------- frappe/translations/ar.csv | 39 ++++++------- frappe/translations/bg.csv | 39 ++++++------- frappe/translations/bn.csv | 39 ++++++------- frappe/translations/bs.csv | 39 ++++++------- frappe/translations/ca.csv | 39 ++++++------- frappe/translations/cs.csv | 39 ++++++------- frappe/translations/da.csv | 39 ++++++------- frappe/translations/de.csv | 39 ++++++------- frappe/translations/el.csv | 39 ++++++------- frappe/translations/es.csv | 107 +++++++++++++++++----------------- frappe/translations/es_pe.csv | 3 - frappe/translations/et.csv | 39 ++++++------- frappe/translations/fa.csv | 39 ++++++------- frappe/translations/fi.csv | 39 ++++++------- frappe/translations/fr.csv | 39 ++++++------- frappe/translations/gu.csv | 39 ++++++------- frappe/translations/he.csv | 39 ++++++------- frappe/translations/hi.csv | 39 ++++++------- frappe/translations/hr.csv | 39 ++++++------- frappe/translations/hu.csv | 39 ++++++------- frappe/translations/id.csv | 39 ++++++------- frappe/translations/is.csv | 39 ++++++------- frappe/translations/it.csv | 39 ++++++------- frappe/translations/ja.csv | 39 ++++++------- frappe/translations/km.csv | 39 ++++++------- frappe/translations/kn.csv | 39 ++++++------- frappe/translations/ko.csv | 39 ++++++------- frappe/translations/ku.csv | 39 ++++++------- frappe/translations/lo.csv | 39 ++++++------- frappe/translations/lt.csv | 39 ++++++------- frappe/translations/lv.csv | 39 ++++++------- frappe/translations/mk.csv | 39 ++++++------- frappe/translations/ml.csv | 39 ++++++------- frappe/translations/mr.csv | 39 ++++++------- frappe/translations/ms.csv | 39 ++++++------- frappe/translations/my.csv | 39 ++++++------- frappe/translations/nl.csv | 39 ++++++------- frappe/translations/no.csv | 39 ++++++------- frappe/translations/pl.csv | 39 ++++++------- frappe/translations/ps.csv | 39 ++++++------- frappe/translations/pt.csv | 39 ++++++------- frappe/translations/pt_br.csv | 3 - frappe/translations/ro.csv | 39 ++++++------- frappe/translations/ru.csv | 39 ++++++------- frappe/translations/rw.csv | 39 ++++++------- frappe/translations/si.csv | 39 ++++++------- frappe/translations/sk.csv | 39 ++++++------- frappe/translations/sl.csv | 39 ++++++------- frappe/translations/sq.csv | 39 ++++++------- frappe/translations/sr.csv | 39 ++++++------- frappe/translations/sv.csv | 39 ++++++------- frappe/translations/sw.csv | 39 ++++++------- frappe/translations/ta.csv | 39 ++++++------- frappe/translations/te.csv | 39 ++++++------- frappe/translations/th.csv | 39 ++++++------- frappe/translations/tr.csv | 39 ++++++------- frappe/translations/uk.csv | 39 ++++++------- frappe/translations/ur.csv | 39 ++++++------- frappe/translations/uz.csv | 39 ++++++------- frappe/translations/vi.csv | 39 ++++++------- frappe/translations/zh.csv | 39 ++++++------- frappe/translations/zh_tw.csv | 35 +++++------ 64 files changed, 1150 insertions(+), 1338 deletions(-) diff --git a/frappe/translations/af.csv b/frappe/translations/af.csv index 3b881d6875..b383fea767 100644 --- a/frappe/translations/af.csv +++ b/frappe/translations/af.csv @@ -499,7 +499,6 @@ Authenticating...,Waarmerking ..., Authentication,verifikasie, Authentication Apps you can use are: ,"Verifikasieprogramme wat jy kan gebruik, is:", Authentication Credentials,Verifikasiebewyse, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Verifikasie het misluk terwyl e-pos van e-posrekening {0} ontvang is. Boodskap van bediener: {1}, Authorization Code,Magtigingskode, Authorize URL,Gee URL aan, Authorized,gemagtigde, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Kan docstatus nie verander van 1 tot 0, Cannot change header content,Kan die inhoud van die koptekst nie verander, Cannot change state of Cancelled Document. Transition row {0},Kan nie die status van gekanselleerde dokument verander nie. Oorgangsreël {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Kan gebruikersdata nie in demo verander nie. Teken asseblief vir 'n nuwe rekening by https://erpnext.com, -Cannot connect: {0},Kan nie verbind nie: {0}, Cannot create a {0} against a child document: {1},Kan nie 'n {0} teen 'n kinderdokument skep nie: {1}, Cannot delete Home and Attachments folders,Kan nie Huis- en Bylae-dopgehou verwyder nie, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Kan nie lêer uitvee soos dit behoort aan {0} {1} waarvoor u nie toestemmings het nie, @@ -1139,7 +1137,6 @@ Font Size,Skrifgrootte, Fonts,fonts, Footer,Footer, Footer HTML,Footer HTML, -Footer Item,Footer Item, Footer Items,Footer Items, Footer will display correctly only in PDF,Voettekste sal slegs korrek in PDF vertoon word, For Document Type,Vir dokumenttipe, @@ -1149,7 +1146,6 @@ For Value,Vir Waarde, "For currency {0}, the minimum transaction amount should be {1}","Vir geldeenheid {0}, moet die minimum transaksie bedrag {1} wees", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Byvoorbeeld, as u INV004 kanselleer en wysig, sal dit 'n nuwe dokument INV004-1 word. Dit help jou om tred te hou met elke wysiging.", "For example: If you want to include the document ID, use {0}","Byvoorbeeld: As jy die dokument ID wil insluit, gebruik {0}", -For top bar,Vir topbalk, "For updating, you can update only selective columns.",Vir opdatering kan u slegs selektiewe kolomme bywerk., For {0} at level {1} in {2} in row {3},Vir {0} op vlak {1} in {2} in ry {3}, Force,Force, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Kalender-ID, Google Font,Google Font, Google Services,Google Services, Grant Type,Toekenningstipe, -Group Label,Groepsetiket, Group Name,Groep Naam, Group name cannot be empty.,Groepnaam kan nie leeg wees nie., Groups of DocTypes,Groepe DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Kontroleer asseblief jou e-posadres, Point Allocation Periodicity,Punte toekenning periodiekheid, Points,punte, Points Given,Punte gegee, -Policy,beleid, Port,Port, Portal Menu,Portaal Menu, Portal Menu Item,Portal Menu Item, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Kies ten minste 1 rekord vir druk, Select or drag across time slots to create a new event.,Kies of sleep oor tydgleuwe om 'n nuwe gebeurtenis te skep., Select records for assignment,Kies rekords vir opdrag, -"Select target = ""_blank"" to open in a new page.",Kies teiken = "_blank" om oop te maak op 'n nuwe bladsy., Select the label after which you want to insert new field.,Kies die etiket waarna jy nuwe veld wil invoeg., "Select your Country, Time Zone and Currency","Kies jou land, tydsone en geldeenheid", Select {0},Kies {0}, @@ -2989,7 +2982,6 @@ star-empty,ster-leë, step-backward,stap-agtertoe, step-forward,tree vorentoe, submitted this document,hierdie dokument ingedien, -"target = ""_blank""",target = "_blank", text in document type,teks in dokument tipe, text-height,teks-hoogte, text-width,teks-wydte, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Iets het verkeerd gegaan tydens die tekengenerasie. Klik op {0} om 'n nuwe een te genereer., Submit After Import,Dien na invoer in, Submitting...,Indiening van ..., -Subscribed Documents,Ingetekende dokumente, Success! You are good to go 👍,Sukses! U is goed om te gaan 👍, Successful Transactions,Suksesvolle transaksies, Successfully Submitted!,Suksesvol voorgelê!, @@ -3777,7 +3768,6 @@ Please specify,Spesifiseer asseblief, Printing,druk, Priority,prioriteit, Project,projek, -Publish,publiseer, Quarterly,kwartaallikse, Queued,tougestaan, Quick Entry,Vinnige toegang, @@ -4299,7 +4289,6 @@ Hide Border,Versteek grens, Index Web Pages for Search,Indeks webbladsye vir soek, Action / Route,Aksie / roete, Document Naming Rule,Reël vir naamgewing van dokumente, -Rules with higher priority will be applied first.,Reëls met 'n hoër prioriteit sal eers toegepas word., Rule Conditions,Reëlvoorwaardes, Digits,Syfers, Example: 00001,Voorbeeld: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Pakketpublikasie-instrument, Click on the row for accessing filters.,Klik op die ry vir toegang tot filters., Sites,Webwerwe, Last Deployed On,Laaste ontplooi, -Last published {0},Laas gepubliseer {0}, -Publishing documents...,Publiseer dokumente ..., -Documents have been published.,Dokumente is gepubliseer., -Select Document Type.,Kies dokumenttipe., Console Log,Console-logboek, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Stel verstekopsies vir alle kaarte op hierdie paneelbord (byvoorbeeld: "kleure": ["# d1d8dd", "# ff5858"])", Use Report Chart,Gebruik Verslagkaart, @@ -4566,10 +4551,6 @@ Incorrect URL,Verkeerde URL, Duplicate Name,Duplikaatnaam, "Please check the value of ""Fetch From"" set for field {0}",Gaan asseblief die waarde van die "Haal uit" -instelling vir veld {0} na, Wrong Fetch From value,Verkeerde haal van waarde, -Deploying,Ontplooi, -Couldn't connect to site {0}. Please check Error Logs.,Kon nie aan werf {0} koppel nie. Gaan asseblief die foutlêers na., -Error while installing package to site {0}. Please check Error Logs.,Fout tydens die installering van pakket na werf {0}. Gaan asseblief die foutlêers na., -Exporting,Uitvoer, A field with the name '{}' already exists in doctype {}.,'N Veld met die naam' {} 'bestaan reeds in doktipe {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Aangepaste veld {0} word deur die administrateur geskep en kan slegs deur die administrateurrekening uitgevee word., Failed to send {0} Auto Email Report,Kon nie {0} outomatiese e-posverslag stuur nie, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Ry # {0}: stel afstandsfilters vir die veld {1} in om die unieke afstandafhanklikheidsdokument te gaan haal, Paytm payment gateway settings,Paytm-betalingsgateway-instellings, "Company, Fiscal Year and Currency defaults","Standaard, maatskappy-, boekjaar- en valuta", -Package,Pakket, -Import and Export Packages.,Invoer- en uitvoerpakkette., Razorpay Signature Verification Failed,Verifiëring van Razorpay-handtekening het misluk, Google Drive - Could not locate - {0},Google Drive - kon nie opspoor nie - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Sinkroniseringstoken was ongeldig en is teruggestel. Probeer weer sinkroniseer., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Vir DocType-skakel / DocType-aksie, Cannot edit filters for standard charts,Kan nie filters vir standaardkaarte wysig nie, Event Producer Last Update,Produsent se laaste opdatering, Default for 'Check' type of field {0} must be either '0' or '1',Standaard vir 'Vink' tipe veld {0} moet '0' of '1' wees, +Non Negative,Nie negatief nie, +Rules with higher priority number will be applied first.,Reëls met 'n hoër prioriteitsnommer sal eers toegepas word., +Open URL in a New Tab,Open URL in 'n nuwe oortjie, +Align Right,Rig reg uit, +Loading Filters...,Laai tans filters ..., +Count Customizations,Tel aanpassings, +For Example: {} Open,Byvoorbeeld: {} Maak oop, +Choose Existing Card or create New Card,Kies bestaande kaart of skep nuwe kaart, +Number Cards,Nommer kaarte, +Function Based On,Funksie gebaseer op, +Add Filters,Voeg filters by, +Skip,Huppel, +Dismiss,Verwerp, +Value cannot be negative for,Waarde kan nie negatief wees nie, +Value cannot be negative for {0}: {1},Waarde kan nie negatief wees vir {0}: {1}, +Negative Value,Negatiewe waarde, +Authentication failed while receiving emails from Email Account: {0}.,Stawing het misluk tydens die ontvangs van e-posse vanaf die e-posrekening: {0}., +Message from server: {0},Boodskap vanaf bediener: {0}, diff --git a/frappe/translations/am.csv b/frappe/translations/am.csv index cdf5c0a193..52ed7c5f11 100644 --- a/frappe/translations/am.csv +++ b/frappe/translations/am.csv @@ -499,7 +499,6 @@ Authenticating...,በማረጋገጥ ላይ ..., Authentication,ማረጋገጫ, Authentication Apps you can use are: ,የማረጋገጫ ምሳሌዎች የሚጠቀሙባቸው መተግበሪያዎች:, Authentication Credentials,የማረጋገጫ ምስክርነቶች, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},የኢሜይል መለያ {0} ኢሜይሎች መቀበል ላይ ሳለ ማረጋገጥ አልተሳካም. ከአገልጋዩ መልዕክት: {1}, Authorization Code,ፈቀዳ ኮድ, Authorize URL,ዩአርኤል ፈቀድ, Authorized,የተፈቀዱ, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,1 ከ 0 docstatus መቀየር አይቻል Cannot change header content,የአርዕስት ይዘት መለወጥ አይቻልም, Cannot change state of Cancelled Document. Transition row {0},ተሰርዟል ሰነዴ ሁኔታ መቀየር አይቻልም. የሽግግር ረድፍ {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,በማሳያ ውስጥ ተጠቃሚ ዝርዝሮችን መቀየር አይቻልም. https://erpnext.com ላይ አዲስ መለያ ለመመዝገብ እባክዎ, -Cannot connect: {0},ማገናኘት አይቻልም: {0}, Cannot create a {0} against a child document: {1},መፍጠር አልተቻለም አንድ {0} አንድ ልጅ ሰነድ ላይ: {1}, Cannot delete Home and Attachments folders,ቤት እና አባሪዎች አቃፊዎችን መሰረዝ አልተቻለም, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,እንደ ፍቃድ የሌለዎት በ {0} {1} ላይ የሆነ ፋይልን መሰረዝ አይችሉም, @@ -1139,7 +1137,6 @@ Font Size,የፊደል መጠን, Fonts,ቅርጸ ቁምፊዎች, Footer,ግርጌ, Footer HTML,ግርጌ HTML።, -Footer Item,ግርጌ ንጥል, Footer Items,ግርጌ ንጥሎች, Footer will display correctly only in PDF,ግርጌ በትክክል በፒዲኤፍ ብቻ ያሳያል።, For Document Type,ለሰነድ ዓይነት።, @@ -1149,7 +1146,6 @@ For Value,ለህሴ, "For currency {0}, the minimum transaction amount should be {1}","ለክን {ል {0}, ዝቅተኛው የግብይት መጠን {1} መሆን አለበት", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,እናንተ ይቅር እና INV004 ያስተካክል ለምሳሌ ያህል አንድ አዲስ ሰነድ INV004-1 ይሆናል. ይህ ከእናንተ እያንዳንዱ ማሻሻያ ለመከታተል ይረዳናል., "For example: If you want to include the document ID, use {0}","ለምሳሌ: ሰነዱን መታወቂያ ማካተት የሚፈልጉ ከሆነ, ለመጠቀም {0}", -For top bar,ከላይ አሞሌ ለ, "For updating, you can update only selective columns.","ማዘመን ያህል, አንተ ብቻ መራጭ አምዶች ማዘመን ይችላሉ.", For {0} at level {1} in {2} in row {3},ለ {0} ውስጥ ደረጃ {1} በ {2} ረድፍ ውስጥ {3}, Force,ኃይል, @@ -1201,7 +1197,6 @@ Google Calendar ID,የ Google ቀን መቁጠሪያ መታወቂያ, Google Font,ጉግል ፎክስ, Google Services,የ Google አገልግሎቶች, Grant Type,ፍቃድ ስጥ አይነት, -Group Label,የቡድን መለያ ስም, Group Name,የቡድን ስም, Group name cannot be empty.,የቡድን ስም ባዶ ሊሆን አይችልም., Groups of DocTypes,DocTypes ቡድኖች, @@ -1911,7 +1906,6 @@ Please verify your Email Address,የእርስዎ ኢሜይል አድራሻ ያ Point Allocation Periodicity,የነጥብ አቀማመጥ የጊዜ ክልል።, Points,ነጥቦች ፡፡, Points Given,የተሰጡ ነጥቦች, -Policy,ፖሊሲ, Port,ወደብ, Portal Menu,ፖርታል ማውጫ, Portal Menu Item,ፖርታል ምናሌ ንጥል, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,የህትመት atleast 1 መዝገብ ይምረጡ, Select or drag across time slots to create a new event.,ይምረጡ ወይም አንድ አዲስ ክስተት ለመፍጠር ጊዜ ቦታዎች ላይ ጎትት., Select records for assignment,ምድብ ይምረጡ መዛግብት, -"Select target = ""_blank"" to open in a new page.",ዒላማ ይምረጡ = "ባዶን" አንድ አዲስ ገጽ ውስጥ ለመክፈት., Select the label after which you want to insert new field.,አዲስ መስክ ማስገባት ይፈልጋሉ በኋላ ያለውን መለያ ይምረጡ., "Select your Country, Time Zone and Currency","የእርስዎን አገር, የሰዓት ዞን እና ምንዛሬ ይምረጡ", Select {0},ይምረጡ {0}, @@ -2989,7 +2982,6 @@ star-empty,ኮከብ-ባዶ, step-backward,ደረጃ-ወደኋላ, step-forward,ደረጃ-ወደፊት, submitted this document,ይህ ሰነድ ገብቷል, -"target = ""_blank""",target = "ባዶን", text in document type,ሰነድ ዓይነት ውስጥ ጽሑፍ, text-height,ጽሑፍ-ቁመት, text-width,ጽሑፍ-ስፋት, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,ምልክት በተደረገበት ትውልድ ወቅት የሆነ ነገር ተሳስቷል። አዲስ ለማመንጨት {0} ላይ ጠቅ ያድርጉ።, Submit After Import,ከመጣ በኋላ ያስገቡ, Submitting...,በማስገባት ላይ ..., -Subscribed Documents,የተመዘገቡ ሰነዶች, Success! You are good to go 👍,ስኬት! Go መሄድ ጥሩ ነው ፡፡, Successful Transactions,የተሳካ ግብይቶች, Successfully Submitted!,በተሳካ ሁኔታ ገብቷል!, @@ -3777,7 +3768,6 @@ Please specify,እባክዎን ይግለጹ, Printing,ማተም, Priority,ቅድሚያ, Project,ፕሮጀክት, -Publish,አትም, Quarterly,የሩብ ዓመት, Queued,ተሰልፏል, Quick Entry,ፈጣን Entry, @@ -4299,7 +4289,6 @@ Hide Border,ድንበርን ደብቅ, Index Web Pages for Search,መረጃ ጠቋሚ የድር ገጾች ለፍለጋ, Action / Route,እርምጃ / መንገድ, Document Naming Rule,የሰነድ ስም ደንብ, -Rules with higher priority will be applied first.,ከፍተኛ ቅድሚያ የሚሰጣቸው ህጎች በመጀመሪያ ይተገበራሉ ፡፡, Rule Conditions,የደንብ ሁኔታዎች, Digits,አሃዞች, Example: 00001,ምሳሌ: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,የጥቅል ማተሚያ መሳሪያ, Click on the row for accessing filters.,ማጣሪያዎችን ለመድረስ ረድፉ ላይ ጠቅ ያድርጉ ፡፡, Sites,ጣቢያዎች, Last Deployed On,ለመጨረሻ ጊዜ የተሰማራው, -Last published {0},ለመጨረሻ ጊዜ የታተመው {0}, -Publishing documents...,ሰነዶችን በማተም ላይ ..., -Documents have been published.,ሰነዶች ታትመዋል ፡፡, -Select Document Type.,የሰነድ ዓይነት ይምረጡ።, Console Log,የኮንሶል ምዝግብ ማስታወሻ, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","በዚህ ዳሽቦርድ ላይ ለሁሉም ገበታዎች ነባሪ አማራጮችን ያቀናብሩ (Ex: "colors": ["# d1d8dd", "# ff5858"])", Use Report Chart,የሪፖርት ሰንጠረዥን ይጠቀሙ, @@ -4566,10 +4551,6 @@ Incorrect URL,ትክክል ያልሆነ ዩ.አር.ኤል., Duplicate Name,የተባዛ ስም, "Please check the value of ""Fetch From"" set for field {0}",እባክዎን ለመስክ {0} የተቀመጠውን የ “አምጣ” እሴት ይፈትሹ።, Wrong Fetch From value,የተሳሳተ አምጣ ከእሴት, -Deploying,መዘርጋት, -Couldn't connect to site {0}. Please check Error Logs.,ከጣቢያው {0} ጋር መገናኘት አልተቻለም። እባክዎን የስህተት ምዝግብ ማስታወሻዎችን ይፈትሹ ፡፡, -Error while installing package to site {0}. Please check Error Logs.,ጥቅልን በጣቢያው {0} ላይ በመጫን ጊዜ ስህተት። እባክዎን የስህተት ምዝግብ ማስታወሻዎችን ይፈትሹ ፡፡, -Exporting,ወደ ውጭ መላክ, A field with the name '{}' already exists in doctype {}.,‹{}› የሚል ስም ያለው መስክ ቀድሞውኑ በአስተምህሮት ውስጥ አለ {}።, Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,ብጁ መስክ {0} በአስተዳዳሪው የተፈጠረ ሲሆን ሊሰረዝ የሚችለው በአስተዳዳሪው መለያ በኩል ብቻ ነው።, Failed to send {0} Auto Email Report,{0} ራስ-ሰር ኢሜይል ሪፖርት መላክ አልተሳካም, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,ረድፍ # {0}-ልዩ የሆነውን የርቀት ጥገኛ ሰነድ ለማምጣት እባክዎ የርቀት እሴት ማጣሪያዎችን ለመስኩ {1} ያዘጋጁ, Paytm payment gateway settings,የ Paytm የክፍያ መግቢያ ቅንብሮች, "Company, Fiscal Year and Currency defaults",ኩባንያ ፣ የበጀት ዓመት እና የምንዛሪ ነባሪዎች, -Package,ጥቅል, -Import and Export Packages.,ፓኬጆችን አስመጣ እና ላክ ፡፡, Razorpay Signature Verification Failed,Razorpay ፊርማ ማረጋገጥ አልተሳካም, Google Drive - Could not locate - {0},ጉግል ድራይቭ - ማግኘት አልተቻለም - {0}, "Sync token was invalid and has been resetted, Retry syncing.",የማመሳሰል ማስመሰያ ልክ ያልሆነ እና ዳግም እንዲጀመር ተደርጓል ፣ ለማመሳሰል እንደገና ይሞክሩ።, @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,ለ DocType አገናኝ / DocType Action, Cannot edit filters for standard charts,ለመደበኛ ገበታዎች ማጣሪያዎችን ማርትዕ አይቻልም, Event Producer Last Update,የክስተት አዘጋጅ የመጨረሻ ዝመና, Default for 'Check' type of field {0} must be either '0' or '1',ነባሪ ለ ‹ፈትሽ› መስክ {0} ወይ ‹0› ወይም ‘1’ መሆን አለበት, +Non Negative,አሉታዊ ያልሆነ, +Rules with higher priority number will be applied first.,ከፍተኛ የቅድሚያ ቁጥር ያላቸው ደንቦች በመጀመሪያ ይተገበራሉ።, +Open URL in a New Tab,በአዲስ ትር ውስጥ ዩ.አር.ኤል. ይክፈቱ, +Align Right,በቀኝ አሰልፍ, +Loading Filters...,ማጣሪያዎችን በመጫን ላይ ..., +Count Customizations,ብጁዎችን ይቆጥሩ, +For Example: {} Open,ለምሳሌ {} ክፈት, +Choose Existing Card or create New Card,ነባር ካርድ ይምረጡ ወይም አዲስ ካርድ ይፍጠሩ, +Number Cards,የቁጥር ካርዶች, +Function Based On,የተመሰረተው ተግባር, +Add Filters,ማጣሪያዎችን ያክሉ, +Skip,ዝለል, +Dismiss,አሰናብት, +Value cannot be negative for,እሴት አሉታዊ ሊሆን አይችልም, +Value cannot be negative for {0}: {1},እሴት ለ {0} አሉታዊ ሊሆን አይችልም ፦ {1}, +Negative Value,አሉታዊ እሴት, +Authentication failed while receiving emails from Email Account: {0}.,ከኢሜል መለያ ኢሜሎችን በሚቀበሉበት ጊዜ ማረጋገጥ አልተሳካም ፦ {0}።, +Message from server: {0},መልእክት ከአገልጋይ: {0}, diff --git a/frappe/translations/ar.csv b/frappe/translations/ar.csv index 55d676d43f..cfd75b7dc9 100644 --- a/frappe/translations/ar.csv +++ b/frappe/translations/ar.csv @@ -499,7 +499,6 @@ Authenticating...,مصادقة ..., Authentication,المصادقة, Authentication Apps you can use are: ,تطبيقات المصادقة التي يمكنك استخدامها هي:, Authentication Credentials,مصادقة بيانات الاعتماد, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},فشل المصادقة في حين تلقي رسائل البريد الإلكتروني من البريد الإلكتروني حساب {0}. رسالة من الخادم: {1}, Authorization Code,رمز الترخيص, Authorize URL,مصادقة عنوان ورل, Authorized,مخول, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,لا يمكن تغيير docstatus من 1 إ Cannot change header content,لا يمكن تغيير محتوى الرأس, Cannot change state of Cancelled Document. Transition row {0},لا يمكن تغيير حالة الوثيقة ملغاة ., Cannot change user details in demo. Please signup for a new account at https://erpnext.com,لا يمكن تغيير تفاصيل المستخدم في العرض التوضيحي. يرجى الاشتراك للحصول على حساب جديد في https://erpnext.com, -Cannot connect: {0},لا يمكن الاتصال: {0}, Cannot create a {0} against a child document: {1},لا يمكن إنشاء {0} ضد مستند طفل: {1}, Cannot delete Home and Attachments folders,لا يمكن حذف المجلدات الرئيسية والمرفقات, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,لا يمكن حذف الملف لأنه ينتمي إلى {0} {1} الذي ليس لديك أذونات, @@ -1139,7 +1137,6 @@ Font Size,حجم الخط, Fonts,الخطوط, Footer,تذييل الصفحة, Footer HTML,تذييل HTML, -Footer Item,تذييل البند, Footer Items,تذييل العناصر, Footer will display correctly only in PDF,سيعرض تذييل الصفحة بشكل صحيح في PDF فقط, For Document Type,لنوع المستند, @@ -1149,7 +1146,6 @@ For Value,للقيمة, "For currency {0}, the minimum transaction amount should be {1}",للعملة {0} ، يجب أن يكون الحد الأدنى لمبلغ المعاملة {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,على سبيل المثال إذا قمت بإلغاء وتعديل INV004 أنها سوف تصبح وثيقة INV004-1 جديدة. هذا يساعدك على تتبع كل تعديل., "For example: If you want to include the document ID, use {0}",على سبيل المثال: إذا كنت تريد تضمين الوثيقة ID، استخدم {0}, -For top bar,للشريط الأعلى, "For updating, you can update only selective columns.",لتحديث، يمكنك تحديث الأعمدة انتقائية فقط., For {0} at level {1} in {2} in row {3},ل {0} في {1} مستوى في {2} في {3} الصف, Force,فرض, @@ -1201,7 +1197,6 @@ Google Calendar ID,معرف تقويم Google, Google Font,خط جوجل, Google Services,خدمات جوجل, Grant Type,منحة نوع, -Group Label,تسمية مجموعة, Group Name,أسم المجموعة, Group name cannot be empty.,لا يمكن أن يكون اسم المجموعة فارغا., Groups of DocTypes,مجموعات من DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,يرجى التحقق من عنوان البر Point Allocation Periodicity,نقطة التخصيص الدورية, Points,نقاط, Points Given,النقاط المقدمة, -Policy,سياسة, Port,المنفذ, Portal Menu,البوابة القائمة, Portal Menu Item,بوابة عنصر القائمة, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,اختر أتلست سجل 1 للطباعة, Select or drag across time slots to create a new event.,اختر أو اسحب عبر فتحات الوقت لإنشاء حدث جديد., Select records for assignment,اختر سجلات التعيين, -"Select target = ""_blank"" to open in a new page.","حدد الهدف = "" _blank "" لفتح في صفحة جديدة .", Select the label after which you want to insert new field.,حدد التسمية بعد الذي تريد إدراج حقل جديد., "Select your Country, Time Zone and Currency",اختر بلدك، المنطقة الزمنية والعملات, Select {0},حدد {0}, @@ -2989,7 +2982,6 @@ star-empty,النجوم فارغة, step-backward,خطوة إلى الوراء, step-forward,خطوة إلى الأمام, submitted this document,هذه الوثيقة مقدمة / مسجلة, -"target = ""_blank""",الهدف = "_blank", text in document type,النص في نوع الوثيقة, text-height,ارتفاع النص, text-width,عرض النص, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,حدث خطأ ما أثناء الجيل المميز. انقر على {0} لإنشاء واحدة جديدة., Submit After Import,إرسال بعد الاستيراد, Submitting...,تقديم..., -Subscribed Documents,المستندات المشتركة, Success! You are good to go 👍,نجاح! أنت جيد للذهاب 👍, Successful Transactions,المعاملات الناجحة, Successfully Submitted!,قدمت بنجاح!, @@ -3777,7 +3768,6 @@ Please specify,رجاء حدد, Printing,طبع, Priority,أفضلية, Project,مشروع, -Publish,نشر, Quarterly,فصلي, Queued,قائمة الانتظار, Quick Entry,إدخال سريع, @@ -4299,7 +4289,6 @@ Hide Border,إخفاء الحدود, Index Web Pages for Search,فهرس صفحات الويب للبحث, Action / Route,العمل / الطريق, Document Naming Rule,قاعدة تسمية الوثيقة, -Rules with higher priority will be applied first.,سيتم تطبيق القواعد ذات الأولوية الأعلى أولاً., Rule Conditions,شروط القاعدة, Digits,أرقام, Example: 00001,مثال: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,أداة نشر الحزمة, Click on the row for accessing filters.,انقر فوق الصف للوصول إلى المرشحات., Sites,المواقع, Last Deployed On,آخر نشر في, -Last published {0},آخر نشر {0}, -Publishing documents...,نشر المستندات ..., -Documents have been published.,تم نشر الوثائق., -Select Document Type.,حدد نوع المستند., Console Log,سجل وحدة التحكم, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])",تعيين الخيارات الافتراضية لجميع الرسوم البيانية في لوحة المعلومات هذه (على سبيل المثال: "الألوان": ["# d1d8dd"، "# ff5858"]), Use Report Chart,استخدم مخطط التقرير, @@ -4566,10 +4551,6 @@ Incorrect URL,URL غير صحيح, Duplicate Name,اسم مكرر, "Please check the value of ""Fetch From"" set for field {0}",يرجى التحقق من قيمة مجموعة "الجلب من" للحقل {0}, Wrong Fetch From value,إحضار خاطئ من القيمة, -Deploying,النشر, -Couldn't connect to site {0}. Please check Error Logs.,تعذر الاتصال بالموقع {0}. يرجى التحقق من سجلات الأخطاء., -Error while installing package to site {0}. Please check Error Logs.,خطأ أثناء تثبيت الحزمة على الموقع {0}. يرجى التحقق من سجلات الأخطاء., -Exporting,تصدير, A field with the name '{}' already exists in doctype {}.,يوجد حقل بالاسم "{}" بالفعل في DOCTYPE {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,يتم إنشاء الحقل المخصص {0} بواسطة المسؤول ولا يمكن حذفه إلا من خلال حساب المسؤول., Failed to send {0} Auto Email Report,فشل إرسال تقرير البريد الإلكتروني التلقائي {0}, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,الصف رقم {0}: الرجاء تعيين عوامل تصفية القيمة البعيدة للحقل {1} لجلب مستند التبعية الفريد عن بُعد, Paytm payment gateway settings,إعدادات بوابة الدفع Paytm, "Company, Fiscal Year and Currency defaults",التخلف عن السداد للشركة والسنة المالية والعملات, -Package,صفقة, -Import and Export Packages.,حزم الاستيراد والتصدير., Razorpay Signature Verification Failed,فشل التحقق من توقيع Razorpay, Google Drive - Could not locate - {0},Google Drive - تعذر تحديد الموقع - {0}, "Sync token was invalid and has been resetted, Retry syncing.",كان رمز المزامنة المميز غير صالح وتم إعادة ضبطه ، أعد محاولة المزامنة., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,لإجراء DocType Link / DocType, Cannot edit filters for standard charts,لا يمكن تحرير عوامل التصفية للمخططات القياسية, Event Producer Last Update,آخر تحديث لمنتج الحدث, Default for 'Check' type of field {0} must be either '0' or '1',يجب أن يكون الإعداد الافتراضي لنوع حقل "التحقق" {0} إما "0" أو "1", +Non Negative,غير سلبي, +Rules with higher priority number will be applied first.,سيتم تطبيق القواعد ذات رقم الأولوية الأعلى أولاً., +Open URL in a New Tab,افتح URL في علامة تبويب جديدة, +Align Right,محاذاة اليمين, +Loading Filters...,تحميل عوامل التصفية ..., +Count Customizations,عد التخصيصات, +For Example: {} Open,على سبيل المثال: {} Open, +Choose Existing Card or create New Card,اختر بطاقة موجودة أو أنشئ بطاقة جديدة, +Number Cards,عدد البطاقات, +Function Based On,وظيفة على أساس, +Add Filters,إضافة عوامل تصفية, +Skip,تخطى, +Dismiss,رفض, +Value cannot be negative for,لا يمكن أن تكون القيمة سالبة لـ, +Value cannot be negative for {0}: {1},لا يمكن أن تكون القيمة سالبة لـ {0}: {1}, +Negative Value,قيمة سالبة, +Authentication failed while receiving emails from Email Account: {0}.,فشلت المصادقة أثناء تلقي رسائل البريد الإلكتروني من حساب البريد الإلكتروني: {0}., +Message from server: {0},رسالة من الخادم: {0}, diff --git a/frappe/translations/bg.csv b/frappe/translations/bg.csv index 68392d54c6..eaeeccdf0b 100644 --- a/frappe/translations/bg.csv +++ b/frappe/translations/bg.csv @@ -499,7 +499,6 @@ Authenticating...,Удостоверява се ..., Authentication,заверка, Authentication Apps you can use are: ,"Приложенията за удостоверяване, които можете да използвате, са:", Authentication Credentials,Удостоверения за удостоверяване, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},"Неуспешно удостоверяване, докато получавате имейли от имейл акаунт {0}. Съобщение от сървъра: {1}", Authorization Code,Оторизационен код, Authorize URL,Упълномощен URL адрес, Authorized,упълномощен, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Не може да се промени docst Cannot change header content,Не може да се промени съдържанието на заглавката, Cannot change state of Cancelled Document. Transition row {0},Не може да се промени състоянието на Отменен документ. Поредни Transition {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,"Не можете да променяте потребителските детайли в демонстрацията. Моля, регистрирайте се за нов профил на адрес https://erpnext.com", -Cannot connect: {0},Не може да се свърже: {0}, Cannot create a {0} against a child document: {1},Не може да се създаде {0} срещу подчинен документ: {1}, Cannot delete Home and Attachments folders,Не може да изтриете папки Основна и Прикачени файлове, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Не може да се изтрие файла, тъй като принадлежи към {0} {1}, за което нямате разрешения", @@ -1139,7 +1137,6 @@ Font Size,Размер На Шрифта, Fonts,Шрифтове, Footer,Footer, Footer HTML,HTML на долния колонтитул, -Footer Item,Footer точка, Footer Items,Футер елементи, Footer will display correctly only in PDF,Footer ще се показва правилно само в PDF формат, For Document Type,За тип документ, @@ -1149,7 +1146,6 @@ For Value,За стойност, "For currency {0}, the minimum transaction amount should be {1}",За валута {0} минималната стойност на транзакцията трябва да бъде {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Например, ако откажете и да измени INV004 тя ще се превърне в нов документ INV004-1. Това ви помага да следите всяко изменение.", "For example: If you want to include the document ID, use {0}","Например: Ако искате да включите ID на документа, използвайте {0}", -For top bar,За горния бар, "For updating, you can update only selective columns.","За актуализиране, можете да актуализирате само селективни колони.", For {0} at level {1} in {2} in row {3},За {0} на равнище {1} в {2} в ред {3}, Force,сила, @@ -1201,7 +1197,6 @@ Google Calendar ID,Идентификатор на Google Календар, Google Font,Google Font, Google Services,Услуги на Google, Grant Type,Вид Grant, -Group Label,Група - Заглавие, Group Name,Име на групата, Group name cannot be empty.,Името на групата не може да бъде празно., Groups of DocTypes,Групи DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,"Моля, потвърдете имейл ад Point Allocation Periodicity,Периодичност на разпределение на точки, Points,точки, Points Given,Дадени точки, -Policy,Полица, Port,Порт, Portal Menu,Portal Menu, Portal Menu Item,Portal Меню, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Изберете поне един запис за печат, Select or drag across time slots to create a new event.,Изберете или плъзгайте по времеви слотове за създаване на ново събитие., Select records for assignment,Изберете записа за присвояване, -"Select target = ""_blank"" to open in a new page.","Изберете целеви = "_blank", за да отворите в нова страница.", Select the label after which you want to insert new field.,Изберете етикета след която искате да вмъкнете нова област., "Select your Country, Time Zone and Currency","Изберете вашата държава, часова зона и валута", Select {0},Изберете {0}, @@ -2989,7 +2982,6 @@ star-empty,звезда-празна, step-backward,стъпка назад, step-forward,стъпка напред, submitted this document,подадено този документ, -"target = ""_blank""","target = ""_blank""", text in document type,текст на вида документ, text-height,текст-височина, text-width,текст-ширина, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,"Нещо се обърка по време на генерацията на жетони. Кликнете върху {0}, за да генерирате нов.", Submit After Import,Изпращане след импортиране, Submitting...,Подаване на ..., -Subscribed Documents,Абонирани документи, Success! You are good to go 👍,Успех! Добре сте да отидете 👍, Successful Transactions,Успешни транзакции, Successfully Submitted!,Успешно изпратено!, @@ -3777,7 +3768,6 @@ Please specify,"Моля, посочете", Printing,Печатане, Priority,Приоритет, Project,Проект, -Publish,публикувам, Quarterly,Тримесечно, Queued,На опашка, Quick Entry,Бързо въвеждане, @@ -4299,7 +4289,6 @@ Hide Border,Скриване на границата, Index Web Pages for Search,Индексирайте уеб страници за търсене, Action / Route,Действие / Маршрут, Document Naming Rule,Правило за именуване на документи, -Rules with higher priority will be applied first.,Първо ще се прилагат правила с по-висок приоритет., Rule Conditions,Правила условия, Digits,Цифри, Example: 00001,Пример: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Инструмент за публикуване на па Click on the row for accessing filters.,Кликнете върху реда за достъп до филтри., Sites,Сайтове, Last Deployed On,Последно разполагане на, -Last published {0},Последно публикувано {0}, -Publishing documents...,Публикуване на документи ..., -Documents have been published.,Документите са публикувани., -Select Document Type.,Изберете Тип на документа., Console Log,Конзолен дневник, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Задайте опции по подразбиране за всички диаграми на това табло за управление (Пример: "цветове": ["# d1d8dd", "# ff5858"])", Use Report Chart,Използвайте диаграма на отчета, @@ -4566,10 +4551,6 @@ Incorrect URL,Неправилен URL адрес, Duplicate Name,Дублирано име, "Please check the value of ""Fetch From"" set for field {0}","Моля, проверете стойността на „Извличане от“, зададена за поле {0}", Wrong Fetch From value,Грешно извличане от стойност, -Deploying,Разполагане, -Couldn't connect to site {0}. Please check Error Logs.,"Не можа да се свърже със сайта {0}. Моля, проверете регистрационните файлове за грешки.", -Error while installing package to site {0}. Please check Error Logs.,"Грешка при инсталирането на пакета на сайта {0}. Моля, проверете регистрационните файлове за грешки.", -Exporting,Експортиране, A field with the name '{}' already exists in doctype {}.,Поле с името „{}“ вече съществува в doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Персонализираното поле {0} се създава от администратора и може да бъде изтрито само чрез администраторския акаунт., Failed to send {0} Auto Email Report,Изпращането на {0} автоматичен отчет по имейл не бе успешно, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,"Ред № {0}: Моля, задайте филтри за отдалечени стойности за полето {1}, за да извлечете уникалния документ за отдалечена зависимост", Paytm payment gateway settings,Настройки на шлюза за плащане на Paytm, "Company, Fiscal Year and Currency defaults","По подразбиране за компания, фискална година и валута", -Package,Пакет, -Import and Export Packages.,Внос и износ на пакети., Razorpay Signature Verification Failed,Проверката на подписа на Razorpay не бе успешна, Google Drive - Could not locate - {0},Google Диск - Не можах да намеря - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Синхронизиращият маркер е невалиден и е нулиран., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,За DocType Link / DocType Action, Cannot edit filters for standard charts,Не могат да се редактират филтри за стандартни диаграми, Event Producer Last Update,Последна актуализация на Event Producer, Default for 'Check' type of field {0} must be either '0' or '1',По подразбиране за полето „Проверка“ {0} трябва да бъде „0“ или „1“, +Non Negative,Неотрицателно, +Rules with higher priority number will be applied first.,Правила с по-висок приоритет ще бъдат приложени първо., +Open URL in a New Tab,Отворете URL в нов раздел, +Align Right,Подравнете вдясно, +Loading Filters...,Зареждане на филтри ..., +Count Customizations,Брой персонализации, +For Example: {} Open,Например: {} Отворете, +Choose Existing Card or create New Card,Изберете Съществуваща карта или създайте нова карта, +Number Cards,Карти с номера, +Function Based On,"Функция, базирана на", +Add Filters,Добавяне на филтри, +Skip,Пропуснете, +Dismiss,Уволни, +Value cannot be negative for,Стойността не може да бъде отрицателна за, +Value cannot be negative for {0}: {1},Стойността не може да бъде отрицателна за {0}: {1}, +Negative Value,Отрицателна стойност, +Authentication failed while receiving emails from Email Account: {0}.,Удостоверяването не бе успешно при получаване на имейли от имейл акаунт: {0}., +Message from server: {0},Съобщение от сървъра: {0}, diff --git a/frappe/translations/bn.csv b/frappe/translations/bn.csv index 462838ca5d..7ca0ed2186 100644 --- a/frappe/translations/bn.csv +++ b/frappe/translations/bn.csv @@ -499,7 +499,6 @@ Authenticating...,প্রমাণ করা হচ্ছে ..., Authentication,প্রমাণীকরণ, Authentication Apps you can use are: ,প্রমাণীকরণ অ্যাপ্লিকেশনগুলি আপনি ব্যবহার করতে পারেন:, Authentication Credentials,প্রমাণীকরণ শংসাপত্রগুলি, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},ইমেইল অ্যাকাউন্ট {0} থেকে ইমেইল প্রাপ্তির যখন প্রমাণীকরণ ব্যর্থ হয়েছে. সার্ভার থেকে বার্তা: {1}, Authorization Code,অনুমোদন কোড, Authorize URL,অনুমোদিত URL, Authorized,অনুমোদিত, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,1 থেকে 0 থেকে docstatus প Cannot change header content,শিরোলেখ বিষয়বস্তু পরিবর্তন করতে পারবেন না, Cannot change state of Cancelled Document. Transition row {0},বাতিল হয়েছে ডকুমেন্ট অবস্থা পরিবর্তন করা যাবে না. স্থানান্তরণ সারিতে {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,ডেমো ব্যবহারকারী বিশদ বিবরণ পরিবর্তন করা যাবে না। https://erpnext.com একটি নতুন অ্যাকাউন্টের জন্য সাইনআপ করুন, -Cannot connect: {0},সংযোগ করা যাবে না: {0}, Cannot create a {0} against a child document: {1},তৈরি করতে পারবেন একটি {0} একটি সন্তানের দলিল বিরুদ্ধে: {1}, Cannot delete Home and Attachments folders,বাড়ি ও সংযুক্তি ফোল্ডার মুছে ফেলা যায় না, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,ফাইলটিকে {0} {1} এর জন্য মুছে ফেলা যাবে না যার জন্য আপনার অনুমতি নেই, @@ -1139,7 +1137,6 @@ Font Size,অক্ষরের আকার, Fonts,ফন্ট, Footer,পাদলেখ, Footer HTML,পাদদেশ HTML, -Footer Item,পাদচরণ আইটেম, Footer Items,পাদলেখ চলছে, Footer will display correctly only in PDF,পাদলেখগুলি কেবলমাত্র পিডিএফ-তে সঠিকভাবে প্রদর্শিত হবে, For Document Type,নথির প্রকারের জন্য, @@ -1149,7 +1146,6 @@ For Value,মূল্য জন্য, "For currency {0}, the minimum transaction amount should be {1}","কারেন্সি {0} জন্য, ন্যূনতম লেনদেনের পরিমাণটি {1} হওয়া উচিত", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,আপনি বাতিল এবং INV004 সংশোধন উদাহরণস্বরূপ যদি একটি নতুন ডকুমেন্ট INV004-1 হয়ে যাবে. এই কমান্ডের সাহায্যে আপনি প্রতিটি সংশোধনীর ট্র্যাক রাখতে সাহায্য করে., "For example: If you want to include the document ID, use {0}","উদাহরণস্বরূপ: আপনি দস্তাবেজ আইডি অন্তর্ভুক্ত করতে চান, ব্যবহার করুন {0}", -For top bar,শীর্ষ বারের জন্য, "For updating, you can update only selective columns.","আপডেট করার জন্য, আপনি শুধুমাত্র নির্বাচনী কলাম আপডেট করতে পারেন.", For {0} at level {1} in {2} in row {3},জন্য {0} এ স্তর {1} এ {2} সারিতে {3}, Force,বল, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google ক্যালেন্ডার আইডি, Google Font,গুগল ফন্ট, Google Services,গুগল সার্ভিসেস, Grant Type,গ্রান্ট প্রকার, -Group Label,দলের লেবেল, Group Name,দলের নাম, Group name cannot be empty.,গোষ্ঠী নামটি ফাঁকা হতে পারে না।, Groups of DocTypes,DocTypes গ্রুপ, @@ -1911,7 +1906,6 @@ Please verify your Email Address,আপনার ইমেল ঠিকানা Point Allocation Periodicity,পয়েন্ট বরাদ্দ সময়কাল, Points,পয়েন্ট, Points Given,পয়েন্ট দেওয়া হয়েছে, -Policy,নীতি, Port,বন্দর, Portal Menu,পোর্টাল মেনু, Portal Menu Item,পোর্টাল মেনু আইটেম, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,মুদ্রণের জন্য অন্তত 1 রেকর্ড নির্বাচন করুন, Select or drag across time slots to create a new event.,নির্বাচন করুন অথবা একটি নতুন ইভেন্ট তৈরি করতে সময় স্লট জুড়ে টেনে আনুন., Select records for assignment,নিয়োগ জন্য নির্বাচন রেকর্ড, -"Select target = ""_blank"" to open in a new page.",নির্বাচন টার্গেট = "_blank" একটি নতুন পাতা খুলুন., Select the label after which you want to insert new field.,"আপনি নতুন ক্ষেত্র সন্নিবেশ করতে চান, যা পরে ট্যাগ নির্বাচন করুন.", "Select your Country, Time Zone and Currency","আপনার দেশ, সময় মন্ডল ও মুদ্রা নির্বাচন", Select {0},নির্বাচন {0}, @@ -2989,7 +2982,6 @@ star-empty,তারকা-খালি, step-backward,ধাপে অনগ্রসর, step-forward,ধাপে এগিয়ে, submitted this document,এই দলিল পেশ, -"target = ""_blank""",টার্গেট = "_blank", text in document type,ডকুমেন্ট টাইপ টেক্সট, text-height,টেক্সট-উচ্চতা, text-width,টেক্সট-প্রস্থ, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,টোকেন প্রজন্মের সময় কিছু ভুল হয়েছে। একটি নতুন উত্পন্ন করতে {0 {এ ক্লিক করুন।, Submit After Import,আমদানির পরে জমা দিন, Submitting...,জমা দেওয়া হচ্ছে ..., -Subscribed Documents,সাবস্ক্রাইব করা ডকুমেন্টস, Success! You are good to go 👍,সফল! তুমি যেতে ভাল 👍, Successful Transactions,সফল লেনদেন, Successfully Submitted!,সাফল্যের সাথে জমা দেওয়া হয়েছে!, @@ -3777,7 +3768,6 @@ Please specify,অনুগ্রহ করে নির্দিষ্ট ক Printing,মুদ্রণ, Priority,অগ্রাধিকার, Project,প্রকল্প, -Publish,প্রকাশ করা, Quarterly,ত্রৈমাসিক, Queued,সারিবদ্ধ, Quick Entry,দ্রুত এন্ট্রি, @@ -4299,7 +4289,6 @@ Hide Border,সীমানা লুকান, Index Web Pages for Search,অনুসন্ধানের জন্য সূচী ওয়েব পৃষ্ঠাগুলি, Action / Route,ক্রিয়া / রুট, Document Naming Rule,ডকুমেন্ট নামকরণের নিয়ম, -Rules with higher priority will be applied first.,উচ্চতর অগ্রাধিকার সহ বিধি প্রথমে প্রয়োগ করা হবে।, Rule Conditions,বিধি শর্ত, Digits,সংখ্যা, Example: 00001,উদাহরণ: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,প্যাকেজ প্রকাশের সরঞ্ Click on the row for accessing filters.,ফিল্টার অ্যাক্সেসের জন্য সারি ক্লিক করুন।, Sites,সাইটগুলি, Last Deployed On,সর্বশেষ নিযুক্ত, -Last published {0},সর্বশেষ প্রকাশিত {0}, -Publishing documents...,দস্তাবেজগুলি প্রকাশ করা হচ্ছে ..., -Documents have been published.,নথি প্রকাশিত হয়েছে।, -Select Document Type.,নথি প্রকার নির্বাচন করুন।, Console Log,কনসোল লগ, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","এই ড্যাশবোর্ডে সমস্ত চার্টের জন্য ডিফল্ট বিকল্পগুলি সেট করুন (উদা: "রং": ["# d1d8dd", "# ff5858"])", Use Report Chart,রিপোর্ট চার্ট ব্যবহার করুন, @@ -4566,10 +4551,6 @@ Incorrect URL,ভুল URL, Duplicate Name,সদৃশ নাম, "Please check the value of ""Fetch From"" set for field {0}",ক্ষেত্র {0} এর জন্য সেট থেকে "আনুন" থেকে মানটি পরীক্ষা করুন, Wrong Fetch From value,মান থেকে ভুল আনুন, -Deploying,মোতায়েন করা হচ্ছে, -Couldn't connect to site {0}. Please check Error Logs.,সাইট to 0} এর সাথে সংযোগ করা যায়নি} ত্রুটি লগ চেক করুন।, -Error while installing package to site {0}. Please check Error Logs.,সাইট to 0} প্যাকেজ ইনস্টল করার সময় ত্রুটি} ত্রুটি লগ চেক করুন।, -Exporting,রফতানি হচ্ছে, A field with the name '{}' already exists in doctype {}.,'{}' নামের ক্ষেত্রটি ডকটিপ {already এ ইতিমধ্যে বিদ্যমান}, Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,কাস্টম ফিল্ড {0} প্রশাসক দ্বারা তৈরি এবং কেবল প্রশাসক অ্যাকাউন্টের মাধ্যমে মুছতে পারে।, Failed to send {0} Auto Email Report,{0} অটো ইমেল প্রতিবেদন পাঠাতে ব্যর্থ, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,সারি # {0}: অনন্য দূরবর্তী নির্ভরতা নথি আনতে দয়া করে ক্ষেত্রের জন্য remote 1 remote দূরবর্তী মান ফিল্টার সেট করুন, Paytm payment gateway settings,পেটিএম পেমেন্ট গেটওয়ে সেটিংস, "Company, Fiscal Year and Currency defaults","সংস্থা, আর্থিক বছর এবং মুদ্রা খেলাপি", -Package,প্যাকেজ, -Import and Export Packages.,প্যাকেজগুলি আমদানি ও রফতানি করুন।, Razorpay Signature Verification Failed,রেজারপে স্বাক্ষর যাচাইকরণ ব্যর্থ, Google Drive - Could not locate - {0},গুগল ড্রাইভ - সনাক্ত করা যায়নি - {0}, "Sync token was invalid and has been resetted, Retry syncing.","সিঙ্ক টোকেনটি অবৈধ ছিল এবং এটি পুনরায় সেট করা হয়েছে, সিঙ্ক করার চেষ্টা করুন।", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,ডকটাইপ লিঙ্ক / ডকট Cannot edit filters for standard charts,স্ট্যান্ডার্ড চার্টের জন্য ফিল্টার সম্পাদনা করতে পারে না, Event Producer Last Update,ইভেন্ট প্রযোজক শেষ আপডেট, Default for 'Check' type of field {0} must be either '0' or '1','চেক' প্রকারের ক্ষেত্রের ডিফল্ট {0 either অবশ্যই '0' বা '1' হতে হবে, +Non Negative,অ নেগেটিভ, +Rules with higher priority number will be applied first.,উচ্চতর অগ্রাধিকার নম্বর সহ বিধি প্রথমে প্রয়োগ করা হবে।, +Open URL in a New Tab,নতুন ট্যাবে URL খুলুন, +Align Right,ডানে যাও, +Loading Filters...,ফিল্টার লোড হচ্ছে ..., +Count Customizations,কাস্টমাইজেশন গণনা করুন, +For Example: {} Open,উদাহরণস্বরূপ: {} খুলুন, +Choose Existing Card or create New Card,বিদ্যমান কার্ড চয়ন করুন বা নতুন কার্ড তৈরি করুন, +Number Cards,নম্বর কার্ড, +Function Based On,উপর ভিত্তি করে ফাংশন, +Add Filters,ফিল্টার যোগ করুন, +Skip,এড়িয়ে যান, +Dismiss,খারিজ করুন, +Value cannot be negative for,মানটি নেতিবাচক হতে পারে না, +Value cannot be negative for {0}: {1},মান {0} এর জন্য নেতিবাচক হতে পারে না: {1}, +Negative Value,নেতিবাচক মান, +Authentication failed while receiving emails from Email Account: {0}.,ইমেল অ্যাকাউন্ট থেকে ইমেলগুলি গ্রহণের সময় প্রমাণীকরণ ব্যর্থ হয়েছিল: {0}}, +Message from server: {0},সার্ভার থেকে বার্তা: {0}, diff --git a/frappe/translations/bs.csv b/frappe/translations/bs.csv index ff6ca1d4b6..9df4faa683 100644 --- a/frappe/translations/bs.csv +++ b/frappe/translations/bs.csv @@ -499,7 +499,6 @@ Authenticating...,Autentifikacija ..., Authentication,autentifikaciju, Authentication Apps you can use are: ,Aplikacije za autentikaciju koje možete koristiti su:, Authentication Credentials,Autentifikacijski akreditivi, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Provjera autentičnosti nije uspjela dok primanje e-pošte iz e-pošte {0}. {1}: Poruka od poslužitelja, Authorization Code,kod autorizacije, Authorize URL,Ovlastite URL adresu, Authorized,ovlašćen, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Ne možete mijenjati docstatus 1-0, Cannot change header content,Ne možete menjati sadržaj zaglavlja, Cannot change state of Cancelled Document. Transition row {0},Ne mogu promijeniti stanje Otkazan dokumentu ., Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Ne može promijeniti podaci o korisniku u demo. Molimo vas da registracija za novi račun u https://erpnext.com, -Cannot connect: {0},Ne može povezati: {0}, Cannot create a {0} against a child document: {1},Ne možete kreirati {0} prema djetetu dokument: {1}, Cannot delete Home and Attachments folders,Ne možete izbrisati Home i prilozi mape, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Ne možete izbrisati datoteku pošto pripada {0} {1} za koju nemate dozvole, @@ -1139,7 +1137,6 @@ Font Size,Veličina fonta, Fonts,Fontovi, Footer,Footer, Footer HTML,Footer HTML, -Footer Item,footer Stavka, Footer Items,Footer Proizvodi, Footer will display correctly only in PDF,Footer će se ispravno prikazati samo u PDF-u, For Document Type,Za vrstu dokumenta, @@ -1149,7 +1146,6 @@ For Value,Za vrijednost, "For currency {0}, the minimum transaction amount should be {1}","Za valutu {0}, minimalna transakcija iznosi {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Na primjer, ako se otkaz i dopune INV004 će postati novi dokument INV004-1. To će Vam pomoći da pratite svakog amandmana.", "For example: If you want to include the document ID, use {0}","Na primjer: Ako želite da uključite dokument ID, koristite {0}", -For top bar,Na gornjoj traci, "For updating, you can update only selective columns.","Za ažuriranje, možete ažurirati samo selektivne kolone.", For {0} at level {1} in {2} in row {3},Za {0} na razini {1} u {2} u redu {3}, Force,sila, @@ -1201,7 +1197,6 @@ Google Calendar ID,ID Google kalendara, Google Font,Google Font, Google Services,Google usluge, Grant Type,Grant Tip, -Group Label,Grupa Label, Group Name,Ime grupe, Group name cannot be empty.,Ime grupe ne može biti prazno., Groups of DocTypes,Grupe Doctype, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Molimo Vas da provjerite e-mail adresa, Point Allocation Periodicity,Periodičnost raspodjele točke, Points,Bodovi, Points Given,Dane bodove, -Policy,politika, Port,luka, Portal Menu,portal Menu, Portal Menu Item,Portal Menu Item, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Odaberite atleast 1 zapis za štampanje, Select or drag across time slots to create a new event.,Odaberite ili povucite preko minutaže stvoriti novi događaj., Select records for assignment,Izaberite Records za dodjelu, -"Select target = ""_blank"" to open in a new page.","Select target = "" _blank "" za otvaranje u novoj stranici.", Select the label after which you want to insert new field.,Odaberite oznaku nakon što želite umetnuti novo polje., "Select your Country, Time Zone and Currency","Izaberite svoju zemlju, vremensku zonu i valuta", Select {0},Odaberite {0}, @@ -2989,7 +2982,6 @@ star-empty,zvijezda-prazna, step-backward,korak unatrag, step-forward,korak naprijed, submitted this document,dostavio ovaj dokument, -"target = ""_blank""",target = "_blank", text in document type,teksta u tipa dokumenta, text-height,tekst-visina, text-width,tekst širine, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Nešto je pošlo po zlu tokom generacije tokena. Kliknite na {0} da biste generirali novi., Submit After Import,Pošaljite nakon uvoza, Submitting...,Podnošenje ..., -Subscribed Documents,Pretplaćeni dokumenti, Success! You are good to go 👍,Uspeh! Ti si dobar to, Successful Transactions,Uspešne transakcije, Successfully Submitted!,Uspješno poslano!, @@ -3777,7 +3768,6 @@ Please specify,Navedite, Printing,Štampanje, Priority,Prioritet, Project,Projekat, -Publish,Objavite, Quarterly,Kvartalno, Queued,Na čekanju, Quick Entry,Brzo uvođenje, @@ -4299,7 +4289,6 @@ Hide Border,Sakrij granicu, Index Web Pages for Search,Indeksirajte web stranice za pretragu, Action / Route,Akcija / ruta, Document Naming Rule,Pravilo imenovanja dokumenata, -Rules with higher priority will be applied first.,Prvo će se primijeniti pravila s većim prioritetom., Rule Conditions,Uvjeti pravila, Digits,Znamenke, Example: 00001,Primjer: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Alat za objavljivanje paketa, Click on the row for accessing filters.,Kliknite red za pristup filtrima., Sites,Sajtovi, Last Deployed On,Posljednji put postavljeno, -Last published {0},Posljednje objavljivanje {0}, -Publishing documents...,Objavljivanje dokumenata ..., -Documents have been published.,Dokumenti su objavljeni., -Select Document Type.,Odaberite vrstu dokumenta., Console Log,Dnevnik konzole, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Postavite zadane opcije za sve grafikone na ovoj nadzornoj ploči (Npr .: "boje": ["# d1d8dd", "# ff5858"])", Use Report Chart,Koristite grafikon izvještaja, @@ -4566,10 +4551,6 @@ Incorrect URL,Netačan URL, Duplicate Name,Duplicirano ime, "Please check the value of ""Fetch From"" set for field {0}",Molimo provjerite vrijednost postavke "Dohvati iz" za polje {0}, Wrong Fetch From value,Pogrešan dohvat iz vrijednosti, -Deploying,Raspoređivanje, -Couldn't connect to site {0}. Please check Error Logs.,Povezivanje sa web lokacijom {0} nije uspjelo. Molimo provjerite zapise grešaka., -Error while installing package to site {0}. Please check Error Logs.,Greška prilikom instaliranja paketa na web lokaciju {0}. Molimo provjerite zapise grešaka., -Exporting,Izvoz, A field with the name '{}' already exists in doctype {}.,Polje s imenom '{}' već postoji u doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Prilagođeno polje {0} kreira administrator i može se izbrisati samo putem administratorskog računa., Failed to send {0} Auto Email Report,Slanje {0} automatskog izvještaja e-poštom nije uspjelo, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Red # {0}: Postavite filtere udaljene vrijednosti za polje {1} da biste preuzeli jedinstveni dokument o udaljenoj zavisnosti, Paytm payment gateway settings,Postavke mrežnog prolaza za Paytm, "Company, Fiscal Year and Currency defaults","Zadane postavke kompanije, fiskalne godine i valute", -Package,Paket, -Import and Export Packages.,Uvoz i izvoz paketa., Razorpay Signature Verification Failed,Nije uspjela provjera potpisa Razorpay-a, Google Drive - Could not locate - {0},Google pogon - Nije moguće pronaći - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Token za sinkronizaciju je nevažeći i resetiran je, pokušajte ponovo sinkronizirati.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Za DocType Link / DocType Action, Cannot edit filters for standard charts,Nije moguće urediti filtre za standardne grafikone, Event Producer Last Update,Posljednje ažuriranje producenta događaja, Default for 'Check' type of field {0} must be either '0' or '1',Zadano za tip polja 'Check' {0} mora biti ili '0' ili '1', +Non Negative,Negativno, +Rules with higher priority number will be applied first.,Prvo će se primijeniti pravila s većim prioritetom., +Open URL in a New Tab,Otvorite URL na novoj kartici, +Align Right,Poravnajte udesno, +Loading Filters...,Učitavanje filtera ..., +Count Customizations,Brojanje prilagođavanja, +For Example: {} Open,Na primjer: {} Otvori, +Choose Existing Card or create New Card,Odaberite postojeću karticu ili kreirajte novu karticu, +Number Cards,Broj kartice, +Function Based On,Funkcija zasnovana na, +Add Filters,Dodaj filtere, +Skip,Preskoči, +Dismiss,Odbaci, +Value cannot be negative for,Vrijednost ne može biti negativna za, +Value cannot be negative for {0}: {1},Vrijednost ne može biti negativna za {0}: {1}, +Negative Value,Negativna vrijednost, +Authentication failed while receiving emails from Email Account: {0}.,Autentifikacija nije uspjela tijekom primanja e-pošte s računa e-pošte: {0}., +Message from server: {0},Poruka od servera: {0}, diff --git a/frappe/translations/ca.csv b/frappe/translations/ca.csv index d886b87704..afb032ec3b 100644 --- a/frappe/translations/ca.csv +++ b/frappe/translations/ca.csv @@ -499,7 +499,6 @@ Authenticating...,Autenticació ..., Authentication,autenticació, Authentication Apps you can use are: ,Les aplicacions d'autenticació que podeu utilitzar són:, Authentication Credentials,Credencials d'autenticació, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Error d'autenticació al rebre correus electrònics de compte de correu electrònic {0}. Missatge del servidor: {1}, Authorization Code,Codi d'autorització, Authorize URL,Autoritza l'URL, Authorized,autoritzat, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,No es pot canviar DocStatus de 1 a 0, Cannot change header content,No es pot canviar el contingut de la capçalera, Cannot change state of Cancelled Document. Transition row {0},No es pot canviar l'estat de Document Cancel·lat. Transition row {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,"No es poden canviar els detalls de l'usuari en demostració. Si us plau, registrar-se per un nou compte a https://erpnext.com", -Cannot connect: {0},No es pot connectar: {0}, Cannot create a {0} against a child document: {1},No es pot crear un {0} en contra d'un document secundari: {1}, Cannot delete Home and Attachments folders,No es pot eliminar d'Interior i Adjunts carpetes, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,No es pot esborrar el fitxer ja que pertany a {0} {1} pel qual no teniu permisos, @@ -1139,7 +1137,6 @@ Font Size,Mida de la Font, Fonts,Fonts, Footer,Peu de pàgina, Footer HTML,Peu de pàgina HTML, -Footer Item,Peu de pàgina de l'article, Footer Items,Peu de pàgina Articles, Footer will display correctly only in PDF,El peu de pàgina només es mostrarà en format PDF, For Document Type,Per al tipus de document, @@ -1149,7 +1146,6 @@ For Value,Per valor, "For currency {0}, the minimum transaction amount should be {1}","Per a la moneda {0}, l’import mínim de la transacció ha de ser {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,Per exemple si es cancel·la i enmendáis INV004 es convertirà en un nou document INV004-1. Això l'ajuda a mantenir un registre de cada esmena., "For example: If you want to include the document ID, use {0}","Per exemple: Si voleu incloure la identificació de document, utilitzeu {0}", -For top bar,Per a la barra superior, "For updating, you can update only selective columns.","Per a l'actualització, pot actualitzar només les columnes seleccionades.", For {0} at level {1} in {2} in row {3},Per {0} a nivell {1} a {2} en fila {3}, Force,força, @@ -1201,7 +1197,6 @@ Google Calendar ID,Identificador de Google Calendar, Google Font,Google Font, Google Services,Serveis de Google, Grant Type,Tipus de subvenció, -Group Label,Label Group, Group Name,Nom del grup, Group name cannot be empty.,El nom del grup no pot estar buit., Groups of DocTypes,Grups de doctypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,"Si us plau, comproveu la vostra adreça de cor Point Allocation Periodicity,Periodicitat d’assignació de punts, Points,Punts, Points Given,Punts donats, -Policy,política, Port,Port, Portal Menu,menú portal, Portal Menu Item,Portal de l'Menú, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Seleccionar com a mínim 1 resultat per a la impressió, Select or drag across time slots to create a new event.,Seleccioneu o arrossegament a través de caselles de temps per crear un nou esdeveniment., Select records for assignment,Seleccioneu els registres per a l'assignació, -"Select target = ""_blank"" to open in a new page.","Select target = ""_blank"" per obrir una nova pàgina.", Select the label after which you want to insert new field.,Selecciona l'etiqueta després de la qual vols inserir el nou camp., "Select your Country, Time Zone and Currency","Seleccioni el seu País, Zona horària i moneda", Select {0},Seleccioneu {0}, @@ -2989,7 +2982,6 @@ star-empty,star-empty, step-backward,pas enrere, step-forward,pas cap endavant, submitted this document,presentat aquest document, -"target = ""_blank""","target = ""_blank""", text in document type,text en el tipus de document, text-height,text-height, text-width,text-width, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Alguna cosa va fallar durant la generació del testimoni. Feu clic a {0} per generar-ne un de nou., Submit After Import,Envieu després d'importar, Submitting...,S'està enviant ..., -Subscribed Documents,Documents subscrits, Success! You are good to go 👍,Èxit! És bo anar go, Successful Transactions,Transaccions correctes, Successfully Submitted!,S'ha enviat amb èxit, @@ -3777,7 +3768,6 @@ Please specify,"Si us plau, especifiqui", Printing,Impressió, Priority,Prioritat, Project,Projecte, -Publish,Publica, Quarterly,Trimestral, Queued,En cua, Quick Entry,Entrada ràpida, @@ -4299,7 +4289,6 @@ Hide Border,Amaga la frontera, Index Web Pages for Search,Índex de pàgines web de cerca, Action / Route,Acció / Ruta, Document Naming Rule,Regla de denominació de documents, -Rules with higher priority will be applied first.,Les regles amb més prioritat s’aplicaran primer., Rule Conditions,Condicions de la norma, Digits,Dígits, Example: 00001,Exemple: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Eina de publicació de paquets, Click on the row for accessing filters.,Feu clic a la fila per accedir als filtres., Sites,Llocs, Last Deployed On,Últim desplegament activat, -Last published {0},Darrera publicació: {0}, -Publishing documents...,S'estan publicant documents ..., -Documents have been published.,S'han publicat documents., -Select Document Type.,Seleccioneu el tipus de document., Console Log,Registre de consola, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Estableix les opcions predeterminades per a tots els gràfics d'aquest tauler (Ex: "colors": ["# d1d8dd", "# ff5858"])", Use Report Chart,Utilitzeu el gràfic d'informes, @@ -4566,10 +4551,6 @@ Incorrect URL,URL incorrecte, Duplicate Name,Nom duplicat, "Please check the value of ""Fetch From"" set for field {0}",Comproveu el valor de "Recupera de" establert per al camp {0}, Wrong Fetch From value,Valor de recuperació incorrecte, -Deploying,Desplegament, -Couldn't connect to site {0}. Please check Error Logs.,No s'ha pogut connectar al lloc {0}. Comproveu els registres d'errors., -Error while installing package to site {0}. Please check Error Logs.,Error en instal·lar el paquet al lloc {0}. Comproveu els registres d'errors., -Exporting,S'està exportant, A field with the name '{}' already exists in doctype {}.,Ja hi ha un camp amb el nom "{}" a doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,L'administrador crea el camp personalitzat {0} i només es pot suprimir mitjançant el compte d'administrador., Failed to send {0} Auto Email Report,No s'ha pogut enviar {0} l'informe de correu electrònic automàtic, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Fila núm. {0}: configureu filtres de valor remot per al camp {1} per obtenir el document únic de dependència remota, Paytm payment gateway settings,Configuració de la passarel·la de pagament Paytm, "Company, Fiscal Year and Currency defaults","Valors predeterminats de l'empresa, de l'any fiscal i de la moneda", -Package,Paquet, -Import and Export Packages.,Importar i exportar paquets., Razorpay Signature Verification Failed,No s'ha pogut verificar la signatura de Razorpay, Google Drive - Could not locate - {0},Google Drive: no s'ha pogut localitzar - {0}, "Sync token was invalid and has been resetted, Retry syncing.",El testimoni de sincronització no és vàlid i s'ha restablert. Torna-ho a provar de sincronitzar., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Per a DocType Link / DocType Action, Cannot edit filters for standard charts,No es poden editar filtres per a gràfics estàndard, Event Producer Last Update,Última actualització del productor d'esdeveniments, Default for 'Check' type of field {0} must be either '0' or '1',El valor predeterminat del tipus de camp "Comprova" {0} ha de ser "0" o "1", +Non Negative,No negatiu, +Rules with higher priority number will be applied first.,Les regles amb un número de prioritat més alt s’aplicaran primer., +Open URL in a New Tab,Obriu l'URL en una pestanya nova, +Align Right,Alinea a la dreta, +Loading Filters...,S'estan carregant els filtres ..., +Count Customizations,Comptar personalitzacions, +For Example: {} Open,Per exemple: {} Obre, +Choose Existing Card or create New Card,Trieu la targeta existent o creeu una targeta nova, +Number Cards,Targetes numèriques, +Function Based On,Funció basada en, +Add Filters,Afegiu filtres, +Skip,Omet, +Dismiss,Destitueix, +Value cannot be negative for,El valor no pot ser negatiu per a, +Value cannot be negative for {0}: {1},El valor no pot ser negatiu per a {0}: {1}, +Negative Value,Valor negatiu, +Authentication failed while receiving emails from Email Account: {0}.,L'autenticació ha fallat en rebre correus electrònics del compte de correu electrònic: {0}., +Message from server: {0},Missatge del servidor: {0}, diff --git a/frappe/translations/cs.csv b/frappe/translations/cs.csv index e2a70acc46..2b405605fa 100644 --- a/frappe/translations/cs.csv +++ b/frappe/translations/cs.csv @@ -499,7 +499,6 @@ Authenticating...,Ověřování ..., Authentication,ověření pravosti, Authentication Apps you can use are: ,"Aplikace ověřování, které můžete použít, jsou:", Authentication Credentials,Autentifikační pověření, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Ověřování při přijímání e-mailů z e-mailového účtu {0} se nezdařilo. Zpráva ze serveru: {1}, Authorization Code,Autorizační kód, Authorize URL,Autorizujte URL, Authorized,Autorizovaný, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Nelze změnit docstatus z 1 na 0, Cannot change header content,Nelze změnit obsah záhlaví, Cannot change state of Cancelled Document. Transition row {0},Nelze změnit stav zrušeného dokumentu. řádek transakce: {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,V demo nelze změnit uživatelské detaily. Přihlaste se k novému účtu na adrese https://erpnext.com, -Cannot connect: {0},Není možné se připojit: {0}, Cannot create a {0} against a child document: {1},Nelze vytvořit {0} proti dětské dokumentu: {1}, Cannot delete Home and Attachments folders,Nelze odstranit Domů a přílohy složky, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Soubor nelze odstranit, protože patří do {0} {1}, pro který nemáte oprávnění", @@ -1139,7 +1137,6 @@ Font Size,Velikost písma, Fonts,Písma, Footer,Zápatí, Footer HTML,Zápatí HTML, -Footer Item,zápatí Item, Footer Items,Položky zápatí, Footer will display correctly only in PDF,Zápatí se zobrazí správně pouze v PDF, For Document Type,Pro typ dokumentu, @@ -1149,7 +1146,6 @@ For Value,Hodnota, "For currency {0}, the minimum transaction amount should be {1}",Pro měnu {0} by minimální částka transakce měla být {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Například, pokud zrušíte a pozměnit INV004 se stane nový dokument INV004-1. To vám pomůže udržet přehled o každé změny.", "For example: If you want to include the document ID, use {0}","Například: Chcete-li zahrnout ID dokumentu, použijte {0}", -For top bar,Pro horní panel, "For updating, you can update only selective columns.","Pro aktualizaci, můžete aktualizovat pouze vybrané sloupce.", For {0} at level {1} in {2} in row {3},Pro {0} na úrovni {1} v {2} na řádku {3}, Force,Platnost, @@ -1201,7 +1197,6 @@ Google Calendar ID,ID Kalendáře Google, Google Font,Písmo Google, Google Services,Služby Google, Grant Type,Grant Type, -Group Label,Skupina Label, Group Name,Skupinové jméno, Group name cannot be empty.,Název skupiny nesmí být prázdný., Groups of DocTypes,Skupiny DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Je třeba ověřit svou emailovou adresu, Point Allocation Periodicity,Periodicita alokace bodů, Points,Body, Points Given,Přidělené body, -Policy,Politika, Port,Port, Portal Menu,portál Menu, Portal Menu Item,Portál Položka, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Zvolte aspoň 1 záznamů pro tisk, Select or drag across time slots to create a new event.,Nová událost: Zvolte nebo táhněte skrz Časová pole., Select records for assignment,Vyberte záznamy pro přiřazení, -"Select target = ""_blank"" to open in a new page.","Zvolte cíl (target) = ""_blank"" pro otevření na nové stránce.", Select the label after which you want to insert new field.,"Zvolte popisek, za kterým chcete vložit nové pole.", "Select your Country, Time Zone and Currency","Vyberte svou zemi, časové pásmo a měnu", Select {0},Vyberte {0}, @@ -2989,7 +2982,6 @@ star-empty,star-empty, step-backward,step-backward, step-forward,step-forward, submitted this document,předložen tento dokument, -"target = ""_blank""","target = ""_blank""", text in document type,text v typu dokumentu, text-height,text-height, text-width,text-width, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Během generování tokenů se něco pokazilo. Kliknutím na {0} vygenerujete nový., Submit After Import,Odeslat po importu, Submitting...,Odesílání ..., -Subscribed Documents,Předplacené dokumenty, Success! You are good to go 👍,Úspěch! Je dobré jít 👍, Successful Transactions,Úspěšné transakce, Successfully Submitted!,Úspěšně odesláno!, @@ -3777,7 +3768,6 @@ Please specify,Prosím specifikujte, Printing,Tisk, Priority,Priorita, Project,Zakázka, -Publish,Publikovat, Quarterly,Čtvrtletně, Queued,Ve frontě, Quick Entry,Rychlý vstup, @@ -4299,7 +4289,6 @@ Hide Border,Skrýt hranici, Index Web Pages for Search,Indexujte webové stránky pro vyhledávání, Action / Route,Akce / trasa, Document Naming Rule,Pravidlo pro pojmenování dokumentu, -Rules with higher priority will be applied first.,Nejprve se použijí pravidla s vyšší prioritou., Rule Conditions,Podmínky pravidla, Digits,Číslice, Example: 00001,Příklad: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Nástroj pro publikování balíčků, Click on the row for accessing filters.,Kliknutím na řádek získáte přístup k filtrům., Sites,Weby, Last Deployed On,Poslední nasazení, -Last published {0},Naposledy publikováno {0}, -Publishing documents...,Publikování dokumentů ..., -Documents have been published.,Byly zveřejněny dokumenty., -Select Document Type.,Vyberte typ dokumentu., Console Log,Protokol konzoly, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Nastavit výchozí možnosti pro všechny grafy na tomto řídicím panelu (např .: "barvy": ["# d1d8dd", "# ff5858"])", Use Report Chart,Použijte přehledový graf, @@ -4566,10 +4551,6 @@ Incorrect URL,Nesprávná adresa URL, Duplicate Name,Duplicitní jméno, "Please check the value of ""Fetch From"" set for field {0}",Zkontrolujte hodnotu „Načíst z“ nastavenou pro pole {0}, Wrong Fetch From value,Chybné načítání z hodnoty, -Deploying,Nasazení, -Couldn't connect to site {0}. Please check Error Logs.,Nelze se připojit k webu {0}. Zkontrolujte protokoly chyb., -Error while installing package to site {0}. Please check Error Logs.,Chyba při instalaci balíčku na web {0}. Zkontrolujte protokoly chyb., -Exporting,Export, A field with the name '{}' already exists in doctype {}.,Pole s názvem „{}“ již v doctype {} existuje., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Vlastní pole {0} vytváří administrátor a lze ho smazat pouze prostřednictvím účtu administrátora., Failed to send {0} Auto Email Report,Nepodařilo se odeslat {0} automatický e-mailový přehled, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,"Řádek č. {0}: Chcete-li načíst jedinečný dokument vzdálené závislosti, nastavte pro pole {1} filtry vzdálených hodnot", Paytm payment gateway settings,Nastavení platební brány Paytm, "Company, Fiscal Year and Currency defaults","Výchozí nastavení společnosti, fiskálního roku a měny", -Package,Balík, -Import and Export Packages.,Import a export balíčků., Razorpay Signature Verification Failed,Ověření podpisu Razorpay se nezdařilo, Google Drive - Could not locate - {0},Disk Google - nelze najít - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Token synchronizace byl neplatný a byl resetován, opakujte synchronizaci.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Pro DocType Link / DocType Action, Cannot edit filters for standard charts,Nelze upravit filtry pro standardní grafy, Event Producer Last Update,Producent událostí Poslední aktualizace, Default for 'Check' type of field {0} must be either '0' or '1',Výchozí hodnota pro typ pole „Zkontrolovat“ {0} musí být „0“ nebo „1“, +Non Negative,Nezáporné, +Rules with higher priority number will be applied first.,Pravidla s vyšším číslem priority budou použita jako první., +Open URL in a New Tab,Otevřete adresu URL na nové kartě, +Align Right,Zarovnat správně, +Loading Filters...,Načítání filtrů ..., +Count Customizations,Počítat přizpůsobení, +For Example: {} Open,Například: {} Otevřít, +Choose Existing Card or create New Card,Vyberte existující kartu nebo vytvořte novou kartu, +Number Cards,Číselné karty, +Function Based On,Funkce založená na, +Add Filters,Přidat filtry, +Skip,Přeskočit, +Dismiss,Zavrhnout, +Value cannot be negative for,Hodnota nemůže být záporná pro, +Value cannot be negative for {0}: {1},Hodnota nemůže být záporná pro {0}: {1}, +Negative Value,Záporná hodnota, +Authentication failed while receiving emails from Email Account: {0}.,Při přijímání e-mailů z e-mailového účtu se nezdařilo ověření: {0}., +Message from server: {0},Zpráva ze serveru: {0}, diff --git a/frappe/translations/da.csv b/frappe/translations/da.csv index 1a7efc5969..32f2ac9f6d 100644 --- a/frappe/translations/da.csv +++ b/frappe/translations/da.csv @@ -499,7 +499,6 @@ Authenticating...,Godkender ..., Authentication,Godkendelse, Authentication Apps you can use are: ,"Autentificeringsprogrammer, du kan bruge, er:", Authentication Credentials,Autentificeringsoplysninger, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Godkendelse mislykkedes mens modtage e-mails fra e-mail-konto {0}. Meddelelse fra serveren: {1}, Authorization Code,Autorisation kode, Authorize URL,Tillad URL, Authorized,autoriseret, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Kan ikke ændre docstatus 1-0, Cannot change header content,Kan ikke ændre header indhold, Cannot change state of Cancelled Document. Transition row {0},Kan ikke ændre tilstand af Annulleret dokument. Overgang rækken {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Kan ikke ændre brugeroplysninger i demo. Tilmeld dig venligst en ny konto på https://erpnext.com, -Cannot connect: {0},Kan ikke forbinde: {0}, Cannot create a {0} against a child document: {1},Kan ikke oprette en {0} mod et barn dokument: {1}, Cannot delete Home and Attachments folders,Kan ikke slette Hjem og Tilbehør mapper, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Kan ikke slette filen, da den tilhører {0} {1}, som du ikke har tilladelser til", @@ -1139,7 +1137,6 @@ Font Size,Skriftstørrelse, Fonts,Skrifttyper, Footer,Sidefod, Footer HTML,Sidefod HTML, -Footer Item,footer Item, Footer Items,Footer Varer, Footer will display correctly only in PDF,Sidefod vises kun korrekt i PDF, For Document Type,For dokumenttype, @@ -1149,7 +1146,6 @@ For Value,For værdi, "For currency {0}, the minimum transaction amount should be {1}",For valuta {0} skal det mindste transaktionsbeløb være {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,For eksempel hvis du annullere og ændre INV004 bliver det et nyt dokument INV004-1. Dette hjælper dig med at holde styr på hver enkelt ændring., "For example: If you want to include the document ID, use {0}","For eksempel: Hvis du ønsker at inkludere dokumentet id, skal du bruge {0}", -For top bar,For top bar, "For updating, you can update only selective columns.","Til opdatering, kan du opdatere kun selektive kolonner.", For {0} at level {1} in {2} in row {3},For {0} på niveau {1} i {2} i række {3}, Force,Kraft, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Kalender-id, Google Font,Google-skrifttype, Google Services,Google Services, Grant Type,Grant Type, -Group Label,Gruppe Label, Group Name,Gruppe navn, Group name cannot be empty.,Gruppens navn kan ikke være tomt., Groups of DocTypes,Grupper af doctypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Bekræft din e-mail adresse, Point Allocation Periodicity,Periodetildeling af point, Points,Points, Points Given,Der gives point, -Policy,Politik, Port,Port, Portal Menu,Portal Menu, Portal Menu Item,Portal Menu Item, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Vælg mindst en post til udskrivning, Select or drag across time slots to create a new event.,Vælg eller træk henover ledige tider for at oprette en ny begivenhed., Select records for assignment,Vælg rækker der skal tildeles, -"Select target = ""_blank"" to open in a new page.",Vælg target = "_blank" for at åbne i en ny side., Select the label after which you want to insert new field.,"Vælg den etiket, hvorefter du vil indsætte nyt felt.", "Select your Country, Time Zone and Currency","Vælg dit land, tidszone og valuta", Select {0},Vælg {0}, @@ -2989,7 +2982,6 @@ star-empty,star-tom, step-backward,trin-bagud, step-forward,trin-frem, submitted this document,godkendte dette dokument, -"target = ""_blank""",target = "_blank", text in document type,tekst i dokumenttype, text-height,tekst-højde, text-width,tekst-bredde, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Der gik noget galt under token-generationen. Klik på {0} for at generere en ny., Submit After Import,Indsend efter import, Submitting...,Sender ..., -Subscribed Documents,Abonnerede dokumenter, Success! You are good to go 👍,Succes! Du er god til at gå 👍, Successful Transactions,Vellykkede transaktioner, Successfully Submitted!,Indsendt!, @@ -3777,7 +3768,6 @@ Please specify,Angiv venligst, Printing,Udskrivning, Priority,Prioritet, Project,Sag, -Publish,Offentliggøre, Quarterly,Kvartalsvis, Queued,Sat i kø, Quick Entry,Hurtig indtastning, @@ -4299,7 +4289,6 @@ Hide Border,Skjul kant, Index Web Pages for Search,Indeksér websider til søgning, Action / Route,Handling / rute, Document Naming Rule,Dokumentnavnregel, -Rules with higher priority will be applied first.,Regler med højere prioritet anvendes først., Rule Conditions,Regelbetingelser, Digits,Cifre, Example: 00001,Eksempel: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Pakkeudgivelsesværktøj, Click on the row for accessing filters.,Klik på rækken for at få adgang til filtre., Sites,Websteder, Last Deployed On,Sidst implementeret den, -Last published {0},Senest offentliggjort {0}, -Publishing documents...,Offentliggørelse af dokumenter ..., -Documents have been published.,Dokumenter er blevet offentliggjort., -Select Document Type.,Vælg Dokumenttype., Console Log,Konsollog, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Indstil standardindstillinger for alle diagrammer på dette instrumentbræt (Eks: "farver": ["# d1d8dd", "# ff5858"])", Use Report Chart,Brug rapportoversigt, @@ -4566,10 +4551,6 @@ Incorrect URL,Forkert URL, Duplicate Name,Kopi navn, "Please check the value of ""Fetch From"" set for field {0}",Kontroller værdien af "Hent fra" -sæt for felt {0}, Wrong Fetch From value,Forkert hentning fra værdi, -Deploying,Implementering, -Couldn't connect to site {0}. Please check Error Logs.,Kunne ikke oprette forbindelse til webstedet {0}. Kontroller fejllogfiler., -Error while installing package to site {0}. Please check Error Logs.,Fejl under installation af pakke til websted {0}. Kontroller fejllogfiler., -Exporting,Eksporterer, A field with the name '{}' already exists in doctype {}.,Et felt med navnet '{}' findes allerede i doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Tilpasset felt {0} oprettes af administratoren og kan kun slettes via administratorkontoen., Failed to send {0} Auto Email Report,Kunne ikke sende {0} rapport med automatisk e-mail, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Række nr. {0}: Indstil fjernværdifiltre til feltet {1} for at hente det unikke fjernafhængighedsdokument, Paytm payment gateway settings,Paytm-betalingsgateway-indstillinger, "Company, Fiscal Year and Currency defaults","Virksomheds-, regnskabsår- og valutaindstillinger", -Package,Pakke, -Import and Export Packages.,Import og eksport af pakker., Razorpay Signature Verification Failed,Bekræftelse af Razorpay-signatur mislykkedes, Google Drive - Could not locate - {0},Google Drev - Kunne ikke finde - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Synkroniseringstoken var ugyldigt og er blevet nulstillet. Prøv at synkronisere igen., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,For DocType Link / DocType Action, Cannot edit filters for standard charts,Kan ikke redigere filtre til standardkort, Event Producer Last Update,Event Producent Sidste opdatering, Default for 'Check' type of field {0} must be either '0' or '1',Standard for 'Kontrollér' felttype {0} skal enten være '0' eller '1', +Non Negative,Ikke negativ, +Rules with higher priority number will be applied first.,Regler med højere prioritetsnummer anvendes først., +Open URL in a New Tab,Åbn URL i en ny fane, +Align Right,Juster højre, +Loading Filters...,Indlæser filtre ..., +Count Customizations,Tæl tilpasninger, +For Example: {} Open,For eksempel: {} Åbn, +Choose Existing Card or create New Card,"Vælg Eksisterende kort, eller opret nyt kort", +Number Cards,Antal kort, +Function Based On,Funktionsbaseret på, +Add Filters,Tilføj filtre, +Skip,Springe, +Dismiss,Afskedige, +Value cannot be negative for,Værdien kan ikke være negativ for, +Value cannot be negative for {0}: {1},Værdien kan ikke være negativ for {0}: {1}, +Negative Value,Negativ værdi, +Authentication failed while receiving emails from Email Account: {0}.,Godkendelse mislykkedes under modtagelse af e-mails fra e-mail-konto: {0}., +Message from server: {0},Meddelelse fra server: {0}, diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index 0572daaee3..f1d72c1443 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -499,7 +499,6 @@ Authenticating...,Authentifizierung ..., Authentication,Authentifizierung, Authentication Apps you can use are: ,Verfügbare Authentifizierungs-Apps:, Authentication Credentials,Zugangsdaten, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},"Authentifizierung fehlgeschlagen, während E-Mails vom Konto {0} empfangen wurden. Nachricht vom Server: {1}", Authorization Code,Autorisierungscode, Authorize URL,URL autorisieren, Authorized,Autorisiert, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,DocStatus kann nicht von 1 auf 0 geändert w Cannot change header content,Header-Inhalt kann nicht geändert werden, Cannot change state of Cancelled Document. Transition row {0},Zustand des aufgehobenen Dokumentes kann nicht geändert werden. Übergangszeile {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Die Benutzerdetails können im Demo nicht geändert werden. Bitte melden Sie sich unter https://erpnext.com für ein neues Konto an, -Cannot connect: {0},Verbindung kann nicht hergestellt werden: {0}, Cannot create a {0} against a child document: {1},Kann {0} nicht gegen ein Kind Dokument erstellen: {1}, Cannot delete Home and Attachments folders,"Die Ordner ""Startseite"" und ""Anlagen"" können nicht gelöscht werden", Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Kann die Datei nicht löschen, da sie zu {0} {1} gehört, für die Sie keine Berechtigungen haben", @@ -1139,7 +1137,6 @@ Font Size,Schriftgröße, Fonts,Schriftarten, Footer,Fußzeile, Footer HTML,Fußzeile HTML, -Footer Item,Fußzeilen-Objekt, Footer Items,Fußzeilen-Objekte, Footer will display correctly only in PDF,Die Fußzeile wird nur in PDF korrekt angezeigt, For Document Type,Für Dokumenttyp, @@ -1149,7 +1146,6 @@ For Value,Für Wert, "For currency {0}, the minimum transaction amount should be {1}",Für die Währung {0} sollte der Mindesttransaktionsbetrag {1} sein., For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Beispiel: Wenn Sie INV004 stornieren und abändern, wird INV004 zu einem neuen Dokument INV004-1. Dies hilft Ihnen, den Überblick über jede Änderung zu behalten.", "For example: If you want to include the document ID, use {0}","Beispiel: Wenn Sie die Dokumenten-ID mit einschliessen möchten, verwenden Sie {0}", -For top bar,Für die Kopfleiste, "For updating, you can update only selective columns.",Nur ausgewählte Spalten können aktualisiert werden, For {0} at level {1} in {2} in row {3},Für {0} auf der Ebene {1} in {2} in Zeile {3}, Force,Erzwingen, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Kalender-ID, Google Font,Google Font, Google Services,Google-Dienste, Grant Type,Grant Typ, -Group Label,Gruppenbezeichnung, Group Name,Gruppenname, Group name cannot be empty.,Der Gruppenname darf nicht leer sein., Groups of DocTypes,Gruppen von DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Bitte bestätigen Sie Ihre E-Mail-Adresse, Point Allocation Periodicity,Punktzuordnungsperiodizität, Points,Punkte, Points Given,Punkte gegeben, -Policy,Politik, Port,Anschluss, Portal Menu,Portal-Menü, Portal Menu Item,Portal Menüpunkt, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Wählen Sie mindestens einen Datensatz für den Druck, Select or drag across time slots to create a new event.,"Um ein neues Ereignis zu erstellen, Zeitfenster markieren oder über ein Zeitfenster ziehen", Select records for assignment,Datensätze für die Zuordnung auswählen, -"Select target = ""_blank"" to open in a new page.","Bitte für ""Ziel"" = ""_blank"" auswählen, um den Inhalt in einer neuen Seite zu öffnen.", Select the label after which you want to insert new field.,"Bitte Element auswählen, nach dem ein neues Feld eingefügt werden soll.", "Select your Country, Time Zone and Currency","Bitte Land, Zeitzone und Währung auswählen", Select {0},{0} auswählen, @@ -2989,7 +2982,6 @@ star-empty,sternenleer, step-backward,Schritt zurück, step-forward,Schritt nach vorn, submitted this document,Dieses Dokument eingereicht, -"target = ""_blank""","target = ""_blank""", text in document type,Text in Dokumententyp, text-height,Texthöhe, text-width,Textbreite, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,"Während der Token-Generierung ist ein Fehler aufgetreten. Klicken Sie auf {0}, um eine neue zu erstellen.", Submit After Import,Nach dem Import einreichen, Submitting...,Einreichen ..., -Subscribed Documents,Abonnierte Dokumente, Success! You are good to go 👍,Erfolg! Du bist gut zu gehen 👍, Successful Transactions,Erfolgreiche Transaktionen, Successfully Submitted!,Erfolgreich eingereicht!, @@ -3777,7 +3768,6 @@ Please specify,Bitte angeben, Printing,Druck, Priority,Priorität, Project,Projekt, -Publish,Veröffentlichen, Quarterly,Quartalsweise, Queued,Warteschlange, Quick Entry,Schnelleingabe, @@ -4299,7 +4289,6 @@ Hide Border,Rand ausblenden, Index Web Pages for Search,Index Webseiten für die Suche, Action / Route,Aktion / Route, Document Naming Rule,Dokumentbenennungsregel, -Rules with higher priority will be applied first.,Regeln mit höherer Priorität werden zuerst angewendet., Rule Conditions,Regelbedingungen, Digits,Ziffern, Example: 00001,Beispiel: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Paketveröffentlichungstool, Click on the row for accessing filters.,"Klicken Sie auf die Zeile, um auf Filter zuzugreifen.", Sites,Websites, Last Deployed On,Zuletzt bereitgestellt am, -Last published {0},Zuletzt veröffentlicht {0}, -Publishing documents...,Dokumente veröffentlichen ..., -Documents have been published.,Dokumente wurden veröffentlicht., -Select Document Type.,Wählen Sie Dokumenttyp., Console Log,Konsolenprotokoll, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Legen Sie die Standardoptionen für alle Diagramme in diesem Dashboard fest (z.B.: ""colors"": [""#d1d8dd"", ""#ff5858""])", Use Report Chart,Berichtsdiagramm verwenden, @@ -4566,10 +4551,6 @@ Incorrect URL,Falsche URL, Duplicate Name,Doppelter Name, "Please check the value of ""Fetch From"" set for field {0}",Bitte überprüfen Sie den Wert von "Abrufen von" für Feld {0}, Wrong Fetch From value,Falscher Abruf vom Wert, -Deploying,Bereitstellen, -Couldn't connect to site {0}. Please check Error Logs.,Es konnte keine Verbindung zur Site {0} hergestellt werden. Bitte überprüfen Sie die Fehlerprotokolle., -Error while installing package to site {0}. Please check Error Logs.,Fehler beim Installieren des Pakets auf Site {0}. Bitte überprüfen Sie die Fehlerprotokolle., -Exporting,Exportieren, A field with the name '{}' already exists in doctype {}.,In doctype {} ist bereits ein Feld mit dem Namen '{}' vorhanden., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Das benutzerdefinierte Feld {0} wird vom Administrator erstellt und kann nur über das Administratorkonto gelöscht werden., Failed to send {0} Auto Email Report,{0} Auto-E-Mail-Bericht konnte nicht gesendet werden, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,"Zeile # {0}: Bitte legen Sie Remote-Wertefilter für das Feld {1} fest, um das eindeutige Remote-Abhängigkeitsdokument abzurufen", Paytm payment gateway settings,Paytm Zahlungsgateway-Einstellungen, "Company, Fiscal Year and Currency defaults","Standardeinstellungen für Unternehmen, Geschäftsjahr und Währung", -Package,Paket, -Import and Export Packages.,Pakete importieren und exportieren., Razorpay Signature Verification Failed,Überprüfung der Razorpay-Signatur fehlgeschlagen, Google Drive - Could not locate - {0},Google Drive - Konnte nicht finden - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Das Synchronisierungstoken war ungültig und wurde zurückgesetzt. Wiederholen Sie die Synchronisierung., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Für DocType Link / DocType-Aktion, Cannot edit filters for standard charts,Filter für Standarddiagramme können nicht bearbeitet werden, Event Producer Last Update,Event Producer Letztes Update, Default for 'Check' type of field {0} must be either '0' or '1',Die Standardeinstellung für den Feldtyp 'Check' {0} muss entweder '0' oder '1' sein., +Non Negative,Nicht negativ, +Rules with higher priority number will be applied first.,Regeln mit höherer Prioritätsnummer werden zuerst angewendet., +Open URL in a New Tab,Öffnen Sie die URL in einem neuen Tab, +Align Right,Rechts ausrichten, +Loading Filters...,Laden von Filtern ..., +Count Customizations,Anpassungen zählen, +For Example: {} Open,Zum Beispiel: {} Öffnen, +Choose Existing Card or create New Card,Wählen Sie Vorhandene Karte oder erstellen Sie eine neue Karte, +Number Cards,Zahlenkarten, +Function Based On,Funktion basiert auf, +Add Filters,Filter hinzufügen, +Skip,Überspringen, +Dismiss,Entlassen, +Value cannot be negative for,Wert kann nicht negativ sein für, +Value cannot be negative for {0}: {1},Der Wert kann für {0} nicht negativ sein: {1}, +Negative Value,Negativer Wert, +Authentication failed while receiving emails from Email Account: {0}.,Die Authentifizierung ist beim Empfang von E-Mails vom E-Mail-Konto fehlgeschlagen: {0}., +Message from server: {0},Nachricht vom Server: {0}, diff --git a/frappe/translations/el.csv b/frappe/translations/el.csv index ca01e898a6..eb1eaae05f 100644 --- a/frappe/translations/el.csv +++ b/frappe/translations/el.csv @@ -499,7 +499,6 @@ Authenticating...,Επαλήθευση ταυτότητας ..., Authentication,Αυθεντικοποίηση, Authentication Apps you can use are: ,Οι εφαρμογές ελέγχου ταυτότητας που μπορείτε να χρησιμοποιήσετε είναι:, Authentication Credentials,Πιστοποιητικά ελέγχου ταυτότητας, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},"Απέτυχε ο έλεγχος ταυτότητας, ενώ λαμβάνετε μηνύματα ηλεκτρονικού ταχυδρομείου από το λογαριασμό email {0}. Μήνυμα από το διακομιστή: {1}", Authorization Code,Κωδικός Εξουσιοδότησης, Authorize URL,Εξουσιοδότηση διεύθυνσης URL, Authorized,εξουσιοδοτημένος, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Δεν είναι δυνατή η αλλαγ Cannot change header content,Δεν είναι δυνατή η αλλαγή του περιεχομένου της κεφαλίδας, Cannot change state of Cancelled Document. Transition row {0},Δεν μπορεί να αλλάξει η κατάσταση ενός ακυρωμένου εγγράφου. Γραμμή μετάβασης {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Δεν είναι δυνατή η αλλαγή των λεπτομερειών του χρήστη στη δοκιμαστική έκδοση. Εγγραφείτε για έναν νέο λογαριασμό στη διεύθυνση https://erpnext.com, -Cannot connect: {0},Δεν είναι δυνατή η σύνδεση: {0}, Cannot create a {0} against a child document: {1},Δεν μπορείτε να δημιουργήσετε ένα {0} κατά ένα έγγραφο παιδί: {1}, Cannot delete Home and Attachments folders,Δεν μπορείτε να διαγράψετε Σπίτι και Συνημμένα φακέλους, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Δεν είναι δυνατή η διαγραφή του αρχείου καθώς ανήκει στην {0} {1} για την οποία δεν έχετε δικαιώματα, @@ -1139,7 +1137,6 @@ Font Size,Μέγεθος γραμματοσειράς, Fonts,Γραμματοσειρές, Footer,Υποσέλιδο, Footer HTML,Υποσέλιδο HTML, -Footer Item,υποσέλιδο Στοιχείο, Footer Items,Αντικείμενα υποσέλιδου, Footer will display correctly only in PDF,Το υποσέλιδο θα εμφανίζεται σωστά μόνο σε PDF, For Document Type,Για τύπο εγγράφου, @@ -1149,7 +1146,6 @@ For Value,Για την τιμή, "For currency {0}, the minimum transaction amount should be {1}","Για το νόμισμα {0}, το ελάχιστο ποσό συναλλαγής πρέπει να είναι {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Για παράδειγμα, αν έχετε ακυρώσει και τροποποιήσει το «inv004» θα γίνει ένα νέο έγγραφο «inv004-1». Αυτό σας βοηθά να παρακολουθείτε κάθε τροπολογία.", "For example: If you want to include the document ID, use {0}","Για παράδειγμα: Αν θέλετε να συμπεριλάβετε το αναγνωριστικό έγγραφο, χρησιμοποιήστε {0}", -For top bar,Για την μπάρα κορυφής, "For updating, you can update only selective columns.","Για ενημέρωση, μπορείτε να ενημερώσετε επιλεκτικές μόνο στήλες.", For {0} at level {1} in {2} in row {3},Για {0} σε επίπεδο {1} στο {2} στη γραμμή {3}, Force,Δύναμη, @@ -1201,7 +1197,6 @@ Google Calendar ID,Αναγνωριστικό Ημερολογίου Google, Google Font,Γραμματοσειρά Google, Google Services,Υπηρεσίες Google, Grant Type,Είδος επιδότησης, -Group Label,ομάδα Label, Group Name,Ονομα ομάδας, Group name cannot be empty.,Το όνομα ομάδας δεν μπορεί να είναι κενό., Groups of DocTypes,Ομάδες doctypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Παρακαλούμε επιβεβαιώστε Point Allocation Periodicity,Περιοδικότητα Κατανομής Σημείων, Points,Σημεία, Points Given,Σημεία που δόθηκαν, -Policy,Πολιτική, Port,Θύρα, Portal Menu,Μενού portal, Portal Menu Item,Portal Στοιχείο Μενού, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Επιλέξτε atleast 1 εγγραφή για εκτύπωση, Select or drag across time slots to create a new event.,Επιλέξτε ή σύρετε χρονοθυρίδες για να δημιουργήσετε ένα νέο συμβάν., Select records for assignment,Επιλέξτε αρχεία για την εκχώρηση, -"Select target = ""_blank"" to open in a new page.","Επιλέξτε target = "" _blank "" για να ανοίξει σε μια νέα σελίδα .", Select the label after which you want to insert new field.,Επιλέξτε την ετικέτα μετά την οποία θέλετε να εισαγάγετε νέο πεδίο., "Select your Country, Time Zone and Currency",Επιλέξτε τη χώρα σας και ελέγξτε την ζώνη ώρας και το νόμισμα., Select {0},Επιλέξτε {0}, @@ -2989,7 +2982,6 @@ star-empty,Star-empty, step-backward,Βήμα προς τα πίσω, step-forward,Βήμα προς τα εμπρός, submitted this document,υπέβαλε αυτό το έγγραφο, -"target = ""_blank""","Target = ""_blank""", text in document type,κείμενο σε είδος εγγράφου, text-height,Text-height, text-width,Text-width, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Κάτι πήγε στραβά κατά τη διάρκεια της γενιάς των συμβόλων. Κάντε κλικ στο {0} για να δημιουργήσετε ένα νέο., Submit After Import,Υποβολή μετά την εισαγωγή, Submitting...,Υποβολή ..., -Subscribed Documents,Εγγεγραμμένα Έγγραφα, Success! You are good to go 👍,Επιτυχία! Είστε καλά να πάτε 👍, Successful Transactions,Επιτυχημένες συναλλαγές, Successfully Submitted!,Καταχωρήθηκε με επιτυχία!, @@ -3777,7 +3768,6 @@ Please specify,Παρακαλώ ορίστε, Printing,Εκτύπωση, Priority,Προτεραιότητα, Project,Έργο, -Publish,Δημοσιεύω, Quarterly,Τριμηνιαίος, Queued,Στην ουρά, Quick Entry,Γρήγορη Έναρξη, @@ -4299,7 +4289,6 @@ Hide Border,Απόκρυψη περιγράμματος, Index Web Pages for Search,Ευρετήριο ιστοσελίδων για αναζήτηση, Action / Route,Δράση / Διαδρομή, Document Naming Rule,Κανόνας ονομασίας εγγράφου, -Rules with higher priority will be applied first.,Οι κανόνες με υψηλότερη προτεραιότητα θα εφαρμοστούν πρώτα., Rule Conditions,Όροι κανόνα, Digits,Ψηφία, Example: 00001,Παράδειγμα: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Εργαλείο δημοσίευσης πακέτων, Click on the row for accessing filters.,Κάντε κλικ στη σειρά για πρόσβαση στα φίλτρα., Sites,Ιστότοποι, Last Deployed On,Τελευταία ανάπτυξη στις, -Last published {0},Τελευταία δημοσίευση {0}, -Publishing documents...,Δημοσίευση εγγράφων ..., -Documents have been published.,Έγγραφα έχουν δημοσιευτεί., -Select Document Type.,Επιλέξτε Τύπος εγγράφου., Console Log,Αρχείο καταγραφής κονσόλας, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Ορισμός προεπιλεγμένων επιλογών για όλα τα γραφήματα σε αυτόν τον πίνακα ελέγχου (π.χ. "χρώματα": ["# d1d8dd", "# ff5858"]", Use Report Chart,Χρήση γραφήματος αναφοράς, @@ -4566,10 +4551,6 @@ Incorrect URL,Λανθασμένη διεύθυνση URL, Duplicate Name,Διπλότυπο όνομα, "Please check the value of ""Fetch From"" set for field {0}",Ελέγξτε την τιμή της ρύθμισης "Ανάκτηση από" για το πεδίο {0}, Wrong Fetch From value,Λάθος λήψη από την τιμή, -Deploying,Ανάπτυξη, -Couldn't connect to site {0}. Please check Error Logs.,Δεν ήταν δυνατή η σύνδεση στον ιστότοπο {0}. Ελέγξτε τα αρχεία καταγραφής σφαλμάτων., -Error while installing package to site {0}. Please check Error Logs.,Σφάλμα κατά την εγκατάσταση του πακέτου στον ιστότοπο {0}. Ελέγξτε τα αρχεία καταγραφής σφαλμάτων., -Exporting,Εξαγωγή, A field with the name '{}' already exists in doctype {}.,Ένα πεδίο με το όνομα "{}" υπάρχει ήδη στο doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Το προσαρμοσμένο πεδίο {0} δημιουργείται από το διαχειριστή και μπορεί να διαγραφεί μόνο μέσω του λογαριασμού διαχειριστή., Failed to send {0} Auto Email Report,Αποτυχία αποστολής {0} Αυτόματης αναφοράς ηλεκτρονικού ταχυδρομείου, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Σειρά # {0}: Ορίστε απομακρυσμένα φίλτρα τιμών για το πεδίο {1} για τη λήψη του μοναδικού εγγράφου εξάρτησης από απόσταση, Paytm payment gateway settings,Ρυθμίσεις πύλης πληρωμής Paytm, "Company, Fiscal Year and Currency defaults","Προεπιλογές εταιρείας, οικονομικού έτους και νομίσματος", -Package,Πακέτο, -Import and Export Packages.,Εισαγωγή και εξαγωγή πακέτων., Razorpay Signature Verification Failed,Η επαλήθευση υπογραφής Razorpay απέτυχε, Google Drive - Could not locate - {0},Google Drive - Δεν ήταν δυνατή η εύρεση - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Το διακριτικό συγχρονισμού δεν ήταν έγκυρο και έχει γίνει επαναφορά, Δοκιμάστε ξανά το συγχρονισμό.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Για ενέργεια DocType Link / DocType Cannot edit filters for standard charts,Δεν είναι δυνατή η επεξεργασία φίλτρων για τυπικά γραφήματα, Event Producer Last Update,Τελευταία ενημέρωση του παραγωγού συμβάντων, Default for 'Check' type of field {0} must be either '0' or '1',Η προεπιλογή για τον τύπο πεδίου "Έλεγχος" {0} πρέπει να είναι είτε "0" είτε "1", +Non Negative,Μη αρνητικό, +Rules with higher priority number will be applied first.,Οι κανόνες με υψηλότερο αριθμό προτεραιότητας θα εφαρμοστούν πρώτα., +Open URL in a New Tab,Άνοιγμα διεύθυνσης URL σε νέα καρτέλα, +Align Right,Ευθυγράμμιση δεξιά, +Loading Filters...,Φόρτωση φίλτρων ..., +Count Customizations,Καταμέτρηση προσαρμογών, +For Example: {} Open,Για παράδειγμα: {} Άνοιγμα, +Choose Existing Card or create New Card,Επιλέξτε την υπάρχουσα κάρτα ή δημιουργήστε νέα κάρτα, +Number Cards,Αριθμός καρτών, +Function Based On,Με βάση τη λειτουργία, +Add Filters,Προσθήκη φίλτρων, +Skip,Παραλείπω, +Dismiss,Απολύω, +Value cannot be negative for,Η τιμή δεν μπορεί να είναι αρνητική για, +Value cannot be negative for {0}: {1},Η τιμή δεν μπορεί να είναι αρνητική για {0}: {1}, +Negative Value,Αρνητική τιμή, +Authentication failed while receiving emails from Email Account: {0}.,Ο έλεγχος ταυτότητας απέτυχε κατά τη λήψη μηνυμάτων ηλεκτρονικού ταχυδρομείου από λογαριασμό ηλεκτρονικού ταχυδρομείου: {0}., +Message from server: {0},Μήνυμα από διακομιστή: {0}, diff --git a/frappe/translations/es.csv b/frappe/translations/es.csv index b547c5bb7f..4ccd85704e 100644 --- a/frappe/translations/es.csv +++ b/frappe/translations/es.csv @@ -54,11 +54,11 @@ Create,Crear, Created By,Creado por, Current,Corriente, Custom HTML,HTML Personalizado, -Custom?,Personalizado?, +Custom?,¿Personalizado?, Date Format,Formato de Fecha, Datetime,Fecha y Hora, Day,Día, -Default Letter Head,Encabezado predeterminado, +Default Letter Head,Encabezado Predeterminado, Defaults,Predeterminados, Delivery Status,Estado del envío, Department,Departamento, @@ -355,7 +355,7 @@ Add custom javascript to forms.,Añadir javascript personalizado a los formulari Add fields to forms.,Agregar campos a los formularios., Add meta tags to your web pages,Agregue metaetiquetas a sus páginas web, Add script for Child Table,Agregar script para tabla secundaria, -Add to table,Agregar a la Mesa, +Add to table,Agregar a la tabla, Add your own translations,Añada sus propias traducciones, "Added HTML in the <head> section of the web page, primarily used for website verification and SEO","HTML añadido en la sección <head> de la página web, utiliza sobre todo para la verificación de la web y SEO", Added {0},Añadido {0}, @@ -499,7 +499,6 @@ Authenticating...,Autenticando ..., Authentication,Autenticación, Authentication Apps you can use are: ,Las aplicaciones de autenticación que puede utilizar son:, Authentication Credentials,Credenciales de Autenticación, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Error de autenticación al recibir correos electrónicos de cuenta de correo electrónico {0}. Mensaje del servidor: {1}, Authorization Code,Código de Autorización, Authorize URL,Autorizar URL, Authorized,Autorizado, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,No se puede cambiar docstatus de 1 a 0, Cannot change header content,No se puede cambiar el contenido del encabezado, Cannot change state of Cancelled Document. Transition row {0},"No se puede cambiar el estado de un documento cancelado, Transition row {0}", Cannot change user details in demo. Please signup for a new account at https://erpnext.com,No puede cambiar los detalles del usuario en el demo. Por favor cree una nueva cuenta en https://erpnext.com, -Cannot connect: {0},No se puede conectar: {0}, Cannot create a {0} against a child document: {1},No se puede crear un {0} en contra de un documento secundario: {1}, Cannot delete Home and Attachments folders,No se puede eliminar la carpeta principal y sus carpetas adjuntas, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,No se puede eliminar el archivo ya que pertenece a {0} {1} para el que no tienes permisos, @@ -653,7 +651,7 @@ Chat Room User,Usuario de Sala de Chat, Chat Token,Token de Chat, Chat Type,Tipo de Chat, Chat messages and other notifications.,Mensajes de chat y otras notificaciones., -Check,Comprobar, +Check,Marcar, Check Request URL,Verificar URL de Solicitud, "Check columns to select, drag to set order.","Marque las columnas para seleccionarlas, puede arrastrar para establecer el orden.", Check this if you are testing your payment using the Sandbox API,Comprobar esto si está probando su pago mediante la API de Sandbox, @@ -937,7 +935,7 @@ Dropbox Access Secret,Acceso Secreto a Dropbox, Dropbox Access Token,Dropbox Access Token, Dropbox Settings,Ajustes de Dropbox, Dropbox Setup,Configuración de Dropbox, -Dropbox access is approved!,Acceso Dropbox está aprobado!, +Dropbox access is approved!,¡El acceso Dropbox está aprobado!, Dropbox backup settings,Configuración de copia de seguridad de Dropbox, Duplicate Filter Name,Nombre de Fltro Duplicado, Dynamic Link,Enlace dinámico, @@ -960,7 +958,7 @@ Email Account Name,Cuenta de correo electrónico, Email Account added multiple times,Cuenta de correo electrónico añadida varias veces, Email Addresses,Correos electrónicos, Email Domain,Dominio de Correo Electrónico, -"Email Domain not configured for this account, Create one?","Dominio de correo electrónico no está configurado para esta cuenta, crear uno?", +"Email Domain not configured for this account, Create one?","Dominio de correo electrónico no está configurado para esta cuenta, ¿Crear uno?", Email Flag Queue,Señal de la bandera del correo electrónico, Email Footer Address,Adjuntar dirección en pie de pagina., Email Group,Grupo de Correo Electrónico, @@ -1042,7 +1040,7 @@ Everyone,Todos, Example,Ejemplo, Example Email Address,Dirección de correo electrónico de ejemplo, Example: {{ subject }},Ejemplo: {{subject}}, -Excel,Sobresalir, +Excel,Excel, Exception,Excepción, Exception Type,Tipo de excepción, Execution Time: {0} sec,Tiempo de ejecución: {0} segundos, @@ -1139,7 +1137,6 @@ Font Size,Tamaño de la fuente, Fonts,Fuentes, Footer,Pie de página, Footer HTML,HTML de pie de página, -Footer Item,Ítem de Pie de Página, Footer Items,Elementos de pie de página, Footer will display correctly only in PDF,El pie de página se mostrará correctamente solo en PDF, For Document Type,Por tipo de documento, @@ -1149,7 +1146,6 @@ For Value,Por valor, "For currency {0}, the minimum transaction amount should be {1}","Para la moneda {0}, el monto mínimo de la transacción debe ser {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,Por ejemplo si se cancela y corrige INV004 se convertirá en un nuevo documento INV004-1. Esto le ayuda a mantener un registro de cada modificación., "For example: If you want to include the document ID, use {0}","Por ejemplo: Si desea incluir el ID de documento, utilice {0}", -For top bar,Por la barra superior, "For updating, you can update only selective columns.","Para actualizar datos, puedes editar sólo las columnas que necesites", For {0} at level {1} in {2} in row {3},Para {0} en el nivel {1} en {2} de la línea {3}, Force,Fuerza, @@ -1201,7 +1197,6 @@ Google Calendar ID,ID de Google Calendar, Google Font,Fuente de Google, Google Services,Servicios de Google, Grant Type,Tipo de Subvención, -Group Label,Etiqueta de Grupo, Group Name,Nombre del Grupo, Group name cannot be empty.,El nombre del Grupo no puede estar vacío., Groups of DocTypes,"Grupos de ""DocTypes""", @@ -1393,7 +1388,7 @@ Is Primary Contact,Es el contacto principal, Is Private,Es privado, Is Published Field,Es campo publicable, Is Published Field must be a valid fieldname,Es Campo Publicable debe ser un nombre de campo válido, -Is Single,Es único, +Is Single,Es individual, Is Spam,es spam, Is Standard,Es estándar, Is Submittable,Se puede validar, @@ -1462,7 +1457,7 @@ Let's prepare the system for first use.,Se esta preparando el sistema para el pr Letter,Carta, Letter Head Based On,Cabecera de carta basada en, Letter Head Image,Imagen de encabezado de carta, -Letter Head Name,Nombre de membrete, +Letter Head Name,Nombre del Encabezado, Letter Head in HTML,Membrete en HTML, Level Name,Nombre de nivel, Liked,Gustó, @@ -1562,7 +1557,7 @@ Message to be displayed on successful completion (only for Guest users),Mensaje Message-id,Mensaje-id, Meta Tags,Metaetiquetas, Migration ID Field,Campo de ID de Migración, -Milestone,Hito, +Milestone,Evento importante, Milestone Tracker,Rastreador de Hitos, Minimum Password Score,Puntuación mínima de contraseña, Miss,Señorita, @@ -1832,7 +1827,7 @@ Percent,Por ciento, Percent Complete,Porcentaje Completo, Perm Level,Nivel permitido, Permanent,Permanente, -Permanently Cancel {0}?,Cancelar permanentemente {0}?, +Permanently Cancel {0}?,¿Cancelar permanentemente {0}?, Permanently Submit {0}?,¿Validar permanentemente {0}?, Permanently delete {0}?,"¿Eliminar permanentemente ""{0}""?", Permission Error,Error de Permiso, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Por favor verifica tu dirección de correo, Point Allocation Periodicity,Periodicidad de asignación de puntos, Points,Puntos, Points Given,Puntos dados, -Policy,Política, Port,Puerto, Portal Menu,Menú del Portal, Portal Menu Item,Elemento del Menú del Portal, @@ -1944,7 +1938,7 @@ Print Format Type,Tipo de formato de impresión, Print Format {0} is disabled,El formato de impresión {0} está deshabilitado, Print Hide,Ocultar en impresión, Print Hide If No Value,Impresión Oculta si no hay Valor, -Print Sent to the printer!,Imprimir enviado a la impresora!, +Print Sent to the printer!,¡La impresión ha sido enviada a la impresora!, Print Server,Servidor de Impresión, Print Style,Estilo de Impresión, Print Style Name,Nombre del Estilo de Impresión, @@ -2024,7 +2018,7 @@ Reference DocName,DocName de referencia, Reference DocType and Reference Name are required,'DocType' de referencia y nombre referencia son requeridos, Reference Report,Informe de referencia, Reference: {0} {1},Referencia: {0} {1}, -Refreshing...,Refrescante..., +Refreshing...,Refrescando..., Register OAuth Client App,Register OAuth cliente de aplicación, Registered but disabled,Registrado pero discapacitados, Relapsed,Reincidido, @@ -2044,7 +2038,7 @@ Remove Field,Quitar Campo, Remove Filter,Eliminar filtro, Remove Section,Remover la sección, Remove Tag,Remover Etiqueta, -Remove all customizations?,Remover todas las personalizaciones?, +Remove all customizations?,¿Remover todas las personalizaciones?, Removed {0},Eliminado {0}, Rename many items by uploading a .csv file.,"Renombrar elementos del sistema, importando un archivo CVS", Rename {0},Cambiar el nombre {0}, @@ -2079,7 +2073,7 @@ Res: {0},Res: {0}, Reset OTP Secret,Restablecer OTP Secret, Reset Password,Restablecer contraseña, Reset Password Key,Restablecer contraseña/clave, -Reset Permissions for {0}?,Restablecer los permisos para {0}?, +Reset Permissions for {0}?,¿Restablecer los permisos para {0}?, Reset to defaults,Restablecer predeterminados, Reset your password,Restablecer su Contraseña, Response Type,Tipo de respuesta, @@ -2088,7 +2082,7 @@ Restore Original Permissions,Restaurar permisos originales, Restore or permanently delete a document.,Restaurar o eliminar permanentemente un documento., Restore to default settings?,Restaurar a la configuración predeterminada?, Restored,Restaurado, -Restrict IP,Restringir la propiedad intelectual, +Restrict IP,Restringir IP, Restrict To Domain,Restringir al dominio, Restrict user for specific document,Restringir usuario para un documento específico, Restrict user from this IP address only. Multiple IP addresses can be added by separating with commas. Also accepts partial IP addresses like (111.111.111),"Restringir el usuario a esta dirección IP. Todas las direcciones IP se pueden agregar separadas con comas, también se aceptan direcciones IP parciales como ( 111.111.111 )", @@ -2106,7 +2100,7 @@ Review Points,Puntos de revisión, Reviews,Comentarios, Revoke,Revocar, Revoked,Revocado, -Rich Text,Texto enriquecido, +Rich Text,Texto Enriquecido, Robots.txt,Robots.txt, Role Name,Nombre del rol, Role Permission for Page and Report,Permiso para la función Página e Informe, @@ -2181,8 +2175,8 @@ Security Settings,Configuración de seguridad, See all past reports.,Ver todos los reportes pasados., See on Website,Ver en el sitio web, See the document at {0},Ver el documento en {0}, -Seems API Key or API Secret is wrong !!!,Parece que la clave de API o clave secreta de API secreto está mal !!!, -Seems Publishable Key or Secret Key is wrong !!!,Parece que la clave publica o clave secreta es incorrecta!, +Seems API Key or API Secret is wrong !!!,¡¡¡ Parece que la clave de API o clave secreta de API secreto está mal !!!, +Seems Publishable Key or Secret Key is wrong !!!,¡Parece que la clave publica o clave secreta es incorrecta!, "Seems issue with server's razorpay config. Don't worry, in case of failure amount will get refunded to your account.","Parece ser un problema con la configuración del servidor de razorpay. No se preocupe, en caso de fallo el importe será reembolsado a su cuenta.", Seems token you are using is invalid!,¡Parece que el token que estás usando no es válido!, Seen,Visto, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Seleccionar al menos 1 registro para la impresión, Select or drag across time slots to create a new event.,Seleccione o arrastre a través de los intervalos de tiempo para crear un nuevo evento., Select records for assignment,Seleccione los registros para la asignación, -"Select target = ""_blank"" to open in a new page.","Seleccione el objetivo = ""_blank"" para abrir en una nueva página.", Select the label after which you want to insert new field.,Seleccione la etiqueta con la cual desea insertar el nuevo campo., "Select your Country, Time Zone and Currency","Seleccione su país, zona horaria y moneda", Select {0},Seleccionar {0}, @@ -2432,10 +2425,10 @@ System Page,Página del Sistema, System Settings,Configuración del Sistema, System User,Usuario del sistema, System and Website Users,Usuarios del sistema y del sitio web, -Table,Mesa, +Table,Tabla, Table Field,Campo de Tabla, Table HTML,Tabla HTML, -Table MultiSelect,Tabla MultiSelect, +Table MultiSelect,Tabla Multi-selección, Table updated,Tabla actualiza, Table {0} cannot be empty,La tabla {0} no puede estar vacía, Take Backup Now,Tome copia de seguridad ahora, @@ -2603,7 +2596,7 @@ URLs,URLs, Unable to find attachment {0},No es posible encontrar adjunto {0}, Unable to load camera.,No se puede cargar la cámara., Unable to load: {0},No se puede cargar: {0}, -Unable to open attached file. Did you export it as CSV?,No se puede abrir el archivo adjunto. Ha exportado como CSV?, +Unable to open attached file. Did you export it as CSV?,No se puede abrir el archivo adjunto. ¿Lo ha exportado como CSV?, Unable to read file format for {0},Incapaz de leer el formato de archivo para {0}, Unable to send emails at this time,No se pueden enviar mensajes de correo electrónico en este momento, Unable to update event,No se puede actualizar evento, @@ -2989,7 +2982,6 @@ star-empty,star-empty, step-backward,retroceder, step-forward,adelantar, submitted this document,presentado este documento, -"target = ""_blank""","target = ""_blank""", text in document type,texto en el tipo de documento, text-height,text-height, text-width,text-width, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Algo salió mal durante la generación de tokens. Haga clic en {0} para generar uno nuevo., Submit After Import,Enviar después de la importación, Submitting...,Sumisión..., -Subscribed Documents,Documentos suscritos, Success! You are good to go 👍,¡Éxito! Eres bueno para ir 👍, Successful Transactions,Transacciones exitosas, Successfully Submitted!,Enviado con éxito!, @@ -3693,7 +3684,7 @@ via Data Import,a través de la importación de datos, ← Back to upload files,← Volver a subir archivos, Activity,Actividad, Add / Manage Email Accounts.,Añadir / Administrar cuentas de correo electrónico., -Add Child,Agregar niño, +Add Child,Agregar hijo, Add Multiple,Añadir Multiple, Add Participants,Agregar Participantes, Added {0} ({1}),Añadido: {0} ({1}), @@ -3722,7 +3713,7 @@ Default,Predeterminado, Delete,Eliminar, Description,Descripción, Designation,Puesto, -Disabled,Discapacitado, +Disabled,Deshabilitado, Doctype,Doctype, Download Template,Descargar plantilla, Dr,Dr., @@ -3777,7 +3768,6 @@ Please specify,"Por favor, especifique", Printing,Impresión, Priority,Prioridad, Project,Proyecto, -Publish,Publicar, Quarterly,Trimestral, Queued,En cola, Quick Entry,Entrada Rápida, @@ -3831,7 +3821,7 @@ Bold,Negrita, CANCELLED,CANCELADO, Calendar,Calendario, Center,Centro, -Clear,Claro, +Clear,Quitar, Comment,Comentario, Comments,Comentarios, DRAFT,BORRADOR, @@ -3927,7 +3917,7 @@ book,libro, calendar,calendario, certificate,certificado, check,Marcar, -clear,Limpiar, +clear,quitar, comment,comentario, comments,comentarios, created,creado, @@ -3979,7 +3969,7 @@ trash,basura, upload,subir, user,usuario, value,valor, -web link,Enlace, +web link,enlace web, yellow,amarillo, Not permitted,No permitido, Add Chart to Dashboard,Agregar gráfico al tablero, @@ -4060,7 +4050,7 @@ Failed Transactions,Transacciones fallidas, Value for field {0} is too long in {1}. Length should be lesser than {2} characters,El valor del campo {0} es demasiado largo en {1}. La longitud debe ser inferior a {2} caracteres., Data Too Long,Datos demasiado largos, via Notification,vía notificación, -Log in to access this page.,Inicie sesión para acceder a esta página., +Log in to access this page.,Inicia sesión para acceder a esta página., Report Document Error,Informar error de documento, {0} is an invalid Data field.,{0} es un campo de datos no válido., Only Options allowed for Data field are:,Solo las opciones permitidas para el campo de datos son:, @@ -4068,14 +4058,14 @@ Select a valid Subject field for creating documents from Email,Seleccione un cam "Subject Field type should be Data, Text, Long Text, Small Text, Text Editor","El tipo de campo de asunto debe ser Datos, Texto, Texto largo, Texto pequeño, Editor de texto", Select a valid Sender Field for creating documents from Email,Seleccione un campo de remitente válido para crear documentos desde el correo electrónico, Sender Field should have Email in options,El campo del remitente debe tener opciones de correo electrónico, -Password changed successfully.,Contraseña cambiada con éxito., +Password changed successfully.,Contraseña cambiada satisfactoriamente., Failed to change password.,No se pudo cambiar la contraseña., No Entry for the User {0} found within LDAP!,¡No se encontró ninguna entrada para el usuario {0} en LDAP!, No LDAP User found for email: {0},No se encontró ningún usuario LDAP para el correo electrónico: {0}, Prepared Report User,Usuario de informe preparado, Scheduler Event,Evento del programador, -Select Event Type,Seleccionar tipo de evento, -Schedule Script,Programación de secuencia de comandos, +Select Event Type,Seleccionar Tipo de Evento, +Schedule Script,Programación de Script, Duration,Duración, Donut,Dona, Custom Options,Opciones personalizadas, @@ -4095,14 +4085,14 @@ Header and Breadcrumbs,Encabezado y migas de pan, Add Custom Tags,Agregar etiquetas personalizadas, Web Page Block,Bloque de página web, Web Template,Plantilla Web, -Edit Values,Editar valores, +Edit Values,Editar Valores, Web Template Values,Valores de plantilla web, -Add Container,Agregar contenedor, +Add Container,Agregar Contenedor, Web Page View,Vista de página web, Path,Camino, Referrer,Referente, Browser,Navegador, -Browser Version,Versión del navegador, +Browser Version,Versión del Navegador, Web Template Field,Campo de plantilla web, Section,Sección, Hide,Esconder, @@ -4299,7 +4289,6 @@ Hide Border,Ocultar borde, Index Web Pages for Search,Índice de páginas web para búsqueda, Action / Route,Acción / Ruta, Document Naming Rule,Regla de denominación de documentos, -Rules with higher priority will be applied first.,Las reglas con mayor prioridad se aplicarán primero., Rule Conditions,Condiciones de la regla, Digits,Dígitos, Example: 00001,Ejemplo: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Herramienta de publicación de paquetes, Click on the row for accessing filters.,Haga clic en la fila para acceder a los filtros., Sites,Sitios, Last Deployed On,Implementado por última vez el, -Last published {0},Última publicación {0}, -Publishing documents...,Publicando documentos ..., -Documents have been published.,Se han publicado documentos., -Select Document Type.,Seleccione Tipo de documento., Console Log,Registro de la consola, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Establecer opciones predeterminadas para todos los gráficos en este panel (por ejemplo: "colores": ["# d1d8dd", "# ff5858"])", Use Report Chart,Usar gráfico de informe, @@ -4566,10 +4551,6 @@ Incorrect URL,URL incorrecta, Duplicate Name,Nombre duplicado, "Please check the value of ""Fetch From"" set for field {0}",Compruebe el valor de "Obtener de" establecido para el campo {0}, Wrong Fetch From value,Valor incorrecto de recuperación, -Deploying,Implementando, -Couldn't connect to site {0}. Please check Error Logs.,No se pudo conectar al sitio {0}. Compruebe los registros de errores., -Error while installing package to site {0}. Please check Error Logs.,Error al instalar el paquete en el sitio {0}. Compruebe los registros de errores., -Exporting,Exportador, A field with the name '{}' already exists in doctype {}.,Ya existe un campo con el nombre '{}' en doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,El campo personalizado {0} lo crea el administrador y solo se puede eliminar a través de la cuenta de administrador., Failed to send {0} Auto Email Report,No se pudo enviar el {0} informe automático por correo electrónico, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Fila n. ° {0}: establezca filtros de valor remoto para el campo {1} para obtener el documento de dependencia remota único, Paytm payment gateway settings,Configuración de la pasarela de pago Paytm, "Company, Fiscal Year and Currency defaults","Valores predeterminados de empresa, año fiscal y moneda", -Package,Paquete, -Import and Export Packages.,Paquetes de Importación y Exportación., Razorpay Signature Verification Failed,Error en la verificación de la firma de Razorpay, Google Drive - Could not locate - {0},Google Drive: no se pudo localizar: {0}, "Sync token was invalid and has been resetted, Retry syncing.",El token de sincronización no es válido y se ha restablecido. Vuelva a intentar la sincronización., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Para DocType Link / DocType Action, Cannot edit filters for standard charts,No se pueden editar filtros para gráficos estándar, Event Producer Last Update,Última actualización de Event Producer, Default for 'Check' type of field {0} must be either '0' or '1',El valor predeterminado para el tipo de campo "Verificar" {0} debe ser "0" o "1", +Non Negative,No negativo, +Rules with higher priority number will be applied first.,Las reglas con un número de prioridad más alto se aplicarán primero., +Open URL in a New Tab,Abrir URL en una pestaña nueva, +Align Right,Alinear a la derecha, +Loading Filters...,Cargando filtros ..., +Count Customizations,Contar personalizaciones, +For Example: {} Open,Por ejemplo: {} Abrir, +Choose Existing Card or create New Card,Elija una tarjeta existente o cree una nueva tarjeta, +Number Cards,Tarjetas de números, +Function Based On,Función basada en, +Add Filters,Agregar filtros, +Skip,Omitir, +Dismiss,Descartar, +Value cannot be negative for,El valor no puede ser negativo para, +Value cannot be negative for {0}: {1},El valor no puede ser negativo para {0}: {1}, +Negative Value,Valor negativo, +Authentication failed while receiving emails from Email Account: {0}.,Error de autenticación al recibir correos electrónicos de la cuenta de correo electrónico: {0}., +Message from server: {0},Mensaje del servidor: {0}, diff --git a/frappe/translations/es_pe.csv b/frappe/translations/es_pe.csv index 77e79c98d5..d528886454 100644 --- a/frappe/translations/es_pe.csv +++ b/frappe/translations/es_pe.csv @@ -57,7 +57,6 @@ Banner Image,Imagen del banner, Banner is above the Top Menu Bar.,El Banner está por sobre la barra de menú superior., Both DocType and Name required,Tanto DocType y Nombre son obligatorios, Both login and password required,Se requiere tanto usuario como contraseña, -Cannot connect: {0},No puede conectarse: {0}, Cannot delete {0} as it has child nodes,"No se puede eliminar {0} , ya que tiene nodos secundarios", Cannot edit cancelled document,No se puede editar un documento anulado, Cannot edit standard fields,No se puede editar campos estándar, @@ -230,7 +229,6 @@ Select Table Columns for {0},Seleccionar columnas de tabla para {0}, Select a DocType to make a new format,Seleccione un tipo de documento para hacer un nuevo formato, Select a group node first.,Seleccione un nodo de grupo primero., Select an image of approx width 150px with a transparent background for best results.,Seleccione una imagen de ancho aprox 150px con fondo transparente para obtener mejores resultados ., -"Select target = ""_blank"" to open in a new page.","Select target = "" _blank"" para abrir en una nueva página.", Select the label after which you want to insert new field.,Seleccione la etiqueta después de la cual desea insertar el nuevo campo ., Select {0},Seleccione {0}, Send Email Print Attachments as PDF (Recommended),Enviar Emails con adjuntos en formato PDF (recomendado), @@ -366,7 +364,6 @@ star,estrella, star-empty,- estrella vacía, step-backward,paso hacia atrás, step-forward,paso hacia adelante, -"target = ""_blank""","target = "" _blank""", text-height,text- altura, text-width,texto de ancho, th,ª, diff --git a/frappe/translations/et.csv b/frappe/translations/et.csv index e359e0de42..899e502d1e 100644 --- a/frappe/translations/et.csv +++ b/frappe/translations/et.csv @@ -499,7 +499,6 @@ Authenticating...,Autentimine ..., Authentication,Autentimine, Authentication Apps you can use are: ,"Autentimise rakendused, mida saate kasutada, on järgmised:", Authentication Credentials,Autentimise volikirjad, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Autentimine nurjus saamise ajal kirju Post konto {0}. Sõnum server: {1}, Authorization Code,autoriseerimise koodi, Authorize URL,URL-i autoriseerimine, Authorized,volitatud, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Ei saa muuta docstatus 1-0, Cannot change header content,Päise sisu ei saa muuta, Cannot change state of Cancelled Document. Transition row {0},Ei saa muuta seisund Tühistatud Dokumendi. Üleminek rida {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Ei saa muuta kasutaja andmeid demo. Palun registreeruda uue konto https://erpnext.com, -Cannot connect: {0},Ei saa ühendust: {0}, Cannot create a {0} against a child document: {1},Ei saa luua {0} lapse vastu dokument: {1}, Cannot delete Home and Attachments folders,Ei saa kustutada Kodu ja failid kaustadesse, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Faili ei saa kustutada, kuna see kuulub {0} {1}, mille jaoks teil pole õigusi", @@ -1139,7 +1137,6 @@ Font Size,Font Size, Fonts,Fondid, Footer,Jalus, Footer HTML,Jaluse HTML, -Footer Item,jalus toode, Footer Items,Footer Esemed, Footer will display correctly only in PDF,Jalus kuvatakse õigesti ainult PDF-is, For Document Type,Dokumendi tüübi jaoks, @@ -1149,7 +1146,6 @@ For Value,Väärtuse jaoks, "For currency {0}, the minimum transaction amount should be {1}",Valuuta {0} puhul peaks tehingu minimaalne väärtus olema {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Näiteks, kui sa soovid ja muuta INV004 muutub see uus dokument INV004-1. See aitab teil jälgida iga muudatus.", "For example: If you want to include the document ID, use {0}","Näiteks: Kui soovite lisada dokumendi ID, kasuta {0}", -For top bar,Top bar, "For updating, you can update only selective columns.","Ajakohastamise, saate uuendada ainult selektiivne sambad.", For {0} at level {1} in {2} in row {3},Sest {0} tasemel {1} on {2} järjest {3}, Force,jõud, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google'i kalendri ID, Google Font,Google'i font, Google Services,Google'i teenused, Grant Type,Grant Type, -Group Label,Märgistus, Group Name,Grupi nimi, Group name cannot be empty.,Grupi nimi ei saa olla tühi., Groups of DocTypes,Grupid doctypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Palun kontrollige oma e-posti aadress, Point Allocation Periodicity,Punktide jaotamise perioodilisus, Points,Punktid, Points Given,Antud punktid, -Policy,poliitika, Port,Port, Portal Menu,portaal Menu, Portal Menu Item,Portaal Menüüvalik, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Valima vähemalt 1 kirje printimiseks, Select or drag across time slots to create a new event.,Vali ja lohista üle ajaühikud luua uus sündmus., Select records for assignment,Vali arvestust arvamist, -"Select target = ""_blank"" to open in a new page.",Vali target = "_blank" avada uue lehekülje., Select the label after which you want to insert new field.,"Valige silt, mille järel soovite lisada uue valdkonna.", "Select your Country, Time Zone and Currency","Vali oma riik, Time Zone ja Valuuta", Select {0},Vali {0}, @@ -2989,7 +2982,6 @@ star-empty,star-tühi, step-backward,samm-tagasi, step-forward,samm edasi, submitted this document,esitatud käesoleva dokumendi, -"target = ""_blank""",target = "_blank", text in document type,teksti dokumendi tüüp, text-height,Teksti-kõrgus, text-width,Teksti laiusega, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Märgi genereerimise ajal läks midagi valesti. Uue loomiseks klõpsake nuppu {0}., Submit After Import,Esita pärast importimist, Submitting...,Esitamine ..., -Subscribed Documents,Tellitud dokumendid, Success! You are good to go 👍,Edu! Sul on hea minna 👍, Successful Transactions,Edukad tehingud, Successfully Submitted!,Edukalt esitatud!, @@ -3777,7 +3768,6 @@ Please specify,Palun täpsusta, Printing,Trükkimine, Priority,Prioriteet, Project,Project, -Publish,Avalda, Quarterly,Kord kvartalis, Queued,Järjekorras, Quick Entry,Kiirsisestamine, @@ -4299,7 +4289,6 @@ Hide Border,Peida piir, Index Web Pages for Search,Indeksige veebilehtede otsingu jaoks, Action / Route,Toiming / marsruut, Document Naming Rule,Dokumendi nimetamise reegel, -Rules with higher priority will be applied first.,Kõigepealt rakendatakse kõrgema prioriteediga reegleid., Rule Conditions,Reegli tingimused, Digits,Numbrid, Example: 00001,Näide: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Pakettide avaldamise tööriist, Click on the row for accessing filters.,Filtrite juurde pääsemiseks klõpsake rida., Sites,Saidid, Last Deployed On,Viimati kasutusele võetud, -Last published {0},Viimati avaldatud {0}, -Publishing documents...,Dokumentide avaldamine ..., -Documents have been published.,Dokumendid on avaldatud., -Select Document Type.,Valige Dokumendi tüüp., Console Log,Konsoolilogi, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Määra selle juhtpaneeli kõigi diagrammide vaikevalikud (nt: "värvid": ["# d1d8dd", "# ff5858"])", Use Report Chart,Kasuta aruandegraafikut, @@ -4566,10 +4551,6 @@ Incorrect URL,Vale URL, Duplicate Name,Nime duplikaat, "Please check the value of ""Fetch From"" set for field {0}",Kontrollige väljale {0} seatud väärtuse „Too algusest” väärtus, Wrong Fetch From value,Väärtusest toomine vale, -Deploying,Juurutamine, -Couldn't connect to site {0}. Please check Error Logs.,Saidiga {0} ei saanud ühendust luua. Kontrollige vea logisid., -Error while installing package to site {0}. Please check Error Logs.,Viga saidi {0} paketi installimisel. Kontrollige vea logisid., -Exporting,Eksportimine, A field with the name '{}' already exists in doctype {}.,Väli nimega „{}” on juba dokumenditüübis {} olemas., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Kohandatud välja {0} on loonud administraator ja selle saab kustutada ainult administraatori konto kaudu., Failed to send {0} Auto Email Report,{0} Automaatse meiliaruande saatmine ebaõnnestus, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Rida nr {0}: unikaalse kaugsõltuvuse dokumendi toomiseks määrake väljale {1} kaugväärtuse filtrid, Paytm payment gateway settings,Paytmi makselüüsi seaded, "Company, Fiscal Year and Currency defaults","Ettevõtte, eelarveaasta ja valuuta vaikesätted", -Package,Pakett, -Import and Export Packages.,Pakettide importimine ja eksportimine., Razorpay Signature Verification Failed,Razorpay allkirja kinnitamine nurjus, Google Drive - Could not locate - {0},Google Drive - ei õnnestunud leida - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Sünkroonimisluba oli vale ja see on lähtestatud. Proovige sünkroonimist uuesti., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,DocType Link / DocType Actioni jaoks, Cannot edit filters for standard charts,Standarddiagrammide filtreid ei saa muuta, Event Producer Last Update,Sündmuse tootja viimane värskendus, Default for 'Check' type of field {0} must be either '0' or '1',Välja „Kontrolli” tüübi {0} vaikeväärtus peab olema „0” või „1”, +Non Negative,Mitte negatiivne, +Rules with higher priority number will be applied first.,Kõigepealt rakendatakse suurema prioriteediga numbreid., +Open URL in a New Tab,Avage URL uuel vahelehel, +Align Right,Joondage paremale, +Loading Filters...,Filtrite laadimine ..., +Count Customizations,Loendage kohandused, +For Example: {} Open,Näiteks: {} Ava, +Choose Existing Card or create New Card,Valige Olemasolev kaart või looge Uus kaart, +Number Cards,Numbrikaardid, +Function Based On,Funktsioon põhineb, +Add Filters,Lisage filtrid, +Skip,Vahele jätma, +Dismiss,Vabaks laskma, +Value cannot be negative for,Väärtus ei saa olla väärtusele negatiivne, +Value cannot be negative for {0}: {1},Väärtus {0} ei saa olla negatiivne: {1}, +Negative Value,Negatiivne väärtus, +Authentication failed while receiving emails from Email Account: {0}.,E-posti kontolt meilide saamisel nurjus autentimine: {0}., +Message from server: {0},Sõnum serverilt: {0}, diff --git a/frappe/translations/fa.csv b/frappe/translations/fa.csv index 96597724c2..a2d3a5f221 100644 --- a/frappe/translations/fa.csv +++ b/frappe/translations/fa.csv @@ -499,7 +499,6 @@ Authenticating...,در حال تأیید صحت ..., Authentication,احراز هویت, Authentication Apps you can use are: ,پرونده های تأیید اعتبار که می توانید استفاده کنید عبارتند از:, Authentication Credentials,احراز هویت, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},احراز هویت در حالی که دریافت ایمیل از ایمیل حساب {0} شکست خورده است. پیام از سرور: {1}, Authorization Code,کد مجوز, Authorize URL,مجاز URL, Authorized,مجاز, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,آیا می docstatus 1-0 تغییر نمی, Cannot change header content,محتوای هدر را نمیتوان تغییر داد, Cannot change state of Cancelled Document. Transition row {0},آیا می توانم حالت سند لغو تغییر دهید. ردیف گذار {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,می توانید جزئیات کاربران در نسخه ی نمایشی را تغییر دهید. لطفا برای یک حساب جدید ثبت نام در https://erpnext.com, -Cannot connect: {0},نمی تواند اتصال: {0}, Cannot create a {0} against a child document: {1},نمی توانید ایجاد یک {0} در برابر یک سند کودک: {1}, Cannot delete Home and Attachments folders,می توانید خانه و فایل های پیوست پوشه را حذف کنید, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,نمیتوان فایل را به عنوان {0} {1} تعریف کرد که مجوزی ندارد, @@ -1139,7 +1137,6 @@ Font Size,اندازه فونت, Fonts,فونت ها, Footer,پاورقی, Footer HTML,پاورقی HTML, -Footer Item,مورد بالا و پایین صفحه, Footer Items,آیتم ها بالا و پایین صفحه, Footer will display correctly only in PDF,پاورقی درست به صورت PDF نمایش داده می شود, For Document Type,برای نوع سند, @@ -1149,7 +1146,6 @@ For Value,برای ارزش, "For currency {0}, the minimum transaction amount should be {1}",برای ارز {0} حداقل مبلغ معامله باید {1} باشد, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,برای مثال اگر شما لغو و اصلاح INV004 آن را تبدیل به یک INV004-1 سند جدید. این کمک می کند تا شما را به پیگیری هر اصلاح., "For example: If you want to include the document ID, use {0}",به عنوان مثال: اگر می خواهید شامل ID سند، استفاده از {0}, -For top bar,برای نوار بالا, "For updating, you can update only selective columns.",برای به روز رسانی، شما می توانید ستون های انتخابی تنها به روز رسانی., For {0} at level {1} in {2} in row {3},برای {0} در سطح {1} در {2} در ردیف {3}, Force,زور, @@ -1201,7 +1197,6 @@ Google Calendar ID,شناسه تقویم گوگل, Google Font,قلم گوگل, Google Services,خدمات Google, Grant Type,نوع گرانت, -Group Label,برچسب گروه, Group Name,اسم گروه, Group name cannot be empty.,نام گروه نمیتواند خالی باشد, Groups of DocTypes,گروه DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,لطفا آدرس ایمیل خود را تای Point Allocation Periodicity,دوره تخصیص نقطه, Points,نکته ها, Points Given,امتیازهای داده شده, -Policy,سیاست, Port,بندر, Portal Menu,منو پورتال, Portal Menu Item,آیتم های منو را پورتال, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,حداقل 1 رکورد برای چاپ انتخاب کنید, Select or drag across time slots to create a new event.,انتخاب و یا کشیدن در سراسر شکاف زمان برای ایجاد یک رویداد جدید., Select records for assignment,انتخاب پرونده برای انتساب, -"Select target = ""_blank"" to open in a new page.",انتخاب هدف = "_blank" برای باز کردن در صفحه جدید., Select the label after which you want to insert new field.,برچسب و پس از آن شما می خواهید برای وارد کردن زمینه های جدید را انتخاب کنید., "Select your Country, Time Zone and Currency",انتخاب کشور خود، منطقه زمانی و ارز, Select {0},انتخاب {0}, @@ -2989,7 +2982,6 @@ star-empty,ستاره خالی, step-backward,گام به گام به عقب, step-forward,گام رو به جلو, submitted this document,ارسال این سند, -"target = ""_blank""",هدف = "_blank", text in document type,متن در نوع سند, text-height,متن ارتفاع, text-width,متن عرض, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,در طول تولید نشانه ها مشکلی پیش آمد. برای تولید یک محصول جدید روی {0 کلیک کنید., Submit After Import,ارسال پس از واردات, Submitting...,در حال ارسال ..., -Subscribed Documents,اسناد مشترک, Success! You are good to go 👍,موفقیت! شما خوب هستید که بروید, Successful Transactions,معاملات موفق, Successfully Submitted!,با موفقیت ارسال شد, @@ -3777,7 +3768,6 @@ Please specify,لطفا مشخص کنید, Printing,چاپ, Priority,اولویت, Project,پروژه, -Publish,انتشار, Quarterly,فصلنامه, Queued,صف, Quick Entry,ورود سریع, @@ -4299,7 +4289,6 @@ Hide Border,مرز را پنهان کنید, Index Web Pages for Search,صفحه های وب را برای جستجو فهرست کنید, Action / Route,اقدام / مسیر, Document Naming Rule,قانون نامگذاری سند, -Rules with higher priority will be applied first.,ابتدا قوانینی با اولویت بالاتر اعمال می شود., Rule Conditions,شرایط قانون, Digits,رقم, Example: 00001,مثال: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,ابزار انتشار بسته, Click on the row for accessing filters.,برای دسترسی به فیلترها روی ردیف کلیک کنید., Sites,سایت های, Last Deployed On,آخرین اعزام در, -Last published {0},آخرین انتشار: {0}, -Publishing documents...,انتشار اسناد ..., -Documents have been published.,اسنادی منتشر شده است., -Select Document Type.,نوع سند را انتخاب کنید., Console Log,ورود به سیستم کنسول, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])",گزینه های پیش فرض را برای همه نمودارهای این داشبورد تنظیم کنید (به عنوان مثال: "colors": ["# d1d8dd"، "# ff5858"]), Use Report Chart,از نمودار گزارش استفاده کنید, @@ -4566,10 +4551,6 @@ Incorrect URL,آدرس اینترنتی نادرست است, Duplicate Name,نام تکراری, "Please check the value of ""Fetch From"" set for field {0}",لطفاً مقدار مجموعه "Fetch From" را برای قسمت {0} بررسی کنید, Wrong Fetch From value,واکشی اشتباه از مقدار, -Deploying,در حال استقرار, -Couldn't connect to site {0}. Please check Error Logs.,اتصال به سایت {0} امکان پذیر نیست. لطفا گزارش خطاها را بررسی کنید., -Error while installing package to site {0}. Please check Error Logs.,هنگام نصب بسته به سایت خطایی رخ داد {0}. لطفا گزارش خطاها را بررسی کنید., -Exporting,صادر کردن, A field with the name '{}' already exists in doctype {}.,فیلدی با نام "{}" از قبل در doctype وجود دارد {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,قسمت سفارشی {0} توسط سرپرست ایجاد شده است و فقط از طریق حساب مدیر قابل حذف است., Failed to send {0} Auto Email Report,{0} گزارش خودکار ایمیل ارسال نشد, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,ردیف شماره {0}: لطفاً برای گرفتن سند منحصر به فرد وابستگی از راه دور ، فیلترهای مقدار از راه دور را برای قسمت {1} تنظیم کنید, Paytm payment gateway settings,تنظیمات درگاه پرداخت Paytm, "Company, Fiscal Year and Currency defaults",پیش فرض های شرکت ، سال مالی و ارز, -Package,بسته بندی, -Import and Export Packages.,بسته های واردات و صادرات., Razorpay Signature Verification Failed,تأیید تأیید Razorpay انجام نشد, Google Drive - Could not locate - {0},Google Drive - مکان یافت نشد - {0}, "Sync token was invalid and has been resetted, Retry syncing.",رمز همگام سازی نامعتبر است و مجدداً بازنشانی شده است ، دوباره همگام سازی را امتحان کنید., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,برای پیوند DocType / اقدام DocTy Cannot edit filters for standard charts,فیلترها برای نمودارهای استاندارد قابل ویرایش نیستند, Event Producer Last Update,آخرین بروزرسانی سازنده رویداد, Default for 'Check' type of field {0} must be either '0' or '1',پیش فرض برای نوع "بررسی" قسمت {0} باید "0" یا "1" باشد, +Non Negative,غیر منفی, +Rules with higher priority number will be applied first.,ابتدا قوانینی با اولویت بالاتر اعمال می شود., +Open URL in a New Tab,URL را در یک برگه جدید باز کنید, +Align Right,تراز راست, +Loading Filters...,در حال بارگیری فیلترها ..., +Count Customizations,تعداد سفارشی ها را بشمارید, +For Example: {} Open,برای مثال: {} باز کنید, +Choose Existing Card or create New Card,کارت موجود را انتخاب کنید یا کارت جدید ایجاد کنید, +Number Cards,کارت های شماره, +Function Based On,عملکرد مبتنی بر, +Add Filters,فیلترها را اضافه کنید, +Skip,پرش, +Dismiss,رد, +Value cannot be negative for,مقدار نمی تواند برای منفی باشد, +Value cannot be negative for {0}: {1},مقدار برای {0} نمی تواند منفی باشد: {1}, +Negative Value,ارزش منفی, +Authentication failed while receiving emails from Email Account: {0}.,تأیید اعتبار هنگام دریافت ایمیل از حساب ایمیل انجام نشد: {0}., +Message from server: {0},پیام از طرف سرور: {0}, diff --git a/frappe/translations/fi.csv b/frappe/translations/fi.csv index d3c5025b30..991b22e302 100644 --- a/frappe/translations/fi.csv +++ b/frappe/translations/fi.csv @@ -499,7 +499,6 @@ Authenticating...,Varmennetaan ..., Authentication,Authentication, Authentication Apps you can use are: ,Käytettävät todentamisohjelmat ovat:, Authentication Credentials,Authentication Credentials, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Todennus epäonnistui yritettäessä noutaa posteja sähköpostitililtä {0}. Palvelimen vastaus: {1}, Authorization Code,Authorization Code, Authorize URL,Hyväksy URL-osoite, Authorized,valtuutettu, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Dokumentin tilaa ei voi muuttaa 1 -> 0, Cannot change header content,Ei voi muuttaa otsikkosisällön sisältöä, Cannot change state of Cancelled Document. Transition row {0},Perutun dokumentin tilaa ei voi muuttaa. Toiminnon rivi {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Ei voi muuttaa käyttäjän tietoja demo. Ole hyvä kirjautumisen uuden tilin https://erpnext.com, -Cannot connect: {0},Ei voi muodostaa: {0}, Cannot create a {0} against a child document: {1},Ei voi luoda {0} dokumentille {1}, Cannot delete Home and Attachments folders,Koti- ja Liitteet- kansioita ei voida poistaa, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Tiedostoa ei voi poistaa koska se kuuluu {0} {1}, jolle sinulla ei ole käyttöoikeuksia", @@ -1139,7 +1137,6 @@ Font Size,Fonttikoko, Fonts,kirjasimet, Footer,Alatunniste, Footer HTML,Alatunnisteen HTML, -Footer Item,Alatunniste tuote, Footer Items,Alatunniste tuotteet, Footer will display correctly only in PDF,Alatunniste näkyy oikein vain PDF-muodossa, For Document Type,Asiakirjatyypille, @@ -1149,7 +1146,6 @@ For Value,Arvoa varten, "For currency {0}, the minimum transaction amount should be {1}",Valuutalle {0} vähimmäismäärän tulisi olla {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Esim: Mikäli hyvität tositteen ML0004 siitä tulee uusi tosite ML0004-1, tämä helpotaa muutosten seurantaa", "For example: If you want to include the document ID, use {0}",Esim: Mikäli haluat sisällyttää asiakirjan tunnuksen käytä {0}, -For top bar,yläpalkkiin, "For updating, you can update only selective columns.",voit päivittää vain tiettyjä sarakkeita, For {0} at level {1} in {2} in row {3},"{0} tasolle {1}, {2} rivillä {3}", Force,Pakottaa, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google-kalenterin tunnus, Google Font,Google-fontti, Google Services,Google-palvelut, Grant Type,Grant Tyyppi, -Group Label,Nimike, Group Name,Ryhmän nimi, Group name cannot be empty.,Ryhmän nimi ei voi olla tyhjä., Groups of DocTypes,Tietuetyyppiryhmät, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Vahvista sähköpostiosoite, Point Allocation Periodicity,Pisteiden allokoinnin jaksotus, Points,pistettä, Points Given,Annetut pisteet, -Policy,Käytäntö, Port,Portti, Portal Menu,Portaalivalikko, Portal Menu Item,Portaalivalikon valinta, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Valitse atleast 1 ennätys tulostukseen, Select or drag across time slots to create a new event.,Valitse tai vieritä oikea aikaväli tehdäksesi uuden tapahtuman, Select records for assignment,Valitse tietueet, -"Select target = ""_blank"" to open in a new page.","Valitsetavoite = ""_tyhjä"" avaa uuden sivun", Select the label after which you want to insert new field.,Valitse nimike jonka jälkeen haluat lisätä uuden kentän, "Select your Country, Time Zone and Currency","Valitse maa, aikavyöhyke ja valuutta", Select {0},Valitse {0}, @@ -2989,7 +2982,6 @@ star-empty,tähtimerkki-tyhjä, step-backward,askel-taaksepäin, step-forward,askel-eteenpäin, submitted this document,Vahvisti tämän dokumentin, -"target = ""_blank""","tavoite = ""_tyhjä""", text in document type,Asiakirjatyypin teksti, text-height,Teksti-korkeus, text-width,Teksti-leveys, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Jokin meni pieleen token-sukupolven aikana. Luo uusi napsauttamalla {0}., Submit After Import,Lähetä tuonnin jälkeen, Submitting...,Lähettämällä ..., -Subscribed Documents,Tilatut asiakirjat, Success! You are good to go 👍,Menestys! Sinulla on hyvä mennä 👍, Successful Transactions,Onnistuneet transaktiot, Successfully Submitted!,Lähetetty onnistuneesti!, @@ -3777,7 +3768,6 @@ Please specify,Ilmoitathan, Printing,Tulostus, Priority,prioriteetti, Project,Projekti, -Publish,Julkaista, Quarterly,3 kk, Queued,Jonossa, Quick Entry,käytä pikasyöttöä, @@ -4299,7 +4289,6 @@ Hide Border,Piilota raja, Index Web Pages for Search,Hakemistosivujen hakemisto, Action / Route,Toiminta / reitti, Document Naming Rule,Asiakirjan nimeämissääntö, -Rules with higher priority will be applied first.,"Ensin sovelletaan sääntöjä, joilla on suurempi prioriteetti.", Rule Conditions,Säännön ehdot, Digits,Numerot, Example: 00001,Esimerkki: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Package Publish -työkalu, Click on the row for accessing filters.,Napsauta riviä päästäksesi suodattimiin., Sites,Sivustot, Last Deployed On,Viimeisin käyttöönotto käytössä, -Last published {0},Viimeksi julkaistu {0}, -Publishing documents...,Julkaistaan asiakirjoja ..., -Documents have been published.,Asiakirjat on julkaistu., -Select Document Type.,Valitse Asiakirjan tyyppi., Console Log,Konsoliloki, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Aseta oletusasetukset kaikille tämän hallintapaneelin kaavioille (Esim. "Värit": ["# d1d8dd", "# ff5858"])", Use Report Chart,Käytä raporttitaulukkoa, @@ -4566,10 +4551,6 @@ Incorrect URL,Virheellinen URL-osoite, Duplicate Name,Kopioi nimi, "Please check the value of ""Fetch From"" set for field {0}",Tarkista kentälle {0} asetetun Nouda lähteestä -arvo., Wrong Fetch From value,Väärä noutoarvo, -Deploying,Käyttöönotto, -Couldn't connect to site {0}. Please check Error Logs.,Yhteyden muodostaminen sivustoon {0} epäonnistui. Tarkista virhelokit., -Error while installing package to site {0}. Please check Error Logs.,Virhe asennettaessa pakettia sivustoon {0}. Tarkista virhelokit., -Exporting,Vie, A field with the name '{}' already exists in doctype {}.,Kenttä nimeltä {} on jo olemassa tiedostotyypissä {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,"Mukautetun kentän {0} on luonut järjestelmänvalvoja, ja se voidaan poistaa vain järjestelmänvalvojan tilillä.", Failed to send {0} Auto Email Report,{0} Automaattisen sähköpostiraportin lähettäminen epäonnistui, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Rivi # {0}: Määritä kentälle {1} etäarvosuodattimet noutamaan ainutlaatuinen etäriippuvuusdokumentti, Paytm payment gateway settings,Paytm-maksuyhdyskäytävän asetukset, "Company, Fiscal Year and Currency defaults","Yrityksen, tilikauden ja valuutan oletukset", -Package,Paketti, -Import and Export Packages.,Tuo ja vie paketteja., Razorpay Signature Verification Failed,Razorpay-allekirjoituksen vahvistus epäonnistui, Google Drive - Could not locate - {0},Google Drive - ei löytynyt - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Synkronointitunnus oli virheellinen ja se on nollattu. Yritä synkronoida uudelleen., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,DocType Link / DocType -toiminto, Cannot edit filters for standard charts,Vakiokaavioiden suodattimia ei voi muokata, Event Producer Last Update,Tapahtuman tuottajan viimeisin päivitys, Default for 'Check' type of field {0} must be either '0' or '1',Tarkista-kentän tyypin {0} oletusarvon on oltava joko 0 tai 1., +Non Negative,Ei negatiivinen, +Rules with higher priority number will be applied first.,"Ensin sovelletaan sääntöjä, joilla on korkeampi prioriteettinumero.", +Open URL in a New Tab,Avaa URL-osoite uudella välilehdellä, +Align Right,Kohdista oikealle, +Loading Filters...,Ladataan suodattimia ..., +Count Customizations,Laske mukautukset, +For Example: {} Open,Esimerkki: {} Avaa, +Choose Existing Card or create New Card,Valitse Olemassa oleva kortti tai luo uusi kortti, +Number Cards,Numerokortit, +Function Based On,Toiminto perustuu, +Add Filters,Lisää suodattimet, +Skip,Ohita, +Dismiss,Hylkää, +Value cannot be negative for,Arvo ei voi olla negatiivinen arvolle, +Value cannot be negative for {0}: {1},Arvo ei voi olla negatiivinen kohteelle {0}: {1}, +Negative Value,Negatiivinen arvo, +Authentication failed while receiving emails from Email Account: {0}.,Todennus epäonnistui vastaanotettaessa sähköposteja sähköpostitililtä: {0}., +Message from server: {0},Viesti palvelimelta: {0}, diff --git a/frappe/translations/fr.csv b/frappe/translations/fr.csv index 694e37cd14..511c590a59 100644 --- a/frappe/translations/fr.csv +++ b/frappe/translations/fr.csv @@ -499,7 +499,6 @@ Authenticating...,Authentifier ..., Authentication,Authentification, Authentication Apps you can use are: ,Les Applications d'Authentification que vous pouvez utiliser sont:, Authentication Credentials,Informations d'Authentification, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},L'authentification a échoué lors de la réception des emails depuis le Compte de Messagerie {0}. Message du serveur : {1}, Authorization Code,Code d'Autorisation, Authorize URL,Autoriser l'URL, Authorized,Autorisé, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Impossible de changer le statut du document Cannot change header content,Impossible de changer le contenu de l'en-tête, Cannot change state of Cancelled Document. Transition row {0},Impossible de changer l'état d'un Document Annulé. Ligne de transition {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Vous ne pouvez pas changer les détails utilisateur dans la démo. Veuillez créer un nouveau compte sur https://erpnext.com, -Cannot connect: {0},Impossible de se connecter : {0}, Cannot create a {0} against a child document: {1},Création impossible d'un {0} pour un document enfant: {1}, Cannot delete Home and Attachments folders,Impossible de supprimer les dossiers d’accueil et les pièces jointes, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Impossible de supprimer le fichier parce qu'il appartient à {0} {1} pour lequel vous n'avez pas d'autorisations, @@ -1139,7 +1137,6 @@ Font Size,Taille de la Police, Fonts,Polices, Footer,Pied de Page, Footer HTML,Pied de page HTML, -Footer Item,Élément du Pied de page, Footer Items,Éléments du Pied de Page, Footer will display correctly only in PDF,Le pied de page ne s'affichera correctement qu'en PDF, For Document Type,Pour le type de document, @@ -1149,7 +1146,6 @@ For Value,Pour la Valeur, "For currency {0}, the minimum transaction amount should be {1}","Pour la devise {0}, le montant minimum de la transaction doit être {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Par exemple, si vous annulez et modifiez le document INV004, il deviendra un nouveau document INV004-1. Cela vous aide à garder une trace de chaque modification.", "For example: If you want to include the document ID, use {0}","Par exemple: Si vous voulez inclure l'ID du document, utilisez {0}", -For top bar,Pour la barre supérieure, "For updating, you can update only selective columns.","Pour la mise à jour, vous pouvez mettre à jour uniquement une sélection colonnes.", For {0} at level {1} in {2} in row {3},Pour {0} au niveau {1} dans {2} à la ligne {3}, Force,Forcer, @@ -1201,7 +1197,6 @@ Google Calendar ID,Identifiant Google Agenda, Google Font,Google Font, Google Services,Services Google, Grant Type,Type de Subvention, -Group Label,Étiquette du Groupe, Group Name,Nom de groupe, Group name cannot be empty.,Le nom du groupe ne peut pas être vide., Groups of DocTypes,Groupes de DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Veuillez vérifier votre adresse e-mail, Point Allocation Periodicity,Périodicité d'attribution de points, Points,Points, Points Given,Points donnés, -Policy,Politique, Port,Port, Portal Menu,Menu Portail, Portal Menu Item,Article du Menu Portail, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Sélectionner au moins 1 enregistrement pour l'impression, Select or drag across time slots to create a new event.,Sélectionner ou glisser sur des intervalles de temps pour créer un nouvel événement., Select records for assignment,Sélectionner les dossiers pour attribution, -"Select target = ""_blank"" to open in a new page.","Sélectionner target = ""_blank"" pour ouvrir dans une nouvelle page.", Select the label after which you want to insert new field.,Sélectionner le libellé après lequel vous voulez insérer un nouveau champ., "Select your Country, Time Zone and Currency","Sélectionner votre Pays, Fuseau Horaire et Devise", Select {0},Sélectionner {0}, @@ -2989,7 +2982,6 @@ star-empty,étoile-vide, step-backward,vers-larrière, step-forward,vers-l'avant, submitted this document,a soumis ce document, -"target = ""_blank""","target = ""_blank""", text in document type,Texte dans le type de document, text-height,Hauteur-texte, text-width,largeur-text, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Quelque chose s'est mal passé pendant la génération de jetons. Cliquez sur {0} pour en générer un nouveau., Submit After Import,Soumettre après importation, Submitting...,Soumission..., -Subscribed Documents,Documents souscrits, Success! You are good to go 👍,Succès! Vous êtes bon pour aller, Successful Transactions,Transactions réussies, Successfully Submitted!,Soumis avec succès!, @@ -3777,7 +3768,6 @@ Please specify,Veuillez spécifier, Printing,Impression, Priority,Priorité, Project,Projet, -Publish,Publier, Quarterly,Trimestriel, Queued,File d'Attente, Quick Entry,Écriture Rapide, @@ -4299,7 +4289,6 @@ Hide Border,Masquer la bordure, Index Web Pages for Search,Indexer les pages Web pour la recherche, Action / Route,Action / Route, Document Naming Rule,Règle de dénomination de document, -Rules with higher priority will be applied first.,Les règles avec une priorité plus élevée seront appliquées en premier., Rule Conditions,Conditions de règle, Digits,Chiffres, Example: 00001,Exemple: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Outil de publication de package, Click on the row for accessing filters.,Cliquez sur la ligne pour accéder aux filtres., Sites,Des sites, Last Deployed On,Dernier déploiement le, -Last published {0},Dernière publication {0}, -Publishing documents...,Publication de documents ..., -Documents have been published.,Des documents ont été publiés., -Select Document Type.,Sélectionnez le type de document., Console Log,Journal de la console, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Définir les options par défaut pour tous les graphiques de ce tableau de bord (par exemple: "couleurs": ["# d1d8dd", "# ff5858"])", Use Report Chart,Utiliser le graphique de rapport, @@ -4566,10 +4551,6 @@ Incorrect URL,URL incorrecte, Duplicate Name,Nom en double, "Please check the value of ""Fetch From"" set for field {0}",Veuillez vérifier la valeur de "Extraire depuis" définie pour le champ {0}, Wrong Fetch From value,Valeur d'extraction incorrecte, -Deploying,Déploiement, -Couldn't connect to site {0}. Please check Error Logs.,Impossible de se connecter au site {0}. Veuillez vérifier les journaux d'erreurs., -Error while installing package to site {0}. Please check Error Logs.,Erreur lors de l'installation du package sur le site {0}. Veuillez vérifier les journaux d'erreurs., -Exporting,Exporter, A field with the name '{}' already exists in doctype {}.,Un champ avec le nom '{}' existe déjà dans doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Le champ personnalisé {0} est créé par l'administrateur et ne peut être supprimé que via le compte administrateur., Failed to send {0} Auto Email Report,Échec de l'envoi du {0} rapport automatique par e-mail, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Ligne n ° {0}: veuillez définir des filtres de valeur distante pour le champ {1} afin de récupérer le document de dépendance distante unique, Paytm payment gateway settings,Paramètres de la passerelle de paiement Paytm, "Company, Fiscal Year and Currency defaults","Valeurs par défaut de la société, de l'exercice et de la devise", -Package,Paquet, -Import and Export Packages.,Importer et exporter des packages., Razorpay Signature Verification Failed,Échec de la vérification de la signature Razorpay, Google Drive - Could not locate - {0},Google Drive - Impossible de localiser - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Le jeton de synchronisation n'était pas valide et a été réinitialisé. Réessayez la synchronisation., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Pour DocType Link / DocType Action, Cannot edit filters for standard charts,Impossible de modifier les filtres des graphiques standard, Event Producer Last Update,Dernière mise à jour du producteur d'événements, Default for 'Check' type of field {0} must be either '0' or '1',La valeur par défaut pour le type de champ "Vérifier" {0} doit être "0" ou "1", +Non Negative,Non négatif, +Rules with higher priority number will be applied first.,Les règles avec un numéro de priorité plus élevé seront appliquées en premier., +Open URL in a New Tab,Ouvrir l'URL dans un nouvel onglet, +Align Right,Aligner à droite, +Loading Filters...,Chargement des filtres ..., +Count Customizations,Comptage des personnalisations, +For Example: {} Open,Par exemple: {} Ouvrir, +Choose Existing Card or create New Card,Choisissez une carte existante ou créez une nouvelle carte, +Number Cards,Cartes numériques, +Function Based On,Fonction basée sur, +Add Filters,Ajouter des filtres, +Skip,Sauter, +Dismiss,Rejeter, +Value cannot be negative for,La valeur ne peut pas être négative pour, +Value cannot be negative for {0}: {1},La valeur ne peut pas être négative pour {0}: {1}, +Negative Value,Valeur négative, +Authentication failed while receiving emails from Email Account: {0}.,L'authentification a échoué lors de la réception des e-mails du compte de messagerie: {0}., +Message from server: {0},Message du serveur: {0}, diff --git a/frappe/translations/gu.csv b/frappe/translations/gu.csv index afd6a23d36..c2c485c2e7 100644 --- a/frappe/translations/gu.csv +++ b/frappe/translations/gu.csv @@ -499,7 +499,6 @@ Authenticating...,પ્રમાણિત કરી રહ્યું છે . Authentication,પ્રમાણીકરણ, Authentication Apps you can use are: ,પ્રમાણીકરણ એપ્લિકેશન્સ તમે ઉપયોગ કરી શકો છો:, Authentication Credentials,પ્રમાણીકરણ ઓળખપત્રો, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},ઇમેઇલ એકાઉન્ટ {0} ઇમેઇલ્સ પ્રાપ્ત કરતી પ્રમાણીકરણ નિષ્ફળ થયું. સર્વર સંદેશ: {1}, Authorization Code,અધિકૃતતા કોડ, Authorize URL,URL ને અધિકૃત કરો, Authorized,અધિકૃત, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,1 થી 0 docstatus બદલી શકા Cannot change header content,હેડર સામગ્રી બદલી શકાતી નથી, Cannot change state of Cancelled Document. Transition row {0},રદ દસ્તાવેજ સ્ટેટ બદલી શકાતું નથી. ટ્રાન્ઝિશન પંક્તિ {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,ડેમો વપરાશકર્તા વિગતો બદલી શકતા નથી. https://erpnext.com ખાતે નવા એકાઉન્ટ માટે સાઇન અપ કૃપા કરીને, -Cannot connect: {0},કનેક્ટ કરી શકો છો: {0}, Cannot create a {0} against a child document: {1},નથી બનાવી શકો છો {0} બાળક દસ્તાવેજ સામે: {1}, Cannot delete Home and Attachments folders,ઘર અને જોડાણો ફોલ્ડર્સ કાઢી શકાતો નથી, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,ફાઇલને કાઢી શકાતી નથી કારણ કે તે {0} {1} માટે છે જેની પાસે તમારી પાસે પરવાનગીઓ નથી, @@ -1139,7 +1137,6 @@ Font Size,અક્ષર ની જાડાઈ, Fonts,ફોન્ટ, Footer,ફૂટર, Footer HTML,ફૂટર એચટીએમએલ, -Footer Item,ફૂટર વસ્તુ, Footer Items,ફૂટર વસ્તુઓ, Footer will display correctly only in PDF,ફૂટર ફક્ત પીડીએફમાં જ પ્રદર્શિત થશે, For Document Type,દસ્તાવેજ પ્રકાર માટે, @@ -1149,7 +1146,6 @@ For Value,મૂલ્ય માટે, "For currency {0}, the minimum transaction amount should be {1}","ચલણ {0} માટે, લઘુત્તમ વ્યવહાર રકમ {1} હોવી જોઈએ", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"તમે રદ અને INV004 સુધારો ઉદાહરણ તરીકે, જો તે નવી દસ્તાવેજ INV004-1 બની જાય છે. આ તમે સુધારો ટ્રેક રાખવા માટે મદદ કરે છે.", "For example: If you want to include the document ID, use {0}","ઉદાહરણ તરીકે: તમે જે દસ્તાવેજ ID ને સમાવવા માટે કરવા માંગો છો, ઉપયોગ {0}", -For top bar,ટોચ બાર, "For updating, you can update only selective columns.","સુધારવા માટે, તમે માત્ર પસંદગીના કૉલમ અપડેટ કરી શકો છો.", For {0} at level {1} in {2} in row {3},માટે {0} સ્તર {1} પર {2} પંક્તિ માં {3}, Force,ફોર્સ, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google કૅલેન્ડર ID, Google Font,ગૂગલ ફontન્ટ, Google Services,Google સેવાઓ, Grant Type,ગ્રાન્ટ પ્રકાર, -Group Label,જૂથ લેબલ, Group Name,ગ્રુપનું નામ, Group name cannot be empty.,જૂથ નામ ખાલી હોઈ શકતું નથી., Groups of DocTypes,DocTypes જૂથો, @@ -1911,7 +1906,6 @@ Please verify your Email Address,તમારું ઇમેઇલ સરના Point Allocation Periodicity,પોઇન્ટ એલોકેશન સમયગાળો, Points,પોઇન્ટ્સ, Points Given,પોઇન્ટ આપ્યા, -Policy,નીતિ, Port,પોર્ટ, Portal Menu,પોર્ટલ મેનુ, Portal Menu Item,પોર્ટલ મેનુ વસ્તુ, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,છાપવા માટે ઓછામાં ઓછા 1 વિક્રમ પસંદ, Select or drag across time slots to create a new event.,પસંદ કરો અથવા એક નવી ઇવેન્ટ બનાવો સમય સ્લોટ સમગ્ર ખેંચો., Select records for assignment,સોંપણી માટે પસંદ રેકોર્ડ, -"Select target = ""_blank"" to open in a new page.",પસંદ લક્ષ્ય = "_blank" એક નવું પાનું ખોલો., Select the label after which you want to insert new field.,"તમે નવા ક્ષેત્ર દાખલ કરવા માંગો છો, જે પછી લેબલ પસંદ કરો.", "Select your Country, Time Zone and Currency","તમારો દેશ, ટાઈમ ઝોન અને કરન્સી પસંદ કરો", Select {0},પસંદ કરો {0}, @@ -2989,7 +2982,6 @@ star-empty,સ્ટાર ખાલી, step-backward,પગલું પછાત, step-forward,પગલું આગળ, submitted this document,આ દસ્તાવેજ રજૂ, -"target = ""_blank""",લક્ષ્ય = "_blank", text in document type,દસ્તાવેજ પ્રકારની લખાણ, text-height,લખાણ ઊંચાઈ, text-width,લખાણ-પહોળાઈ, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,ટોકન પે generationી દરમિયાન કંઈક ખોટું થયું. નવું બનાવવા માટે {0 on પર ક્લિક કરો., Submit After Import,આયાત પછી સબમિટ કરો, Submitting...,સબમિટ કરી રહ્યું છે ..., -Subscribed Documents,સબ્સ્ક્રાઇબ કરેલા દસ્તાવેજો, Success! You are good to go 👍,સફળતા! તમે જવા માટે સારા છે 👍, Successful Transactions,સફળ વ્યવહાર, Successfully Submitted!,સફળતાપૂર્વક સબમિટ કર્યું!, @@ -3777,7 +3768,6 @@ Please specify,કૃપયા ચોક્કસ ઉલ્લેખ કરો, Printing,પ્રિન્ટિંગ, Priority,પ્રાધાન્યતા, Project,પ્રોજેક્ટ, -Publish,પ્રકાશિત કરો, Quarterly,ત્રિમાસિક, Queued,કતારબદ્ધ, Quick Entry,ઝડપી એન્ટ્રી, @@ -4299,7 +4289,6 @@ Hide Border,બોર્ડર છુપાવો, Index Web Pages for Search,શોધ માટે અનુક્રમણિકા વેબ પૃષ્ઠો, Action / Route,ક્રિયા / માર્ગ, Document Naming Rule,દસ્તાવેજ નામકરણનો નિયમ, -Rules with higher priority will be applied first.,ઉચ્ચ અગ્રતાવાળા નિયમો પહેલા લાગુ કરવામાં આવશે., Rule Conditions,નિયમની શરતો, Digits,અંકો, Example: 00001,ઉદાહરણ: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,પેકેજ પબ્લિશ ટૂલ, Click on the row for accessing filters.,ગાળકોને accessક્સેસ કરવા માટે પંક્તિ પર ક્લિક કરો., Sites,સાઇટ્સ, Last Deployed On,છેલ્લું જમાવટ થયેલ, -Last published {0},છેલ્લે પ્રકાશિત {0}, -Publishing documents...,દસ્તાવેજો પ્રકાશિત કરી રહ્યાં છે ..., -Documents have been published.,દસ્તાવેજો પ્રકાશિત કરવામાં આવ્યા છે., -Select Document Type.,દસ્તાવેજ પ્રકાર પસંદ કરો., Console Log,કન્સોલ લ Logગ, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","આ ડેશબોર્ડ પરના બધા ચાર્ટ્સ માટે ડિફોલ્ટ વિકલ્પો સેટ કરો (ઉદા: "રંગો": ["# d1d8dd", "# ff5858"])", Use Report Chart,રિપોર્ટ ચાર્ટનો ઉપયોગ કરો, @@ -4566,10 +4551,6 @@ Incorrect URL,ખોટો URL, Duplicate Name,ડુપ્લિકેટ નામ, "Please check the value of ""Fetch From"" set for field {0}",કૃપા કરી ફીલ્ડ for 0} માટે સેટ "ફ Fromચ ફ્રોમ" ની કિંમત તપાસો., Wrong Fetch From value,મૂલ્યમાંથી ખોટું મેળવો, -Deploying,જમાવટ, -Couldn't connect to site {0}. Please check Error Logs.,સાઇટ {0} સાથે કનેક્ટ કરી શકાયું નથી. કૃપા કરીને ભૂલ લોગ તપાસો., -Error while installing package to site {0}. Please check Error Logs.,સાઇટ package 0} પર પેકેજ સ્થાપિત કરતી વખતે ભૂલ. કૃપા કરીને ભૂલ લોગ તપાસો., -Exporting,નિકાસ કરી રહ્યું છે, A field with the name '{}' already exists in doctype {}.,'{}' નામનું ક્ષેત્ર ડોકટાઇપ in already માં પહેલેથી જ અસ્તિત્વમાં છે., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,કસ્ટમ ફીલ્ડ {0} એડમિનિસ્ટ્રેટર દ્વારા બનાવવામાં આવ્યું છે અને તે ફક્ત એડમિનિસ્ટ્રેટર એકાઉન્ટ દ્વારા કા deletedી શકાય છે., Failed to send {0} Auto Email Report,{0} ઓટો ઇમેઇલ રિપોર્ટ મોકલવામાં નિષ્ફળ, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,પંક્તિ # {0}: કૃપા કરીને અનન્ય રીમોટ પરાધીનતા દસ્તાવેજ મેળવવા માટે ક્ષેત્ર {1 field ક્ષેત્ર માટે રીમોટ વેલ્યુ ફિલ્ટર્સ સેટ કરો., Paytm payment gateway settings,પેટીએમ ચુકવણી ગેટવે સેટિંગ્સ, "Company, Fiscal Year and Currency defaults","કંપની, નાણાકીય વર્ષ અને કરન્સી ડિફોલ્ટ", -Package,પેકેજ, -Import and Export Packages.,આયાત અને નિકાસ પેકેજો., Razorpay Signature Verification Failed,રેઝરપે સહી ચકાસણી નિષ્ફળ, Google Drive - Could not locate - {0},ગૂગલ ડ્રાઇવ - શોધી શક્યા નથી - {0, "Sync token was invalid and has been resetted, Retry syncing.","સમન્વયન ટોકન અમાન્ય હતું અને ફરીથી સેટ કરવામાં આવ્યું છે, ફરીથી સમન્વયન કરવાનો પ્રયાસ કરો.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,ડTકટાઇપ લિંક / ડ Docક Cannot edit filters for standard charts,માનક ચાર્ટ્સ માટે ફિલ્ટર્સ સંપાદિત કરી શકાતા નથી, Event Producer Last Update,ઇવેન્ટ નિર્માતા છેલ્લું અપડેટ, Default for 'Check' type of field {0} must be either '0' or '1',"'ચેક' પ્રકારનાં ક્ષેત્ર for 0 for માટે ડિફોલ્ટ, '0' અથવા '1' હોવું આવશ્યક છે", +Non Negative,નકારાત્મક, +Rules with higher priority number will be applied first.,ઉચ્ચ અગ્રતા નંબર સાથેના નિયમો પહેલા લાગુ કરવામાં આવશે., +Open URL in a New Tab,નવા ટ Tabબમાં URL ખોલો, +Align Right,જમણે સંરેખિત કરો, +Loading Filters...,ગાળકો લોડ કરી રહ્યું છે ..., +Count Customizations,કસ્ટમાઇઝેશન ગણતરી, +For Example: {} Open,ઉદાહરણ તરીકે: {} ખોલો, +Choose Existing Card or create New Card,હાલનું કાર્ડ પસંદ કરો અથવા નવું કાર્ડ બનાવો, +Number Cards,નંબર કાર્ડ્સ, +Function Based On,પર આધારિત કાર્ય, +Add Filters,ગાળકો ઉમેરો, +Skip,અવગણો, +Dismiss,કાismી નાખો, +Value cannot be negative for,મૂલ્ય નકારાત્મક હોઈ શકતું નથી, +Value cannot be negative for {0}: {1},મૂલ્ય {0 for માટે નકારાત્મક હોઈ શકતું નથી: {1}, +Negative Value,નકારાત્મક મૂલ્ય, +Authentication failed while receiving emails from Email Account: {0}.,ઇમેઇલ એકાઉન્ટથી ઇમેઇલ્સ પ્રાપ્ત કરતી વખતે પ્રમાણીકરણ નિષ્ફળ થયું: {0}., +Message from server: {0},સર્વરનો સંદેશ: {0}, diff --git a/frappe/translations/he.csv b/frappe/translations/he.csv index 07cd5a1ac5..c78ff6c556 100644 --- a/frappe/translations/he.csv +++ b/frappe/translations/he.csv @@ -499,7 +499,6 @@ Authenticating...,מאמת ..., Authentication,אימות, Authentication Apps you can use are: ,אפליקציות אימות בהן אתה יכול להשתמש הן:, Authentication Credentials,אישורי אימות, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},אימות נכשלה תוך קבלת הודעות דוא"ל מחשבון דוא"ל {0}. הודעה מהשרת: {1}, Authorization Code,קוד אימות, Authorize URL,אשר כתובת אתר, Authorized,מורשה, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,לא יכול לשנות docstatus 1-0, Cannot change header content,לא ניתן לשנות את תוכן הכותרת, Cannot change state of Cancelled Document. Transition row {0},לא יכול לשנות את המצב של מסמך בוטל. שורת מעבר {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,לא ניתן לשנות את פרטי המשתמש בהדגמה. אנא הירשם לחשבון חדש בכתובת https://erpnext.com, -Cannot connect: {0},לא ניתן להתחבר: {0}, Cannot create a {0} against a child document: {1},לא ניתן ליצור {0} נגד מסמך הילד: {1}, Cannot delete Home and Attachments folders,לא יכול למחוק את התיקיות וקבצים מצורפים בית, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,לא ניתן למחוק את הקובץ מכיוון שהוא שייך ל- {0} {1} שאין לך הרשאות עבורו, @@ -1139,7 +1137,6 @@ Font Size,גודל גופן, Fonts,גופנים, Footer,תחתונה, Footer HTML,כותרת תחתונה של HTML, -Footer Item,פריט תחתון, Footer Items,פריטים תחתונה, Footer will display correctly only in PDF,כותרת תחתונה תוצג כהלכה רק ב- PDF, For Document Type,לסוג המסמך, @@ -1149,7 +1146,6 @@ For Value,עבור ערך, "For currency {0}, the minimum transaction amount should be {1}","עבור מטבע {0}, סכום העסקה המינימלי צריך להיות {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"לדוגמא, אם תוכל לבטל ולתקן INV004 היא תהפוך לINV004-1 מסמך חדש. זה עוזר לך לעקוב אחר כל תיקון.", "For example: If you want to include the document ID, use {0}","לדוגמא: אם ברצונך לכלול זיהוי המסמך, השתמש {0}", -For top bar,לבר העליון, "For updating, you can update only selective columns.","לעדכון, אתה יכול לעדכן את עמודים רק סלקטיבית.", For {0} at level {1} in {2} in row {3},עבור {0} ברמת {1} {2} בשורת {3}, Force,כּוֹחַ, @@ -1201,7 +1197,6 @@ Google Calendar ID,מזהה יומן Google, Google Font,גופן של גוגל, Google Services,שירותי גוגל, Grant Type,סוג מענק, -Group Label,לייבל הקבוצה, Group Name,שם קבוצה, Group name cannot be empty.,שם הקבוצה לא יכול להיות ריק., Groups of DocTypes,קבוצות של DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,אנא אמת את כתובת הדוא"ל Point Allocation Periodicity,מחזוריות של הקצאת נקודה, Points,נקודות, Points Given,נקודות שניתנו, -Policy,מְדִינִיוּת, Port,נמל, Portal Menu,תפריט פורטל, Portal Menu Item,פריט תפריט פורטל, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,בחר רשומה לפחות 1 להדפסה, Select or drag across time slots to create a new event.,בחר או גרור על פני חריצי זמן כדי ליצור אירוע חדש., Select records for assignment,רשומות בחרו למשימה, -"Select target = ""_blank"" to open in a new page.","target = ""_blank"" בחר לפתוח בדף חדש.", Select the label after which you want to insert new field.,בחר את התווית לאחר שרצונך להוסיף שדה חדש., "Select your Country, Time Zone and Currency","בחר את המדינה, אזור הזמן ומטבע", Select {0},בחר {0}, @@ -2989,7 +2982,6 @@ star-empty,כוכבים ריקים, step-backward,צעד אחורה, step-forward,צעד קדימה, submitted this document,הגיש מסמך זה, -"target = ""_blank""","target = ""_blank""", text in document type,טקסט בסוג המסמך, text-height,טקסט גובה, text-width,text-רוחב, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,משהו השתבש במהלך דור האסימונים. לחץ על {0} כדי ליצור אחד חדש., Submit After Import,הגש לאחר הייבוא, Submitting...,הַגָשָׁה..., -Subscribed Documents,מסמכים מנויים, Success! You are good to go 👍,הַצלָחָה! אתה טוב ללכת 👍, Successful Transactions,עסקאות מוצלחות, Successfully Submitted!,הוגש בהצלחה!, @@ -3777,7 +3768,6 @@ Please specify,אנא ציין, Printing,הדפסה, Priority,עדיפות, Project,פרויקט, -Publish,לְפַרְסֵם, Quarterly,הרבעונים, Queued,בתור, Quick Entry,כניסה מהירה, @@ -4299,7 +4289,6 @@ Hide Border,הסתר גבול, Index Web Pages for Search,אינדקס דפי אינטרנט לחיפוש, Action / Route,פעולה / מסלול, Document Naming Rule,כלל שמות מסמכים, -Rules with higher priority will be applied first.,תחילה יוחלו כללים עם עדיפות גבוהה יותר., Rule Conditions,תנאי הכלל, Digits,ספרות, Example: 00001,דוגמה: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,כלי פרסום החבילה, Click on the row for accessing filters.,לחץ על השורה לגישה למסננים., Sites,אתרים, Last Deployed On,הועלה לאחרונה, -Last published {0},פורסם לאחרונה {0}, -Publishing documents...,מפרסם מסמכים ..., -Documents have been published.,מסמכים פורסמו., -Select Document Type.,בחר סוג מסמך., Console Log,יומן קונסולות, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","הגדר אפשרויות ברירת מחדל עבור כל התרשימים בלוח המחוונים הזה (לדוגמה: "צבעים": ["# d1d8dd", "# ff5858"])", Use Report Chart,השתמש בתרשים דוחות, @@ -4566,10 +4551,6 @@ Incorrect URL,כתובת אתר שגויה, Duplicate Name,שם כפול, "Please check the value of ""Fetch From"" set for field {0}",אנא בדוק את הערך של ההגדרה "אחזר מ-" עבור השדה {0}, Wrong Fetch From value,ערך אחזור שגוי, -Deploying,פריסה, -Couldn't connect to site {0}. Please check Error Logs.,לא ניתן היה להתחבר לאתר {0}. אנא בדוק יומני שגיאות., -Error while installing package to site {0}. Please check Error Logs.,שגיאה במהלך התקנת החבילה לאתר {0}. אנא בדוק יומני שגיאות., -Exporting,מייצא, A field with the name '{}' already exists in doctype {}.,שדה עם השם '{}' כבר קיים ב- doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,שדה מותאם אישית {0} נוצר על ידי מנהל המערכת וניתן למחוק אותו רק דרך חשבון מנהל המערכת., Failed to send {0} Auto Email Report,שליחת {0} דוח האימייל האוטומטי נכשלה, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,שורה מספר {0}: הגדר מסנני ערך מרוחקים עבור השדה {1} כדי להביא את מסמך התלות הרחוק הייחודי, Paytm payment gateway settings,הגדרות שער התשלומים של Paytm, "Company, Fiscal Year and Currency defaults","ברירות מחדל של חברה, שנת כספים ומטבע", -Package,חֲבִילָה, -Import and Export Packages.,יבוא וייצוא חבילות., Razorpay Signature Verification Failed,אימות החתימה של Razorpay נכשל, Google Drive - Could not locate - {0},כונן Google - לא ניתן היה לאתר - {0}, "Sync token was invalid and has been resetted, Retry syncing.","אסימון הסינכרון לא חוקי והוא אופס מחדש, נסה לסנכרן מחדש.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,עבור קישור DocType / Action DocType, Cannot edit filters for standard charts,לא ניתן לערוך מסננים עבור תרשימים סטנדרטיים, Event Producer Last Update,עדכון אחרון של מפיק האירועים, Default for 'Check' type of field {0} must be either '0' or '1',ברירת המחדל עבור סוג השדה 'בדוק' חייב להיות '0' או '1', +Non Negative,לא שלילי, +Rules with higher priority number will be applied first.,תחילה יוחלו כללים עם מספר עדיפות גבוה יותר., +Open URL in a New Tab,פתח את כתובת האתר בכרטיסייה חדשה, +Align Right,ליישור מימין, +Loading Filters...,טוען מסננים ..., +Count Customizations,ספירת התאמות אישיות, +For Example: {} Open,לדוגמא: {} פתח, +Choose Existing Card or create New Card,בחר כרטיס קיים או צור כרטיס חדש, +Number Cards,כרטיסי מספר, +Function Based On,פונקציה מבוססת על, +Add Filters,הוסף מסננים, +Skip,לדלג, +Dismiss,לשחרר, +Value cannot be negative for,הערך לא יכול להיות שלילי עבור, +Value cannot be negative for {0}: {1},הערך לא יכול להיות שלילי עבור {0}: {1}, +Negative Value,ערך שלילי, +Authentication failed while receiving emails from Email Account: {0}.,האימות נכשל בעת קבלת הודעות דוא"ל מחשבון הדוא"ל: {0}., +Message from server: {0},הודעה מהשרת: {0}, diff --git a/frappe/translations/hi.csv b/frappe/translations/hi.csv index c1b0771139..35b8ec1bd9 100644 --- a/frappe/translations/hi.csv +++ b/frappe/translations/hi.csv @@ -499,7 +499,6 @@ Authenticating...,प्रमाणित कर रहा है ..., Authentication,प्रमाणीकरण, Authentication Apps you can use are: ,प्रमाणीकरण वाले ऐप्स आप उपयोग कर सकते हैं:, Authentication Credentials,प्रमाणीकरण प्रमाणन, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},ईमेल खाता {0} से ईमेल प्राप्त करते हुए प्रमाणीकरण विफल। सर्वर से संदेश: {1}, Authorization Code,प्राधिकरण कोड, Authorize URL,अधिकृत यूआरएल, Authorized,अधिकृत, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,1-0 docstatus बदल नहीं सक Cannot change header content,हेडर सामग्री को बदल नहीं सकते, Cannot change state of Cancelled Document. Transition row {0},रद्द दस्तावेज़ के राज्य को बदल नहीं सकते ., Cannot change user details in demo. Please signup for a new account at https://erpnext.com,डेमो में उपयोगकर्ता विवरण बदल नहीं सकते कृपया https://erpnext.com पर एक नए खाते के लिए साइनअप करें, -Cannot connect: {0},कनेक्ट नहीं कर सकता: {0}, Cannot create a {0} against a child document: {1},नहीं बना सकते हैं एक {0} एक बच्चे दस्तावेज़ के खिलाफ: {1}, Cannot delete Home and Attachments folders,घर और संलग्नक फ़ोल्डरों नष्ट नहीं कर सकते, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,फ़ाइल को हटा नहीं सकते क्योंकि यह {0} {1} के लिए है जिसके लिए आपको अनुमति नहीं है, @@ -1139,7 +1137,6 @@ Font Size,फॉन्ट का आकार, Fonts,फ़ॉन्ट्स, Footer,पाद लेख, Footer HTML,पाद लेख HTML, -Footer Item,पाद मद, Footer Items,पाद लेख आइटम, Footer will display correctly only in PDF,केवल पीडीएफ में पाद सही ढंग से प्रदर्शित होगा, For Document Type,दस्तावेज़ प्रकार के लिए, @@ -1149,7 +1146,6 @@ For Value,मूल्य के लिए, "For currency {0}, the minimum transaction amount should be {1}","मुद्रा {0} के लिए, न्यूनतम लेनदेन राशि {1} होनी चाहिए", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,आप रद्द करने और INV004 में संशोधन उदाहरण के लिए यदि यह एक नया दस्तावेज़ INV004-1 बन जाएगा। यह आप प्रत्येक संशोधन का ट्रैक रखने में मदद करता है।, "For example: If you want to include the document ID, use {0}","उदाहरण के लिए: यदि आप दस्तावेज़ आईडी को शामिल करना चाहते हैं, का उपयोग करें {0}", -For top bar,शीर्ष पट्टी के लिए, "For updating, you can update only selective columns.","अद्यतन करने के लिए, आप केवल चुनिंदा कॉलम अपडेट कर सकते हैं।", For {0} at level {1} in {2} in row {3},के लिए {0} स्तर पर {1} में {2} पंक्ति में {3}, Force,बल, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google कैलेंडर ID, Google Font,Google फ़ॉन्ट, Google Services,Google सेवाएं, Grant Type,अनुदान के प्रकार, -Group Label,समूह लेबल, Group Name,समूह का नाम, Group name cannot be empty.,समूह का नाम रिक्त नहीं हो सकता।, Groups of DocTypes,Doctypes का समूह, @@ -1911,7 +1906,6 @@ Please verify your Email Address,अपना ईमेल एड्रेस Point Allocation Periodicity,बिंदु आवंटन आवधिकता, Points,अंक, Points Given,अंक दिए, -Policy,नीति, Port,बंदरगाह, Portal Menu,पोर्टल मेन्यू, Portal Menu Item,पोर्टल मेन्यू आइटम, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,मुद्रण के लिए कम से कम 1 रिकॉर्ड का चयन करें, Select or drag across time slots to create a new event.,का चयन करें या एक नई घटना बनाने के लिए टाइम स्लॉट भर में खींचें., Select records for assignment,काम के लिए चयन के रिकॉर्ड, -"Select target = ""_blank"" to open in a new page.","चुनने का लक्ष्य एक नया पेज में खोलने के लिए = "" _blank"" .", Select the label after which you want to insert new field.,लेबल का चयन करें जिसके बाद आप नए क्षेत्र सम्मिलित करना चाहते हैं., "Select your Country, Time Zone and Currency","अपने देश, समय क्षेत्र और मुद्रा का चयन करें", Select {0},चयन करें {0}, @@ -2989,7 +2982,6 @@ star-empty,सितारा खाली, step-backward,कदम से पिछड़े, step-forward,कदम आगे, submitted this document,इस दस्तावेज प्रस्तुत, -"target = ""_blank""",लक्ष्य = "_blank", text in document type,लेख दस्तावेज़ प्रकार, text-height,अक्षर-ऊंचाई, text-width,अक्षर-चौड़ाई, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,टोकन निर्माण के दौरान कुछ गलत हो गया। नया बनाने के लिए {0} पर क्लिक करें।, Submit After Import,आयात के बाद सबमिट करें, Submitting...,भेजने से ..., -Subscribed Documents,सब्स्क्राइब्ड दस्तावेज, Success! You are good to go 👍,सफलता! आप जाने के लिए अच्छे हैं 👍, Successful Transactions,सफल लेन-देन, Successfully Submitted!,सफलतापूर्वक प्रस्तुत किया गया!, @@ -3777,7 +3768,6 @@ Please specify,कृपया बताएं, Printing,मुद्रण, Priority,प्राथमिकता, Project,परियोजना, -Publish,प्रकाशित करना, Quarterly,त्रैमासिक, Queued,पंक्तिबद्ध, Quick Entry,त्वरित एंट्री, @@ -4299,7 +4289,6 @@ Hide Border,बॉर्डर छिपाएं, Index Web Pages for Search,खोज के लिए इंडेक्स वेब पेज, Action / Route,क्रिया / मार्ग, Document Naming Rule,दस्तावेज़ का नामकरण नियम, -Rules with higher priority will be applied first.,उच्च प्राथमिकता वाले नियम पहले लागू किए जाएंगे।, Rule Conditions,नियम की शर्तें, Digits,अंक, Example: 00001,उदाहरण: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,पैकेज प्रकाशित उपकरण, Click on the row for accessing filters.,फ़िल्टर तक पहुँचने के लिए पंक्ति पर क्लिक करें।, Sites,साइटें, Last Deployed On,अंतिम पर तैनात, -Last published {0},अंतिम प्रकाशित {0}, -Publishing documents...,दस्तावेज़ प्रकाशित कर रहा है ..., -Documents have been published.,दस्तावेज़ प्रकाशित किए गए हैं।, -Select Document Type.,दस्तावेज़ प्रकार का चयन करें।, Console Log,कंसोल लॉग, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","इस डैशबोर्ड पर सभी चार्ट के लिए डिफ़ॉल्ट विकल्प सेट करें (उदा: "रंग": ["# d1d8dd", "# ff5858"])", Use Report Chart,रिपोर्ट चार्ट का उपयोग करें, @@ -4566,10 +4551,6 @@ Incorrect URL,गलत URL, Duplicate Name,डुप्लिकेट नाम, "Please check the value of ""Fetch From"" set for field {0}",कृपया फ़ील्ड {0} के लिए "Fetch From" सेट का मान जांचें, Wrong Fetch From value,मूल्य से गलत बुत, -Deploying,परिनियोजित, -Couldn't connect to site {0}. Please check Error Logs.,साइट {0} से कनेक्ट नहीं किया जा सका। कृपया त्रुटि लॉग की जाँच करें।, -Error while installing package to site {0}. Please check Error Logs.,साइट {0} पर पैकेज स्थापित करते समय त्रुटि। कृपया त्रुटि लॉग की जाँच करें।, -Exporting,निर्यात, A field with the name '{}' already exists in doctype {}.,'{}' नाम का एक क्षेत्र पहले से ही doctype {} में मौजूद है।, Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,कस्टम फ़ील्ड {0} व्यवस्थापक द्वारा बनाया गया है और इसे केवल व्यवस्थापक खाते के माध्यम से हटाया जा सकता है।, Failed to send {0} Auto Email Report,{0} ऑटो ईमेल रिपोर्ट भेजने में विफल, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,पंक्ति # {0}: कृपया अनन्य दूरस्थ निर्भरता दस्तावेज़ लाने के लिए फ़ील्ड {1} के लिए दूरस्थ मान फ़िल्टर सेट करें, Paytm payment gateway settings,पेटीएम पेमेंट गेटवे सेटिंग्स, "Company, Fiscal Year and Currency defaults","कंपनी, वित्तीय वर्ष और मुद्रा चूक", -Package,पैकेज, -Import and Export Packages.,आयात और निर्यात पैकेज।, Razorpay Signature Verification Failed,रज़ोरपाय हस्ताक्षर सत्यापन विफल, Google Drive - Could not locate - {0},Google ड्राइव - पता नहीं लगा सका - {0}, "Sync token was invalid and has been resetted, Retry syncing.","समन्वयन टोकन अमान्य था और इसे रीसेट कर दिया गया है, फिर से सिंक करें।", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,DocType Link / DocType Action के लिए Cannot edit filters for standard charts,मानक चार्ट के लिए फ़िल्टर संपादित नहीं कर सकते, Event Producer Last Update,इवेंट प्रोड्यूसर लास्ट अपडेट, Default for 'Check' type of field {0} must be either '0' or '1',फ़ील्ड '0' के 'चेक' प्रकार के लिए डिफ़ॉल्ट या तो '0' या '1' होना चाहिए, +Non Negative,गैर नकारात्मक, +Rules with higher priority number will be applied first.,उच्च प्राथमिकता संख्या वाले नियम पहले लागू किए जाएंगे।, +Open URL in a New Tab,एक नया टैब में URL खोलें, +Align Right,सही संरेखित, +Loading Filters...,फ़िल्टर लोड कर रहा है ..., +Count Customizations,अनुकूलन की गणना करें, +For Example: {} Open,उदाहरण के लिए: {} खुला, +Choose Existing Card or create New Card,मौजूदा कार्ड चुनें या नया कार्ड बनाएं, +Number Cards,नंबर कार्ड, +Function Based On,पर आधारित समारोह, +Add Filters,फिल्टर जोड़ें, +Skip,छोड़ें, +Dismiss,खारिज, +Value cannot be negative for,मान के लिए ऋणात्मक नहीं हो सकता, +Value cannot be negative for {0}: {1},मान {0}: {1} के लिए ऋणात्मक नहीं हो सकता, +Negative Value,ऋणात्मक मान, +Authentication failed while receiving emails from Email Account: {0}.,ईमेल खाते से ईमेल प्राप्त करते समय प्रमाणीकरण विफल रहा: {0}।, +Message from server: {0},सर्वर से संदेश: {0}, diff --git a/frappe/translations/hr.csv b/frappe/translations/hr.csv index b503d78eb6..ff9cf5453a 100644 --- a/frappe/translations/hr.csv +++ b/frappe/translations/hr.csv @@ -499,7 +499,6 @@ Authenticating...,Autentikacija ..., Authentication,Ovjera, Authentication Apps you can use are: ,Aplikacije za provjeru autentičnosti koje možete koristiti su:, Authentication Credentials,Potvrde vjerodostojnosti, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Provjera autentičnosti nije uspjela kod primanja emailova sa računa {0}. Poruka od poslužitelja: {1}, Authorization Code,Autorizacijski kod, Authorize URL,Autoriziraj URL, Authorized,Odobreno, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Ne mogu promijeniti docstatus 1-0, Cannot change header content,Nije moguće promijeniti sadržaj zaglavlja, Cannot change state of Cancelled Document. Transition row {0},Ne možeš promijeniti stanje poništenog dokumenta., Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Nije moguće promijeniti podatke o korisniku u demo. Prijavite se za novi račun na https://erpnext.com, -Cannot connect: {0},Ne mogu se spojiti: {0}, Cannot create a {0} against a child document: {1},Ne mogu stvoriti {0} protiv dječje dokumenta: {1}, Cannot delete Home and Attachments folders,Ne možete izbrisati Home i privitke mape, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Nije moguće izbrisati datoteku jer pripada {0} {1} za koju nemate dopuštenja, @@ -1139,7 +1137,6 @@ Font Size,Veličina fonta, Fonts,Fontovi, Footer,Footer, Footer HTML,HTML podnožja |, -Footer Item,Podnožje predmeta, Footer Items,Footer Proizvodi, Footer will display correctly only in PDF,Footer će prikazati ispravno samo u PDF-u, For Document Type,Za vrstu dokumenta, @@ -1149,7 +1146,6 @@ For Value,Za vrijednost, "For currency {0}, the minimum transaction amount should be {1}","Za valutu {0}, iznos minimalne transakcije trebao bi biti {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Na primjer, ako ste odustali i dopuniti INV004 će postati novi dokument INV004-1. To vam pomaže da pratimo svaku izmjenu i dopunu.", "For example: If you want to include the document ID, use {0}","Na primjer: Ako želite uključiti ID dokumenta, upotrijebite {0}", -For top bar,Na gornjoj traci, "For updating, you can update only selective columns.","Za ažuriranje, možete ažurirati samo selektivne stupce.", For {0} at level {1} in {2} in row {3},Za {0} na razini {1} u {2} u redu {3}, Force,Sila, @@ -1201,7 +1197,6 @@ Google Calendar ID,ID Google kalendara, Google Font,Google Font, Google Services,Google usluge, Grant Type,Vrsta Grant, -Group Label,Grupa Label, Group Name,Grupno ime, Group name cannot be empty.,Naziv grupe ne može biti prazan., Groups of DocTypes,Skupine DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Potvrdite svoju adresu e-pošte, Point Allocation Periodicity,Periodičnost raspodjele točke, Points,točke, Points Given,Dane bodove, -Policy,Politika, Port,Port, Portal Menu,Portal Izbornik, Portal Menu Item,Portal Izbornička stavka, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Odaberite barem 1 zapis za ispis, Select or drag across time slots to create a new event.,Odaberite ili povucite preko minutaže stvoriti novi događaj., Select records for assignment,Odaberite zapisi za dodjelu, -"Select target = ""_blank"" to open in a new page.","Select target = "" _blank "" otvara se u novu stranicu .", Select the label after which you want to insert new field.,Odaberite oznaku nakon što želite umetnuti novo polje., "Select your Country, Time Zone and Currency","Odaberite svoju zemlju, vremensku zonu i valutu", Select {0},Odaberite {0}, @@ -2989,7 +2982,6 @@ star-empty,zvijezda-prazna, step-backward,korak unatrag, step-forward,korak naprijed, submitted this document,podnosi ovaj dokument, -"target = ""_blank""",target = "_blank", text in document type,Tekst u vrsti dokumenta, text-height,tekst-visina, text-width,tekst širine, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Nešto je pošlo po zlu tijekom generacije tokena. Kliknite {0} da biste generirali novi., Submit After Import,Pošaljite nakon uvoza, Submitting...,Slanje ..., -Subscribed Documents,Pretplaćeni dokumenti, Success! You are good to go 👍,Uspjeh! Ti si dobar to, Successful Transactions,Uspješne transakcije, Successfully Submitted!,Uspješno poslano!, @@ -3777,7 +3768,6 @@ Please specify,Navedite, Printing,Tiskanje, Priority,Prioritet, Project,Projekt, -Publish,Objaviti, Quarterly,Tromjesečni, Queued,Čekanju, Quick Entry,Brzi Ulaz, @@ -4299,7 +4289,6 @@ Hide Border,Sakrij granicu, Index Web Pages for Search,Indeksirajte web stranice za pretraživanje, Action / Route,Akcija / ruta, Document Naming Rule,Pravilo imenovanja dokumenata, -Rules with higher priority will be applied first.,Prvo će se primijeniti pravila s većim prioritetom., Rule Conditions,Uvjeti pravila, Digits,Znamenke, Example: 00001,Primjer: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Alat za objavljivanje paketa, Click on the row for accessing filters.,Kliknite redak za pristup filtrima., Sites,Stranice, Last Deployed On,Posljednja primjena dana, -Last published {0},Posljednji put objavljeno {0}, -Publishing documents...,Objavljivanje dokumenata ..., -Documents have been published.,Dokumenti su objavljeni., -Select Document Type.,Odaberite vrstu dokumenta., Console Log,Zapisnik konzole, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Postavite zadane opcije za sve grafikone na ovoj nadzornoj ploči (Primjer: "boje": ["# d1d8dd", "# ff5858"])", Use Report Chart,Koristite grafikon izvješća, @@ -4566,10 +4551,6 @@ Incorrect URL,Pogrešan URL, Duplicate Name,Dvostruki naziv, "Please check the value of ""Fetch From"" set for field {0}",Molimo provjerite vrijednost polja "Dohvati iz" za polje {0}, Wrong Fetch From value,Pogrešno dohvaćanje iz vrijednosti, -Deploying,Raspoređivanje, -Couldn't connect to site {0}. Please check Error Logs.,Povezivanje s web-lokacijom {0} nije uspjelo. Molimo provjerite zapisnike pogrešaka., -Error while installing package to site {0}. Please check Error Logs.,Pogreška prilikom instaliranja paketa na web lokaciju {0}. Molimo provjerite zapisnike pogrešaka., -Exporting,Izvoz, A field with the name '{}' already exists in doctype {}.,Polje s imenom "{}" već postoji u doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Prilagođeno polje {0} kreira administrator i može ga izbrisati samo putem administratorskog računa., Failed to send {0} Auto Email Report,Slanje {0} automatskog izvješća e-poštom nije uspjelo, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Redak {0}: postavite filtre udaljene vrijednosti za polje {1} da biste preuzeli jedinstveni dokument o udaljenoj ovisnosti, Paytm payment gateway settings,Postavke pristupnika za plaćanje Paytm, "Company, Fiscal Year and Currency defaults","Zadani zadaci za tvrtku, fiskalnu godinu i valutu", -Package,Paket, -Import and Export Packages.,Uvoz i izvoz paketa., Razorpay Signature Verification Failed,Nije uspjela provjera potpisa Razorpay-a, Google Drive - Could not locate - {0},Google pogon - Nije moguće pronaći - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Token za sinkronizaciju nije važeći i resetiran je, pokušajte ponovo sinkronizirati.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Za vezu DocType / DocType Action, Cannot edit filters for standard charts,Nije moguće urediti filtre za standardne ljestvice, Event Producer Last Update,Posljednje ažuriranje proizvođača događaja, Default for 'Check' type of field {0} must be either '0' or '1',Zadano za vrstu polja "Check" {0} mora biti "0" ili "1", +Non Negative,Negativno, +Rules with higher priority number will be applied first.,Prvo će se primijeniti pravila s većim prioritetom., +Open URL in a New Tab,Otvorite URL na novoj kartici, +Align Right,Poravnajte udesno, +Loading Filters...,Učitavanje filtara ..., +Count Customizations,Brojanje prilagodbi, +For Example: {} Open,Na primjer: {} Otvori, +Choose Existing Card or create New Card,Odaberite postojeću karticu ili stvorite novu karticu, +Number Cards,Karte s brojevima, +Function Based On,Funkcija temeljena na, +Add Filters,Dodaj filtre, +Skip,Preskočiti, +Dismiss,Odbaciti, +Value cannot be negative for,Vrijednost ne može biti negativna za, +Value cannot be negative for {0}: {1},Vrijednost ne može biti negativna za {0}: {1}, +Negative Value,Negativna vrijednost, +Authentication failed while receiving emails from Email Account: {0}.,Autentifikacija nije uspjela tijekom primanja e-pošte s računa e-pošte: {0}., +Message from server: {0},Poruka s poslužitelja: {0}, diff --git a/frappe/translations/hu.csv b/frappe/translations/hu.csv index 02e1b82a33..83e292b672 100644 --- a/frappe/translations/hu.csv +++ b/frappe/translations/hu.csv @@ -499,7 +499,6 @@ Authenticating...,Hitelesítés ..., Authentication,Hitelesítés, Authentication Apps you can use are: ,Hitelesítési alkalmazások:, Authentication Credentials,Hitelesítési adatok, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Sikertelen hitelesítés miközben e-maileket fogad a következő e-mail fiókról: {0}. Üzenet a szerverről: {1}, Authorization Code,Hitelesítő kód, Authorize URL,Hitelesítő URL, Authorized,Hitelesített, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Nem lehet megváltoztatni docstatus 1 -ről Cannot change header content,A fejléc tartalma nem változtaható, Cannot change state of Cancelled Document. Transition row {0},Nem lehet megváltoztatni a Törölt dokumentum állapotát. Átvezetési sor {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Nem lehet megváltoztatni a felhasználói adatokat a demoban. Kérjük regisztráljon egy új fiókot itt: https://erpnext.com, -Cannot connect: {0},Nem lehet csatlakozni: {0}, Cannot create a {0} against a child document: {1},Nem lehet létrehozni egy: {0} az aldokumentumhoz: {1}, Cannot delete Home and Attachments folders,Nem lehet törölni a Főoldal és a Csatolmányok mappát, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Nem lehet törölni a fájlt mert hozzátartozik ehhez: {0} {1}, amelyhez nincs engedélye", @@ -1139,7 +1137,6 @@ Font Size,Betűméret, Fonts,betűtípusok, Footer,Lábléc, Footer HTML,Lábléc HTML, -Footer Item,Lábléc elem, Footer Items,Lábléc elemek, Footer will display correctly only in PDF,A lábléc csak PDF formátumban jelenik meg helyesen, For Document Type,A dokumentum típusához, @@ -1149,7 +1146,6 @@ For Value,Értékért, "For currency {0}, the minimum transaction amount should be {1}",A {0} pénznem esetében a minimális tranzakciós összeg: {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Például ha törli, és módosítja SZLA004, akkor az egy új dokumentumot lesz: SZLA004-1. Ez segít nyomon követni az egyes módosításokat.", "For example: If you want to include the document ID, use {0}","Például: Ha hozzá szeretné fúzni a dokumentum ID azonosítót, használja ezt: {0}", -For top bar,A felső sávhoz, "For updating, you can update only selective columns.","Frissítésére, frissítheti csak szelektív oszlopokat lehet.", For {0} at level {1} in {2} in row {3},{0} -hoz a {1} szinten a {2} -ben a {3} sorban, Force,Eröltesse, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google naptár azonosító ID, Google Font,Google betűtípus, Google Services,Google szolgáltatások, Grant Type,Típus támogatása, -Group Label,Csoport felirat, Group Name,Csoport neve, Group name cannot be empty.,A csoport neve nem lehet üres., Groups of DocTypes,DOCTYPES csoportjai, @@ -1911,7 +1906,6 @@ Please verify your Email Address,"Kérjük, ellenőrizze az e-mail címét", Point Allocation Periodicity,A pontok kiosztásának periodikussága, Points,Pont, Points Given,Pontok megadva, -Policy,Irányelv, Port,Port, Portal Menu,Portál Menü, Portal Menu Item,Portál menüpont, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Válasszon ki legalább 1 bejegyzés a nyomtatáshoz, Select or drag across time slots to create a new event.,Válassza ki vagy húzza át az időkereteket egy új esemény létrehozásához., Select records for assignment,Válasszon ki rekordokat hozzárendeléshez, -"Select target = ""_blank"" to open in a new page.","Válasszon célt = ""_blank"" egy új oldalon megjelenítéshez", Select the label after which you want to insert new field.,"Válassza ki a címkét, amely után be szeretné szúrni az új területet.", "Select your Country, Time Zone and Currency","Válassza ki országát, időzóna és a pénznemét", Select {0},Válassza ki a {0}, @@ -2989,7 +2982,6 @@ star-empty,csillag-üres, step-backward,visszalépés, step-forward,előrelépés, submitted this document,benyújtotta ezt a dokumentumot, -"target = ""_blank""","target = ""_blank""", text in document type,szöveg dokumentum típusban, text-height,szöveg-magasság, text-width,szöveg-szélesség, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Valami rosszra ment a token generáció során. Kattintson a (z) {0} elemre egy új létrehozásához., Submit After Import,Küldés importálás után, Submitting...,Beküldés ..., -Subscribed Documents,Feliratkozott dokumentumok, Success! You are good to go 👍,Siker! Jó vagy menni 👍, Successful Transactions,Sikeres tranzakciók, Successfully Submitted!,Sikeresen beküldve!, @@ -3777,7 +3768,6 @@ Please specify,"Kérjük, határozza meg", Printing,Nyomtatás, Priority,Prioritás, Project,Projekt téma, -Publish,közzétesz, Quarterly,Negyedévenként, Queued,Sorba állított, Quick Entry,Gyors bevitel, @@ -4299,7 +4289,6 @@ Hide Border,Határ elrejtése, Index Web Pages for Search,Tárgymutató keresési weboldalak, Action / Route,Művelet / Útvonal, Document Naming Rule,Dokumentum elnevezési szabály, -Rules with higher priority will be applied first.,Először a magasabb prioritású szabályokat kell alkalmazni., Rule Conditions,Szabályfeltételek, Digits,Számjegyek, Example: 00001,Példa: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Package Publish Tool, Click on the row for accessing filters.,Kattintson a sorra a szűrők eléréséhez., Sites,Webhelyek, Last Deployed On,Utoljára telepítve, -Last published {0},Utoljára megjelent: {0}, -Publishing documents...,Dokumentumok közzététele ..., -Documents have been published.,Dokumentumok megjelentek., -Select Document Type.,Válassza a Dokumentum típus lehetőséget., Console Log,Konzolnapló, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Alapértelmezett beállítások megadása ezen az irányítópulton az összes diagramhoz (pl .: "színek": ["# d1d8dd", "# ff5858"])", Use Report Chart,Jelentési diagram használata, @@ -4566,10 +4551,6 @@ Incorrect URL,Helytelen URL, Duplicate Name,Ismétlődő név, "Please check the value of ""Fetch From"" set for field {0}","Kérjük, ellenőrizze a (z) {0} mező számára beállított "Fetch From" értékét", Wrong Fetch From value,Helytelen lekérés értékből, -Deploying,Telepítés, -Couldn't connect to site {0}. Please check Error Logs.,Nem sikerült csatlakozni a (z) {0} webhelyhez. Ellenőrizze a hibanaplókat., -Error while installing package to site {0}. Please check Error Logs.,Hiba történt a csomag telepítésekor a (z) {0} webhelyre. Ellenőrizze a hibanaplókat., -Exporting,Exportálás, A field with the name '{}' already exists in doctype {}.,A „{}” nevű mező már létezik a doctype {} mezőben., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,"A (z) {0} egyéni mezőt a rendszergazda hozta létre, és csak a rendszergazdai fiókkal törölhető.", Failed to send {0} Auto Email Report,Nem sikerült elküldeni az {0} automatikus e-mail jelentést, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,"{0} sor: Kérjük, állítsa be a távértékérték szűrőket a (z) {1} mezőhöz az egyedi távoli függőségi dokumentum beolvasásához", Paytm payment gateway settings,Paytm fizetési átjáró beállításai, "Company, Fiscal Year and Currency defaults","A vállalat, a pénzügyi év és a pénznem alapértelmezett értékei", -Package,Csomag, -Import and Export Packages.,Csomagok importálása és exportálása., Razorpay Signature Verification Failed,A Razorpay aláírás ellenőrzése nem sikerült, Google Drive - Could not locate - {0},Google Drive - Nem található - {0}, "Sync token was invalid and has been resetted, Retry syncing.","A szinkronizálási token érvénytelen volt, és alaphelyzetbe állították. Próbálja újra a szinkronizálást.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,A DocType Link / DocType művelethez, Cannot edit filters for standard charts,A szokásos diagramok szűrői nem szerkeszthetők, Event Producer Last Update,Az Event Producer utolsó frissítése, Default for 'Check' type of field {0} must be either '0' or '1',A „Check” mező típusának alapértelmezett értéke {0} vagy „0” vagy „1”, +Non Negative,Nem negatív, +Rules with higher priority number will be applied first.,Először a magasabb prioritású számokat alkalmazzák., +Open URL in a New Tab,Nyissa meg az URL-t egy új lapon, +Align Right,Igazítsa jobbra, +Loading Filters...,Szűrők betöltése ..., +Count Customizations,Számolja a testreszabásokat, +For Example: {} Open,Például: {} Megnyitás, +Choose Existing Card or create New Card,"Válassza a Meglévő kártya lehetőséget, vagy hozzon létre Új kártyát", +Number Cards,Számkártyák, +Function Based On,Funkció alapján, +Add Filters,Szűrők hozzáadása, +Skip,Ugrás, +Dismiss,Elvetés, +Value cannot be negative for,Az érték nem lehet negatív a következőre:, +Value cannot be negative for {0}: {1},Az érték nem lehet negatív a következőnél: {0}: {1}, +Negative Value,Negatív érték, +Authentication failed while receiving emails from Email Account: {0}.,"A hitelesítés meghiúsult, amikor e-maileket kapott az e-mail fiókból: {0}.", +Message from server: {0},Üzenet a szerverről: {0}, diff --git a/frappe/translations/id.csv b/frappe/translations/id.csv index e767358893..6207ecaa05 100644 --- a/frappe/translations/id.csv +++ b/frappe/translations/id.csv @@ -499,7 +499,6 @@ Authenticating...,Mengautentikasi ..., Authentication,pembuktian keaslian, Authentication Apps you can use are: ,Aplikasi Otentikasi yang dapat Anda gunakan adalah:, Authentication Credentials,Kredensial Otentikasi, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Otentikasi gagal saat menerima surel dari Akun surel {0}. Pesan dari server: {1}, Authorization Code,Kode otorisasi, Authorize URL,Otorisasi URL, Authorized,resmi, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Tidak dapat mengubah docstatus dari 1 ke 0, Cannot change header content,Tidak dapat mengubah konten header, Cannot change state of Cancelled Document. Transition row {0},Tidak dapat mengubah keadaan Dibatalkan Dokumen. Transisi baris {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Tidak dapat mengubah detail pengguna di demo. Silakan mendaftar untuk akun baru di https://erpnext.com, -Cannot connect: {0},Tidak dapat terhubung: {0}, Cannot create a {0} against a child document: {1},tidak dapat membuat {0} terhadap dokumen anak: {1}, Cannot delete Home and Attachments folders,Tidak dapat menghapus Rumah dan Lampiran folder, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Tidak dapat menghapus file seperti milik {0} {1} yang tidak memiliki izin, @@ -1139,7 +1137,6 @@ Font Size,Font Size, Fonts,Font, Footer,Footer, Footer HTML,Footer HTML, -Footer Item,Footer Barang, Footer Items,Footer Items, Footer will display correctly only in PDF,Footer akan ditampilkan dengan benar hanya dalam PDF, For Document Type,Untuk Jenis Dokumen, @@ -1149,7 +1146,6 @@ For Value,Untuk nilai, "For currency {0}, the minimum transaction amount should be {1}","Untuk mata uang {0}, jumlah transaksi minimum harus {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,Misalnya jika Anda membatalkan dan mengubah INV004 itu akan menjadi INV004-1 dokumen baru. Ini akan membantu Anda untuk melacak setiap perubahan., "For example: If you want to include the document ID, use {0}","Sebagai contoh: Jika Anda ingin memasukkan ID dokumen, gunakan {0}", -For top bar,Untuk top bar, "For updating, you can update only selective columns.","Untuk memperbarui, Anda hanya dapat memperbarui kolom tertentu.", For {0} at level {1} in {2} in row {3},Untuk {0} pada tingkat {1} dalam {2} berturut-turut {3}, Force,Memaksa, @@ -1201,7 +1197,6 @@ Google Calendar ID,ID Kalender Google, Google Font,Google Font, Google Services,Layanan Google, Grant Type,Jenis Donasi, -Group Label,kelompok Label, Group Name,Nama grup, Group name cannot be empty.,Nama grup tidak boleh kosong., Groups of DocTypes,Kelompok Doctypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Harap verifikasi Alamat Email Anda, Point Allocation Periodicity,Titik Alokasi Periode, Points,Poin, Points Given,Poin yang Diberikan, -Policy,Kebijakan, Port,Port, Portal Menu,Portal menu, Portal Menu Item,Portal Menu Item, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Pilih minimal 1 record untuk pencetakan, Select or drag across time slots to create a new event.,Pilih atau seret di slot waktu untuk membuat acara baru., Select records for assignment,Pilih catatan untuk tugas, -"Select target = ""_blank"" to open in a new page.","Pilih target = ""_blank"" untuk membuka di halaman baru.", Select the label after which you want to insert new field.,Pilih label setelah itu Anda ingin memasukkan bidang baru., "Select your Country, Time Zone and Currency","Pilih Negara Anda, Zona Waktu dan Mata Uang", Select {0},Pilih {0}, @@ -2989,7 +2982,6 @@ star-empty,Bintang-kosong, step-backward,langkah-mundur, step-forward,langkah-maju, submitted this document,disampaikan dokumen ini, -"target = ""_blank""","target = ""_blank""", text in document type,teks dalam tipe dokumen, text-height,text-height, text-width,text-width, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Sesuatu yang salah terjadi selama pembuatan token. Klik pada {0} untuk menghasilkan yang baru., Submit After Import,Kirim Setelah Impor, Submitting...,Mengirimkan ..., -Subscribed Documents,Dokumen Berlangganan, Success! You are good to go 👍,Keberhasilan! Anda baik untuk pergi 👍, Successful Transactions,Transaksi yang berhasil, Successfully Submitted!,Berhasil Diserahkan!, @@ -3777,7 +3768,6 @@ Please specify,Silakan tentukan, Printing,Pencetakan, Priority,Prioritas, Project,Proyek, -Publish,Menerbitkan, Quarterly,Triwulan, Queued,Diantrikan, Quick Entry,Entri Cepat, @@ -4299,7 +4289,6 @@ Hide Border,Sembunyikan Perbatasan, Index Web Pages for Search,Indeks Halaman Web untuk Pencarian, Action / Route,Tindakan / Rute, Document Naming Rule,Aturan Penamaan Dokumen, -Rules with higher priority will be applied first.,Aturan dengan prioritas lebih tinggi akan diterapkan terlebih dahulu., Rule Conditions,Ketentuan Aturan, Digits,Digit, Example: 00001,Contoh: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Paket Alat Publikasikan, Click on the row for accessing filters.,Klik pada baris untuk mengakses filter., Sites,Situs, Last Deployed On,Terakhir Diterapkan Pada, -Last published {0},Terakhir diterbitkan {0}, -Publishing documents...,Menerbitkan dokumen ..., -Documents have been published.,Dokumen telah diterbitkan., -Select Document Type.,Pilih Jenis Dokumen., Console Log,Log Konsol, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Tetapkan Opsi Default untuk semua bagan di Dasbor ini (Mis: "warna": ["# d1d8dd", "# ff5858"])", Use Report Chart,Gunakan Diagram Laporan, @@ -4566,10 +4551,6 @@ Incorrect URL,URL salah, Duplicate Name,Nama Duplikat, "Please check the value of ""Fetch From"" set for field {0}",Harap periksa nilai set "Ambil Dari" untuk bidang {0}, Wrong Fetch From value,Nilai Ambil Dari Salah, -Deploying,Menerapkan, -Couldn't connect to site {0}. Please check Error Logs.,Tidak dapat terhubung ke situs {0}. Silakan periksa Log Kesalahan., -Error while installing package to site {0}. Please check Error Logs.,Galat saat memasang paket ke situs {0}. Silakan periksa Log Kesalahan., -Exporting,Mengekspor, A field with the name '{}' already exists in doctype {}.,Bidang dengan nama '{}' sudah ada di doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Bidang Khusus {0} dibuat oleh Administrator dan hanya dapat dihapus melalui akun Administrator., Failed to send {0} Auto Email Report,Gagal mengirim {0} Laporan Email Otomatis, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Baris # {0}: Harap setel filter nilai jarak jauh untuk bidang {1} untuk mengambil dokumen ketergantungan jarak jauh yang unik, Paytm payment gateway settings,Pengaturan gateway pembayaran paytm, "Company, Fiscal Year and Currency defaults","Perusahaan, Tahun Fiskal dan Default Mata Uang", -Package,Paket, -Import and Export Packages.,Paket Impor dan Ekspor., Razorpay Signature Verification Failed,Verifikasi Tanda Tangan Razorpay Gagal, Google Drive - Could not locate - {0},Google Drive - Tidak dapat menemukan - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Token sinkronisasi tidak valid dan telah disetel ulang, Coba sinkronkan lagi.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Untuk Tautan DocType / Tindakan DocType, Cannot edit filters for standard charts,Tidak dapat mengedit filter untuk bagan standar, Event Producer Last Update,Pembaruan Terakhir Produser Acara, Default for 'Check' type of field {0} must be either '0' or '1',Default untuk jenis bidang 'Cek' {0} harus berupa '0' atau '1', +Non Negative,Non Negatif, +Rules with higher priority number will be applied first.,Aturan dengan nomor prioritas lebih tinggi akan diterapkan terlebih dahulu., +Open URL in a New Tab,Buka URL di Tab Baru, +Align Right,Rata kanan, +Loading Filters...,Memuat Filter ..., +Count Customizations,Hitung Kustomisasi, +For Example: {} Open,Misalnya: {} Buka, +Choose Existing Card or create New Card,Pilih Kartu yang Ada atau buat Kartu Baru, +Number Cards,Kartu Nomor, +Function Based On,Fungsi Berdasarkan, +Add Filters,Tambahkan Filter, +Skip,Melewatkan, +Dismiss,Memberhentikan, +Value cannot be negative for,Nilai tidak boleh negatif untuk, +Value cannot be negative for {0}: {1},Nilai tidak boleh negatif untuk {0}: {1}, +Negative Value,Nilai Negatif, +Authentication failed while receiving emails from Email Account: {0}.,Autentikasi gagal saat menerima email dari Akun Email: {0}., +Message from server: {0},Pesan dari server: {0}, diff --git a/frappe/translations/is.csv b/frappe/translations/is.csv index 5fb65a9a92..c06065b120 100644 --- a/frappe/translations/is.csv +++ b/frappe/translations/is.csv @@ -499,7 +499,6 @@ Authenticating...,Sannvottun ..., Authentication,Auðkenning, Authentication Apps you can use are: ,Staðfestingarforrit sem þú getur notað eru:, Authentication Credentials,Auðkenningar persónuskilríki, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Auðkenning mistókst meðan að fá tölvupóst frá netfangs {0}. Skilaboð frá miðlara: {1}, Authorization Code,heimild Code, Authorize URL,Leyfa vefslóð, Authorized,Leyft, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Get ekki breytt docstatus frá 1 til 0, Cannot change header content,Ekki er hægt að breyta innihaldi haus, Cannot change state of Cancelled Document. Transition row {0},Getur ekki breytt stöðu hætt við skjali. Umskipti róður {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Ekki er hægt að breyta notendaupplýsingum í kynningu. Vinsamlegast skráðu þig inn fyrir nýja reikning á https://erpnext.com, -Cannot connect: {0},Get ekki tengst: {0}, Cannot create a {0} against a child document: {1},Get ekki búið til {0} gegn barni skjali: {1}, Cannot delete Home and Attachments folders,Ekki hægt að eyða Heimili og viðhengi möppur, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Ekki er hægt að eyða skrá þar sem það tilheyrir {0} {1} sem þú hefur ekki heimild til, @@ -1139,7 +1137,6 @@ Font Size,Leturstærð, Fonts,Skírnarfontur, Footer,Footer, Footer HTML,Footer HTML, -Footer Item,Footer Item, Footer Items,Footer Items, Footer will display correctly only in PDF,Footer mun aðeins birtast rétt á PDF skjali, For Document Type,Fyrir gerð skjals, @@ -1149,7 +1146,6 @@ For Value,Fyrir gildi, "For currency {0}, the minimum transaction amount should be {1}",Fyrir gjaldmiðil {0} skal lágmarks viðskipta upphæð vera {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,Til dæmis ef þú hætta við og breyta INV004 það mun verða nýtt skjal INV004-1. Þetta hjálpar þér að halda utan um hvert breytingu., "For example: If you want to include the document ID, use {0}","Til dæmis: Ef þú vilt að fela skjalskenni, nota {0}", -For top bar,Fyrir toppur bar, "For updating, you can update only selective columns.","Fyrir uppfærslu, getur þú uppfærir bara sértækur dálkum.", For {0} at level {1} in {2} in row {3},Fyrir {0} á vettvangi {1} í {2} í röð {3}, Force,Force, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Dagatal ID, Google Font,Google leturgerð, Google Services,Google þjónustu, Grant Type,Grant Type, -Group Label,Group Label, Group Name,Heiti hóps, Group name cannot be empty.,Heiti hóps getur ekki verið tómt., Groups of DocTypes,Hópar DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Vinsamlegast staðfestu netfangið þitt, Point Allocation Periodicity,Tímabil úthlutunar liða, Points,Stig, Points Given,Stig gefin, -Policy,stefna, Port,Port, Portal Menu,Portal Matseðill, Portal Menu Item,Portal Menu Item, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Veldu atleast 1 skrá til prentunar, Select or drag across time slots to create a new event.,Veldu eða draga yfir tímarásir til að búa til nýja atburði., Select records for assignment,Valið færslur fyrir verkefni, -"Select target = ""_blank"" to open in a new page.",Veldu target = "_blank" til að opna í nýja síðu., Select the label after which you want to insert new field.,Veldu merkimiða eftir sem þú vilt að setja nýja sviði., "Select your Country, Time Zone and Currency","Veldu landið þitt, tímabelti og gjaldmiðli", Select {0},Veldu {0}, @@ -2989,7 +2982,6 @@ star-empty,stjörnu-tómt, step-backward,skref-afturábak, step-forward,skref áfram, submitted this document,lögð þessu skjali, -"target = ""_blank""",target = "_blank", text in document type,Textinn í skjalinu tegund, text-height,texti-hæð, text-width,texti-breidd, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Eitthvað fór úrskeiðis á táknmyndinni. Smelltu á {0} til að búa til nýjan., Submit After Import,Sendu inn eftir innflutning, Submitting...,Sendir inn ..., -Subscribed Documents,Áskrift skjöl, Success! You are good to go 👍,Árangur! Þú ert góður að fara 👍, Successful Transactions,Árangursrík viðskipti, Successfully Submitted!,Fram tókst!, @@ -3777,7 +3768,6 @@ Please specify,vinsamlegast tilgreindu, Printing,Prentun, Priority,Forgangur, Project,Project, -Publish,Birta, Quarterly,ársfjórðungslega, Queued,biðröð, Quick Entry,Quick Entry, @@ -4299,7 +4289,6 @@ Hide Border,Fela landamæri, Index Web Pages for Search,Veftré vefsíður fyrir leit, Action / Route,Aðgerð / Leið, Document Naming Rule,Regla um heiti skjala, -Rules with higher priority will be applied first.,Reglum með meiri forgangs verður beitt fyrst., Rule Conditions,Regluskilyrði, Digits,Tölur, Example: 00001,Dæmi: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Pakkabirtingartól, Click on the row for accessing filters.,Smelltu á línuna til að fá aðgang að síum., Sites,Síður, Last Deployed On,Síðast sett á, -Last published {0},Síðast birt {0}, -Publishing documents...,Birtir skjöl ..., -Documents have been published.,Skjöl hafa verið birt., -Select Document Type.,Veldu skjalategund., Console Log,Console Log, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Stilltu sjálfgefna valkosti fyrir öll töflur á þessu mælaborði (td: "litir": ["# d1d8dd", "# ff5858"])", Use Report Chart,Notaðu skýrslutöflu, @@ -4566,10 +4551,6 @@ Incorrect URL,Rangt vefslóð, Duplicate Name,Afrit nafn, "Please check the value of ""Fetch From"" set for field {0}",Vinsamlegast athugaðu gildi „Sótt frá“ sett fyrir reitinn {0}, Wrong Fetch From value,Rangt sókn frá gildi, -Deploying,Dreifing, -Couldn't connect to site {0}. Please check Error Logs.,Gat ekki tengst vefsvæðinu {0}. Vinsamlegast athugaðu villuskrá., -Error while installing package to site {0}. Please check Error Logs.,Villa við uppsetningu pakka á vefsvæði {0}. Vinsamlegast athugaðu villuskrá., -Exporting,Útflutningur, A field with the name '{}' already exists in doctype {}.,Reitur með nafninu '{}' er þegar til í skjalagerð {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Sérsniðinn reitur {0} er búinn til af stjórnandanum og aðeins er hægt að eyða honum með stjórnandareikningnum., Failed to send {0} Auto Email Report,Ekki tókst að senda {0} sjálfvirka tölvupóstsskýrslu, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Röð nr. {0}: Vinsamlegast stilltu fjargildissíur fyrir reitinn {1} til að sækja hið sérstaka fjarvíddarskjal, Paytm payment gateway settings,Stillingar Paytm greiðslugáttar, "Company, Fiscal Year and Currency defaults","Vanefndir fyrirtækis, reikningsárs og gjaldmiðils", -Package,Pakki, -Import and Export Packages.,Innflutningur og útflutningur pakka., Razorpay Signature Verification Failed,Staðfesting á undirskrift Razorpay mistókst, Google Drive - Could not locate - {0},Google Drive - Gat ekki fundið - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Samstillingarmerki var ógilt og hefur verið endurstillt. Reyndu aftur að samstilla., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Fyrir DocType Link / DocType Action, Cannot edit filters for standard charts,Get ekki breytt síum fyrir venjuleg töflur, Event Producer Last Update,Síðasta uppfærsla framleiðanda viðburða, Default for 'Check' type of field {0} must be either '0' or '1',Sjálfgefið fyrir reitinn „Athugaðu“ reitinn {0} verður að vera annað hvort „0“ eða „1“, +Non Negative,Ekki neikvætt, +Rules with higher priority number will be applied first.,Reglum með hærra forgangsnúmer verður beitt fyrst., +Open URL in a New Tab,Opnaðu slóð í nýjum flipa, +Align Right,Align Right, +Loading Filters...,Hleður síur ..., +Count Customizations,Talið um sérsnið, +For Example: {} Open,Til dæmis: {} Opna, +Choose Existing Card or create New Card,Veldu Núverandi kort eða búðu til nýtt kort, +Number Cards,Fjöldakort, +Function Based On,Aðgerð byggð á, +Add Filters,Bæta við síum, +Skip,Sleppa, +Dismiss,Hafna, +Value cannot be negative for,Gildi getur ekki verið neikvætt fyrir, +Value cannot be negative for {0}: {1},Gildi getur ekki verið neikvætt fyrir {0}: {1}, +Negative Value,Neikvætt gildi, +Authentication failed while receiving emails from Email Account: {0}.,Auðkenning mistókst þegar móttekin var tölvupóstur frá netreikningi: {0}., +Message from server: {0},Skilaboð frá netþjóni: {0}, diff --git a/frappe/translations/it.csv b/frappe/translations/it.csv index ec3eb9b4af..f61d467ebe 100644 --- a/frappe/translations/it.csv +++ b/frappe/translations/it.csv @@ -499,7 +499,6 @@ Authenticating...,Autenticazione ..., Authentication,Autenticazione, Authentication Apps you can use are: ,Le applicazioni di autenticazione utilizzabili sono:, Authentication Credentials,Credenziali di autenticazione, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Autenticazione non riuscita durante la ricezione di email da account email {0}. Messaggio dal server: {1}, Authorization Code,Codice di autorizzazione, Authorize URL,Autorizza URL, Authorized,Autorizzato, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Impossibile cambiare docstatus da 1 a 0, Cannot change header content,Impossibile modificare il contenuto dell'intestazione, Cannot change state of Cancelled Document. Transition row {0},Impossibile modificare lo stato di un Documento Annullato. Riga transizione {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Non è possibile modificare i dettagli utente in demo. Per favore registrati per un nuovo account all'indirizzo https://erpnext.com, -Cannot connect: {0},Impossibile connettersi: {0}, Cannot create a {0} against a child document: {1},Non è possibile creare un {0} contro un documento secondario: {1}, Cannot delete Home and Attachments folders,Impossibile eliminare Home e Cartelle Allegate, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Impossibile eliminare il file in quanto appartiene a {0} {1} per il quale non si dispone di autorizzazioni, @@ -1139,7 +1137,6 @@ Font Size,Dimensioni Font, Fonts,Caratteri, Footer,Piè di pagina, Footer HTML,Piè di pagina HTML, -Footer Item,footer Articolo, Footer Items,Elementi Piè di Pagina, Footer will display correctly only in PDF,Il piè di pagina verrà visualizzato correttamente solo in PDF, For Document Type,Per tipo di documento, @@ -1149,7 +1146,6 @@ For Value,Per valore, "For currency {0}, the minimum transaction amount should be {1}","Per la valuta {0}, l'importo minimo della transazione deve essere {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Ad esempio, se si annulla ed emendare INV004 diventerà un nuovo INV004-1 documento. Questo aiuta a tenere traccia di ogni modifica.", "For example: If you want to include the document ID, use {0}","Ad esempio: se si desidera includere l'ID del documento, utilizzare {0}", -For top bar,Per i top bar, "For updating, you can update only selective columns.","Per l'aggiornamento, è possibile aggiornare le colonne solo selettivi.", For {0} at level {1} in {2} in row {3},Per {0} a livello {1} {2} in riga {3}, Force,Vigore, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Calendar ID, Google Font,Google Font, Google Services,Servizi di Google, Grant Type,Tipo di grant, -Group Label,Label Group, Group Name,Nome del gruppo, Group name cannot be empty.,Il nome del gruppo non può essere vuoto., Groups of DocTypes,Gruppi di DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Per cortesia verifichi il suo indirizzo email, Point Allocation Periodicity,Periodicità di assegnazione dei punti, Points,Punti, Points Given,Punti assegnati, -Policy,Politica, Port,Porta, Portal Menu,Menu del Portale, Portal Menu Item,Portal voce di menu, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Selezionare atleast 1 record per la stampa, Select or drag across time slots to create a new event.,Selezionare o trascinare gli intervalli di tempo per creare un nuovo evento., Select records for assignment,Seleziona le schede per l'assegnazione, -"Select target = ""_blank"" to open in a new page.","Selezionare target = "" _blank "" per aprire in una nuova pagina .", Select the label after which you want to insert new field.,Selezionare l'etichetta dopo la quale si desidera inserire nuovo campo., "Select your Country, Time Zone and Currency","Seleziona il tuo Paese, fuso orario e valuta", Select {0},Selezionare {0}, @@ -2989,7 +2982,6 @@ star-empty,star-vuoto, step-backward,passo indietro, step-forward,passo in avanti, submitted this document,presentato questo documento, -"target = ""_blank""",target = "_blank", text in document type,testo tipo di documento, text-height,text-height, text-width,text-width, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Qualcosa è andato storto durante la generazione di token. Fai clic su {0} per generarne uno nuovo., Submit After Import,Invia dopo l'importazione, Submitting...,Invio ..., -Subscribed Documents,Documenti sottoscritti, Success! You are good to go 👍,Successo! Sei bravo ad andare 👍, Successful Transactions,Transazioni riuscite, Successfully Submitted!,Inserito correttamente!, @@ -3777,7 +3768,6 @@ Please specify,Si prega di specificare, Printing,Stampa, Priority,Priorità, Project,Progetto, -Publish,Pubblicare, Quarterly,Trimestralmente, Queued,In coda, Quick Entry,Inserimento rapido, @@ -4299,7 +4289,6 @@ Hide Border,Nascondi bordo, Index Web Pages for Search,Indice pagine Web per la ricerca, Action / Route,Azione / percorso, Document Naming Rule,Regola di denominazione dei documenti, -Rules with higher priority will be applied first.,Le regole con priorità più alta verranno applicate per prime., Rule Conditions,Condizioni della regola, Digits,Cifre, Example: 00001,Esempio: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Strumento di pubblicazione dei pacchetti, Click on the row for accessing filters.,Fare clic sulla riga per accedere ai filtri., Sites,Siti, Last Deployed On,Ultimo implementato il, -Last published {0},Ultima pubblicazione {0}, -Publishing documents...,Pubblicazione di documenti ..., -Documents have been published.,I documenti sono stati pubblicati., -Select Document Type.,Seleziona il tipo di documento., Console Log,Registro della console, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Imposta le opzioni predefinite per tutti i grafici in questa dashboard (Es: "colors": ["# d1d8dd", "# ff5858"])", Use Report Chart,Usa grafico report, @@ -4566,10 +4551,6 @@ Incorrect URL,URL errato, Duplicate Name,Nome duplicato, "Please check the value of ""Fetch From"" set for field {0}",Controlla il valore di "Recupera da" impostato per il campo {0}, Wrong Fetch From value,Valore Fetch From errato, -Deploying,Distribuzione, -Couldn't connect to site {0}. Please check Error Logs.,Impossibile connettersi al sito {0}. Si prega di controllare i log degli errori., -Error while installing package to site {0}. Please check Error Logs.,Errore durante l'installazione del pacchetto sul sito {0}. Si prega di controllare i log degli errori., -Exporting,Esportazione, A field with the name '{}' already exists in doctype {}.,Un campo con il nome "{}" esiste già in doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Il campo personalizzato {0} viene creato dall'amministratore e può essere eliminato solo tramite l'account dell'amministratore., Failed to send {0} Auto Email Report,Impossibile inviare {0} rapporto email automatico, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Riga n. {0}: imposta i filtri del valore remoto per il campo {1} per recuperare il documento di dipendenza remota univoco, Paytm payment gateway settings,Impostazioni del gateway di pagamento Paytm, "Company, Fiscal Year and Currency defaults","Valori predefiniti di società, anno fiscale e valuta", -Package,Pacchetto, -Import and Export Packages.,Importa ed esporta pacchetti., Razorpay Signature Verification Failed,Verifica della firma Razorpay non riuscita, Google Drive - Could not locate - {0},Google Drive - Impossibile individuare - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Il token di sincronizzazione non era valido ed è stato ripristinato. Riprova la sincronizzazione., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Per DocType Link / DocType Action, Cannot edit filters for standard charts,Impossibile modificare i filtri per i grafici standard, Event Producer Last Update,Ultimo aggiornamento del produttore dell'evento, Default for 'Check' type of field {0} must be either '0' or '1',L'impostazione predefinita per il tipo di campo "Verifica" {0} deve essere "0" o "1", +Non Negative,Non negativo, +Rules with higher priority number will be applied first.,Le regole con un numero di priorità più alto verranno applicate per prime., +Open URL in a New Tab,Apri URL in una nuova scheda, +Align Right,Allinea a destra, +Loading Filters...,Caricamento filtri ..., +Count Customizations,Conta personalizzazioni, +For Example: {} Open,Ad esempio: {} Apri, +Choose Existing Card or create New Card,Scegli Carta esistente o crea una nuova carta, +Number Cards,Numero di carte, +Function Based On,Funzione basata su, +Add Filters,Aggiungi filtri, +Skip,Salta, +Dismiss,Respingere, +Value cannot be negative for,Il valore non può essere negativo per, +Value cannot be negative for {0}: {1},Il valore non può essere negativo per {0}: {1}, +Negative Value,Valore negativo, +Authentication failed while receiving emails from Email Account: {0}.,Autenticazione non riuscita durante la ricezione di e-mail dall'account e-mail: {0}., +Message from server: {0},Messaggio dal server: {0}, diff --git a/frappe/translations/ja.csv b/frappe/translations/ja.csv index 0565d0ccfd..441cfa44ef 100644 --- a/frappe/translations/ja.csv +++ b/frappe/translations/ja.csv @@ -499,7 +499,6 @@ Authenticating...,認証しています..., Authentication,認証, Authentication Apps you can use are: ,次の認証アプリケーションが使用可能です：, Authentication Credentials,認証資格情報, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},メールアカウント{0}からのメールを受信中、認証に失敗しました。サーバーからのメッセージ：{1}, Authorization Code,認証コード, Authorize URL,URLを承認する, Authorized,認証済, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,文書ステータスを1から0に変更す Cannot change header content,ヘッダーの内容を変更できません, Cannot change state of Cancelled Document. Transition row {0},キャンセルされた文書の状態を変更することはできません。遷移行{0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,デモでユーザーの詳細を変更することはできません。 https://erpnext.comで新規アカウントにサインアップしてください, -Cannot connect: {0},接続できません：{0}, Cannot create a {0} against a child document: {1},子ドキュメントに対して{0}を作成できません：{1}, Cannot delete Home and Attachments folders,ホームおよび添付ファイルフォルダを削除することはできません, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,権限を持たない{0} {1}に属しているファイルを削除できません, @@ -1139,7 +1137,6 @@ Font Size,フォントサイズ, Fonts,フォント, Footer,フッター, Footer HTML,フッターHTML, -Footer Item,フッターアイテム, Footer Items,フッター項目, Footer will display correctly only in PDF,フッターはPDFでのみ正しく表示されます, For Document Type,伝票タイプ, @@ -1149,7 +1146,6 @@ For Value,価値観, "For currency {0}, the minimum transaction amount should be {1}",通貨{0}の場合、最小取引額は{1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,例えば、あなたがINV004をキャンセルして修正した場合、新しいドキュメントINV004-1になります。これによって各修正を追跡するのに役立ちます。, "For example: If you want to include the document ID, use {0}",例：文書IDを含める場合、{0}を使用, -For top bar,トップバー用, "For updating, you can update only selective columns.",更新の際、選択した列のみを更新することができます。, For {0} at level {1} in {2} in row {3},行{3}の{2}のレベル{1}の{0}, Force,力, @@ -1201,7 +1197,6 @@ Google Calendar ID,GoogleカレンダーID, Google Font,Googleフォント, Google Services,Googleサービス, Grant Type,助成金タイプ, -Group Label,グループ・ラベル, Group Name,グループ名, Group name cannot be empty.,グループ名は空にすることはできません。, Groups of DocTypes,文書タイプのグループ, @@ -1911,7 +1906,6 @@ Please verify your Email Address,あなたのメールアドレスを確認し Point Allocation Periodicity,ポイント割り当ての周期性, Points,ポイント, Points Given,与えられたポイント, -Policy,ポリシー, Port,ポート, Portal Menu,ポータルメニュー, Portal Menu Item,ポータルメニューアイテム, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,印刷用に少なくとも1つのレコードを選択, Select or drag across time slots to create a new event.,新規イベントを作成するには時間スロットを選択するかドラッグしてください, Select records for assignment,割当のためのレコードを選択, -"Select target = ""_blank"" to open in a new page.","新しいページで開くようにするには target=""_blank"" を選択してください。", Select the label after which you want to insert new field.,新たなフィールドを挿入後にラベルを選択してください。, "Select your Country, Time Zone and Currency",国、時間帯、通貨を選択, Select {0},{0}を選択, @@ -2989,7 +2982,6 @@ star-empty,星（空白）, step-backward,戻る, step-forward,進む, submitted this document,この文書を提出, -"target = ""_blank""","target = ""_blank""", text in document type,文書タイプのテキスト, text-height,text-height, text-width,テキスト幅, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,トークン生成中に問題が発生しました。 {0}をクリックして新しいものを生成してください。, Submit After Import,インポート後に送信, Submitting...,送信しています..., -Subscribed Documents,購読文書, Success! You are good to go 👍,成功！あなたは行ってもいいです, Successful Transactions,成功したトランザクション, Successfully Submitted!,正常に送信されました！, @@ -3777,7 +3768,6 @@ Please specify,指定してください, Printing,印刷, Priority,優先度, Project,プロジェクト, -Publish,公開, Quarterly,4半期ごと, Queued,キュー追加済, Quick Entry,クイックエントリー, @@ -4299,7 +4289,6 @@ Hide Border,ボーダーを隠す, Index Web Pages for Search,検索用のインデックスWebページ, Action / Route,アクション/ルート, Document Naming Rule,ドキュメントの命名規則, -Rules with higher priority will be applied first.,優先度の高いルールが最初に適用されます。, Rule Conditions,ルール条件, Digits,数字, Example: 00001,例：00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,パッケージ公開ツール, Click on the row for accessing filters.,フィルタにアクセスするには、行をクリックします。, Sites,サイト, Last Deployed On,最終展開日, -Last published {0},最終公開{0}, -Publishing documents...,ドキュメントの公開..., -Documents have been published.,ドキュメントが公開されました。, -Select Document Type.,ドキュメントタイプを選択します。, Console Log,コンソールログ, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])",このダッシュボードのすべてのグラフのデフォルトオプションを設定します（例： "colors"：["＃d1d8dd"、 "＃ff5858"]）, Use Report Chart,レポートチャートを使用する, @@ -4566,10 +4551,6 @@ Incorrect URL,間違ったURL, Duplicate Name,重複する名前, "Please check the value of ""Fetch From"" set for field {0}",フィールド{0}に設定されている「FetchFrom」の値を確認してください, Wrong Fetch From value,値からのフェッチが間違っています, -Deploying,展開, -Couldn't connect to site {0}. Please check Error Logs.,サイト{0}に接続できませんでした。エラーログを確認してください。, -Error while installing package to site {0}. Please check Error Logs.,パッケージをサイト{0}にインストール中にエラーが発生しました。エラーログを確認してください。, -Exporting,エクスポート, A field with the name '{}' already exists in doctype {}.,'{}'という名前のフィールドは、doctype {}にすでに存在します。, Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,カスタムフィールド{0}は管理者によって作成され、管理者アカウントを介してのみ削除できます。, Failed to send {0} Auto Email Report,{0}自動メールレポートの送信に失敗しました, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,行＃{0}：フィールド{1}にリモート値フィルターを設定して、一意のリモート依存関係ドキュメントをフェッチしてください, Paytm payment gateway settings,Paytmペイメントゲートウェイの設定, "Company, Fiscal Year and Currency defaults",会社、会計年度、通貨のデフォルト, -Package,パッケージ, -Import and Export Packages.,パッケージのインポートとエクスポート。, Razorpay Signature Verification Failed,Razorpay署名の検証に失敗しました, Google Drive - Could not locate - {0},Googleドライブ-見つかりませんでした-{0}, "Sync token was invalid and has been resetted, Retry syncing.",同期トークンが無効でリセットされました。同期を再試行してください。, @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,DocTypeリンク/ DocTypeアクションの場 Cannot edit filters for standard charts,標準チャートのフィルターは編集できません, Event Producer Last Update,イベントプロデューサー最終更新, Default for 'Check' type of field {0} must be either '0' or '1',フィールド{0}の「チェック」タイプのデフォルトは「0」または「1」のいずれかでなければなりません, +Non Negative,非負, +Rules with higher priority number will be applied first.,優先順位の高いルールが最初に適用されます。, +Open URL in a New Tab,新しいタブでURLを開く, +Align Right,右揃え, +Loading Filters...,フィルタを読み込んでいます。, +Count Customizations,カウントのカスタマイズ, +For Example: {} Open,例：{}開く, +Choose Existing Card or create New Card,既存のカードを選択するか、新しいカードを作成します, +Number Cards,ナンバーカード, +Function Based On,に基づく機能, +Add Filters,フィルタを追加する, +Skip,スキップ, +Dismiss,退出させる, +Value cannot be negative for,の値を負にすることはできません, +Value cannot be negative for {0}: {1},{0}の値を負にすることはできません：{1}, +Negative Value,負の値, +Authentication failed while receiving emails from Email Account: {0}.,電子メールアカウントからの電子メールの受信中に認証に失敗しました：{0}。, +Message from server: {0},サーバーからのメッセージ：{0}, diff --git a/frappe/translations/km.csv b/frappe/translations/km.csv index 720cee90c1..70a719d63d 100644 --- a/frappe/translations/km.csv +++ b/frappe/translations/km.csv @@ -499,7 +499,6 @@ Authenticating...,កំពុងផ្ទៀងផ្ទាត់ ..., Authentication,ការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវ, Authentication Apps you can use are: ,កម្មវិធីផ្ទៀងផ្ទាត់ដែលអ្នកអាចប្រើគឺ:, Authentication Credentials,អត្តសញ្ញាណសម្គាល់អត្តសញ្ញាណ, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},ការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវបានបរាជ័យខណៈពេលដែលទទួលអ៊ីម៉ែលពីគណនីអ៊ីម៉ែល {0} ។ សារពីម៉ាស៊ីនបម្រើ: {1}, Authorization Code,កូដអនុញ្ញាត, Authorize URL,អនុញ្ញាត URL, Authorized,បានអនុញ្ញាត, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,មិនអាចផ្លាស់ប្ Cannot change header content,មិនអាចផ្លាស់ប្តូរមាតិកាបឋមកថា, Cannot change state of Cancelled Document. Transition row {0},មិនអាចប្ដូរស្ថានភាពនៃឯកសារត្រូវបានលុបចោល។ ជួរដេកដែលបានផ្លាស់ប្តូរ {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,មិនអាចផ្លាស់ប្តូរការបង្ហាញសេចក្តីលម្អិតអ្នកប្រើនៅក្នុង។ សូមចុះឈ្មោះសម្រាប់គណនីថ្មីមួយនៅ https://erpnext.com, -Cannot connect: {0},មិនអាចតភ្ជាប់: {0}, Cannot create a {0} against a child document: {1},មិនអាចបង្កើតការប្រឆាំងនឹង {0} ឯកសារដែលកុមារ: {1}, Cannot delete Home and Attachments folders,មិនអាចលុបថតផ្ទះនិងឯកសារភ្ជាប់, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,មិនអាចលុបឯកសារបានទេព្រោះវាជារបស់ {0} {1} ដែលអ្នកមិនមានសិទ្ធិ, @@ -1139,7 +1137,6 @@ Font Size,ទំហំពុម្ពអក្សរ, Fonts,ពុម្ពអក្សរ, Footer,បាតកថា, Footer HTML,បាតកថា HTML ។, -Footer Item,ធាតុបាតកថា, Footer Items,បាតកថាធាតុ, Footer will display correctly only in PDF,បាតកថានឹងបង្ហាញយ៉ាងត្រឹមត្រូវតែនៅក្នុងឯកសារ PDF ។, For Document Type,សម្រាប់ប្រភេទឯកសារ។, @@ -1149,7 +1146,6 @@ For Value,សម្រាប់តម្លៃ, "For currency {0}, the minimum transaction amount should be {1}",សម្រាប់រូបិយប័ណ្ណ {0} ចំនួនទឹកប្រាក់ប្រតិបត្តិអប្បបរមាគួរតែ {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,ឧទាហរណ៍ប្រសិនបើអ្នកលុបកែប្រែ INV004 វានឹងក្លាយទៅជា INV004-1 ឯកសារថ្មី។ នេះអាចជួយអ្នកក្នុងការរក្សាដាននៃការធ្វើវិសោធនកម្មគ្នា។, "For example: If you want to include the document ID, use {0}",ឧទាហរណ៍: ប្រសិនបើអ្នកចង់រួមបញ្ចូលលេខសម្គាល់ឯកសារប្រើ {0}, -For top bar,សម្រាប់របារកំពូល, "For updating, you can update only selective columns.","សម្រាប់ការធ្វើឱ្យទាន់សម័យ, អ្នកអាចធ្វើឱ្យទាន់សម័យជួរឈរជ្រើសរើសតែប៉ុណ្ណោះ។", For {0} at level {1} in {2} in row {3},សម្រាប់ {0} នៅក្នុងកម្រិត {1} នៅក្នុង {2} នៅក្នុងជួរដេក {3}, Force,កម្លាំង, @@ -1201,7 +1197,6 @@ Google Calendar ID,លេខសម្គាល់ប្រតិទិន Google Google Font,ពុម្ពអក្សរហ្គូហ្គល។, Google Services,សេវាកម្ម Google, Grant Type,ប្រភេទជំនួយឥតសំណង, -Group Label,ស្លាកគ្រុប, Group Name,ឈ្មោះក្រុម, Group name cannot be empty.,ឈ្មោះក្រុមមិនអាចទទេបានទេ។, Groups of DocTypes,ក្រុម DOCTYPE, @@ -1911,7 +1906,6 @@ Please verify your Email Address,សូមផ្ទៀងផ្ទាត់អ Point Allocation Periodicity,រយៈពេលនៃការបែងចែកចំណុច។, Points,ចំណុច។, Points Given,ពិន្ទុដែលបានផ្តល់ឱ្យ។, -Policy,គោលនយោបាយ, Port,កំពង់ផែ, Portal Menu,ម៉ឺនុយវិបផតថល, Portal Menu Item,ធាតុម៉ឺនុយវិបផតថល, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,ជ្រើសយ៉ាងហោចណាស់ 1 កំណត់ត្រាសម្រាប់ការបោះពុម្ព, Select or drag across time slots to create a new event.,ជ្រើសឬអូសកាត់រន្ធពេលវេលាដើម្បីបង្កើតព្រឹត្តិការណ៍ថ្មី។, Select records for assignment,ជ្រើសកំណត់ត្រាសម្រាប់កិច្ចការ, -"Select target = ""_blank"" to open in a new page.",ជ្រើសគោលដៅ = "_blank" ដើម្បីបើកនៅក្នុងទំព័រថ្មីមួយ។, Select the label after which you want to insert new field.,ជ្រើសស្លាកបន្ទាប់ពីការដែលអ្នកចង់បញ្ចូលវាលថ្មី។, "Select your Country, Time Zone and Currency","ជ្រើសប្រទេស, ម៉ោងក្នុងតំបន់និងរូបិយវត្ថុរបស់អ្នក", Select {0},ជ្រើស {0}, @@ -2989,7 +2982,6 @@ star-empty,តារាទទេ, step-backward,ជំហានថយក្រោយ, step-forward,ជំហានទៅមុខ, submitted this document,បានដាក់ស្នើឯកសារនេះ, -"target = ""_blank""",គោលដៅ = "_blank", text in document type,អត្ថបទក្នុងប្រភេទឯកសារ, text-height,កម្ពស់អត្ថបទ, text-width,អត្ថបទដែលមានទទឹង, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,មានអ្វីមួយមិនប្រក្រតីកំឡុងជំនាន់ថូខឹន។ ចុចលើ {0} ដើម្បីបង្កើតថ្មី។, Submit After Import,ដាក់ស្នើបន្ទាប់ពីនាំចូល។, Submitting...,កំពុងដាក់ស្នើ ..., -Subscribed Documents,ឯកសារដែលបានជាវ, Success! You are good to go 👍,ជោគជ័យ! អ្នកពូកែទៅ👍។, Successful Transactions,ប្រតិបត្តិការជោគជ័យ, Successfully Submitted!,បានដាក់ស្នើដោយជោគជ័យ!, @@ -3777,7 +3768,6 @@ Please specify,សូមបញ្ជាក់, Printing,ការបោះពុម្ព, Priority,អាទិភាព, Project,គម្រោង, -Publish,ផ្សាយ, Quarterly,ប្រចាំត្រីមាស, Queued,បានដាក់ជាជួរ, Quick Entry,ធាតុរហ័ស, @@ -4299,7 +4289,6 @@ Hide Border,លាក់ព្រំដែន, Index Web Pages for Search,ទំព័រលិបិក្រមសម្រាប់ស្វែងរក, Action / Route,សកម្មភាព / ផ្លូវ, Document Naming Rule,ឯកសារស្តីពីវិធានការដាក់ឈ្មោះឯកសារ, -Rules with higher priority will be applied first.,វិធានដែលមានអាទិភាពខ្ពស់នឹងត្រូវអនុវត្តមុន។, Rule Conditions,លក្ខខណ្ឌច្បាប់, Digits,តួលេខ, Example: 00001,ឧទាហរណ៍ៈ ០០០០១, @@ -4344,10 +4333,6 @@ Package Publish Tool,ឧបករណ៍បោះពុម្ពកញ្ចប Click on the row for accessing filters.,ចុចលើជួរដេកដើម្បីចូលប្រើតម្រង។, Sites,គេហទំព័រ, Last Deployed On,បានដាក់ឱ្យប្រើចុងក្រោយ, -Last published {0},បានបោះពុម្ពផ្សាយចុងក្រោយ {0}, -Publishing documents...,ផ្សព្វផ្សាយឯកសារ ..., -Documents have been published.,ឯកសារត្រូវបានបោះពុម្ពផ្សាយ។, -Select Document Type.,ជ្រើសរើសប្រភេទឯកសារ។, Console Log,កុងសូលកំណត់ហេតុ, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","កំណត់ជម្រើសលំនាំដើមសម្រាប់គំនូសតាងទាំងអស់នៅលើផ្ទាំងព័ត៌មាននេះ (ឧ៖ "ពណ៌"៖ ["# d1d8dd", "# ff5858"])", Use Report Chart,ប្រើតារាងរបាយការណ៍, @@ -4566,10 +4551,6 @@ Incorrect URL,URL មិនត្រឹមត្រូវ, Duplicate Name,ឈ្មោះស្ទួន, "Please check the value of ""Fetch From"" set for field {0}",សូមពិនិត្យតម្លៃនៃសំណុំ "យកពី" សម្រាប់វាល {0}, Wrong Fetch From value,ប្រមូលយកខុសពីតម្លៃ, -Deploying,ដាក់ពង្រាយ, -Couldn't connect to site {0}. Please check Error Logs.,មិនអាចភ្ជាប់ទៅគេហទំព័រ {0} បានទេ។ សូមពិនិត្យមើលកំណត់ហេតុកំហុស។, -Error while installing package to site {0}. Please check Error Logs.,មានកំហុសនៅពេលដំឡើងកញ្ចប់ទៅគេហទំព័រ {0} ។ សូមពិនិត្យមើលកំណត់ហេតុកំហុស។, -Exporting,នាំចេញ, A field with the name '{}' already exists in doctype {}.,វាលមួយដែលមានឈ្មោះថា '{}' មាននៅក្នុងអក្សរសាស្រ្ត {} រួចហើយ។, Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,វាលផ្ទាល់ខ្លួន {0} ត្រូវបានបង្កើតដោយអ្នកគ្រប់គ្រងហើយអាចលុបបានតែតាមរយៈគណនីអ្នកគ្រប់គ្រងប៉ុណ្ណោះ។, Failed to send {0} Auto Email Report,បានបរាជ័យក្នុងការផ្ញើ {0} របាយការណ៍តាមអ៊ីមែលដោយស្វ័យប្រវត្តិ, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,ជួរដេក # {០}៖ សូមកំណត់តម្រងតម្លៃពីចម្ងាយសម្រាប់វាល {១} ដើម្បីទៅរកឯកសារដែលអាស្រ័យពីចម្ងាយ, Paytm payment gateway settings,ការកំណត់ច្រកទ្វារបង់ប្រាក់ Paytm, "Company, Fiscal Year and Currency defaults",ក្រុមហ៊ុនឆ្នាំសារពើពន្ធនិងលំនាំរូបិយប័ណ្ណ, -Package,កញ្ចប់, -Import and Export Packages.,កញ្ចប់នាំចូលនិងនាំចេញ។, Razorpay Signature Verification Failed,ការផ្ទៀងផ្ទាត់ហត្ថលេខា Razorpay បានបរាជ័យ, Google Drive - Could not locate - {0},ថាសហ្គូហ្គល - មិនអាចរកទីតាំង - {0}, "Sync token was invalid and has been resetted, Retry syncing.",និមិត្តសញ្ញាសមកាលកម្មមិនមានសុពលភាពហើយត្រូវបានកំណត់ឡើងវិញព្យាយាមធ្វើសមកាលកម្មម្តងទៀត។, @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,សម្រាប់សកម្មភាព Cannot edit filters for standard charts,មិនអាចកែតំរងតម្រងសំរាប់គំនូសតាងស្តង់ដារទេ, Event Producer Last Update,អ្នកផលិតព្រឹត្តិការណ៍ចុងក្រោយធ្វើឱ្យទាន់សម័យ, Default for 'Check' type of field {0} must be either '0' or '1',លំនាំដើមសម្រាប់ប្រភេទ 'ពិនិត្យ' នៃវាល {0} ត្រូវតែជា '0' ឬ '1', +Non Negative,មិនអវិជ្ជមាន, +Rules with higher priority number will be applied first.,វិធានដែលមានលេខអាទិភាពខ្ពស់នឹងត្រូវអនុវត្តមុន។, +Open URL in a New Tab,បើក URL នៅក្នុងផ្ទាំងថ្មី, +Align Right,តម្រឹមស្តាំ, +Loading Filters...,កំពុងផ្ទុកតម្រង ..., +Count Customizations,រាប់ការកែប្រែតាមតម្រូវការ, +For Example: {} Open,ឧទាហរណ៍ៈ {} បើក, +Choose Existing Card or create New Card,ជ្រើសរើសកាតដែលមានស្រាប់ឬបង្កើតកាតថ្មី, +Number Cards,កាតលេខ, +Function Based On,មុខងារផ្អែកលើ, +Add Filters,បន្ថែមតម្រង, +Skip,រំលង, +Dismiss,បោះបង់ចោល, +Value cannot be negative for,តម្លៃមិនអាចអវិជ្ជមានសម្រាប់, +Value cannot be negative for {0}: {1},តម្លៃមិនអាចអវិជ្ជមានសម្រាប់ {0}៖ {១}, +Negative Value,តម្លៃអវិជ្ជមាន, +Authentication failed while receiving emails from Email Account: {0}.,ការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវបានបរាជ័យពេលទទួលអ៊ីមែលពីគណនីអ៊ីមែល៖ {០} ។, +Message from server: {0},សារពីម៉ាស៊ីនមេ៖ {0}, diff --git a/frappe/translations/kn.csv b/frappe/translations/kn.csv index 4d7cf5bc25..616732b9de 100644 --- a/frappe/translations/kn.csv +++ b/frappe/translations/kn.csv @@ -499,7 +499,6 @@ Authenticating...,ದೃ ating ೀಕರಿಸಲಾಗುತ್ತಿದೆ ... Authentication,ದೃಢೀಕರಣ, Authentication Apps you can use are: ,ನೀವು ಬಳಸಬಹುದಾದ ದೃಢೀಕರಣದ ಅಪ್ಲಿಕೇಶನ್ಗಳು:, Authentication Credentials,ದೃಢೀಕರಣ ರುಜುವಾತುಗಳು, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},ಇಮೇಲ್ ಖಾತೆ {0} ಇಮೇಲ್ಗಳನ್ನು ಸ್ವೀಕರಿಸುವುದನ್ನು ಸಂದರ್ಭದಲ್ಲಿ ದೃಢೀಕರಣ ವಿಫಲಗೊಂಡಿತು. ಸರ್ವರ್ನಿಂದ ಸಂದೇಶ: {1}, Authorization Code,ಅಧಿಕಾರ ಕೋಡ್, Authorize URL,URL ಅನ್ನು ದೃಢೀಕರಿಸಿ, Authorized,ಅಧಿಕೃತ, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,1 ರಿಂದ 0 docstatus ಬದಲಾಯ Cannot change header content,ಶಿರೋಲೇಖ ವಿಷಯವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ, Cannot change state of Cancelled Document. Transition row {0},ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ ಡಾಕ್ಯುಮೆಂಟ್ ರಾಜ್ಯದ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ., Cannot change user details in demo. Please signup for a new account at https://erpnext.com,ಡೆಮೊ ಬಳಕೆದಾರ ವಿವರಗಳನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. https://erpnext.com ನಲ್ಲಿ ಹೊಸ ಖಾತೆ ಸೈನ್ ಅಪ್ ಮಾಡಿ, -Cannot connect: {0},ಸಂಪರ್ಕ ಸಾಧ್ಯವಿಲ್ಲ: {0}, Cannot create a {0} against a child document: {1},ಅಲ್ಲ ರಚಿಸಬಹುದು {0} ಮಗುವಿನ ಡಾಕ್ಯುಮೆಂಟ್ ವಿರುದ್ಧ: {1}, Cannot delete Home and Attachments folders,ಮುಖಪುಟ ಮತ್ತು ಲಗತ್ತುಗಳು ಫೋಲ್ಡರ್ಗಳನ್ನು ಅಳಿಸಿಹಾಕಲಾಗದು, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,ನಿಮಗೆ ಅನುಮತಿ ಇಲ್ಲದ {0} {0} ಗೆ ಸೇರಿದ ಕಾರಣ ಫೈಲ್ ಅನ್ನು ಅಳಿಸಲಾಗುವುದಿಲ್ಲ, @@ -1139,7 +1137,6 @@ Font Size,ಅಕ್ಷರ ಗಾತ್ರ, Fonts,ಫಾಂಟ್ಗಳು, Footer,ಅಡಿಟಿಪ್ಪಣಿ, Footer HTML,ಅಡಿಟಿಪ್ಪಣಿ HTML, -Footer Item,ಅಡಿಟಿಪ್ಪಣಿ ಐಟಂ, Footer Items,ಅಡಿಟಿಪ್ಪಣಿ ಐಟಂಗಳು, Footer will display correctly only in PDF,ಅಡಿಟಿಪ್ಪಣಿ ಪಿಡಿಎಫ್‌ನಲ್ಲಿ ಮಾತ್ರ ಸರಿಯಾಗಿ ಪ್ರದರ್ಶಿಸುತ್ತದೆ, For Document Type,ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರಕ್ಕಾಗಿ, @@ -1149,7 +1146,6 @@ For Value,ಮೌಲ್ಯಕ್ಕಾಗಿ, "For currency {0}, the minimum transaction amount should be {1}","ಕರೆನ್ಸಿಗೆ {0}, ಕನಿಷ್ಠ ವಹಿವಾಟು ಮೊತ್ತವು {1} ಆಗಿರಬೇಕು", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,ನೀವು ರದ್ದು ಮತ್ತು INV004 ತಿದ್ದುಪಡಿ ಉದಾಹರಣೆಗೆ ಇದು ಹೊಸ ದಾಖಲೆ INV004-1 ಪರಿಣಮಿಸುತ್ತದೆ. ನೀವೇ ತಿದ್ದುಪಡಿ ಕಾಪಾಡುವುದು ಸಹಾಯ., "For example: If you want to include the document ID, use {0}","ಉದಾಹರಣೆಗೆ: ನೀವು ದಾಖಲೆ ID ಸೇರಿಸಲು ಬಯಸಿದರೆ, ಬಳಸಿ {0}", -For top bar,ಅಗ್ರ ಬಾರ್, "For updating, you can update only selective columns.","ಅಪ್ಡೇಟ್, ನೀವು ಮಾತ್ರ ಆಯ್ದ ಅಂಕಣಗಳನ್ನು ನವೀಕರಿಸಬಹುದು.", For {0} at level {1} in {2} in row {3},ಫಾರ್ {0} ಮಟ್ಟದಲ್ಲಿ {1} ಗೆ {2} ಸತತವಾಗಿ {3}, Force,ಫೋರ್ಸ್, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Calendar ID, Google Font,ಗೂಗಲ್ ಫಾಂಟ್, Google Services,Google ಸೇವೆಗಳು, Grant Type,ಗ್ರಾಂಟ್ ಕೌಟುಂಬಿಕತೆ, -Group Label,ಗ್ರೂಪ್ ಲೇಬಲ್, Group Name,ತಂಡದ ಹೆಸರು, Group name cannot be empty.,ಗುಂಪು ಹೆಸರು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ., Groups of DocTypes,DOCTYPES ಗುಂಪುಗಳು, @@ -1911,7 +1906,6 @@ Please verify your Email Address,ದಯವಿಟ್ಟು ನಿಮ್ಮ ಇಮ Point Allocation Periodicity,ಪಾಯಿಂಟ್ ಹಂಚಿಕೆ ಆವರ್ತಕತೆ, Points,ಅಂಕಗಳು, Points Given,ನೀಡಲಾದ ಅಂಕಗಳು, -Policy,ನೀತಿ, Port,ರೇವು, Portal Menu,ಪೋರ್ಟಲ್ ಮೆನು, Portal Menu Item,ಪೋರ್ಟಲ್ ಮೆನು ಐಟಂ, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,ಮುದ್ರಣಕ್ಕೆ ಕನಿಷ್ಠ 1 ದಾಖಲೆ ಆಯ್ಕೆಮಾಡಿ, Select or drag across time slots to create a new event.,ಆಯ್ಕೆ ಅಥವಾ ಹೊಸ ಈವೆಂಟ್ ರಚಿಸಲು ಸಮಯಾವಧಿಗಳ ಅಡ್ಡಲಾಗಿ ಎಳೆಯಿರಿ ., Select records for assignment,ಹುದ್ದೆ ಆಯ್ಕೆ ದಾಖಲೆಗಳು, -"Select target = ""_blank"" to open in a new page.","ಆಯ್ಕೆ ಗುರಿ ಹೊಸ ಪುಟ ತೆರೆಯಲು = ""_blank"" .", Select the label after which you want to insert new field.,ನೀವು ಹೊಸ ಕ್ಷೇತ್ರದಲ್ಲಿ ಸೇರಿಸಲು ಬಯಸುವ afterwhich ಲೇಬಲ್ ಆಯ್ಕೆ ., "Select your Country, Time Zone and Currency","ನಿಮ್ಮ ದೇಶ, ಕಾಲವಲಯವನ್ನು ಮತ್ತು ಕರೆನ್ಸಿ ಆಯ್ಕೆ", Select {0},ಆಯ್ಕೆ {0}, @@ -2989,7 +2982,6 @@ star-empty,ನಕ್ಷತ್ರ ಖಾಲಿ, step-backward,ಹಂತ ಹಿಂದುಳಿದ, step-forward,ಹಂತ ಮುಂದೆ, submitted this document,ಈ ಡಾಕ್ಯುಮೆಂಟ್ ಸಲ್ಲಿಸಿದ, -"target = ""_blank""","ಗುರಿ = ""_blank""", text in document type,ದಾಖಲೆ ಪ್ರಕಾರ ಪಠ್ಯ, text-height,ಪಠ್ಯ ಎತ್ತರ, text-width,ಪಠ್ಯ ಅಗಲ, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,ಟೋಕನ್ ಪೀಳಿಗೆಯ ಸಮಯದಲ್ಲಿ ಏನೋ ತಪ್ಪಾಗಿದೆ. ಹೊಸದನ್ನು ರಚಿಸಲು {0 on ಕ್ಲಿಕ್ ಮಾಡಿ., Submit After Import,ಆಮದು ನಂತರ ಸಲ್ಲಿಸಿ, Submitting...,ಸಲ್ಲಿಸಲು..., -Subscribed Documents,ಚಂದಾದಾರರಾದ ದಾಖಲೆಗಳು, Success! You are good to go 👍,ಯಶಸ್ಸು! ನೀವು ಹೋಗುವುದು ಒಳ್ಳೆಯದು, Successful Transactions,ಯಶಸ್ವಿ ವಹಿವಾಟುಗಳು, Successfully Submitted!,ಯಶಸ್ವಿಯಾಗಿ ಸಲ್ಲಿಸಲಾಗಿದೆ!, @@ -3777,7 +3768,6 @@ Please specify,ಸೂಚಿಸಲು ದಯವಿಟ್ಟು, Printing,ಮುದ್ರಣ, Priority,ಆದ್ಯತೆ, Project,ಯೋಜನೆ, -Publish,ಪ್ರಕಟಿಸು, Quarterly,ತ್ರೈಮಾಸಿಕ, Queued,ಸರತಿಯಲ್ಲಿ, Quick Entry,ತ್ವರಿತ ಪ್ರವೇಶ, @@ -4299,7 +4289,6 @@ Hide Border,ಗಡಿಯನ್ನು ಮರೆಮಾಡಿ, Index Web Pages for Search,ಹುಡುಕಾಟಕ್ಕಾಗಿ ಸೂಚ್ಯಂಕ ವೆಬ್ ಪುಟಗಳು, Action / Route,ಕ್ರಿಯೆ / ಮಾರ್ಗ, Document Naming Rule,ಡಾಕ್ಯುಮೆಂಟ್ ಹೆಸರಿಸುವ ನಿಯಮ, -Rules with higher priority will be applied first.,ಹೆಚ್ಚಿನ ಆದ್ಯತೆಯ ನಿಯಮಗಳನ್ನು ಮೊದಲು ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ., Rule Conditions,ನಿಯಮ ನಿಯಮಗಳು, Digits,ಅಂಕೆಗಳು, Example: 00001,ಉದಾಹರಣೆ: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,ಪ್ಯಾಕೇಜ್ ಪ್ರಕಟಣೆ ಸಾಧನ Click on the row for accessing filters.,ಫಿಲ್ಟರ್‌ಗಳನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಲಿನ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡಿ., Sites,ಸೈಟ್‌ಗಳು, Last Deployed On,ಕೊನೆಯದಾಗಿ ನಿಯೋಜಿಸಲಾಗಿದೆ, -Last published {0},ಕೊನೆಯದಾಗಿ ಪ್ರಕಟಿಸಲಾಗಿದೆ {0}, -Publishing documents...,ದಾಖಲೆಗಳನ್ನು ಪ್ರಕಟಿಸಲಾಗುತ್ತಿದೆ ..., -Documents have been published.,ದಾಖಲೆಗಳನ್ನು ಪ್ರಕಟಿಸಲಾಗಿದೆ., -Select Document Type.,ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆಮಾಡಿ., Console Log,ಕನ್ಸೋಲ್ ಲಾಗ್, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","ಈ ಡ್ಯಾಶ್‌ಬೋರ್ಡ್‌ನಲ್ಲಿನ ಎಲ್ಲಾ ಚಾರ್ಟ್‌ಗಳಿಗೆ ಡೀಫಾಲ್ಟ್ ಆಯ್ಕೆಗಳನ್ನು ಹೊಂದಿಸಿ (ಉದಾ: "ಬಣ್ಣಗಳು": ["# d1d8dd", "# ff5858"])", Use Report Chart,ವರದಿ ಚಾರ್ಟ್ ಬಳಸಿ, @@ -4566,10 +4551,6 @@ Incorrect URL,ತಪ್ಪಾದ URL, Duplicate Name,ನಕಲಿ ಹೆಸರು, "Please check the value of ""Fetch From"" set for field {0}",ದಯವಿಟ್ಟು field 0 field ಕ್ಷೇತ್ರಕ್ಕಾಗಿ ಹೊಂದಿಸಲಾದ "ಇಂದ ಪಡೆಯಿರಿ" ಮೌಲ್ಯವನ್ನು ಪರಿಶೀಲಿಸಿ, Wrong Fetch From value,ಮೌಲ್ಯದಿಂದ ತಪ್ಪಾಗಿದೆ, -Deploying,ನಿಯೋಜಿಸಲಾಗುತ್ತಿದೆ, -Couldn't connect to site {0}. Please check Error Logs.,Site site site ಸೈಟ್‌ಗೆ ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. ದಯವಿಟ್ಟು ದೋಷ ದಾಖಲೆಗಳನ್ನು ಪರಿಶೀಲಿಸಿ., -Error while installing package to site {0}. Please check Error Logs.,Site site site ಸೈಟ್‌ಗೆ ಪ್ಯಾಕೇಜ್ ಸ್ಥಾಪಿಸುವಾಗ ದೋಷ. ದಯವಿಟ್ಟು ದೋಷ ದಾಖಲೆಗಳನ್ನು ಪರಿಶೀಲಿಸಿ., -Exporting,ರಫ್ತು ಮಾಡಲಾಗುತ್ತಿದೆ, A field with the name '{}' already exists in doctype {}.,'{}' ಹೆಸರಿನ ಕ್ಷೇತ್ರವು ಈಗಾಗಲೇ ಡಾಕ್ಟೈಪ್ in in ನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,ಕಸ್ಟಮ್ ಕ್ಷೇತ್ರ {0 the ಅನ್ನು ನಿರ್ವಾಹಕರು ರಚಿಸಿದ್ದಾರೆ ಮತ್ತು ಅದನ್ನು ನಿರ್ವಾಹಕ ಖಾತೆಯ ಮೂಲಕ ಮಾತ್ರ ಅಳಿಸಬಹುದು., Failed to send {0} Auto Email Report,Email 0} ಸ್ವಯಂ ಇಮೇಲ್ ವರದಿಯನ್ನು ಕಳುಹಿಸುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,ಸಾಲು # {0}: ಅನನ್ಯ ದೂರಸ್ಥ ಅವಲಂಬನೆ ಡಾಕ್ಯುಮೆಂಟ್ ಪಡೆಯಲು ದಯವಿಟ್ಟು {1 field ಕ್ಷೇತ್ರಕ್ಕೆ ದೂರಸ್ಥ ಮೌಲ್ಯ ಫಿಲ್ಟರ್‌ಗಳನ್ನು ಹೊಂದಿಸಿ, Paytm payment gateway settings,Paytm ಪಾವತಿ ಗೇಟ್‌ವೇ ಸೆಟ್ಟಿಂಗ್‌ಗಳು, "Company, Fiscal Year and Currency defaults","ಕಂಪನಿ, ಹಣಕಾಸಿನ ವರ್ಷ ಮತ್ತು ಕರೆನ್ಸಿ ಡೀಫಾಲ್ಟ್‌ಗಳು", -Package,ಪ್ಯಾಕೇಜ್, -Import and Export Packages.,ಪ್ಯಾಕೇಜುಗಳನ್ನು ಆಮದು ಮತ್ತು ರಫ್ತು ಮಾಡಿ., Razorpay Signature Verification Failed,ರೇಜರ್ಪೇ ಸಹಿ ಪರಿಶೀಲನೆ ವಿಫಲವಾಗಿದೆ, Google Drive - Could not locate - {0},Google ಡ್ರೈವ್ - ಪತ್ತೆ ಮಾಡಲಾಗಲಿಲ್ಲ - {0}, "Sync token was invalid and has been resetted, Retry syncing.","ಸಿಂಕ್ ಟೋಕನ್ ಅಮಾನ್ಯವಾಗಿದೆ ಮತ್ತು ಮರುಹೊಂದಿಸಲಾಗಿದೆ, ಸಿಂಕ್ ಮಾಡಲು ಮರುಪ್ರಯತ್ನಿಸಿ.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,ಡಾಕ್ಟೈಪ್ ಲಿಂಕ್ / ಡ Cannot edit filters for standard charts,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಚಾರ್ಟ್‌ಗಳಿಗಾಗಿ ಫಿಲ್ಟರ್‌ಗಳನ್ನು ಸಂಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ, Event Producer Last Update,ಈವೆಂಟ್ ನಿರ್ಮಾಪಕ ಕೊನೆಯ ನವೀಕರಣ, Default for 'Check' type of field {0} must be either '0' or '1','ಚೆಕ್' ಪ್ರಕಾರದ ಡೀಫಾಲ್ಟ್ {0} '0' ಅಥವಾ '1' ಆಗಿರಬೇಕು, +Non Negative,ನಕಾರಾತ್ಮಕವಲ್ಲದ, +Rules with higher priority number will be applied first.,ಹೆಚ್ಚಿನ ಆದ್ಯತೆಯ ಸಂಖ್ಯೆಯನ್ನು ಹೊಂದಿರುವ ನಿಯಮಗಳನ್ನು ಮೊದಲು ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ., +Open URL in a New Tab,ಹೊಸ ಟ್ಯಾಬ್‌ನಲ್ಲಿ URL ತೆರೆಯಿರಿ, +Align Right,ಬಲಕ್ಕೆ ಜೋಡಿಸಿ, +Loading Filters...,ಫಿಲ್ಟರ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ ..., +Count Customizations,ಗ್ರಾಹಕೀಕರಣಗಳನ್ನು ಎಣಿಸಿ, +For Example: {} Open,ಉದಾಹರಣೆಗಾಗಿ:}} ತೆರೆಯಿರಿ, +Choose Existing Card or create New Card,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ ಅಥವಾ ಹೊಸ ಕಾರ್ಡ್ ರಚಿಸಿ, +Number Cards,ಸಂಖ್ಯೆ ಕಾರ್ಡ್‌ಗಳು, +Function Based On,ಕಾರ್ಯವನ್ನು ಆಧರಿಸಿದೆ, +Add Filters,ಫಿಲ್ಟರ್‌ಗಳನ್ನು ಸೇರಿಸಿ, +Skip,ಬಿಟ್ಟುಬಿಡಿ, +Dismiss,ವಜಾಗೊಳಿಸಿ, +Value cannot be negative for,ಮೌಲ್ಯವು negative ಣಾತ್ಮಕವಾಗಿರಬಾರದು, +Value cannot be negative for {0}: {1},{0} ಗೆ ಮೌಲ್ಯ negative ಣಾತ್ಮಕವಾಗಿರಬಾರದು: {1}, +Negative Value,ನಕಾರಾತ್ಮಕ ಮೌಲ್ಯ, +Authentication failed while receiving emails from Email Account: {0}.,ಇಮೇಲ್ ಖಾತೆಯಿಂದ ಇಮೇಲ್‌ಗಳನ್ನು ಸ್ವೀಕರಿಸುವಾಗ ದೃ ation ೀಕರಣ ವಿಫಲವಾಗಿದೆ: {0}., +Message from server: {0},ಸರ್ವರ್‌ನಿಂದ ಸಂದೇಶ: {0}, diff --git a/frappe/translations/ko.csv b/frappe/translations/ko.csv index a462b809a6..4d197b2d03 100644 --- a/frappe/translations/ko.csv +++ b/frappe/translations/ko.csv @@ -499,7 +499,6 @@ Authenticating...,인증 중 ..., Authentication,입증, Authentication Apps you can use are: ,인증 응용 프로그램은 다음과 같습니다., Authentication Credentials,인증 자격 증명, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},이메일 계정 {0}에서 이메일을 수신하는 동안 인증에 실패했습니다. 서버에서 메시지 : {1}, Authorization Code,인증 코드, Authorize URL,URL 승인, Authorized,인정 받은, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,1-0 docstatus을 변경할 수 없습니다, Cannot change header content,헤더 내용을 변경할 수 없습니다., Cannot change state of Cancelled Document. Transition row {0},취소 된 문서의 상태를 변경할 수 없습니다.전환 행 {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,데모에서는 사용자 세부 정보를 변경할 수 없습니다. https://erpnext.com에서 새 계정을 만드십시오., -Cannot connect: {0},연결할 수 없습니다 : {0}, Cannot create a {0} against a child document: {1},만들 수 없습니다 {0} 하위 문서에 대해 : {1}, Cannot delete Home and Attachments folders,홈 및 첨부 파일 폴더를 삭제할 수 없습니다, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,권한이없는 {0} {1}에 속한 파일을 삭제할 수 없습니다., @@ -1139,7 +1137,6 @@ Font Size,글꼴 크기, Fonts,글꼴, Footer,바닥 글, Footer HTML,꼬리말 HTML, -Footer Item,바닥 글 항목, Footer Items,바닥 글 항목, Footer will display correctly only in PDF,꼬리말은 PDF로만 올바르게 표시됩니다., For Document Type,문서 유형, @@ -1149,7 +1146,6 @@ For Value,가치를 위해, "For currency {0}, the minimum transaction amount should be {1}",통화 {0}의 경우 최소 거래 금액은 {1}이어야합니다., For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,취소 및 INV004을 개정 예를 들어이 새 문서 INV004-1 될 것입니다.이렇게하면 각 개정을 추적하는 데 도움이됩니다., "For example: If you want to include the document ID, use {0}","예를 들어 문서 ID를 포함 할 경우, 사용 {0}", -For top bar,상단 막대, "For updating, you can update only selective columns.",업데이트의 경우에만 선택적으로 열을 업데이트 할 수 있습니다., For {0} at level {1} in {2} in row {3},에 대한 {0} 레벨의 {1}에서 {2} 행에서 {3}, Force,힘, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google 캘린더 ID, Google Font,Google 글꼴, Google Services,Google 서비스, Grant Type,그랜트 유형, -Group Label,그룹 레이블, Group Name,그룹 이름, Group name cannot be empty.,그룹 이름은 비워 둘 수 없습니다., Groups of DocTypes,doctype에 그룹, @@ -1911,7 +1906,6 @@ Please verify your Email Address,당신의 이메일 주소를 확인하세요, Point Allocation Periodicity,포인트 할당주기, Points,전철기, Points Given,주어진 포인트, -Policy,정책, Port,포트, Portal Menu,포털 메뉴, Portal Menu Item,포털 메뉴 항목, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,인쇄이어야 1 개 레코드를 선택, Select or drag across time slots to create a new event.,선택하거나 새 이벤트를 만들 시간 슬롯을 가로 질러 드래그합니다., Select records for assignment,할당 선택 기록, -"Select target = ""_blank"" to open in a new page.","선택 대상 새 페이지에 열 = ""_blank"".", Select the label after which you want to insert new field.,당신이 새 필드를 삽입 할 후 레이블을 선택합니다., "Select your Country, Time Zone and Currency","국가, 시간대 및 통화를 선택", Select {0},선택 {0}, @@ -2989,7 +2982,6 @@ star-empty,스타 빈, step-backward,스텝 뒤로, step-forward,단계 앞으로, submitted this document,이 문서를 제출, -"target = ""_blank""","대상 = ""_blank""", text in document type,문서 형식의 텍스트, text-height,텍스트 높이, text-width,텍스트 폭, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,토큰을 생성하는 동안 문제가 발생했습니다. 새 것을 생성하려면 {0}을 클릭하십시오., Submit After Import,수입 후 제출, Submitting...,제출 중 ..., -Subscribed Documents,가입 서류, Success! You are good to go 👍,성공! 너는 좋은데 👍, Successful Transactions,성공적인 거래, Successfully Submitted!,성공적으로 제출되었습니다!, @@ -3777,7 +3768,6 @@ Please specify,지정하십시오, Printing,인쇄, Priority,우선순위, Project,프로젝트, -Publish,게시, Quarterly,분기 별, Queued,대기 중, Quick Entry,빠른 입력, @@ -4299,7 +4289,6 @@ Hide Border,테두리 숨기기, Index Web Pages for Search,검색 용 웹 페이지 색인, Action / Route,행동 / 경로, Document Naming Rule,문서 명명 규칙, -Rules with higher priority will be applied first.,우선 순위가 더 높은 규칙이 먼저 적용됩니다., Rule Conditions,규칙 조건, Digits,숫자, Example: 00001,예 : 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,패키지 게시 도구, Click on the row for accessing filters.,필터에 액세스하려면 행을 클릭하십시오., Sites,사이트, Last Deployed On,마지막 배포 날짜, -Last published {0},마지막 게시 {0}, -Publishing documents...,문서 게시 중 ..., -Documents have been published.,문서가 게시되었습니다., -Select Document Type.,문서 유형을 선택합니다., Console Log,콘솔 로그, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","이 대시 보드의 모든 차트에 대한 기본 옵션 설정 (예 : "colors": [ "# d1d8dd", "# ff5858"])", Use Report Chart,보고서 차트 사용, @@ -4566,10 +4551,6 @@ Incorrect URL,잘못된 URL, Duplicate Name,중복 된 이름, "Please check the value of ""Fetch From"" set for field {0}",{0} 필드에 대해 설정된 "가져 오기"값을 확인하십시오., Wrong Fetch From value,잘못된 가져 오기 값, -Deploying,배포, -Couldn't connect to site {0}. Please check Error Logs.,{0} 사이트에 연결할 수 없습니다. 오류 로그를 확인하십시오., -Error while installing package to site {0}. Please check Error Logs.,{0} 사이트에 패키지를 설치하는 동안 오류가 발생했습니다. 오류 로그를 확인하십시오., -Exporting,수출, A field with the name '{}' already exists in doctype {}.,이름이 '{}'인 필드가 문서 유형 {}에 이미 있습니다., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,맞춤 입력란 {0}은 (는) 관리자가 생성하며 관리자 계정을 통해서만 삭제할 수 있습니다., Failed to send {0} Auto Email Report,{0} 자동 이메일 보고서를 보내지 못했습니다., @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,행 # {0} : 고유 한 원격 종속성 문서를 가져 오려면 {1} 필드에 원격 값 필터를 설정하십시오., Paytm payment gateway settings,PayTM 결제 게이트웨이 설정, "Company, Fiscal Year and Currency defaults","회사, 회계 연도 및 통화 기본값", -Package,꾸러미, -Import and Export Packages.,패키지 가져 오기 및 내보내기., Razorpay Signature Verification Failed,Razorpay 서명 확인 실패, Google Drive - Could not locate - {0},Google 드라이브-찾을 수 없음-{0}, "Sync token was invalid and has been resetted, Retry syncing.",동기화 토큰이 잘못되어 재설정되었습니다. 동기화를 다시 시도하세요., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,DocType 링크 / DocType 작업의 경우, Cannot edit filters for standard charts,표준 차트에 대한 필터를 편집 할 수 없습니다., Event Producer Last Update,이벤트 프로듀서 마지막 업데이트, Default for 'Check' type of field {0} must be either '0' or '1',필드 {0}의 '확인'유형에 대한 기본값은 '0'또는 '1'이어야합니다., +Non Negative,음수가 아님, +Rules with higher priority number will be applied first.,우선 순위 번호가 더 높은 규칙이 먼저 적용됩니다., +Open URL in a New Tab,새 탭에서 URL 열기, +Align Right,오른쪽 정렬, +Loading Filters...,필터로드 중 ..., +Count Customizations,사용자 정의 계산, +For Example: {} Open,예 : {} 열기, +Choose Existing Card or create New Card,기존 카드 선택 또는 새 카드 생성, +Number Cards,숫자 카드, +Function Based On,기능 기반, +Add Filters,필터 추가, +Skip,건너 뛰기, +Dismiss,버리다, +Value cannot be negative for,값은 음수 일 수 없습니다., +Value cannot be negative for {0}: {1},{0}에 대한 값은 음수 일 수 없습니다. {1}, +Negative Value,부정적인 가치, +Authentication failed while receiving emails from Email Account: {0}.,이메일 계정 {0}에서 이메일을받는 동안 인증에 실패했습니다., +Message from server: {0},서버의 메시지 : {0}, diff --git a/frappe/translations/ku.csv b/frappe/translations/ku.csv index 333f742e2f..93f6b95f69 100644 --- a/frappe/translations/ku.csv +++ b/frappe/translations/ku.csv @@ -499,7 +499,6 @@ Authenticating...,Nasname ..., Authentication,Piştrastkirina, Authentication Apps you can use are: ,Hûn dikarin bikar bînin:, Authentication Credentials,Credential, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Têketin serneket dema sitendina emailên ji Account Email {0}. Message from server: {1}, Authorization Code,Code Authorization, Authorize URL,URL, Authorized,bi destûr, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Can docstatus ji 1 ji 0 nayê guhertin, Cannot change header content,Naveroka sereke nayê guhertin, Cannot change state of Cancelled Document. Transition row {0},Can dewletê ya Dokumentê Hilandin biguherîne. row Transition {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Can hûragahiyan li user li demo nayê guhertin. Ji kerema xwe ji bo hesabekî nû çêke signup li https://erpnext.com, -Cannot connect: {0},Nikare bigihîjê: {0}, Cannot create a {0} against a child document: {1},ne dikarin biafirînin {0} dijî belgeyeke zarok: {1}, Cannot delete Home and Attachments folders,Can Home û Attachments peldankan jê bibî bi, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Dibe ku pelê {0} {1} ye ku ji bo we tune ye ku pelê tune, @@ -1139,7 +1137,6 @@ Font Size,Size font, Fonts,Fonts, Footer,footer, Footer HTML,Footer HTML, -Footer Item,Babetê footer, Footer Items,Nawy footer, Footer will display correctly only in PDF,Footer dê tenê di PDF de bi rengek rast nîşan bide, For Document Type,Ji bo Tîpa Document, @@ -1149,7 +1146,6 @@ For Value,Ji bo Nirxê, "For currency {0}, the minimum transaction amount should be {1}","Ji bo pereyê {0 currency, dravê herî kêm ya danûstendinê divê {1} be", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Ji bo nimûne eger tu betal û mawe, INV004 ev dê bibe INV004-1 belgeyeke nû. Ev alîkariya te dike ji bo şopandina her guhertinan.", "For example: If you want to include the document ID, use {0}","Ji bo nimûne: Heke tu dixwazî de ID belgeyê de, bi kar tînin {0}", -For top bar,Ji bo bar top, "For updating, you can update only selective columns.","Ji bo rojane, tu stûnên tenê bijartî yên rojane bike.", For {0} at level {1} in {2} in row {3},Ji bo {0} di asta {1} li {2} li row {3}, Force,Cebir, @@ -1201,7 +1197,6 @@ Google Calendar ID,Nasnameya Google Calendar, Google Font,Google Font, Google Services,Xizmetên Google, Grant Type,Type Grant, -Group Label,Label Group, Group Name,Navê Navê, Group name cannot be empty.,Navê navnîşê vala nebe., Groups of DocTypes,Groups of DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Ji kerema xwe bo rastkirina Email Address te, Point Allocation Periodicity,Periodsîbûna Allocation Point, Points,Points, Points Given,Pek hatine dayîn, -Policy,Tektîk, Port,Bender, Portal Menu,Menu Portal, Portal Menu Item,Babetê Menu Portal, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Li Hindîstan 1 record ji bo çapkirinê Select, Select or drag across time slots to create a new event.,Select an nîr û li seranserî slots dem ji bo bûyereke nû., Select records for assignment,qeydên ji bo tayînkirin Hilbijêre, -"Select target = ""_blank"" to open in a new page.",Hilbijêre target = "_blank" ji bo vekirina di rûpeleke nû., Select the label after which you want to insert new field.,li label piştî ku tu dixwazî têxe nav zeviyê ya nû hilbijêre., "Select your Country, Time Zone and Currency","Select Welatê xwe, Zone û Exchange Time", Select {0},{0} Select, @@ -2989,7 +2982,6 @@ star-empty,star-vala, step-backward,gav-bi paş ve, step-forward,gav-bi pêş, submitted this document,şandin ku ev belge, -"target = ""_blank""",target = "_blank", text in document type,text li cureyê pelgeyê, text-height,text-height, text-width,text-width, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Di dema nifşê token de tiştek xirab bû. On 0 Click bikirtînin da ku hûn nû nû bikin., Submit After Import,Piştî Importê bişînin, Submitting...,Belavkirin ..., -Subscribed Documents,Belgeyên abonandî, Success! You are good to go 👍,Serketinî! Hûn xweş in ku biçin 👍, Successful Transactions,Danûstendinên serkeftî, Successfully Submitted!,Serkeftin şandin!, @@ -3777,7 +3768,6 @@ Please specify,ji kerema xwe binivîsin, Printing,Çapnivîs, Priority,Pêşeyî, Project,Rêvename, -Publish,Weşandin, Quarterly,Bultena, Queued,li hêvîya, Quick Entry,Peyam Quick, @@ -4299,7 +4289,6 @@ Hide Border,Sînor Veşêre, Index Web Pages for Search,Rûpelên Tevneyê ji bo Lêgerînê, Action / Route,Çalakî / Rê, Document Naming Rule,Rêziknameya Navkirina Belgeyê, -Rules with higher priority will be applied first.,Rêgezên ku xwedan pêşanî ne dê pêşî werin sepandin., Rule Conditions,Rertên Rule, Digits,Digits, Example: 00001,Mînak: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Amûra Weşanê ya Pakêtê, Click on the row for accessing filters.,Ji bo gihîştina felteran rêzê bikirtînin., Sites,Sites, Last Deployed On,Herî dawî Hat şandin, -Last published {0},Cara dawî hate weşandin {0}, -Publishing documents...,Belavkirina belgeyan ..., -Documents have been published.,Belge hatine weşandin., -Select Document Type.,Tîpa Belgeyê Hilbijêrin., Console Log,Log Console, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Vebijarkên Defaultê ji bo hemî nexşeyên li ser vê Dashboardê saz bikin (Ex: "reng": ["# d1d8dd", "# ff5858"])", Use Report Chart,Chart Report bikar bînin, @@ -4566,10 +4551,6 @@ Incorrect URL,URL-ya çewt, Duplicate Name,Navê Duplicate, "Please check the value of ""Fetch From"" set for field {0}",Ji kerema xwe nirxa "Fetch From" a ji bo qada {0} hatî danîn binerin, Wrong Fetch From value,Fetch Çewtiyek Ji nirxê, -Deploying,Loandin, -Couldn't connect to site {0}. Please check Error Logs.,Bi malpera {0} ve nehat girêdan. Ji kerema xwe Nivîsarên Çewtiyê kontrol bikin., -Error while installing package to site {0}. Please check Error Logs.,Dema sazkirina pakêtê li ser malperê {0} çewtî. Ji kerema xwe Nivîsarên Çewtiyê kontrol bikin., -Exporting,Hinardekirin, A field with the name '{}' already exists in doctype {}.,Zeviyek bi navê '{}' jixwe di doktype de {} heye., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Zeviya xwerû {0} ji hêla Rêvebera ve hatî afirandin û tenê bi navgîniya rêveberê ve tête jêbirin., Failed to send {0} Auto Email Report,{0} Rapora E-nameya Jixweber nehat şandin, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Rêzok # {0}: Ji kerema xwe ji bo zeviyê {1} felterên nirxa dûr saz bikin ku belgeya girêdana dûr a yekta bistînin, Paytm payment gateway settings,Mîhengên deriyê dravdana paytm, "Company, Fiscal Year and Currency defaults","Pargîdaniyên Pargîdaniyê, Sala Darayî û Dirav", -Package,Pakêt, -Import and Export Packages.,Pakêtên îthal û Exxracatê., Razorpay Signature Verification Failed,Razorpay Vermzekirina Rastkirinê Çewtî, Google Drive - Could not locate - {0},Google Drive - Nikare cîwar bibe - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Token-a senkronîzasyonê nederbasdar bû û hate nûve kirin, Ji nû ve senkronîzekirinê biceribîne.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Ji bo Girêdana DocType / Çalakiya DocType, Cannot edit filters for standard charts,Fîltreyên ji bo nexşeyên standard nayê guherandin, Event Producer Last Update,Hilberînerê Bûyera Rojanekirina Dawîn, Default for 'Check' type of field {0} must be either '0' or '1',Default ji bo 'Check' type zeviyê {0} divê yan '0' an '1' be, +Non Negative,Neyînî, +Rules with higher priority number will be applied first.,Dê rêzikên ku xwedan jimareya pêşîniyê mezintir in pêşî bêne sepandin., +Open URL in a New Tab,Di Tabek Nû de URL vekin, +Align Right,Rast Rast bikin, +Loading Filters...,Filters têne barkirin ..., +Count Customizations,Customizations jimartin, +For Example: {} Open,Ji bo Mînakê: {} Vekirî, +Choose Existing Card or create New Card,Qerta Heye Hilbijêrin an Qerta Nû biafirînin, +Number Cards,Qertên Jimareyê, +Function Based On,Fonksiyona Bingehîn, +Add Filters,Fîlteran zêde bikin, +Skip,Hilperkîn, +Dismiss,Berdan, +Value cannot be negative for,Nirx ji bo neyênî nabe, +Value cannot be negative for {0}: {1},Nirx nikare ji bo {0} neyînî be: {1}, +Negative Value,Nirxê Neyînî, +Authentication failed while receiving emails from Email Account: {0}.,Dema ku hûn e-nameyên ji Hesabê E-nameyê werdigirin rastnivîsîn têk çû: {0}., +Message from server: {0},Peyama serverê: {0}, diff --git a/frappe/translations/lo.csv b/frappe/translations/lo.csv index f7f9f5b43d..006bee49a8 100644 --- a/frappe/translations/lo.csv +++ b/frappe/translations/lo.csv @@ -499,7 +499,6 @@ Authenticating...,ການກວດສອບຄວາມຖືກຕ້ອງ . Authentication,ການກວດສອບ, Authentication Apps you can use are: ,Apps ການກວດສອບທີ່ທ່ານສາມາດນໍາໃຊ້ໄດ້ແກ່:, Authentication Credentials,ໃບຢັ້ງຢືນການກວດສອບຄວາມຖືກຕ້ອງ, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},ການກວດສອບສົບຜົນສໍາເລັດໃນຂະນະທີ່ໄດ້ຮັບອີເມວຈາກບັນຊີອີເມວ {0}. ຂໍ້ຄວາມຈາກເຄື່ອງແມ່ຂ່າຍ: {1}, Authorization Code,ລະຫັດອະນຸຍາດ, Authorize URL,Authorize URL, Authorized,ອະນຸຍາດ, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,ບໍ່ສາມາດມີການປ Cannot change header content,ບໍ່ສາມາດປ່ຽນເນື້ອຫາຂອງຫົວຂໍ້, Cannot change state of Cancelled Document. Transition row {0},ບໍ່ສາມາດມີການປ່ຽນແປງສະຖານະຂອງເອກະສານຍົກເລີກ. ຕິດຕໍ່ກັນການຫັນປ່ຽນ {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,ບໍ່ສາມາດມີການປ່ຽນແປງລາຍລະອຽດຂອງຜູ້ໃຊ້ໃນການສາທິດ. ກະລຸນາລົງທະບຽນສໍາລັບການບັນຊີໃຫມ່ທີ່ https://erpnext.com, -Cannot connect: {0},ບໍ່ສາມາດເຊື່ອມຕໍ່: {0}, Cannot create a {0} against a child document: {1},ບໍ່ສາມາດສ້າງ {0} ກັບເອກະສານເດັກນ້ອຍ: {1}, Cannot delete Home and Attachments folders,ບໍ່ສາມາດລຶບແລະ Attachments ໂຟເດີ, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,ບໍ່ສາມາດລຶບເອກະສານເປັນເປັນ {0} {1} ສໍາລັບທີ່ທ່ານບໍ່ຈໍາເປັນອະນຸຍາດ, @@ -1139,7 +1137,6 @@ Font Size,ຂະຫນາດຕົວອັກສອນ, Fonts,ອັກສອນ, Footer,footer, Footer HTML,Footer HTML, -Footer Item,footer Item, Footer Items,ລາຍະການ footer, Footer will display correctly only in PDF,Footer ຈະສະແດງຢ່າງຖືກຕ້ອງພຽງແຕ່ໃນ PDF ເທົ່ານັ້ນ, For Document Type,ສຳ ລັບປະເພດເອກະສານ, @@ -1149,7 +1146,6 @@ For Value,ສໍາລັບມູນຄ່າ, "For currency {0}, the minimum transaction amount should be {1}","ສໍາລັບສະກຸນເງິນ {0}, ຈໍານວນການໂອນເງິນຂັ້ນຕ່ໍາຄວນຈະເປັນ {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,ສໍາລັບການຍົກຕົວຢ່າງຖ້າຫາກວ່າທ່ານຍົກເລີກແລະປັບປຸງ INV004 ມັນຈະກາຍເປັນ INV004-1 ເອກະສານໃຫມ່. ນີ້ຈະຊ່ວຍໃຫ້ທ່ານຮັກສາຕິດຕາມຂອງແຕ່ລະການປ່ຽນແປງ., "For example: If you want to include the document ID, use {0}","ສໍາລັບການຍົກຕົວຢ່າງ: ຖ້າຫາກວ່າທ່ານຕ້ອງການທີ່ຈະປະກອບມີລະຫັດເອກະສານ, ການນໍາໃຊ້ {0}", -For top bar,ສໍາລັບພາທະນາຍຄວາມ, "For updating, you can update only selective columns.","ສໍາລັບການປັບປຸງ, ທ່ານສາມາດປັບປຸງຄໍລໍາພຽງແຕ່ການຄັດເລືອກ.", For {0} at level {1} in {2} in row {3},{0} ຢູ່ໃນລະດັບ {1} ໃນ {2} ຕິດຕໍ່ກັນ {3}, Force,ຜົນບັງຄັບໃຊ້, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Calendar ID, Google Font,Google Font, Google Services,Google Services, Grant Type,ປະເພດການຊ່ວຍເຫຼືອລ້າ, -Group Label,Label Group, Group Name,ຊື່ກຸ່ມ, Group name cannot be empty.,ຊື່ກຸ່ມບໍ່ສາມາດຫວ່າງໄດ້., Groups of DocTypes,ກຸ່ມຂອງ DOCTYPE, @@ -1911,7 +1906,6 @@ Please verify your Email Address,ກະລຸນາຢືນຢັນທີ່ Point Allocation Periodicity,ແຕ່ລະໄລຍະຂອງການຈັດສັນຈຸດ, Points,ຈຸດຕ່າງໆ, Points Given,ຈຸດທີ່ໄດ້ຮັບ, -Policy,ນະໂຍບາຍ, Port,Port, Portal Menu,ເມນູສະບັບພິມໄດ້, Portal Menu Item,Menu Item Portal, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,ເລືອກ atleast 1 ບັນທຶກສໍາລັບການພິມ, Select or drag across time slots to create a new event.,ເລືອກຫຼືລາກຂ້າມຊ່ວງເວລາທີ່ຈະສ້າງເປັນເຫດການໃຫມ່., Select records for assignment,ເລືອກການບັນທຶກການສໍາລັບການແຕ່ງ, -"Select target = ""_blank"" to open in a new page.",ເລືອກເປົ້າຫມາຍ = "_blank" ຈະເປີດຢູ່ໃນຫນ້າໃຫມ່., Select the label after which you want to insert new field.,ເລືອກເອົາປ້າຍຫຼັງຈາກທີ່ທ່ານຕ້ອງການທີ່ຈະສະແດງກິ່ງງ່າພາກສະຫນາມໃຫມ່., "Select your Country, Time Zone and Currency","ເລືອກປະເທດຂອງທ່ານ, ເຂດທີ່ໃຊ້ເວລາແລະສະກຸນເງິນ", Select {0},ເລືອກ {0}, @@ -2989,7 +2982,6 @@ star-empty,ດາວເປົ່າຫວ່າງ, step-backward,ຂັ້ນຕອນທີກັບຄືນ, step-forward,ຂັ້ນຕອນທີຕໍ່, submitted this document,ສົ່ງເອກະສານນີ້, -"target = ""_blank""",ເປົ້າຫມາຍ = "_blank", text in document type,ຂໍ້ຄວາມໃນປະເພດເອກະສານ, text-height,ຂໍ້ຄວາມລະດັບຄວາມສູງ, text-width,ຂໍ້ຄວາມ width, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,ມີບາງສິ່ງບາງຢ່າງຜິດພາດໃນຊ່ວງລຸ້ນ token. ກົດທີ່ {0} ເພື່ອສ້າງ ໃໝ່., Submit After Import,ສົ່ງຫຼັງຈາກ ນຳ ເຂົ້າ, Submitting...,ກຳ ລັງສົ່ງ ..., -Subscribed Documents,ເອກະສານສະ ໝັກ, Success! You are good to go 👍,ຄວາມສໍາເລັດ! ເຈົ້າດີທີ່ຈະໄປ👍, Successful Transactions,ການເຮັດທຸລະ ກຳ ທີ່ປະສົບຜົນ ສຳ ເລັດ, Successfully Submitted!,ສົ່ງຢ່າງ ສຳ ເລັດຜົນ!, @@ -3777,7 +3768,6 @@ Please specify,ກະລຸນາລະບຸ, Printing,ການພິມ, Priority,ບູລິມະສິດ, Project,ໂຄງການ, -Publish,ເຜີຍແຜ່, Quarterly,ໄຕມາດ, Queued,ຄິວ, Quick Entry,Entry ດ່ວນ, @@ -4299,7 +4289,6 @@ Hide Border,ເຊື່ອງຊາຍແດນ, Index Web Pages for Search,ດັດສະນີ ໜ້າ ເວັບ ສຳ ລັບຄົ້ນຫາ, Action / Route,ການປະຕິບັດງານ / ເສັ້ນທາງ, Document Naming Rule,ລະບຽບການຕັ້ງຊື່ເອກະສານ, -Rules with higher priority will be applied first.,ກົດລະບຽບທີ່ມີບູລິມະສິດສູງກວ່າຈະຖືກ ນຳ ໃຊ້ກ່ອນ., Rule Conditions,ເງື່ອນໄຂການປົກຄອງ, Digits,ຕົວເລກ, Example: 00001,ຕົວຢ່າງ: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,ເຄື່ອງມືເຜີຍແຜ່ແພັກ Click on the row for accessing filters.,ກົດເຂົ້າແຖວເພື່ອເຂົ້າຫາຕົວກອງ., Sites,ພື້ນທີ່, Last Deployed On,ຖືກ ນຳ ໃຊ້ຄັ້ງສຸດທ້າຍ, -Last published {0},ຈັດພີມມາຄັ້ງສຸດທ້າຍ {0}, -Publishing documents...,ເຜີຍແຜ່ເອກະສານ ..., -Documents have been published.,ເອກະສານຕ່າງໆໄດ້ຖືກເຜີຍແຜ່ແລ້ວ., -Select Document Type.,ເລືອກປະເພດເອກະສານ., Console Log,Console Log, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","ກຳ ນົດຕົວເລືອກຄ່າເລີ່ມຕົ້ນ ສຳ ລັບຕາຕະລາງທັງ ໝົດ ໃນ Dashboard ນີ້ (Ex: "color": ["# d1d8dd", "# ff5858"])", Use Report Chart,ໃຊ້ຕາຕະລາງການລາຍງານ, @@ -4566,10 +4551,6 @@ Incorrect URL,URL ທີ່ບໍ່ຖືກຕ້ອງ, Duplicate Name,ຊື່ຊ້ ຳ, "Please check the value of ""Fetch From"" set for field {0}",ກະລຸນາກວດເບິ່ງຄ່າຂອງ "Fetch From" ທີ່ ກຳ ນົດໄວ້ ສຳ ລັບພາກສະ ໜາມ {0}, Wrong Fetch From value,ເອົາຜິດຈາກຄ່າ, -Deploying,ໃຊ້ໄດ້, -Couldn't connect to site {0}. Please check Error Logs.,ບໍ່ສາມາດເຊື່ອມຕໍ່ກັບເວັບໄຊທ໌ {0}. ກະລຸນາກວດເບິ່ງຂໍ້ມູນບັນທຶກຂໍ້ຜິດພາດ., -Error while installing package to site {0}. Please check Error Logs.,ມີຂໍ້ຜິດພາດໃນຂະນະທີ່ຕິດຕັ້ງແພັກເກດໄປທີ່ເວັບໄຊທ໌ {0}. ກະລຸນາກວດເບິ່ງຂໍ້ມູນບັນທຶກຂໍ້ຜິດພາດ., -Exporting,ການສົ່ງອອກ, A field with the name '{}' already exists in doctype {}.,ຊ່ອງຂໍ້ມູນທີ່ມີຊື່ວ່າ '{}' ມີຢູ່ໃນປະເພດ ຄຳ ນາມ {} ແລ້ວ., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Custom Field {0} ແມ່ນສ້າງຂື້ນໂດຍ Administrator ແລະສາມາດລຶບໄດ້ໂດຍຜ່ານບັນຊີ Administrator ເທົ່ານັ້ນ., Failed to send {0} Auto Email Report,ລົ້ມເຫລວໃນການສົ່ງ {0} ລາຍງານອີເມວອັດຕະໂນມັດ, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,ແຖວ # {0}: ກະລຸນາຕັ້ງຄ່າການກັ່ນຕອງມູນຄ່າໄລຍະໄກ ສຳ ລັບພາກສະ ໜາມ {1} ເພື່ອເກັບເອກະສານການເອື່ອຍອີງຂອງເອກະລັກ, Paytm payment gateway settings,ການຕັ້ງຄ່າຄ່າຜ່ານປະຕູທາງ Paytm, "Company, Fiscal Year and Currency defaults","ບໍລິສັດ, ປີການເງິນແລະຄ່າເງີນເລີ່ມຕົ້ນ", -Package,ຊຸດ, -Import and Export Packages.,ການຫຸ້ມຫໍ່ ນຳ ເຂົ້າແລະສົ່ງອອກ., Razorpay Signature Verification Failed,ການກວດສອບລາຍເຊັນ Razorpay ລົ້ມເຫລວ, Google Drive - Could not locate - {0},Google Drive - ບໍ່ສາມາດຊອກຫາໄດ້ - {0}, "Sync token was invalid and has been resetted, Retry syncing.","token ຊິ້ງແມ່ນບໍ່ຖືກຕ້ອງແລະຖືກຕັ້ງ ໃໝ່, ລອງ ໃໝ່ ອີກຄັ້ງ.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,ສຳ ລັບ DocType Link / DocType Action Cannot edit filters for standard charts,ບໍ່ສາມາດແກ້ໄຂຕົວກອງ ສຳ ລັບຕາຕະລາງມາດຕະຖານ, Event Producer Last Update,ຜູ້ຜະລິດເຫດການປັບປຸງຫຼ້າສຸດ, Default for 'Check' type of field {0} must be either '0' or '1',ຄ່າເລີ່ມຕົ້ນ ສຳ ລັບປະເພດ 'ກວດສອບ' ປະເພດ {0} ຕ້ອງເປັນ '0' ຫລື '1', +Non Negative,ບໍ່ແມ່ນລົບ, +Rules with higher priority number will be applied first.,ກົດລະບຽບທີ່ມີຕົວເລກບູລິມະສິດສູງກວ່າຈະຖືກນໍາໃຊ້ກ່ອນ., +Open URL in a New Tab,ເປີດ URL ໃນແຖບ New, +Align Right,ຈັດລຽນຂວາ, +Loading Filters...,ກຳ ລັງໂຫລດຕົວກອງ ..., +Count Customizations,ນັບການປັບແຕ່ງ, +For Example: {} Open,ຕົວຢ່າງ: {} ເປີດ, +Choose Existing Card or create New Card,ເລືອກບັດທີ່ມີຢູ່ແລ້ວຫຼືສ້າງ New Card, +Number Cards,ເລກບັດ, +Function Based On,Function ອີງໃສ່, +Add Filters,ຕື່ມການກັ່ນຕອງ, +Skip,ຂ້າມ, +Dismiss,ປະຕິເສດ, +Value cannot be negative for,ຄຸນຄ່າບໍ່ສາມາດເປັນສິ່ງລົບກວນ ສຳ ລັບ, +Value cannot be negative for {0}: {1},ຄ່າບໍ່ສາມາດລົບຕໍ່ {0}: {1}, +Negative Value,ຄຸນຄ່າທາງລົບ, +Authentication failed while receiving emails from Email Account: {0}.,ການກວດສອບຄວາມລົ້ມເຫລວໃນການຮັບອີເມວຈາກບັນຊີອີເມວ: {0}., +Message from server: {0},ຂໍ້ຄວາມຈາກເຊີບເວີ: {0}, diff --git a/frappe/translations/lt.csv b/frappe/translations/lt.csv index 102e68a87c..d6c743c1bf 100644 --- a/frappe/translations/lt.csv +++ b/frappe/translations/lt.csv @@ -499,7 +499,6 @@ Authenticating...,Autentifikuojamas ..., Authentication,autentifikavimo, Authentication Apps you can use are: ,"Autentifikavimo programos, kurias galite naudoti, yra šios:", Authentication Credentials,Autentifikavimo įgaliojimai, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},"Autorizacija nepavyko, o gauti elektroninius laiškus iš pašto sąskaitą {0}. Pranešimas iš serverio: {1}", Authorization Code,autorizacijos kodas, Authorize URL,Įgalioti URL, Authorized,įgaliotas, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Nepavyksta pakeisti docstatus nuo 1 iki 0, Cannot change header content,Negalima pakeisti antraštės turinio, Cannot change state of Cancelled Document. Transition row {0},Nepavyksta pakeisti būseną Atšauktas dokumente. Perėjimas eilutė {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Nepavyksta pakeisti naudotojo detales demo. Prašome užsiregistruoti naują sąskaitą https://erpnext.com, -Cannot connect: {0},Nepavyko prisijungti: {0}, Cannot create a {0} against a child document: {1},Negalima sukurti {0} prieš vaikų dokumentas: {1}, Cannot delete Home and Attachments folders,Negalite trinti Pradžia ir priedai aplankus, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Negalima ištrinti failo, nes jis priklauso {0} {1}, dėl kurio neturite leidimų", @@ -1139,7 +1137,6 @@ Font Size,Šrifto dydis, Fonts,Šriftai, Footer,Apatinė, Footer HTML,Poraštės HTML, -Footer Item,Apatinė punktas, Footer Items,Apatinė daiktai, Footer will display correctly only in PDF,Poraštė teisingai bus rodoma tik PDF formatu, For Document Type,Skirta dokumento tipui, @@ -1149,7 +1146,6 @@ For Value,Dėl vertės, "For currency {0}, the minimum transaction amount should be {1}",Dėl valiutos {0} minimali sandorio suma turėtų būti {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Pavyzdžiui, jei atšaukti ir pakeisti INV004 ji taps nauja dokumentas INV004-1. Tai padeda jums sekti kiekvieno pakeitimo.", "For example: If you want to include the document ID, use {0}","Pavyzdžiui: Jei norite įtraukti dokumento ID, naudokite {0}", -For top bar,Dėl viršutinėje juostoje, "For updating, you can update only selective columns.","Dėl atnaujinimo, galite atnaujinti tik selektyvios stulpelius.", For {0} at level {1} in {2} in row {3},Dėl {0} lygyje {1} iš {2} iš eilės {3}, Force,jėga, @@ -1201,7 +1197,6 @@ Google Calendar ID,"Google" kalendoriaus ID, Google Font,„Google“ šriftas, Google Services,"Google" paslaugos, Grant Type,Dotacijos tipas, -Group Label,Grupės etikėtė, Group Name,Grupės pavadinimas, Group name cannot be empty.,Grupės pavadinimas negali būti tuščias., Groups of DocTypes,Grupės DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Prašome patikrinti savo elektroninio pašto ad Point Allocation Periodicity,Taškų paskirstymo periodiškumas, Points,Taškai, Points Given,Duoti taškai, -Policy,politika, Port,uostas, Portal Menu,portalo Meniu, Portal Menu Item,Portalo Meniu punktas, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Pasirinkite atleast 1 įrašas spausdinimui, Select or drag across time slots to create a new event.,Pasirinkite arba vilkite visoje laiko tarpsnius sukurti naują įvykį., Select records for assignment,Pasirinkite įrašai užduoties, -"Select target = ""_blank"" to open in a new page.",Pasirinkite target = "_blank" atidaryti naują puslapį., Select the label after which you want to insert new field.,"Pasirinkite etiketę, po kurios norite įterpti naują lauką.", "Select your Country, Time Zone and Currency","Pasirinkite savo šalį, laiko juostą ir valiutos", Select {0},Pasirinkite {0}, @@ -2989,7 +2982,6 @@ star-empty,žvaigždės tuščias, step-backward,žingsnis atgal, step-forward,išeiti į priekį, submitted this document,pateikė šį dokumentą, -"target = ""_blank""",target = "_ blank", text in document type,Teksto dokumento tipui, text-height,teksto aukštis, text-width,teksto plotis, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,"Ženklų kartos metu kažkas nutiko. Spustelėkite {0}, kad sukurtumėte naują.", Submit After Import,Pateikti po importavimo, Submitting...,Pateikiama ..., -Subscribed Documents,Užsakomi dokumentai, Success! You are good to go 👍,Sėkmė! Jums gera eiti 👍, Successful Transactions,Sėkmingi sandoriai, Successfully Submitted!,Sėkmingai pateiktas!, @@ -3777,7 +3768,6 @@ Please specify,Prašome nurodyti, Printing,spausdinimas, Priority,Prioritetas, Project,projektas, -Publish,Paskelbti, Quarterly,kas ketvirtį, Queued,eilėje, Quick Entry,Greita Įėjimas, @@ -4299,7 +4289,6 @@ Hide Border,Slėpti sieną, Index Web Pages for Search,Rodykite tinklalapius paieškai, Action / Route,Veiksmas / maršrutas, Document Naming Rule,Dokumento pavadinimo taisyklė, -Rules with higher priority will be applied first.,Pirmiausia bus taikomos aukštesnio prioriteto taisyklės., Rule Conditions,Taisyklės sąlygos, Digits,Skaičiai, Example: 00001,Pavyzdys: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,„Package Publish“ įrankis, Click on the row for accessing filters.,"Spustelėkite eilutę, kad pasiektumėte filtrus.", Sites,Svetainės, Last Deployed On,Paskutinis įdiegtas, -Last published {0},Paskutinį kartą paskelbta {0}, -Publishing documents...,Skelbiami dokumentai ..., -Documents have been published.,Paskelbti dokumentai., -Select Document Type.,Pasirinkite Dokumento tipas., Console Log,Pulto žurnalas, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Nustatykite numatytąsias visų šios informacijos suvestinės diagramų parinktis (pvz., „Spalvos“: ["# d1d8dd", "# ff5858"])", Use Report Chart,Naudoti ataskaitų diagramą, @@ -4566,10 +4551,6 @@ Incorrect URL,Neteisingas URL, Duplicate Name,Pasikartojantis vardas, "Please check the value of ""Fetch From"" set for field {0}",Patikrinkite laukui „{0}“ nustatytą „Iškelti iš“ vertę., Wrong Fetch From value,Neteisinga išgauti iš vertės, -Deploying,Diegimas, -Couldn't connect to site {0}. Please check Error Logs.,Nepavyko prisijungti prie svetainės {0}. Patikrinkite klaidų žurnalus., -Error while installing package to site {0}. Please check Error Logs.,Klaida diegiant paketą į svetainę {0}. Patikrinkite klaidų žurnalus., -Exporting,Eksportavimas, A field with the name '{}' already exists in doctype {}.,Laukas pavadinimu „{}“ jau yra doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Tinkintą lauką {0} sukuria administratorius ir jį galima ištrinti tik per administratoriaus paskyrą., Failed to send {0} Auto Email Report,Nepavyko išsiųsti {0} automatinio el. Pašto pranešimo, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,"# Eilutė {0}: nustatykite nuotolinius vertės filtrus laukui {1}, kad gautumėte unikalų nuotolinės priklausomybės dokumentą", Paytm payment gateway settings,„Paytm“ mokėjimo šliuzo nustatymai, "Company, Fiscal Year and Currency defaults","Numatyti įmonės, finansinių metų ir valiutos duomenys", -Package,Pakuotė, -Import and Export Packages.,Importo ir eksporto paketai., Razorpay Signature Verification Failed,Nepavyko patvirtinti „Razorpay“ parašo, Google Drive - Could not locate - {0},„Google“ diskas - nepavyko rasti - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Sinchronizavimo prieigos raktas buvo neteisingas ir iš naujo nustatytas. Bandykite dar kartą sinchronizuoti., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,„DocType Link“ / „DocType Action“, Cannot edit filters for standard charts,Negalima redaguoti standartinių diagramų filtrų, Event Producer Last Update,Įvykio gamintojo paskutinis atnaujinimas, Default for 'Check' type of field {0} must be either '0' or '1',Numatytasis lauko „Tikrinti“ tipo tipas {0} turi būti „0“ arba „1“, +Non Negative,Ne neigiamas, +Rules with higher priority number will be applied first.,"Pirmiausia bus taikomos taisyklės, kurių prioritetas didesnis.", +Open URL in a New Tab,Atidarykite URL naujame skirtuke, +Align Right,Lygiuoti dešinėn, +Loading Filters...,Įkeliami filtrai ..., +Count Customizations,Skaičiuokite tinkinimus, +For Example: {} Open,Pavyzdžiui: {} Atidaryti, +Choose Existing Card or create New Card,Pasirinkite Esama kortelė arba sukurkite Naują kortelę, +Number Cards,Skaičių kortelės, +Function Based On,Pagal funkciją, +Add Filters,Pridėti filtrus, +Skip,Praleisti, +Dismiss,Atsisakyti, +Value cannot be negative for,Vertė negali būti neigiama, +Value cannot be negative for {0}: {1},{0} vertė negali būti neigiama: {1}, +Negative Value,Neigiama vertė, +Authentication failed while receiving emails from Email Account: {0}.,Nepavyko autentifikuoti gavus el. Laiškus iš el. Pašto paskyros: {0}., +Message from server: {0},Pranešimas iš serverio: {0}, diff --git a/frappe/translations/lv.csv b/frappe/translations/lv.csv index f2c167f55c..4ea90df6e2 100644 --- a/frappe/translations/lv.csv +++ b/frappe/translations/lv.csv @@ -499,7 +499,6 @@ Authenticating...,Autentificēšana ..., Authentication,Autentifikācija, Authentication Apps you can use are: ,"Autentifikācijas lietojumprogrammas, kuras varat izmantot, ir šādas:", Authentication Credentials,Authentication Credentials, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Autentifikācija neizdevās saņemot e-pastus no e-pasta konta {0}. Ziņojums no servera: {1}, Authorization Code,Autorizācijas kods, Authorize URL,Atļaut URL, Authorized,atļauts, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Nevar mainīt docstatus 1-0, Cannot change header content,Nevar mainīt galvenes saturu, Cannot change state of Cancelled Document. Transition row {0},Nevar mainīt stāvokli ATCELTS dokumenta. Pāreja rinda {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,"Nevar mainīt lietotāja datus demo. Lūdzu reģistrēties, lai izveidotu jaunu kontu https://erpnext.com", -Cannot connect: {0},Nevar izveidot savienojumu: {0}, Cannot create a {0} against a child document: {1},Nevar izveidot {0} pret bērnu dokumenta: {1}, Cannot delete Home and Attachments folders,Nevar izdzēst Mājai un pielikumus mapes, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Nevar izdzēst failu, jo tas pieder {0} {1}, kam jums nav atļaujas", @@ -1139,7 +1137,6 @@ Font Size,Fonta izmērs, Fonts,Fonti, Footer,Futbols, Footer HTML,Kājenes HTML, -Footer Item,Footer punkts, Footer Items,Footer Items, Footer will display correctly only in PDF,Kājene tiks pareizi parādīta tikai PDF formātā, For Document Type,Dokumenta tipam, @@ -1149,7 +1146,6 @@ For Value,Par vērtību, "For currency {0}, the minimum transaction amount should be {1}",Valūtā {0} minimālā darījuma summa ir {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Piemēram, ja jūs atcelt un grozīt INV004 tas kļūs par jaunu dokumentu INV004-1. Tas palīdz jums sekot līdzi katru grozījumu.", "For example: If you want to include the document ID, use {0}","Piemēram: Ja jūs vēlaties, lai iekļautu dokumentu ID, izmantojiet {0}", -For top bar,Par augšējā joslā, "For updating, you can update only selective columns.","Par atjaunināšanu, varat atjaunināt tikai selektīvas kolonnas.", For {0} at level {1} in {2} in row {3},Par {0} vienlīmeņa {1} jo {2} rindā {3}, Force,spēks, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google kalendāra ID, Google Font,Google fonts, Google Services,Google pakalpojumi, Grant Type,Grant Type, -Group Label,marķējums, Group Name,Grupas nosaukums, Group name cannot be empty.,Grupas nosaukums nevar būt tukšs., Groups of DocTypes,Grupas DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,"Lūdzu, apstipriniet savu e-pasta adresi", Point Allocation Periodicity,Punktu piešķiršanas periodiskums, Points,Punkti, Points Given,Piešķirtie punkti, -Policy,politika, Port,Osta, Portal Menu,portāls Menu, Portal Menu Item,Portāls Izvēlnes pozīcija, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Izvēlieties Vismaz 1 rekordu drukāšanai, Select or drag across time slots to create a new event.,"Izvēlieties vai velciet pāri laika nišām, lai izveidotu jaunu notikumu.", Select records for assignment,Izvēlieties ieraksti cesiju, -"Select target = ""_blank"" to open in a new page.","Izvēlieties target = ""_blank"" atvērt jaunu lapu.", Select the label after which you want to insert new field.,"Izvēlieties etiķeti, pēc kura vēlaties ievietot jauno darbības jomu.", "Select your Country, Time Zone and Currency","Izvēlieties savu valsti, laika joslu un Valūta", Select {0},Izvēlieties {0}, @@ -2989,7 +2982,6 @@ star-empty,star-tukšs, step-backward,soli atpakaļ, step-forward,soli uz priekšu, submitted this document,iesniedza šo dokumentu, -"target = ""_blank""","target = ""_blank""", text in document type,Teksta dokumenta veida, text-height,teksta augstums, text-width,teksta platums, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,"Žetonu ģenerēšanas laikā kaut kas nogāja greizi. Noklikšķiniet uz {0}, lai ģenerētu jaunu.", Submit After Import,Iesniegt pēc importēšanas, Submitting...,Notiek iesniegšana ..., -Subscribed Documents,Abonētie dokumenti, Success! You are good to go 👍,Panākumi! Jums ir labi iet 👍, Successful Transactions,Veiksmīgi darījumi, Successfully Submitted!,Veiksmīgi iesniegts!, @@ -3777,7 +3768,6 @@ Please specify,"Lūdzu, norādiet", Printing,Iespiešana, Priority,Prioritāte, Project,Projekts, -Publish,Publicēt, Quarterly,Ceturkšņa, Queued,Rindā, Quick Entry,Quick Entry, @@ -4299,7 +4289,6 @@ Hide Border,Slēpt robežu, Index Web Pages for Search,Mājas lapu meklēšanai indeksēšana, Action / Route,Darbība / maršruts, Document Naming Rule,Dokumentu nosaukšanas kārtība, -Rules with higher priority will be applied first.,Vispirms tiks piemēroti noteikumi ar augstāku prioritāti., Rule Conditions,Noteikumu nosacījumi, Digits,Cipari, Example: 00001,Piemērs: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Iepakojuma publicēšanas rīks, Click on the row for accessing filters.,"Noklikšķiniet uz rindas, lai piekļūtu filtriem.", Sites,Vietnes, Last Deployed On,Pēdējoreiz izvietots, -Last published {0},Pēdējoreiz publicēts {0}, -Publishing documents...,Publicē dokumentus ..., -Documents have been published.,Dokumenti ir publicēti., -Select Document Type.,Atlasiet Dokumenta tips., Console Log,Konsoles žurnāls, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Iestatiet noklusējuma opcijas visām diagrammām šajā informācijas panelī (piemēram: "krāsas": ["# d1d8dd", "# ff5858"])", Use Report Chart,Izmantot pārskatu diagrammu, @@ -4566,10 +4551,6 @@ Incorrect URL,Nepareizs URL, Duplicate Name,Vārda dublikāts, "Please check the value of ""Fetch From"" set for field {0}","Lūdzu, pārbaudiet laukam {0} iestatītās vērtības “Noņemt no” vērtību", Wrong Fetch From value,Nepareiza atņemšanas vērtība, -Deploying,Izvietošana, -Couldn't connect to site {0}. Please check Error Logs.,"Nevarēja izveidot savienojumu ar vietni {0}. Lūdzu, pārbaudiet kļūdu žurnālus.", -Error while installing package to site {0}. Please check Error Logs.,"Instalējot pakotni vietnē {0}, radās kļūda. Lūdzu, pārbaudiet kļūdu žurnālus.", -Exporting,Eksportēšana, A field with the name '{}' already exists in doctype {}.,Lauks ar nosaukumu “{}” jau pastāv doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,"Pielāgoto lauku {0} izveido administrators, un to var izdzēst tikai ar administratora kontu.", Failed to send {0} Auto Email Report,Neizdevās nosūtīt {0} automātiskā e-pasta ziņojumu, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,"{0}. Rinda: Lūdzu, iestatiet attālo vērtību filtrus laukam {1}, lai ielādētu unikālo attālās atkarības dokumentu", Paytm payment gateway settings,Paytm maksājumu vārtejas iestatījumi, "Company, Fiscal Year and Currency defaults","Uzņēmuma, finanšu gada un valūtas noklusējums", -Package,Iepakojums, -Import and Export Packages.,Importēt un eksportēt paketes., Razorpay Signature Verification Failed,Neizdevās pārbaudīt Razorpay parakstu, Google Drive - Could not locate - {0},Google disks - nevarēja atrast - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Sinhronizācijas marķieris nebija derīgs, un tas ir atiestatīts. Mēģiniet vēlreiz sinhronizēt.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,DocType Link / DocType Action, Cannot edit filters for standard charts,Nevar rediģēt standarta diagrammu filtrus, Event Producer Last Update,Pasākuma producenta pēdējais atjauninājums, Default for 'Check' type of field {0} must be either '0' or '1',Noklusējuma lauka “Pārbaudīt” tipam {0} ir jābūt “0” vai “1”, +Non Negative,Nav negatīvs, +Rules with higher priority number will be applied first.,Vispirms tiks izmantoti noteikumi ar lielāku prioritātes numuru., +Open URL in a New Tab,Atveriet URL jaunā cilnē, +Align Right,Izlīdzināt pa labi, +Loading Filters...,Notiek filtru ielāde ..., +Count Customizations,Skaitiet pielāgojumus, +For Example: {} Open,Piemērs: {} Atvērt, +Choose Existing Card or create New Card,Izvēlieties Esošā karte vai izveidojiet Jauna karte, +Number Cards,Skaitļu kartes, +Function Based On,Pamatojoties uz funkciju, +Add Filters,Pievienojiet filtrus, +Skip,Izlaist, +Dismiss,Atlaist, +Value cannot be negative for,Vērtība nevar būt negatīva, +Value cannot be negative for {0}: {1},Vērtība {0} nevar būt negatīva: {1}, +Negative Value,Negatīva vērtība, +Authentication failed while receiving emails from Email Account: {0}.,"Autentifikācija neizdevās, saņemot e-pasta ziņojumus no e-pasta konta: {0}.", +Message from server: {0},Ziņojums no servera: {0}, diff --git a/frappe/translations/mk.csv b/frappe/translations/mk.csv index 2da6e6614e..20d42ae7f5 100644 --- a/frappe/translations/mk.csv +++ b/frappe/translations/mk.csv @@ -499,7 +499,6 @@ Authenticating...,Потврдување ..., Authentication,за проверка на автентичност, Authentication Apps you can use are: ,Апликациите за автентикација кои можете да ги користите се:, Authentication Credentials,Сертификати за проверка на автентичност, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Проверката за автентичност не успеа додека прима пораки од е-мејл сметка {0}. Порака од серверот: {1}, Authorization Code,код за авторизација, Authorize URL,Овластете URL, Authorized,овластен, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Не можат да сменат docstatus Cannot change header content,Не може да се смени содржината на заглавието, Cannot change state of Cancelled Document. Transition row {0},Не може да се промени состојбата на Откажано документ. Ред транзиција {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,не може да се промени детали корисникот во демо. Ве молиме регистрирате за нова сметка на https://erpnext.com, -Cannot connect: {0},Не може да се поврзе: {0}, Cannot create a {0} against a child document: {1},Не можам да создадам {0} против документ дете: {1}, Cannot delete Home and Attachments folders,Не можат да избришат Дом и додатоци папки, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Не може да се избрише датотеката како што му припаѓа {0} {1} за која немате дозволи, @@ -1139,7 +1137,6 @@ Font Size,Големина на фонт, Fonts,Фонтови, Footer,Footer, Footer HTML,Подносни HTML, -Footer Item,footer точка, Footer Items,Footer Теми, Footer will display correctly only in PDF,Подножјето ќе се прикаже правилно само во PDF формат, For Document Type,За типот на документот, @@ -1149,7 +1146,6 @@ For Value,За вредност, "For currency {0}, the minimum transaction amount should be {1}","За валута {0}, минималната сума на трансакција треба да биде {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"На пример, ако се откаже и да се менуваат INV004 таа ќе стане нов документ INV004-1. Ова ќе ви помогне да ги пратите на секој амандман.", "For example: If you want to include the document ID, use {0}","На пример: Ако сакате да ги вклучите проект на документот, користете {0}", -For top bar,На врвот бар, "For updating, you can update only selective columns.","За ажурирање, можете да го ажурирате само селективно колони.", For {0} at level {1} in {2} in row {3},За {0} на ниво {1} на {2} во ред {3}, Force,сила, @@ -1201,7 +1197,6 @@ Google Calendar ID,ИД на Google Calendar, Google Font,Фонт на Google, Google Services,Услуги на Google, Grant Type,Тип на грант, -Group Label,Етикета група, Group Name,Име на групата, Group name cannot be empty.,Името на групата не може да биде празно., Groups of DocTypes,Групи на DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Ве молиме потврдете го ва Point Allocation Periodicity,Периодичност на распределување на точка, Points,Поени, Points Given,Дадени поени, -Policy,политика, Port,Порт, Portal Menu,портал Мени, Portal Menu Item,Портал Ставка, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Изберете барем 1 рекорд за печатење, Select or drag across time slots to create a new event.,Одберете или повлечете низ времето слотови да се создаде нов настан., Select records for assignment,Изберете евиденција за доделување, -"Select target = ""_blank"" to open in a new page.",Изберете целни = "_blank" за отворање на нова страница., Select the label after which you want to insert new field.,Изберете етикетата по што сакате да го вметнете нова област., "Select your Country, Time Zone and Currency","Изберете ја вашата земја, временска зона и валута", Select {0},Изберете {0}, @@ -2989,7 +2982,6 @@ star-empty,ѕвезда-празни, step-backward,чекор назад, step-forward,чекор напред, submitted this document,поднесено овој документ, -"target = ""_blank""",целни = "_blank", text in document type,текст во типот на документот, text-height,текст висина, text-width,текст ширина, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Нешто не беше во ред за време на генерацијата на токени. Кликнете на {0} за да генерирате нов., Submit After Import,Поднесете по увозот, Submitting...,Поднесување ..., -Subscribed Documents,Претплатени документи, Success! You are good to go 👍,Успех! Добро си да одиш 👍, Successful Transactions,Успешни трансакции, Successfully Submitted!,Успешно поднесено!, @@ -3777,7 +3768,6 @@ Please specify,Ве молиме наведете, Printing,Печатење, Priority,Приоритет, Project,Проект, -Publish,Објавете, Quarterly,Квартален, Queued,Чекаат на ред, Quick Entry,Брз влез, @@ -4299,7 +4289,6 @@ Hide Border,Сокриј ја границата, Index Web Pages for Search,Индексирај веб-страници за пребарување, Action / Route,Акција / пат, Document Naming Rule,Правило за именување документ, -Rules with higher priority will be applied first.,Прво ќе се применат правила со поголем приоритет., Rule Conditions,Услови за правило, Digits,Бројки, Example: 00001,Пример: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Алатка за објавување пакети, Click on the row for accessing filters.,Кликнете на редот за пристап до филтрите., Sites,Сајтови, Last Deployed On,Последно распоредено на, -Last published {0},Последно објавено {0}, -Publishing documents...,Објавување документи ..., -Documents have been published.,Документи се објавени., -Select Document Type.,Изберете Тип на документ., Console Log,Дневник на конзолата, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Поставете стандардни опции за сите графикони на оваа табла (Пр.: "Бои": ["# d1d8dd", "# ff5858"])", Use Report Chart,Користете Табела за извештаи, @@ -4566,10 +4551,6 @@ Incorrect URL,Неточна URL-адреса, Duplicate Name,Дупликат име, "Please check the value of ""Fetch From"" set for field {0}",Проверете ја вредноста на поставеното „Преземи од“ за полето {0}, Wrong Fetch From value,Погрешен превземање од вредност, -Deploying,Распоредување, -Couldn't connect to site {0}. Please check Error Logs.,Не може да се поврзе со страницата {0}. Проверете ги дневниците за грешки., -Error while installing package to site {0}. Please check Error Logs.,Грешка при инсталирање на пакетот на страницата {0}. Проверете ги дневниците за грешки., -Exporting,Извоз, A field with the name '{}' already exists in doctype {}.,Поле со име "{}" веќе постои во документот тип {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Прилагодено поле {0} е создадено од администраторот и може да се избрише само преку сметката на администраторот., Failed to send {0} Auto Email Report,Не успеа да се испрати извештајот за автоматска е-пошта, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Ред # {0}: Поставете филтри за далечинска вредност за полето {1} за да го преземете уникатниот документ за зависност од далечина, Paytm payment gateway settings,Поставки за портата за плаќање Paytm, "Company, Fiscal Year and Currency defaults","Стандардни вредности на компанијата, фискалната година и валутата", -Package,Пакет, -Import and Export Packages.,Увоз и извоз на пакети., Razorpay Signature Verification Failed,Проверката на потписот на Razorpay не успеа, Google Drive - Could not locate - {0},Google Drive - не може да се лоцира - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Токенот за синхронизација беше неважечки и е ресетиран, обидете се повторно со синхронизирање.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,За врска со DocType / акција з Cannot edit filters for standard charts,Не може да се уредуваат филтрите за стандардни графикони, Event Producer Last Update,Последно ажурирање на производителот на настани, Default for 'Check' type of field {0} must be either '0' or '1',Стандардно за полето „Провери“ {0} мора да биде „0“ или „1“, +Non Negative,Ненегативно, +Rules with higher priority number will be applied first.,Прво ќе се применат правила со поголем број на приоритет., +Open URL in a New Tab,Отворете URL во ново јазиче, +Align Right,Порамнете го десно, +Loading Filters...,Се вчитуваат филтрите ..., +Count Customizations,Брои прилагодувања, +For Example: {} Open,На пример: {} Отвори, +Choose Existing Card or create New Card,Изберете постоечка картичка или создадете нова картичка, +Number Cards,Картички со броеви, +Function Based On,Функција заснована врз, +Add Filters,Додадете филтри, +Skip,Прескокни, +Dismiss,Отфрли, +Value cannot be negative for,Вредноста не може да биде негативна за, +Value cannot be negative for {0}: {1},Вредноста не може да биде негативна за {0}: {1}, +Negative Value,Негативна вредност, +Authentication failed while receiving emails from Email Account: {0}.,Автентикацијата не успеа при добивање е-пошта од сметка за е-пошта: {0}., +Message from server: {0},Порака од серверот: {0}, diff --git a/frappe/translations/ml.csv b/frappe/translations/ml.csv index 02d27b40eb..8a8ae15b91 100644 --- a/frappe/translations/ml.csv +++ b/frappe/translations/ml.csv @@ -499,7 +499,6 @@ Authenticating...,പ്രാമാണീകരിക്കുന്നു ..., Authentication,ആധികാരികത, Authentication Apps you can use are: ,നിങ്ങൾ ഉപയോഗിക്കാൻ കഴിയുന്ന പ്രാമാണീകരണ അപ്ലിക്കേഷനുകൾ ഇവയാണ്:, Authentication Credentials,പ്രാമാണീകരണ ക്രെഡൻഷ്യലുകൾ, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},ഇമെയിൽ അക്കൗണ്ട് {0} നിന്ന് ഇമെയിലുകൾ വാങ്ങിക്കുന്നതും പ്രാമാണീകരണം പരാജയപ്പെട്ടു. സെർവറിൽ നിന്നുള്ള സന്ദേശം: {1}, Authorization Code,അംഗീകാരമുള്ള കോഡ്, Authorize URL,URL അംഗീകരിക്കുക, Authorized,അംഗീകൃത, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,0 1 മുതൽ docstatus മാറ്റ Cannot change header content,ശീർഷക ഉള്ളടക്കം മാറ്റാൻ കഴിയില്ല, Cannot change state of Cancelled Document. Transition row {0},റദ്ദാക്കി ഡോക്യുമെന്റ് സംസ്ഥാന മാറ്റാൻ കഴിയില്ല. ട്രാൻസിഷൻ വരി {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,ഡെമോ ഉപയോക്താക്കളുള്ള വിശദാംശങ്ങൾ മാറ്റാൻ കഴിയില്ല. https://erpnext.com ഒരു പുതിയ അക്കൗണ്ട് പ്രവേശന ദയവായി, -Cannot connect: {0},ബന്ധിപ്പിക്കാൻ കഴിയില്ല: {0}, Cannot create a {0} against a child document: {1},ഒരു കുട്ടി പ്രമാണം നേരെ {0} സൃഷ്ടിക്കാൻ കഴിയില്ല: {1}, Cannot delete Home and Attachments folders,ഹോം ആൻഡ് അറ്റാച്മെന്റ് ഫോൾഡറുകൾ ഇല്ലാതാക്കാൻ കഴിയില്ല, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"നിങ്ങൾക്ക് അനുമതിയില്ലെങ്കിൽ, {0} {1} എന്നതിന്റെ ഭാഗമായി ഫയൽ ഇല്ലാതാക്കാൻ കഴിയില്ല", @@ -1139,7 +1137,6 @@ Font Size,അക്ഷര വലിപ്പം, Fonts,ഫോണ്ടുകൾ, Footer,അടിക്കുറിപ്പ്, Footer HTML,അടിക്കുറിപ്പ് HTML, -Footer Item,അടിക്കുറിപ്പ് ഇനം, Footer Items,അടിക്കുറിപ്പ് ഇനങ്ങൾ, Footer will display correctly only in PDF,അടിക്കുറിപ്പ് PDF ൽ മാത്രം ശരിയായി പ്രദർശിപ്പിക്കും, For Document Type,പ്രമാണ തരത്തിനായി, @@ -1149,7 +1146,6 @@ For Value,മൂല്യം, "For currency {0}, the minimum transaction amount should be {1}","കറൻസിക്ക് {0}, ഏറ്റവും കുറഞ്ഞ ഇടപാട് തുക {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"റദ്ദാക്കി INV004, ഭേദഗതി ഉദാഹരണത്തിന് ഒരു പുതിയ ഡോക്യുമെന്റ് INV004-1 മാറും. ഇത് നിങ്ങൾ ഓരോ ഭേദഗതി ട്രാക്ക് സഹായിക്കുന്നു.", "For example: If you want to include the document ID, use {0}","ഉദാഹരണം: ഡോക്യുമെന്റ് ഐഡി ഉൾപ്പെടുത്താൻ ആഗ്രഹിക്കുന്നുവെങ്കിൽ, {0} ഉപയോഗിക്കുക", -For top bar,മുകളിൽ ബാർ വേണ്ടി, "For updating, you can update only selective columns.","അപ്ഡേറ്റ്, നിങ്ങൾ മാത്രം സെലക്ടീവായ നിരകൾ അപ്ഡേറ്റ് ചെയ്യാം.", For {0} at level {1} in {2} in row {3},{2} നിരയിൽ {3} ലെ {1} തലത്തിൽ {0} വേണ്ടി, Force,ശക്തിയാണ്, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google കലണ്ടർ ഐഡി, Google Font,Google ഫോണ്ട്, Google Services,Google സേവനങ്ങൾ, Grant Type,ഗ്രാന്റ് ഇനം, -Group Label,ഗ്രൂപ്പ് ലേബൽ, Group Name,ഗ്രൂപ്പ് പേര്, Group name cannot be empty.,ഗ്രൂപ്പ് നാമം ശൂന്യമായിരിക്കരുത്., Groups of DocTypes,DocTypes ഓഫ് ഗ്രൂപ്പുകൾ, @@ -1911,7 +1906,6 @@ Please verify your Email Address,നിങ്ങളുടെ ഇമെയിൽ Point Allocation Periodicity,പോയിന്റ് അലോക്കേഷൻ പീരിയോഡിസിറ്റി, Points,പോയിന്റുകൾ, Points Given,നൽകിയ പോയിന്റുകൾ, -Policy,നയം, Port,പോര്ട്, Portal Menu,പോർട്ടൽ മെനു, Portal Menu Item,പോർട്ടൽ മെനു ഇനം, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,അച്ചടിക്കാനുള്ള കുറയാതെ 1 റെക്കോഡ് തിരഞ്ഞെടുക്കുക, Select or drag across time slots to create a new event.,തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ ഒരു പുതിയ ഇവന്റ് സൃഷ്ടിക്കാൻ സമയം സ്ലോട്ടുകൾ കുറുകെ ഡ്രാഗ്., Select records for assignment,അസൈന്മെന്റ് റിക്കോഡുകൾ തിരഞ്ഞെടുക്കുക, -"Select target = ""_blank"" to open in a new page.",ഒരു പുതിയ പേജിൽ തുറക്കാൻ തിരഞ്ഞെടുക്കുക ലക്ഷ്യം = "_blank"., Select the label after which you want to insert new field.,നിങ്ങൾ പുതിയ ഫീൽഡ് തിരുകാൻ ആഗ്രഹിക്കുന്ന ശേഷം ലേബൽ തിരഞ്ഞെടുക്കുക., "Select your Country, Time Zone and Currency","നിങ്ങളുടെ രാജ്യം, സമയ സോൺ, കറൻസി തിരഞ്ഞെടുക്കുക", Select {0},{0} തിരഞ്ഞെടുക്കുക, @@ -2989,7 +2982,6 @@ star-empty,നക്ഷത്രം-ഒഴിഞ്ഞ, step-backward,ഘട്ടം പിന്നാക്ക, step-forward,മുന്നോട്ട്, submitted this document,ഈ പ്രമാണം സമർപ്പിച്ചു, -"target = ""_blank""",ലക്ഷ്യം = "_blank", text in document type,ഡോക്യുമെന്റ് തരം വാചകം, text-height,ടെക്സ്റ്റ്-ഉയരം, text-width,ടെക്സ്റ്റ്-വീതി, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,ടോക്കൺ ജനറേഷൻ സമയത്ത് എന്തോ തെറ്റായി സംഭവിച്ചു. പുതിയത് സൃഷ്ടിക്കുന്നതിന് {0 on ക്ലിക്കുചെയ്യുക., Submit After Import,ഇറക്കുമതിക്ക് ശേഷം സമർപ്പിക്കുക, Submitting...,സമർപ്പിക്കുന്നു ..., -Subscribed Documents,സബ്‌സ്‌ക്രൈബുചെയ്‌ത പ്രമാണങ്ങൾ, Success! You are good to go 👍,വിജയം! നിങ്ങൾ പോകുന്നത് നല്ലതാണ്, Successful Transactions,വിജയകരമായ ഇടപാടുകൾ, Successfully Submitted!,വിജയകരമായി സമർപ്പിച്ചു!, @@ -3777,7 +3768,6 @@ Please specify,ദയവായി വ്യക്തമാക്കുക, Printing,അച്ചടി, Priority,മുൻഗണന, Project,പ്രോജക്ട്, -Publish,പ്രസിദ്ധീകരിക്കുക, Quarterly,പാദവാർഷികം, Queued,ക്യൂവിലാക്കി, Quick Entry,ദ്രുത എൻട്രി, @@ -4299,7 +4289,6 @@ Hide Border,ബോർഡർ മറയ്‌ക്കുക, Index Web Pages for Search,തിരയലിനായുള്ള സൂചിക വെബ് പേജുകൾ, Action / Route,പ്രവർത്തനം / റൂട്ട്, Document Naming Rule,പ്രമാണ നാമകരണ നിയമം, -Rules with higher priority will be applied first.,ഉയർന്ന മുൻ‌ഗണനയുള്ള നിയമങ്ങൾ‌ ആദ്യം പ്രയോഗിക്കും., Rule Conditions,റൂൾ നിബന്ധനകൾ, Digits,അക്കങ്ങൾ, Example: 00001,ഉദാഹരണം: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,പാക്കേജ് പ്രസിദ്ധീകര Click on the row for accessing filters.,ഫിൽ‌റ്ററുകൾ‌ ആക്‌സസ് ചെയ്യുന്നതിന് വരിയിൽ‌ ക്ലിക്കുചെയ്യുക., Sites,സൈറ്റുകൾ, Last Deployed On,അവസാനം വിന്യസിച്ചു, -Last published {0},അവസാനം പ്രസിദ്ധീകരിച്ചത് {0}, -Publishing documents...,പ്രമാണങ്ങൾ പ്രസിദ്ധീകരിക്കുന്നു ..., -Documents have been published.,പ്രമാണങ്ങൾ പ്രസിദ്ധീകരിച്ചു., -Select Document Type.,പ്രമാണ തരം തിരഞ്ഞെടുക്കുക., Console Log,കൺസോൾ ലോഗ്, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","ഈ ഡാഷ്‌ബോർഡിലെ എല്ലാ ചാർട്ടുകൾക്കുമായി സ്ഥിരസ്ഥിതി ഓപ്ഷനുകൾ സജ്ജമാക്കുക (ഉദാ: "നിറങ്ങൾ": ["# d1d8dd", "# ff5858"])", Use Report Chart,റിപ്പോർട്ട് ചാർട്ട് ഉപയോഗിക്കുക, @@ -4566,10 +4551,6 @@ Incorrect URL,തെറ്റായ URL, Duplicate Name,തനിപ്പകർപ്പ് പേര്, "Please check the value of ""Fetch From"" set for field {0}",Field 0 field ഫീൽഡിനായി സജ്ജമാക്കിയ "നിന്ന് നേടുക" എന്നതിന്റെ മൂല്യം പരിശോധിക്കുക, Wrong Fetch From value,മൂല്യത്തിൽ നിന്ന് തെറ്റായ ലഭ്യമാക്കുക, -Deploying,വിന്യസിക്കുന്നു, -Couldn't connect to site {0}. Please check Error Logs.,Site site site സൈറ്റിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല. പിശക് ലോഗുകൾ പരിശോധിക്കുക., -Error while installing package to site {0}. Please check Error Logs.,Site site site സൈറ്റിലേക്ക് പാക്കേജ് ഇൻസ്റ്റാൾ ചെയ്യുമ്പോൾ പിശക്. പിശക് ലോഗുകൾ പരിശോധിക്കുക., -Exporting,എക്‌സ്‌പോർട്ടുചെയ്യുന്നു, A field with the name '{}' already exists in doctype {}.,'{}' എന്ന പേരിലുള്ള ഒരു ഫീൽഡ് ഇതിനകം ഡോക്‌ടൈപ്പിൽ നിലവിലുണ്ട് {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,"ഇഷ്‌ടാനുസൃത ഫീൽഡ് {0 the അഡ്മിനിസ്ട്രേറ്റർ സൃഷ്‌ടിച്ചതാണ്, മാത്രമല്ല അഡ്‌മിനിസ്‌ട്രേറ്റർ അക്കൗണ്ട് വഴി മാത്രമേ ഇത് ഇല്ലാതാക്കാൻ കഴിയൂ.", Failed to send {0} Auto Email Report,Email 0} യാന്ത്രിക ഇമെയിൽ റിപ്പോർട്ട് അയയ്‌ക്കുന്നതിൽ പരാജയപ്പെട്ടു, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,വരി # {0}: അദ്വിതീയ വിദൂര ആശ്രിത പ്രമാണം ലഭിക്കുന്നതിന് {1 the ഫീൽഡിനായി വിദൂര മൂല്യ ഫിൽട്ടറുകൾ സജ്ജമാക്കുക, Paytm payment gateway settings,പേടിഎം പേയ്‌മെന്റ് ഗേറ്റ്‌വേ ക്രമീകരണങ്ങൾ, "Company, Fiscal Year and Currency defaults","കമ്പനി, സാമ്പത്തിക വർഷം, കറൻസി സ്ഥിരസ്ഥിതികൾ", -Package,പാക്കേജ്, -Import and Export Packages.,"പാക്കേജുകൾ ഇറക്കുമതി ചെയ്യുക, കയറ്റുമതി ചെയ്യുക.", Razorpay Signature Verification Failed,റേസർപേ സിഗ്നേച്ചർ പരിശോധന പരാജയപ്പെട്ടു, Google Drive - Could not locate - {0},Google ഡ്രൈവ് - കണ്ടെത്താൻ കഴിഞ്ഞില്ല - {0}, "Sync token was invalid and has been resetted, Retry syncing.","സമന്വയ ടോക്കൺ അസാധുവായിരുന്നു, പുന reset സജ്ജമാക്കി, സമന്വയിപ്പിക്കൽ വീണ്ടും ശ്രമിക്കുക.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,ഡോക്‌ടൈപ്പ് ലിങ് Cannot edit filters for standard charts,സ്റ്റാൻഡേർഡ് ചാർട്ടുകൾക്കായി ഫിൽട്ടറുകൾ എഡിറ്റുചെയ്യാൻ കഴിയില്ല, Event Producer Last Update,ഇവന്റ് പ്രൊഡ്യൂസർ അവസാന അപ്‌ഡേറ്റ്, Default for 'Check' type of field {0} must be either '0' or '1','ചെക്ക്' ഫീൽഡ് for 0 for സ്ഥിരസ്ഥിതി '0' അല്ലെങ്കിൽ '1' ആയിരിക്കണം, +Non Negative,നെഗറ്റീവ് അല്ല, +Rules with higher priority number will be applied first.,ഉയർന്ന മുൻ‌ഗണനാ നമ്പറുള്ള നിയമങ്ങൾ‌ ആദ്യം പ്രയോഗിക്കും., +Open URL in a New Tab,ഒരു പുതിയ ടാബിൽ URL തുറക്കുക, +Align Right,വലത്തേക്ക് വിന്യസിക്കുക, +Loading Filters...,ഫിൽട്ടറുകൾ ലോഡുചെയ്യുന്നു ..., +Count Customizations,ഇഷ്‌ടാനുസൃതമാക്കലുകൾ എണ്ണുക, +For Example: {} Open,ഉദാഹരണത്തിന്: {} തുറക്കുക, +Choose Existing Card or create New Card,നിലവിലുള്ള കാർഡ് തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ പുതിയ കാർഡ് സൃഷ്ടിക്കുക, +Number Cards,നമ്പർ കാർഡുകൾ, +Function Based On,പ്രവർത്തനം അടിസ്ഥാനമാക്കി, +Add Filters,ഫിൽട്ടറുകൾ ചേർക്കുക, +Skip,ഒഴിവാക്കുക, +Dismiss,നിരസിക്കുക, +Value cannot be negative for,മൂല്യം നെഗറ്റീവ് ആകരുത്, +Value cannot be negative for {0}: {1},{0 For ന് മൂല്യം നെഗറ്റീവ് ആകരുത്: {1}, +Negative Value,നെഗറ്റീവ് മൂല്യം, +Authentication failed while receiving emails from Email Account: {0}.,ഇമെയിൽ അക്കൗണ്ടിൽ നിന്ന് ഇമെയിലുകൾ സ്വീകരിക്കുമ്പോൾ പ്രാമാണീകരണം പരാജയപ്പെട്ടു: {0}., +Message from server: {0},സെർവറിൽ നിന്നുള്ള സന്ദേശം: {0}, diff --git a/frappe/translations/mr.csv b/frappe/translations/mr.csv index f932c8e1c8..383b7a1c1e 100644 --- a/frappe/translations/mr.csv +++ b/frappe/translations/mr.csv @@ -499,7 +499,6 @@ Authenticating...,प्रमाणीकरण करीत आहे ..., Authentication,प्रमाणीकरण, Authentication Apps you can use are: ,आपण वापरू शकता प्रमाणीकरण अॅप्स आहेत:, Authentication Credentials,प्रमाणीकरण क्रेडेन्शियल, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},प्रमाणीकरण ईमेल खाते {0} ईमेल प्राप्त करताना अयशस्वी. सर्व्हरकडून संदेश: {1}, Authorization Code,प्राधिकृत करणे कोड, Authorize URL,अधिकृत URL, Authorized,अधिकृत, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,0 ते 1 docstatus बदलू शकत Cannot change header content,शीर्षलेख सामग्री बदलू शकत नाही, Cannot change state of Cancelled Document. Transition row {0},रद्द दस्तऐवज राज्य बदलू शकत नाही. स्थित्यंतर सलग {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,डेमो वापरकर्ता तपशील बदलू शकत नाही. https://erpnext.com एक नवीन खाते साठी साइन अप करा, -Cannot connect: {0},कनेक्ट करू शकत नाही: {0}, Cannot create a {0} against a child document: {1},{0} तयार करू शकत नाही एक एक मूल दस्तऐवजावर: {1}, Cannot delete Home and Attachments folders,घर आणि संलग्नक फोल्डर्स डिलीट करू शकत नाही, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,{0} {1} च्या मालकीची फाईल हटवू शकत नाही ज्यासाठी आपल्याला परवानगी नाही, @@ -1139,7 +1137,6 @@ Font Size,फॉन्ट आकार, Fonts,फॉन्ट, Footer,तळटीप, Footer HTML,तळटीप एचटीएमएल, -Footer Item,तळटीप बाबींचा, Footer Items,तळटीप आयटम, Footer will display correctly only in PDF,फुटर केवळ पीडीएफमध्ये योग्यरित्या प्रदर्शित होईल, For Document Type,दस्तऐवज प्रकारासाठी, @@ -1149,7 +1146,6 @@ For Value,मूल्यासाठी, "For currency {0}, the minimum transaction amount should be {1}","चलन {0} साठी, कमीत कमी व्यवहार रक्कम {1} असावी", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,आपल्याला रद्द करणे आणि INV004 असले पाहिजे उदाहरणार्थ तो एक नवीन दस्तऐवज INV004-1 होईल. हे आपण प्रत्येक दुरुस्ती ट्रॅक ठेवण्यासाठी मदत करते., "For example: If you want to include the document ID, use {0}","उदाहरणार्थ: जर आपण दस्तऐवज आयडी समाविष्ट करू इच्छित असल्यास, वापरा {0}", -For top bar,Top बार साठी, "For updating, you can update only selective columns.","अद्ययावत करण्यासाठी , आपण फक्त पसंतीचा स्तंभ अद्ययावत करू शकता.", For {0} at level {1} in {2} in row {3},कारण {0} मध्ये पातळी {1} येथे {2} सलग {3}, Force,शक्ती, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Calendar ID, Google Font,गूगल फॉन्ट, Google Services,Google सेवा, Grant Type,अनुदान प्रकार, -Group Label,गट लेबल, Group Name,गटाचे नाव, Group name cannot be empty.,गट नाव रिक्त असू शकत नाही., Groups of DocTypes,DocTypes गट, @@ -1911,7 +1906,6 @@ Please verify your Email Address,आपला ई-मेल पत्ता स Point Allocation Periodicity,पॉईंट ocलोकेशन पीरियडिसीटी, Points,गुण, Points Given,गुण दिले, -Policy,धोरण, Port,पोर्ट, Portal Menu,पोर्टल मेनू, Portal Menu Item,पोर्टल मेन्यू घटक, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,मुद्रणासाठी किमान 1 रेकॉर्ड निवडा, Select or drag across time slots to create a new event.,नवीन कार्यक्रम तयार करण्याची वेळ स्लॉट ओलांडून ड्रॅग करा किंवा निवडा., Select records for assignment,नेमणूकींसाठी रेकॉर्ड निवडा, -"Select target = ""_blank"" to open in a new page.","target = ""_blank"" एक नवीन पृष्ठ मध्ये उघडण्यासाठी निवडा.", Select the label after which you want to insert new field.,ज्यानंतर नवीन क्षेत्रात समाविष्ट करायचे असेल ते लेबल निवडा., "Select your Country, Time Zone and Currency","आपला देश, टाइम झोन, आणि चलन निवडा", Select {0},निवडा {0}, @@ -2989,7 +2982,6 @@ star-empty,स्टार-रिक्त, step-backward,चरण-मागे, step-forward,चरण-पुढे, submitted this document,या दस्तऐवज सादर केला, -"target = ""_blank""",target = "_blank", text in document type,दस्तऐवज प्रकार मजकूर, text-height,मजकूर-उंची, text-width,मजकूर-रुंदीचा, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,टोकन पिढी दरम्यान काहीतरी चूक झाली. नवीन व्युत्पन्न करण्यासाठी {0} वर क्लिक करा., Submit After Import,आयात केल्यानंतर सबमिट करा, Submitting...,सबमिट करीत आहे ..., -Subscribed Documents,सदस्यता घेतलेली कागदपत्रे, Success! You are good to go 👍,यश! आपण जाणे चांगले आहे 👍, Successful Transactions,यशस्वी व्यवहार, Successfully Submitted!,यशस्वीरित्या सबमिट केले!, @@ -3777,7 +3768,6 @@ Please specify,कृपया निर्दिष्ट करा, Printing,मुद्रण, Priority,प्राधान्य, Project,प्रकल्प, -Publish,प्रकाशित करा, Quarterly,तिमाही, Queued,रांगेत आहे, Quick Entry,जलद प्रवेश, @@ -4299,7 +4289,6 @@ Hide Border,सीमा लपवा, Index Web Pages for Search,शोधासाठी अनुक्रमणिका वेब पृष्ठे, Action / Route,क्रिया / मार्ग, Document Naming Rule,दस्तऐवज नामकरण नियम, -Rules with higher priority will be applied first.,प्रथम उच्च प्राथमिकतेसह नियम लागू केले जातील., Rule Conditions,नियम अटी, Digits,अंक, Example: 00001,उदाहरण: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,पॅकेज प्रकाशित साधन, Click on the row for accessing filters.,फिल्टरमध्ये प्रवेश करण्यासाठी पंक्तीवर क्लिक करा., Sites,साइट्स, Last Deployed On,शेवटची तैनात, -Last published {0},अंतिम प्रकाशित {0}, -Publishing documents...,कागदजत्र प्रकाशित करीत आहे ..., -Documents have been published.,कागदपत्रे प्रकाशित केली गेली आहेत., -Select Document Type.,कागदजत्र प्रकार निवडा., Console Log,कन्सोल लॉग, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","या डॅशबोर्डवरील सर्व चार्टसाठी डीफॉल्ट पर्याय सेट करा (उदा: "रंग": ["# d1d8dd", "# ff5858"])", Use Report Chart,रिपोर्ट चार्ट वापरा, @@ -4566,10 +4551,6 @@ Incorrect URL,चुकीची URL, Duplicate Name,डुप्लिकेट नाव, "Please check the value of ""Fetch From"" set for field {0}",कृपया फील्ड for 0} साठी सेट केलेले "प्राप्त करा" चे मूल्य तपासा., Wrong Fetch From value,चुकीचे आणा मूल्य पासून, -Deploying,तैनात करत आहे, -Couldn't connect to site {0}. Please check Error Logs.,साइट {0} वर कनेक्ट करणे शक्य झाले नाही. कृपया त्रुटी लॉग तपासा., -Error while installing package to site {0}. Please check Error Logs.,साइट package 0} वर पॅकेज स्थापित करताना त्रुटी. कृपया त्रुटी लॉग तपासा., -Exporting,निर्यात करत आहे, A field with the name '{}' already exists in doctype {}.,'{}' नावाचे फील्ड डॉकटाइप already} मध्ये आधीपासून विद्यमान आहे., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,सानुकूल फील्ड {0} प्रशासकाद्वारे तयार केले गेले आहे आणि केवळ प्रशासक खात्याद्वारे हटविले जाऊ शकते., Failed to send {0} Auto Email Report,Email 0} स्वयं ईमेल अहवाल पाठविण्यात अयशस्वी, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,पंक्ती # {0}: कृपया अद्वितीय दूरस्थ अवलंबन दस्तऐवज मिळविण्यासाठी फील्ड {1 field साठी रिमोट मूल्य फिल्टर सेट करा, Paytm payment gateway settings,पेटीएम पेमेंट गेटवे सेटिंग्ज, "Company, Fiscal Year and Currency defaults","कंपनी, वित्तीय वर्ष आणि चलन डीफॉल्ट", -Package,पॅकेज, -Import and Export Packages.,पॅकेजेस आयात आणि निर्यात करा., Razorpay Signature Verification Failed,रेजरपे स्वाक्षरी पडताळणी अयशस्वी, Google Drive - Could not locate - {0},Google ड्राइव्ह - शोधू शकलो नाही - {0, "Sync token was invalid and has been resetted, Retry syncing.","समक्रमण टोकन अवैध होते आणि रीसेट केले गेले आहे, संकालनाचा पुन्हा प्रयत्न करा.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,डॉकटाइप लिंक / डॉक Cannot edit filters for standard charts,मानक चार्टसाठी फिल्टर संपादित करू शकत नाही, Event Producer Last Update,कार्यक्रम निर्माता शेवटचे अद्यतन, Default for 'Check' type of field {0} must be either '0' or '1','चेक' प्रकाराच्या फील्ड for 0 for साठी डीफॉल्ट एकतर '0' किंवा '1' असणे आवश्यक आहे, +Non Negative,नकारात्मक नाही, +Rules with higher priority number will be applied first.,प्रथम उच्च प्राधान्य क्रमांकासह नियम लागू केले जातील., +Open URL in a New Tab,नवीन टॅबमध्ये URL उघडा, +Align Right,उजवीकडे संरेखित करा, +Loading Filters...,फिल्टर लोड करीत आहे ..., +Count Customizations,सानुकूलने मोजा, +For Example: {} Open,उदाहरणार्थ: {} उघडा, +Choose Existing Card or create New Card,विद्यमान कार्ड निवडा किंवा नवीन कार्ड तयार करा, +Number Cards,क्रमांक कार्डे, +Function Based On,कार्यावर आधारित, +Add Filters,फिल्टर जोडा, +Skip,वगळा, +Dismiss,काढून टाकणे, +Value cannot be negative for,मूल्य यासाठी नकारात्मक असू शकत नाही, +Value cannot be negative for {0}: {1},मूल्य {0} साठी नकारात्मक असू शकत नाही: {1}, +Negative Value,नकारात्मक मूल्य, +Authentication failed while receiving emails from Email Account: {0}.,ईमेल खात्यावरून ईमेल प्राप्त करताना प्रमाणीकरण अयशस्वी: {0}., +Message from server: {0},सर्व्हरकडून संदेश: {0}, diff --git a/frappe/translations/ms.csv b/frappe/translations/ms.csv index 05fde7407d..00c97f0a20 100644 --- a/frappe/translations/ms.csv +++ b/frappe/translations/ms.csv @@ -499,7 +499,6 @@ Authenticating...,Mengesahkan ..., Authentication,pengesahan, Authentication Apps you can use are: ,Aplikasi pengesahan yang boleh anda gunakan adalah:, Authentication Credentials,Kredensial Pengesahan, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Pengesahan gagal semasa menerima e-mel dari Akaun E-mel {0}. Mesej dari pelayan: {1}, Authorization Code,Kod Pengesahan, Authorize URL,Kebenaran URL, Authorized,yang diberi kuasa, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Tidak boleh menukar docstatus 1-0, Cannot change header content,Tidak boleh menukar kandungan header, Cannot change state of Cancelled Document. Transition row {0},Tidak boleh mengubah keadaan Dokumen Dibatalkan. Berturut-turut peralihan {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Tidak dapat mengubah maklumat pengguna dalam demo. Sila mendaftar untuk akaun baru di https://erpnext.com, -Cannot connect: {0},Tidak dapat menyambung: {0}, Cannot create a {0} against a child document: {1},Tidak boleh mencipta {0} terhadap dokumen kanak-kanak: {1}, Cannot delete Home and Attachments folders,Tidak dapat memadam Rumah dan Lampiran folder, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Tidak dapat memadam fail kerana ia dimiliki oleh {0} {1} yang mana anda tidak mempunyai keizinan, @@ -1139,7 +1137,6 @@ Font Size,Saiz font, Fonts,Font, Footer,Footer, Footer HTML,HTML Footer, -Footer Item,Footer Perkara, Footer Items,Item Footer, Footer will display correctly only in PDF,Footer akan dipaparkan dengan betul hanya dalam PDF, For Document Type,Untuk Jenis Dokumen, @@ -1149,7 +1146,6 @@ For Value,Untuk Nilai, "For currency {0}, the minimum transaction amount should be {1}","Untuk mata wang {0}, jumlah transaksi minimum harus {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,Sebagai contoh jika anda membatalkan dan meminda INV004 ia akan menjadi INV004-1 dokumen baru. Ini membantu anda untuk menjejaki setiap pindaan., "For example: If you want to include the document ID, use {0}","Sebagai contoh: Jika anda ingin memasukkan ID dokumen itu, gunakan {0}", -For top bar,Untuk bar atas, "For updating, you can update only selective columns.","Untuk mengemaskini, anda boleh mengemas kini ruangan hanya terpilih.", For {0} at level {1} in {2} in row {3},Untuk {0} di peringkat {1} dalam {2} berturut-turut {3}, Force,Force, @@ -1201,7 +1197,6 @@ Google Calendar ID,ID Kalendar Google, Google Font,Google Font, Google Services,Perkhidmatan Google, Grant Type,Grant Jenis, -Group Label,Kumpulan Label, Group Name,Nama kumpulan, Group name cannot be empty.,Nama kumpulan tidak boleh kosong., Groups of DocTypes,Kumpulan DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Sila sahkan Alamat E-mel anda, Point Allocation Periodicity,Periodicity Alokasi Point, Points,Mata, Points Given,Mata diberi, -Policy,Dasar, Port,Port, Portal Menu,Portal Menu, Portal Menu Item,Menu Portal Item, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Pilih atleast 1 rekod untuk mencetak, Select or drag across time slots to create a new event.,Pilih atau seret di seluruh slot masa untuk mewujudkan satu acara baru., Select records for assignment,Pilih rekod untuk tugasan, -"Select target = ""_blank"" to open in a new page.",Sasaran pilih = "_blank" dibuka pada muka surat yang baru., Select the label after which you want to insert new field.,Pilih label yang anda kehendaki untuk memasukkan bidang baru., "Select your Country, Time Zone and Currency","Pilih Negara anda, Time Zone dan mata wang", Select {0},Pilih {0}, @@ -2989,7 +2982,6 @@ star-empty,bintang-kosong, step-backward,langkah ke belakang, step-forward,langkah ke hadapan, submitted this document,mengemukakan dokumen ini, -"target = ""_blank""",target = "_blank", text in document type,teks dalam jenis dokumen, text-height,teks ketinggian, text-width,teks-lebar, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Sesuatu yang berlaku semasa generasi token. Klik pada {0} untuk menghasilkan yang baru., Submit After Import,Hantar Selepas Import, Submitting...,Menghantar ..., -Subscribed Documents,Dokumen yang Dilanggan, Success! You are good to go 👍,Kejayaan! Anda baik untuk pergi 👍, Successful Transactions,Urusniaga yang berjaya, Successfully Submitted!,Berjaya Dihantar!, @@ -3777,7 +3768,6 @@ Please specify,Sila nyatakan, Printing,Percetakan, Priority,Keutamaan, Project,Projek, -Publish,Menerbitkan, Quarterly,Suku Tahunan, Queued,Beratur, Quick Entry,Kemasukan Pantas, @@ -4299,7 +4289,6 @@ Hide Border,Sembunyikan Sempadan, Index Web Pages for Search,Halaman Web Indeks untuk Carian, Action / Route,Tindakan / Laluan, Document Naming Rule,Peraturan Penamaan Dokumen, -Rules with higher priority will be applied first.,Peraturan dengan keutamaan yang lebih tinggi akan digunakan terlebih dahulu., Rule Conditions,Syarat Peraturan, Digits,Digit, Example: 00001,Contoh: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Alat Penerbitan Pakej, Click on the row for accessing filters.,Klik pada baris untuk mengakses penapis., Sites,Laman web, Last Deployed On,Terakhir Digunakan Pada, -Last published {0},Terakhir diterbitkan {0}, -Publishing documents...,Menerbitkan dokumen ..., -Documents have been published.,Dokumen telah diterbitkan., -Select Document Type.,Pilih Jenis Dokumen., Console Log,Log Konsol, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Tetapkan Pilihan Lalai untuk semua carta di Papan Pemuka ini (Cth: "colors": ["# d1d8dd", "# ff5858"])", Use Report Chart,Gunakan Carta Laporan, @@ -4566,10 +4551,6 @@ Incorrect URL,URL tidak betul, Duplicate Name,Pendua Nama, "Please check the value of ""Fetch From"" set for field {0}",Sila periksa nilai set "Ambil Dari" untuk bidang {0}, Wrong Fetch From value,Pengambilan Daripada nilai yang salah, -Deploying,Menyebarkan, -Couldn't connect to site {0}. Please check Error Logs.,Tidak dapat menyambung ke laman web {0}. Sila periksa Log Ralat., -Error while installing package to site {0}. Please check Error Logs.,Ralat semasa memasang pakej ke laman web {0}. Sila periksa Log Ralat., -Exporting,Mengeksport, A field with the name '{}' already exists in doctype {}.,Medan dengan nama '{}' sudah ada dalamypeype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Medan Khusus {0} dibuat oleh Pentadbir dan hanya dapat dihapus melalui akaun Pentadbir., Failed to send {0} Auto Email Report,Gagal menghantar {0} Laporan E-mel Auto, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Baris # {0}: Tetapkan penapis nilai jauh untuk medan {1} untuk mengambil dokumen kebergantungan jarak jauh yang unik, Paytm payment gateway settings,Tetapan pintu masuk pembayaran Paytm, "Company, Fiscal Year and Currency defaults","Palsu Syarikat, Tahun Fiskal dan Mata Wang", -Package,Pakej, -Import and Export Packages.,Pakej Import dan Eksport., Razorpay Signature Verification Failed,Pengesahan Tandatangan Razorpay Gagal, Google Drive - Could not locate - {0},Google Drive - Tidak dapat mencari - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Token penyegerakan tidak sah dan telah diset semula, Cuba lagi penyegerakan.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Untuk Tindakan Pautan DocType / DocType, Cannot edit filters for standard charts,Tidak dapat mengedit penapis untuk carta standard, Event Producer Last Update,Kemas kini Terakhir Pengeluar Acara, Default for 'Check' type of field {0} must be either '0' or '1',Lalai untuk jenis medan 'Periksa' {0} mestilah '0' atau '1', +Non Negative,Tidak Negatif, +Rules with higher priority number will be applied first.,Peraturan dengan nombor keutamaan yang lebih tinggi akan digunakan terlebih dahulu., +Open URL in a New Tab,Buka URL dalam Tab Baru, +Align Right,Sejajarkan Kanan, +Loading Filters...,Memuatkan Penapis ..., +Count Customizations,Kira Penyesuaian, +For Example: {} Open,Sebagai Contoh: {} Buka, +Choose Existing Card or create New Card,Pilih Kad Sedia Ada atau buat Kad Baru, +Number Cards,Kad Nombor, +Function Based On,Fungsi Berdasarkan, +Add Filters,Tambah Penapis, +Skip,Langkau, +Dismiss,Ketepikan, +Value cannot be negative for,Nilai tidak boleh negatif untuk, +Value cannot be negative for {0}: {1},Nilai tidak boleh negatif untuk {0}: {1}, +Negative Value,Nilai Negatif, +Authentication failed while receiving emails from Email Account: {0}.,Pengesahan gagal semasa menerima e-mel dari Akaun E-mel: {0}., +Message from server: {0},Mesej dari pelayan: {0}, diff --git a/frappe/translations/my.csv b/frappe/translations/my.csv index 87d58a4d14..357a688a03 100644 --- a/frappe/translations/my.csv +++ b/frappe/translations/my.csv @@ -499,7 +499,6 @@ Authenticating...,Authenticating ..., Authentication,Authentication ကို, Authentication Apps you can use are: ,သငျသညျကိုသုံးနိုင်သည် authentication Apps ကပနေသောခေါင်းစဉ်:, Authentication Credentials,authentication သံတမန်ဆောင်ဧည်, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},အီးမေးလ်အကောင့်ကို {0} ကနေအီးမေးလ်များကိုလက်ခံရရှိစဉ် authentication မအောင်မြင်ခဲ့ပေ။ server ကနေအကြောင်းကြားစာ: {1}, Authorization Code,ခွင့်ပြုချက် Code ကို, Authorize URL,URL ကိုခွင့်ပြုရန်, Authorized,Authorized, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,0 င်ရန် 1 ရက်မှ docstatu Cannot change header content,ခေါင်းစဉ်အကြောင်းအရာမပြောင်းနိုင်သလား, Cannot change state of Cancelled Document. Transition row {0},ဖျက်သိမ်း Document ဖိုင်၏ပြည်နယ်ကိုပြောင်းလဲလို့မရပါဘူး။ အကူးအပြောင်းအတန်း {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,သရုပ်ပြအတွက်အသုံးပြုသူအသေးစိတျမပြောင်းနိုင်ပါ။ https://erpnext.com မှာအသစ်တခုအကောင့်အတွက်ဆိုင်းအပ်ပေးပါ, -Cannot connect: {0},မချိတ်ဆက်နိုင်သည် {0}, Cannot create a {0} against a child document: {1},ကလေးတစ်ဦးစာရွက်စာတမ်းဆန့်ကျင်နေတဲ့ {0} ကိုမဖန်တီးနိုင်: {1}, Cannot delete Home and Attachments folders,Home နဲ့ပူးတွဲဖိုင်များဖိုလ်ဒါမဖျက်နိုင်ပါ, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,က {0} {1} သင်ခွင့်ပြုချက်မရှိပါဖို့ရာဘို့ပိုင်အဖြစ်ဖိုင်ကိုမဖျက်နိုင်ပါ, @@ -1139,7 +1137,6 @@ Font Size,ဖောင့်အရွယ်အစား, Fonts,fonts, Footer,footer, Footer HTML,footer က HTML, -Footer Item,footer Item, Footer Items,footer ပစ္စည်းများ, Footer will display correctly only in PDF,footer သာ PDF ဖိုင်ရယူရန်အတွက်မှန်ကန်စွာပြသပေးမှာ, For Document Type,စာရွက်စာတမ်းအမျိုးအစားများအတွက်, @@ -1149,7 +1146,6 @@ For Value,Value ကိုများအတွက်, "For currency {0}, the minimum transaction amount should be {1}","ငွေကြေးအဘို့ {0}, နိမ့်ဆုံးငွေပေးငွေယူငွေပမာဏ {1} ဖြစ်သင့်", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,သင်ဖျက်သိမ်းနှင့် INV004 ပြင်ဆင်ရန်ဥပမာ အကယ်. ထိုသို့အသစ်တစ်ခုကိုစာရွက်စာတမ်း INV004-1 ဖြစ်လာပါလိမ့်မယ်။ ဒါဟာသင်တစ်ခုချင်းစီပြင်ဆင်ရေးခြေရာခံစောင့်ရှောက်ရန်ကူညီပေးသည်။, "For example: If you want to include the document ID, use {0}",ဥပမာ: သင်စာရွက်စာတမ်း ID ကိုထည့်သွင်းလိုပါက {0} ကိုသုံး, -For top bar,ထိပ်ဆုံးဘားတန်းများအတွက်, "For updating, you can update only selective columns.","အဆင့်မြှင့်, သင်သာရွေးချယ်ကော်လံ update ပြုလုပ်နိုင်ပါသည်။", For {0} at level {1} in {2} in row {3},{2} အတန်းအတွက် {3} အတွက် {1} အဆင့်မှာ {0} များအတွက်, Force,အင်အားစု, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google ကပြက္ခဒိန် ID ကို, Google Font,Google ကဖောင့်, Google Services,Google ဝန်ဆောင်မှုများ, Grant Type,Grant ကအမျိုးအစား, -Group Label,Group ကတံဆိပ်တပ်ရန်, Group Name,အဖွဲ့နာမည်, Group name cannot be empty.,အဖွဲ့အမည်မှာဗလာမဖြစ်နိုင်ပါ။, Groups of DocTypes,DOCTYPE အုပ်စုများ, @@ -1911,7 +1906,6 @@ Please verify your Email Address,သင့်ရဲ့အီးမေးလ် Point Allocation Periodicity,point ခွဲဝေ periodic, Points,ရမှတ်, Points Given,အားအချက်များ, -Policy,ပေါ်လစီ, Port,ဆိပ်ကမ်း, Portal Menu,portal Menu ကို, Portal Menu Item,portal Menu ကို Item, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,ပုံနှိပ်ခြင်းအဘို့အ atleast 1 စံချိန်ကို Select လုပ်ပါ, Select or drag across time slots to create a new event.,ကိုရွေးပါသို့မဟုတ်အသစ်တစ်ခုကိုပွဲဖန်တီးရန်အချိန် slot များအနှံ့ဆွဲယူပါ။, Select records for assignment,တာဝန်ကျတဲ့အတှကျမှတ်တမ်းများကိုရွေးပါ, -"Select target = ""_blank"" to open in a new page.",သစ်တစ်ခုစာမျက်နှာဖွင့်လှစ်ဖို့ကို Select လုပ်ပါပစ်မှတ် = "_blank" ။, Select the label after which you want to insert new field.,သင်အသစ်များသည်လယ်ပြင်၌ထည့်သွင်းရန်လိုသည့်နောက်ပိုင်းတံဆိပ်ကိုရွေးချယ်ပါ။, "Select your Country, Time Zone and Currency","သင့်ရဲ့နိုင်ငံ, အချိန်ဇုန်နှင့်ငွေကြေးစနစ်ကိုရွေးပါ", Select {0},{0} ကိုရွေးပါ, @@ -2989,7 +2982,6 @@ star-empty,ကြယ်ပွင့်-အချည်းနှီး, step-backward,ခြေလှမ်း-နောက်ပြန်, step-forward,ခြေလှမ်း-ရှေ့ဆက်, submitted this document,ဤစာရွက်စာတမ်းတင်သွင်း, -"target = ""_blank""",ပစ်မှတ် = "_blank", text in document type,စာရွက်စာတမ်းအမျိုးအစားထဲမှာစာသား, text-height,text-အမြင့်, text-width,text-width ကို, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,တစ်ခုခုလက္ခဏာသက်သေမျိုးဆက်စဉ်အတွင်းမှားသွားတယ်။ အသစ်တစ်ခုကိုတဦးတည်းကိုထုတ်လုပ်ဖို့ {0} ပေါ်တွင်ကလစ်နှိပ်ပါ။, Submit After Import,သွင်းကုန်ပြီးနောက် Submit, Submitting...,တင်ပြနေသည် ..., -Subscribed Documents,Subscribed စာရွက်စာတမ်းများ, Success! You are good to go 👍,အောင်မြင်ပါသည်! သငျသညျသှားဖို့ကောင်းပါတယ်👍, Successful Transactions,အောင်မြင်သောအရောင်းအ, Successfully Submitted!,အောင်မြင်စွာတင်သွင်းခဲ့သည်!, @@ -3777,7 +3768,6 @@ Please specify,သတ်မှတ် ကျေးဇူးပြု., Printing,ပုံနှိပ်ခြင်း, Priority,ဦးစားပေး, Project,စီမံကိန်း, -Publish,ပုံနှိပ်ထုတ်ဝေ, Quarterly,သုံးလတစ်ကြိမ်, Queued,Queued, Quick Entry,လျင်မြန်စွာ Entry ', @@ -4299,7 +4289,6 @@ Hide Border,Border ဖျောက်ထားပါ, Index Web Pages for Search,ရှာဖွေရန်အညွှန်းဝက်ဘ်စာမျက်နှာများ, Action / Route,လှုပ်ရှားမှု / လမ်းကြောင်း, Document Naming Rule,မှတ်တမ်းအမည်အမည်နည်းဥပဒေ, -Rules with higher priority will be applied first.,ပိုမိုမြင့်မားသော ဦး စားပေးမှုနှင့်အတူစည်းမျဉ်းစည်းကမ်းတွေကိုပထမ ဦး ဆုံးလျှောက်ထားပါလိမ့်မည်။, Rule Conditions,စည်းမျဉ်းစည်းကမ်းများ, Digits,ဂဏန်း, Example: 00001,ဥပမာ: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,အထုပ်ထုတ်ဝေရန် Tool ကို, Click on the row for accessing filters.,စစ်ထုတ်ကိရိယာများရယူရန်အတွက်အတန်းကိုနှိပ်ပါ။, Sites,ဆိုဒ်များ, Last Deployed On,နောက်ဆုံးဖြန့်ကျက်ခဲ့သည်, -Last published {0},နောက်ဆုံးထုတ်ဝေသော {0}, -Publishing documents...,စာရွက်စာတမ်းများထုတ်ဝြေခင်း ..., -Documents have been published.,စာရွက်စာတမ်းများထုတ်ဝေခဲ့ကြသည်။, -Select Document Type.,Document အမျိုးအစားကိုရွေးပါ။, Console Log,Console မှတ်တမ်း, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","ဤ Dashboard ပေါ်ရှိဇယားအားလုံးအတွက်စံသတ်မှတ်ချက်များကိုသတ်မှတ်ပါ (ဥပမာ - "colors": ["# d1d8dd", "# ff5858"])", Use Report Chart,အစီရင်ခံစာဇယားကိုအသုံးပြုပါ, @@ -4566,10 +4551,6 @@ Incorrect URL,URL မမှန်ကန်ပါ, Duplicate Name,မိတ္တူပွား, "Please check the value of ""Fetch From"" set for field {0}",ကျေးဇူးပြုပြီး "Fetch From" ၏ကွက်လပ်ကိုစစ်ဆေးပါ {0}, Wrong Fetch From value,အမှားအယွင်းမှတန်ဖိုးမှယူပါ, -Deploying,ဖြန့်ကျက်, -Couldn't connect to site {0}. Please check Error Logs.,ဆိုဒ်သို့ {0} ချိတ်ဆက်၍ မရပါ။ ကျေးဇူးပြု၍ အမှားမှတ်တမ်းများကိုစစ်ဆေးပါ။, -Error while installing package to site {0}. Please check Error Logs.,အထုပ်ကိုထည့်သွင်းနေစဉ် {0} ချို့ယွင်းချက်။ ကျေးဇူးပြု၍ အမှားမှတ်တမ်းများကိုစစ်ဆေးပါ။, -Exporting,တင်ပို့သည်, A field with the name '{}' already exists in doctype {}.,'{}' ဟူသောအမည်ကိုသုံးသောအကွက်သည် doctype {} တွင်ရှိပြီးဖြစ်သည်။, Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Custom Field {0} ကိုအုပ်ချုပ်သူမှဖန်တီးပြီးအုပ်ချုပ်သူအကောင့်မှသာဖျက်နိုင်သည်။, Failed to send {0} Auto Email Report,{0} အော်တိုအီးမေးလ်ပို့ရန်မအောင်မြင်ပါ, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Row # {0} - ထူးခြားသောဝေးလံခေါင်ဖျားမှီခိုမှုစာရွက်စာတမ်းကိုယူရန်ကွင်းဆက် {1} အတွက်ဝေးလံခေါင်သီသောစစ်ထုတ်မှုများကိုသတ်မှတ်ပါ, Paytm payment gateway settings,Paytm ငွေပေးချေမှုတံခါးပေါက် settings ကို, "Company, Fiscal Year and Currency defaults",ကုမ္ပဏီ၊ ဘဏ္calာရေးနှစ်နှင့်ငွေကြေးပျက်ကွက်မှု, -Package,အထုပ်, -Import and Export Packages.,သွင်းကုန်နှင့်ပို့ကုန်အထုပ်များ။, Razorpay Signature Verification Failed,Razorpay လက်မှတ်အတည်ပြုခြင်းမအောင်မြင်ပါ, Google Drive - Could not locate - {0},ဂူဂဲလ်ဒရိုက် - ရှာဖွေ။ မရနိုင်ပါ - {0}, "Sync token was invalid and has been resetted, Retry syncing.",ထပ်တူပြုခြင်းလက္ခဏာသက်သေသည်မမှန်ကန်ပါ၊ ပြန်လည်နေရာချထားသည်၊ ထပ်တူပြုခြင်းကိုပြန်လည်ပြုလုပ်ပါ။, @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,DocType Link ကို / DocType လှုပ Cannot edit filters for standard charts,စံဇယားများအတွက် filter များကို edit မလုပ်နိုင်ပါ, Event Producer Last Update,ပွဲထုတ်လုပ်သူနောက်ဆုံး update ကို, Default for 'Check' type of field {0} must be either '0' or '1','Check' field အတွက်ပုံမှန် {0} သည် '0' သို့မဟုတ် '1' ဖြစ်ရမည်။, +Non Negative,မဟုတ်အနုတ်လက္ခဏာ, +Rules with higher priority number will be applied first.,ပိုမိုမြင့်မားသော ဦး စားပေးနံပါတ်နှင့်အတူစည်းမျဉ်းစည်းကမ်းတွေကိုပထမ ဦး ဆုံးလျှောက်ထားပါလိမ့်မည်။, +Open URL in a New Tab,New Tab တွင် URL ထည့်ပါ, +Align Right,ညာဘက် align, +Loading Filters...,Filter များဖွင့်နေသည် ..., +Count Customizations,စိတ်ကြိုက်ပြင်ဆင်မှုများကိုရေတွက်ပါ, +For Example: {} Open,ဥပမာအားဖြင့်: {} ပွင့်လင်း, +Choose Existing Card or create New Card,လက်ရှိကတ်ကိုရွေးချယ်ပါသို့မဟုတ်ကဒ်အသစ်ကိုဖန်တီးပါ, +Number Cards,နံပါတ်ကဒ်များ, +Function Based On,အပေါ်အခြေခံပြီး function ကို, +Add Filters,filter များကိုထည့်ပါ, +Skip,ကျော်သွား, +Dismiss,ပယ်ချ, +Value cannot be negative for,တန်ဖိုးသည်အနုတ်မဖြစ်နိုင်ပါ, +Value cannot be negative for {0}: {1},{0} အတွက်တန်ဖိုးကအနုတ်မဖြစ်နိုင်ပါ။ {1}, +Negative Value,အနုတ်တန်ဖိုး, +Authentication failed while receiving emails from Email Account: {0}.,အီးမေးလ်အကောင့်မှအီးမေးလ်များလက်ခံရရှိချိန်တွင် {0} စစ်မှန်ကြောင်းအတည်ပြုခြင်းမအောင်မြင်ပါ။, +Message from server: {0},ဆာဗာမှသတင်းစကား - {0}, diff --git a/frappe/translations/nl.csv b/frappe/translations/nl.csv index 1b87c96ead..850faa57a7 100644 --- a/frappe/translations/nl.csv +++ b/frappe/translations/nl.csv @@ -499,7 +499,6 @@ Authenticating...,Verifiëren ..., Authentication,authenticatie, Authentication Apps you can use are: ,Authenticatie Apps die u kunt gebruiken zijn:, Authentication Credentials,Verificatiegegevens, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Authenticatie is mislukt tijdens het ontvangen van e-mails van e-mail account {0}. Bericht van server: {1}, Authorization Code,Authorisatie Code, Authorize URL,Autoriseer URL, Authorized,geautoriseerde, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Kan docstatus niet wijzigen van 1 naar 0, Cannot change header content,Kan de inhoud van de koptekst niet wijzigen, Cannot change state of Cancelled Document. Transition row {0},Status van het geannuleerde document kan niet veranderd worden. Overgang rij {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Kan de gebruikersgegevens niet wijzigen in demo. Meld u alstublieft in voor een nieuw account op https://erpnext.com, -Cannot connect: {0},Kan geen verbinding maken: {0}, Cannot create a {0} against a child document: {1},Kan geen {0} maken tegen een onderliggend document: {1}, Cannot delete Home and Attachments folders,Kan home en bijlagenmappen niet verwijderen, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Kan het bestand niet verwijderen zoals het behoort tot {0} {1} waarvoor u geen rechten heeft, @@ -1139,7 +1137,6 @@ Font Size,Tekengrootte, Fonts,Fonts, Footer,Voettekst, Footer HTML,Voettekst HTML, -Footer Item,footer Item, Footer Items,Voettekst onderdelen, Footer will display correctly only in PDF,Voettekst wordt alleen correct in PDF weergegeven, For Document Type,Voor documenttype, @@ -1149,7 +1146,6 @@ For Value,Voor waarde, "For currency {0}, the minimum transaction amount should be {1}",Voor valuta {0} moet het minimale transactiebedrag {1} zijn, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,Bijvoorbeeld als u annuleert en INV004 amenderen zal een nieuw document INV004-1 geworden. Dit helpt u om bij te houden van elke wijziging te houden., "For example: If you want to include the document ID, use {0}","Bijvoorbeeld: Als u de document-id omvatten, gebruik {0}", -For top bar,Voor bovenste balk, "For updating, you can update only selective columns.","Voor het bijwerken, kunt u alleen selectieve kolommen te werken.", For {0} at level {1} in {2} in row {3},Voor {0} op niveau {1} in {2} in rij {3}, Force,Dwingen, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Agenda-ID, Google Font,Google-lettertype, Google Services,Google-services, Grant Type,Grant Type, -Group Label,Etiket, Group Name,Groepsnaam, Group name cannot be empty.,Groepsnaam mag niet leeg zijn., Groups of DocTypes,Groepen DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Verifieer uw email adres alstublieft, Point Allocation Periodicity,Puntallocatie Periodiciteit, Points,punten, Points Given,Gegeven punten, -Policy,Beleid, Port,haven, Portal Menu,portal Menu, Portal Menu Item,Portal Menu Item, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Selecteer tenminste 1 record voor het afdrukken, Select or drag across time slots to create a new event.,Selecteer of sleep over tijdsloten om een nieuwe gebeurtenis te maken., Select records for assignment,Selecteer records voor opdracht, -"Select target = ""_blank"" to open in a new page.","Selecteer target = "" _blank "" om in een nieuwe pagina te openen.", Select the label after which you want to insert new field.,"Selecteer het label, waarachter u nieuwe veld wilt invoegen.", "Select your Country, Time Zone and Currency","Selecteer uw land, tijdzone en valuta", Select {0},Selecteer {0}, @@ -2989,7 +2982,6 @@ star-empty,star-leeg, step-backward,step-achteruit, step-forward,stap-vooruit, submitted this document,dit document ingediend, -"target = ""_blank""",target = "_blank", text in document type,tekst in het documenttype, text-height,text-height, text-width,text-width, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Er is iets misgegaan tijdens de tokengeneratie. Klik op {0} om een nieuwe te genereren., Submit After Import,Verzenden na importeren, Submitting...,Verzenden ..., -Subscribed Documents,Ingeschreven documenten, Success! You are good to go 👍,Succes! Je bent goed om te gaan 👍, Successful Transactions,Succesvolle transacties, Successfully Submitted!,Met succes ingediend!, @@ -3777,7 +3768,6 @@ Please specify,Specificeer, Printing,Afdrukken, Priority,Prioriteit, Project,Project, -Publish,Publiceren, Quarterly,Kwartaal, Queued,Wachtrij, Quick Entry,Snelle invoer, @@ -4299,7 +4289,6 @@ Hide Border,Rand verbergen, Index Web Pages for Search,Index-webpagina's voor zoeken, Action / Route,Actie / route, Document Naming Rule,Regel voor de naamgeving van documenten, -Rules with higher priority will be applied first.,Regels met een hogere prioriteit worden eerst toegepast., Rule Conditions,Regelvoorwaarden, Digits,Cijfers, Example: 00001,Voorbeeld: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Hulpprogramma voor het publiceren van pakketten, Click on the row for accessing filters.,Klik op de rij voor toegang tot filters., Sites,Sites, Last Deployed On,Laatst geïmplementeerd op, -Last published {0},Laatst gepubliceerd {0}, -Publishing documents...,Documenten publiceren ..., -Documents have been published.,Documenten zijn gepubliceerd., -Select Document Type.,Selecteer Documenttype., Console Log,Consolelogboek, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Standaardopties instellen voor alle grafieken op dit dashboard (bijv. "Kleuren": ["# d1d8dd", "# ff5858"])", Use Report Chart,Gebruik rapportdiagram, @@ -4566,10 +4551,6 @@ Incorrect URL,Onjuiste URL, Duplicate Name,Dubbele naam, "Please check the value of ""Fetch From"" set for field {0}",Controleer de waarde van "Fetch From" ingesteld voor veld {0}, Wrong Fetch From value,Verkeerde waarde voor ophalen van, -Deploying,Implementeren, -Couldn't connect to site {0}. Please check Error Logs.,Kan geen verbinding maken met site {0}. Controleer de foutenlogboeken., -Error while installing package to site {0}. Please check Error Logs.,Fout tijdens het installeren van pakket op site {0}. Controleer de foutenlogboeken., -Exporting,Exporteren, A field with the name '{}' already exists in doctype {}.,Er bestaat al een veld met de naam '{}' in doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Aangepast veld {0} wordt gemaakt door de beheerder en kan alleen worden verwijderd via de beheerdersaccount., Failed to send {0} Auto Email Report,Verzenden van {0} automatisch e-mailrapport is mislukt, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Rij # {0}: stel filters voor externe waarden in voor het veld {1} om het unieke externe afhankelijkheidsdocument op te halen, Paytm payment gateway settings,Paytm betalingsgateway-instellingen, "Company, Fiscal Year and Currency defaults","Standaardinstellingen voor bedrijf, boekjaar en valuta", -Package,Pakket, -Import and Export Packages.,Pakketten importeren en exporteren., Razorpay Signature Verification Failed,Verificatie van Razorpay-handtekening mislukt, Google Drive - Could not locate - {0},Google Drive - Kan niet vinden - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Synchronisatietoken was ongeldig en is opnieuw ingesteld, probeer opnieuw te synchroniseren.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Voor DocType Link / DocType-actie, Cannot edit filters for standard charts,Filters voor standaarddiagrammen kunnen niet worden bewerkt, Event Producer Last Update,Laatste update van evenementproducent, Default for 'Check' type of field {0} must be either '0' or '1',De standaardwaarde voor het veldtype 'Controle' {0} moet '0' of '1' zijn, +Non Negative,Niet negatief, +Rules with higher priority number will be applied first.,Regels met een hoger prioriteitsnummer worden eerst toegepast., +Open URL in a New Tab,Open URL in een nieuw tabblad, +Align Right,Rechts uitlijnen, +Loading Filters...,Filters laden ..., +Count Customizations,Tel aanpassingen, +For Example: {} Open,Bijvoorbeeld: {} Open, +Choose Existing Card or create New Card,Kies bestaande kaart of maak een nieuwe kaart, +Number Cards,Cijferkaarten, +Function Based On,Functie gebaseerd op, +Add Filters,Filters toevoegen, +Skip,Overspringen, +Dismiss,Afwijzen, +Value cannot be negative for,Waarde kan niet negatief zijn voor, +Value cannot be negative for {0}: {1},Waarde mag niet negatief zijn voor {0}: {1}, +Negative Value,Negatieve waarde, +Authentication failed while receiving emails from Email Account: {0}.,Verificatie mislukt tijdens het ontvangen van e-mails van e-mailaccount: {0}., +Message from server: {0},Bericht van server: {0}, diff --git a/frappe/translations/no.csv b/frappe/translations/no.csv index cf18419f3b..a91d09ea54 100644 --- a/frappe/translations/no.csv +++ b/frappe/translations/no.csv @@ -499,7 +499,6 @@ Authenticating...,Godkjenner ..., Authentication,Autentisering, Authentication Apps you can use are: ,Autentiseringsprogrammer du kan bruke er:, Authentication Credentials,Godkjennings legitimasjon, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Godkjenning mislyktes mens du mottar e-post fra e-postkonto {0}. Melding fra serveren: {1}, Authorization Code,Godkjennelseskoden, Authorize URL,Godkjenn nettadressen, Authorized,autorisert, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Kan ikke endre docstatus 1-0, Cannot change header content,Kan ikke endre topptekstinnhold, Cannot change state of Cancelled Document. Transition row {0},Kan ikke endre tilstand av Avbrutt Document. Transition rad {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Kan ikke endre brukerdetaljer i demo. Vennligst registrer deg for en ny konto på https://erpnext.com, -Cannot connect: {0},Kan ikke koble til: {0}, Cannot create a {0} against a child document: {1},Kan ikke opprette en {0} mot et barn dokument: {1}, Cannot delete Home and Attachments folders,Kan ikke slette Hjem og vedlegg mapper, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Kan ikke slette filen som den tilhører {0} {1} som du ikke har tillatelser til, @@ -1139,7 +1137,6 @@ Font Size,Skriftstørrelse, Fonts,fonter, Footer,bunntekst, Footer HTML,Bunntekst HTML, -Footer Item,Fotnote Element, Footer Items,Footer Items, Footer will display correctly only in PDF,Bunntekst vises bare riktig i PDF, For Document Type,For dokumenttype, @@ -1149,7 +1146,6 @@ For Value,For verdi, "For currency {0}, the minimum transaction amount should be {1}","For valuta {0}, bør minimumstransaksjonsbeløpet være {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,For eksempel hvis du avbryte og endre INV004 vil det bli et nytt dokument INV004-1. Dette hjelper deg å holde styr på hver endring., "For example: If you want to include the document ID, use {0}","For eksempel: Hvis du vil inkludere dokumentet ID, bruker {0}", -For top bar,For top bar, "For updating, you can update only selective columns.","For oppdatering, kan du oppdatere kun selektive kolonner.", For {0} at level {1} in {2} in row {3},For {0} på nivå {1} i {2} i rad {3}, Force,Makt, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Kalender-ID, Google Font,Google Font, Google Services,Google Services, Grant Type,Grant Type, -Group Label,Gruppe etikett, Group Name,Gruppenavn, Group name cannot be empty.,Gruppens navn kan ikke være tomt., Groups of DocTypes,Grupper av Doctyper, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Bekreft e-postadresse, Point Allocation Periodicity,Punktfordelingsperiode, Points,Poeng, Points Given,Poeng gitt, -Policy,Politikk, Port,Port, Portal Menu,Portal Meny, Portal Menu Item,Portal menypunkt, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Velg atleast en rekord for utskrift, Select or drag across time slots to create a new event.,Velg eller dra på tvers av tidsluker for å opprette en ny hendelse., Select records for assignment,Velg poster for oppdraget, -"Select target = ""_blank"" to open in a new page.",Velg target = "_blank" for å åpne en ny side i., Select the label after which you want to insert new field.,Velg etiketten etter som du vil sette inn nytt felt., "Select your Country, Time Zone and Currency","Velg land, tidssone og valuta", Select {0},Velg {0}, @@ -2989,7 +2982,6 @@ star-empty,stjerners-tomt, step-backward,trinn bakover, step-forward,skritt fremover, submitted this document,innsendt dette dokumentet, -"target = ""_blank""",target = "_blank", text in document type,tekst i dokumenttype, text-height,text-høyden, text-width,text-bredde, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Noe gikk galt under token-generasjonen. Klikk på {0} for å generere en ny., Submit After Import,Send inn etter import, Submitting...,Sender ..., -Subscribed Documents,Abonnerte dokumenter, Success! You are good to go 👍,Suksess! Du er god å gå 👍, Successful Transactions,Vellykkede transaksjoner, Successfully Submitted!,Sendt!, @@ -3777,7 +3768,6 @@ Please specify,Vennligst spesifiser, Printing,Utskrift, Priority,Prioritet, Project,Prosjekt, -Publish,publisere, Quarterly,Quarterly, Queued,I kø, Quick Entry,Hurtig Entry, @@ -4299,7 +4289,6 @@ Hide Border,Skjul grensen, Index Web Pages for Search,Indekser websider for søk, Action / Route,Handling / Rute, Document Naming Rule,Dokumentnavnregel, -Rules with higher priority will be applied first.,Regler med høyere prioritet blir brukt først., Rule Conditions,Regelbetingelser, Digits,Sifre, Example: 00001,Eksempel: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Package Publishing Tool, Click on the row for accessing filters.,Klikk på raden for å få tilgang til filtre., Sites,Nettsteder, Last Deployed On,Sist distribuert, -Last published {0},Sist publisert {0}, -Publishing documents...,Publisere dokumenter ..., -Documents have been published.,Dokumenter er publisert., -Select Document Type.,Velg Dokumenttype., Console Log,Konsollogg, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Angi standardalternativer for alle diagrammer på dette dashbordet (Eks: "farger": ["# d1d8dd", "# ff5858"])", Use Report Chart,Bruk rapportdiagram, @@ -4566,10 +4551,6 @@ Incorrect URL,Feil URL, Duplicate Name,Duplikatnavn, "Please check the value of ""Fetch From"" set for field {0}",Kontroller verdien for "Hent fra" angitt for felt {0}, Wrong Fetch From value,Feil henting fra verdi, -Deploying,Implementerer, -Couldn't connect to site {0}. Please check Error Logs.,Kunne ikke koble til nettstedet {0}. Kontroller feillogger., -Error while installing package to site {0}. Please check Error Logs.,Feil under installasjon av pakken til nettstedet {0}. Kontroller feillogger., -Exporting,Eksporterer, A field with the name '{}' already exists in doctype {}.,Et felt med navnet '{}' eksisterer allerede i doktype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Egendefinert felt {0} opprettes av administratoren og kan bare slettes via administratorkontoen., Failed to send {0} Auto Email Report,Kunne ikke sende {0} automatisk e-postrapport, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Rad nr. {0}: Angi eksterne verdifilter for feltet {1} for å hente det unike fjernavhengighetsdokumentet, Paytm payment gateway settings,Innstillinger for Paytm-betalingsgateway, "Company, Fiscal Year and Currency defaults","Standard, selskap, regnskapsår og valuta", -Package,Pakke, -Import and Export Packages.,Importer og eksporter pakker., Razorpay Signature Verification Failed,Bekreftelse av Razorpay signatur mislyktes, Google Drive - Could not locate - {0},Google Disk - kunne ikke finne - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Synkroniseringstoken var ugyldig og er tilbakestilt. Prøv å synkronisere på nytt., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,For DocType Link / DocType Action, Cannot edit filters for standard charts,Kan ikke redigere filtre for standarddiagrammer, Event Producer Last Update,Arrangørprodusent Siste oppdatering, Default for 'Check' type of field {0} must be either '0' or '1',Standardverdien for "Sjekk" feltfelt {0} må være enten "0" eller "1", +Non Negative,Ikke negativ, +Rules with higher priority number will be applied first.,Regler med høyere prioritetsnummer blir brukt først., +Open URL in a New Tab,Åpne URL i en ny fane, +Align Right,Juster riktig, +Loading Filters...,Laster inn filtre ..., +Count Customizations,Telle tilpasninger, +For Example: {} Open,For eksempel: {} Åpne, +Choose Existing Card or create New Card,Velg Eksisterende kort eller opprett Nytt kort, +Number Cards,Nummerkort, +Function Based On,Funksjonsbasert på, +Add Filters,Legg til filtre, +Skip,Hopp over, +Dismiss,Avskjedige, +Value cannot be negative for,Verdien kan ikke være negativ for, +Value cannot be negative for {0}: {1},Verdien kan ikke være negativ for {0}: {1}, +Negative Value,Negativ verdi, +Authentication failed while receiving emails from Email Account: {0}.,Autentiseringen mislyktes når du mottok e-post fra e-postkontoen: {0}., +Message from server: {0},Melding fra server: {0}, diff --git a/frappe/translations/pl.csv b/frappe/translations/pl.csv index 1da274b88a..3fa85687f1 100644 --- a/frappe/translations/pl.csv +++ b/frappe/translations/pl.csv @@ -499,7 +499,6 @@ Authenticating...,Uwierzytelnianie ..., Authentication,Poświadczenie, Authentication Apps you can use are: ,"Aplikacja uwierzytelniania, którą możesz użyć to:", Authentication Credentials,Poświadczenia uwierzytelniające, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Uwierzytelnianie nie powiodło się podczas odbierania wiadomości e-mail z konta e-mail {0}. Wiadomość z serwera: {1}, Authorization Code,Kod autoryzacji, Authorize URL,Autoryzuj adres URL, Authorized,Upoważniony, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Nie można zmieniać docstatus z 1 na 0, Cannot change header content,Nie można zmienić zawartości nagłówka, Cannot change state of Cancelled Document. Transition row {0},Nie można zmienić stanu Anulowane dokumentu. Przejście wiersz {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Nie można zmienić danych użytkownika w demo. Załóż nowe konto na https://erpnext.com, -Cannot connect: {0},Nie można połączyć: {0}, Cannot create a {0} against a child document: {1},Nie można utworzyć {0} przeciwko dziecięcej dokumencie: {1}, Cannot delete Home and Attachments folders,Nie możesz usuwać Dom i Załączniki foldery, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Nie można usunąć pliku należącego do {0} {1}, dla którego nie masz uprawnień", @@ -1139,7 +1137,6 @@ Font Size,Rozmiar czcionki, Fonts,Czcionki, Footer,Stopka, Footer HTML,Stopka HTML, -Footer Item,Element Stopki, Footer Items,Składniki Stopki, Footer will display correctly only in PDF,Stopka będzie wyświetlana poprawnie tylko w formacie PDF, For Document Type,Dla typu dokumentu, @@ -1149,7 +1146,6 @@ For Value,Dla wartości, "For currency {0}, the minimum transaction amount should be {1}",W przypadku waluty {0} minimalna kwota transakcji powinna wynosić {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,Na przykład w przypadku anulowania i zmiany INV004 stanie się nowym INV004-1 dokument. To pozwala na śledzenie każdej poprawki., "For example: If you want to include the document ID, use {0}","Na przykład: Jeśli chcesz dołączyć identyfikator dokumentu, należy użyć {0}", -For top bar,Dla górnej zakładki, "For updating, you can update only selective columns.",Do aktualizacji można aktualizować tylko selektywnych kolumn., For {0} at level {1} in {2} in row {3},Dla {0} na poziomie {1} w {2} w rzędzie {3}, Force,Siła, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Calendar ID, Google Font,Czcionka Google, Google Services,Usługi Google, Grant Type,Grant Rodzaj, -Group Label,Grupa Label, Group Name,Nazwa grupy, Group name cannot be empty.,Nazwa grupy nie może być pusta., Groups of DocTypes,Grupa DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Zweryfikuj swój adres e-mail, Point Allocation Periodicity,Częstotliwość alokacji punktów, Points,Zwrotnica, Points Given,Punkty podane, -Policy,Polityka, Port,Port, Portal Menu,Portal Menu, Portal Menu Item,Portal Pozycja menu, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Wybierz conajmniej 1 rekordów do druku, Select or drag across time slots to create a new event.,Wybierz albo przeciągnij pomiędzy komórkami czasu aby stworzyć wydarzenie., Select records for assignment,Wybierz rekordy dla zadania, -"Select target = ""_blank"" to open in a new page.","Wybierz target = ""_blank"", aby otworzyć w nowym oknie.", Select the label after which you want to insert new field.,Wybierz etykietę po której chcesz dodać nowe pole., "Select your Country, Time Zone and Currency","Wybierz swój kraj, strefę czasową i walutę", Select {0},Wybierz {0}, @@ -2989,7 +2982,6 @@ star-empty,pusty, step-backward,Cofnij o jeden krok, step-forward,Przejdź krok dalej, submitted this document,przedstawiła ten dokument, -"target = ""_blank""","target = ""_blank""", text in document type,Tekst w rodzaju dokumentu, text-height,wysokość tekstu, text-width,szerokość tekstu, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,"Coś poszło nie tak podczas generowania tokena. Kliknij {0}, aby wygenerować nowy.", Submit After Import,Prześlij po imporcie, Submitting...,Przedkładający..., -Subscribed Documents,Dokumenty subskrybowane, Success! You are good to go 👍,Powodzenie! Dobrze iść go, Successful Transactions,Udane transakcje, Successfully Submitted!,Pomyślnie przesłano!, @@ -3777,7 +3768,6 @@ Please specify,Sprecyzuj, Printing,Druk, Priority,Priorytet, Project,Projekt, -Publish,Publikować, Quarterly,Kwartalnie, Queued,W kolejce, Quick Entry,Szybkie wejścia, @@ -4299,7 +4289,6 @@ Hide Border,Ukryj obramowanie, Index Web Pages for Search,Indeksuj strony internetowe do wyszukiwania, Action / Route,Akcja / Trasa, Document Naming Rule,Zasada nazywania dokumentów, -Rules with higher priority will be applied first.,Reguły o wyższym priorytecie zostaną zastosowane w pierwszej kolejności., Rule Conditions,Warunki reguł, Digits,Cyfry, Example: 00001,Przykład: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Narzędzie do publikowania pakietów, Click on the row for accessing filters.,"Kliknij wiersz, aby uzyskać dostęp do filtrów.", Sites,Witryny, Last Deployed On,Ostatnio wdrożone w dniu, -Last published {0},Ostatnio opublikowana {0}, -Publishing documents...,Publikowanie dokumentów ..., -Documents have been published.,Dokumenty zostały opublikowane., -Select Document Type.,Wybierz typ dokumentu., Console Log,Dziennik konsoli, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Ustaw opcje domyślne dla wszystkich wykresów w tym panelu (np. „Colors”: [„# d1d8dd”, „# ff5858”])", Use Report Chart,Użyj wykresu raportu, @@ -4566,10 +4551,6 @@ Incorrect URL,Nieprawidłowy adres URL, Duplicate Name,Zduplikowana nazwa, "Please check the value of ""Fetch From"" set for field {0}",Sprawdź wartość „Pobierz z” ustawioną dla pola {0}, Wrong Fetch From value,Nieprawidłowa wartość pobierania z, -Deploying,Wdrażanie, -Couldn't connect to site {0}. Please check Error Logs.,Nie można połączyć się z witryną {0}. Sprawdź dzienniki błędów., -Error while installing package to site {0}. Please check Error Logs.,Błąd podczas instalowania pakietu w witrynie {0}. Sprawdź dzienniki błędów., -Exporting,Eksport, A field with the name '{}' already exists in doctype {}.,Pole o nazwie „{}” już istnieje w doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Pole niestandardowe {0} jest tworzone przez administratora i można je usunąć tylko za pośrednictwem konta administratora., Failed to send {0} Auto Email Report,Nie udało się wysłać {0} automatycznego raportu e-mailem, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,"Wiersz nr {0}: Ustaw filtry wartości zdalnej dla pola {1}, aby pobrać unikalny dokument zdalnej zależności", Paytm payment gateway settings,Ustawienia bramki płatniczej Paytm, "Company, Fiscal Year and Currency defaults","Domyślne wartości firmy, roku podatkowego i waluty", -Package,Pakiet, -Import and Export Packages.,Import i eksport pakietów., Razorpay Signature Verification Failed,Weryfikacja podpisu Razorpay nie powiodła się, Google Drive - Could not locate - {0},Dysk Google - nie można zlokalizować - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Token synchronizacji był nieprawidłowy i został zresetowany. Ponów próbę synchronizacji., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Dla DocType Link / DocType Action, Cannot edit filters for standard charts,Nie można edytować filtrów dla standardowych wykresów, Event Producer Last Update,Ostatnia aktualizacja producenta wydarzenia, Default for 'Check' type of field {0} must be either '0' or '1',Wartość domyślna pola „Sprawdź” {0} musi mieć wartość „0” lub „1”, +Non Negative,Nieujemne, +Rules with higher priority number will be applied first.,Reguły o wyższym priorytecie zostaną zastosowane jako pierwsze., +Open URL in a New Tab,Otwórz adres URL w nowej karcie, +Align Right,Wyrównaj do prawej, +Loading Filters...,Ładowanie filtrów ..., +Count Customizations,Policz dostosowania, +For Example: {} Open,Na przykład: {} Otwórz, +Choose Existing Card or create New Card,Wybierz Istniejącą kartę lub utwórz nową kartę, +Number Cards,Karty liczbowe, +Function Based On,Funkcja oparta na, +Add Filters,Dodaj filtry, +Skip,Pominąć, +Dismiss,Oddalić, +Value cannot be negative for,Wartość nie może być ujemna dla, +Value cannot be negative for {0}: {1},Wartość nie może być ujemna dla {0}: {1}, +Negative Value,Ujemna wartość, +Authentication failed while receiving emails from Email Account: {0}.,Uwierzytelnianie nie powiodło się podczas odbierania wiadomości e-mail z konta e-mail: {0}., +Message from server: {0},Wiadomość z serwera: {0}, diff --git a/frappe/translations/ps.csv b/frappe/translations/ps.csv index b8cb0200a8..a17d94fb2b 100644 --- a/frappe/translations/ps.csv +++ b/frappe/translations/ps.csv @@ -499,7 +499,6 @@ Authenticating...,تصدیق کول ..., Authentication,اعتبار, Authentication Apps you can use are: ,د تایید کولو کاریالونه چې تاسو یې کارولی شئ دا دي:, Authentication Credentials,د اعتبار اعتبارونه, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},اعتبارول ونشو داسې حال کې چې له دبرېښنا ليک حساب {0} ایمیلونو. پالنګر څخه پيغام: {1}, Authorization Code,د واک ورکولو د قانون, Authorize URL,د اعتبار وړ یو آر ایل, Authorized,اجازه, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,نه د 1 تر 0 docstatus بدلون, Cannot change header content,د سرلیک منځپانګې نشي بدلولی, Cannot change state of Cancelled Document. Transition row {0},د ردشوي سند دولت نه شي بدلولی شي. د لیږد د قطار {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,په قالب نه شي کولای د کارونکي عکس تفصيلات بدلون. په https://erpnext.com لطفا لپاره يو نوی ګڼون لپارهخپل, -Cannot connect: {0},پیوستېدلی نشي: {0}, Cannot create a {0} against a child document: {1},جوړ نه شي {0} يو ماشوم سند په وړاندې: {1}, Cannot delete Home and Attachments folders,آیا د کور او ضم پوښيو نه ړنګول, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,دوتنه نشي کولی ځکه چې دا د {0} {1} پورې اړه لري ځکه چې تاسو لرې اجازه نلري, @@ -1139,7 +1137,6 @@ Font Size,font size, Fonts,فکسونه, Footer,پښۍ, Footer HTML,فوټر HTML, -Footer Item,پښۍ د قالب, Footer Items,پښۍ سامان, Footer will display correctly only in PDF,فوټر به یوازې په PDF کې په سمه توګه وښیې, For Document Type,د لاسوند ډول لپاره, @@ -1149,7 +1146,6 @@ For Value,د ارزښت لپاره, "For currency {0}, the minimum transaction amount should be {1}",د پیسو لپاره {0}، د لیږد لږ تر لږه {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,د مثال په توګه که تاسو لغوه او INV004 تعدیل به د يو نوي سند INV004-1 شي. دا تاسو سره مرسته کوي تر څو د هر تعدیل اوسی., "For example: If you want to include the document ID, use {0}",د مثال په توګه: که تاسو غواړی چې شامل سند تذکرو، د {0}, -For top bar,د سر bar, "For updating, you can update only selective columns.",نوي کوونې لپاره، تاسو ته فقط انتخابی کالمونو د اوسمهالولو., For {0} at level {1} in {2} in row {3},د {0} په کچه د {1} {2} په قطار {3}, Force,ځواک, @@ -1201,7 +1197,6 @@ Google Calendar ID,د ګوګل کتل ID, Google Font,ګوګل فونټ, Google Services,ګوګل خدمتونه, Grant Type,وړیا ډول, -Group Label,ګروپ نښه د, Group Name,د ډلې نوم, Group name cannot be empty.,د ډلې نوم خالي نه دی., Groups of DocTypes,د DocTypes ډلو, @@ -1911,7 +1906,6 @@ Please verify your Email Address,مهرباني وکړئ ستاسو دبرېښن Point Allocation Periodicity,د ټکی تخصیص دوره, Points,ټکي, Points Given,ورکړل شوي ځایونه, -Policy,د پالیسۍ, Port,بندر, Portal Menu,تانبه Menu, Portal Menu Item,تانبه Menu د قالب, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,تيروخت د چاپولو 1 ریکارډ وټاکئ, Select or drag across time slots to create a new event.,وټاکئ او يا په ټول وخت صنفونه راکاږي د يو نوي پيښه رامنځ ته کړي., Select records for assignment,د دنده انتخاب سوابق, -"Select target = ""_blank"" to open in a new page.",انتخاب هدف = "_blank" په دابرخه يو نوی مخ., Select the label after which you want to insert new field.,ليبل وروسته چې تاسو غواړئ چې نوي ډګر ورننباسئ وټاکئ., "Select your Country, Time Zone and Currency",د خپل هېواد، د وخت د زون او د اسعارو وټاکئ, Select {0},وټاکئ {0}, @@ -2989,7 +2982,6 @@ star-empty,ستوري-تش, step-backward,ګام په شا, step-forward,په ګام مخ, submitted this document,د دې سند ته وسپارل, -"target = ""_blank""",هدف = "_blank", text in document type,د متن په لاسوند ډول, text-height,text-قد, text-width,text-عرض, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,د نښې نسل په جریان کې یو څه غلط شو. د نوي پیدا کولو لپاره په {0} کلیک وکړئ., Submit After Import,له واردولو وروسته وسپارئ, Submitting...,سپارنه ..., -Subscribed Documents,ګډون شوي سندونه, Success! You are good to go 👍,بریا! ته ښه شه 👍, Successful Transactions,بریالي لیږدونه, Successfully Submitted!,په بریالیتوب سره وسپارل شو!, @@ -3777,7 +3768,6 @@ Please specify,څرګند یي کړي, Printing,د چاپونې, Priority,د لومړیتوب, Project,د پروژې د, -Publish,خپرول, Quarterly,درې میاشتنی, Queued,له پيله, Quick Entry,د چټک انفاذ, @@ -4299,7 +4289,6 @@ Hide Border,پوله پټول, Index Web Pages for Search,د لټون لپاره د شاخص ویب پا .ې, Action / Route,کړنه / لاره, Document Naming Rule,د اسنادو نوم ورکولو قانون, -Rules with higher priority will be applied first.,د لوړ لومړیتوب لرونکي قواعد به لومړی پلي شي., Rule Conditions,اصول شرایط, Digits,ګsي, Example: 00001,مثال: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,د کڅوړې خپرولو وسیله, Click on the row for accessing filters.,د فلټرونو لاسرسي لپاره په قطار کې کلیک وکړئ., Sites,سایټونه, Last Deployed On,وروستی ګمارل شوی په, -Last published {0},وروستی ځل خپور شوی {0}, -Publishing documents...,د سندونو خپرول ..., -Documents have been published.,اسناد خپاره شوي, -Select Document Type.,د لاسوند ډول وټاکئ., Console Log,کنسول لاګ, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])",په دې ډشبورډ کې د ټولو چارتونو لپاره ډیفالټ اختیارونه تنظیم کړئ (مثال: "رنګونه": ["# d1d8dd" ، "# ff5858"]), Use Report Chart,د راپور چارت وکاروئ, @@ -4566,10 +4551,6 @@ Incorrect URL,غلط یو آر ایل, Duplicate Name,ورته نوم, "Please check the value of ""Fetch From"" set for field {0}",مهرباني وکړئ د ساحې {0} لپاره د "ترالسه کول" ټاکل شوي ارزښت وګورئ., Wrong Fetch From value,د ارزښت څخه غلط راوتل, -Deploying,پلي کول, -Couldn't connect to site {0}. Please check Error Logs.,ګورتځای سره ونښلول شو. مهرباني وکړئ د تېروتنې يادښتونه وګورئ., -Error while installing package to site {0}. Please check Error Logs.,سایټ package 0} ته د کڅوړې په لګولو کې تېروتنه. مهرباني وکړئ د تېروتنې يادښتونه وګورئ., -Exporting,صادرول, A field with the name '{}' already exists in doctype {}.,د '{}' نوم لرونکی ساحه لا دمخه په سند ډول {in کې شتون لري., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,ګمرک ساحه {0} د مدیر لخوا رامینځته شوی او یوازې د مدیر حساب له لارې حذف کیدی شي., Failed to send {0} Auto Email Report,د} 0} اتومات بریښنالیک راپور لیږلو کې ناکام شو, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,قطار # {0}: مهرباني وکړئ د {1 the ساحې لپاره د ریموټ ارزښت ارزښت فلټرونه ترتیب کړئ ترڅو د ریموټ انحصاري ځانګړی سند ترلاسه کړئ, Paytm payment gateway settings,د پیټیم تادیې ګیټ ویز تنظیمات, "Company, Fiscal Year and Currency defaults",شرکت ، مالي کال او اسعارو ډیفالټس, -Package,کڅوړه, -Import and Export Packages.,ګېډۍ وارد او صادر کړئ., Razorpay Signature Verification Failed,د ریزارپي لاسلیک تایید ونشو, Google Drive - Could not locate - {0},ګوګل ډرائیو - نشو موندلی - {0}, "Sync token was invalid and has been resetted, Retry syncing.",د هماهنګ کولو نښه ناباوره وه او له سره جوړه شوې ، له سره همغږۍ بیا هڅه وکړئ., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,د ډاک ټایپ لینک / ډاک ټایپ Cannot edit filters for standard charts,د معیاري چارټونو لپاره فلټرونه نشي سمولی, Event Producer Last Update,د پیښې پروډیوسر وروستی تازه, Default for 'Check' type of field {0} must be either '0' or '1',د 'چیک' ډوله ساحې {0 for لپاره ډیفالټ باید یا هم '0' یا '1' وي, +Non Negative,غیر منفي, +Rules with higher priority number will be applied first.,د لوړ لومړیتوب شمیره سره قواعد به لومړی پلي شي., +Open URL in a New Tab,په نوي ټب کې URL خلاص کړئ, +Align Right,ښي لاس ته, +Loading Filters...,فلټرونه کښته کیږي ..., +Count Customizations,دودیزول, +For Example: {} Open,د مثال په توګه:}} خلاص, +Choose Existing Card or create New Card,موجود کارت غوره کړئ یا نوی کارت جوړ کړئ, +Number Cards,د کارت شمیره, +Function Based On,پر بنسټ فعالیت, +Add Filters,فلټرونه اضافه کړئ, +Skip,پرېښودل, +Dismiss,ګوښه کول, +Value cannot be negative for,ارزښت د دې لپاره منفي نشي کیدی, +Value cannot be negative for {0}: {1},ارزښت د {0} لپاره منفي نشي کیدی: {1}, +Negative Value,منفي ارزښت, +Authentication failed while receiving emails from Email Account: {0}.,اعتبار د بریښنالیک حساب څخه د بریښنالیکونو ترلاسه کولو پر مهال ناکام شو: {0}., +Message from server: {0},د سرور لخوا پیغام: {0}, diff --git a/frappe/translations/pt.csv b/frappe/translations/pt.csv index 590d11166c..a8d04f5532 100644 --- a/frappe/translations/pt.csv +++ b/frappe/translations/pt.csv @@ -499,7 +499,6 @@ Authenticating...,Autenticando ..., Authentication,Autenticação, Authentication Apps you can use are: ,Os aplicativos de autenticação que você pode usar são:, Authentication Credentials,Credenciais de Autenticação, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},A autenticação falhou ao receber emails da Conta de Email {0}. Mensagem do servidor: {1}, Authorization Code,Código de autorização, Authorize URL,Autorizar URL, Authorized,Autorizado, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Não é possível alterar o docstatus de 1 a Cannot change header content,Não é possível alterar o conteúdo do cabeçalho, Cannot change state of Cancelled Document. Transition row {0},Não é possível alterar o status do Documento Cancelado da linha {0}., Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Não é possível alterar os detalhes do usuário na demo. Inscreva-se para uma nova conta em https://erpnext.com, -Cannot connect: {0},Não é possível conectar: {0}, Cannot create a {0} against a child document: {1},Não é possível criar um {0} no documento secundário: {1}, Cannot delete Home and Attachments folders,Não é possível eliminar as pastas Início e Anexos, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Não é possível excluir o arquivo como ele pertence a {0} {1} para o qual você não possui permissões, @@ -1139,7 +1137,6 @@ Font Size,Tamanho da Letra, Fonts,Fontes, Footer,Rodapé, Footer HTML,HTML de rodapé, -Footer Item,Item do Rodapé, Footer Items,Itens do Rodapé, Footer will display correctly only in PDF,Rodapé será exibido corretamente somente em PDF, For Document Type,Para o tipo de documento, @@ -1149,7 +1146,6 @@ For Value,Por valor, "For currency {0}, the minimum transaction amount should be {1}","Para a moeda {0}, o valor mínimo da transação deve ser {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Por exemplo, se cancelar e alterar INV004 ele irá tornar-se num novo documento, o INV004-1 . Isto ajuda-o a controlar cada alteração.", "For example: If you want to include the document ID, use {0}","Por exemplo: Se deseja incluir a ID do documento, utilize {0}", -For top bar,Para a barra superior, "For updating, you can update only selective columns.","Na atualização, só pode atualizar as colunas selecionadas.", For {0} at level {1} in {2} in row {3},Para {0} no nível {1} em {2} na linha {3}, Force,Força, @@ -1201,7 +1197,6 @@ Google Calendar ID,ID do calendário do Google, Google Font,Google Font, Google Services,Google Services, Grant Type,Tipo Grant, -Group Label,Designação de Grupo, Group Name,Nome do grupo, Group name cannot be empty.,O nome do grupo não pode estar vazio., Groups of DocTypes,Grupos de DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Por favor verifique seu endereço de email, Point Allocation Periodicity,Periodicidade de alocação de pontos, Points,Pontos, Points Given,Pontos dados, -Policy,Política, Port,Porta, Portal Menu,Menu do Portal, Portal Menu Item,Item do Menu do Portal, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Selecione pelo menos 1 registro para impressão, Select or drag across time slots to create a new event.,Selecione ou arraste intervalos de tempo para criar um novo evento., Select records for assignment,Seleciona registros para a atribuição, -"Select target = ""_blank"" to open in a new page.","Selecteer target = "" _blank "" te openen in een nieuwe pagina .", Select the label after which you want to insert new field.,Selecione o rótulo após o qual você deseja inserir novo campo., "Select your Country, Time Zone and Currency","Escolha o seu país, fuso horário e moeda", Select {0},Selecione {0}, @@ -2989,7 +2982,6 @@ star-empty,estrelas vazio, step-backward,passo para trás-, step-forward,passo-, submitted this document,apresentou este documento, -"target = ""_blank""",target = "_blank", text in document type,texto em tipo de documento, text-height,texto de altura, text-width,texto de largura, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Algo deu errado durante a geração do token. Clique em {0} para gerar um novo., Submit After Import,Enviar após importação, Submitting...,Enviando ..., -Subscribed Documents,Documentos Inscritos, Success! You are good to go 👍,Sucesso! Você é bom para ir 👍, Successful Transactions,Transações bem-sucedidas, Successfully Submitted!,Submetido com sucesso!, @@ -3777,7 +3768,6 @@ Please specify,"Por favor, especifique", Printing,Impressão, Priority,Prioridade, Project,Projeto, -Publish,Publicar, Quarterly,Trimestral, Queued,Em Fila, Quick Entry,Registo Rápido, @@ -4299,7 +4289,6 @@ Hide Border,Ocultar borda, Index Web Pages for Search,Índice de páginas da web para pesquisa, Action / Route,Ação / Rota, Document Naming Rule,Regra de Nomenclatura de Documento, -Rules with higher priority will be applied first.,As regras com maior prioridade serão aplicadas primeiro., Rule Conditions,Condições da regra, Digits,Dígitos, Example: 00001,Exemplo: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Ferramenta de publicação de pacotes, Click on the row for accessing filters.,Clique na linha para acessar os filtros., Sites,Sites, Last Deployed On,Última implantação em, -Last published {0},Última publicação em {0}, -Publishing documents...,Publicando documentos ..., -Documents have been published.,Os documentos foram publicados., -Select Document Type.,Selecione o tipo de documento., Console Log,Log do console, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Defina as opções padrão para todos os gráficos neste painel (Ex: "cores": ["# d1d8dd", "# ff5858"])", Use Report Chart,Usar gráfico de relatório, @@ -4566,10 +4551,6 @@ Incorrect URL,URL incorreto, Duplicate Name,Nome duplicado, "Please check the value of ""Fetch From"" set for field {0}",Verifique o valor de "Buscar de" definido para o campo {0}, Wrong Fetch From value,Valor errado de busca, -Deploying,Implantando, -Couldn't connect to site {0}. Please check Error Logs.,Não foi possível conectar ao site {0}. Verifique os logs de erros., -Error while installing package to site {0}. Please check Error Logs.,Erro ao instalar o pacote no site {0}. Verifique os logs de erros., -Exporting,Exportador, A field with the name '{}' already exists in doctype {}.,Já existe um campo com o nome '{}' em doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,O campo personalizado {0} é criado pelo administrador e só pode ser excluído por meio da conta do administrador., Failed to send {0} Auto Email Report,Falha ao enviar {0} relatório de e-mail automático, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Linha nº {0}: Defina filtros de valor remoto para o campo {1} para buscar o documento de dependência remota exclusivo, Paytm payment gateway settings,Configurações de gateway de pagamento Paytm, "Company, Fiscal Year and Currency defaults","Padrões da empresa, ano fiscal e moeda", -Package,Pacote, -Import and Export Packages.,Importar e exportar pacotes., Razorpay Signature Verification Failed,Falha na verificação da assinatura Razorpay, Google Drive - Could not locate - {0},Google Drive - Não foi possível localizar - {0}, "Sync token was invalid and has been resetted, Retry syncing.",O token de sincronização era inválido e foi redefinido. Tente sincronizar novamente., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Para DocType Link / DocType Action, Cannot edit filters for standard charts,Não é possível editar filtros para gráficos padrão, Event Producer Last Update,Última atualização do produtor de eventos, Default for 'Check' type of field {0} must be either '0' or '1',Padrão para 'Verificar' o tipo de campo {0} deve ser '0' ou '1', +Non Negative,Não Negativo, +Rules with higher priority number will be applied first.,Regras com número de prioridade mais alta serão aplicadas primeiro., +Open URL in a New Tab,Abrir URL em uma nova guia, +Align Right,Alinhar à direita, +Loading Filters...,Carregando filtros ..., +Count Customizations,Personalizações de contagem, +For Example: {} Open,Por exemplo: {} aberto, +Choose Existing Card or create New Card,Escolha o cartão existente ou crie um novo cartão, +Number Cards,Cartões numéricos, +Function Based On,Função baseada em, +Add Filters,Adicionar Filtros, +Skip,Pular, +Dismiss,Dispensar, +Value cannot be negative for,O valor não pode ser negativo para, +Value cannot be negative for {0}: {1},O valor não pode ser negativo para {0}: {1}, +Negative Value,Valor Negativo, +Authentication failed while receiving emails from Email Account: {0}.,Falha na autenticação ao receber e-mails da conta de e-mail: {0}., +Message from server: {0},Mensagem do servidor: {0}, diff --git a/frappe/translations/pt_br.csv b/frappe/translations/pt_br.csv index 68db31ad3a..1a3439d9f6 100644 --- a/frappe/translations/pt_br.csv +++ b/frappe/translations/pt_br.csv @@ -457,7 +457,6 @@ Font Size,Tamanho da Fonte, For User,Para o Usuário, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Por exemplo, se você cancelar e corrigir o INV004, ele vai se tornar um novo documento chamado INV004-1. Isso ajuda você a manter o controle de cada alteração.", "For example: If you want to include the document ID, use {0}","Por exemplo: Se você quiser incluir a ID do documento, use {0}", -For top bar,Para barra superior, "For updating, you can update only selective columns.","Para a atualização, você pode atualizar colunas só seletivos.", For {0} at level {1} in {2} in row {3},Por {0} a nível {1} em {2} na linha {3}, Force Show,Forçar Exibição, @@ -473,7 +472,6 @@ Full Page,Página completa, Gateway,Porta de entrada, Global Unsubscribe,Cancelar Inscrição Global, Google Analytics ID,ID do Google Analytics, -Group Label,Etiqueta do Grupo, HTML for header section. Optional,HTML para a seção de cabeçalho. opcional, Has Role,Tem Função, Have an account? Login,Possui cadastro? Entre, @@ -899,7 +897,6 @@ Select Print Format to Edit,Selecione um formato de impressão para editar, Select Role,Selecione a Função, Select a Brand Image first.,Selecione o Logo da Marca primeiro., Select a group node first.,Selecione um nó de grupo primeiro., -"Select target = ""_blank"" to open in a new page.","Select target = "" _blank"" para abrir em uma nova página.", Select the label after which you want to insert new field.,Selecione a etiqueta após a qual você deseja inserir um novo campo., "Select your Country, Time Zone and Currency","Escolha o seu País, Fuso Horário e Moeda", Send Alert On,Enviar Alerta, diff --git a/frappe/translations/ro.csv b/frappe/translations/ro.csv index f0d6bc8bd3..1f0b8e8bab 100644 --- a/frappe/translations/ro.csv +++ b/frappe/translations/ro.csv @@ -499,7 +499,6 @@ Authenticating...,Autentifică ..., Authentication,Autentificare, Authentication Apps you can use are: ,Aplicațiile de autentificare pe care le puteți utiliza sunt:, Authentication Credentials,Acreditări autentificare, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Autentificarea a eșuat în timp ce a primit e-mailuri de la e-mail Contul {0}. Mesaj de pe server: {1}, Authorization Code,Cod de autorizare, Authorize URL,Autorizați adresa URL, Authorized,Autorizat, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Nu se poate schimba docstatus 1-0, Cannot change header content,Nu se poate modifica conținutul antetului, Cannot change state of Cancelled Document. Transition row {0},Nu se poate schimba starea de Document anulat. Tranziție rând {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Nu se pot schimba detaliile utilizatorului în demo. Înscrieți-vă pentru un cont nou la adresa https://erpnext.com, -Cannot connect: {0},Nu se poate conecta: {0}, Cannot create a {0} against a child document: {1},Nu se poate crea o {0} împotriva unui document de copil: {1}, Cannot delete Home and Attachments folders,Nu se poate șterge Acasă și Echipamente dosare, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Nu se poate șterge fișierul deoarece aparține lui {0} {1} pentru care nu aveți permisiuni, @@ -1139,7 +1137,6 @@ Font Size,Dimensiune font, Fonts,Fonturi, Footer,Subsol, Footer HTML,Subsol HTML, -Footer Item,articol de subsol, Footer Items,Subsol Articole, Footer will display correctly only in PDF,Footer-ul va fi afișat corect doar în PDF, For Document Type,Pentru tipul de document, @@ -1149,7 +1146,6 @@ For Value,Pentru valoare, "For currency {0}, the minimum transaction amount should be {1}","Pentru valuta {0}, suma minimă a tranzacției ar trebui să fie {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"De exemplu, dacă anulați și modifice INV004 va deveni un nou document de INV004-1. Acest lucru vă ajută să urmăriți de fiecare amendament.", "For example: If you want to include the document ID, use {0}","De exemplu: Dacă doriți să includă ID-ul documentului, utilizați {0}", -For top bar,Pentru bara de sus, "For updating, you can update only selective columns.","Pentru actualizarea, puteți actualiza coloane numai selective.", For {0} at level {1} in {2} in row {3},Pentru {0} la nivel {1} din {2} în rândul {3}, Force,Forta, @@ -1201,7 +1197,6 @@ Google Calendar ID,Codul Google Calendar, Google Font,Font Google, Google Services,Serviciile Google, Grant Type,Tipul de grant, -Group Label,Etichetă de grup, Group Name,Numele Grupului, Group name cannot be empty.,Numele grupului nu poate fi gol., Groups of DocTypes,Grupuri de doctypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Confirmați adresa de e-mail, Point Allocation Periodicity,Periodicitatea alocării punctelor, Points,puncte, Points Given,Puncte date, -Policy,Politică, Port,Port, Portal Menu,Meniu portal, Portal Menu Item,Meniu portal Articol, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Selectați atleast 1 record pentru imprimare, Select or drag across time slots to create a new event.,Selectați sau glisați peste intervale de timp pentru a crea un nou eveniment., Select records for assignment,Selectați înregistrările de alocare, -"Select target = ""_blank"" to open in a new page.","Selectați target = ""_blank"" pentru a deschide într-o nouă pagină.", Select the label after which you want to insert new field.,Selectați eticheta după care doriți să inserați câmpul nou., "Select your Country, Time Zone and Currency","Selectați țara ta, fusul orar și valutar", Select {0},Selectați {0}, @@ -2989,7 +2982,6 @@ star-empty,stele gol, step-backward,pas-înapoi, step-forward,pas înainte, submitted this document,a prezentat acest document, -"target = ""_blank""","target = ""_blank""", text in document type,text de tip de document, text-height,text-înălțime, text-width,text cu lățime, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Ceva nu a mers în timpul generației. Faceți clic pe {0} pentru a genera unul nou., Submit After Import,Trimiteți după import, Submitting...,Trimiterea ..., -Subscribed Documents,Documente abonate, Success! You are good to go 👍,Succes! Ești bine să mergi 👍, Successful Transactions,Tranzacții de succes, Successfully Submitted!,Înscris cu succes!, @@ -3777,7 +3768,6 @@ Please specify,Vă rugăm să specificați, Printing,Tipărire, Priority,Prioritate, Project,Proiect, -Publish,Publica, Quarterly,Trimestrial, Queued,Coada de așteptare, Quick Entry,Intrarea rapidă, @@ -4299,7 +4289,6 @@ Hide Border,Ascundeți chenarul, Index Web Pages for Search,Pagini Web index pentru căutare, Action / Route,Acțiune / Traseu, Document Naming Rule,Regula de numire a documentelor, -Rules with higher priority will be applied first.,Regulile cu prioritate mai mare vor fi aplicate mai întâi., Rule Conditions,Condiții de regulă, Digits,Cifre, Example: 00001,Exemplu: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Instrument de publicare a pachetelor, Click on the row for accessing filters.,Faceți clic pe rând pentru accesarea filtrelor., Sites,Site-uri, Last Deployed On,Ultima desfășurare activată, -Last published {0},Ultima publicare {0}, -Publishing documents...,Publicarea documentelor ..., -Documents have been published.,Documentele au fost publicate., -Select Document Type.,Selectați tipul documentului., Console Log,Jurnal consolă, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Setați opțiunile implicite pentru toate diagramele de pe acest tablou de bord (de exemplu: "culori": ["# d1d8dd", "# ff5858"])", Use Report Chart,Utilizați diagrama de raportare, @@ -4566,10 +4551,6 @@ Incorrect URL,Adresă URL incorectă, Duplicate Name,Numele duplicat, "Please check the value of ""Fetch From"" set for field {0}",Vă rugăm să verificați valoarea „Preluare din” setată pentru câmpul {0}, Wrong Fetch From value,Preluare greșită din valoare, -Deploying,Implementarea, -Couldn't connect to site {0}. Please check Error Logs.,Nu s-a putut conecta la site-ul {0}. Vă rugăm să verificați jurnalele de erori., -Error while installing package to site {0}. Please check Error Logs.,Eroare la instalarea pachetului pe site {0}. Vă rugăm să verificați jurnalele de erori., -Exporting,Exportator, A field with the name '{}' already exists in doctype {}.,Un câmp cu numele „{}” există deja în doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Câmpul personalizat {0} este creat de administrator și poate fi șters doar prin contul de administrator., Failed to send {0} Auto Email Report,Nu s-a trimis {0} Raport automat de e-mail, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Rândul # {0}: setați filtre de valori la distanță pentru câmpul {1} pentru a prelua documentul unic de dependență la distanță, Paytm payment gateway settings,Setări gateway de plată Paytm, "Company, Fiscal Year and Currency defaults","Valori implicite pentru companie, anul fiscal și valută", -Package,Pachet, -Import and Export Packages.,Pachete de import și export., Razorpay Signature Verification Failed,Verificarea semnăturii Razorpay nu a reușit, Google Drive - Could not locate - {0},Google Drive - Nu s-a putut localiza - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Jetonul de sincronizare nu a fost valid și a fost resetat, Încercați din nou sincronizarea.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Pentru DocType Link / DocType Action, Cannot edit filters for standard charts,Nu se pot edita filtrele pentru diagrame standard, Event Producer Last Update,Ultima actualizare a producătorului de evenimente, Default for 'Check' type of field {0} must be either '0' or '1',Implicit pentru tipul de câmp „Verificare” {0} trebuie să fie „0” sau „1”, +Non Negative,Non-negativ, +Rules with higher priority number will be applied first.,Regulile cu număr de prioritate mai mare vor fi aplicate mai întâi., +Open URL in a New Tab,Deschideți adresa URL într-o filă nouă, +Align Right,Aliniați dreapta, +Loading Filters...,Se încarcă filtrele ..., +Count Customizations,Numărați personalizările, +For Example: {} Open,De exemplu: {} Deschideți, +Choose Existing Card or create New Card,Alegeți cardul existent sau creați un card nou, +Number Cards,Carduri numerice, +Function Based On,Funcție bazată pe, +Add Filters,Adăugați filtre, +Skip,Ocolire, +Dismiss,Renunță, +Value cannot be negative for,Valoarea nu poate fi negativă pentru, +Value cannot be negative for {0}: {1},Valoarea nu poate fi negativă pentru {0}: {1}, +Negative Value,Valoare negativă, +Authentication failed while receiving emails from Email Account: {0}.,Autentificarea nu a reușit la primirea e-mailurilor din contul de e-mail: {0}., +Message from server: {0},Mesaj de la server: {0}, diff --git a/frappe/translations/ru.csv b/frappe/translations/ru.csv index 8916570190..6c7db7d6a4 100644 --- a/frappe/translations/ru.csv +++ b/frappe/translations/ru.csv @@ -499,7 +499,6 @@ Authenticating...,Проверка подлинности ..., Authentication,Аутентификация, Authentication Apps you can use are: ,"Приложения аутентификации, которые вы можете использовать:", Authentication Credentials,Аутентификационные учетные данные, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Ошибка аутентификации при получении писем от учетной записи электронной почты {0}. Сообщение от сервера: {1}, Authorization Code,Код авторизации, Authorize URL,Авторизованный URL, Authorized,уполномоченный, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Нельзя изменить статус Cannot change header content,Невозможно изменить содержимое заголовка, Cannot change state of Cancelled Document. Transition row {0},Невозможно изменить состояние Отмененные документа. Переход строка {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Невозможно изменить данные пользователя в демо. Подпишитесь на новую учетную запись на https://erpnext.com, -Cannot connect: {0},Не удается подключиться: {0}, Cannot create a {0} against a child document: {1},Невозможно создать {0} против дочернего документа: {1}, Cannot delete Home and Attachments folders,Не удается удалить Дома и папки Вложения, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Не удается удалить файл, поскольку он принадлежит {0} {1}, для которого у вас нет прав доступа", @@ -1139,7 +1137,6 @@ Font Size,Размер шрифта, Fonts,Шрифты, Footer,Низ страницы, Footer HTML,Нижний колонтитул HTML, -Footer Item,Элемент колонтитула, Footer Items,Элементы колонтитула, Footer will display correctly only in PDF,Нижний колонтитул будет отображаться правильно только в PDF, For Document Type,Для типа документа, @@ -1149,7 +1146,6 @@ For Value,Для ценности, "For currency {0}, the minimum transaction amount should be {1}",Для валюты {0} минимальная сумма транзакции должна быть {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Например, если вы отмените и измените INV004, он станет новым документом INV004-1. Это поможет вам отследить каждую правку.", "For example: If you want to include the document ID, use {0}","Например: Если вы хотите добавить идентификатор документа, используйте {0}", -For top bar,Для верхней панели, "For updating, you can update only selective columns.","Для обновления, вы можете обновить только выборочные столбцы.", For {0} at level {1} in {2} in row {3},Для {0} на уровне {1} в {2} в строке {3}, Force,Принудительно, @@ -1201,7 +1197,6 @@ Google Calendar ID,Идентификатор Google Calendar, Google Font,Google Font, Google Services,Службы Google, Grant Type,Тип гранта, -Group Label,Группа Этикетка, Group Name,Название группы, Group name cannot be empty.,Имя группы не может быть пустым., Groups of DocTypes,Группы DOCTYPES, @@ -1911,7 +1906,6 @@ Please verify your Email Address,"Пожалуйста, подтвердите Point Allocation Periodicity,Периодичность распределения точек, Points,Точки, Points Given,Очки даны, -Policy,политика, Port,Порт, Portal Menu,Меню портала, Portal Menu Item,Портал Пункт меню, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Выберите по крайней мере 1 запись для печати, Select or drag across time slots to create a new event.,"Выберите или перетащите через временные интервалы, чтобы создать новое событие.", Select records for assignment,Выберите записи для присвоения, -"Select target = ""_blank"" to open in a new page.","Выберите целевых = ""_blank"", чтобы открыть на новой странице.", Select the label after which you want to insert new field.,"Выберите метку, после чего Вы хотите вставить новое поле.", "Select your Country, Time Zone and Currency","Выберите страну, часовой пояс и валюта", Select {0},Выберите {0}, @@ -2989,7 +2982,6 @@ star-empty,звезды пусто, step-backward,шаг назад, step-forward,шаг вперед, submitted this document,представил этот документ, -"target = ""_blank""","целевых = ""_blank""", text in document type,Текст в документе типа, text-height,Текст-высота, text-width,Текст ширины, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,"Что-то пошло не так во время генерации токенов. Нажмите {0}, чтобы создать новый.", Submit After Import,Отправить после импорта, Submitting...,Добавляю ..., -Subscribed Documents,Подписные документы, Success! You are good to go 👍,Успех! Ты хорош идти go, Successful Transactions,Успешные транзакции, Successfully Submitted!,Успешно отправлено!, @@ -3777,7 +3768,6 @@ Please specify,"Пожалуйста, сформулируйте", Printing,Печать, Priority,Приоритет, Project,проект, -Publish,Публиковать, Quarterly,Ежеквартально, Queued,В очереди, Quick Entry,Быстрый доступ, @@ -4299,7 +4289,6 @@ Hide Border,Скрыть границу, Index Web Pages for Search,Индексирование веб-страниц для поиска, Action / Route,Действие / Маршрут, Document Naming Rule,Правило именования документов, -Rules with higher priority will be applied first.,Сначала будут применены правила с более высоким приоритетом., Rule Conditions,Условия правила, Digits,Цифры, Example: 00001,Пример: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Инструмент публикации пакетов, Click on the row for accessing filters.,Щелкните строку для доступа к фильтрам., Sites,Места, Last Deployed On,Последнее развертывание, -Last published {0},Последняя публикация {0}, -Publishing documents...,Публикация документов ..., -Documents have been published.,Документы опубликованы., -Select Document Type.,Выберите Тип документа., Console Log,Журнал консоли, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Установите параметры по умолчанию для всех диаграмм на этой панели инструментов (например: «colors»: [«# d1d8dd», «# ff5858»])", Use Report Chart,Использовать диаграмму отчета, @@ -4566,10 +4551,6 @@ Incorrect URL,Неверный URL, Duplicate Name,Повторяющееся имя, "Please check the value of ""Fetch From"" set for field {0}","Проверьте значение параметра "Получить из", установленное для поля {0}.", Wrong Fetch From value,Неверное значение Fetch From, -Deploying,Развертывание, -Couldn't connect to site {0}. Please check Error Logs.,"Не удалось подключиться к сайту {0}. Пожалуйста, проверьте журналы ошибок.", -Error while installing package to site {0}. Please check Error Logs.,"Ошибка при установке пакета на сайт {0}. Пожалуйста, проверьте журналы ошибок.", -Exporting,Экспорт, A field with the name '{}' already exists in doctype {}.,Поле с именем '{}' уже существует в doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Настраиваемое поле {0} создается администратором и может быть удалено только через учетную запись администратора., Failed to send {0} Auto Email Report,Не удалось отправить отчет по электронной почте {0}, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,"Строка № {0}: установите фильтры удаленных значений для поля {1}, чтобы получить уникальный документ удаленной зависимости.", Paytm payment gateway settings,Настройки платежного шлюза Paytm, "Company, Fiscal Year and Currency defaults","Компания, финансовый год и валюта по умолчанию", -Package,Пакет, -Import and Export Packages.,Импортные и экспортные пакеты., Razorpay Signature Verification Failed,Ошибка проверки подписи Razorpay, Google Drive - Could not locate - {0},Google Диск - не удалось найти - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Токен синхронизации был недействителен и был сброшен. Повторите попытку синхронизации., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Для DocType Link / DocType Action, Cannot edit filters for standard charts,Невозможно редактировать фильтры для стандартных диаграмм, Event Producer Last Update,Последнее обновление Event Producer, Default for 'Check' type of field {0} must be either '0' or '1',"По умолчанию для типа поля "Проверка" {0} должен быть либо "0", либо "1".", +Non Negative,Не отрицательный, +Rules with higher priority number will be applied first.,Сначала будут применяться правила с более высоким номером приоритета., +Open URL in a New Tab,Открыть URL в новой вкладке, +Align Right,Выровнять по правому краю, +Loading Filters...,Загрузка фильтров ..., +Count Customizations,Подсчет настроек, +For Example: {} Open,Например: {} Открыть, +Choose Existing Card or create New Card,Выберите существующую карту или создайте новую карту, +Number Cards,Числовые карты, +Function Based On,Функция на основе, +Add Filters,Добавить фильтры, +Skip,Пропускать, +Dismiss,Отклонить, +Value cannot be negative for,Значение не может быть отрицательным для, +Value cannot be negative for {0}: {1},Значение не может быть отрицательным для {0}: {1}, +Negative Value,Отрицательное значение, +Authentication failed while receiving emails from Email Account: {0}.,Ошибка аутентификации при получении писем из учетной записи электронной почты: {0}., +Message from server: {0},Сообщение с сервера: {0}, diff --git a/frappe/translations/rw.csv b/frappe/translations/rw.csv index 24d9eddaf7..e0a1142a6a 100644 --- a/frappe/translations/rw.csv +++ b/frappe/translations/rw.csv @@ -499,7 +499,6 @@ Authenticating...,Kwemeza ..., Authentication,Kwemeza, Authentication Apps you can use are: ,Porogaramu yo Kwemeza ushobora gukoresha ni:, Authentication Credentials,Icyemezo cyo Kwemeza, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Kwemeza byarananiranye mugihe wakiriye imeri kuri konte imeri {0}. Ubutumwa buva kuri seriveri: {1}, Authorization Code,Kode yemewe, Authorize URL,Emera URL, Authorized,Yemerewe, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Ntushobora guhindura docstatus kuva 1 kugeza Cannot change header content,Ntushobora guhindura imitwe, Cannot change state of Cancelled Document. Transition row {0},Ntushobora guhindura imiterere yinyandiko yahagaritswe. Umurongo w'inzibacyuho {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Ntushobora guhindura amakuru yumukoresha muri demo. Nyamuneka iyandikishe kuri konti nshya kuri https://erpnext.com, -Cannot connect: {0},Ntushobora guhuza: {0}, Cannot create a {0} against a child document: {1},Ntushobora gukora {0} kurwanya inyandiko yumwana: {1}, Cannot delete Home and Attachments folders,Ntushobora gusiba Ububiko na Umugereka, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Ntushobora gusiba dosiye nkuko ari {0} {1} udafite uburenganzira, @@ -1139,7 +1137,6 @@ Font Size,Ingano yimyandikire, Fonts,Imyandikire, Footer,Umutwe, Footer HTML,Umutwe HTML, -Footer Item,Ikirenge, Footer Items,Ibirenge, Footer will display correctly only in PDF,Umutwe uzerekana neza muri PDF gusa, For Document Type,Ubwoko bw'inyandiko, @@ -1149,7 +1146,6 @@ For Value,Agaciro, "For currency {0}, the minimum transaction amount should be {1}","Ku ifaranga {0}, amafaranga ntarengwa yo kugurisha agomba kuba {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,Kurugero niba uhagaritse ugahindura INV004 bizahinduka inyandiko nshya INV004-1. Ibi biragufasha gukurikirana buri cyahinduwe., "For example: If you want to include the document ID, use {0}","Kurugero: Niba ushaka gushyiramo ID ID, koresha {0}", -For top bar,Ku murongo wo hejuru, "For updating, you can update only selective columns.","Kuvugurura, urashobora kuvugurura gusa inkingi zatoranijwe.", For {0} at level {1} in {2} in row {3},Kuri {0} kurwego {1} muri {2} kumurongo {3}, Force,Imbaraga, @@ -1201,7 +1197,6 @@ Google Calendar ID,Indangamuntu ya Google, Google Font,Imyandikire ya Google, Google Services,Serivisi za Google, Grant Type,Ubwoko bw'impano, -Group Label,Ikirango cy'itsinda, Group Name,Izina ry'itsinda, Group name cannot be empty.,Izina ryitsinda ntirishobora kuba ubusa., Groups of DocTypes,Amatsinda yinyandiko, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Nyamuneka reba imeri yawe, Point Allocation Periodicity,Igihe cyo Kugabura Ingingo, Points,Ingingo, Points Given,Ingingo zatanzwe, -Policy,Politiki, Port,Icyambu, Portal Menu,Urubuga, Portal Menu Item,Urubuga Ibikubiyemo, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Hitamo byibuze inyandiko 1 yo gucapa, Select or drag across time slots to create a new event.,Hitamo cyangwa ukurure umwanya uhagije kugirango ukore ikintu gishya., Select records for assignment,Hitamo inyandiko zoherejwe, -"Select target = ""_blank"" to open in a new page.",Hitamo intego = "_blank" kugirango ufungure kurupapuro rushya., Select the label after which you want to insert new field.,Hitamo ikirango nyuma ushaka gushyiramo umurima mushya., "Select your Country, Time Zone and Currency","Hitamo Igihugu cyawe, Igihe cyagenwe nifaranga", Select {0},Hitamo {0}, @@ -2989,7 +2982,6 @@ star-empty,inyenyeri-ubusa, step-backward,intambwe-inyuma, step-forward,intambwe-imbere, submitted this document,yatanze iyi nyandiko, -"target = ""_blank""",intego = "_blank", text in document type,inyandiko muburyo bwinyandiko, text-height,uburebure, text-width,ubugari, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Ikintu kitagenze neza mugihe cyibimenyetso. Kanda kuri {0} kugirango ubyare agashya., Submit After Import,Tanga Nyuma yo Kuzana, Submitting...,Kohereza ..., -Subscribed Documents,Inyandiko, Success! You are good to go 👍,Intsinzi! Nibyiza kugenda 👍, Successful Transactions,Ihererekanyabubasha, Successfully Submitted!,Byatanzwe neza!, @@ -3777,7 +3768,6 @@ Please specify,Nyamuneka sobanura, Printing,Gucapa, Priority,Ibyingenzi, Project,Umushinga, -Publish,Tangaza, Quarterly,Igihembwe, Queued,Umurongo, Quick Entry,Kwinjira vuba, @@ -4299,7 +4289,6 @@ Hide Border,Hisha umupaka, Index Web Pages for Search,Ironderero Urubuga Urupapuro rwo Gushakisha, Action / Route,Igikorwa / Inzira, Document Naming Rule,Amategeko yo Kwita Izina, -Rules with higher priority will be applied first.,Amategeko hamwe nibyingenzi azashyirwa mubikorwa mbere., Rule Conditions,Amategeko, Digits,Imibare, Example: 00001,Urugero: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Igikoresho cyo Gutangaza, Click on the row for accessing filters.,Kanda kumurongo kugirango ubone gushungura., Sites,Imbuga, Last Deployed On,Iheruka Koherezwa Kuri, -Last published {0},Iheruka gusohoka {0}, -Publishing documents...,Gutangaza inyandiko ..., -Documents have been published.,Inyandiko zashyizwe ahagaragara., -Select Document Type.,Hitamo Ubwoko bw'inyandiko., Console Log,Injira ya konsole, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Shiraho Amahitamo asanzwe ku mbonerahamwe yose kuriyi Dashboard (Ex: "amabara": ["# d1d8dd", "# ff5858"])", Use Report Chart,Koresha Imbonerahamwe, @@ -4566,10 +4551,6 @@ Incorrect URL,URL itari yo, Duplicate Name,Izina ryigana, "Please check the value of ""Fetch From"" set for field {0}",Nyamuneka reba agaciro ka "Fetch Kuva" yashizwe kumurima {0}, Wrong Fetch From value,Kubona nabi Biturutse ku gaciro, -Deploying,Kohereza, -Couldn't connect to site {0}. Please check Error Logs.,Ntushobora guhuza kurubuga {0}. Nyamuneka reba Ikosa., -Error while installing package to site {0}. Please check Error Logs.,Ikosa mugihe ushyira paki kurubuga {0}. Nyamuneka reba Ikosa., -Exporting,Kohereza hanze, A field with the name '{}' already exists in doctype {}.,Umwanya ufite izina '{}' usanzwe uboneka muri doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Umwanya wihariye {0} washyizweho nubuyobozi kandi ushobora gusibwa gusa ukoresheje konti yumuyobozi., Failed to send {0} Auto Email Report,Kunanirwa kohereza {0} Raporo ya imeri, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Umurongo # {0}: Nyamuneka shyira kure agaciro kayunguruzo kumurima {1} kugirango uzane inyandiko yihariye ya kure, Paytm payment gateway settings,Igenamigambi ryo kwishyura rya Paytm, "Company, Fiscal Year and Currency defaults","Isosiyete, Umwaka w'Imari n'Amafaranga asanzwe", -Package,Amapaki, -Import and Export Packages.,Kuzana no kohereza ibicuruzwa hanze., Razorpay Signature Verification Failed,Kugenzura umukono wa Razorpay byarananiranye, Google Drive - Could not locate - {0},Google Drive - Ntushobora kumenya - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Ikimenyetso cyo guhuza nticyemewe kandi cyongeye gusubirwamo, Ongera ugerageze.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Kuri DocType Ihuza / Igikorwa cya DocType, Cannot edit filters for standard charts,Ntushobora guhindura muyunguruzi kubishushanyo bisanzwe, Event Producer Last Update,Ibikorwa bya Producer Iheruka Kuvugurura, Default for 'Check' type of field {0} must be either '0' or '1',Ibisanzwe kuri 'Kugenzura' ubwoko bwumurima {0} bigomba kuba '0' cyangwa '1', +Non Negative,Ntabwo ari bibi, +Rules with higher priority number will be applied first.,Amategeko afite umubare wambere wambere azashyirwa mubikorwa mbere., +Open URL in a New Tab,Fungura URL muri Tab nshya, +Align Right,Huza Iburyo, +Loading Filters...,Gutwara Akayunguruzo ..., +Count Customizations,Kubara Customizations, +For Example: {} Open,Kurugero: {} Gufungura, +Choose Existing Card or create New Card,Hitamo Ikarita iriho cyangwa ukore Ikarita Nshya, +Number Cards,Ikarita Yumubare, +Function Based On,Imikorere ishingiye, +Add Filters,Ongeramo Akayunguruzo, +Skip,Simbuka, +Dismiss,Kwirukana, +Value cannot be negative for,Agaciro ntigashobora kuba mubi kuri, +Value cannot be negative for {0}: {1},Agaciro ntigashobora kuba kibi kuri {0}: {1}, +Negative Value,Agaciro, +Authentication failed while receiving emails from Email Account: {0}.,Kwemeza byarananiranye mugihe wakiriye imeri kuri konte imeri: {0}., +Message from server: {0},Ubutumwa buva kuri seriveri: {0}, diff --git a/frappe/translations/si.csv b/frappe/translations/si.csv index 16a243ab98..12d8c7e48b 100644 --- a/frappe/translations/si.csv +++ b/frappe/translations/si.csv @@ -499,7 +499,6 @@ Authenticating...,සත්‍යාපනය ..., Authentication,සත්යාපන, Authentication Apps you can use are: ,ඔබට භාවිතා කළ හැකි සත්යාපන යෙදුම්:, Authentication Credentials,සත්යාපන අක්තපත්ර, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},ඊ-තැපැල් ගිණුම {0} ඊ-තැපැල් ලබමින් සිටියදී තහවුරු කරගැනීමේ අසාර්ථක විය. සේවාදායකය වෙතින් පණිවුඩය: {1}, Authorization Code,බලය පැවරීමේ කේතය, Authorize URL,අවසර දෙන්න, Authorized,බලයලත්, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,1 සිට 0 docstatus වෙනස් ක Cannot change header content,ශීර්ෂ අන්තර්ගතය වෙනස් කළ නොහැක, Cannot change state of Cancelled Document. Transition row {0},අහෝසි ලේඛන රාජ්ය වෙනස් කළ නොහැක. සංක්රමණය පේළිය {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,demo දී පරිශීලක විස්තර වෙනස් කළ නොහැක. https://erpnext.com නව ගිණුම සඳහා ලියාපදිංචි වීමේ කරුණාකර, -Cannot connect: {0},සම්බන්ධ විය නොහැක: {0}, Cannot create a {0} against a child document: {1},ළමා ලියවිල්ල එරෙහිව {0} නිර්මාණය කළ නොහැක: {1}, Cannot delete Home and Attachments folders,මුල් පිටුව හා ඇමුණුම් ෆෝල්ඩර මකා දැමිය නොහැකි, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,{0} {1} ඔබට අවසර නොමැති නිසා ගොනුව මකා දැමිය නොහැක, @@ -1139,7 +1137,6 @@ Font Size,අකුරු ප්රමාණය, Fonts,ෆොන්ට්, Footer,පාදකය, Footer HTML,පාදක HTML, -Footer Item,පාදකය අයිතමය, Footer Items,පාදකය අයිතම, Footer will display correctly only in PDF,පාදකය නිවැරදිව පෙන්වන්නේ PDF වලින් පමණි, For Document Type,ලේඛන වර්ගය සඳහා, @@ -1149,7 +1146,6 @@ For Value,වටිනාකම සඳහා, "For currency {0}, the minimum transaction amount should be {1}","මුදල් සඳහා {0}, අවම ගනුදෙනුව ප්රමාණය {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"ඔබ අවලංගු INV004 සංශෝධනය උදාහරණයක් ලෙස, යම් එය නව ලේඛනයක් INV004-1 බවට පත් වනු ඇත. මෙම එක් එක් සංශෝධනය පිළිබඳ වාර්තාවක් තබා ගැනීමට උපකාරී වේ.", "For example: If you want to include the document ID, use {0}","උදාහරණයක් ලෙස: ඔබට බලන්න හැඳුනුම්පත ඇතුළත් කිරීමට අවශ්ය නම්, භාවිතා {0}", -For top bar,ඉහළ බාර් සඳහා, "For updating, you can update only selective columns.","යාවත්කාලීන කිරීම සඳහා, ඔබ තෝරාගත් තීරු පමණක් යාවත්කාලීන කළ හැකිය.", For {0} at level {1} in {2} in row {3},{0} සඳහා මට්ටමින් {1} {2} පේළියේ {3} තුළ, Force,හමුදා, @@ -1201,7 +1197,6 @@ Google Calendar ID,ගූගල් කැලැන්ඩර ID, Google Font,ගූගල් ෆොන්ට්, Google Services,Google සේවා, Grant Type,ප්රදාන වර්ගය, -Group Label,සමූහ ලේබල්, Group Name,කණ්ඩායම් නම, Group name cannot be empty.,කණ්ඩායම් නාම හිස් විය නොහැක., Groups of DocTypes,DocTypes කණ්ඩායම්, @@ -1911,7 +1906,6 @@ Please verify your Email Address,ඔබේ විද්යුත් තැපැ Point Allocation Periodicity,ලක්ෂ්‍ය වෙන්කිරීමේ කාල සීමාව, Points,කරුණු, Points Given,ලබා දී ඇති කරුණු, -Policy,ප්රතිපත්ති, Port,වරාය, Portal Menu,ද්වාරය මෙනුව, Portal Menu Item,ද්වාරය මෙනු අයිතමය, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,මුද්රණය සඳහා ආයෝජිත මුදලක් 1 වාර්තා තෝරන්න, Select or drag across time slots to create a new event.,තෝරා ගැනීමට හෝ නව අවස්ථාවට නිර්මාණය කිරීමට මඳබව පුරා ඇදගෙන යන්න., Select records for assignment,පැවරුම සඳහා වාර්තා තෝරන්න, -"Select target = ""_blank"" to open in a new page.",ඉලක්කය තේරීම් = "_blank" නව පිටුවක් විවෘත කිරීමට., Select the label after which you want to insert new field.,ඔබට නව ක්ෂේත්ර ඇතුළු කිරීමට අවශ්ය කළ පසු ලේබලය තෝරන්න., "Select your Country, Time Zone and Currency","ඔබගේ රට, හෝරා කලාපය සහ ව්යවහාර මුදල් තෝරන්න", Select {0},තෝරන්න {0}, @@ -2989,7 +2982,6 @@ star-empty,"තරු, හිස්-", step-backward,පියවර පසුගාමී, step-forward,පියවරක් ඉදිරියට, submitted this document,මෙම ලියවිල්ල ඉදිරිපත්, -"target = ""_blank""",target = "_blank", text in document type,ලිපි වර්ගය පෙළ, text-height,පෙළ-උස, text-width,පෙළ-පළල, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,ටෝකන පරම්පරාව තුළ යමක් වැරදී ඇත. නව එකක් ජනනය කිරීමට {0 on මත ක්ලික් කරන්න., Submit After Import,ආයාත කිරීමෙන් පසු ඉදිරිපත් කරන්න, Submitting...,ඉදිරිපත් කිරීම ..., -Subscribed Documents,දායක වූ ලේඛන, Success! You are good to go 👍,සාර්ථකත්වය! ඔබ යන්න හොඳයි, Successful Transactions,සාර්ථක ගනුදෙනු, Successfully Submitted!,සාර්ථකව ඉදිරිපත් කරන ලදි!, @@ -3777,7 +3768,6 @@ Please specify,සඳහන් කරන්න, Printing,මුද්රණ, Priority,ප්රමුඛ, Project,ව්යාපෘති, -Publish,පළ කරන්න, Quarterly,කාර්තුමය, Queued,පේළි, Quick Entry,ඉක්මන් පිවිසුම්, @@ -4299,7 +4289,6 @@ Hide Border,දේශ සීමාව සඟවන්න, Index Web Pages for Search,සෙවීම සඳහා වෙබ් පිටු සුචිගත කරන්න, Action / Route,ක්‍රියාව / මාර්ගය, Document Naming Rule,ලේඛන නම් කිරීමේ රීතිය, -Rules with higher priority will be applied first.,ඉහළ ප්‍රමුඛතාවයක් ඇති රීති පළමුව අදාළ වේ., Rule Conditions,රීති කොන්දේසි, Digits,ඉලක්කම්, Example: 00001,උදාහරණය: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,පැකේජ ප්‍රකාශන මෙවලම, Click on the row for accessing filters.,පෙරහන් වෙත ප්‍රවේශ වීම සඳහා පේළිය මත ක්ලික් කරන්න., Sites,අඩවි, Last Deployed On,අවසන් වරට යොදවා ඇත, -Last published {0},අවසන් වරට ප්‍රකාශයට පත් කළේ {0}, -Publishing documents...,ලේඛන ප්‍රකාශයට පත් කිරීම ..., -Documents have been published.,ලේඛන ප්‍රකාශයට පත් කර ඇත., -Select Document Type.,ලේඛන වර්ගය තෝරන්න., Console Log,කොන්සෝල ලොගය, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","මෙම උපකරණ පුවරුවේ සියලුම ප්‍රස්ථාර සඳහා පෙරනිමි විකල්ප සකසන්න (උදා: "වර්ණ": ["# d1d8dd", "# ff5858"])", Use Report Chart,වාර්තා සටහන භාවිතා කරන්න, @@ -4566,10 +4551,6 @@ Incorrect URL,වැරදි URL, Duplicate Name,අනුපිටපත් නම, "Please check the value of ""Fetch From"" set for field {0}",කරුණාකර field 0 field ක්ෂේත්‍රය සඳහා "ලබා ගන්න" කට්ටලයේ වටිනාකම පරීක්ෂා කරන්න, Wrong Fetch From value,වටිනාකමින් වැරදි ලබා ගැනීම, -Deploying,යෙදවීම, -Couldn't connect to site {0}. Please check Error Logs.,Site 0 site වෙබ් අඩවියට සම්බන්ධ වීමට නොහැකි විය. කරුණාකර දෝෂ ලොග් පරීක්ෂා කරන්න., -Error while installing package to site {0}. Please check Error Logs.,Site 0 site වෙබ් අඩවියට පැකේජය ස්ථාපනය කිරීමේදී දෝෂයකි. කරුණාකර දෝෂ ලොග් පරීක්ෂා කරන්න., -Exporting,අපනයනය, A field with the name '{}' already exists in doctype {}.,'{}' යන නම සහිත ක්ෂේත්‍රයක් දැනටමත් ඩොක්ටයිප් {in හි පවතී., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,අභිරුචි ක්ෂේත්‍රය {0 the පරිපාලකයා විසින් නිර්මාණය කරන ලද අතර එය මකා දැමිය හැක්කේ පරිපාලක ගිණුම හරහා පමණි., Failed to send {0} Auto Email Report,Email 0} ස්වයංක්‍රීය විද්‍යුත් තැපැල් වාර්තාවක් යැවීමට අපොහොසත් විය, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,පේළිය # {0}: අද්විතීය දුරස්ථ පරායත්ත ලේඛනය ලබා ගැනීම සඳහා කරුණාකර {1 field ක්ෂේත්‍රය සඳහා දුරස්ථ අගය පෙරහන් සකසන්න, Paytm payment gateway settings,Paytm ගෙවීම් ද්වාර සැකසුම්, "Company, Fiscal Year and Currency defaults","සමාගම, මූල්‍ය වර්ෂය සහ මුදල් පැහැර හැරීම්", -Package,පැකේජය, -Import and Export Packages.,පැකේජ ආනයනය හා අපනයනය කිරීම., Razorpay Signature Verification Failed,රේසර්පේ අත්සන සත්‍යාපනය අසමත් විය, Google Drive - Could not locate - {0},ගූගල් ඩ්‍රයිව් - සොයාගත නොහැකි විය - {0}, "Sync token was invalid and has been resetted, Retry syncing.","සමමුහුර්ත කිරීමේ ටෝකනය අවලංගු වූ අතර නැවත සකසා ඇත, නැවත සමමුහුර්ත කිරීම.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,DocType Link / DocType Action සඳහා, Cannot edit filters for standard charts,සම්මත ප්‍රස්ථාර සඳහා පෙරහන් සංස්කරණය කළ නොහැක, Event Producer Last Update,සිදුවීම් නිෂ්පාදකයා අවසන් යාවත්කාලීන කිරීම, Default for 'Check' type of field {0} must be either '0' or '1',Check 0 field 'චෙක්' ක්ෂේත්‍රයේ පෙරනිමිය '0' හෝ '1' විය යුතුය, +Non Negative,Neg ණාත්මක නොවේ, +Rules with higher priority number will be applied first.,ඉහළ ප්‍රමුඛතා අංකයක් සහිත රීති පළමුව අදාළ වේ., +Open URL in a New Tab,නව ටැබ් එකක URL විවෘත කරන්න, +Align Right,දකුණට පෙළගස්වන්න, +Loading Filters...,පෙරහන් පූරණය වෙමින් ..., +Count Customizations,අභිරුචිකරණයන් ගණන් කරන්න, +For Example: {} Open,උදාහරණයක් සඳහා: {} විවෘත කරන්න, +Choose Existing Card or create New Card,පවතින කාඩ්පත තෝරන්න හෝ නව කාඩ්පතක් සාදන්න, +Number Cards,අංක කාඩ්පත්, +Function Based On,ක්‍රියාකාරිත්වය මත පදනම්ව, +Add Filters,පෙරහන් එක් කරන්න, +Skip,මඟ හරින්න, +Dismiss,ඉවත් කරන්න, +Value cannot be negative for,අගය සඳහා negative ණ විය නොහැක, +Value cannot be negative for {0}: {1},{0} සඳහා අගය negative ණ විය නොහැක: {1}, +Negative Value,සෘණ අගය, +Authentication failed while receiving emails from Email Account: {0}.,විද්‍යුත් තැපැල් ගිණුමෙන් ඊමේල් ලැබීමේදී සත්‍යාපනය අසාර්ථක විය: {0}., +Message from server: {0},සේවාදායකයෙන් පණිවිඩය: {0}, diff --git a/frappe/translations/sk.csv b/frappe/translations/sk.csv index d65adffd95..1d9442ffdb 100644 --- a/frappe/translations/sk.csv +++ b/frappe/translations/sk.csv @@ -499,7 +499,6 @@ Authenticating...,Overovanie ..., Authentication,overenie pravosti, Authentication Apps you can use are: ,"Aplikácie na autentifikáciu, ktoré môžete použiť, sú:", Authentication Credentials,Autentifikačné poverenia, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Overovanie pri prijímaní e-mailov z e-mailového konta {0} zlyhalo. Správa zo servera: {1}, Authorization Code,autorizačný kód, Authorize URL,Povolenie adresy URL, Authorized,oprávnený, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Nie je možné zmeniť status dokumentu z 1 Cannot change header content,Nie je možné zmeniť obsah hlavičky, Cannot change state of Cancelled Document. Transition row {0},Nelze změnit stav zrušeného dokumentu. řádek transakce: {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Nemožno meniť údaje používateľa v demo. Prihláste sa na nový účet na stránke https://erpnext.com, -Cannot connect: {0},Nie je možné sa pripojiť: {0}, Cannot create a {0} against a child document: {1},Nie je možné vytvoriť {0} proti potomkovi dokumentu: {1}, Cannot delete Home and Attachments folders,Nemožno odstrániť Domov a prílohy zložky, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Nie je možné odstrániť súbor, pretože patrí do {0} {1}, pre ktorý nemáte povolenia", @@ -1139,7 +1137,6 @@ Font Size,Veľkosť písma, Fonts,Písma, Footer,Zápätie, Footer HTML,Päta HTML, -Footer Item,zápätie Item, Footer Items,Položky zápätia, Footer will display correctly only in PDF,Päta sa zobrazí správne iba vo formáte PDF, For Document Type,Pre typ dokumentu, @@ -1149,7 +1146,6 @@ For Value,Pre hodnotu, "For currency {0}, the minimum transaction amount should be {1}",Pri mene {0} by minimálna suma transakcie mala byť {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Například, pokud zrušíte a pozměnit INV004 se stane nový dokument INV004-1. To vám pomůže udržet přehled o každé změny.", "For example: If you want to include the document ID, use {0}","Napríklad: Ak chcete zahrnúť ID dokumentu, použite {0}", -For top bar,Pro horní panel, "For updating, you can update only selective columns.","Pro aktualizaci, můžete aktualizovat pouze vybrané sloupce.", For {0} at level {1} in {2} in row {3},Pre {0} na úrovni {1} v {2} na riadku {3}, Force,sila, @@ -1201,7 +1197,6 @@ Google Calendar ID,ID služby Kalendár Google, Google Font,Písmo Google, Google Services,Služby Google, Grant Type,grant Type, -Group Label,skupina Label, Group Name,Názov skupiny, Group name cannot be empty.,Názov skupiny nesmie byť prázdny., Groups of DocTypes,Skupiny DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Skontrolujte prosím e-mailovú adresu, Point Allocation Periodicity,Periodicita prideľovania bodov, Points,body, Points Given,Dané body, -Policy,politika, Port,Port, Portal Menu,Menu na portáli, Portal Menu Item,Položka menu na portáli, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Zvoľte aspoň 1 záznamov pre tlač, Select or drag across time slots to create a new event.,Nová událost: Zvolte nebo táhněte skrz Časová pole., Select records for assignment,Vyberte záznamy pre priradenie, -"Select target = ""_blank"" to open in a new page.","Zadajte target = ""_blank"" pre otvorenie na novej stránke", Select the label after which you want to insert new field.,"Zvolte popisek, za kterým chcete vložit nové pole.", "Select your Country, Time Zone and Currency","Vyberte svoju krajinu, časové pásmo a menu", Select {0},Vyberte {0}, @@ -2989,7 +2982,6 @@ star-empty,star-empty, step-backward,step-backward, step-forward,step-forward, submitted this document,predložený tento dokument, -"target = ""_blank""","target = ""_blank""", text in document type,text v type dokumentu, text-height,text-height, text-width,text-width, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Počas generovania tokenov sa niečo pokazilo. Kliknutím na {0} vygenerujete nový., Submit After Import,Odoslať po importe, Submitting...,Odoslaním ..., -Subscribed Documents,Predplatené dokumenty, Success! You are good to go 👍,Úspech! Ste dobrí ísť 👍, Successful Transactions,Úspešné transakcie, Successfully Submitted!,Úspešne odoslané!, @@ -3777,7 +3768,6 @@ Please specify,Prosím upresnite, Printing,Tlačenie, Priority,Priorita, Project,Projekt, -Publish,publikovať, Quarterly,Čtvrtletně, Queued,Vo fronte, Quick Entry,Rýchly vstup, @@ -4299,7 +4289,6 @@ Hide Border,Skryť hranicu, Index Web Pages for Search,Indexujte webové stránky na vyhľadávanie, Action / Route,Akcia / trasa, Document Naming Rule,Pravidlo pomenovania dokumentu, -Rules with higher priority will be applied first.,Najskôr sa použijú pravidlá s vyššou prioritou., Rule Conditions,Podmienky pravidla, Digits,Číslice, Example: 00001,Príklad: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Nástroj na zverejnenie balíka, Click on the row for accessing filters.,Kliknutím na riadok získate prístup k filtrom., Sites,Weby, Last Deployed On,Naposledy nasadené, -Last published {0},Naposledy zverejnené {0}, -Publishing documents...,Zverejňujú sa dokumenty ..., -Documents have been published.,Dokumenty boli zverejnené., -Select Document Type.,Vyberte typ dokumentu., Console Log,Protokol konzoly, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Nastaviť predvolené možnosti pre všetky grafy na tomto paneli (napr. „Farby“: ["# d1d8dd", "# ff5858"])", Use Report Chart,Použite prehľadový graf, @@ -4566,10 +4551,6 @@ Incorrect URL,Nesprávna adresa URL, Duplicate Name,Duplicitný názov, "Please check the value of ""Fetch From"" set for field {0}",Skontrolujte hodnotu nastavenia „Načítať z“ pre pole {0}, Wrong Fetch From value,Nesprávne načítanie z hodnoty, -Deploying,Nasadzovanie, -Couldn't connect to site {0}. Please check Error Logs.,Nepodarilo sa pripojiť k webu {0}. Skontrolujte protokoly chýb., -Error while installing package to site {0}. Please check Error Logs.,Chyba pri inštalácii balíka na web {0}. Skontrolujte protokoly chýb., -Exporting,Exportuje sa, A field with the name '{}' already exists in doctype {}.,Pole s názvom '{}' už v doctype {} existuje., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Vlastné pole {0} vytvára správca a je možné ho odstrániť iba prostredníctvom účtu správcu., Failed to send {0} Auto Email Report,Nepodarilo sa odoslať {0} automatický e-mailový prehľad, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,"Riadok č. {0}: Nastavte filtre vzdialených hodnôt pre pole {1}, aby sa načítal jedinečný dokument vzdialenej závislosti", Paytm payment gateway settings,Nastavenia platobnej brány Paytm, "Company, Fiscal Year and Currency defaults","Predvolené hodnoty spoločnosti, fiškálneho roka a meny", -Package,Balíček, -Import and Export Packages.,Import a export balíkov., Razorpay Signature Verification Failed,Overenie podpisu Razorpay zlyhalo, Google Drive - Could not locate - {0},Disk Google - nepodarilo sa nájsť - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Token synchronizácie bol neplatný a bol obnovený, skúste synchronizáciu zopakovať.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Pre DocType Link / DocType Action, Cannot edit filters for standard charts,Nie je možné upraviť filtre pre štandardné grafy, Event Producer Last Update,Posledná aktualizácia producenta udalostí, Default for 'Check' type of field {0} must be either '0' or '1',Predvolená hodnota pre pole typu „Skontrolovať“ {0} musí byť „0“ alebo „1“, +Non Negative,Nezáporné, +Rules with higher priority number will be applied first.,Najskôr sa použijú pravidlá s vyššou prioritou., +Open URL in a New Tab,Otvorte adresu URL na novej karte, +Align Right,Zarovnať správne, +Loading Filters...,Načítavajú sa filtre ..., +Count Customizations,Počítajte prispôsobenia, +For Example: {} Open,Napríklad: {} Otvorené, +Choose Existing Card or create New Card,Vyberte existujúcu kartu alebo vytvorte novú kartu, +Number Cards,Číselné karty, +Function Based On,Funkcia založená na, +Add Filters,Pridajte filtre, +Skip,Preskočiť, +Dismiss,Zavrieť, +Value cannot be negative for,Hodnota nemôže byť záporná pre, +Value cannot be negative for {0}: {1},Hodnota nemôže byť záporná pre {0}: {1}, +Negative Value,Záporná hodnota, +Authentication failed while receiving emails from Email Account: {0}.,Pri prijímaní e-mailov z e-mailového účtu zlyhalo overenie: {0}., +Message from server: {0},Správa zo servera: {0}, diff --git a/frappe/translations/sl.csv b/frappe/translations/sl.csv index 271c3a74a5..e3eb3018c5 100644 --- a/frappe/translations/sl.csv +++ b/frappe/translations/sl.csv @@ -499,7 +499,6 @@ Authenticating...,Preverjanje pristnosti ..., Authentication,preverjanje pristnosti, Authentication Apps you can use are: ,"Aplikacije za preverjanje pristnosti, ki jih lahko uporabite, so:", Authentication Credentials,Potrdila za preverjanje pristnosti, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},"Preverjanje pristnosti ni uspelo, medtem ko prejemanje e-pošte iz e-poštni račun {0}. Sporočilo s strežnika: {1}", Authorization Code,dovoljenje koda, Authorize URL,Avtoriziraj URL, Authorized,pooblaščeni, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Ne more spremeniti docstatus od 1 do 0, Cannot change header content,Vsebine glave ni mogoče spremeniti, Cannot change state of Cancelled Document. Transition row {0},Ne more spremeniti stanja preklicano dokumentu. Prehod vrstica {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,"ne more spremeniti podatke o uporabniku na demo. Prosimo, da se prijavite za nov račun na https://erpnext.com", -Cannot connect: {0},Ne more povezati: {0}, Cannot create a {0} against a child document: {1},Ne morem ustvariti {0} proti dokumenta otroka: {1}, Cannot delete Home and Attachments folders,"Mape ""Dom"" in ""Priponke"" ni mogoče izbrisati", Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Datoteke ne morete izbrisati, ker pripada {0} {1}, za katerega nimate dovoljenj", @@ -1139,7 +1137,6 @@ Font Size,Velikost pisave, Fonts,Pisave, Footer,Noga, Footer HTML,Footer HTML, -Footer Item,Noga Element, Footer Items,Noga Items, Footer will display correctly only in PDF,Podnožje se prikaže pravilno samo v PDF obliki, For Document Type,Za vrsto dokumenta, @@ -1149,7 +1146,6 @@ For Value,Za vrednost, "For currency {0}, the minimum transaction amount should be {1}",Za valuto {0} mora biti najmanjša vsota transakcije {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Na primer, če odpove in spremeniti INV004 bo postala nov dokument INV004-1. To vam pomaga, da spremljate vsako spremembo.", "For example: If you want to include the document ID, use {0}","Na primer: Če želite vključiti ID dokumenta, uporabite {0}", -For top bar,Za zgornji vrstici, "For updating, you can update only selective columns.","Za posodabljanje, lahko posodobite samo selektivne stolpce.", For {0} at level {1} in {2} in row {3},Za {0} na ravni {1} v {2} v vrstici {3}, Force,Force, @@ -1201,7 +1197,6 @@ Google Calendar ID,ID Google Koledarja, Google Font,Google Pisava, Google Services,Googlove storitve, Grant Type,Vrsta Grant, -Group Label,Oznaka skupine, Group Name,Ime skupine, Group name cannot be empty.,Ime skupine ne sme biti prazno., Groups of DocTypes,Skupine DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,"Prosimo, preverite svoj e-poštni naslov", Point Allocation Periodicity,Periodičnost dodeljevanja točk, Points,Točke, Points Given,Določene točke, -Policy,politika, Port,Port, Portal Menu,portal Meni, Portal Menu Item,Portal Menu Item, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Izberite atleast 1 zapis za tiskanje, Select or drag across time slots to create a new event.,Izberite ali povlecite čez termine ustvariti nov dogodek., Select records for assignment,Izberite evidence za dodelitev, -"Select target = ""_blank"" to open in a new page.","Izberite target = "_blank", da se odpre v novo stran.", Select the label after which you want to insert new field.,"Izberite oznako, po kateri želite vstaviti novo polje.", "Select your Country, Time Zone and Currency","Izberite vašo državo, časovni pas in valuto", Select {0},Izberite {0}, @@ -2989,7 +2982,6 @@ star-empty,zvezda-prazna, step-backward,korak nazaj, step-forward,korak naprej, submitted this document,predložen ta dokument, -"target = ""_blank""",target = "_blank", text in document type,Besedilo v vrsti dokumenta, text-height,text-višina, text-width,text-širina, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Nekaj je šlo narobe med generacijo žetona. Kliknite {0} in ustvarite novega., Submit After Import,Pošlji po uvozu, Submitting...,Predložitev ..., -Subscribed Documents,Naročeni dokumenti, Success! You are good to go 👍,"Uspeh! Dober si, da greš 👍", Successful Transactions,Uspešne transakcije, Successfully Submitted!,Uspešno oddano!, @@ -3777,7 +3768,6 @@ Please specify,"Prosimo, navedite", Printing,Tiskanje, Priority,Prednost, Project,Projekt, -Publish,Objavi, Quarterly,Četrtletno, Queued,V čakalni vrsti, Quick Entry,Quick Entry, @@ -4299,7 +4289,6 @@ Hide Border,Skrij mejo, Index Web Pages for Search,Indeksirajte spletne strani za iskanje, Action / Route,Dejanje / pot, Document Naming Rule,Pravilo o poimenovanju dokumentov, -Rules with higher priority will be applied first.,Najprej bodo uporabljena pravila z višjo prioriteto., Rule Conditions,Pogoji pravila, Digits,Števke, Example: 00001,Primer: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Orodje za objavo paketov, Click on the row for accessing filters.,Kliknite vrstico za dostop do filtrov., Sites,Spletna mesta, Last Deployed On,Nazadnje razmeščeno dne, -Last published {0},Nazadnje objavljeno {0}, -Publishing documents...,Objavljanje dokumentov ..., -Documents have been published.,Dokumenti so objavljeni., -Select Document Type.,Izberite vrsto dokumenta., Console Log,Dnevnik konzole, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Nastavite privzete možnosti za vse grafikone na tej nadzorni plošči (npr .: "colors": ["# d1d8dd", "# ff5858"])", Use Report Chart,Uporabite grafikon poročil, @@ -4566,10 +4551,6 @@ Incorrect URL,Napačen URL, Duplicate Name,Podvojeno ime, "Please check the value of ""Fetch From"" set for field {0}",Preverite vrednost nastavitve »Pridobi iz« za polje {0}, Wrong Fetch From value,Napačno pridobivanje iz vrednosti, -Deploying,Uvajanje, -Couldn't connect to site {0}. Please check Error Logs.,Povezave s spletnim mestom {0} ni bilo mogoče vzpostaviti. Preverite dnevnike napak., -Error while installing package to site {0}. Please check Error Logs.,Napaka pri namestitvi paketa na spletno mesto {0}. Preverite dnevnike napak., -Exporting,Izvažanje, A field with the name '{}' already exists in doctype {}.,Polje z imenom "{}" že obstaja v dokumentu {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Polje po meri {0} ustvari skrbnik in ga je mogoče izbrisati samo prek skrbniškega računa., Failed to send {0} Auto Email Report,Pošiljanja {0} samodejnega poročila po e-pošti ni uspelo, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,"Vrstica {0}: nastavite filtre oddaljenih vrednosti za polje {1}, da pridobite edinstveni dokument o oddaljeni odvisnosti", Paytm payment gateway settings,Nastavitve plačilnega prehoda Paytm, "Company, Fiscal Year and Currency defaults","Privzete vrednosti podjetja, fiskalnega leta in valute", -Package,Paket, -Import and Export Packages.,Uvoz in izvoz paketov., Razorpay Signature Verification Failed,Preverjanje podpisa Razorpay ni uspelo, Google Drive - Could not locate - {0},Google Drive - ni bilo mogoče najti - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Žeton za sinhronizacijo ni bil veljaven in je bil ponastavljen. Poskusite znova sinhronizacijo., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Za povezavo DocType / akcijo DocType, Cannot edit filters for standard charts,Ne morem urejati filtrov za standardne grafikone, Event Producer Last Update,Event Update Zadnja posodobitev, Default for 'Check' type of field {0} must be either '0' or '1',Privzeto za polje polja »Preveri« {0} mora biti »0« ali »1«, +Non Negative,Negativno, +Rules with higher priority number will be applied first.,Najprej bodo uporabljena pravila z večjo prednostno številko., +Open URL in a New Tab,Odprite URL v novem zavihku, +Align Right,Poravnaj desno, +Loading Filters...,Nalaganje filtrov ..., +Count Customizations,Štejte prilagoditve, +For Example: {} Open,Na primer: {} Odpri, +Choose Existing Card or create New Card,Izberite Obstoječa kartica ali ustvarite novo kartico, +Number Cards,Številčne kartice, +Function Based On,Funkcija temelji na, +Add Filters,Dodaj filtre, +Skip,Preskoči, +Dismiss,Odpusti, +Value cannot be negative for,Vrednost ne more biti negativna za, +Value cannot be negative for {0}: {1},Vrednost ne more biti negativna za {0}: {1}, +Negative Value,Negativna vrednost, +Authentication failed while receiving emails from Email Account: {0}.,Preverjanje pristnosti med prejemanjem e-poštnih sporočil iz e-poštnega računa ni uspelo: {0}., +Message from server: {0},Sporočilo s strežnika: {0}, diff --git a/frappe/translations/sq.csv b/frappe/translations/sq.csv index c593c628d9..3d3fe564b3 100644 --- a/frappe/translations/sq.csv +++ b/frappe/translations/sq.csv @@ -499,7 +499,6 @@ Authenticating...,Saktëson ..., Authentication,vërtetim, Authentication Apps you can use are: ,Aplikacionet e autentifikimit që mund të përdorni janë:, Authentication Credentials,Kredencialet e autentifikimit, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Authentication dështuar duke marrë email nga Email llogarisë {0}. Mesazh nga serveri: {1}, Authorization Code,Kodi i autorizimit, Authorize URL,Autorizo URL, Authorized,i autorizuar, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Nuk mund të ndryshojë docstatus prej 1 ne Cannot change header content,Nuk mund të ndryshojë përmbajtjen e kokës, Cannot change state of Cancelled Document. Transition row {0},Nuk mund të ndryshojë gjendjen e Dokumentit Anullohen. Rresht Tranzicioni {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Nuk mund të ndryshojë të dhënat e përdoruesit në demo. Ju lutemi të regjistroheni për një llogari të re në https://erpnext.com, -Cannot connect: {0},Nuk mund të lidhet: {0}, Cannot create a {0} against a child document: {1},nuk mund të krijojë një {0} kundër një dokument të fëmijëve: {1}, Cannot delete Home and Attachments folders,Nuk mund të fshini shtëpi dhe Attachments dosjet, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Nuk mund të fshihet skedari si i përket {0} {1} për të cilin nuk ke leje, @@ -1139,7 +1137,6 @@ Font Size,Font Size, Fonts,fonts, Footer,Futboll, Footer HTML,Këmbë HTML, -Footer Item,Footer Item, Footer Items,Items Footer, Footer will display correctly only in PDF,Footer do të shfaqet saktë vetëm në PDF, For Document Type,Për llojin e dokumentit, @@ -1149,7 +1146,6 @@ For Value,Për vlerën, "For currency {0}, the minimum transaction amount should be {1}","Për monedhën {0}, shuma minimale e transaksionit duhet të jetë {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Për shembull, nëse ju anuloni dhe të ndryshojë INV004 ajo do të bëhet një INV004-1 ri dokument. Kjo ju ndihmon të mbajnë gjurmët e çdo amendament.", "For example: If you want to include the document ID, use {0}","Për shembull: Nëse ju doni të përfshijë ID dokument, përdorni {0}", -For top bar,Për bar të lartë, "For updating, you can update only selective columns.","Për përditësimin, ju mund update kolona vetëm selektive.", For {0} at level {1} in {2} in row {3},Për {0} në nivelin {1} në {2} në rresht {3}, Force,forcë, @@ -1201,7 +1197,6 @@ Google Calendar ID,ID e Google Kalendarit, Google Font,Font Google, Google Services,Shërbimet e Google, Grant Type,Grant Lloji, -Group Label,Grupi Label, Group Name,Emri i grupit, Group name cannot be empty.,Emri i grupit nuk mund të jetë i zbrazët., Groups of DocTypes,Grupet e DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Ju lutem verifikoni adresën tuaj email, Point Allocation Periodicity,Periodiciteti i ndarjes së pikave, Points,pikë, Points Given,Pikat e dhëna, -Policy,Politikë, Port,Port, Portal Menu,Portal Menu, Portal Menu Item,Portal Menu Item, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Zgjidhni atleast 1 Të dhënat për printim, Select or drag across time slots to create a new event.,Zgjidhni ose terhiqe nëpër kohë lojëra elektronike për të krijuar një ngjarje të re., Select records for assignment,Zgjidh dhënat për caktimin, -"Select target = ""_blank"" to open in a new page.",Zgjidh target = "_blank" për të hapur në një faqe të re., Select the label after which you want to insert new field.,Zgjidhni etiketën pasi që ju doni të futur fushë të re., "Select your Country, Time Zone and Currency","Zgjidh vendin tuaj, Time Zone dhe monedhës", Select {0},Zgjidh {0}, @@ -2989,7 +2982,6 @@ star-empty,yll-bosh, step-backward,hap prapa, step-forward,hap përpara, submitted this document,dorëzuar këtë dokument, -"target = ""_blank""",target = "_blank", text in document type,Teksti në llojin e dokumentit, text-height,text-height, text-width,text-width, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Diqka shkoi keq gjatë gjenerimit të shenjave. Klikoni në {0} për të gjeneruar një të re., Submit After Import,Paraqisni pas importit, Submitting...,Dorëzimi ..., -Subscribed Documents,Dokumente të pajtuara, Success! You are good to go 👍,Sukses! Ju jeni mirë të shkoni 👍, Successful Transactions,Transaksione të suksesshme, Successfully Submitted!,Dorëzohet me sukses!, @@ -3777,7 +3768,6 @@ Please specify,Ju lutem specifikoni, Printing,Shtypje, Priority,Prioritet, Project,Projekt, -Publish,publikoj, Quarterly,Tremujor, Queued,Queued, Quick Entry,Hyrja shpejtë, @@ -4299,7 +4289,6 @@ Hide Border,Fshih kufirin, Index Web Pages for Search,Indeksoni faqet në internet për kërkim, Action / Route,Aksioni / Rruga, Document Naming Rule,Rregulli i Emërtimit të Dokumentit, -Rules with higher priority will be applied first.,Rregullat me përparësi më të lartë do të zbatohen së pari., Rule Conditions,Kushtet e rregullave, Digits,Shifrat, Example: 00001,Shembull: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Mjet Publikimi i Paketave, Click on the row for accessing filters.,Klikoni në rresht për të hyrë në filtra., Sites,Sitet, Last Deployed On,Vendosur për herë të fundit në, -Last published {0},Botuar për herë të fundit {0}, -Publishing documents...,Publikimi i dokumenteve ..., -Documents have been published.,Dokumentet janë botuar., -Select Document Type.,Zgjidhni Llojin e Dokumentit., Console Log,Regjistri i konsolës, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Vendosni Opsionet e Parazgjedhura për të gjitha grafikët në këtë Panel (Shembull: "Colors": ["# d1d8dd", "# ff5858"])", Use Report Chart,Përdorni Grafikun e Raportit, @@ -4566,10 +4551,6 @@ Incorrect URL,URL e pasaktë, Duplicate Name,Emri dublikatë, "Please check the value of ""Fetch From"" set for field {0}",Ju lutemi kontrolloni vlerën e vendosur "Fetch From" për fushën {0}, Wrong Fetch From value,Nxjerrja e gabuar nga vlera, -Deploying,Vendosja, -Couldn't connect to site {0}. Please check Error Logs.,Nuk mund të lidhej me sitin {0}. Ju lutemi kontrolloni Regjistrat e Gabimeve., -Error while installing package to site {0}. Please check Error Logs.,Gabim gjatë instalimit të paketës në sitin {0}. Ju lutemi kontrolloni Regjistrat e Gabimeve., -Exporting,Eksportimi, A field with the name '{}' already exists in doctype {}.,Një fushë me emrin '{}' ekziston tashmë në tipin e doktrinës {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Fusha e personalizuar {0} është krijuar nga Administratori dhe mund të fshihet vetëm përmes llogarisë së Administratorit., Failed to send {0} Auto Email Report,Dërgimi i {0} Raportit Automatik të Email-it dështoi, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Rreshti # {0}: Ju lutemi vendosni filtra me vlerë të largët për fushën {1} për të marrë dokumentin unik të varësisë në distancë, Paytm payment gateway settings,Cilësimet e portës së pagesës Paytm, "Company, Fiscal Year and Currency defaults","Parazgjedhjet e kompanisë, vitit fiskal dhe valutës", -Package,Paketa, -Import and Export Packages.,Importo dhe Eksporto Paketat., Razorpay Signature Verification Failed,Verifikimi i Nënshkrimit Razorpay Dështoi, Google Drive - Could not locate - {0},Google Drive - Nuk mund të lokalizohet - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Shenja e sinkronizimit ishte e pavlefshme dhe është rivendosur, riprovo sinkronizimin.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Për DocType Link / DocType Action, Cannot edit filters for standard charts,Nuk mund të modifikoni filtrat për tabelat standarde, Event Producer Last Update,Përditësimi i fundit i Producentit të Ngjarjes, Default for 'Check' type of field {0} must be either '0' or '1',Default për llojin 'Kontroll' i fushës {0} duhet të jetë '0' ose '1', +Non Negative,Jo Negativ, +Rules with higher priority number will be applied first.,Rregullat me numër më të lartë të përparësisë do të zbatohen së pari., +Open URL in a New Tab,Hapni URL-në në një skedë të re, +Align Right,Align Right, +Loading Filters...,Filtrat po ngarkohen ..., +Count Customizations,Numëroni personalizimet, +For Example: {} Open,Për shembull: {} Hapur, +Choose Existing Card or create New Card,Zgjidhni Kartën Ekzistuese ose krijoni Kartën e Re, +Number Cards,Kartat e Numrave, +Function Based On,Funksioni Bazuar në, +Add Filters,Shto filtra, +Skip,Kapërce, +Dismiss,Shkarkoni, +Value cannot be negative for,Vlera nuk mund të jetë negative për, +Value cannot be negative for {0}: {1},Vlera nuk mund të jetë negative për {0}: {1}, +Negative Value,Vlera negative, +Authentication failed while receiving emails from Email Account: {0}.,Vërtetimi dështoi gjatë marrjes së postave elektronike nga llogaria e postës elektronike: {0}., +Message from server: {0},Mesazh nga serveri: {0}, diff --git a/frappe/translations/sr.csv b/frappe/translations/sr.csv index 0d1bfb5659..0f3de31315 100644 --- a/frappe/translations/sr.csv +++ b/frappe/translations/sr.csv @@ -499,7 +499,6 @@ Authenticating...,Аутентификација ..., Authentication,Аутентикација, Authentication Apps you can use are: ,Апликације за аутентикацију које можете користити су:, Authentication Credentials,Аутентификацијски акредитиви, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Аутхентицатион фаилед док примање мејлова из Е-маил рачуна {0}. Порука са сервера: {1}, Authorization Code,код за дозволу, Authorize URL,Овластите УРЛ адресу, Authorized,овлашћен, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Не могу да променим доцс Cannot change header content,Не могу мењати садржај заглавља, Cannot change state of Cancelled Document. Transition row {0},Не могу променити стање Отказан Документа ., Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Не можете да промените информације о кориснику у демо. Молимо Вас да регистрација за нови налог на хттпс://ерпнект.цом, -Cannot connect: {0},Цан нот цоннецт: {0}, Cannot create a {0} against a child document: {1},Не може да креира {0} против документа детета: {1}, Cannot delete Home and Attachments folders,Не могу да избришем Хоме и прилоге фасцикле, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Не можете избрисати датотеку пошто припада {0} {1} за коју немате дозволе, @@ -1139,7 +1137,6 @@ Font Size,Величина фонта, Fonts,Фонтови, Footer,Подножје, Footer HTML,Фоотер ХТМЛ, -Footer Item,фоотер артикла, Footer Items,Фоотер Артикли, Footer will display correctly only in PDF,Фоотер ће се исправно приказати само у ПДФ-у, For Document Type,За врсту документа, @@ -1149,7 +1146,6 @@ For Value,За вредност, "For currency {0}, the minimum transaction amount should be {1}","За валуту {0}, минимална трансакција износи {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"На пример, ако се откаже и измени ИНВ004 постаће нови документ ИНВ004-1. Ово вам помаже да пратите сваком амандману.", "For example: If you want to include the document ID, use {0}","На пример: Ако желите да укључите у идентификационог документа, користимо {0}", -For top bar,Для верхней панели, "For updating, you can update only selective columns.","За ажурирање, можете ажурирати само селективне колоне.", For {0} at level {1} in {2} in row {3},Для {0} на уровне {1} в {2} в строке {3}, Force,сила, @@ -1201,7 +1197,6 @@ Google Calendar ID,ИД Гоогле календара, Google Font,Гоогле Фонт, Google Services,Гоогле услуге, Grant Type,грант Тип, -Group Label,Група Ознака, Group Name,Назив групе, Group name cannot be empty.,Име групе не може бити празно., Groups of DocTypes,Групе ДоцТипес, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Молимо Вас да потврдите В Point Allocation Periodicity,Периодичност расподјеле тачке, Points,Бодова, Points Given,Дане бодове, -Policy,политика, Port,порт, Portal Menu,портал Мени, Portal Menu Item,Портал Ставка менија, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Изабери покрвитеља 1 запис за штампање, Select or drag across time slots to create a new event.,Изаберите или превуците преко терминима да креирате нови догађај., Select records for assignment,Изаберите евиденција за доделу, -"Select target = ""_blank"" to open in a new page.","Одаберите таргет = ""_бланк "" отвара нову страницу у .", Select the label after which you want to insert new field.,Изаберите ознаку након чега желите да убаците ново поље., "Select your Country, Time Zone and Currency","Изаберите своју земљу, временску зону и валуту", Select {0},Изаберите {0}, @@ -2989,7 +2982,6 @@ star-empty,звезда празна, step-backward,корак-назад, step-forward,корак напред, submitted this document,доставио овај документ, -"target = ""_blank""",таргет = "_бланк", text in document type,текст у врсти документа, text-height,текст-висина, text-width,Текст ширине, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Нешто је пошло по злу током генерације токена. Кликните на {0} да бисте генерисали нови., Submit After Import,Пошаљите после увоза, Submitting...,Подношење ..., -Subscribed Documents,Претплаћени документи, Success! You are good to go 👍,Успех! Ти си добар го, Successful Transactions,Успешне трансакције, Successfully Submitted!,Успешно поднет!, @@ -3777,7 +3768,6 @@ Please specify,Наведите, Printing,Штампање, Priority,Приоритет, Project,Пројекат, -Publish,Објави, Quarterly,Тромесечни, Queued,Куеуед, Quick Entry,Брзо Ступање, @@ -4299,7 +4289,6 @@ Hide Border,Сакриј границу, Index Web Pages for Search,Индексирајте веб странице за претрагу, Action / Route,Акција / рута, Document Naming Rule,Правило именовања докумената, -Rules with higher priority will be applied first.,Прво ће се примењивати правила са већим приоритетом., Rule Conditions,Услови правила, Digits,Цифре, Example: 00001,Пример: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Алат за објављивање пакета, Click on the row for accessing filters.,Кликните на ред за приступ филтерима., Sites,Сајтови, Last Deployed On,Последњи пут постављено, -Last published {0},Последњи пут објављено {0}, -Publishing documents...,Објављивање докумената ..., -Documents have been published.,Документи су објављени., -Select Document Type.,Изаберите врсту документа., Console Log,Дневник конзоле, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Поставите подразумеване опције за све графиконе на овој контролној табли (Нпр .: "боје": ["# д1д8дд", "# фф5858"])", Use Report Chart,Користите графикон извештаја, @@ -4566,10 +4551,6 @@ Incorrect URL,Нетачан УРЛ, Duplicate Name,Дупликат имена, "Please check the value of ""Fetch From"" set for field {0}",Проверите вредност поставке „Преузимање из“ за поље {0}, Wrong Fetch From value,Погрешно преузимање из вредности, -Deploying,Распоређивање, -Couldn't connect to site {0}. Please check Error Logs.,Повезивање са веб локацијом {0} није успело. Молимо проверите Евиденције грешака., -Error while installing package to site {0}. Please check Error Logs.,Грешка приликом инсталирања пакета на веб локацију {0}. Молимо проверите Евиденције грешака., -Exporting,Извоз, A field with the name '{}' already exists in doctype {}.,Поље са именом „{}“ већ постоји у доцтипе {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Прилагођено поље {0} креира администратор и може се избрисати само путем администраторског налога., Failed to send {0} Auto Email Report,Слање {0} аутоматског извештаја е-поштом није успело, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Ред # {0}: Поставите филтере удаљене вредности за поље {1} да бисте преузели јединствени документ о удаљеној зависности, Paytm payment gateway settings,Поставке мрежног пролаза за Паитм, "Company, Fiscal Year and Currency defaults","Подразумеване вредности предузећа, фискалне године и валуте", -Package,Пакет, -Import and Export Packages.,Увоз и извоз пакета., Razorpay Signature Verification Failed,Није успела верификација потписа Разорпаи-а, Google Drive - Could not locate - {0},Гоогле диск - Не могу да пронађем - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Токен за синхронизацију је неважећи и ресетован је, покушајте поново да синхронизујете.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,За ДоцТипе Линк / ДоцТипе Cannot edit filters for standard charts,Није могуће уредити филтере за стандардне графиконе, Event Producer Last Update,Последње ажурирање произвођача догађаја, Default for 'Check' type of field {0} must be either '0' or '1',Подразумевано за тип поља „Цхецк“ {0} мора бити „0“ или „1“, +Non Negative,Негативно, +Rules with higher priority number will be applied first.,Прво ће се применити правила са већим приоритетом., +Open URL in a New Tab,Отворите УРЛ на новој картици, +Align Right,Поравнајте десно, +Loading Filters...,Учитавање филтера ..., +Count Customizations,Бројање прилагођавања, +For Example: {} Open,На пример: {} Отвори, +Choose Existing Card or create New Card,Одаберите постојећу картицу или креирајте нову, +Number Cards,Број картице, +Function Based On,Функција заснована на, +Add Filters,Додај филтере, +Skip,Прескочи, +Dismiss,Одбаци, +Value cannot be negative for,Вредност не може бити негативна за, +Value cannot be negative for {0}: {1},Вредност не може бити негативна за {0}: {1}, +Negative Value,Негативна вредност, +Authentication failed while receiving emails from Email Account: {0}.,Аутентификација није успела током примања е-поште са налога е-поште: {0}., +Message from server: {0},Порука са сервера: {0}, diff --git a/frappe/translations/sv.csv b/frappe/translations/sv.csv index 30accc14c4..fe8458de35 100644 --- a/frappe/translations/sv.csv +++ b/frappe/translations/sv.csv @@ -499,7 +499,6 @@ Authenticating...,Autentisering ..., Authentication,autentisering, Authentication Apps you can use are: ,Autentiseringsprogram som du kan använda är:, Authentication Credentials,Autentiseringsuppgifter, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Autentisering misslyckades samtidigt som han får e-post från e-postkonto {0}. Meddelande från server: {1}, Authorization Code,Behörighetskod, Authorize URL,Godkänn webbadress, Authorized,auktoriserad, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Det går inte att ändra docstatus 1-0, Cannot change header content,Kan inte ändra huvudinnehåll, Cannot change state of Cancelled Document. Transition row {0},Det går inte att ändra tillstånd av Inställt dokument. Övergångs raden {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Kan inte ändra användaruppgifter i demo. Vänligen logga in för ett nytt konto på https://erpnext.com, -Cannot connect: {0},Kan inte ansluta: {0}, Cannot create a {0} against a child document: {1},Det går inte att skapa en {0} mot ett underordnat dokument: {1}, Cannot delete Home and Attachments folders,Det går inte att ta bort Hem och bilagor mappar, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Det går inte att ta bort filen eftersom den tillhör {0} {1} för vilken du inte har behörigheter, @@ -1139,7 +1137,6 @@ Font Size,Textstorlek, Fonts,typsnitt, Footer,Footer, Footer HTML,Sidfot HTML, -Footer Item,footer Punkt, Footer Items,Footer artiklar, Footer will display correctly only in PDF,Sidfot visas bara korrekt i PDF, For Document Type,För dokumenttyp, @@ -1149,7 +1146,6 @@ For Value,För värde, "For currency {0}, the minimum transaction amount should be {1}",För valuta {0} bör den minsta transaktionsbeloppet vara {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,Till exempel om du avbryter och ändrar INV004 kommer att bli ett nytt dokument INV004-1. Detta hjälper dig att hålla koll på varje ändring., "For example: If you want to include the document ID, use {0}","Till exempel: Om du vill inkludera dokument-ID, använd {0}", -For top bar,För översta fältet, "For updating, you can update only selective columns.",För uppdatering kan du uppdatera bara selektiva kolumner., For {0} at level {1} in {2} in row {3},För {0} på nivå {1} i {2} i rad {3}, Force,Tvinga, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Kalender-ID, Google Font,Google Font, Google Services,Google Services, Grant Type,Grant Typ, -Group Label,grupp~~POS=HEADCOMP Etikett, Group Name,Grupp namn, Group name cannot be empty.,Gruppnamn kan inte vara tomt., Groups of DocTypes,Grupper av DOCTYPE, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Kontrollera din e-postadress, Point Allocation Periodicity,Punkttilldelning Periodicitet, Points,Points, Points Given,Givna poäng, -Policy,Politik, Port,Port, Portal Menu,portal Menu, Portal Menu Item,Portal Menyobjekt, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Välj minst ett rekord för utskrift, Select or drag across time slots to create a new event.,Välj eller dra över tidsluckor för att skapa en ny händelse., Select records for assignment,Välj poster för uppdrag, -"Select target = ""_blank"" to open in a new page.",Välj target = "_blank" för att öppna en ny sida., Select the label after which you want to insert new field.,Välj etiketten efter vilken du vill infoga nya fält., "Select your Country, Time Zone and Currency","Välj ditt land, tidszon och valuta", Select {0},Välj {0}, @@ -2989,7 +2982,6 @@ star-empty,star-tom, step-backward,steg bakåt, step-forward,Stig fram, submitted this document,lämnat detta dokument, -"target = ""_blank""",target = "_blank", text in document type,text i dokument typ, text-height,text-höjd, text-width,text-bredd, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Något gick fel under tokengenerationen. Klicka på {0} för att generera en ny., Submit After Import,Skicka efter import, Submitting...,Skickar ..., -Subscribed Documents,Prenumererade dokument, Success! You are good to go 👍,Framgång! Du är bra att gå 👍, Successful Transactions,Framgångsrika transaktioner, Successfully Submitted!,Framgångsrikt skickat!, @@ -3777,7 +3768,6 @@ Please specify,Vänligen specificera, Printing,Tryckning, Priority,Prioritet, Project,Projekt, -Publish,Publicera, Quarterly,Kvartals, Queued,I kö, Quick Entry,Snabbinmatning, @@ -4299,7 +4289,6 @@ Hide Border,Dölj gräns, Index Web Pages for Search,Indexera webbsidor för sökning, Action / Route,Action / rutt, Document Naming Rule,Dokumentnamnregel, -Rules with higher priority will be applied first.,Regler med högre prioritet tillämpas först., Rule Conditions,Regelvillkor, Digits,Siffror, Example: 00001,Exempel: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Verktyg för paketpublicering, Click on the row for accessing filters.,Klicka på raden för att komma åt filter., Sites,Webbplatser, Last Deployed On,Senast implementerad, -Last published {0},Senast publicerad {0}, -Publishing documents...,Publicera dokument ..., -Documents have been published.,Dokument har publicerats., -Select Document Type.,Välj Dokumenttyp., Console Log,Konsollogg, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Ställ in standardalternativ för alla diagram på denna instrumentpanel (Ex: "färger": ["# d1d8dd", "# ff5858"])", Use Report Chart,Använd rapportdiagram, @@ -4566,10 +4551,6 @@ Incorrect URL,Fel URL, Duplicate Name,Dubblettnamn, "Please check the value of ""Fetch From"" set for field {0}",Kontrollera värdet för uppsättningen "Hämta från" för fält {0}, Wrong Fetch From value,Fel hämtning från värde, -Deploying,Implementerar, -Couldn't connect to site {0}. Please check Error Logs.,Det gick inte att ansluta till webbplatsen {0}. Kontrollera felloggar., -Error while installing package to site {0}. Please check Error Logs.,Fel vid installation av paket till webbplats {0}. Kontrollera felloggar., -Exporting,Exporterar, A field with the name '{}' already exists in doctype {}.,Ett fält med namnet '{}' finns redan i doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Anpassat fält {0} skapas av administratören och kan bara raderas via administratörskontot., Failed to send {0} Auto Email Report,Det gick inte att skicka {0} automatisk e-postrapport, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Rad # {0}: Ange fjärrvärden för fältet {1} för att hämta det unika dokumentet för fjärrberoende, Paytm payment gateway settings,Paytm-betalningsgatewayinställningar, "Company, Fiscal Year and Currency defaults","Standardvärden för företag, räkenskapsår och valuta", -Package,Paket, -Import and Export Packages.,Importera och exportera paket., Razorpay Signature Verification Failed,Verifiering av Razorpay-signatur misslyckades, Google Drive - Could not locate - {0},Google Drive - Det gick inte att hitta - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Synkroniseringstoken var ogiltig och har återställts. Försök igen med synkronisering., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,För DocType-länk / DocType-åtgärd, Cannot edit filters for standard charts,Det går inte att redigera filter för standarddiagram, Event Producer Last Update,Event Producent Senaste uppdatering, Default for 'Check' type of field {0} must be either '0' or '1',Standard för "Kontroll" -typen för fält {0} måste vara antingen "0" eller "1", +Non Negative,Ej negativ, +Rules with higher priority number will be applied first.,Regler med högre prioritetsnummer tillämpas först., +Open URL in a New Tab,Öppna URL i en ny flik, +Align Right,Anpassa till höger, +Loading Filters...,Läser in filter ..., +Count Customizations,Räkna anpassningar, +For Example: {} Open,Till exempel: {} Öppna, +Choose Existing Card or create New Card,Välj Befintligt kort eller skapa nytt kort, +Number Cards,Nummerkort, +Function Based On,Funktionsbaserad på, +Add Filters,Lägg till filter, +Skip,Hoppa, +Dismiss,Avfärda, +Value cannot be negative for,Värde kan inte vara negativt för, +Value cannot be negative for {0}: {1},Värde kan inte vara negativt för {0}: {1}, +Negative Value,Negativt värde, +Authentication failed while receiving emails from Email Account: {0}.,Autentiseringen misslyckades när e-postmeddelanden togs emot från e-postkontot: {0}., +Message from server: {0},Meddelande från servern: {0}, diff --git a/frappe/translations/sw.csv b/frappe/translations/sw.csv index 669bf561e6..cbe7ddd65c 100644 --- a/frappe/translations/sw.csv +++ b/frappe/translations/sw.csv @@ -499,7 +499,6 @@ Authenticating...,Inathibitisha ..., Authentication,Uthibitishaji, Authentication Apps you can use are: ,Programu za uthibitishaji unazoweza kutumia ni:, Authentication Credentials,Vidokezo vya Uthibitishaji, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Uthibitisho umeshindwa wakati wa kupokea barua pepe kutoka kwa Akaunti ya barua pepe {0}. Ujumbe kutoka kwa seva: {1}, Authorization Code,Kanuni ya Uidhinishaji, Authorize URL,Thibitisha URL, Authorized,Imeidhinishwa, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Haiwezi kubadilisha docstatus kutoka 1 hadi Cannot change header content,Haiwezi kubadilisha maudhui ya kichwa, Cannot change state of Cancelled Document. Transition row {0},Haiwezi kubadilisha hali ya Nyaraka Iliyosajiliwa. Mstari wa mpito {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Haiwezi kubadilisha maelezo ya mtumiaji katika demo. Tafadhali ingia akaunti mpya kwenye https://erpnext.com, -Cannot connect: {0},Haiwezi kuunganisha: {0}, Cannot create a {0} against a child document: {1},Haiwezi kuunda {0} dhidi ya hati ya mtoto: {1}, Cannot delete Home and Attachments folders,Haiwezi kufuta folda za Nyumbani na Vifungo, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Haiwezi kufuta faili kama ni ya {0} {1} ambayo huna ruhusa, @@ -1139,7 +1137,6 @@ Font Size,Ukubwa wa herufi, Fonts,Fonts, Footer,Chini, Footer HTML,HTML ya HTML, -Footer Item,Kitu cha chini, Footer Items,Vipindi vya vidogo, Footer will display correctly only in PDF,Footer itaonyeshwa kwa usahihi tu katika PDF, For Document Type,Kwa Aina ya Hati, @@ -1149,7 +1146,6 @@ For Value,Kwa Thamani, "For currency {0}, the minimum transaction amount should be {1}","Kwa sarafu {0}, kiwango cha chini cha shughuli lazima {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,Kwa mfano ikiwa unaweza kufuta na kurekebisha INV004 itakuwa hati mpya INV004-1. Hii inakusaidia kuweka wimbo wa kila marekebisho., "For example: If you want to include the document ID, use {0}","Kwa mfano: Ikiwa unataka kuingiza Kitambulisho cha hati, tumia {0}", -For top bar,Kwa bar ya juu, "For updating, you can update only selective columns.","Kwa uppdatering, unaweza kuboresha safu zilizochaguliwa tu.", For {0} at level {1} in {2} in row {3},Kwa {0} kwa kiwango {1} katika {2} mfululizo {3}, Force,Nguvu, @@ -1201,7 +1197,6 @@ Google Calendar ID,Kitambulisho cha Kalenda ya Google, Google Font,Fonti ya Google, Google Services,Huduma za Google, Grant Type,Aina ya Ruzuku, -Group Label,Lebo ya Kikundi, Group Name,Jina la Kikundi, Group name cannot be empty.,Jina la kikundi hawezi kuwa tupu., Groups of DocTypes,Vikundi vya DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Tafadhali thibitisha Anwani yako ya barua pepe, Point Allocation Periodicity,Kipindi cha Ugawanyaji wa Uhakika, Points,Pointi, Points Given,Vidokezo Vilivyopewa, -Policy,Sera, Port,Bandari, Portal Menu,Menyu ya Portal, Portal Menu Item,Kipengele cha Menyu ya Portal, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Chagua rekodi 1 ya uchapishaji, Select or drag across time slots to create a new event.,Chagua au gurudisha wakati unaofaa ili kuunda tukio jipya., Select records for assignment,Chagua rekodi za kazi, -"Select target = ""_blank"" to open in a new page.",Chagua lengo = "_blank" ili kufungua ukurasa mpya., Select the label after which you want to insert new field.,Chagua lebo baada ya ambayo unataka kuingiza shamba jipya., "Select your Country, Time Zone and Currency","Chagua Nchi yako, Eneo la Wakati na Fedha", Select {0},Chagua {0}, @@ -2989,7 +2982,6 @@ star-empty,nyota-tupu, step-backward,hatua ya nyuma, step-forward,hatua ya mbele, submitted this document,iliwasilisha hati hii, -"target = ""_blank""",lengo = "_blank", text in document type,Nakala katika aina ya hati, text-height,urefu wa maandishi, text-width,upana wa maandishi, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Kuna kitu kilienda vibaya wakati wa kizazi cha ishara. Bonyeza kwenye {0} ili kutengeneza mpya., Submit After Import,Tuma baada ya Kuingiza, Submitting...,Inawasilisha ..., -Subscribed Documents,Hati zilizosajiliwa, Success! You are good to go 👍,Kufanikiwa! Wewe ni mzuri kwenda 👍, Successful Transactions,Uuzaji uliofanikiwa, Successfully Submitted!,Imewasilishwa kwa mafanikio!, @@ -3777,7 +3768,6 @@ Please specify,Tafadhali fafanua, Printing,Uchapishaji, Priority,Kipaumbele, Project,Mradi, -Publish,Kuchapisha, Quarterly,Jumatatu, Queued,Umewekwa, Quick Entry,Kuingia kwa haraka, @@ -4299,7 +4289,6 @@ Hide Border,Ficha Mpaka, Index Web Pages for Search,Faharasa Kurasa za Wavuti za Kutafuta, Action / Route,Hatua / Njia, Document Naming Rule,Kanuni ya Kumtaja Hati, -Rules with higher priority will be applied first.,Kanuni zilizo na kipaumbele cha juu zitatumika kwanza., Rule Conditions,Masharti ya Utawala, Digits,Nambari, Example: 00001,Mfano: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Zana ya Kuchapisha Kifurushi, Click on the row for accessing filters.,Bonyeza kwenye safu ili ufikie vichungi., Sites,Tovuti, Last Deployed On,Iliyotumwa Mwisho, -Last published {0},Ilichapishwa mwisho {0}, -Publishing documents...,Inachapisha hati ..., -Documents have been published.,Nyaraka zimechapishwa., -Select Document Type.,Chagua Aina ya Hati., Console Log,Ingia ya Dashibodi, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Weka Chaguzi Chaguo-msingi kwa chati zote kwenye Dashibodi hii (Mfano: "rangi": ["# d1d8dd", "# ff5858"])", Use Report Chart,Tumia Chati ya Ripoti, @@ -4566,10 +4551,6 @@ Incorrect URL,URL isiyo sahihi, Duplicate Name,Jina la Nakala, "Please check the value of ""Fetch From"" set for field {0}",Tafadhali angalia thamani ya "Leta Kutoka" iliyowekwa kwa uwanja {0}, Wrong Fetch From value,Leta Mbaya Kutoka kwa thamani, -Deploying,Kupeleka, -Couldn't connect to site {0}. Please check Error Logs.,Imeshindwa kuunganisha kwenye wavuti {0}. Tafadhali angalia Makosa ya Makosa., -Error while installing package to site {0}. Please check Error Logs.,Hitilafu wakati wa kusakinisha kifurushi kwenye wavuti {0}. Tafadhali angalia Makosa ya Makosa., -Exporting,Kuhamisha, A field with the name '{}' already exists in doctype {}.,Sehemu iliyo na jina '{}' tayari ipo katika fumbo la maandishi {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Sehemu Maalum {0} imeundwa na Msimamizi na inaweza kufutwa tu kupitia akaunti ya Msimamizi., Failed to send {0} Auto Email Report,Imeshindwa kutuma {0} Ripoti ya Barua Pepe Kiotomatiki, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Safu mlalo # {0}: Tafadhali weka vichungi vya thamani ya mbali kwa uwanja {1} ili upate hati ya kipekee ya utegemezi wa mbali, Paytm payment gateway settings,Mipangilio ya lango la malipo ya Paytm, "Company, Fiscal Year and Currency defaults","Kampuni, Mwaka wa Fedha na chaguzi za Fedha", -Package,Kifurushi, -Import and Export Packages.,Ingiza na Hamisha Vifurushi., Razorpay Signature Verification Failed,Uthibitishaji wa Saini ya Razorpay Imeshindwa, Google Drive - Could not locate - {0},Hifadhi ya Google - Imeshindwa kupata - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Hati ya usawazishaji ilikuwa batili na imebadilishwa, Jaribu kusawazisha tena.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Kwa Kiunga cha DocType / Action Action, Cannot edit filters for standard charts,Haiwezi kuhariri vichungi kwa chati za kawaida, Event Producer Last Update,Mtayarishaji wa Tukio Mwisho, Default for 'Check' type of field {0} must be either '0' or '1',Chaguomsingi kwa aina ya uwanja wa 'Angalia' lazima iwe '0' au '1', +Non Negative,Yasiyo hasi, +Rules with higher priority number will be applied first.,Kanuni zilizo na nambari ya kipaumbele cha juu zitatumika kwanza., +Open URL in a New Tab,Fungua URL katika Kichupo kipya, +Align Right,Panga Haki, +Loading Filters...,Inapakia Vichungi ..., +Count Customizations,Hesabu Customizations, +For Example: {} Open,Kwa Mfano: {} Fungua, +Choose Existing Card or create New Card,Chagua Kadi Iliyopo au unda Kadi Mpya, +Number Cards,Kadi za Nambari, +Function Based On,Kazi Kulingana na, +Add Filters,Ongeza Vichungi, +Skip,Ruka, +Dismiss,Ondoa, +Value cannot be negative for,Thamani haiwezi kuwa hasi kwa, +Value cannot be negative for {0}: {1},Thamani haiwezi kuwa hasi kwa {0}: {1}, +Negative Value,Thamani hasi, +Authentication failed while receiving emails from Email Account: {0}.,Uthibitishaji umeshindwa wakati wa kupokea barua pepe kutoka Akaunti ya Barua pepe: {0}., +Message from server: {0},Ujumbe kutoka kwa seva: {0}, diff --git a/frappe/translations/ta.csv b/frappe/translations/ta.csv index 2990a1be2e..cdc6fcd468 100644 --- a/frappe/translations/ta.csv +++ b/frappe/translations/ta.csv @@ -499,7 +499,6 @@ Authenticating...,அங்கீகரிக்கிறது ..., Authentication,அங்கீகார, Authentication Apps you can use are: ,நீங்கள் பயன்படுத்தக்கூடிய அங்கீகார பயன்பாடுகள்:, Authentication Credentials,அங்கீகார சான்றுகள், -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},மின்னஞ்சல் கணக்கு {0} இருந்து மின்னஞ்சல்களை பெறும் போது அங்கீகாரம் தோல்வியடைந்தது. சேவையகத்தில் இருந்து செய்தி: {1}, Authorization Code,அங்கீகார குறியீடு, Authorize URL,URL ஐ அங்கீகரிக்கவும், Authorized,அங்கீகரிக்கப்பட்ட, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,1 இருந்து 0 docstatus மா Cannot change header content,தலைப்பு உள்ளடக்கத்தை மாற்ற முடியாது, Cannot change state of Cancelled Document. Transition row {0},ரத்து ஆவண மாநில மாற்ற முடியாது., Cannot change user details in demo. Please signup for a new account at https://erpnext.com,டெமோ பயனர் விவரங்களை மாற்ற முடியாது. https://erpnext.com ஒரு புதிய கணக்கிற்கு பதிவு செய்க, -Cannot connect: {0},இணைக்க முடியாது {0}, Cannot create a {0} against a child document: {1},உருவாக்க முடியவில்லையா {0} ஒரு குழந்தை ஆவணம் எதிராக: {1}, Cannot delete Home and Attachments folders,முகப்பு மற்றும் இணைப்புகள் கோப்புகளை நீக்க முடியாது, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,நீங்கள் அனுமதி இல்லாத {0} {1} க்கு சொந்தமான கோப்பை நீக்க முடியாது, @@ -1139,7 +1137,6 @@ Font Size,எழுத்துரு அளவு, Fonts,எழுத்துருக்கள், Footer,அடிக்குறிப்பு, Footer HTML,அடிக்குறிப்பு HTML, -Footer Item,அடிக்குறிப்பு பொருள், Footer Items,அடிக்குறிப்பு உருப்படிகள், Footer will display correctly only in PDF,அடிக்குறிப்பு PDF இல் மட்டுமே சரியாகக் காண்பிக்கப்படும், For Document Type,ஆவண வகைக்கு, @@ -1149,7 +1146,6 @@ For Value,மதிப்பு, "For currency {0}, the minimum transaction amount should be {1}","நாணய {0} க்கு, குறைந்தபட்ச பரிவர்த்தனை தொகை {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,நீங்கள் ரத்துசெய்ய மற்றும் INV004 திருத்தும் உதாரணமாக இது ஒரு புதிய ஆவணம் INV004-1 மாறும். இந்த நீங்கள் திருத்தத்தை கண்காணிக்க உதவுகிறது., "For example: If you want to include the document ID, use {0}","எடுத்துக்காட்டாக: நீங்கள் ஆவண ID சேர்க்க வேண்டும் என்றால், பயன்படுத்த {0}", -For top bar,மேல் பட்டியில், "For updating, you can update only selective columns.","புதுப்பித்தல், நீங்கள் மட்டும் தேர்ந்தெடுக்கப்பட்ட பத்திகள் புதுப்பிக்க முடியாது.", For {0} at level {1} in {2} in row {3},இதற்காக {0} மட்டத்தில் {1} ல் {2} வரிசையில் {3}, Force,படை, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Calendar ID, Google Font,கூகிள் எழுத்துரு, Google Services,Google சேவைகள், Grant Type,கிராண்ட் வகை, -Group Label,குழு லேபிள், Group Name,குழு பெயர், Group name cannot be empty.,குழு பெயர் காலியாக இருக்க முடியாது., Groups of DocTypes,ஆவண வகை குழுக்கள், @@ -1911,7 +1906,6 @@ Please verify your Email Address,உங்கள் மின்னஞ்சல Point Allocation Periodicity,புள்ளி ஒதுக்கீடு காலம், Points,புள்ளிகள், Points Given,புள்ளிகள் கொடுக்கப்பட்டுள்ளன, -Policy,கொள்கை, Port,துறைமுகம், Portal Menu,போர்டல் பட்டி, Portal Menu Item,போர்டல் மெனு உருப்படி, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,அச்சிடுவதற்கு குறைந்தது 1 சாதனை தேர்ந்தெடுக்கவும், Select or drag across time slots to create a new event.,தேர்வு அல்லது ஒரு புதிய நிகழ்வை உருவாக்க நேரம் இடங்கள் முழுவதும் இழுக்கவும்., Select records for assignment,வேலையை தேர்வு பதிவுகள், -"Select target = ""_blank"" to open in a new page.","தேர்ந்தெடு இலக்கு ஒரு புதிய பக்கம் திறக்க = ""_blank"" .", Select the label after which you want to insert new field.,நீங்கள் புதிய துறையில் சேர்க்க வேண்டும் பின்னர் லேபிள் தேர்வு., "Select your Country, Time Zone and Currency","உங்கள் நாடு, நேர மண்டலம் மற்றும் நாணய வாய்ப்புகள்", Select {0},வாய்ப்புகள் {0}, @@ -2989,7 +2982,6 @@ star-empty,நட்சத்திர-காலியாக, step-backward,படி-பின்தங்கிய, step-forward,படி-முன்னோக்கி, submitted this document,இந்த ஆவணம் சமர்ப்பிக்க, -"target = ""_blank""",இலக்கு = "_blank", text in document type,ஆவண வகை உள்ள உரை, text-height,உரை உயரம், text-width,உரை அகலம், @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,டோக்கன் தலைமுறையின் போது ஏதோ தவறு ஏற்பட்டது. புதியதை உருவாக்க {0 on ஐக் கிளிக் செய்க., Submit After Import,இறக்குமதி செய்த பிறகு சமர்ப்பிக்கவும், Submitting...,சமர்ப்பித்தல் ..., -Subscribed Documents,சந்தா ஆவணங்கள், Success! You are good to go 👍,வெற்றி! நீங்கள் செல்ல நல்லது, Successful Transactions,வெற்றிகரமான பரிவர்த்தனைகள், Successfully Submitted!,வெற்றிகரமாக சமர்ப்பிக்கப்பட்டது!, @@ -3777,7 +3768,6 @@ Please specify,குறிப்பிடவும், Printing,அச்சிடுதல், Priority,முதன்மை, Project,திட்டம், -Publish,வெளியிடு, Quarterly,கால் ஆண்டுக்கு ஒரு முறை நிகழ்கிற, Queued,வரிசைப்படுத்திய, Quick Entry,விரைவு நுழைவு, @@ -4299,7 +4289,6 @@ Hide Border,எல்லையை மறை, Index Web Pages for Search,தேடலுக்கான வலைப்பக்கங்கள், Action / Route,செயல் / பாதை, Document Naming Rule,ஆவண பெயரிடும் விதி, -Rules with higher priority will be applied first.,அதிக முன்னுரிமை கொண்ட விதிகள் முதலில் பயன்படுத்தப்படும்., Rule Conditions,விதி நிபந்தனைகள், Digits,இலக்கங்கள், Example: 00001,எடுத்துக்காட்டு: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,தொகுப்பு வெளியீட்டு க Click on the row for accessing filters.,வடிப்பான்களை அணுக வரிசையில் கிளிக் செய்க., Sites,தளங்கள், Last Deployed On,கடைசியாக பயன்படுத்தப்பட்டது, -Last published {0},கடைசியாக வெளியிடப்பட்டது {0}, -Publishing documents...,ஆவணங்களை வெளியிடுகிறது ..., -Documents have been published.,ஆவணங்கள் வெளியிடப்பட்டுள்ளன., -Select Document Type.,ஆவண வகையைத் தேர்ந்தெடுக்கவும்., Console Log,கன்சோல் பதிவு, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","இந்த டாஷ்போர்டில் உள்ள அனைத்து விளக்கப்படங்களுக்கும் இயல்புநிலை விருப்பங்களை அமைக்கவும் (எ.கா: "வண்ணங்கள்": ["# d1d8dd", "# ff5858"])", Use Report Chart,அறிக்கை விளக்கப்படத்தைப் பயன்படுத்தவும், @@ -4566,10 +4551,6 @@ Incorrect URL,தவறான URL, Duplicate Name,நகல் பெயர், "Please check the value of ""Fetch From"" set for field {0}",புலம் {0 for க்கு அமைக்கப்பட்ட "இருந்து பெறு" மதிப்பை சரிபார்க்கவும், Wrong Fetch From value,மதிப்பிலிருந்து தவறான பெறுதல், -Deploying,வரிசைப்படுத்துதல், -Couldn't connect to site {0}. Please check Error Logs.,Site site site தளத்துடன் இணைக்க முடியவில்லை. பிழை பதிவுகளை சரிபார்க்கவும்., -Error while installing package to site {0}. Please check Error Logs.,Site site site தளத்திற்கு தொகுப்பை நிறுவும் போது பிழை. பிழை பதிவுகளை சரிபார்க்கவும்., -Exporting,ஏற்றுமதி செய்கிறது, A field with the name '{}' already exists in doctype {}.,'{}' என்ற பெயரைக் கொண்ட ஒரு புலம் ஏற்கனவே டாக்டைப் {in இல் உள்ளது., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,தனிப்பயன் புலம் {0 the நிர்வாகியால் உருவாக்கப்பட்டது மற்றும் நிர்வாகி கணக்கு மூலம் மட்டுமே நீக்க முடியும்., Failed to send {0} Auto Email Report,Email 0} தானியங்கு மின்னஞ்சல் அறிக்கையை அனுப்புவதில் தோல்வி, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,வரிசை # {0}: தனிப்பட்ட தொலைநிலை சார்பு ஆவணத்தைப் பெற {1 field புலத்திற்கான தொலை மதிப்பு வடிப்பான்களை அமைக்கவும், Paytm payment gateway settings,Paytm கட்டண நுழைவாயில் அமைப்புகள், "Company, Fiscal Year and Currency defaults","நிறுவனம், நிதி ஆண்டு மற்றும் நாணய இயல்புநிலை", -Package,தொகுப்பு, -Import and Export Packages.,தொகுப்புகளை இறக்குமதி மற்றும் ஏற்றுமதி செய்யுங்கள்., Razorpay Signature Verification Failed,ரேஸர்பே கையொப்ப சரிபார்ப்பு தோல்வியுற்றது, Google Drive - Could not locate - {0},Google இயக்ககம் - கண்டுபிடிக்க முடியவில்லை - {0}, "Sync token was invalid and has been resetted, Retry syncing.","ஒத்திசைவு டோக்கன் தவறானது மற்றும் மீட்டமைக்கப்பட்டது, ஒத்திசைவை மீண்டும் முயற்சிக்கவும்.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,டாக் டைப் இணைப்ப Cannot edit filters for standard charts,நிலையான விளக்கப்படங்களுக்கான வடிப்பான்களைத் திருத்த முடியாது, Event Producer Last Update,நிகழ்வு தயாரிப்பாளர் கடைசி புதுப்பிப்பு, Default for 'Check' type of field {0} must be either '0' or '1',சரிபார்ப்பு 'புலத்தின் இயல்புநிலை {0}' 0 'அல்லது' 1 'ஆக இருக்க வேண்டும், +Non Negative,எதிர்மறை அல்ல, +Rules with higher priority number will be applied first.,அதிக முன்னுரிமை எண் கொண்ட விதிகள் முதலில் பயன்படுத்தப்படும்., +Open URL in a New Tab,புதிய தாவலில் URL ஐத் திறக்கவும், +Align Right,வலதுபுறம் சீரமைக்கவும், +Loading Filters...,வடிப்பான்களை ஏற்றுகிறது ..., +Count Customizations,தனிப்பயனாக்கங்களை எண்ணுங்கள், +For Example: {} Open,எடுத்துக்காட்டுக்கு:}} திற, +Choose Existing Card or create New Card,இருக்கும் அட்டையைத் தேர்வுசெய்க அல்லது புதிய அட்டையை உருவாக்கவும், +Number Cards,எண் அட்டைகள், +Function Based On,செயல்பாடு அடிப்படையில், +Add Filters,வடிப்பான்களைச் சேர்க்கவும், +Skip,தவிர், +Dismiss,நிராகரி, +Value cannot be negative for,மதிப்பு எதிர்மறையாக இருக்க முடியாது, +Value cannot be negative for {0}: {1},{0} க்கு மதிப்பு எதிர்மறையாக இருக்க முடியாது: {1}, +Negative Value,எதிர்மறை மதிப்பு, +Authentication failed while receiving emails from Email Account: {0}.,மின்னஞ்சல் கணக்கிலிருந்து மின்னஞ்சல்களைப் பெறும்போது அங்கீகாரம் தோல்வியுற்றது: {0}., +Message from server: {0},சேவையகத்திலிருந்து செய்தி: {0}, diff --git a/frappe/translations/te.csv b/frappe/translations/te.csv index 460423ccfa..6018977bad 100644 --- a/frappe/translations/te.csv +++ b/frappe/translations/te.csv @@ -499,7 +499,6 @@ Authenticating...,ధ్రువీకరిస్తున్నాయి ..., Authentication,ప్రామాణీకరణ, Authentication Apps you can use are: ,మీరు ఉపయోగించే ప్రామాణీకరణ అనువర్తనాలు:, Authentication Credentials,ప్రామాణీకరణ ఆధారాలు, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},ఇమెయిల్ ఖాతా {0} నుండి ఇమెయిళ్ళను స్వీకరించడం అయితే ప్రామాణీకరణ విఫలమైంది. సర్వర్ నుండి సందేశం: {1}, Authorization Code,అధికార కోడ్, Authorize URL,URL ను ప్రామాణీకరించండి, Authorized,ఆథరైజ్డ్, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,1 నుండి 0 docstatus మార్ Cannot change header content,శీర్షిక కంటెంట్ను మార్చలేరు, Cannot change state of Cancelled Document. Transition row {0},రద్దయింది డాక్యుమెంట్ రాష్ట్రంలో మార్చలేరు. ట్రాన్సిషన్ వరుసగా {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,డెమో వినియోగదారు వివరాలు మార్చలేరు. https://erpnext.com వద్ద ఒక కొత్త ఖాతా కోసం సైన్ దయచేసి, -Cannot connect: {0},కనెక్ట్ కాదు: {0}, Cannot create a {0} against a child document: {1},సృష్టించలేను ఒక {0} పిల్లల పత్రం వ్యతిరేకంగా: {1}, Cannot delete Home and Attachments folders,హోం మరియు అటాచ్మెంట్లు ఫోల్డర్లను తొలగించడం సాధ్యపడదు, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,మీరు అనుమతులు లేని {0} {1} కి సంబంధించినది కనుక ఫైల్ను తొలగించలేరు, @@ -1139,7 +1137,6 @@ Font Size,ఫాంట్ పరిమాణం, Fonts,ఫాంట్లు, Footer,ఫుటర్, Footer HTML,ఫుటరు HTML, -Footer Item,ఫుటర్ అంశం, Footer Items,ఫుటర్ అంశాలు, Footer will display correctly only in PDF,ఫుటరు PDF లో మాత్రమే సరిగ్గా ప్రదర్శించబడుతుంది, For Document Type,పత్ర రకం కోసం, @@ -1149,7 +1146,6 @@ For Value,విలువ కోసం, "For currency {0}, the minimum transaction amount should be {1}","కరెన్సీకి {0}, కనీస లావాదేవీ మొత్తం {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,మీరు రద్దు మరియు INV004 చక్కదిద్దు ఉంటే ఉదాహరణకు అది ఒక న్యూ పత్రం INV004-1 అవుతుంది. మీరు ప్రతి సవరణ ట్రాక్ సహాయపడుతుంది., "For example: If you want to include the document ID, use {0}","ఉదాహరణకు: మీరు డాక్యుమెంట్ ID చేర్చాలనుకుంటే, ఉపయోగించండి {0}", -For top bar,టాప్ బార్, "For updating, you can update only selective columns.","నవీకరించడం కోసం, మీరు మాత్రమే సెలెక్టివ్ నిలువు నవీకరించవచ్చు.", For {0} at level {1} in {2} in row {3},కోసం {0} స్థాయి {1} లో {2} వరుసగా {3}, Force,ఫోర్స్, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Calendar ID, Google Font,గూగుల్ ఫాంట్, Google Services,Google సేవలు, Grant Type,గ్రాంట్ టైప్, -Group Label,గ్రూప్ లేబుల్, Group Name,కూటమి పేరు, Group name cannot be empty.,సమూహం పేరు ఖాళీగా ఉండకూడదు., Groups of DocTypes,డాక్యుమెంట్ రకాలు గుంపులు, @@ -1911,7 +1906,6 @@ Please verify your Email Address,దయచేసి మీ ఇమెయిల్ Point Allocation Periodicity,పాయింట్ కేటాయింపు ఆవర్తన, Points,పాయింట్లు, Points Given,ఇచ్చిన పాయింట్లు, -Policy,విధానం, Port,పోర్ట్, Portal Menu,పోర్టల్ మెనూ, Portal Menu Item,పోర్టల్ మెను ఐటెమ్, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,ముద్రణా కనీసం 1 రికార్డు ఎంచుకోండి, Select or drag across time slots to create a new event.,ఎంచుకోండి లేదా ఒక కొత్త సంఘటన సృష్టించడానికి సమయ విభాగాలు అంతటా లాగండి., Select records for assignment,అప్పగించిన కోసం ఎంచుకోండి రికార్డులు, -"Select target = ""_blank"" to open in a new page.",Select లక్ష్యం = "_blank" ఒక కొత్త పేజీ లో తెరవడానికి., Select the label after which you want to insert new field.,మీరు కొత్త రంగంలో ఇన్సర్ట్ కోరుకుంటున్న తర్వాత లేబుల్ ఎంచుకోండి., "Select your Country, Time Zone and Currency","మీ దేశం, సమయమండలం మరియు కరెన్సీ ఎంచుకోండి", Select {0},ఎంచుకోండి {0}, @@ -2989,7 +2982,6 @@ star-empty,స్టార్ ఖాళీ, step-backward,దశల వెనుకబడిన, step-forward,దశల ముందుకు, submitted this document,ఈ పత్రం సమర్పించిన, -"target = ""_blank""",target = "_blank", text in document type,డాక్యుమెంట్ రకము టెక్స్ట్, text-height,టెక్స్ట్-ఎత్తు, text-width,టెక్స్ట్ వెడల్పు, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,టోకెన్ తరం సమయంలో ఏదో తప్పు జరిగింది. క్రొత్తదాన్ని రూపొందించడానికి {0 on పై క్లిక్ చేయండి., Submit After Import,దిగుమతి తర్వాత సమర్పించండి, Submitting...,సమర్పిస్తోంది ..., -Subscribed Documents,చందా పత్రాలు, Success! You are good to go 👍,విజయం! మీరు వెళ్ళడం మంచిది, Successful Transactions,విజయవంతమైన లావాదేవీలు, Successfully Submitted!,విజయవంతంగా సమర్పించబడింది!, @@ -3777,7 +3768,6 @@ Please specify,పేర్కొనండి, Printing,ప్రింటింగ్, Priority,ప్రాధాన్య, Project,ప్రాజెక్టు, -Publish,ప్రచురించు, Quarterly,క్వార్టర్లీ, Queued,క్యూలో, Quick Entry,త్వరిత ఎంట్రీ, @@ -4299,7 +4289,6 @@ Hide Border,సరిహద్దును దాచు, Index Web Pages for Search,శోధన కోసం సూచిక వెబ్ పేజీలు, Action / Route,చర్య / మార్గం, Document Naming Rule,డాక్యుమెంట్ నామకరణ నియమం, -Rules with higher priority will be applied first.,అధిక ప్రాధాన్యత ఉన్న నియమాలు మొదట వర్తించబడతాయి., Rule Conditions,నిబంధనలు, Digits,అంకెలు, Example: 00001,ఉదాహరణ: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,ప్యాకేజీ ప్రచురణ సాధన Click on the row for accessing filters.,ఫిల్టర్లను యాక్సెస్ చేయడానికి అడ్డు వరుసపై క్లిక్ చేయండి., Sites,సైట్లు, Last Deployed On,చివరిగా అమలు చేయబడింది, -Last published {0},చివరిగా ప్రచురించబడింది {0}, -Publishing documents...,పత్రాలను ప్రచురిస్తోంది ..., -Documents have been published.,పత్రాలు ప్రచురించబడ్డాయి., -Select Document Type.,పత్ర రకాన్ని ఎంచుకోండి., Console Log,కన్సోల్ లాగ్, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","ఈ డాష్‌బోర్డ్‌లోని అన్ని చార్ట్‌ల కోసం డిఫాల్ట్ ఎంపికలను సెట్ చేయండి (ఉదా: "రంగులు": ["# d1d8dd", "# ff5858"])", Use Report Chart,రిపోర్ట్ చార్ట్ ఉపయోగించండి, @@ -4566,10 +4551,6 @@ Incorrect URL,తప్పు URL, Duplicate Name,నకిలీ పేరు, "Please check the value of ""Fetch From"" set for field {0}",దయచేసి field 0 field ఫీల్డ్ కోసం సెట్ చేసిన "నుండి పొందండి" విలువను తనిఖీ చేయండి, Wrong Fetch From value,విలువ నుండి తప్పు పొందడం, -Deploying,మోహరిస్తోంది, -Couldn't connect to site {0}. Please check Error Logs.,Site site site సైట్‌కు కనెక్ట్ కాలేదు. దయచేసి లోపం లాగ్‌లను తనిఖీ చేయండి., -Error while installing package to site {0}. Please check Error Logs.,Site 0 site సైట్‌కు ప్యాకేజీని ఇన్‌స్టాల్ చేస్తున్నప్పుడు లోపం. దయచేసి లోపం లాగ్‌లను తనిఖీ చేయండి., -Exporting,ఎగుమతి చేస్తోంది, A field with the name '{}' already exists in doctype {}.,'{}' పేరుతో ఉన్న ఫీల్డ్ ఇప్పటికే డాక్టైప్ in in లో ఉంది., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,అనుకూల ఫీల్డ్ {0 the నిర్వాహకుడిచే సృష్టించబడింది మరియు నిర్వాహక ఖాతా ద్వారా మాత్రమే తొలగించబడుతుంది., Failed to send {0} Auto Email Report,Email 0} ఆటో ఇమెయిల్ నివేదికను పంపడంలో విఫలమైంది, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,అడ్డు వరుస # {0}: దయచేసి ప్రత్యేకమైన రిమోట్ డిపెండెన్సీ పత్రాన్ని పొందటానికి {1 field ఫీల్డ్ కోసం రిమోట్ విలువ ఫిల్టర్లను సెట్ చేయండి, Paytm payment gateway settings,Paytm చెల్లింపు గేట్‌వే సెట్టింగ్‌లు, "Company, Fiscal Year and Currency defaults","కంపెనీ, ఫిస్కల్ ఇయర్ మరియు కరెన్సీ డిఫాల్ట్‌లు", -Package,ప్యాకేజీ, -Import and Export Packages.,ప్యాకేజీలను దిగుమతి మరియు ఎగుమతి చేయండి., Razorpay Signature Verification Failed,రేజర్‌పే సంతకం ధృవీకరణ విఫలమైంది, Google Drive - Could not locate - {0},Google డిస్క్ - గుర్తించలేకపోయింది - {0}, "Sync token was invalid and has been resetted, Retry syncing.","సమకాలీకరణ టోకెన్ చెల్లదు మరియు రీసెట్ చేయబడింది, సమకాలీకరణను మళ్లీ ప్రయత్నించండి.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,డాక్‌టైప్ లింక్ / Cannot edit filters for standard charts,ప్రామాణిక చార్ట్‌ల కోసం ఫిల్టర్‌లను సవరించలేరు, Event Producer Last Update,ఈవెంట్ నిర్మాత చివరి నవీకరణ, Default for 'Check' type of field {0} must be either '0' or '1','చెక్' రకం ఫీల్డ్ {0 for కోసం డిఫాల్ట్ '0' లేదా '1' అయి ఉండాలి, +Non Negative,నాన్ నెగటివ్, +Rules with higher priority number will be applied first.,అధిక ప్రాధాన్యత సంఖ్య ఉన్న నియమాలు మొదట వర్తించబడతాయి., +Open URL in a New Tab,క్రొత్త ట్యాబ్‌లో URL ని తెరవండి, +Align Right,కుడివైపు సమలేఖనం చేయండి, +Loading Filters...,ఫిల్టర్‌లను లోడ్ చేస్తోంది ..., +Count Customizations,అనుకూలీకరణలను లెక్కించండి, +For Example: {} Open,ఉదాహరణ కోసం:}} తెరవండి, +Choose Existing Card or create New Card,ఉన్న కార్డును ఎంచుకోండి లేదా క్రొత్త కార్డ్‌ను సృష్టించండి, +Number Cards,సంఖ్య కార్డులు, +Function Based On,ఫంక్షన్ ఆధారంగా, +Add Filters,ఫిల్టర్‌లను జోడించండి, +Skip,దాటవేయి, +Dismiss,రద్దుచేసే, +Value cannot be negative for,విలువ ప్రతికూలంగా ఉండకూడదు, +Value cannot be negative for {0}: {1},{0 For కోసం విలువ ప్రతికూలంగా ఉండకూడదు: {1}, +Negative Value,ప్రతికూల విలువ, +Authentication failed while receiving emails from Email Account: {0}.,ఇమెయిల్ ఖాతా నుండి ఇమెయిల్‌లను స్వీకరించేటప్పుడు ప్రామాణీకరణ విఫలమైంది: {0}., +Message from server: {0},సర్వర్ నుండి సందేశం: {0}, diff --git a/frappe/translations/th.csv b/frappe/translations/th.csv index 053d520423..3294672a1b 100644 --- a/frappe/translations/th.csv +++ b/frappe/translations/th.csv @@ -499,7 +499,6 @@ Authenticating...,ตรวจสอบสิทธิ์ ..., Authentication,การรับรอง, Authentication Apps you can use are: ,แอปพลิเคชันการตรวจสอบสิทธิ์ที่คุณสามารถใช้ได้ ได้แก่, Authentication Credentials,ข้อมูลรับรองการตรวจสอบสิทธิ์, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},รับรองความถูกต้องล้มเหลวในขณะที่ได้รับอีเมลจากบัญชีอีเมล {0} ข้อความจากเซิร์ฟเวอร์: {1}, Authorization Code,รหัสอนุมัติ, Authorize URL,อนุญาต URL, Authorized,มีอำนาจ, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,ไม่สามารถเปลี่ Cannot change header content,ไม่สามารถเปลี่ยนเนื้อหาส่วนหัว, Cannot change state of Cancelled Document. Transition row {0},ไม่สามารถ เปลี่ยนสถานะ ของ เอกสาร ยกเลิก, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,ไม่สามารถเปลี่ยนรายละเอียดผู้ใช้ในการสาธิต โปรดลงชื่อสมัครใช้บัญชีใหม่ที่ https://erpnext.com, -Cannot connect: {0},ไม่สามารถเชื่อมต่อ: {0}, Cannot create a {0} against a child document: {1},ไม่สามารถสร้าง {0} กับเอกสารสำหรับเด็ก: {1}, Cannot delete Home and Attachments folders,ไม่สามารถลบหน้าแรกและโฟลเดอร์ไฟล์แนบ, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,ไม่สามารถลบไฟล์ที่เป็นของ {0} {1} ที่คุณไม่มีสิทธิ์, @@ -1139,7 +1137,6 @@ Font Size,ขนาดตัวอักษร, Fonts,แบบอักษร, Footer,ส่วนท้าย, Footer HTML,HTML ท้ายกระดาษ, -Footer Item,ส่วนท้ายของรายการ, Footer Items,รายการส่วนท้าย, Footer will display correctly only in PDF,ส่วนท้ายจะแสดงอย่างถูกต้องเฉพาะใน PDF, For Document Type,สำหรับประเภทเอกสาร, @@ -1149,7 +1146,6 @@ For Value,สำหรับ Value, "For currency {0}, the minimum transaction amount should be {1}",สำหรับสกุลเงิน {0} จำนวนธุรกรรมขั้นต่ำควรเป็น {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,ตัวอย่างเช่นถ้าคุณยกเลิกและแก้ไข INV004 มันจะกลายเป็นเอกสารใหม่ INV004-1 นี้จะช่วยให้คุณสามารถติดตามของแต่ละการแก้ไข, "For example: If you want to include the document ID, use {0}",ตัวอย่างเช่นถ้าคุณต้องการที่จะรวม ID เอกสารใช้ {0}, -For top bar,สำหรับ แถบด้านบน, "For updating, you can update only selective columns.",สำหรับการปรับปรุงคุณสามารถปรับปรุงเฉพาะคอลัมน์ที่เลือก, For {0} at level {1} in {2} in row {3},สำหรับ {0} ในระดับ {1} ใน {2} ในแถว {3}, Force,บังคับ, @@ -1201,7 +1197,6 @@ Google Calendar ID,รหัสปฏิทิน Google, Google Font,Google Font, Google Services,บริการของ Google, Grant Type,ประเภทการอนุญาต, -Group Label,กลุ่มป้ายกำกับ, Group Name,ชื่อกลุ่ม, Group name cannot be empty.,ชื่อกลุ่มต้องไม่ว่างเปล่า, Groups of DocTypes,กลุ่ม DocTypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,โปรดตรวจสอบที่อ Point Allocation Periodicity,จุดการจัดสรรระยะเวลา, Points,จุด, Points Given,คะแนนที่ได้รับ, -Policy,นโยบาย, Port,พอร์ต, Portal Menu,เมนูพอร์ทัล, Portal Menu Item,รายการเมนูพอร์ทัล, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,เลือกอย่างน้อย 1 รายการสำหรับการพิมพ์, Select or drag across time slots to create a new event.,เลือกหรือลากผ่านช่วงเวลาที่จะสร้างเหตุการณ์ใหม่, Select records for assignment,เลือกบันทึกสำหรับการมอบหมาย, -"Select target = ""_blank"" to open in a new page.","เลือก target = ""_blank"" จะเปิดใน หน้าใหม่", Select the label after which you want to insert new field.,เลือกป้ายชื่อหลังจากที่คุณต้องการแทรกเขตข้อมูลใหม่, "Select your Country, Time Zone and Currency",เลือกประเทศของคุณโซนเวลาและสกุลเงิน, Select {0},เลือก {0}, @@ -2989,7 +2982,6 @@ star-empty,ดาวที่ว่างเปล่า, step-backward,ขั้นตอนย้อนหลัง, step-forward,ก้าวไปข้างหน้า-, submitted this document,ส่งเอกสารนี้, -"target = ""_blank""",target = "_blank", text in document type,ข้อความที่อยู่ในประเภทของเอกสาร, text-height,ข้อความที่มีความสูง, text-width,ข้อความความกว้าง, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,มีบางอย่างผิดพลาดระหว่างรุ่นโทเค็น คลิกที่ {0} เพื่อสร้างใหม่, Submit After Import,ส่งหลังจากนำเข้า, Submitting...,ส่ง ..., -Subscribed Documents,เอกสารที่สมัครเป็นสมาชิก, Success! You are good to go 👍,ที่ประสบความสำเร็จ! คุณพร้อมที่จะไป👍, Successful Transactions,ธุรกรรมที่ประสบความสำเร็จ, Successfully Submitted!,ส่งสำเร็จแล้ว!, @@ -3777,7 +3768,6 @@ Please specify,โปรดระบุ, Printing,การพิมพ์, Priority,บุริมสิทธิ์, Project,โครงการ, -Publish,ประกาศ, Quarterly,ทุกไตรมาส, Queued,จัดคิว, Quick Entry,รายการด่วน, @@ -4299,7 +4289,6 @@ Hide Border,ซ่อนเส้นขอบ, Index Web Pages for Search,จัดทำดัชนีหน้าเว็บสำหรับการค้นหา, Action / Route,การดำเนินการ / เส้นทาง, Document Naming Rule,กฎการตั้งชื่อเอกสาร, -Rules with higher priority will be applied first.,กฎที่มีลำดับความสำคัญสูงกว่าจะถูกนำมาใช้ก่อน, Rule Conditions,เงื่อนไขกฎ, Digits,ตัวเลข, Example: 00001,ตัวอย่าง: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,เครื่องมือเผยแพร่แพ Click on the row for accessing filters.,คลิกที่แถวเพื่อเข้าถึงตัวกรอง, Sites,ไซต์, Last Deployed On,ปรับใช้ล่าสุดเมื่อ, -Last published {0},เผยแพร่ล่าสุด {0}, -Publishing documents...,กำลังเผยแพร่เอกสาร ..., -Documents have been published.,มีการเผยแพร่เอกสาร, -Select Document Type.,เลือกประเภทเอกสาร, Console Log,บันทึกคอนโซล, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","ตั้งค่าตัวเลือกเริ่มต้นสำหรับแผนภูมิทั้งหมดในแดชบอร์ดนี้ (เช่น: "colors": ["# d1d8dd", "# ff5858"])", Use Report Chart,ใช้แผนภูมิรายงาน, @@ -4566,10 +4551,6 @@ Incorrect URL,URL ไม่ถูกต้อง, Duplicate Name,ชื่อที่ซ้ำกัน, "Please check the value of ""Fetch From"" set for field {0}",โปรดตรวจสอบค่าของ "ดึงข้อมูลจาก" ที่กำหนดไว้สำหรับฟิลด์ {0}, Wrong Fetch From value,ค่าดึงข้อมูลจากไม่ถูกต้อง, -Deploying,กำลังปรับใช้, -Couldn't connect to site {0}. Please check Error Logs.,ไม่สามารถเชื่อมต่อกับไซต์ {0} โปรดตรวจสอบบันทึกข้อผิดพลาด, -Error while installing package to site {0}. Please check Error Logs.,เกิดข้อผิดพลาดขณะติดตั้งแพ็กเกจไปยังไซต์ {0} โปรดตรวจสอบบันทึกข้อผิดพลาด, -Exporting,การส่งออก, A field with the name '{}' already exists in doctype {}.,มีฟิลด์ชื่อ "{}" อยู่แล้วในประเภทหลัก {}, Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,ฟิลด์ที่กำหนดเอง {0} สร้างขึ้นโดยผู้ดูแลระบบและสามารถลบได้ผ่านบัญชีผู้ดูแลระบบเท่านั้น, Failed to send {0} Auto Email Report,ไม่สามารถส่ง {0} รายงานอีเมลอัตโนมัติ, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,แถว # {0}: โปรดตั้งค่าตัวกรองค่าระยะไกลสำหรับฟิลด์ {1} เพื่อดึงเอกสารการอ้างอิงระยะไกลที่ไม่ซ้ำกัน, Paytm payment gateway settings,การตั้งค่าเกตเวย์การชำระเงิน Paytm, "Company, Fiscal Year and Currency defaults",ค่าเริ่มต้นของ บริษัท ปีงบประมาณและสกุลเงิน, -Package,แพ็คเกจ, -Import and Export Packages.,นำเข้าและส่งออกแพ็คเกจ, Razorpay Signature Verification Failed,การยืนยันลายเซ็นของ Razorpay ล้มเหลว, Google Drive - Could not locate - {0},Google ไดรฟ์ - ไม่พบ - {0}, "Sync token was invalid and has been resetted, Retry syncing.",โทเค็นการซิงค์ไม่ถูกต้องและถูกรีเซ็ตแล้วลองซิงค์อีกครั้ง, @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,สำหรับ DocType Link / DocType Acti Cannot edit filters for standard charts,ไม่สามารถแก้ไขตัวกรองสำหรับแผนภูมิมาตรฐาน, Event Producer Last Update,อัพเดตล่าสุดของ Event Producer, Default for 'Check' type of field {0} must be either '0' or '1',ค่าเริ่มต้นสำหรับฟิลด์ประเภท "ตรวจสอบ" {0} ต้องเป็น "0" หรือ "1", +Non Negative,ไม่ใช่เชิงลบ, +Rules with higher priority number will be applied first.,ระบบจะใช้กฎที่มีลำดับความสำคัญสูงกว่าก่อน, +Open URL in a New Tab,เปิด URL ในแท็บใหม่, +Align Right,จัดชิดขวา, +Loading Filters...,กำลังโหลดตัวกรอง ..., +Count Customizations,นับการปรับแต่ง, +For Example: {} Open,ตัวอย่างเช่น: {} เปิด, +Choose Existing Card or create New Card,เลือกบัตรที่มีอยู่หรือสร้างการ์ดใหม่, +Number Cards,บัตรตัวเลข, +Function Based On,ฟังก์ชันขึ้นอยู่กับ, +Add Filters,เพิ่มตัวกรอง, +Skip,ข้าม, +Dismiss,ปิด, +Value cannot be negative for,ค่าไม่สามารถเป็นค่าลบสำหรับ, +Value cannot be negative for {0}: {1},ค่าไม่สามารถเป็นค่าลบสำหรับ {0}: {1}, +Negative Value,ค่าลบ, +Authentication failed while receiving emails from Email Account: {0}.,การตรวจสอบสิทธิ์ล้มเหลวขณะรับอีเมลจากบัญชีอีเมล: {0}, +Message from server: {0},ข้อความจากเซิร์ฟเวอร์: {0}, diff --git a/frappe/translations/tr.csv b/frappe/translations/tr.csv index 2cdd68f0e9..91d651be8f 100644 --- a/frappe/translations/tr.csv +++ b/frappe/translations/tr.csv @@ -499,7 +499,6 @@ Authenticating...,Kimlik doğrulanıyor ..., Authentication,Doğrulama, Authentication Apps you can use are: ,Kullanabileceğiniz kimlik doğrulama uygulamaları şunlardır:, Authentication Credentials,Kimlik Doğrulama Kimlik Bilgileri, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},E-posta Hesabı {0} gelen e-postaları alırken kimlik doğrulama başarısız oldu. Sunucudan mesaj: {1}, Authorization Code,Yetki Kodu, Authorize URL,URL'yi yetkilendir, Authorized,Yetkili, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,1-0 docstatus değiştirilemiyor, Cannot change header content,Başlık içeriği değiştirilemiyor, Cannot change state of Cancelled Document. Transition row {0},İptal Belgesinin durumu değiştirilemez. Geçiş satır {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Demoda kullanıcı ayrıntılarını değiştiremezsiniz. Lütfen https://erpnext.com adresinden yeni bir hesap için kaydolun, -Cannot connect: {0},Can not connect: {0}, Cannot create a {0} against a child document: {1},oluşturulamıyor bir {0} alt belgenin karşı: {1}, Cannot delete Home and Attachments folders,Ev ve Ekler klasörleri silemezsiniz, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,{0} {1} 'e ait olduğu için dosyanın izinleri olmadığı için silinemiyor, @@ -1139,7 +1137,6 @@ Font Size,Yazı Boyutu, Fonts,Fontlar, Footer,Altbilgi, Footer HTML,Altbilgi HTML, -Footer Item,Altbilgi Öğe, Footer Items,Altbilgi Öğeleri, Footer will display correctly only in PDF,Altbilgi yalnızca PDF olarak doğru görüntülenecek, For Document Type,Belge Türü İçin, @@ -1149,7 +1146,6 @@ For Value,Değer İçin, "For currency {0}, the minimum transaction amount should be {1}",{0} para birimi için minimum işlem tutarı {1} olmalıdır., For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"İptal ve INV004 değişiklik Örneğin yeni bir belge INV004-1 olacak. Bu, her değişikliğin izlemenize yardımcı olur.", "For example: If you want to include the document ID, use {0}","Örneğin: Belge Kimliği eklemek istiyorsanız, kullanmak {0}", -For top bar,Üst bar için, "For updating, you can update only selective columns.","Güncellenmesi için, sadece seçici sütunları güncelleyebilirsiniz.", For {0} at level {1} in {2} in row {3},Için {0} düzeyde {1} {2} tane üst üste {3}, Force,Kuvvet, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Takvim Kimliği, Google Font,Google Yazı Tipi, Google Services,Google Hizmetleri, Grant Type,hibe Tipi, -Group Label,Grup Etiketi, Group Name,Grup ismi, Group name cannot be empty.,Grup adı boş olamaz., Groups of DocTypes,Belgetürleri Grupları, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Lütfen email adresini doğrula, Point Allocation Periodicity,Nokta Tahsisi Periyodikliği, Points,makas, Points Given,Verilen Puanlar, -Policy,Politika, Port,Port, Portal Menu,Portal Menüsü, Portal Menu Item,Portal Menü Maddesi, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,baskı için en az 1 kayıt seçin, Select or drag across time slots to create a new event.,Seçin veya yeni bir etkinlik oluşturmak için zaman dilimleri boyunca sürükleyin., Select records for assignment,Atama için seçin kayıtları, -"Select target = ""_blank"" to open in a new page.","Seçin hedef, yeni bir sayfa açmak için = ""_blank"".", Select the label after which you want to insert new field.,Select the label after which you want to insert new field., "Select your Country, Time Zone and Currency","Ülkenizi,Saat Dilimi ve Para Birimi Seçiniz", Select {0},Seçin {0}, @@ -2989,7 +2982,6 @@ star-empty,star-empty, step-backward,step-backward, step-forward,step-forward, submitted this document,Bu belgeyi ibraz, -"target = ""_blank""","target = ""_blank""", text in document type,belge tipi içindeki yazı, text-height,text-height, text-width,text-width, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Jeton üretimi sırasında bir şeyler ters gitti. Yeni bir tane oluşturmak için {0} 'a tıklayın., Submit After Import,İçe Aktardıktan Sonra Gönder, Submitting...,Gönderiliyor ..., -Subscribed Documents,Abone Olunan Belgeler, Success! You are good to go 👍,Başarı! Gitmek için iyi birisin 👍, Successful Transactions,Başarılı İşlemler, Successfully Submitted!,Başarıyla gönderildi!, @@ -3777,7 +3768,6 @@ Please specify,Lütfen belirtiniz, Printing,Baskı, Priority,Öncelik, Project,Proje, -Publish,yayınlamak, Quarterly,Üç ayda bir, Queued,Sıraya alınmış, Quick Entry,Hızlı Girişi, @@ -4299,7 +4289,6 @@ Hide Border,Kenarlığı Gizle, Index Web Pages for Search,Arama için Web Sayfalarını İndeksle, Action / Route,Eylem / Rota, Document Naming Rule,Belge Adlandırma Kuralı, -Rules with higher priority will be applied first.,Önce daha yüksek önceliğe sahip kurallar uygulanacaktır., Rule Conditions,Kural Koşulları, Digits,Rakamlar, Example: 00001,Örnek: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Paket Yayınlama Aracı, Click on the row for accessing filters.,Filtrelere erişmek için sıraya tıklayın., Sites,Siteler, Last Deployed On,Son Dağıtılma Tarihi, -Last published {0},Son yayınlanan {0}, -Publishing documents...,Belgeler yayınlanıyor ..., -Documents have been published.,Belgeler yayınlandı., -Select Document Type.,Belge Türü'nü seçin., Console Log,Konsol Günlüğü, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Bu Gösterge Panosundaki tüm grafikler için Varsayılan Seçenekleri ayarlayın (Ör: "renkler": ["# d1d8dd", "# ff5858"])", Use Report Chart,Rapor Grafiğini Kullan, @@ -4566,10 +4551,6 @@ Incorrect URL,Yanlış URL, Duplicate Name,Yinelenen Ad, "Please check the value of ""Fetch From"" set for field {0}",Lütfen {0} alanı için "Getir" ayarının değerini kontrol edin, Wrong Fetch From value,Değerden Yanlış Getirme, -Deploying,Dağıtma, -Couldn't connect to site {0}. Please check Error Logs.,{0} sitesine bağlanılamadı. Lütfen Hata Günlüklerini kontrol edin., -Error while installing package to site {0}. Please check Error Logs.,Paket {0} sitesine yüklenirken hata oluştu. Lütfen Hata Günlüklerini kontrol edin., -Exporting,İhracat, A field with the name '{}' already exists in doctype {}.,{} Doküman türünde '{}' adında bir alan zaten var., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,"Özel Alan {0}, Yönetici tarafından oluşturulur ve yalnızca Yönetici hesabı aracılığıyla silinebilir.", Failed to send {0} Auto Email Report,{0} Otomatik E-posta Raporu gönderilemedi, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Satır # {0}: Benzersiz uzaktan bağımlılık belgesini getirmek için lütfen {1} alanı için uzak değer filtreleri ayarlayın, Paytm payment gateway settings,Paytm ödeme ağ geçidi ayarları, "Company, Fiscal Year and Currency defaults","Şirket, Mali Yıl ve Para Birimi varsayılanları", -Package,Paket içeriği, -Import and Export Packages.,Paketleri İçe ve Dışa Aktarın., Razorpay Signature Verification Failed,Razorpay İmza Doğrulaması Başarısız, Google Drive - Could not locate - {0},Google Drive - Bulunamadı - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Senkronizasyon jetonu geçersizdi ve sıfırlandı, Senkronizasyonu yeniden deneyin.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,DocType Link / DocType Eylemi İçin, Cannot edit filters for standard charts,Standart grafikler için filtreler düzenlenemez, Event Producer Last Update,Etkinlik Yapımcısı Son Güncelleme, Default for 'Check' type of field {0} must be either '0' or '1',{0} alanının "Kontrol" türü için varsayılan değer "0" veya "1" olmalıdır, +Non Negative,Negatif olmayan, +Rules with higher priority number will be applied first.,Önce öncelik numarası daha yüksek olan kurallar uygulanacaktır., +Open URL in a New Tab,URL'yi Yeni Bir Sekmede Aç, +Align Right,Sağa Hizala, +Loading Filters...,Filtreler Yükleniyor ..., +Count Customizations,Özelleştirmeleri Sayma, +For Example: {} Open,Örneğin: {} Aç, +Choose Existing Card or create New Card,Mevcut Kartı seçin veya Yeni Kart oluşturun, +Number Cards,Sayı Kartları, +Function Based On,Dayalı İşlev, +Add Filters,Filtreler Ekleyin, +Skip,Atla, +Dismiss,Reddet, +Value cannot be negative for,Değer negatif olamaz, +Value cannot be negative for {0}: {1},{0} için değer negatif olamaz: {1}, +Negative Value,Olumsuz değer, +Authentication failed while receiving emails from Email Account: {0}.,E-posta Hesabından e-posta alınırken kimlik doğrulama başarısız oldu: {0}., +Message from server: {0},Sunucudan mesaj: {0}, diff --git a/frappe/translations/uk.csv b/frappe/translations/uk.csv index 6776024b32..e2b34b13f5 100644 --- a/frappe/translations/uk.csv +++ b/frappe/translations/uk.csv @@ -499,7 +499,6 @@ Authenticating...,Аутентифікація ..., Authentication,засвідчення справжності, Authentication Apps you can use are: ,"Програми автентифікації, які ви можете використовувати, є:", Authentication Credentials,Перевірка автентичності, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Помилка аутентифікації при одержанні листа від електронної пошти рахунки {0}. Повідомлення від сервера: {1}, Authorization Code,код авторизації, Authorize URL,Дозволити URL-адресу, Authorized,уповноважений, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Неможливо змінити docstatus Cannot change header content,Неможливо змінити вміст заголовка, Cannot change state of Cancelled Document. Transition row {0},Неможливо змінити стан Скасовані документа. Перехід ряд {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,"Неможливо змінити дані користувача в демо. Будь ласка, підписатися на новий обліковий запис на https://erpnext.com", -Cannot connect: {0},Не вдається підключитися: {0}, Cannot create a {0} against a child document: {1},Неможливо створити {0} проти дочірнього документа: {1}, Cannot delete Home and Attachments folders,"Не вдається видалити теки ""Головна"" та ""Долучення""", Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Неможливо видалити файл, оскільки він належить {0} {1}, для якого у вас немає дозволів", @@ -1139,7 +1137,6 @@ Font Size,Розмір шрифту, Fonts,Шрифти, Footer,Підвал, Footer HTML,HTML колонтитула, -Footer Item,Footer Пункт, Footer Items,Footer товари, Footer will display correctly only in PDF,Нижній колонтитул відображається правильно лише у форматі PDF, For Document Type,Для типу документа, @@ -1149,7 +1146,6 @@ For Value,Для значення, "For currency {0}, the minimum transaction amount should be {1}",Для валюти {0} мінімальна сума транзакції повинна бути {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Наприклад, якщо ви скасуєте та відновите INV004, він стане новим документом INV004-1. Це допомагає стежити за кожною поправкою.", "For example: If you want to include the document ID, use {0}","Наприклад: Якщо ви хочете, щоб включити ідентифікатор документа, використовуйте {0}", -For top bar,Для верхньої панелі, "For updating, you can update only selective columns.","Для оновлення, ви можете оновити тільки вибіркові стовпці.", For {0} at level {1} in {2} in row {3},Для {0} на рівні {1} в {2} в рядку {3}, Force,сила, @@ -1201,7 +1197,6 @@ Google Calendar ID,Ідентифікатор календаря Google, Google Font,Google Font, Google Services,Служби Google, Grant Type,Тип гранту, -Group Label,Група Етикетка, Group Name,Назва групи, Group name cannot be empty.,Ім'я групи не може бути порожнім., Groups of DocTypes,Групи DOCTYPES, @@ -1911,7 +1906,6 @@ Please verify your Email Address,"Будь ласка, підтвердіть с Point Allocation Periodicity,Періодичність розподілу точок, Points,Очки, Points Given,Наведені бали, -Policy,політика, Port,Порт, Portal Menu,Меню порталу, Portal Menu Item,Пункт меню порталу, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Виберіть принаймні 1 запис для друку, Select or drag across time slots to create a new event.,"Виберіть або перетягніть по часових комірках, щоб створити нову подію.", Select records for assignment,Виберіть записи для присвоєння, -"Select target = ""_blank"" to open in a new page.","Виберіть мету = "_blank", щоб відкрити на новій сторінці.", Select the label after which you want to insert new field.,"Виберіть мітку, після чого Ви хочете вставити нове поле.", "Select your Country, Time Zone and Currency","Виберіть вашу країну, часовий пояс і валюту", Select {0},Виберіть {0}, @@ -2989,7 +2982,6 @@ star-empty,зірка порожній, step-backward,крок назад, step-forward,крок вперед, submitted this document,представив цей документ, -"target = ""_blank""",мета = "_blank", text in document type,Текст в документі типу, text-height,Текст висоти, text-width,Текст ширина, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,"Щось пішло не так під час генерації жетонів. Клацніть на {0}, щоб створити новий.", Submit After Import,Надіслати після імпорту, Submitting...,Подання ..., -Subscribed Documents,Підписані документи, Success! You are good to go 👍,Успіху! Вам добре піти 👍, Successful Transactions,Успішні транзакції, Successfully Submitted!,Успішно подано!, @@ -3777,7 +3768,6 @@ Please specify,Будь ласка уточніть, Printing,Друк, Priority,Пріоритет, Project,Проект, -Publish,Опублікувати, Quarterly,Щоквартальний, Queued,У черзі, Quick Entry,Швидкий доступ, @@ -4299,7 +4289,6 @@ Hide Border,Сховати межу, Index Web Pages for Search,Індекс веб-сторінок для пошуку, Action / Route,Дія / Маршрут, Document Naming Rule,Правило іменування документів, -Rules with higher priority will be applied first.,Спочатку застосовуватимуться правила з вищим пріоритетом., Rule Conditions,Правила, Digits,Цифри, Example: 00001,Приклад: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Інструмент публікації пакетів, Click on the row for accessing filters.,Клацніть на рядок для доступу до фільтрів., Sites,Сайти, Last Deployed On,Останнє розгортання в, -Last published {0},Востаннє опубліковано {0}, -Publishing documents...,Публікація документів ..., -Documents have been published.,Документи опубліковані., -Select Document Type.,Виберіть тип документа., Console Log,Журнал консолі, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Встановіть параметри за замовчуванням для всіх діаграм на цій інформаційній панелі (Наприклад: "кольори": ["# d1d8dd", "# ff5858"])", Use Report Chart,Використовуйте діаграму звітів, @@ -4566,10 +4551,6 @@ Incorrect URL,Неправильна URL-адреса, Duplicate Name,Дублікат назви, "Please check the value of ""Fetch From"" set for field {0}","Будь ласка, перевірте значення параметра "Отримати з" для поля {0}", Wrong Fetch From value,Неправильний вибір зі значення, -Deploying,Розгортання, -Couldn't connect to site {0}. Please check Error Logs.,"Не вдалося підключитися до сайту {0}. Будь ласка, перевірте журнали помилок.", -Error while installing package to site {0}. Please check Error Logs.,"Помилка під час встановлення пакета на сайт {0}. Будь ласка, перевірте журнали помилок.", -Exporting,Експорт, A field with the name '{}' already exists in doctype {}.,Поле з назвою "{}" вже існує в doctype {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Спеціальне поле {0} створюється адміністратором і може бути видалено лише через обліковий запис адміністратора., Failed to send {0} Auto Email Report,Не вдалося надіслати {0} автоматичний звіт електронною поштою, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,"Рядок № {0}: встановіть фільтри віддалених значень для поля {1}, щоб отримати унікальний документ віддаленої залежності", Paytm payment gateway settings,Налаштування шлюзу платежів Paytm, "Company, Fiscal Year and Currency defaults","За замовчуванням компанія, фінансовий рік та валюта", -Package,Пакет, -Import and Export Packages.,Імпорт та експорт пакетів., Razorpay Signature Verification Failed,Не вдалося підтвердити підпис Razorpay, Google Drive - Could not locate - {0},Google Drive - Не вдалося знайти - {0}, "Sync token was invalid and has been resetted, Retry syncing.",Маркер синхронізації був недійсним і його було скинуто. Повторіть спробу синхронізації., @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Для DocType Link / DocType Action, Cannot edit filters for standard charts,Не вдається редагувати фільтри для стандартних діаграм, Event Producer Last Update,Останнє оновлення продюсера подій, Default for 'Check' type of field {0} must be either '0' or '1',"За замовчуванням для поля поля "Перевірка" {0} має бути або "0", або "1"", +Non Negative,Не негативний, +Rules with higher priority number will be applied first.,Спочатку застосовуватимуться правила з вищим пріоритетом., +Open URL in a New Tab,Відкрийте URL-адресу в новій вкладці, +Align Right,Вирівняти вправо, +Loading Filters...,Завантаження фільтрів ..., +Count Customizations,Налаштування підрахунку, +For Example: {} Open,Наприклад: {} Відкрити, +Choose Existing Card or create New Card,Виберіть існуючу картку або створіть нову, +Number Cards,Картки з номерами, +Function Based On,Функція заснована на, +Add Filters,Додати фільтри, +Skip,Пропустити, +Dismiss,Звільнити, +Value cannot be negative for,Значення не може бути від’ємним для, +Value cannot be negative for {0}: {1},Значення не може бути від’ємним для {0}: {1}, +Negative Value,Негативне значення, +Authentication failed while receiving emails from Email Account: {0}.,Помилка автентифікації під час отримання електронних листів з облікового запису електронної пошти: {0}., +Message from server: {0},Повідомлення від сервера: {0}, diff --git a/frappe/translations/ur.csv b/frappe/translations/ur.csv index d361227459..db9e7d7500 100644 --- a/frappe/translations/ur.csv +++ b/frappe/translations/ur.csv @@ -499,7 +499,6 @@ Authenticating...,تصدیق کر رہا ہے…, Authentication,توثیق, Authentication Apps you can use are: ,توثیقی اطلاقات آپ استعمال کر سکتے ہیں:, Authentication Credentials,توثیقی اعتبار, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},ای میل اکاؤنٹ {0} سے ای میلز وصول کرتے ہوئے توثیق ناکام. سرور سے پیغام: {1}, Authorization Code,اجازت کوڈ, Authorize URL,اختیار شدہ یو آر ایل, Authorized,مجاز, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,1 سے 0 docstatus تبدیل نہیں کر Cannot change header content,ہیڈر کا مواد تبدیل نہیں کر سکتا, Cannot change state of Cancelled Document. Transition row {0},منسوخ دستاویز کی حالت کو تبدیل نہیں کر سکتے. منتقلی صف {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,ڈیمو میں صارف کی تفصیلات کو تبدیل نہیں کر سکتے. https://erpnext.com میں ایک نیا اکاؤنٹ کے لئے سائن اپ کریں براہ مہربانی, -Cannot connect: {0},رابطہ قائم نہیں کر سکتے ہیں: {0}, Cannot create a {0} against a child document: {1},نہیں بنا سکتا ایک {0} ایک بچے کی دستاویز کے خلاف: {1}, Cannot delete Home and Attachments folders,گھر اور منسلکات فولڈر حذف نہیں کر سکتے ہیں, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,فائل کو حذف نہیں کر سکتا کیونکہ اس سے تعلق رکھتا ہے {0} {1} جس کے لئے آپ کی اجازت نہیں ہے, @@ -1139,7 +1137,6 @@ Font Size,حرف کا سائز, Fonts,فانٹ, Footer,فوٹر, Footer HTML,فوٹر HTML, -Footer Item,فوٹر آئٹم, Footer Items,فوٹر اشیا, Footer will display correctly only in PDF,فوٹر صرف پی ڈی ایف میں صحیح طریقے سے ظاہر ہوگا۔, For Document Type,دستاویز کی قسم کے لئے۔, @@ -1149,7 +1146,6 @@ For Value,قدر کے لئے, "For currency {0}, the minimum transaction amount should be {1}",کرنسی {0} کے لئے، کم سے کم ٹرانزیکشن کی رقم {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,آپ کو منسوخ اور INV004 نیکوکار ہوجائیں تو مثال کے طور پر ایک نئی دستاویز INV004-1 بن جائے گا. یہ آپ کو ہر ترمیم کے ٹریک رکھنے کے لئے میں مدد ملتی ہے., "For example: If you want to include the document ID, use {0}",مثال کے طور پر: آپ دستاویز ID شامل کرنا چاہتے ہیں تو، کا استعمال کرتے ہیں {0}, -For top bar,سب سے اوپر بار کے لئے, "For updating, you can update only selective columns.",کو اپ ڈیٹ کرنے کے لئے، آپ کو صرف منتخب کالم اپ ڈیٹ کر سکتے., For {0} at level {1} in {2} in row {3},کے لئے {0} میں سطح {1} پر {2} قطار میں {3}, Force,فورس, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google کیلنڈر ID, Google Font,گوگل فونٹ, Google Services,گوگل سروسز, Grant Type,گرانٹ کی قسم, -Group Label,گروپ لیبل, Group Name,گروہ کا نام, Group name cannot be empty.,گروپ کا نام خالی نہیں ہوسکتا ہے., Groups of DocTypes,DocTypes کے گروپ, @@ -1911,7 +1906,6 @@ Please verify your Email Address,اپنا ای میل ایڈریس کی تصدی Point Allocation Periodicity,پوائنٹ الاٹیکشن کی مدت۔, Points,پوائنٹس, Points Given,پوائنٹس دیئے گئے۔, -Policy,پالیسی, Port,پورٹ, Portal Menu,پورٹل مینو, Portal Menu Item,پورٹل مینو اشیاء, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,پرنٹنگ کے لئے کم سے کم 1 ریکارڈ کریں, Select or drag across time slots to create a new event.,کو منتخب کریں یا ایک نیا ایونٹ بنانے کے لئے وقت سلاٹ بھر ھیںچیں., Select records for assignment,تفویض کے لئے منتخب ریکارڈز, -"Select target = ""_blank"" to open in a new page.",منتخب ہدف = "_blank" کے ایک نئے صفحے میں کھولنے کے لئے., Select the label after which you want to insert new field.,آپ نئے میدان داخل کرنا چاہتے ہیں، جس کے بعد لیبل منتخب کریں., "Select your Country, Time Zone and Currency",آپ کے ملک، ٹائم زون اور کرنسی منتخب کریں, Select {0},منتخب کریں {0}, @@ -2989,7 +2982,6 @@ star-empty,سٹار خالی, step-backward,قدم پیچھے, step-forward,قدم آگے, submitted this document,اس دستاویز جمع کرائی, -"target = ""_blank""",ہدف = "_blank", text in document type,دستاویز کی قسم میں متن, text-height,متن اونچائی, text-width,متن چوڑائی, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,ٹوکن نسل کے دوران کچھ غلط ہوا۔ نیا پیدا کرنے کے لئے {0} پر کلک کریں۔, Submit After Import,درآمد کے بعد جمع کروائیں۔, Submitting...,جمع کروا رہا ہے…, -Subscribed Documents,خریداری شدہ دستاویزات, Success! You are good to go 👍,کامیابی! آپ جانا اچھا ہے 👍, Successful Transactions,کامیاب لین دین, Successfully Submitted!,کامیابی کے ساتھ عرض کیا گیا!, @@ -3777,7 +3768,6 @@ Please specify,وضاحت براہ مہربانی, Printing,پرنٹنگ, Priority,ترجیح, Project,پروجیکٹ, -Publish,شائع کریں, Quarterly,سہ ماہی, Queued,قطار میں, Quick Entry,فوری اندراج, @@ -4299,7 +4289,6 @@ Hide Border,بارڈر چھپائیں, Index Web Pages for Search,تلاش کے لئے انڈیکس ویب صفحات, Action / Route,ایکشن / روٹ, Document Naming Rule,دستاویز نام دینے کا قاعدہ, -Rules with higher priority will be applied first.,اعلی ترجیح والے قواعد پہلے لاگو ہوں گے۔, Rule Conditions,قواعد و ضوابط, Digits,ہندسے, Example: 00001,مثال: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,پیکیج پبلشنگ ٹول, Click on the row for accessing filters.,فلٹرز تک رسائی کے ل for قطار پر کلک کریں۔, Sites,سائٹیں, Last Deployed On,آخری تعینات, -Last published {0},آخری بار شائع {0}, -Publishing documents...,دستاویزات کی اشاعت…, -Documents have been published.,دستاویزات شائع ہوچکی ہیں۔, -Select Document Type.,دستاویز کی قسم منتخب کریں۔, Console Log,کنسول لاگ, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])",اس ڈیش بورڈ پر تمام چارٹ کیلئے پہلے سے طے شدہ اختیارات طے کریں (مثال کے طور پر: "رنگین": ["# d1d8dd"، "# ff5858"]), Use Report Chart,رپورٹ چارٹ استعمال کریں, @@ -4566,10 +4551,6 @@ Incorrect URL,غلط URL, Duplicate Name,ڈپلیکیٹ نام, "Please check the value of ""Fetch From"" set for field {0}",براہ کرم فیلڈ for 0} کیلئے مرتب کردہ "بازیافت منجانب" کی قدر چیک کریں۔, Wrong Fetch From value,قیمت سے غلط بازیافت, -Deploying,تعینات ہے, -Couldn't connect to site {0}. Please check Error Logs.,سائٹ {0} سے رابطہ قائم نہیں کیا جاسکا۔ براہ کرم خرابی والے نوشتہ جات دیکھیں۔, -Error while installing package to site {0}. Please check Error Logs.,سائٹ package 0} پر پیکیج انسٹال کرتے وقت خامی۔ براہ کرم خرابی والے نوشتہ جات دیکھیں۔, -Exporting,برآمد کر رہا ہے, A field with the name '{}' already exists in doctype {}.,دستاویز ٹائپ in in میں '{}' نام والا فیلڈ پہلے سے موجود ہے۔, Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,کسٹم فیلڈ {0} ایڈمنسٹریٹر کے ذریعہ تشکیل دیا گیا ہے اور اسے صرف ایڈمنسٹریٹر کے اکاؤنٹ کے ذریعہ ختم کیا جاسکتا ہے۔, Failed to send {0} Auto Email Report,{0} آٹو ای میل رپورٹ بھیجنے میں ناکام, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,قطار # {0}: براہ کرم remote 1 field فیلڈ کے لئے ریموٹ ویلیو فلٹرز مرتب کریں تاکہ ریموٹ انحصار کے انوکھے دستاویز کو حاصل کیا جاسکے۔, Paytm payment gateway settings,پے ٹی ایم ادائیگی کے گیٹ وے کی ترتیبات, "Company, Fiscal Year and Currency defaults",کمپنی ، مالی سال اور کرنسی ڈیفالٹ, -Package,پیکیج, -Import and Export Packages.,پیکیج درآمد اور برآمد کریں۔, Razorpay Signature Verification Failed,ریزر پے کے دستخط کی تصدیق ناکام ہوگئی, Google Drive - Could not locate - {0},گوگل ڈرائیو - تلاش نہیں کیا جا سکا - {0}, "Sync token was invalid and has been resetted, Retry syncing.",مطابقت پذیری کا ٹوکن غلط تھا اور دوبارہ ترتیب دیا گیا ہے ، مطابقت پذیری کی دوبارہ کوشش کریں۔, @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,DocType Link / DocType ایکشن کیلئے, Cannot edit filters for standard charts,معیاری چارٹ کے لئے فلٹرز میں ترمیم نہیں کی جاسکتی ہے, Event Producer Last Update,واقعہ پروڈیوسر آخری تازہ کاری, Default for 'Check' type of field {0} must be either '0' or '1','چیک' قسم کے فیلڈ for 0 for کیلئے پہلے سے طے شدہ یا تو '0' یا '1' ہونا چاہئے, +Non Negative,غیر منفی, +Rules with higher priority number will be applied first.,پہلے اعلی ترجیحی نمبر والے قواعد لاگو ہوں گے۔, +Open URL in a New Tab,کسی نئے ٹیب میں URL کھولیں, +Align Right,دائیں سیدھ میں لائیں, +Loading Filters...,فلٹرز لوڈ ہورہے ہیں…, +Count Customizations,حسب ضرورت گنیں, +For Example: {} Open,مثال کے طور پر: {} کھولیں, +Choose Existing Card or create New Card,موجودہ کارڈ کا انتخاب کریں یا نیا کارڈ بنائیں, +Number Cards,نمبر کارڈز, +Function Based On,فنکشن پر مبنی, +Add Filters,فلٹرز شامل کریں, +Skip,چھوڑ دو, +Dismiss,برخاست کریں, +Value cannot be negative for,قدر منفی نہیں ہوسکتی ہے, +Value cannot be negative for {0}: {1},قدر {0} کیلئے منفی نہیں ہوسکتی ہے: {1}, +Negative Value,منفی قدر, +Authentication failed while receiving emails from Email Account: {0}.,ای میل اکاؤنٹ سے ای میلز وصول کرتے وقت توثیق ناکام ہوگئی: {0}., +Message from server: {0},سرور کا پیغام: {0}, diff --git a/frappe/translations/uz.csv b/frappe/translations/uz.csv index 591b591386..13c07e6593 100644 --- a/frappe/translations/uz.csv +++ b/frappe/translations/uz.csv @@ -499,7 +499,6 @@ Authenticating...,Haqiqiylik tekshirilmoqda ..., Authentication,Autentifikatsiya, Authentication Apps you can use are: ,Siz foydalanishingiz mumkin bo'lgan haqiqiylikni tekshirish dasturlari quyidagilardir:, Authentication Credentials,Hisobga olish haqiqiyligini tekshirish ma'lumotlari, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},{0} e-pochta qayd yozuvidan e-pochtalarni olishda autentifikatsiya amalga oshmadi. Serverdan xabar: {1}, Authorization Code,Avtorizatsiya kodi, Authorize URL,URLni tasdiqlash, Authorized,Vakolatli, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Docstatusni 1dan 0gacha o'zgartirib bo&# Cannot change header content,Sarlavha mazmunini o'zgartirib bo'lmaydi, Cannot change state of Cancelled Document. Transition row {0},Bekor qilingan hujjatning holatini o'zgartirib bo'lmaydi. O'tish satri {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,"Demo-da foydalanuvchi ma'lumotlarini o'zgartirib bo'lmaydi. Iltimos, https://erpnext.com manzili bo'yicha yangi hisob uchun ro'yxatdan o'ting", -Cannot connect: {0},Ulanmayapti: {0}, Cannot create a {0} against a child document: {1},{0} bolani hujjatiga qarshi yaratib bo'lmaydi: {1}, Cannot delete Home and Attachments folders,Uy va biriktirilgan papkalarni o'chirib bo'lmaydi, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,"Faylni o'chirib bo'lmaydi, chunki u sizga ruxsat yo'q {0} {1} ga tegishli", @@ -1139,7 +1137,6 @@ Font Size,Shrift o'lchami, Fonts,Shriftlar, Footer,Olmashlar, Footer HTML,Quyi HTML HTML, -Footer Item,Olmashlar elementi, Footer Items,Olingan ma'lumotlar, Footer will display correctly only in PDF,Taglik faqat PDF formatida to'g'ri ko'rsatiladi, For Document Type,Hujjat turi uchun, @@ -1149,7 +1146,6 @@ For Value,Qiymat uchun, "For currency {0}, the minimum transaction amount should be {1}",Pul uchun {0} uchun eng kam bitim miqdori {1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,"Masalan, agar siz INV004ni bekor qilsangiz va o'zgartirsangiz, u INV004-1 yangi hujjat bo'ladi. Bu har bir o'zgarishlarni kuzatib borishga yordam beradi.", "For example: If you want to include the document ID, use {0}","Misol uchun: hujjat identifikatorini kiritish zarur bo'lsa, {0}", -For top bar,Yuqori satr uchun, "For updating, you can update only selective columns.",Yangilash uchun faqat tanlangan ustunlarni yangilashingiz mumkin., For {0} at level {1} in {2} in row {3},{1} {2} qatorida {3} qatorda {0} uchun, Force,Majburlash, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google Taqvim ID raqami, Google Font,Google Shrift, Google Services,Google xizmatlari, Grant Type,Grant turi, -Group Label,Guruh yorlig'i, Group Name,Guruh nomi, Group name cannot be empty.,Guruh nomi bo'sh bo'lishi mumkin emas., Groups of DocTypes,DocTypes guruhlari, @@ -1911,7 +1906,6 @@ Please verify your Email Address,E-pochta manzilingizni tasdiqlang, Point Allocation Periodicity,Nuqtalarni taqsimlash davriyligi, Points,Ballar, Points Given,Berilgan ballar, -Policy,Siyosat, Port,Port, Portal Menu,Portal menyusi, Portal Menu Item,Portal Menyu elementi, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Bosib chiqarish uchun atleast 1 yozuvini tanlang, Select or drag across time slots to create a new event.,Yangi hodisa yaratish uchun vaqt oraliqlarini tanlang yoki harakatlantiring., Select records for assignment,Belgilash uchun yozuvlarni tanlang, -"Select target = ""_blank"" to open in a new page.",Yangi sahifada ochish uchun maqsadni = "_blank" ni tanlang., Select the label after which you want to insert new field.,Yangi maydon qo'shish kerakli yorliqni tanlang., "Select your Country, Time Zone and Currency","Mamlakatni, vaqt zonasini va valyutani tanlang", Select {0},{0} ni tanlang, @@ -2989,7 +2982,6 @@ star-empty,yulduz-bo'sh, step-backward,qadam orqaga, step-forward,qadam oldinga, submitted this document,ushbu hujjatni taqdim etdi, -"target = ""_blank""",target = "_blank", text in document type,hujjat turidagi matn, text-height,matn balandligi, text-width,matn kengligi, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Belgilarni ishlab chiqarish jarayonida nimadir noto'g'ri ketdi. Yangisini yaratish uchun {0} ustiga bosing., Submit After Import,Import qilinganidan keyin yuborish, Submitting...,Yuborilmoqda ..., -Subscribed Documents,Obuna hujjatlari, Success! You are good to go 👍,Muvaffaqiyat! Siz borishingiz yaxshi 👍, Successful Transactions,Muvaffaqiyatli bitimlar, Successfully Submitted!,Muvaffaqiyatli yuborildi!, @@ -3777,7 +3768,6 @@ Please specify,"Iltimos, ko'rsating", Printing,Bosib chiqarish, Priority,Birinchi o'ringa, Project,Loyiha, -Publish,Nashr qiling, Quarterly,Har chorakda, Queued,Navbatga qo'yildi, Quick Entry,Tez kirish, @@ -4299,7 +4289,6 @@ Hide Border,Chegarani yashirish, Index Web Pages for Search,Qidiruv uchun veb-sahifalarni indekslash, Action / Route,Amal / marshrut, Document Naming Rule,Hujjatlarni nomlash qoidasi, -Rules with higher priority will be applied first.,Avvalo ustuvorligi yuqori bo'lgan qoidalar qo'llaniladi., Rule Conditions,Qoida shartlari, Digits,Raqamlar, Example: 00001,Misol: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Paketni nashr etish vositasi, Click on the row for accessing filters.,Filtrlarga kirish uchun qatorni bosing., Sites,Saytlar, Last Deployed On,Oxirgi joylashtirilgan, -Last published {0},Oxirgi marta nashr etilgan: {0}, -Publishing documents...,Hujjatlar nashr etilmoqda ..., -Documents have been published.,Hujjatlar nashr etildi., -Select Document Type.,Hujjat turini tanlang., Console Log,Konsol jurnali, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Ushbu asboblar panelidagi barcha jadvallar uchun standart parametrlarni o'rnating (Masalan: "color": ["# d1d8dd", "# ff5858"])", Use Report Chart,Hisobotlar jadvalidan foydalaning, @@ -4566,10 +4551,6 @@ Incorrect URL,Noto'g'ri URL, Duplicate Name,Ikki nusxadagi ism, "Please check the value of ""Fetch From"" set for field {0}","Iltimos, {0} maydoniga o'rnatilgan "Kimdan olish" qiymatini tekshiring", Wrong Fetch From value,Qiymatdan noto'g'ri olish, -Deploying,Joylashtirish, -Couldn't connect to site {0}. Please check Error Logs.,{0} saytiga ulanib bo'lmadi. Xato jurnallarini tekshiring., -Error while installing package to site {0}. Please check Error Logs.,Paketni {0} saytiga o'rnatishda xatolik yuz berdi. Xato jurnallarini tekshiring., -Exporting,Eksport qilinmoqda, A field with the name '{}' already exists in doctype {}.,'{}' Ismli maydon allaqachon doctype {} da mavjud., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Maxsus maydon {0} ma'mur tomonidan yaratiladi va uni faqat administrator hisobi orqali o'chirib tashlash mumkin., Failed to send {0} Auto Email Report,{0} Avtomatik elektron pochta hisoboti yuborilmadi, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Qator # {0}: Noyob masofadan qaramlikka oid hujjatni olish uchun {1} maydon uchun masofaviy qiymat filtrlarini o'rnating, Paytm payment gateway settings,Paytm to'lov shlyuzi sozlamalari, "Company, Fiscal Year and Currency defaults","Kompaniya, moliya yili va valyutaning defoltlari", -Package,Paket, -Import and Export Packages.,Paketlarni import qilish va eksport qilish., Razorpay Signature Verification Failed,Razorpay imzosini tekshirib bo'lmadi, Google Drive - Could not locate - {0},Google Drive - topilmadi - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Sinxronizatsiya belgisi noto'g'ri edi va qayta o'rnatildi, sinxronlashni takrorlang.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,DocType Link / DocType Action uchun, Cannot edit filters for standard charts,Standart jadvallar uchun filtrlarni tahrirlash mumkin emas, Event Producer Last Update,Voqealar ishlab chiqaruvchisi so'nggi yangilanish, Default for 'Check' type of field {0} must be either '0' or '1',{0} maydonining "Tekshirish" uchun standart qiymati "0" yoki "1" bo'lishi kerak, +Non Negative,Salbiy emas, +Rules with higher priority number will be applied first.,Birinchi navbatda ustunligi yuqori bo'lgan qoidalar qo'llaniladi., +Open URL in a New Tab,URLni yangi yorliqda oching, +Align Right,To'g'ri tekislang, +Loading Filters...,Filtrlar yuklanmoqda ..., +Count Customizations,Moslashtirishlarni hisoblash, +For Example: {} Open,Masalan: {} Ochiq, +Choose Existing Card or create New Card,Mavjud kartani tanlang yoki yangi karta yarating, +Number Cards,Raqam kartalari, +Function Based On,Funktsiyaga asoslangan, +Add Filters,Filtrlar qo'shish, +Skip,O'tkazib yuborish, +Dismiss,Ishdan bo'shatish, +Value cannot be negative for,Qiymat salbiy bo'lishi mumkin emas, +Value cannot be negative for {0}: {1},{0} uchun manfiy bo'lmasligi mumkin: {1}, +Negative Value,Salbiy qiymat, +Authentication failed while receiving emails from Email Account: {0}.,Elektron pochta hisobidan elektron pochta xabarlarini qabul qilishda autentifikatsiya amalga oshmadi: {0}., +Message from server: {0},Serverdan xabar: {0}, diff --git a/frappe/translations/vi.csv b/frappe/translations/vi.csv index 35e3e96a6c..dfa82c6c6e 100644 --- a/frappe/translations/vi.csv +++ b/frappe/translations/vi.csv @@ -499,7 +499,6 @@ Authenticating...,Xác thực ..., Authentication,Xác thực, Authentication Apps you can use are: ,Ứng dụng xác thực bạn có thể sử dụng là:, Authentication Credentials,Xác thực giấy chứng nhận, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},Xác thực không thành công khi nhận được email từ tài khoản email {0}. Thông điệp từ máy chủ: {1}, Authorization Code,Mã ủy quyền, Authorize URL,Ủy quyền URL, Authorized,Ủy quyền, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,Không thể thay đổi docstatus 1-0, Cannot change header content,Không thể thay đổi nội dung tiêu đề, Cannot change state of Cancelled Document. Transition row {0},Không thể thay đổi trạng thái của tài liệu bị hủy. Hàng chuyển {0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,Không thể thay đổi các chi tiết người dùng trong bản giới thiệu. Vui lòng đăng ký tài khoản mới tại https://erpnext.com, -Cannot connect: {0},Không thể kết nối: {0}, Cannot create a {0} against a child document: {1},Không thể tạo một {0} đối với một tài liệu trẻ em: {1}, Cannot delete Home and Attachments folders,Không thể xóa thư mục Home và đính kèm, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,Không thể xóa tệp vì nó thuộc về {0} {1} mà bạn không có quyền truy cập, @@ -1139,7 +1137,6 @@ Font Size,Kích thước văn bản, Fonts,Phông chữ, Footer,Phần chân, Footer HTML,Chân trang HTML, -Footer Item,Phần chân mẫu hàng, Footer Items,Phần chân của các mẫu hàng, Footer will display correctly only in PDF,Footer sẽ chỉ hiển thị chính xác trong PDF, For Document Type,Đối với loại tài liệu, @@ -1149,7 +1146,6 @@ For Value,Đối với Giá trị, "For currency {0}, the minimum transaction amount should be {1}","Đối với đơn vị tiền tệ {0}, số tiền giao dịch tối thiểu phải là {1}", For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,Ví dụ nếu bạn hủy bỏ và sửa đổi INV004 nó sẽ trở thành một INV004-1 tài liệu mới. Điều này sẽ giúp bạn theo dõi từng sửa đổi., "For example: If you want to include the document ID, use {0}","Ví dụ: Nếu bạn muốn bao gồm các ID tài liệu, sử dụng {0}", -For top bar,Cho thanh hàng đầu, "For updating, you can update only selective columns.","Để cập nhật, bạn chỉ có thể cập nhật các cột được lựa chọn sẵn.", For {0} at level {1} in {2} in row {3},Cho {0} ở mức {1} trong {2} trong hàng {3}, Force,Sức ảnh hưởng, @@ -1201,7 +1197,6 @@ Google Calendar ID,ID Lịch Google, Google Font,Phông chữ Google, Google Services,Dịch vụ của Google, Grant Type,Loại trợ cấp, -Group Label,nhóm Label, Group Name,Tên nhóm, Group name cannot be empty.,Tên nhóm không thể để trống., Groups of DocTypes,Nhóm doctypes, @@ -1911,7 +1906,6 @@ Please verify your Email Address,Vui lòng xác nhận địa chỉ email, Point Allocation Periodicity,Định kỳ phân bổ điểm, Points,Điểm, Points Given,Điểm cho, -Policy,chính sách, Port,Cảng, Portal Menu,Portal Menu, Portal Menu Item,Portal Menu Item, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,Chọn ít nhất 1 kỷ lục cho in ấn, Select or drag across time slots to create a new event.,Chọn hoặc kéo trên các khe thời gian để tạo ra một sự kiện mới., Select records for assignment,Chọn hồ sơ chuyển nhượng, -"Select target = ""_blank"" to open in a new page.","Chọn target = ""_blank"" để mở một trang mới.", Select the label after which you want to insert new field.,Chọn nhãn sau đó bạn muốn chèn lĩnh vực mới., "Select your Country, Time Zone and Currency","Chọn quốc gia của bạn, Time Zone và ngoại tệ", Select {0},Chọn {0}, @@ -2989,7 +2982,6 @@ star-empty,sao - rỗng, step-backward,bước lùi, step-forward,bước về phía trước, submitted this document,gửi tài liệu này, -"target = ""_blank""","mục tiêu = ""_trống""", text in document type,văn bản trong loại tài liệu, text-height,chiều cao văn bản, text-width,chiều rộng văn bản, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,Đã xảy ra lỗi trong quá trình tạo mã thông báo. Nhấp vào {0} để tạo một cái mới., Submit After Import,Gửi sau khi nhập, Submitting...,Đệ trình ..., -Subscribed Documents,Tài liệu đăng ký, Success! You are good to go 👍,Sự thành công! Bạn tốt để đi, Successful Transactions,Giao dịch thành công, Successfully Submitted!,Gửi thành công!, @@ -3777,7 +3768,6 @@ Please specify,Vui lòng chỉ, Printing,In ấn, Priority,Ưu tiên, Project,Dự Án, -Publish,Công bố, Quarterly,Quý, Queued,Xếp hàng, Quick Entry,Bút toán nhanh, @@ -4299,7 +4289,6 @@ Hide Border,Ẩn đường viền, Index Web Pages for Search,Lập chỉ mục các trang web cho tìm kiếm, Action / Route,Hành động / Lộ trình, Document Naming Rule,Quy tắc đặt tên tài liệu, -Rules with higher priority will be applied first.,Các quy tắc có mức độ ưu tiên cao hơn sẽ được áp dụng trước., Rule Conditions,Điều kiện quy tắc, Digits,Chữ số, Example: 00001,Ví dụ: 00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,Công cụ xuất bản gói, Click on the row for accessing filters.,Nhấp vào hàng để truy cập bộ lọc., Sites,Các trang web, Last Deployed On,Được triển khai lần cuối vào ngày, -Last published {0},Xuất bản lần cuối {0}, -Publishing documents...,Xuất bản tài liệu ..., -Documents have been published.,Tài liệu đã được xuất bản., -Select Document Type.,Chọn Loại tài liệu., Console Log,Nhật ký bảng điều khiển, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])","Đặt Tùy chọn Mặc định cho tất cả các biểu đồ trên Trang tổng quan này (Ví dụ: "color": ["# d1d8dd", "# ff5858"])", Use Report Chart,Sử dụng biểu đồ báo cáo, @@ -4566,10 +4551,6 @@ Incorrect URL,URL không chính xác, Duplicate Name,Tên trùng lặp, "Please check the value of ""Fetch From"" set for field {0}",Vui lòng kiểm tra giá trị của "Tìm nạp từ" được đặt cho trường {0}, Wrong Fetch From value,Tìm nạp sai từ giá trị, -Deploying,Triển khai, -Couldn't connect to site {0}. Please check Error Logs.,Không thể kết nối với trang web {0}. Vui lòng kiểm tra Nhật ký Lỗi., -Error while installing package to site {0}. Please check Error Logs.,Lỗi khi cài đặt gói vào trang web {0}. Vui lòng kiểm tra Nhật ký Lỗi., -Exporting,Xuất khẩu, A field with the name '{}' already exists in doctype {}.,Trường có tên '{}' đã tồn tại trong loại tài liệu {}., Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,Trường Tùy chỉnh {0} do Quản trị viên tạo và chỉ có thể bị xóa thông qua tài khoản Quản trị viên., Failed to send {0} Auto Email Report,Không gửi được {0} Báo cáo email tự động, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,Hàng # {0}: Vui lòng đặt bộ lọc giá trị từ xa cho trường {1} để tìm nạp tài liệu phụ thuộc từ xa duy nhất, Paytm payment gateway settings,Cài đặt cổng thanh toán Paytm, "Company, Fiscal Year and Currency defaults","Công ty, năm tài chính và tiền tệ mặc định", -Package,Gói, -Import and Export Packages.,Gói Xuất nhập khẩu., Razorpay Signature Verification Failed,Xác minh Chữ ký Razorpay Không thành công, Google Drive - Could not locate - {0},Google Drive - Không thể định vị - {0}, "Sync token was invalid and has been resetted, Retry syncing.","Mã thông báo đồng bộ hóa không hợp lệ và đã được đặt lại, Hãy thử đồng bộ hóa lại.", @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,Đối với DocType Link / DocType Action, Cannot edit filters for standard charts,Không thể chỉnh sửa bộ lọc cho biểu đồ chuẩn, Event Producer Last Update,Cập nhật lần cuối của Event Producer, Default for 'Check' type of field {0} must be either '0' or '1',Mặc định cho loại trường 'Kiểm tra' {0} phải là '0' hoặc '1', +Non Negative,Không phủ định, +Rules with higher priority number will be applied first.,Các quy tắc có số ưu tiên cao hơn sẽ được áp dụng trước., +Open URL in a New Tab,Mở URL trong một tab mới, +Align Right,Sắp xếp đúng, +Loading Filters...,Đang tải bộ lọc ..., +Count Customizations,Đếm tùy chỉnh, +For Example: {} Open,Ví dụ: {} Mở, +Choose Existing Card or create New Card,Chọn thẻ hiện có hoặc tạo thẻ mới, +Number Cards,Thẻ số, +Function Based On,Chức năng dựa trên, +Add Filters,Thêm bộ lọc, +Skip,Nhảy, +Dismiss,Bỏ qua, +Value cannot be negative for,Giá trị không được âm cho, +Value cannot be negative for {0}: {1},Giá trị không được âm cho {0}: {1}, +Negative Value,Giá trị âm, +Authentication failed while receiving emails from Email Account: {0}.,Xác thực không thành công khi nhận email từ Tài khoản Email: {0}., +Message from server: {0},Thông báo từ máy chủ: {0}, diff --git a/frappe/translations/zh.csv b/frappe/translations/zh.csv index 5e89bbd73d..b8c404ce30 100644 --- a/frappe/translations/zh.csv +++ b/frappe/translations/zh.csv @@ -499,7 +499,6 @@ Authenticating...,验证..., Authentication,认证, Authentication Apps you can use are: ,您可以使用的验证应用程序是：, Authentication Credentials,认证凭据, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},同时接收来自电子邮件帐户{0}电子邮件身份验证失败。从服务器消息：{1}, Authorization Code,授权码, Authorize URL,授权URL, Authorized,合法, @@ -601,7 +600,6 @@ Cannot change docstatus from 1 to 0,不能将文档状态由1改为0, Cannot change header content,无法更改标题内容, Cannot change state of Cancelled Document. Transition row {0},不能改变已取消文档的状态。过渡行{0}, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,演示中无法更改用户详细信息。请在https://erpnext.com注册一个新帐户, -Cannot connect: {0},无法连接：{0}, Cannot create a {0} against a child document: {1},无法针对子文件创建{0}：{1}, Cannot delete Home and Attachments folders,无法删除主和附件文件夹, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,无法删除属于您没有权限的{0} {1}的文件, @@ -1139,7 +1137,6 @@ Font Size,字体大小, Fonts,字体, Footer,页脚, Footer HTML,页脚HTML, -Footer Item,页脚项目, Footer Items,页脚项目, Footer will display correctly only in PDF,页脚仅以PDF格式正确显示, For Document Type,对于文档类型, @@ -1149,7 +1146,6 @@ For Value,为价值, "For currency {0}, the minimum transaction amount should be {1}",对于货币{0}，最小交易金额应为{1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,例如如取消和修订INV004将成为一个新的文档INV004-1，这有利于你跟踪每次修订。, "For example: If you want to include the document ID, use {0}",例如：如果要包括文件ID，使用{0}, -For top bar,对顶部条, "For updating, you can update only selective columns.",您只能更新选择的列。, For {0} at level {1} in {2} in row {3},对行{3}，{2}中级别{1}的{0}, Force,力, @@ -1201,7 +1197,6 @@ Google Calendar ID,Google日历ID, Google Font,谷歌字体, Google Services,Google服务, Grant Type,准予类型, -Group Label,组标签, Group Name,团队名字, Group name cannot be empty.,组名不能为空。, Groups of DocTypes,文档类型的组, @@ -1911,7 +1906,6 @@ Please verify your Email Address,请验证您的邮箱地址, Point Allocation Periodicity,点分配周期, Points,点, Points Given,得分, -Policy,政策, Port,端口, Portal Menu,门户网站菜单, Portal Menu Item,门户菜单项, @@ -2214,7 +2208,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,选择打印ATLEAST 1项纪录, Select or drag across time slots to create a new event.,选择或拖动整个时隙，以创建一个新的事件。, Select records for assignment,选择分配记录, -"Select target = ""_blank"" to open in a new page.","选择taget=""_blank""在新页面中打开。", Select the label after which you want to insert new field.,选择标签，在其后插入新字段。, "Select your Country, Time Zone and Currency",设置你的国家，时区和货币, Select {0},选择{0}, @@ -2989,7 +2982,6 @@ star-empty,star-empty, step-backward,step-backward, step-forward,step-forward, submitted this document,提交这份文件, -"target = ""_blank""","target = ""_blank""", text in document type,文件类型的文本, text-height,文字高度, text-width,文字宽度, @@ -3565,7 +3557,6 @@ Some columns might get cut off when printing to PDF. Try to keep number of colum Something went wrong during the token generation. Click on {0} to generate a new one.,在令牌生成期间出了点问题。单击{0}以生成新的。, Submit After Import,导入后提交, Submitting...,提交中..., -Subscribed Documents,订阅文件, Success! You are good to go 👍,成功！你很高兴去👍, Successful Transactions,成功交易, Successfully Submitted!,提交成功！, @@ -3777,7 +3768,6 @@ Please specify,请注明, Printing,打印, Priority,优先, Project,项目, -Publish,发布, Quarterly,季度, Queued,排队, Quick Entry,快速入门, @@ -4299,7 +4289,6 @@ Hide Border,隐藏边框, Index Web Pages for Search,索引搜索网页, Action / Route,动作/路线, Document Naming Rule,文件命名规则, -Rules with higher priority will be applied first.,具有较高优先级的规则将首先应用。, Rule Conditions,规则条件, Digits,位数, Example: 00001,例如：00001, @@ -4344,10 +4333,6 @@ Package Publish Tool,包发布工具, Click on the row for accessing filters.,单击该行以访问过滤器。, Sites,网站, Last Deployed On,上次部署时间, -Last published {0},上次发布的{0}, -Publishing documents...,发布文件..., -Documents have been published.,文件已经出版。, -Select Document Type.,选择文档类型。, Console Log,控制台日志, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])",为该仪表板上的所有图表设置默认选项（例如：“颜色”：[“＃d1d8dd”，“＃ff5858”]）, Use Report Chart,使用报告表, @@ -4566,10 +4551,6 @@ Incorrect URL,网址错误, Duplicate Name,名称重复, "Please check the value of ""Fetch From"" set for field {0}",请检查为字段{0}设置的“提取自”的值, Wrong Fetch From value,从价值中提取错误, -Deploying,部署中, -Couldn't connect to site {0}. Please check Error Logs.,无法连接到站点{0}。请检查错误日志。, -Error while installing package to site {0}. Please check Error Logs.,将软件包安装到站点{0}时出错。请检查错误日志。, -Exporting,出口, A field with the name '{}' already exists in doctype {}.,文档类型{}中已经存在名称为“ {}”的字段。, Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,自定义字段{0}由管理员创建，只能通过管理员帐户删除。, Failed to send {0} Auto Email Report,无法发送{0}自动电子邮件报告, @@ -4609,8 +4590,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,第＃{0}行：请为字段{1}设置远程值过滤器，以获取唯一的远程依赖关系文档, Paytm payment gateway settings,Paytm付款网关设置, "Company, Fiscal Year and Currency defaults",公司，会计年度和货币默认值, -Package,包, -Import and Export Packages.,导入和导出软件包。, Razorpay Signature Verification Failed,Razorpay签名验证失败, Google Drive - Could not locate - {0},Google云端硬盘-找不到-{0}, "Sync token was invalid and has been resetted, Retry syncing.",同步令牌无效，并且已重置，请重试同步。, @@ -4703,3 +4682,21 @@ For DocType Link / DocType Action,对于DocType链接/ DocType操作, Cannot edit filters for standard charts,无法编辑标准图表的过滤器, Event Producer Last Update,活动制作人最后更新, Default for 'Check' type of field {0} must be either '0' or '1',字段{0}的“检查”类型的默认值必须为“ 0”或“ 1”, +Non Negative,非负数, +Rules with higher priority number will be applied first.,优先级较高的规则将首先应用。, +Open URL in a New Tab,在新标签页中打开URL, +Align Right,右对齐, +Loading Filters...,正在加载过滤器..., +Count Customizations,计数自定义, +For Example: {} Open,例如：{}打开, +Choose Existing Card or create New Card,选择现有卡或创建新卡, +Number Cards,号码卡, +Function Based On,基于功能, +Add Filters,添加过滤器, +Skip,跳跃, +Dismiss,解雇, +Value cannot be negative for,值不能为负, +Value cannot be negative for {0}: {1},{0}的值不能为负：{1}, +Negative Value,负值, +Authentication failed while receiving emails from Email Account: {0}.,从电子邮件帐户{0}接收电子邮件时，身份验证失败。, +Message from server: {0},来自服务器的消息：{0}, diff --git a/frappe/translations/zh_tw.csv b/frappe/translations/zh_tw.csv index 58d8c10138..0eb866a28f 100644 --- a/frappe/translations/zh_tw.csv +++ b/frappe/translations/zh_tw.csv @@ -437,7 +437,6 @@ Authenticating...,驗證..., Authentication,認證, Authentication Apps you can use are: ,您可以使用的驗證應用程序是：, Authentication Credentials,身份驗證憑據, -Authentication failed while receiving emails from Email Account {0}. Message from server: {1},當接收來自帳戶{0}的電子郵件時，身份驗證失敗。從伺服器消息：{1}, Authorization Code,授權碼, Authorize URL,授權URL, Auto,汽車, @@ -525,7 +524,6 @@ Cannot change docstatus from 1 to 0,不能改變docstatus從1到0, Cannot change header content,無法更改標題內容, Cannot change state of Cancelled Document. Transition row {0},不能改變註銷文件的狀態。, Cannot change user details in demo. Please signup for a new account at https://erpnext.com,演示中無法更改用戶詳細信息。請在https://erpnext.com註冊一個新帳戶, -Cannot connect: {0},無法連接：{0}, Cannot create a {0} against a child document: {1},無法創建{0}針對兒童的文檔：{1}, Cannot delete Home and Attachments folders,無法刪除首頁和附件的文件夾, Cannot delete file as it belongs to {0} {1} for which you do not have permissions,無法刪除屬於您沒有權限的{0} {1}的文件, @@ -1033,7 +1031,6 @@ Font Size,字體大小, Fonts,字體, Footer,頁腳, Footer HTML,頁腳HTML, -Footer Item,頁腳項目, Footer Items,頁腳項目, Footer will display correctly only in PDF,頁腳僅以PDF格式正確顯示, For Document Type,對於文檔類型, @@ -1043,7 +1040,6 @@ For Value,為價值, "For currency {0}, the minimum transaction amount should be {1}",對於貨幣{0}，最小交易金額應為{1}, For example if you cancel and amend INV004 it will become a new document INV004-1. This helps you to keep track of each amendment.,例如，如果你取消和修改INV004將成為一個新的文檔INV004-1。這可以幫助您跟踪每一項修正案。, "For example: If you want to include the document ID, use {0}",例如：如果要包含文檔ID，請使用{0}, -For top bar,對於頂端選單, "For updating, you can update only selective columns.",對於更新，您可以更新只選擇列。, For {0} at level {1} in {2} in row {3},{0}在水平{1}的{2}行{3}, Force Show,力量秀, @@ -1088,7 +1084,6 @@ Google Calendar ID,Google日曆ID, Google Font,谷歌字體, Google Services,Google服務, Grant Type,格蘭特類型, -Group Label,組標籤, Group Name,團隊名字, Group name cannot be empty.,組名不能為空。, Groups of DocTypes,文檔類型的組, @@ -2009,7 +2004,6 @@ Select an image of approx width 150px with a transparent background for best res Select atleast 1 record for printing,選擇打印ATLEAST 1紀錄, Select or drag across time slots to create a new event.,選擇或拖動整個時間條，以創建一個新的事件。, Select records for assignment,用於分配選擇記錄, -"Select target = ""_blank"" to open in a new page.","選擇target = ""_blank""以在新頁面中打開。", Select the label after which you want to insert new field.,之後要插入新字段中選擇的標籤。, "Select your Country, Time Zone and Currency",選擇國家時區和貨幣, Select {0},選擇{0}, @@ -2715,7 +2709,6 @@ star-empty,明星空, step-backward,往後退, step-forward,往前進, submitted this document,提交這份文件, -"target = ""_blank""",目標=“_blank”, text in document type,在文件類型的文本, text-width,文字寬度, th,日, @@ -3229,7 +3222,6 @@ Social Home,社會之家, Some columns might get cut off when printing to PDF. Try to keep number of columns under 10.,打印到PDF時，某些列可能會被切斷。盡量保持列數低於10。, Something went wrong during the token generation. Click on {0} to generate a new one.,在令牌生成期間出了點問題。單擊{0}以生成新的。, Submit After Import,導入後提交, -Subscribed Documents,訂閱文件, Success! You are good to go 👍,成功！你很高興去👍, Successfully imported {0} record.,已成功導入{0}記錄。, Successfully imported {0} records.,成功導入了{0}條記錄。, @@ -3413,7 +3405,6 @@ Please specify,請註明, Printing,列印, Priority,優先, Project,專案, -Publish,發布, Quarterly,每季, Queued,排隊, Quick Entry,快速入門, @@ -3844,7 +3835,6 @@ Hide Border,隱藏邊框, Index Web Pages for Search,索引搜索網頁, Action / Route,動作/路線, Document Naming Rule,文件命名規則, -Rules with higher priority will be applied first.,具有較高優先級的規則將首先應用。, Rule Conditions,規則條件, Digits,位數, Counter,計數器, @@ -3885,10 +3875,6 @@ Package Publish Tool,包發布工具, Click on the row for accessing filters.,單擊該行以訪問過濾器。, Sites,網站, Last Deployed On,上次部署時間, -Last published {0},上次發布的{0}, -Publishing documents...,發布文件..., -Documents have been published.,文件已經出版。, -Select Document Type.,選擇文檔類型。, Console Log,控制台日誌, "Set Default Options for all charts on this Dashboard (Ex: ""colors"": [""#d1d8dd"", ""#ff5858""])",為該儀表板上的所有圖表設置默認選項（例如：“顏色”：[“＃d1d8dd”，“＃ff5858”]）, Use Report Chart,使用報告表, @@ -4073,8 +4059,6 @@ Incorrect URL,網址錯誤, Duplicate Name,名稱重複, "Please check the value of ""Fetch From"" set for field {0}",請檢查為字段{0}設置的“提取自”的值, Wrong Fetch From value,從價值中提取錯誤, -Couldn't connect to site {0}. Please check Error Logs.,無法連接到站點{0}。請檢查錯誤日誌。, -Error while installing package to site {0}. Please check Error Logs.,將軟件包安裝到站點{0}時出錯。請檢查錯誤日誌。, A field with the name '{}' already exists in doctype {}.,文檔類型{}中已經存在名稱為“ {}”的字段。, Custom Field {0} is created by the Administrator and can only be deleted through the Administrator account.,自定義字段{0}由管理員創建，只能通過管理員帳戶刪除。, Failed to send {0} Auto Email Report,無法發送{0}自動電子郵件報告, @@ -4112,7 +4096,6 @@ Row #{0}: Please set Mapping or Default Value for the field {1} since its a depe Row #{0}: Please set remote value filters for the field {1} to fetch the unique remote dependency document,第＃{0}行：請為字段{1}設置遠程值過濾器，以獲取唯一的遠程依賴關係文檔, Paytm payment gateway settings,Paytm付款網關設置, "Company, Fiscal Year and Currency defaults",公司，會計年度和貨幣默認值, -Import and Export Packages.,導入和導出軟件包。, Razorpay Signature Verification Failed,Razorpay簽名驗證失敗, Google Drive - Could not locate - {0},Google雲端硬盤-找不到-{0}, "Sync token was invalid and has been resetted, Retry syncing.",同步令牌無效，並且已重置，請重試同步。, @@ -4199,3 +4182,21 @@ For DocType Link / DocType Action,對於DocType鏈接/ DocType操作, Cannot edit filters for standard charts,無法編輯標準圖表的過濾器, Event Producer Last Update,活動製作人最後更新, Default for 'Check' type of field {0} must be either '0' or '1',字段{0}的“檢查”類型的默認值必須為“ 0”或“ 1”, +Non Negative,非負數, +Rules with higher priority number will be applied first.,優先級較高的規則將首先應用。, +Open URL in a New Tab,在新標籤頁中打開URL, +Align Right,右對齊, +Loading Filters...,正在加載過濾器..., +Count Customizations,計數自定義, +For Example: {} Open,例如：{}打開, +Choose Existing Card or create New Card,選擇現有卡或創建新卡, +Number Cards,號碼卡, +Function Based On,基於功能, +Add Filters,添加過濾器, +Skip,跳躍, +Dismiss,解僱, +Value cannot be negative for,值不能為負, +Value cannot be negative for {0}: {1},{0}的值不能為負：{1}, +Negative Value,負值, +Authentication failed while receiving emails from Email Account: {0}.,從電子郵件帳戶{0}接收電子郵件時，身份驗證失敗。, +Message from server: {0},來自服務器的消息：{0}, From a9bf8023c6862310c294cc810e3c518a49b79ba0 Mon Sep 17 00:00:00 2001 From: Himanshu Date: Sat, 7 Nov 2020 19:22:00 +0530 Subject: [PATCH 052/259] Update standard_macros.html --- frappe/templates/print_formats/standard_macros.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html index 3681a87f53..24967b9525 100644 --- a/frappe/templates/print_formats/standard_macros.html +++ b/frappe/templates/print_formats/standard_macros.html @@ -137,7 +137,7 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}" {% elif df.fieldtype=="HTML" %} {{ frappe.render_template(df.options, {"doc":doc}) }} {% elif df.fieldtype=="Currency" %} - {{ doc.get_formatted(df.fieldname, doc, translated=df.translatable) }} + {{ doc.get_formatted(df.fieldname, parent_doc or doc, translated=df.translatable) }} {% else %} {{ doc.get_formatted(df.fieldname, parent_doc or doc, translated=df.translatable) }} {% endif %} From 19a14d09e0dc872594fc5ae0f0be9505ee6e76d3 Mon Sep 17 00:00:00 2001 From: Glen Whitney Date: Sun, 8 Nov 2020 17:58:10 +0000 Subject: [PATCH 053/259] fix(quick entry): make sure init_callback is always called Prior to this PR, as noted in issue #7638, it is not possible with frappe.new_doc to initialize certain fields of the new document, such as the description of a Task or the posting_date of a Journal Entry (in ERPNext). The reason this occurs is that currently the route_options which can be set in the second argument to frappe.new_doc() are only allowed to set certain field types of a document (namely, Link, Select, Data, and Dynamic Link). Although it turns out that it would not work to allow any field type to be set in the route options (in particular, attempting to allow one to set Table field types in this way is non-functional), it would be reasonable simply to try setting other fields that cannot be set in the route_options via the callback allowed as the third argument of frappe.new_doc. And indeed, this approach works for those DocTypes that have a Quick Entry Form. For those DocTypes that do not, however, the callback is never called. This PR modifies frappe.ui.form.make_quick_entry() -- which frappe.new_doc calls to do most of its work -- so that the callback is called regardless of whether the DocType has a Quick Entry Form or not. The only slight awkwardness in this is that if there is a Quick Entry, the callback is passed the dialog object of that Quick Entry, whereas if there is no Quick Entry, the callback is only passed the doc object that is about to be edited in the standard Form interface for a new document. Nevertheless, in any case, it is now possible to write a callback which will initialize any field in the new document being created. Resolves #7638. --- frappe/public/js/frappe/form/quick_entry.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js index 2da7b8f236..0a489e26d6 100644 --- a/frappe/public/js/frappe/form/quick_entry.js +++ b/frappe/public/js/frappe/form/quick_entry.js @@ -35,7 +35,11 @@ frappe.ui.form.QuickEntryForm = Class.extend({ if (this.is_quick_entry() || this.force) { this.render_dialog(); resolve(this); - } else { + } else { // No quick entry, use full Form + // but still give callback a shot at the doc + if (this.init_callback) { + this.init_callback(this.doc); + } frappe.quick_entry = null; frappe.set_route('Form', this.doctype, this.doc.name) .then(() => resolve(this)); From 9cedd7616d10eb41b45b3d53df3fc948bf19980b Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 9 Nov 2020 12:48:54 +0530 Subject: [PATCH 054/259] refactor: Show versions from Installed Applications to show "real" versions synced with the site database --- frappe/commands/site.py | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 142cb9f90f..033165e760 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -223,30 +223,31 @@ def install_app(context, apps): @click.command('list-apps') -@click.option('--only-apps', is_flag=True) @pass_context -def list_apps(context, only_apps): +def list_apps(context): "List apps in site" - import click - titled = False - - if len(context.sites) > 1: - titled = True for site in context.sites: frappe.init(site=site) frappe.connect() - apps = sorted(frappe.get_installed_apps()) + site_title = click.style(f"{site}", fg="green") if len(context.sites) > 1 else "" + apps = frappe.get_single("Installed Applications").installed_applications - if only_apps: - apps.remove("frappe") + if apps: + name_len, ver_len, branch_len = [ + max([len(x.get(y)) for x in apps]) for y in ["app_name", "app_version", "git_branch"] + ] + template = "{{0:{0}}} {{1:{1}}} {{2}}".format(name_len, ver_len, branch_len) + + installed_applications = [template.format(app.app_name, app.app_version, app.git_branch) for app in apps] + applications_summary = "\n".join(installed_applications) + summary = f"\n{site_title}\n{applications_summary}".strip() - if titled: - summary = "{}{}".format(click.style(site + ": ", fg="green"), ", ".join(apps)) else: - summary = "\n".join(apps) + applications_summary = "\n".join(frappe.get_installed_apps()) + summary = f"\n{site_title}\n{applications_summary}".strip() - if apps and summary.strip(): + if applications_summary and summary: print(summary) frappe.destroy() From 6c28f0cffef3ab73631f4fda949e4c28d8a6aa35 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 9 Nov 2020 13:20:38 +0530 Subject: [PATCH 055/259] style: Sider + Black --- frappe/commands/site.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 033165e760..2c52bddf8f 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -222,7 +222,7 @@ def install_app(context, apps): sys.exit(exit_code) -@click.command('list-apps') +@click.command("list-apps") @pass_context def list_apps(context): "List apps in site" @@ -230,16 +230,22 @@ def list_apps(context): for site in context.sites: frappe.init(site=site) frappe.connect() - site_title = click.style(f"{site}", fg="green") if len(context.sites) > 1 else "" + site_title = ( + click.style(f"{site}", fg="green") if len(context.sites) > 1 else "" + ) apps = frappe.get_single("Installed Applications").installed_applications if apps: - name_len, ver_len, branch_len = [ - max([len(x.get(y)) for x in apps]) for y in ["app_name", "app_version", "git_branch"] + name_len, ver_len = [ + max([len(x.get(y)) for x in apps]) + for y in ["app_name", "app_version"] ] - template = "{{0:{0}}} {{1:{1}}} {{2}}".format(name_len, ver_len, branch_len) + template = "{{0:{0}}} {{1:{1}}} {{2}}".format(name_len, ver_len) - installed_applications = [template.format(app.app_name, app.app_version, app.git_branch) for app in apps] + installed_applications = [ + template.format(app.app_name, app.app_version, app.git_branch) + for app in apps + ] applications_summary = "\n".join(installed_applications) summary = f"\n{site_title}\n{applications_summary}".strip() @@ -252,6 +258,7 @@ def list_apps(context): frappe.destroy() + @click.command('add-system-manager') @click.argument('email') @click.option('--first-name') From 61b0ffc14dd1012f9b5be1f96a7031c774027684 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 9 Nov 2020 13:48:06 +0530 Subject: [PATCH 056/259] fix: Add new-lines between sites' summaries --- frappe/commands/site.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 2c52bddf8f..b08030e56a 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -227,6 +227,13 @@ def install_app(context, apps): def list_apps(context): "List apps in site" + def fix_whitespaces(text): + if site == context.sites[-1]: + text = text.rstrip() + if len(context.sites) == 1: + text = text.lstrip() + return text + for site in context.sites: frappe.init(site=site) frappe.connect() @@ -247,11 +254,13 @@ def list_apps(context): for app in apps ] applications_summary = "\n".join(installed_applications) - summary = f"\n{site_title}\n{applications_summary}".strip() + summary = f"{site_title}\n{applications_summary}\n" else: applications_summary = "\n".join(frappe.get_installed_apps()) - summary = f"\n{site_title}\n{applications_summary}".strip() + summary = f"{site_title}\n{applications_summary}\n" + + summary = fix_whitespaces(summary) if applications_summary and summary: print(summary) From 01312889f8834facfa7ab8f111a4334db6c2b47b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 9 Nov 2020 15:31:49 +0530 Subject: [PATCH 057/259] refactor: Move get_build_version to utils.py --- frappe/utils/__init__.py | 8 ++++++++ frappe/www/desk.py | 10 +--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index d3bf1dd10c..b8866b53eb 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -721,3 +721,11 @@ def get_file_size(path, format=False): num /= 1024 return "{0:.1f}{1}{2}".format(num, 'Yi', suffix) + +def get_build_version(): + try: + return str(os.path.getmtime(os.path.join(frappe.local.sites_path, '.build'))) + except OSError: + # .build can sometimes not exist + # this is not a major problem so send fallback + return frappe.utils.random_string(8) \ No newline at end of file diff --git a/frappe/www/desk.py b/frappe/www/desk.py index c6bce850a5..e5c3c6af5c 100644 --- a/frappe/www/desk.py +++ b/frappe/www/desk.py @@ -36,7 +36,7 @@ def get_context(context): context.update({ "no_cache": 1, - "build_version": get_build_version(), + "build_version": frappe.utils.get_build_version(), "include_js": hooks["app_include_js"], "include_css": hooks["app_include_css"], "sounds": hooks["sounds"], @@ -82,11 +82,3 @@ def get_desk_assets(build_version): "boot": data["boot"], "assets": assets } - -def get_build_version(): - try: - return str(os.path.getmtime(os.path.join(frappe.local.sites_path, '.build'))) - except OSError: - # .build can sometimes not exist - # this is not a major problem so send fallback - return frappe.utils.random_string(8) From 13175a8bc4615ec8eab31045413c2fe5c4052a04 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 9 Nov 2020 15:54:17 +0530 Subject: [PATCH 058/259] fix(website): Bust cache by passing build_version to link and script sources --- frappe/templates/base.html | 8 ++++---- frappe/utils/__init__.py | 2 +- frappe/website/router.py | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/frappe/templates/base.html b/frappe/templates/base.html index aaed0035b9..dc87ab72dd 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -30,11 +30,11 @@ {%- if theme.name != 'Standard' -%} {%- else -%} - + {%- endif -%} {%- for link in web_include_css %} - + {%- endfor -%} {%- endblock -%} @@ -94,12 +94,12 @@ {% block base_scripts %} - + {% endblock %} {%- for link in web_include_js %} - + {%- endfor -%} {%- block script %} diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index b8866b53eb..c209ee13c9 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -728,4 +728,4 @@ def get_build_version(): except OSError: # .build can sometimes not exist # this is not a major problem so send fallback - return frappe.utils.random_string(8) \ No newline at end of file + return frappe.utils.random_string(8) diff --git a/frappe/website/router.py b/frappe/website/router.py index 22d186790b..5244c57ba8 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -275,8 +275,7 @@ def get_page_info(path, app, start, basepath=None, app_path=None, fname=None): # extract properties from controller attributes load_properties_from_controller(page_info) - # if not page_info.title: - # print('no-title-for', page_info.route) + page_info.build_version = frappe.utils.get_build_version() return page_info From 1e6674b4726ed22c6fedf64303532189d4f4fe42 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 9 Nov 2020 15:58:21 +0530 Subject: [PATCH 059/259] fix: Allow doctype export in test mode --- frappe/core/doctype/doctype/doctype.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index d7cc9ba919..da76da8db9 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -288,9 +288,12 @@ class DocType(Document): self.update_fields_to_fetch() - from frappe import conf - allow_doctype_export = frappe.flags.allow_doctype_export or (not frappe.flags.in_test and conf.get('developer_mode')) - if not self.custom and not frappe.flags.in_import and allow_doctype_export: + allow_doctype_export = ( + not self.custom + and not frappe.flags.in_import + and (frappe.flags.allow_doctype_export or frappe.conf.developer_mode) + ) + if allow_doctype_export: self.export_doc() self.make_controller_template() From 7394427df001bc8ca1712cd58d12372e737dcb70 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 9 Nov 2020 15:14:33 +0530 Subject: [PATCH 060/259] test: Add tests for bench list-apps --- frappe/tests/test_commands.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index 4e02de795a..9757a823a6 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -143,5 +143,24 @@ class TestCommands(BaseTestCommands): # test 1: remove app from installed_apps global default self.execute("bench --site {site} remove-from-installed-apps {app}", {"app": app}) + self.assertEquals(self.returncode, 0) self.execute("bench --site {site} list-apps") self.assertNotIn(app, self.stdout) + + def test_list_apps(self): + # test 1: sanity check for command + self.execute("bench --site all list-apps") + self.assertEquals(self.returncode, 0) + + # test 2: bare functionality for single site + self.execute("bench --site {site} list-apps") + self.assertEquals(self.returncode, 0) + list_apps = set([ + _x.split()[0] for _x in self.stdout.split("\n") + ]) + doctype = frappe.get_single("Installed Applications").installed_applications + if doctype: + installed_apps = set([x.app_name for x in doctype]) + else: + installed_apps = set(frappe.get_installed_apps()) + self.assertSetEqual(list_apps, installed_apps) From b86e6ac674a614d57bf02b317fed8343d7effb82 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 9 Nov 2020 17:39:45 +0530 Subject: [PATCH 061/259] fix: validate links table data (#11884) Co-authored-by: Faris Ansari --- frappe/core/doctype/doctype/doctype.py | 17 ++++++++++++- frappe/core/doctype/doctype/test_doctype.py | 27 +++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 8a9c130fbe..fd0cb1917d 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -56,7 +56,8 @@ class DocType(Document): - Check fieldnames (duplication etc) - Clear permission table for child tables - Add `amended_from` and `amended_by` if Amendable - - Add custom field `auto_repeat` if Repeatable""" + - Add custom field `auto_repeat` if Repeatable + - Check if links point to valid fieldnames""" self.check_developer_mode() @@ -88,6 +89,7 @@ class DocType(Document): self.make_repeatable() self.validate_nestedset() self.validate_website() + self.validate_links_table_fieldnames() if not self.is_new(): self.before_update = frappe.get_doc('DocType', self.name) @@ -656,6 +658,19 @@ class DocType(Document): if not re.match("^(?![\W])[^\d_\s][\w ]+$", name, **flags): frappe.throw(_("DocType's name should start with a letter and it can only consist of letters, numbers, spaces and underscores"), frappe.NameError) + def validate_links_table_fieldnames(self): + """Validate fieldnames in Links table""" + if frappe.flags.in_patch: return + if frappe.flags.in_fixtures: return + if not self.links: return + + for index, link in enumerate(self.links): + meta = frappe.get_meta(link.link_doctype) + if not meta.get_field(link.link_fieldname): + message = _("Row #{0}: Could not find field {1} in {2} DocType").format(index+1, frappe.bold(link.link_fieldname), frappe.bold(link.link_doctype)) + frappe.throw(message, InvalidFieldNameError, _("Invalid Fieldname")) + + def validate_fields_for_doctype(doctype): doc = frappe.get_doc("DocType", doctype) diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py index 6f4a400577..10169073e5 100644 --- a/frappe/core/doctype/doctype/test_doctype.py +++ b/frappe/core/doctype/doctype/test_doctype.py @@ -451,6 +451,33 @@ class TestDocType(unittest.TestCase): test_doc_1.delete() frappe.db.commit() + def test_links_table_fieldname_validation(self): + doc = new_doctype("Test Links Table Validation") + + # check valid data + doc.append("links", { + 'link_doctype': "User", + 'link_fieldname': "first_name" + }) + doc.validate_links_table_fieldnames() # no error + doc.links = [] # reset links table + + # check invalid doctype + doc.append("links", { + 'link_doctype': "User2", + 'link_fieldname': "first_name" + }) + self.assertRaises(frappe.DoesNotExistError, doc.validate_links_table_fieldnames) + doc.links = [] # reset links table + + # check invalid fieldname + doc.append("links", { + 'link_doctype': "User", + 'link_fieldname': "a_field_that_does_not_exists" + }) + self.assertRaises(InvalidFieldNameError, doc.validate_links_table_fieldnames) + + def new_doctype(name, unique=0, depends_on='', fields=None): doc = frappe.get_doc({ "doctype": "DocType", From 98b633a14ed98c8493a1d394757241244b9b56f5 Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Date: Mon, 9 Nov 2020 18:42:10 +0530 Subject: [PATCH 062/259] fix: add widgets/utils.js to build.json --- frappe/public/build.json | 4 +- frappe/public/js/frappe/widgets/utils.js | 51 ------------------------ 2 files changed, 3 insertions(+), 52 deletions(-) diff --git a/frappe/public/build.json b/frappe/public/build.json index 242cf0160a..a3622499d5 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -245,7 +245,9 @@ "public/js/frappe/ui/chart.js", "public/js/frappe/ui/datatable.js", "public/js/frappe/ui/driver.js", - "public/js/frappe/barcode_scanner/index.js" + "public/js/frappe/barcode_scanner/index.js", + + "public/js/frappe/widgets/utils.js" ], "css/form.min.css": [ "public/less/form_grid.less" diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js index 88684127e0..ade35dae35 100644 --- a/frappe/public/js/frappe/widgets/utils.js +++ b/frappe/public/js/frappe/widgets/utils.js @@ -1,54 +1,5 @@ frappe.provide('frappe.widget.utils'); -function generate_grid(data) { - function add(a, b) { - return a + b; - } - - const grid_max_cols = 6 - - // Split the data into multiple arrays - // Each array will contain grid elements of one row - let processed = [] - let temp = [] - let init = 0 - data.forEach((data) => { - init = init + data.columns; - if (init > grid_max_cols) { - init = data.columns - processed.push(temp) - temp = [] - } - temp.push(data) - }) - - processed.push(temp) - - let grid_template = []; - - processed.forEach((data, index) => { - let aa = data.map(dd => { - return Array.apply(null, Array(dd.columns)).map(String.prototype.valueOf, dd.name) - }).flat() - - if (aa.length < grid_max_cols) { - let diff = grid_max_cols - aa.length; - for (let ii = 0; ii < diff; ii++) { - aa.push(`grid-${index}-${ii}`) - } - } - - grid_template.push(aa.join(" ")) - }) - let grid_template_area = "" - - grid_template.forEach(temp => { - grid_template_area += `"${temp}" ` - }) - - return grid_template_area -} - frappe.widget.utils = { build_summary_item: function(summary) { let df = { fieldtype: summary.datatype }; @@ -71,5 +22,3 @@ frappe.widget.utils = { ); }, }; - -export { generate_grid }; From af1ed2f0bcd964fb60381fc802092b9466ce5a20 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 9 Nov 2020 18:50:03 +0530 Subject: [PATCH 063/259] refactor: Move _new_site and extract_sql_from_archive from frappe.commands.site module to frappe.installer --- frappe/commands/site.py | 73 ++----------------------- frappe/installer.py | 115 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 117 insertions(+), 71 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 8af0b422ba..5305502b17 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -9,7 +9,7 @@ import click import frappe from frappe.commands import get_site, pass_context from frappe.exceptions import SiteNotSpecifiedError -from frappe.utils import get_site_path, touch_file +from frappe.installer import _new_site @click.command('new-site') @@ -42,57 +42,6 @@ def new_site(site, mariadb_root_username=None, mariadb_root_password=None, admin if len(frappe.utils.get_sites()) == 1: use(site) -def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=None, - admin_password=None, verbose=False, install_apps=None, source_sql=None, force=False, - no_mariadb_socket=False, reinstall=False, db_password=None, db_type=None, db_host=None, - db_port=None, new_site=False): - """Install a new Frappe site""" - - if not force and os.path.exists(site): - print('Site {0} already exists'.format(site)) - sys.exit(1) - - if no_mariadb_socket and not db_type == "mariadb": - print('--no-mariadb-socket requires db_type to be set to mariadb.') - sys.exit(1) - - if not db_name: - import hashlib - db_name = '_' + hashlib.sha1(site.encode()).hexdigest()[:16] - - from frappe.commands.scheduler import _is_scheduler_enabled - from frappe.installer import install_db, make_site_dirs - from frappe.installer import install_app as _install_app - import frappe.utils.scheduler - - frappe.init(site=site) - - try: - - # enable scheduler post install? - enable_scheduler = _is_scheduler_enabled() - except Exception: - enable_scheduler = False - - make_site_dirs() - - installing = touch_file(get_site_path('locks', 'installing.lock')) - - install_db(root_login=mariadb_root_username, root_password=mariadb_root_password, db_name=db_name, - admin_password=admin_password, verbose=verbose, source_sql=source_sql, force=force, reinstall=reinstall, - db_password=db_password, db_type=db_type, db_host=db_host, db_port=db_port, no_mariadb_socket=no_mariadb_socket) - apps_to_install = ['frappe'] + (frappe.conf.get("install_apps") or []) + (list(install_apps) or []) - for app in apps_to_install: - _install_app(app, verbose=verbose, set_as_patched=not source_sql) - - os.remove(installing) - - frappe.utils.scheduler.toggle_scheduler(enable_scheduler) - frappe.db.commit() - - scheduler_status = "disabled" if frappe.utils.scheduler.is_scheduler_disabled() else "enabled" - print("*** Scheduler is", scheduler_status, "***") - @click.command('restore') @click.argument('sql-file-path') @@ -107,25 +56,9 @@ def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=N @pass_context def restore(context, sql_file_path, mariadb_root_username=None, mariadb_root_password=None, db_name=None, verbose=None, install_app=None, admin_password=None, force=None, with_public_files=None, with_private_files=None): "Restore site database from an sql file" - from frappe.installer import extract_sql_gzip, extract_files, is_downgrade + from frappe.installer import extract_sql_from_archive, extract_files, is_downgrade force = context.force or force - - # Extract the gzip file if user has passed *.sql.gz file instead of *.sql file - if not os.path.exists(sql_file_path): - base_path = '..' - sql_file_path = os.path.join(base_path, sql_file_path) - if not os.path.exists(sql_file_path): - print('Invalid path {0}'.format(sql_file_path[3:])) - sys.exit(1) - elif sql_file_path.startswith(os.sep): - base_path = os.sep - else: - base_path = '.' - - if sql_file_path.endswith('sql.gz'): - decompressed_file_name = extract_sql_gzip(os.path.abspath(sql_file_path)) - else: - decompressed_file_name = sql_file_path + decompressed_file_name = extract_sql_from_archive(sql_file_path) site = get_site(context) frappe.init(site=site) diff --git a/frappe/installer.py b/frappe/installer.py index df767a3294..b1420e5d9f 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -3,8 +3,90 @@ import json import os -from frappe.defaults import _clear_cache +import sys + import frappe +from frappe.defaults import _clear_cache + + +def _new_site( + db_name, + site, + mariadb_root_username=None, + mariadb_root_password=None, + admin_password=None, + verbose=False, + install_apps=None, + source_sql=None, + force=False, + no_mariadb_socket=False, + reinstall=False, + db_password=None, + db_type=None, + db_host=None, + db_port=None, + new_site=False, +): + """Install a new Frappe site""" + + if not force and os.path.exists(site): + print("Site {0} already exists".format(site)) + sys.exit(1) + + if no_mariadb_socket and not db_type == "mariadb": + print("--no-mariadb-socket requires db_type to be set to mariadb.") + sys.exit(1) + + if not db_name: + import hashlib + db_name = "_" + hashlib.sha1(site.encode()).hexdigest()[:16] + + frappe.init(site=site) + + from frappe.commands.scheduler import _is_scheduler_enabled + from frappe.utils import get_site_path, scheduler, touch_file + + try: + # enable scheduler post install? + enable_scheduler = _is_scheduler_enabled() + except Exception: + enable_scheduler = False + + make_site_dirs() + + installing = touch_file(get_site_path("locks", "installing.lock")) + + install_db( + root_login=mariadb_root_username, + root_password=mariadb_root_password, + db_name=db_name, + admin_password=admin_password, + verbose=verbose, + source_sql=source_sql, + force=force, + reinstall=reinstall, + db_password=db_password, + db_type=db_type, + db_host=db_host, + db_port=db_port, + no_mariadb_socket=no_mariadb_socket, + ) + apps_to_install = ( + ["frappe"] + (frappe.conf.get("install_apps") or []) + (list(install_apps) or []) + ) + + for app in apps_to_install: + install_app(app, verbose=verbose, set_as_patched=not source_sql) + + os.remove(installing) + + scheduler.toggle_scheduler(enable_scheduler) + frappe.db.commit() + + scheduler_status = ( + "disabled" if frappe.utils.scheduler.is_scheduler_disabled() else "enabled" + ) + print("*** Scheduler is", scheduler_status, "***") def install_db(root_login="root", root_password=None, db_name=None, source_sql=None, @@ -331,6 +413,37 @@ def remove_missing_apps(): frappe.db.set_global("installed_apps", json.dumps(installed_apps)) +def extract_sql_from_archive(sql_file_path): + """Return the path of an SQL file if the passed argument is the path of a gzipped + SQL file or an SQL file path. The path may be absolute or relative from the bench + root directory or the sites sub-directory. + + Args: + sql_file_path (str): Path of the SQL file + + Returns: + str: Path of the decompressed SQL file + """ + # Extract the gzip file if user has passed *.sql.gz file instead of *.sql file + if not os.path.exists(sql_file_path): + base_path = '..' + sql_file_path = os.path.join(base_path, sql_file_path) + if not os.path.exists(sql_file_path): + print('Invalid path {0}'.format(sql_file_path[3:])) + sys.exit(1) + elif sql_file_path.startswith(os.sep): + base_path = os.sep + else: + base_path = '.' + + if sql_file_path.endswith('sql.gz'): + decompressed_file_name = extract_sql_gzip(os.path.abspath(sql_file_path)) + else: + decompressed_file_name = sql_file_path + + return decompressed_file_name + + def extract_sql_gzip(sql_gz_path): import subprocess From 7b1fa59a29ec59535976a53bd10528fe80f6e18c Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 9 Nov 2020 18:51:33 +0530 Subject: [PATCH 064/259] feat: Restore partial backups via bench partial-restore --- frappe/commands/site.py | 17 ++++++++++++++++- frappe/database/db_manager.py | 1 - frappe/installer.py | 23 +++++++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 5305502b17..fd247b4182 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -91,6 +91,20 @@ def restore(context, sql_file_path, mariadb_root_username=None, mariadb_root_pas success_message = "Site {0} has been restored{1}".format(site, " with files" if (with_public_files or with_private_files) else "") click.secho(success_message, fg="green") +@click.command('partial-restore') +@click.argument('sql-file-path') +@click.option("--verbose", "-v", is_flag=True) +@pass_context +def partial_restore(context, sql_file_path, verbose): + from frappe.installer import partial_restore + verbose = context.verbose or verbose + + site = get_site(context) + frappe.init(site=site) + frappe.connect(site=site) + partial_restore(sql_file_path, verbose) + frappe.destroy() + @click.command('reinstall') @click.option('--admin-password', help='Administrator Password for reinstalled site') @click.option('--mariadb-root-username', help='Root username for MariaDB') @@ -650,5 +664,6 @@ commands = [ stop_recording, add_to_hosts, start_ngrok, - build_search_index + build_search_index, + partial_restore ] diff --git a/frappe/database/db_manager.py b/frappe/database/db_manager.py index 3345fce735..da1f584f57 100644 --- a/frappe/database/db_manager.py +++ b/frappe/database/db_manager.py @@ -3,7 +3,6 @@ import frappe class DbManager: - def __init__(self, db): """ Pass root_conn here for access to all databases. diff --git a/frappe/installer.py b/frappe/installer.py index b1420e5d9f..2bbf0421e3 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -519,3 +519,26 @@ def is_downgrade(sql_file_path, verbose=False): print("Your site will be downgraded from Frappe {0} to {1}".format(current_version, backup_version)) return downgrade + + +def partial_restore(sql_file_path, verbose=False): + sql_file = extract_sql_from_archive(sql_file_path) + + if frappe.conf.db_type in (None, "mariadb"): + from frappe.database.mariadb.setup_db import import_db_from_sql + elif frappe.conf.db_type == "postgres": + from frappe.database.postgres.setup_db import import_db_from_sql + import warnings + from click import style + warn = style( + "Delete the tables you want to restore manually before attempting" + " partial restore operation for PostreSQL databases", + fg="yellow" + ) + warnings.warn(warn) + + import_db_from_sql(source_sql=sql_file, verbose=verbose) + + # Removing temporarily created file + if sql_file != sql_file_path: + os.remove(sql_file) From ce45343355a4f429e772c83636fe7f2c438345e1 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 9 Nov 2020 18:53:14 +0530 Subject: [PATCH 065/259] feat: Add aliases for bench backup * --include is the same as --only, -i * --exclude is the same as -e --- frappe/commands/site.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index fd247b4182..646984dc8b 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -325,8 +325,8 @@ def use(site, sites_path='.'): @click.command('backup') @click.option('--with-files', default=False, is_flag=True, help="Take backup with files") -@click.option('--include', default="", type=str, help="Specify the DocTypes to backup seperated by commas") -@click.option('--exclude', default="", type=str, help="Specify the DocTypes to not backup seperated by commas") +@click.option('--include', '--only', '-i', default="", type=str, help="Specify the DocTypes to backup seperated by commas") +@click.option('--exclude', '-e', default="", type=str, help="Specify the DocTypes to not backup seperated by commas") @click.option('--backup-path', default=None, help="Set path for saving all the files in this operation") @click.option('--backup-path-db', default=None, help="Set path for saving database file") @click.option('--backup-path-files', default=None, help="Set path for saving public file") From b371c7005359e202c68adc4a2abd09030f5366e2 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 10 Nov 2020 11:11:19 +0530 Subject: [PATCH 066/259] refactor: Meaningful variable names --- frappe/database/db_manager.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/database/db_manager.py b/frappe/database/db_manager.py index da1f584f57..b8ffae519b 100644 --- a/frappe/database/db_manager.py +++ b/frappe/database/db_manager.py @@ -65,10 +65,10 @@ class DbManager: esc = make_esc('$ ') from distutils.spawn import find_executable - pipe = find_executable('pv') - if pipe: - pipe = '{pipe} {source} |'.format( - pipe=pipe, + pv = find_executable('pv') + if pv: + pipe = '{pv} {source} |'.format( + pv=pv, source=source ) source = '' @@ -77,7 +77,7 @@ class DbManager: source = '< {source}'.format(source=source) if pipe: - print('Creating Database...') + print('Restoring Database file...') command = '{pipe} mysql -u {user} -p{password} -h{host} ' + ('-P{port}' if frappe.db.port else '') + ' {target} {source}' command = command.format( From e8fdaa195bf3fe276be58c455d4fc3bad56970a8 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 10 Nov 2020 09:11:19 +0530 Subject: [PATCH 067/259] refactor: PostgreSQL module methods correspond to MariaDB * Added bootstrap_database, import_db_from_sql function APIs similar to MariaDB implementations --- frappe/database/postgres/setup_db.py | 29 +++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/frappe/database/postgres/setup_db.py b/frappe/database/postgres/setup_db.py index f53872db82..6f2ba7a1b7 100644 --- a/frappe/database/postgres/setup_db.py +++ b/frappe/database/postgres/setup_db.py @@ -10,6 +10,23 @@ def setup_database(force, source_sql=None, verbose=False): root_conn.sql("CREATE user {0} password '{1}'".format(frappe.conf.db_name, frappe.conf.db_password)) root_conn.sql("GRANT ALL PRIVILEGES ON DATABASE `{0}` TO {0}".format(frappe.conf.db_name)) + root_conn.close() + + bootstrap_database(frappe.conf.db_name, verbose, source_sql=source_sql) + frappe.connect() + +def bootstrap_database(db_name, verbose, source_sql=None): + frappe.connect(db_name=db_name) + import_db_from_sql(source_sql, verbose) + frappe.connect(db_name=db_name) + if not 'tabDefaultValue' in frappe.db.get_tables(): + print('''Database not installed, this can due to lack of permission, or that the database name exists. + Check your mysql root password, or use --force to reinstall''') + sys.exit(1) + +def import_db_from_sql(source_sql=None, verbose=False): + if verbose: + print("Starting Database Import...") # we can't pass psql password in arguments in postgresql as mysql. So # set password connection parameter in environment variable @@ -19,15 +36,21 @@ def setup_database(force, source_sql=None, verbose=False): if not source_sql: source_sql = os.path.join(os.path.dirname(__file__), 'framework_postgres.sql') - subprocess.check_output([ + command = [ 'psql', frappe.conf.db_name, '-h', frappe.conf.db_host or 'localhost', '-p', str(frappe.conf.db_port or '5432'), '-U', frappe.conf.db_name, '-f', source_sql - ], env=subprocess_env) + ] - frappe.connect() + if verbose: + print(" ".join(command)) + + subprocess.check_output(command, env=subprocess_env) + + if verbose: + print(f"Imported from Database File: {source_sql}") def setup_help_database(help_db_name): root_conn = get_root_connection() From 19f87c36e51d57c2d7b96d20b43e919c7d4289e1 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 9 Nov 2020 18:57:21 +0530 Subject: [PATCH 068/259] fix: Marked is_downgrade function as only MariaDB compatible --- frappe/installer.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index 2bbf0421e3..b73f3f1d6e 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -118,9 +118,9 @@ def install_db(root_login="root", root_password=None, db_name=None, source_sql=N def install_app(name, verbose=False, set_as_patched=True): from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs - from frappe.utils.fixtures import sync_fixtures from frappe.model.sync import sync_for from frappe.modules.utils import sync_customizations + from frappe.utils.fixtures import sync_fixtures frappe.flags.in_install = name frappe.flags.ignore_in_install = False @@ -458,9 +458,10 @@ def extract_sql_gzip(sql_gz_path): return decompressed_file + def extract_files(site_name, file_path, folder_name): - import subprocess import shutil + import subprocess # Need to do frappe.init to maintain the site locals frappe.init(site=site_name) @@ -488,6 +489,12 @@ def extract_files(site_name, file_path, folder_name): def is_downgrade(sql_file_path, verbose=False): """checks if input db backup will get downgraded on current bench""" + + # This function is only tested with mariadb + # TODO: Add postgres support + if frappe.conf.db_type not in (None, "mariadb"): + return False + from semantic_version import Version head = "INSERT INTO `tabInstalled Application` VALUES" From 142b6009fe0d2b609a9f0c40a4404a7dfb16ac72 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 10 Nov 2020 10:42:03 +0530 Subject: [PATCH 069/259] fix: Better error message on missing table --- frappe/database/mariadb/setup_db.py | 18 ++++++++++++++---- frappe/database/postgres/setup_db.py | 13 ++++++++++--- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/frappe/database/mariadb/setup_db.py b/frappe/database/mariadb/setup_db.py index a4e4d624ae..9b73d77171 100644 --- a/frappe/database/mariadb/setup_db.py +++ b/frappe/database/mariadb/setup_db.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals import frappe -import os, sys +import os from frappe.database.db_manager import DbManager expected_settings_10_2_earlier = { @@ -86,6 +86,8 @@ def drop_user_and_database(db_name, root_login, root_password): dbman.drop_database(db_name) def bootstrap_database(db_name, verbose, source_sql=None): + import sys + frappe.connect(db_name=db_name) if not check_database_settings(): print('Database settings do not match expected values; stopping database setup.') @@ -94,9 +96,17 @@ def bootstrap_database(db_name, verbose, source_sql=None): import_db_from_sql(source_sql, verbose) frappe.connect(db_name=db_name) - if not 'tabDefaultValue' in frappe.db.get_tables(): - print('''Database not installed, this can due to lack of permission, or that the database name exists. - Check your mysql root password, or use --force to reinstall''') + if 'tabDefaultValue' not in frappe.db.get_tables(): + from click import secho + + secho( + "Table 'tabDefaultValue' missing in the restored site. " + "Database not installed correctly, this can due to lack of " + "permission, or that the database name exists. Check your mysql" + " root password, validity of the backup file or use --force to" + " reinstall", + fg="red" + ) sys.exit(1) def import_db_from_sql(source_sql=None, verbose=False): diff --git a/frappe/database/postgres/setup_db.py b/frappe/database/postgres/setup_db.py index 6f2ba7a1b7..109ed0469e 100644 --- a/frappe/database/postgres/setup_db.py +++ b/frappe/database/postgres/setup_db.py @@ -19,9 +19,16 @@ def bootstrap_database(db_name, verbose, source_sql=None): frappe.connect(db_name=db_name) import_db_from_sql(source_sql, verbose) frappe.connect(db_name=db_name) - if not 'tabDefaultValue' in frappe.db.get_tables(): - print('''Database not installed, this can due to lack of permission, or that the database name exists. - Check your mysql root password, or use --force to reinstall''') + if 'tabDefaultValue' not in frappe.db.get_tables(): + import sys + from click import secho + + secho( + "Table 'tabDefaultValue' missing in the restored site. " + "This may be due to incorrect permissions or the result of a restore from a bad backup file. " + "Database not installed correctly.", + fg="red" + ) sys.exit(1) def import_db_from_sql(source_sql=None, verbose=False): From 853acf6dd05176729ed033ec36658557ea31ce76 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 10 Nov 2020 10:51:23 +0530 Subject: [PATCH 070/259] fix: Add "partial" tag in the backup file following site name to indicate its nature --- frappe/utils/backups.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 552debbaa1..7856c8d953 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -65,6 +65,7 @@ class BackupGenerator: self.ignore_conf = ignore_conf self.include_doctypes = include_doctypes self.exclude_doctypes = exclude_doctypes + self.partial = False if not self.db_type: self.db_type = "mariadb" @@ -144,6 +145,8 @@ class BackupGenerator: self.backup_includes = self.backup_includes or conf_tables["include"] self.backup_excludes = self.backup_excludes or conf_tables["exclude"] + self.partial = (self.backup_includes or self.backup_excludes) and not self.ignore_conf + @property def site_config_backup_path(self): # For backwards compatibility @@ -199,7 +202,10 @@ class BackupGenerator: self.backup_path_conf = site_config_backup_path def set_backup_file_name(self): - # Generate a random name using today's date and a 8 digit random number + if self.partial: + # slugs postfixed with partial won't get returned by get_recent_backup + self.site_slug = self.site_slug + "-partial" + for_conf = self.todays_date + "-" + self.site_slug + "-site_config_backup.json" for_db = self.todays_date + "-" + self.site_slug + "-database.sql.gz" ext = "tgz" if self.compress_files else "tar" From b4e17b9f95f65900b9c287d8a14985fba114065b Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 10 Nov 2020 10:52:10 +0530 Subject: [PATCH 071/259] fix: Give more information about file to match verbosity --- frappe/utils/backups.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 7856c8d953..f44bcd40e8 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -573,29 +573,29 @@ def delete_temp_backups(older_than=24): os.remove(this_file_path) -def is_file_old(db_file_name, older_than=24): +def is_file_old(file_path, older_than=24): """ Checks if file exists and is older than specified hours Returns -> True: file does not exist or file is old False: file is new """ - if os.path.isfile(db_file_name): + if os.path.isfile(file_path): from datetime import timedelta # Get timestamp of the file - file_datetime = datetime.fromtimestamp(os.stat(db_file_name).st_ctime) + file_datetime = datetime.fromtimestamp(os.stat(file_path).st_ctime) if datetime.today() - file_datetime >= timedelta(hours=older_than): if _verbose: - print("File is old") + print(f"File {file_path} is older than {older_than} hours") return True else: if _verbose: - print("File is recent") + print(f"File {file_path} is recent") return False else: if _verbose: - print("File does not exist") + print(f"File {file_path} does not exist") return True From a073a595448a2459e3d220e6406a46291f462daa Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 11 Nov 2020 09:11:19 +0530 Subject: [PATCH 072/259] fix: Add partial slug only for database file --- frappe/utils/backups.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index f44bcd40e8..e2fe4c559a 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -202,16 +202,14 @@ class BackupGenerator: self.backup_path_conf = site_config_backup_path def set_backup_file_name(self): - if self.partial: - # slugs postfixed with partial won't get returned by get_recent_backup - self.site_slug = self.site_slug + "-partial" - - for_conf = self.todays_date + "-" + self.site_slug + "-site_config_backup.json" - for_db = self.todays_date + "-" + self.site_slug + "-database.sql.gz" + # backups with the partial tag won't get returned by get_recent_backup + partial = "-partial" if self.partial else "" ext = "tgz" if self.compress_files else "tar" - for_public_files = self.todays_date + "-" + self.site_slug + "-files." + ext - for_private_files = self.todays_date + "-" + self.site_slug + "-private-files." + ext + for_conf = f"{self.todays_date}-{self.site_slug}-site_config_backup.json" + for_db = f"{self.todays_date}-{self.site_slug}{partial}-database.sql.gz" + for_public_files = f"{self.todays_date}-{self.site_slug}-files.{ext}" + for_private_files = f"{self.todays_date}-{self.site_slug}-private-files.{ext}" backup_path = self.backup_path or get_backup_path() if not self.backup_path_conf: From e7fb4d0ef3bff2c6da3b77038a90d6b0849f031a Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 10 Nov 2020 11:49:03 +0530 Subject: [PATCH 073/259] fix(query-report): Show scrollbar for datatable Show report-wrapper before rendering datatable --- frappe/public/js/frappe/views/reports/query_report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 130bf372e6..60abb187ae 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -813,6 +813,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { data.splice(-1, 1); } + this.$report.show(); if (this.datatable && this.datatable.options && (this.datatable.options.showTotalRow ===this.raw_data.add_total_row)) { this.datatable.options.treeView = this.tree_report; @@ -844,7 +845,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { if (this.report_settings.after_datatable_render) { this.report_settings.after_datatable_render(this.datatable); } - this.$report.show(); } get_chart_options(data) { From 3fed5c72553e2404123beb63ba10405cbf934536 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 10 Nov 2020 13:11:34 +0530 Subject: [PATCH 074/259] test: Add tests for bench partial-restore --- frappe/tests/test_commands.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index 283f9c01a7..f5cdd6b775 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -12,6 +12,7 @@ from glob import glob # imports - module imports import frappe +from frappe.utils import add_to_date, now from frappe.utils.backups import fetch_latest_backups import frappe.recorder @@ -243,6 +244,30 @@ class TestCommands(BaseTestCommands): database = fetch_latest_backups()["database"] self.assertTrue(exists_in_backup(backup["excludes"]["excludes"], database)) + def test_partial_restore(self): + _now = now() + for num in range(10): + frappe.get_doc({ + "doctype": "ToDo", + "date": add_to_date(_now, days=num), + "description": frappe.mock("paragraph") + }).insert() + todo_count = frappe.db.count("ToDo") + + # check if todos exist, create a partial backup and see if the state is the same after restore + self.assertIsNot(todo_count, 0) + self.execute("bench --site {site} backup --only 'ToDo'") + db_path = fetch_latest_backups(partial=True)["database"] + self.assertTrue("partial" in db_path) + + frappe.db.sql_ddl("DROP TABLE IF EXISTS `tabToDo`") + frappe.db.commit() + + self.execute("bench --site {site} partial-restore {path}", {"path": db_path}) + self.assertEquals(self.returncode, 0) + frappe.db.commit() + self.assertEquals(frappe.db.count("ToDo"), todo_count) + def test_recorder(self): frappe.recorder.stop() From 34af8cb32601993c069a862f1902aac53d848e69 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 12 Nov 2020 09:11:19 +0530 Subject: [PATCH 075/259] fix: Show partial backups when flag set * in fetch_latest_backups whitelisted API * BackupGenerator.get_recent_backup --- frappe/tests/test_commands.py | 8 ++++---- frappe/utils/backups.py | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index f5cdd6b775..1063307b76 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -215,27 +215,27 @@ class TestCommands(BaseTestCommands): self.execute("bench --site {site} set-config backup '{includes}' --as-dict", {"includes": json.dumps(backup["includes"])}) self.execute("bench --site {site} backup --verbose") self.assertEquals(self.returncode, 0) - database = fetch_latest_backups()["database"] + database = fetch_latest_backups(partial=True)["database"] self.assertTrue(exists_in_backup(backup["includes"]["includes"], database)) # test 8: take a backup with frappe.conf.backup.excludes self.execute("bench --site {site} set-config backup '{excludes}' --as-dict", {"excludes": json.dumps(backup["excludes"])}) self.execute("bench --site {site} backup --verbose") self.assertEquals(self.returncode, 0) - database = fetch_latest_backups()["database"] + database = fetch_latest_backups(partial=True)["database"] self.assertFalse(exists_in_backup(backup["excludes"]["excludes"], database)) self.assertTrue(exists_in_backup(backup["includes"]["includes"], database)) # test 9: take a backup with --include (with frappe.conf.excludes still set) self.execute("bench --site {site} backup --include '{include}'", {"include": ",".join(backup["includes"]["includes"])}) self.assertEquals(self.returncode, 0) - database = fetch_latest_backups()["database"] + database = fetch_latest_backups(partial=True)["database"] self.assertTrue(exists_in_backup(backup["includes"]["includes"], database)) # test 10: take a backup with --exclude self.execute("bench --site {site} backup --exclude '{exclude}'", {"exclude": ",".join(backup["excludes"]["excludes"])}) self.assertEquals(self.returncode, 0) - database = fetch_latest_backups()["database"] + database = fetch_latest_backups(partial=True)["database"] self.assertFalse(exists_in_backup(backup["excludes"]["excludes"], database)) # test 11: take a backup with --ignore-backup-conf diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index e2fe4c559a..178d213e59 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -202,7 +202,6 @@ class BackupGenerator: self.backup_path_conf = site_config_backup_path def set_backup_file_name(self): - # backups with the partial tag won't get returned by get_recent_backup partial = "-partial" if self.partial else "" ext = "tgz" if self.compress_files else "tar" @@ -221,11 +220,11 @@ class BackupGenerator: if not self.backup_path_private_files: self.backup_path_private_files = os.path.join(backup_path, for_private_files) - def get_recent_backup(self, older_than): + def get_recent_backup(self, older_than, partial=False): backup_path = get_backup_path() file_type_slugs = { - "database": "*-{}-database.sql.gz", + "database": "*-{{}}-{}database.sql.gz".format('*' if partial else ''), "public": "*-{}-files.tar", "private": "*-{}-private-files.tar", "config": "*-{}-site_config_backup.json", @@ -463,7 +462,7 @@ def get_backup(): @frappe.whitelist() -def fetch_latest_backups(): +def fetch_latest_backups(partial=False): """Fetches paths of the latest backup taken in the last 30 days Only for: System Managers @@ -479,7 +478,7 @@ def fetch_latest_backups(): db_type=frappe.conf.db_type, db_port=frappe.conf.db_port, ) - database, public, private, config = odb.get_recent_backup(older_than=24 * 30) + database, public, private, config = odb.get_recent_backup(older_than=24 * 30, partial=partial) return {"database": database, "public": public, "private": private, "config": config} From a22cd461ac85764477a39dc1e5ed613125b4e0bf Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 10 Nov 2020 13:34:48 +0530 Subject: [PATCH 076/259] test: Commit after insert, not before count check --- frappe/tests/test_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index 1063307b76..d19a62d788 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -252,6 +252,7 @@ class TestCommands(BaseTestCommands): "date": add_to_date(_now, days=num), "description": frappe.mock("paragraph") }).insert() + frappe.db.commit() todo_count = frappe.db.count("ToDo") # check if todos exist, create a partial backup and see if the state is the same after restore @@ -265,7 +266,6 @@ class TestCommands(BaseTestCommands): self.execute("bench --site {site} partial-restore {path}", {"path": db_path}) self.assertEquals(self.returncode, 0) - frappe.db.commit() self.assertEquals(frappe.db.count("ToDo"), todo_count) def test_recorder(self): From a8427c735e97501416b565f1493928a0828c6b67 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 10 Nov 2020 18:01:16 +0530 Subject: [PATCH 077/259] fix: Dont take backup in dry run + other fixes --- frappe/installer.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index 51113beae8..9807421e98 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -135,7 +135,7 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) if not confirm: return - if not no_backup: + if not (dry_run or no_backup): from frappe.utils.backups import scheduled_backup print("Backing up...") scheduled_backup(ignore_files=True) @@ -173,13 +173,15 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) if not dry_run: remove_from_installed_apps(app_name) - for doctype in set(drop_doctypes): - print("* dropping Table for '{0}'...".format(doctype)) + for doctype in set(drop_doctypes): + print("* dropping Table for '{0}'...".format(doctype)) + if not dry_run: frappe.db.sql_ddl("drop table `tab{0}`".format(doctype)) + if not dry_run: frappe.db.commit() - click.secho("Uninstalled App {0} from Site {1}".format(app_name, frappe.local.site), fg="green") + click.secho("Uninstalled App {0} from Site {1}".format(app_name, frappe.local.site), fg="green") frappe.flags.in_uninstall = False From b3a487242ff52feb6b30e94750b64d32171772f7 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 10 Nov 2020 18:04:44 +0530 Subject: [PATCH 078/259] fix: Use get_all instead of get_list --- frappe/installer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index 9807421e98..dd03783869 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -147,7 +147,7 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) for module_name in modules: print("Deleting Module '{0}'".format(module_name)) - for doctype in frappe.get_list("DocType", filters={"module": module_name}, fields=["name", "issingle"]): + for doctype in frappe.get_all("DocType", filters={"module": module_name}, fields=["name", "issingle"]): print("* removing DocType '{0}'...".format(doctype.name)) if not dry_run: @@ -161,7 +161,7 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) doctypes_with_linked_modules = ordered_doctypes + [doctype.parent for doctype in linked_doctypes if doctype.parent not in ordered_doctypes] for doctype in doctypes_with_linked_modules: - for record in frappe.get_list(doctype, filters={"module": module_name}): + for record in frappe.get_all(doctype, filters={"module": module_name}): print("* removing {0} '{1}'...".format(doctype, record.name)) if not dry_run: frappe.delete_doc(doctype, record.name) From 5facf0fd1c45f812f7224d852e11ad63bbeff8c8 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 10 Nov 2020 18:17:54 +0530 Subject: [PATCH 079/259] style: Use f-strings, pluck and Black --- frappe/installer.py | 49 +++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index dd03783869..7f630cbe57 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -121,34 +121,41 @@ def remove_from_installed_apps(app_name): def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False): """Remove app and all linked to the app's module with the app from a site.""" import click + site = frappe.local.site # dont allow uninstall app if not installed unless forced if not force: if app_name not in frappe.get_installed_apps(): - click.secho("App {0} not installed on Site {1}".format(app_name, frappe.local.site), fg="yellow") + click.secho(f"App {app_name} not installed on Site {site}", fg="yellow") return - print("Uninstalling App {0} from Site {1}...".format(app_name, frappe.local.site)) + print(f"Uninstalling App {app_name} from Site {site}...") if not dry_run and not yes: - confirm = click.confirm("All doctypes (including custom), modules related to this app will be deleted. Are you sure you want to continue?") + confirm = click.confirm( + "All doctypes (including custom), modules related to this app will be" + " deleted. Are you sure you want to continue?" + ) if not confirm: return if not (dry_run or no_backup): from frappe.utils.backups import scheduled_backup + print("Backing up...") scheduled_backup(ignore_files=True) frappe.flags.in_uninstall = True drop_doctypes = [] - modules = (x.name for x in frappe.get_all("Module Def", filters={"app_name": app_name})) + modules = frappe.get_all("Module Def", filters={"app_name": app_name}, pluck="name") for module_name in modules: - print("Deleting Module '{0}'".format(module_name)) + print(f"Deleting Module '{module_name}'") - for doctype in frappe.get_all("DocType", filters={"module": module_name}, fields=["name", "issingle"]): - print("* removing DocType '{0}'...".format(doctype.name)) + for doctype in frappe.get_all( + "DocType", filters={"module": module_name}, fields=["name", "issingle"] + ): + print(f"* removing DocType '{doctype.name}'...") if not dry_run: frappe.delete_doc("DocType", doctype.name) @@ -156,17 +163,25 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) if not doctype.issingle: drop_doctypes.append(doctype.name) - linked_doctypes = frappe.get_all("DocField", filters={"fieldtype": "Link", "options": "Module Def"}, fields=['parent']) + linked_doctypes = frappe.get_all( + "DocField", filters={"fieldtype": "Link", "options": "Module Def"}, fields=["parent"] + ) ordered_doctypes = ["Desk Page", "Report", "Page", "Web Form"] - doctypes_with_linked_modules = ordered_doctypes + [doctype.parent for doctype in linked_doctypes if doctype.parent not in ordered_doctypes] - + all_doctypes_with_linked_modules = ordered_doctypes + [ + doctype.parent + for doctype in linked_doctypes + if doctype.parent not in ordered_doctypes + ] + doctypes_with_linked_modules = [ + x for x in all_doctypes_with_linked_modules if frappe.db.exists("DocType", x) + ] for doctype in doctypes_with_linked_modules: - for record in frappe.get_all(doctype, filters={"module": module_name}): - print("* removing {0} '{1}'...".format(doctype, record.name)) + for record in frappe.get_all(doctype, filters={"module": module_name}, pluck="name"): + print(f"* removing {doctype} '{record}'...") if not dry_run: - frappe.delete_doc(doctype, record.name) + frappe.delete_doc(doctype, record) - print("* removing Module Def '{0}'...".format(module_name)) + print(f"* removing Module Def '{module_name}'...") if not dry_run: frappe.delete_doc("Module Def", module_name) @@ -174,14 +189,14 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) remove_from_installed_apps(app_name) for doctype in set(drop_doctypes): - print("* dropping Table for '{0}'...".format(doctype)) + print(f"* dropping Table for '{doctype}'...") if not dry_run: - frappe.db.sql_ddl("drop table `tab{0}`".format(doctype)) + frappe.db.sql_ddl(f"drop table `tab{doctype}`") if not dry_run: frappe.db.commit() - click.secho("Uninstalled App {0} from Site {1}".format(app_name, frappe.local.site), fg="green") + click.secho(f"Uninstalled App {app_name} from Site {site}", fg="green") frappe.flags.in_uninstall = False From d28fb7ff5e7c74a516a9c2bf5ac44fb1535165cc Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 10 Nov 2020 18:37:21 +0530 Subject: [PATCH 080/259] fix: ignore on_trash, delete comment on dt --- frappe/installer.py | 11 +++++------ frappe/model/delete_doc.py | 14 ++++++++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index 7f630cbe57..ac411e2667 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -121,6 +121,7 @@ def remove_from_installed_apps(app_name): def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False): """Remove app and all linked to the app's module with the app from a site.""" import click + site = frappe.local.site # dont allow uninstall app if not installed unless forced @@ -158,7 +159,7 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) print(f"* removing DocType '{doctype.name}'...") if not dry_run: - frappe.delete_doc("DocType", doctype.name) + frappe.delete_doc("DocType", doctype.name, ignore_on_trash=True) if not doctype.issingle: drop_doctypes.append(doctype.name) @@ -179,14 +180,11 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) for record in frappe.get_all(doctype, filters={"module": module_name}, pluck="name"): print(f"* removing {doctype} '{record}'...") if not dry_run: - frappe.delete_doc(doctype, record) + frappe.delete_doc(doctype, record, ignore_on_trash=True) print(f"* removing Module Def '{module_name}'...") if not dry_run: - frappe.delete_doc("Module Def", module_name) - - if not dry_run: - remove_from_installed_apps(app_name) + frappe.delete_doc("Module Def", module_name, ignore_on_trash=True) for doctype in set(drop_doctypes): print(f"* dropping Table for '{doctype}'...") @@ -194,6 +192,7 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) frappe.db.sql_ddl(f"drop table `tab{doctype}`") if not dry_run: + remove_from_installed_apps(app_name) frappe.db.commit() click.secho(f"Uninstalled App {app_name} from Site {site}", fg="green") diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index a38470e3f5..862abe375c 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -335,19 +335,25 @@ def clear_timeline_references(link_doctype, link_name): WHERE `tabCommunication Link`.link_doctype=%s AND `tabCommunication Link`.link_name=%s""", (link_doctype, link_name)) def insert_feed(doc): - from frappe.utils import get_fullname - - if frappe.flags.in_install or frappe.flags.in_import or getattr(doc, "no_feed_on_delete", False): + if ( + frappe.flags.in_install + or frappe.flags.in_uninstall + or frappe.flags.in_import + or getattr(doc, "no_feed_on_delete", False) + ): return + from frappe.utils import get_fullname + frappe.get_doc({ "doctype": "Comment", "comment_type": "Deleted", "reference_doctype": doc.doctype, "subject": "{0} {1}".format(_(doc.doctype), doc.name), - "full_name": get_fullname(doc.owner) + "full_name": get_fullname(doc.owner), }).insert(ignore_permissions=True) + def delete_controllers(doctype, module): """ Delete controller code in the doctype folder From e036c65ee221a5142db8494b0410f3489fcbf665 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 11 Nov 2020 12:34:56 +0530 Subject: [PATCH 081/259] fix: Bypass validation if force is passed --- frappe/commands/site.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 2be566f85f..51c352a931 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -127,7 +127,7 @@ def restore(context, sql_file_path, mariadb_root_username=None, mariadb_root_pas else: decompressed_file_name = sql_file_path - validate_database_sql(decompressed_file_name, _raise=force) + validate_database_sql(decompressed_file_name, _raise=not force) site = get_site(context) frappe.init(site=site) From c295882e058737a6f8e5da6244641d4767e19190 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 11 Nov 2020 14:03:03 +0530 Subject: [PATCH 082/259] fix: Don't overwrite same variable --- frappe/installer.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index 51113beae8..6745a92345 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -415,21 +415,23 @@ def validate_database_sql(path, _raise=True): path (str): Path of the decompressed SQL file _raise (bool, optional): Raise exception if invalid file. Defaults to True. """ - _raise = False + to_raise = False error_message = "" if not os.path.getsize(path): error_message = f"{path} is an empty file!" - _raise = True + to_raise = True if not _raise: with open(path, "r") as f: for line in f: if 'tabDefaultValue' in line: error_message = "Table `tabDefaultValue` not found in file." - _raise = True + to_raise = True - if error_message and _raise: + if error_message: import click click.secho(error_message, fg="red") + + if _raise and to_raise: raise frappe.InvalidDatabaseFile From ff1cf6e7d61150394b7ce0a18275fec4ad5f6049 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 11 Nov 2020 14:26:44 +0530 Subject: [PATCH 083/259] test: Trigger GitHub checks From 0e1807091087018338134b4aa1f10a3fd58e0589 Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Wed, 11 Nov 2020 14:56:55 +0530 Subject: [PATCH 084/259] fix: error on trying to check semantic version --- frappe/utils/change_log.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/frappe/utils/change_log.py b/frappe/utils/change_log.py index 29fee2bac0..f7fac4cdf4 100644 --- a/frappe/utils/change_log.py +++ b/frappe/utils/change_log.py @@ -165,9 +165,10 @@ def check_for_update(): add_message_to_redis(updates) + def parse_latest_non_beta_release(response): """ - Pasrses the response JSON for all the releases and returns the latest non prerelease + Parses the response JSON for all the releases and returns the latest non prerelease Parameters response (list): response object returned by github @@ -182,32 +183,34 @@ def parse_latest_non_beta_release(response): return None + def check_release_on_github(app): - # Check if repo remote is on github from subprocess import CalledProcessError + try: + # Check if repo remote is on github remote_url = subprocess.check_output("cd ../apps/{} && git ls-remote --get-url".format(app), shell=True).decode() except CalledProcessError: # Passing this since some apps may not have git initializaed in them - return None + return if isinstance(remote_url, bytes): remote_url = remote_url.decode() if "github.com" not in remote_url: - return None + return # Get latest version from github if 'https' not in remote_url: - return None + return org_name = remote_url.split('/')[3] r = requests.get('https://api.github.com/repos/{}/{}/releases'.format(org_name, app)) if r.ok: - lastest_non_beta_release = parse_latest_non_beta_release(r.json()) - return Version(lastest_non_beta_release), org_name - # In case of an improper response or if there are no releases - return None + latest_non_beta_release = parse_latest_non_beta_release(r.json()) + if latest_non_beta_release: + return Version(latest_non_beta_release), org_name + def add_message_to_redis(update_json): # "update-message" will store the update message string From d29b0504fc8106511e3b77b8ae53629fb47eb9eb Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 11 Nov 2020 15:09:02 +0530 Subject: [PATCH 085/259] fix: Allow rename controllers in test via rename_doc --- frappe/core/doctype/doctype/doctype.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index da76da8db9..7063e64352 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -396,7 +396,7 @@ class DocType(Document): frappe.db.commit() # Do not rename and move files and folders for custom doctype - if not self.custom and not frappe.flags.in_test and not frappe.flags.in_patch: + if not self.custom and not frappe.flags.in_patch: self.rename_files_and_folders(old, new) def rename_files_and_folders(self, old, new): From 53fc7b946aaf4bf0be4528528a3671a35fdf19a4 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 11 Nov 2020 18:22:40 +0530 Subject: [PATCH 086/259] fix: dashboard not visible bug --- frappe/public/js/frappe/form/dashboard.js | 6 +++++- frappe/public/js/frappe/form/layout.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index 3b6ccd9a5c..b6daabc616 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -35,6 +35,7 @@ frappe.ui.form.Dashboard = Class.extend({ // clear custom this.wrapper.find('.custom').remove(); + this.hide(); }, set_headline: function(html, color) { this.frm.layout.show_message(html, color); @@ -171,7 +172,7 @@ frappe.ui.form.Dashboard = Class.extend({ if(this.data.graph) { this.setup_graph(); - show = true; + // show = true; } if(show) { @@ -494,6 +495,9 @@ frappe.ui.form.Dashboard = Class.extend({ callback: function(r) { if(r.message) { me.render_graph(r.message); + me.show(); + } else { + me.hide(); } } }); diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 6ea21e6e63..3505cf4857 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -113,7 +113,7 @@ frappe.ui.form.Layout = Class.extend({ label: __('Dashboard'), cssClass: 'form-dashboard', collapsible: 1, - hidden: 1 + // hidden: 1 }); }, From f9523b0a3dc1b8b89aa5bd1e5367b824f9619e9a Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 11 Nov 2020 19:09:25 +0530 Subject: [PATCH 087/259] fix: Set VSCode keybindings in ace editor --- frappe/public/js/frappe/form/controls/code.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js index a547cfcf32..f3c51e0232 100644 --- a/frappe/public/js/frappe/form/controls/code.js +++ b/frappe/public/js/frappe/form/controls/code.js @@ -66,6 +66,7 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({ const ace_language_mode = language_map[language] || ''; this.editor.session.setMode(ace_language_mode); + this.editor.setKeyboardHandler('ace/keyboard/vscode'); }, parse(value) { From 3fec6c2ee1c2bcf467167dd294daf42ba31b4e95 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 11 Nov 2020 19:09:36 +0530 Subject: [PATCH 088/259] fix: Python syntax highlighting in Script field --- frappe/core/doctype/server_script/server_script.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/server_script/server_script.json b/frappe/core/doctype/server_script/server_script.json index cc3995ad1d..420f96ec2f 100644 --- a/frappe/core/doctype/server_script/server_script.json +++ b/frappe/core/doctype/server_script/server_script.json @@ -31,6 +31,7 @@ "fieldname": "script", "fieldtype": "Code", "label": "Script", + "options": "Python", "reqd": 1 }, { @@ -87,7 +88,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2020-08-24 16:44:41.060350", + "modified": "2020-11-11 12:39:41.391052", "modified_by": "Administrator", "module": "Core", "name": "Server Script", From 3581e591f3d83de5cab98042a602a37a86cee795 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 11 Nov 2020 19:40:41 +0530 Subject: [PATCH 089/259] fix: Strip html tags for frappe.msgprint output to stdout --- frappe/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index fac0927428..63ac57909b 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -326,7 +326,7 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, as_list=False, :param is_minimizable: [optional] Allow users to minimize the modal :param wide: [optional] Show wide modal """ - from frappe.utils import encode + from frappe.utils import encode, strip_html_tags msg = safe_decode(msg) out = _dict(message=msg) @@ -353,7 +353,7 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, as_list=False, out.as_list = 1 if flags.print_messages and out.message: - print(f"Message: {repr(out.message).encode('utf-8')}") + print(f"Message: {strip_html_tags(out.message)}") if title: out.title = title From 2a615226d50b43b1dc2aa0c7acd28928da9aed36 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 11 Nov 2020 19:41:31 +0530 Subject: [PATCH 090/259] fix: Clear class_doctypes cache for doctype rename, deletes for all sites --- frappe/core/doctype/doctype/doctype.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 7063e64352..0144103f47 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -396,8 +396,17 @@ class DocType(Document): frappe.db.commit() # Do not rename and move files and folders for custom doctype - if not self.custom and not frappe.flags.in_patch: - self.rename_files_and_folders(old, new) + if not self.custom: + if not frappe.flags.in_patch: + self.rename_files_and_folders(old, new) + + for site in frappe.utils.get_sites(): + frappe.cache().delete(f"{site}:doctype_classes", old) + + def after_delete(self): + if not self.custom: + for site in frappe.utils.get_sites(): + frappe.cache().delete(f"{site}:doctype_classes", self.name) def rename_files_and_folders(self, old, new): # move files From 18c0270168e825a284388fbf073977e2f8fd032f Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 12 Nov 2020 09:11:19 +0530 Subject: [PATCH 091/259] fix: Delete controllers if delete_doc triggered via tests too --- frappe/model/delete_doc.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index a38470e3f5..0599368f33 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -76,7 +76,12 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa delete_from_table(doctype, name, ignore_doctypes, None) - if not (for_reload or frappe.flags.in_migrate or frappe.flags.in_install or frappe.flags.in_uninstall or frappe.flags.in_test): + if not doc.custom and not ( + for_reload + or frappe.flags.in_migrate + or frappe.flags.in_install + or frappe.flags.in_uninstall + ): try: delete_controllers(name, doc.module) except (FileNotFoundError, OSError, KeyError): From 71225783e6edab50e2236fee59d30a18bc3b26e9 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 12 Nov 2020 11:11:19 +0530 Subject: [PATCH 092/259] test: Rename doc tests --- frappe/tests/test_document.py | 78 ------------------------- frappe/tests/test_rename_doc.py | 100 ++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 78 deletions(-) create mode 100644 frappe/tests/test_rename_doc.py diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py index 3c07f3e02a..2be92be1f5 100644 --- a/frappe/tests/test_document.py +++ b/frappe/tests/test_document.py @@ -249,84 +249,6 @@ class TestDocument(unittest.TestCase): self.assertEqual(cint(old_current) - 1, new_current) - def test_rename_doc(self): - from random import choice, sample - from frappe.model.base_document import get_controller - - available_documents = [] - doctype = "ToDo" - - # data generation: 4 todo documents - for num in range(1, 5): - doc = frappe.get_doc({ - "doctype": doctype, - "date": add_to_date(now(), days=num), - "description": "this is todo #{}".format(num) - }).insert() - available_documents.append(doc.name) - - # test 1: document renaming - old_name = choice(available_documents) - new_name = old_name + '.new' - self.assertEqual(new_name, frappe.rename_doc(doctype, old_name, new_name, force=True)) - available_documents.remove(old_name) - available_documents.append(new_name) - - # test 2: merge documents - first_todo, second_todo = sample(available_documents, 2) - - second_todo_doc = frappe.get_doc(doctype, second_todo) - second_todo_doc.priority = "High" - second_todo_doc.save() - - merged_todo = frappe.rename_doc(doctype, first_todo, second_todo, merge=True, force=True) - merged_todo_doc = frappe.get_doc(doctype, merged_todo) - available_documents.remove(first_todo) - - with self.assertRaises(DoesNotExistError): - frappe.get_doc(doctype, first_todo) - - self.assertEqual(merged_todo_doc.priority, second_todo_doc.priority) - - for docname in available_documents: - frappe.delete_doc(doctype, docname) - - # test 3: rename doctypes with controller code - doctype = frappe._dict({ - "old": "Test Rename Document Old", - "new": "Test Rename Document New", - }) - doc = frappe.get_doc({ - "doctype": "DocType", - "module": "Custom", - "name": doctype.old, - "custom": 0, - "fields": [ - { - "label": "Some Field", - "fieldname": "some_fieldname", - "fieldtype": "Data" - } - ], - "permissions": [ - {"role": "System Manager", "read": 1} - ], - }) - doc.insert() - # check if module exists exists; - # if custom, get_controller will return Document class - # if not custom, a different class will be returned - self.assertNotEqual(get_controller(doctype.old), frappe.model.document.Document) - - # rename doc via wrapper API accessible via /desk - frappe.rename_doc("DocType", doctype.old, doctype.new) - - # check if database and controllers are updated - self.assertTrue(frappe.db.exists("DocType", doctype.new)) - self.assertFalse(frappe.db.exists("DocType", doctype.old)) - with self.assertRaises(ImportError): - get_controller(doctype.old) - def test_non_negative_check(self): frappe.delete_doc_if_exists("Currency", "Frappe Coin", 1) diff --git a/frappe/tests/test_rename_doc.py b/frappe/tests/test_rename_doc.py new file mode 100644 index 0000000000..f69597b6de --- /dev/null +++ b/frappe/tests/test_rename_doc.py @@ -0,0 +1,100 @@ +import os +import unittest + +import frappe +from frappe.utils import add_to_date, now +from frappe.exceptions import DoesNotExistError + +from random import choice, sample +from frappe.model.base_document import get_controller +from frappe.modules.utils import get_doc_path + + +class TestRenameDoc(unittest.TestCase): + @classmethod + def setUpClass(self): + """Setting Up data for the tests defined under TestRenameDoc""" + # data generation: for base and merge tests + self.available_documents = [] + self.test_doctype = "ToDo" + + for num in range(1, 5): + doc = frappe.get_doc({ + "doctype": self.test_doctype, + "date": add_to_date(now(), days=num), + "description": "this is todo #{}".format(num), + }).insert() + self.available_documents.append(doc.name) + + # data generation: for controllers tests + self.doctype = frappe._dict({ + "old": "Test Rename Document Old", + "new": "Test Rename Document New", + }) + + frappe.get_doc({ + "doctype": "DocType", + "module": "Custom", + "name": self.doctype.old, + "custom": 0, + "fields": [ + {"label": "Some Field", "fieldname": "some_fieldname", "fieldtype": "Data"} + ], + "permissions": [{"role": "System Manager", "read": 1}], + }).insert() + + @classmethod + def tearDownClass(self): + """Deleting data generated for the tests defined under TestRenameDoc""" + # delete the documents created + for docname in self.available_documents: + frappe.delete_doc(self.test_doctype, docname) + + for dt in self.doctype.values(): + if frappe.db.exists("DocType", dt): + frappe.delete_doc("DocType", dt) + frappe.db.sql_ddl(f"DROP TABLE `tab{dt}`") + + def test_rename_doc(self): + """Rename an existing document via frappe.rename_doc""" + old_name = choice(self.available_documents) + new_name = old_name + ".new" + self.assertEqual(new_name, frappe.rename_doc(self.test_doctype, old_name, new_name, force=True)) + self.available_documents.remove(old_name) + self.available_documents.append(new_name) + + def test_merging_docs(self): + """Merge two documents via frappe.rename_doc""" + first_todo, second_todo = sample(self.available_documents, 2) + + second_todo_doc = frappe.get_doc(self.test_doctype, second_todo) + second_todo_doc.priority = "High" + second_todo_doc.save() + + merged_todo = frappe.rename_doc( + self.test_doctype, first_todo, second_todo, merge=True, force=True + ) + merged_todo_doc = frappe.get_doc(self.test_doctype, merged_todo) + self.available_documents.remove(first_todo) + + with self.assertRaises(DoesNotExistError): + frappe.get_doc(self.test_doctype, first_todo) + + self.assertEqual(merged_todo_doc.priority, second_todo_doc.priority) + + def test_rename_controllers(self): + """Rename doctypes with controller code paths""" + # check if module exists exists; + # if custom, get_controller will return Document class + # if not custom, a different class will be returned + self.assertNotEqual(get_controller(self.doctype.old), frappe.model.document.Document) + + old_doctype_path = get_doc_path("Custom", "DocType", self.doctype.old) + + # rename doc via wrapper API accessible via /desk + frappe.rename_doc("DocType", self.doctype.old, self.doctype.new) + + # check if database and controllers are updated + self.assertTrue(frappe.db.exists("DocType", self.doctype.new)) + self.assertFalse(frappe.db.exists("DocType", self.doctype.old)) + self.assertFalse(os.path.exists(old_doctype_path)) From f024b48f52c2ac6c8449e1ff587c1881db14d6f8 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 11 Nov 2020 20:11:30 +0530 Subject: [PATCH 093/259] fix: Remove unnecessary import Removed via 3581e591f3d83de5cab98042a602a37a86cee795 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 63ac57909b..e6eea7ed4a 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -326,7 +326,7 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, as_list=False, :param is_minimizable: [optional] Allow users to minimize the modal :param wide: [optional] Show wide modal """ - from frappe.utils import encode, strip_html_tags + from frappe.utils import strip_html_tags msg = safe_decode(msg) out = _dict(message=msg) From c5a420ffc79f0e1058ae1459523d5883d075d1d2 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 12 Nov 2020 10:43:36 +0530 Subject: [PATCH 094/259] fix: Allow doctype export with in_test flag set --- frappe/core/doctype/doctype/doctype.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 0144103f47..d421317a8a 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -291,7 +291,11 @@ class DocType(Document): allow_doctype_export = ( not self.custom and not frappe.flags.in_import - and (frappe.flags.allow_doctype_export or frappe.conf.developer_mode) + and ( + frappe.conf.developer_mode + or frappe.flags.allow_doctype_export + or frappe.flags.in_test + ) ) if allow_doctype_export: self.export_doc() From 6357bb63929b9b528fe6925fa184433f2db5a940 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 12 Nov 2020 11:51:42 +0530 Subject: [PATCH 095/259] test: Drop table if exists --- frappe/tests/test_rename_doc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/tests/test_rename_doc.py b/frappe/tests/test_rename_doc.py index f69597b6de..4db877e586 100644 --- a/frappe/tests/test_rename_doc.py +++ b/frappe/tests/test_rename_doc.py @@ -53,7 +53,7 @@ class TestRenameDoc(unittest.TestCase): for dt in self.doctype.values(): if frappe.db.exists("DocType", dt): frappe.delete_doc("DocType", dt) - frappe.db.sql_ddl(f"DROP TABLE `tab{dt}`") + frappe.db.sql_ddl(f"DROP TABLE IF EXISTS `tab{dt}`") def test_rename_doc(self): """Rename an existing document via frappe.rename_doc""" From e230ddf4d3408adbe9a31fa1638ac229504bd3d5 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 12 Nov 2020 13:43:03 +0530 Subject: [PATCH 096/259] fix: allow any field to be set in based on field --- .../automation/doctype/assignment_rule/assignment_rule.js | 2 +- .../automation/doctype/assignment_rule/assignment_rule.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/automation/doctype/assignment_rule/assignment_rule.js b/frappe/automation/doctype/assignment_rule/assignment_rule.js index 774befc15e..e6f136fe62 100644 --- a/frappe/automation/doctype/assignment_rule/assignment_rule.js +++ b/frappe/automation/doctype/assignment_rule/assignment_rule.js @@ -57,7 +57,7 @@ frappe.ui.form.on('Assignment Rule', { frm.set_fields_as_options( 'field', doctype, - (df) => df.fieldtype == 'Link' && df.options == 'User', + () => true, [{ label: 'Owner', value: 'owner' }] ); if (doctype) { diff --git a/frappe/automation/doctype/assignment_rule/assignment_rule.py b/frappe/automation/doctype/assignment_rule/assignment_rule.py index c85cb149ea..d20398d564 100644 --- a/frappe/automation/doctype/assignment_rule/assignment_rule.py +++ b/frappe/automation/doctype/assignment_rule/assignment_rule.py @@ -82,7 +82,7 @@ class AssignmentRule(Document): elif self.rule == 'Load Balancing': return self.get_user_load_balancing() elif self.rule == 'Based on Field': - return doc.get(self.field) + return self.get_user_based_on_field(doc) def get_user_round_robin(self): ''' @@ -119,6 +119,11 @@ class AssignmentRule(Document): # pick the first user return sorted_counts[0].get('user') + def get_user_based_on_field(self, doc): + val = doc.get(self.field) + if frappe.db.exists('User', val): + return val + def safe_eval(self, fieldname, doc): try: if self.get(fieldname): From e2dd9f401f1901d337d41a7a83678d70bec1e5c1 Mon Sep 17 00:00:00 2001 From: UrvashiKishnani <41088003+UrvashiKishnani@users.noreply.github.com> Date: Thu, 12 Nov 2020 12:50:09 +0400 Subject: [PATCH 097/259] fix(minor): order of HTML closing tags --- frappe/public/js/frappe/form/templates/form_sidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html index 67e674b1c1..481d0159c3 100644 --- a/frappe/public/js/frappe/form/templates/form_sidebar.html +++ b/frappe/public/js/frappe/form/templates/form_sidebar.html @@ -60,7 +60,7 @@
  • {%= __("Tags") %}
    • From b52cfd1903a050f0d3493f120d75f00c2d715168 Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Thu, 12 Nov 2020 15:24:12 +0530 Subject: [PATCH 098/259] fix: add git URL check --- frappe/utils/change_log.py | 16 ++++++++++------ frappe/utils/data.py | 6 ++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/frappe/utils/change_log.py b/frappe/utils/change_log.py index f7fac4cdf4..75421c43ea 100644 --- a/frappe/utils/change_log.py +++ b/frappe/utils/change_log.py @@ -1,15 +1,16 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt -from __future__ import unicode_literals -from six.moves import range -import json, os -from semantic_version import Version +import json +import os +import subprocess # nosec + import frappe import requests -import subprocess # nosec -from frappe.utils import cstr from frappe import _, safe_decode +from frappe.utils import cstr, is_git_url +from semantic_version import Version +from six.moves import range def get_change_log(user=None): @@ -204,6 +205,9 @@ def check_release_on_github(app): if 'https' not in remote_url: return + if is_git_url(remote_url): + return + org_name = remote_url.split('/')[3] r = requests.get('https://api.github.com/repos/{}/{}/releases'.format(org_name, app)) if r.ok: diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 41f247da45..1ddf59a82c 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -1376,3 +1376,9 @@ def validate_json_string(string): json.loads(string) except (TypeError, ValueError): raise frappe.ValidationError + + +def is_git_url(url): + # modified to allow without the tailing .git from https://github.com/jonschlinkert/is-git-url.git + pattern = r"(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\.git)?(\/?|\#[-\d\w._]+?)$" + return bool(re.match(pattern, url)) From 8fef0e0fcd2d885db59fcaee8c181d5fa41fd781 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 12 Nov 2020 15:38:34 +0530 Subject: [PATCH 099/259] fix: TypeError on saving report with child table --- frappe/core/doctype/report/report.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py index 9d30409a2a..01c32bcb57 100644 --- a/frappe/core/doctype/report/report.py +++ b/frappe/core/doctype/report/report.py @@ -61,8 +61,9 @@ class Report(Document): def set_doctype_roles(self): if not self.get('roles') and self.is_standard == 'No': meta = frappe.get_meta(self.ref_doctype) - roles = [{'role': d.role} for d in meta.permissions if d.permlevel==0] - self.set('roles', roles) + if not meta.istable: + roles = [{'role': d.role} for d in meta.permissions if d.permlevel==0] + self.set('roles', roles) def is_permitted(self): """Returns true if Has Role is not set or the user is allowed.""" From 4e49f0f0ca04bb1e3feb8efe3047c28d99e7a6a1 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 12 Nov 2020 15:26:24 +0530 Subject: [PATCH 100/259] fix: show only link, dynamic link and data fields --- frappe/automation/doctype/assignment_rule/assignment_rule.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/automation/doctype/assignment_rule/assignment_rule.js b/frappe/automation/doctype/assignment_rule/assignment_rule.js index e6f136fe62..ee1a076465 100644 --- a/frappe/automation/doctype/assignment_rule/assignment_rule.js +++ b/frappe/automation/doctype/assignment_rule/assignment_rule.js @@ -57,7 +57,8 @@ frappe.ui.form.on('Assignment Rule', { frm.set_fields_as_options( 'field', doctype, - () => true, + (df) => ['Dynamic Link', 'Data'].includes(df.fieldtype) + || (df.fieldtype == 'Link' && df.options == 'User'), [{ label: 'Owner', value: 'owner' }] ); if (doctype) { From a6c25fa9ad46884f01b8b982ceaa24ae6db0ff93 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 12 Nov 2020 16:21:51 +0530 Subject: [PATCH 101/259] ci: Run tests with set verbosity --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 63895675ea..2331217363 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,12 +31,12 @@ matrix: - name: "Python 3.7 MariaDB" python: 3.7 env: DB=mariadb TYPE=server - script: bench --site test_site run-tests --coverage + script: bench --verbose --site test_site run-tests --coverage - name: "Python 3.7 PostgreSQL" python: 3.7 env: DB=postgres TYPE=server - script: bench --site test_site run-tests --coverage + script: bench --verbose --site test_site run-tests --coverage - name: "Cypress" python: 3.7 From b1b1fbbce2871f7c8b45f6c34f4f079d8fe561e5 Mon Sep 17 00:00:00 2001 From: conncampbell Date: Thu, 12 Nov 2020 08:04:00 -0700 Subject: [PATCH 102/259] feat: Web form fields support for property depends on fields (read-only and mandatory) --- frappe/website/doctype/web_form/web_form.js | 2 ++ .../web_form_field/web_form_field.json | 27 ++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/frappe/website/doctype/web_form/web_form.js b/frappe/website/doctype/web_form/web_form.js index 6b4442ccaf..369f684192 100644 --- a/frappe/website/doctype/web_form/web_form.js +++ b/frappe/website/doctype/web_form/web_form.js @@ -59,6 +59,8 @@ frappe.ui.form.on("Web Form", { default: field.default, read_only: field.read_only, depends_on: field.depends_on, + mandatory_depends_on: field.mandatory_depends_on, + read_only_depends_on: field.read_only_depends_on, hidden: field.hidden, description: field.description }); diff --git a/frappe/website/doctype/web_form_field/web_form_field.json b/frappe/website/doctype/web_form_field/web_form_field.json index ef7b1c4ddf..72fcccf555 100644 --- a/frappe/website/doctype/web_form_field/web_form_field.json +++ b/frappe/website/doctype/web_form_field/web_form_field.json @@ -18,6 +18,10 @@ "options", "max_length", "max_value", + "property_depends_on_section", + "mandatory_depends_on", + "column_break_16", + "read_only_depends_on", "section_break_6", "description", "column_break_8", @@ -117,11 +121,32 @@ "fieldname": "default", "fieldtype": "Data", "label": "Default" + }, + { + "fieldname": "property_depends_on_section", + "fieldtype": "Section Break", + "label": "Property Depends On" + }, + { + "fieldname": "mandatory_depends_on", + "fieldtype": "Code", + "label": "Mandatory Depends On", + "options": "JS" + }, + { + "fieldname": "column_break_16", + "fieldtype": "Column Break" + }, + { + "fieldname": "read_only_depends_on", + "fieldtype": "Code", + "label": "Read Only Depends On", + "options": "JS" } ], "istable": 1, "links": [], - "modified": "2020-05-13 13:35:08.454427", + "modified": "2020-11-10 23:20:44.354862", "modified_by": "Administrator", "module": "Website", "name": "Web Form Field", From 0f13fe7da5e7158830ab77896a76116e71b02b64 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 13 Nov 2020 15:13:55 +0530 Subject: [PATCH 103/259] fix: Validate SQL files properly --- frappe/installer.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index 6745a92345..3edea185cf 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -415,23 +415,29 @@ def validate_database_sql(path, _raise=True): path (str): Path of the decompressed SQL file _raise (bool, optional): Raise exception if invalid file. Defaults to True. """ - to_raise = False + empty_file = False + missing_table = True + error_message = "" if not os.path.getsize(path): error_message = f"{path} is an empty file!" - to_raise = True + empty_file = True - if not _raise: + # dont bother checking if empty file + if not empty_file: with open(path, "r") as f: for line in f: if 'tabDefaultValue' in line: - error_message = "Table `tabDefaultValue` not found in file." - to_raise = True + missing_table = False + break + + if missing_table: + error_message = "Table `tabDefaultValue` not found in file." if error_message: import click click.secho(error_message, fg="red") - if _raise and to_raise: + if _raise and (missing_table or empty_file): raise frappe.InvalidDatabaseFile From 0cb29a81ae793f529c84cbd712db9d190db98498 Mon Sep 17 00:00:00 2001 From: Fahim Ali Zain TP Date: Fri, 13 Nov 2020 15:15:29 +0530 Subject: [PATCH 104/259] feat(Event Streaming): Conditional Events (#10868) --- .../doctype/event_consumer/event_consumer.py | 59 +++++++- .../event_consumer_document_type.json | 11 +- .../doctype/event_producer/event_producer.py | 25 ++-- .../event_producer/test_event_producer.py | 79 +++++++++++ .../event_producer_document_type.json | 10 +- .../event_update_log/event_update_log.json | 15 +- .../event_update_log/event_update_log.py | 134 ++++++++++++++++++ .../event_update_log_consumer/__init__.py | 0 .../event_update_log_consumer.json | 32 +++++ .../event_update_log_consumer.py | 10 ++ 10 files changed, 355 insertions(+), 20 deletions(-) create mode 100644 frappe/event_streaming/doctype/event_update_log_consumer/__init__.py create mode 100644 frappe/event_streaming/doctype/event_update_log_consumer/event_update_log_consumer.json create mode 100644 frappe/event_streaming/doctype/event_update_log_consumer/event_update_log_consumer.py diff --git a/frappe/event_streaming/doctype/event_consumer/event_consumer.py b/frappe/event_streaming/doctype/event_consumer/event_consumer.py index 1505c3a05d..5789e09e74 100644 --- a/frappe/event_streaming/doctype/event_consumer/event_consumer.py +++ b/frappe/event_streaming/doctype/event_consumer/event_consumer.py @@ -31,10 +31,12 @@ class EventConsumer(Document): self.update_consumer_status() else: frappe.db.set_value(self.doctype, self.name, 'incoming_change', 0) - + frappe.cache().delete_value('event_consumer_document_type_map') def on_trash(self): + for i in frappe.get_all('Event Update Log Consumer', {'consumer': self.name}): + frappe.delete_doc('Event Update Log Consumer', i.name) frappe.cache().delete_value('event_consumer_document_type_map') def update_consumer_status(self): @@ -88,8 +90,9 @@ def register_consumer(data): for entry in consumer_doctypes: consumer.append('consumer_doctypes', { - 'ref_doctype': entry, - 'status': 'Pending' + 'ref_doctype': entry.get('doctype'), + 'status': 'Pending', + 'condition': entry.get('condition') }) consumer.insert() @@ -153,3 +156,53 @@ def notify(consumer): jobs = get_jobs() if not jobs or enqueued_method not in jobs[frappe.local.site] and not consumer.flags.notifed: frappe.enqueue(enqueued_method, queue='long', enqueue_after_commit=True, **{'consumer': consumer}) + + +def has_consumer_access(consumer, update_log): + """Checks if consumer has completely satisfied all the conditions on the doc""" + + if isinstance(consumer, str): + consumer = frappe.get_doc('Event Consumer', consumer) + + if not frappe.db.exists(update_log.ref_doctype, update_log.docname): + # Delete Log + # Check if the last Update Log of this document was read by this consumer + last_update_log = frappe.get_all( + 'Event Update Log', + filters={ + 'ref_doctype': update_log.ref_doctype, + 'docname': update_log.docname, + 'creation': ['<', update_log.creation] + }, + order_by='creation desc', + limit_page_length=1 + ) + if not len(last_update_log): + return False + + last_update_log = frappe.get_doc('Event Update Log', last_update_log[0].name) + return len([x for x in last_update_log.consumers if x.consumer == consumer.name]) + + doc = frappe.get_doc(update_log.ref_doctype, update_log.docname) + try: + for dt_entry in consumer.consumer_doctypes: + if dt_entry.ref_doctype != update_log.ref_doctype: + continue + + if not dt_entry.condition: + return True + + condition: str = dt_entry.condition + if condition.startswith('cmd:'): + cmd = condition.split('cmd:')[1].strip() + args = { + 'consumer': consumer, + 'doc': doc, + 'update_log': update_log + } + return frappe.call(cmd, **args) + else: + return frappe.safe_eval(condition, frappe._dict(doc=doc)) + except Exception as e: + frappe.log_error(title='has_consumer_access error', message=e) + return False \ No newline at end of file diff --git a/frappe/event_streaming/doctype/event_consumer_document_type/event_consumer_document_type.json b/frappe/event_streaming/doctype/event_consumer_document_type/event_consumer_document_type.json index 71dcc63127..c243334a09 100644 --- a/frappe/event_streaming/doctype/event_consumer_document_type/event_consumer_document_type.json +++ b/frappe/event_streaming/doctype/event_consumer_document_type/event_consumer_document_type.json @@ -7,7 +7,8 @@ "field_order": [ "ref_doctype", "status", - "unsubscribed" + "unsubscribed", + "condition" ], "fields": [ { @@ -37,11 +38,17 @@ "in_list_view": 1, "label": "Unsubscribed", "read_only": 1 + }, + { + "fieldname": "condition", + "fieldtype": "Code", + "label": "Condition", + "read_only": 1 } ], "istable": 1, "links": [], - "modified": "2020-08-14 12:38:40.918620", + "modified": "2020-11-07 09:26:49.894294", "modified_by": "Administrator", "module": "Event Streaming", "name": "Event Consumer Document Type", diff --git a/frappe/event_streaming/doctype/event_producer/event_producer.py b/frappe/event_streaming/doctype/event_producer/event_producer.py index d458f3c24b..d8a6a55510 100644 --- a/frappe/event_streaming/doctype/event_producer/event_producer.py +++ b/frappe/event_streaming/doctype/event_producer/event_producer.py @@ -102,9 +102,13 @@ class EventProducer(Document): for entry in self.producer_doctypes: if entry.has_mapping: # if mapping, subscribe to remote doctype on consumer's site - consumer_doctypes.append(frappe.db.get_value('Document Type Mapping', entry.mapping, 'remote_doctype')) + dt = frappe.db.get_value('Document Type Mapping', entry.mapping, 'remote_doctype') else: - consumer_doctypes.append(entry.ref_doctype) + dt = entry.ref_doctype + consumer_doctypes.append({ + "doctype": dt, + "condition": entry.condition + }) user_key = frappe.db.get_value('User', self.user, 'api_key') user_secret = get_decrypted_password('User', self.user, 'api_secret') @@ -145,7 +149,8 @@ class EventProducer(Document): event_consumer.consumer_doctypes.append({ 'ref_doctype': ref_doctype, 'status': get_approval_status(config, ref_doctype), - 'unsubscribed': entry.unsubscribe + 'unsubscribed': entry.unsubscribe, + 'condition': entry.condition }) event_consumer.user = self.user event_consumer.incoming_change = True @@ -347,13 +352,13 @@ def set_delete(update): def get_updates(producer_site, last_update, doctypes): """Get all updates generated after the last update timestamp""" - docs = producer_site.get_list( - doctype='Event Update Log', - filters={'ref_doctype': ('in', doctypes), 'creation': ('>', last_update)}, - fields=['update_type', 'ref_doctype', 'docname', 'data', 'name', 'creation'] - ) - docs.reverse() - return [frappe._dict(d) for d in docs] + docs = producer_site.post_request({ + 'cmd': 'frappe.event_streaming.doctype.event_update_log.event_update_log.get_update_logs_for_consumer', + 'event_consumer': get_url(), + 'doctypes': frappe.as_json(doctypes), + 'last_update': last_update + }) + return [frappe._dict(d) for d in (docs or [])] def get_local_doc(update): diff --git a/frappe/event_streaming/doctype/event_producer/test_event_producer.py b/frappe/event_streaming/doctype/event_producer/test_event_producer.py index fa2461a9d8..4c259c3729 100644 --- a/frappe/event_streaming/doctype/event_producer/test_event_producer.py +++ b/frappe/event_streaming/doctype/event_producer/test_event_producer.py @@ -152,6 +152,82 @@ class TestEventProducer(unittest.TestCase): reset_configuration(producer_url) + def test_conditional_events(self): + producer = get_remote_site() + + # Add Condition + event_producer = frappe.get_doc('Event Producer', producer_url) + note_producer_entry = [ + x for x in event_producer.producer_doctypes if x.ref_doctype == 'Note' + ][0] + note_producer_entry.condition = 'doc.public == 1' + event_producer.save() + + # Make test doc + producer_note1 = frappe._dict(doctype='Note', public=0, title='test conditional sync') + delete_on_remote_if_exists(producer, 'Note', {'title': producer_note1['title']}) + producer_note1 = producer.insert(producer_note1) + + # Make Update + producer_note1['content'] = 'Test Conditional Sync Content' + producer_note1 = producer.update(producer_note1) + + self.pull_producer_data() + + # Check if synced here + self.assertFalse(frappe.db.exists('Note', producer_note1.name)) + + # Lets satisfy the condition + producer_note1['public'] = 1 + producer_note1 = producer.update(producer_note1) + + self.pull_producer_data() + + # it should sync now + self.assertTrue(frappe.db.exists('Note', producer_note1.name)) + local_note = frappe.get_doc('Note', producer_note1.name) + self.assertEqual(local_note.content, producer_note1.content) + + reset_configuration(producer_url) + + def test_conditional_events_with_cmd(self): + producer = get_remote_site() + + # Add Condition + event_producer = frappe.get_doc('Event Producer', producer_url) + note_producer_entry = [ + x for x in event_producer.producer_doctypes if x.ref_doctype == 'Note' + ][0] + note_producer_entry.condition = 'cmd: frappe.event_streaming.doctype.event_producer.test_event_producer.can_sync_note' + event_producer.save() + + # Make test doc + producer_note1 = frappe._dict(doctype='Note', public=0, title='test conditional sync cmd') + delete_on_remote_if_exists(producer, 'Note', {'title': producer_note1['title']}) + producer_note1 = producer.insert(producer_note1) + + # Make Update + producer_note1['content'] = 'Test Conditional Sync Content' + producer_note1 = producer.update(producer_note1) + + self.pull_producer_data() + + # Check if synced here + self.assertFalse(frappe.db.exists('Note', producer_note1.name)) + + # Lets satisfy the condition + producer_note1['public'] = 1 + producer_note1 = producer.update(producer_note1) + + self.pull_producer_data() + + # it should sync now + self.assertTrue(frappe.db.exists('Note', producer_note1.name)) + local_note = frappe.get_doc('Note', producer_note1.name) + self.assertEqual(local_note.content, producer_note1.content) + + reset_configuration(producer_url) + def test_update_log(self): producer = get_remote_site() producer_doc = insert_into_producer(producer, 'test update log') @@ -221,6 +297,8 @@ class TestEventProducer(unittest.TestCase): reset_configuration(producer_url) +def can_sync_note(consumer, doc, update_log): + return doc.public == 1 def setup_event_producer_for_inner_mapping(): event_producer = frappe.get_doc('Event Producer', producer_url, for_update=True) @@ -322,6 +400,7 @@ def create_event_producer(producer_url): def reset_configuration(producer_url): event_producer = frappe.get_doc('Event Producer', producer_url, for_update=True) event_producer.producer_doctypes = [] + event_producer.conditions = [] event_producer.producer_url = producer_url event_producer.append('producer_doctypes', { 'ref_doctype': 'ToDo', diff --git a/frappe/event_streaming/doctype/event_producer_document_type/event_producer_document_type.json b/frappe/event_streaming/doctype/event_producer_document_type/event_producer_document_type.json index e5fe9497f8..17fd51d12d 100644 --- a/frappe/event_streaming/doctype/event_producer_document_type/event_producer_document_type.json +++ b/frappe/event_streaming/doctype/event_producer_document_type/event_producer_document_type.json @@ -10,7 +10,8 @@ "use_same_name", "unsubscribe", "has_mapping", - "mapping" + "mapping", + "condition" ], "fields": [ { @@ -63,11 +64,16 @@ "fieldtype": "Check", "in_list_view": 1, "label": "Unsubscribe" + }, + { + "fieldname": "condition", + "fieldtype": "Code", + "label": "Condition" } ], "istable": 1, "links": [], - "modified": "2020-08-14 11:38:01.278996", + "modified": "2020-11-07 09:26:58.463868", "modified_by": "Administrator", "module": "Event Streaming", "name": "Event Producer Document Type", diff --git a/frappe/event_streaming/doctype/event_update_log/event_update_log.json b/frappe/event_streaming/doctype/event_update_log/event_update_log.json index 452a656b8b..a42bc7ec87 100644 --- a/frappe/event_streaming/doctype/event_update_log/event_update_log.json +++ b/frappe/event_streaming/doctype/event_update_log/event_update_log.json @@ -1,4 +1,5 @@ { + "actions": [], "creation": "2019-07-30 15:31:26.352527", "doctype": "DocType", "editable_grid": 1, @@ -7,7 +8,8 @@ "update_type", "ref_doctype", "docname", - "data" + "data", + "consumers" ], "fields": [ { @@ -31,7 +33,6 @@ "fieldtype": "Data", "in_list_view": 1, "label": "Document Name", - "options": "ref_doctype", "read_only": 1 }, { @@ -39,10 +40,18 @@ "fieldtype": "Code", "label": "Data", "read_only": 1 + }, + { + "fieldname": "consumers", + "fieldtype": "Table MultiSelect", + "label": "Consumers", + "options": "Event Update Log Consumer", + "read_only": 1 } ], "in_create": 1, - "modified": "2019-09-24 23:16:07.207707", + "links": [], + "modified": "2020-09-04 07:31:52.599804", "modified_by": "Administrator", "module": "Event Streaming", "name": "Event Update Log", diff --git a/frappe/event_streaming/doctype/event_update_log/event_update_log.py b/frappe/event_streaming/doctype/event_update_log/event_update_log.py index 646331a02c..1c31718c2b 100644 --- a/frappe/event_streaming/doctype/event_update_log/event_update_log.py +++ b/frappe/event_streaming/doctype/event_update_log/event_update_log.py @@ -140,3 +140,137 @@ def check_docstatus(out, old, new, for_child): if not for_child and old.docstatus != new.docstatus: out.changed['docstatus'] = new.docstatus return out + + +def is_consumer_uptodate(update_log, consumer): + """ + Checks if Consumer has read all the UpdateLogs before the specified update_log + :param update_log: The UpdateLog Doc in context + :param consumer: The EventConsumer doc + """ + if update_log.update_type == 'Create': + # consumer is obviously up to date + return True + + prev_logs = frappe.get_all( + 'Event Update Log', + filters={ + 'ref_doctype': update_log.ref_doctype, + 'docname': update_log.docname, + 'creation': ['<', update_log.creation] + }, + order_by='creation desc', + limit_page_length=1 + ) + + if not len(prev_logs): + return False + + prev_log_consumers = frappe.get_all( + 'Event Update Log Consumer', + fields=['consumer'], + filters={ + 'parent': prev_logs[0].name, + 'parenttype': 'Event Update Log', + 'consumer': consumer.name + } + ) + + return len(prev_log_consumers) > 0 + + +def mark_consumer_read(update_log_name, consumer_name): + """ + This function appends the Consumer to the list of Consumers that has 'read' an Update Log + """ + update_log = frappe.get_doc('Event Update Log', update_log_name) + if len([x for x in update_log.consumers if x.consumer == consumer_name]): + return + + frappe.get_doc(frappe._dict( + doctype='Event Update Log Consumer', + consumer=consumer_name, + parent=update_log_name, + parenttype='Event Update Log', + parentfield='consumers' + )).insert(ignore_permissions=True) + + +def get_unread_update_logs(consumer_name, dt, dn): + """ + Get old logs unread by the consumer on a particular document + """ + already_consumed = [x[0] for x in frappe.db.sql(""" + SELECT + update_log.name + FROM `tabEvent Update Log` update_log + JOIN `tabEvent Update Log Consumer` consumer ON consumer.parent = update_log.name + WHERE + consumer.consumer = %(consumer)s + AND update_log.ref_doctype = %(dt)s + AND update_log.docname = %(dn)s + """, {'consumer': consumer_name, "dt": dt, "dn": dn}, as_dict=0)] + + logs = frappe.get_all( + 'Event Update Log', + fields=['update_type', 'ref_doctype', + 'docname', 'data', 'name', 'creation'], + filters={ + 'ref_doctype': dt, + 'docname': dn, + 'name': ['not in', already_consumed] + }, + order_by='creation' + ) + + return logs + + +@frappe.whitelist() +def get_update_logs_for_consumer(event_consumer, doctypes, last_update): + """ + Fetches all the UpdateLogs for the consumer + It will inject old un-consumed Update Logs if a doc was just found to be accessible to the Consumer + """ + + if isinstance(doctypes, str): + doctypes = frappe.parse_json(doctypes) + + from frappe.event_streaming.doctype.event_consumer.event_consumer import has_consumer_access + + consumer = frappe.get_doc('Event Consumer', event_consumer) + docs = frappe.get_list( + doctype='Event Update Log', + filters={'ref_doctype': ('in', doctypes), + 'creation': ('>', last_update)}, + fields=['update_type', 'ref_doctype', + 'docname', 'data', 'name', 'creation'], + order_by='creation desc' + ) + + result = [] + to_update_history = [] + for d in docs: + if (d.ref_doctype, d.docname) in to_update_history: + # will be notified by background jobs + continue + + if not has_consumer_access(consumer=consumer, update_log=d): + continue + + if not is_consumer_uptodate(d, consumer): + to_update_history.append((d.ref_doctype, d.docname)) + # get_unread_update_logs will have the current log + old_logs = get_unread_update_logs(consumer.name, d.ref_doctype, d.docname) + if old_logs: + old_logs.reverse() + result.extend(old_logs) + else: + result.append(d) + + + for d in result: + mark_consumer_read(update_log_name=d.name, consumer_name=consumer.name) + + result.reverse() + return result \ No newline at end of file diff --git a/frappe/event_streaming/doctype/event_update_log_consumer/__init__.py b/frappe/event_streaming/doctype/event_update_log_consumer/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/event_streaming/doctype/event_update_log_consumer/event_update_log_consumer.json b/frappe/event_streaming/doctype/event_update_log_consumer/event_update_log_consumer.json new file mode 100644 index 0000000000..b3484c6481 --- /dev/null +++ b/frappe/event_streaming/doctype/event_update_log_consumer/event_update_log_consumer.json @@ -0,0 +1,32 @@ +{ + "actions": [], + "creation": "2020-06-30 10:54:53.301787", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "consumer" + ], + "fields": [ + { + "fieldname": "consumer", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Consumer", + "options": "Event Consumer", + "reqd": 1 + } + ], + "istable": 1, + "links": [], + "modified": "2020-06-30 10:54:53.301787", + "modified_by": "Administrator", + "module": "Event Streaming", + "name": "Event Update Log Consumer", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/event_streaming/doctype/event_update_log_consumer/event_update_log_consumer.py b/frappe/event_streaming/doctype/event_update_log_consumer/event_update_log_consumer.py new file mode 100644 index 0000000000..ee6d5d8ca9 --- /dev/null +++ b/frappe/event_streaming/doctype/event_update_log_consumer/event_update_log_consumer.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class EventUpdateLogConsumer(Document): + pass From 14fe6ccfa3e12afbe94ead781aa3179f79f20a2f Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 13 Nov 2020 19:42:38 +0530 Subject: [PATCH 105/259] fix: Add is_partial check in bench restore --- frappe/commands/site.py | 35 ++++++++++++++++++++++++++++++++--- frappe/installer.py | 8 ++++++++ frappe/utils/backups.py | 1 + 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index c12afcb7ef..b55e7b7253 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -56,17 +56,41 @@ def new_site(site, mariadb_root_username=None, mariadb_root_password=None, admin @pass_context def restore(context, sql_file_path, mariadb_root_username=None, mariadb_root_password=None, db_name=None, verbose=None, install_app=None, admin_password=None, force=None, with_public_files=None, with_private_files=None): "Restore site database from an sql file" - from frappe.installer import extract_sql_from_archive, extract_files, is_downgrade, validate_database_sql + from frappe.installer import ( + extract_sql_from_archive, + extract_files, + is_downgrade, + is_partial, + validate_database_sql + ) + force = context.force or force decompressed_file_name = extract_sql_from_archive(sql_file_path) + # check if partial backup + if is_partial(decompressed_file_name): + click.secho( + "Partial Backup file detected. You cannot use a partial file to restore a Frappe Site.", + fg="red" + ) + click.secho( + "Use `bench partial-restore` to restore a partial backup to an existing site.", + fg="yellow" + ) + sys.exit(1) + + # check if valid SQL file validate_database_sql(decompressed_file_name, _raise=force) + site = get_site(context) frappe.init(site=site) # dont allow downgrading to older versions of frappe without force if not force and is_downgrade(decompressed_file_name, verbose=True): - warn_message = "This is not recommended and may lead to unexpected behaviour. Do you want to continue anyway?" + warn_message = ( + "This is not recommended and may lead to unexpected behaviour. " + "Do you want to continue anyway?" + ) click.confirm(warn_message, abort=True) _new_site(frappe.conf.db_name, site, mariadb_root_username=mariadb_root_username, @@ -89,9 +113,13 @@ def restore(context, sql_file_path, mariadb_root_username=None, mariadb_root_pas if decompressed_file_name != sql_file_path: os.remove(decompressed_file_name) - success_message = "Site {0} has been restored{1}".format(site, " with files" if (with_public_files or with_private_files) else "") + success_message = "Site {0} has been restored{1}".format( + site, + " with files" if (with_public_files or with_private_files) else "" + ) click.secho(success_message, fg="green") + @click.command('partial-restore') @click.argument('sql-file-path') @click.option("--verbose", "-v", is_flag=True) @@ -106,6 +134,7 @@ def partial_restore(context, sql_file_path, verbose): partial_restore(sql_file_path, verbose) frappe.destroy() + @click.command('reinstall') @click.option('--admin-password', help='Administrator Password for reinstalled site') @click.option('--mariadb-root-username', help='Root username for MariaDB') diff --git a/frappe/installer.py b/frappe/installer.py index 2285d0011a..32a61f35fb 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -528,6 +528,14 @@ def is_downgrade(sql_file_path, verbose=False): return downgrade +def is_partial(sql_file_path): + with open(sql_file_path) as f: + header = " ".join([f.readline() for _ in range(5)]) + if "Partial Backup" in header: + return True + return False + + def partial_restore(sql_file_path, verbose=False): sql_file = extract_sql_from_archive(sql_file_path) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 178d213e59..fe045be81f 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -6,6 +6,7 @@ import os from calendar import timegm from datetime import datetime from glob import glob +import gzip # imports - third party imports import click From 2fd5a82bbdd970089e209229eaa93304493c8ab5 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 13 Nov 2020 19:43:07 +0530 Subject: [PATCH 106/259] fix: Add header content in database backups --- frappe/utils/backups.py | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index fe045be81f..b11c73c2b2 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -342,17 +342,36 @@ class BackupGenerator: def take_dump(self): import frappe.utils + from frappe.utils.change_log import get_app_branch + + database_header_content = [ + f"Backup generated by Frappe {frappe.__version__} on branch {get_app_branch('frappe') or 'N/A'}", + "", + ] # escape reserved characters - args = dict( + args = frappe._dict( [item[0], frappe.utils.esc(str(item[1]), "$ ")] for item in self.__dict__.copy().items() ) if self.backup_includes: - print("Backing Up Tables: {0}\n".format(", ".join(self.backup_includes))) + backup_info = ("Backing Up Tables: ", ", ".join(self.backup_includes)) elif self.backup_excludes: - print("Skipping Tables: {0}\n".format(", ".join(self.backup_excludes))) + backup_info = ("Skipping Tables: ", ", ".join(self.backup_excludes)) + + if self.partial: + print(''.join(backup_info), "\n") + database_header_content.extend([ + f"Partial Backup of Frappe Site {frappe.local.site}", + ("Backup contains: " if self.backup_includes else "Backup excludes: ") + backup_info[1], + "", + ]) + + generated_header = "\n".join([f"-- {x}" for x in database_header_content]) + "\n" + + with gzip.open(args.backup_path_db, "wt") as f: + f.write(generated_header) if self.db_type == "postgres": if self.backup_includes: @@ -366,7 +385,7 @@ class BackupGenerator: cmd_string = ( "pg_dump postgres://{user}:{password}@{db_host}:{db_port}/{db_name}" - " {include} {exclude} | gzip > {backup_path_db}" + " {include} {exclude} | gzip >> {backup_path_db}" ) else: @@ -383,16 +402,16 @@ class BackupGenerator: cmd_string = ( "mysqldump --single-transaction --quick --lock-tables=false -u {user}" " -p{password} {db_name} -h {db_host} -P {db_port} {include} {exclude}" - " | gzip > {backup_path_db}" + " | gzip >> {backup_path_db}" ) command = cmd_string.format( - user=args.get("user"), - password=args.get("password"), - db_host=args.get("db_host"), - db_port=args.get("db_port"), - db_name=args.get("db_name"), - backup_path_db=args.get("backup_path_db"), + user=args.user, + password=args.password, + db_host=args.db_host, + db_port=args.db_port, + db_name=args.db_name, + backup_path_db=args.backup_path_db, exclude=args.get("exclude", ""), include=args.get("include", ""), ) From 22b752ac21c69cf2f50df9bfae472c1dacf0128a Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Sat, 14 Nov 2020 11:11:19 +0530 Subject: [PATCH 107/259] test: Add tests for bench restore --- frappe/tests/test_commands.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index 3f19abdae4..422dbf2930 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -201,9 +201,7 @@ class TestCommands(BaseTestCommands): # test 5: take a backup with --compress self.execute("bench --site {site} backup --with-files --compress") - self.assertEquals(self.returncode, 0) - compressed_files = glob(site_backup_path + "/*.tgz") self.assertGreater(len(compressed_files), 0) @@ -244,6 +242,18 @@ class TestCommands(BaseTestCommands): database = fetch_latest_backups()["database"] self.assertTrue(exists_in_backup(backup["excludes"]["excludes"], database)) + def test_restore(self): + # test 1: bench restore from full backup + self.execute("bench --site {site} backup --ignore-backup-conf") + database = fetch_latest_backups()["database"] + self.execute("bench --site {site} restore {database}", {"database": database}) + + # test 2: restore from partial backup + self.execute("bench --site {site} backup --exclude 'ToDo") + database = fetch_latest_backups(partial=True)["database"] + self.execute("bench --site {site} restore {database}", {"database": database}) + self.assertEquals(self.returncode, 1) + def test_partial_restore(self): _now = now() for num in range(10): From e8c6a7afc2ad7d70bdf5daf3bb3cae382f088410 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Sat, 14 Nov 2020 14:48:39 +0530 Subject: [PATCH 108/259] fix: Manage private images via get_local_image --- frappe/core/doctype/file/file.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index b8bed89a4d..2a4e1983c9 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -612,7 +612,12 @@ def get_extension(filename, extn, content): return extn def get_local_image(file_url): - file_path = frappe.get_site_path("public", file_url.lstrip("/")) + if file_url.startswith("/private"): + file_url_path = (file_url.lstrip("/"), ) + else: + file_url_path = ("public", file_url.lstrip("/")) + + file_path = frappe.get_site_path(*file_url_path) try: image = Image.open(file_path) From 2bc477331d2eab4a90a62982c53bff746cb50358 Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Date: Mon, 16 Nov 2020 13:59:56 +0530 Subject: [PATCH 109/259] refactor: cleanup --- .../public/js/frappe/form/controls/comment.js | 2 +- .../public/js/frappe/form/footer/timeline.js | 52 ++++++++++++------- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/comment.js b/frappe/public/js/frappe/form/controls/comment.js index a64df56bca..d00c915065 100644 --- a/frappe/public/js/frappe/form/controls/comment.js +++ b/frappe/public/js/frappe/form/controls/comment.js @@ -60,7 +60,7 @@ frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({ update_state() { const value = this.get_value(); - if (strip_html(value).trim() != "") { + if (strip_html(value).trim() != "" || value.includes('img')) { this.button.removeClass('btn-default').addClass('btn-primary'); } else { this.button.addClass('btn-default').removeClass('btn-primary'); diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js index 84f34d4757..2e390dc3cb 100644 --- a/frappe/public/js/frappe/form/footer/timeline.js +++ b/frappe/public/js/frappe/form/footer/timeline.js @@ -30,7 +30,7 @@ frappe.ui.form.Timeline = class Timeline { render_input: true, only_input: true, on_submit: (val) => { - if(strip_html(val).trim() != "") { + if(strip_html(val).trim() != "" || val.includes('img')) { this.insert_comment(val, this.comment_area.button); } } @@ -547,10 +547,14 @@ frappe.ui.form.Timeline = class Timeline { log.color = 'dark'; log.sender = log.owner; log.comment_type = 'Milestone'; - log.content = __('{0} changed {1} to {2}', [ - frappe.user.full_name(log.owner).bold(), - frappe.meta.get_label(this.frm.doctype, log.track_field), - log.value.bold()]); + log.content = __( + '{0} changed {1} to {2}', + [ + frappe.user.full_name(log.owner).bold(), + frappe.meta.get_label(this.frm.doctype, log.track_field), + log.value.bold() + ] + ); return log; }); return milestones; @@ -613,11 +617,14 @@ frappe.ui.form.Timeline = class Timeline { const field_display_status = frappe.perm.get_field_display_status(df, null, me.frm.perm); if (field_display_status === 'Read' || field_display_status === 'Write') { - parts.push(__('{0} from {1} to {2}', [ - __(df.label), - me.format_content_for_timeline(p[1]), - me.format_content_for_timeline(p[2]) - ])); + parts.push(__( + '{0} from {1} to {2}', + [ + __(df.label), + me.format_content_for_timeline(p[1]), + me.format_content_for_timeline(p[2]) + ] + )); } } } @@ -648,13 +655,18 @@ frappe.ui.form.Timeline = class Timeline { null, me.frm.perm); if (field_display_status === 'Read' || field_display_status === 'Write') { - parts.push(__('{0} from {1} to {2} in row #{3}', [ - frappe.meta.get_label(me.frm.fields_dict[row[0]].grid.doctype, - p[0]), - me.format_content_for_timeline(p[1]), - me.format_content_for_timeline(p[2]), - row[1] - ])); + parts.push(__( + '{0} from {1} to {2} in row #{3}', + [ + frappe.meta.get_label( + me.frm.fields_dict[row[0]].grid.doctype, + p[0] + ), + me.format_content_for_timeline(p[1]), + me.format_content_for_timeline(p[2]), + row[1] + ] + )); } } return parts.length < 3; @@ -691,8 +703,10 @@ frappe.ui.form.Timeline = class Timeline { return p; }); if (parts.length) { - out.push(me.get_version_comment(version, __("{0} rows for {1}", - [__(key), parts.join(', ')]))); + out.push(me.get_version_comment(version, __( + "{0} rows for {1}", + [__(key), parts.join(', ')] + ))); } } }); From 4443dab3cbc4510574e306ba84d114e13ac8e6dc Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Mon, 16 Nov 2020 14:03:00 +0530 Subject: [PATCH 110/259] refactor: solve sider issues --- frappe/public/js/frappe/form/footer/timeline.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js index 2e390dc3cb..c23b6d8127 100644 --- a/frappe/public/js/frappe/form/footer/timeline.js +++ b/frappe/public/js/frappe/form/footer/timeline.js @@ -30,7 +30,7 @@ frappe.ui.form.Timeline = class Timeline { render_input: true, only_input: true, on_submit: (val) => { - if(strip_html(val).trim() != "" || val.includes('img')) { + if (strip_html(val).trim() != "" || val.includes('img')) { this.insert_comment(val, this.comment_area.button); } } From c4e57926f9899a3c0d1a0922aea651f66a3032a9 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 17 Nov 2020 12:33:21 +0530 Subject: [PATCH 111/259] feat(postgres): Show restore progress if pv is available --- frappe/database/postgres/setup_db.py | 50 +++++++++++++++++----------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/frappe/database/postgres/setup_db.py b/frappe/database/postgres/setup_db.py index 109ed0469e..bf344c3aa5 100644 --- a/frappe/database/postgres/setup_db.py +++ b/frappe/database/postgres/setup_db.py @@ -1,5 +1,7 @@ -import frappe, subprocess, os -from six.moves import input +import os + +import frappe + def setup_database(force, source_sql=None, verbose=False): root_conn = get_root_connection() @@ -19,6 +21,7 @@ def bootstrap_database(db_name, verbose, source_sql=None): frappe.connect(db_name=db_name) import_db_from_sql(source_sql, verbose) frappe.connect(db_name=db_name) + if 'tabDefaultValue' not in frappe.db.get_tables(): import sys from click import secho @@ -32,32 +35,40 @@ def bootstrap_database(db_name, verbose, source_sql=None): sys.exit(1) def import_db_from_sql(source_sql=None, verbose=False): - if verbose: - print("Starting Database Import...") + from shlex import split + from shutil import which + from subprocess import run, PIPE # we can't pass psql password in arguments in postgresql as mysql. So # set password connection parameter in environment variable subprocess_env = os.environ.copy() subprocess_env['PGPASSWORD'] = str(frappe.conf.db_password) + # bootstrap db if not source_sql: source_sql = os.path.join(os.path.dirname(__file__), 'framework_postgres.sql') - command = [ - 'psql', frappe.conf.db_name, - '-h', frappe.conf.db_host or 'localhost', - '-p', str(frappe.conf.db_port or '5432'), - '-U', frappe.conf.db_name, - '-f', source_sql - ] + pv = which('pv') + + _command = ( + f"psql {frappe.conf.db_name} " + f"-h {frappe.conf.db_host or 'localhost'} -p {str(frappe.conf.db_port or '5432')} " + f"-U {frappe.conf.db_name}" + ) + + if pv: + command = f"{pv} {source_sql} | " + _command + else: + command = _command + f"-f {source_sql}" + + print("Restoring Database file...") + if verbose: + print(command) + + restore_proc = run(command, env=subprocess_env, shell=True, stdout=PIPE) if verbose: - print(" ".join(command)) - - subprocess.check_output(command, env=subprocess_env) - - if verbose: - print(f"Imported from Database File: {source_sql}") + print(f"\nSTDOUT by psql:\n{restore_proc.stdout.decode()}\nImported from Database File: {source_sql}") def setup_help_database(help_db_name): root_conn = get_root_connection() @@ -68,19 +79,20 @@ def setup_help_database(help_db_name): root_conn.sql("GRANT ALL PRIVILEGES ON DATABASE `{0}` TO {0}".format(help_db_name)) def get_root_connection(root_login=None, root_password=None): - import getpass if not frappe.local.flags.root_connection: if not root_login: root_login = frappe.conf.get("root_login") or None if not root_login: + from six.moves import input root_login = input("Enter postgres super user: ") if not root_password: root_password = frappe.conf.get("root_password") or None if not root_password: - root_password = getpass.getpass("Postgres super user password: ") + from getpass import getpass + root_password = getpass("Postgres super user password: ") frappe.local.flags.root_connection = frappe.database.get_db(user=root_login, password=root_password) From 84e2fcd6a8b7bdc0ec6f6eaabe1b4b6d7582cf3c Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 17 Nov 2020 12:33:59 +0530 Subject: [PATCH 112/259] fix: Add missing quote --- frappe/tests/test_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index 422dbf2930..3c5fddeef0 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -249,7 +249,7 @@ class TestCommands(BaseTestCommands): self.execute("bench --site {site} restore {database}", {"database": database}) # test 2: restore from partial backup - self.execute("bench --site {site} backup --exclude 'ToDo") + self.execute("bench --site {site} backup --exclude 'ToDo'") database = fetch_latest_backups(partial=True)["database"] self.execute("bench --site {site} restore {database}", {"database": database}) self.assertEquals(self.returncode, 1) From 3b5ec6aa88fa94a83aa00358fb2f85f7e72e0ab5 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 17 Nov 2020 12:45:55 +0530 Subject: [PATCH 113/259] fix: Sider + improper command ending --- frappe/database/postgres/setup_db.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/database/postgres/setup_db.py b/frappe/database/postgres/setup_db.py index bf344c3aa5..3ee6b6a286 100644 --- a/frappe/database/postgres/setup_db.py +++ b/frappe/database/postgres/setup_db.py @@ -35,7 +35,6 @@ def bootstrap_database(db_name, verbose, source_sql=None): sys.exit(1) def import_db_from_sql(source_sql=None, verbose=False): - from shlex import split from shutil import which from subprocess import run, PIPE @@ -59,7 +58,7 @@ def import_db_from_sql(source_sql=None, verbose=False): if pv: command = f"{pv} {source_sql} | " + _command else: - command = _command + f"-f {source_sql}" + command = _command + f" -f {source_sql}" print("Restoring Database file...") if verbose: From 7d091c19575a28f28803f2062a840d9c88d81432 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 19 Oct 2020 12:04:03 +0530 Subject: [PATCH 114/259] fix: Move attachment limit validation to file uploader --- frappe/public/js/frappe/file_uploader/index.js | 6 ++++++ frappe/public/js/frappe/form/form.js | 6 +----- frappe/public/js/frappe/form/sidebar/attachments.js | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/file_uploader/index.js b/frappe/public/js/frappe/file_uploader/index.js index 62a7bff822..5336cd7c52 100644 --- a/frappe/public/js/frappe/file_uploader/index.js +++ b/frappe/public/js/frappe/file_uploader/index.js @@ -15,7 +15,13 @@ export default class FileUploader { allow_multiple, as_dataurl, disable_file_browser, + frm } = {}) { + if (frm && frm.attachments.max_reached()) { + frappe.throw(__("Maximum Attachment Limit for this record reached.")); + return; + } + if (!wrapper) { this.make_dialog(); } else { diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index bb9e8c22d1..90b628f269 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -232,14 +232,10 @@ frappe.ui.form.Form = class FrappeForm { throw "attach error"; } - if(me.attachments.max_reached()) { - frappe.msgprint(__("Maximum Attachment Limit for this record reached.")); - throw "attach error"; - } - new frappe.ui.FileUploader({ doctype: me.doctype, docname: me.docname, + frm: me, files: dataTransfer.files, folder: 'Home/Attachments', on_success(file_doc) { diff --git a/frappe/public/js/frappe/form/sidebar/attachments.js b/frappe/public/js/frappe/form/sidebar/attachments.js index 165527e281..dc0c839737 100644 --- a/frappe/public/js/frappe/form/sidebar/attachments.js +++ b/frappe/public/js/frappe/form/sidebar/attachments.js @@ -140,7 +140,6 @@ frappe.ui.form.Attachments = Class.extend({ }); }, new_attachment: function(fieldname) { - var me = this; if (this.dialog) { // remove upload dialog this.dialog.$wrapper.remove(); @@ -149,6 +148,7 @@ frappe.ui.form.Attachments = Class.extend({ new frappe.ui.FileUploader({ doctype: this.frm.doctype, docname: this.frm.docname, + frm: this.frm, folder: 'Home/Attachments', on_success: (file_doc) => { this.attachment_uploaded(file_doc); From b33461bb53f05233017d27f19d83846c59e235e4 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 19 Oct 2020 12:04:57 +0530 Subject: [PATCH 115/259] feat: Add server-side validation for attachment limit --- frappe/core/doctype/file/file.py | 21 +++++++++++++++++++++ frappe/exceptions.py | 1 + 2 files changed, 22 insertions(+) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index b8bed89a4d..9b0b3f3fd1 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -93,6 +93,7 @@ class File(Document): self.set_is_private() self.set_file_name() self.validate_duplicate_entry() + self.validate_attachment_limit() self.validate_folder() if not self.file_url and not self.flags.ignore_file_validate: @@ -140,6 +141,26 @@ class File(Document): if self.file_url and (self.is_private != self.file_url.startswith('/private')): frappe.throw(_('Invalid file URL. Please contact System Administrator.')) + def validate_attachment_limit(self): + attachment_limit = 0 + if self.attached_to_doctype and self.attached_to_name: + attachment_limit = frappe.get_meta(self.attached_to_doctype).max_attachments + + if attachment_limit: + current_attachment_count = len(frappe.get_all('File', filters={ + 'attached_to_doctype': self.attached_to_doctype, + 'attached_to_name': self.attached_to_name, + }, limit=(attachment_limit + 1))) + + if current_attachment_count >= attachment_limit: + frappe.throw(_("Attachment Limit reached for {0} {1}.").format( + self.attached_to_doctype, + self.attached_to_name + ), + exc=frappe.exceptions.AttachmentLimitReached, + title=_('Maximum Attachment Limit Reached') + ) + def set_folder_name(self): """Make parent folders if not exists based on reference doctype and name""" if self.attached_to_doctype and not self.folder: diff --git a/frappe/exceptions.py b/frappe/exceptions.py index 267f5410af..81fccf5880 100644 --- a/frappe/exceptions.py +++ b/frappe/exceptions.py @@ -106,6 +106,7 @@ class InvalidDates(ValidationError): pass class DataTooLongException(ValidationError): pass class FileAlreadyAttachedException(Exception): pass class DocumentAlreadyRestored(Exception): pass +class AttachmentLimitReached(Exception): pass # OAuth exceptions class InvalidAuthorizationHeader(CSRFTokenError): pass class InvalidAuthorizationPrefix(CSRFTokenError): pass From 23efc9919ab24c58d60256a02fb067e5e11ff9d0 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 19 Oct 2020 12:37:02 +0530 Subject: [PATCH 116/259] fix: Update validation message --- frappe/core/doctype/file/file.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 9b0b3f3fd1..bb7765e055 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -153,12 +153,12 @@ class File(Document): }, limit=(attachment_limit + 1))) if current_attachment_count >= attachment_limit: - frappe.throw(_("Attachment Limit reached for {0} {1}.").format( + frappe.throw(_("Maximum Attachment Limit reached for {0} {1}.").format( self.attached_to_doctype, self.attached_to_name ), exc=frappe.exceptions.AttachmentLimitReached, - title=_('Maximum Attachment Limit Reached') + title=_('Attachment Limit Reached') ) def set_folder_name(self): From a2471ace211831c644454f13df8a4b384b251af9 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 19 Oct 2020 12:43:14 +0530 Subject: [PATCH 117/259] fix: Update attachment limit --- frappe/public/js/frappe/file_uploader/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/file_uploader/index.js b/frappe/public/js/frappe/file_uploader/index.js index 5336cd7c52..36de853b8f 100644 --- a/frappe/public/js/frappe/file_uploader/index.js +++ b/frappe/public/js/frappe/file_uploader/index.js @@ -18,7 +18,10 @@ export default class FileUploader { frm } = {}) { if (frm && frm.attachments.max_reached()) { - frappe.throw(__("Maximum Attachment Limit for this record reached.")); + frappe.throw({ + title: __("Attachment Limit Reached"), + message: __("Maximum attachment limit for this record reached."), + }); return; } From 42fc8fb25c8ec59d99468d99a316518aff62f158 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 19 Oct 2020 13:34:04 +0530 Subject: [PATCH 118/259] fix: Convert limit to integer --- frappe/core/doctype/file/file.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index bb7765e055..a8a999ff9a 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -144,13 +144,13 @@ class File(Document): def validate_attachment_limit(self): attachment_limit = 0 if self.attached_to_doctype and self.attached_to_name: - attachment_limit = frappe.get_meta(self.attached_to_doctype).max_attachments + attachment_limit = cint(frappe.get_meta(self.attached_to_doctype).max_attachments) if attachment_limit: current_attachment_count = len(frappe.get_all('File', filters={ 'attached_to_doctype': self.attached_to_doctype, 'attached_to_name': self.attached_to_name, - }, limit=(attachment_limit + 1))) + }, limit=attachment_limit + 1)) if current_attachment_count >= attachment_limit: frappe.throw(_("Maximum Attachment Limit reached for {0} {1}.").format( From e64483ad89b7d6af385256aaccb9a8acbcff3b0a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 19 Oct 2020 13:35:16 +0530 Subject: [PATCH 119/259] test: Add test for attachment limit validation --- frappe/core/doctype/file/test_file.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py index 85397ea1ee..cb44d33781 100644 --- a/frappe/core/doctype/file/test_file.py +++ b/frappe/core/doctype/file/test_file.py @@ -160,6 +160,29 @@ class TestSameContent(unittest.TestCase): def test_saved_content(self): self.assertFalse(os.path.exists(get_files_path(self.dup_filename))) + def test_attachment_limit(self): + doctype, docname = make_test_doc() + from frappe.custom.doctype.property_setter.property_setter import make_property_setter + limit_property = make_property_setter('ToDo', None, 'max_attachments', 1, 'int', for_doctype=True) + _file1 = frappe.get_doc({ + "doctype": "File", + "file_name": 'test-attachment', + "attached_to_doctype": doctype, + "attached_to_name": docname, + "content": 'test'}) + + _file1.insert() + + _file2 = frappe.get_doc({ + "doctype": "File", + "file_name": 'test-attachment', + "attached_to_doctype": doctype, + "attached_to_name": docname, + "content": 'test2'}) + + self.assertRaises(frappe.exceptions.AttachmentLimitReached, _file2.insert) + limit_property.delete() + frappe.clear_cache(doctype='ToDo') def tearDown(self): # File gets deleted on rollback, so blank From a7264405b5a09ac5f7d4121e914a570a5a6de2b6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 20 Oct 2020 10:27:16 +0530 Subject: [PATCH 120/259] style: Fix formatting --- frappe/core/doctype/file/file.py | 6 +++--- frappe/core/doctype/file/test_file.py | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index a8a999ff9a..74c6c3f22e 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -153,9 +153,9 @@ class File(Document): }, limit=attachment_limit + 1)) if current_attachment_count >= attachment_limit: - frappe.throw(_("Maximum Attachment Limit reached for {0} {1}.").format( - self.attached_to_doctype, - self.attached_to_name + frappe.throw( + _("Maximum Attachment Limit reached for {0} {1}.").format( + self.attached_to_doctype, self.attached_to_name ), exc=frappe.exceptions.AttachmentLimitReached, title=_('Attachment Limit Reached') diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py index cb44d33781..e627558680 100644 --- a/frappe/core/doctype/file/test_file.py +++ b/frappe/core/doctype/file/test_file.py @@ -164,23 +164,25 @@ class TestSameContent(unittest.TestCase): doctype, docname = make_test_doc() from frappe.custom.doctype.property_setter.property_setter import make_property_setter limit_property = make_property_setter('ToDo', None, 'max_attachments', 1, 'int', for_doctype=True) - _file1 = frappe.get_doc({ + file1 = frappe.get_doc({ "doctype": "File", "file_name": 'test-attachment', "attached_to_doctype": doctype, "attached_to_name": docname, - "content": 'test'}) + "content": 'test' + }) - _file1.insert() + file1.insert() - _file2 = frappe.get_doc({ + file2 = frappe.get_doc({ "doctype": "File", "file_name": 'test-attachment', "attached_to_doctype": doctype, "attached_to_name": docname, - "content": 'test2'}) + "content": 'test2' + }) - self.assertRaises(frappe.exceptions.AttachmentLimitReached, _file2.insert) + self.assertRaises(frappe.exceptions.AttachmentLimitReached, file2.insert) limit_property.delete() frappe.clear_cache(doctype='ToDo') From 1685afc49eed63a370ec98880e6c34266ad1e5db Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 26 Oct 2020 13:53:01 +0530 Subject: [PATCH 121/259] fix: Update limit validation message --- frappe/core/doctype/file/file.py | 4 ++-- .../public/js/frappe/file_uploader/index.js | 9 ++------- .../js/frappe/form/sidebar/attachments.js | 20 +++++++++++-------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 74c6c3f22e..48247860b3 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -154,8 +154,8 @@ class File(Document): if current_attachment_count >= attachment_limit: frappe.throw( - _("Maximum Attachment Limit reached for {0} {1}.").format( - self.attached_to_doctype, self.attached_to_name + _("Maximum Attachment Limit of {0} has been reached for {1} {2}.").format( + frappe.bold(attachment_limit), self.attached_to_doctype, self.attached_to_name ), exc=frappe.exceptions.AttachmentLimitReached, title=_('Attachment Limit Reached') diff --git a/frappe/public/js/frappe/file_uploader/index.js b/frappe/public/js/frappe/file_uploader/index.js index 36de853b8f..646f60715a 100644 --- a/frappe/public/js/frappe/file_uploader/index.js +++ b/frappe/public/js/frappe/file_uploader/index.js @@ -17,13 +17,8 @@ export default class FileUploader { disable_file_browser, frm } = {}) { - if (frm && frm.attachments.max_reached()) { - frappe.throw({ - title: __("Attachment Limit Reached"), - message: __("Maximum attachment limit for this record reached."), - }); - return; - } + + frm && frm.attachments.max_reached(true); if (!wrapper) { this.make_dialog(); diff --git a/frappe/public/js/frappe/form/sidebar/attachments.js b/frappe/public/js/frappe/form/sidebar/attachments.js index dc0c839737..56b484e7c4 100644 --- a/frappe/public/js/frappe/form/sidebar/attachments.js +++ b/frappe/public/js/frappe/form/sidebar/attachments.js @@ -16,15 +16,19 @@ frappe.ui.form.Attachments = Class.extend({ this.add_attachment_wrapper = this.parent.find(".add_attachment").parent(); this.attachments_label = this.parent.find(".attachments-label"); }, - max_reached: function() { - // no of attachments - var n = Object.keys(this.get_attachments()).length; - - // button if the number of attachments is less than max - if(n < this.frm.meta.max_attachments || !this.frm.meta.max_attachments) { - return false; + max_reached: function(raise_exception=false) { + const attachment_count = Object.keys(this.get_attachments()).length; + const attachment_limit = this.frm.meta.max_attachments; + if (attachment_limit && attachment_count >= attachment_limit) { + if (raise_exception) { + frappe.throw({ + title: __("Attachment Limit Reached"), + message: __("Maximum attachment limit of {0} has been reached.", [cstr(attachment_limit).bold()]), + }); + } + return true; } - return true; + return false; }, refresh: function() { var me = this; From 291179904615480bcaaa623e9b2bc055188b8ed9 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 17 Nov 2020 15:14:23 +0530 Subject: [PATCH 122/259] fix: Re-write restore tests to process another site --- frappe/tests/test_commands.py | 36 +++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index 3c5fddeef0..e282f1027d 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -243,15 +243,39 @@ class TestCommands(BaseTestCommands): self.assertTrue(exists_in_backup(backup["excludes"]["excludes"], database)) def test_restore(self): + # step 0: create a site to run the test on + global_config = { + "admin_password": frappe.conf.admin_password, + "root_login": frappe.conf.root_login, + "root_password": frappe.conf.root_password, + "db_type": frappe.conf.db_type + } + site_data = { + "another_site": f"{frappe.local.site}-restore.test", + **global_config + } + for key, value in global_config.items(): + if value: + self.execute(f"bench set-config {key} {value} -g") + self.execute("bench new-site {another_site} --admin-password {admin_password} --db-type {db_type} --force", site_data) + # test 1: bench restore from full backup - self.execute("bench --site {site} backup --ignore-backup-conf") - database = fetch_latest_backups()["database"] - self.execute("bench --site {site} restore {database}", {"database": database}) + self.execute("bench --site {another_site} backup --ignore-backup-conf", site_data) + self.execute("bench --site {another_site} execute frappe.utils.backups.fetch_latest_backups", site_data) + site_data.update({"database": json.loads(self.stdout)["database"]}) + self.execute("bench --site {another_site} restore {database}", site_data) # test 2: restore from partial backup - self.execute("bench --site {site} backup --exclude 'ToDo'") - database = fetch_latest_backups(partial=True)["database"] - self.execute("bench --site {site} restore {database}", {"database": database}) + self.execute("bench --site {another_site} backup --exclude 'ToDo'", site_data) + site_data.update({"kw": "\"{'partial':True}\""}) + self.execute( + "bench --site {another_site} execute frappe.utils.backups.fetch_latest_backups --kwargs {kw}", + site_data + ) + site_data.update({ + "database": json.loads(self.stdout)["database"] + }) + self.execute("bench --site {another_site} restore {database}", site_data) self.assertEquals(self.returncode, 1) def test_partial_restore(self): From f1cd3388ba0b71a52cf87bd7e1af16f4e834b35f Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 17 Nov 2020 16:28:15 +0530 Subject: [PATCH 123/259] style: Black-ish + fixed typos + Optimized imports --- frappe/build.py | 2 +- .../frappe_providers/frappecloud.py | 2 +- frappe/tests/test_commands.py | 83 ++++++++++++------- 3 files changed, 53 insertions(+), 34 deletions(-) diff --git a/frappe/build.py b/frappe/build.py index f14b250a92..f47a7cb32b 100644 --- a/frappe/build.py +++ b/frappe/build.py @@ -105,7 +105,7 @@ def download_frappe_assets(verbose=True): if frappe_head: try: url = get_assets_link(frappe_head) - click.secho("Retreiving assets...", fg="yellow") + click.secho("Retrieving assets...", fg="yellow") prefix = mkdtemp(prefix="frappe-assets-", suffix=frappe_head) assets_archive = download_file(url, prefix) print("\n{0} Downloaded Frappe assets from {1}".format(green('✔'), url)) diff --git a/frappe/integrations/frappe_providers/frappecloud.py b/frappe/integrations/frappe_providers/frappecloud.py index e09f09a44b..f60344ee8f 100644 --- a/frappe/integrations/frappe_providers/frappecloud.py +++ b/frappe/integrations/frappe_providers/frappecloud.py @@ -6,7 +6,7 @@ import frappe def frappecloud_migrator(local_site): - print("Retreiving Site Migrator...") + print("Retrieving Site Migrator...") remote_site = frappe.conf.frappecloud_url or "frappecloud.com" request_url = "https://{}/api/method/press.api.script".format(remote_site) request = requests.get(request_url) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index e282f1027d..8c76ce2f48 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -1,24 +1,24 @@ # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors # imports - standard imports +import gzip import json import os import shlex import subprocess import sys import unittest -import gzip -from glob import glob +import glob # imports - module imports import frappe +import frappe.recorder +from frappe.installer import add_to_installed_apps from frappe.utils import add_to_date, now from frappe.utils.backups import fetch_latest_backups -import frappe.recorder # TODO: check frappe.cli.coloured_output to set coloured output! - def supports_color(): """ Returns True if the running system's terminal supports color, and False @@ -32,12 +32,12 @@ def supports_color(): class color(dict): - nc = '\033[0m' - blue = '\033[94m' - green = '\033[92m' - yellow = '\033[93m' - red = '\033[91m' - silver = '\033[90m' + nc = "\033[0m" + blue = "\033[94m" + green = "\033[92m" + yellow = "\033[93m" + red = "\033[91m" + silver = "\033[90m" def __getattr__(self, key): if supports_color(): @@ -82,6 +82,7 @@ def exists_in_backup(doctypes, file): content = f.read().decode("utf8") return all([predicate.format(doctype).lower() in content.lower() for doctype in doctypes]) + class BaseTestCommands(unittest.TestCase): def execute(self, command, kwargs=None): site = {"site": frappe.local.site} @@ -109,6 +110,7 @@ class BaseTestCommands(unittest.TestCase): ]).strip() return "{}\n\n{}".format(output, cmd_execution_summary) + class TestCommands(BaseTestCommands): def test_execute(self): # test 1: execute a command expecting a numeric output @@ -127,7 +129,7 @@ class TestCommands(BaseTestCommands): # The returned value has quotes which have been trimmed for the test self.execute("""bench --site {site} execute frappe.bold --kwargs '{{"text": "DocType"}}'""") self.assertEquals(self.returncode, 0) - self.assertEquals(self.stdout[1:-1], frappe.bold(text='DocType')) + self.assertEquals(self.stdout[1:-1], frappe.bold(text="DocType")) def test_backup(self): backup = { @@ -184,16 +186,19 @@ class TestCommands(BaseTestCommands): "db_path": "database.sql.gz", "files_path": "public.tar", "private_path": "private.tar", - "conf_path": "config.json" + "conf_path": "config.json", }.items() } - self.execute("""bench + self.execute( + """bench --site {site} backup --with-files --backup-path-db {db_path} --backup-path-files {files_path} --backup-path-private-files {private_path} - --backup-path-conf {conf_path}""", kwargs) + --backup-path-conf {conf_path}""", + kwargs, + ) self.assertEquals(self.returncode, 0) for path in kwargs.values(): @@ -202,7 +207,7 @@ class TestCommands(BaseTestCommands): # test 5: take a backup with --compress self.execute("bench --site {site} backup --with-files --compress") self.assertEquals(self.returncode, 0) - compressed_files = glob(site_backup_path + "/*.tgz") + compressed_files = glob.glob(site_backup_path + "/*.tgz") self.assertGreater(len(compressed_files), 0) # test 6: take a backup with --verbose @@ -210,14 +215,20 @@ class TestCommands(BaseTestCommands): self.assertEquals(self.returncode, 0) # test 7: take a backup with frappe.conf.backup.includes - self.execute("bench --site {site} set-config backup '{includes}' --as-dict", {"includes": json.dumps(backup["includes"])}) + self.execute( + "bench --site {site} set-config backup '{includes}' --as-dict", + {"includes": json.dumps(backup["includes"])}, + ) self.execute("bench --site {site} backup --verbose") self.assertEquals(self.returncode, 0) database = fetch_latest_backups(partial=True)["database"] self.assertTrue(exists_in_backup(backup["includes"]["includes"], database)) # test 8: take a backup with frappe.conf.backup.excludes - self.execute("bench --site {site} set-config backup '{excludes}' --as-dict", {"excludes": json.dumps(backup["excludes"])}) + self.execute( + "bench --site {site} set-config backup '{excludes}' --as-dict", + {"excludes": json.dumps(backup["excludes"])}, + ) self.execute("bench --site {site} backup --verbose") self.assertEquals(self.returncode, 0) database = fetch_latest_backups(partial=True)["database"] @@ -225,13 +236,19 @@ class TestCommands(BaseTestCommands): self.assertTrue(exists_in_backup(backup["includes"]["includes"], database)) # test 9: take a backup with --include (with frappe.conf.excludes still set) - self.execute("bench --site {site} backup --include '{include}'", {"include": ",".join(backup["includes"]["includes"])}) + self.execute( + "bench --site {site} backup --include '{include}'", + {"include": ",".join(backup["includes"]["includes"])}, + ) self.assertEquals(self.returncode, 0) database = fetch_latest_backups(partial=True)["database"] self.assertTrue(exists_in_backup(backup["includes"]["includes"], database)) # test 10: take a backup with --exclude - self.execute("bench --site {site} backup --exclude '{exclude}'", {"exclude": ",".join(backup["excludes"]["excludes"])}) + self.execute( + "bench --site {site} backup --exclude '{exclude}'", + {"exclude": ",".join(backup["excludes"]["excludes"])}, + ) self.assertEquals(self.returncode, 0) database = fetch_latest_backups(partial=True)["database"] self.assertFalse(exists_in_backup(backup["excludes"]["excludes"], database)) @@ -248,20 +265,24 @@ class TestCommands(BaseTestCommands): "admin_password": frappe.conf.admin_password, "root_login": frappe.conf.root_login, "root_password": frappe.conf.root_password, - "db_type": frappe.conf.db_type - } - site_data = { - "another_site": f"{frappe.local.site}-restore.test", - **global_config + "db_type": frappe.conf.db_type, } + site_data = {"another_site": f"{frappe.local.site}-restore.test", **global_config} for key, value in global_config.items(): if value: self.execute(f"bench set-config {key} {value} -g") - self.execute("bench new-site {another_site} --admin-password {admin_password} --db-type {db_type} --force", site_data) + self.execute( + "bench new-site {another_site} --admin-password {admin_password} --db-type" + " {db_type}", + site_data, + ) # test 1: bench restore from full backup self.execute("bench --site {another_site} backup --ignore-backup-conf", site_data) - self.execute("bench --site {another_site} execute frappe.utils.backups.fetch_latest_backups", site_data) + self.execute( + "bench --site {another_site} execute frappe.utils.backups.fetch_latest_backups", + site_data, + ) site_data.update({"database": json.loads(self.stdout)["database"]}) self.execute("bench --site {another_site} restore {database}", site_data) @@ -269,12 +290,11 @@ class TestCommands(BaseTestCommands): self.execute("bench --site {another_site} backup --exclude 'ToDo'", site_data) site_data.update({"kw": "\"{'partial':True}\""}) self.execute( - "bench --site {another_site} execute frappe.utils.backups.fetch_latest_backups --kwargs {kw}", - site_data + "bench --site {another_site} execute" + " frappe.utils.backups.fetch_latest_backups --kwargs {kw}", + site_data, ) - site_data.update({ - "database": json.loads(self.stdout)["database"] - }) + site_data.update({"database": json.loads(self.stdout)["database"]}) self.execute("bench --site {another_site} restore {database}", site_data) self.assertEquals(self.returncode, 1) @@ -314,7 +334,6 @@ class TestCommands(BaseTestCommands): self.assertEqual(frappe.recorder.status(), False) def test_remove_from_installed_apps(self): - from frappe.installer import add_to_installed_apps app = "test_remove_app" add_to_installed_apps(app) From 39da1e0363b0d15d4f2c9eb779ea3eb093d960fc Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 18 Nov 2020 01:31:18 +0530 Subject: [PATCH 124/259] fix: Raise error if executable not found in PATH --- frappe/exceptions.py | 3 ++- frappe/utils/backups.py | 29 +++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/frappe/exceptions.py b/frappe/exceptions.py index 267f5410af..9b63b23787 100644 --- a/frappe/exceptions.py +++ b/frappe/exceptions.py @@ -110,4 +110,5 @@ class DocumentAlreadyRestored(Exception): pass class InvalidAuthorizationHeader(CSRFTokenError): pass class InvalidAuthorizationPrefix(CSRFTokenError): pass class InvalidAuthorizationToken(CSRFTokenError): pass -class InvalidDatabaseFile(ValidationError): pass \ No newline at end of file +class InvalidDatabaseFile(ValidationError): pass +class ExecutableNotFound(FileNotFoundError): pass diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index b11c73c2b2..3ae300d3c4 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -2,11 +2,12 @@ # MIT License. See license.txt # imports - standard imports +import gzip import os from calendar import timegm from datetime import datetime from glob import glob -import gzip +from shutil import which # imports - third party imports import click @@ -14,7 +15,7 @@ import click # imports - module imports import frappe from frappe import _, conf -from frappe.utils import get_url, now, now_datetime, get_file_size +from frappe.utils import get_file_size, get_url, now, now_datetime # backup variable for backwards compatibility verbose = False @@ -344,6 +345,20 @@ class BackupGenerator: import frappe.utils from frappe.utils.change_log import get_app_branch + db_exc = { + "mariadb": ("mysqldump", which("mysqldump")), + "postgres": ("pg_dump", which("pg_dump")), + }[self.db_type] + gzip_exc = which("gzip") + + if not (gzip_exc and db_exc[1]): + _exc = "gzip" if not gzip_exc else db_exc[0] + frappe.throw( + f"{_exc} not found in PATH! This is required to take a backup.", + exc=frappe.ExecutableNotFound + ) + db_exc = db_exc[0] + database_header_content = [ f"Backup generated by Frappe {frappe.__version__} on branch {get_app_branch('frappe') or 'N/A'}", "", @@ -384,8 +399,8 @@ class BackupGenerator: ) cmd_string = ( - "pg_dump postgres://{user}:{password}@{db_host}:{db_port}/{db_name}" - " {include} {exclude} | gzip >> {backup_path_db}" + "{db_exc} postgres://{user}:{password}@{db_host}:{db_port}/{db_name}" + " {include} {exclude} | {gzip} >> {backup_path_db}" ) else: @@ -400,20 +415,22 @@ class BackupGenerator: ) cmd_string = ( - "mysqldump --single-transaction --quick --lock-tables=false -u {user}" + "{db_exc} --single-transaction --quick --lock-tables=false -u {user}" " -p{password} {db_name} -h {db_host} -P {db_port} {include} {exclude}" - " | gzip >> {backup_path_db}" + " | {gzip} >> {backup_path_db}" ) command = cmd_string.format( user=args.user, password=args.password, + db_exc=db_exc, db_host=args.db_host, db_port=args.db_port, db_name=args.db_name, backup_path_db=args.backup_path_db, exclude=args.get("exclude", ""), include=args.get("include", ""), + gzip=gzip_exc, ) if self.verbose: From b90980406c4ac7474a3acf27e91afef5027ad34d Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 17 Nov 2020 18:53:27 +0530 Subject: [PATCH 125/259] fix: increase batch limit --- frappe/core/doctype/prepared_report/prepared_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py index 2c4d933440..1d0d6ebb09 100644 --- a/frappe/core/doctype/prepared_report/prepared_report.py +++ b/frappe/core/doctype/prepared_report/prepared_report.py @@ -89,7 +89,7 @@ def delete_expired_prepared_reports(): 'creation': ['<', frappe.utils.add_days(frappe.utils.now(), -expiry_period)] }) - batches = frappe.utils.create_batch(prepared_reports_to_delete, 50) + batches = frappe.utils.create_batch(prepared_reports_to_delete, 100) for batch in batches: args = { 'reports': batch, From 7f012b73b42616e8b622745831fa31e0212d678c Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Date: Tue, 17 Nov 2020 19:18:44 +0530 Subject: [PATCH 126/259] feat: solve translation string issues --- .../public/js/frappe/form/footer/timeline.js | 36 +++---------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js index c23b6d8127..159ab8a61b 100644 --- a/frappe/public/js/frappe/form/footer/timeline.js +++ b/frappe/public/js/frappe/form/footer/timeline.js @@ -547,14 +547,7 @@ frappe.ui.form.Timeline = class Timeline { log.color = 'dark'; log.sender = log.owner; log.comment_type = 'Milestone'; - log.content = __( - '{0} changed {1} to {2}', - [ - frappe.user.full_name(log.owner).bold(), - frappe.meta.get_label(this.frm.doctype, log.track_field), - log.value.bold() - ] - ); + log.content = __('{0} changed {1} to {2}', [ frappe.user.full_name(log.owner).bold(), frappe.meta.get_label(this.frm.doctype, log.track_field), log.value.bold()]); return log; }); return milestones; @@ -617,14 +610,7 @@ frappe.ui.form.Timeline = class Timeline { const field_display_status = frappe.perm.get_field_display_status(df, null, me.frm.perm); if (field_display_status === 'Read' || field_display_status === 'Write') { - parts.push(__( - '{0} from {1} to {2}', - [ - __(df.label), - me.format_content_for_timeline(p[1]), - me.format_content_for_timeline(p[2]) - ] - )); + parts.push(__('{0} from {1} to {2}', [ __(df.label), me.format_content_for_timeline(p[1]), me.format_content_for_timeline(p[2])])); } } } @@ -655,18 +641,7 @@ frappe.ui.form.Timeline = class Timeline { null, me.frm.perm); if (field_display_status === 'Read' || field_display_status === 'Write') { - parts.push(__( - '{0} from {1} to {2} in row #{3}', - [ - frappe.meta.get_label( - me.frm.fields_dict[row[0]].grid.doctype, - p[0] - ), - me.format_content_for_timeline(p[1]), - me.format_content_for_timeline(p[2]), - row[1] - ] - )); + parts.push(__('{0} from {1} to {2} in row #{3}', [ frappe.meta.get_label( me.frm.fields_dict[row[0]].grid.doctype, p[0]), me.format_content_for_timeline(p[1]), me.format_content_for_timeline(p[2]), row[1] ])); } } return parts.length < 3; @@ -703,10 +678,7 @@ frappe.ui.form.Timeline = class Timeline { return p; }); if (parts.length) { - out.push(me.get_version_comment(version, __( - "{0} rows for {1}", - [__(key), parts.join(', ')] - ))); + out.push(me.get_version_comment(version, __("{0} rows for {1}", [__(key), parts.join(', ')]))); } } }); From f37789280b9f75fffc7e392da28da00c635a9ab9 Mon Sep 17 00:00:00 2001 From: Himanshu Date: Wed, 18 Nov 2020 10:47:33 +0530 Subject: [PATCH 127/259] fix(user defaults): Set user selected timezone in user defaults (#11902) Co-authored-by: Sahil Khan Co-authored-by: Sahil Khan --- frappe/core/doctype/user/user.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 2c5865fb69..7309528da6 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -13,7 +13,7 @@ from frappe.utils.user import get_system_managers from bs4 import BeautifulSoup import frappe.permissions import frappe.share - +import frappe.defaults from frappe.website.utils import is_signup_enabled from frappe.utils.background_jobs import enqueue @@ -107,6 +107,10 @@ class User(Document): ) if self.name not in ('Administrator', 'Guest') and not self.user_image: frappe.enqueue('frappe.core.doctype.user.user.update_gravatar', name=self.name) + + # Set user selected timezone + if self.time_zone: + frappe.defaults.set_default("time_zone", self.time_zone, self.name) def has_website_permission(self, ptype, user, verbose=False): """Returns true if current user is the session user""" @@ -1129,4 +1133,4 @@ def check_password_reset_limit(user, rate_limit): frappe.throw(_("You have reached the hourly limit for generating password reset links. Please try again later.")) def get_generated_link_count(user): - return cint(frappe.cache().hget("password_reset_link_count", user)) or 0 \ No newline at end of file + return cint(frappe.cache().hget("password_reset_link_count", user)) or 0 From cb6c704671dfe96063d3e59bef7e18f84430890a Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 2 Nov 2020 16:43:36 +0530 Subject: [PATCH 128/259] fix: Define chunk size based on backup file size to avoid timeout issues (#11526) Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> (cherry picked from commit 5020bbe4f68abaf5f9c019efff6105573d2ed5c0) # Conflicts: # frappe/integrations/offsite_backup_utils.py --- .../dropbox_settings/dropbox_settings.py | 5 ++-- frappe/integrations/offsite_backup_utils.py | 28 ++++++++++++++++++- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py index 6b95a3f5bf..71445b44d7 100644 --- a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py +++ b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py @@ -9,7 +9,7 @@ import frappe import os from frappe import _ from frappe.model.document import Document -from frappe.integrations.offsite_backup_utils import get_latest_backup_file, send_email, validate_file_size +from frappe.integrations.offsite_backup_utils import get_latest_backup_file, send_email, validate_file_size, get_chunk_site from frappe.integrations.utils import make_post_request from frappe.utils import (cint, get_request_site_address, get_files_path, get_backups_path, get_url, encode) @@ -167,8 +167,9 @@ def upload_file_to_dropbox(filename, folder, dropbox_client): return create_folder_if_not_exists(folder, dropbox_client) - chunk_size = 15 * 1024 * 1024 file_size = os.path.getsize(encode(filename)) + chunk_size = get_chunk_site(file_size) + mode = (dropbox.files.WriteMode.overwrite) f = open(encode(filename), 'rb') diff --git a/frappe/integrations/offsite_backup_utils.py b/frappe/integrations/offsite_backup_utils.py index db176538e4..39ffbd2c0e 100644 --- a/frappe/integrations/offsite_backup_utils.py +++ b/frappe/integrations/offsite_backup_utils.py @@ -6,7 +6,11 @@ from __future__ import unicode_literals import frappe import glob import os +<<<<<<< HEAD from frappe.utils import split_emails, get_backups_path +======= +from frappe.utils import split_emails, now_datetime, cint +>>>>>>> 5020bbe4f6... fix: Define chunk size based on backup file size to avoid timeout issues (#11526) def send_email(success, service_name, doctype, email_field, error_status=None): @@ -81,6 +85,22 @@ def get_file_size(file_path, unit): return file_size +def get_chunk_site(file_size): + ''' this function will return chunk size in megabytes based on file size ''' + + file_size_in_gb = cint(file_size/1024/1024) + + MB = 1024 * 1024 + if file_size_in_gb > 5000: + return 200 * MB + elif file_size_in_gb >= 3000: + return 150 * MB + elif file_size_in_gb >= 1000: + return 100 * MB + elif file_size_in_gb >= 500: + return 50 * MB + else: + return 15 * MB def validate_file_size(): frappe.flags.create_new_backup = True @@ -97,5 +117,11 @@ def generate_files_backup(): frappe.conf.db_password, db_host = frappe.db.host, db_type=frappe.conf.db_type, db_port=frappe.conf.db_port) +<<<<<<< HEAD backup.set_backup_file_name() - backup.zip_files() \ No newline at end of file + backup.zip_files() +======= + odb.todays_date = now_datetime().strftime('%Y%m%d_%H%M%S') + odb.set_backup_file_name() + odb.zip_files() +>>>>>>> 5020bbe4f6... fix: Define chunk size based on backup file size to avoid timeout issues (#11526) From 51a1bf9a736e460f04efed4a0685571c7d19648b Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 18 Nov 2020 12:13:57 +0530 Subject: [PATCH 129/259] fix: Delete with force to bypass linked docs errors --- frappe/installer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index be9b04d453..6d6ed4eb94 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -180,11 +180,11 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) for record in frappe.get_all(doctype, filters={"module": module_name}, pluck="name"): print(f"* removing {doctype} '{record}'...") if not dry_run: - frappe.delete_doc(doctype, record, ignore_on_trash=True) + frappe.delete_doc(doctype, record, ignore_on_trash=True, force=True) print(f"* removing Module Def '{module_name}'...") if not dry_run: - frappe.delete_doc("Module Def", module_name, ignore_on_trash=True) + frappe.delete_doc("Module Def", module_name, ignore_on_trash=True, force=True) for doctype in set(drop_doctypes): print(f"* dropping Table for '{doctype}'...") From 887f4b0d614ea05b77980ed6af8bfb73e62db3e0 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Wed, 18 Nov 2020 13:54:57 +0530 Subject: [PATCH 130/259] fix: Resolve conflicts --- frappe/integrations/offsite_backup_utils.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/frappe/integrations/offsite_backup_utils.py b/frappe/integrations/offsite_backup_utils.py index 39ffbd2c0e..ebbeb41cce 100644 --- a/frappe/integrations/offsite_backup_utils.py +++ b/frappe/integrations/offsite_backup_utils.py @@ -6,12 +6,7 @@ from __future__ import unicode_literals import frappe import glob import os -<<<<<<< HEAD -from frappe.utils import split_emails, get_backups_path -======= -from frappe.utils import split_emails, now_datetime, cint ->>>>>>> 5020bbe4f6... fix: Define chunk size based on backup file size to avoid timeout issues (#11526) - +from frappe.utils import split_emails, get_backups_path, cint def send_email(success, service_name, doctype, email_field, error_status=None): recipients = get_recipients(doctype, email_field) @@ -117,11 +112,5 @@ def generate_files_backup(): frappe.conf.db_password, db_host = frappe.db.host, db_type=frappe.conf.db_type, db_port=frappe.conf.db_port) -<<<<<<< HEAD backup.set_backup_file_name() backup.zip_files() -======= - odb.todays_date = now_datetime().strftime('%Y%m%d_%H%M%S') - odb.set_backup_file_name() - odb.zip_files() ->>>>>>> 5020bbe4f6... fix: Define chunk size based on backup file size to avoid timeout issues (#11526) From 189c6cb7715156de759ce2d60310e328dd719789 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Wed, 18 Nov 2020 14:01:14 +0530 Subject: [PATCH 131/259] style: Remove unused import --- frappe/integrations/offsite_backup_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/integrations/offsite_backup_utils.py b/frappe/integrations/offsite_backup_utils.py index ebbeb41cce..48a2c89107 100644 --- a/frappe/integrations/offsite_backup_utils.py +++ b/frappe/integrations/offsite_backup_utils.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe import glob import os -from frappe.utils import split_emails, get_backups_path, cint +from frappe.utils import split_emails, cint def send_email(success, service_name, doctype, email_field, error_status=None): recipients = get_recipients(doctype, email_field) From 4d8ef4690eb9e364e244f296f935dab45733d5f6 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 12 Nov 2020 17:42:25 +0530 Subject: [PATCH 132/259] feat: Ability to set weekdays for Auto Repeat with weekly frequency --- .../doctype/auto_repeat/auto_repeat.json | 18 ++++++- .../doctype/auto_repeat/auto_repeat.py | 54 +++++++++++++------ .../doctype/auto_repeat_day/__init__.py | 0 .../auto_repeat_day/auto_repeat_day.json | 33 ++++++++++++ .../auto_repeat_day/auto_repeat_day.py | 10 ++++ 5 files changed, 99 insertions(+), 16 deletions(-) create mode 100644 frappe/automation/doctype/auto_repeat_day/__init__.py create mode 100644 frappe/automation/doctype/auto_repeat_day/auto_repeat_day.json create mode 100644 frappe/automation/doctype/auto_repeat_day/auto_repeat_day.py diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.json b/frappe/automation/doctype/auto_repeat/auto_repeat.json index 8ee6ca1d45..87cf423e2c 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.json +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.json @@ -1,4 +1,5 @@ { + "actions": [], "allow_import": 1, "allow_rename": 1, "autoname": "format:AUT-AR-{#####}", @@ -21,6 +22,8 @@ "repeat_on_last_day", "column_break_12", "next_schedule_date", + "section_break_12", + "repeat_on_days", "notification", "notify_by_email", "recipients", @@ -186,9 +189,22 @@ "fieldname": "repeat_on_last_day", "fieldtype": "Check", "label": "Repeat on Last Day of the Month" + }, + { + "depends_on": "eval:doc.frequency==='Weekly';", + "fieldname": "repeat_on_days", + "fieldtype": "Table", + "label": "Repeat on Days", + "options": "Auto Repeat Day" + }, + { + "depends_on": "eval:doc.frequency==='Weekly';", + "fieldname": "section_break_12", + "fieldtype": "Section Break" } ], - "modified": "2019-07-17 11:30:51.412317", + "links": [], + "modified": "2020-11-10 22:44:51.815740", "modified_by": "Administrator", "module": "Automation", "name": "Auto Repeat", diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index fcf24bf1a9..dc6ec554d5 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import frappe from frappe import _ +from datetime import timedelta from frappe.desk.form import assign_to from frappe.utils.jinja import validate_template from dateutil.relativedelta import relativedelta @@ -15,6 +16,7 @@ from frappe.core.doctype.communication.email import make from frappe.utils.background_jobs import get_jobs month_map = {'Monthly': 1, 'Quarterly': 3, 'Half-yearly': 6, 'Yearly': 12} +week_map = {'Monday': 0, 'Tuesday': 1, 'Wednesday': 2, 'Thursday': 3, 'Friday': 4, 'Saturday': 5, 'Sunday': 6} class AutoRepeat(Document): @@ -48,7 +50,7 @@ class AutoRepeat(Document): if self.disabled: self.next_schedule_date = None else: - self.next_schedule_date = get_next_schedule_date(self.start_date, self.frequency, self.start_date, self.repeat_on_day, self.repeat_on_last_day, self.end_date) + self.next_schedule_date = get_next_schedule_date(schedule_date=self.start_date, auto_repeat_doc=self) def unlink_if_applicable(self): if self.status == 'Completed' or self.disabled: @@ -107,7 +109,7 @@ class AutoRepeat(Document): end_date = getdate(self.end_date) if not self.end_date: - next_date = get_next_schedule_date(start_date, self.frequency, self.start_date, self.repeat_on_day, self.repeat_on_last_day) + next_date = get_next_schedule_date(schedule_date=start_date, auto_repeat_doc=self) row = { "reference_document": self.reference_document, "frequency": self.frequency, @@ -117,7 +119,7 @@ class AutoRepeat(Document): if self.end_date: next_date = get_next_schedule_date( - start_date, self.frequency, self.start_date, self.repeat_on_day, self.repeat_on_last_day, for_full_schedule=True) + schedule_date=start_date, auto_repeat_doc=self, for_full_schedule=True) while (getdate(next_date) < getdate(end_date)): row = { @@ -127,7 +129,7 @@ class AutoRepeat(Document): } schedule_details.append(row) next_date = get_next_schedule_date( - next_date, self.frequency, self.start_date, self.repeat_on_day, self.repeat_on_last_day, end_date, for_full_schedule=True) + schedule_date=next_date, auto_repeat_doc=self, for_full_schedule=True) return schedule_details @@ -282,31 +284,34 @@ class AutoRepeat(Document): ) -def get_next_schedule_date(schedule_date, frequency, start_date, repeat_on_day=None, repeat_on_last_day=False, end_date=None, for_full_schedule=False): - if month_map.get(frequency): - month_count = month_map.get(frequency) + month_diff(schedule_date, start_date) - 1 +def get_next_schedule_date(schedule_date, auto_repeat_doc=None, for_full_schedule=False): + if month_map.get(auto_repeat_doc.frequency): + month_count = month_map.get(auto_repeat_doc.frequency) + month_diff(schedule_date, auto_repeat_doc.start_date) - 1 else: month_count = 0 day_count = 0 - if month_count and repeat_on_last_day: + if month_count and auto_repeat_doc.repeat_on_last_day: day_count = 31 - next_date = get_next_date(start_date, month_count, day_count) + next_date = get_next_date(auto_repeat_doc.start_date, month_count, day_count) elif month_count and repeat_on_day: day_count = repeat_on_day - next_date = get_next_date(start_date, month_count, day_count) + next_date = get_next_date(auto_repeat_doc.start_date, month_count, day_count) elif month_count: - next_date = get_next_date(start_date, month_count) + next_date = get_next_date(auto_repeat_doc.start_date, month_count) else: - days = 7 if frequency == 'Weekly' else 1 + if auto_repeat_doc.frequency == "Weekly": + days = get_offset_for_weekly_frequency(auto_repeat_doc) + else: + days = 1 next_date = add_days(schedule_date, days) # next schedule date should be after or on current date if not for_full_schedule: while getdate(next_date) < getdate(today()): if month_count: - month_count += month_map.get(frequency) - next_date = get_next_date(start_date, month_count, day_count) + month_count += month_map.get(auto_repeat_doc.frequency) + next_date = get_next_date(auto_repeat_doc.start_date, month_count, day_count) elif days: next_date = add_days(next_date, days) @@ -318,6 +323,25 @@ def get_next_date(dt, mcount, day=None): dt += relativedelta(months=mcount, day=day) return dt + +def get_offset_for_weekly_frequency(auto_repeat_doc): + if not auto_repeat_doc.repeat_on_days: + return 7 + + repeat_on_days = [entry.day for entry in auto_repeat_doc.repeat_on_days] + current_day = getdate().weekday() + weekday = get_next_weekday(current_day, repeat_on_days) + return timedelta((7 + week_map.get(weekday) - current_day) % 7).days + + +def get_next_weekday(current_day, weekdays): + days = list(week_map.keys()) + days = days[current_day:] + days[:current_day] + for entry in days: + if entry in weekdays: + return entry + + #called through hooks def make_auto_repeat_entry(): enqueued_method = 'frappe.automation.doctype.auto_repeat.auto_repeat.create_repeated_entries' @@ -337,7 +361,7 @@ def create_repeated_entries(data): if schedule_date == current_date and not doc.disabled: doc.create_documents() - schedule_date = get_next_schedule_date(schedule_date, doc.frequency, doc.start_date, doc.repeat_on_day, doc.repeat_on_last_day, doc.end_date) + schedule_date = get_next_schedule_date(schedule_date=schedule_date, auto_repeat_doc=doc) if schedule_date and not doc.disabled: frappe.db.set_value('Auto Repeat', doc.name, 'next_schedule_date', schedule_date) diff --git a/frappe/automation/doctype/auto_repeat_day/__init__.py b/frappe/automation/doctype/auto_repeat_day/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/automation/doctype/auto_repeat_day/auto_repeat_day.json b/frappe/automation/doctype/auto_repeat_day/auto_repeat_day.json new file mode 100644 index 0000000000..6f5c3060cd --- /dev/null +++ b/frappe/automation/doctype/auto_repeat_day/auto_repeat_day.json @@ -0,0 +1,33 @@ +{ + "actions": [], + "creation": "2020-11-10 22:30:53.690228", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "day" + ], + "fields": [ + { + "fieldname": "day", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Day", + "options": "Monday\nTuesday\nWednesday\nThursday\nFriday\nSaturday\nSunday", + "reqd": 1 + } + ], + "index_web_pages_for_search": 1, + "istable": 1, + "links": [], + "modified": "2020-11-10 22:30:53.690228", + "modified_by": "Administrator", + "module": "Automation", + "name": "Auto Repeat Day", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/automation/doctype/auto_repeat_day/auto_repeat_day.py b/frappe/automation/doctype/auto_repeat_day/auto_repeat_day.py new file mode 100644 index 0000000000..3a7ced1370 --- /dev/null +++ b/frappe/automation/doctype/auto_repeat_day/auto_repeat_day.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class AutoRepeatDay(Document): + pass From 5e7e7cc922fe0cad987f32ede3d39ea9ef3f02c8 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 19 Nov 2020 14:13:27 +0530 Subject: [PATCH 133/259] fix: full schedule calculation for weekdays --- .../doctype/auto_repeat/auto_repeat.js | 4 +- .../doctype/auto_repeat/auto_repeat.py | 37 +++++++++++++++---- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.js b/frappe/automation/doctype/auto_repeat/auto_repeat.js index a11de1d881..2b1102f681 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.js +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.js @@ -86,10 +86,10 @@ frappe.ui.form.on('Auto Repeat', { frappe.auto_repeat.render_schedule = function(frm) { if (!frm.is_dirty() && frm.doc.status !== 'Disabled') { - frappe.call({ + frm.call({ method: "get_auto_repeat_schedule", doc: frm.doc - }).done((r) => { + }).then((r) => { frm.dashboard.wrapper.empty(); frm.dashboard.add_section( frappe.render_template("auto_repeat_schedule", { diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index dc6ec554d5..d0f01f4ad5 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -14,6 +14,7 @@ from frappe.utils import cstr, getdate, split_emails, add_days, today, get_last_ from frappe.model.document import Document from frappe.core.doctype.communication.email import make from frappe.utils.background_jobs import get_jobs +from frappe.automation.doctype.assignment_rule.assignment_rule import get_repeated month_map = {'Monthly': 1, 'Quarterly': 3, 'Half-yearly': 6, 'Yearly': 12} week_map = {'Monday': 0, 'Tuesday': 1, 'Wednesday': 2, 'Thursday': 3, 'Friday': 4, 'Saturday': 5, 'Sunday': 6} @@ -25,6 +26,7 @@ class AutoRepeat(Document): self.validate_reference_doctype() self.validate_dates() self.validate_email_id() + self.validate_auto_repeat_days() self.set_dates() self.update_auto_repeat_id() self.unlink_if_applicable() @@ -84,6 +86,12 @@ class AutoRepeat(Document): else: frappe.throw(_("'Recipients' not specified")) + def validate_auto_repeat_days(self): + auto_repeat_days = get_auto_repeat_days(self) + if not len(set(auto_repeat_days)) == len(auto_repeat_days): + repeated_days = get_repeated(auto_repeat_days) + frappe.throw(_('Auto Repeat Day {0} has been repeated.').format(frappe.bold(repeated_days))) + def update_auto_repeat_id(self): #check if document is already on auto repeat auto_repeat = frappe.db.get_value(self.reference_doctype, self.reference_document, "auto_repeat") @@ -301,7 +309,7 @@ def get_next_schedule_date(schedule_date, auto_repeat_doc=None, for_full_schedul next_date = get_next_date(auto_repeat_doc.start_date, month_count) else: if auto_repeat_doc.frequency == "Weekly": - days = get_offset_for_weekly_frequency(auto_repeat_doc) + days = get_offset_for_weekly_frequency(schedule_date, auto_repeat_doc) else: days = 1 next_date = add_days(schedule_date, days) @@ -324,24 +332,37 @@ def get_next_date(dt, mcount, day=None): return dt -def get_offset_for_weekly_frequency(auto_repeat_doc): +def get_offset_for_weekly_frequency(schedule_date, auto_repeat_doc): if not auto_repeat_doc.repeat_on_days: return 7 - repeat_on_days = [entry.day for entry in auto_repeat_doc.repeat_on_days] - current_day = getdate().weekday() - weekday = get_next_weekday(current_day, repeat_on_days) - return timedelta((7 + week_map.get(weekday) - current_day) % 7).days + repeat_on_days = get_auto_repeat_days(auto_repeat_doc) + current_schedule_day = getdate(schedule_date).weekday() + + if len(repeat_on_days) > 1 or list(week_map.keys())[current_schedule_day] not in repeat_on_days: + weekday = get_next_weekday(current_schedule_day, repeat_on_days) + next_weekday_number = week_map.get(weekday) + return timedelta((7 + next_weekday_number - current_schedule_day) % 7).days + else: + return 7 -def get_next_weekday(current_day, weekdays): +def get_next_weekday(current_schedule_day, weekdays): days = list(week_map.keys()) - days = days[current_day:] + days[:current_day] + if current_schedule_day > 0: + days = days[(current_schedule_day + 1):] + days[:current_schedule_day] + else: + days = days[(current_schedule_day + 1):] + for entry in days: if entry in weekdays: return entry +def get_auto_repeat_days(doc): + return [d.day for d in doc.get('repeat_on_days', [])] + + #called through hooks def make_auto_repeat_entry(): enqueued_method = 'frappe.automation.doctype.auto_repeat.auto_repeat.create_repeated_entries' From 6f6a20d6b5e880a7dde0f23976088ae8626978e9 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 19 Nov 2020 14:35:30 +0530 Subject: [PATCH 134/259] fix: handle schedule for a past start date --- frappe/automation/doctype/auto_repeat/auto_repeat.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index d0f01f4ad5..fe2fccf99d 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -311,6 +311,7 @@ def get_next_schedule_date(schedule_date, auto_repeat_doc=None, for_full_schedul if auto_repeat_doc.frequency == "Weekly": days = get_offset_for_weekly_frequency(schedule_date, auto_repeat_doc) else: + # daily frequency days = 1 next_date = add_days(schedule_date, days) @@ -321,6 +322,11 @@ def get_next_schedule_date(schedule_date, auto_repeat_doc=None, for_full_schedul month_count += month_map.get(auto_repeat_doc.frequency) next_date = get_next_date(auto_repeat_doc.start_date, month_count, day_count) elif days: + if auto_repeat_doc.frequency == "Weekly": + days = get_offset_for_weekly_frequency(next_date, auto_repeat_doc) + else: + # daily frequency + days = 1 next_date = add_days(next_date, days) return next_date @@ -333,15 +339,20 @@ def get_next_date(dt, mcount, day=None): def get_offset_for_weekly_frequency(schedule_date, auto_repeat_doc): + # if weekdays are not set, offset is 7 from current schedule date if not auto_repeat_doc.repeat_on_days: return 7 repeat_on_days = get_auto_repeat_days(auto_repeat_doc) current_schedule_day = getdate(schedule_date).weekday() + # if repeats on more than 1 day or + # start date's weekday is not in repeat days, then get next weekday + # else offset is 7 if len(repeat_on_days) > 1 or list(week_map.keys())[current_schedule_day] not in repeat_on_days: weekday = get_next_weekday(current_schedule_day, repeat_on_days) next_weekday_number = week_map.get(weekday) + # offset for upcoming weekday return timedelta((7 + next_weekday_number - current_schedule_day) % 7).days else: return 7 From 4b7120c5c4dd2d6286666d9a04f676d6c00c21da Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 19 Nov 2020 15:30:07 +0530 Subject: [PATCH 135/259] test: Auto Repeat with weekly frequency --- .../doctype/auto_repeat/auto_repeat.py | 7 +-- .../doctype/auto_repeat/test_auto_repeat.py | 50 ++++++++++++++++++- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index fe2fccf99d..a41fef1f6b 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -302,8 +302,8 @@ def get_next_schedule_date(schedule_date, auto_repeat_doc=None, for_full_schedul if month_count and auto_repeat_doc.repeat_on_last_day: day_count = 31 next_date = get_next_date(auto_repeat_doc.start_date, month_count, day_count) - elif month_count and repeat_on_day: - day_count = repeat_on_day + elif month_count and auto_repeat_doc.repeat_on_day: + day_count = auto_repeat_doc.repeat_on_day next_date = get_next_date(auto_repeat_doc.start_date, month_count, day_count) elif month_count: next_date = get_next_date(auto_repeat_doc.start_date, month_count) @@ -345,11 +345,12 @@ def get_offset_for_weekly_frequency(schedule_date, auto_repeat_doc): repeat_on_days = get_auto_repeat_days(auto_repeat_doc) current_schedule_day = getdate(schedule_date).weekday() + weekdays = list(week_map.keys()) # if repeats on more than 1 day or # start date's weekday is not in repeat days, then get next weekday # else offset is 7 - if len(repeat_on_days) > 1 or list(week_map.keys())[current_schedule_day] not in repeat_on_days: + if len(repeat_on_days) > 1 or weekdays[current_schedule_day] not in repeat_on_days: weekday = get_next_weekday(current_schedule_day, repeat_on_days) next_weekday_number = week_map.get(weekday) # offset for upcoming weekday diff --git a/frappe/automation/doctype/auto_repeat/test_auto_repeat.py b/frappe/automation/doctype/auto_repeat/test_auto_repeat.py index 60fa9cb59e..69e9d98c0a 100644 --- a/frappe/automation/doctype/auto_repeat/test_auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/test_auto_repeat.py @@ -10,6 +10,7 @@ from frappe.custom.doctype.custom_field.custom_field import create_custom_field from frappe.automation.doctype.auto_repeat.auto_repeat import get_auto_repeat_entries, create_repeated_entries from frappe.utils import today, add_days, getdate, add_months +week_map = {'Monday': 0, 'Tuesday': 1, 'Wednesday': 2, 'Thursday': 3, 'Friday': 4, 'Saturday': 5, 'Sunday': 6} def add_custom_fields(): df = dict( @@ -42,6 +43,52 @@ class TestAutoRepeat(unittest.TestCase): self.assertEqual(todo.get('description'), new_todo.get('description')) + def test_weekly_auto_repeat(self): + todo = frappe.get_doc( + dict(doctype='ToDo', description='test weekly todo', assigned_by='Administrator')).insert() + + doc = make_auto_repeat(reference_doctype='ToDo', + frequency='Weekly', reference_document=todo.name, start_date=add_days(today(), -7)) + + self.assertEqual(doc.next_schedule_date, today()) + data = get_auto_repeat_entries(getdate(today())) + create_repeated_entries(data) + frappe.db.commit() + + todo = frappe.get_doc(doc.reference_doctype, doc.reference_document) + self.assertEqual(todo.auto_repeat, doc.name) + + new_todo = frappe.db.get_value('ToDo', + {'auto_repeat': doc.name, 'name': ('!=', todo.name)}, 'name') + + new_todo = frappe.get_doc('ToDo', new_todo) + + self.assertEqual(todo.get('description'), new_todo.get('description')) + + def test_weekly_auto_repeat_with_weekdays(self): + todo = frappe.get_doc( + dict(doctype='ToDo', description='test auto repeat with weekdays', assigned_by='Administrator')).insert() + + weekdays = list(week_map.keys()) + current_weekday = getdate().weekday() + days = [ + {'day': weekdays[current_weekday]}, + {'day': weekdays[current_weekday + 2]} + ] + doc = make_auto_repeat(reference_doctype='ToDo', + frequency='Weekly', reference_document=todo.name, start_date=add_days(today(), -7), days=days) + + self.assertEqual(doc.next_schedule_date, today()) + data = get_auto_repeat_entries(getdate(today())) + create_repeated_entries(data) + frappe.db.commit() + + todo = frappe.get_doc(doc.reference_doctype, doc.reference_document) + self.assertEqual(todo.auto_repeat, doc.name) + + doc.reload() + self.assertEqual(doc.next_schedule_date, add_days(getdate(), 2)) + def test_monthly_auto_repeat(self): start_date = today() end_date = add_months(start_date, 12) @@ -124,7 +171,8 @@ def make_auto_repeat(**args): 'notify_by_email': args.notify or 0, 'recipients': args.recipients or "", 'subject': args.subject or "", - 'message': args.message or "" + 'message': args.message or "", + 'repeat_on_days': args.days or [] }).insert(ignore_permissions=True) return doc From 4ebc7be1a3ad256aa2d8be9f633bf8063b526df3 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 19 Nov 2020 16:25:12 +0530 Subject: [PATCH 136/259] chore: code clean-up --- .../doctype/auto_repeat/auto_repeat.py | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index a41fef1f6b..c47b672595 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -308,11 +308,7 @@ def get_next_schedule_date(schedule_date, auto_repeat_doc=None, for_full_schedul elif month_count: next_date = get_next_date(auto_repeat_doc.start_date, month_count) else: - if auto_repeat_doc.frequency == "Weekly": - days = get_offset_for_weekly_frequency(schedule_date, auto_repeat_doc) - else: - # daily frequency - days = 1 + days = get_days(schedule_date, auto_repeat_doc) next_date = add_days(schedule_date, days) # next schedule date should be after or on current date @@ -322,11 +318,7 @@ def get_next_schedule_date(schedule_date, auto_repeat_doc=None, for_full_schedul month_count += month_map.get(auto_repeat_doc.frequency) next_date = get_next_date(auto_repeat_doc.start_date, month_count, day_count) elif days: - if auto_repeat_doc.frequency == "Weekly": - days = get_offset_for_weekly_frequency(next_date, auto_repeat_doc) - else: - # daily frequency - days = 1 + days = get_days(next_date, auto_repeat_doc) next_date = add_days(next_date, days) return next_date @@ -338,6 +330,16 @@ def get_next_date(dt, mcount, day=None): return dt +def get_days(schedule_date, auto_repeat_doc): + if auto_repeat_doc.frequency == "Weekly": + days = get_offset_for_weekly_frequency(schedule_date, auto_repeat_doc) + else: + # daily frequency + days = 1 + + return days + + def get_offset_for_weekly_frequency(schedule_date, auto_repeat_doc): # if weekdays are not set, offset is 7 from current schedule date if not auto_repeat_doc.repeat_on_days: @@ -355,8 +357,7 @@ def get_offset_for_weekly_frequency(schedule_date, auto_repeat_doc): next_weekday_number = week_map.get(weekday) # offset for upcoming weekday return timedelta((7 + next_weekday_number - current_schedule_day) % 7).days - else: - return 7 + return 7 def get_next_weekday(current_schedule_day, weekdays): @@ -385,6 +386,7 @@ def make_auto_repeat_entry(): data = get_auto_repeat_entries(date) frappe.enqueue(enqueued_method, data=data) + def create_repeated_entries(data): for d in data: doc = frappe.get_doc('Auto Repeat', d.name) @@ -398,6 +400,7 @@ def create_repeated_entries(data): if schedule_date and not doc.disabled: frappe.db.set_value('Auto Repeat', doc.name, 'next_schedule_date', schedule_date) + def get_auto_repeat_entries(date=None): if not date: date = getdate(today()) @@ -406,6 +409,7 @@ def get_auto_repeat_entries(date=None): ['status', '=', 'Active'] ]) + #called through hooks def set_auto_repeat_as_completed(): auto_repeat = frappe.get_all("Auto Repeat", filters = {'status': ['!=', 'Disabled']}) @@ -415,6 +419,7 @@ def set_auto_repeat_as_completed(): doc.status = 'Completed' doc.save() + @frappe.whitelist() def make_auto_repeat(doctype, docname, frequency = 'Daily', start_date = None, end_date = None): if not start_date: From 17ec45b92a11ac7f11c547f06240a4987b284342 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 19 Nov 2020 16:41:17 +0530 Subject: [PATCH 137/259] fix: test case for edge case scenario --- frappe/automation/doctype/auto_repeat/test_auto_repeat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/automation/doctype/auto_repeat/test_auto_repeat.py b/frappe/automation/doctype/auto_repeat/test_auto_repeat.py index 69e9d98c0a..3cd10e8a61 100644 --- a/frappe/automation/doctype/auto_repeat/test_auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/test_auto_repeat.py @@ -73,7 +73,7 @@ class TestAutoRepeat(unittest.TestCase): current_weekday = getdate().weekday() days = [ {'day': weekdays[current_weekday]}, - {'day': weekdays[current_weekday + 2]} + {'day': weekdays[(current_weekday + 2) % 7]} ] doc = make_auto_repeat(reference_doctype='ToDo', frequency='Weekly', reference_document=todo.name, start_date=add_days(today(), -7), days=days) From edbb26d73edb0873785502556c1634467cc9d4b1 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 20 Nov 2020 11:49:45 +0530 Subject: [PATCH 138/259] fix: display style removed from emails --- frappe/utils/html_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/html_utils.py b/frappe/utils/html_utils.py index 302813645e..6fdd383eb9 100644 --- a/frappe/utils/html_utils.py +++ b/frappe/utils/html_utils.py @@ -34,7 +34,7 @@ def clean_email_html(html): 'margin', 'margin-top', 'margin-bottom', 'margin-left', 'margin-right', 'padding', 'padding-top', 'padding-bottom', 'padding-left', 'padding-right', 'font-size', 'font-weight', 'font-family', 'text-decoration', - 'line-height', 'text-align', 'vertical-align' + 'line-height', 'text-align', 'vertical-align', 'display' ], protocols=['cid', 'http', 'https', 'mailto', 'data'], strip=True, strip_comments=True) From 6bfe86d1272a7a9cc0585d17dc53e486654fec03 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Fri, 20 Nov 2020 17:40:20 +0100 Subject: [PATCH 139/259] feat: translate oauth confirmation dialog --- .../templates/includes/oauth_confirmation.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/frappe/templates/includes/oauth_confirmation.html b/frappe/templates/includes/oauth_confirmation.html index 73425af036..3fbbb75971 100644 --- a/frappe/templates/includes/oauth_confirmation.html +++ b/frappe/templates/includes/oauth_confirmation.html @@ -1,7 +1,7 @@ {% if not error %}
    -

    {{ client_id }} wants to access the following details from your account

    +

    {{ _("{} wants to access the following details from your account").format(client_id) }}

      @@ -11,10 +11,10 @@
    • - +
    • - +
    @@ -22,24 +22,24 @@ {% else %}
    -

    Authorization error for {{ client_id }}

    +

    {{ _("Authorization error for {}.").format(client_id) }}

    -

    An unexpected error occurred while authorizing {{ client_id }}.

    +

    {{ _("An unexpected error occurred while authorizing {}.").format(client_id) }}

    {{ error }}

    • - +
    From 5a52bc73effc615f2720303d7b0c7fe30621af8b Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Fri, 20 Nov 2020 17:40:56 +0100 Subject: [PATCH 140/259] fix: cookie value --- frappe/oauth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/oauth.py b/frappe/oauth.py index bf225ac118..09af5ad809 100644 --- a/frappe/oauth.py +++ b/frappe/oauth.py @@ -148,7 +148,7 @@ class OAuthWebRequestValidator(RequestValidator): print("Failed body authentication: Application %s does not exist".format(cid=request.client_id)) cookie_dict = get_cookie_dict_from_headers(request) - user_id = unquote(cookie_dict['user_id']) if 'user_id' in cookie_dict else "Guest" + user_id = unquote(cookie_dict.get('user_id').value) if 'user_id' in cookie_dict else "Guest" return frappe.session.user == user_id def authenticate_client_id(self, client_id, request, *args, **kwargs): From 9fb635828fe900d8e0eef7fb6ae6e4735586bc03 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Fri, 20 Nov 2020 17:44:35 +0100 Subject: [PATCH 141/259] refactor: oauth2 --- frappe/integrations/oauth2.py | 120 +++++++++++++++++----------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/frappe/integrations/oauth2.py b/frappe/integrations/oauth2.py index c8dfc52c95..59d0278d79 100644 --- a/frappe/integrations/oauth2.py +++ b/frappe/integrations/oauth2.py @@ -1,41 +1,50 @@ from __future__ import unicode_literals -import frappe, json -from frappe.oauth import OAuthWebRequestValidator, WebApplicationServer + +import hashlib +import json +import jwt +from werkzeug.urls import url_fix from oauthlib.oauth2 import FatalClientError, OAuth2Error -from werkzeug import url_fix from six.moves.urllib.parse import quote, urlencode, urlparse -from frappe.integrations.doctype.oauth_provider_settings.oauth_provider_settings import get_oauth_settings + +import frappe from frappe import _ +from frappe.oauth import OAuthWebRequestValidator, WebApplicationServer +from frappe.integrations.doctype.oauth_provider_settings.oauth_provider_settings import get_oauth_settings def get_oauth_server(): if not getattr(frappe.local, 'oauth_server', None): oauth_validator = OAuthWebRequestValidator() - frappe.local.oauth_server = WebApplicationServer(oauth_validator) + frappe.local.oauth_server = WebApplicationServer(oauth_validator) return frappe.local.oauth_server -def get_urlparams_from_kwargs(param_kwargs): +def sanitize_kwargs(param_kwargs): arguments = param_kwargs - if arguments.get("data"): - arguments.pop("data") - if arguments.get("cmd"): - arguments.pop("cmd") + arguments.pop('data', None) + arguments.pop('cmd', None) - return urlencode(arguments) + return arguments @frappe.whitelist() def approve(*args, **kwargs): r = frappe.request - uri = url_fix(r.url.replace("+"," ")) - http_method = r.method - body = r.get_data() - headers = r.headers try: - scopes, frappe.flags.oauth_credentials = get_oauth_server().validate_authorization_request(uri, http_method, body, headers) + scopes, frappe.flags.oauth_credentials = get_oauth_server().validate_authorization_request( + r.url, + r.method, + r.get_data(), + r.headers + ) - headers, body, status = get_oauth_server().create_authorization_response(uri=frappe.flags.oauth_credentials['redirect_uri'], \ - body=body, headers=headers, scopes=scopes, credentials=frappe.flags.oauth_credentials) + headers, body, status = get_oauth_server().create_authorization_response( + uri=frappe.flags.oauth_credentials['redirect_uri'], + body=r.get_data(), + headers=r.headers, + scopes=scopes, + credentials=frappe.flags.oauth_credentials + ) uri = headers.get('Location', None) frappe.local.response["type"] = "redirect" @@ -47,34 +56,28 @@ def approve(*args, **kwargs): return e @frappe.whitelist(allow_guest=True) -def authorize(*args, **kwargs): - #Fetch provider URL from settings - oauth_settings = get_oauth_settings() - params = get_urlparams_from_kwargs(kwargs) - request_url = urlparse(frappe.request.url) - success_url = request_url.scheme + "://" + request_url.netloc + "/api/method/frappe.integrations.oauth2.approve?" + params +def authorize(**kwargs): + success_url = "/api/method/frappe.integrations.oauth2.approve?" + urlencode(sanitize_kwargs(kwargs)) failure_url = frappe.form_dict["redirect_uri"] + "?error=access_denied" - if frappe.session['user']=='Guest': + if frappe.session.user == 'Guest': #Force login, redirect to preauth again. frappe.local.response["type"] = "redirect" - frappe.local.response["location"] = "/login?redirect-to=/api/method/frappe.integrations.oauth2.authorize?" + quote(params.replace("+"," ")) - - elif frappe.session['user']!='Guest': + frappe.local.response["location"] = "/login?" + urlencode({'redirect-to': frappe.request.url}) + else: try: r = frappe.request - uri = url_fix(r.url) - http_method = r.method - body = r.get_data() - headers = r.headers - - scopes, frappe.flags.oauth_credentials = get_oauth_server().validate_authorization_request(uri, http_method, body, headers) + scopes, frappe.flags.oauth_credentials = get_oauth_server().validate_authorization_request( + r.url, + r.method, + r.get_data(), + r.headers + ) skip_auth = frappe.db.get_value("OAuth Client", frappe.flags.oauth_credentials['client_id'], "skip_authorization") unrevoked_tokens = frappe.get_all("OAuth Bearer Token", filters={"status":"Active"}) - if skip_auth or (oauth_settings["skip_authorization"] == "Auto" and len(unrevoked_tokens)): - + if skip_auth or (get_oauth_settings().skip_authorization == "Auto" and unrevoked_tokens): frappe.local.response["type"] = "redirect" frappe.local.response["location"] = success_url else: @@ -87,7 +90,6 @@ def authorize(*args, **kwargs): }) resp_html = frappe.render_template("templates/includes/oauth_confirmation.html", response_html_params) frappe.respond_as_web_page("Confirm Access", resp_html) - except FatalClientError as e: return e except OAuth2Error as e: @@ -95,20 +97,20 @@ def authorize(*args, **kwargs): @frappe.whitelist(allow_guest=True) def get_token(*args, **kwargs): - r = frappe.request - - uri = url_fix(r.url) - http_method = r.method - body = r.form - headers = r.headers - #Check whether frappe server URL is set frappe_server_url = frappe.db.get_value("Social Login Key", "frappe", "base_url") or None if not frappe_server_url: frappe.throw(_("Please set Base URL in Social Login Key for Frappe")) try: - headers, body, status = get_oauth_server().create_token_response(uri, http_method, body, headers, frappe.flags.oauth_credentials) + r = frappe.request + headers, body, status = get_oauth_server().create_token_response( + r.url, + r.method, + r.form, + r.headers, + frappe.flags.oauth_credentials + ) out = frappe._dict(json.loads(body)) if not out.error and "openid" in out.scope: token_user = frappe.db.get_value("OAuth Bearer Token", out.access_token, "user") @@ -116,7 +118,7 @@ def get_token(*args, **kwargs): client_secret = frappe.db.get_value("OAuth Client", token_client, "client_secret") if token_user in ["Guest", "Administrator"]: frappe.throw(_("Logged in as Guest or Administrator")) - import hashlib + id_token_header = { "typ":"jwt", "alg":"HS256" @@ -128,9 +130,10 @@ def get_token(*args, **kwargs): "iss": frappe_server_url, "at_hash": frappe.oauth.calculate_at_hash(out.access_token, hashlib.sha256) } - import jwt + id_token_encoded = jwt.encode(id_token, client_secret, algorithm='HS256', headers=id_token_header) - out.update({"id_token":str(id_token_encoded)}) + out.update({"id_token": str(id_token_encoded)}) + frappe.local.response = out except FatalClientError as e: @@ -140,12 +143,12 @@ def get_token(*args, **kwargs): @frappe.whitelist(allow_guest=True) def revoke_token(*args, **kwargs): r = frappe.request - uri = url_fix(r.url) - http_method = r.method - body = r.form - headers = r.headers - - headers, body, status = get_oauth_server().create_revocation_response(uri, headers=headers, body=body, http_method=http_method) + headers, body, status = get_oauth_server().create_revocation_response( + r.url, + headers=r.headers, + body=r.form, + http_method=r.method + ) frappe.local.response['http_status_code'] = status if status == 200: @@ -174,15 +177,12 @@ def openid_profile(*args, **kwargs): "email": name, "picture": picture }) - + frappe.local.response = user_profile def validate_url(url_string): try: result = urlparse(url_string) - if result.scheme and result.scheme in ["http", "https", "ftp", "ftps"]: - return True - else: - return False + return result.scheme and result.scheme in ["http", "https", "ftp", "ftps"] except: - return False \ No newline at end of file + return False From bea4f6e11b5058c7aa457141f2fd0aa59b27615b Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Fri, 20 Nov 2020 18:03:17 +0100 Subject: [PATCH 142/259] fix: remove unused import --- frappe/integrations/oauth2.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/integrations/oauth2.py b/frappe/integrations/oauth2.py index 59d0278d79..7570a50127 100644 --- a/frappe/integrations/oauth2.py +++ b/frappe/integrations/oauth2.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import hashlib import json import jwt -from werkzeug.urls import url_fix from oauthlib.oauth2 import FatalClientError, OAuth2Error from six.moves.urllib.parse import quote, urlencode, urlparse From e93a38f912d8fb10f4610173d218508b7a4459b7 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Fri, 20 Nov 2020 19:02:33 +0100 Subject: [PATCH 143/259] refactor: move encode_params from test to oauth2.py --- frappe/integrations/oauth2.py | 17 ++++++++++++++--- frappe/tests/test_oauth20.py | 11 +---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/frappe/integrations/oauth2.py b/frappe/integrations/oauth2.py index 7570a50127..a750c8328c 100644 --- a/frappe/integrations/oauth2.py +++ b/frappe/integrations/oauth2.py @@ -2,9 +2,10 @@ from __future__ import unicode_literals import hashlib import json +from urllib.parse import quote, urlencode, urlparse + import jwt from oauthlib.oauth2 import FatalClientError, OAuth2Error -from six.moves.urllib.parse import quote, urlencode, urlparse import frappe from frappe import _ @@ -56,13 +57,13 @@ def approve(*args, **kwargs): @frappe.whitelist(allow_guest=True) def authorize(**kwargs): - success_url = "/api/method/frappe.integrations.oauth2.approve?" + urlencode(sanitize_kwargs(kwargs)) + success_url = "/api/method/frappe.integrations.oauth2.approve?" + encode_params(sanitize_kwargs(kwargs)) failure_url = frappe.form_dict["redirect_uri"] + "?error=access_denied" if frappe.session.user == 'Guest': #Force login, redirect to preauth again. frappe.local.response["type"] = "redirect" - frappe.local.response["location"] = "/login?" + urlencode({'redirect-to': frappe.request.url}) + frappe.local.response["location"] = "/login?" + encode_params({'redirect-to': frappe.request.url}) else: try: r = frappe.request @@ -185,3 +186,13 @@ def validate_url(url_string): return result.scheme and result.scheme in ["http", "https", "ftp", "ftps"] except: return False + +def encode_params(params): + """ + Encode a dict of params into a query string. + + Use `quote_via=urllib.parse.quote` so that whitespaces will be encoded as + `%20` instead of as `+`. This is needed because oauthlib cannot handle `+` + as a whitespace. + """ + return urlencode(params, quote_via=quote) diff --git a/frappe/tests/test_oauth20.py b/frappe/tests/test_oauth20.py index f4ecc8a68d..e2213145b7 100644 --- a/frappe/tests/test_oauth20.py +++ b/frappe/tests/test_oauth20.py @@ -6,6 +6,7 @@ import unittest, frappe, requests, time from frappe.test_runner import make_test_records from six.moves.urllib.parse import urlparse, parse_qs, urljoin from urllib.parse import urlencode, quote +from frappe.integrations.oauth2 import encode_params class TestOAuth20(unittest.TestCase): @@ -232,13 +233,3 @@ def login(session): def get_full_url(endpoint): """Turn '/endpoint' into 'http://127.0.0.1:8000/endpoint'.""" return urljoin(frappe.utils.get_url(), endpoint) - -def encode_params(params): - """ - Encode a dict of params into a query string. - - Use `quote_via=urllib.parse.quote` so that whitespaces will be encoded as - `%20` instead of as `+`. This is needed because oauthlib cannot handle `+` - as a whitespace. - """ - return urlencode(params, quote_via=quote) From 0312b9d67cd9ab45cf4f7e342e100dbb87ad1d26 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 17 Nov 2020 19:20:44 +0530 Subject: [PATCH 144/259] feat: check if auto_repeat field is already present --- .../doctype/customize_form/customize_form.py | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index cf674082ab..67b4f05856 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -76,17 +76,20 @@ class CustomizeForm(Document): def create_auto_repeat_custom_field_if_requried(self, meta): if self.allow_auto_repeat: - if not frappe.db.exists('Custom Field', {'fieldname': 'auto_repeat', 'dt': self.doc_type}) and \ - not frappe.db.exists('DocField', {'fieldname': 'auto_repeat', 'parent': self.name}): - insert_after = self.fields[len(self.fields) - 1].fieldname - df = dict( - fieldname='auto_repeat', - label='Auto Repeat', - fieldtype='Link', - options='Auto Repeat', - insert_after=insert_after, - read_only=1, no_copy=1, print_hide=1) - create_custom_field(self.doc_type, df) + all_fields = [df.fieldname for df in meta.fields] + + if "auto_repeat" in all_fields: + return + + insert_after = self.fields[len(self.fields) - 1].fieldname + create_custom_field(self.doc_type, dict( + fieldname='auto_repeat', + label='Auto Repeat', + fieldtype='Link', + options='Auto Repeat', + insert_after=insert_after, + read_only=1, no_copy=1, print_hide=1 + )) def get_name_translation(self): From 019fca9ef773e006a57069b8137a1043593da174 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 23 Nov 2020 11:33:16 +0530 Subject: [PATCH 145/259] fix: typo in function name --- frappe/custom/doctype/customize_form/customize_form.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index 67b4f05856..60ae65091d 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -39,7 +39,7 @@ class CustomizeForm(Document): translation = self.get_name_translation() self.label = translation.translated_text if translation else '' - self.create_auto_repeat_custom_field_if_requried(meta) + self.create_auto_repeat_custom_field_if_required(meta) # NOTE doc (self) is sent to clientside by run_method @@ -74,7 +74,7 @@ class CustomizeForm(Document): for d in meta.get(fieldname): self.append(fieldname, d) - def create_auto_repeat_custom_field_if_requried(self, meta): + def create_auto_repeat_custom_field_if_required(self, meta): if self.allow_auto_repeat: all_fields = [df.fieldname for df in meta.fields] From 44413e9ba6010a88b25114c67fb12275f0de803f Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 23 Nov 2020 11:34:49 +0530 Subject: [PATCH 146/259] chore: add docstrings --- frappe/custom/doctype/customize_form/customize_form.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index 60ae65091d..82513783c7 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -75,6 +75,9 @@ class CustomizeForm(Document): self.append(fieldname, d) def create_auto_repeat_custom_field_if_required(self, meta): + ''' + Create auto repeat custom field if it's not already present + ''' if self.allow_auto_repeat: all_fields = [df.fieldname for df in meta.fields] From 456030760dba7b18753e42f34df383c81c421f0e Mon Sep 17 00:00:00 2001 From: marination Date: Mon, 23 Nov 2020 19:11:48 +0530 Subject: [PATCH 147/259] chore: Allow custom freeze message in Open Mapped Doc --- frappe/public/js/frappe/model/create_new.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/model/create_new.js b/frappe/public/js/frappe/model/create_new.js index 7be7fc5baa..f7a5982b96 100644 --- a/frappe/public/js/frappe/model/create_new.js +++ b/frappe/public/js/frappe/model/create_new.js @@ -306,6 +306,7 @@ $.extend(frappe.model, { selected_children: opts.frm ? opts.frm.get_selected() : null }, freeze: true, + freeze_message: opts.freeze_message || '', callback: function(r) { if(!r.exc) { frappe.model.sync(r.message); From 0866526d11bbe7c9afa102cbaa3665b4423af0ca Mon Sep 17 00:00:00 2001 From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Date: Tue, 24 Nov 2020 09:35:18 +0530 Subject: [PATCH 148/259] fix(Document Follow): Skip Email Account and Email Domain (#11973) --- frappe/desk/form/document_follow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/form/document_follow.py b/frappe/desk/form/document_follow.py index 3aa3a4fa88..66164948f2 100644 --- a/frappe/desk/form/document_follow.py +++ b/frappe/desk/form/document_follow.py @@ -21,7 +21,7 @@ def follow_document(doctype, doc_name, user, force=False): avoided for some doctype follow only if track changes are set to 1 ''' - if (doctype in ("Communication", "ToDo", "Email Unsubscribe", "File", "Comment") + if (doctype in ("Communication", "ToDo", "Email Unsubscribe", "File", "Comment", "Email Account", "Email Domain") or doctype in log_types): return From f71a8e0afcffae02dee34fd20642ee439c6b6017 Mon Sep 17 00:00:00 2001 From: everyx Date: Tue, 24 Nov 2020 14:36:53 +0800 Subject: [PATCH 149/259] fix: `PRIMARY KEY must be NOT NULL` error when install with MySQL 5.7+ --- frappe/database/mariadb/framework_mariadb.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/database/mariadb/framework_mariadb.sql b/frappe/database/mariadb/framework_mariadb.sql index 15b0bed699..a52efd01e3 100644 --- a/frappe/database/mariadb/framework_mariadb.sql +++ b/frappe/database/mariadb/framework_mariadb.sql @@ -233,7 +233,7 @@ CREATE TABLE `tabDocType` ( DROP TABLE IF EXISTS `tabSeries`; CREATE TABLE `tabSeries` ( - `name` varchar(100) DEFAULT NULL, + `name` varchar(100), `current` int(10) NOT NULL DEFAULT 0, PRIMARY KEY(`name`) ) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci; From 200211e11ef40db91b6bd5fe83203792d779d4ce Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 24 Nov 2020 14:27:10 +0530 Subject: [PATCH 150/259] feat: use modified by or owner to send notification from --- frappe/email/doctype/notification/notification.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py index 75281d427e..2ea7a3785e 100644 --- a/frappe/email/doctype/notification/notification.py +++ b/frappe/email/doctype/notification/notification.py @@ -181,6 +181,7 @@ def get_context(context): 'document_type': doc.doctype, 'document_name': doc.name, 'subject': subject, + 'from_user': doc.modified_by or doc.owner, 'email_content': frappe.render_template(self.message, context), 'attached_file': attachments and json.dumps(attachments[0]) } From 856ff501e4399b4711de4b16f6e4e6afb712a7a7 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 24 Nov 2020 14:27:34 +0530 Subject: [PATCH 151/259] feat: show recipients section for System Notifications --- frappe/email/doctype/notification/notification.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/email/doctype/notification/notification.json b/frappe/email/doctype/notification/notification.json index 73a84e1d3e..c1c877efd4 100644 --- a/frappe/email/doctype/notification/notification.json +++ b/frappe/email/doctype/notification/notification.json @@ -207,7 +207,7 @@ "label": "Value To Be Set" }, { - "depends_on": "eval:in_list(['Email', 'SMS'], doc.channel)", + "depends_on": "eval:doc.channel !=\"Slack\"", "fieldname": "column_break_5", "fieldtype": "Section Break", "label": "Recipients" @@ -281,7 +281,7 @@ "icon": "fa fa-envelope", "index_web_pages_for_search": 1, "links": [], - "modified": "2020-10-28 11:04:54.955567", + "modified": "2020-11-24 14:25:43.245677", "modified_by": "Administrator", "module": "Email", "name": "Notification", From 0d6dafa3f589a224feafef1dedb5a6c09104a632 Mon Sep 17 00:00:00 2001 From: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Date: Tue, 24 Nov 2020 11:36:23 +0100 Subject: [PATCH 152/259] fix: allow other github links in same PR --- .github/helper/documentation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/helper/documentation.py b/.github/helper/documentation.py index 3fc14ba61b..08d1d1aa9c 100644 --- a/.github/helper/documentation.py +++ b/.github/helper/documentation.py @@ -21,8 +21,8 @@ def docs_link_exists(body): if word.startswith('http') and uri_validator(word): parsed_url = urlparse(word) if parsed_url.netloc == "github.com": - _, org, repo, _type, ref = parsed_url.path.split('/') - if org == "frappe" and repo in docs_repos: + parts = parsed_url.path.split('/') + if len(parts) == 5 and parts[1] == "frappe" and parts[2] in docs_repos: return True From ff059156d8757bc89c945256116479bd6308db11 Mon Sep 17 00:00:00 2001 From: bhavesh95863 <34086262+bhavesh95863@users.noreply.github.com> Date: Tue, 24 Nov 2020 22:28:11 +0530 Subject: [PATCH 153/259] feat: translate kanboard board title --- frappe/public/js/frappe/views/kanban/kanban_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/kanban/kanban_view.js b/frappe/public/js/frappe/views/kanban/kanban_view.js index e4d0659965..48a45fddd6 100644 --- a/frappe/public/js/frappe/views/kanban/kanban_view.js +++ b/frappe/public/js/frappe/views/kanban/kanban_view.js @@ -30,7 +30,7 @@ frappe.views.KanbanView = class KanbanView extends frappe.views.ListView { return super.setup_defaults() .then(() => { this.board_name = frappe.get_route()[3]; - this.page_title = this.board_name; + this.page_title = __(this.board_name); this.card_meta = this.get_card_meta(); this.menu_items.push({ From c903286465c95e966a11b3a3e0b209f3f7997a20 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 24 Nov 2020 23:28:00 +0530 Subject: [PATCH 154/259] fix: Not able to save Domain Settings (#11984) --- frappe/core/doctype/domain_settings/domain_settings.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/core/doctype/domain_settings/domain_settings.js b/frappe/core/doctype/domain_settings/domain_settings.js index 1428727993..7178cb4cd6 100644 --- a/frappe/core/doctype/domain_settings/domain_settings.js +++ b/frappe/core/doctype/domain_settings/domain_settings.js @@ -18,6 +18,9 @@ frappe.ui.form.on('Domain Settings', { checked: active_domains.includes(domain) }; }); + }, + on_change: () => { + frm.dirty(); } }, render_input: true From 1154cc931fafd454a98ca8c15ed21fbdd258757c Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Wed, 25 Nov 2020 07:29:34 +0200 Subject: [PATCH 155/259] fix(Snyk): Security upgrade snyk from 1.398.1 to 1.425.4 (#11990) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-Y18N-1021887 --- package.json | 2 +- yarn.lock | 349 +++++++++++++++++++++++++++++---------------------- 2 files changed, 202 insertions(+), 149 deletions(-) diff --git a/package.json b/package.json index c9eb9c0e56..91d204bec5 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "qz-tray": "^2.0.8", "redis": "^2.8.0", "showdown": "^1.9.1", - "snyk": "^1.398.1", + "snyk": "^1.425.4", "socket.io": "^2.3.0", "superagent": "^3.8.2", "touch": "^3.1.0", diff --git a/yarn.lock b/yarn.lock index 15a6321ae2..459f4139b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -93,10 +93,21 @@ source-map-support "^0.5.19" tslib "^1.13.0" -"@snyk/docker-registry-v2-client@^1.13.5": - version "1.13.5" - resolved "https://registry.yarnpkg.com/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.5.tgz#8d862f0c53d4a9a25db09cd48b4cd44aa8e385c9" - integrity sha512-lgJiC071abCpFVLp47OnykU8MMrhdQe386Wt6QaDmjI0s2DQn/S58NfdLrPU7s6l4zoGT7UwRW9+7paozRgFTA== +"@snyk/dep-graph@^1.19.5": + version "1.20.0" + resolved "https://registry.yarnpkg.com/@snyk/dep-graph/-/dep-graph-1.20.0.tgz#258ae85f8a066dc63af4444cfca8b8d092b94bc0" + integrity sha512-/TOzXGh+JFgAu8pWdo1oLFKDNfFk99TnSQG2lbEu+vKLI2ZrGAk9oGO0geNogAN7Ib4EDQOEhgb7YwqwL7aA7w== + dependencies: + graphlib "^2.1.8" + lodash.isequal "^4.5.0" + object-hash "^2.0.3" + semver "^6.0.0" + tslib "^1.13.0" + +"@snyk/docker-registry-v2-client@1.13.9": + version "1.13.9" + resolved "https://registry.yarnpkg.com/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.9.tgz#54c2e3071de58fc6fc12c5fef5eaeae174ecda12" + integrity sha512-DIFLEhr8m1GrAwsLGInJmpcQMacjuhf3jcbpQTR+LeMvZA9IuKq+B7kqw2O2FzMiHMZmUb5z+tV+BR7+IUHkFQ== dependencies: needle "^2.5.0" parse-link-header "^1.0.1" @@ -107,10 +118,10 @@ resolved "https://registry.yarnpkg.com/@snyk/gemfile/-/gemfile-1.2.0.tgz#919857944973cce74c650e5428aaf11bcd5c0457" integrity sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA== -"@snyk/java-call-graph-builder@1.13.2": - version "1.13.2" - resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.13.2.tgz#6e4a9495d5c47bbab9bc69e066d4646473781b67" - integrity sha512-YN3a93ttscqFQRUeThrxa7i2SJkFPfYn0VpFqdPB6mIJz2fRVLxUkMtlCbG0aSEUvWiLnGVHN0IYxwWEzhq11w== +"@snyk/java-call-graph-builder@1.16.2": + version "1.16.2" + resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.16.2.tgz#a9f9a34107759cf2be847a114a759e347cef44e8" + integrity sha512-tJF+dY/wTfexwYuCgFB3RpWl4RGcf2H9RT9yurkTVi5wwKfvcNwZMUMwSlTDEFOqwmAsJ7e0uNVRlkPQHekCcQ== dependencies: ci-info "^2.0.0" debug "^4.1.1" @@ -119,11 +130,29 @@ jszip "^3.2.2" needle "^2.3.3" progress "^2.0.3" - snyk-config "^3.0.0" + snyk-config "^4.0.0-rc.2" source-map-support "^0.5.7" temp-dir "^2.0.0" tslib "^1.9.3" +"@snyk/java-call-graph-builder@1.16.5": + version "1.16.5" + resolved "https://registry.yarnpkg.com/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.16.5.tgz#e57302cc6dc93f1adff7abe1e5eecff26d8a41f4" + integrity sha512-6H4hkq/qYljJoH1QnZsTRPMqp9Kt5AOEZYGJAeSHkhJdfUYSLtqwN4WsU6yVR3vWAaDQ8Lllp3m6EL7nstMPZA== + dependencies: + ci-info "^2.0.0" + debug "^4.1.1" + glob "^7.1.6" + graphlib "^2.1.8" + jszip "^3.2.2" + needle "^2.3.3" + progress "^2.0.3" + snyk-config "^4.0.0-rc.2" + source-map-support "^0.5.7" + temp-dir "^2.0.0" + tmp "^0.2.1" + tslib "^1.9.3" + "@snyk/rpm-parser@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@snyk/rpm-parser/-/rpm-parser-2.0.0.tgz#4ded7fa4b0a8efca7699359e4ca7a79bfbe38bc1" @@ -142,12 +171,12 @@ source-map-support "^0.5.7" tslib "^2.0.0" -"@snyk/snyk-docker-pull@^3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.0.tgz#07c47b8be2d899d51d720099a73a0d89effe5d99" - integrity sha512-uWKtjh29I/d0mfmfBN7w6RwwNBQxQVKrauF5ND/gqb0PVsKV22GIpkI+viWjI7KNKso6/B0tMmsv7TX2tsNcLQ== +"@snyk/snyk-docker-pull@3.2.3": + version "3.2.3" + resolved "https://registry.yarnpkg.com/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.3.tgz#9743ea624098c7abd0f95c438c76067530494f4b" + integrity sha512-hiFiSmWGLc2tOI7FfgIhVdFzO2f69im8O6p3OV4xEZ/Ss1l58vwtqudItoswsk7wj/azRlgfBW8wGu2MjoudQg== dependencies: - "@snyk/docker-registry-v2-client" "^1.13.5" + "@snyk/docker-registry-v2-client" "1.13.9" child-process "^1.0.2" tar-stream "^2.1.2" tmp "^0.1.0" @@ -545,10 +574,10 @@ async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8" integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg== -async@^1.4.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" - integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= +async@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" + integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== asynckit@^0.4.0: version "0.4.0" @@ -757,6 +786,13 @@ braces@^2.3.1: split-string "^3.0.2" to-regex "^3.0.1" +braces@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + browserify-zlib@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d" @@ -896,7 +932,7 @@ camelcase-keys@^2.0.0: camelcase "^2.0.0" map-obj "^1.0.0" -camelcase@^2.0.0, camelcase@^2.0.1: +camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= @@ -1021,15 +1057,6 @@ cli-width@^3.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== -cliui@^3.0.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" - cliui@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" @@ -1507,7 +1534,14 @@ debug@^3.1.0, debug@^3.2.5, debug@^3.2.6: dependencies: ms "^2.1.1" -decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: +debug@^4.2.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + +decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -1751,6 +1785,13 @@ electron-to-chromium@^1.3.523: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.551.tgz#a94d243a4ca90705189bd4a5eca4e0f56b745a4f" integrity sha512-11qcm2xvf2kqeFO5EIejaBx5cKXsW1quAyv3VctCMYwofnyVZLs97y6LCekss3/ghQpr7PYkSO3uId5FmxZsdw== +elfy@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/elfy/-/elfy-1.0.0.tgz#7a1c86af7d41e0a568cbb4a3fa5b685648d9efcd" + integrity sha512-4Kp3AA94jC085IJox+qnvrZ3PudqTi4gQNvIoTZfJJ9IqkRuCoqP60vCVYlIg00c5aYusi5Wjh2bf0cHYt+6gQ== + dependencies: + endian-reader "^0.3.0" + email-validator@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed" @@ -1783,6 +1824,11 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" +endian-reader@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/endian-reader/-/endian-reader-0.3.0.tgz#84eca436b80aed0d0639c47291338b932efe50a0" + integrity sha1-hOykNrgK7Q0GOcRykTOLky7+UKA= + engine.io-client@~3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.4.0.tgz#82a642b42862a9b3f7a188f41776b2deab643700" @@ -2177,6 +2223,13 @@ fill-range@^4.0.0: repeat-string "^1.6.1" to-regex-range "^2.1.0" +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + finalhandler@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" @@ -2678,6 +2731,13 @@ hosted-git-info@^3.0.4: dependencies: lru-cache "^6.0.0" +hosted-git-info@^3.0.7: + version "3.0.7" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c" + integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ== + dependencies: + lru-cache "^6.0.0" + hsl-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e" @@ -2857,7 +2917,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.0, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -2881,11 +2941,6 @@ inquirer@^7.3.3: strip-ansi "^6.0.0" through "^2.3.6" -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= - iota-array@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/iota-array/-/iota-array-1.0.0.tgz#81ef57fe5d05814cd58c2483632a99c30a0e8087" @@ -3122,6 +3177,11 @@ is-number@^3.0.0: dependencies: kind-of "^3.0.2" +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + is-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" @@ -3447,13 +3507,6 @@ latest-version@^5.0.0: dependencies: package-json "^6.3.0" -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= - dependencies: - invert-kv "^1.0.0" - less@^3.11.1: version "3.11.1" resolved "https://registry.yarnpkg.com/less/-/less-3.11.1.tgz#c6bf08e39e02404fe6b307a3dfffafdc55bd36e2" @@ -3750,6 +3803,14 @@ methods@^1.1.1, methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= +micromatch@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" + integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + dependencies: + braces "^3.0.1" + picomatch "^2.0.5" + micromatch@^3.1.10: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" @@ -3896,7 +3957,7 @@ ms@2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== -ms@^2.1.1: +ms@2.1.2, ms@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== @@ -3928,16 +3989,6 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -nconf@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.10.0.tgz#da1285ee95d0a922ca6cee75adcf861f48205ad2" - integrity sha512-fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q== - dependencies: - async "^1.4.0" - ini "^1.3.0" - secure-keys "^1.0.0" - yargs "^3.19.0" - ndarray-linear-interpolate@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ndarray-linear-interpolate/-/ndarray-linear-interpolate-1.0.0.tgz#78bc92b85b9abc15b6e67ee65828f9e2137ae72b" @@ -4268,13 +4319,6 @@ os-homedir@^1.0.0, os-homedir@^1.0.1: resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= - dependencies: - lcid "^1.0.0" - os-name@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801" @@ -4508,6 +4552,11 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= +picomatch@^2.0.5: + version "2.2.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== + pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -5687,11 +5736,6 @@ scss-tokenizer@^0.2.3: js-base64 "^2.1.8" source-map "^0.4.2" -secure-keys@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/secure-keys/-/secure-keys-1.0.0.tgz#f0c82d98a3b139a8776a8808050b824431087fca" - integrity sha1-8MgtmKOxOah3aogIBQuCRDEIf8o= - semver-diff@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" @@ -5862,40 +5906,55 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -snyk-config@3.1.1, snyk-config@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/snyk-config/-/snyk-config-3.1.1.tgz#a511ef8bf769545f0564e09d382b5ea3aacb9c6a" - integrity sha512-wwrMIEDozfLJ8LmakCsCC1FQ0siIX5icCQPCbUKKgRbeVsZ27NjPJs37BpTXX4rcHkaWpe8TbH3yOtp23qmszg== +snyk-config@4.0.0-rc.2: + version "4.0.0-rc.2" + resolved "https://registry.yarnpkg.com/snyk-config/-/snyk-config-4.0.0-rc.2.tgz#c6c94afe733e9063df546cd71a7adf6957135594" + integrity sha512-HIXpMCRp5IdQDFH/CY6WqOUt5X5Ec55KC9dFVjlMLe/2zeqsImJn1vbjpE5uBoLYIdYi1SteTqtsJhyJZWRK8g== dependencies: + async "^3.2.0" debug "^4.1.1" lodash.merge "^4.6.2" - nconf "^0.10.0" + minimist "^1.2.5" -snyk-cpp-plugin@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/snyk-cpp-plugin/-/snyk-cpp-plugin-1.5.0.tgz#2ec2068fdcf5e579eb7d9b9eed8bb984fd00a925" - integrity sha512-nBZ0cBmpT4RVJUFzYydQJOxwjcdXk7NtRJE1UIIOafQa2FcvIl3GBezfrCJ6pu61svOAf5r8Qi/likx6F15K1A== +snyk-config@^4.0.0-rc.2: + version "4.0.0" + resolved "https://registry.yarnpkg.com/snyk-config/-/snyk-config-4.0.0.tgz#21d459f19087991246cc07a7ffb4501dce6f4159" + integrity sha512-E6jNe0oUjjzVASWBOAc/mA23DhbzABDF9MI6UZvl0gylh2NSXSXw2/LjlqMNOKL2c1qkbSkzLOdIX5XACoLCAQ== + dependencies: + async "^3.2.0" + debug "^4.1.1" + lodash.merge "^4.6.2" + minimist "^1.2.5" + +snyk-cpp-plugin@2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/snyk-cpp-plugin/-/snyk-cpp-plugin-2.2.1.tgz#55891511a43a6448e5a7c836a94f66f70fa705eb" + integrity sha512-NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ== dependencies: "@snyk/dep-graph" "^1.19.3" chalk "^4.1.0" debug "^4.1.1" + hosted-git-info "^3.0.7" tslib "^2.0.0" -snyk-docker-plugin@3.21.0: - version "3.21.0" - resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-3.21.0.tgz#a92074c0411578c1a7b86852a06f1421770e985d" - integrity sha512-A7oJS3QGR7bwm1qeeczCb8PDfi8go1KM6VWph/drJHBQ7JxVKKLb3j4AzrMmIM96mGZFbmyNOL4pznwumaOM8g== +snyk-docker-plugin@4.12.0: + version "4.12.0" + resolved "https://registry.yarnpkg.com/snyk-docker-plugin/-/snyk-docker-plugin-4.12.0.tgz#137a159baf627debef6178cfb8b40941a81a7168" + integrity sha512-iN5GUTpMR4dx/hmjxh1GnJ9vrMpbOUhD8gsdWgFPZ5Qg+ImPQ2WBJBal/hyfkauM0TaKQEAgIwT6xZ1ovaIvWQ== dependencies: + "@snyk/dep-graph" "^1.19.4" "@snyk/rpm-parser" "^2.0.0" - "@snyk/snyk-docker-pull" "^3.2.0" + "@snyk/snyk-docker-pull" "3.2.3" + chalk "^2.4.2" debug "^4.1.1" docker-modem "2.1.3" dockerfile-ast "0.0.30" + elfy "^1.0.0" event-loop-spinner "^2.0.0" gunzip-maybe "^1.4.2" mkdirp "^1.0.4" semver "^6.1.0" - snyk-nodejs-lockfile-parser "1.28.1" + snyk-nodejs-lockfile-parser "1.30.1" tar-stream "^2.1.0" tmp "^0.2.1" tslib "^1" @@ -5921,13 +5980,14 @@ snyk-go-plugin@1.16.2: tmp "0.2.1" tslib "^1.10.0" -snyk-gradle-plugin@3.6.3: - version "3.6.3" - resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.6.3.tgz#484059bcb98469b6a674bbcbdc995eafb5581041" - integrity sha512-j/eQSLSsK3DHmvVX2fNig4+ugYrKlCOV8Xvo6OYFkNzhMpdyNFiGWTS1uyP1HH75Gyc78MaLANMgjlSYePukzQ== +snyk-gradle-plugin@3.10.2: + version "3.10.2" + resolved "https://registry.yarnpkg.com/snyk-gradle-plugin/-/snyk-gradle-plugin-3.10.2.tgz#f3e104d42989e49b5c05818f005cae8c544c9803" + integrity sha512-gTFKL0BLUN54asUQ4OIoa4lATGn27VZwWDJGQ0VuqSaaoy8I5W16Cbn/KN95oIKa7tgwrmasPLd5uviFWzo/Qw== dependencies: "@snyk/cli-interface" "2.9.1" "@snyk/dep-graph" "^1.19.4" + "@snyk/java-call-graph-builder" "1.16.2" "@types/debug" "^4.1.4" chalk "^3.0.0" debug "^4.1.1" @@ -5960,22 +6020,23 @@ snyk-module@^2.0.2: debug "^3.1.0" hosted-git-info "^2.7.1" -snyk-mvn-plugin@2.19.4: - version "2.19.4" - resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.19.4.tgz#4e29fa82b9ca409789d441939c766797d6a2360f" - integrity sha512-kYPUKOugnNd31PFqx1YHJTo90pospELYHME4AzBx8dkMDgs5ZPjAmQXSxegQ3AMUqfqcETMSTzlKHe6uHujI8A== +snyk-mvn-plugin@2.23.4: + version "2.23.4" + resolved "https://registry.yarnpkg.com/snyk-mvn-plugin/-/snyk-mvn-plugin-2.23.4.tgz#3f43601058aa51e8a0f9e272a7c186cad4b26950" + integrity sha512-1dWqvFu6eo2KsXFDqRF28JFwrdzpc0k+GwpIqv7vF2kHarsMxnLnT/akhjbKzs+xlRTNFvqdKhEQxjdq2nSD1Q== dependencies: "@snyk/cli-interface" "2.9.1" - "@snyk/java-call-graph-builder" "1.13.2" + "@snyk/java-call-graph-builder" "1.16.5" debug "^4.1.1" + glob "^7.1.6" needle "^2.5.0" tmp "^0.1.0" tslib "1.11.1" -snyk-nodejs-lockfile-parser@1.28.1: - version "1.28.1" - resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.28.1.tgz#9eda1354bbca1fc881a4e63a1e1042f80c37bff2" - integrity sha512-0zbmtidYLI2ia/DQD4rZm2YKrhfHLvHlVBdF2cMAGPwhOoKW5ovG9eBO4wNQdvjxNi7b4VeUyAj8SfuhjDraDQ== +snyk-nodejs-lockfile-parser@1.30.1: + version "1.30.1" + resolved "https://registry.yarnpkg.com/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.1.tgz#5d54180ae818ddbe8c2b55329528c4d68e390235" + integrity sha512-QyhE4pmy7GI7fQrVmZ+qrQB8GGSbxN7OoYueS4BEP9nDxIyH4dJAz8dME5zOUeUxh3frcgBWoWgZoSzE4VOYpg== dependencies: "@yarnpkg/lockfile" "^1.1.0" event-loop-spinner "^2.0.0" @@ -5987,16 +6048,15 @@ snyk-nodejs-lockfile-parser@1.28.1: lodash.set "^4.3.2" lodash.topairs "^4.3.0" p-map "2.1.0" - snyk-config "^3.0.0" - source-map-support "^0.5.7" + snyk-config "^4.0.0-rc.2" tslib "^1.9.3" - uuid "^3.3.2" + uuid "^8.3.0" yaml "^1.9.2" -snyk-nuget-plugin@1.19.3: - version "1.19.3" - resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.19.3.tgz#5b4d9a5a61a543810c98bd4e67b9f6b1d95e3c3a" - integrity sha512-KwKoMumwcXVz/DQH80ifXfX7CTnm29bmHJ2fczjCGohxLGb4EKBGQtA3t7K98O7lTISQGgXDxnWIaM9ZXkxPdw== +snyk-nuget-plugin@1.19.4: + version "1.19.4" + resolved "https://registry.yarnpkg.com/snyk-nuget-plugin/-/snyk-nuget-plugin-1.19.4.tgz#cd1163a29f8002d54a965eab9e256345c97d4174" + integrity sha512-6BvLJc7gpNdfPJSnvpmTL4BrbaOVbXh/9q1FNMs5OVp8NbnZ3l97iM+bpQXWTJHOa3BJBZz7iEg+3suH4AWoWw== dependencies: debug "^4.1.1" dotnet-deps-parser "5.0.0" @@ -6022,6 +6082,17 @@ snyk-php-plugin@1.9.2: "@snyk/composer-lockfile-parser" "^1.4.1" tslib "1.11.1" +snyk-poetry-lockfile-parser@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.1.tgz#3f062953802916f6ae1767ec13dd1892fff0541e" + integrity sha512-G3LX27V2KUsKObwVN4vDDjrYr5BERad9pXHAf+SST5+vZsdPUUZjd1ZUIrHgCv7IQhwq+7mZrtqedY5x7+LIGA== + dependencies: + "@snyk/cli-interface" "^2.9.2" + "@snyk/dep-graph" "^1.19.5" + debug "^4.2.0" + toml "^3.0.0" + tslib "^2.0.0" + snyk-policy@1.14.1: version "1.14.1" resolved "https://registry.yarnpkg.com/snyk-policy/-/snyk-policy-1.14.1.tgz#4e48ea993573aca18e8d883b8c62171b9d35a3e0" @@ -6037,12 +6108,13 @@ snyk-policy@1.14.1: snyk-try-require "^1.3.1" then-fs "^2.0.0" -snyk-python-plugin@1.17.1: - version "1.17.1" - resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.17.1.tgz#303ec2885ef748634d89f22f3099ef1febdc3325" - integrity sha512-KKklat9Hfbj4hw2y63LRhgmziYzmyRt+cSuzN5KDmBSAGYck0EAoPDtNpJXjrIs1kPNz28EXnE6NDnadXnOjiQ== +snyk-python-plugin@1.19.1: + version "1.19.1" + resolved "https://registry.yarnpkg.com/snyk-python-plugin/-/snyk-python-plugin-1.19.1.tgz#91febcd260094a9d900bc54bf200aa0c2632613a" + integrity sha512-JoOUHnA76L3pekCblSuE9jQ9CuA5jt+GqXpsLQbEIZ0FQQTBa+0F7vfolg3Q7+s1it4ZdtgSbSWrlxCngIJt8g== dependencies: "@snyk/cli-interface" "^2.0.3" + snyk-poetry-lockfile-parser "^1.1.1" tmp "0.0.33" snyk-resolve-deps@4.4.0: @@ -6104,10 +6176,10 @@ snyk-try-require@1.3.1, snyk-try-require@^1.1.1, snyk-try-require@^1.3.1: lru-cache "^4.0.0" then-fs "^2.0.0" -snyk@^1.398.1: - version "1.398.1" - resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.398.1.tgz#19aec8dfffa60e7412e6309117e96b2cfa960355" - integrity sha512-jH24ztdJY8DQlqkd1z8n/JutdOqHtTPccCynM2hfOedW20yAp9c108LFjXvqBEk/EH3YyNmWzyLkkHOySeDkwQ== +snyk@^1.425.4: + version "1.431.1" + resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.431.1.tgz#1e360dae1b63d83f74fe90979f7b9a0fb1607aa7" + integrity sha512-OW48lG89ffLsSZPHwsjfdqQcu3XG6aRQOkwASPCgTAGcVcnXzS9XHB89h0gLsDzk0fZRskEVgYpvXdh4RFjNqA== dependencies: "@snyk/cli-interface" "2.9.2" "@snyk/dep-graph" "1.19.4" @@ -6120,28 +6192,28 @@ snyk@^1.398.1: configstore "^5.0.1" debug "^4.1.1" diff "^4.0.1" - glob "^7.1.3" graphlib "^2.1.8" inquirer "^7.3.3" lodash "^4.17.20" + micromatch "4.0.2" needle "2.5.0" open "^7.0.3" os-name "^3.0.0" proxy-agent "^3.1.1" proxy-from-env "^1.0.0" semver "^6.0.0" - snyk-config "3.1.1" - snyk-cpp-plugin "1.5.0" - snyk-docker-plugin "3.21.0" + snyk-config "4.0.0-rc.2" + snyk-cpp-plugin "2.2.1" + snyk-docker-plugin "4.12.0" snyk-go-plugin "1.16.2" - snyk-gradle-plugin "3.6.3" + snyk-gradle-plugin "3.10.2" snyk-module "3.1.0" - snyk-mvn-plugin "2.19.4" - snyk-nodejs-lockfile-parser "1.28.1" - snyk-nuget-plugin "1.19.3" + snyk-mvn-plugin "2.23.4" + snyk-nodejs-lockfile-parser "1.30.1" + snyk-nuget-plugin "1.19.4" snyk-php-plugin "1.9.2" snyk-policy "1.14.1" - snyk-python-plugin "1.17.1" + snyk-python-plugin "1.19.1" snyk-resolve "1.0.1" snyk-resolve-deps "4.4.0" snyk-sbt-plugin "2.11.0" @@ -6760,6 +6832,13 @@ to-regex-range@^2.1.0: is-number "^3.0.0" repeat-string "^1.6.1" +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + to-regex@^3.0.1, to-regex@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" @@ -7023,6 +7102,11 @@ uuid@^8.2.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea" integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ== +uuid@^8.3.0: + version "8.3.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" + integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg== + validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -7147,11 +7231,6 @@ widest-line@^3.1.0: dependencies: string-width "^4.0.0" -window-size@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" - integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY= - windows-release@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.2.0.tgz#8122dad5afc303d833422380680a79cdfa91785f" @@ -7164,14 +7243,6 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" @@ -7241,11 +7312,6 @@ xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -y18n@^3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= - y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" @@ -7320,19 +7386,6 @@ yargs@^14.2: y18n "^4.0.0" yargs-parser "^15.0.0" -yargs@^3.19.0: - version "3.32.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" - integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU= - dependencies: - camelcase "^2.0.1" - cliui "^3.0.3" - decamelize "^1.1.1" - os-locale "^1.4.0" - string-width "^1.0.1" - window-size "^0.1.4" - y18n "^3.2.0" - yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" From 0c1dc810fba8a2d8b025663698a4fbb6cc82f432 Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Date: Wed, 25 Nov 2020 12:10:30 +0530 Subject: [PATCH 156/259] fix: add semicolons to unicode end --- frappe/public/js/frappe/utils/common.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/utils/common.js b/frappe/public/js/frappe/utils/common.js index 9ff4ade761..0a145b098b 100644 --- a/frappe/public/js/frappe/utils/common.js +++ b/frappe/public/js/frappe/utils/common.js @@ -234,11 +234,11 @@ frappe.utils.xss_sanitise = function (string, options) { strategies: ['html', 'js'] // use all strategies. } const HTML_ESCAPE_MAP = { - '<': '<', - '>': '>', - '"': '"', - "'": ''', - '/': '/' + '<': '<', + '>': '>', + '"': '"', + "'": ''', + '/': '/' }; const REGEX_SCRIPT = /)<[^<]*)*<\/script>/gi; // used in jQuery 1.7.2 src/ajax.js Line 14 options = Object.assign({ }, DEFAULT_OPTIONS, options); // don't deep copy, immutable beauty. From f4c7c7aeedb3976847505b0987d7f8af2850cd0a Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 25 Nov 2020 15:07:19 +0530 Subject: [PATCH 157/259] fix: set self.port instead of self.smtp_port --- frappe/email/smtp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/smtp.py b/frappe/email/smtp.py index f53b835757..391ce06c74 100644 --- a/frappe/email/smtp.py +++ b/frappe/email/smtp.py @@ -210,7 +210,7 @@ class SMTPServer: try: if self.use_ssl: if not self.port: - self.smtp_port = 465 + self.port = 465 self._sess = smtplib.SMTP_SSL((self.server or "").encode('utf-8'), cint(self.port) or None) From b3a8ecad632bf3f12bd588447fdb4acc97833c55 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 25 Nov 2020 17:34:44 +0530 Subject: [PATCH 158/259] refactor: don't encode server string --- frappe/email/smtp.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/email/smtp.py b/frappe/email/smtp.py index 391ce06c74..9ba81fa146 100644 --- a/frappe/email/smtp.py +++ b/frappe/email/smtp.py @@ -212,8 +212,7 @@ class SMTPServer: if not self.port: self.port = 465 - self._sess = smtplib.SMTP_SSL((self.server or "").encode('utf-8'), - cint(self.port) or None) + self._sess = smtplib.SMTP_SSL((self.server or ""), cint(self.port)) else: if self.use_tls and not self.port: self.port = 587 From 08c8e517b6d484c5ad9aa1848ace855fec4c4c15 Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Wed, 25 Nov 2020 18:08:18 +0530 Subject: [PATCH 159/259] fix: git check flow --- frappe/utils/change_log.py | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/frappe/utils/change_log.py b/frappe/utils/change_log.py index 75421c43ea..148d03ae39 100644 --- a/frappe/utils/change_log.py +++ b/frappe/utils/change_log.py @@ -185,29 +185,38 @@ def parse_latest_non_beta_release(response): return None -def check_release_on_github(app): - from subprocess import CalledProcessError +def check_release_on_github(app: str): + """ + Check the latest release for a given Frappe application hosted on Github. + + Args: + app (str): The name of the Frappe application. + + Returns: + tuple(Version, str): The Version object of the latest release and the + organization name, if the application exists, otherwise None. + """ try: # Check if repo remote is on github - remote_url = subprocess.check_output("cd ../apps/{} && git ls-remote --get-url".format(app), shell=True).decode() - except CalledProcessError: - # Passing this since some apps may not have git initializaed in them + remote_url = subprocess.check_output("cd ../apps/{} && git ls-remote --get-url".format(app), shell=True) + except subprocess.CalledProcessError: + # Passing this since some apps may not have git initialized in them return if isinstance(remote_url, bytes): remote_url = remote_url.decode() - if "github.com" not in remote_url: + if "github" not in remote_url: + return + + if is_git_url(remote_url): return # Get latest version from github if 'https' not in remote_url: return - if is_git_url(remote_url): - return - org_name = remote_url.split('/')[3] r = requests.get('https://api.github.com/repos/{}/{}/releases'.format(org_name, app)) if r.ok: From 6d9a56e43cb2e80e74e781c93151b023e8256fd5 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 25 Nov 2020 18:51:50 +0530 Subject: [PATCH 160/259] feat: add tests --- frappe/email/test_smtp.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 frappe/email/test_smtp.py diff --git a/frappe/email/test_smtp.py b/frappe/email/test_smtp.py new file mode 100644 index 0000000000..869d708430 --- /dev/null +++ b/frappe/email/test_smtp.py @@ -0,0 +1,25 @@ +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors +# License: The MIT License + +import unittest +from frappe.email.smtp import SMTPServer + +class TestSMTP(unittest.TestCase): + def test_smtp_ssl_session(self): + for port in [None, 0, 465, "465"]: + make_server(port, 1, 0) + + def test_smtp_tls_session(self): + for port in [None, 0, 587, "587"]: + make_server(port, 0, 1) + + +def make_server(port, ssl, tls): + server = SMTPServer( + server = "smtp.gmail.com", + port = port, + use_ssl = ssl, + use_tls = tls + ) + + server.sess \ No newline at end of file From a459ce40ed05efbf682ec8c5df00e819b315c3ec Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Thu, 26 Nov 2020 05:41:01 +0200 Subject: [PATCH 161/259] fix(snyk): Security upgrade highlight.js from 9.18.1 to 9.18.2 (#11999) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-HIGHLIGHTJS-1045326 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 91d204bec5..d1a94d0e35 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "frappe-datatable": "^1.15.3", "frappe-gantt": "^0.5.0", "fuse.js": "^3.4.6", - "highlight.js": "^9.18.1", + "highlight.js": "^9.18.2", "js-sha256": "^0.9.0", "jsbarcode": "^3.9.0", "moment": "^2.20.1", diff --git a/yarn.lock b/yarn.lock index 459f4139b9..b30ca7de0c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2702,10 +2702,10 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -highlight.js@^9.18.1: - version "9.18.1" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c" - integrity sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg== +highlight.js@^9.18.2: + version "9.18.5" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825" + integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA== homedir-polyfill@^1.0.1: version "1.0.3" From ce05cc15ed4a4816d145aaed664bd905a5688c4e Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 26 Nov 2020 09:26:58 +0530 Subject: [PATCH 162/259] fix: text editor field type changes in grid row form (bp #11974) (#11978) Co-authored-by: Shivam Mishra Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/public/js/frappe/form/grid_row.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 827fbfdee6..ec9cee9c39 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -373,6 +373,7 @@ export default class GridRow { // no text editor in grid if (df.fieldtype=='Text Editor') { + df = Object.assign({}, df); df.fieldtype = 'Text'; } From 926d7e78fd75dcfc5713de7c684900d54d84a843 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 26 Nov 2020 15:33:55 +0530 Subject: [PATCH 163/259] fix: clear localstorage if quota exceeds --- frappe/public/js/frappe/model/model.js | 33 +++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js index 308d9bd5f8..1d302215dd 100644 --- a/frappe/public/js/frappe/model/model.js +++ b/frappe/public/js/frappe/model/model.js @@ -103,6 +103,31 @@ $.extend(frappe.model, { return docfield[0]; }, + get_from_localstorage: function(doctype) { + if (localStorage["_doctype:" + doctype]) { + return JSON.parse(localStorage["_doctype:" + doctype]); + } + }, + + set_in_localstorage: function(doctype, docs) { + try { + localStorage["_doctype:" + doctype] = JSON.stringify(docs); + } catch(e) { + // if quota is exceeded, clear local storage and set item + console.warn("localStorage quota exceeded, clearing doctype cache") + frappe.model.clear_local_storage(); + localStorage["_doctype:" + doctype] = JSON.stringify(docs); + } + }, + + clear_local_storage: function() { + for(var key in localStorage) { + if (key.startsWith("_doctype:")) { + localStorage.removeItem(key); + } + } + }, + with_doctype: function(doctype, callback, async) { if(locals.DocType[doctype]) { callback && callback(); @@ -110,13 +135,15 @@ $.extend(frappe.model, { let cached_timestamp = null; let cached_doc = null; - if(localStorage["_doctype:" + doctype]) { - let cached_docs = JSON.parse(localStorage["_doctype:" + doctype]); + let cached_docs = frappe.model.get_from_localstorage(doctype) + + if (cached_docs) { cached_doc = cached_docs.filter(doc => doc.name === doctype)[0]; if(cached_doc) { cached_timestamp = cached_doc.modified; } } + return frappe.call({ method:'frappe.desk.form.load.getdoctype', type: "GET", @@ -134,7 +161,7 @@ $.extend(frappe.model, { if(r.message=="use_cache") { frappe.model.sync(cached_doc); } else { - localStorage["_doctype:" + doctype] = JSON.stringify(r.docs); + frappe.model.set_in_localstorage(doctype, r.docs) } frappe.model.init_doctype(doctype); From 8192db7382a02fd4334c227ad15339c10f7bede5 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 26 Nov 2020 16:22:40 +0530 Subject: [PATCH 164/259] chore: remove stray console --- frappe/public/js/frappe/desk.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index c8ed29fb76..5fa7a9dbcb 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -148,7 +148,6 @@ frappe.Application = Class.extend({ user: frappe.session.user }, callback: function(r) { - console.log(r); if(r.message.show_alert){ frappe.show_alert({ indicator: 'red', From 0d4f116b3ef07c83190db428b2868ab9c819f493 Mon Sep 17 00:00:00 2001 From: Karthikeyan Singaravelan Date: Thu, 26 Nov 2020 13:15:09 +0000 Subject: [PATCH 165/259] fix: Import ABC from collections.abc for Python 3.9 compatibility. --- frappe/chat/util/util.py | 4 ++-- frappe/utils/response.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/chat/util/util.py b/frappe/chat/util/util.py index 5aa80a85ae..1c3de3bbf5 100644 --- a/frappe/chat/util/util.py +++ b/frappe/chat/util/util.py @@ -7,7 +7,7 @@ import requests import six # imports - standard imports -from collections import Sequence, MutableSequence, Mapping, MutableMapping +from collections.abc import Sequence, MutableSequence, Mapping, MutableMapping if six.PY2: from urlparse import urlparse # PY2 else: @@ -113,4 +113,4 @@ def get_emojis(): emojis = resp.json() redis.hset('frappe_emojis', 'emojis', emojis) - return dictify(emojis) \ No newline at end of file + return dictify(emojis) diff --git a/frappe/utils/response.py b/frappe/utils/response.py index 20b5ea5678..c35ebc751e 100644 --- a/frappe/utils/response.py +++ b/frappe/utils/response.py @@ -123,7 +123,7 @@ def make_logs(response = None): def json_handler(obj): """serialize non-serializable data for json""" # serialize date - import collections + import collections.abc if isinstance(obj, (datetime.date, datetime.timedelta, datetime.datetime)): return text_type(obj) @@ -138,7 +138,7 @@ def json_handler(obj): doc = obj.as_dict(no_nulls=True) return doc - elif isinstance(obj, collections.Iterable): + elif isinstance(obj, collections.abc.Iterable): return list(obj) elif type(obj)==type or isinstance(obj, Exception): From 3a146580a8a1cafdb74c2af8e5e9522017a0069c Mon Sep 17 00:00:00 2001 From: Karthikeyan Singaravelan Date: Thu, 26 Nov 2020 13:30:07 +0000 Subject: [PATCH 166/259] fix: Use html.unescape for Python 3.9 compatibility. --- frappe/utils/global_search.py | 6 ++---- frappe/utils/html_utils.py | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index e945039d0d..f605c3bf66 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -10,6 +10,7 @@ import json import os from bs4 import BeautifulSoup from frappe.utils import cint, strip_html_tags +from frappe.utils.html_utils import unescape_html from frappe.model.base_document import get_controller from six import text_type @@ -345,11 +346,8 @@ def get_formatted_value(value, field): :return: """ - from six.moves.html_parser import HTMLParser - if getattr(field, 'fieldtype', None) in ["Text", "Text Editor"]: - h = HTMLParser() - value = h.unescape(frappe.safe_decode(value)) + value = unescape_html(frappe.safe_decode(value)) value = (re.subn(r'<[\s]*(script|style).*?(?s)', '', text_type(value))[0]) value = ' '.join(value.split()) return field.label + " : " + strip_html_tags(text_type(value)) diff --git a/frappe/utils/html_utils.py b/frappe/utils/html_utils.py index 6fdd383eb9..bccdbd9441 100644 --- a/frappe/utils/html_utils.py +++ b/frappe/utils/html_utils.py @@ -106,9 +106,8 @@ def get_icon_html(icon, small=False): return "".format(icon=icon) def unescape_html(value): - from six.moves.html_parser import HTMLParser - h = HTMLParser() - return h.unescape(value) + from html import unescape + return unescape(value) # adapted from https://raw.githubusercontent.com/html5lib/html5lib-python/4aa79f113e7486c7ec5d15a6e1777bfe546d3259/html5lib/sanitizer.py acceptable_elements = [ From 8d3894e8a537540899c0412e2a48724014b6c304 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 27 Nov 2020 11:01:49 +0530 Subject: [PATCH 167/259] fix: Validate Python syntax on saves --- frappe/core/doctype/server_script/server_script.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py index 839b784651..ded397d5e3 100644 --- a/frappe/core/doctype/server_script/server_script.py +++ b/frappe/core/doctype/server_script/server_script.py @@ -4,6 +4,8 @@ from __future__ import unicode_literals +import ast + import frappe from frappe.model.document import Document from frappe.utils.safe_exec import safe_exec @@ -11,9 +13,9 @@ from frappe import _ class ServerScript(Document): - @staticmethod - def validate(): + def validate(self): frappe.only_for('Script Manager', True) + ast.parse(self.script) @staticmethod def on_update(): From 5babacac3eac0e4dd2c7734a779b59641b96c94b Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 27 Nov 2020 11:02:37 +0530 Subject: [PATCH 168/259] fix: Show function not available in namespace instead of nothing Prior to this, frappe._dict was being used to inject functions to the server script namespaces. This meant unimplemented methods returned None and we'd get a NoneType not callable error --- frappe/utils/safe_exec.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index fee6b404ac..50893330be 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -13,7 +13,17 @@ from frappe.www.printview import get_visible_columns import frappe.exceptions import frappe.integrations.utils -class ServerScriptNotEnabled(frappe.PermissionError): pass +class ServerScriptNotEnabled(frappe.PermissionError): + pass + +class NamespaceDict(frappe._dict): + """Raise AttributeError if function not found in namespace""" + def __getattr__(self, key): + ret = self.get(key) + if (not ret and key.startswith("__")) or (key not in self): + raise AttributeError(f"module has no attribute '{key}'") + return ret + def safe_exec(script, _globals=None, _locals=None): # script reports must be enabled via site_config.json @@ -46,13 +56,13 @@ def get_safe_globals(): user = getattr(frappe.local, "session", None) and frappe.local.session.user or "Guest" - out = frappe._dict( + out = NamespaceDict( # make available limited methods of frappe json=json, dict=dict, log=frappe.log, _dict=frappe._dict, - frappe=frappe._dict( + frappe=NamespaceDict( flags=frappe._dict(), format=frappe.format_value, format_value=frappe.format_value, @@ -112,7 +122,7 @@ def get_safe_globals(): out.get_visible_columns = get_visible_columns out.frappe.date_format = date_format out.frappe.time_format = time_format - out.frappe.db = frappe._dict( + out.frappe.db = NamespaceDict( get_list = frappe.get_list, get_all = frappe.get_all, get_value = frappe.db.get_value, From da0fa439bc4e96400cbf0b5dd0406d6951693712 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 27 Nov 2020 11:40:53 +0530 Subject: [PATCH 169/259] style: Optimize imports, fixed flake8 issues --- frappe/chat/util/util.py | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/frappe/chat/util/util.py b/frappe/chat/util/util.py index 1c3de3bbf5..82df6dd127 100644 --- a/frappe/chat/util/util.py +++ b/frappe/chat/util/util.py @@ -1,27 +1,21 @@ from __future__ import unicode_literals +# imports - standard imports +import json +from collections.abc import MutableMapping, MutableSequence, Sequence + # imports - third-party imports import requests - -# imports - compatibility imports -import six - -# imports - standard imports -from collections.abc import Sequence, MutableSequence, Mapping, MutableMapping -if six.PY2: - from urlparse import urlparse # PY2 -else: - from urllib.parse import urlparse # PY3 -import json +from urllib.parse import urlparse # imports - module imports -from frappe.model.document import Document -from frappe.exceptions import DuplicateEntryError -from frappe import _dict import frappe +from frappe.exceptions import DuplicateEntryError +from frappe.model.document import Document session = frappe.session + def get_user_doc(user = None): if isinstance(user, Document): return user @@ -38,12 +32,12 @@ def squashify(what): return what def safe_json_loads(*args): - results = [ ] + results = [] for arg in args: try: arg = json.loads(arg) - except Exception as e: + except Exception: pass results.append(arg) @@ -81,7 +75,7 @@ def dictify(arg): for i, a in enumerate(arg): arg[i] = dictify(a) elif isinstance(arg, MutableMapping): - arg = _dict(arg) + arg = frappe._dict(arg) return arg From 58ed57e8f53bf24c438ae7e91909ccdf9f0bad02 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 27 Nov 2020 15:01:46 +0530 Subject: [PATCH 170/259] fix: Add postgreSQL support for rename_doc queries --- frappe/core/doctype/doctype/doctype.py | 5 ++++- frappe/model/rename_doc.py | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 8a9c130fbe..f06f2017ae 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -392,7 +392,10 @@ class DocType(Document): frappe.db.sql("""update tabSingles set value=%s where doctype=%s and field='name' and value = %s""", (new, new, old)) else: - frappe.db.sql("rename table `tab%s` to `tab%s`" % (old, new)) + frappe.db.multisql({ + "mariadb": f"RENAME TABLE `tab{old}` TO `tab{new}`", + "postgres": f"ALTER TABLE `tab{old}` RENAME TO `tab{new}`" + }) def rename_files_and_folders(self, old, new): # move files diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 789a7f51cf..33f6fefb7d 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -315,8 +315,7 @@ def get_link_fields(doctype): def update_options_for_fieldtype(fieldtype, old, new): if frappe.conf.developer_mode: - for name in frappe.db.sql_list("""select parent from - tabDocField where options=%s""", old): + for name in frappe.get_all("DocField", filters={"options": old}, pluck="parent"): doctype = frappe.get_doc("DocType", name) save = False for f in doctype.fields: @@ -422,20 +421,21 @@ def update_parenttype_values(old, new): child_doctypes += custom_child_doctypes fields = [d['fieldname'] for d in child_doctypes] - property_setter_child_doctypes = frappe.db.sql("""\ - select value as options from `tabProperty Setter` - where doc_type=%s and property='options' and - field_name in ("%s")""" % ('%s', '", "'.join(fields)), - (new,)) + property_setter_child_doctypes = frappe.get_all( + "Property Setter", + filters={ + "doc_type": new, + "property": "options", + "field_name": ("in", fields) + }, + pluck="value" + ) + child_doctypes = list(d['options'] for d in child_doctypes) child_doctypes += property_setter_child_doctypes - child_doctypes = (d['options'] for d in child_doctypes) for doctype in child_doctypes: - frappe.db.sql("""\ - update `tab%s` set parenttype=%s - where parenttype=%s""" % (doctype, '%s', '%s'), - (new, old)) + frappe.db.sql(f"update `tab{doctype}` set parenttype=%s where parenttype=%s", (new, old)) def rename_dynamic_links(doctype, old, new): for df in get_dynamic_link_map().get(doctype, []): From 104bc1b16708af1417a5488b779ac931db4827e5 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 27 Nov 2020 15:09:23 +0530 Subject: [PATCH 171/259] chore: Remove dead code --- frappe/model/rename_doc.py | 60 -------------------------------------- 1 file changed, 60 deletions(-) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 33f6fefb7d..15d634dade 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -42,7 +42,6 @@ def rename_doc(doctype, old, new, force=False, merge=False, ignore_permissions=F force = cint(force) merge = cint(merge) - meta = frappe.get_meta(doctype) # call before_rename @@ -489,62 +488,3 @@ def bulk_rename(doctype, rows=None, via_console = False): if not via_console: return rename_log - -def update_linked_doctypes(doctype, docname, linked_to, value, ignore_doctypes=None): - """ - linked_doctype_info_list = list formed by get_fetch_fields() function - docname = Master DocType's name in which modification are made - value = Value for the field thats set in other DocType's by fetching from Master DocType - """ - linked_doctype_info_list = get_fetch_fields(doctype, linked_to, ignore_doctypes) - - for d in linked_doctype_info_list: - frappe.db.sql(""" - update - `tab{doctype}` - set - {linked_to_fieldname} = "{value}" - where - {master_fieldname} = {docname} - and {linked_to_fieldname} != "{value}" - """.format( - doctype = d['doctype'], - linked_to_fieldname = d['linked_to_fieldname'], - value = value, - master_fieldname = d['master_fieldname'], - docname = frappe.db.escape(docname) - )) - -def get_fetch_fields(doctype, linked_to, ignore_doctypes=None): - """ - doctype = Master DocType in which the changes are being made - linked_to = DocType name of the field thats being updated in Master - - This function fetches list of all DocType where both doctype and linked_to is found - as link fields. - Forms a list of dict in the form - - [{doctype: , master_fieldname: , linked_to_fieldname: ] - where - doctype = DocType where changes need to be made - master_fieldname = Fieldname where options = doctype - linked_to_fieldname = Fieldname where options = linked_to - """ - - master_list = get_link_fields(doctype) - linked_to_list = get_link_fields(linked_to) - out = [] - - from itertools import product - product_list = product(master_list, linked_to_list) - - for d in product_list: - linked_doctype_info = frappe._dict() - if d[0]['parent'] == d[1]['parent'] \ - and (not ignore_doctypes or d[0]['parent'] not in ignore_doctypes) \ - and not d[1]['issingle']: - linked_doctype_info['doctype'] = d[0]['parent'] - linked_doctype_info['master_fieldname'] = d[0]['fieldname'] - linked_doctype_info['linked_to_fieldname'] = d[1]['fieldname'] - out.append(linked_doctype_info) - - return out From 7bba0b7da933950accbf654325bf668fd1bcf4ab Mon Sep 17 00:00:00 2001 From: gavin Date: Fri, 27 Nov 2020 15:56:28 +0530 Subject: [PATCH 172/259] chore(GitHub): Add issue template config --- .github/ISSUE_TEMPLATE/config.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000000..26bb7ab280 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: Community Forum + url: https://discuss.erpnext.com/ + about: For general QnA, discussions and community help. From 8a6bdf546652d46d13377e016c7fdf6c2173d2e3 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 27 Nov 2020 16:49:49 +0530 Subject: [PATCH 173/259] chore: Move rename doctype method to dedicated TestCase Co-authored-by: Marica --- frappe/tests/test_document.py | 76 --------------------------------- frappe/tests/test_rename_doc.py | 36 ++++++++++++++++ 2 files changed, 36 insertions(+), 76 deletions(-) diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py index 4f595c9419..2be92be1f5 100644 --- a/frappe/tests/test_document.py +++ b/frappe/tests/test_document.py @@ -249,82 +249,6 @@ class TestDocument(unittest.TestCase): self.assertEqual(cint(old_current) - 1, new_current) - def test_rename_doc(self): - from random import choice, sample - - available_documents = [] - doctype = "ToDo" - - # data generation: 4 todo documents - for num in range(1, 5): - doc = frappe.get_doc({ - "doctype": doctype, - "date": add_to_date(now(), days=num), - "description": "this is todo #{}".format(num) - }).insert() - available_documents.append(doc.name) - - # test 1: document renaming - old_name = choice(available_documents) - new_name = old_name + '.new' - self.assertEqual(new_name, frappe.rename_doc(doctype, old_name, new_name, force=True)) - available_documents.remove(old_name) - available_documents.append(new_name) - - # test 2: merge documents - first_todo, second_todo = sample(available_documents, 2) - - second_todo_doc = frappe.get_doc(doctype, second_todo) - second_todo_doc.priority = "High" - second_todo_doc.save() - - merged_todo = frappe.rename_doc(doctype, first_todo, second_todo, merge=True, force=True) - merged_todo_doc = frappe.get_doc(doctype, merged_todo) - available_documents.remove(first_todo) - - with self.assertRaises(DoesNotExistError): - frappe.get_doc(doctype, first_todo) - - self.assertEqual(merged_todo_doc.priority, second_todo_doc.priority) - - for docname in available_documents: - frappe.delete_doc(doctype, docname) - - def test_rename_doctype(self): - from frappe.core.doctype.doctype.test_doctype import new_doctype - - fields =[{ - "label": "Linked To", - "fieldname": "linked_to_doctype", - "fieldtype": "Link", - "options": "DocType", - "unique": 0 - }] - if not frappe.db.exists("DocType", "Rename This"): - new_doctype("Rename This", unique=0, fields=fields).insert() - - to_rename_record = frappe.get_doc({ - "doctype": "Rename This", - "linked_to_doctype": "Rename This" - }) - to_rename_record.insert() - - # Rename doctype - self.assertEqual("Renamed Doc", frappe.rename_doc("DocType", "Rename This", "Renamed Doc", force=True)) - - # Test if Doctype value has changed in Link field - renamed_doctype_record = frappe.get_doc("Renamed Doc", to_rename_record.name) - self.assertEqual(renamed_doctype_record.linked_to_doctype, "Renamed Doc") - - # Test if there are conflicts between a record and a DocType - # having the same name - old_name = to_rename_record.name - new_name = "ToDo" - self.assertEqual(new_name, frappe.rename_doc("Renamed Doc", old_name, new_name, force=True)) - - frappe.delete_doc_if_exists("Renamed Doc", "ToDo") - frappe.delete_doc_if_exists("DocType", "Renamed Doc") - def test_non_negative_check(self): frappe.delete_doc_if_exists("Currency", "Frappe Coin", 1) diff --git a/frappe/tests/test_rename_doc.py b/frappe/tests/test_rename_doc.py index 4db877e586..fcb82e2755 100644 --- a/frappe/tests/test_rename_doc.py +++ b/frappe/tests/test_rename_doc.py @@ -98,3 +98,39 @@ class TestRenameDoc(unittest.TestCase): self.assertTrue(frappe.db.exists("DocType", self.doctype.new)) self.assertFalse(frappe.db.exists("DocType", self.doctype.old)) self.assertFalse(os.path.exists(old_doctype_path)) + + def test_rename_doctype(self): + """Rename DocType via frappe.rename_doc""" + from frappe.core.doctype.doctype.test_doctype import new_doctype + + fields =[{ + "label": "Linked To", + "fieldname": "linked_to_doctype", + "fieldtype": "Link", + "options": "DocType", + "unique": 0 + }] + if not frappe.db.exists("DocType", "Rename This"): + new_doctype("Rename This", unique=0, fields=fields).insert() + + to_rename_record = frappe.get_doc({ + "doctype": "Rename This", + "linked_to_doctype": "Rename This" + }) + to_rename_record.insert() + + # Rename doctype + self.assertEqual("Renamed Doc", frappe.rename_doc("DocType", "Rename This", "Renamed Doc", force=True)) + + # Test if Doctype value has changed in Link field + renamed_doctype_record = frappe.get_doc("Renamed Doc", to_rename_record.name) + self.assertEqual(renamed_doctype_record.linked_to_doctype, "Renamed Doc") + + # Test if there are conflicts between a record and a DocType + # having the same name + old_name = to_rename_record.name + new_name = "ToDo" + self.assertEqual(new_name, frappe.rename_doc("Renamed Doc", old_name, new_name, force=True)) + + frappe.delete_doc_if_exists("Renamed Doc", "ToDo") + frappe.delete_doc_if_exists("DocType", "Renamed Doc") From 9a84a7eb45c529d882f6b541db0916232468d783 Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Fri, 27 Nov 2020 17:27:44 +0530 Subject: [PATCH 174/259] feat: use giturlparse to parse Git URLs --- frappe/utils/change_log.py | 32 ++++++++++++++++++++------------ frappe/utils/data.py | 6 ------ requirements.txt | 1 + 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/frappe/utils/change_log.py b/frappe/utils/change_log.py index 148d03ae39..9607c89784 100644 --- a/frappe/utils/change_log.py +++ b/frappe/utils/change_log.py @@ -5,13 +5,14 @@ import json import os import subprocess # nosec -import frappe import requests -from frappe import _, safe_decode -from frappe.utils import cstr, is_git_url from semantic_version import Version from six.moves import range +import frappe +from frappe import _, safe_decode +from frappe.utils import cstr + def get_change_log(user=None): if not user: user = frappe.session.user @@ -193,10 +194,13 @@ def check_release_on_github(app: str): app (str): The name of the Frappe application. Returns: - tuple(Version, str): The Version object of the latest release and the + tuple(Version, str): The semantic version object of the latest release and the organization name, if the application exists, otherwise None. """ + from giturlparse import parse + from giturlparse.parser import ParserError + try: # Check if repo remote is on github remote_url = subprocess.check_output("cd ../apps/{} && git ls-remote --get-url".format(app), shell=True) @@ -207,22 +211,26 @@ def check_release_on_github(app: str): if isinstance(remote_url, bytes): remote_url = remote_url.decode() - if "github" not in remote_url: + try: + parsed_url = parse(remote_url) + except ParserError: + # Invalid URL return - if is_git_url(remote_url): + # Get latest version from Github + if parsed_url.protocol == "http": + return + if parsed_url.resource != "github.com": return - # Get latest version from github - if 'https' not in remote_url: - return + owner = parsed_url.owner + repo = parsed_url.name - org_name = remote_url.split('/')[3] - r = requests.get('https://api.github.com/repos/{}/{}/releases'.format(org_name, app)) + r = requests.get('https://api.github.com/repos/{}/{}/releases'.format(owner, repo)) if r.ok: latest_non_beta_release = parse_latest_non_beta_release(r.json()) if latest_non_beta_release: - return Version(latest_non_beta_release), org_name + return Version(latest_non_beta_release), owner def add_message_to_redis(update_json): diff --git a/frappe/utils/data.py b/frappe/utils/data.py index cb61355a29..34659e1cac 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -1397,9 +1397,3 @@ def validate_json_string(string): json.loads(string) except (TypeError, ValueError): raise frappe.ValidationError - - -def is_git_url(url): - # modified to allow without the tailing .git from https://github.com/jonschlinkert/is-git-url.git - pattern = r"(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\.git)?(\/?|\#[-\d\w._]+?)$" - return bool(re.match(pattern, url)) diff --git a/requirements.txt b/requirements.txt index de9e675a67..59c4a9dbf8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,6 +15,7 @@ Faker==2.0.4 future==0.18.2 gitdb2==2.0.6;python_version<'3.4' GitPython==2.1.15 +git-url-parse==1.2.2 google-api-python-client==1.9.3 google-auth-httplib2==0.0.3 google-auth-oauthlib==0.4.1 From 147a3def0dcab7173d000b91d9d998a72a8b87de Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 27 Nov 2020 18:36:23 +0530 Subject: [PATCH 175/259] fix: Use get_value to find value of linked_to_doctype instead Tests ran successfully when run locally for mariaDB and postgres --- frappe/tests/test_rename_doc.py | 42 ++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/frappe/tests/test_rename_doc.py b/frappe/tests/test_rename_doc.py index fcb82e2755..fb0776a485 100644 --- a/frappe/tests/test_rename_doc.py +++ b/frappe/tests/test_rename_doc.py @@ -103,34 +103,42 @@ class TestRenameDoc(unittest.TestCase): """Rename DocType via frappe.rename_doc""" from frappe.core.doctype.doctype.test_doctype import new_doctype - fields =[{ - "label": "Linked To", - "fieldname": "linked_to_doctype", - "fieldtype": "Link", - "options": "DocType", - "unique": 0 - }] if not frappe.db.exists("DocType", "Rename This"): - new_doctype("Rename This", unique=0, fields=fields).insert() + new_doctype( + "Rename This", + fields=[ + { + "label": "Linked To", + "fieldname": "linked_to_doctype", + "fieldtype": "Link", + "options": "DocType", + "unique": 0, + } + ], + ).insert() - to_rename_record = frappe.get_doc({ - "doctype": "Rename This", - "linked_to_doctype": "Rename This" - }) - to_rename_record.insert() + to_rename_record = frappe.get_doc( + {"doctype": "Rename This", "linked_to_doctype": "Rename This"} + ).insert() # Rename doctype - self.assertEqual("Renamed Doc", frappe.rename_doc("DocType", "Rename This", "Renamed Doc", force=True)) + self.assertEqual( + "Renamed Doc", frappe.rename_doc("DocType", "Rename This", "Renamed Doc", force=True) + ) # Test if Doctype value has changed in Link field - renamed_doctype_record = frappe.get_doc("Renamed Doc", to_rename_record.name) - self.assertEqual(renamed_doctype_record.linked_to_doctype, "Renamed Doc") + linked_to_doctype = frappe.db.get_value( + "Renamed Doc", to_rename_record.name, "linked_to_doctype" + ) + self.assertEqual(linked_to_doctype, "Renamed Doc") # Test if there are conflicts between a record and a DocType # having the same name old_name = to_rename_record.name new_name = "ToDo" - self.assertEqual(new_name, frappe.rename_doc("Renamed Doc", old_name, new_name, force=True)) + self.assertEqual( + new_name, frappe.rename_doc("Renamed Doc", old_name, new_name, force=True) + ) frappe.delete_doc_if_exists("Renamed Doc", "ToDo") frappe.delete_doc_if_exists("DocType", "Renamed Doc") From 729ee6ea9ea1138043a501632891cfd03fc68396 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Fri, 27 Nov 2020 19:03:23 +0530 Subject: [PATCH 176/259] fix: changing percent field precision to global default --- frappe/public/js/frappe/form/formatters.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index 3f422d0a9b..c456739add 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -50,7 +50,7 @@ frappe.form.formatters = { return frappe.form.formatters._right(value==null ? "" : cint(value), options) }, Percent: function(value, docfield, options) { - return frappe.form.formatters._right(flt(value, 2) + "%", options) + return frappe.form.formatters._right(flt(value, frappe.defaults.get_default("float_precision")) + "%", options) }, Rating: function(value) { return ` From 8aeb1716642a1e275ddbc83c77501a24529dd1c5 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Fri, 27 Nov 2020 19:58:41 +0530 Subject: [PATCH 177/259] fix: sider issue fixed --- frappe/public/js/frappe/form/formatters.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index c456739add..7f5c3bf472 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -50,7 +50,7 @@ frappe.form.formatters = { return frappe.form.formatters._right(value==null ? "" : cint(value), options) }, Percent: function(value, docfield, options) { - return frappe.form.formatters._right(flt(value, frappe.defaults.get_default("float_precision")) + "%", options) + return frappe.form.formatters._right(flt(value, frappe.defaults.get_default("float_precision")) + "%", options); }, Rating: function(value) { return ` From e3b09e2a2aa8d88760ea91cc51375ca485ef34ce Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 27 Nov 2020 20:15:08 +0530 Subject: [PATCH 178/259] fix: Add rename_doc utils for external API usages * The previously deleted code was being used in ERPNext's Customer module. * This will be moved into frappe.model.utils.rename_doc for the time and completely removed in time. --- frappe/model/rename_doc.py | 30 +++++++++++++++++ frappe/model/utils/rename_doc.py | 58 ++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 frappe/model/utils/rename_doc.py diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 15d634dade..a188705fcf 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -2,6 +2,7 @@ # MIT License. See license.txt from __future__ import unicode_literals, print_function +from click.termui import secho import frappe from frappe import _, bold from frappe.utils import cint @@ -488,3 +489,32 @@ def bulk_rename(doctype, rows=None, via_console = False): if not via_console: return rename_log + +def update_linked_doctypes(doctype, docname, linked_to, value, ignore_doctypes=None): + from frappe.model.utils.rename_doc import update_linked_doctypes + show_deprecation_warning("update_linked_doctypes") + + return update_linked_doctypes( + doctype=doctype, + docname=docname, + linked_to=linked_to, + value=value, + ignore_doctypes=ignore_doctypes, + ) + + +def get_fetch_fields(doctype, linked_to, ignore_doctypes=None): + from frappe.model.utils.rename_doc import get_fetch_fields + show_deprecation_warning("get_fetch_fields") + + return get_fetch_fields( + doctype=doctype, linked_to=linked_to, ignore_doctypes=ignore_doctypes + ) + +def show_deprecation_warning(funct): + from click import secho + message = ( + f"Function frappe.model.rename_doc.{funct} has been deprecated and " + "moved to the frappe.model.utils.rename_doc" + ) + secho(message, fg="yellow") diff --git a/frappe/model/utils/rename_doc.py b/frappe/model/utils/rename_doc.py new file mode 100644 index 0000000000..bf71d36a42 --- /dev/null +++ b/frappe/model/utils/rename_doc.py @@ -0,0 +1,58 @@ +from itertools import product + +import frappe +from frappe.model.rename_doc import get_link_fields + + +def update_linked_doctypes(doctype, docname, linked_to, value, ignore_doctypes=None): + """ + linked_doctype_info_list = list formed by get_fetch_fields() function + docname = Master DocType's name in which modification are made + value = Value for the field thats set in other DocType's by fetching from Master DocType + """ + linked_doctype_info_list = get_fetch_fields(doctype, linked_to, ignore_doctypes) + + for d in linked_doctype_info_list: + frappe.db.set_value( + d.doctype, + { + d.master_fieldname : docname, + d.linked_to_fieldname : ("!=", value), + }, + d.linked_to_fieldname, + value, + ) + + +def get_fetch_fields(doctype, linked_to, ignore_doctypes=None): + """ + doctype = Master DocType in which the changes are being made + linked_to = DocType name of the field thats being updated in Master + This function fetches list of all DocType where both doctype and linked_to is found + as link fields. + Forms a list of dict in the form - + [{doctype: , master_fieldname: , linked_to_fieldname: ] + where + doctype = DocType where changes need to be made + master_fieldname = Fieldname where options = doctype + linked_to_fieldname = Fieldname where options = linked_to + """ + + out = [] + master_list = get_link_fields(doctype) + linked_to_list = get_link_fields(linked_to) + product_list = product(master_list, linked_to_list) + + for d in product_list: + linked_doctype_info = frappe._dict() + if ( + d[0]["parent"] == d[1]["parent"] + and (not ignore_doctypes or d[0]["parent"] not in ignore_doctypes) + and not d[1]["issingle"] + ): + linked_doctype_info.doctype = d[0]["parent"] + linked_doctype_info.master_fieldname = d[0]["fieldname"] + linked_doctype_info.linked_to_fieldname = d[1]["fieldname"] + out.append(linked_doctype_info) + + return out From a0cb5930198ea1df0c8c6d1aaefd5d557e02b973 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 27 Nov 2020 20:33:10 +0530 Subject: [PATCH 179/259] style: Sort and remove unused imports --- frappe/model/rename_doc.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index a188705fcf..35fbf94dc6 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -1,15 +1,15 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt -from __future__ import unicode_literals, print_function -from click.termui import secho +from __future__ import print_function, unicode_literals + import frappe from frappe import _, bold -from frappe.utils import cint -from frappe.model.naming import validate_name from frappe.model.dynamic_links import get_dynamic_link_map -from frappe.utils.password import rename_password +from frappe.model.naming import validate_name from frappe.model.utils.user_settings import sync_user_settings, update_user_settings_data +from frappe.utils import cint +from frappe.utils.password import rename_password @frappe.whitelist() From dd8e2114ab5ef913418ea747a15e757350588ec7 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sat, 28 Nov 2020 18:53:59 +0530 Subject: [PATCH 180/259] fix: Trim long names in website navbar by adding ellipsis (bp #11730) (#12009) Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/public/scss/website.scss | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss index e1b7d0a827..5291834aab 100644 --- a/frappe/public/scss/website.scss +++ b/frappe/public/scss/website.scss @@ -244,9 +244,18 @@ h5.modal-title { white-space: nowrap; text-overflow: ellipsis; } + .about-section { padding-top: 1rem; } + .about-footer { padding-top: 1rem; -} \ No newline at end of file +} + +.logged-in > .nav-link { + max-width: 200px; + @extend .ellipsis; + max-width: 100%; + vertical-align: middle; +} From be6724c7c8288589d616b73a641a2440ef580f26 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 30 Nov 2020 11:15:18 +0530 Subject: [PATCH 181/259] fix: check if print settings has landscape --- frappe/public/js/frappe/microtemplate.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/microtemplate.js b/frappe/public/js/frappe/microtemplate.js index d233a47893..7b45db952e 100644 --- a/frappe/public/js/frappe/microtemplate.js +++ b/frappe/public/js/frappe/microtemplate.js @@ -89,11 +89,19 @@ frappe.render_template = function(name, data) { } frappe.render_grid = function(opts) { // build context - if(opts.grid) { + if (opts.grid) { opts.columns = opts.grid.getColumns(); opts.data = opts.grid.getData().getItems(); } + if ( + opts.print_settings && + opts.print_settings.orientation && + opts.print_settings.orientation.toLowerCase() === "landscape" + ) { + opts.landscape = true; + } + // show landscape view if columns more than 10 if (opts.landscape == null) { if(opts.columns && opts.columns.length > 10) { From bd2e3530cdf6491d1ab43fd1c4326e7d9275b1ab Mon Sep 17 00:00:00 2001 From: Abhishek Balam Date: Mon, 30 Nov 2020 11:59:16 +0530 Subject: [PATCH 182/259] fix: strip exif data from image files before uploading --- frappe/core/doctype/file/file.py | 12 +++++++++--- frappe/utils/image.py | 25 ++++++++++++++++++++++++- requirements.txt | 3 ++- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 473d810a9f..1642e857c5 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -30,7 +30,7 @@ import frappe from frappe import _, conf from frappe.model.document import Document from frappe.utils import call_hook_method, cint, cstr, encode, get_files_path, get_hook_method, random_string, strip - +from frappe.utils.image import strip_exif_data class MaxFileSizeReachedError(frappe.ValidationError): pass @@ -456,6 +456,7 @@ class File(Document): def save_file(self, content=None, decode=False, ignore_existing_file_check=False): file_exists = False self.content = content + if decode: if isinstance(content, text_type): self.content = content.encode("utf-8") @@ -466,10 +467,15 @@ class File(Document): if not self.is_private: self.is_private = 0 + + self.content_type = mimetypes.guess_type(self.file_name)[0] + + if self.content_type and "image" in self.content_type: + self.content = strip_exif_data(self.content, self.content_type) + self.file_size = self.check_max_file_size() self.content_hash = get_content_hash(self.content) - self.content_type = mimetypes.guess_type(self.file_name)[0] - + duplicate_file = None # check if a file exists with the same content hash and is also in the same folder (public or private) diff --git a/frappe/utils/image.py b/frappe/utils/image.py index 1eada5acca..3d3d98a28c 100644 --- a/frappe/utils/image.py +++ b/frappe/utils/image.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals, print_function import os def resize_images(path, maxdim=700): - import Image + from PIL import Image size = (maxdim, maxdim) for basepath, folders, files in os.walk(path): for fname in files: @@ -17,3 +17,26 @@ def resize_images(path, maxdim=700): im.save(os.path.join(basepath, fname)) print("resized {0}".format(os.path.join(basepath, fname))) + +def strip_exif_data(content, content_type): + """ Strips exif from image files which support it. + + Works by creating a new Image object which ignores exif by + default and then extracts the binary data back into content. + + Returns: stripped image content + """ + + from PIL import Image + import io + + original_image = Image.open(io.BytesIO(content)) + output = io.BytesIO() + + new_image = Image.new(original_image.mode, original_image.size) + new_image.putdata(list(original_image.getdata())) + new_image.save(output, format=content_type.split('/')[-1].upper()) + + content = output.getvalue() + + return content \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index de9e675a67..92ea0e5572 100644 --- a/requirements.txt +++ b/requirements.txt @@ -73,4 +73,5 @@ pycryptodome==3.9.8 paytmchecksum==1.7.0 wrapt==1.10.11 razorpay==1.2.0 -rsa>=4.1 # not directly required, pinned by Snyk to avoid a vulnerability \ No newline at end of file +rsa>=4.1 # not directly required, pinned by Snyk to avoid a vulnerability +pillow==8.0.1 \ No newline at end of file From 29941ef46a396dcbc0d79762988107e05b98fd2d Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 30 Nov 2020 12:03:53 +0530 Subject: [PATCH 183/259] fix: Use ORM instead of raw SQL Co-authored-by: Marica --- frappe/model/rename_doc.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index a7714a0ae7..697978ff98 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -247,6 +247,7 @@ def update_link_field_values(link_fields, old, new, doctype): pass else: parent = field['parent'] + docfield = field["fieldname"] # Handles the case where one of the link fields belongs to # the DocType being renamed. @@ -258,11 +259,8 @@ def update_link_field_values(link_fields, old, new, doctype): if parent == new and doctype == "DocType": parent = old - frappe.db.sql(""" - update `tab{table_name}` set `{fieldname}`=%s - where `{fieldname}`=%s""".format( - table_name=parent, - fieldname=field['fieldname']), (new, old)) + frappe.db.set_value(parent, {docfield: old}, docfield, new) + # update cached link_fields as per new if doctype=='DocType' and field['parent'] == old: field['parent'] = new From d276a2d8e0b826f18b13ae6183b56c787a2ab242 Mon Sep 17 00:00:00 2001 From: Abhishek Balam Date: Mon, 30 Nov 2020 12:26:09 +0530 Subject: [PATCH 184/259] fix: remove extra pillow entry in requirements --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 92ea0e5572..de9e675a67 100644 --- a/requirements.txt +++ b/requirements.txt @@ -73,5 +73,4 @@ pycryptodome==3.9.8 paytmchecksum==1.7.0 wrapt==1.10.11 razorpay==1.2.0 -rsa>=4.1 # not directly required, pinned by Snyk to avoid a vulnerability -pillow==8.0.1 \ No newline at end of file +rsa>=4.1 # not directly required, pinned by Snyk to avoid a vulnerability \ No newline at end of file From 51928cccb0ff573ac314255cd29522c82a388c9f Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 30 Nov 2020 12:38:38 +0530 Subject: [PATCH 185/259] chore: bump frappe-charts to 1.5.4 --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index b30ca7de0c..26797675c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2300,9 +2300,9 @@ fragment-cache@^0.2.1: map-cache "^0.2.2" frappe-charts@^1.5.1: - version "1.5.3" - resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-1.5.3.tgz#0dcb86ea774fa7a3e1b79221e958d29701dfff04" - integrity sha512-VS5XVxek41ea8mVzetyFF3avNefiwGDcDSDJuHrZyJXgbqiTSXLoqlPFoMqTzuzRm1g+o6TXs+A7wLtVp3Vt0g== + version "1.5.4" + resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-1.5.4.tgz#5870f77ac6ffc8ea4dab32adda1d4e5e4fbda64b" + integrity sha512-hBr7cRLmsCC5VBj/HwKOCgdwyXnkeAO5CAvOd5H4IYFbk84VD9jOjx9fSaqAE0MygVVbY1nCN+5nb08WThW4Xw== frappe-datatable@^1.15.3: version "1.15.3" From 64e80d7aa3025290e61d15795bf9d53b0c8c7bd0 Mon Sep 17 00:00:00 2001 From: Leela vadlamudi Date: Mon, 30 Nov 2020 14:12:43 +0530 Subject: [PATCH 186/259] refactor: Remove telephony related code (#12017) --- frappe/public/js/frappe/form/controls/data.js | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/data.js b/frappe/public/js/frappe/form/controls/data.js index 4db2553bd1..401de2ed5d 100644 --- a/frappe/public/js/frappe/form/controls/data.js +++ b/frappe/public/js/frappe/form/controls/data.js @@ -22,27 +22,9 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({ this.has_input = true; this.bind_change_event(); this.setup_autoname_check(); - if (this.df.options == 'Phone') { - this.setup_phone(); - } // somehow this event does not bubble up to document // after v7, if you can debug, remove this }, - setup_phone() { - if (frappe.phone_call.handler) { - this.$wrapper.find('.control-input') - .append(` - - - - - `) - .find('.phone-btn') - .click(() => { - frappe.phone_call.handler(this.get_value(), this.frm); - }); - } - }, setup_autoname_check: function() { if (!this.df.parent) return; this.meta = frappe.get_meta(this.df.parent); From 9808c868d70ce334dadda790ca55b3819d557ca7 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 30 Nov 2020 14:14:19 +0530 Subject: [PATCH 187/259] feat: allow html in email templates --- .../email_template/email_template.json | 22 +++++++++++++-- .../doctype/email_template/email_template.py | 27 ++++++++++++++++--- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/frappe/email/doctype/email_template/email_template.json b/frappe/email/doctype/email_template/email_template.json index 0d0922f16f..dc73acacc1 100644 --- a/frappe/email/doctype/email_template/email_template.json +++ b/frappe/email/doctype/email_template/email_template.json @@ -1,4 +1,5 @@ { + "actions": [], "allow_import": 1, "allow_rename": 1, "autoname": "Prompt", @@ -8,6 +9,8 @@ "engine": "InnoDB", "field_order": [ "subject", + "use_html", + "response_html", "response", "owner", "section_break_4", @@ -22,11 +25,12 @@ "reqd": 1 }, { + "depends_on": "eval:!doc.use_html", "fieldname": "response", "fieldtype": "Text Editor", "in_list_view": 1, "label": "Response", - "reqd": 1 + "mandatory_depends_on": "eval:!doc.use_html" }, { "default": "user", @@ -45,10 +49,24 @@ "fieldtype": "HTML", "label": "Email Reply Help", "options": "

    Email Reply Example

    \n\n
    Order Overdue\n\nTransaction {{ name }} has exceeded Due Date. Please take necessary action.\n\nDetails\n\n- Customer: {{ customer }}\n- Amount: {{ grand_total }}\n
    \n\n

    How to get fieldnames

    \n\n

    The fieldnames you can use in your email template are the fields in the document from which you are sending the email. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Sales Invoice)

    \n\n

    Templating

    \n\n

    Templates are compiled using the Jinja Templating Language. To learn more about Jinja, read this documentation.

    \n" + }, + { + "default": "0", + "fieldname": "use_html", + "fieldtype": "Check", + "label": "Use HTML" + }, + { + "depends_on": "eval:doc.use_html", + "fieldname": "response_html", + "fieldtype": "Code", + "label": "Response ", + "options": "HTML" } ], "icon": "fa fa-comment", - "modified": "2019-10-30 14:15:00.956347", + "links": [], + "modified": "2020-11-30 14:12:50.321633", "modified_by": "Administrator", "module": "Email", "name": "Email Template", diff --git a/frappe/email/doctype/email_template/email_template.py b/frappe/email/doctype/email_template/email_template.py index 2743032331..6708e9dd3f 100644 --- a/frappe/email/doctype/email_template/email_template.py +++ b/frappe/email/doctype/email_template/email_template.py @@ -9,7 +9,29 @@ from six import string_types class EmailTemplate(Document): def validate(self): - validate_template(self.response) + if self.use_html: + validate_template(self.response_html) + else: + validate_template(self.response) + + def get_formatted_subject(self, doc): + return frappe.render_template(self.subject, doc) + + def get_formatted_response(self, doc): + if self.use_html: + return frappe.render_template(self.response_html, doc) + + return frappe.render_template(self.response, doc) + + def get_formatted_email(self, doc): + if isinstance(doc, string_types): + doc = json.loads(doc) + + return { + "subject" : self.get_formatted_subject(doc), + "message" : self.get_formatted_response(doc) + } + @frappe.whitelist() def get_email_template(template_name, doc): @@ -18,5 +40,4 @@ def get_email_template(template_name, doc): doc = json.loads(doc) email_template = frappe.get_doc("Email Template", template_name) - return {"subject" : frappe.render_template(email_template.subject, doc), - "message" : frappe.render_template(email_template.response, doc)} \ No newline at end of file + return email_template.get_formatted_email(doc) \ No newline at end of file From 76b3fd811ec84ea86085e603d3dd6423f20c489c Mon Sep 17 00:00:00 2001 From: Abhishek Balam Date: Mon, 30 Nov 2020 14:56:49 +0530 Subject: [PATCH 188/259] fix: added tests, cleaned up code --- frappe/tests/data/exif_sample_image.jpg | Bin 0 -> 161713 bytes frappe/tests/test_image.py | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 frappe/tests/data/exif_sample_image.jpg create mode 100644 frappe/tests/test_image.py diff --git a/frappe/tests/data/exif_sample_image.jpg b/frappe/tests/data/exif_sample_image.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4a2c1552b991add9a356a460415626ad700f401b GIT binary patch literal 161713 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 literal 0 HcmV?d00001 diff --git a/frappe/tests/test_image.py b/frappe/tests/test_image.py new file mode 100644 index 0000000000..4da83ace8b --- /dev/null +++ b/frappe/tests/test_image.py @@ -0,0 +1,19 @@ +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt +from __future__ import unicode_literals + +import frappe, unittest +from PIL import Image +from frappe.utils.image import strip_exif_data +import io + +class TestImage(unittest.TestCase): + def test_strip_exif_data(self): + original_image = Image.open("../apps/frappe/frappe/tests/data/exif_sample_image.jpg") + original_image_content = io.open("../apps/frappe/frappe/tests/data/exif_sample_image.jpg", mode='rb').read() + + new_image_content = strip_exif_data(original_image_content) + new_image = Image.open(io.BytesIO(new_image_content)) + + self.assertEqual(new_image._getexif(), None) + self.assertNotEqual(original_image._getexif(), new_image._getexif()) \ No newline at end of file From 3a074756c1162579a2ae1cd92342248162deb208 Mon Sep 17 00:00:00 2001 From: Abhishek Balam Date: Mon, 30 Nov 2020 14:58:01 +0530 Subject: [PATCH 189/259] fix: removed content_type param --- frappe/core/doctype/file/file.py | 4 ++-- frappe/utils/image.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 1642e857c5..8b1d8195dc 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -470,8 +470,8 @@ class File(Document): self.content_type = mimetypes.guess_type(self.file_name)[0] - if self.content_type and "image" in self.content_type: - self.content = strip_exif_data(self.content, self.content_type) + if self.content_type == "image": + self.content = strip_exif_data(self.content) self.file_size = self.check_max_file_size() self.content_hash = get_content_hash(self.content) diff --git a/frappe/utils/image.py b/frappe/utils/image.py index 3d3d98a28c..6cb5e9fc92 100644 --- a/frappe/utils/image.py +++ b/frappe/utils/image.py @@ -18,7 +18,7 @@ def resize_images(path, maxdim=700): print("resized {0}".format(os.path.join(basepath, fname))) -def strip_exif_data(content, content_type): +def strip_exif_data(content): """ Strips exif from image files which support it. Works by creating a new Image object which ignores exif by @@ -35,7 +35,7 @@ def strip_exif_data(content, content_type): new_image = Image.new(original_image.mode, original_image.size) new_image.putdata(list(original_image.getdata())) - new_image.save(output, format=content_type.split('/')[-1].upper()) + new_image.save(output, format='JPEG') # Since this is a temporary image, the extension does not matter content = output.getvalue() From f7444b7b440e770a34ff23d64c9c5c41ddc405d2 Mon Sep 17 00:00:00 2001 From: Abhishek Balam Date: Mon, 30 Nov 2020 15:01:07 +0530 Subject: [PATCH 190/259] fix: removed unused import --- frappe/tests/test_image.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/tests/test_image.py b/frappe/tests/test_image.py index 4da83ace8b..89cbc3225a 100644 --- a/frappe/tests/test_image.py +++ b/frappe/tests/test_image.py @@ -2,7 +2,7 @@ # MIT License. See license.txt from __future__ import unicode_literals -import frappe, unittest +import unittest from PIL import Image from frappe.utils.image import strip_exif_data import io From f8fd59b6eb26b03c324fe06f0ed10409ae5ac0a4 Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Mon, 30 Nov 2020 15:15:19 +0530 Subject: [PATCH 191/259] fix: remove HTTP filter --- frappe/utils/change_log.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frappe/utils/change_log.py b/frappe/utils/change_log.py index 9607c89784..7cea1554b4 100644 --- a/frappe/utils/change_log.py +++ b/frappe/utils/change_log.py @@ -217,15 +217,13 @@ def check_release_on_github(app: str): # Invalid URL return - # Get latest version from Github - if parsed_url.protocol == "http": - return if parsed_url.resource != "github.com": return owner = parsed_url.owner repo = parsed_url.name + # Get latest version from Github r = requests.get('https://api.github.com/repos/{}/{}/releases'.format(owner, repo)) if r.ok: latest_non_beta_release = parse_latest_non_beta_release(r.json()) From 4810d07a8a4823a31ceef66b0896a991123ece6e Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 30 Nov 2020 15:23:12 +0530 Subject: [PATCH 192/259] test: Add tests for throwing AttributeError if method not found --- .../doctype/server_script/test_server_script.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/frappe/core/doctype/server_script/test_server_script.py b/frappe/core/doctype/server_script/test_server_script.py index 3356e584af..256cea57d7 100644 --- a/frappe/core/doctype/server_script/test_server_script.py +++ b/frappe/core/doctype/server_script/test_server_script.py @@ -45,6 +45,15 @@ frappe.response['message'] = 'hello' allow_guest = 1, script = ''' frappe.flags = 'hello' +''' + ), + dict( + name='test_invalid_namespace_method', + script_type = 'DocType Event', + doctype_event = 'Before Insert', + reference_doctype = 'Note', + script = ''' +frappe.method_that_doesnt_exist("do some magic") ''' ) ] @@ -85,3 +94,8 @@ class TestServerScript(unittest.TestCase): def test_api_return(self): self.assertEqual(frappe.get_doc('Server Script', 'test_return_value').execute_method(), 'hello') + + def test_attribute_error(self): + """Raise AttributeError if method not found in Namespace""" + note = frappe.get_doc({"doctype": "Note", "title": "Test Note: Server Script"}) + self.assertRaises(AttributeError, note.insert) From d5d0bc8ea9983438366c059edea0be19a26bf359 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 30 Nov 2020 15:23:42 +0530 Subject: [PATCH 193/259] fix: Return dummy function to avoid NoneType not callable --- frappe/utils/safe_exec.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 50893330be..2aacf5eda8 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -21,7 +21,9 @@ class NamespaceDict(frappe._dict): def __getattr__(self, key): ret = self.get(key) if (not ret and key.startswith("__")) or (key not in self): - raise AttributeError(f"module has no attribute '{key}'") + def default_function(*args, **kwargs): + raise AttributeError(f"module has no attribute '{key}'") + return default_function return ret From 3e1f6c8103fd705c67968d5b1c9f46867af0ecd5 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 30 Nov 2020 15:37:29 +0530 Subject: [PATCH 194/259] style: Use f-string instead of format --- frappe/utils/change_log.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/utils/change_log.py b/frappe/utils/change_log.py index 7cea1554b4..33801af722 100644 --- a/frappe/utils/change_log.py +++ b/frappe/utils/change_log.py @@ -223,8 +223,8 @@ def check_release_on_github(app: str): owner = parsed_url.owner repo = parsed_url.name - # Get latest version from Github - r = requests.get('https://api.github.com/repos/{}/{}/releases'.format(owner, repo)) + # Get latest version from GitHub + r = requests.get(f"https://api.github.com/repos/{owner}/{repo}/releases") if r.ok: latest_non_beta_release = parse_latest_non_beta_release(r.json()) if latest_non_beta_release: From 3296097df606df2998f01dde927541836504d6bc Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 30 Nov 2020 15:46:29 +0530 Subject: [PATCH 195/259] feat: show absolute value in print format --- frappe/model/base_document.py | 6 +++--- frappe/printing/doctype/print_format/print_format.json | 9 ++++++++- frappe/templates/print_formats/standard_macros.html | 5 ++--- frappe/www/printview.py | 1 + 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 0a219b4253..5d86b3bac8 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -802,12 +802,12 @@ class BaseDocument(object): if translated: val = _(val) - if absolute_value and isinstance(val, (int, float)): - val = abs(self.get(fieldname)) - if not doc: doc = getattr(self, "parent_doc", None) or self + if (absolute_value or doc.get('absolute_value')) and isinstance(val, (int, float)): + val = abs(self.get(fieldname)) + return format_value(val, df=df, doc=doc, currency=currency) def is_print_hide(self, fieldname, df=None, for_print=True): diff --git a/frappe/printing/doctype/print_format/print_format.json b/frappe/printing/doctype/print_format/print_format.json index 63448ccc39..3867ce4502 100644 --- a/frappe/printing/doctype/print_format/print_format.json +++ b/frappe/printing/doctype/print_format/print_format.json @@ -22,6 +22,7 @@ "align_labels_right", "show_section_headings", "line_breaks", + "absolute_value", "column_break_11", "font", "css_section", @@ -196,13 +197,19 @@ "fieldtype": "Check", "hidden": 1, "label": "Print Format Builder" + }, + { + "default": "0", + "fieldname": "absolute_value", + "fieldtype": "Check", + "label": "Show absolute values" } ], "icon": "fa fa-print", "idx": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2020-10-27 18:27:58.307070", + "modified": "2020-11-30 15:26:35.605213", "modified_by": "Administrator", "module": "Printing", "name": "Print Format", diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html index 3681a87f53..168547798b 100644 --- a/frappe/templates/print_formats/standard_macros.html +++ b/frappe/templates/print_formats/standard_macros.html @@ -136,10 +136,9 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}" {%- if df.print_width %} style="width: {{ get_width(df) }};"{% endif %}> {% elif df.fieldtype=="HTML" %} {{ frappe.render_template(df.options, {"doc":doc}) }} - {% elif df.fieldtype=="Currency" %} - {{ doc.get_formatted(df.fieldname, doc, translated=df.translatable) }} {% else %} - {{ doc.get_formatted(df.fieldname, parent_doc or doc, translated=df.translatable) }} + {%- set parent = parent_doc or doc -%} + {{ doc.get_formatted(df.fieldname, parent, translated=df.translatable, absolute_value=parent.absolute_value) }} {% endif %} {%- endmacro %} diff --git a/frappe/www/printview.py b/frappe/www/printview.py index 545e5d581d..71316dc48c 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -100,6 +100,7 @@ def get_rendered_template(doc, name=None, print_format=None, meta=None, doc.print_section_headings = print_format.show_section_headings doc.print_line_breaks = print_format.line_breaks doc.align_labels_right = print_format.align_labels_right + doc.absolute_value = print_format.absolute_value def get_template_from_string(): return jenv.from_string(get_print_format(doc.doctype, From 7d4992549d69bc5485dad51cf75fa60f6143fcc5 Mon Sep 17 00:00:00 2001 From: Abhishek Balam Date: Mon, 30 Nov 2020 17:19:35 +0530 Subject: [PATCH 196/259] feat: added option in system settings to remove exif tags, default 1 --- frappe/core/doctype/file/file.py | 5 +++-- frappe/core/doctype/system_settings/system_settings.json | 9 ++++++++- frappe/utils/image.py | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 8b1d8195dc..34ff1f5599 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -470,8 +470,9 @@ class File(Document): self.content_type = mimetypes.guess_type(self.file_name)[0] - if self.content_type == "image": - self.content = strip_exif_data(self.content) + if self.content_type and "image" in self.content_type and \ + frappe.get_system_settings("remove_exif_tags"): + self.content = strip_exif_data(self.content, self.content_type) self.file_size = self.check_max_file_size() self.content_hash = get_content_hash(self.content) diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json index 17f97b3e1a..987c079b77 100644 --- a/frappe/core/doctype/system_settings/system_settings.json +++ b/frappe/core/doctype/system_settings/system_settings.json @@ -37,6 +37,7 @@ "allow_login_using_mobile_number", "allow_login_using_user_name", "allow_error_traceback", + "remove_exif_tags", "password_settings", "logout_on_password_reset", "force_user_to_reset_password", @@ -460,12 +461,18 @@ "fieldname": "prepared_report_section", "fieldtype": "Section Break", "label": "Prepared Report" + }, + { + "default": "1", + "fieldname": "remove_exif_tags", + "fieldtype": "Check", + "label": "Remove EXIF tags from uploaded images" } ], "icon": "fa fa-cog", "issingle": 1, "links": [], - "modified": "2020-08-12 14:35:45.214327", + "modified": "2020-11-30 17:04:06.785282", "modified_by": "Administrator", "module": "Core", "name": "System Settings", diff --git a/frappe/utils/image.py b/frappe/utils/image.py index 6cb5e9fc92..4643429691 100644 --- a/frappe/utils/image.py +++ b/frappe/utils/image.py @@ -18,7 +18,7 @@ def resize_images(path, maxdim=700): print("resized {0}".format(os.path.join(basepath, fname))) -def strip_exif_data(content): +def strip_exif_data(content, content_type): """ Strips exif from image files which support it. Works by creating a new Image object which ignores exif by @@ -35,7 +35,7 @@ def strip_exif_data(content): new_image = Image.new(original_image.mode, original_image.size) new_image.putdata(list(original_image.getdata())) - new_image.save(output, format='JPEG') # Since this is a temporary image, the extension does not matter + new_image.save(output, format=content_type.split('/')[1]) content = output.getvalue() From 8f8489d9b39a8a5a649b93c0e3f5665d44275494 Mon Sep 17 00:00:00 2001 From: Abhishek Balam Date: Mon, 30 Nov 2020 17:43:28 +0530 Subject: [PATCH 197/259] fix: test fix --- frappe/tests/test_image.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/tests/test_image.py b/frappe/tests/test_image.py index 89cbc3225a..b8ed0792b6 100644 --- a/frappe/tests/test_image.py +++ b/frappe/tests/test_image.py @@ -12,7 +12,7 @@ class TestImage(unittest.TestCase): original_image = Image.open("../apps/frappe/frappe/tests/data/exif_sample_image.jpg") original_image_content = io.open("../apps/frappe/frappe/tests/data/exif_sample_image.jpg", mode='rb').read() - new_image_content = strip_exif_data(original_image_content) + new_image_content = strip_exif_data(original_image_content, "image/jpeg") new_image = Image.open(io.BytesIO(new_image_content)) self.assertEqual(new_image._getexif(), None) From e306f5601c0a841b5bda80c4ee9bd394d12c9eff Mon Sep 17 00:00:00 2001 From: Abhishek Balam Date: Mon, 30 Nov 2020 18:58:53 +0530 Subject: [PATCH 198/259] fix: made requested changes --- frappe/core/doctype/file/file.py | 9 ++++++--- .../system_settings/system_settings.json | 8 ++++---- frappe/tests/test_image.py | 19 ------------------- frappe/tests/test_utils.py | 15 +++++++++++++++ frappe/utils/image.py | 5 +++-- 5 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 frappe/tests/test_image.py diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 34ff1f5599..8614740d26 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -470,11 +470,14 @@ class File(Document): self.content_type = mimetypes.guess_type(self.file_name)[0] - if self.content_type and "image" in self.content_type and \ - frappe.get_system_settings("remove_exif_tags"): + self.file_size = self.check_max_file_size() + + if ( + self.content_type and "image" in self.content_type + and frappe.get_system_settings("strip_exif_metadata_from_uploaded_images") + ): self.content = strip_exif_data(self.content, self.content_type) - self.file_size = self.check_max_file_size() self.content_hash = get_content_hash(self.content) duplicate_file = None diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json index 987c079b77..79fb84923a 100644 --- a/frappe/core/doctype/system_settings/system_settings.json +++ b/frappe/core/doctype/system_settings/system_settings.json @@ -37,7 +37,7 @@ "allow_login_using_mobile_number", "allow_login_using_user_name", "allow_error_traceback", - "remove_exif_tags", + "strip_exif_metadata_from_uploaded_images", "password_settings", "logout_on_password_reset", "force_user_to_reset_password", @@ -464,15 +464,15 @@ }, { "default": "1", - "fieldname": "remove_exif_tags", + "fieldname": "strip_exif_metadata_from_uploaded_images", "fieldtype": "Check", - "label": "Remove EXIF tags from uploaded images" + "label": "Strip EXIF tags from uploaded images" } ], "icon": "fa fa-cog", "issingle": 1, "links": [], - "modified": "2020-11-30 17:04:06.785282", + "modified": "2020-11-30 18:52:22.161391", "modified_by": "Administrator", "module": "Core", "name": "System Settings", diff --git a/frappe/tests/test_image.py b/frappe/tests/test_image.py deleted file mode 100644 index b8ed0792b6..0000000000 --- a/frappe/tests/test_image.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt -from __future__ import unicode_literals - -import unittest -from PIL import Image -from frappe.utils.image import strip_exif_data -import io - -class TestImage(unittest.TestCase): - def test_strip_exif_data(self): - original_image = Image.open("../apps/frappe/frappe/tests/data/exif_sample_image.jpg") - original_image_content = io.open("../apps/frappe/frappe/tests/data/exif_sample_image.jpg", mode='rb').read() - - new_image_content = strip_exif_data(original_image_content, "image/jpeg") - new_image = Image.open(io.BytesIO(new_image_content)) - - self.assertEqual(new_image._getexif(), None) - self.assertNotEqual(original_image._getexif(), new_image._getexif()) \ No newline at end of file diff --git a/frappe/tests/test_utils.py b/frappe/tests/test_utils.py index 8cdfe3e1a9..ebba60b8e8 100644 --- a/frappe/tests/test_utils.py +++ b/frappe/tests/test_utils.py @@ -7,6 +7,10 @@ import unittest from frappe.utils import evaluate_filters, money_in_words, scrub_urls, get_url from frappe.utils import ceil, floor +from PIL import Image +from frappe.utils.image import strip_exif_data +import io + class TestFilters(unittest.TestCase): def test_simple_dict(self): self.assertTrue(evaluate_filters({'doctype': 'User', 'status': 'Open'}, {'status': 'Open'})) @@ -122,3 +126,14 @@ class TestHTMLUtils(unittest.TestCase): clean = clean_email_html(sample) self.assertTrue('

    Hello

    ' in clean) self.assertTrue('text' in clean) + +class TestImage(unittest.TestCase): + def test_strip_exif_data(self): + original_image = Image.open("../apps/frappe/frappe/tests/data/exif_sample_image.jpg") + original_image_content = io.open("../apps/frappe/frappe/tests/data/exif_sample_image.jpg", mode='rb').read() + + new_image_content = strip_exif_data(original_image_content, "image/jpeg") + new_image = Image.open(io.BytesIO(new_image_content)) + + self.assertEqual(new_image._getexif(), None) + self.assertNotEqual(original_image._getexif(), new_image._getexif()) \ No newline at end of file diff --git a/frappe/utils/image.py b/frappe/utils/image.py index 4643429691..60595464a1 100644 --- a/frappe/utils/image.py +++ b/frappe/utils/image.py @@ -19,12 +19,13 @@ def resize_images(path, maxdim=700): print("resized {0}".format(os.path.join(basepath, fname))) def strip_exif_data(content, content_type): - """ Strips exif from image files which support it. + """ Strips EXIF from image files which support it. Works by creating a new Image object which ignores exif by default and then extracts the binary data back into content. - Returns: stripped image content + Returns: + Bytes: Stripped image content """ from PIL import Image From e760c39c68d9d9d9c2561fc5989f2a218b849821 Mon Sep 17 00:00:00 2001 From: Leela vadlamudi Date: Tue, 1 Dec 2020 16:34:19 +0530 Subject: [PATCH 199/259] chore: Add .editorconfig to enforce consistent styling (#12021) Github respects editorconfig settings. Adding indent_size as 4 in settings makes github indent code to 4 columns. --- .editorconfig | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..24f122a8d4 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,14 @@ +# Root editor config file +root = true + +# Common settings +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +charset = utf-8 + +# python, js indentation settings +[{*.py,*.js}] +indent_style = tab +indent_size = 4 From fa80d26f4c2a29ccbdef70058d600114afb42aa9 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 2 Dec 2020 09:46:48 +0530 Subject: [PATCH 200/259] fix(minor): update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 59c4a9dbf8..3cc92264a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,7 +35,7 @@ oauthlib==3.1.0 openpyxl==2.6.4 passlib==1.7.3 pdfkit==0.6.1 -Pillow==7.1.0 +Pillow>=8.0.0 premailer==3.6.1 psycopg2-binary==2.8.4 pyasn1==0.4.8 @@ -74,4 +74,4 @@ pycryptodome==3.9.8 paytmchecksum==1.7.0 wrapt==1.10.11 razorpay==1.2.0 -rsa>=4.1 # not directly required, pinned by Snyk to avoid a vulnerability \ No newline at end of file +rsa>=4.1 # not directly required, pinned by Snyk to avoid a vulnerability From aadbdfbd84482a37ab8503a5cc5a868019138346 Mon Sep 17 00:00:00 2001 From: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com> Date: Wed, 2 Dec 2020 17:51:38 +0530 Subject: [PATCH 201/259] refactor(System Settings): Remove redundant code (#12027) Co-authored-by: Anuja --- .../system_settings/system_settings.js | 63 +++++++++---------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/frappe/core/doctype/system_settings/system_settings.js b/frappe/core/doctype/system_settings/system_settings.js index b6514dea9f..c0c9074cbc 100644 --- a/frappe/core/doctype/system_settings/system_settings.js +++ b/frappe/core/doctype/system_settings/system_settings.js @@ -1,37 +1,36 @@ -frappe.ui.form.on("System Settings", "refresh", function(frm) { - frappe.call({ - method: "frappe.core.doctype.system_settings.system_settings.load", - callback: function(data) { - frappe.all_timezones = data.message.timezones; - frm.set_df_property("time_zone", "options", frappe.all_timezones); +frappe.ui.form.on("System Settings", { + refresh: function(frm) { + frappe.call({ + method: "frappe.core.doctype.system_settings.system_settings.load", + callback: function(data) { + frappe.all_timezones = data.message.timezones; + frm.set_df_property("time_zone", "options", frappe.all_timezones); - $.each(data.message.defaults, function(key, val) { - frm.set_value(key, val); - frappe.sys_defaults[key] = val; - }) + $.each(data.message.defaults, function(key, val) { + frm.set_value(key, val); + frappe.sys_defaults[key] = val; + }); + } + }); + }, + enable_password_policy: function(frm) { + if (frm.doc.enable_password_policy == 0) { + frm.set_value("minimum_password_score", ""); + } else { + frm.set_value("minimum_password_score", "2"); } - }); -}); - -frappe.ui.form.on("System Settings", "enable_password_policy", function(frm) { - if(frm.doc.enable_password_policy == 0){ - frm.set_value("minimum_password_score", ""); - } else { - frm.set_value("minimum_password_score", "2"); - } -}); - -frappe.ui.form.on("System Settings", "enable_two_factor_auth", function(frm) { - if(frm.doc.enable_two_factor_auth == 0){ - frm.set_value("bypass_2fa_for_retricted_ip_users", 0); - frm.set_value("bypass_restrict_ip_check_if_2fa_enabled", 0); - } -}); - -frappe.ui.form.on("System Settings", "enable_prepared_report_auto_deletion", function(frm) { - if (frm.doc.enable_prepared_report_auto_deletion) { - if (!frm.doc.prepared_report_expiry_period) { - frm.set_value('prepared_report_expiry_period', 7); + }, + enable_two_factor_auth: function(frm) { + if (frm.doc.enable_two_factor_auth == 0) { + frm.set_value("bypass_2fa_for_retricted_ip_users", 0); + frm.set_value("bypass_restrict_ip_check_if_2fa_enabled", 0); + } + }, + enable_prepared_report_auto_deletion: function(frm) { + if (frm.doc.enable_prepared_report_auto_deletion) { + if (!frm.doc.prepared_report_expiry_period) { + frm.set_value('prepared_report_expiry_period', 7); + } } } }); From a19932835a8e8ab66042e19c8ae52f87a19af946 Mon Sep 17 00:00:00 2001 From: Anupam Date: Thu, 3 Dec 2020 12:30:10 +0530 Subject: [PATCH 202/259] feat: provision to open child table in customize form --- frappe/custom/doctype/customize_form/customize_form.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/custom/doctype/customize_form/customize_form.js b/frappe/custom/doctype/customize_form/customize_form.js index 2d220b864c..17343573ed 100644 --- a/frappe/custom/doctype/customize_form/customize_form.js +++ b/frappe/custom/doctype/customize_form/customize_form.js @@ -81,6 +81,11 @@ frappe.ui.form.on("Customize Form", { } else { f._sortable = false; } + if (f.fieldtype == "Table") { + frm.add_custom_button(f.options, function() { + frm.set_value('doc_type', f.options); + }, __('Customize Child Table')); + } }); frm.fields_dict.fields.grid.refresh(); }, From 6c48c2d14aa81d9ed2dc0545f45cda6672e41cef Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Date: Thu, 3 Dec 2020 14:10:47 +0530 Subject: [PATCH 203/259] fix(charts): escape nan in each y axis --- frappe/public/js/frappe/views/reports/report_utils.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/reports/report_utils.js b/frappe/public/js/frappe/views/reports/report_utils.js index 158dbd653b..ebb08bd24b 100644 --- a/frappe/public/js/frappe/views/reports/report_utils.js +++ b/frappe/public/js/frappe/views/reports/report_utils.js @@ -15,7 +15,9 @@ frappe.report_utils = { if (raw_data.add_total_row) { labels = labels.slice(0, -1); - datasets[0].values = datasets[0].values.slice(0, -1); + datasets.forEach(dataset => { + dataset.values = dataset.values.slice(0, -1); + }); } return { From ee3fa3e4e0ebf414a9a7e777a509f6a7535be0a0 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 3 Dec 2020 22:39:38 +0530 Subject: [PATCH 204/259] fix: Remove unreferenced variable base_path --- frappe/commands/site.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index bc65aa178c..35f5b13582 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -100,12 +100,10 @@ def restore(context, sql_file_path, mariadb_root_username=None, mariadb_root_pas # Extract public and/or private files to the restored site, if user has given the path if with_public_files: - with_public_files = os.path.join(base_path, with_public_files) public = extract_files(site, with_public_files, 'public') os.remove(public) if with_private_files: - with_private_files = os.path.join(base_path, with_private_files) private = extract_files(site, with_private_files, 'private') os.remove(private) From 9ac14fb5abf6930234e4da41217dd74718c858da Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 3 Dec 2020 23:26:34 +0530 Subject: [PATCH 205/259] feat: Permission Query script type Add dynamic conditions in where clause of get_list query --- .../doctype/server_script/server_script.js | 41 ++++++++++++++----- .../doctype/server_script/server_script.json | 6 +-- .../doctype/server_script/server_script.py | 6 +++ .../server_script/server_script_utils.py | 11 ++++- .../server_script/test_server_script.py | 12 ++++++ frappe/model/db_query.py | 13 +++++- 6 files changed, 71 insertions(+), 18 deletions(-) diff --git a/frappe/core/doctype/server_script/server_script.js b/frappe/core/doctype/server_script/server_script.js index 78ef2d0509..a317d69166 100644 --- a/frappe/core/doctype/server_script/server_script.js +++ b/frappe/core/doctype/server_script/server_script.js @@ -48,29 +48,33 @@ frappe.ui.form.on('Server Script', { setup_help(frm) { frm.get_field('help_html').html(` -

    Examples

    DocType Event

    -
    
+
    Add logic for standard doctype events like Before Insert, After Submit, etc.
    
+
    +	
 # set property
 if "test" in doc.description:
-    doc.status = 'Closed'
+	doc.status = 'Closed'
 
 
 # validate
 if "validate" in doc.description:
-    raise frappe.ValidationError
+	raise frappe.ValidationError
 
 # auto create another document
-if doc.allocted_to:
-    frappe.get_doc(dict(
-        doctype = 'ToDo'
-        owner = doc.allocated_to,
-        description = doc.subject
-    )).insert()
-
    
+if doc.allocated_to:
+	frappe.get_doc(dict(
+		doctype = 'ToDo'
+		owner = doc.allocated_to,
+		description = doc.subject
+	)).insert()
+    
+
    +

    API Call

    +

    Respond to /api/method/<method-name> calls, just like whitelisted methods

    
 # respond to API
 
@@ -79,6 +83,21 @@ if frappe.form_dict.message == "ping":
 else:
 	frappe.response['message'] = "ok"
    + +
    + +

    Permission Query

    +

    Add conditions to the where clause of list queries.

    +
    
+# generate dynamic conditions and set it in the conditions variable
+tenant_id = frappe.db.get_value(...)
+conditions = 'tenant_id = {}'.format(tenant_id)
+
+# resulting select query
+select name from \`tabPerson\`
+where tenant_id = 2
+order by creation desc
+
    `); } diff --git a/frappe/core/doctype/server_script/server_script.json b/frappe/core/doctype/server_script/server_script.json index 420f96ec2f..94a48f196c 100644 --- a/frappe/core/doctype/server_script/server_script.json +++ b/frappe/core/doctype/server_script/server_script.json @@ -24,7 +24,7 @@ "fieldtype": "Select", "in_list_view": 1, "label": "Script Type", - "options": "DocType Event\nScheduler Event\nAPI", + "options": "DocType Event\nScheduler Event\nPermission Query\nAPI", "reqd": 1 }, { @@ -35,7 +35,7 @@ "reqd": 1 }, { - "depends_on": "eval:doc.script_type==='DocType Event'", + "depends_on": "eval:['DocType Event', 'Permission Query'].includes(doc.script_type)", "fieldname": "reference_doctype", "fieldtype": "Link", "in_list_view": 1, @@ -88,7 +88,7 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2020-11-11 12:39:41.391052", + "modified": "2020-12-03 22:42:02.708148", "modified_by": "Administrator", "module": "Core", "name": "Server Script", diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py index 839b784651..b1bf79dc52 100644 --- a/frappe/core/doctype/server_script/server_script.py +++ b/frappe/core/doctype/server_script/server_script.py @@ -41,6 +41,12 @@ class ServerScript(Document): # wrong report type! raise frappe.DoesNotExistError + def get_permission_query_conditions(self, user): + locals = {"user": user, "conditions": ""} + safe_exec(self.script, None, locals) + if locals["conditions"]: + return locals["conditions"] + @frappe.whitelist() def setup_scheduler_events(script_name, frequency): method = frappe.scrub('{0}-{1}'.format(script_name, frequency)) diff --git a/frappe/core/doctype/server_script/server_script_utils.py b/frappe/core/doctype/server_script/server_script_utils.py index e03504f30b..4dc4f12b34 100644 --- a/frappe/core/doctype/server_script/server_script_utils.py +++ b/frappe/core/doctype/server_script/server_script_utils.py @@ -50,6 +50,9 @@ def get_server_script_map(): # }, # '_api': { # '[path]': '[server script]' + # }, + # 'permission_query': { + # 'DocType': '[server script]' # } # } if frappe.flags.in_patch and not frappe.db.table_exists('Server Script'): @@ -57,16 +60,20 @@ def get_server_script_map(): script_map = frappe.cache().get_value('server_script_map') if script_map is None: - script_map = {} + script_map = { + 'permission_query': {} + } enabled_server_scripts = frappe.get_all('Server Script', fields=('name', 'reference_doctype', 'doctype_event','api_method', 'script_type'), filters={'disabled': 0}) for script in enabled_server_scripts: if script.script_type == 'DocType Event': script_map.setdefault(script.reference_doctype, {}).setdefault(script.doctype_event, []).append(script.name) + elif script.script_type == 'Permission Query': + script_map['permission_query'][script.reference_doctype] = script.name else: script_map.setdefault('_api', {})[script.api_method] = script.name frappe.cache().set_value('server_script_map', script_map) - return script_map \ No newline at end of file + return script_map diff --git a/frappe/core/doctype/server_script/test_server_script.py b/frappe/core/doctype/server_script/test_server_script.py index 3356e584af..565436d9f2 100644 --- a/frappe/core/doctype/server_script/test_server_script.py +++ b/frappe/core/doctype/server_script/test_server_script.py @@ -45,6 +45,14 @@ frappe.response['message'] = 'hello' allow_guest = 1, script = ''' frappe.flags = 'hello' +''' + ), + dict( + name='test_permission_query', + script_type = 'Permission Query', + reference_doctype = 'ToDo', + script = ''' +conditions = '1 = 1' ''' ) ] @@ -85,3 +93,7 @@ class TestServerScript(unittest.TestCase): def test_api_return(self): self.assertEqual(frappe.get_doc('Server Script', 'test_return_value').execute_method(), 'hello') + + def test_permission_query(self): + self.assertTrue('where (1 = 1)' in frappe.db.get_list('ToDo', return_query=1)) + self.assertTrue(isinstance(frappe.db.get_list('ToDo'), list)) diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index ace9b04cec..b936251b50 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -18,6 +18,7 @@ from frappe.client import check_parent_permission from frappe.model.utils.user_settings import get_user_settings, update_user_settings from frappe.utils import flt, cint, get_time, make_filter_tuple, get_filter, add_to_date, cstr, get_timespan_date_range from frappe.model.meta import get_table_columns +from frappe.core.doctype.server_script.server_script_utils import get_server_script_map class DatabaseQuery(object): def __init__(self, doctype, user=None): @@ -683,15 +684,23 @@ class DatabaseQuery(object): self.match_filters.append(match_filters) def get_permission_query_conditions(self): + conditions = [] condition_methods = frappe.get_hooks("permission_query_conditions", {}).get(self.doctype, []) if condition_methods: - conditions = [] for method in condition_methods: c = frappe.call(frappe.get_attr(method), self.user) if c: conditions.append(c) - return " and ".join(conditions) if conditions else None + permision_script_name = get_server_script_map().get("permission_query").get(self.doctype) + if permision_script_name: + script = frappe.get_doc("Server Script", permision_script_name) + condition = script.get_permission_query_conditions(self.user) + if condition: + conditions.append(condition) + + return " and ".join(conditions) if conditions else "" + def run_custom_query(self, query): if '%(key)s' in query: From e338f2f7b6cb5e446dacd9a7527d12e1c4806405 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 3 Dec 2020 23:56:26 +0530 Subject: [PATCH 206/259] fix(newsletter): Render template for HTML content type --- frappe/email/doctype/newsletter/newsletter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index a4d60706eb..2791ebb75b 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -85,11 +85,11 @@ class Newsletter(WebsiteGenerator): self.db_set("scheduled_to_send", len(self.recipients)) def get_message(self): - + if self.content_type == "HTML": + return frappe.render_template(self.message_html, {"doc": self.as_dict()}) return { 'Rich Text': self.message, - 'Markdown': markdown(self.message_md), - 'HTML': self.message_html + 'Markdown': markdown(self.message_md) }[self.content_type or 'Rich Text'] def get_recipients(self): From 69befda08efa8d42f6c9ea2bb0fd84936d124f99 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 4 Dec 2020 16:12:22 +0530 Subject: [PATCH 207/259] fix: label for _assign field --- frappe/model/meta.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/model/meta.py b/frappe/model/meta.py index 8c17a5b19b..c740d495c1 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -209,7 +209,8 @@ class Meta(Document): 'owner': _('Created By'), 'modified_by': _('Modified By'), 'creation': _('Created On'), - 'modified': _('Last Modified On') + 'modified': _('Last Modified On'), + '_assign': _('Assigned To') }.get(fieldname) or _('No Label') return label From 9d060f96533679b7f9fa187e63ae548a73f4258f Mon Sep 17 00:00:00 2001 From: Abhishek Balam Date: Fri, 4 Dec 2020 17:01:55 +0530 Subject: [PATCH 208/259] fix: cstr import added --- frappe/utils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 9640bcd394..d76e6c951e 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -10,7 +10,7 @@ import functools from .html_utils import sanitize_html import frappe from frappe.utils.identicon import Identicon -from email.utils import parseaddr, formataddr +from email.utils import parseaddr, formataddr, cstr from email.header import decode_header, make_header # utility functions like cint, int, flt, etc. from frappe.utils.data import * From d229e363b39d26a0ff11ee4efb2ed2693da6c158 Mon Sep 17 00:00:00 2001 From: Abhishek Balam Date: Fri, 4 Dec 2020 17:10:42 +0530 Subject: [PATCH 209/259] fix: revert cstr import added --- frappe/utils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index d76e6c951e..9640bcd394 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -10,7 +10,7 @@ import functools from .html_utils import sanitize_html import frappe from frappe.utils.identicon import Identicon -from email.utils import parseaddr, formataddr, cstr +from email.utils import parseaddr, formataddr from email.header import decode_header, make_header # utility functions like cint, int, flt, etc. from frappe.utils.data import * From 1b609af8e5de0b0cc75fdd9d60e8fe9748371180 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 4 Dec 2020 18:15:17 +0530 Subject: [PATCH 210/259] fix: Handle paths relative to bench root and sites folder --- frappe/commands/site.py | 4 ++-- frappe/installer.py | 20 +++++++------------- frappe/utils/__init__.py | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 35f5b13582..4a631be3ac 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -100,11 +100,11 @@ def restore(context, sql_file_path, mariadb_root_username=None, mariadb_root_pas # Extract public and/or private files to the restored site, if user has given the path if with_public_files: - public = extract_files(site, with_public_files, 'public') + public = extract_files(site, with_public_files) os.remove(public) if with_private_files: - private = extract_files(site, with_private_files, 'private') + private = extract_files(site, with_private_files) os.remove(private) # Removing temporarily created file diff --git a/frappe/installer.py b/frappe/installer.py index 1245a08cb7..a11c8dfbfa 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -440,20 +440,11 @@ def extract_sql_from_archive(sql_file_path): Returns: str: Path of the decompressed SQL file """ + from frappe.utils import get_bench_relative_path + sql_file_path = get_bench_relative_path(sql_file_path) # Extract the gzip file if user has passed *.sql.gz file instead of *.sql file - if not os.path.exists(sql_file_path): - base_path = '..' - sql_file_path = os.path.join(base_path, sql_file_path) - if not os.path.exists(sql_file_path): - print('Invalid path {0}'.format(sql_file_path[3:])) - sys.exit(1) - elif sql_file_path.startswith(os.sep): - base_path = os.sep - else: - base_path = '.' - if sql_file_path.endswith('sql.gz'): - decompressed_file_name = extract_sql_gzip(os.path.abspath(sql_file_path)) + decompressed_file_name = extract_sql_gzip(sql_file_path) else: decompressed_file_name = sql_file_path @@ -475,9 +466,12 @@ def extract_sql_gzip(sql_gz_path): return decompressed_file -def extract_files(site_name, file_path, folder_name): +def extract_files(site_name, file_path): import shutil import subprocess + from frappe.utils import get_bench_relative_path + + file_path = get_bench_relative_path(file_path) # Need to do frappe.init to maintain the site locals frappe.init(site=site_name) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index c209ee13c9..cc5b42acb7 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -729,3 +729,27 @@ def get_build_version(): # .build can sometimes not exist # this is not a major problem so send fallback return frappe.utils.random_string(8) + +def get_bench_relative_path(file_path): + """Fixes paths relative to the bench root directory if exists and returns the absolute path + + Args: + file_path (str, Path): Path of a file that exists on the file system + + Returns: + str: Absolute path of the file_path + """ + if not os.path.exists(file_path): + base_path = '..' + elif file_path.startswith(os.sep): + base_path = os.sep + else: + base_path = '.' + + file_path = os.path.join(base_path, file_path) + + if not os.path.exists(file_path): + print('Invalid path {0}'.format(file_path[3:])) + sys.exit(1) + + return os.path.abspath(file_path) From beec0b48fbac14766d005d73c874b4b874420d91 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 4 Dec 2020 18:31:16 +0530 Subject: [PATCH 211/259] fix: use frappe.utils.shorten_number --- frappe/public/js/frappe/widgets/number_card_widget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js index 20503ed4f1..8855de435b 100644 --- a/frappe/public/js/frappe/widgets/number_card_widget.js +++ b/frappe/public/js/frappe/widgets/number_card_widget.js @@ -269,7 +269,7 @@ export default class NumberCardWidget extends Widget { result: this.number }).then(res => { if (res !== undefined) { - this.percentage_stat = shorten_number(res); + this.percentage_stat = frappe.utils.shorten_number(res); } }); } From b1cab9a9c1788ee654fe6d08d49a71c67eb6e163 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sat, 5 Dec 2020 19:26:52 +0530 Subject: [PATCH 212/259] fix: Query report filter --- frappe/core/doctype/report_filter/report_filter.json | 4 ++-- frappe/public/js/frappe/views/reports/query_report.js | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/report_filter/report_filter.json b/frappe/core/doctype/report_filter/report_filter.json index 9d277db11d..964294b96e 100644 --- a/frappe/core/doctype/report_filter/report_filter.json +++ b/frappe/core/doctype/report_filter/report_filter.json @@ -44,7 +44,7 @@ }, { "fieldname": "options", - "fieldtype": "Data", + "fieldtype": "Small Text", "label": "Options" }, { @@ -58,7 +58,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2020-08-17 16:15:46.937267", + "modified": "2020-12-05 19:20:00.503097", "modified_by": "Administrator", "module": "Core", "name": "Report Filter", diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 60abb187ae..eccfa9c089 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1112,7 +1112,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { } get_filter_values(raise) { - const mandatory = this.filters.filter(f => f.df.reqd); + + // check for mandatory property for filters added via UI + const mandatory = this.filters.filter(f => (f.df.reqd || f.df.mandatory)); const missing_mandatory = mandatory.filter(f => !f.get_value()); if (raise && missing_mandatory.length > 0) { let message = __('Please set filters'); From 9dec6e84bd3f6043a10003b6e5bff17f07a383c0 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sun, 6 Dec 2020 23:07:09 +0000 Subject: [PATCH 213/259] fix: package.json & yarn.lock to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-HIGHLIGHTJS-1048676 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d1a94d0e35..2ef6ceab2d 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "frappe-datatable": "^1.15.3", "frappe-gantt": "^0.5.0", "fuse.js": "^3.4.6", - "highlight.js": "^9.18.2", + "highlight.js": "^10.4.1", "js-sha256": "^0.9.0", "jsbarcode": "^3.9.0", "moment": "^2.20.1", diff --git a/yarn.lock b/yarn.lock index 26797675c6..5cbea3f938 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2702,10 +2702,10 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -highlight.js@^9.18.2: - version "9.18.5" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825" - integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA== +highlight.js@^10.4.1: + version "10.4.1" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0" + integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg== homedir-polyfill@^1.0.1: version "1.0.3" From c5677b52d0af3dd31812625db8b22a2fab501983 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 7 Dec 2020 14:42:54 +0530 Subject: [PATCH 214/259] refactor: shorten_number function - pass min_length and max_no_of_decimals --- frappe/public/js/frappe/utils/utils.js | 41 +++++++++++++++---- .../js/frappe/widgets/number_card_widget.js | 2 +- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 4bf9c5bbd8..f8f25293b3 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -979,17 +979,42 @@ Object.assign(frappe.utils, { return route; }, - shorten_number: function (number, country) { - country = (country == 'India') ? country : ''; + shorten_number: function (number, country, min_length=4, max_no_of_decimals=2) { + /* returns the number as an abbreviated string + * PARAMS + * number - number to be shortened + * country - country that determines the numnber system to be used + * min_length - length below which the number will not be shortened + * max_no_of_decimals - max number of decimals of the shortened number + */ + + // return number if total digits is lesser than min_length + const len = String(number).match(/\d/g).length; + if (len < min_length) return number.toString(); + const number_system = this.get_number_system(country); let x = Math.abs(Math.round(number)); for (const map of number_system) { - const condition = map.condition ? map.condition(x) : x >= map.divisor; - if (condition) { - return (number/map.divisor).toFixed(2) + ' ' + map.symbol; + if (x >= map.divisor) { + let result = number/map.divisor; + const no_of_decimals = this.get_number_of_decimals(result); + /* + If no_of_decimals is greater than max_no_of_decimals, + round the number to max_no_of_decimals + */ + result = no_of_decimals > max_no_of_decimals + ? result.toFixed(max_no_of_decimals) + : result; + return result + ' ' + map.symbol; } } - return number.toFixed(); + + return number.toFixed(max_no_of_decimals); + }, + + get_number_of_decimals: function (number) { + if (Math.floor(number) === number) return 0; + return number.toString().split(".")[1].length || 0; }, get_number_system: function (country) { @@ -1019,9 +1044,11 @@ Object.assign(frappe.utils, { { divisor: 1.0e+3, symbol: 'K', - condition: (num) => num.toFixed().length > 5 }] }; + + if (!Object.keys(number_system_map).includes(country)) country = ''; + return number_system_map[country]; }, }); diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js index 8855de435b..c41f9bc6e7 100644 --- a/frappe/public/js/frappe/widgets/number_card_widget.js +++ b/frappe/public/js/frappe/widgets/number_card_widget.js @@ -204,7 +204,7 @@ export default class NumberCardWidget extends Widget { get_formatted_number(df) { const default_country = frappe.sys_defaults.country; - const shortened_number = frappe.utils.shorten_number(this.number, default_country); + const shortened_number = frappe.utils.shorten_number(this.number, default_country, 5); let number_parts = shortened_number.split(' '); const symbol = number_parts[1] || ''; From fc97e080c67ddc241af9548fb08d9672fb3c0470 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 7 Dec 2020 16:32:19 +0100 Subject: [PATCH 215/259] feat: remove useless functionality --- .../s3_backup_settings.json | 32 ++-------- .../s3_backup_settings/s3_backup_settings.py | 58 +++++-------------- 2 files changed, 19 insertions(+), 71 deletions(-) diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json index 123bb21e88..2ca1723cb2 100755 --- a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json +++ b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json @@ -18,12 +18,9 @@ "bucket", "endpoint_url", "column_break_13", - "region", "backup_details_section", "frequency", - "backup_files", - "column_break_18", - "backup_limit" + "backup_files" ], "fields": [ { @@ -42,7 +39,7 @@ }, { "default": "1", - "description": "Note: By default emails for failed backups are sent.", + "description": "By default, emails are only sent for failed backups.", "fieldname": "send_email_for_successful_backup", "fieldtype": "Check", "label": "Send Email for Successful Backup" @@ -73,14 +70,7 @@ "reqd": 1 }, { - "default": "us-east-1", - "description": "See https://docs.aws.amazon.com/general/latest/gr/s3.html for details.", - "fieldname": "region", - "fieldtype": "Select", - "label": "Region", - "options": "us-east-1\nus-east-2\nus-west-1\nus-west-2\naf-south-1\nap-east-1\nap-south-1\nap-southeast-1\nap-southeast-2\nap-northeast-1\nap-northeast-2\nap-northeast-3\nca-central-1\ncn-north-1\ncn-northwest-1\neu-central-1\neu-west-1\neu-west-2\neu-west-3\neu-south-1\neu-north-1\nme-south-1\nsa-east-1" - }, - { + "default": "https://s3.amazonaws.com", "fieldname": "endpoint_url", "fieldtype": "Data", "label": "Endpoint URL" @@ -92,14 +82,6 @@ "mandatory_depends_on": "enabled", "reqd": 1 }, - { - "description": "Set to 0 for no limit on the number of backups taken", - "fieldname": "backup_limit", - "fieldtype": "Int", - "label": "Backup Limit", - "mandatory_depends_on": "enabled", - "reqd": 1 - }, { "depends_on": "enabled", "fieldname": "api_access_section", @@ -142,16 +124,12 @@ "fieldname": "backup_files", "fieldtype": "Check", "label": "Backup Files" - }, - { - "fieldname": "column_break_18", - "fieldtype": "Column Break" } ], "hide_toolbar": 1, "issingle": 1, "links": [], - "modified": "2020-07-27 17:27:21.400000", + "modified": "2020-12-07 15:30:55.047689", "modified_by": "Administrator", "module": "Integrations", "name": "S3 Backup Settings", @@ -172,4 +150,4 @@ "sort_field": "modified", "sort_order": "DESC", "track_changes": 1 -} +} \ No newline at end of file diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py index 7c90d37f82..308d34c5c2 100755 --- a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py +++ b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py @@ -24,6 +24,7 @@ class S3BackupSettings(Document): if not self.endpoint_url: self.endpoint_url = 'https://s3.amazonaws.com' + conn = boto3.client( 's3', aws_access_key_id=self.access_key_id, @@ -31,25 +32,21 @@ class S3BackupSettings(Document): endpoint_url=self.endpoint_url ) - bucket_lower = str(self.bucket) - - try: - conn.list_buckets() - - except ClientError: - frappe.throw(_("Invalid Access Key ID or Secret Access Key.")) - try: # Head_bucket returns a 200 OK if the bucket exists and have access to it. - conn.head_bucket(Bucket=bucket_lower) + # Requires ListBucket permission + conn.head_bucket(Bucket=self.bucket) except ClientError as e: error_code = e.response['Error']['Code'] + bucket_name = frappe.bold(self.bucket) if error_code == '403': - frappe.throw(_("Do not have permission to access {0} bucket.").format(bucket_lower)) - else: # '400'-Bad request or '404'-Not Found return - # try to create bucket - conn.create_bucket(Bucket=bucket_lower, CreateBucketConfiguration={ - 'LocationConstraint': self.region}) + msg = _("Do not have permission to access bucket {0}.").format(bucket_name) + elif error_code == '404': + msg = _("Bucket {0} not found.").format(bucket_name) + else: + msg = e.args[0] + + frappe.throw(msg) @frappe.whitelist() @@ -70,11 +67,13 @@ def take_backups_weekly(): def take_backups_monthly(): take_backups_if("Monthly") + def take_backups_if(freq): if cint(frappe.db.get_value("S3 Backup Settings", None, "enabled")): if frappe.db.get_value("S3 Backup Settings", None, "frequency") == freq: take_backups_s3() + @frappe.whitelist() def take_backups_s3(retry_count=0): try: @@ -146,42 +145,13 @@ def backup_to_s3(): if files_filename: upload_file_to_s3(files_filename, folder, conn, bucket) - delete_old_backups(doc.backup_limit, bucket) - def upload_file_to_s3(filename, folder, conn, bucket): destpath = os.path.join(folder, os.path.basename(filename)) try: print("Uploading file:", filename) - conn.upload_file(filename, bucket, destpath) + conn.upload_file(filename, bucket, destpath) # Requires PutObject permission except Exception as e: frappe.log_error() print("Error uploading: %s" % (e)) - - -def delete_old_backups(limit, bucket): - all_backups = [] - doc = frappe.get_single("S3 Backup Settings") - backup_limit = int(limit) - - s3 = boto3.resource( - 's3', - aws_access_key_id=doc.access_key_id, - aws_secret_access_key=doc.get_password('secret_access_key'), - endpoint_url=doc.endpoint_url or 'https://s3.amazonaws.com' - ) - - bucket = s3.Bucket(bucket) - objects = bucket.meta.client.list_objects_v2(Bucket=bucket.name, Delimiter='/') - if objects: - for obj in objects.get('CommonPrefixes'): - all_backups.append(obj.get('Prefix')) - - oldest_backup = sorted(all_backups)[0] if all_backups else '' - - if len(all_backups) > backup_limit: - print("Deleting Backup: {0}".format(oldest_backup)) - for obj in bucket.objects.filter(Prefix=oldest_backup): - # delete all keys that are inside the oldest_backup - s3.Object(bucket.name, obj.key).delete() From 3a11ef3365ed4838f1bd82929af5d4f5589110e0 Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 8 Dec 2020 12:46:16 +0530 Subject: [PATCH 216/259] fix: filter dashboards, dashboard charts, number cards by modules --- frappe/desk/doctype/dashboard/dashboard.py | 19 ++++++++++++ .../dashboard_chart/dashboard_chart.py | 30 ++++++++++++------- .../desk/doctype/number_card/number_card.py | 13 ++++++-- frappe/hooks.py | 1 + 4 files changed, 50 insertions(+), 13 deletions(-) diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py index b12bcfe27d..1c04b6a2fe 100644 --- a/frappe/desk/doctype/dashboard/dashboard.py +++ b/frappe/desk/doctype/dashboard/dashboard.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals from frappe.model.document import Document from frappe.modules.export_file import export_to_files +from frappe.config import get_modules_from_all_apps_for_user import frappe from frappe import _ import json @@ -42,6 +43,24 @@ class Dashboard(Document): except ValueError as error: frappe.throw(_("Invalid json added in the custom options: {0}").format(error)) + +def get_permission_query_conditions(user): + if not user: + user = frappe.session.user + + if user == 'Administrator': + return + + roles = frappe.get_roles(user) + if "System Manager" in roles: + return None + + allowed_modules = [frappe.db.escape(module.get('module_name')) for module in get_modules_from_all_apps_for_user()] + module_condition = '`tabDashboard`.`module` in ({allowed_modules}) or `tabDashboard`.`module` is NULL'.format( + allowed_modules=','.join(allowed_modules)) + + return '{module_condition}'.format(module_condition=module_condition) + @frappe.whitelist() def get_permitted_charts(dashboard_name): permitted_charts = [] diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 3f8d7c3c79..2fa36b5514 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -13,12 +13,12 @@ from frappe.utils.dateutils import\ get_period, get_period_beginning, get_from_date_from_timespan, get_dates_from_timegrain from frappe.model.naming import append_number_if_name_exists from frappe.boot import get_allowed_reports +from frappe.config import get_modules_from_all_apps_for_user from frappe.model.document import Document from frappe.modules.export_file import export_to_files def get_permission_query_conditions(user): - if not user: user = frappe.session.user @@ -31,9 +31,11 @@ def get_permission_query_conditions(user): doctype_condition = False report_condition = False + module_condition = False allowed_doctypes = [frappe.db.escape(doctype) for doctype in frappe.permissions.get_doctypes_with_read()] allowed_reports = [frappe.db.escape(key) if type(key) == str else key.encode('UTF8') for key in get_allowed_reports()] + allowed_modules = [frappe.db.escape(module.get('module_name')) for module in get_modules_from_all_apps_for_user()] if allowed_doctypes: doctype_condition = '`tabDashboard Chart`.`document_type` in ({allowed_doctypes})'.format( @@ -41,18 +43,24 @@ def get_permission_query_conditions(user): if allowed_reports: report_condition = '`tabDashboard Chart`.`report_name` in ({allowed_reports})'.format( allowed_reports=','.join(allowed_reports)) + if allowed_modules: + module_condition = '''`tabDashboard Chart`.`module` in ({allowed_modules}) + or `tabDashboard Chart`.`module` is NULL'''.format( + allowed_modules=','.join(allowed_modules)) return ''' - (`tabDashboard Chart`.`chart_type` in ('Count', 'Sum', 'Average') - and {doctype_condition}) - or - (`tabDashboard Chart`.`chart_type` = 'Report' - and {report_condition}) - '''.format( - doctype_condition=doctype_condition, - report_condition=report_condition - ) - + ((`tabDashboard Chart`.`chart_type` in ('Count', 'Sum', 'Average') + and {doctype_condition}) + or + (`tabDashboard Chart`.`chart_type` = 'Report' + and {report_condition})) + and + ({module_condition}) + '''.format( + doctype_condition=doctype_condition, + report_condition=report_condition, + module_condition=module_condition + ) def has_permission(doc, ptype, user): roles = frappe.get_roles(user) diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py index d4a2b00c57..6bddd09fc7 100644 --- a/frappe/desk/doctype/number_card/number_card.py +++ b/frappe/desk/doctype/number_card/number_card.py @@ -8,6 +8,7 @@ from frappe.model.document import Document from frappe.utils import cint from frappe.model.naming import append_number_if_name_exists from frappe.modules.export_file import export_to_files +from frappe.config import get_modules_from_all_apps_for_user class NumberCard(Document): def autoname(self): @@ -33,16 +34,24 @@ def get_permission_query_conditions(user=None): return None doctype_condition = False + module_condition = False allowed_doctypes = [frappe.db.escape(doctype) for doctype in frappe.permissions.get_doctypes_with_read()] + allowed_modules = [frappe.db.escape(module.get('module_name')) for module in get_modules_from_all_apps_for_user()] if allowed_doctypes: doctype_condition = '`tabNumber Card`.`document_type` in ({allowed_doctypes})'.format( allowed_doctypes=','.join(allowed_doctypes)) + if allowed_modules: + module_condition = '''`tabNumber Card`.`module` in ({allowed_modules}) + or `tabNumber Card`.`module` is NULL'''.format( + allowed_modules=','.join(allowed_modules)) return ''' - {doctype_condition} - '''.format(doctype_condition=doctype_condition) + {doctype_condition} + and + {module_condition} + '''.format(doctype_condition=doctype_condition, module_condition=module_condition) def has_permission(doc, ptype, user): roles = frappe.get_roles(user) diff --git a/frappe/hooks.py b/frappe/hooks.py index d8c8cd841c..3d7ae0abb4 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -94,6 +94,7 @@ permission_query_conditions = { "User": "frappe.core.doctype.user.user.get_permission_query_conditions", "Dashboard Settings": "frappe.desk.doctype.dashboard_settings.dashboard_settings.get_permission_query_conditions", "Notification Log": "frappe.desk.doctype.notification_log.notification_log.get_permission_query_conditions", + "Dashboard": "frappe.desk.doctype.dashboard.dashboard.get_permission_query_conditions", "Dashboard Chart": "frappe.desk.doctype.dashboard_chart.dashboard_chart.get_permission_query_conditions", "Number Card": "frappe.desk.doctype.number_card.number_card.get_permission_query_conditions", "Notification Settings": "frappe.desk.doctype.notification_settings.notification_settings.get_permission_query_conditions", From e197a6fd7fbecfca9eadd8c2d92577eb20ba12b7 Mon Sep 17 00:00:00 2001 From: Anupam Date: Tue, 8 Dec 2020 11:35:41 +0530 Subject: [PATCH 217/259] feat: added data format support DD-Mon-YY --- frappe/public/js/frappe/data_import/import_preview.js | 1 + frappe/utils/data.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/frappe/public/js/frappe/data_import/import_preview.js b/frappe/public/js/frappe/data_import/import_preview.js index 6c17cb4351..477cfb0786 100644 --- a/frappe/public/js/frappe/data_import/import_preview.js +++ b/frappe/public/js/frappe/data_import/import_preview.js @@ -101,6 +101,7 @@ frappe.data_import.ImportPreview = class ImportPreview { .replace('%H', 'HH') .replace('%M', 'mm') .replace('%S', 'ss') + .replace('%b', 'Mon') : null; let column_title = ` diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 41f247da45..cef4243913 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -1300,12 +1300,14 @@ def generate_hash(*args, **kwargs): def guess_date_format(date_string): DATE_FORMATS = [ + r"%d/%b/%y", r"%d-%m-%Y", r"%m-%d-%Y", r"%Y-%m-%d", r"%d-%m-%y", r"%m-%d-%y", r"%y-%m-%d", + r"%y-%b-%d", r"%d/%m/%Y", r"%m/%d/%Y", r"%Y/%m/%d", From 309f483bb3c158fe0b3186e3d6c4762f66b2049c Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 9 Dec 2020 16:54:40 +0530 Subject: [PATCH 218/259] refactor: update return statement --- frappe/desk/doctype/dashboard/dashboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py index 1c04b6a2fe..fa03bf8f80 100644 --- a/frappe/desk/doctype/dashboard/dashboard.py +++ b/frappe/desk/doctype/dashboard/dashboard.py @@ -59,7 +59,7 @@ def get_permission_query_conditions(user): module_condition = '`tabDashboard`.`module` in ({allowed_modules}) or `tabDashboard`.`module` is NULL'.format( allowed_modules=','.join(allowed_modules)) - return '{module_condition}'.format(module_condition=module_condition) + return module_condition @frappe.whitelist() def get_permitted_charts(dashboard_name): From c5d08305536c77162ba7821bd4ac9ec9a0cee13b Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 10 Dec 2020 10:37:29 +0530 Subject: [PATCH 219/259] fix: cint seconds before operations --- frappe/utils/data.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 34659e1cac..75e8dedbe9 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -369,6 +369,8 @@ def format_duration(seconds, hide_days=False): example: converts 12885 to '3h 34m 45s' where 12885 = seconds in float """ + + seconds = cint(seconds) total_duration = { 'days': math.floor(seconds / (3600 * 24)), From c805851ebe20ea60719a0d9929fbfb900265e28b Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 10 Dec 2020 10:52:50 +0530 Subject: [PATCH 220/259] feat(Auto Repeat): Submit on Creation configuration --- .../automation/doctype/auto_repeat/auto_repeat.js | 14 ++++++++++++++ .../doctype/auto_repeat/auto_repeat.json | 11 ++++++++++- .../automation/doctype/auto_repeat/auto_repeat.py | 5 ++++- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.js b/frappe/automation/doctype/auto_repeat/auto_repeat.js index a11de1d881..121b4bd2f0 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.js +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.js @@ -44,6 +44,20 @@ frappe.ui.form.on('Auto Repeat', { // auto repeat schedule frappe.auto_repeat.render_schedule(frm); + + frm.trigger('toggle_submit_on_creation'); + }, + + reference_doctype: function(frm) { + frm.trigger('toggle_submit_on_creation'); + }, + + toggle_submit_on_creation: function(frm) { + // submit on creation checkbox + frappe.model.with_doctype(frm.doc.reference_doctype, () => { + let meta = frappe.get_meta(frm.doc.reference_doctype); + frm.toggle_display('submit_on_creation', meta.is_submittable); + }); }, template: function(frm) { diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.json b/frappe/automation/doctype/auto_repeat/auto_repeat.json index 8ee6ca1d45..80975dd4f5 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.json +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.json @@ -1,4 +1,5 @@ { + "actions": [], "allow_import": 1, "allow_rename": 1, "autoname": "format:AUT-AR-{#####}", @@ -12,6 +13,7 @@ "section_break_3", "reference_doctype", "reference_document", + "submit_on_creation", "column_break_5", "start_date", "end_date", @@ -186,9 +188,16 @@ "fieldname": "repeat_on_last_day", "fieldtype": "Check", "label": "Repeat on Last Day of the Month" + }, + { + "default": "0", + "fieldname": "submit_on_creation", + "fieldtype": "Check", + "label": "Submit on Creation" } ], - "modified": "2019-07-17 11:30:51.412317", + "links": [], + "modified": "2020-12-10 10:43:13.449172", "modified_by": "Administrator", "module": "Automation", "name": "Auto Repeat", diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index fcf24bf1a9..019692f136 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -150,6 +150,9 @@ class AutoRepeat(Document): self.update_doc(new_doc, reference_doc) new_doc.insert(ignore_permissions = True) + if self.submit_on_creation: + new_doc.submit(gnore_permissions = True) + return new_doc def update_doc(self, new_doc, reference_doc): @@ -160,7 +163,7 @@ class AutoRepeat(Document): if new_doc.meta.get_field('auto_repeat'): new_doc.set('auto_repeat', self.name) - for fieldname in ['naming_series', 'ignore_pricing_rule', 'posting_time', 'select_print_heading', 'remarks', 'owner']: + for fieldname in ['naming_series', 'ignore_pricing_rule', 'posting_time', 'select_print_heading', 'user_remark', 'remarks', 'owner']: if new_doc.meta.get_field(fieldname): new_doc.set(fieldname, reference_doc.get(fieldname)) From 30fbf37f25530cec068d39a98066684cfccd8848 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 10 Dec 2020 11:48:12 +0530 Subject: [PATCH 221/259] test: submit on creation --- .../doctype/auto_repeat/auto_repeat.py | 2 +- .../doctype/auto_repeat/test_auto_repeat.py | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index 019692f136..7eb533ce44 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -151,7 +151,7 @@ class AutoRepeat(Document): new_doc.insert(ignore_permissions = True) if self.submit_on_creation: - new_doc.submit(gnore_permissions = True) + new_doc.submit() return new_doc diff --git a/frappe/automation/doctype/auto_repeat/test_auto_repeat.py b/frappe/automation/doctype/auto_repeat/test_auto_repeat.py index 60fa9cb59e..e40b12e3b9 100644 --- a/frappe/automation/doctype/auto_repeat/test_auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/test_auto_repeat.py @@ -111,6 +111,25 @@ class TestAutoRepeat(unittest.TestCase): doc = make_auto_repeat(frequency='Daily', reference_document=todo.name, start_date=add_days(today(), -2)) self.assertEqual(getdate(doc.next_schedule_date), current_date) + def test_submit_on_creation(self): + doctype = 'Test Submittable DocType' + create_submittable_doctype(doctype) + + current_date = getdate() + submittable_doc = frappe.get_doc(dict(doctype=doctype, test='test submit on creation')).insert() + submittable_doc.submit() + doc = make_auto_repeat(frequency='Daily', reference_doctype=doctype, reference_document=submittable_doc.name, + start_date=add_days(current_date, -1), submit_on_creation=1) + + data = get_auto_repeat_entries(current_date) + create_repeated_entries(data) + docnames = frappe.db.get_all(doc.reference_doctype, + filters={'auto_repeat': doc.name}, + fields=['docstatus'], + limit=1 + ) + self.assertEquals(docnames[0].docstatus, 1) + def make_auto_repeat(**args): args = frappe._dict(args) @@ -118,6 +137,7 @@ def make_auto_repeat(**args): 'doctype': 'Auto Repeat', 'reference_doctype': args.reference_doctype or 'ToDo', 'reference_document': args.reference_document or frappe.db.get_value('ToDo', 'name'), + 'submit_on_creation': args.submit_on_creation or 0, 'frequency': args.frequency or 'Daily', 'start_date': args.start_date or add_days(today(), -1), 'end_date': args.end_date or "", @@ -128,3 +148,34 @@ def make_auto_repeat(**args): }).insert(ignore_permissions=True) return doc + + +def create_submittable_doctype(doctype): + if frappe.db.exists('DocType', doctype): + return + else: + doc = frappe.get_doc({ + 'doctype': 'DocType', + '__newname': doctype, + 'module': 'Custom', + 'custom': 1, + 'is_submittable': 1, + 'fields': [{ + 'fieldname': 'test', + 'label': 'Test', + 'fieldtype': 'Data' + }], + 'permissions': [{ + 'role': 'System Manager', + 'read': 1, + 'write': 1, + 'create': 1, + 'delete': 1, + 'submit': 1, + 'cancel': 1, + 'amend': 1 + }] + }).insert() + + doc.allow_auto_repeat = 1 + doc.save() \ No newline at end of file From 5a60048a0a9e57a5227796a3585b402c02435348 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 10 Dec 2020 12:31:01 +0530 Subject: [PATCH 222/259] test: for get_bench_relative_path --- frappe/tests/test_commands.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index 8c76ce2f48..2da08718a4 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -14,7 +14,7 @@ import glob import frappe import frappe.recorder from frappe.installer import add_to_installed_apps -from frappe.utils import add_to_date, now +from frappe.utils import add_to_date, get_bench_relative_path, now from frappe.utils.backups import fetch_latest_backups @@ -364,3 +364,21 @@ class TestCommands(BaseTestCommands): else: installed_apps = set(frappe.get_installed_apps()) self.assertSetEqual(list_apps, installed_apps) + + def test_get_bench_relative_path(self): + bench_path = frappe.utils.get_bench_path() + test1_path = os.path.join(bench_path, 'test1.txt') + test2_path = os.path.join(bench_path, 'sites/test2.txt') + + with open(test1_path, 'w+') as test1: + test1.write('asdf') + with open(test2_path, 'w+') as test2: + test2.write('asdf') + + self.assertTrue('test1.txt' in get_bench_relative_path('test1.txt')) + self.assertTrue('sites/test2.txt' in get_bench_relative_path('test2.txt')) + with self.assertRaises(SystemExit): + get_bench_relative_path('test3.txt') + + os.remove(test1_path) + os.remove(test2_path) From 9e954a737257b3fb11821ae56255d3bf07082cb6 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 10 Dec 2020 13:52:21 +0530 Subject: [PATCH 223/259] style: quotes --- frappe/tests/test_commands.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index 2da08718a4..0786a0e14f 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -367,18 +367,18 @@ class TestCommands(BaseTestCommands): def test_get_bench_relative_path(self): bench_path = frappe.utils.get_bench_path() - test1_path = os.path.join(bench_path, 'test1.txt') - test2_path = os.path.join(bench_path, 'sites/test2.txt') + test1_path = os.path.join(bench_path, "test1.txt") + test2_path = os.path.join(bench_path, "sites", "test2.txt") - with open(test1_path, 'w+') as test1: - test1.write('asdf') - with open(test2_path, 'w+') as test2: - test2.write('asdf') + with open(test1_path, "w+") as test1: + test1.write("asdf") + with open(test2_path, "w+") as test2: + test2.write("asdf") - self.assertTrue('test1.txt' in get_bench_relative_path('test1.txt')) - self.assertTrue('sites/test2.txt' in get_bench_relative_path('test2.txt')) + self.assertTrue("test1.txt" in get_bench_relative_path("test1.txt")) + self.assertTrue("sites/test2.txt" in get_bench_relative_path("test2.txt")) with self.assertRaises(SystemExit): - get_bench_relative_path('test3.txt') + get_bench_relative_path("test3.txt") os.remove(test1_path) os.remove(test2_path) From ec0d1dd63f727ca7d4713fbf2f739e1c49151a30 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 10 Dec 2020 17:18:13 +0530 Subject: [PATCH 224/259] fix: added server side validation for submit on creation --- frappe/automation/doctype/auto_repeat/auto_repeat.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index 7eb533ce44..31d6539e61 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -21,6 +21,7 @@ class AutoRepeat(Document): def validate(self): self.update_status() self.validate_reference_doctype() + self.validate_submit_on_creation() self.validate_dates() self.validate_email_id() self.set_dates() @@ -60,6 +61,11 @@ class AutoRepeat(Document): if not frappe.get_meta(self.reference_doctype).allow_auto_repeat: frappe.throw(_("Enable Allow Auto Repeat for the doctype {0} in Customize Form").format(self.reference_doctype)) + def validate_submit_on_creation(self): + if self.submit_on_creation and not frappe.get_meta(self.reference_doctype).is_submittable: + frappe.throw(_('Cannot enable {0} for a non-submittable doctype').format( + frappe.bold('Submit on Creation'))) + def validate_dates(self): if frappe.flags.in_patch: return From 0651341bf8535af743d0fda128008ee180f3d533 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Thu, 10 Dec 2020 18:53:21 +0530 Subject: [PATCH 225/259] feat: show absolute value checkbox if doctype has appropriate fields --- .../doctype/print_format/print_format.js | 18 +++++++++++++++++- .../doctype/print_format/print_format.json | 4 +++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/frappe/printing/doctype/print_format/print_format.js b/frappe/printing/doctype/print_format/print_format.js index e6599b2496..9ef5652dda 100644 --- a/frappe/printing/doctype/print_format/print_format.js +++ b/frappe/printing/doctype/print_format/print_format.js @@ -19,6 +19,7 @@ frappe.ui.form.on("Print Format", { } frm.trigger('render_buttons'); frm.toggle_display('standard', frappe.boot.developer_mode); + frm.trigger('hide_absolute_value_field'); }, render_buttons: function (frm) { frm.page.clear_inner_toolbar(); @@ -58,5 +59,20 @@ frappe.ui.form.on("Print Format", { frm.set_value('show_section_headings', value); frm.set_value('line_breaks', value); frm.trigger('render_buttons'); + }, + doc_type: function (frm) { + frm.trigger('hide_absolute_value_field'); + }, + hide_absolute_value_field: function (frm) { + // TODO: make it work with frm.doc.doc_type + // Problem: frm isn't updated in some random cases + const doctype = locals[frm.doc.doctype][frm.doc.name]; + if (doctype) { + frappe.model.with_doctype(doctype, () => { + const meta = frappe.get_meta(doctype); + const has_int_float_currency_field = meta.fields.filter(df => in_list(['Int', 'Float', 'Currency'], df.fieldtype)); + frm.toggle_display('absolute_value', has_int_float_currency_field.length); + }); + } } -}) +}); diff --git a/frappe/printing/doctype/print_format/print_format.json b/frappe/printing/doctype/print_format/print_format.json index 3867ce4502..6e64e802c9 100644 --- a/frappe/printing/doctype/print_format/print_format.json +++ b/frappe/printing/doctype/print_format/print_format.json @@ -200,6 +200,8 @@ }, { "default": "0", + "depends_on": "doc_type", + "description": "If checked, negative numberic values of Currency, Quantity or Count would be shown as positive", "fieldname": "absolute_value", "fieldtype": "Check", "label": "Show absolute values" @@ -209,7 +211,7 @@ "idx": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2020-11-30 15:26:35.605213", + "modified": "2020-12-10 18:58:55.598269", "modified_by": "Administrator", "module": "Printing", "name": "Print Format", From f0ae807df83009fc2fe9f7e82111b3404a395f60 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Fri, 11 Dec 2020 10:31:36 +0530 Subject: [PATCH 226/259] fix: fallback for global default precision --- frappe/public/js/frappe/form/formatters.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index 7f5c3bf472..a03a4d8405 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -50,7 +50,7 @@ frappe.form.formatters = { return frappe.form.formatters._right(value==null ? "" : cint(value), options) }, Percent: function(value, docfield, options) { - return frappe.form.formatters._right(flt(value, frappe.defaults.get_default("float_precision")) + "%", options); + return frappe.form.formatters._right(flt(value, frappe.defaults.get_default("float_precision") || 3) + "%", options); }, Rating: function(value) { return ` From e7417ebe486bd5d60a73056735743c079fc44597 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Fri, 11 Dec 2020 11:31:56 +0530 Subject: [PATCH 227/259] fix: fallback for percent field precision to 2 --- frappe/public/js/frappe/form/formatters.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index a03a4d8405..f163f59171 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -50,7 +50,8 @@ frappe.form.formatters = { return frappe.form.formatters._right(value==null ? "" : cint(value), options) }, Percent: function(value, docfield, options) { - return frappe.form.formatters._right(flt(value, frappe.defaults.get_default("float_precision") || 3) + "%", options); + var precision = docfield.precision || cint(frappe.boot.sysdefaults && frappe.boot.sysdefaults.float_precision) || 2; + return frappe.form.formatters._right(flt(value, precision) + "%", options); }, Rating: function(value) { return ` From 6398ca7db7ea9565f5fef78cab584ac771c59f51 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 11 Dec 2020 12:11:07 +0530 Subject: [PATCH 228/259] refactor: move common functions as methods to the Auto Repeat class --- .../doctype/auto_repeat/auto_repeat.js | 5 +- .../doctype/auto_repeat/auto_repeat.py | 143 +++++++++--------- .../doctype/auto_repeat/test_auto_repeat.py | 4 +- 3 files changed, 70 insertions(+), 82 deletions(-) diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.js b/frappe/automation/doctype/auto_repeat/auto_repeat.js index afee9b98bb..e914ff27b0 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.js +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.js @@ -100,10 +100,7 @@ frappe.ui.form.on('Auto Repeat', { frappe.auto_repeat.render_schedule = function(frm) { if (!frm.is_dirty() && frm.doc.status !== 'Disabled') { - frm.call({ - method: "get_auto_repeat_schedule", - doc: frm.doc - }).then((r) => { + frm.call("get_auto_repeat_schedule").then((r) => { frm.dashboard.wrapper.empty(); frm.dashboard.add_section( frappe.render_template("auto_repeat_schedule", { diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index 205d49df56..1fd2cdf1b3 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -19,7 +19,6 @@ from frappe.automation.doctype.assignment_rule.assignment_rule import get_repeat month_map = {'Monthly': 1, 'Quarterly': 3, 'Half-yearly': 6, 'Yearly': 12} week_map = {'Monday': 0, 'Tuesday': 1, 'Wednesday': 2, 'Thursday': 3, 'Friday': 4, 'Saturday': 5, 'Sunday': 6} - class AutoRepeat(Document): def validate(self): self.update_status() @@ -53,7 +52,7 @@ class AutoRepeat(Document): if self.disabled: self.next_schedule_date = None else: - self.next_schedule_date = get_next_schedule_date(schedule_date=self.start_date, auto_repeat_doc=self) + self.next_schedule_date = self.get_next_schedule_date(schedule_date=self.start_date) def unlink_if_applicable(self): if self.status == 'Completed' or self.disabled: @@ -93,7 +92,7 @@ class AutoRepeat(Document): frappe.throw(_("'Recipients' not specified")) def validate_auto_repeat_days(self): - auto_repeat_days = get_auto_repeat_days(self) + auto_repeat_days = self.get_auto_repeat_days() if not len(set(auto_repeat_days)) == len(auto_repeat_days): repeated_days = get_repeated(auto_repeat_days) frappe.throw(_('Auto Repeat Day {0} has been repeated.').format(frappe.bold(repeated_days))) @@ -123,7 +122,7 @@ class AutoRepeat(Document): end_date = getdate(self.end_date) if not self.end_date: - next_date = get_next_schedule_date(schedule_date=start_date, auto_repeat_doc=self) + next_date = self.get_next_schedule_date(schedule_date=start_date) row = { "reference_document": self.reference_document, "frequency": self.frequency, @@ -132,8 +131,7 @@ class AutoRepeat(Document): schedule_details.append(row) if self.end_date: - next_date = get_next_schedule_date( - schedule_date=start_date, auto_repeat_doc=self, for_full_schedule=True) + next_date = self.get_next_schedule_date(schedule_date=start_date, for_full_schedule=True) while (getdate(next_date) < getdate(end_date)): row = { @@ -142,8 +140,7 @@ class AutoRepeat(Document): "next_scheduled_date" : next_date } schedule_details.append(row) - next_date = get_next_schedule_date( - schedule_date=next_date, auto_repeat_doc=self, for_full_schedule=True) + next_date = self.get_next_schedule_date(schedule_date=next_date, for_full_schedule=True) return schedule_details @@ -221,6 +218,68 @@ class AutoRepeat(Document): new_doc.set('from_date', from_date) new_doc.set('to_date', to_date) + def get_next_schedule_date(self, schedule_date, for_full_schedule=False): + if month_map.get(self.frequency): + month_count = month_map.get(self.frequency) + month_diff(schedule_date, self.start_date) - 1 + else: + month_count = 0 + + day_count = 0 + if month_count and self.repeat_on_last_day: + day_count = 31 + next_date = get_next_date(self.start_date, month_count, day_count) + elif month_count and self.repeat_on_day: + day_count = self.repeat_on_day + next_date = get_next_date(self.start_date, month_count, day_count) + elif month_count: + next_date = get_next_date(self.start_date, month_count) + else: + days = self.get_days(schedule_date) + next_date = add_days(schedule_date, days) + + # next schedule date should be after or on current date + if not for_full_schedule: + while getdate(next_date) < getdate(today()): + if month_count: + month_count += month_map.get(self.frequency) + next_date = get_next_date(self.start_date, month_count, day_count) + elif days: + days = self.get_days(next_date) + next_date = add_days(next_date, days) + + return next_date + + def get_days(self, schedule_date): + if self.frequency == "Weekly": + days = self.get_offset_for_weekly_frequency(schedule_date) + else: + # daily frequency + days = 1 + + return days + + def get_offset_for_weekly_frequency(self, schedule_date): + # if weekdays are not set, offset is 7 from current schedule date + if not self.repeat_on_days: + return 7 + + repeat_on_days = self.get_auto_repeat_days() + current_schedule_day = getdate(schedule_date).weekday() + weekdays = list(week_map.keys()) + + # if repeats on more than 1 day or + # start date's weekday is not in repeat days, then get next weekday + # else offset is 7 + if len(repeat_on_days) > 1 or weekdays[current_schedule_day] not in repeat_on_days: + weekday = get_next_weekday(current_schedule_day, repeat_on_days) + next_weekday_number = week_map.get(weekday) + # offset for upcoming weekday + return timedelta((7 + next_weekday_number - current_schedule_day) % 7).days + return 7 + + def get_auto_repeat_days(self): + return [d.day for d in self.get('repeat_on_days', [])] + def send_notification(self, new_doc): """Notify concerned people about recurring document generation""" subject = self.subject or '' @@ -301,74 +360,12 @@ class AutoRepeat(Document): ) -def get_next_schedule_date(schedule_date, auto_repeat_doc=None, for_full_schedule=False): - if month_map.get(auto_repeat_doc.frequency): - month_count = month_map.get(auto_repeat_doc.frequency) + month_diff(schedule_date, auto_repeat_doc.start_date) - 1 - else: - month_count = 0 - - day_count = 0 - if month_count and auto_repeat_doc.repeat_on_last_day: - day_count = 31 - next_date = get_next_date(auto_repeat_doc.start_date, month_count, day_count) - elif month_count and auto_repeat_doc.repeat_on_day: - day_count = auto_repeat_doc.repeat_on_day - next_date = get_next_date(auto_repeat_doc.start_date, month_count, day_count) - elif month_count: - next_date = get_next_date(auto_repeat_doc.start_date, month_count) - else: - days = get_days(schedule_date, auto_repeat_doc) - next_date = add_days(schedule_date, days) - - # next schedule date should be after or on current date - if not for_full_schedule: - while getdate(next_date) < getdate(today()): - if month_count: - month_count += month_map.get(auto_repeat_doc.frequency) - next_date = get_next_date(auto_repeat_doc.start_date, month_count, day_count) - elif days: - days = get_days(next_date, auto_repeat_doc) - next_date = add_days(next_date, days) - - return next_date - - def get_next_date(dt, mcount, day=None): dt = getdate(dt) dt += relativedelta(months=mcount, day=day) return dt -def get_days(schedule_date, auto_repeat_doc): - if auto_repeat_doc.frequency == "Weekly": - days = get_offset_for_weekly_frequency(schedule_date, auto_repeat_doc) - else: - # daily frequency - days = 1 - - return days - - -def get_offset_for_weekly_frequency(schedule_date, auto_repeat_doc): - # if weekdays are not set, offset is 7 from current schedule date - if not auto_repeat_doc.repeat_on_days: - return 7 - - repeat_on_days = get_auto_repeat_days(auto_repeat_doc) - current_schedule_day = getdate(schedule_date).weekday() - weekdays = list(week_map.keys()) - - # if repeats on more than 1 day or - # start date's weekday is not in repeat days, then get next weekday - # else offset is 7 - if len(repeat_on_days) > 1 or weekdays[current_schedule_day] not in repeat_on_days: - weekday = get_next_weekday(current_schedule_day, repeat_on_days) - next_weekday_number = week_map.get(weekday) - # offset for upcoming weekday - return timedelta((7 + next_weekday_number - current_schedule_day) % 7).days - return 7 - - def get_next_weekday(current_schedule_day, weekdays): days = list(week_map.keys()) if current_schedule_day > 0: @@ -381,10 +378,6 @@ def get_next_weekday(current_schedule_day, weekdays): return entry -def get_auto_repeat_days(doc): - return [d.day for d in doc.get('repeat_on_days', [])] - - #called through hooks def make_auto_repeat_entry(): enqueued_method = 'frappe.automation.doctype.auto_repeat.auto_repeat.create_repeated_entries' @@ -405,7 +398,7 @@ def create_repeated_entries(data): if schedule_date == current_date and not doc.disabled: doc.create_documents() - schedule_date = get_next_schedule_date(schedule_date=schedule_date, auto_repeat_doc=doc) + schedule_date = doc.get_next_schedule_date(schedule_date=schedule_date) if schedule_date and not doc.disabled: frappe.db.set_value('Auto Repeat', doc.name, 'next_schedule_date', schedule_date) diff --git a/frappe/automation/doctype/auto_repeat/test_auto_repeat.py b/frappe/automation/doctype/auto_repeat/test_auto_repeat.py index a9bfbb1cf8..0d6229cd9e 100644 --- a/frappe/automation/doctype/auto_repeat/test_auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/test_auto_repeat.py @@ -7,11 +7,9 @@ import unittest import frappe from frappe.custom.doctype.custom_field.custom_field import create_custom_field -from frappe.automation.doctype.auto_repeat.auto_repeat import get_auto_repeat_entries, create_repeated_entries +from frappe.automation.doctype.auto_repeat.auto_repeat import get_auto_repeat_entries, create_repeated_entries, week_map from frappe.utils import today, add_days, getdate, add_months -week_map = {'Monday': 0, 'Tuesday': 1, 'Wednesday': 2, 'Thursday': 3, 'Friday': 4, 'Saturday': 5, 'Sunday': 6} - def add_custom_fields(): df = dict( fieldname='auto_repeat', label='Auto Repeat', fieldtype='Link', insert_after='sender', From 56302986036a367c86d38445a59116928f826624 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 11 Dec 2020 12:34:09 +0530 Subject: [PATCH 229/259] fix: Reload server script via patch (#12076) --- frappe/patches.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/patches.txt b/frappe/patches.txt index 0daf29e001..b459019dd7 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -21,6 +21,7 @@ execute:frappe.reload_doc('email', 'doctype', 'document_follow') execute:frappe.reload_doc('core', 'doctype', 'communication_link') #2019-10-02 execute:frappe.reload_doc('core', 'doctype', 'has_role') execute:frappe.reload_doc('core', 'doctype', 'communication') #2019-10-02 +execute:frappe.reload_doc('core', 'doctype', 'server_script') frappe.patches.v11_0.replicate_old_user_permissions frappe.patches.v11_0.reload_and_rename_view_log #2019-01-03 frappe.patches.v7_1.rename_scheduler_log_to_error_log From 5f708fa160ef9df5553aca0eb7292539ccb07cac Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 11 Dec 2020 12:47:16 +0530 Subject: [PATCH 230/259] feat: cache bench apps --- frappe/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index c5f13f2295..2bab1cd294 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -348,7 +348,7 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, as_list=False, if as_table and type(msg) in (list, tuple): out.as_table = 1 - + if as_list and type(msg) in (list, tuple) and len(msg) > 1: out.as_list = 1 @@ -939,7 +939,11 @@ def get_installed_apps(sort=False, frappe_last=False): connect() if not local.all_apps: - local.all_apps = get_all_apps(True) + local.all_apps = cache().get_value('all_apps', get_all_apps) + + #cache bench apps + if not cache().get_value('all_apps'): + cache().set_value('all_apps', local.all_apps) installed = json.loads(db.get_global("installed_apps") or "[]") From 881c42629650837dc05940fb45167b399d8fb6a1 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 14 Dec 2020 11:39:21 +0530 Subject: [PATCH 231/259] fix: typo --- frappe/printing/doctype/print_format/print_format.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/printing/doctype/print_format/print_format.json b/frappe/printing/doctype/print_format/print_format.json index 6e64e802c9..3a47fb554f 100644 --- a/frappe/printing/doctype/print_format/print_format.json +++ b/frappe/printing/doctype/print_format/print_format.json @@ -201,17 +201,17 @@ { "default": "0", "depends_on": "doc_type", - "description": "If checked, negative numberic values of Currency, Quantity or Count would be shown as positive", + "description": "If checked, negative numeric values of Currency, Quantity or Count would be shown as positive", "fieldname": "absolute_value", "fieldtype": "Check", - "label": "Show absolute values" + "label": "Show Absolute Values" } ], "icon": "fa fa-print", "idx": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2020-12-10 18:58:55.598269", + "modified": "2020-12-14 11:38:49.132061", "modified_by": "Administrator", "module": "Printing", "name": "Print Format", From 9e4e36041ae2ec5e0c85a3ae929a716626f09312 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 14 Dec 2020 11:48:10 +0530 Subject: [PATCH 232/259] fix: toggling of show absolute values checkbox --- frappe/printing/doctype/print_format/print_format.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/printing/doctype/print_format/print_format.js b/frappe/printing/doctype/print_format/print_format.js index 9ef5652dda..786f8f97ab 100644 --- a/frappe/printing/doctype/print_format/print_format.js +++ b/frappe/printing/doctype/print_format/print_format.js @@ -66,7 +66,7 @@ frappe.ui.form.on("Print Format", { hide_absolute_value_field: function (frm) { // TODO: make it work with frm.doc.doc_type // Problem: frm isn't updated in some random cases - const doctype = locals[frm.doc.doctype][frm.doc.name]; + const doctype = locals[frm.doc.doctype][frm.doc.name].doc_type; if (doctype) { frappe.model.with_doctype(doctype, () => { const meta = frappe.get_meta(doctype); From 8c539743cf5ad77cc8cb2dd42034b7d5ef4cc5ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Dec 2020 08:18:58 +0000 Subject: [PATCH 233/259] chore(deps): bump ini from 1.3.5 to 1.3.8 Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8. - [Release notes](https://github.com/isaacs/ini/releases) - [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 26797675c6..e0383afccb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2918,9 +2918,9 @@ inherits@2.0.3: integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== inquirer@^7.3.3: version "7.3.3" From 7a773d24611fa259749da0b0190a88e9d4590f62 Mon Sep 17 00:00:00 2001 From: conncampbell Date: Sun, 8 Nov 2020 10:02:35 -0700 Subject: [PATCH 234/259] feat: Workflow transition condition allows datetime functions --- frappe/model/workflow.py | 10 ++++++++-- .../workflow_transition/workflow_transition.json | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/frappe/model/workflow.py b/frappe/model/workflow.py index 72ce8c9ce4..d0206a9f60 100644 --- a/frappe/model/workflow.py +++ b/frappe/model/workflow.py @@ -53,14 +53,20 @@ def get_transitions(doc, workflow = None, raise_exception=False): return transitions def get_workflow_safe_globals(): - # access to frappe.db.get_value and frappe.db.get_list + # access to frappe.db.get_value, frappe.db.get_list, and date time utils. return dict( frappe=frappe._dict( db=frappe._dict( get_value=frappe.db.get_value, get_list=frappe.db.get_list ), - session=frappe.session + session=frappe.session, + utils=frappe._dict( + now_datetime=frappe.utils.now_datetime, + add_to_date=frappe.utils.add_to_date, + get_datetime=frappe.utils.get_datetime, + now=frappe.utils.now + ) ) ) diff --git a/frappe/workflow/doctype/workflow_transition/workflow_transition.json b/frappe/workflow/doctype/workflow_transition/workflow_transition.json index 8bc06bf18a..5e5cec5880 100644 --- a/frappe/workflow/doctype/workflow_transition/workflow_transition.json +++ b/frappe/workflow/doctype/workflow_transition/workflow_transition.json @@ -295,7 +295,7 @@ "label": "Example", "length": 0, "no_copy": 0, - "options": "
    doc.grand_total > 0
    \n\n

    Conditions should be written in simple Python. Please use properties available in the form only.

    ", + "options": "
    doc.grand_total > 0
    \n\n

    Conditions should be written in simple Python. Please use properties available in the form only.

    \n

    Allowed functions: \n

      \n
    • frappe.db.get_value
      • \n
    • frappe.db.get_list
      • \n
    • frappe.session
      • \n
    • frappe.utils.now_datetime
      • \n
    • frappe.utils.get_datetime
      • \n
    • frappe.utils.add_to_date
      • \n
    • frappe.utils.now
      • \n
    \n

    Example: 

    doc.creation > frappe.utils.add_to_date(frappe.utils.now_datetime(), days=-5, as_string=True, as_datetime=True)

    ", "permlevel": 0, "precision": "", "print_hide": 0, @@ -320,7 +320,7 @@ "issingle": 0, "istable": 1, "max_attachments": 0, - "modified": "2018-10-09 10:28:53.294908", + "modified": "2020-11-08 12:11:00.294908", "modified_by": "Administrator", "module": "Workflow", "name": "Workflow Transition", From 06fcb822054d364089646eb947b431180852a46f Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 15 Dec 2020 12:35:30 +0530 Subject: [PATCH 235/259] fix: call init_callback after set_route --- frappe/public/js/frappe/form/quick_entry.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js index 0a489e26d6..eed49e070b 100644 --- a/frappe/public/js/frappe/form/quick_entry.js +++ b/frappe/public/js/frappe/form/quick_entry.js @@ -35,14 +35,15 @@ frappe.ui.form.QuickEntryForm = Class.extend({ if (this.is_quick_entry() || this.force) { this.render_dialog(); resolve(this); - } else { // No quick entry, use full Form - // but still give callback a shot at the doc - if (this.init_callback) { - this.init_callback(this.doc); - } + } else { + // no quick entry, open full form frappe.quick_entry = null; frappe.set_route('Form', this.doctype, this.doc.name) .then(() => resolve(this)); + // call init_callback for consistency + if (this.init_callback) { + this.init_callback(this.doc); + } } }); }); From 8ef2f7ed1896f7a055e42b456bba8152a69ac1a7 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 15 Dec 2020 13:54:27 +0530 Subject: [PATCH 236/259] style: Re-format and use const instead of var --- frappe/public/js/frappe/form/formatters.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index f163f59171..f9a1d0b643 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -50,7 +50,14 @@ frappe.form.formatters = { return frappe.form.formatters._right(value==null ? "" : cint(value), options) }, Percent: function(value, docfield, options) { - var precision = docfield.precision || cint(frappe.boot.sysdefaults && frappe.boot.sysdefaults.float_precision) || 2; + const precision = ( + docfield.precision + || cint( + frappe.boot.sysdefaults + && frappe.boot.sysdefaults.float_precision + ) + || 2 + ); return frappe.form.formatters._right(flt(value, precision) + "%", options); }, Rating: function(value) { From 2d8550619d2701b2d5230e33457db1a21b6249d3 Mon Sep 17 00:00:00 2001 From: marination Date: Tue, 15 Dec 2020 16:04:16 +0530 Subject: [PATCH 237/259] fix: Reset frappe.flag.link_fields in test - Reset frappe.flag.link_fields in rename doctype tests - Teardown doctypes appropriately after test --- frappe/tests/test_rename_doc.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/tests/test_rename_doc.py b/frappe/tests/test_rename_doc.py index fb0776a485..0f094749d0 100644 --- a/frappe/tests/test_rename_doc.py +++ b/frappe/tests/test_rename_doc.py @@ -55,6 +55,8 @@ class TestRenameDoc(unittest.TestCase): frappe.delete_doc("DocType", dt) frappe.db.sql_ddl(f"DROP TABLE IF EXISTS `tab{dt}`") + frappe.delete_doc_if_exists("Renamed Doc", "ToDo") + def test_rename_doc(self): """Rename an existing document via frappe.rename_doc""" old_name = choice(self.available_documents) @@ -87,6 +89,7 @@ class TestRenameDoc(unittest.TestCase): # check if module exists exists; # if custom, get_controller will return Document class # if not custom, a different class will be returned + frappe.flags.link_fields = {} self.assertNotEqual(get_controller(self.doctype.old), frappe.model.document.Document) old_doctype_path = get_doc_path("Custom", "DocType", self.doctype.old) @@ -103,6 +106,7 @@ class TestRenameDoc(unittest.TestCase): """Rename DocType via frappe.rename_doc""" from frappe.core.doctype.doctype.test_doctype import new_doctype + frappe.flags.link_fields = {} if not frappe.db.exists("DocType", "Rename This"): new_doctype( "Rename This", @@ -140,5 +144,7 @@ class TestRenameDoc(unittest.TestCase): new_name, frappe.rename_doc("Renamed Doc", old_name, new_name, force=True) ) - frappe.delete_doc_if_exists("Renamed Doc", "ToDo") + # delete_doc doesnt drop tables + # this is done to bypass inconsistencies in the db frappe.delete_doc_if_exists("DocType", "Renamed Doc") + frappe.db.sql_ddl("drop table if exists `tabRenamed Doc`") \ No newline at end of file From 9d75094ba9f5d5c32e98eca56123d8f1b8674d3e Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 15 Dec 2020 19:06:42 +0530 Subject: [PATCH 238/259] chore: Move reset flags to setup method Reason for unsetting flags in setUp: 1. frappe.flags.whatever is reset in each request...since it's a werzeug local (ref: https://werkzeug.palletsprojects.com/en/1.0.x/local/) 2. so until it is in the context of current request, it has the same value 3. when you call rename_doc via a request, it's flags are forgotten post that 4. but in a test suite, the whole module's tests run in a single process and the flags aren't (un|re)set 5. which is why frappe.flags.whatever has the same value throughout this module's tests --- frappe/tests/test_rename_doc.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/tests/test_rename_doc.py b/frappe/tests/test_rename_doc.py index 0f094749d0..9aa175d2d4 100644 --- a/frappe/tests/test_rename_doc.py +++ b/frappe/tests/test_rename_doc.py @@ -57,6 +57,10 @@ class TestRenameDoc(unittest.TestCase): frappe.delete_doc_if_exists("Renamed Doc", "ToDo") + def setUp(self): + frappe.flags.link_fields = {} + super().setUp() + def test_rename_doc(self): """Rename an existing document via frappe.rename_doc""" old_name = choice(self.available_documents) @@ -89,7 +93,6 @@ class TestRenameDoc(unittest.TestCase): # check if module exists exists; # if custom, get_controller will return Document class # if not custom, a different class will be returned - frappe.flags.link_fields = {} self.assertNotEqual(get_controller(self.doctype.old), frappe.model.document.Document) old_doctype_path = get_doc_path("Custom", "DocType", self.doctype.old) @@ -106,7 +109,6 @@ class TestRenameDoc(unittest.TestCase): """Rename DocType via frappe.rename_doc""" from frappe.core.doctype.doctype.test_doctype import new_doctype - frappe.flags.link_fields = {} if not frappe.db.exists("DocType", "Rename This"): new_doctype( "Rename This", @@ -144,7 +146,7 @@ class TestRenameDoc(unittest.TestCase): new_name, frappe.rename_doc("Renamed Doc", old_name, new_name, force=True) ) - # delete_doc doesnt drop tables + # delete_doc doesnt drop tables # this is done to bypass inconsistencies in the db frappe.delete_doc_if_exists("DocType", "Renamed Doc") - frappe.db.sql_ddl("drop table if exists `tabRenamed Doc`") \ No newline at end of file + frappe.db.sql_ddl("drop table if exists `tabRenamed Doc`") From f4f7e8e798940684cfbdb76d05ac7b88d6f4dce0 Mon Sep 17 00:00:00 2001 From: Snyk bot Date: Wed, 16 Dec 2020 07:04:07 +0200 Subject: [PATCH 239/259] chore(Snyk): Security upgrade frappe-charts from 1.5.4 to 1.5.5 (#12086) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d1a94d0e35..114de53384 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "driver.js": "^0.9.8", "express": "^4.17.1", "fast-deep-equal": "^2.0.1", - "frappe-charts": "^1.5.1", + "frappe-charts": "^1.5.5", "frappe-datatable": "^1.15.3", "frappe-gantt": "^0.5.0", "fuse.js": "^3.4.6", diff --git a/yarn.lock b/yarn.lock index e0383afccb..3f8eaa3d9d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2299,10 +2299,10 @@ fragment-cache@^0.2.1: dependencies: map-cache "^0.2.2" -frappe-charts@^1.5.1: - version "1.5.4" - resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-1.5.4.tgz#5870f77ac6ffc8ea4dab32adda1d4e5e4fbda64b" - integrity sha512-hBr7cRLmsCC5VBj/HwKOCgdwyXnkeAO5CAvOd5H4IYFbk84VD9jOjx9fSaqAE0MygVVbY1nCN+5nb08WThW4Xw== +frappe-charts@^1.5.5: + version "1.5.5" + resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-1.5.5.tgz#5f44a3639aecc6f8fc7d15752abc80bb68e26734" + integrity sha512-L9pJTsrSuRobS/EaBKT8i1x+DVOjkXyUwT85cteZAPqynU/7K+uqjQOy4tMSTv5zsTWJNWFJ37ax68T73YdR3g== frappe-datatable@^1.15.3: version "1.15.3" From 4c1756b3d633568500179c39066aeaa6da50962c Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 16 Dec 2020 11:29:05 +0530 Subject: [PATCH 240/259] fix: code clean-up and fallbacks for get method --- frappe/automation/doctype/auto_repeat/auto_repeat.js | 2 +- frappe/automation/doctype/auto_repeat/auto_repeat.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.js b/frappe/automation/doctype/auto_repeat/auto_repeat.js index e914ff27b0..c2c84692d8 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.js +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.js @@ -100,7 +100,7 @@ frappe.ui.form.on('Auto Repeat', { frappe.auto_repeat.render_schedule = function(frm) { if (!frm.is_dirty() && frm.doc.status !== 'Disabled') { - frm.call("get_auto_repeat_schedule").then((r) => { + frm.call("get_auto_repeat_schedule").then(r => { frm.dashboard.wrapper.empty(); frm.dashboard.add_section( frappe.render_template("auto_repeat_schedule", { diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index 1fd2cdf1b3..7dbbcdd05d 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -241,9 +241,9 @@ class AutoRepeat(Document): if not for_full_schedule: while getdate(next_date) < getdate(today()): if month_count: - month_count += month_map.get(self.frequency) + month_count += month_map.get(self.frequency, 0) next_date = get_next_date(self.start_date, month_count, day_count) - elif days: + else: days = self.get_days(next_date) next_date = add_days(next_date, days) @@ -272,7 +272,7 @@ class AutoRepeat(Document): # else offset is 7 if len(repeat_on_days) > 1 or weekdays[current_schedule_day] not in repeat_on_days: weekday = get_next_weekday(current_schedule_day, repeat_on_days) - next_weekday_number = week_map.get(weekday) + next_weekday_number = week_map.get(weekday, 0) # offset for upcoming weekday return timedelta((7 + next_weekday_number - current_schedule_day) % 7).days return 7 From 7d70e552aaa7bde72bc88a324b7c09d097f9718f Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 16 Dec 2020 12:09:10 +0530 Subject: [PATCH 241/259] chore: added a docstring for the get_next_schedule_date method --- frappe/automation/doctype/auto_repeat/auto_repeat.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index 7dbbcdd05d..830af68de7 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -219,6 +219,13 @@ class AutoRepeat(Document): new_doc.set('to_date', to_date) def get_next_schedule_date(self, schedule_date, for_full_schedule=False): + """ + Returns the next schedule date for auto repeat after a recurring document has been created. + Adds required offset to the schedule_date param and returns the next schedule date. + + :param schedule_date: The date when the last recurring document was created. + :param for_full_schedule: If True, returns the immediate next schedule date, else the full schedule. + """ if month_map.get(self.frequency): month_count = month_map.get(self.frequency) + month_diff(schedule_date, self.start_date) - 1 else: From ed01c67f543412fda99e747bf7d99b86320cb34c Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 16 Dec 2020 15:17:20 +0530 Subject: [PATCH 242/259] style: Black over updated diffs --- frappe/model/workflow.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/frappe/model/workflow.py b/frappe/model/workflow.py index d0206a9f60..43e26cc5d0 100644 --- a/frappe/model/workflow.py +++ b/frappe/model/workflow.py @@ -56,17 +56,14 @@ def get_workflow_safe_globals(): # access to frappe.db.get_value, frappe.db.get_list, and date time utils. return dict( frappe=frappe._dict( - db=frappe._dict( - get_value=frappe.db.get_value, - get_list=frappe.db.get_list - ), + db=frappe._dict(get_value=frappe.db.get_value, get_list=frappe.db.get_list), session=frappe.session, utils=frappe._dict( now_datetime=frappe.utils.now_datetime, add_to_date=frappe.utils.add_to_date, get_datetime=frappe.utils.get_datetime, - now=frappe.utils.now - ) + now=frappe.utils.now, + ), ) ) From aea6123348e78c17008d2a4104aacb0a3f55f42a Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 16 Dec 2020 17:39:29 +0530 Subject: [PATCH 243/259] chore: Drop unused? highlight.pack.js --- frappe/public/js/lib/highlight.pack.js | 1 - 1 file changed, 1 deletion(-) delete mode 100755 frappe/public/js/lib/highlight.pack.js diff --git a/frappe/public/js/lib/highlight.pack.js b/frappe/public/js/lib/highlight.pack.js deleted file mode 100755 index ecee8ad109..0000000000 --- a/frappe/public/js/lib/highlight.pack.js +++ /dev/null @@ -1 +0,0 @@ -var hljs=new function(){function e(e){return e.replace(/&/gm,"&").replace(//gm,">")}function t(e){return e.nodeName.toLowerCase()}function n(e,t){var n=e&&e.exec(t);return n&&0==n.index}function r(e){var t=(e.className+" "+(e.parentNode?e.parentNode.className:"")).split(/\s+/);return t=t.map(function(e){return e.replace(/^lang(uage)?-/,"")}),t.filter(function(e){return m(e)||/no(-?)highlight/.test(e)})[0]}function i(e,t){var n={};for(var r in e)n[r]=e[r];if(t)for(var r in t)n[r]=t[r];return n}function a(e){var n=[];return function r(e,i){for(var a=e.firstChild;a;a=a.nextSibling)3==a.nodeType?i+=a.nodeValue.length:1==a.nodeType&&(n.push({event:"start",offset:i,node:a}),i=r(a,i),t(a).match(/br|hr|img|input/)||n.push({event:"stop",offset:i,node:a}));return i}(e,0),n}function s(n,r,i){function a(){return n.length&&r.length?n[0].offset!=r[0].offset?n[0].offset"}function o(e){l+=""}function c(e){("start"==e.event?s:o)(e.node)}for(var u=0,l="",f=[];n.length||r.length;){var h=a();if(l+=e(i.substr(u,h[0].offset-u)),u=h[0].offset,h==n){f.reverse().forEach(o);do c(h.splice(0,1)[0]),h=a();while(h==n&&h.length&&h[0].offset==u);f.reverse().forEach(s)}else"start"==h[0].event?f.push(h[0].node):f.pop(),c(h.splice(0,1)[0])}return l+e(i.substr(u))}function o(e){function t(e){return e&&e.source||e}function n(n,r){return RegExp(t(n),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,s){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},c=function(t,n){e.cI&&(n=n.toLowerCase()),n.split(" ").forEach(function(e){var n=e.split("|");o[n[0]]=[t,n[1]?Number(n[1]):1]})};"string"==typeof a.k?c("keyword",a.k):Object.keys(a.k).forEach(function(e){c(e,a.k[e])}),a.k=o}a.lR=n(a.l||/\b[A-Za-z0-9_]+\b/,!0),s&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=n(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=n(a.e)),a.tE=t(a.e)||"",a.eW&&s.tE&&(a.tE+=(a.e?"|":"")+s.tE)),a.i&&(a.iR=n(a.i)),void 0===a.r&&(a.r=1),a.c||(a.c=[]);var u=[];a.c.forEach(function(e){e.v?e.v.forEach(function(t){u.push(i(e,t))}):u.push("self"==e?a:e)}),a.c=u,a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,s);var l=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(t).filter(Boolean);a.t=l.length?n(l.join("|"),!0):{exec:function(){return null}}}}r(e)}function c(t,r,i,a){function s(e,t){for(var r=0;r";return a+=e+'">',a+t+s}function p(){if(!w.k)return e(B);var t="",n=0;w.lR.lastIndex=0;for(var r=w.lR.exec(B);r;){t+=e(B.substr(n,r.index-n));var i=h(w,r);i?(y+=i[1],t+=g(i[0],e(r[0]))):t+=e(r[0]),n=w.lR.lastIndex,r=w.lR.exec(B)}return t+e(B.substr(n))}function v(){if(w.sL&&!E[w.sL])return e(B);var t=w.sL?c(w.sL,B,!0,L[w.sL]):u(B);return w.r>0&&(y+=t.r),"continuous"==w.subLanguageMode&&(L[w.sL]=t.top),g(t.language,t.value,!1,!0)}function b(){return void 0!==w.sL?v():p()}function d(t,n){var r=t.cN?g(t.cN,"",!0):"";t.rB?(M+=r,B=""):t.eB?(M+=e(n)+r,B=""):(M+=r,B=n),w=Object.create(t,{parent:{value:w}})}function R(t,n){if(B+=t,void 0===n)return M+=b(),0;var r=s(n,w);if(r)return M+=b(),d(r,n),r.rB?0:n.length;var i=l(w,n);if(i){var a=w;a.rE||a.eE||(B+=n),M+=b();do w.cN&&(M+="    "),y+=w.r,w=w.parent;while(w!=i.parent);return a.eE&&(M+=e(n)),B="",i.starts&&d(i.starts,""),a.rE?0:n.length}if(f(n,w))throw new Error('Illegal lexeme "'+n+'" for mode "'+(w.cN||"")+'"');return B+=n,n.length||1}var x=m(t);if(!x)throw new Error('Unknown language: "'+t+'"');o(x);for(var w=a||x,L={},M="",k=w;k!=x;k=k.parent)k.cN&&(M=g(k.cN,"",!0)+M);var B="",y=0;try{for(var C,I,j=0;;){if(w.t.lastIndex=j,C=w.t.exec(r),!C)break;I=R(r.substr(j,C.index-j),C[0]),j=C.index+I}R(r.substr(j));for(var k=w;k.parent;k=k.parent)k.cN&&(M+="    ");return{r:y,value:M,language:t,top:w}}catch(A){if(-1!=A.message.indexOf("Illegal"))return{r:0,value:e(r)};throw A}}function u(t,n){n=n||N.languages||Object.keys(E);var r={r:0,value:e(t)},i=r;return n.forEach(function(e){if(m(e)){var n=c(e,t,!1);n.language=e,n.r>i.r&&(i=n),n.r>r.r&&(i=r,r=n)}}),i.language&&(r.second_best=i),r}function l(e){return N.tabReplace&&(e=e.replace(/^((<[^>]+>|\t)+)/gm,function(e,t){return t.replace(/\t/g,N.tabReplace)})),N.useBR&&(e=e.replace(/\n/g,"
    ")),e}function f(e,t,n){var r=t?R[t]:n,i=[e.trim()];return e.match(/(\s|^)hljs(\s|$)/)||i.push("hljs"),r&&i.push(r),i.join(" ").trim()}function h(e){var t=r(e);if(!/no(-?)highlight/.test(t)){var n;N.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(//g,"\n")):n=e;var i=n.textContent,o=t?c(t,i,!0):u(i),h=a(n);if(h.length){var g=document.createElementNS("http://www.w3.org/1999/xhtml","div");g.innerHTML=o.value,o.value=s(h,a(g),i)}o.value=l(o.value),e.innerHTML=o.value,e.className=f(e.className,t,o.language),e.result={language:o.language,re:o.r},o.second_best&&(e.second_best={language:o.second_best.language,re:o.second_best.r})}}function g(e){N=i(N,e)}function p(){if(!p.called){p.called=!0;var e=document.querySelectorAll("pre code");Array.prototype.forEach.call(e,h)}}function v(){addEventListener("DOMContentLoaded",p,!1),addEventListener("load",p,!1)}function b(e,t){var n=E[e]=t(this);n.aliases&&n.aliases.forEach(function(t){R[t]=e})}function d(){return Object.keys(E)}function m(e){return E[e]||E[R[e]]}var N={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},E={},R={};this.highlight=c,this.highlightAuto=u,this.fixMarkup=l,this.highlightBlock=h,this.configure=g,this.initHighlighting=p,this.initHighlightingOnLoad=v,this.registerLanguage=b,this.listLanguages=d,this.getLanguage=m,this.inherit=i,this.IR="[a-zA-Z][a-zA-Z0-9_]*",this.UIR="[a-zA-Z_][a-zA-Z0-9_]*",this.NR="\\b\\d+(\\.\\d+)?",this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",this.BNR="\\b(0b[01]+)",this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",this.BE={b:"\\\\[\\s\\S]",r:0},this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE]},this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE]},this.PWM={b:/\b(a|an|the|are|I|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such)\b/},this.CLCM={cN:"comment",b:"//",e:"$",c:[this.PWM]},this.CBCM={cN:"comment",b:"/\\*",e:"\\*/",c:[this.PWM]},this.HCM={cN:"comment",b:"#",e:"$",c:[this.PWM]},this.NM={cN:"number",b:this.NR,r:0},this.CNM={cN:"number",b:this.CNR,r:0},this.BNM={cN:"number",b:this.BNR,r:0},this.CSSNM={cN:"number",b:this.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},this.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[this.BE,{b:/\[/,e:/\]/,r:0,c:[this.BE]}]},this.TM={cN:"title",b:this.IR,r:0},this.UTM={cN:"title",b:this.UIR,r:0}};hljs.registerLanguage("markdown",function(){return{aliases:["md","mkdown","mkd"],c:[{cN:"header",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"blockquote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"`.+?`"},{b:"^( {4}| )",e:"$",r:0}]},{cN:"horizontal_rule",b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"link_label",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link_url",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"link_reference",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:"^\\[.+\\]:",rB:!0,c:[{cN:"link_reference",b:"\\[",e:"\\]:",eB:!0,eE:!0,starts:{cN:"link_url",e:"$"}}]}]}});hljs.registerLanguage("javascript",function(r){return{aliases:["js"],k:{keyword:"in if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const class",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document"},c:[{cN:"pi",b:/^\s*('|")use strict('|")/,r:10},r.ASM,r.QSM,r.CLCM,r.CBCM,r.CNM,{b:"("+r.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[r.CLCM,r.CBCM,r.RM,{b:/;/,r:0,sL:"xml"}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[r.inherit(r.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,c:[r.CLCM,r.CBCM],i:/["'\(]/}],i:/\[|%/},{b:/\$[(.]/},{b:"\\."+r.IR,r:0}]}});hljs.registerLanguage("json",function(e){var t={literal:"true false null"},i=[e.QSM,e.CNM],l={cN:"value",e:",",eW:!0,eE:!0,c:i,k:t},c={b:"{",e:"}",c:[{cN:"attribute",b:'\\s*"',e:'"\\s*:\\s*',eB:!0,eE:!0,c:[e.BE],i:"\\n",starts:l}],i:"\\S"},n={b:"\\[",e:"\\]",c:[e.inherit(l,{cN:null})],i:"\\S"};return i.splice(i.length,0,c,n),{c:i,k:t,i:"\\S"}});hljs.registerLanguage("python",function(e){var r={cN:"prompt",b:/^(>>>|\.\.\.) /},b={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[r],r:10},{b:/(u|b)?r?"""/,e:/"""/,c:[r],r:10},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},e.ASM,e.QSM]},i={cN:"number",r:0,v:[{b:e.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:e.CNR+"[lLjJ]?"}]},l={cN:"params",b:/\(/,e:/\)/,c:["self",r,i,b]},n={e:/:/,i:/[${=;\n]/,c:[e.UTM,l]};return{aliases:["py","gyp"],k:{keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda nonlocal|10 None True False",built_in:"Ellipsis NotImplemented"},i:/(<\/|->|\?)/,c:[r,i,b,e.HCM,e.inherit(n,{cN:"function",bK:"def",r:10}),e.inherit(n,{cN:"class",bK:"class"}),{cN:"decorator",b:/@/,e:/$/},{b:/\b(print|exec)\(/}]}});hljs.registerLanguage("xml",function(){var t="[A-Za-z0-9\\._:-]+",e={b:/<\?(php)?(?!\w)/,e:/\?>/,sL:"php",subLanguageMode:"continuous"},c={eW:!0,i:/]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xsl","plist"],cI:!0,c:[{cN:"doctype",b:"",r:10,c:[{b:"\\[",e:"\\]"}]},{cN:"comment",b:"",r:10},{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"|$)",e:">",k:{title:"style"},c:[c],starts:{e:"",rE:!0,sL:"css"}},{cN:"tag",b:"|$)",e:">",k:{title:"script"},c:[c],starts:{e:"",rE:!0,sL:"javascript"}},e,{cN:"pi",b:/<\?\w+/,e:/\?>/,r:10},{cN:"tag",b:"",c:[{cN:"title",b:/[^ \/><\n\t]+/,r:0},c]}]}});hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",a={cN:"function",b:c+"\\(",rB:!0,eE:!0,e:"\\("};return{cI:!0,i:"[=/|']",c:[e.CBCM,{cN:"id",b:"\\#[A-Za-z0-9_-]+"},{cN:"class",b:"\\.[A-Za-z0-9_-]+",r:0},{cN:"attr_selector",b:"\\[",e:"\\]",i:"$"},{cN:"pseudo",b:":(:)?[a-zA-Z0-9\\_\\-\\+\\(\\)\\\"\\']+"},{cN:"at_rule",b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{cN:"at_rule",b:"@",e:"[{;]",c:[{cN:"keyword",b:/\S+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[a,e.ASM,e.QSM,e.CSSNM]}]},{cN:"tag",b:c,r:0},{cN:"rules",b:"{",e:"}",i:"[^\\s]",r:0,c:[e.CBCM,{cN:"rule",b:"[^\\s]",rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:"[A-Z\\_\\.\\-]+",e:":",eE:!0,i:"[^\\s]",starts:{cN:"value",eW:!0,eE:!0,c:[a,e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"hexcolor",b:"#[0-9A-Fa-f]+"},{cN:"important",b:"!important"}]}}]}]}]}}); \ No newline at end of file From 00255a4c9e8e2829a15b27c1fe1a40bfbd9f95d0 Mon Sep 17 00:00:00 2001 From: Himanshu Date: Wed, 16 Dec 2020 17:40:18 +0530 Subject: [PATCH 244/259] fix: strip html before checking for null values Co-authored-by: Sahil Khan --- frappe/public/js/frappe/ui/field_group.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/field_group.js b/frappe/public/js/frappe/ui/field_group.js index d432e553f1..393f2af154 100644 --- a/frappe/public/js/frappe/ui/field_group.js +++ b/frappe/public/js/frappe/ui/field_group.js @@ -86,7 +86,7 @@ frappe.ui.FieldGroup = frappe.ui.form.Layout.extend({ var f = this.fields_dict[key]; if (f.get_value) { var v = f.get_value(); - if (f.df.reqd && is_null(v)) + if(f.df.reqd && is_null(strip_html(v))) errors.push(__(f.df.label)); if (f.df.reqd From c876cdc63e256b2e281c931c5fb17974fb56f6d1 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 16 Dec 2020 19:04:59 +0530 Subject: [PATCH 245/259] fix: Update controllers via delete_doc and rename_doc only in developer_mode --- frappe/core/doctype/doctype/doctype.py | 1 - frappe/model/delete_doc.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index a4d53351d6..3e283e1699 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -296,7 +296,6 @@ class DocType(Document): and ( frappe.conf.developer_mode or frappe.flags.allow_doctype_export - or frappe.flags.in_test ) ) if allow_doctype_export: diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index f8344f014c..15de673e4b 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -76,7 +76,7 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa delete_from_table(doctype, name, ignore_doctypes, None) - if not doc.custom and not ( + if frappe.conf.developer_mode and not doc.custom and not ( for_reload or frappe.flags.in_migrate or frappe.flags.in_install From bd7ff5277cbad85f7b26a4b20159439f49b46a1a Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 16 Dec 2020 19:27:02 +0530 Subject: [PATCH 246/259] fix(hljs): Import core instead of highlight ref: https://unpkg.com/browse/highlight.js@10.4.1/lib/highlight.js --- frappe/website/js/syntax_highlight.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/js/syntax_highlight.js b/frappe/website/js/syntax_highlight.js index 199174b1e5..80914d9d99 100644 --- a/frappe/website/js/syntax_highlight.js +++ b/frappe/website/js/syntax_highlight.js @@ -1,4 +1,4 @@ -const hljs = require('highlight.js/lib/highlight'); +const hljs = require('highlight.js/lib/core'); hljs.registerLanguage('javascript', require('highlight.js/lib/languages/javascript')); hljs.registerLanguage('python', require('highlight.js/lib/languages/python')); From 2b4299a10524723c84b353d4621de87b0f7180d3 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 16 Dec 2020 19:10:37 +0530 Subject: [PATCH 247/259] test: Set frappe.conf.developer_mode for test_rename_doc --- frappe/tests/test_rename_doc.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frappe/tests/test_rename_doc.py b/frappe/tests/test_rename_doc.py index 9aa175d2d4..58cc5bb125 100644 --- a/frappe/tests/test_rename_doc.py +++ b/frappe/tests/test_rename_doc.py @@ -14,6 +14,10 @@ class TestRenameDoc(unittest.TestCase): @classmethod def setUpClass(self): """Setting Up data for the tests defined under TestRenameDoc""" + # set developer_mode to rename doc controllers + self._original_developer_flag = frappe.conf.developer_mode + frappe.conf.developer_mode = 1 + # data generation: for base and merge tests self.available_documents = [] self.test_doctype = "ToDo" @@ -57,6 +61,9 @@ class TestRenameDoc(unittest.TestCase): frappe.delete_doc_if_exists("Renamed Doc", "ToDo") + # reset original value of developer_mode conf + frappe.conf.developer_mode = self._original_developer_flag + def setUp(self): frappe.flags.link_fields = {} super().setUp() From 72c25d28b33075ee024f45c203dd83b79f02aeb4 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Thu, 17 Dec 2020 17:37:22 +0530 Subject: [PATCH 248/259] fix: Improve breadrumbs markup schema for website --- frappe/templates/includes/breadcrumbs.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/templates/includes/breadcrumbs.html b/frappe/templates/includes/breadcrumbs.html index e281c4b111..61c03201bc 100644 --- a/frappe/templates/includes/breadcrumbs.html +++ b/frappe/templates/includes/breadcrumbs.html @@ -6,12 +6,12 @@ {% for parent in parents %}
  • - {{ parent.title or parent.label or parent.name or "" }} + {{ parent.title or parent.label or parent.name or "" }}
    • {% endfor %} -
  • +
  • {{ title or "" }}
    • From c873c36971313997ecfb5ddbb025b1d43fc89a4a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 17 Dec 2020 13:12:49 +0530 Subject: [PATCH 249/259] feat(minor): add before_commit methods --- frappe/__init__.py | 1 + frappe/database/database.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/frappe/__init__.py b/frappe/__init__.py index 276e296cd3..9958ae9700 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -148,6 +148,7 @@ def init(site, sites_path=None, new_site=False): "new_site": new_site }) local.rollback_observers = [] + local.before_commit = [] local.test_objects = {} local.site = site diff --git a/frappe/database/database.py b/frappe/database/database.py index 616dd3c3ec..179206a4af 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -746,6 +746,9 @@ class Database(object): def commit(self): """Commit current transaction. Calls SQL `COMMIT`.""" + for method in frappe.local.before_commit: + frappe.call(method[0], *(method[1] or []), **(method[2] or {})) + self.sql("commit") frappe.local.rollback_observers = [] @@ -753,6 +756,9 @@ class Database(object): enqueue_jobs_after_commit() flush_local_link_count() + def add_before_commit(self, method, args=None, kwargs=None): + frappe.local.before_commit.append([method, args, kwargs]) + @staticmethod def flush_realtime_log(): for args in frappe.local.realtime_log: From 41a3b8c2842ff066194970cffb2fa8cb446e9246 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Thu, 17 Dec 2020 20:44:23 +0530 Subject: [PATCH 250/259] fix(workflow): Update modified timestamp (#12093) To sync changes in https://github.com/frappe/frappe/pull/11787 after migrate --- frappe/workflow/doctype/workflow/workflow.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/workflow/doctype/workflow/workflow.json b/frappe/workflow/doctype/workflow/workflow.json index 3cb72d0eed..e8db8dcb10 100644 --- a/frappe/workflow/doctype/workflow/workflow.json +++ b/frappe/workflow/doctype/workflow/workflow.json @@ -99,7 +99,7 @@ "icon": "fa fa-random", "idx": 1, "links": [], - "modified": "2020-07-16 04:29:20.898040", + "modified": "2020-12-17 20:35:16.898040", "modified_by": "Administrator", "module": "Workflow", "name": "Workflow", From 018e45fdcc9c73187ad27c6972376e75821aa4c9 Mon Sep 17 00:00:00 2001 From: sahil28297 <37302950+sahil28297@users.noreply.github.com> Date: Fri, 18 Dec 2020 00:13:49 +0530 Subject: [PATCH 251/259] chore: add space after if keyword --- frappe/public/js/frappe/ui/field_group.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/field_group.js b/frappe/public/js/frappe/ui/field_group.js index 393f2af154..67aeb4474e 100644 --- a/frappe/public/js/frappe/ui/field_group.js +++ b/frappe/public/js/frappe/ui/field_group.js @@ -86,7 +86,7 @@ frappe.ui.FieldGroup = frappe.ui.form.Layout.extend({ var f = this.fields_dict[key]; if (f.get_value) { var v = f.get_value(); - if(f.df.reqd && is_null(strip_html(v))) + if (f.df.reqd && is_null(strip_html(v))) errors.push(__(f.df.label)); if (f.df.reqd From afa8a744970985b60583e158f781c9262123422e Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 17 Dec 2020 10:59:47 +0530 Subject: [PATCH 252/259] fix: rendering of percentage stat --- .../js/frappe/widgets/number_card_widget.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js index c41f9bc6e7..ccc9ea7bfd 100644 --- a/frappe/public/js/frappe/widgets/number_card_widget.js +++ b/frappe/public/js/frappe/widgets/number_card_widget.js @@ -172,7 +172,7 @@ export default class NumberCardWidget extends Widget { get_number_for_custom_card(res) { if (typeof res === 'object') { this.number = res.value; - this.get_formatted_number(res); + this.set_formatted_number(res); } else { this.formatted_number = res; } @@ -184,7 +184,7 @@ export default class NumberCardWidget extends Widget { return frappe.model.with_doctype(this.card_doc.document_type, () => { const based_on_df = frappe.meta.get_docfield(this.card_doc.document_type, this.card_doc.aggregate_function_based_on); - this.get_formatted_number(based_on_df); + this.set_formatted_number(based_on_df); }); } else { this.formatted_number = res; @@ -199,10 +199,10 @@ export default class NumberCardWidget extends Widget { }, []); const col = res.columns.find(col => col.fieldname == field); this.number = frappe.report_utils.get_result_of_fn(this.card_doc.report_function, vals); - this.get_formatted_number(col); + this.set_formatted_number(col); } - get_formatted_number(df) { + set_formatted_number(df) { const default_country = frappe.sys_defaults.country; const shortened_number = frappe.utils.shorten_number(this.number, default_country, 5); let number_parts = shortened_number.split(' '); @@ -250,10 +250,16 @@ export default class NumberCardWidget extends Widget { }; const stats_qualifier = stats_qualifier_map[this.card_doc.stats_time_interval]; + let get_stat = () => { + const parts = this.percentage_stat.split(' '); + const symbol = parts[1] || ''; + return Math.abs(parts[0]) + ' ' + symbol; + }; + $(this.body).find('.widget-content').append(`
    ${caret_html} - ${Math.abs(this.percentage_stat)} % + ${get_stat()} % ${stats_qualifier} From a6705135dcb8679d3f82deacf1cd93476182d867 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Sat, 19 Dec 2020 08:49:14 +0530 Subject: [PATCH 253/259] fix: Link attachment in webform for new file (bp #12097) (#12102) (cherry picked from commit 85d6a640358fa0337aaac405e71b7d14395fb298) Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/public/js/frappe/web_form/web_form.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js index 4dc1a50bc4..0421147d49 100644 --- a/frappe/public/js/frappe/web_form/web_form.js +++ b/frappe/public/js/frappe/web_form/web_form.js @@ -103,6 +103,7 @@ export default class WebForm extends frappe.ui.FieldGroup { } save() { + let is_new = this.is_new; if (this.validate && !this.validate()) { frappe.throw(__("Couldn't save, please check the data you have entered"), __("Validation Error")); } @@ -139,6 +140,18 @@ export default class WebForm extends frappe.ui.FieldGroup { this.handle_success(response.message); frappe.web_form.events.trigger('after_save'); this.after_save && this.after_save(); + // args doctype and docname added to link doctype in file manager + if (is_new) { + frappe.call({ + type: 'POST', + method: "frappe.handler.upload_file", + args: { + file_url: response.message.attachment, + doctype: response.message.doctype, + docname: response.message.name + } + }); + } } }, always: function() { From 5a77383aa8ec771e1bc55a23ac2ec95a53920753 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sat, 19 Dec 2020 13:19:07 +0530 Subject: [PATCH 254/259] fix: donot remove the modules from txt file if developer mode is off --- frappe/core/doctype/module_def/module_def.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/module_def/module_def.py b/frappe/core/doctype/module_def/module_def.py index 930c46e60b..7e63572162 100644 --- a/frappe/core/doctype/module_def/module_def.py +++ b/frappe/core/doctype/module_def/module_def.py @@ -43,7 +43,7 @@ class ModuleDef(Document): def on_trash(self): """Delete module name from modules.txt""" - if frappe.flags.in_uninstall or self.custom: + if not frappe.conf.get('developer_mode') or frappe.flags.in_uninstall or self.custom: return modules = None From f4ba3e7c0a9dc91cf80fa5e1c8b0ab354fe2128f Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 22 Dec 2020 12:42:58 +0530 Subject: [PATCH 255/259] fix: Update breadcrumb markup schema --- frappe/templates/includes/breadcrumbs.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frappe/templates/includes/breadcrumbs.html b/frappe/templates/includes/breadcrumbs.html index 61c03201bc..ccc77de253 100644 --- a/frappe/templates/includes/breadcrumbs.html +++ b/frappe/templates/includes/breadcrumbs.html @@ -3,16 +3,20 @@ From 3db2fd2c9f24155edc8651f3b35a2bc3e731dae2 Mon Sep 17 00:00:00 2001 From: Abhishek Balam Date: Wed, 23 Dec 2020 21:37:24 +0530 Subject: [PATCH 256/259] fix: Email Section label typo --- frappe/core/doctype/system_settings/system_settings.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json index 79fb84923a..7443c1b34a 100644 --- a/frappe/core/doctype/system_settings/system_settings.json +++ b/frappe/core/doctype/system_settings/system_settings.json @@ -1,4 +1,4 @@ -{ +"label": "EMail"{ "actions": [], "creation": "2014-04-17 16:53:52.640856", "doctype": "DocType", @@ -357,7 +357,7 @@ "collapsible": 1, "fieldname": "email", "fieldtype": "Section Break", - "label": "EMail" + "label": "Email" }, { "description": "Your organization name and address for the email footer.", @@ -490,4 +490,4 @@ "sort_field": "modified", "sort_order": "ASC", "track_changes": 1 -} \ No newline at end of file +} From f38615585b924b9781f1da6e7c02de97b7809c09 Mon Sep 17 00:00:00 2001 From: Abhishek Balam Date: Wed, 23 Dec 2020 21:38:43 +0530 Subject: [PATCH 257/259] fix:email section typo --- frappe/core/doctype/system_settings/system_settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json index 7443c1b34a..565ee373f1 100644 --- a/frappe/core/doctype/system_settings/system_settings.json +++ b/frappe/core/doctype/system_settings/system_settings.json @@ -1,4 +1,4 @@ -"label": "EMail"{ +{ "actions": [], "creation": "2014-04-17 16:53:52.640856", "doctype": "DocType", From bc9d6cff2e2a3be17101f0957f771ab9e4f5b377 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 24 Dec 2020 18:36:59 +0530 Subject: [PATCH 258/259] fix(patch): Remove Package Publish Tool doctypes (#12113) --- frappe/patches.txt | 1 + frappe/patches/v13_0/delete_package_publish_tool.py | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 frappe/patches/v13_0/delete_package_publish_tool.py diff --git a/frappe/patches.txt b/frappe/patches.txt index b459019dd7..1a086303ba 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -317,3 +317,4 @@ frappe.patches.v13_0.web_template_set_module #2020-10-05 frappe.patches.v13_0.remove_custom_link execute:frappe.delete_doc("DocType", "Footer Item") frappe.patches.v13_0.replace_field_target_with_open_in_new_tab +frappe.patches.v13_0.delete_package_publish_tool diff --git a/frappe/patches/v13_0/delete_package_publish_tool.py b/frappe/patches/v13_0/delete_package_publish_tool.py new file mode 100644 index 0000000000..25024f58dd --- /dev/null +++ b/frappe/patches/v13_0/delete_package_publish_tool.py @@ -0,0 +1,11 @@ +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt + +from __future__ import unicode_literals +import frappe + + +def execute(): + frappe.delete_doc("DocType", "Package Publish Tool", ignore_missing=True) + frappe.delete_doc("DocType", "Package Document Type", ignore_missing=True) + frappe.delete_doc("DocType", "Package Publish Target", ignore_missing=True) From c982875b6a5490dc706d0c5412d5183c43ddb24f Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 28 Dec 2020 13:40:12 +0530 Subject: [PATCH 259/259] fix: Show cancel button only if document is cancellable --- frappe/model/workflow.py | 5 ++--- frappe/public/js/frappe/form/toolbar.js | 20 +++++++++++++++++--- frappe/public/js/frappe/form/workflow.js | 13 ++----------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/frappe/model/workflow.py b/frappe/model/workflow.py index 43e26cc5d0..3e8125f9b1 100644 --- a/frappe/model/workflow.py +++ b/frappe/model/workflow.py @@ -120,9 +120,8 @@ def apply_workflow(doc, action): return doc @frappe.whitelist() -def can_cancel_document(doc): - doc = frappe.get_doc(frappe.parse_json(doc)) - workflow = get_workflow(doc.doctype) +def can_cancel_document(doctype): + workflow = get_workflow(doctype) for state_doc in workflow.states: if state_doc.doc_status == '2': for transition in workflow.transitions: diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js index c7fb69a2b5..d8a2b91277 100644 --- a/frappe/public/js/frappe/form/toolbar.js +++ b/frappe/public/js/frappe/form/toolbar.js @@ -441,9 +441,23 @@ frappe.ui.form.Toolbar = Class.extend({ me.frm.page.set_view('main'); }, 'octicon octicon-pencil'); } else if(status === "Cancel") { - this.page.set_secondary_action(__(status), function() { - me.frm.savecancel(this); - }, "octicon octicon-circle-slash"); + let add_cancel_button = () => { + this.page.set_secondary_action(__(status), function() { + me.frm.savecancel(this); + }, "octicon octicon-circle-slash"); + }; + if (this.has_workflow()) { + frappe.xcall( + 'frappe.model.workflow.can_cancel_document', { + 'doctype': this.frm.doc.doctype, + }).then((can_cancel) => { + if (can_cancel) { + add_cancel_button(); + } + }); + } else { + add_cancel_button(); + } } else { var click = { "Save": function() { diff --git a/frappe/public/js/frappe/form/workflow.js b/frappe/public/js/frappe/form/workflow.js index 4c59e8219b..16d9f8676b 100644 --- a/frappe/public/js/frappe/form/workflow.js +++ b/frappe/public/js/frappe/form/workflow.js @@ -85,7 +85,7 @@ frappe.ui.form.States = Class.extend({ frappe.workflow.get_transitions(this.frm.doc).then(transitions => { this.frm.page.clear_actions_menu(); transitions.forEach(d => { - if(frappe.user_roles.includes(d.allowed) && has_approval_access(d)) { + if (frappe.user_roles.includes(d.allowed) && has_approval_access(d)) { added = true; me.frm.page.add_action_item(__(d.action), function() { // set the workflow_action for use in form scripts @@ -103,17 +103,8 @@ frappe.ui.form.States = Class.extend({ }); } }); - if (!added) { - //call function and clear cancel button if Cancel doc state is defined in the workfloe - frappe.xcall('frappe.model.workflow.can_cancel_document', {doc: this.frm.doc}).then((can_cancel) => { - if (!can_cancel) { - this.frm.page.clear_secondary_action(); - } - }); - } else { - this.setup_btn(added); - } + this.setup_btn(added); }); },