Version 3.2.7 (Nov 17, 2018)

- fixed inventory bug when converting an order to an invoice
- added option to limit sales to inventory on hand
- added option to hide closed accounts
- added lot and expiry date for parts and assemblies
- added option to force using a warehouse
- fixed missing function call for printing timecards
- added storescards for batch printing and queueing
- fixed display for first selected customer/vendor on payment screen
- added upload image function
- added make and model to selection screen and forms
- changed cookie to allow space in login names
- fixed subtotals on payroll report
- added missing module link for batch printing
- fixed totals on invoices with kits

Author: Tekki

SL/.htaccess

@@ -1,4 +1 @@
-AuthType	basic
-AuthName	"Unauthorized"
-AuthUserFile	/dev/null
-Require		valid-user
+deny from all

SL/AA.pm

@@ -1579,68 +1579,6 @@ sub vc_links {
 }
 
 
-sub consolidate {
-  my ($self, $myconfig, $form) = @_;
-
-  # connect to database
-  my $dbh = $form->dbconnect($myconfig);
-
-  my %defaults = $form->get_defaults($dbh, \@{['precision', 'company']});
-  for (keys %defaults) { $form->{$_} = $defaults{$_} }
-
-  my $invoice = ($form->{type} eq 'invoice') ? 1 : 0;
-  my $arap = lc $form->{ARAP};
-  my $vc = ($form->{ARAP} eq 'AR') ? 'customer' : 'vendor';
-
-  my $query = qq|SELECT a.*, c.prec
-                 FROM $arap a
-                 LEFT JOIN curr c ON (c.curr = a.curr)
-                 WHERE amount != paid
-                 AND invoice = '$invoice'
-                 AND approved = '1'
-                 AND onhold = '0'|;
-
-  my @sf = (transdate);
-  my %ordinal = $form->ordinal_order($dbh, $query);
-  $query .= qq| ORDER BY | .$form->sort_order(\@sf, \%ordinal);
-
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  $query = qq|SELECT c.name, a.city
-              FROM $vc c
-              JOIN address a ON (a.trans_id = c.id)
-              WHERE c.id = ?|;
-  my $cth = $dbh->prepare($query);
-
-  $query = qq|SELECT c.accno
-              FROM acc_trans ac
-              JOIN chart c ON (c.id = ac.chart_id)
-              WHERE ac.trans_id = ?
-              AND c.link = '$form->{ARAP}'|;
-  my $ath = $dbh->prepare($query);
-
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    $cth->execute($ref->{"${vc}_id"});
-    ($ref->{name}, $ref->{city}) = $cth->fetchrow_array;
-    $cth->finish;
-
-    $ath->execute($ref->{id});
-    ($arap) = $ath->fetchrow_array;
-    $ath->finish;
-
-    $form->{$ref->{curr}}++;
-
-    push @{ $form->{all_transactions}{$ref->{curr}}{$arap}{$ref->{name}} }, $ref;
-  }
-  $sth->finish;
-
-  $dbh->disconnect;
-
-}
-
-
-
 1;
 
 =encoding utf8
@@ -1666,10 +1604,6 @@ L<SL::AA> implements the following functions:
 
   AA->company_details($myconfig, $form, $dbh);
 
-=head2 consolidate
-
-  AA->consolidate($myconfig, $form);
-
 =head2 delete_transaction
 
   AA->delete_transaction($myconfig, $form, $dbh);

SL/AM.pm

