headers
SVN commit mailer | 2 Jan 2006 20:07
Picon
Favicon
Gravatar

[SVN: lx-office-erp] r733 - in trunk/unstable: SL bin/mozilla

Author: preetz
Date: 2006-01-02 20:07:34 +0100 (Mon, 02 Jan 2006)
New Revision: 733

Modified:
   trunk/unstable/SL/AP.pm
   trunk/unstable/bin/mozilla/ap.pl
Log:
Splitbuchungen fuer Kreditoren ergaenzt

Modified: trunk/unstable/SL/AP.pm
===================================================================
--- trunk/unstable/SL/AP.pm	2006-01-02 19:06:52 UTC (rev 732)
+++ trunk/unstable/SL/AP.pm	2006-01-02 19:07:34 UTC (rev 733)
 <at>  <at>  -61,8 +61,15  <at>  <at> 
       : $form->parse_amount($myconfig, $form->{exchangerate});
   }

+  for $i (1 .. $form->{rowcount}) {
+    $form->{AP_amounts}{"amount_$i"} =
+      (split(/--/, $form->{"AP_amount_$i"}))[0];
+  }
+  ($form->{AP_amounts}{payables}) = split(/--/, $form->{APselected});
+  ($form->{AP}{payables})         = split(/--/, $form->{APselected});
+
   # reverse and parse amounts
-  for my $i (1 .. 1) {
+  for my $i (1 .. $form->{rowcount}) {
     $form->{"amount_$i"} =
       $form->round_amount(
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 2 Jan 2006 20:06
Picon
Favicon
Gravatar

[SVN: lx-office-erp] r732 - in trunk/unstable: SL bin/mozilla

Author: preetz
Date: 2006-01-02 20:06:52 +0100 (Mon, 02 Jan 2006)
New Revision: 732

Modified:
   trunk/unstable/SL/AR.pm
   trunk/unstable/bin/mozilla/ar.pl
Log:
Fehler bei Splitbuchungen beseitigt, wenn mit Steuer inkl. gebucht wurde

Modified: trunk/unstable/SL/AR.pm
===================================================================
--- trunk/unstable/SL/AR.pm	2005-12-30 20:57:09 UTC (rev 731)
+++ trunk/unstable/SL/AR.pm	2006-01-02 19:06:52 UTC (rev 732)
 <at>  <at>  -55,10 +55,11  <at>  <at> 
                                 $form->{transdate}, 'buy');
   }
   for $i (1 .. $form->{rowcount}) {
-    $form->{AR_amounts}{"amount_$i"} = (split(/--/, $form->{"AR_amount_$i"}))[0];
+    $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}{receivables})         = split(/--/, $form->{ARselected});

   $form->{exchangerate} =
     ($exchangerate)
 <at>  <at>  -85,28 +86,33  <at>  <at>
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 2 Jan 2006 20:10
Picon
Favicon
Gravatar

[SVN: lx-office-erp] r734 - trunk/unstable/locale/de

Author: preetz
Date: 2006-01-02 20:10:02 +0100 (Mon, 02 Jan 2006)
New Revision: 734

Modified:
   trunk/unstable/locale/de/all
   trunk/unstable/locale/de/ap
   trunk/unstable/locale/de/ar
   trunk/unstable/locale/de/ca
Log:
Splitbuchungen

Modified: trunk/unstable/locale/de/all
===================================================================
--- trunk/unstable/locale/de/all	2006-01-02 19:07:34 UTC (rev 733)
+++ trunk/unstable/locale/de/all	2006-01-02 19:10:02 UTC (rev 734)
 <at>  <at>  -184,7 +184,6  <at>  <at> 
   'Company'                     => 'Firma',
   'Company Name'                => 'Firmenname',
   'Compare to'                  => 'Gegenüberstellen zu',
-  'Config'                      => 'Config',
   'Confirm!'                    => 'Bestätigen Sie!',
   'Confirmation'                => 'Auftragsbestätigung',
   'Connect to'                  => 'Als Vorlage verwenden',
 <at>  <at>  -194,7 +193,6  <at>  <at> 
   'Contra'                      => 'gegen',
   'Copies'                      => 'Kopien',
   'Copy to COA'                 => 'In Kontenplan kopieren',
-  'Correct Tax'                 => 'Steuer anpassen',
   'Cost Center'                 => 'Kostenstelle',
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 3 Jan 2006 17:59
Picon
Favicon
Gravatar

[SVN: lx-office-erp] r735 - in trunk/unstable: bin/mozilla locale/de

Author: sschoeling
Date: 2006-01-03 17:59:39 +0100 (Tue, 03 Jan 2006)
New Revision: 735

Modified:
   trunk/unstable/bin/mozilla/io.pl
   trunk/unstable/bin/mozilla/oe.pl
   trunk/unstable/locale/de/all
   trunk/unstable/locale/de/oe
