Attachment #152581 for bug #34022

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

Lines 145-155 if ($quantityrec > $origquantityrec ) { Link Here

(-)a/acqui/finishreceive.pl (-5 / +5 lines)
145	# now, add items if applicable	145	# now, add items if applicable
146	if ($basket->effective_create_items eq 'receiving') {	146	if ($basket->effective_create_items eq 'receiving') {
147		147
148	my @tags = $input->multi_param('tag');	148	my @tags = $input->multi_param('tag[]');
149	my @subfields = $input->multi_param('subfield');	149	my @subfields = $input->multi_param('subfield[]');
150	my @field_values = $input->multi_param('field_value');	150	my @field_values = $input->multi_param('field_value[]');
151	my @serials = $input->multi_param('serial');	151	my @serials = $input->multi_param('serial[]');
152	my @itemid = $input->multi_param('itemid');	152	my @itemid = $input->multi_param('itemid[]');
153	#Rebuilding ALL the data for items into a hash	153	#Rebuilding ALL the data for items into a hash
154	# parting them on $itemid.	154	# parting them on $itemid.
155	my %itemhash;	155	my %itemhash;




                params['replacementprice'] = row.replacement_price;
                params['unitprice'] = ( invoiceincgst=="1" ) ? ( row.unit_price_tax_included || row.ecost_tax_included ) : ( row.unit_price_tax_excluded || row.ecost_tax_excluded );
                params['order_internalnote'] = row.internal_note;
                if (effective_create_items == 'receiving') {
                    row.items.forEach(function(item){
                        Object.keys(item).forEach(function(item_field){
                            Object.keys(item[item_field]).forEach(function(key){
                                if (!params[key]) params[key] = [];
                                params[key].push(item[item_field][key]);
                                if(!params[key]) params[key] = [];
                                params[key].push(item[key]);
                            });
                        });
                    });
- 

Return to bug 34022

Lines 695-708 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-9 / +6 lines)
695	params['replacementprice'] = row.replacement_price;	695	params['replacementprice'] = row.replacement_price;
696	params['unitprice'] = ( invoiceincgst=="1" ) ? ( row.unit_price_tax_included \|\| row.ecost_tax_included ) : ( row.unit_price_tax_excluded \|\| row.ecost_tax_excluded );	696	params['unitprice'] = ( invoiceincgst=="1" ) ? ( row.unit_price_tax_included \|\| row.ecost_tax_included ) : ( row.unit_price_tax_excluded \|\| row.ecost_tax_excluded );
697	params['order_internalnote'] = row.internal_note;	697	params['order_internalnote'] = row.internal_note;
698	if(effective_create_items == 'receiving') {	698	if (effective_create_items == 'receiving') {
699	Object.keys(row.items).forEach(function(key) {	699	row.items.forEach(function(item){
700	var item = row.items[key];	700	Object.keys(item).forEach(function(item_field){
701	Object.keys(item).forEach(function(key) {	701	Object.keys(item[item_field]).forEach(function(key){
702	var field = item[key];	702	if (!params[key]) params[key] = [];
703	Object.keys(field).forEach(function(key) {	703	params[key].push(item[item_field][key]);
704	if(!params[key]) params[key] = [];
705	params[key].push(item[key]);
706	});	704	});
707	});	705	});
708	});	706	});
709	-