diff --git a/Changelog b/Changelog index 9d2eeb2b80..64708b7bbe 100644 --- a/Changelog +++ b/Changelog @@ -9,6 +9,7 @@ Changelog for 1.3.28 * Fixing is_zero errors on ar/ap transaction screens w/tax incldued (Chris T) * Fixing csv ar transactions not showing taxes (Chris T, 3589640) * Fixing demo quotations having descriptions taking too much space (Chris T) +* Moved to label/button system for deleting lines on invoices (Chris T) Changelog for 1.3.27 * Detect whether ledgersmb.conf exists during Makefile.PL run and create if diff --git a/bin/io.pl b/bin/io.pl index f06675b4cb..e0f0ffa14f 100644 --- a/bin/io.pl +++ b/bin/io.pl @@ -84,6 +84,7 @@ # $locale->text('Oct') # $locale->text('Nov') # $locale->text('Dec') +# sub _calc_taxes { $form->{subtotal} = $form->{invsubtotal}; @@ -339,8 +340,17 @@ sub display_row { $column_data{runningnumber} = qq||; - $column_data{partnumber} = + if ($form->{"partnumber_$i"}){ + $column_data{partnumber} = + qq| $form->{"partnumber_$i"} + + |; + } else { + $column_data{partnumber} = qq|$skunumber|; + } $column_data{qty} = qq|{nextsub} = 'update'; # set option selected for (qw(AP currency)) { @@ -408,6 +409,14 @@ sub form_header { print qq| | . $form->open_status_div . qq| + +
|; @@ -415,9 +424,11 @@ sub form_header { print qq|$form->{notice}
|; } $form->{vc} = "vendor"; + $form->{nextsub} = 'update'; $form->hide_form( qw(id title vc type terms creditlimit creditremaining closedto locked - shipped oldtransdate recurring reverse batch_id subtype form_id) + shipped oldtransdate recurring reverse batch_id subtype form_id + nextsub) ); print qq| @@ -1055,6 +1066,7 @@ sub update { if ( $form->{import_text} ) { &import_text; } + delete $form->{"partnumber_$form->{delete_line}"} if $form->{delete_line}; $form->{exchangerate} = $form->parse_amount( \%myconfig, $form->{exchangerate} ); diff --git a/bin/is.pl b/bin/is.pl index 4def754359..a6a003f846 100644 --- a/bin/is.pl +++ b/bin/is.pl @@ -338,6 +338,7 @@ sub prepare_invoice { } sub form_header { + $form->{nextsub} = 'update'; # set option selected for (qw(AR currency)) { @@ -444,15 +445,21 @@ sub form_header { print qq| | . $form->open_status_div . qq| - - + + |; $form->hide_form( qw(form_id id type printed emailed queued title vc terms discount creditlimit creditremaining tradediscount business closedto locked shipped oldtransdate recurring reverse batch_id subtype - meta_number) + meta_number nextsub) ); if ($form->{notice}){ @@ -1096,6 +1103,8 @@ sub form_footer { sub update { on_update();#TODO meaning ? + delete $form->{"partnumber_$form->{delete_line}"} if $form->{delete_line}; + $form->{taxes} = {}; $form->{exchangerate} = $form->parse_amount( \%myconfig, $form->{exchangerate} ); diff --git a/bin/oe.pl b/bin/oe.pl index 2fe7655ccb..a40ead3f2e 100644 --- a/bin/oe.pl +++ b/bin/oe.pl @@ -332,7 +332,7 @@ sub prepare_order { sub form_header { - + $form->{nextsub} = 'update'; $checkedopen = ( $form->{closed} ) ? "" : "checked"; $checkedclosed = ( $form->{closed} ) ? "checked" : ""; @@ -583,6 +583,14 @@ sub form_header { print qq| | . $form->open_status_div . qq| + + |; @@ -592,7 +600,7 @@ sub form_header { } $form->hide_form(qw(entity_control_code meta_number)); $form->hide_form( - qw(id type formname media format printed emailed queued vc title discount creditlimit creditremaining tradediscount business recurring form_id) + qw(id type formname media format printed emailed queued vc title discount creditlimit creditremaining tradediscount business recurring form_id nextsub) ); print qq| @@ -967,7 +975,9 @@ sub form_footer { } sub update { + $form->{nextsub} = 'update'; + delete $form->{"partnumber_$form->{delete_line}"} if $form->{delete_line}; if ( $form->{type} eq 'generate_purchase_order' ) { for ( 1 .. $form->{rowcount} ) { diff --git a/old-handler.pl b/old-handler.pl index a12614b326..a583c1dc43 100755 --- a/old-handler.pl +++ b/old-handler.pl @@ -89,6 +89,7 @@ $locale = LedgerSMB::Locale->get_handle( ${LedgerSMB::Sysconfig::language} ) or $form->error( __FILE__ . ':' . __LINE__ . ": Locale not loaded: $!\n" ); +$form->{action} = $form->{nextsub} if (!$form->{action} and $form->{nextsub}); # we use $script for the language module $form->{script} = $script;