/ - Diff - projekt kivitendo - wissen

« Zurück | Weiter »

Revision 7a7f33b5

Von Moritz Bunkus vor fast 17 Jahren hinzugefügt

ID 7a7f33b5c1b3531ab761adba1cf19d4ad68cffcd
Vorgänger b15e4435
Nachfolger 5b22b6b5

Zwei neue Features:
1. Beliebige Notizen für Kunden und Lieferanten können angelegt werden. Solche Notizen können auf Wiedervorlage gelegt werden, was durch 2. implementiert ist.
2. Einkaufs- und Verkaufsbelege können auf Wiedervorlage gelegt werden. Wiedervorlagen können für beliebige Nutzer erstellt werden (Aufgabe an andere Nutzer deligieren). Anstehende Wiedervorlagen und abgelaufene Angebote werden auf der Startseite in einer Aufgabenliste angezeigt.

     use Data::Dumper;
     use SL::Common;
     use SL::CVar;
     use SL::DBUtils;
     use SL::FU;
     use SL::Notes;
     sub get_tuple {
       $main::lxdebug->enter_sub();
-...
           selectrow_query($form, $dbh, $query, $form->{salesman_id});
+      }
       my ($employee_id) = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $form->{login});
       $query =
         qq|SELECT n.*, n.itime::DATE AS created_on,
              e.name AS created_by_name, e.login AS created_by_login
            FROM notes n
            LEFT JOIN employee e ON (n.created_by = e.id)
            WHERE (n.trans_id = ?) AND (n.trans_module = 'ct')|;
       $form->{NOTES} = selectall_hashref_query($form, $dbh, $query, conv_i($form->{id}));
       $query =
         qq|SELECT fu.follow_up_date, fu.done AS follow_up_done, e.name AS created_for_name, e.name AS created_for_login
            FROM follow_ups fu
            LEFT JOIN employee e ON (fu.created_for_user = e.id)
            WHERE (fu.note_id = ?)
              AND NOT COALESCE(fu.done, FALSE)
              AND (   (fu.created_by = ?)
                   OR (fu.created_by IN (SELECT DISTINCT what FROM follow_up_access WHERE who = ?)))|;
       $sth = prepare_query($form, $dbh, $query);
       foreach my $note (@{ $form->{NOTES} }) {
         do_statement($form, $sth, $query, conv_i($note->{id}), conv_i($note->{created_by}), conv_i($employee_id));
         $ref = $sth->fetchrow_hashref();
         map { $note->{$_} = $ref->{$_} } keys %{ $ref } if ($ref);
+      }
       $sth->finish();
       if ($form->{edit_note_id}) {
         $query =
           qq|SELECT n.id AS NOTE_id, n.subject AS NOTE_subject, n.body AS NOTE_body,
                fu.id AS FU_id, fu.follow_up_date AS FU_date, fu.done AS FU_done, fu.created_for_user AS FU_created_for_user
              FROM notes n
              LEFT JOIN follow_ups fu ON ((n.id = fu.note_id) AND NOT COALESCE(fu.done, FALSE))
              WHERE n.id = ?|;
         $ref = selectfirst_hashref_query($form, $dbh, $query, conv_i($form->{edit_note_id}));
         if ($ref) {
           foreach my $key (keys %{ $ref }) {
             my $new_key       =  $key;
             $new_key          =~ s/^([^_]+)/\U\1\E/;
             $form->{$new_key} =  $ref->{$key};
+          }
+        }
+      }
       # check if it is orphaned
       my $arap = ( $form->{db} eq 'customer' ) ? "ar" : "ap";
       $query =
