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

(-)a/acqui/parcel.pl (+1 lines)
Lines 124-129 my $total_tax_included = 0; Link Here
124 
my $subtotal_for_funds;
 124 
my $subtotal_for_funds;
125 
for my $order ( @orders ) {
 125 
for my $order ( @orders ) {
126 
    $order->{'unitprice'} += 0;
 126 
    $order->{'unitprice'} += 0;
127 
    $order->{'booksellerid'} = $booksellerid; # required for basket group links
127 

          128
          

        

        

          128
          
    if ( $bookseller->invoiceincgst ) {

          129
          
    if ( $bookseller->invoiceincgst ) {

        

        

          129
          
        $order->{ecost}     = $order->{ecost_tax_included};

          130
          
        $order->{ecost}     = $order->{ecost_tax_included};

        



(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
      (-3 / +2 lines)




  

    
      
            Lines 133-139
          
      
      
        Link Here
      
    
  

        

          133
          
                <td class="basketfilterclass">[% loop_order.basketname | html %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno | html %]">[% loop_order.basketno | html %]</a>)</td>

          133
          
                <td class="basketfilterclass">[% loop_order.basketname | html %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno | html %]">[% loop_order.basketno | html %]</a>)</td>

        

        

          134
          
                <td>

          134
          
                <td>

        

        

          135
          
                  [% IF loop_order.basketgroupid %]

          135
          
                  [% IF loop_order.basketgroupid %]

        

          
            

              136
              
                    [% loop_order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% loop_order.booksellerid | html %]">[% loop_order.basketgroupid | html %]</a>)


              136
              
                    [% loop_order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% loop_order.booksellerid | html %]&basketgroupid=[% loop_order.basketgroupid | html %]">[% loop_order.basketgroupid | html %]</a>)

            

        

          137
          
                  [% ELSE %]

          137
          
                  [% ELSE %]

        

        

          138
          
                    No basket group

          138
          
                    No basket group

        

        

          139
          
                  [% END %]

          139
          
                  [% END %]

        

  

    
      
            Lines 280-286
          
      
      
        Link Here
      
    
  

        

          280
          
                <td>[% order.basketname | html %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% order.basketno | html %]">[% order.basketno | html %]</a>)</td>

          280
          
                <td>[% order.basketname | html %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% order.basketno | html %]">[% order.basketno | html %]</a>)</td>

        

        

          281
          
                <td>

          281
          
                <td>

        

        

          282
          
                  [% IF order.basketgroupid %]

          282
          
                  [% IF order.basketgroupid %]

        

          
            

              283
              
                    [% order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% order.booksellerid | html %]">[% order.basketgroupid | html %]</a>)


              283
              
                    [% order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% order.booksellerid | html %]&basketgroupid=[% loop_order.basketgroupid | html %]">[% order.basketgroupid | html %]</a>)

            

        

          284
          
                  [% ELSE %]

          284
          
                  [% ELSE %]

        

        

          285
          
                    No basket group

          285
          
                    No basket group

        

        

          286
          
                  [% END %]

          286
          
                  [% END %]

        

            

              287
              
- 

              
              
            






  

  Return to bug 21659