headers
SVN commit mailer | 1 Mar 2007 09:17
Picon
Favicon
Gravatar

r2030 - trunk/unstable/SL

Author: mbunkus
Date: 2007-03-01 09:17:12 +0100 (Thu, 01 Mar 2007)
New Revision: 2030

Modified:
   trunk/unstable/SL/GL.pm
Log:
Projektnummer nicht doppelt und schon gar nicht mit einem Subquery abholen.

Modified: trunk/unstable/SL/GL.pm
===================================================================
--- trunk/unstable/SL/GL.pm	2007-02-28 14:12:45 UTC (rev 2029)
+++ trunk/unstable/SL/GL.pm	2007-03-01 08:17:12 UTC (rev 2030)
 <at>  <at>  -638,8 +638,8  <at>  <at> 

     # retrieve individual rows
     $query = qq|SELECT c.accno, t.taxkey AS accnotaxkey, a.amount, a.memo,
-                a.transdate, a.cleared, a.project_id, p.projectnumber,(SELECT p.projectnumber FROM project p
-		 WHERE a.project_id = p.id) AS projectnumber, a.taxkey, t.rate AS taxrate, t.id, (SELECT c1.accno
FROM chart c1, tax t1 WHERE t1.id=t.id AND c1.id=t.chart_id) AS taxaccno, (SELECT tk.tax_id FROM
taxkeys tk WHERE tk.chart_id =a.chart_id AND tk.startdate<=a.transdate ORDER BY tk.startdate desc
LIMIT 1) AS tax_id
+                a.transdate, a.cleared, a.project_id, p.projectnumber,
+		 a.taxkey, t.rate AS taxrate, t.id, (SELECT c1.accno FROM chart c1, tax t1 WHERE t1.id=t.id AND
c1.id=t.chart_id) AS taxaccno, (SELECT tk.tax_id FROM taxkeys tk WHERE tk.chart_id =a.chart_id AND
tk.startdate<=a.transdate ORDER BY tk.startdate desc LIMIT 1) AS tax_id
 		FROM acc_trans a
 		JOIN chart c ON (c.id = a.chart_id)
 		LEFT JOIN project p ON (p.id = a.project_id)
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 1 Mar 2007 09:17
Picon
Favicon
Gravatar

r2031 - in trunk/unstable: SL bin/mozilla

Author: mbunkus
Date: 2007-03-01 09:17:56 +0100 (Thu, 01 Mar 2007)
New Revision: 2031

Modified:
   trunk/unstable/SL/AR.pm
   trunk/unstable/SL/IS.pm
   trunk/unstable/bin/mozilla/ar.pl
Log:
Dialogbuchen: Weitere Drop-Down-Boxen werden bei jedem Aufbau aus der Datenbank ausgelesen und durch
das CGI-Modul ausgegeben.

Modified: trunk/unstable/SL/AR.pm
===================================================================
--- trunk/unstable/SL/AR.pm	2007-03-01 08:17:12 UTC (rev 2030)
+++ trunk/unstable/SL/AR.pm	2007-03-01 08:17:56 UTC (rev 2031)
 <at>  <at>  -61,8 +61,8  <at>  <at> 
     $form->{AR_amounts}{"amount_$i"} =
       (split(/--/, $form->{"AR_amount_$i"}))[0];
   }
-  ($form->{AR_amounts}{receivables}) = split(/--/, $form->{ARselected});
-  ($form->{AR}{receivables})         = split(/--/, $form->{ARselected});
+  $form->{AR_amounts}{receivables} = $form->{ARselected};
+  $form->{AR}{receivables}         = $form->{ARselected};

   $form->{exchangerate} =
     ($exchangerate)
 <at>  <at>  -378,7 +378,7  <at>  <at> 
       $form->get_exchangerate($dbh, $form->{currency}, $form->{transdate},
                               "buy");
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 1 Mar 2007 11:20
Picon
Favicon
Gravatar

r2032 - trunk/unstable/SL

Author: mbunkus
Date: 2007-03-01 11:20:18 +0100 (Thu, 01 Mar 2007)
New Revision: 2032

Modified:
   trunk/unstable/SL/AP.pm
Log:
Booleans als 't' oder 'f' an die Datenbank geben.