-...
       # add shipto
       $form->add_shipto( $dbh, $form->{id}, "CT" );
       $self->_save_note('dbh' => $dbh);
       $self->_delete_selected_notes('dbh' => $dbh);
       CVar->save_custom_variables('dbh'       => $dbh,
                                   'module'    => 'CT',
                                   'trans_id'  => $form->{id},
-...
       # add shipto
       $form->add_shipto( $dbh, $form->{id}, "CT" );
       $self->_save_note('dbh' => $dbh);
       $self->_delete_selected_notes('dbh' => $dbh);
       CVar->save_custom_variables('dbh'       => $dbh,
                                   'module'    => 'CT',
                                   'trans_id'  => $form->{id},
-...
       $main::lxdebug->leave_sub();
+    }
     sub _save_note {
       $main::lxdebug->enter_sub();
       my $self   = shift;
       my %params = @_;
       my $form   = $main::form;
       Common::check_params(\%params, 'dbh');
       if (!$form->{NOTE_subject}) {
         $main::lxdebug->leave_sub();
         return;
+      }
       my $dbh = $params{dbh};
       my %follow_up;
       my %note = (
         'id'           => $form->{NOTE_id},
         'subject'      => $form->{NOTE_subject},
         'body'         => $form->{NOTE_body},
         'trans_id'     => $form->{id},
         'trans_module' => 'ct',
       );
       $note{id} = Notes->save(%note);
       if ($form->{FU_date}) {
         %follow_up = (
           'id'               => $form->{FU_id},
           'note_id'          => $note{id},
           'follow_up_date'   => $form->{FU_date},
           'created_for_user' => $form->{FU_created_for_user},
           'done'             => $form->{FU_done} ? 1 : 0,
           'subject'          => $form->{NOTE_subject},
           'body'             => $form->{NOTE_body},
           'LINKS'            => [
+            {
               'trans_id'     => $form->{id},
               'trans_type'   => $form->{db} eq 'customer' ? 'customer' : 'vendor',
               'trans_info'   => $form->{name},
             },
           ],
         );
         $follow_up{id} = FU->save(%follow_up);
       } elsif ($form->{FU_id}) {
         do_query($form, $dbh, qq|DELETE FROM follow_up_links WHERE follow_up_id = ?|, conv_i($form->{FU_id}));
         do_query($form, $dbh, qq|DELETE FROM follow_ups      WHERE id = ?|,           conv_i($form->{FU_id}));
+      }
       delete @{$form}{grep { /^NOTE_|^FU_/ } keys %{ $form }};
       $main::lxdebug->leave_sub();
+    }
     sub _delete_selected_notes {
       $main::lxdebug->enter_sub();
       my $self   = shift;
       my %params = @_;
       Common::check_params(\%params, 'dbh');
       my $form = $main::form;
       my $dbh  = $params{dbh};
       foreach my $i (1 .. $form->{NOTES_rowcount}) {
         next unless ($form->{"NOTE_delete_$i"} && $form->{"NOTE_id_$i"});
         Notes->delete('dbh' => $params{dbh},
                       'id'  => $form->{"NOTE_id_$i"});
+      }
       $main::lxdebug->leave_sub();
+    }
 ;

     # Follow-Ups
     package FU;
     use List::Util qw(first);
     use SL::Common;
     use SL::DBUtils;
     use SL::Notes;
     sub save {
       $main::lxdebug->enter_sub();
       my $self     = shift;
       my %params   = @_;
       my $myconfig = \%main::myconfig;
       my $form     = $main::form;
       my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
       my ($query, @values);
       if (!$params{id}) {
         ($params{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('follow_up_id')|);
         $query = qq|INSERT INTO follow_ups (created_by, done, note_id, follow_up_date, created_for_user, id)
                     VALUES ((SELECT id FROM employee WHERE login = ?), ?, ?, ?, ?, ?)|;
         push @values, $form->{login};
       } else {
         $query = qq|UPDATE follow_ups SET done = ?, note_id = ?, follow_up_date = ?, created_for_user = ? WHERE id = ?|;
+      }
       $params{note_id} = Notes->save('id'           => $params{note_id},
                                      'trans_id'     => $params{id},
                                      'trans_module' => 'fu',
                                      'subject'      => $params{subject},
                                      'body'         => $params{body});
       $params{done} = 1 if (!defined $params{done});
       do_query($form, $dbh, $query, @values, $params{done} ? 't' : 'f', conv_i($params{note_id}), $params{follow_up_date}, conv_i($params{created_for_user}), conv_i($params{id}));
       do_query($form, $dbh, qq|DELETE FROM follow_up_links WHERE follow_up_id = ?|, conv_i($params{id}));
       my $query = qq|INSERT INTO follow_up_links (follow_up_id, trans_id, trans_type, trans_info) VALUES (?, ?, ?, ?)|;
       my $sth   = prepare_query($form, $dbh, $query);
       foreach my $link (@{ $params{LINKS} }) {
         do_statement($form, $sth, $query, conv_i($params{id}), conv_i($link->{trans_id}), $link->{trans_type}, $link->{trans_info});
+      }
       $sth->finish();
       $dbh->commit() unless ($params{dbh});
       $main::lxdebug->leave_sub();
+    }
     sub finish {
       $main::lxdebug->enter_sub();
       my $self     = shift;
       my %params   = @_;
       Common::check_params(\%params, 'id');
       my $myconfig = \%main::myconfig;
       my $form     = $main::form;
       my $dbh      = $form->get_standard_dbh($myconfig);
       do_query($form, $dbh, qq|UPDATE follow_ups SET done = TRUE WHERE id = ?|, conv_i($params{id}));
       $dbh->commit();
       $main::lxdebug->leave_sub();
+    }
     sub delete {
       $main::lxdebug->enter_sub();
       my $self     = shift;
       my %params   = @_;
       Common::check_params(\%params, 'id');
       my $myconfig = \%main::myconfig;
       my $form     = $main::form;
       my $dbh      = $form->get_standard_dbh($myconfig);
       my $id       = conv_i($params{id});
       do_query($form, $dbh, qq|DELETE FROM follow_up_links WHERE follow_up_id = ?|,                         $id);
       do_query($form, $dbh, qq|DELETE FROM follow_ups      WHERE id = ?|,                                   $id);
       do_query($form, $dbh, qq|DELETE FROM notes           WHERE (trans_id = ?) AND (trans_module = 'fu')|, $id);
       $dbh->commit();
       $main::lxdebug->leave_sub();
+    }
     sub retrieve {
       $main::lxdebug->enter_sub();
       my $self     = shift;
       my %params   = @_;
       Common::check_params(\%params, 'id');
       my $myconfig = \%main::myconfig;
       my $form     = $main::form;
       my $dbh      = $form->get_standard_dbh($myconfig);
       my ($query, @values);
       my ($employee_id) = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $form->{login});
       $query            = qq|SELECT fu.*, n.subject, n.body, n.created_by
                              FROM follow_ups fu
                              LEFT JOIN notes n ON (fu.note_id = n.id)
                              WHERE (fu.id = ?)
                                AND (   (fu.created_by = ?) OR (fu.created_for_user = ?)
                                     OR (fu.created_by IN (SELECT DISTINCT what FROM follow_up_access WHERE who = ?)))|;
       my $ref           = selectfirst_hashref_query($form, $dbh, $query, conv_i($params{id}), $employee_id, $employee_id, $employee_id);
       if (!$ref) {
         $main::lxdebug->leave_sub();
         return undef;
+      }
       $ref->{LINKS} = $self->retrieve_links(%{ $ref });
       $main::lxdebug->leave_sub();
       return $ref;
+    }
     sub retrieve_links {
       $main::lxdebug->enter_sub();
       my $self     = shift;
       my %params   = @_;
       Common::check_params(\%params, qw(id));
       my $myconfig = \%main::myconfig;
       my $form     = $main::form;
       my $dbh      = $form->get_standard_dbh($myconfig);
       my $query    = qq|SELECT ful.trans_id, ful.trans_type, ful.trans_info, fu.note_id
                         FROM follow_up_links ful
                         LEFT JOIN follow_ups fu ON (ful.follow_up_id = fu.id)
                         WHERE ful.follow_up_id = ?
                         ORDER BY ful.itime|;
       my $links    = selectall_hashref_query($form, $dbh, $query, conv_i($params{id}));
       foreach my $link_ref (@{ $links }) {
         my $link_details = FU->link_details(%{ $link_ref });
         map { $link_ref->{$_} = $link_details->{$_} } keys %{ $link_details} if ($link_details);
+      }
       $main::lxdebug->leave_sub();
       return $links;
+    }
     sub follow_ups {
       $main::lxdebug->enter_sub();
       my $self     = shift;
       my %params   = @_;
       my $myconfig = \%main::myconfig;
       my $form     = $main::form;
       my $dbh      = $form->get_standard_dbh($myconfig);
       my ($query, $where, $where_user);
       my ($employee_id) = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $form->{login});
       my @values        = ($employee_id, $employee_id);
       if ($params{trans_id}) {
         $where .= qq| AND EXISTS (SELECT * FROM follow_up_links ful
                                   WHERE (ful.follow_up_id = fu.id) AND (ful.trans_id = ?))|;
         push @values, conv_i($params{trans_id});
+      }
       if ($params{due_only}) {
         $where .= qq| AND (fu.follow_up_date <= current_date)|;
+      }
       if ($params{done} ne $params{not_done}) {
         my $not  = $params{not_done} ? 'NOT' : '';
         $where  .= qq| AND $not COALESCE(fu.done, FALSE)|;
+      }
       if ($params{not_id}) {
         $where .= qq| AND (fu.id <> ?)|;
         push @values, conv_i($params{not_id});
+      }
       foreach my $item (qw(subject body)) {
         next unless ($params{$item});
         $where .= qq| AND (n.${item} ILIKE ?)|;
         push @values, '%' . $params{$item} . '%';
+      }
       if ($params{reference}) {
         $where .= qq| AND EXISTS (SELECT ful.follow_up_id
                                   FROM follow_up_links ful
                                   WHERE (ful.follow_up_id = fu.id)
                                     AND (ful.trans_info ILIKE ?)
                                   LIMIT 1)|;
         push @values, '%' . $params{reference} . '%';
+      }
       if ($params{follow_up_date_from}) {
         $where .= qq| AND (fu.follow_up_date >= ?)|;
         push @values, conv_date($params{follow_up_date_from});
+      }
       if ($params{follow_up_date_to}) {
         $where .= qq| AND (fu.follow_up_date <= ?)|;
         push @values, conv_date($params{follow_up_date_to});
+      }
       if ($params{itime_from}) {
         $where .= qq| AND (date_trunc('DAY', fu.itime) >= ?)|;
         push @values, conv_date($params{itime_from});
+      }
       if ($params{itime_to}) {
         $where .= qq| AND (date_trunc('DAY', fu.itime) <= ?)|;
         push @values, conv_date($params{itime_to});
+      }
       if ($params{all_users}) {
         $where_user = qq|OR (fu.created_by IN (SELECT DISTINCT what FROM follow_up_access WHERE who = ?))|;
         push @values, $employee_id;
+      }
       $query  = qq|SELECT fu.*, n.subject, n.body, n.created_by,
                      fu.follow_up_date <= current_date AS due,
                      fu.itime::DATE                    AS created_on,
                      COALESCE(eby.name,  eby.login)    AS created_by_name,
                      COALESCE(efor.name, efor.login)   AS created_for_user_name
                    FROM follow_ups fu
                    LEFT JOIN notes    n    ON (fu.note_id          = n.id)
                    LEFT JOIN employee eby  ON (n.created_by        = eby.id)
                    LEFT JOIN employee efor ON (fu.created_for_user = efor.id)
                    WHERE ((fu.created_by = ?) OR (fu.created_for_user = ?)
                           $where_user)
                      $where
                    ORDER BY fu.follow_up_date DESC, fu.id ASC|;
       my $follow_ups = selectall_hashref_query($form, $dbh, $query, @values);
       if (!scalar @{ $follow_ups }) {
         $main::lxdebug->leave_sub();
         return $follow_ups;
+      }
       foreach my $fu (@{ $follow_ups }) {
         $fu->{LINKS} = $self->retrieve_links(%{ $fu });
+      }
       $main::lxdebug->leave_sub();
       return $follow_ups;
+    }
     sub link_details {
       $main::lxdebug->enter_sub();
       my $self     = shift;
       my %params   = @_;
       Common::check_params(\%params, qw(trans_id trans_type));
       my $myconfig = \%main::myconfig;
       my $form     = $main::form;
       my $locale   = $main::locale;
       my $q_id     = $form->quote($params{trans_id});
       my $link;
       if ($params{trans_type} eq 'customer') {
         $link = {
           'url'   => 'ct.pl?action=edit&db=customer&id=' . $form->quote($params{trans_id}) . '&edit_note_id=' . $form->quote($params{note_id}),
           'title' => $locale->text('Customer') . " '$params{trans_info}'",
         };
       } elsif ($params{trans_type} eq 'vendor') {
         $link = {
           'url'   => 'ct.pl?action=edit&type=sales_quotation&id=' . $params{trans_id} . '&edit_note_id=' . $form->quote($params{note_id}),
           'title' => $locale->text('Vendor') . " '$params{trans_info}'",
         };
       } elsif ($params{trans_type} eq 'sales_quotation') {
         $link = {
           'url'   => 'oe.pl?action=edit&type=sales_quotation&id=' . $params{trans_id},
           'title' => $locale->text('Sales quotation') . " $params{trans_info}",
         };
       } elsif ($params{trans_type} eq 'sales_order') {
         $link = {
           'url'   => 'oe.pl?action=edit&type=sales_order&id=' . $params{trans_id},
           'title' => $locale->text('Sales Order') . " $params{trans_info}",
         };
       } elsif ($params{trans_type} eq 'sales_invoice') {
         $link = {
           'url'   => 'is.pl?action=edit&type=invoice&id=' . $params{trans_id},
           'title' => $locale->text('Sales Invoice') . " $params{trans_info}",
         };
       } elsif ($params{trans_type} eq 'credit_note') {
         $link = {
           'url'   => 'is.pl?action=edit&type=credit_note&id=' . $params{trans_id},
           'title' => $locale->text('Credit Note') . " $params{trans_info}",
         };
       } elsif ($params{trans_type} eq 'dunning') {
         $link = {
           'url'   => 'dn.pl?action=print_dunning&format=pdf&media=screen&dunning_id=' . $params{trans_id},
           'title' => $locale->text('Dunning') . " $params{trans_info}",
         };
       } elsif ($params{trans_type} eq 'request_quotation') {
         $link = {
           'url'   => 'oe.pl?action=edit&type=request_quotation&id=' . $params{trans_id},
           'title' => $locale->text('Request quotation') . " $params{trans_info}",
         };
       } elsif ($params{trans_type} eq 'purchase_order') {
         $link = {
           'url'   => 'oe.pl?action=edit&type=purchase_order&id=' . $params{trans_id},
           'title' => $locale->text('Purchase Order') . " $params{trans_info}",
         };
       } elsif ($params{trans_type} eq 'vendor_invoice') {
         $link = {
           'url'   => 'ir.pl?action=edit&type=invoice&id=' . $params{trans_id},
           'title' => $locale->text('Vendor Invoice') . " $params{trans_info}",
         };
       } elsif ($params{trans_type} eq 'ar_transaction') {
         $link = {
           'url'   => 'ar.pl?action=editid=' . $params{trans_id},
           'title' => $locale->text('AR Transaction') . " $params{trans_info}",
         };
       } elsif ($params{trans_type} eq 'ap_transaction') {
         $link = {
           'url'   => 'ap.pl?action=editid=' . $params{trans_id},
           'title' => $locale->text('AP Transaction') . " $params{trans_info}",
         };
       } elsif ($params{trans_type} eq 'gl_transaction') {
         $link = {
           'url'   => 'gl.pl?action=edit&id=' . $params{trans_id},
           'title' => $locale->text('GL Transaction') . " $params{trans_info}",
         };
+      }
       $main::lxdebug->leave_sub();
       return $link || { };
+    }
     sub save_access_rights {
       $main::lxdebug->enter_sub();
       my $self     = shift;
       my %params   = @_;
       Common::check_params(\%params, 'access');
       my $myconfig = \%main::myconfig;
       my $form     = $main::form;
       my $dbh      = $form->get_standard_dbh($myconfig);
       my ($id)     = selectrow_query($form, $dbh, qq|SELECT id FROM employee WHERE login = ?|, $form->{login});
       my $query    = qq|INSERT INTO follow_up_access (who, what) VALUES (?, ?)|;
       my $sth      = prepare_query($form, $dbh, $query);
       do_query($form, $dbh, qq|DELETE FROM follow_up_access WHERE what = ?|, $id);
       while (my ($who, $access_allowed) = each %{ $params{access} }) {
         next unless ($access_allowed);
         do_statement($form, $sth, $query, conv_i($who), $id);
+      }
       $sth->finish();
       $dbh->commit();
       $main::lxdebug->leave_sub();
+    }
     sub retrieve_access_rights {
       $main::lxdebug->enter_sub();
       my $self     = shift;
       my %params   = @_;
       my $myconfig = \%main::myconfig;
       my $form     = $main::form;
       my $dbh      = $form->get_standard_dbh($myconfig);
       my $sth      = prepare_execute_query($form, $dbh, qq|SELECT who FROM follow_up_access WHERE what = (SELECT id FROM employee WHERE login = ?)|, $form->{login});
       my $access   = {};
       while (my $ref = $sth->fetchrow_hashref()) {
         $access->{$ref->{who}} = 1;
+      }
       $sth->finish();
       $main::lxdebug->leave_sub();
       return $access;
+    }
 ;

       $main::lxdebug->leave_sub();
