Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 6d8f12f1

Von Moritz Bunkus vor mehr als 15 Jahren hinzugefügt

  • ID 6d8f12f14d85bd1a445afa13f443bace3ac9a5ff
  • Vorgänger fbc3a232
  • Nachfolger 821ce29e

Revisionen und 4167 und 4192:4194 rückgängig gemacht (Kundenauswahl in Rechnungen via Multibox)

Grund: Hat Bug 1022 verursacht. Das ist releasekritisch; muss nach dem
Release anständig gefixt werden.

Fix für Bug 1022.

Unterschiede anzeigen:

bin/mozilla/is.pl
354 354
    </tr>|;
355 355

  
356 356

  
357
  $form->{selectcustomer} = $myconfig{vclimit} > scalar(@{ $form->{ALL_CUSTOMERS} });
357
  %labels = ();
358
  @values = ();
359
  foreach my $item (@{ $form->{"ALL_CUSTOMERS"} }) {
360
    push(@values, $item->{name}.qq|--|.$item->{"id"});
361
    $labels{$item->{name}.qq|--|.$item->{"id"}} = $item->{"name"};
362
  }
363

  
364
  $form->{selectcustomer} = ($myconfig{vclimit} > scalar(@values));
358 365

  
359 366
  my $customers = qq|
360 367
      <th align="right">| . $locale->text('Customer') . qq|</th>
361
      <td>|
362
      . $form->parse_html_template('generic/multibox',
363
                                   { 'name'          => 'customer',
364
                                     'default'       => $form->{oldcustomer},
365
                                     'style'         => 'width: 250px',
366
                                     'DATA'          => $form->{ALL_CUSTOMERS},
367
                                     'id_sub'        => 'vc_keys',
368
                                     'vc_keys'       => sub { "$_[0]->{name}--$_[0]->{id}" },
369
                                     'label_key'     => 'name',
370
                                     'select'        => 'customer_or_vendor_selection_window(\'customer\', \'\', 0, 0);',
371
                                     'limit'         => $myconfig{vclimit},
372
                                     'allow_textbox' => 1,
373
                                     'onChange'      => "document.getElementById('update_button').click();" })
374
      . qq| <input type="button" value="| . $locale->text('Details (one letter abbreviation)') . qq|" onclick="show_vc_details('customer')"></td>|;
368
      <td>| .
369
        (($myconfig{vclimit} <=  scalar(@values))
370
              ? qq|<input type="text" value="| . H($form->{customer}) . qq|" name="customer">|
371
              : (NTI($cgi->popup_menu('-name' => 'customer', '-default' => $form->{oldcustomer},
372
                             '-onChange' => 'document.getElementById(\'update_button\').click();',
373
                             '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')))) . qq|
374
        <input type="button" value="| . $locale->text('Details (one letter abbreviation)') . qq|" onclick="show_vc_details('customer')">
375
      </td>|;
375 376

  
376 377
  %labels = ();
377 378
  @values = ("");
......
556 557
    #write Trigger
557 558
    $jsscript =
558 559
      Form->write_trigger(\%myconfig,     "3",
559
                          "invdate",      "BL", "trigger1",
560
                          "invdate",      "BL", "trigger1", 
560 561
                          "duedate",      "BL", "trigger2",
561 562
                          "deliverydate", "BL", "trigger3");
562 563
  }
......
590 591
<body onLoad="$onload">
591 592
<script type="text/javascript" src="js/common.js"></script>
592 593
<script type="text/javascript" src="js/delivery_customer_selection.js"></script>
593
<script type="text/javascript" src="js/customer_or_vendor_selection.js"></script>
594
<script type="text/javascript" src="js/vendor_selection.js"></script>
594 595
<script type="text/javascript" src="js/calculate_qty.js"></script>
595 596
<script type="text/javascript" src="js/follow_up.js"></script>
596 597

  
......
600 601
  $form->hide_form(qw(id action type media format queued printed emailed title vc discount
601 602
                      creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
602 603
                      max_dunning_level dunning_amount
603
                      shiptoname shiptostreet shiptozipcode shiptocity shiptocountry  shiptocontact shiptophone shiptofax
604
                      shiptoname shiptostreet shiptozipcode shiptocity shiptocountry  shiptocontact shiptophone shiptofax 
604 605
                      shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus
605 606
                      convert_from_do_ids convert_from_oe_ids),
606 607
                      map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} );
607

  
608
   