Modified: trunk/unstable/SL/AP.pm
===================================================================
--- trunk/unstable/SL/AP.pm	2007-03-01 08:17:56 UTC (rev 2031)
+++ trunk/unstable/SL/AP.pm	2007-03-01 10:20:18 UTC (rev 2032)
 <at>  <at>  -205,7 +205,7  <at>  <at> 
               WHERE id = ?|;
   my  <at> values = ($form->{invnumber}, conv_date($form->{transdate}),
                 $form->{ordnumber}, conv_i($form->{vendor_id}),
-                $form->{taxincluded}, $form->{invtotal},
+                $form->{taxincluded} ? 't' : 'f', $form->{invtotal},
                 conv_date($form->{duedate}), $form->{invpaid},
                 conv_date($datepaid), $form->{netamount},
                 $form->{currency}, $form->{notes},

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
Permalink | Reply | 0 comments |
headers
SVN commit mailer | 1 Mar 2007 14:19
Picon
Favicon
Gravatar

r2033 - in trunk/unstable: . bin/mozilla locale/de

Author: mbunkus
Date: 2007-03-01 14:19:44 +0100 (Thu, 01 Mar 2007)
New Revision: 2033

Removed:
   trunk/unstable/bin/mozilla/cn.pl
   trunk/unstable/cn.pl
   trunk/unstable/locale/de/cn
Log:
Diese Datei wird gar nicht benutzt. Gutschriften werden ?\195?\188ber is.pl abgewickelt.

Deleted: trunk/unstable/bin/mozilla/cn.pl
===================================================================
--- trunk/unstable/bin/mozilla/cn.pl	2007-03-01 10:20:18 UTC (rev 2032)
+++ trunk/unstable/bin/mozilla/cn.pl	2007-03-01 13:19:44 UTC (rev 2033)
 <at>  <at>  -1,1218 +0,0  <at>  <at> 
-#=====================================================================
-# LX-Office ERP
-# Copyright (C) 2004
-# Based on SQL-Ledger Version 2.1.9
-# Web http://www.lx-office.org
-#
-#=====================================================================
-# SQL-Ledger Accounting
-# Copyright (c) 1998-2002
-#
-#  Author: Dieter Simader
-#   Email: dsimader <at> sql-ledger.org
-#     Web: http://www.sql-ledger.org
-#
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 1 Mar 2007 15:19
Picon
Favicon
Gravatar

r2034 - in trunk/unstable: SL bin/mozilla

Author: mbunkus
Date: 2007-03-01 15:19:20 +0100 (Thu, 01 Mar 2007)
New Revision: 2034

Modified:
   trunk/unstable/SL/AR.pm
   trunk/unstable/SL/Form.pm
   trunk/unstable/SL/IS.pm
   trunk/unstable/bin/mozilla/ar.pl
   trunk/unstable/bin/mozilla/io.pl
   trunk/unstable/bin/mozilla/is.pl
Log:
Rechnungs- und Gutschriftsnummern werden nun direkt innerhalb der Backend-Routinen innerhalb der
gleichen Transaktion vergeben, in der auch die eigentliche Rechnung etc gespeichert wird. Damit soll
besser verhindert werden, dass sich L?\195?\182cher in den Nummernkreisen ergeben.

Modified: trunk/unstable/SL/AR.pm
===================================================================
--- trunk/unstable/SL/AR.pm	2007-03-01 13:19:44 UTC (rev 2033)
+++ trunk/unstable/SL/AR.pm	2007-03-01 14:19:20 UTC (rev 2034)
 <at>  <at>  -170,6 +170,10  <at>  <at> 

     $query = qq|INSERT INTO ar (id, invnumber, employee_id) VALUES (?, 'dummy', ?)|;
     do_query($form, $dbh, $query, $form->{id}, $form->{employee_id});
+
+    if (!$form->{invnumber}) {
+      $form->{invnumber} = $form->update_defaults($myconfig, "invnumber", $dbh);
+    }
   }
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 2 Mar 2007 11:47
Picon
Favicon
Gravatar

r2035 - trunk/unstable/SL

Author: mbunkus
Date: 2007-03-02 11:47:34 +0100 (Fri, 02 Mar 2007)
New Revision: 2035

Modified:
   trunk/unstable/SL/OE.pm
Log:
Debugcode

Modified: trunk/unstable/SL/OE.pm
===================================================================
--- trunk/unstable/SL/OE.pm	2007-03-01 14:19:20 UTC (rev 2034)
+++ trunk/unstable/SL/OE.pm	2007-03-02 10:47:34 UTC (rev 2035)
 <at>  <at>  -121,8 +121,6  <at>  <at> 
   $sth->execute( <at> values) ||
     $form->dberror($query . " (" . join(", ",  <at> values) . ")");

-  dump_query(0, "laqje", $query,  <at> values);
-
   my %id = ();
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     $ref->{exchangerate} = 1 unless $ref->{exchangerate};

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
Permalink | Reply | 0 comments |
headers
SVN commit mailer | 2 Mar 2007 12:38
Picon
Favicon
Gravatar

r2036 - trunk/unstable/bin/mozilla

Author: tkasulke
Date: 2007-03-02 12:38:28 +0100 (Fri, 02 Mar 2007)
New Revision: 2036

