X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=9bc225e884bb596231ed4b64ad7441710820be02;hb=e09347c89ca119213c4d8ba43083653cda793399;hp=85768154354f0a310e75f8f7b976497ffd23885b;hpb=f25d9c857df997a05c27af74f68af445f97146be;p=kivitendo-erp.git

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 857681543..9bc225e88 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -69,10 +69,6 @@ sub add {
 
   $form{jsscript} = "date";
 
-  if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
-  {
-    $form->error("Access Denied");
-  }
   &invoice_links;
   &prepare_invoice;
   &display_form;
@@ -89,10 +85,6 @@ sub edit {
   $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
   #/show hhistory button
 
-  if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR")
-  {
-    $form->error("Access Denied");
-  }
   $edit = 1;
   if ($form->{print_and_post}) {
     $form->{action}   = "print";
@@ -248,8 +240,6 @@ sub prepare_invoice {
 
   if ($form->{id}) {
 
-    map { $form->{$_} =~ s/\"/&quot;/g }
-      qw(invnumber ordnumber quonumber shippingpoint shipvia notes intnotes);
 
     #     # get pricegroups for parts
     #     IS->get_pricegroups_for_parts(\%myconfig, \%$form);
@@ -276,8 +266,6 @@ sub prepare_invoice {
       $form->{"qty_$i"} =
         $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
 
-      map { $form->{"${_}_$i"} =~ s/\"/&quot;/g }
-        qw(partnumber description unit partnotes);
       $form->{rowcount} = $i;
 
     }
@@ -540,8 +528,8 @@ sub form_header {
   $jsscript = "";
   if ($form->{type} eq "credit_note") {
     $button1 = qq|
-      <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
-       <input type="button" name="invdate" id="trigger1" value="|
+      <td nowrap><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
+       <input type="button" name="invdate_button" id="trigger1" value="|
       . $locale->text('button') . qq|"></td>|;
 
     #write Trigger
@@ -551,18 +539,18 @@ sub form_header {
                           "trigger1");
   } else {
     $button1 = qq|
-      <td><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
-       <input type="button" name="invdate" id="trigger1" value="|
+      <td nowrap><input name="invdate" id="invdate" size="11" title="$myconfig{dateformat}" value="$form->{invdate}" onBlur=\"check_right_date_format(this)\">
+       <input type="button" name="invdate_button" id="trigger1" value="|
       . $locale->text('button') . qq|"></td>
       |;
     $button2 = qq|
       <td width="13"><input name="duedate" id="duedate" size="11" title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\">
-       <input type="button" name="duedate" id="trigger2" value="|
+       <input type="button" name="duedate_button" id="trigger2" value="|
       . $locale->text('button') . qq|"></td>
     |;
     $button3 = qq|
       <td width="13"><input name="deliverydate" id="deliverydate" size="11" title="$myconfig{dateformat}" value="$form->{deliverydate}" onBlur=\"check_right_date_format(this)\">
-       <input type="button" name="deliverydate" id="trigger3" value="|
+       <input type="button" name="deliverydate_button" id="trigger3" value="|
       . $locale->text('button') . qq|"></td>
     |;
 
@@ -577,7 +565,7 @@ sub form_header {
   $credittext = $locale->text('Credit Limit exceeded!!!');
 
   my $follow_up_vc         =  $form->{customer};
-  $follow_up_vc            =~ s/--.*?//;
+  $follow_up_vc            =~ s/--\d*\s*$//;
   my $follow_up_trans_info =  "$form->{invnumber} ($follow_up_vc)";
 
   $onload = ($form->{resubmit} && ($form->{format} eq "html")) ? qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|
@@ -667,10 +655,13 @@ sub form_header {
 		<th align="right" nowrap>| . $locale->text('Shipping Point') . qq|</th>
 		<td colspan="3"> | .
 		$cgi->textfield("-name" => "shippingpoint", "-size" => 35, "-value" => $form->{shippingpoint}) .
-	  qq|</tr>
+      	  qq|	</td>
+	      </tr>
 	      <tr>
 		<th align="right" nowrap>| . $locale->text('Ship via') . qq|</th>
-		<td colspan="3"><input name="shipvia" size="35" value="$form->{shipvia}"></td>
+		<td colspan="3"> | .
+		$cgi->textfield("-name" => "shipvia", "-size" => 35, "-value" => $form->{shipvia}) .
+	  qq|	</td>
 	      </tr>
               <tr>
                 <th align="right">| . $locale->text('Transaction description') . qq|</th>
@@ -703,10 +694,14 @@ print qq|	    </table>
 	      $employees
         $salesman
 |;
+
+#ergänzung in der maske um das feld Lieferscheinnummer (Delivery Order Number), meiner meinung nach sinnvoll ueber dem feld lieferscheindatum 12.02.2009 jb
 if ($form->{type} eq "credit_note") {
 print qq|     <tr>
 		<th align="right" nowrap>| . $locale->text('Credit Note Number') . qq|</th>
-		<td><input name="invnumber" size="11" value="$form->{invnumber}"></td>
+		<td> |.
+	        $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .	
+      qq|	</td>
 	      </tr>
 	      <tr>
 		<th align="right">| . $locale->text('Credit Note Date') . qq|</th>
@@ -715,7 +710,9 @@ print qq|     <tr>
 } else {
 print qq|     <tr>
 		<th align="right" nowrap>| . $locale->text('Invoice Number') . qq|</th>
-		<td><input name="invnumber" size="11" value="$form->{invnumber}"></td>
+		<td> |.
+	        $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .	
+      qq|	</td>
 	      </tr>
 	      <tr>
 		<th align="right">| . $locale->text('Invoice Date') . qq|</th>
@@ -725,6 +722,12 @@ print qq|     <tr>
 		<th align="right">| . $locale->text('Due Date') . qq|</th>
                 $button2
 	      </tr>
+	      <tr>
+		<th align="right" nowrap>| . $locale->text('Delivery Order Number') . qq|</th>
+		<td> |.
+	        $cgi->textfield("-name" => "donumber", "-size" => 11, "-value" => $form->{donumber}) .	
+      qq|	</td>
+	      </tr>
 	      <tr>
 		<th align="right">| . $locale->text('Delivery Date') . qq|</th>
                 $button3
@@ -732,7 +735,9 @@ print qq|     <tr>
 }
 print qq|     <tr>
 		<th align="right" nowrap>| . $locale->text('Order Number') . qq|</th>
-		<td><input name="ordnumber" size="11" value="$form->{ordnumber}"></td>
+		<td> |.
+	        $cgi->textfield("-name" => "ordnumber", "-size" => 11, "-value" => $form->{ordnumber}) .	
+      qq|	</td>
 	      </tr>
         <tr>
           <th align="right" nowrap>| . $locale->text('Order Date') . qq|</th>
@@ -741,7 +746,9 @@ print qq|     <tr>
         </tr>
 	      <tr>
 		<th align="right" nowrap>| . $locale->text('Quotation Number') . qq|</th>
-		<td><input name="quonumber" size="11" value="$form->{quonumber}"></td>
+		<td> |.
+	        $cgi->textfield("-name" => "quonumber", "-size" => 11, "-value" => $form->{quonumber}) .	
+      qq|	</td>
 	      </tr>
         <tr>
           <th align="right" nowrap>| . $locale->text('Quotation Date') . qq|</th>
@@ -750,7 +757,9 @@ print qq|     <tr>
         </tr>
 	      <tr>
 		<th align="right" nowrap>| . $locale->text('Customer Order Number') . qq|</th>
-		<td><input name="cusordnumber" size="11" value="$form->{cusordnumber}"></td>
+		<td> |.
+	        $cgi->textfield("-name" => "cusordnumber", "-size" => 11, "-value" => $form->{cusordnumber}) .	
+      qq|	</td>
 	      </tr>
 	      <tr>
           <th align="right" nowrap>| . $locale->text('Project Number') . qq|</th>
@@ -902,7 +911,7 @@ sub form_footer {
 	      <tr valign="top">
 		<td>$notes</td>
 		<td>$intnotes</td>
-                <td><select name="payment_id" onChange="if (this.value) set_duedate(['payment_id__' + this.value],['duedate'])">$payment
+                <td><select name="payment_id" onChange="if (this.value) set_duedate(['payment_id__' + this.value, 'invdate__' + invdate.value],['duedate'])">$payment
                 </select></td>
 	      </tr>
         $follow_ups_block
@@ -1104,7 +1113,7 @@ if ($form->{type} eq "credit_note") {
   $closedto = $form->datetonum($form->{closedto}, \%myconfig);
 
   if ($form->{id}) {
-    my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar");
+    my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && (($totalpaid == 0) || ($totalpaid eq ""));
 
     print qq|
     <input class="submit" type="submit" accesskey="u" name="action" id="update_button" value="|
@@ -1193,6 +1202,7 @@ if ($form->{type} eq "credit_note") {
 $cgi->hidden("-name" => "callback", "-value" => $form->{callback})
 . $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
 . $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
+. $cgi->hidden('-name' => 'customer_discount', '-value' => [$form->{customer_discount}])
 . qq|
 </form>
 
@@ -1258,7 +1268,7 @@ sub update {
 
     $rows = scalar @{ $form->{item_list} };
 
-    $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{discount} * 100);
+    $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{customer_discount} * 100);
 
     if ($rows) {
       $form->{"qty_$i"} = ($form->{"qty_$i"} * 1) ? $form->{"qty_$i"} : 1;