Log:
Habe das Lieferdatum auf Postenebene wieder eingefuehrt, anscheinend hatte das jemand wegoptimiert.
Es wird jetzt wieder im Auftrag erfassen und Rechnung erfassen Formular angezeigt.
Es wird ausserdem bei Umwandlung zwischen Rechnung<->Auftrag uebernommen.
Sammelrechnungen uebernehmen das Lieferdatum aus den Teilauftraegen, wobei Postenlieferdatum
Prioritaet hat.

DB Schema muss nicht angepasst werden, die Spalten sin schon vorhanden.

Modified: trunk/unstable/bin/mozilla/io.pl
===================================================================
--- trunk/unstable/bin/mozilla/io.pl	2006-01-02 19:10:02 UTC (rev 734)
+++ trunk/unstable/bin/mozilla/io.pl	2006-01-03 16:59:39 UTC (rev 735)
 <at>  <at>  -202,6 +202,7  <at>  <at> 
   $serialnumber  = $locale->text('Serial No.');
   $projectnumber = $locale->text('Project');
   $partsgroup    = $locale->text('Group');
+  $reqdate       = $locale->text('Reqdate');

   $delvar = 'deliverydate';
(Continue reading)

Permalink | Reply | 5 comments |
headers
SVN commit mailer | 3 Jan 2006 18:05
Picon
Favicon
Gravatar

[SVN: lx-office-erp] r736 - trunk/unstable/bin/mozilla

Author: sschoeling
Date: 2006-01-03 18:05:02 +0100 (Tue, 03 Jan 2006)
New Revision: 736

Modified:
   trunk/unstable/bin/mozilla/io.pl
Log:
Peinlich, falsche io.pl eingcheckt. Diese hier ist die richtige.

Modified: trunk/unstable/bin/mozilla/io.pl
===================================================================
--- trunk/unstable/bin/mozilla/io.pl	2006-01-03 16:59:39 UTC (rev 735)
+++ trunk/unstable/bin/mozilla/io.pl	2006-01-03 17:05:02 UTC (rev 736)
 <at>  <at>  -403,13 +403,13  <at>  <at> 
       print qq|
         <b>${$reqdate_term}</b>&nbsp;<input name="${reqdate_term}_$i" size=11 value="$form->{"${reqdate_term}_$i"}">
 |;
+    }

     print qq|
 	  </td>
 	</tr>

 |;
-    }

 ############## ENDE Neueintrag ##################

-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 6 Jan 2006 02:26
Picon
Favicon
Gravatar

[SVN: lx-office-erp] r739 - in trunk/unstable: SL bin/mozilla

Author: udo_spallek
Date: 2006-01-06 02:26:26 +0100 (Fri, 06 Jan 2006)
New Revision: 739

Modified:
   trunk/unstable/SL/User.pm
   trunk/unstable/bin/mozilla/admin.pl
Log:
Solved Bug 166

Modified: trunk/unstable/SL/User.pm
===================================================================
--- trunk/unstable/SL/User.pm	2006-01-06 00:49:29 UTC (rev 738)
+++ trunk/unstable/SL/User.pm	2006-01-06 01:26:26 UTC (rev 739)
 <at>  <at>  -841,7 +841,7  <at>  <at> 
     currency dateformat dbconnect dbdriver dbhost dbport dboptions
     dbname dbuser dbpasswd email fax name numberformat in_numberformat password
     printer role sid signature stylesheet tel templates vclimit angebote bestellungen rechnungen
-    anfragen lieferantenbestellungen einkaufsrechnungen steuernummer ustid duns menustyle);
+    anfragen lieferantenbestellungen einkaufsrechnungen steuernummer co_ustid duns menustyle);

   $main::lxdebug->leave_sub();

Modified: trunk/unstable/bin/mozilla/admin.pl
===================================================================
--- trunk/unstable/bin/mozilla/admin.pl	2006-01-06 00:49:29 UTC (rev 738)
+++ trunk/unstable/bin/mozilla/admin.pl	2006-01-06 01:26:26 UTC (rev 739)
 <at>  <at>  -539,7 +539,7  <at>  <at> 
 	</tr>
         <tr valign=top>
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 6 Jan 2006 00:17
Picon
Favicon
Gravatar

[SVN: lx-office-erp] r737 - trunk/unstable/SL

Author: udo_spallek
Date: 2006-01-06 00:17:36 +0100 (Fri, 06 Jan 2006)
New Revision: 737

Modified:
   trunk/unstable/SL/GL.pm
Log:
BUG 125 solved. (Dank an Hartmut Goebel)

Modified: trunk/unstable/SL/GL.pm
===================================================================
--- trunk/unstable/SL/GL.pm	2006-01-03 17:05:02 UTC (rev 736)
+++ trunk/unstable/SL/GL.pm	2006-01-05 23:17:36 UTC (rev 737)
 <at>  <at>  -342,6 +342,17  <at>  <at> 

   my $false = ($myconfig->{dbdriver} eq 'Pg') ? FALSE: q|'0'|;

