Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 94e11003

Von Moritz Bunkus vor mehr als 16 Jahren hinzugefügt

  • ID 94e11003809e9090514026a733e58e72e636a6bb
  • Vorgänger 00738f6f
  • Nachfolger 01bdb4dc

Beim Umwandeln von Angeboten/Preisanfragen in Aufträge die IDs in record_links speichern. Beim Umwandeln von Aufträgen und Lieferscheinen in Rechnungen die IDs in record_links speichern.

Unterschiede anzeigen:

bin/mozilla/oe.pl
234 234
    $form->{"select$form->{vc}"} = 1;
235 235
    $form->{$form->{vc}}         = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
236 236
  }
237
  $form->{"old$form->{vc}"}    = $form->{$form->{vc}};
237

  
238
  $form->{"old$form->{vc}"}  = $form->{$form->{vc}};
239
  $form->{"old$form->{vc}"} .= qq|--$form->{"$form->{vc}_id"}| unless ($form->{"old$form->{vc}"} =~ m/--\d+$/);
238 240

  
239 241
  $lxdebug->leave_sub();
240 242
}
......
1455 1457
    OE->close_orders(\%myconfig, \%$form);
1456 1458
  }
1457 1459

  
1458
  $form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig);
1459
  $form->{duedate}   = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
1460
  $form->{convert_from_oe_ids} = $form->{id};
1461
  $form->{transdate}           = $form->{invdate} = $form->current_date(\%myconfig);
1462
  $form->{duedate}             = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
1463
  $form->{shipto}              = 1;
1464
  $form->{defaultcurrency}     = $form->get_default_currency(\%myconfig);
1460 1465

  
1461
  $form->{id}     = '';
1462
  $form->{closed} = 0;
1466
  delete @{$form}{qw(id closed)};
1463 1467
  $form->{rowcount}--;
1464
  $form->{shipto} = 1;
1465

  
1466
  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
1467 1468

  
1468 1469
  if ($form->{type} =~ /_order$/) {
1469 1470
    $form->{exchangerate} = $exchangerate;
......
1814 1815
    delete($form->{ordnumber});
1815 1816
  }
1816 1817

  
1817
  $form->{cp_id}               *= 1;
1818
  $form->{convert_from_oe_ids}  = $form->{id};
1818
  $form->{cp_id} *= 1;
1819 1819

  
1820
  $form->{title}                = $locale->text('Add Sales Order');
1821
  $form->{vc}                   = "customer";
1822
  $form->{type}                 = "sales_order";
1820
  $form->{title}  = $locale->text('Add Sales Order');
1821
  $form->{vc}     = "customer";
1822
  $form->{type}   = "sales_order";
1823 1823

  
1824 1824
  &poso;
1825 1825

  
......
1835 1835
  $form->{transdate} = $form->current_date(\%myconfig);
1836 1836
  delete $form->{duedate};
1837 1837

  
1838
  $form->{closed}          = 0;
1838
  $form->{convert_from_oe_ids} = $form->{id};
1839
  $form->{closed}              = 0;
1839 1840

  
1840
  $form->{old_employee_id} = $form->{employee_id};
1841
  $form->{old_salesman_id} = $form->{salesman_id};
1841
  $form->{old_employee_id}     = $form->{employee_id};
1842
  $form->{old_salesman_id}     = $form->{salesman_id};
1842 1843

  
1843 1844
  # reset
1844
  map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal);
1845
  map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal delivered);
1845 1846

  
1846 1847
  for $i (1 .. $form->{rowcount}) {
1847 1848
    map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if ($form->{"${_}_${i}"}) } qw(ship qty sellprice listprice basefactor);

Auch abrufbar als: Unified diff