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

(-)a/acqui/neworderempty.pl (+1 lines)
Lines 347-352 $template->param( Link Here
347 
    quantity         => $data->{'quantity'},
 347 
    quantity         => $data->{'quantity'},
348 
    quantityrec      => $data->{'quantity'},
 348 
    quantityrec      => $data->{'quantity'},
349 
    rrp              => $data->{'rrp'},
 349 
    rrp              => $data->{'rrp'},
350 
    discount         => $data->{'discount'},
350 
    listprice        => sprintf("%.2f", $data->{'listprice'}||$listprice),
 351 
    listprice        => sprintf("%.2f", $data->{'listprice'}||$listprice),
351 
    total            => sprintf("%.2f", ($data->{'ecost'}||0)*($data->{'quantity'}||0) ),
 352 
    total            => sprintf("%.2f", ($data->{'ecost'}||0)*($data->{'quantity'}||0) ),
352 
    ecost            => $data->{'ecost'},
 353 
    ecost            => $data->{'ecost'},
(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
Lines 2522-2527 CREATE TABLE `aqorders` ( Link Here
2522 
  `currency` varchar(3) default NULL,
 2522 
  `currency` varchar(3) default NULL,
2523 
  `listprice` decimal(28,6) default NULL,
 2523 
  `listprice` decimal(28,6) default NULL,
2524 
  `totalamount` decimal(28,6) default NULL,
 2524 
  `totalamount` decimal(28,6) default NULL,
2525 
  `discount` float(6,4) default 0,
2525 
  `datereceived` date default NULL,
 2526 
  `datereceived` date default NULL,
2526 
  `booksellerinvoicenumber` mediumtext,
 2527 
  `booksellerinvoicenumber` mediumtext,
2527 
  `freight` decimal(28,6) default NULL,
 2528 
  `freight` decimal(28,6) default NULL,
(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
Lines 3701-3706 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
3701 
    SetVersion ($DBversion);
 3701 
    SetVersion ($DBversion);
3702 
}
 3702 
}
3703 

          3703
          

        

            

              
              
              3704
              
$DBversion = "3.01.00.146";

            

            

              3705
              
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {

            

            

              3706
              
    $dbh->do('ALTER TABLE aqorders ADD COLUMN discount FLOAT(6,4) DEFAULT NULL;');

            

            

              3707
              
    print "Upgrade to $DBversion done (Add 'discount' column on aqorders)\n";

            

            

              3708
              
    SetVersion ($DBversion);

            

            

              3709
              
}

            

            

              3710
              

            

            

              3711
              

            

        

          3704
          
=item DropAllForeignKeys($table)

          3712
          
=item DropAllForeignKeys($table)

        

        

          3705
          

          3713
          

        

        

          3706
          
  Drop all foreign keys of the table $table

          3714
          
  Drop all foreign keys of the table $table

        



(-)a/kohaversion.pl
      (-2 / +1 lines)




  

    
      
            Lines 11-17
          use strict;
      
      
        Link Here
      
    
  

        

          11
          

          11
          

        

        

          12
          
sub kohaversion {

          12
          
sub kohaversion {

        

        

          13
          

          13
          

        

          
            

              14
              
    our $VERSION = '3.01.00.145';


              14
              
    our $VERSION = '3.01.00.146';

            

        

          15
          

          15
          

        

        

          16
          
    # version needs to be set this way

          16
          
    # version needs to be set this way

        

        

          17
          
    # so that it can be picked up by Makefile.PL

          17
          
    # so that it can be picked up by Makefile.PL

        

            

              18
              
- 

              
              
            






  

  Return to bug 5173