Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 8fa48153

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

  • ID 8fa481535e12dc5cfddcdff28b8b1a9ce881ab57
  • Vorgänger 8574428d
  • Nachfolger c2f2c60e

Whitespace Purge

Unterschiede anzeigen:

SL/IS.pm
499 499
  if (!$form->{employee_id}) {
500 500
    $form->get_employee($dbh);
501 501
  }
502
  
502

  
503 503
  $form->{defaultcurrency} = $form->get_default_currency($myconfig);
504 504

  
505 505
  ($null, $form->{department_id}) = split(/--/, $form->{department});
......
962 962
                curr        = ?, department_id = ?, payment_id    = ?, taxincluded   = ?,
963 963
                type        = ?, language_id   = ?, taxzone_id    = ?, shipto_id     = ?,
964 964
                employee_id = ?, salesman_id   = ?, storno_id     = ?, storno        = ?,
965
                cp_id       = ?, marge_total   = ?, marge_percent = ?, 
965
                cp_id       = ?, marge_total   = ?, marge_percent = ?,
966 966
                globalproject_id               = ?, delivery_customer_id             = ?,
967 967
                transaction_description        = ?, delivery_vendor_id               = ?,
968 968
		donumber    = ?
969 969
              WHERE id = ?|;
970 970
  @values = (          $form->{"invnumber"},           $form->{"ordnumber"},             $form->{"quonumber"},          $form->{"cusordnumber"},
971
             conv_date($form->{"invdate"}),  conv_date($form->{"orddate"}),    conv_date($form->{"quodate"}),    conv_i($form->{"customer_id"}), 
972
                       $amount,                        $netamount,                       $form->{"paid"},     conv_date($form->{"datepaid"}), 
971
             conv_date($form->{"invdate"}),  conv_date($form->{"orddate"}),    conv_date($form->{"quodate"}),    conv_i($form->{"customer_id"}),
972
                       $amount,                        $netamount,                       $form->{"paid"},     conv_date($form->{"datepaid"}),
973 973
             conv_date($form->{"duedate"}),  conv_date($form->{"deliverydate"}),    '1',                                $form->{"shippingpoint"},
974 974
                       $form->{"shipvia"},      conv_i($form->{"terms"}),                $form->{"notes"},              $form->{"intnotes"},
975 975
                       $form->{"currency"},     conv_i($form->{"department_id"}), conv_i($form->{"payment_id"}),        $form->{"taxincluded"} ? 't' : 'f',
976 976
                       $form->{"type"},         conv_i($form->{"language_id"}),   conv_i($form->{"taxzone_id"}), conv_i($form->{"shipto_id"}),
977
                conv_i($form->{"employee_id"}), conv_i($form->{"salesman_id"}),   conv_i($form->{storno_id}),           $form->{"storno"} ? 't' : 'f', 
977
                conv_i($form->{"employee_id"}), conv_i($form->{"salesman_id"}),   conv_i($form->{storno_id}),           $form->{"storno"} ? 't' : 'f',
978 978
                conv_i($form->{"cp_id"}),            1 * $form->{marge_total} ,      1 * $form->{marge_percent},
979
                conv_i($form->{"globalproject_id"}),                              conv_i($form->{"delivery_customer_id"}), 
979
                conv_i($form->{"globalproject_id"}),                              conv_i($form->{"delivery_customer_id"}),
980 980
                       $form->{transaction_description},                          conv_i($form->{"delivery_vendor_id"}),
981 981
		       $form->{"donumber"}, #das entsprechende feld lieferscheinnummer aus der html-form 12.02.09 jb
982 982
                conv_i($form->{"id"}));
983 983
  do_query($form, $dbh, $query, @values);
984
  
984

  
985 985
  if($form->{"formname"} eq "credit_note") {
986 986
    for my $i (1 .. $form->{rowcount}) {
987 987
      $query = qq|UPDATE parts SET onhand = onhand - ? WHERE id = ?|;
......
989 989
      do_query($form, $dbh, $query, @values);
990 990
    }
991 991
  }
992
  
992

  
993 993
  if ($form->{storno}) {
994 994
    $query =
995 995
      qq!UPDATE ar SET
......
1438 1438
    my $transdate = $form->{deliverydate} ? $dbh->quote($form->{deliverydate})
1439 1439
                  : $form->{invdate}      ? $dbh->quote($form->{invdate})
1440 1440
                  :                         "current_date";
1441
     
1441

  
1442 1442

  
1443 1443
    my $taxzone_id = $form->{taxzone_id} *= 1;
1444 1444
    $taxzone_id = 0 if (0 > $taxzone_id) || (3 < $taxzone_id);
......
1488 1488
           LEFT JOIN chart c ON (c.id = t.chart_id)
1489 1489
           WHERE t.id IN
1490 1490
             (SELECT tk.tax_id FROM taxkeys tk
1491
              WHERE tk.chart_id = (SELECT id FROM chart WHERE accno = ?) 
1491
              WHERE tk.chart_id = (SELECT id FROM chart WHERE accno = ?)
1492 1492
                AND startdate <= date($transdate)
1493 1493
              ORDER BY startdate DESC LIMIT 1)
1494 1494
           ORDER BY c.accno|;
......
1815 1815
    my $i = 0;
1816 1816
    while (my $ptr = $stw->fetchrow_hashref('NAME_lc')) {
1817 1817

  
1818
      #    if ($customertax{$ref->{accno}}) 
1818
      #    if ($customertax{$ref->{accno}})
1819 1819
      if (($ptr->{accno} eq "") && ($ptr->{rate} == 0)) {
1820 1820
        $i++;
1821 1821
        $ptr->{accno} = $i;

Auch abrufbar als: Unified diff