@@ -3369,19 +3369,18 @@ sub audit_log {
   $dateformat =~ s/yy$/yyyy/;
   $dateformat =~ s/yyyyyy/yyyy/;
 
-  my %datestyle = ( Pg => "set DateStyle to SQL, US" );
-
-  my $query = qq|$datestyle{$myconfig->{dbdriver}};
+  my $query = qq|
                  SELECT a.*, e.name, e.employeenumber, e.login,
-                 to_char(a.transdate, '$dateformat') AS transdate,
+                 a.transdate,
+                 to_char(a.transdate, '$dateformat') AS transdatea,
                  to_char(a.transdate, 'HH24:MI:SS') AS transtime
                  FROM audittrail a
                  LEFT JOIN employee e ON (e.id = a.employee_id)
                  $where|;
 
   $form->{sort} ||= "transdate";
   my @sf;
-  push @sf, ($form->{sort} eq 'transdate') ? qw(transdate transtime) : $form->{sort};
+  push @sf, $form->{sort};
   my %ordinal = $form->ordinal_order($dbh, $query);
   my $sortorder = $form->sort_order(\@sf, \%ordinal);
 
@@ -3396,6 +3395,8 @@ sub audit_log {
 
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     $ref->{login} = 'admin' if $ref->{employee_id} == 0;
+    $ref->{transdate} = $ref->{transdatea};
+    delete $ref->{transdatea};
     push @{ $form->{ALL} }, $ref;
   }
   $sth->finish;

SL/BP.pm

@@ -31,6 +31,7 @@ sub get_vc {
                sales_quotation => { oe => customer },
                request_quotation => { oe => vendor },
                timecard => { jcitems => employee },
+               storescard => { jcitems => employee },
              );
 
   my $query;
@@ -146,7 +147,7 @@ sub get_vc {
   $form->all_years($myconfig, $dbh);
 
   if ($form->{type} =~ /(timecard|storescard)/) {
-    $form->all_projects($myconfig, $dbh);
+    $form->all_projects($myconfig, $dbh, undef, ($form->{type} eq 'storescard'));
   }
 
   $dbh->disconnect;
@@ -191,11 +192,8 @@ sub get_spoolfiles {
 
   my $where;
 
-  if ($form->{type} eq 'timecard') {
-    my $dateformat = $myconfig->{dateformat};
-
-    $dateformat =~ s/yy/yyyy/;
-    $dateformat =~ s/yyyyyy/yyyy/;
+  if ($form->{type} =~ /(timecard|storescard)/) {
+    my $dateformat = 'YYYY-MM-DD';
 
     $invnumber = 'id';
     $where = "1=1";
@@ -206,7 +204,7 @@ sub get_spoolfiles {
                   j.id AS invnumber,
                   to_char(j.checkedin, '$dateformat') AS transdate,
                   '' AS ordnumber, '' AS quonumber, '0' AS invoice,
-                  'jc' AS module, s.spoolfile, j.description,
+                  'jcitems' AS tablename, s.spoolfile, j.description,
                   j.sellprice * j.qty AS amount, ad.city, e.id AS employee_id
                   FROM jcitems j
                   JOIN employee e ON (e.id = j.employee_id)
@@ -244,7 +242,7 @@ sub get_spoolfiles {
                   j.id AS invnumber,
                   to_char(j.checkedin, '$dateformat') AS transdate,
                   '' AS ordnumber, '' AS quonumber, '0' AS invoice,
-                  'jc' AS module, '' AS spoolfile, j.description,
+                  'jcitems' AS tablename, '' AS spoolfile, j.description,
                   j.sellprice * j.qty AS amount, ad.city, e.id AS employee_id
                   FROM jcitems j
                   JOIN employee e ON (e.id = j.employee_id)
@@ -318,7 +316,7 @@ sub get_spoolfiles {
                   vc.$arap{$form->{type}}{$item}number AS vcnumber,
                   a.$invnumber AS invnumber, a.transdate,
                   a.ordnumber, a.quonumber, $invoice AS invoice,
-                  '$item' AS module, s.spoolfile, a.description, a.amount,
+                  '$item' AS tablename, s.spoolfile, a.description, a.amount,
                   ad.city, vc.email, '$arap{$form->{type}}{$item}' AS db,
                   vc.id AS vc_id
                   FROM $item a
@@ -329,7 +327,6 @@ sub get_spoolfiles {
                   AND s.spoolfile <> ''
                   AND s.formname LIKE '$wildcard$form->{type}'|;
       } else {
-
         if ($item ne 'oe' && $form->{onhold}) {
           $form->{open} = "Y";
           $form->{closed} = "";
@@ -375,10 +372,9 @@ sub get_spoolfiles {
                 }
               }
             }
-            } else {
-              $where .= qq| AND a.id = 0|;
+          } else {
+            $where .= qq| AND a.id = 0|;
           }
-
         }
 
         $query .= qq|
@@ -387,7 +383,7 @@ sub get_spoolfiles {
                   vc.$arap{$form->{type}}{$item}number AS vcnumber,
                   a.$invnumber AS invnumber, a.transdate,
                   a.ordnumber, a.quonumber, $invoice AS invoice,
-                  '$item' AS module, '' AS spoolfile, a.description, a.amount,
+                  '$item' AS tablename, '' AS spoolfile, a.description, a.amount,
                   '$arap{$form->{type}}{$item}' AS vc,
                   ad.city, vc.email, '$arap{$form->{type}}{$item}' AS db,
                   vc.id AS vc_id
@@ -459,7 +455,7 @@ sub get_spoolfiles {
                 AND s.spoolfile IS NOT NULL
                 AND s.spoolfile <> ''|;
 
-     if ($form->{type} eq 'timecard') {
+     if ($form->{type} =~ /(timecard|storescard)/) {
        $query .= qq|AND s.trans_id NOT IN (SELECT id FROM jcitems)|;
 
      } else {
@@ -518,7 +514,7 @@ sub delete_spool {
       $sth->execute($form->{"spoolfile_$i"}) || $form->dberror;
       $sth->finish;
 
-      %audittrail = ( tablename  => $form->{module},
+      %audittrail = ( tablename  => $form->{"tablename_$i"},
                       reference  => $form->{"reference_$i"},
                       formname   => $formname,
                       action     => 'dequeued',
@@ -589,7 +585,7 @@ sub print_spool {
   $sth->execute($form->{spoolfile}) || $form->dberror;
   $sth->finish;
 
-  %audittrail = ( tablename  => $form->{module},
+  %audittrail = ( tablename  => $form->{tablename},
                   reference  => $form->{reference},
                   formname   => $formname,
                   action     => 'printed',

SL/CA.pm

@@ -24,7 +24,7 @@ sub all_accounts {
 
   my $ref;
 
-  my %defaults = $form->get_defaults($dbh, \@{['precision', 'company']});
+  my %defaults = $form->get_defaults($dbh, \@{['precision', 'company', 'hideaccounts']});
   for (keys %defaults) { $form->{$_} = $defaults{$_} }
 
   my $query = qq|SELECT c.accno,

SL/CP.pm

@@ -128,6 +128,10 @@ sub get_openvc {
 
   my $dbh = $form->dbconnect($myconfig);
 
+  $form->remove_locks($myconfig, $dbh, $form->{arap});
+  $form->{redo} = 1;
+  $form->{locks_removed} = 1;
+
   my $where = qq|a.amount != a.paid
                  AND a.approved = '1'
                  AND a.onhold = '0'
@@ -236,6 +240,8 @@ sub get_openvc {
 
   my %vc;
 
+  @{ $form->{name_list} } = ();
+
   foreach $ref (@transactions) {
 
     next if $vc{$ref->{id}};
@@ -540,6 +546,8 @@ sub get_openinvoices {
 
   $sth->finish;
 
+  $form->{PR} = ();
+
   foreach $ref (@transactions) {
     if ($form->{vc} eq 'vendor') {
       if ($ref->{threshold} > 0) {