From 09e6ae36f7ba0f3571dc5f890959365e16de110a Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Thu, 11 Oct 2018 10:14:32 -0400 Subject: [PATCH] RT# 73382 - fixed formatting issue with calendar --- httemplate/elements/customer-table.html | 4 +++- httemplate/misc/process/batch-cust_pay.cgi | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/httemplate/elements/customer-table.html b/httemplate/elements/customer-table.html index 9f76384d2..0e4bfa65a 100644 --- a/httemplate/elements/customer-table.html +++ b/httemplate/elements/customer-table.html @@ -640,6 +640,7 @@ and probably should be cleaned up more before being used by anything else. var my_cell = document.createElement('TD'); my_cell.setAttribute('align', '<% $align{ $opt{align}->[$col] || 'l' } %>'); + my_cell.style.whiteSpace = 'nowrap'; % if ($opt{'color'}->[$col]) { my_cell.style.color = '<% $opt{color}->[$col] %>'; % } @@ -667,6 +668,7 @@ and probably should be cleaned up more before being used by anything else. my_input_button.setAttribute('title', <% mt('Select date') |js_string %>); my_input_button.setAttribute('name', '<% $name %>'+thisrownum+'button'); my_input_button.setAttribute('id', '<% $name %>'+thisrownum+'button'); + my_input_button.style.verticalAlign = 'top'; % } my_input.value = (values && values.<% $field %>) || ''; % if ( $opt{onchange}->[$col] ) { @@ -732,7 +734,7 @@ and probably should be cleaned up more before being used by anything else. Customer Balance % foreach my $header ( @{$opt{header}} ) { - <% $header %> + <% $header %> % } diff --git a/httemplate/misc/process/batch-cust_pay.cgi b/httemplate/misc/process/batch-cust_pay.cgi index b4580bb4e..0720fdada 100644 --- a/httemplate/misc/process/batch-cust_pay.cgi +++ b/httemplate/misc/process/batch-cust_pay.cgi @@ -33,12 +33,14 @@ foreach my $row ( map /^custnum(\d+)$/, keys %$param ) { $custnum = $cust_main->custnum if $cust_main; # if !$cust_main, then this will throw an error on batch_insert + my $_date = $param->{"_date$row"} ? parse_datetime($param->{"_date$row"}) : ''; + my $cust_pay = new FS::cust_pay { 'custnum' => $custnum, 'paid' => $param->{"paid$row"}, 'payby' => 'BILL', 'payinfo' => $param->{"payinfo$row"}, - '_date' => $param->{"_date$row"}, + '_date' => $_date, 'discount_term' => $param->{"discount_term$row"}, 'paybatch' => $paybatch, 'no_auto_apply' => exists($param->{"no_auto_apply$row"}) ? 'Y' : '', -- 2.11.0