Skip to content

Commit

Permalink
Bug 797605 - RFE: Customer/Vendor/Employee Overview should also have …
Browse files Browse the repository at this point in the history
…"Process Payment" toolbar
  • Loading branch information
christopherlam committed Apr 25, 2020
1 parent ed6ef53 commit a8ae00c
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
26 changes: 26 additions & 0 deletions gnucash/gnome/gnc-plugin-page-owner-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
#include "dialog-employee.h"
#include "dialog-invoice.h"
#include "dialog-job.h"
#include "dialog-payment.h"

#include "gncOwner.h"
#include "dialog-utils.h"
Expand Down Expand Up @@ -128,6 +129,7 @@ static void gnc_plugin_page_owner_tree_cmd_refresh (GtkAction *action, GncPlugin
static void gnc_plugin_page_owner_tree_cmd_new_invoice (GtkAction *action, GncPluginPageOwnerTree *page);
static void gnc_plugin_page_owner_tree_cmd_owners_report (GtkAction *action, GncPluginPageOwnerTree *plugin_page);
static void gnc_plugin_page_owner_tree_cmd_owner_report (GtkAction *action, GncPluginPageOwnerTree *plugin_page);
static void gnc_plugin_page_owner_tree_cmd_process_payment (GtkAction *action, GncPluginPageOwnerTree *plugin_page);


static guint plugin_page_signals[LAST_SIGNAL] = { 0 };
Expand Down Expand Up @@ -230,6 +232,11 @@ static GtkActionEntry gnc_plugin_page_owner_tree_actions [] =
N_("Show employee report"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_owner_report)
},
{
"OTProcessPaymentAction", GNC_ICON_INVOICE_PAY,
N_("Process Payment"), NULL, N_("Process Payment"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_process_payment)
},
};
/** The number of actions provided by this plugin. */
static guint gnc_plugin_page_owner_tree_n_actions = G_N_ELEMENTS (gnc_plugin_page_owner_tree_actions);
Expand All @@ -242,6 +249,7 @@ static const gchar *actions_requiring_owner_rw[] =
"OTEditVendorAction",
"OTEditCustomerAction",
"OTEditEmployeeAction",
"OTProcessPaymentAction",
/* FIXME disabled due to crash "EditDeleteOwnerAction", */
NULL
};
Expand All @@ -253,6 +261,7 @@ static const gchar *actions_requiring_owner_always[] =
"OTVendorReportAction",
"OTCustomerReportAction",
"OTEmployeeReportAction",
"OTProcessPaymentAction",
NULL
};

Expand All @@ -265,6 +274,7 @@ static const gchar* readonly_inactive_actions[] =
"OTNewBillAction",
"OTNewInvoiceAction",
"OTNewVoucherAction",
"OTProcessPaymentAction",
NULL
};

Expand All @@ -283,6 +293,7 @@ static action_toolbar_labels toolbar_labels[] =
{ "OTNewVoucherAction", N_("New Voucher") },
{ "OTVendorListingReportAction", N_("Vendor Listing") },
{ "OTCustomerListingReportAction", N_("Customer Listing") },
{ "OTProcessPaymentAction", N_("Process Payment") },
/* FIXME disable due to crash { "EditDeleteOwnerAction", N_("Delete") },*/
{ NULL, NULL },
};
Expand Down Expand Up @@ -1244,5 +1255,20 @@ gnc_plugin_page_owner_tree_cmd_owner_report (GtkAction *action,
LEAVE(" ");
}


static void
gnc_plugin_page_owner_tree_cmd_process_payment (GtkAction *action,
GncPluginPageOwnerTree *plugin_page)
{
ENTER("(action %p, plugin_page %p)", action, plugin_page);

g_return_if_fail(GNC_IS_PLUGIN_PAGE_OWNER_TREE(plugin_page));

gnc_ui_payment_new (GTK_WINDOW(GNC_PLUGIN_PAGE(plugin_page)->window),
gnc_plugin_page_owner_tree_get_current_owner (plugin_page),
gnc_get_current_book ());

LEAVE(" ");
}
/** @} */
/** @} */
2 changes: 2 additions & 0 deletions gnucash/ui/gnc-plugin-page-owner-tree-ui.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<toolitem name="ToolbarNewVoucher" action="OTNewVoucherAction"/>
<toolitem name="ToolbarVendorListing" action="OTVendorListingReportAction"/>
<toolitem name="ToolbarCustomerListing" action="OTCustomerListingReportAction"/>
<toolitem name="ToolbarProcessPayment" action="OTProcessPaymentAction"/>
</placeholder>
</toolbar>

Expand All @@ -54,6 +55,7 @@
<menuitem name="OTVendorReport" action="OTVendorReportAction"/>
<menuitem name="OTCustomerReport" action="OTCustomerReportAction"/>
<menuitem name="OTEmployeeReport" action="OTEmployeeReportAction"/>
<menuitem name="ProcessPayment" action="OTProcessPaymentAction"/>
</placeholder>
</popup>
</ui>

0 comments on commit a8ae00c

Please sign in to comment.