Attachment #11120 for bug #5356

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




=head3 NewBasket

  $basket = &NewBasket( $booksellerid, $authorizedby, $basketname, 
      $basketnote, $basketbooksellernote, $basketcontractnumber, $deliveryplace, $billingplace );

Create a new basket in aqbasket table



=cut

# FIXME : this function seems to be unused.

sub NewBasket {
    my ( $booksellerid, $authorisedby, $basketname, $basketnote, $basketbooksellernote, $basketcontractnumber, $deliveryplace, $billingplace ) = @_;
    my $dbh = C4::Context->dbh;
    my $query = "
        INSERT INTO aqbasket

    $dbh->do($query);
#find & return basketno MYSQL dependant, but $dbh->last_insert_id always returns null :-(
    my $basket = $dbh->{'mysql_insertid'};
    ModBasketHeader($basket, $basketname || '', $basketnote || '', $basketbooksellernote || '', $basketcontractnumber || undef, $booksellerid, $deliveryplace || undef, $billingplace || undef );
    return $basket;
}


            notes => $order->{'notes'},
            quantity => $order->{'quantity'},
            rrp => $order->{'rrp'},
            deliveryplace => C4::Branch::GetBranchName( $basket->{'deliveryplace'} ),
            billingplace => C4::Branch::GetBranchName( $basket->{'billingplace'} ),
        };
        foreach(qw(
            contractname author title publishercode collectiontitle notes

        my @orders     = GetOrders( $$basket{basketno} );
        my $contract   = GetContract( $$basket{contractnumber} );
        my $bookseller = GetBookSellerFromId( $$basket{booksellerid} );
        my $basketgroup = GetBasketgroup( $$basket{basketgroupid} );

        foreach my $order (@orders) {
            my $bd = GetBiblioData( $order->{'biblionumber'} );

                booksellerpostal => $bookseller->{postal},
                contractnumber => $contract->{contractnumber},
                contractname => $contract->{contractname},
                basketgroupdeliveryplace => C4::Branch::GetBranchName( $basketgroup->{deliveryplace} ) || C4::Branch::GetBranchName( $basketgroup->{freedeliveryplace} ),
                basketgroupbillingplace => C4::Branch::GetBranchName( $basketgroup->{billingplace} ),
                basketdeliveryplace => C4::Branch::GetBranchName( $basket->{deliveryplace} ),
                basketbillingplace => C4::Branch::GetBranchName( $basket->{billingplace} ),
            };
            foreach(qw(
                basketname author title publishercode collectiontitle notes


=item C<$booksellerid> is the id (foreign) key in the "aqbooksellers" table for the vendor.

=item C<$deliveryplace> is the "deliveryplace" field in the aqbasket table.

=item C<$billingplace> is the "billingplace" field in the aqbasket table.

=back

=cut

sub ModBasketHeader {
    my ($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid, $deliveryplace, $billingplace) = @_;
    my $query = qq{
        UPDATE aqbasket
        SET basketname=?, note=?, booksellernote=?, booksellerid=?, deliveryplace=?, billingplace=?
        WHERE basketno=?
    };

    my $query = "UPDATE aqbasket SET basketname=?, note=?, booksellernote=?, booksellerid=? WHERE basketno=?";
    my $dbh = C4::Context->dbh;
    my $sth = $dbh->prepare($query);
    $sth->execute($basketname, $note, $booksellernote, $booksellerid, $deliveryplace, $billingplace, $basketno);

    if ( $contractnumber ) {
        my $query2 ="UPDATE aqbasket SET contractnumber=? WHERE basketno=?";

Lines 130-135 if ( $op eq 'delete_confirm' ) { Link Here

(-)a/acqui/basket.pl (+13 lines)
130	authorisedby => $basket->{authorisedby},	130	authorisedby => $basket->{authorisedby},
131	authorisedbyname => $basket->{authorisedbyname},	131	authorisedbyname => $basket->{authorisedbyname},
132	closedate => $basket->{closedate},	132	closedate => $basket->{closedate},
		133	deliveryplace => $basket->{deliveryplace} \|\| $basket->{freedeliveryplace},
		134	billingplace => $basket->{billingplace},
133	active => $bookseller->{'active'},	135	active => $bookseller->{'active'},
134	booksellerid => $bookseller->{'id'},	136	booksellerid => $bookseller->{'id'},
135	name => $bookseller->{'name'},	137	name => $bookseller->{'name'},
Lines 357-362 my $total_est_gste; Link Here
357	my $contract = &GetContract($basket->{contractnumber});	359	my $contract = &GetContract($basket->{contractnumber});
358	my @orders = GetOrders($basketno);	360	my @orders = GetOrders($basketno);
359		361
		362	if ($basket->{basketgroupid}){
		363	my $basketgroup = GetBasketgroup($basket->{basketgroupid});
		364	for my $key (keys %$basketgroup ){
		365	$basketgroup->{"basketgroup$key"} = delete $basketgroup->{$key};
		366	}
		367	$basketgroup->{basketgroupdeliveryplace} = C4::Branch::GetBranchName( $basketgroup->{basketgroupdeliveryplace} );
		368	$basketgroup->{basketgroupbillingplace} = C4::Branch::GetBranchName( $basketgroup->{basketgroupbillingplace} );
		369	$template->param(%$basketgroup);
		370	}
360	my $borrower= GetMember('borrowernumber' => $loggedinuser);	371	my $borrower= GetMember('borrowernumber' => $loggedinuser);
361	my $budgets = GetBudgetHierarchy;	372	my $budgets = GetBudgetHierarchy;
362	my $has_budgets = 0;	373	my $has_budgets = 0;
Lines 387-392 my $total_est_gste; Link Here
387	authorisedbyname => $basket->{authorisedbyname},	398	authorisedbyname => $basket->{authorisedbyname},
388	closedate => $basket->{closedate},	399	closedate => $basket->{closedate},
389	estimateddeliverydate=> $estimateddeliverydate,	400	estimateddeliverydate=> $estimateddeliverydate,
		401	deliveryplace => C4::Branch::GetBranchName( $basket->{deliveryplace} ) \|\| C4::Branch::GetBranchName( $basket->{freedeliveryplace} ),
		402	billingplace => C4::Branch::GetBranchName( $basket->{billingplace} ),
390	active => $bookseller->{'active'},	403	active => $bookseller->{'active'},
391	booksellerid => $bookseller->{'id'},	404	booksellerid => $bookseller->{'id'},
392	name => $bookseller->{'name'},	405	name => $bookseller->{'name'},




        my $borrower = GetMember( ( 'borrowernumber' => $loggedinuser ) );
        $billingplace  = $billingplace  || $borrower->{'branchcode'};
        $deliveryplace = $deliveryplace || $borrower->{'branchcode'};

        my $branches = C4::Branch::GetBranchesLoop( $billingplace );
        $template->param( billingplaceloop => $branches );
        $branches = C4::Branch::GetBranchesLoop( $deliveryplace );
        $template->param( deliveryplaceloop => $branches );
        for (sort keys %$branches) {
            push @billingplaceloop, {
                value      => $_,
                selected   => $_ eq $billingplace,
                branchname => $branches->{$_}->{branchname},
            };
        }
        $template->param( billingplaceloop => \@billingplaceloop );
        
        # Build the combobox to select the delivery place
        my @deliveryplaceloop;
        for (sort keys %$branches) {
            push @deliveryplaceloop, {
                value      => $_,
                selected   => $_ eq $deliveryplace,
                branchname => $branches->{$_}->{branchname},
            };
        }
        $template->param( deliveryplaceloop => \@deliveryplaceloop );

        $template->param( booksellerid => $booksellerid );
    }




use CGI;
use C4::Context;
use C4::Auth;
use C4::Branch;
use C4::Output;
use C4::Acquisition qw/GetBasket NewBasket GetContracts ModBasketHeader/;
use C4::Bookseller qw/GetBookSellerFromId GetBookSeller/;

#parameters:
my $booksellerid = $input->param('booksellerid');
my $basketno = $input->param('basketno');
my $branches = GetBranches;
my $basket;
my $op = $input ->param('op');
my $is_an_edit= $input ->param('is_an_edit');

        $template->param(contractloop => \@contractloop,
                         basketcontractnumber => $basket->{'contractnumber'});
    }
    my @booksellers = C4::Bookseller::GetBookSeller();
    $template->param( add_form => 1,
                    basketname => $basket->{'basketname'},
                    basketnote => $basket->{'note'},

                    booksellerid => $booksellerid,
                    basketno => $basketno,
                    booksellers => \@booksellers,
                    deliveryplace => $basket->{deliveryplace},
                    billingplace => $basket->{billingplace},
    );

    my $billingplace = $basket->{'billingplace'} || C4::Context->userenv->{"branch"};
    my $deliveryplace = $basket->{'deliveryplace'} || C4::Context->userenv->{"branch"};

    # Build the combobox to select the billing place
    my @billingplaceloop;

    my $branches = C4::Branch::GetBranchesLoop( $billingplace );
    $template->param( billingplaceloop => $branches );
    $branches = C4::Branch::GetBranchesLoop( $deliveryplace );
    $template->param( deliveryplaceloop => $branches );

#End Edit
} elsif ( $op eq 'add_validate' ) {
#we are confirming the changes, save the basket
    my $basketno;
    if ( $is_an_edit ) {
        ModBasketHeader(
            $basketno,
            $input->param('basketname'),
            $input->param('basketnote'),
            $input->param('basketbooksellernote'),
            $input->param('basketcontractnumber') || undef,
            $input->param('basketbooksellerid'),
            $input->param('deliveryplace'),
            $input->param('billingplace'),
        );
    } else { #New basket
        $basketno = NewBasket(
            $booksellerid,
            $loggedinuser,
            $input->param('basketname'),
            $input->param('basketnote'),
            $input->param('basketbooksellernote'),
            $input->param('basketcontractnumber') || undef,
            undef,
            $input->param('deliveryplace'),
            $input->param('billingplace'),
        );
    }
    print $input->redirect('basket.pl?basketno='.$basketno);
    exit 0;

Lines 2567-2572 CREATE TABLE `aqbasket` ( -- stores data about baskets in acquisitions Link Here

(-)a/installer/data/mysql/kohastructure.sql (+3 lines)
2567	`authorisedby` varchar(10) default NULL, -- the borrowernumber of the person who created the basket	2567	`authorisedby` varchar(10) default NULL, -- the borrowernumber of the person who created the basket
2568	`booksellerinvoicenumber` mediumtext, -- appears to always be NULL	2568	`booksellerinvoicenumber` mediumtext, -- appears to always be NULL
2569	`basketgroupid` int(11), -- links this basket to its group (aqbasketgroups.id)	2569	`basketgroupid` int(11), -- links this basket to its group (aqbasketgroups.id)
		2570	`deliveryplace` varchar(10) default NULL, -- basket delivery place
		2571	`billingplace` varchar(10) default NULL, -- basket billing place
		2572	`freedeliveryplace` VARCHAR(10) default NULL, -- basket freedelivery place
2570	PRIMARY KEY (`basketno`),	2573	PRIMARY KEY (`basketno`),
2571	KEY `booksellerid` (`booksellerid`),	2574	KEY `booksellerid` (`booksellerid`),
2572	KEY `basketgroupid` (`basketgroupid`),	2575	KEY `basketgroupid` (`basketgroupid`),

Lines 5556-5561 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+9 lines)
5556	SetVersion($DBversion);	5556	SetVersion($DBversion);
5557	}	5557	}
5558		5558
		5559	$DBversion = "3.09.00.XXX";
		5560	if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
		5561	$dbh->do("ALTER TABLE aqbasket ADD deliveryplace VARCHAR(10) default NULL AFTER basketgroupid;");
		5562	$dbh->do("ALTER TABLE aqbasket ADD billingplace VARCHAR(10) default NULL AFTER deliveryplace;");
		5563	$dbh->do("ALTER TABLE aqbasket ADD freedeliveryplace VARCHAR(10) default NULL AFTER billingplace;");
		5564	print "Upgrade to $DBversion done (Added billingplace, deliveryplace and freedeliveryplaceto aqbasket)\n";
		5565	SetVersion($DBversion);
		5566	}
		5567
5559	=head1 FUNCTIONS	5568	=head1 FUNCTIONS
5560		5569
5561	=head2 TableExists($table)	5570	=head2 TableExists($table)

Lines 149-159 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (+6 lines)
149	// YUI Toolbar Functions	149	// YUI Toolbar Functions
150	function yuiToolbar() {	150	function yuiToolbar() {
151	new YAHOO.widget.Button("reopenbutton");	151	new YAHOO.widget.Button("reopenbutton");
		152	new YAHOO.widget.Button("exportbutton");
152	}	153	}
153	//]]>	154	//]]>
154	</script>	155	</script>
155	<ul id="toolbar-list" class="toolbar">	156	<ul id="toolbar-list" class="toolbar">
156	<li><a href="javascript:confirm_reopen([% skip_confirm_reopen %]);" class="button" id="reopenbutton">Reopen this basket</a></li>	157	<li><a href="javascript:confirm_reopen([% skip_confirm_reopen %]);" class="button" id="reopenbutton">Reopen this basket</a></li>
		158	<li><a href="[% script_name %]?op=export&basketno=[% basketno %]&booksellerid=[% booksellerid %]" class="button" id="exportbutton">Export this basket as CSV</a></li>
157	</ul>	159	</ul>
158	</div>	160	</div>
159	[% END %]	161	[% END %]
Lines 192-197 Link Here
192	[% IF ( basketcontractno ) %]	194	[% IF ( basketcontractno ) %]
193	<li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&contractnumber=[% basketcontractno %]&booksellerid=[% booksellerid %]">[% basketcontractname %]</a></li>	195	<li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&contractnumber=[% basketcontractno %]&booksellerid=[% booksellerid %]">[% basketcontractname %]</a></li>
194	[% END %]	196	[% END %]
		197	[% IF ( deliveryplace ) %]<li><span class="label">Delivery place:</span> [% deliveryplace %]</li>[% END %]
		198	[% IF ( billingplace ) %]<li><span class="label">Billing place:</span> [% billingplace %]</li>[% END %]
195	[% IF ( authorisedbyname ) %]<li><span class="label">Managed by:</span> [% authorisedbyname %]</li>[% END %]	199	[% IF ( authorisedbyname ) %]<li><span class="label">Managed by:</span> [% authorisedbyname %]</li>[% END %]
196	[% IF ( creationdate ) %]<li><span class="label">Opened on:</span> [% creationdate \| $KohaDates %]</li>[% END %]	200	[% IF ( creationdate ) %]<li><span class="label">Opened on:</span> [% creationdate \| $KohaDates %]</li>[% END %]
197	[% IF ( closedate ) %]<li><span class="label">Closed on:</span> [% closedate \| $KohaDates %]</li>[% END %]	201	[% IF ( closedate ) %]<li><span class="label">Closed on:</span> [% closedate \| $KohaDates %]</li>[% END %]
Lines 221-226 Link Here
221	<input type="submit" value="Change basket group" /></p>	225	<input type="submit" value="Change basket group" /></p>
222		226
223	</form>	227	</form>
		228	[% IF ( basketgroupdeliveryplace ) %]<p>Basketgroup Delivery place: [% basketgroupdeliveryplace %]</p>[% END %]
		229	[% IF ( basketgroupbillingplace ) %]<p>Basketgroup Billing place: [% basketgroupbillingplace %]</p>[% END %]
224	</div>	230	</div>
225	[% END %]	231	[% END %]
226	</div>	232	</div>

Lines 203-208 function yuiToolbar() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (+1 lines)
203	<input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" /></li>	203	<input type="text" name="basketgroupname" id="basketgroupname" value="[% name %]" /></li>
204	<li><label for="billingplace">Billing place:</label>	204	<li><label for="billingplace">Billing place:</label>
205	<select name="billingplace" id="billingplace" style="width:13em;">	205	<select name="billingplace" id="billingplace" style="width:13em;">
		206	<option value="">--</option>
206	[% FOREACH billingplaceloo IN billingplaceloop %]	207	[% FOREACH billingplaceloo IN billingplaceloop %]
207	[% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option>	208	[% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option>
208	[% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%]	209	[% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%]




                    <label for="basketname" class="required">Basket name</label> &nbsp;
                        <input type="text" name="basketname" id="basketname" size="40" maxlength="80" value="[% basketname %]" />
                </li>
                 <li>
                    <label for="billingplace">Billing Place:</label>
                    <select name="billingplace" id="billingplace">
                        <option value="">--</option>
                        [% FOREACH billingplace IN billingplaceloop %]
                            <option value="[% billingplace.value %]"[% IF ( billingplace.selected ) %] selected="selected"[% END %]>
                                [% billingplace.branchname %]
                            </option>
                        [% END %]
                    </select>
                </li>
                <li>
                    <label for="deliveryplace">Delivery  Place:</label>
                    <select name="deliveryplace" id="deliveryplace">
                        <option value="">--</option>
                        [% FOREACH deliveryplace IN deliveryplaceloop %]
                            <option value="[% deliveryplace.value %]"[% IF ( deliveryplace.selected ) %] selected="selected"[% END %]>
                                [% deliveryplace.branchname %]
                            </option>
                        [% END %]
                    </select>
                </li>
                <li>
                    <label for="basketbooksellerid">Vendor</label> &nbsp;
                    <select name="basketbooksellerid" id="basketbooksellerid">
- 

Return to bug 5356

Lines 165-171 sub GetBasket { Link Here

(-)a/C4/Acquisition.pm (-10 / +21 lines)
165	=head3 NewBasket	165	=head3 NewBasket
166		166
167	$basket = &NewBasket( $booksellerid, $authorizedby, $basketname,	167	$basket = &NewBasket( $booksellerid, $authorizedby, $basketname,
168	$basketnote, $basketbooksellernote, $basketcontractnumber );	168	$basketnote, $basketbooksellernote, $basketcontractnumber, $deliveryplace, $billingplace );
169		169
170	Create a new basket in aqbasket table	170	Create a new basket in aqbasket table
171		171
Lines 181-190 The other parameters are optional, see ModBasketHeader for more info on them. Link Here
181		181
182	=cut	182	=cut
183		183
184	# FIXME : this function seems to be unused.
185
186	sub NewBasket {	184	sub NewBasket {
187	my ( $booksellerid, $authorisedby, $basketname, $basketnote, $basketbooksellernote, $basketcontractnumber ) = @_;	185	my ( $booksellerid, $authorisedby, $basketname, $basketnote, $basketbooksellernote, $basketcontractnumber, $deliveryplace, $billingplace ) = @_;
188	my $dbh = C4::Context->dbh;	186	my $dbh = C4::Context->dbh;
189	my $query = "	187	my $query = "
190	INSERT INTO aqbasket	188	INSERT INTO aqbasket
Lines 195-201 sub NewBasket { Link Here
195	$dbh->do($query);	193	$dbh->do($query);
196	#find & return basketno MYSQL dependant, but $dbh->last_insert_id always returns null :-(	194	#find & return basketno MYSQL dependant, but $dbh->last_insert_id always returns null :-(
197	my $basket = $dbh->{'mysql_insertid'};	195	my $basket = $dbh->{'mysql_insertid'};
198	ModBasketHeader($basket, $basketname \|\| '', $basketnote \|\| '', $basketbooksellernote \|\| '', $basketcontractnumber \|\| undef, $booksellerid);	196	ModBasketHeader($basket, $basketname \|\| '', $basketnote \|\| '', $basketbooksellernote \|\| '', $basketcontractnumber \|\| undef, $booksellerid, $deliveryplace \|\| undef, $billingplace \|\| undef );
199	return $basket;	197	return $basket;
200	}	198	}
201		199
Lines 257-264 sub GetBasketAsCSV { Link Here
257	notes => $order->{'notes'},	255	notes => $order->{'notes'},
258	quantity => $order->{'quantity'},	256	quantity => $order->{'quantity'},
259	rrp => $order->{'rrp'},	257	rrp => $order->{'rrp'},
260	deliveryplace => $basket->{'deliveryplace'},	258	deliveryplace => C4::Branch::GetBranchName( $basket->{'deliveryplace'} ),
261	billingplace => $basket->{'billingplace'}	259	billingplace => C4::Branch::GetBranchName( $basket->{'billingplace'} ),
262	};	260	};
263	foreach(qw(	261	foreach(qw(
264	contractname author title publishercode collectiontitle notes	262	contractname author title publishercode collectiontitle notes
Lines 307-312 sub GetBasketGroupAsCSV { Link Here
307	my @orders = GetOrders( $$basket{basketno} );	305	my @orders = GetOrders( $$basket{basketno} );
308	my $contract = GetContract( $$basket{contractnumber} );	306	my $contract = GetContract( $$basket{contractnumber} );
309	my $bookseller = GetBookSellerFromId( $$basket{booksellerid} );	307	my $bookseller = GetBookSellerFromId( $$basket{booksellerid} );
		308	my $basketgroup = GetBasketgroup( $$basket{basketgroupid} );
310		309
311	foreach my $order (@orders) {	310	foreach my $order (@orders) {
312	my $bd = GetBiblioData( $order->{'biblionumber'} );	311	my $bd = GetBiblioData( $order->{'biblionumber'} );
Lines 331-336 sub GetBasketGroupAsCSV { Link Here
331	booksellerpostal => $bookseller->{postal},	330	booksellerpostal => $bookseller->{postal},
332	contractnumber => $contract->{contractnumber},	331	contractnumber => $contract->{contractnumber},
333	contractname => $contract->{contractname},	332	contractname => $contract->{contractname},
		333	basketgroupdeliveryplace => C4::Branch::GetBranchName( $basketgroup->{deliveryplace} ) \|\| C4::Branch::GetBranchName( $basketgroup->{freedeliveryplace} ),
		334	basketgroupbillingplace => C4::Branch::GetBranchName( $basketgroup->{billingplace} ),
		335	basketdeliveryplace => C4::Branch::GetBranchName( $basket->{deliveryplace} ),
		336	basketbillingplace => C4::Branch::GetBranchName( $basket->{billingplace} ),
334	};	337	};
335	foreach(qw(	338	foreach(qw(
336	basketname author title publishercode collectiontitle notes	339	basketname author title publishercode collectiontitle notes
Lines 478-494 Modifies a basket's header. Link Here
478		481
479	=item C<$booksellerid> is the id (foreign) key in the "aqbooksellers" table for the vendor.	482	=item C<$booksellerid> is the id (foreign) key in the "aqbooksellers" table for the vendor.
480		483
		484	=item C<$deliveryplace> is the "deliveryplace" field in the aqbasket table.
		485
		486	=item C<$billingplace> is the "billingplace" field in the aqbasket table.
		487
481	=back	488	=back
482		489
483	=cut	490	=cut
484		491
485	sub ModBasketHeader {	492	sub ModBasketHeader {
486	my ($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid) = @_;	493	my ($basketno, $basketname, $note, $booksellernote, $contractnumber, $booksellerid, $deliveryplace, $billingplace) = @_;
		494	my $query = qq{
		495	UPDATE aqbasket
		496	SET basketname=?, note=?, booksellernote=?, booksellerid=?, deliveryplace=?, billingplace=?
		497	WHERE basketno=?
		498	};
487		499
488	my $query = "UPDATE aqbasket SET basketname=?, note=?, booksellernote=?, booksellerid=? WHERE basketno=?";
489	my $dbh = C4::Context->dbh;	500	my $dbh = C4::Context->dbh;
490	my $sth = $dbh->prepare($query);	501	my $sth = $dbh->prepare($query);
491	$sth->execute($basketname,$note,$booksellernote,$booksellerid,$basketno);	502	$sth->execute($basketname, $note, $booksellernote, $booksellerid, $deliveryplace, $billingplace, $basketno);
492		503
493	if ( $contractnumber ) {	504	if ( $contractnumber ) {
494	my $query2 ="UPDATE aqbasket SET contractnumber=? WHERE basketno=?";	505	my $query2 ="UPDATE aqbasket SET contractnumber=? WHERE basketno=?";

Lines 328-357 if ( $op eq "add" ) { Link Here

(-)a/acqui/basketgroup.pl (-24 / +5 lines)
328	my $borrower = GetMember( ( 'borrowernumber' => $loggedinuser ) );	328	my $borrower = GetMember( ( 'borrowernumber' => $loggedinuser ) );
329	$billingplace = $billingplace \|\| $borrower->{'branchcode'};	329	$billingplace = $billingplace \|\| $borrower->{'branchcode'};
330	$deliveryplace = $deliveryplace \|\| $borrower->{'branchcode'};	330	$deliveryplace = $deliveryplace \|\| $borrower->{'branchcode'};
331		331
332	my $branches = GetBranches;	332	my $branches = C4::Branch::GetBranchesLoop( $billingplace );
333		333	$template->param( billingplaceloop => $branches );
334	# Build the combobox to select the billing place	334	$branches = C4::Branch::GetBranchesLoop( $deliveryplace );
335	my @billingplaceloop;	335	$template->param( deliveryplaceloop => $branches );
336	for (sort keys %$branches) {
337	push @billingplaceloop, {
338	value => $_,
339	selected => $_ eq $billingplace,
340	branchname => $branches->{$_}->{branchname},
341	};
342	}
343	$template->param( billingplaceloop => \@billingplaceloop );
344
345	# Build the combobox to select the delivery place
346	my @deliveryplaceloop;
347	for (sort keys %$branches) {
348	push @deliveryplaceloop, {
349	value => $_,
350	selected => $_ eq $deliveryplace,
351	branchname => $branches->{$_}->{branchname},
352	};
353	}
354	$template->param( deliveryplaceloop => \@deliveryplaceloop );
355		336
356	$template->param( booksellerid => $booksellerid );	337	$template->param( booksellerid => $booksellerid );
357	}	338	}

Lines 50-55 use warnings; Link Here

(-)a/acqui/basketheader.pl (-6 / +39 lines)
50	use CGI;	50	use CGI;
51	use C4::Context;	51	use C4::Context;
52	use C4::Auth;	52	use C4::Auth;
		53	use C4::Branch;
53	use C4::Output;	54	use C4::Output;
54	use C4::Acquisition qw/GetBasket NewBasket GetContracts ModBasketHeader/;	55	use C4::Acquisition qw/GetBasket NewBasket GetContracts ModBasketHeader/;
55	use C4::Bookseller qw/GetBookSellerFromId GetBookSeller/;	56	use C4::Bookseller qw/GetBookSellerFromId GetBookSeller/;
Lines 70-75 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
70	#parameters:	71	#parameters:
71	my $booksellerid = $input->param('booksellerid');	72	my $booksellerid = $input->param('booksellerid');
72	my $basketno = $input->param('basketno');	73	my $basketno = $input->param('basketno');
		74	my $branches = GetBranches;
73	my $basket;	75	my $basket;
74	my $op = $input ->param('op');	76	my $op = $input ->param('op');
75	my $is_an_edit= $input ->param('is_an_edit');	77	my $is_an_edit= $input ->param('is_an_edit');
Lines 100-106 if ( $op eq 'add_form' ) { Link Here
100	$template->param(contractloop => \@contractloop,	102	$template->param(contractloop => \@contractloop,
101	basketcontractnumber => $basket->{'contractnumber'});	103	basketcontractnumber => $basket->{'contractnumber'});
102	}	104	}
103	my @booksellers = GetBookSeller();	105	my @booksellers = C4::Bookseller::GetBookSeller();
104	$template->param( add_form => 1,	106	$template->param( add_form => 1,
105	basketname => $basket->{'basketname'},	107	basketname => $basket->{'basketname'},
106	basketnote => $basket->{'note'},	108	basketnote => $basket->{'note'},
Lines 109-124 if ( $op eq 'add_form' ) { Link Here
109	booksellerid => $booksellerid,	111	booksellerid => $booksellerid,
110	basketno => $basketno,	112	basketno => $basketno,
111	booksellers => \@booksellers,	113	booksellers => \@booksellers,
112	);	114	deliveryplace => $basket->{deliveryplace},
		115	billingplace => $basket->{billingplace},
		116	);
		117
		118	my $billingplace = $basket->{'billingplace'} \|\| C4::Context->userenv->{"branch"};
		119	my $deliveryplace = $basket->{'deliveryplace'} \|\| C4::Context->userenv->{"branch"};
		120
		121	# Build the combobox to select the billing place
		122	my @billingplaceloop;
		123
		124	my $branches = C4::Branch::GetBranchesLoop( $billingplace );
		125	$template->param( billingplaceloop => $branches );
		126	$branches = C4::Branch::GetBranchesLoop( $deliveryplace );
		127	$template->param( deliveryplaceloop => $branches );
		128
113	#End Edit	129	#End Edit
114	} elsif ( $op eq 'add_validate' ) {	130	} elsif ( $op eq 'add_validate' ) {
115	#we are confirming the changes, save the basket	131	#we are confirming the changes, save the basket
116	my $basketno;
117	if ( $is_an_edit ) {	132	if ( $is_an_edit ) {
118	$basketno = $input->param('basketno');	133	ModBasketHeader(
119	ModBasketHeader( $input->param('basketno'), $input->param('basketname'), $input->param('basketnote'), $input->param('basketbooksellernote'), $input->param('basketcontractnumber') \|\| undef, $input->param('basketbooksellerid') );	134	$basketno,
		135	$input->param('basketname'),
		136	$input->param('basketnote'),
		137	$input->param('basketbooksellernote'),
		138	$input->param('basketcontractnumber') \|\| undef,
		139	$input->param('basketbooksellerid'),
		140	$input->param('deliveryplace'),
		141	$input->param('billingplace'),
		142	);
120	} else { #New basket	143	} else { #New basket
121	$basketno = NewBasket($booksellerid, $loggedinuser, $input->param('basketname'), $input->param('basketnote'), $input->param('basketbooksellernote'), $input->param('basketcontractnumber'));	144	$basketno = NewBasket(
		145	$booksellerid,
		146	$loggedinuser,
		147	$input->param('basketname'),
		148	$input->param('basketnote'),
		149	$input->param('basketbooksellernote'),
		150	$input->param('basketcontractnumber') \|\| undef,
		151	undef,
		152	$input->param('deliveryplace'),
		153	$input->param('billingplace'),
		154	);
122	}	155	}
123	print $input->redirect('basket.pl?basketno='.$basketno);	156	print $input->redirect('basket.pl?basketno='.$basketno);
124	exit 0;	157	exit 0;

Lines 125-130 li.list2 { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt (-1 / +22 lines)
125	<label for="basketname" class="required">Basket name</label>	125	<label for="basketname" class="required">Basket name</label>
126	<input type="text" name="basketname" id="basketname" size="40" maxlength="80" value="[% basketname %]" />	126	<input type="text" name="basketname" id="basketname" size="40" maxlength="80" value="[% basketname %]" />
127	</li>	127	</li>
		128	<li>
		129	<label for="billingplace">Billing Place:</label>
		130	<select name="billingplace" id="billingplace">
		131	<option value="">--</option>
		132	[% FOREACH billingplace IN billingplaceloop %]
		133	<option value="[% billingplace.value %]"[% IF ( billingplace.selected ) %] selected="selected"[% END %]>
		134	[% billingplace.branchname %]
		135	</option>
		136	[% END %]
		137	</select>
		138	</li>
		139	<li>
		140	<label for="deliveryplace">Delivery Place:</label>
		141	<select name="deliveryplace" id="deliveryplace">
		142	<option value="">--</option>
		143	[% FOREACH deliveryplace IN deliveryplaceloop %]
		144	<option value="[% deliveryplace.value %]"[% IF ( deliveryplace.selected ) %] selected="selected"[% END %]>
		145	[% deliveryplace.branchname %]
		146	</option>
		147	[% END %]
		148	</select>
		149	</li>
128	<li>	150	<li>
129	<label for="basketbooksellerid">Vendor</label>	151	<label for="basketbooksellerid">Vendor</label>
130	<select name="basketbooksellerid" id="basketbooksellerid">	152	<select name="basketbooksellerid" id="basketbooksellerid">
131	-