Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision b65a230d

Von Sven Schöling vor fast 15 Jahren hinzugefügt

  • ID b65a230d60e86d2c18a3ab7222379905aea5ecd7
  • Vorgänger 3cbc223a
  • Nachfolger 7e9a98a0

Tabs aus *.pl Dateien entfernt.

Unterschiede anzeigen:

bin/mozilla/io.pl
750 750
        #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"};
751 751

  
752 752
        # fuer assemblies auskommentiert. siehe oben
753
	#    $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"} / ($form->{"price_factor_$i"} || 1));
753
        #    $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"} / ($form->{"price_factor_$i"} || 1));
754 754
        $form->{weight}    += ($form->{"qty_$i"} * $form->{"weight_$i"} / ($form->{"price_factor_$i"} || 1));
755 755
        $count++;
756 756
      }
......
1421 1421

  
1422 1422
      call_sub($display_form);
1423 1423
      # saving the history
1424
  	  if(!exists $form->{addition}) {
1424
      if(!exists $form->{addition}) {
1425 1425
        $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
1426
  	    $form->{addition} = "PRINTED";
1427
  	    $form->save_history($form->dbconnect(\%myconfig));
1426
        $form->{addition} = "PRINTED";
1427
        $form->save_history($form->dbconnect(\%myconfig));
1428 1428
      }
1429 1429
      # /saving the history
1430 1430
      exit;
......
1641 1641
  if(!exists $form->{addition}) {
1642 1642
    $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber};
1643 1643
    if($form->{media} =~ /printer/) {
1644
    	$form->{addition} = "PRINTED";
1644
      $form->{addition} = "PRINTED";
1645 1645
    }
1646 1646
    elsif($form->{media} =~ /email/) {
1647
    	$form->{addition} = "MAILED";
1647
      $form->{addition} = "MAILED";
1648 1648
    }
1649 1649
    elsif($form->{media} =~ /queue/) {
1650
    	$form->{addition} = "QUEUED";
1650
      $form->{addition} = "QUEUED";
1651 1651
    }
1652 1652
    elsif($form->{media} =~ /screen/) {
1653
    	$form->{addition} = "SCREENED";
1653
      $form->{addition} = "SCREENED";
1654 1654
    }
1655 1655
    $form->save_history($form->dbconnect(\%myconfig));
1656 1656
  }
......
1809 1809
  <tr>
1810 1810
    <td>
1811 1811
      <table>
1812
	<tr class="listheading">
1813
	  <th class="listheading" colspan="2" width="50%">|
1812
        <tr class="listheading">
1813
          <th class="listheading" colspan="2" width="50%">|
1814 1814
    . $locale->text('Billing Address') . qq|</th>
1815
	  <th class="listheading" width="50%">|
1815
          <th class="listheading" width="50%">|
1816 1816
    . $locale->text('Shipping Address') . qq|</th>
1817
	</tr>
1818
	<tr height="5"></tr>
1819
	<tr>
1820
	  <th align="right" nowrap>$number</th>
1821
	  <td>$form->{"$form->{vc}number"}</td>
1822
	</tr>
1823
	<tr>
1824
	  <th align="right" nowrap>| . $locale->text('Company Name') . qq|</th>
1825
	  <td>$form->{name}</td>
1826
	  <td><input name="shiptoname" size="35" value="$form->{shiptoname}"></td>
1827
	</tr>
1828
	<tr>
1829
	  <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
1830
	  <td>$form->{department_1}</td>
1831
	  <td><input name="shiptodepartment_1" size="35" value="$form->{shiptodepartment_1}"></td>
1832
	</tr>
1833
	<tr>
1834
	  <th align="right" nowrap>&nbsp;</th>
1835
	  <td>$form->{department_2}</td>
1836
	  <td><input name="shiptodepartment_2" size="35" value="$form->{shiptodepartment_2}"></td>
1837
	</tr>
1838
	<tr>
1839
	  <th align="right" nowrap>| . $locale->text('Street') . qq|</th>
1840
	  <td>$form->{street}</td>
1841
	  <td><input name="shiptostreet" size="35" value="$form->{shiptostreet}"></td>
1842
	</tr>
1843
	<tr>
1844
	  <th align="right" nowrap>| . $locale->text('Zipcode') . qq|</th>
1845
	  <td>$form->{zipcode}</td>
1846
	  <td><input name="shiptozipcode" size="35" value="$form->{shiptozipcode}"></td>
1847
	</tr>
1848
	<tr>
1849
	  <th align="right" nowrap>| . $locale->text('City') . qq|</th>
1850
	  <td>$form->{city}</td>
