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/ct.pl
69 69
  if ($form->{db} eq 'vendor') {
70 70
    $gifi = qq|
71 71
		<td><input name="l_gifi_accno" type=checkbox class=checkbox value=Y> |
72
      . $locale->text('GIFI')
73
      . qq|</td>
72
      . $locale->text('GIFI') . qq|</td>
74 73
|;
75 74
  }
76 75

  
......
112 111
	  <td><input name=status class=radio type=radio value=all checked>&nbsp;|
113 112
    . $locale->text('All') . qq|
114 113
	  <input name=status class=radio type=radio value=orphaned>&nbsp;|
115
    . $locale->text('Orphaned')
116
    . qq|</td>
114
    . $locale->text('Orphaned') . qq|</td>
117 115
	</tr>
118 116
	<tr>
119 117
	  <th align=right nowrap>| . $locale->text('Include in Report') . qq|</th>
......
121 119
	    <table>
122 120
	      <tr>
123 121
	        <td><input name="l_id" type=checkbox class=checkbox value=Y> |
124
    . $locale->text('ID')
125
    . qq|</td>
122
    . $locale->text('ID') . qq|</td>
126 123
		<td><input name="l_$form->{db}number" type=checkbox class=checkbox value=Y> |
127
    . $locale->text($label . ' Number')
128
    . qq|</td>
124
    . $locale->text($label . ' Number') . qq|</td>
129 125
		<td><input name="l_name" type=checkbox class=checkbox value=Y checked> |
130
    . $locale->text('Company Name')
131
    . qq|</td>
126
    . $locale->text('Company Name') . qq|</td>
132 127
		<td><input name="l_address" type=checkbox class=checkbox value=Y> |
133
    . $locale->text('Address')
134
    . qq|</td>
128
    . $locale->text('Address') . qq|</td>
135 129
	      </tr>
136 130
	      <tr>
137 131
		<td><input name="l_contact" type=checkbox class=checkbox value=Y checked> |
138
    . $locale->text('Contact')
139
    . qq|</td>
132
    . $locale->text('Contact') . qq|</td>
140 133
		<td><input name="l_phone" type=checkbox class=checkbox value=Y checked> |
141
    . $locale->text('Phone')
142
    . qq|</td>
134
    . $locale->text('Phone') . qq|</td>
143 135
		<td><input name="l_fax" type=checkbox class=checkbox value=Y> |
144
    . $locale->text('Fax')
145
    . qq|</td>
136
    . $locale->text('Fax') . qq|</td>
146 137
		<td><input name="l_email" type=checkbox class=checkbox value=Y checked> |
147
    . $locale->text('E-mail')
148
    . qq|</td>
138
    . $locale->text('E-mail') . qq|</td>
149 139
	      </tr>
150 140
	      <tr>
151 141
		<td><input name="l_taxnumber" type=checkbox class=checkbox value=Y> |
152
    . $locale->text('Tax Number')
153
    . qq|</td>
142
    . $locale->text('Tax Number') . qq|</td>
154 143
		$gifi
155 144
		<td><input name="l_sic_code" type=checkbox class=checkbox value=Y> |
156
    . $locale->text('SIC')
157
    . qq|</td>
145
    . $locale->text('SIC') . qq|</td>
158 146
		<td><input name="l_business" type=checkbox class=checkbox value=Y> |
159
    . $locale->text('Type of Business')
160
    . qq|</td>
147
    . $locale->text('Type of Business') . qq|</td>
161 148
	      </tr>
162 149
	      <tr>
163 150
		<td><input name="l_invnumber" type=checkbox class=checkbox value=Y> |
164
    . $locale->text('Invoices')
165
    . qq|</td>
151
    . $locale->text('Invoices') . qq|</td>
166 152
		<td><input name="l_ordnumber" type=checkbox class=checkbox value=Y> |
167
    . $locale->text('Orders')
168
    . qq|</td>
153
    . $locale->text('Orders') . qq|</td>
169 154
		<td><input name="l_quonumber" type=checkbox class=checkbox value=Y> |
170
    . $locale->text('Quotations')
171
    . qq|</td>
155
    . $locale->text('Quotations') . qq|</td>
172 156
	      </tr>
173 157
	    </table>
174 158
	  </td>
......
363 347

  
364 348
    if ($ref->{id} eq $sameid) {
365 349
      map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
366
      map { $column_data{$_} = "<td>$ref->{$_}&nbsp;</td>" } (invnumber, ordnumber, quonumber);
367 350
    } else {
368 351
      map { $column_data{$_} = "<td>$ref->{$_}&nbsp;</td>" } @column_index;
369 352

  
......
529 512
  </tr>
530 513
|;
531 514
  }
532

  
533 515
  $form->{selectbusiness} = qq|<option>\n|;
534 516
  map {
535
    $form->{selectbusiness} .= qq|<option value=$_->{id}>$_->{description}\n|
517
    $form->{selectbusiness} .=
518
      qq|<option value=$_->{id}>$_->{description}\n|
536 519
  } @{ $form->{all_business} };
