IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Bug 797605 - RFE: Customer/Vendor/Employee Overview should also have "Process Payment" toolbar"

Browse Source 
This reverts commit 695d8b820e.
This commit is contained in:
Christopher Lam 2020-04-25 00:15:03 +08:00
parent 88f276e291
commit 8f5094f990
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gnucash/gnome/gnc-plugin-page-owner-tree.c
View File

@ -46,7 +46,6 @@
#include "dialog-employee.h" #include "dialog-employee.h"
#include "dialog-invoice.h" #include "dialog-invoice.h"
#include "dialog-job.h" #include "dialog-job.h"
#include "dialog-payment.h"
#include "gncOwner.h" #include "gncOwner.h"
#include "dialog-utils.h" #include "dialog-utils.h"
@ -129,7 +128,6 @@ 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_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_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_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 }; static guint plugin_page_signals[LAST_SIGNAL] = { 0 };
@ -232,11 +230,6 @@ static GtkActionEntry gnc_plugin_page_owner_tree_actions [] =
N_("Show employee report"), N_("Show employee report"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_owner_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. */ /** 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); static guint gnc_plugin_page_owner_tree_n_actions = G_N_ELEMENTS (gnc_plugin_page_owner_tree_actions);
@ -249,7 +242,6 @@ static const gchar *actions_requiring_owner_rw[] =
"OTEditVendorAction", "OTEditVendorAction",
"OTEditCustomerAction", "OTEditCustomerAction",
"OTEditEmployeeAction", "OTEditEmployeeAction",
"OTProcessPaymentAction",
/* FIXME disabled due to crash "EditDeleteOwnerAction", */ /* FIXME disabled due to crash "EditDeleteOwnerAction", */
NULL NULL
}; };
@ -261,7 +253,6 @@ static const gchar *actions_requiring_owner_always[] =
"OTVendorReportAction", "OTVendorReportAction",
"OTCustomerReportAction", "OTCustomerReportAction",
"OTEmployeeReportAction", "OTEmployeeReportAction",
"OTProcessPaymentAction",
NULL NULL
}; };
@ -274,7 +265,6 @@ static const gchar* readonly_inactive_actions[] =
"OTNewBillAction", "OTNewBillAction",
"OTNewInvoiceAction", "OTNewInvoiceAction",
"OTNewVoucherAction", "OTNewVoucherAction",
"OTProcessPaymentAction",
NULL NULL
}; };
@ -293,7 +283,6 @@ static action_toolbar_labels toolbar_labels[] =
{ "OTNewVoucherAction", N_("New Voucher") }, { "OTNewVoucherAction", N_("New Voucher") },
{ "OTVendorListingReportAction", N_("Vendor Listing") }, { "OTVendorListingReportAction", N_("Vendor Listing") },
{ "OTCustomerListingReportAction", N_("Customer Listing") }, { "OTCustomerListingReportAction", N_("Customer Listing") },
{ "OTProcessPaymentAction", N_("Process Payment") },
/* FIXME disable due to crash { "EditDeleteOwnerAction", N_("Delete") },*/ /* FIXME disable due to crash { "EditDeleteOwnerAction", N_("Delete") },*/
{ NULL, NULL }, { NULL, NULL },
}; };
@ -1255,20 +1244,5 @@ gnc_plugin_page_owner_tree_cmd_owner_report (GtkAction *action,
LEAVE(" "); 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
gnucash/ui/gnc-plugin-page-owner-tree-ui.xml
View File

@ -38,7 +38,6 @@
<toolitem name="ToolbarNewVoucher" action="OTNewVoucherAction"/> <toolitem name="ToolbarNewVoucher" action="OTNewVoucherAction"/>
<toolitem name="ToolbarVendorListing" action="OTVendorListingReportAction"/> <toolitem name="ToolbarVendorListing" action="OTVendorListingReportAction"/>
<toolitem name="ToolbarCustomerListing" action="OTCustomerListingReportAction"/> <toolitem name="ToolbarCustomerListing" action="OTCustomerListingReportAction"/>
<toolitem name="ToolbarProcessPayment" action="OTProcessPaymentAction"/>
</placeholder> </placeholder>
</toolbar> </toolbar>
@ -55,7 +54,6 @@
<menuitem name="OTVendorReport" action="OTVendorReportAction"/> <menuitem name="OTVendorReport" action="OTVendorReportAction"/>
<menuitem name="OTCustomerReport" action="OTCustomerReportAction"/> <menuitem name="OTCustomerReport" action="OTCustomerReportAction"/>
<menuitem name="OTEmployeeReport" action="OTEmployeeReportAction"/> <menuitem name="OTEmployeeReport" action="OTEmployeeReportAction"/>
<menuitem name="ProcessPayment" action="OTProcessPaymentAction"/>
</placeholder> </placeholder>
</popup> </popup>
</ui> </ui>