From: G. Richardson <information@lx-office-hosting.de>
Date: Fri, 9 Nov 2012 14:29:11 +0000 (+0100)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~14^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/6669edf8fb3d3e7e917aca49fa9b1e8387b0943a?hp=c126984ed1c1e6e1cb84c5f848221f8bf6c0418b

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

diff --git a/SL/BackgroundJob/SelfTest.pm b/SL/BackgroundJob/SelfTest.pm
index 917dc0e18..37a02eb94 100644
--- a/SL/BackgroundJob/SelfTest.pm
+++ b/SL/BackgroundJob/SelfTest.pm
@@ -37,6 +37,7 @@ sub setup {
   $self->config($::lx_office_conf{self_test} || {});
 
   $self->tester(Test::Builder->new);
+  $self->tester->reset; # stupid Test::Builder mplementation uses class variables
   $self->aggreg(TAP::Parser::Aggregator->new);
 
   $self->modules(split /\s+/, $self->config->{modules});
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 732eaed5e..0654d860b 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -153,9 +153,6 @@ sub create_links {
   # build the popup menus
   $form->{taxincluded} = ($form->{id}) ? $form->{taxincluded} : "checked";
 
-  # notes
-  $form->{notes} = $form->{intnotes} unless $form->{notes};
-
   # currencies
   $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
 
@@ -287,6 +284,7 @@ sub form_header {
   }
   my $notes =
     qq|<textarea name=notes rows=$rows cols=50 wrap=soft $readonly>$form->{notes}</textarea>|;
+  my $intnotes = qq|<textarea name=intnotes rows=$rows cols=50 wrap=soft readonly>$form->{intnotes}</textarea>|;
 
   my $department;
   $department = qq|
@@ -627,6 +625,9 @@ $jsscript
         <tr>
           <th align=left width=1%>| . $locale->text('Notes') . qq|</th>
           <td align=left>$notes</td>
+
+          <th align=left width=1%>| . $locale->text('Notes for vendor') . qq|</th>
+          <td align=left>$intnotes</td>
         </tr>
       </table>
     </td>
@@ -929,7 +930,7 @@ sub update {
   $form->{exchangerate} = $form->{forex} if $form->{forex};
 
   $form->{invdate} = $form->{transdate};
-  my %saved_variables = map +( $_ => $form->{$_} ), qw(AP AP_amount_1 taxchart_1);
+  my %saved_variables = map +( $_ => $form->{$_} ), qw(AP AP_amount_1 taxchart_1 notes);
 
   my $vendor_changed = &check_name("vendor");
 
@@ -966,9 +967,6 @@ sub update {
   $form->{oldinvtotal}  = $form->{invtotal};
   $form->{oldtotalpaid} = $totalpaid;
 
-  # notes
-  $form->{notes} = $form->{intnotes} if $vendor_changed;
-
   &display_form;
 
   $main::lxdebug->leave_sub();
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index be080ea6a..80c87f966 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -161,9 +161,6 @@ sub create_links {
   $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
   $form->{rowcount}    = 1;
 
-  # notes
-  $form->{notes} = $form->{intnotes} unless $form->{notes};
-
   # currencies
   $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
 
@@ -617,13 +614,10 @@ sub update {
 
   $form->{invdate} = $form->{transdate};
 
-  my %saved_variables = map +( $_ => $form->{$_} ), qw(AR AR_amount_1 taxchart_1 customer_id);
+  my %saved_variables = map +( $_ => $form->{$_} ), qw(AR AR_amount_1 taxchart_1 customer_id notes);
 
   &check_name("customer");
 
-  # check_name loads customer notes into notes, but ar only knows intnotes, so copy them
-  $form->{notes} = $form->{intnotes} if $saved_variables{customer_id} != $form->{customer_id};
-
   $form->{AR} = $saved_variables{AR};
   if ($saved_variables{AR_amount_1} =~ m/.--./) {
     map { $form->{$_} = $saved_variables{$_} } qw(AR_amount_1 taxchart_1);
diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 570c7c358..c3cb45b96 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -305,7 +305,7 @@ sub form_header {
     # emulate click for resubmitting actions
     $dispatch_to_popup .= "document.do.${_}.click(); " for grep { /^action_/ } keys %$form;
     $dispatch_to_popup .= "document.do.submit();";
-    $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup)");
+    $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup})");
   }
 
   my $follow_up_vc                =  $form->{ $form->{vc} eq 'customer' ? 'customer' : 'vendor' };
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 0bcb897bf..3908f7435 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -409,7 +409,6 @@ sub form_header {
   } elsif ($form->{resubmit}) {
     # emulate click for resubmitting actions
     $dispatch_to_popup  = "document.oe.${_}.click(); " for grep { /^action_/ } keys %$form;
-    $dispatch_to_popup .= "document.oe.submit();";
   } elsif ($creditwarning) {
     $::request->{layout}->add_javascripts_inline("alert('$credittext')");
   }
diff --git a/locale/de/all b/locale/de/all
index 60fab355e..452225806 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -1285,6 +1285,8 @@ $self->{texts} = {
   'Notes'                       => 'Bemerkungen',
   'Notes (translation for #1)'  => 'Bemerkungen (Übersetzung für #1)',
   'Notes (will appear on hard copy)' => 'Bemerkungen',
+  'Notes for customer'          => 'Bemerkungen beim Kunden',
+  'Notes for vendor'            => 'Bemerkungen beim Lieferanten',
   'Nothing has been selected for removal.' => 'Es wurde nichts f&uuml;r eine Entnahme ausgew&auml;hlt.',
   'Nothing has been selected for transfer.' => 'Es wurde nichts zum Umlagern ausgew&auml;hlt.',
   'Nothing selected!'           => 'Es wurde nichts ausgewählt!',
diff --git a/templates/webpages/ar/form_header.html b/templates/webpages/ar/form_header.html
index 363bb9d20..ea17d6ddc 100644
--- a/templates/webpages/ar/form_header.html
+++ b/templates/webpages/ar/form_header.html
@@ -171,6 +171,9 @@
         <tr>
           <th align=left width=1%>[% 'Notes' | $T8 %]</th>
           <td align=left><textarea name=notes rows="[% rows %]" cols=50 wrap=soft>[% notes | html %]</textarea></td>
+
+          <th align=left width=1%>[% 'Notes for customer' | $T8 %]</th>
+          <td align=left><textarea name=intnotes rows="[% rows %]" cols=50 wrap=soft readonly>[% intnotes | html %]</textarea></td>
         </tr>
       </table>
     </td>