Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 07d71c33

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

  • ID 07d71c33315605fcfc450d3b9abf0fd10e92bed5
  • Vorgänger becc49b1
  • Nachfolger ee583bd5

Merge von 599-602,605,614,615 aus unstable: Preisgruppen Teil 1
--Preisgruppenerweiterung auf Basis von Andres Patch - Thanks
-Preisgruppenverwaltung
-Preiseingabe der Preisgruppen in Masken Waren,etc.
-Auswahl der Preisgruppen in den Verkaufsmasken
-Erweiterung Datenbankschema
-Übersetzungen für Preisgruppen
-Bugfix Preisgruppen, in der Warenmaske zeigte er eine Preisgruppe a
"Gruppe 1" als "Gruppe" an
-Anpassung locale
--Fehler bei negativen Umsaetzen behoben
--Fehler beim Speichern von Rechnungen und Angeboten/Auftraegen wenn keine Preisgruppen vorhanden
--Fehler bei Drucken und Buchen und Preisgruppen behoben, Preisgruppen Quelltext ein wenig modifiziert

Unterschiede anzeigen:

bin/mozilla/pe.pl
65 65
  if ($form->{type} eq 'partsgroup') {
66 66
    PE->get_partsgroup(\%myconfig, \%$form);
67 67
  }
68

  
68
  if ($form->{type} eq 'pricegroup') {
69
    PE->get_pricegroup(\%myconfig, \%$form);
70
  }
69 71
  &{"form_$form->{type}_header"};
70 72
  &{"form_$form->{type}_footer"};
71 73

  
......
106 108

  
107 109
  }
108 110

  
111
  # for pricesgroups
112
  if ($form->{type} eq 'pricegroup') {
113
    $report        = "pricegroup_report";
114
    $sort          = 'pricegroup';
115
    $form->{title} = $locale->text('Pricegroup');
116

  
117
    $number = qq|
118
	<tr>
119
	  <th align=right width=1%>| . $locale->text('Pricegroup') . qq|</th>
120
	  <td><input name=pricegroup size=20></td>
121
	</tr>
122
|;
123

  
124
  }
125

  
109 126
  $form->header;
110 127

  
111 128
  print qq|
......
130 147
	  <td><input name=status class=radio type=radio value=all checked>&nbsp;|
131 148
    . $locale->text('All') . qq|
132 149
	  <input name=status class=radio type=radio value=orphaned>&nbsp;|
133
    . $locale->text('Orphaned')
134
    . qq|</td>
150
    . $locale->text('Orphaned') . qq|</td>
135 151
	</tr>
136 152
      </table>
137 153
    </td>
......
397 413
    $form->redirect($locale->text('Group saved!'));
398 414
  }
399 415

  
416
  # choice pricegroup and save
417
  if ($form->{type} eq 'pricegroup') {
418
    $form->isblank("pricegroup", $locale->text('Pricegroup missing!'));
419
    PE->save_pricegroup(\%myconfig, \%$form);
420
    $form->redirect($locale->text('Pricegroup saved!'));
421
  }
422

  
400 423
  $lxdebug->leave_sub();
401 424
}
402 425

  
......
411 434
  if ($form->{type} eq 'partsgroup') {
412 435
    $form->redirect($locale->text('Group deleted!'));
413 436
  }
437
  if ($form->{type} eq 'pricegroup') {
438
    $form->redirect($locale->text('Pricegroup deleted!'));
439
  }
414 440

  
415 441
  $lxdebug->leave_sub();
416 442
}
......
611 637

  
612 638
  $lxdebug->leave_sub();