1851
	  <td><input name="shiptocity" size="35" value="$form->{shiptocity}"></td>
1852
	</tr>
1853
	<tr>
1854
	  <th align="right" nowrap>| . $locale->text('Country') . qq|</th>
1855
	  <td>$form->{country}</td>
1856
	  <td><input name="shiptocountry" size="35" value="$form->{shiptocountry}"></td>
1857
	</tr>
1858
	<tr>
1859
	  <th align="right" nowrap>| . $locale->text('Contact') . qq|</th>
1860
	  <td>$form->{contact}</td>
1861
	  <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
1862
	</tr>
1863
	<tr>
1864
	  <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
1865
	  <td>$form->{phone}</td>
1866
	  <td><input name="shiptophone" size="20" value="$form->{shiptophone}"></td>
1867
	</tr>
1868
	<tr>
1869
	  <th align="right" nowrap>| . $locale->text('Fax') . qq|</th>
1870
	  <td>$form->{fax}</td>
1871
	  <td><input name="shiptofax" size="20" value="$form->{shiptofax}"></td>
1872
	</tr>
1873
	<tr>
1874
	  <th align="right" nowrap>| . $locale->text('E-mail') . qq|</th>
1875
	  <td>$form->{email}</td>
1876
	  <td><input name="shiptoemail" size="35" value="$form->{shiptoemail}"></td>
1877
	</tr>
1817
        </tr>
1818
        <tr height="5"></tr>
1819
        <tr>
1820
          <th align="right" nowrap>$number</th>
1821
          <td>$form->{"$form->{vc}number"}</td>
1822
        </tr>
1823
        <tr>
1824
          <th align="right" nowrap>| . $locale->text('Company Name') . qq|</th>
1825
          <td>$form->{name}</td>
1826
          <td><input name="shiptoname" size="35" value="$form->{shiptoname}"></td>
1827
        </tr>
1828
        <tr>
1829
          <th align="right" nowrap>| . $locale->text('Department') . qq|</th>
1830
          <td>$form->{department_1}</td>
1831
          <td><input name="shiptodepartment_1" size="35" value="$form->{shiptodepartment_1}"></td>
1832
        </tr>
1833
        <tr>
1834
          <th align="right" nowrap>&nbsp;</th>
1835
          <td>$form->{department_2}</td>
1836
          <td><input name="shiptodepartment_2" size="35" value="$form->{shiptodepartment_2}"></td>
1837
        </tr>
1838
        <tr>
1839
          <th align="right" nowrap>| . $locale->text('Street') . qq|</th>
1840
          <td>$form->{street}</td>
1841
          <td><input name="shiptostreet" size="35" value="$form->{shiptostreet}"></td>
1842
        </tr>
1843
        <tr>
1844
          <th align="right" nowrap>| . $locale->text('Zipcode') . qq|</th>
1845
          <td>$form->{zipcode}</td>
1846
          <td><input name="shiptozipcode" size="35" value="$form->{shiptozipcode}"></td>
1847
        </tr>
1848
        <tr>
1849
          <th align="right" nowrap>| . $locale->text('City') . qq|</th>
1850
          <td>$form->{city}</td>
1851
          <td><input name="shiptocity" size="35" value="$form->{shiptocity}"></td>
1852
        </tr>
1853
        <tr>
1854
          <th align="right" nowrap>| . $locale->text('Country') . qq|</th>
1855
          <td>$form->{country}</td>
1856
          <td><input name="shiptocountry" size="35" value="$form->{shiptocountry}"></td>
1857
        </tr>
1858
        <tr>
1859
          <th align="right" nowrap>| . $locale->text('Contact') . qq|</th>
1860
          <td>$form->{contact}</td>
1861
          <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
1862
        </tr>
1863
        <tr>
1864
          <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
1865
          <td>$form->{phone}</td>
1866
          <td><input name="shiptophone" size="20" value="$form->{shiptophone}"></td>
1867
        </tr>
1868
        <tr>
1869
          <th align="right" nowrap>| . $locale->text('Fax') . qq|</th>
1870
          <td>$form->{fax}</td>
1871
          <td><input name="shiptofax" size="20" value="$form->{shiptofax}"></td>
1872
        </tr>
1873
        <tr>
1874
          <th align="right" nowrap>| . $locale->text('E-mail') . qq|</th>
1875
          <td>$form->{email}</td>
1876
          <td><input name="shiptoemail" size="35" value="$form->{shiptoemail}"></td>
1877
        </tr>
1878 1878
      </table>
1879 1879
    </td>
1880 1880
  </tr>

Auch abrufbar als: Unified diff