+    }
     sub _get_groups {
       $main::lxdebug->enter_sub();
       my ($self, $dbh, $key) = @_;
       $key ||= "all_groups";
       my $groups = $main::auth->read_groups();
       $self->{$key} = selectall_hashref_query($self, $dbh, $query);
       $main::lxdebug->leave_sub();
+    }
     sub get_lists {
       $main::lxdebug->enter_sub();
-...
         $self->_get_warehouses($dbh, $params{warehouses});
+      }
       if ($params{groups}) {
         $self->_get_groups($dbh, $params{groups});
+      }
       $main::lxdebug->leave_sub();
+    }

     # Notes
     package Notes;
     use SL::Common;
     use SL::DBUtils;
     sub save {
       $main::lxdebug->enter_sub();
       my $self     = shift;
       my %params   = @_;
       my $myconfig = \%main::myconfig;
       my $form     = $main::form;
       my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
       my ($query, @values);
       if (!$params{id}) {
         ($params{id}) = selectrow_query($form, $dbh, qq|SELECT nextval('note_id')|);
         $query        = qq|INSERT INTO notes (created_by, trans_id, trans_module, subject, body, id)
                            VALUES ((SELECT id FROM employee WHERE login = ?), ?, ?, ?, ?, ?)|;
         push @values, $form->{login}, conv_i($params{trans_id}), $params{trans_module};
       } else {
         $query        = qq|UPDATE notes SET subject = ?, body = ? WHERE id = ?|;
+      }
       push @values, $params{subject}, $params{body}, conv_i($params{id});
       do_query($form, $dbh, $query, @values);
       $dbh->commit() unless ($params{dbh});
       $main::lxdebug->leave_sub();
       return $params{id};
+    }
     sub retrieve {
       $main::lxdebug->enter_sub();
       my $self     = shift;
       my %params   = @_;
       Common::check_params(\%params, qw(id));
       my $myconfig = \%main::myconfig;
       my $form     = $main::form;
       my $dbh      = $form->get_standard_dbh($myconfig);
       my $ref      = selectfirst_hashref_query($form, $dbh, qq|SELECT * FROM notes WHERE id = ?|, conv_i($param{id}));
       $main::lxdebug->leave_sub();
       return $ref;
+    }
     sub delete {
       $main::lxdebug->enter_sub();
       my $self     = shift;
       my %params   = @_;
       Common::check_params(\%params, qw(id));
       my $myconfig = \%main::myconfig;
       my $form     = $main::form;
       my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
       my $id       = conv_i($params{id});
       do_query($form, $dbh, qq|DELETE FROM follow_up_links WHERE follow_up_id IN (SELECT DISTINCT id FROM follow_ups WHERE note_id = ?)|, $id);
       do_query($form, $dbh, qq|DELETE FROM follow_ups      WHERE note_id = ?|, $id);
       do_query($form, $dbh, qq|DELETE FROM notes           WHERE id = ?|, $id);
       $dbh->commit() unless ($params{dbh});
       $main::lxdebug->leave_sub();
       return $ref;
+    }
 ;

       $main::lxdebug->leave_sub();