537 520
  if ($form->{business_save}) {
538 521
    $form->{selectbusiness} = $form->{business_save};
......
596 579

  
597 580
  $select_greeting =
598 581
    qq|&nbsp;<select name=selected_cp_greeting><option></option>|;
599
  map({ $select_greeting .= qq|<option>$_</option>|; } @{ $form->{GREETINGS} });
582
  map(
583
     { $select_greeting .= qq|<option>$_</option>|; } @{ $form->{GREETINGS} });
600 584
  $select_greeting .= qq|</select>|;
601 585
## /LINET
602 586

  
587
  if ($form->{db} eq 'customer') {
588
  #get pricegroup and form it
589
  $form->get_pricegroup(\%myconfig, { all => 1 });
590

  
591
  $form->{pricegroup}    = "$form->{klass}";
592
  $form->{pricegroup_id} = "$form->{klass}";
593

  
594
  if (@{ $form->{all_pricegroup} }) {
595

  
596
    $form->{selectpricegroup} = qq|<option>\n|;
597
    map {
598
      $form->{selectpricegroup} .=
599
        qq|<option value="$_->{id}">$_->{pricegroup}\n|
600
    } @{ $form->{all_pricegroup} };
601
  }
602

  
603
  if ($form->{selectpricegroup}) {
604
    $form->{selectpricegroup} = $form->unescape($form->{selectpricegroup});
605

  
606
    $pricegroup =
607
      qq|<input type=hidden name=selectpricegroup value="|
608
      . $form->escape($form->{selectpricegroup}, 1) . qq|">|;
609

  
610
    $form->{selectpricegroup} =~
611
      s/(<option value="\Q$form->{klass}\E")/$1 selected/;
612

  
613
    $pricegroup .= qq|<select name=klass>$form->{selectpricegroup}</select>|;
614

  
615
    $group = $locale->text('Hola');
616
  }
617
 }
603 618
  # $locale->text('Customer Number')
604 619
  # $locale->text('Vendor Number')
605 620
  $form->{fokus} = "ct.name";
......
618 633
      <table width=100%>
619 634
	<tr class=listheading>
620 635
	  <th class=listheading colspan=2 width=50%>|
621
    . $locale->text('Billing Address')
622
    . qq|</th>
636
    . $locale->text('Billing Address') . qq|</th>
623 637
	  <th class=listheading width=50%>|
624
    . $locale->text('Shipping Address')
625
    . qq|</th>
638
    . $locale->text('Shipping Address') . qq|</th>
626 639
	</tr>
627 640
	<tr height="5"></tr>
628 641
        $business_salesman
......
649 662
	</tr>
650 663
	<tr>
651 664
	  <th align=right nowrap>|
652
    . $locale->text('Zipcode') . "/"
653
    . $locale->text('City')
654
    . qq|</th>
665
    . $locale->text('Zipcode') . "/" . $locale->text('City') . qq|</th>
655 666
	  <td><input name=zipcode size=5 tabindex=5 maxlength=10 value="$form->{zipcode}">
656 667
          <input name=city size=30 tabindex=6 maxlength=75 value="$form->{city}"></td>
657 668
	  <td><input name=shiptozipcode size=5 maxlength=10 value="$form->{shiptozipcode}">
......
695 706
                <table>
696 707
                <tr>
697 708
	          <th align=right nowrap>|
698
    . $locale->text('Contact Person')
699
    . qq|</th>
709
    . $locale->text('Contact Person') . qq|</th>
700 710
                </tr>
701 711
                <tr>
702 712
                  <th></th>
......
710 720
                <tr>
711 721
                  <th></th>
712 722
                  <th align=left nowrap>|
713
    . $locale->text('Given Name')
714
    . qq|</th>
723
    . $locale->text('Given Name') . qq|</th>
715 724
                  <td><input name=cp_givenname size=30 maxlength=40 value="$form->{cp_givenname}"></td>
716 725
	          <th align=left nowrap>| . $locale->text('Name') . qq|</th>
717 726
                  <td><input name=cp_name size=30 maxlength=40 value="$form->{cp_name}"></td>
......
747 756
	  <td><input name=creditlimit tabindex=13 size=9 value="$form->{creditlimit}"></td>
748 757
	  <th align=right>| . $locale->text('Terms: Net') . qq|</th>
749 758
	  <td><input name=terms tabindex=14 size=2 value="$form->{terms}">|
750
    . $locale->text('days')
751
    . qq|</td>
759
    . $locale->text('days') . qq|</td>
752 760
	  <th align=right>| . $locale->text('Discount') . qq|</th>
753 761
	  <td><input name=discount tabindex=15 size=4 value="$form->{discount}">
754 762
	  %</td>
......
773 781
	  <th align=right>| . $locale->text('Language') . qq|</th>
774 782
	  <td><select name=language tabindex=23>$lang
775 783
                          </select></td>|;
784
if ($form->{db} eq 'customer'){
776 785

  
786
print qq|
787
          <th align=right>| . $locale->text('Preisklasse') . qq|</th>
788
          <td>$pricegroup</td>|;
789
}
777 790
  print qq|        </tr>
778 791
        <tr>
779 792
          <td align=right>| . $locale->text('Obsolete') . qq|</td>
......
835 848
<input type=hidden name=callback value="$form->{callback}">
836 849
<input type=hidden name=db value=$form->{db}>
837 850

  
851

  
852

  
838 853
<br>
839 854
$update_button
840 855
<input class=submit type=submit name=action accesskey="s" value="|

Auch abrufbar als: Unified diff