Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision d946f59b

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

  • ID d946f59b7c4c8069ecb83834ed34251056155e53
  • Vorgänger 5c3ccca4
  • Nachfolger 6715bd15

is.pl->post entwirrt.
emails speichern/buchen nun rechnungen/auftraege vor dem aufrufen der maske

Unterschiede anzeigen:

bin/mozilla/io.pl
1291 1291
  quotation();
1292 1292
}
1293 1293

  
1294
sub e_mail {
1294
sub edit_e_mail {
1295 1295
  $lxdebug->enter_sub();
1296 1296
  if ($form->{second_run}) {
1297 1297
    $form->{print_and_post} = 0;
bin/mozilla/is.pl
1452 1452
  }
1453 1453

  
1454 1454
  relink_accounts();
1455
  if ($print_post) {
1456
    if (!(IS->post_invoice(\%myconfig, \%$form))) {
1457
      $form->error($locale->text('Cannot post invoice!'));
1458
    }
1459
    remove_draft() if $form->{remove_draft};
1460
    # saving the history
1461
  	if(!exists $form->{addition}) {
1462
  	  $form->{addition} = "PRINTED AND POSTED";
1463
  	  $form->save_history($form->dbconnect(\%myconfig));
1464
    }
1465
    # /saving the history
1466
    
1467
  } else {
1468
    if (IS->post_invoice(\%myconfig, \%$form)){
1469
      remove_draft() if $form->{remove_draft};
1470
    	# saving the history
1471
        if(!exists $form->{addition}) {
1472
  	  		if($form->{storno}) {
1473
  	  			$form->{addition} = "STORNO";
1474
  	  		}
1475
  	  		else {
1476
  	  			$form->{addition} = "POSTED";
1477
  	  		}
1478
  	  		$form->save_history($form->dbconnect(\%myconfig));
1479
    	}
1480
    	# /saving the history
1481
    
1482
    	$form->redirect(
1483
            $form->{label} . " $form->{invnumber} " . $locale->text('posted!'));
1484
  	}
1485
    $form->error($locale->text('Cannot post invoice!'));
1455
  $form->error($locale->text('Cannot post invoice!'))
1456
    unless IS->post_invoice(\%myconfig, \%$form);
1457
  remove_draft() if $form->{remove_draft};
1458

  
1459
  if(!exists $form->{addition}) {
1460
    $form->{addition} = $print_post     ? "PRINTED AND POSTED" :
1461
                        $form->{storno} ? "STORNO"             :
1462
                                          "POSTED";
1463
    $form->save_history($form->dbconnect(\%myconfig));
1486 1464
  }
1465
  
1466
  $form->redirect( $form->{label} . " $form->{invnumber} " . $locale->text('posted!'))
1467
    unless $print_post;
1487 1468

  
1488 1469
  $lxdebug->leave_sub();
1489 1470
}
......
1662 1643

  
1663 1644
  $lxdebug->leave_sub();
1664 1645
}
1646

  
1647
sub e_mail {
1648
  $lxdebug->enter_sub();
1649

  
1650
  $form->{postasnew} = 1;
1651
  $print_post        = 1;
1652

  
1653
  map { delete $form->{$_} } qw(printed emailed queued);
1654

  
1655
  &post;
1656

  
1657
  &edit_e_mail;
1658

  
1659
  $lxdebug->leave_sub();
1660
}
bin/mozilla/oe.pl
2509 2509
  $lxdebug->leave_sub();
2510 2510
}
2511 2511

  
2512
sub e_mail {
2513
  $lxdebug->enter_sub();
2514

  
2515
  $form->{saveasnew}      = 1;
2516
  $form->{closed}         = 0;
2517
  $form->{print_and_save} = 1;
2518
  map { delete $form->{$_} } qw(printed emailed queued);
2519

  
2520
  # Let Lx-Office assign a new order number if the user hasn't changed the
2521
  # previous one. If it has been changed manually then use it as-is.
2522
  my $idx = $form->{type} =~ /_quotation$/ ? "quonumber" : "ordnumber";
2523
  if ($form->{saved_xyznumber} &&
2524
      ($form->{saved_xyznumber} eq $form->{$idx})) {
2525
    delete($form->{$idx});
2526
  }
2527

  
2528
  &save;
2529

  
2530
  &edit_e_mail;
2531

  
2532
  $lxdebug->leave_sub();
2533
}
2534

  
locale/de/dn
241 241
  'delivery_customer_selection' => 'delivery_customer_selection',
242 242
  'display_form'                => 'display_form',
243 243
  'display_row'                 => 'display_row',
244
  'e_mail'                      => 'e_mail',
245 244
  'edit_config'                 => 'edit_config',
245
  'edit_e_mail'                 => 'edit_e_mail',
246 246
  'employee_selection_internal' => 'employee_selection_internal',
247 247
  'format_dates'                => 'format_dates',
248 248
  'gl_transaction'              => 'gl_transaction',
locale/de/ic
288 288
  'display'                     => 'display',
289 289
  'display_form'                => 'display_form',
290 290
  'display_row'                 => 'display_row',
291
  'e_mail'                      => 'e_mail',
292 291
  'edit'                        => 'edit',
292
  'edit_e_mail'                 => 'edit_e_mail',
293 293
  'employee_selection_internal' => 'employee_selection_internal',
294 294
  'form_footer'                 => 'form_footer',
295 295
  'form_header'                 => 'form_header',
locale/de/io
176 176
  'delivery_customer_selection' => 'delivery_customer_selection',
177 177
  'display_form'                => 'display_form',
178 178
  'display_row'                 => 'display_row',
179
  'e_mail'                      => 'e_mail',
179
  'edit_e_mail'                 => 'edit_e_mail',
180 180
  'employee_selection_internal' => 'employee_selection_internal',
181 181
  'format_dates'                => 'format_dates',
182 182
  'invoicetotal'                => 'invoicetotal',
locale/de/ir
253 253
  'display_row'                 => 'display_row',
254 254
  'dont_load_draft'             => 'dont_load_draft',
255 255
  'draft_action_dispatcher'     => 'draft_action_dispatcher',
256
  'e_mail'                      => 'e_mail',
257 256
  'edit'                        => 'edit',
257
  'edit_e_mail'                 => 'edit_e_mail',
258 258
  'employee_selection_internal' => 'employee_selection_internal',
259 259
  'form_footer'                 => 'form_footer',
260 260
  'form_header'                 => 'form_header',
locale/de/is
278 278
  'display_row'                 => 'display_row',
279 279
  'dont_load_draft'             => 'dont_load_draft',
280 280
  'draft_action_dispatcher'     => 'draft_action_dispatcher',
281
  'e_mail'                      => 'e_mail',
282 281
  'edit'                        => 'edit',
282
  'edit_e_mail'                 => 'edit_e_mail',
283 283
  'employee_selection_internal' => 'employee_selection_internal',
284 284
  'form_footer'                 => 'form_footer',
285 285
  'form_header'                 => 'form_header',
locale/de/oe
288 288
  'display_row'                 => 'display_row',
289 289
  'e_mail'                      => 'e_mail',
290 290
  'edit'                        => 'edit',
291
  'edit_e_mail'                 => 'edit_e_mail',
291 292
  'employee_selection_internal' => 'employee_selection_internal',
292 293
  'form_footer'                 => 'form_footer',
293 294
  'form_header'                 => 'form_header',

Auch abrufbar als: Unified diff