+    }
     sub transactions_for_todo_list {
       $main::lxdebug->enter_sub();
       my $self     = shift;
       my %params   = @_;
       my $myconfig = \%main::myconfig;
       my $form     = $main::form;
       my $dbh      = $params{dbh} || $form->get_standard_dbh($myconfig);
       my $query    = qq|SELECT id FROM employee WHERE login = ?|;
       my ($e_id)   = selectrow_query($form, $dbh, $query, $form->{login});
       $query       =
         qq|SELECT oe.id, oe.transdate, oe.reqdate, oe.quonumber, oe.transaction_description, oe.amount,
              c.name AS customer,
              e.name AS employee
            FROM oe
            LEFT JOIN customer c ON (oe.customer_id = c.id)
            LEFT JOIN employee e ON (oe.employee_id = e.id)
            WHERE (COALESCE(quotation, FALSE) = TRUE)
              AND (COALESCE(closed,    FALSE) = FALSE)
              AND ((oe.employee_id = ?) OR (oe.salesman_id = ?))
              AND NOT (oe.reqdate ISNULL)
              AND (oe.reqdate < current_date)
            ORDER BY transdate|;
       my $quotations = selectall_hashref_query($form, $dbh, $query, $e_id, $e_id);
       $main::lxdebug->leave_sub();
       return $quotations;
+    }
     sub save {
       $main::lxdebug->enter_sub();

     #======================================================================
     use POSIX qw(strftime);
     use List::Util qw(sum);
     use SL::AP;
     use SL::FU;
     use SL::IR;
     use SL::IS;
     use SL::PE;
-...
         $button2 =
           qq|<td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\"> $readonly</td>|;
+      }
       my $follow_up_vc         =  $form->{vendor};
       $follow_up_vc            =~ s/--.*?//;
       my $follow_up_trans_info =  "$form->{invnumber} ($follow_up_vc)";
       $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
       $form->{javascript} .= qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
       $form->{javascript} .= qq|<script type="text/javascript" src="js/follow_up.js"></script>|;
       $form->header;
       $onload = qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
