headers
SVN author sschoeling | 11 Dec 2007 14:59
Picon
Favicon
Gravatar

r2962 - trunk/unstable/scripts

Author: sschoeling
Date: 2007-12-11 14:59:03 +0100 (Tue, 11 Dec 2007)
New Revision: 2962

Log:
kleines Script zum konvertieren von perl html -> template html

Added:
   trunk/unstable/scripts/pl2tmpl.pl
Added: trunk/unstable/scripts/pl2tmpl.pl
===================================================================
--- trunk/unstable/scripts/pl2tmpl.pl	                        (rev 0)
+++ trunk/unstable/scripts/pl2tmpl.pl	2007-12-11 13:59:03 UTC (rev 2962)
 <at>  <at>  -0,0 +1,15  <at>  <at> 
+#!/usr/local/bin/perl -pli.orig
+
+#
+# perlcode -> template converter
+#
+# there's ugly perl generated html in your xy.pl?
+# no problem. copy&paste it into a separate html file, remove 'qq|' and '|;' and use this script to fix most
of the rest.
+#
+# use: perl pl2tmpl.pl <file>
+#
+# will save the original file as file.orig
+#
+
+s/\$form->\{(?:"([^}]+)"|([^}]+))\}/[% $+ %]/g;
+s/\| \s* \. \s* \$locale->text \( ' ([^)]+) ' \) \s* \. \s* qq\|/<translate>$1<\/translate>/xg;
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN author sschoeling | 11 Dec 2007 15:54
Picon
Favicon
Gravatar

r2963 - in trunk/unstable: bin/mozilla locale/de templates/webpages/ic

Author: sschoeling
Date: 2007-12-11 15:54:58 +0100 (Tue, 11 Dec 2007)
New Revision: 2963

Log:
- form header auf templates ausgelagert, 
- bugfixes. 
- dead code aus pre buchungsgruppen entfernt.


Added:
   trunk/unstable/templates/webpages/ic/form_header_de.html
   trunk/unstable/templates/webpages/ic/form_header_master.html
Modified:
   trunk/unstable/bin/mozilla/ic.pl
   trunk/unstable/locale/de/ic
   trunk/unstable/templates/webpages/ic/choice_de.html
   trunk/unstable/templates/webpages/ic/choice_master.html
Modified: trunk/unstable/bin/mozilla/ic.pl
===================================================================
--- trunk/unstable/bin/mozilla/ic.pl	2007-12-11 13:59:03 UTC (rev 2962)
+++ trunk/unstable/bin/mozilla/ic.pl	2007-12-11 14:54:58 UTC (rev 2963)
 <at>  <at>  -52,6 +52,14  <at>  <at> 
 
 1;
 
+# Parserhappy(R):
+# type=submit $locale->text('Add Part')
+# type=submit $locale->text('Add Service')
+# type=submit $locale->text('Add Assembly')
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN author mbunkus | 12 Dec 2007 17:49
Picon
Favicon
Gravatar

r2964 - trunk/unstable/SL

Author: mbunkus
Date: 2007-12-12 17:49:36 +0100 (Wed, 12 Dec 2007)
New Revision: 2964

Log:
Automatisches Erstellen von Arrays und Hashes in $form bei Verwendung spezieller Namen f?\195?\188r
Formularelemente: name[] kennzeichnet Arrays, name[+] ein neues Arrayelement, name.element
kennzeichnet Hashes.

Modified:
   trunk/unstable/SL/Form.pm
Modified: trunk/unstable/SL/Form.pm
===================================================================
--- trunk/unstable/SL/Form.pm	2007-12-11 14:54:58 UTC (rev 2963)
+++ trunk/unstable/SL/Form.pm	2007-12-12 16:49:36 UTC (rev 2964)
 <at>  <at>  -59,36 +59,71  <at>  <at> 
   }
 }

