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

(-)a/C4/Acquisition.pm (+23 lines)
Lines 93-98 BEGIN { Link Here
93
        &NotifyOrderUsers
93
        &NotifyOrderUsers
94
94
95
        &FillWithDefaultValues
95
        &FillWithDefaultValues
96
97
        &ModNotesOrder
96
    );
98
    );
97
}
99
}
98
100
Lines 1366-1371 sub ModOrder { Link Here
1366
1368
1367
#------------------------------------------------------------#
1369
#------------------------------------------------------------#
1368
1370
1371
=head3 ModNotesOrder
1372
1373
    ModNotesOrder($orders);
1374
1375
Modifies internal and vendor note off all items in orders
1376
1377
=cut
1378
1379
sub ModNotesOrder{
1380
    my $orders = shift;
1381
    my $dbh = C4::Context->dbh;
1382
    my $sth = $dbh->prepare("UPDATE aqorders SET order_internalnote = ?, order_vendornote = ? WHERE ordernumber = ?");
1383
    foreach my $ordernumber (keys %$orders) {
1384
        $sth->execute($orders->{$ordernumber}->{'i'}, $orders->{$ordernumber}->{'v'}, $ordernumber) if ($orders->{$ordernumber}->{'i'} || $orders->{$ordernumber}->{'v'});
1385
    }
1386
}
1387
1388
 #------------------------------------------------------------#
1389
1369
=head3 ModItemOrder
1390
=head3 ModItemOrder
1370
1391
1371
    ModItemOrder($itemnumber, $ordernumber);
1392
    ModItemOrder($itemnumber, $ordernumber);
Lines 2119-2124 sub GetLateOrders { Link Here
2119
        aqorders.ecost            AS unitpricelib,
2140
        aqorders.ecost            AS unitpricelib,
2120
        aqorders.claims_count     AS claims_count,
2141
        aqorders.claims_count     AS claims_count,
2121
        aqorders.claimed_date     AS claimed_date,
2142
        aqorders.claimed_date     AS claimed_date,
2143
        aqorders.order_internalnote AS internalnote,
2144
        aqorders.order_vendornote   AS vendornote,
2122
        aqbudgets.budget_name     AS budget,
2145
        aqbudgets.budget_name     AS budget,
2123
        borrowers.branchcode      AS branch,
2146
        borrowers.branchcode      AS branch,
2124
        aqbooksellers.name        AS supplier,
2147
        aqbooksellers.name        AS supplier,
(-)a/acqui/lateorders-export.pl (+2 lines)
Lines 53-58 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},
57
            vendornote   => $order->{vendornote},
56
        }
58
        }
57
    ;
59
    ;
58
}
60
}
(-)a/acqui/lateorders.pl (+14 lines)
Lines 122-127 if ($op and $op eq "send_alert"){ Link Here
122
    }
122
    }
123
}
123
}
124
124
125
if ($op && $op eq "save"){
126
    my $listorders;
127
    my $ordernumber;
128
    my @orders = $input->param;
129
130
    foreach my $order (@orders){
131
        if ( $order ne "op"){
132
            my @split = split (/_/,$order);
133
            $listorders->{$split[0]}->{$split[1]} = $input->param($order);
134
        }
135
    }
136
    ModNotesOrder($listorders);
137
}
138
125
my @parameters = ( $delay );
139
my @parameters = ( $delay );
126
push @parameters, $estimateddeliverydatefrom_dt
140
push @parameters, $estimateddeliverydatefrom_dt
127
    ? $estimateddeliverydatefrom_dt->ymd()
141
    ? $estimateddeliverydatefrom_dt->ymd()
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/acqui/lateorders.tt (-1 / +1 lines)
Line 1 Link Here
1
[%- BLOCK -%]ORDER DATE,ESTIMATED DELIVERY DATE,VENDOR,INFORMATION,TOTAL COST,BASKET,CLAIMS COUNT,CLAIMED DATE[%- END -%]
1
[%- BLOCK -%]ORDER DATE,ESTIMATED DELIVERY DATE,VENDOR,INFORMATION,TOTAL COST,BASKET,CLAIMS COUNT,CLAIMED DATE,INTERNAL NOTE,VENDOR NOTE[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt (-2 / +29 lines)
Lines 64-69 $(document).ready(function() { Link Here
64
        location.href = url;
64
        location.href = url;
65
        return false;
65
        return false;
66
    });
66
    });
67
    // Update all notes
68
    $("#savenotes").click(function(){
69
        var all_nodes = $(late_orderst.fnGetNodes());
70
        var req = new XMLHttpRequest();
71
        var url = '/cgi-bin/koha/acqui/lateorders.pl';
72
        var data = new FormData();
73
        data.append("op","save");
74
        for (var i = 0; i < all_nodes.length; i++) {
75
            var order = $(all_nodes[i]).find("input[name='ordernumber']");
76
            var internalnote = $(all_nodes[i]).find("input[name='internalnote']");
77
            var vendornote = $(all_nodes[i]).find("input[name='vendornote']");
78
            data.append(order[0].value + "_i",internalnote[0].value);
79
            data.append(order[0].value + "_v",vendornote[0].value);
80
        }
81
82
        req.open("POST",url);
83
        req.send(data);
84
        req.onreadystatechange = function () {
85
            if (req.readyState == '4' ){
86
                alert(_("all notes is modified correctly"));
87
            }
88
        }
89
    });
67
});
90
});
68
//]]>
91
//]]>
69
</script>
92
</script>
Lines 127-132 $(document).ready(function() { Link Here
127
            <th>Fund</th>
150
            <th>Fund</th>
128
            <th>Claims count</th>
151
            <th>Claims count</th>
129
            <th class="title-string">Claimed date</th>
152
            <th class="title-string">Claimed date</th>
153
            <th>Internal note</th>
154
            <th>Vendor note</th>
130
        </tr>
155
        </tr>
131
      </thead>
156
      </thead>
132
      <tbody>
157
      <tbody>
Lines 191-196 $(document).ready(function() { Link Here
191
                    <span title="0000-00-00"></span>
216
                    <span title="0000-00-00"></span>
192
                [% END %]
217
                [% END %]
193
            </td>
218
            </td>
219
            <td><input name="internalnote" id="internalnote" type="text" value="[% lateorder.internalnote %]"></td>
220
            <td><input name="vendornote" id="vendornote" type="text" value="[% lateorder.vendornote %]"></td>
194
        </tr>
221
        </tr>
195
      [% END %]
222
      [% END %]
196
      </tbody>
223
      </tbody>
Lines 198-204 $(document).ready(function() { Link Here
198
        <tr>
225
        <tr>
199
            <th colspan="5">Total</th>
226
            <th colspan="5">Total</th>
200
            <th>[% total %]</th>
227
            <th>[% total %]</th>
201
            <th colspan="6">&nbsp;</th>
228
            <th colspan="8">&nbsp;</th>
202
        </tr>
229
        </tr>
203
      </tfoot>
230
      </tfoot>
204
    </table>
231
    </table>
Lines 209-214 $(document).ready(function() { Link Here
209
        [% UNLESS lateorder.budget_lock %]
236
        [% UNLESS lateorder.budget_lock %]
210
            <input type="submit"  value="Claim order" />
237
            <input type="submit"  value="Claim order" />
211
        [% END %]
238
        [% END %]
239
        <input type="button" value="Save notes" id="savenotes"/>
212
    </p>
240
    </p>
213
</form>
241
</form>
214
[% ELSE %]<p>There are no late orders.</p>
242
[% ELSE %]<p>There are no late orders.</p>
215
- 

Return to bug 12502