608 609
  print qq|<p>$form->{saved_message}</p>| if $form->{saved_message};
609 610

  
610 611
  print qq|
......
699 700
print qq|     <tr>
700 701
		<th align="right" nowrap>| . $locale->text('Credit Note Number') . qq|</th>
701 702
		<td> |.
702
	        $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .
703
	        $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .	
703 704
      qq|	</td>
704 705
	      </tr>
705 706
	      <tr>
......
710 711
print qq|     <tr>
711 712
		<th align="right" nowrap>| . $locale->text('Invoice Number') . qq|</th>
712 713
		<td> |.
713
	        $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .
714
	        $cgi->textfield("-name" => "invnumber", "-size" => 11, "-value" => $form->{invnumber}) .	
714 715
      qq|	</td>
715 716
	      </tr>
716 717
	      <tr>
......
724 725
	      <tr>
725 726
		<th align="right" nowrap>| . $locale->text('Delivery Order Number') . qq|</th>
726 727
		<td> |.
727
	        $cgi->textfield("-name" => "donumber", "-size" => 11, "-value" => $form->{donumber}) .
728
	        $cgi->textfield("-name" => "donumber", "-size" => 11, "-value" => $form->{donumber}) .	
728 729
      qq|	</td>
729 730
	      </tr>
730 731
	      <tr>
......
735 736
print qq|     <tr>
736 737
		<th align="right" nowrap>| . $locale->text('Order Number') . qq|</th>
737 738
		<td> |.
738
	        $cgi->textfield("-name" => "ordnumber", "-size" => 11, "-value" => $form->{ordnumber}) .
739
	        $cgi->textfield("-name" => "ordnumber", "-size" => 11, "-value" => $form->{ordnumber}) .	
739 740
      qq|	</td>
740 741
	      </tr>
741 742
        <tr>
......
746 747
	      <tr>
747 748
		<th align="right" nowrap>| . $locale->text('Quotation Number') . qq|</th>
748 749
		<td> |.
749
	        $cgi->textfield("-name" => "quonumber", "-size" => 11, "-value" => $form->{quonumber}) .
750
	        $cgi->textfield("-name" => "quonumber", "-size" => 11, "-value" => $form->{quonumber}) .	
750 751
      qq|	</td>
751 752
	      </tr>
752 753
        <tr>
......
757 758
	      <tr>
758 759
		<th align="right" nowrap>| . $locale->text('Customer Order Number') . qq|</th>
759 760
		<td> |.
760
	        $cgi->textfield("-name" => "cusordnumber", "-size" => 11, "-value" => $form->{cusordnumber}) .
761
	        $cgi->textfield("-name" => "cusordnumber", "-size" => 11, "-value" => $form->{cusordnumber}) .	
761 762
      qq|	</td>
762 763
	      </tr>
763 764
	      <tr>
......
773 774
  <tr>
774 775
    <td>
775 776
    </td>
776
  </tr>
777
  </tr> 
777 778
  $jsscript
778 779
|;
779 780
  print qq|<input type="hidden" name="webdav" value="$webdav">|;
......
1186 1187
  	  . qq|"> |;
1187 1188
  }
1188 1189
  # /button for saving history
1189

  
1190
  # mark_as_paid button
1191
  if($form->{id} ne "") {
1192
    print qq|<input type="submit" class="submit" name="action" value="|
1190
  
1191
  # mark_as_paid button 
1192
  if($form->{id} ne "") {  
1193
    print qq|<input type="submit" class="submit" name="action" value="| 
1193 1194
          . $locale->text('mark as paid') . qq|">|;
1194 1195
  }
1195 1196
  # /mark_as_paid button
......
1218 1219

  
1219 1220
  $auth->assert('invoice_edit');
1220 1221

  
1221
  &mark_as_paid_common(\%myconfig,"ar");
1222
  &mark_as_paid_common(\%myconfig,"ar");  
1222 1223

  
1223 1224
  $lxdebug->leave_sub();
1224 1225
}
......
1283 1284

  
1284 1285
        map { $form->{item_list}[$i]{$_} =~ s/\"/&quot;/g } qw(partnumber description unit);
1285 1286
        map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
1286

  
1287
        
1287 1288
        $form->{payment_id}    = $form->{"part_payment_id_$i"} if $form->{"part_payment_id_$i"} ne "";
1288 1289
        $form->{"discount_$i"} = 0                             if $form->{"not_discountable_$i"};
1289 1290

  

Auch abrufbar als: Unified diff