r22286 - gnucash/trunk/src - Adapt payment dialog for credit notes.
Geert Janssens
gjanssens at code.gnucash.org
Sat Aug 4 12:09:05 EDT 2012
Author: gjanssens
Date: 2012-08-04 12:09:04 -0400 (Sat, 04 Aug 2012)
New Revision: 22286
Trac: http://svn.gnucash.org/trac/changeset/22286
Modified:
gnucash/trunk/src/business/business-gnome/dialog-payment.c
gnucash/trunk/src/business/business-gnome/gtkbuilder/dialog-payment.glade
gnucash/trunk/src/engine/gncOwner.c
Log:
Adapt payment dialog for credit notes.
To deal with all possible combinations, a user must set a debit or
credit amount for the payment. In most cases the right amount is
prefilled by selecting documents from the list.
In the process, this changes gets rid of some confusing sign reversal
logic in the payment code (gncOwner.c).
WARNING FOR SCRIPTERS: if you have written python or scheme code that
relies on gncOwnerApplyPayment, be careful: you now need to pass a
signed amount to the function instead of an absolute value, because a
payment could be for both an invoice/bill or a credit note. No more sign
reversals happen internally based on the owner being a vendor or a
customer.
Modified: gnucash/trunk/src/business/business-gnome/dialog-payment.c
===================================================================
--- gnucash/trunk/src/business/business-gnome/dialog-payment.c 2012-08-04 16:08:55 UTC (rev 22285)
+++ gnucash/trunk/src/business/business-gnome/dialog-payment.c 2012-08-04 16:09:04 UTC (rev 22286)
@@ -60,7 +60,8 @@
GtkWidget * memo_entry;
GtkWidget * post_combo;
GtkWidget * owner_choice;
- GtkWidget * amount_edit;
+ GtkWidget * amount_debit_edit;
+ GtkWidget * amount_credit_edit;
GtkWidget * date_edit;
GtkWidget * acct_tree;
GtkWidget * docs_list_tree_view;
@@ -95,7 +96,23 @@
void gnc_ui_payment_window_set_amount (PaymentWindow *pw, gnc_numeric amount)
{
g_assert(pw);
- gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT(pw->amount_edit), amount);
+
+ /* Debits are negative, credits are positive */
+ if (gnc_numeric_positive_p (amount))
+ {
+ gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT(pw->amount_credit_edit),
+ amount);
+ gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT(pw->amount_debit_edit),
+ gnc_numeric_zero ());
+ }
+ else
+ {
+ gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT(pw->amount_debit_edit),
+ gnc_numeric_neg (amount));
+ gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT(pw->amount_credit_edit),
+ gnc_numeric_zero ());
+ }
+
}
void gnc_ui_payment_window_set_postaccount (PaymentWindow *pw, const Account* account)
{
@@ -126,6 +143,8 @@
void gnc_payment_window_destroy_cb (GtkWidget *widget, gpointer data);
void gnc_payment_acct_tree_row_activated_cb (GtkWidget *widget, GtkTreePath *path,
GtkTreeViewColumn *column, PaymentWindow *pw);
+void gnc_payment_leave_amount_cb (GtkWidget *widget, GdkEventFocus *event,
+ PaymentWindow *pw);
static void
@@ -203,9 +222,7 @@
/* Set the payment amount in the dialog */
val = gnc_payment_dialog_calculate_selected_total (pw);
- /* XXX It may not always be correct to use the absolute value of amount here
- * This is an assumption from before the credit notes implementation. */
- gnc_ui_payment_window_set_amount(pw, gnc_numeric_abs (val));
+ gnc_ui_payment_window_set_amount(pw, val);
}
static void
@@ -521,20 +538,22 @@
PaymentWindow *pw = data;
const char *text = NULL;
Account *post, *acc;
- gnc_numeric amount;
+ gnc_numeric amount_deb, amount_cred, amount_tot;
if (!pw)
return;
- /* Verify the amount is non-zero */
- amount = gnc_amount_edit_get_amount (GNC_AMOUNT_EDIT (pw->amount_edit));
+ /* Verify the total amount is non-zero */
+ amount_deb = gnc_amount_edit_get_amount (GNC_AMOUNT_EDIT (pw->amount_debit_edit));
+ amount_cred = gnc_amount_edit_get_amount (GNC_AMOUNT_EDIT (pw->amount_credit_edit));
+ amount_tot = gnc_numeric_sub (amount_cred, amount_deb,
+ gnc_commodity_get_fraction (xaccAccountGetCommodity (pw->post_acct)),
+ GNC_HOW_RND_ROUND_HALF_UP);
- /* XXX Amounts could possibly be negative as well if you take credit notes into account
- * This still has to be reviewed */
- if (gnc_numeric_check (amount) || !gnc_numeric_positive_p (amount))
+ if (gnc_numeric_check (amount_tot) || gnc_numeric_zero_p (amount_tot))
{
text = _("You must enter the amount of the payment. "
- "The payment amount must be greater than zero.");
+ "The payment amount must not be zero.");
gnc_error_dialog (pw->dialog, "%s", text);
return;
}
@@ -597,7 +616,7 @@
gnc_info_dialog(pw->dialog, "%s", text);
gnc_xfer_dialog_select_to_account(xfer, post);
- gnc_xfer_dialog_set_amount(xfer, amount);
+ gnc_xfer_dialog_set_amount(xfer, amount_tot);
/* All we want is the exchange rate so prevent the user from thinking
it makes sense to mess with other stuff */
@@ -611,7 +630,7 @@
/* Perform the payment */
gncOwnerApplyPayment (&pw->owner, pw->pre_existing_txn, selected_lots,
- post, acc, amount, exch, date, memo, num);
+ post, acc, amount_tot, exch, date, memo, num);
}
gnc_resume_gui_refresh ();
@@ -671,6 +690,25 @@
}
}
+void
+gnc_payment_leave_amount_cb (GtkWidget *widget, GdkEventFocus *event,
+ PaymentWindow *pw)
+{
+ gnc_numeric amount_deb, amount_cred, amount_tot;
+
+ if (! pw->amount_credit_edit || ! pw->amount_debit_edit)
+ return;
+
+ /* If both credit and debit amount are entered, simplify it to either one */
+ amount_deb = gnc_amount_edit_get_amount (GNC_AMOUNT_EDIT (pw->amount_debit_edit));
+ amount_cred = gnc_amount_edit_get_amount (GNC_AMOUNT_EDIT (pw->amount_credit_edit));
+ amount_tot = gnc_numeric_sub (amount_cred, amount_deb,
+ gnc_commodity_get_fraction (xaccAccountGetCommodity (pw->post_acct)),
+ GNC_HOW_RND_ROUND_HALF_UP);
+
+ gnc_ui_payment_window_set_amount (pw, amount_tot);
+}
+
/* Select the list of accounts to show in the tree */
static void
gnc_payment_set_account_types (GncTreeViewAccount *tree)
@@ -768,13 +806,26 @@
box = GTK_WIDGET (gtk_builder_get_object (builder, "owner_box"));
pw->owner_choice = gnc_owner_select_create (label, box, book, owner);
- box = GTK_WIDGET (gtk_builder_get_object (builder, "amount_box"));
- pw->amount_edit = gnc_amount_edit_new ();
- gtk_box_pack_start (GTK_BOX (box), pw->amount_edit, TRUE, TRUE, 0);
- gnc_amount_edit_set_evaluate_on_enter (GNC_AMOUNT_EDIT (pw->amount_edit),
+ box = GTK_WIDGET (gtk_builder_get_object (builder, "amount_debit_box"));
+ pw->amount_debit_edit = gnc_amount_edit_new ();
+ gtk_box_pack_start (GTK_BOX (box), pw->amount_debit_edit, TRUE, TRUE, 0);
+ gnc_amount_edit_set_evaluate_on_enter (GNC_AMOUNT_EDIT (pw->amount_debit_edit),
TRUE);
- gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (pw->amount_edit), gnc_numeric_zero());
+ gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (pw->amount_debit_edit), gnc_numeric_zero());
+ g_signal_connect(G_OBJECT(gnc_amount_edit_gtk_entry(GNC_AMOUNT_EDIT(pw->amount_debit_edit))),
+ "focus-out-event",
+ G_CALLBACK(gnc_payment_leave_amount_cb), pw);
+ box = GTK_WIDGET (gtk_builder_get_object (builder, "amount_credit_box"));
+ pw->amount_credit_edit = gnc_amount_edit_new ();
+ gtk_box_pack_start (GTK_BOX (box), pw->amount_credit_edit, TRUE, TRUE, 0);
+ gnc_amount_edit_set_evaluate_on_enter (GNC_AMOUNT_EDIT (pw->amount_credit_edit),
+ TRUE);
+ gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (pw->amount_credit_edit), gnc_numeric_zero());
+ g_signal_connect(G_OBJECT(gnc_amount_edit_gtk_entry(GNC_AMOUNT_EDIT(pw->amount_credit_edit))),
+ "focus-out-event",
+ G_CALLBACK(gnc_payment_leave_amount_cb), pw);
+
box = GTK_WIDGET (gtk_builder_get_object (builder, "date_box"));
pw->date_edit = gnc_date_edit_new (time(NULL), FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (box), pw->date_edit, TRUE, TRUE, 0);
@@ -1045,7 +1096,7 @@
pw = gnc_ui_payment_new(owner,
qof_instance_get_book(QOF_INSTANCE(txn)));
g_assert(assetaccount_split); // we can rely on this because of the countAssetAccounts() check above
- //g_message("Amount=%s", gnc_numeric_to_string(amount));
+ g_debug("Amount=%s", gnc_numeric_to_string(amount));
// Fill in the values from the given txn
pw->pre_existing_txn = txn;
@@ -1055,9 +1106,7 @@
GDate txn_date = xaccTransGetDatePostedGDate (txn);
gnc_ui_payment_window_set_date(pw, &txn_date);
}
- /* XXX It may not always be correct to use the absolute value of amount here
- * This is an assumption from before the credit notes implementation. */
- gnc_ui_payment_window_set_amount(pw, gnc_numeric_abs(amount));
+ gnc_ui_payment_window_set_amount(pw, amount);
gnc_ui_payment_window_set_xferaccount(pw, xaccSplitGetAccount(assetaccount_split));
if (postaccount_split)
gnc_ui_payment_window_set_postaccount(pw, xaccSplitGetAccount(postaccount_split));
Modified: gnucash/trunk/src/business/business-gnome/gtkbuilder/dialog-payment.glade
===================================================================
--- gnucash/trunk/src/business/business-gnome/gtkbuilder/dialog-payment.glade 2012-08-04 16:08:55 UTC (rev 22285)
+++ gnucash/trunk/src/business/business-gnome/gtkbuilder/dialog-payment.glade 2012-08-04 16:09:04 UTC (rev 22286)
@@ -18,14 +18,16 @@
<object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">3</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
+ <property name="column_spacing">3</property>
+ <property name="row_spacing">3</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
@@ -38,6 +40,7 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">The company associated with this payment.</property>
<property name="tooltip_text" translatable="yes">The company associated with this payment.</property>
+ <property name="border_width">3</property>
<child>
<placeholder/>
</child>
@@ -68,7 +71,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
@@ -78,6 +80,7 @@
<object class="GtkComboBox" id="post_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">3</property>
<property name="model">post_combo_model</property>
<property name="has_entry">True</property>
<property name="entry_text_column">0</property>
@@ -114,7 +117,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
@@ -124,6 +126,7 @@
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="border_width">3</property>
<property name="hadjustment">docs_list_hor_adj</property>
<property name="vadjustment">docs_list_vert_adj</property>
<property name="shadow_type">in</property>
@@ -148,6 +151,7 @@
<property name="sizing">fixed</property>
<property name="min_width">50</property>
<property name="title" translatable="yes">Date</property>
+ <property name="clickable">True</property>
<property name="sort_indicator">True</property>
<property name="sort_column_id">0</property>
<child>
@@ -164,6 +168,7 @@
<property name="sizing">fixed</property>
<property name="min_width">50</property>
<property name="title" translatable="yes">Number</property>
+ <property name="clickable">True</property>
<property name="sort_column_id">1</property>
<child>
<object class="GtkCellRendererText" id="docs_list_num_renderer"/>
@@ -179,6 +184,7 @@
<property name="sizing">fixed</property>
<property name="min_width">50</property>
<property name="title" translatable="yes">Type</property>
+ <property name="clickable">True</property>
<property name="sort_column_id">2</property>
<child>
<object class="GtkCellRendererText" id="docs_list_type_renderer"/>
@@ -194,6 +200,7 @@
<property name="sizing">fixed</property>
<property name="min_width">50</property>
<property name="title" translatable="yes">Debit</property>
+ <property name="clickable">True</property>
<property name="sort_column_id">3</property>
<child>
<object class="GtkCellRendererText" id="docs_list_deb_renderer"/>
@@ -209,6 +216,7 @@
<property name="sizing">fixed</property>
<property name="min_width">50</property>
<property name="title" translatable="yes">Credit</property>
+ <property name="clickable">True</property>
<property name="sort_column_id">4</property>
<child>
<object class="GtkCellRendererText" id="docs_list_cred_renderer"/>
@@ -246,22 +254,24 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkVBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">3</property>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">3</property>
- <property name="homogeneous">True</property>
+ <property name="n_rows">8</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">3</property>
+ <property name="row_spacing">3</property>
<child>
<object class="GtkLabel" id="date_label">
<property name="visible">True</property>
@@ -271,12 +281,24 @@
<property name="justify">right</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
+ <object class="GtkHBox" id="date_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkLabel" id="amount_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -292,16 +314,70 @@
In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Amount</property>
+ <property name="label" translatable="yes"><b>Amount</b></property>
+ <property name="use_markup">True</property>
<property name="justify">right</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
+ <object class="GtkLabel" id="debit_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">The amount to pay for this invoice.
+
+If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.
+
+In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
+ <property name="tooltip_text" translatable="yes">The amount to pay for this invoice.
+
+If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.
+
+In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Debit</property>
+ <property name="justify">right</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="credit_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">The amount to pay for this invoice.
+
+If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.
+
+In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
+ <property name="tooltip_text" translatable="yes">The amount to pay for this invoice.
+
+If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.
+
+In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Credit</property>
+ <property name="justify">right</property>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkLabel" id="num_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -310,9 +386,10 @@
<property name="justify">right</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -324,40 +401,40 @@
<property name="justify">right</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">3</property>
- <property name="homogeneous">True</property>
<child>
- <object class="GtkHBox" id="date_box">
+ <object class="GtkHBox" id="amount_debit_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">The amount to pay for this invoice.
+
+If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.
+
+In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
+ <property name="tooltip_text" translatable="yes">The amount to pay for this invoice.
+
+If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.
+
+In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
<child>
<placeholder/>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="amount_box">
+ <object class="GtkHBox" id="amount_credit_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
@@ -376,9 +453,10 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
</packing>
</child>
<child>
@@ -389,9 +467,10 @@
<property name="invisible_char_set">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
</packing>
</child>
<child>
@@ -402,16 +481,80 @@
<property name="invisible_char_set">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
</packing>
</child>
+ <child>
+ <object class="GtkHBox" id="amount_top_filler">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">The amount to pay for this invoice.
+
+If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.
+
+In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
+ <property name="tooltip_text" translatable="yes">The amount to pay for this invoice.
+
+If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.
+
+In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ <property name="y_padding">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="amount_bot_filler">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">The amount to pay for this invoice.
+
+If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.
+
+In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
+ <property name="tooltip_text" translatable="yes">The amount to pay for this invoice.
+
+If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.
+
+In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ <property name="y_padding">3</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -440,7 +583,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
@@ -449,6 +591,7 @@
<child>
<object class="GtkScrolledWindow" id="acct_window">
<property name="width_request">250</property>
+ <property name="height_request">200</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">3</property>
@@ -493,7 +636,6 @@
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -511,7 +653,6 @@
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
Modified: gnucash/trunk/src/engine/gncOwner.c
===================================================================
--- gnucash/trunk/src/engine/gncOwner.c 2012-08-04 16:08:55 UTC (rev 22285)
+++ gnucash/trunk/src/engine/gncOwner.c 2012-08-04 16:09:04 UTC (rev 22286)
@@ -700,17 +700,6 @@
return timespec_cmp (&da, &db);
}
-static gboolean use_reversed_payment_amounts(const GncOwner *owner)
-{
- g_assert(owner);
- return (gncOwnerGetType (owner) == GNC_OWNER_CUSTOMER);
-}
-
-
-/*
- * Create a payment of "amount" for the owner and return
- * the new lot associated with this payment.
- */
GNCLot *
gncOwnerCreatePaymentLot (const GncOwner *owner, Transaction *txn,
Account *posted_acc, Account *xfer_acc,
@@ -721,8 +710,6 @@
Split *split;
const char *name;
gnc_commodity *commodity;
- gboolean reverse;
- gnc_numeric payment_value = amount;
Split *xfer_split = NULL;
GNCLot *payment_lot;
@@ -734,7 +721,7 @@
book = gnc_account_get_book (posted_acc);
name = gncOwnerGetName (gncOwnerGetEndOwner ((GncOwner*)owner));
commodity = gncOwnerGetCurrency (owner);
- reverse = use_reversed_payment_amounts(owner);
+// reverse = use_reversed_payment_amounts(owner);
if (txn)
{
@@ -811,15 +798,16 @@
if (gnc_commodity_equal(xaccAccountGetCommodity(xfer_acc), commodity))
{
- xaccSplitSetBaseValue (split, reverse ? amount :
- gnc_numeric_neg (amount), commodity);
+ xaccSplitSetBaseValue (split, amount, commodity);
}
else
{
/* Need to value the payment in terms of the owner commodity */
- xaccSplitSetAmount(split, reverse ? amount : gnc_numeric_neg (amount));
- payment_value = gnc_numeric_mul(amount, exch, GNC_DENOM_AUTO, GNC_HOW_RND_ROUND_HALF_UP);
- xaccSplitSetValue(split, reverse ? payment_value : gnc_numeric_neg(payment_value));
+ gnc_numeric payment_value = gnc_numeric_mul(amount,
+ exch, GNC_DENOM_AUTO, GNC_HOW_RND_ROUND_HALF_UP);
+
+ xaccSplitSetAmount(split, amount);
+ xaccSplitSetValue(split, payment_value);
}
}
@@ -831,7 +819,7 @@
xaccAccountInsertSplit (posted_acc, split);
xaccAccountCommitEdit (posted_acc);
xaccTransAppendSplit (txn, split);
- xaccSplitSetBaseValue (split, reverse ? gnc_numeric_neg (amount) : amount, commodity);
+ xaccSplitSetBaseValue (split, gnc_numeric_neg (amount), commodity);
/* Create a new lot for the payment */
payment_lot = gnc_lot_new (book);
More information about the gnucash-changes
mailing list