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

(-)a/C4/Acquisition.pm (-21 lines)
Lines 93-100 BEGIN { Link Here
93
        &NotifyOrderUsers
93
        &NotifyOrderUsers
94
94
95
        &FillWithDefaultValues
95
        &FillWithDefaultValues
96
97
        &ModNotesOrder
98
    );
96
    );
99
}
97
}
100
98
Lines 1373-1397 sub ModOrder { Link Here
1373
1371
1374
#------------------------------------------------------------#
1372
#------------------------------------------------------------#
1375
1373
1376
=head3 ModNotesOrder
1377
1378
    ModNotesOrder($orders);
1379
1380
Modifies internal and vendor note off all items in orders
1381
1382
=cut
1383
1384
sub ModNotesOrder{
1385
    my $orders = shift;
1386
    my $dbh = C4::Context->dbh;
1387
    my $sth = $dbh->prepare("UPDATE aqorders SET order_internalnote = ?, order_vendornote = ? WHERE ordernumber = ?");
1388
    foreach my $ordernumber (keys %$orders) {
1389
        $sth->execute($orders->{$ordernumber}->{'i'}, $orders->{$ordernumber}->{'v'}, $ordernumber) if ($orders->{$ordernumber}->{'i'} || $orders->{$ordernumber}->{'v'});
1390
    }
1391
}
1392
1393
 #------------------------------------------------------------#
1394
1395
=head3 ModItemOrder
1374
=head3 ModItemOrder
1396
1375
1397
    ModItemOrder($itemnumber, $ordernumber);
1376
    ModItemOrder($itemnumber, $ordernumber);
(-)a/acqui/lateorders-export.pl (-1 / +2 lines)
Lines 53-60 for my $ordernumber ( @ordernumbers ) { Link Here
53
            basketno => $order->{basketno},
53
            basketno => $order->{basketno},
54
            claims_count => $order->{claims_count},
54
            claims_count => $order->{claims_count},
55
            claimed_date => $order->{claimed_date},
55
            claimed_date => $order->{claimed_date},
56
            internalnote => $order->{internaldate},
56
            internalnote => $order->{internalnote},
57
            vendornote   => $order->{vendornote},
57
            vendornote   => $order->{vendornote},
58
            isbn => $order->{isbn},
58
        }
59
        }
59
    ;
60
    ;
60
}
61
}
(-)a/acqui/lateorders.pl (-1 / +11 lines)
Lines 53-58 use C4::Context; Link Here
53
use C4::Acquisition;
53
use C4::Acquisition;
54
use C4::Letters;
54
use C4::Letters;
55
use Koha::DateUtils;
55
use Koha::DateUtils;
56
use Koha::Acquisition:Orders;
56
57
57
my $input = new CGI;
58
my $input = new CGI;
58
my ($template, $loggedinuser, $cookie) = get_template_and_user(
59
my ($template, $loggedinuser, $cookie) = get_template_and_user(
Lines 133-139 if ($op && $op eq "save"){ Link Here
133
            $listorders->{$split[0]}->{$split[1]} = $input->param($order);
134
            $listorders->{$split[0]}->{$split[1]} = $input->param($order);
134
        }
135
        }
135
    }
136
    }
136
    ModNotesOrder($listorders);
137
138
    my $orders_rs = Koha::Acquisition::Orders->search({ ordernumber => [ keys %$listorders ] });
139
    while ( my $order = $orders_rs->next ) {
140
        my $internalnote = $listorders->{$order->ordernumber}->{i};
141
        my $vendornote   = $listorders->{$order->ordernumber}->{v};
142
143
        $order->order_internalnote($internalnote) if defined $internalnote;
144
        $order->order_vendornote($vendornote)     if defined $vendornote;
145
        $order->store;
146
    }
137
}
147
}
138
148
139
my @parameters = ( $delay );
149
my @parameters = ( $delay );
(-)a/admin/columns_settings.yml (+8 lines)
Lines 38-43 modules: Link Here
38
          cannot_be_toggled: 1
38
          cannot_be_toggled: 1
39
          cannot_be_modified: 1
39
          cannot_be_modified: 1
40
        -
40
        -
41
          columnname: order_line
42
        -
41
          columnname: order_date
43
          columnname: order_date
42
        -
44
        -
43
          columnname: estimated_delivery_date
45
          columnname: estimated_delivery_date
Lines 59-64 modules: Link Here
59
          columnname: claims_count
61
          columnname: claims_count
60
        -
62
        -
61
          columnname: claimed_date
63
          columnname: claimed_date
64
        -
65
          columnname: internal_note
66
        -
67
          columnname: vendor_note