-...
     <input type=hidden name=locked value=$form->{locked}>
     <input type=hidden name=title value="$title">
     <input type="hidden" name="follow_up_trans_id_1" value="| . H($form->{id}) . qq|">
     <input type="hidden" name="follow_up_trans_type_1" value="ap_transaction">
     <input type="hidden" name="follow_up_trans_info_1" value="| . H($follow_up_trans_info) . qq|">
     <input type="hidden" name="follow_up_rowcount" value="1">
     | . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
     <table width=100%>
-...
       $auth->assert('general_ledger');
       my $follow_ups_block;
       if ($form->{id}) {
         my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
         if (@{ $follow_ups} ) {
           my $num_due       = sum map { $_->{due} * 1 } @{ $follow_ups };
           $follow_ups_block = qq|<p>| . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq|</p>|;
+        }
+      }
       print qq|
     $follow_ups_block
     <input name=callback type=hidden value="$form->{callback}">
     <input name="gldate" type="hidden" value="| . Q($form->{gldate}) . qq|">
+    |
-...
         print qq| <input class=submit type=submit name=action value="| . $locale->text('Post Payment') . qq|">
                   <input class=submit type=submit name=action value="| . $locale->text('Use As Template') . qq|">
                   <input type="button" class="submit" onclick="follow_up_window()" value="| . $locale->text('Follow-Up') . qq|">
     |;
       } elsif (($transdate > $closedto) && !$form->{id}) {
         print qq|

     #======================================================================
     use POSIX qw(strftime);
     use List::Util qw(sum);
     use SL::AR;
     use SL::FU;
     use SL::IS;
     use SL::PE;
     use SL::ReportGenerator;
-...
           qq|<td><input name=duedate id=duedate size=11 title="$myconfig{dateformat}" value="$form->{duedate}" onBlur=\"check_right_date_format(this)\"></td>|;
+      }
       my $follow_up_vc         =  $form->{customer};
       $follow_up_vc            =~ s/--.*?//;
       my $follow_up_trans_info =  "$form->{invnumber} ($follow_up_vc)";
       $form->{javascript} .=
         qq|<script type="text/javascript" src="js/common.js"></script>| .
         qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
         qq|<script type="text/javascript" src="js/show_vc_details.js"></script>| .
         qq|<script type="text/javascript" src="js/follow_up.js"></script>|;
       $form->header;
       $onload = qq|focus()|;
-...
     <input type=hidden name=closedto value=$form->{closedto}>
     <input type=hidden name=locked value=$form->{locked}>
     <input type=hidden name=title value="$title">
     <input type="hidden" name="follow_up_trans_id_1" value="| . H($form->{id}) . qq|">
     <input type="hidden" name="follow_up_trans_type_1" value="ar_transaction">
     <input type="hidden" name="follow_up_trans_info_1" value="| . H($follow_up_trans_info) . qq|">
     <input type="hidden" name="follow_up_rowcount" value="1">
     | . ($form->{saved_message} ? qq|<p>$form->{saved_message}</p>| : "") . qq|