613 639
}
640

  
641
#################################
642
# get pricesgroups and build up html-code
643
#
644
sub pricegroup_report {
645
  $lxdebug->enter_sub();
646

  
647
  map { $form->{$_} = $form->unescape($form->{$_}) } (pricegroup);
648
  PE->pricegroups(\%myconfig, \%$form);
649

  
650
  $callback =
651
    "$form->{script}?action=pricegroup_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
652

  
653
  if ($form->{status} eq 'all') {
654
    $option = $locale->text('All');
655
  }
656
  if ($form->{status} eq 'orphaned') {
657
    $option .= $locale->text('Orphaned');
658
  }
659
  if ($form->{pricegroup}) {
660
    $callback .= "&pricegroup=$form->{pricegroup}";
661
    $option   .=
662
      "\n<br>" . $locale->text('Pricegroup') . " : $form->{pricegroup}";
663
  }
664

  
665
  @column_index = $form->sort_columns(qw(pricegroup));
666

  
667
  $column_header{pricegroup} =
668
      qq|<th class=listheading width=90%>|
669
    . $locale->text('Pricegroup')
670
    . qq|</th>|;
671

  
672
  $form->{title} = $locale->text('Pricegroup');
673

  
674
  $form->header;
675

  
676
  print qq|
677
<body>
678

  
679
<table width=100%>
680
  <tr>
681
    <th class=listtop>$form->{title}</th>
682
  </tr>
683
  <tr height="5"></tr>
684
  <tr>
685
    <td>$option</td>
686
  </tr>
687
  <tr>
688
    <td>
689
      <table width=100%>
690
	<tr class=listheading>
691
|;
692

  
693
  map { print "$column_header{$_}\n" } @column_index;
694

  
695
  print qq|
696
        </tr>
697
|;
698

  
699
  # escape callback
700
  $form->{callback} = $callback;
701

  
702
  # escape callback for href
703
  $callback = $form->escape($callback);
704

  
705
  foreach $ref (@{ $form->{item_list} }) {
706

  
707
    $i++;
708
    $i %= 2;
709

  
710
    print qq|
711
        <tr valign=top class=listrow$i>
712
|;
713
    $column_data{pricegroup} =
714
      qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{pricegroup}</td>|;
715

  
716
    map { print "$column_data{$_}\n" } @column_index;
717

  
718
    print "
719
        </tr>
720
";
721
  }
722

  
723
  print qq|
724
      </table>
725
    </td>
726
  </tr>
727
  <tr>
728
    <td><hr size=3 noshade></td>
729
  </tr>
730
</table>
731

  
732
<br>
733
<form method=post action=$form->{script}>
734

  
735
<input name=callback type=hidden value="$form->{callback}">
736

  
737
<input type=hidden name=type value=$form->{type}>
738

  
739
<input type=hidden name=path value=$form->{path}>
740
<input type=hidden name=login value=$form->{login}>
741
<input type=hidden name=password value=$form->{password}>
742

  
743
<input class=submit type=submit name=action value="|
744
    . $locale->text('Add') . qq|">|;
745

  
746
  if ($form->{menubar}) {
747
    require "$form->{path}/menu.pl";
748
    &menubar;
749
  }
750

  
751
  print qq|
752
  </form>
753

  
754
</body>
755
</html>
756
|;
757

  
758
  $lxdebug->leave_sub();
759
}
760

  
761
#######################
762
#build up pricegroup_header
763
#
764
sub form_pricegroup_header {
765
  $lxdebug->enter_sub();
766

  
767
  # $locale->text('Add Pricegroup')
768
  # $locale->text('Edit Pricegroup')
769

  
770
  $form->{title} = $locale->text("$form->{title} Pricegroup");
771

  
772
  $form->{pricegroup} =~ s/\"/&quot;/g;
773

  
774
  $form->header;
775

  
776
  print qq|
777
<body>
778

  
779
<form method=post action=$form->{script}>
780

  
781
<input type=hidden name=id value=$form->{id}>
782
<input type=hidden name=type value=$form->{type}>
783

  
784
<table width=100%>
785
  <tr>
786
    <th class=listtop>$form->{title}</th>
787
  </tr>
788
  <tr height="5"></tr>
789
  <tr>
790
    <td>
791
      <table width=100%>
792
	<tr>
793
	  <th align=right>| . $locale->text('Preisgruppe') . qq|</th>
794
          <td><input name=pricegroup size=30 value="$form->{pricegroup}"></td>
795
	</tr>
796
      </table>
797
    </td>
798
  </tr>
799
  <tr>
800
    <td colspan=2><hr size=3 noshade></td>
801
  </tr>
802
</table>
803
|;
804

  
805
  $lxdebug->leave_sub();
806
}
807
######################
808
#build up pricegroup_footer
809
#
810
sub form_pricegroup_footer {
811
  $lxdebug->enter_sub();
812

  
813
  print qq|
814

  
815
<input name=callback type=hidden value="$form->{callback}">
816

  
817
<input type=hidden name=path value=$form->{path}>
818
<input type=hidden name=login value=$form->{login}>
819
<input type=hidden name=password value=$form->{password}>
820

  
821
<br><input type=submit class=submit name=action value="|
822
    . $locale->text('Save') . qq|">
823
|;
824

  
825
  if ($form->{id} && $form->{orphaned}) {
826
    print qq|
827
<input type=submit class=submit name=action value="|
828
      . $locale->text('Delete') . qq|">|;
829
  }
830

  
831
  if ($form->{menubar}) {
832
    require "$form->{path}/menu.pl";
833
    &menubar;
834
  }
835

  
836
  print qq|
837
</form>
838

  
839
</body>
840
</html>
841
|;
842

  
843
  $lxdebug->leave_sub();
844
}

Auch abrufbar als: Unified diff