Attachment #111084 for bug #24190

View | Details | Raw Unified | Return to bug 24190
Collapse All | Expand All




    my @encumber_open  = $input->multi_param('encumber_open');
    my %e_open = map { $_ => 1 } @encumber_open;

    my @keys = ('adjustment', 'reason', 'budget_id', 'encumber_open');
    for( my $i=0; $i < scalar @adjustment; $i++ ){
        if( $adjustment_id[$i] eq 'new' ){
            next unless ( $adjustment[$i] || $reason[$i] );
            my $adj = {
                invoiceid => $invoiceid,
                adjustment => $adjustment[$i],
                reason => $reason[$i],
                note => $note[$i],
                budget_id => $budget_id[$i] || undef,
                encumber_open => defined $e_open{ $adjustment_id[$i] } ? 1 : 0,
            };
            my $new_adj = Koha::Acquisition::Invoice::Adjustment->new($adj);
            $new_adj->store();
            # Log this addition
            if (C4::Context->preference("AcqLog")) {

Lines 194-200 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-2 / +1 lines)
194	<label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>	194	<label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
195	[% END %]	195	[% END %]
196		196
197	[% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' ] %]	197	[% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' ] %]
198	[% IF actions.grep(actx).size %]	198	[% IF actions.grep(actx).size %]
199	<label for="action[% actx \| html %]" class="viewlog"><input type="checkbox" id="action[% actx \| html %]" name="actions" value="[% actx \| html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>	199	<label for="action[% actx \| html %]" class="viewlog"><input type="checkbox" id="action[% actx \| html %]" name="actions" value="[% actx \| html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
200	[% ELSE %]	200	[% ELSE %]
201	-

Return to bug 24190

Lines 175-193 elsif ( $op && $op eq 'mod_adj' ) { Link Here

(-)a/acqui/invoice.pl (-4 / +4 lines)
175	my @encumber_open = $input->multi_param('encumber_open');	175	my @encumber_open = $input->multi_param('encumber_open');
176	my %e_open = map { $_ => 1 } @encumber_open;	176	my %e_open = map { $_ => 1 } @encumber_open;
177		177
178	my @keys = ('adjustment', 'reason', 'budget_id', 'encumber_open');	178	my @keys = ('adjustment', 'reason', 'budget_id', 'encumber_open');
179	for( my $i=0; $i < scalar @adjustment; $i++ ){	179	for( my $i=0; $i < scalar @adjustment; $i++ ){
180	if( $adjustment_id[$i] eq 'new' ){	180	if( $adjustment_id[$i] eq 'new' ){
181	next unless ( $adjustment[$i] \|\| $reason[$i] );	181	next unless ( $adjustment[$i] \|\| $reason[$i] );
182	my $adj = {	182	my $adj = {
183	invoiceid => $invoiceid,	183	invoiceid => $invoiceid,
184	adjustment => $adjustment[$i],	184	adjustment => $adjustment[$i],
185	reason => $reason[$i],	185	reason => $reason[$i],
186	note => $note[$i],	186	note => $note[$i],
187	budget_id => $budget_id[$i] \|\| undef,	187	budget_id => $budget_id[$i] \|\| undef,
188	encumber_open => defined $e_open{ $adjustment_id[$i] } ? 1 : 0,	188	encumber_open => defined $e_open{ $adjustment_id[$i] } ? 1 : 0,
189	};	189	};
190	my $new_adj = Koha::Acquisition::Invoice::Adjustment->new($adj);	190	my $new_adj = Koha::Acquisition::Invoice::Adjustment->new($adj);
191	$new_adj->store();	191	$new_adj->store();
192	# Log this addition	192	# Log this addition
193	if (C4::Context->preference("AcqLog")) {	193	if (C4::Context->preference("AcqLog")) {