gnucash maint: Multiple changes pushed
John Ralls
jralls at code.gnucash.org
Sat Jun 12 20:25:23 EDT 2021
Updated via https://github.com/Gnucash/gnucash/commit/c2472936 (commit)
via https://github.com/Gnucash/gnucash/commit/b5e25b31 (commit)
via https://github.com/Gnucash/gnucash/commit/98369380 (commit)
from https://github.com/Gnucash/gnucash/commit/99712f58 (commit)
commit c2472936cabd14d84cb7ead23e2dd79a55d34c30
Merge: 99712f589 b5e25b31b
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Jun 12 17:16:14 2021 -0700
Merge TiangYing Xi's no-business-address into maint.
commit b5e25b31b78e2bc653c8ff040bfd402407a1cf57
Author: duguqiubailee <duguqiubailee at gmail.com>
Date: Sun Jun 13 07:17:14 2021 +0800
change some descriptions
diff --git a/gnucash/gnome/dialog-customer.c b/gnucash/gnome/dialog-customer.c
index 00c7b6c32..f356bfa17 100644
--- a/gnucash/gnome/dialog-customer.c
+++ b/gnucash/gnome/dialog-customer.c
@@ -329,8 +329,8 @@ gnc_customer_window_ok_cb (GtkWidget *widget, gpointer data)
/* Check for valid company name */
if (check_entry_nonempty (cw->company_entry,
- _("The Company Name field cannot be left blank,\n"
- "enter a company name or personal.")))
+ _("The Company Name field cannot be left blank, please "
+ "enter a company name or a person's name.")))
return;
/* Verify terms, discount, and credit are valid (or empty) */
diff --git a/gnucash/gnome/dialog-vendor.c b/gnucash/gnome/dialog-vendor.c
index da7a0eac3..3d5e02903 100644
--- a/gnucash/gnome/dialog-vendor.c
+++ b/gnucash/gnome/dialog-vendor.c
@@ -211,8 +211,8 @@ gnc_vendor_window_ok_cb (GtkWidget *widget, gpointer data)
/* Check for valid company name */
if (check_entry_nonempty (vw->company_entry,
- _("The Company Name field cannot be left blank,\n"
- "enter a company name or personal.")))
+ _("The Company Name field cannot be left blank, please "
+ "enter a company name or a person's name.")))
return;
/* Check for valid id and set one if necessary */
commit 9836938096dfc5e7f28b0e4eefa5b037ac197c98
Author: duguqiubailee <duguqiubailee at gmail.com>
Date: Sat Jun 12 09:39:10 2021 +0800
Translation update by Reza Almanda <rezaalmanda27 at gmail.com> using Weblate
po/id.po: 98.0% (5371 of 5479 strings; 105 fuzzy)
82 failing checks (1.4%)
Translation: GnuCash/Program (Indonesian)
Translate-URL: https://hosted.weblate.org/projects/gnucash/gnucash/id/
Co-authored-by: Reza Almanda <rezaalmanda27 at gmail.com>
diff --git a/gnucash/gnome/dialog-customer.c b/gnucash/gnome/dialog-customer.c
index 6f61fc875..00c7b6c32 100644
--- a/gnucash/gnome/dialog-customer.c
+++ b/gnucash/gnome/dialog-customer.c
@@ -329,23 +329,10 @@ gnc_customer_window_ok_cb (GtkWidget *widget, gpointer data)
/* Check for valid company name */
if (check_entry_nonempty (cw->company_entry,
- _("You must enter a company name. "
- "If this customer is an individual (and not a company) "
- "you should enter the same value for:\nIdentification "
- "- Company Name, and\nPayment Address - Name.")))
+ _("The Company Name field cannot be left blank,\n"
+ "enter a company name or personal.")))
return;
- /* Make sure we have an address */
- if (check_entry_nonempty (cw->addr1_entry, NULL) &&
- check_entry_nonempty (cw->addr2_entry, NULL) &&
- check_entry_nonempty (cw->addr3_entry, NULL) &&
- check_entry_nonempty (cw->addr4_entry, NULL))
- {
- const char *msg = _("You must enter a billing address.");
- gnc_error_dialog (gnc_ui_get_gtk_window (widget), "%s", msg);
- return;
- }
-
/* Verify terms, discount, and credit are valid (or empty) */
min = gnc_numeric_zero ();
max = gnc_numeric_create (100, 1);
diff --git a/gnucash/gnome/dialog-employee.c b/gnucash/gnome/dialog-employee.c
index ee71cdbfb..9244c66f9 100644
--- a/gnucash/gnome/dialog-employee.c
+++ b/gnucash/gnome/dialog-employee.c
@@ -208,26 +208,11 @@ gnc_employee_window_ok_cb (GtkWidget *widget, gpointer data)
GNCPrintAmountInfo print_info;
gnc_commodity *currency;
- /* Check for valid username */
- if (check_entry_nonempty (ew->username_entry,
- _("You must enter a username.")))
- return;
-
- /* Check for valid username */
+ /* Check for valid employeename */
if (check_entry_nonempty (ew->name_entry,
- _("You must enter the employee's name.")))
+ _("You must enter a Payment-Address Name.")))
return;
- /* Make sure we have an address */
- if (check_entry_nonempty (ew->addr1_entry, NULL) &&
- check_entry_nonempty (ew->addr2_entry, NULL) &&
- check_entry_nonempty (ew->addr3_entry, NULL) &&
- check_entry_nonempty (ew->addr4_entry, NULL))
- {
- const char *msg = _("You must enter an address.");
- gnc_error_dialog (gnc_ui_get_gtk_window (widget), "%s", msg);
- return;
- }
/* Set the employee id if one has not been chosen */
if (g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (ew->id_entry)), "") == 0)
diff --git a/gnucash/gnome/dialog-vendor.c b/gnucash/gnome/dialog-vendor.c
index 0d24ace42..da7a0eac3 100644
--- a/gnucash/gnome/dialog-vendor.c
+++ b/gnucash/gnome/dialog-vendor.c
@@ -211,23 +211,10 @@ gnc_vendor_window_ok_cb (GtkWidget *widget, gpointer data)
/* Check for valid company name */
if (check_entry_nonempty (vw->company_entry,
- _("You must enter a company name. "
- "If this vendor is an individual (and not a company) "
- "you should enter the same value for:\nIdentification "
- "- Company Name, and\nPayment Address - Name.")))
+ _("The Company Name field cannot be left blank,\n"
+ "enter a company name or personal.")))
return;
- /* Make sure we have an address */
- if (check_entry_nonempty (vw->addr1_entry, NULL) &&
- check_entry_nonempty (vw->addr2_entry, NULL) &&
- check_entry_nonempty (vw->addr3_entry, NULL) &&
- check_entry_nonempty (vw->addr4_entry, NULL))
- {
- const char *msg = _("You must enter a payment address.");
- gnc_error_dialog (gnc_ui_get_gtk_window (widget), "%s", msg);
- return;
- }
-
/* Check for valid id and set one if necessary */
if (g_strcmp0 (gtk_entry_get_text (GTK_ENTRY (vw->id_entry)), "") == 0)
{
diff --git a/gnucash/import-export/customer-import/dialog-customer-import.c b/gnucash/import-export/customer-import/dialog-customer-import.c
index adc7bea1c..793ae5ae0 100644
--- a/gnucash/import-export/customer-import/dialog-customer-import.c
+++ b/gnucash/import-export/customer-import/dialog-customer-import.c
@@ -246,15 +246,7 @@ gnc_customer_import_fix_customers (GtkListStore *store, guint *fixed, guint *del
}
}
- // At least one of the address fields must have a value.
- // If not, then delete the row.
- if (strlen(addr1) == 0 && strlen(addr2) == 0 && strlen(addr3) == 0 && strlen(addr4) == 0)
- {
- valid = gtk_list_store_remove (store, &iter);
- (*deleted)++;
- continue;
- }
-
+
g_free (company);
g_free (name);
g_free (addr1);
Summary of changes:
gnucash/gnome/dialog-customer.c | 17 ++---------------
gnucash/gnome/dialog-employee.c | 19 ++-----------------
gnucash/gnome/dialog-vendor.c | 17 ++---------------
.../customer-import/dialog-customer-import.c | 10 +---------
4 files changed, 7 insertions(+), 56 deletions(-)
More information about the gnucash-changes
mailing list