Merge branch 'master' of ssh://git-mbunkus@lx-office.linet-services.de/~/lx-office-erp

diff --git a/SL/IC.pm b/SL/IC.pm
index 30aa8cf0d256078ba5f437b7e0d13e89dade3629..dd7c08df18fb7c464ed3e5be03b5a697b02c9b2e 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -799,9 +799,9 @@ sub all_parts {
        ) AS ioi ON ioi.parts_id = p.id|,
     apoe       =>
       q|LEFT JOIN (
-         SELECT id, transdate, 'ir' AS module, ordnumber, quonumber,         invnumber, FALSE AS quotation, NULL AS customer_id,         vendor_id, NULL AS deliverydate, 'invoice'    AS ioi FROM ap UNION
-         SELECT id, transdate, 'is' AS module, ordnumber, quonumber,         invnumber, FALSE AS quotation,         customer_id, NULL AS vendor_id,         deliverydate, 'invoice'    AS ioi FROM ar UNION
-         SELECT id, transdate, 'oe' AS module, ordnumber, quonumber, NULL AS invnumber,          quotation,         customer_id,         vendor_id, NULL AS deliverydate, 'orderitems' AS ioi FROM oe
+         SELECT id, transdate, 'ir' AS module, ordnumber, quonumber,         invnumber, FALSE AS quotation, NULL AS customer_id,         vendor_id,    NULL AS deliverydate, 'invoice'    AS ioi FROM ap UNION
+         SELECT id, transdate, 'is' AS module, ordnumber, quonumber,         invnumber, FALSE AS quotation,         customer_id, NULL AS vendor_id,            deliverydate, 'invoice'    AS ioi FROM ar UNION
+         SELECT id, transdate, 'oe' AS module, ordnumber, quonumber, NULL AS invnumber,          quotation,         customer_id,         vendor_id, reqdate AS deliverydate, 'orderitems' AS ioi FROM oe
        ) AS apoe ON ((ioi.trans_id = apoe.id) AND (ioi.ioi = apoe.ioi))|,
     cv         =>
       q|LEFT JOIN (

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index ebdaba52f894cb45900ae10184a63d5e951aac00..965e4bafa6ecf9c7ed525edfbb5e100401171878 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1145,12 +1145,10 @@ sub generate_report {
 
   # special case for lastcost
   if ($form->{ledgerchecks}){
-    # zumindestens für den haken 'gekauft' muss das verhalten
-    # so sein, das der Verkaufspreis nicht angezeigt
-    # wird. In der Backend-Funktion all_parts wird nur mit
-    # price gearbeitet
+    # ledgerchecks don't know about sellprice or lastcost. they just return a
+    # price. so rename sellprice to price, and drop lastcost.
     $column_defs{sellprice}{text} = $locale->text('Price');
-    $form->{l_lastcost} = "" 
+    $form->{l_lastcost} = ""
   }
 
   if ($form->{description}) {

diff --git a/doc/changelog b/doc/changelog
index 2db8471d65eb1e544db24ad45747435d344f0aed..9773cb3cfa9ce522ac1b0b3a6d3b404fd548b0e9 100644 (file)
--- a/doc/changelog
+++ b/doc/changelog
@@ -178,7 +178,7 @@
   1051 1055 1057 1058 1072 1073 1077 1079 1081 1082 1095 1098 1100 1101 1108
   1110 1118 1125 1127 1130 1133 1135 1136 1138 1144 1146 1147 1150 1151 1155
   1164 1173 1177 1186 1188 1190 1191 1195 1197 1198 1199 1200 1201 1209 1213
-  1243 1248 1250 1262 1286 1287 1289 1294 1299
+  1243 1248 1250 1262 1286 1287 1289 1291 1294 1299
 
 
 2009-06-02 - Version 2.6.0