-...
       my ($transdate, $closedto);
       my $follow_ups_block;
       if ($form->{id}) {
         my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
         if (@{ $follow_ups} ) {
           my $num_due       = sum map { $_->{due} * 1 } @{ $follow_ups };
           $follow_ups_block = qq|<p>| . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq|</p>|;
+        }
+      }
       print qq|
     $follow_ups_block
     <input name=gldate type=hidden value="| . Q($form->{gldate}) . qq|">
     <input name=callback type=hidden value="$form->{callback}">
-...
             <input class=submit type=submit name=action value="| . $locale->text('Use As Template') . qq|"> |;
+        }
         print qq|
             <input class=submit type=submit name=action value="| . $locale->text('Post Payment') .    qq|"> |;
             <input class=submit type=submit name=action value="| . $locale->text('Post Payment') .    qq|">
             <input type="button" class="submit" onclick="follow_up_window()" value="|
           . $locale->text('Follow-Up')
           . qq|"> |;
       } else {
         if ($transdate > $closedto) {

       $auth->assert('customer_vendor_edit');
       $form->get_lists("employees" => "ALL_SALESMEN",
       $form->get_lists("employees" => "ALL_EMPLOYEES",
                        "taxzones"  => "ALL_TAXZONES");
       $form->get_pricegroup(\%myconfig, { all => 1 });
       $form->{ALL_SALESMEN}   = $form->{ALL_EMPLOYEES};
       $form->{taxincluded}    = ($form->{taxincluded}) ? "checked" : "";
       $form->{is_admin}       = $myconfig{role} eq 'admin';
       $form->{is_customer}    = $form->{db}     eq 'customer';
-...
       map { $form->{"MB_$_"} = [ map +{ id => $_, description => $_ }, @{ $form->{$_} } ] } qw(TITLES GREETINGS COMPANY_GREETINGS DEPARTMENT);
     ## /LINET
       $form->{NOTES} ||= [ ];
       $form->{CUSTOM_VARIABLES} = CVar->get_custom_variables('module' => 'CT', 'trans_id' => $form->{id});
       CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}) if (scalar @{ $form->{CUSTOM_VARIABLES} });
       $main::lxdebug->dump(0, "cvar", $form->{CUSTOM_VARIABLES});
       $form->header;
       print $form->parse_html_template('ct/form_header');

     use POSIX qw(strftime);
     use SL::FU;
     use SL::ReportGenerator;
     require "bin/mozilla/reportgenerator.pl";
     sub _collect_links {
       $lxdebug->enter_sub();
       my $dest = shift;
       $dest->{LINKS} = [];
       foreach my $i (1 .. $form->{trans_rowcount}) {
         next if (!$form->{"trans_id_$i"} || !$form->{"trans_type_$i"});
         push @{ $dest->{LINKS} }, { map { +"trans_$_" => $form->{"trans_${_}_$i"} } qw(id type info) };
+      }
       $lxdebug->leave_sub();
+    }
     sub add {
       $lxdebug->enter_sub();
       _collect_links($form);
       $form->get_employee($form->get_standard_dbh(\%myconfig));
       $form->{created_for_user} = $form->{employee_id};
       my $link_details;
       if (0 < scalar @{ $form->{LINKS} }) {
         $link_details = FU->link_details(%{ $form->{LINKS}->[0] });
+      }
       if ($link_details && $link_details->{title}) {
         $form->{title} = $locale->text('Add Follow-Up for #1', $link_details->{title});
       } else {
         $form->{title} = $locale->text('Add Follow-Up');
+      }
       display_form();
       $lxdebug->leave_sub();
+    }
     sub edit {
       $lxdebug->enter_sub();
       my $ref = FU->retrieve('id' => $form->{id});
       if (!$ref) {
         $form->error($locale->text("Invalid follow-up ID."));
+      }
       map { $form->{$_} = $ref->{$_} } keys %{ $ref };
       if (@{ $form->{LINKS} } && $form->{LINKS}->[0]->{title}) {
         $form->{title} = $locale->text('Edit Follow-Up for #1', $form->{LINKS}->[0]->{title});
       } else {
         $form->{title} = $locale->text('Edit Follow-Up');
+      }
       display_form();
       $lxdebug->leave_sub();
+    }
     sub display_form {
       $lxdebug->enter_sub();
       $form->get_lists("employees" => "EMPLOYEES");
       my %params;
       $params{not_id}     = $form->{id} if ($form->{id});
       $params{trans_id}   = $form->{LINKS}->[0]->{trans_id} if (@{ $form->{LINKS} });
       $form->{FOLLOW_UPS} = FU->follow_ups(%params);
       $form->{jsscript}   = 1;
       $form->header();
       print $form->parse_html_template('fu/add_edit');
       $lxdebug->leave_sub();
+    }
     sub save_follow_up {
       $lxdebug->enter_sub();
       $form->isblank('created_for_user', $locale->text('You must chose a user.'));
       $form->isblank('follow_up_date',   $locale->text('The follow-up date is missing.'));
       $form->isblank('subject',          $locale->text('The subject is missing.'));
       my %params = (map({ $_ => $form->{$_} } qw(id subject body created_for_user follow_up_date)), 'done' => 0);
       _collect_links(\%params);
       FU->save(%params);
       if ($form->{POPUP_MODE}) {
         $form->header();
         print $form->parse_html_template('fu/close_window');
         exit 0;
+      }
       $form->{SAVED_MESSAGE} = $locale->text('Follow-Up saved.');
       if ($form->{callback}) {
         $form->redirect();
+      }
       delete @{$form}{qw(id subject body created_for_user follow_up_date)};
       map { $form->{$_} = 1 } qw(due_only all_users not_done);
       report();
       $lxdebug->leave_sub();
+    }
     sub finish {
       $lxdebug->enter_sub();
       if ($form->{id}) {
         my $ref = FU->retrieve('id' => $form->{id});
         if (!$ref) {
           $form->error($locale->text("Invalid follow-up ID."));
+        }
         FU->finish('id' => $form->{id});
       } else {
         foreach my $i (1..$form->{rowcount}) {
           next unless ($form->{"selected_$i"} && $form->{"follow_up_id_$i"});
           FU->finish('id' => $form->{"follow_up_id_$i"});
+        }
+      }
       if ($form->{POPUP_MODE}) {
         $form->header();
         print $form->parse_html_template('fu/close_window');
         exit 0;
+      }
       $form->redirect() if ($form->{callback});
       report();
       $lxdebug->leave_sub();
+    }
     sub delete {
       $lxdebug->enter_sub();
       if ($form->{id}) {
         my $ref = FU->retrieve('id' => $form->{id});
         if (!$ref) {
           $form->error($locale->text("Invalid follow-up ID."));
+        }
         FU->delete('id' => $form->{id});
       } else {
         foreach my $i (1..$form->{rowcount}) {
           next unless ($form->{"selected_$i"} && $form->{"follow_up_id_$i"});
           FU->delete('id' => $form->{"follow_up_id_$i"});
+        }
+      }
       if ($form->{POPUP_MODE}) {
         $form->header();
         print $form->parse_html_template('fu/close_window');
         exit 0;
+      }
       $form->redirect() if ($form->{callback});
       report();
       $lxdebug->leave_sub();
+    }
     sub search {
       $lxdebug->enter_sub();
       $form->get_lists("employees" => "EMPLOYEES");
       $form->{jsscript} = 1;
       $form->{title}    = $locale->text('Follow-Ups');
       $form->header();
       print $form->parse_html_template('fu/search');
       $lxdebug->leave_sub();
+    }
     sub report {
       $lxdebug->enter_sub();
       my @report_params = qw(created_for subject body reference follow_up_date_from follow_up_date_to itime_from itime_to due_only all_users done not_done);
       my $follow_ups    = FU->follow_ups(map { $_ => $form->{$_} } @report_params);
       $form->{rowcount} = scalar @{ $follow_ups };
       $form->{title}    = $locale->text('Follow-Ups');
       my %column_defs = (
         'selected'              => { 'text' => '', },
         'follow_up_date'        => { 'text' => $locale->text('Follow-Up Date'), },
         'created_on'            => { 'text' => $locale->text('Created on'), },
         'title'                 => { 'text' => $locale->text('Reference'), },
         'subject'               => { 'text' => $locale->text('Subject'), },
         'created_by_name'       => { 'text' => $locale->text('Created by'), },
         'created_for_user_name' => { 'text' => $locale->text('Follow-up for'), },
         'done'                  => { 'text' => $locale->text('Done'), 'visible' => $form->{done} && $form->{not_done} ? 1 : 0 },
       );
       my @columns = qw(selected follow_up_date created_on subject title created_by_name created_for_user_name done);
       my @options;
       if ($form->{created_for}) {
         $form->get_lists("employees" => "EMPLOYEES");
         foreach my $employee (@{ $form->{EMPLOYEES} }) {
           if ($employee->{id} == $form->{created_for}) {
             push @options, $locale->text('Created for') . " : " . ($employee->{name} ? "$employee->{name} ($employee->{login})" : $employee->{login});
             last;
+          }
+        }
+      }
       push @options, $locale->text('Subject')                  . " : $form->{subject}"   if ($form->{subject});
       push @options, $locale->text('Body')                     . " : $form->{body}"      if ($form->{body});
       push @options, $locale->text('Reference')                . " : $form->{reference}" if ($form->{reference});
       push @options, $locale->text('Done')                                               if ($form->{done});
       push @options, $locale->text('Not done yet')                                       if ($form->{not_done});
       push @options, $locale->text('Only due follow-ups')                                if ($form->{due_only});
       push @options, $locale->text("Other users' follow-ups")                            if ($form->{all_users});
       my @hidden_report_params = map { +{ 'key' => $_, 'value' => $form->{$_} } } @report_params;
       my $report = SL::ReportGenerator->new(\%myconfig, $form, 'std_column_visibility' => 1);
       $report->set_columns(%column_defs);
       $report->set_column_order(@columns);
       $report->set_export_options('report', @report_params);
       $report->set_sort_indicator('follow_up_date', 1);
       $report->set_options('raw_top_info_text'    => $form->parse_html_template('fu/report_top',    { 'OPTIONS' => \@options }),
                            'raw_bottom_info_text' => $form->parse_html_template('fu/report_bottom', { 'HIDDEN'  => \@hidden_report_params }),
                            'output_format'        => 'HTML',
                            'title'                => $form->{title},
                            'attachment_basename'  => $locale->text('follow_up_list') . strftime('_%Y%m%d', localtime time),
         );
       $report->set_options_from_form();
       my $idx      = 0;
       my $callback = build_std_url('action=report', grep { $form->{$_} } @report_params);
       my $edit_url = build_std_url('action=edit', 'callback=' . E($callback));
       foreach my $fu (@{ $follow_ups }) {
         $idx++;
         $fu->{done} = $fu->{done} ? $locale->text('Yes') : $locale->text('No');
         my $row = { map { $_ => { 'data' => $fu->{$_} } } keys %{ $fu } };
         $row->{selected} = {
           'raw_data' =>   $cgi->hidden('-name' => "follow_up_id_${idx}", '-value' => $fu->{id})
                         . $cgi->checkbox('-name' => "selected_${idx}",   '-value' => 1, '-label' => ''),
           'valign'   => 'center',
           'align'    => 'center',
         };
         if (@{ $fu->{LINKS} }) {
           my $link = $fu->{LINKS}->[0];
           $row->{title}->{data} = $link->{title};
           $row->{title}->{link} = $link->{url};
+        }
         $row->{subject}->{link} = $edit_url . '&id=' . Q($fu->{id});
         $report->add_data($row);
+      }
       $report->generate_with_headers();
       $lxdebug->leave_sub();
+    }
     sub report_for_todo_list {
       $lxdebug->enter_sub();
       my @report_params = qw(created_for subject body reference follow_up_date_from follow_up_date_to itime_from itime_to due_only all_users done not_done);
       my %params   = (
         'due_only'          => 1,
         'not_done'          => 1,
         'created_for_login' => $form->{login},
         );
       my $follow_ups = FU->follow_ups(%params);
       my $content;
       if (@{ $follow_ups }) {
         my $callback = build_std_url('action');
         my $edit_url = build_std_url('script=fu.pl', 'action=edit', 'callback=' . E($callback)) . '&id=';
         foreach my $fu (@{ $follow_ups }) {
           if (@{ $fu->{LINKS} }) {
             my $link = $fu->{LINKS}->[0];
             $fu->{reference}      = $link->{title};
             $fu->{reference_link} = $link->{url};
+          }
+        }
         $content = $form->parse_html_template('fu/report_for_todo_list', { 'FOLLOW_UPS' => $follow_ups,
                                                                            'callback'   => $callback,
                                                                            'edit_url'   => $edit_url, });
+      }
       $lxdebug->leave_sub();
       return $content;
+    }
     sub edit_access_rights {
       $lxdebug->enter_sub();
       my $access = FU->retrieve_access_rights();
       $form->get_lists("employees" => "EMPLOYEES");
       map { $_->{access} = $access->{$_->{id}} } @{ $form->{EMPLOYEES} };
       $form->{title} = $locale->text('Edit Access Rights for Follow-Ups');
       $form->header();
       print $form->parse_html_template('fu/edit_access_rights');
       $lxdebug->leave_sub();
+    }
     sub save_access_rights {
       $lxdebug->enter_sub();
       my %access;
       foreach my $i (1 .. $form->{rowcount}) {
         my $id = $form->{"employee_id_$i"};
         $access{$id} = 1 if ($id && $form->{"access_$id"});
+      }
       FU->save_access_rights('access' => \%access);
       $form->{SAVED_MESSAGE} = $locale->text('The access rights have been saved.');
       edit_access_rights();
       $lxdebug->leave_sub();
+    }
     sub update {
       call_sub($form->{nextsub});
+    }
     sub continue {
       call_sub($form->{nextsub});
+    }
     sub save {
       if ($form->{save_nextsub}) {
         call_sub($form->{save_nextsub});
       } else {
         save_follow_up();
+      }
+    }
     sub dispatcher {
       foreach my $action (qw(finish save delete)) {
         if ($form->{"action_${action}"}) {
           call_sub($action);
           return;
+        }
+      }
       call_sub($form->{default_action}) if ($form->{default_action});
       $form->error($locale->text('No action defined.'));
+    }
 ;

     #======================================================================
     use POSIX qw(strftime);
     use List::Util qw(sum);
     use SL::FU;
     use SL::GL;
     use SL::IS;
     use SL::PE;
-...
       print qq|
     <body onLoad="fokus()">
     <script type="text/javascript" src="js/common.js"></script>
     <script type="text/javascript" src="js/follow_up.js"></script>
     <form method=post name="gl" action=gl.pl>
     |;
-...
       print qq|
     <input type=hidden name=title value="$title">
     <input type="hidden" name="follow_up_trans_id_1" value="| . H($form->{id}) . qq|">
     <input type="hidden" name="follow_up_trans_type_1" value="gl_transaction">
     <input type="hidden" name="follow_up_trans_info_1" value="| . H($form->{id}) . qq|">
     <input type="hidden" name="follow_up_rowcount" value="1">
     <table width=100%>
       <tr>
-...
       $auth->assert('general_ledger');
       my $follow_ups_block;
       if ($form->{id}) {
         my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
         if (@{ $follow_ups} ) {
           my $num_due       = sum map { $_->{due} * 1 } @{ $follow_ups };
           $follow_ups_block = qq|<p>| . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq|</p>|;
+        }
+      }
       ($dec) = ($form->{totaldebit} =~ /\.(\d+)/);
       $dec = length $dec;
       $decimalplaces = ($dec > 2) ? $dec : 2;
-...
     <input name=callback type=hidden value="$form->{callback}">
     $follow_ups_block
     <br>
     |;
-...
             <input class=submit type=submit name=action value="| . $locale->text('Delete') . qq|">|;
+        }
         print qq|
             <input type="button" class="submit" onclick="follow_up_window()" value="|
           . $locale->text('Follow-Up')
           . qq|"> |;
       } else {
         if ($transdate > $closedto) {
           print qq|

+    #
     #======================================================================
     use SL::FU;
     use SL::IR;
     use SL::IS;
     use SL::PE;
     use List::Util qw(max);
     use List::Util qw(max sum);
     require "bin/mozilla/io.pl";
     require "bin/mozilla/invoice_io.pl";
-...
                             "invdate", "BL", "trigger1",
                             "duedate", "BL", "trigger2");
       my $follow_up_vc         =  $form->{vendor};
       $follow_up_vc            =~ s/--.*?//;
       my $follow_up_trans_info =  "$form->{invnumber} ($follow_up_vc)";
       $form->{javascript} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
       $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
       $form->{javascript} .= qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
       $form->{javascript} .= qq|<script type="text/javascript" src="js/follow_up.js"></script>|;
       $jsscript .= $form->write_trigger(\%myconfig, 2, "orddate", "BL", "trigger_orddate", "quodate", "BL", "trigger_quodate");
-...
       $form->{invtotal}    =
         $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0);
       my $follow_ups_block;
       if ($form->{id}) {
         my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
         if (@{ $follow_ups} ) {
           my $num_due       = sum map { $_->{due} * 1 } @{ $follow_ups };
           $follow_ups_block = qq|
           <tr>
             <td colspan="2">| . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq|</td>
           </tr>
     |;
+        }

... Dieser Diff wurde abgeschnitten, weil er die maximale Anzahl anzuzeigender Zeilen überschreitet.

Auch abrufbar als: Unified diff

Projekt

Allgemein

Profil

projekt kivitendo

Revision 7a7f33b5

Von Moritz Bunkus vor fast 17 Jahren hinzugefügt