+sub _store_value {
+  $main::lxdebug->enter_sub(2);
+
+  my $self  = shift;
+  my $key   = shift;
+  my $value = shift;
+
+  my $curr  = $self;
+
+  while ($key =~ /\[\+?\]\.|\./) {
+    substr($key, 0, $+[0]) = '';
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN author mbunkus | 13 Dec 2007 15:17
Picon
Favicon
Gravatar

r2965 - trunk/unstable/SL

Author: mbunkus
Date: 2007-12-13 15:17:35 +0100 (Thu, 13 Dec 2007)
New Revision: 2965

Log:
Eine Hilfsfunktion, die aus Array- und Hashstrukturen in $form eine Liste von Variablennamen und Werten
erzeugt, die dann wieder als versteckte Inputs in HTML-Formularen ausgegeben werden kann. Dabei sind
die Variablennamen strukturiert (so wird z.B. aus "$form->{filter}->[0]->{description}" der Name
"filter[+].description"). Au?\195?\159erdem eine Anpassung von $form->isblank(), die solch
strukturierte Variablennamen versteht.

Modified:
   trunk/unstable/SL/Form.pm
Modified: trunk/unstable/SL/Form.pm
===================================================================
--- trunk/unstable/SL/Form.pm	2007-12-12 16:49:36 UTC (rev 2964)
+++ trunk/unstable/SL/Form.pm	2007-12-13 14:17:35 UTC (rev 2965)
 <at>  <at>  -224,6 +224,58  <at>  <at> 
   return $self;
 }

+sub _flatten_variables_rec {
+  $main::lxdebug->enter_sub(2);
+
+  my $self   = shift;
+  my $curr   = shift;
+  my $prefix = shift;
+  my $key    = shift;
+
+  my  <at> result;
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN author mbunkus | 13 Dec 2007 15:20
Picon
Favicon
Gravatar

r2966 - in trunk/unstable: SL bin/mozilla

Author: mbunkus
Date: 2007-12-13 15:20:30 +0100 (Thu, 13 Dec 2007)
New Revision: 2966

Log:
Unterst?\195?\188tzung f?\195?\188r strukturierte Variablennamen und Hash- und Arraystrukturen in
$form in den mitzuschleifenden Variablen.

Modified:
   trunk/unstable/SL/ReportGenerator.pm
   trunk/unstable/bin/mozilla/reportgenerator.pl
Modified: trunk/unstable/SL/ReportGenerator.pm
===================================================================
--- trunk/unstable/SL/ReportGenerator.pm	2007-12-13 14:17:35 UTC (rev 2965)
+++ trunk/unstable/SL/ReportGenerator.pm	2007-12-13 14:20:30 UTC (rev 2966)
 <at>  <at>  -44,7 +44,7  <at>  <at> 
   };
   $self->{export}   = {
     'nextsub'       => '',
-    'variable_list' => '',
+    'variable_list' => [],
   };

   $self->{data_present} = 0;
 <at>  <at>  -209,7 +209,7  <at>  <at> 

   $self->{export} = {
     'nextsub'       => shift,
-    'variable_list' => join(" ",  <at> _),
+    'variable_list' => [  <at> _ ],
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN author sschoeling | 19 Dec 2007 13:24
Picon
Favicon
Gravatar

r2967 - trunk/unstable/templates/webpages/ic

Author: sschoeling
Date: 2007-12-19 13:24:06 +0100 (Wed, 19 Dec 2007)
New Revision: 2967

Log:
locales

Modified:
   trunk/unstable/templates/webpages/ic/form_header_de.html
Modified: trunk/unstable/templates/webpages/ic/form_header_de.html
===================================================================
--- trunk/unstable/templates/webpages/ic/form_header_de.html	2007-12-13 14:20:30 UTC (rev 2966)
+++ trunk/unstable/templates/webpages/ic/form_header_de.html	2007-12-19 12:24:06 UTC (rev 2967)
 <at>  <at>  -182,7 +182,6  <at>  <at> 
 [%- UNLESS unit_changeable %]
                   <input type="hidden" name="unit" value="[% unit%]">[% unit %]
 [%- ELSE %]
-                 <!-- [% unit_select %] -->
                     [%- INCLUDE generic/multibox.html 
                           name       = 'unit',
                           DATA       = ALL_UNITS,
 <at>  <at>  -269,14 +268,5  <at>  <at> 
 [%- END %]

 <script type="text/javascript">
-       <!--
-       Calendar.setup(
-      {
-      inputField : "priceupdate",
-      ifFormat :"%d.%m.%Y",
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN author hlindemann | 20 Dec 2007 12:37
Picon
Favicon
Gravatar

r2968 - trunk/crm/unstable

Author: hlindemann
Date: 2007-12-20 12:37:28 +0100 (Thu, 20 Dec 2007)
New Revision: 2968

Log:
5. Parameter f?\195?\188r den richtigen Absender der Mail

Modified:
   trunk/crm/unstable/mail.php
Modified: trunk/crm/unstable/mail.php
===================================================================
--- trunk/crm/unstable/mail.php	2007-12-19 12:24:06 UTC (rev 2967)
+++ trunk/crm/unstable/mail.php	2007-12-20 11:37:28 UTC (rev 2968)
 <at>  <at>  -71,7 +71,7  <at>  <at> 
 			$mime = new Mail_Mime("\n");
 			$mail =& Mail::factory("mail");
 			$user=getUserStamm($_SESSION["loginCRM"]);
-			$abs=$user["Name"]." <".$user["eMail"].">";
+			$abs=sprintf("%s <%s>",$user["Name"],$user["eMail"]);
 			$Subject=preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "", $_POST["Subject"]);
 			$headers=array( 
 					"Return-Path"	=> $abs,
 <at>  <at>  -111,6 +111,7  <at>  <at> 
 			
 			$body = $mime->get(array("text_encoding"=>"quoted-printable"));
 			$hdr = $mime->headers($headers);
+			$mail->_params="-f ".$user["eMail"];
 			$rc=$mail->send($to, $hdr, $body);
 			if ($logmail) {
 				$f=fopen("tmp/maillog.txt","a");
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN author sschoeling | 20 Dec 2007 15:04
Picon
Favicon
Gravatar

r2969 - in trunk/unstable: bin/mozilla templates/webpages/login

Author: sschoeling
Date: 2007-12-20 15:04:41 +0100 (Thu, 20 Dec 2007)
New Revision: 2969

Log:
Fehler etwas abgefedert bei falschem/fehlendem Login.

(Wie sieht denn das aus, sofort die nackte Fehlermeldung zu kriegen....)

Modified:
   trunk/unstable/bin/mozilla/login.pl
   trunk/unstable/templates/webpages/login/login_screen_de.html
   trunk/unstable/templates/webpages/login/login_screen_master.html
Modified: trunk/unstable/bin/mozilla/login.pl
===================================================================
--- trunk/unstable/bin/mozilla/login.pl	2007-12-20 11:37:28 UTC (rev 2968)
+++ trunk/unstable/bin/mozilla/login.pl	2007-12-20 14:04:41 UTC (rev 2969)
 <at>  <at>  -64,11 +64,13  <at>  <at> 

 sub login_screen {
   $lxdebug->enter_sub();
+  my ($msg) =  <at> _;

   if (-f "css/lx-office-erp.css") {
     $form->{stylesheet} = "lx-office-erp.css";
   }

+  $form->{msg}   = $msg;
   $form->{fokus} = "loginscreen.login";
   $form->header;
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN author sschoeling | 21 Dec 2007 18:43
Picon
Favicon
Gravatar

r2970 - trunk/unstable/templates/webpages/ic

Author: sschoeling
Date: 2007-12-21 18:43:44 +0100 (Fri, 21 Dec 2007)
New Revision: 2970

Log:
Bugfix: Dateformat fuer javascript Kalender war hardcoded

Modified:
   trunk/unstable/templates/webpages/ic/form_header_de.html
   trunk/unstable/templates/webpages/ic/form_header_master.html
Modified: trunk/unstable/templates/webpages/ic/form_header_de.html
===================================================================
--- trunk/unstable/templates/webpages/ic/form_header_de.html	2007-12-20 14:04:41 UTC (rev 2969)
+++ trunk/unstable/templates/webpages/ic/form_header_de.html	2007-12-21 17:43:44 UTC (rev 2970)
 <at>  <at>  -268,5 +268,5  <at>  <at> 
 [%- END %]

 <script type="text/javascript">
-  <!-- Calendar.setup({ inputField : "priceupdate", ifFormat :"%d.%m.%Y", align : "BL", button :
"trigger1" }); //--> 
+  <!-- Calendar.setup({ inputField : "priceupdate", ifFormat :"[% myconfig_jsc_dateformat %]", align
: "BL", button : "trigger1" }); //--> 
 </script>

Modified: trunk/unstable/templates/webpages/ic/form_header_master.html
===================================================================
--- trunk/unstable/templates/webpages/ic/form_header_master.html	2007-12-20 14:04:41 UTC (rev 2969)
+++ trunk/unstable/templates/webpages/ic/form_header_master.html	2007-12-21 17:43:44 UTC (rev 2970)
 <at>  <at>  -268,5 +268,5  <at>  <at> 
 [%- END %]
(Continue reading)

Permalink | Reply | 0 comments |
headers
SVN author sschoeling | 21 Dec 2007 20:03
Picon
Favicon
Gravatar

r2971 - in trunk/unstable: bin/mozilla locale/de templates/webpages/ct

Author: sschoeling
Date: 2007-12-21 20:03:55 +0100 (Fri, 21 Dec 2007)
New Revision: 2971

Log:
Customer/Vendor add/edit Dialog auf templates umgestellt.


Added:
   trunk/unstable/templates/webpages/ct/form_header_de.html
   trunk/unstable/templates/webpages/ct/form_header_master.html
Modified:
   trunk/unstable/bin/mozilla/ct.pl
   trunk/unstable/locale/de/all
   trunk/unstable/locale/de/ct
Modified: trunk/unstable/bin/mozilla/ct.pl
===================================================================
--- trunk/unstable/bin/mozilla/ct.pl	2007-12-21 17:43:44 UTC (rev 2970)
+++ trunk/unstable/bin/mozilla/ct.pl	2007-12-21 19:03:55 UTC (rev 2971)
 <at>  <at>  -236,573 +236,36  <at>  <at> 
   $lxdebug->enter_sub();
 
   $form->get_lists("employees" => "ALL_SALESMEN",
-                   "taxzones" => "ALL_TAXZONES");
+                   "taxzones"  => "ALL_TAXZONES");
+  $form->get_pricegroup(\%myconfig, { all => 1 });
 
-  $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : "";
-  $form->{creditlimit} =
-    $form->format_amount(\%myconfig, $form->{creditlimit}, 0);
(Continue reading)

Permalink | Reply | 0 comments |

Gmane