From 389fb26cdbcd6095d0185cd5d2d585592fb982a1 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Thu, 12 Jul 2012 15:26:50 -0400
Subject: [PATCH] ACQ invoice formatting improvements

Prevent # invoiced and # paid inputs from wrapping.  Also, make the text
boxes a little smaller to reduce horizontal space requirements.  It's
still possible to enter any value, but only the 4 least significant
digits are visible.  Since it's not common to invoice 10k+ copies of the
same item, this seems like a fair trade off.

Signed-off-by: Bill Erickson <berick@esilibrary.com>

Conflicts:
	Open-ILS/src/templates/acq/invoice/view.tt2

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 Open-ILS/src/templates/acq/invoice/view.tt2    | 4 +---
 Open-ILS/web/js/ui/default/acq/invoice/view.js | 6 +++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/src/templates/acq/invoice/view.tt2 b/Open-ILS/src/templates/acq/invoice/view.tt2
index d4c91b372d..9023c4a271 100644
--- a/Open-ILS/src/templates/acq/invoice/view.tt2
+++ b/Open-ILS/src/templates/acq/invoice/view.tt2
@@ -13,7 +13,6 @@
 
     <div dojoType="dijit.layout.ContentPane" layoutAlign="client">
 
-
         <div dojoType="dijit.layout.TabContainer" style="width: 96%; height: 100%;">
             <div dojoType="dijit.layout.ContentPane" 
                 class='oils-acq-detail-content-pane' title="Invoice" selected='true' style='height:600px'>
@@ -50,7 +49,7 @@
                                 <div name='title_details'></div>
                                 <div name='note'></div>
                             </td>
-                            <td class='acq-invoice-center-col'>
+                            <td class='acq-invoice-center-col' nowrap='nowrap'>
                                 <span name='inv_item_count'></span>&nbsp;/&nbsp;<span name='phys_item_count'></span>
                             </td>
                             <td class='acq-invoice-billed-col'><div name='cost_billed'></div></td>
@@ -244,7 +243,6 @@
             </div> <!-- tab 2 -->
         </div> <!-- end tabcontainer -->
     </div> <!-- end contentpane -->
-
 </div>
 <div dojoType='openils.widget.ProgressDialog' jsId='progressDialog'></div>
 <div jsId='extraItemsDialog' dojoType="dijit.Dialog" title="Extra Items">
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 a83241a34c..ce8c6621a2 100644
--- a/Open-ILS/web/js/ui/default/acq/invoice/view.js
+++ b/Open-ILS/web/js/ui/default/acq/invoice/view.js
@@ -517,7 +517,11 @@ function addInvoiceEntry(entry) {
                 ['inv_item_count', 'phys_item_count', 'cost_billed', 'amount_paid'],
                 function(field) {
                     var dijitArgs = {required : true, constraints : {min: 0}, style : 'width:6em'};
-                    if(!field.match(/count/)) dijitArgs.style = 'width:9em';
+                    if(field.match(/count/)) {
+                        dijitArgs.style = 'width:4em;';
+                    } else {
+                        dijitArgs.style = 'width:9em;';
+                    }
                     if(entry.isnew() && field == 'phys_item_count') {
                         // by default, attempt to pay for all non-canceled and as-of-yet-un-invoiced items
                         var count = Number(li.order_summary().item_count() || 0) - 
-- 
2.11.0