+     my $sortorder = join ', ', $form->sort_columns(qw(transdate reference source description accno));
+     my %ordinal = ( transdate => 6,
+                     reference => 4,
+                     source => 7,
+   		  description => 5 );
+     map { $sortorder =~ s/$_/$ordinal{$_}/ } keys %ordinal;
+   
+     if ($form->{sort}) {
+         $sortorder = $form->{sort} . ',' . $sortorder;
+     }
+  
   my $query =
     qq|SELECT g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, t.taxkey AS sorttax,
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 6 Jan 2006 15:13
Picon
Favicon
Gravatar

[SVN: lx-office-erp] r741 - trunk/unstable/SL

Author: sschoeling
Date: 2006-01-06 15:13:45 +0100 (Fri, 06 Jan 2006)
New Revision: 741

Modified:
   trunk/unstable/SL/CA.pm
Log:
Fix fuer Bug 214 und seine Nebenwirkungen
Derselbe Bug tritt auch in Verbindung mit Einkaufsrechnungen auf, und verfaelscht die Bilanz, wenn mit
einer Datumsmaske gesucht wird.

Modified: trunk/unstable/SL/CA.pm
===================================================================
--- trunk/unstable/SL/CA.pm	2006-01-06 02:02:38 UTC (rev 740)
+++ trunk/unstable/SL/CA.pm	2006-01-06 14:13:45 UTC (rev 741)
 <at>  <at>  -234,7 +234,7  <at>  <at> 

 	       UNION

-	          SELECT SUM(ac.sellprice)
+	          SELECT SUM(ac.qty * ac.sellprice)
 		  FROM invoice ac
 		  JOIN ar a ON (ac.trans_id = a.id)
 		  JOIN parts p ON (ac.parts_id = p.id)
 <at>  <at>  -248,7 +248,7  <at>  <at> 

 	       UNION

-	          SELECT SUM(ac.sellprice)
+	          SELECT SUM(ac.qty * ac.sellprice)
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 7 Jan 2006 00:05
Picon
Favicon
Gravatar

[SVN: lx-office-erp] r742 - trunk/unstable/SL

Author: udo_spallek
Date: 2006-01-07 00:05:31 +0100 (Sat, 07 Jan 2006)
New Revision: 742

Modified:
   trunk/unstable/SL/RP.pm
Log:
Solved 179, Nachtrag f?\195?\188r Tabellen im Zahlungsmodul
Spalten Sortierung funktioniert nicht in Tabellen

Modified: trunk/unstable/SL/RP.pm
===================================================================
--- trunk/unstable/SL/RP.pm	2006-01-06 14:13:45 UTC (rev 741)
+++ trunk/unstable/SL/RP.pm	2006-01-06 23:05:31 UTC (rev 742)
 <at>  <at>  -2247,7 +2247,8  <at>  <at> 

   my $sortorder = join ', ',
     $form->sort_columns(qw(name invnumber ordnumber transdate source));
-
+    $sortorder = $form->{sort} if $form->{sort};
+    
   # cycle through each id
   foreach my $accno (split(/ /, $form->{paymentaccounts})) {

-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_idv37&alloc_id865&op=click
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN commit mailer | 6 Jan 2006 01:49
Picon
Favicon
Gravatar

[SVN: lx-office-erp] r738 - trunk/unstable/templates

Author: udo_spallek
Date: 2006-01-06 01:49:29 +0100 (Fri, 06 Jan 2006)
New Revision: 738

Modified:
   trunk/unstable/templates/German-bwa.html
Log:
Try Bug:154

Modified: trunk/unstable/templates/German-bwa.html
===================================================================
--- trunk/unstable/templates/German-bwa.html	2006-01-05 23:17:36 UTC (rev 737)
+++ trunk/unstable/templates/German-bwa.html	2006-01-06 00:49:29 UTC (rev 738)
 <at>  <at>  -173,7 +173,7  <at>  <at> 
 	<td><nobr><%kummgl4%></nobr></td>
 	<td><nobr><%kummgk4%></nobr></td>
 	<td><nobr><%kummpk4%></nobr></td>
-	<td class="right"><nobr><%kummauf4%></nobr></td>
+	<td class="right"><nobr><%kummauf4%></nobr>&nbsp;</td>
 </tr>
 	
 <tr class="white"><td class="left right" colspan="11">&nbsp;</td></tr>
 <at>  <at>  -189,7 +189,7  <at>  <at> 
 	<td><nobr><%kummglrohertrag%></nobr></td>
 	<td><nobr><%kummgkrohertrag%></nobr></td>
 	<td><nobr><%kummpkrohertrag%></nobr></td>
-	<td class="right"><nobr><%kummaufrohertrag%></nobr></td>
+	<td class="right"><nobr><%kummaufrohertrag%></nobr>&nbsp;</td>
 </tr>
(Continue reading)

Permalink | Reply | 0 comments |

Gmane