Beim Umwandeln von Angeboten/Preisanfragen in Aufträge die IDs in record_links speich...

diff --git a/SL/DO.pm b/SL/DO.pm
index eea23724f6f08a3f18778bda63528a4bd5b54f58..3f623ec6d63b60a734dd39335f52031946bb3cde 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -345,7 +345,7 @@ sub save {
 
   # Link this delivery order to the quotations it was created from.
   RecordLinks->create_links('dbh'        => $dbh,
 
   # Link this delivery order to the quotations it was created from.
   RecordLinks->create_links('dbh'        => $dbh,

-                            'mode'       => 'string',
+                            'mode'       => 'ids',

                             'from_table' => 'oe',
                             'from_ids'   => $form->{convert_from_oe_ids},
                             'to_table'   => 'delivery_orders',
                             'from_table' => 'oe',
                             'from_ids'   => $form->{convert_from_oe_ids},
                             'to_table'   => 'delivery_orders',

diff --git a/SL/IR.pm b/SL/IR.pm
index b8f22cd31a556ce68ee4e4780171634e70a54c75..f3c2674b05d493f3fd3791a66bc69f1753038a8c 100644 (file)
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -539,10 +539,28 @@ sub post_invoice {
 
   Common::webdav_folder($form) if ($main::webdav);
 
 
   Common::webdav_folder($form) if ($main::webdav);
 

-  my @close_do_ids = map { $_ * 1 } grep { $_ } split m/\s+/, $form->{close_do_ids};
-  if (scalar @close_do_ids) {
+  # Link this record to the records it was created from.
+  RecordLinks->create_links('dbh'        => $dbh,
+                            'mode'       => 'ids',
+                            'from_table' => 'oe',
+                            'from_ids'   => $form->{convert_from_oe_ids},
+                            'to_table'   => 'ap',
+                            'to_id'      => $form->{id},
+    );
+  delete $form->{convert_from_oe_ids};
+
+  my @convert_from_do_ids = map { $_ * 1 } grep { $_ } split m/\s+/, $form->{convert_from_do_ids};
+  if (scalar @convert_from_do_ids) {

     DO->close_orders('dbh' => $dbh,
     DO->close_orders('dbh' => $dbh,

-                     'ids' => \@close_do_ids);
+                     'ids' => \@convert_from_do_ids);
+
+    RecordLinks->create_links('dbh'        => $dbh,
+                              'mode'       => 'ids',
+                              'from_table' => 'delivery_orders',
+                              'from_ids'   => \@convert_from_do_ids,
+                              'to_table'   => 'ap',
+                              'to_id'      => $form->{id},
+      );

   }
 
   my $rc = 1;
   }
 
   my $rc = 1;

diff --git a/SL/IS.pm b/SL/IS.pm
index ca43fd8abcd0ef297fd3c1bfcf0374c7fa3971b6..c4e2a7fbd04526846b4ed2070d1cf171120fa4aa 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -970,11 +970,29 @@ sub post_invoice {
 
   Common::webdav_folder($form) if ($main::webdav);
 
 
   Common::webdav_folder($form) if ($main::webdav);
 

-  my @close_do_ids = map { $_ * 1 } grep { $_ } split m/\s+/, $form->{close_do_ids};
-
-  if (scalar @close_do_ids) {
+  # Link this record to the records it was created from.
+  RecordLinks->create_links('dbh'        => $dbh,
+                            'mode'       => 'ids',
+                            'from_table' => 'oe',
+                            'from_ids'   => $form->{convert_from_oe_ids},
+                            'to_table'   => 'ar',
+                            'to_id'      => $form->{id},
+    );
+  delete $form->{convert_from_oe_ids};
+
+  my @convert_from_do_ids = map { $_ * 1 } grep { $_ } split m/\s+/, $form->{convert_from_do_ids};
+
+  if (scalar @convert_from_do_ids) {

     DO->close_orders('dbh' => $dbh,
     DO->close_orders('dbh' => $dbh,

-                     'ids' => \@close_do_ids);
+                     'ids' => \@convert_from_do_ids);
+
+    RecordLinks->create_links('dbh'        => $dbh,
+                              'mode'       => 'ids',
+                              'from_table' => 'delivery_orders',
+                              'from_ids'   => \@convert_from_do_ids,
+                              'to_table'   => 'ar',
+                              'to_id'      => $form->{id},
+      );

   }
 
   my $rc = 1;
   }
 
   my $rc = 1;

diff --git a/SL/OE.pm b/SL/OE.pm
index e279e4a65f95cbc26fdbe54588a6dabd3b776afb..3dd83b768afc04412a9987dc8c9455428d280a90 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -465,6 +465,16 @@ sub save {
   # save printed, emailed, queued
   $form->save_status($dbh);
 
   # save printed, emailed, queued
   $form->save_status($dbh);
 

+  # Link this record to the records it was created from.
+  RecordLinks->create_links('dbh'        => $dbh,
+                            'mode'       => 'ids',
+                            'from_table' => 'oe',
+                            'from_ids'   => $form->{convert_from_oe_ids},
+                            'to_table'   => 'oe',
+                            'to_id'      => $form->{id},
+    );
+  delete $form->{convert_from_oe_ids};
+

   if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
     if ($form->{vc} eq 'customer') {
       $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, $form->{exchangerate}, 0);
   if (($form->{currency} ne $form->{defaultcurrency}) && !$exchangerate) {
     if ($form->{vc} eq 'customer') {
       $form->update_exchangerate($dbh, $form->{currency}, $form->{transdate}, $form->{exchangerate}, 0);


@@ -600,6 +610,10 @@ sub retrieve {
       if ($form->{"multi_id_$_"} and $form->{"trans_id_$_"})
   } (1 .. $form->{"rowcount"});
 
       if ($form->{"multi_id_$_"} and $form->{"trans_id_$_"})
   } (1 .. $form->{"rowcount"});
 

+  if ($form->{rowcount} && scalar @ids) {
+    $form->{convert_from_oe_ids} = join ' ', @ids;
+  }
+

   # if called in multi id mode, and still only got one id, switch back to single id
   if ($form->{"rowcount"} and $#ids == 0) {
     $form->{"id"} = $ids[0];
   # if called in multi id mode, and still only got one id, switch back to single id
   if ($form->{"rowcount"} and $#ids == 0) {
     $form->{"id"} = $ids[0];

diff --git a/SL/RecordLinks.pm b/SL/RecordLinks.pm
index fb451a801489bbc6774d52f07aefbc4436d54206..8dfbac61ee775ee08e58a5d070edd86ba757bb9c 100644 (file)
--- a/SL/RecordLinks.pm
+++ b/SL/RecordLinks.pm
@@ -9,7 +9,7 @@ sub create_links {
   my $self     = shift;
   my %params   = @_;
 
   my $self     = shift;
   my %params   = @_;
 

-  if ($params{mode} && ($params{mode} eq 'string')) {
+  if ($params{mode} && ($params{mode} eq 'ids')) {

     Common::check_params_x(\%params, [ qw(from_ids to_ids) ]);
 
   } else {
     Common::check_params_x(\%params, [ qw(from_ids to_ids) ]);
 
   } else {


@@ -19,9 +19,15 @@ sub create_links {
 
   my @links;
 
 
   my @links;
 

-  if ($params{mode} && ($params{mode} eq 'string')) {
+  if ($params{mode} && ($params{mode} eq 'ids')) {

     my ($from_to, $to_from) = $params{from_ids} ? qw(from to) : qw(to from);
     my ($from_to, $to_from) = $params{from_ids} ? qw(from to) : qw(to from);

-    my %ids                 = ( $from_to => [ grep { $_ } map { $_ * 1 } split m/\s+/, $params{"${from_to}_ids"} ] );
+    my %ids;
+
+    if ('ARRAY' eq ref $params{"${from_to}_ids"}) {
+      $ids{$from_to} = $params{"${from_to}_ids"};
+    } else {
+      $ids{$from_to} = [ grep { $_ } map { $_ * 1 } split m/\s+/, $params{"${from_to}_ids"} ];
+    }

 
     if (my $num = scalar @{ $ids{$from_to} }) {
       $main::lxdebug->message(0, "3");
 
     if (my $num = scalar @{ $ids{$from_to} }) {
       $main::lxdebug->message(0, "3");

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 228b8e68d5073ead902952f7b1ba4362084150dc..c88f3b0ecf6a7fd43ba38789707c1f64412e0573 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -648,17 +648,15 @@ sub invoice {
   check_do_access();
   $auth->assert($form->{type} eq 'purchase_delivery_order' ? 'vendor_invoice_edit' : 'invoice_edit');
 
   check_do_access();
   $auth->assert($form->{type} eq 'purchase_delivery_order' ? 'vendor_invoice_edit' : 'invoice_edit');
 

-  $form->{close_do_ids} = $form->{id};
+  $form->{convert_from_do_ids} = $form->{id};
+  $form->{deliverydate}        = $form->{transdate};
+  $form->{transdate}           = $form->{invdate} = $form->current_date(\%myconfig);
+  $form->{duedate}             = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
+  $form->{defaultcurrency}     = $form->get_default_currency(\%myconfig);

 
 

-  $form->{deliverydate} = $form->{transdate};
-  $form->{transdate}    = $form->{invdate} = $form->current_date(\%myconfig);
-  $form->{duedate}      = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
-
-  $form->{id}     = '';
-  $form->{closed} = 0;

   $form->{rowcount}--;
 
   $form->{rowcount}--;
 

-  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+  delete @{$form}{qw(id closed delivered)};

 
   if ($form->{type} eq 'purchase_delivery_order') {
     $form->{title}  = $locale->text('Add Vendor Invoice');
 
   if ($form->{type} eq 'purchase_delivery_order') {
     $form->{title}  = $locale->text('Add Vendor Invoice');


@@ -742,13 +740,13 @@ sub invoice_multi {
                               'back_button' => 1);
   }
 
                               'back_button' => 1);
   }
 

-  $form->{close_do_ids}    = join ' ', @do_ids;
-  $form->{deliverydate}    = $form->{transdate};
-  $form->{transdate}       = $form->current_date(\%myconfig);
-  $form->{duedate}         = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
-  $form->{type}            = "invoice";
-  $form->{closed}          = 0;
-  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+  $form->{convert_from_do_ids} = join ' ', @do_ids;
+  $form->{deliverydate}        = $form->{transdate};
+  $form->{transdate}           = $form->current_date(\%myconfig);
+  $form->{duedate}             = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
+  $form->{type}                = "invoice";
+  $form->{closed}              = 0;
+  $form->{defaultcurrency}     = $form->get_default_currency(\%myconfig);

 
   my $buysell;
   if ($form->{type} eq 'purchase_delivery_order') {
 
   my $buysell;
   if ($form->{type} eq 'purchase_delivery_order') {

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index d5a36ca44c15d43576bc5cab89da08d7ade9eab0..ce28fff922f17eaaf9eda6f1e9e797fd0259b968 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -424,7 +424,8 @@ sub form_header {
 
   $form->hide_form(qw(id title vc type level creditlimit creditremaining closedto locked shippted storno storno_id
                       max_dunning_level dunning_amount vendor_id oldvendor selectvendor taxaccounts
 
   $form->hide_form(qw(id title vc type level creditlimit creditremaining closedto locked shippted storno storno_id
                       max_dunning_level dunning_amount vendor_id oldvendor selectvendor taxaccounts

-                      fxgain_accno fxloss_accno taxpart taxservice cursor_fokus),
+                      fxgain_accno fxloss_accno taxpart taxservice cursor_fokus
+                      convert_from_oe_ids convert_from_do_ids),

                       map { $_.'_rate', $_.'_description' } split / /, $form->{taxaccounts} );
 
   print qq|<p>$form->{saved_message}</p>| if $form->{saved_message};
                       map { $_.'_rate', $_.'_description' } split / /, $form->{taxaccounts} );
 
   print qq|<p>$form->{saved_message}</p>| if $form->{saved_message};


@@ -806,7 +807,7 @@ sub form_footer {
   </tr>
 </table>
 <br>
   </tr>
 </table>
 <br>

-| . $cgi->hidden('-name' => 'close_do_ids', '-default' => [$form->{close_do_ids}]);
+|;

 
   $invdate  = $form->datetonum($form->{invdate},  \%myconfig);
   $closedto = $form->datetonum($form->{closedto}, \%myconfig);
 
   $invdate  = $form->datetonum($form->{invdate},  \%myconfig);
   $closedto = $form->datetonum($form->{closedto}, \%myconfig);

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index a6cdff236145f7a911057de3e04df205009e3abf..933602fa158f2780b4be0c8d370967f6f4b10f24 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -614,7 +614,8 @@ sub form_header {
                       creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
                       max_dunning_level dunning_amount
                       shiptoname shiptostreet shiptozipcode shiptocity shiptocountry  shiptocontact shiptophone shiptofax 
                       creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id
                       max_dunning_level dunning_amount
                       shiptoname shiptostreet shiptozipcode shiptocity shiptocountry  shiptocontact shiptophone shiptofax 

-                      shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus),
+                      shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus
+                      convert_from_do_ids convert_from_oe_ids),

                       map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} );
    
   print qq|<p>$form->{saved_message}</p>| if $form->{saved_message};
                       map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts} );
    
   print qq|<p>$form->{saved_message}</p>| if $form->{saved_message};


@@ -1192,7 +1193,6 @@ if ($form->{type} eq "credit_note") {
 $cgi->hidden("-name" => "callback", "-value" => $form->{callback})
 . $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
 . $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
 $cgi->hidden("-name" => "callback", "-value" => $form->{callback})
 . $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
 . $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])

-. $cgi->hidden('-name' => 'close_do_ids', '-default' => [$form->{close_do_ids}])

 . qq|
 </form>
 
 . qq|
 </form>
 

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index a56557d41e6ee30f5dd0a750011ebd639ca0b548..bc4cc453abd8ed3186146cb766a9ca53e63c1b8a 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -234,7 +234,9 @@ sub order_links {
     $form->{"select$form->{vc}"} = 1;
     $form->{$form->{vc}}         = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
   }
     $form->{"select$form->{vc}"} = 1;
     $form->{$form->{vc}}         = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
   }

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

 
   $lxdebug->leave_sub();
 }
 
   $lxdebug->leave_sub();
 }


@@ -1455,15 +1457,14 @@ sub invoice {
     OE->close_orders(\%myconfig, \%$form);
   }
 
     OE->close_orders(\%myconfig, \%$form);
   }
 

-  $form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig);
-  $form->{duedate}   = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
+  $form->{convert_from_oe_ids} = $form->{id};
+  $form->{transdate}           = $form->{invdate} = $form->current_date(\%myconfig);
+  $form->{duedate}             = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
+  $form->{shipto}              = 1;
+  $form->{defaultcurrency}     = $form->get_default_currency(\%myconfig);

 
 

-  $form->{id}     = '';
-  $form->{closed} = 0;
+  delete @{$form}{qw(id closed)};

   $form->{rowcount}--;
   $form->{rowcount}--;

-  $form->{shipto} = 1;
-
-  $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);

 
   if ($form->{type} =~ /_order$/) {
     $form->{exchangerate} = $exchangerate;
 
   if ($form->{type} =~ /_order$/) {
     $form->{exchangerate} = $exchangerate;


@@ -1814,12 +1815,11 @@ sub sales_order {
     delete($form->{ordnumber});
   }
 
     delete($form->{ordnumber});
   }
 

-  $form->{cp_id}               *= 1;
-  $form->{convert_from_oe_ids}  = $form->{id};
+  $form->{cp_id} *= 1;

 
 

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

 
   &poso;
 
 
   &poso;
 


@@ -1835,13 +1835,14 @@ sub poso {
   $form->{transdate} = $form->current_date(\%myconfig);
   delete $form->{duedate};
 
   $form->{transdate} = $form->current_date(\%myconfig);
   delete $form->{duedate};
 

-  $form->{closed}          = 0;
+  $form->{convert_from_oe_ids} = $form->{id};
+  $form->{closed}              = 0;

 
 

-  $form->{old_employee_id} = $form->{employee_id};
-  $form->{old_salesman_id} = $form->{salesman_id};
+  $form->{old_employee_id}     = $form->{employee_id};
+  $form->{old_salesman_id}     = $form->{salesman_id};

 
   # reset
 
   # reset

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

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

diff --git a/templates/webpages/oe/form_header_de.html b/templates/webpages/oe/form_header_de.html
index c09c8f0b5100812d37c52a7b2fe5c3d5bc2b7d34..064908abc8b3999e835e5b8d4599c38fe5dc7117 100644 (file)
--- a/templates/webpages/oe/form_header_de.html
+++ b/templates/webpages/oe/form_header_de.html
@@ -15,6 +15,8 @@
    <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
 [%- END %]
 
    <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
 [%- END %]
 

+    <input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
+

     <input type="hidden" name="follow_up_trans_id_1" value="[% HTML.escape(id) %]">
     <input type="hidden" name="follow_up_trans_type_1" value="[% HTML.escape(type) %]">
     <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
     <input type="hidden" name="follow_up_trans_id_1" value="[% HTML.escape(id) %]">
     <input type="hidden" name="follow_up_trans_type_1" value="[% HTML.escape(type) %]">
     <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">

diff --git a/templates/webpages/oe/form_header_master.html b/templates/webpages/oe/form_header_master.html
index 939915df3617513423f56828172c1c9c37434801..6521c6f84614ebedda3c5352d3d474f5a0dfa24f 100644 (file)
--- a/templates/webpages/oe/form_header_master.html
+++ b/templates/webpages/oe/form_header_master.html
@@ -15,6 +15,8 @@
    <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
 [%- END %]
 
    <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
 [%- END %]
 

+    <input type="hidden" name="convert_from_oe_ids" value="[% HTML.escape(convert_from_oe_ids) %]">
+

     <input type="hidden" name="follow_up_trans_id_1" value="[% HTML.escape(id) %]">
     <input type="hidden" name="follow_up_trans_type_1" value="[% HTML.escape(type) %]">
     <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
     <input type="hidden" name="follow_up_trans_id_1" value="[% HTML.escape(id) %]">
     <input type="hidden" name="follow_up_trans_type_1" value="[% HTML.escape(type) %]">
     <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">