Anzahlungs-Rg.: Workflow Auftrag -> Anzahlungs-Rg.

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 64ad14d231463bc9ea5c1815e8c0d19a4e89c6cd..7d421ef01288012e9216466d914259c6d8c09ece 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -57,11 +57,11 @@ use Rose::Object::MakeMethods::Generic
 __PACKAGE__->run_before('check_auth');
 
 __PACKAGE__->run_before('recalc',
 __PACKAGE__->run_before('check_auth');
 
 __PACKAGE__->run_before('recalc',

-                        only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_ap_transaction
+                        only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_invoice_for_advance_payment save_and_ap_transaction

                                      print send_email) ]);
 
 __PACKAGE__->run_before('get_unalterable_data',
                                      print send_email) ]);
 
 __PACKAGE__->run_before('get_unalterable_data',

-                        only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_ap_transaction
+                        only => [ qw(save save_as_new save_and_delivery_order save_and_invoice save_and_invoice_for_advance_payment save_and_ap_transaction

                                      print send_email) ]);
 
 #
                                      print send_email) ]);
 
 #


@@ -688,6 +688,16 @@ sub action_save_and_invoice {
   );
 }
 
   );
 }
 

+sub action_save_and_invoice_for_advance_payment {
+  my ($self) = @_;
+
+  $self->save_and_redirect_to(
+    controller       => 'oe.pl',
+    action           => 'oe_invoice_from_order',
+    new_invoice_type => 'invoice_for_advance_payment',
+  );
+}
+

 # workflow from sales order to sales quotation
 sub action_sales_quotation {
   $_[0]->workflow_sales_or_request_for_quotation();
 # workflow from sales order to sales quotation
 sub action_sales_quotation {
   $_[0]->workflow_sales_or_request_for_quotation();


@@ -1974,6 +1984,12 @@ sub setup_edit_action_bar {
   my @req_trans_cost_art = qw(kivi.Order.check_transport_cost_article_presence) x!!$::instance_conf->get_transport_cost_reminder_article_number_id;
   my @req_cusordnumber   = qw(kivi.Order.check_cusordnumber_presence)           x($self->type eq sales_order_type() && $::instance_conf->get_order_warn_no_cusordnumber);
 
   my @req_trans_cost_art = qw(kivi.Order.check_transport_cost_article_presence) x!!$::instance_conf->get_transport_cost_reminder_article_number_id;
   my @req_cusordnumber   = qw(kivi.Order.check_cusordnumber_presence)           x($self->type eq sales_order_type() && $::instance_conf->get_order_warn_no_cusordnumber);
 

+  my $has_invoice_for_advance_payment;
+  if ($self->order->id && $self->type eq sales_order_type()) {
+    my $lr = $self->order->linked_records(direction => 'to', to => ['Invoice']);
+    $has_invoice_for_advance_payment = any {'SL::DB::Invoice' eq ref $_ && "invoice_for_advance_payment" eq $_->type} @$lr;
+  }
+

   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       combobox => [
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       combobox => [


@@ -2040,6 +2056,16 @@ sub setup_edit_action_bar {
                          @req_trans_cost_art, @req_cusordnumber,
           ],
         ],
                          @req_trans_cost_art, @req_cusordnumber,
           ],
         ],

+        action => [
+          t8('Save and Invoice for Advance Payment'),
+          call      => [ 'kivi.Order.save', 'save_and_invoice_for_advance_payment', $::instance_conf->get_order_warn_duplicate_parts ],
+          checks    => [ 'kivi.Order.check_save_active_periodic_invoices',
+                         @req_trans_cost_art, @req_cusordnumber,
+          ],
+          disabled  => $has_invoice_for_advance_payment ? t8('This order has already an invoice for advanced payment.')
+                                                        : undef,
+          only_if   => (any { $self->type eq $_ } (sales_order_type())),
+        ],

         action => [
           t8('Save and AP Transaction'),
           call      => [ 'kivi.Order.save', 'save_and_ap_transaction', $::instance_conf->get_order_warn_duplicate_parts ],
         action => [
           t8('Save and AP Transaction'),
           call      => [ 'kivi.Order.save', 'save_and_ap_transaction', $::instance_conf->get_order_warn_duplicate_parts ],

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index a3425ecde477f1bc6b65cd5d77f192fb11ffacb8..b9edf4c96f84e4a50e1bce086939e1305208b33d 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -1699,7 +1699,9 @@ sub invoice {
 
   if (   $form->{type} eq 'sales_order'
       || $form->{type} eq 'sales_quotation') {
 
   if (   $form->{type} eq 'sales_order'
       || $form->{type} eq 'sales_quotation') {

-    $form->{title}  = $locale->text('Add Sales Invoice');
+    $form->{title}  = ($form->{new_invoice_type} eq 'invoice_for_advance_payment')
+                    ? $locale->text('Add Invoice for Advance Payment')
+                    : $locale->text('Add Sales Invoice');

     $form->{script} = 'is.pl';
     $script         = "is";
     $buysell        = 'buy';
     $form->{script} = 'is.pl';
     $script         = "is";
     $buysell        = 'buy';


@@ -1708,7 +1710,7 @@ sub invoice {
   # bo creates the id, reset it
   map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued);
   $form->{ $form->{vc} } =~ s/--.*//g;
   # bo creates the id, reset it
   map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued);
   $form->{ $form->{vc} } =~ s/--.*//g;

-  $form->{type} = "invoice";
+  $form->{type} = $form->{new_invoice_type} || "invoice";

 
   # locale messages
   $main::locale = Locale->new("$myconfig{countrycode}", "$script");
 
   # locale messages
   $main::locale = Locale->new("$myconfig{countrycode}", "$script");

diff --git a/locale/de/all b/locale/de/all
index f456c5756aed771fc705cb4d3d0cc06807755f56..4a62d7c3e83fc3bc5fe2c5524447cd9f440fb931 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -3000,6 +3000,7 @@ $self->{texts} = {
   'Save and Delivery Order'     => 'Speichern und Lieferschein',
   'Save and E-mail'             => 'Speichern und E-Mail',
   'Save and Invoice'            => 'Speichern und Rechnung erfassen',
   'Save and Delivery Order'     => 'Speichern und Lieferschein',
   'Save and E-mail'             => 'Speichern und E-Mail',
   'Save and Invoice'            => 'Speichern und Rechnung erfassen',

+  'Save and Invoice for Advance Payment' => 'Speichern und Anzahlungsrechnung',

   'Save and Order'              => 'Speichern und Auftrag erfassen',
   'Save and Purchase Order'     => 'Speichern und Lieferantenauftrag',
   'Save and Quotation'          => 'Speichern und Angebot',
   'Save and Order'              => 'Speichern und Auftrag erfassen',
   'Save and Purchase Order'     => 'Speichern und Lieferantenauftrag',
   'Save and Quotation'          => 'Speichern und Angebot',


@@ -3871,6 +3872,7 @@ $self->{texts} = {
   'This option controls the method used for determining the startdate for the balance report.' => 'Diese Option bestimmt, wie das Startdatum für den Bilanzbericht ermittelt wird',
   'This option controls the method used for profit determination.' => 'Dieser Parameter legt die Berechnungsmethode für die Gewinnermittlung fest.',
   'This option controls the posting and calculation behavior for the accounting method.' => 'Dieser Parameter steuert die Buchungs- und Berechnungsmethoden für die Versteuerungsart.',
   'This option controls the method used for determining the startdate for the balance report.' => 'Diese Option bestimmt, wie das Startdatum für den Bilanzbericht ermittelt wird',
   'This option controls the method used for profit determination.' => 'Dieser Parameter legt die Berechnungsmethode für die Gewinnermittlung fest.',
   'This option controls the posting and calculation behavior for the accounting method.' => 'Dieser Parameter steuert die Buchungs- und Berechnungsmethoden für die Versteuerungsart.',

+  'This order has already an invoice for advanced payment.' => 'Dieser Auftrag hat schon eine Anzahlungsrechnung.',

   'This part has already been added.' => 'Dieser Artikel wurde schon hinzugefügt',
   'This part was already counted for this bin:' => 'Dieser Artikel wurde für diesen Lagerplatz bereits erfasst:',
   'This price has since gone down' => 'Dieser Preis ist mittlerweile niedriger',
   'This part has already been added.' => 'Dieser Artikel wurde schon hinzugefügt',
   'This part was already counted for this bin:' => 'Dieser Artikel wurde für diesen Lagerplatz bereits erfasst:',
   'This price has since gone down' => 'Dieser Preis ist mittlerweile niedriger',

diff --git a/locale/en/all b/locale/en/all
index 900c36592ccba5b79673b0587bf482050fb2cead..fa77868c1d2e0397f853a5d106fd1194b3274cee 100644 (file)
--- a/locale/en/all
+++ b/locale/en/all
@@ -2998,6 +2998,7 @@ $self->{texts} = {
   'Save and Delivery Order'     => '',
   'Save and E-mail'             => '',
   'Save and Invoice'            => '',
   'Save and Delivery Order'     => '',
   'Save and E-mail'             => '',
   'Save and Invoice'            => '',

+  'Save and Invoice for Advance Payment' => '',

   'Save and Order'              => '',
   'Save and Purchase Order'     => '',
   'Save and Quotation'          => '',
   'Save and Order'              => '',
   'Save and Purchase Order'     => '',
   'Save and Quotation'          => '',


@@ -3866,6 +3867,7 @@ $self->{texts} = {
   'This option controls the method used for determining the startdate for the balance report.' => '',
   'This option controls the method used for profit determination.' => '',
   'This option controls the posting and calculation behavior for the accounting method.' => '',
   'This option controls the method used for determining the startdate for the balance report.' => '',
   'This option controls the method used for profit determination.' => '',
   'This option controls the posting and calculation behavior for the accounting method.' => '',

+  'This order has already an invoice for advanced payment.' => '',

   'This part has already been added.' => '',
   'This part was already counted for this bin:' => '',
   'This price has since gone down' => '',
   'This part has already been added.' => '',
   'This part was already counted for this bin:' => '',
   'This price has since gone down' => '',