Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 383022ae

Von Stephan Köhler vor fast 19 Jahren hinzugefügt

  • ID 383022aec2779e0845e154238a3bdd885f5edc10
  • Vorgänger 3aaf323a
  • Nachfolger 2ae62d30

Merge von 599 aus unstable: Funktion fuer Druckvorschau und Drucken+Buchen zu Verkaufsrechnungen hinzugefuegt

Unterschiede anzeigen:

bin/mozilla/io.pl
199 199

  
200 200
    # undo formatting
201 201
    map {
202
      $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
202
      $form->{"${_}_$i"} =
203
        $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
203 204
    } qw(qty ship discount sellprice);
204 205

  
205 206
    ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
......
643 644
    &{"$form->{display_form}"};
644 645
    exit;
645 646
  }
647
  if (   $form->{print_and_post}
648
      && $form->{second_run}
649
      && ($form->{action} eq "display_form")) {
650
    for (keys %$form) { $old_form->{$_} = $form->{$_} }
651
    $old_form->{rowcount}++;
646 652

  
653
    #$form->{rowcount}--;
654
    #$form->{rowcount}--;
655

  
656
    $form->{print_and_post} = 0;
657

  
658
    &print_form($old_form);
659
    exit;
660
  }
661

  
662
  $form->{action}   = "";
663
  $form->{resubmit} = 0;
664

  
665
  if ($form->{print_and_post} && !$form->{second_run}) {
666
    $form->{second_run} = 1;
667
    $form->{action}     = "display_form";
668
    $form->{rowcount}--;
669

  
670
    $form->{resubmit} = 1;
671

  
672
  }
647 673
  &form_header;
648 674

  
649 675
  $numrows    = ++$form->{rowcount};
......
672 698

  
673 699
  &form_footer;
674 700

  
701
  #   if ($form->{print_and_post}) {
702
  #     &display_form;
703
  #   }
704

  
675 705
  $lxdebug->leave_sub();
676 706
}
677 707

  
......
680 710

  
681 711
  my @a     = ();
682 712
  my $count = 0;
683
  my @flds = (
713
  my @flds  = (
684 714
    qw(id partnumber description qty ship sellprice unit discount inventory_accno income_accno expense_accno listprice taxaccounts bin assembly weight projectnumber project_id oldprojectnumber runningnumber serialnumber partsgroup)
685 715
  );
686 716

  
......
1323 1353
  # $locale->text('Quotation Date missing!')
1324 1354

  
1325 1355
  # assign number
1326
  if (!$form->{"${inv}number"}) {
1356
  if (!$form->{"${inv}number"} && !$form->{preview}) {
1327 1357
    $form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
1328 1358
    if ($form->{media} ne 'email') {
1329 1359
      $form->{rowcount}--;
......
1513 1543
      ? $locale->text('sent to printer')
1514 1544
      : $locale->text('emailed to') . " $form->{email}";
1515 1545
    $form->redirect(qq|$form->{label} $form->{"${inv}number"} $msg|);
1546
  } else {
1547
    &{"$display_form"};
1516 1548
  }
1517 1549

  
1518 1550
  $lxdebug->leave_sub();
......
1553 1585
  map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
1554 1586
    qw(exchangerate creditlimit creditremaining);
1555 1587
  $form_id = $form->{id};
1588

  
1556 1589
  # get details for name
1557 1590
  &{"$form->{vc}_details"};
1558 1591
  $form->{id} = $form_id;
......
1579 1612
      <table>
1580 1613
	<tr class=listheading>
1581 1614
	  <th class=listheading colspan=2 width=50%>|
1582
    . $locale->text('Billing Address')
1583
    . qq|</th>
1615
    . $locale->text('Billing Address') . qq|</th>
1584 1616
	  <th class=listheading width=50%>|
1585
    . $locale->text('Shipping Address')
1586
    . qq|</th>
1617
    . $locale->text('Shipping Address') . qq|</th>
1587 1618
	</tr>
1588 1619
	<tr height="5"></tr>
1589 1620
	<tr>

Auch abrufbar als: Unified diff