Modified:
   trunk/unstable/bin/mozilla/oe.pl
Log:
show_history.js in header eingebunden

Modified: trunk/unstable/bin/mozilla/oe.pl
===================================================================
--- trunk/unstable/bin/mozilla/oe.pl	2007-03-02 10:47:34 UTC (rev 2035)
+++ trunk/unstable/bin/mozilla/oe.pl	2007-03-02 11:38:28 UTC (rev 2036)
 <at>  <at>  -698,7 +698,9  <at>  <at> 
   }

   $form->{"javascript"} .= qq|<script type="text/javascript" src="js/show_form_details.js"></script>|;
-
+  # show history button js
+  $form->{javascript} .= qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+  #/show history button js
   $form->header;

   print qq|

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 5 Mar 2007 10:08
Picon
Favicon
Gravatar

r2037 - trunk/unstable/css

Author: mbunkus
Date: 2007-03-05 10:08:26 +0100 (Mon, 05 Mar 2007)
New Revision: 2037

Modified:
   trunk/unstable/css/lx-office-erp.css
Log:
Links durch andere Farbe besser hervorheben. Eingabefelder, ?\195?\188ber denen die Maus positioniert
ist, werden in hellgelb dargestellt. Patch von Kai-Martin Knaak ( kmk () familieknaak ! de )

Modified: trunk/unstable/css/lx-office-erp.css
===================================================================
--- trunk/unstable/css/lx-office-erp.css	2007-03-02 11:38:28 UTC (rev 2036)
+++ trunk/unstable/css/lx-office-erp.css	2007-03-05 09:08:26 UTC (rev 2037)
 <at>  <at>  -1,45 +1,19  <at>  <at> 
 /* stylesheet for LX-Office ERP */

-/* general stuff */
-/*
-A:link { color: #a0522d; text-decoration: none; }
-A:visited { color: #0522d; text-decoration: none; }
-A:active { color: #a0522d; text-decoration: underline; }
-A:hover { color: white;
-          background-color: rgb(187,187,187);
-	  text-decoration: none;
-}
-*/
-A:link { color: black; text-decoration: none; }
-A:visited { color: black; text-decoration: none; }
-A:active { color: black; text-decoration: underline; }
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 5 Mar 2007 10:25
Picon
Favicon
Gravatar

r2038 - trunk/unstable/bin/mozilla

Author: mbunkus
Date: 2007-03-05 10:25:57 +0100 (Mon, 05 Mar 2007)
New Revision: 2038

Modified:
   trunk/unstable/bin/mozilla/io.pl
Log:
Eine Variable $qty_readonly gibt es ansonsten nicht.

Modified: trunk/unstable/bin/mozilla/io.pl
===================================================================
--- trunk/unstable/bin/mozilla/io.pl	2007-03-05 09:08:26 UTC (rev 2037)
+++ trunk/unstable/bin/mozilla/io.pl	2007-03-05 09:25:57 UTC (rev 2038)
 <at>  <at>  -355,11 +355,10  <at>  <at> 
     }

     $column_data{"unit"} = "<td>" .
-      ($qty_readonly ? "&nbsp;" :
        AM->unit_select_html($is_part ? $dimension_units :
                             $is_assigned ? $service_units : $all_units,
                             "unit_$i", $this_unit,
-                            $is_assigned ? $form->{"unit_$i"} : undef))
+                            $is_assigned ? $form->{"unit_$i"} : undef)
       . "</td>";

     # build in drop down list for pricesgroups

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 5 Mar 2007 10:41
Picon
Favicon
Gravatar

r2039 - in trunk/unstable: SL bin/mozilla locale/de

Author: mbunkus
Date: 2007-03-05 10:41:52 +0100 (Mon, 05 Mar 2007)
New Revision: 2039

Modified:
   trunk/unstable/SL/IC.pm
   trunk/unstable/bin/mozilla/is.pl
   trunk/unstable/locale/de/all
   trunk/unstable/locale/de/is
Log:
Das mehrmalige Stornieren von Kundenrechnungen definitiv verhindern.

Modified: trunk/unstable/SL/IC.pm
===================================================================
--- trunk/unstable/SL/IC.pm	2007-03-05 09:25:57 UTC (rev 2038)
+++ trunk/unstable/SL/IC.pm	2007-03-05 09:41:52 UTC (rev 2039)
 <at>  <at>  -1887,4 +1887,24  <at>  <at> 

   $main::lxdebug->leave_sub();
 }
+
+sub has_storno {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form) =  <at> _;
+
+  $main::lxdebug->leave_sub() and return 0 unless ($form->{id});
+
+  my $dbh = $form->dbconnect($myconfig);
+
(Continue reading)

Permalink | Reply | 0 comments |

Gmane