68
        -
69
          columnname: isbn
62
70
63
  admin:
71
  admin:
64
    currency:
72
    currency:
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt (-1 / +1 lines)
Lines 1-4 Link Here
1
[%- USE Koha -%]
1
[%- USE Koha -%]
2
[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%]
2
[%- SET delimiter = Koha.Preference( 'delimiter' ) || ',' -%]
3
3
4
[%- BLOCK -%]ORDER DATE[%- delimiter -%]ESTIMATED DELIVERY DATE[%- delimiter -%]VENDOR[%- delimiter -%]INFORMATION[%- delimiter -%]TOTAL COST[%- delimiter -%]BASKET[%- delimiter -%]CLAIMS COUNT[%- delimiter -%]CLAIMED DATE[%- delimiter -%]INTERNAL NOTE[%- delimiter -%]VENDOR NOTE[%- END -%]
4
[%- BLOCK -%]ORDER DATE[%- delimiter -%]ESTIMATED DELIVERY DATE[%- delimiter -%]VENDOR[%- delimiter -%]INFORMATION[%- delimiter -%]TOTAL COST[%- delimiter -%]BASKET[%- delimiter -%]CLAIMS COUNT[%- delimiter -%]CLAIMED DATE[%- delimiter -%]INTERNAL NOTE[%- delimiter -%]VENDOR NOTE[%- delimiter -%]ISBN[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-7 / +15 lines)
Lines 66-71 $(document).ready(function() { Link Here
66
    });
66
    });
67
    // Update all notes
67
    // Update all notes
68
    $("#savenotes").click(function(){
68
    $("#savenotes").click(function(){
69
        $("#savenotes").after("<span id=\"loading\" style=\"margin:4px;\"><img src=\"[% interface %]/[% theme %]/img/loading-small.gif\" alt=\"\" /> "+_("Loading")+"</span>");
69
        var all_nodes = $(late_orderst.fnGetNodes());
70
        var all_nodes = $(late_orderst.fnGetNodes());
70
        var req = new XMLHttpRequest();
71
        var req = new XMLHttpRequest();
71
        var url = '/cgi-bin/koha/acqui/lateorders.pl';
72
        var url = '/cgi-bin/koha/acqui/lateorders.pl';
Lines 73-89 $(document).ready(function() { Link Here
73
        data.append("op","save");
74
        data.append("op","save");
74
        for (var i = 0; i < all_nodes.length; i++) {
75
        for (var i = 0; i < all_nodes.length; i++) {
75
            var order = $(all_nodes[i]).find("input[name='ordernumber']");
76
            var order = $(all_nodes[i]).find("input[name='ordernumber']");
76
            var internalnote = $(all_nodes[i]).find("input[name='internalnote']");
77
            var internalnote = $(all_nodes[i]).find("input[name='internalnote']")[0].value;
77
            var vendornote = $(all_nodes[i]).find("input[name='vendornote']");
78
            var vendornote = $(all_nodes[i]).find("input[name='vendornote']")[0].value;
78
            data.append(order[0].value + "_i",internalnote[0].value);
79
            var internalnote_key = order[0].value + "_i";
79
            data.append(order[0].value + "_v",vendornote[0].value);
80
            var vendornote_key = order[0].value + "_v";
81
            data.append(internalnote_key, internalnote);
82
            data.append(vendornote_key, vendornote);
80
        }
83
        }
81
84
82
        req.open("POST",url);
85
        req.open("POST",url);
83
        req.send(data);
86
        req.send(data);
84
        req.onreadystatechange = function () {
87
        req.onreadystatechange = function () {
88
            $("#loading").remove();
85
            if (req.readyState == '4' ){
89
            if (req.readyState == '4' ){
86
                alert(_("all notes is modified correctly"));
90
                if ( req.status == 200 ){
91
                    alert(_("Notes successfully saved"));
92
                }
93
                else {
94
                    alert(_("Error while saving the notes. Please try again"));
95
                }
87
            }
96
            }
88
        }
97
        }
89
    });
98
    });
Lines 139-145 $(document).ready(function() { Link Here
139
            [% ELSE %]
148
            [% ELSE %]
140
                <th></th>
149
                <th></th>
141
            [% END %]
150
            [% END %]
142
            <th>Order No.</th>
151
            <th>Order line</th>
143
            <th class="title-string">Order date</th>
152
            <th class="title-string">Order date</th>
144
            <th class="title-string">Estimated delivery date</th>
153
            <th class="title-string">Estimated delivery date</th>
145
            <th>Vendor</th>
154
            <th>Vendor</th>
146
- 

Return to bug 12502