From 00f0e17ae7a07247a4eb1f730a59a1352b634f61 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 31 Jul 2012 14:02:10 -0400 Subject: [PATCH] acq invoice : set receiver/provider Signed-off-by: Bill Erickson --- Open-ILS/web/js/ui/default/acq/invoice/common.js | 2 +- Open-ILS/web/js/ui/default/acq/invoice/view.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Open-ILS/web/js/ui/default/acq/invoice/common.js b/Open-ILS/web/js/ui/default/acq/invoice/common.js index a21fbae7f5..0980fca978 100644 --- a/Open-ILS/web/js/ui/default/acq/invoice/common.js +++ b/Open-ILS/web/js/ui/default/acq/invoice/common.js @@ -10,7 +10,7 @@ function drawInvoicePane(parentNode, inv, args) { if(!inv) { override = { recv_date : {widgetValue : dojo.date.stamp.toISOString(new Date())}, - receiver : {widgetValue : openils.User.user.ws_ou()}, + //receiver : {widgetValue : openils.User.user.ws_ou()}, recv_method : {widgetValue : 'PPR'} }; } diff --git a/Open-ILS/web/js/ui/default/acq/invoice/view.js b/Open-ILS/web/js/ui/default/acq/invoice/view.js index 28d82ff125..10a8cc0868 100644 --- a/Open-ILS/web/js/ui/default/acq/invoice/view.js +++ b/Open-ILS/web/js/ui/default/acq/invoice/view.js @@ -713,6 +713,14 @@ function addInvoiceEntry(entry) { updateReceiveLink(li); updateExpectedCost(li, entry); + // set some default values if otherwise unset + if (!invoicePane.getFieldValue('receiver')) { + invoicePane.setFieldValue('receiver', li.purchase_order().ordering_agency()); + } + if (!invoicePane.getFieldValue('provider')) { + invoicePane.setFieldValue('provider', li.purchase_order().provider()); + } + dojo.forEach( ['inv_item_count', 'phys_item_count', 'cost_billed', 'amount_paid'], function(field) { -- 2.11.0