Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp

Conflicts:

	bin/mozilla/ic.pl

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index a6d5cdc5c1073cfbf6c21b9e956e7101fe66fa8d..fba5ba1b6c71453e3e62a5596ba115d9a0dad6f2 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -1292,7 +1292,7 @@ sub ap_transactions {
     'duedate'                 => { 'text' => $locale->text('Due Date'), },
     'transaction_description' => { 'text' => $locale->text('Transaction description'), },
     'notes'                   => { 'text' => $locale->text('Notes'), },
-    'employee'                => { 'text' => $locale->text('Salesperson'), },
+    'employee'                => { 'text' => $locale->text('Employee'), },
     'globalprojectnumber'     => { 'text' => $locale->text('Project Number'), },
     'vendornumber'            => { 'text' => $locale->text('Vendor Number'), },
     'country'                 => { 'text' => $locale->text('Country'), },

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 63ee667faa53826a6ad29ab64dea54762e408c30..692a4595ac700a1082179a7f1178c54f5277432d 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -477,7 +477,7 @@ sub orders {
     'donumber'                => { 'text' => $locale->text('Delivery Order'), },
     'ordnumber'               => { 'text' => $locale->text('Order'), },
     'name'                    => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
-    'employee'                => { 'text' => $locale->text('Salesperson'), },
+    'employee'                => { 'text' => $locale->text('Employee'), },
     'shipvia'                 => { 'text' => $locale->text('Ship via'), },
     'globalprojectnumber'     => { 'text' => $locale->text('Project Number'), },
     'transaction_description' => { 'text' => $locale->text('Transaction description'), },

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 4b0e9e34f7ff7ca6da48ab59fa5bbac9defbf746..ebdaba52f894cb45900ae10184a63d5e951aac00 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1123,6 +1123,7 @@ sub generate_report {
     drawing       => $locale->text('Drawing')          . ": '$form->{drawing}'",
     microfiche    => $locale->text('Microfiche')       . ": '$form->{microfiche}'",
     l_soldtotal   => $locale->text('soldtotal'),
+    ean           => $locale->text('EAN')              . ": '$form->{ean}'",
   );
 
   my @itemstatus_keys = qw(active obsolete orphaned onhand short);
@@ -1191,7 +1192,7 @@ sub generate_report {
     partnumber description partsgroup bin onhand rop unit listprice
     linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost
     priceupdate weight image drawing microfiche invnumber ordnumber quonumber
-    transdate name serialnumber soldtotal deliverydate
+    transdate name serialnumber soldtotal deliverydate ean
   );
 
   my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
@@ -1201,8 +1202,7 @@ sub generate_report {
   push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables;
 
   %column_defs = (%column_defs,%column_defs_cvars); # nochmal die cvars als überschrift hinzufügen
-
-  map { $column_defs{$_}->{visible} = $form->{"l_$_"} ? 1 : 0 } @columns;
+    map { $column_defs{$_}->{visible} = $form->{"l_$_"} ? 1 : 0 } @columns;
   map { $column_defs{$_}->{align}   = 'right' } qw(onhand sellprice listprice lastcost linetotalsellprice linetotallastcost linetotallistprice rop weight soldtotal);
 
   my @hidden_variables = (qw(l_subtotal l_linetotal searchitems itemstatus bom), @itemstatus_keys, @callback_keys, @searchable_custom_variables, map { "l_$_" } @columns);

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 90fdcc2db0a8c81b5002cb3f98d700d64500c228..cabb133d6df66910da38aba896c7cce315409e8e 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1881,7 +1881,7 @@ sub ship_to {
 
 
   # delete shipto
-  map({ delete $form->{$_} } (@shipto_vars, qw(header)));
+  map({ delete $form->{$_} } (@shipto_vars, qw(header shipto_id)));
   $form->{title} = $title;
 
   foreach my $key (keys %$form) {

diff --git a/js/jquery.checkall.js b/js/jquery.checkall.js
new file mode 100644 (file)
index 0000000..4b53049
--- /dev/null
+++ b/js/jquery.checkall.js
@@ -0,0 +1,20 @@
+/*
+ * jQuery SelectAll plugin 1.1
+ *
+ * Copyright (c) 2009 Sven Schöling
+ */
+
+;(function($) {
+
+$.fn.extend({
+  checkall: function(target) {
+    var saved_this = this;
+    return $(this).click(function() {
+      $(target).each(function() {
+        $(this).attr('checked', $(saved_this).attr('checked'));
+      });
+    });
+  }
+});
+
+})(jQuery);

diff --git a/locale/de/ap b/locale/de/ap
index cee83d0f0277fa4e02ce7738460c80621404b77f..ad9a1bd4a9b50d1af248dc8e9f571b0db12ec506 100644 (file)
--- a/locale/de/ap
+++ b/locale/de/ap
@@ -104,6 +104,7 @@ $self->{texts} = {
   'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Edit Accounts Payables Transaction' => 'Kreditorenbuchung bearbeiten',
+  'Employee'                    => 'Bearbeiter',
   'Enter longdescription'       => 'Langtext eingeben',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',
   'Exch'                        => 'Wechselkurs.',
@@ -206,7 +207,6 @@ $self->{texts} = {
   'Sales Invoice'               => 'Rechnung',
   'Sales Order'                 => 'Kundenauftrag',
   'Sales quotation'             => 'Angebot',
-  'Salesperson'                 => 'Verkäufer',
   'Save draft'                  => 'Entwurf speichern',
   'Select a Customer'           => 'Endkunde auswählen',
   'Select a customer'           => 'Einen Kunden auswählen',

diff --git a/locale/de/do b/locale/de/do
index eef7703dfe6ea8e3a6fc18719c14d7dfb477c40d..6ac7e92b3d0a329bd4656a3fde6121ecaed2fc55 100644 (file)
--- a/locale/de/do
+++ b/locale/de/do
@@ -108,6 +108,7 @@ $self->{texts} = {
   'ELSE'                        => 'Zusatz',
   'Edit Purchase Delivery Order' => 'Lieferschein (Einkauf) bearbeiten',
   'Edit Sales Delivery Order'   => 'Lieferschein (Verkauf) bearbeiten',
+  'Employee'                    => 'Bearbeiter',
   'Enter longdescription'       => 'Langtext eingeben',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',
   'Error in position #1: You must either assign no stock at all or the full quantity of #2 #3.' => 'Fehler in Position #1: Sie müssen einer Position entweder gar keinen Lagereingang oder die vollständige im Lieferschein vermerkte Menge von #2 #3 zuweisen.',
@@ -228,7 +229,6 @@ $self->{texts} = {
   'Sales Invoice'               => 'Rechnung',
   'Sales Order'                 => 'Kundenauftrag',
   'Sales quotation'             => 'Angebot',
-  'Salesperson'                 => 'Verkäufer',
   'Screen'                      => 'Bildschirm',
   'Select a Customer'           => 'Endkunde auswählen',
   'Select a customer'           => 'Einen Kunden auswählen',

diff --git a/templates/webpages/ic/search_de.html b/templates/webpages/ic/search_de.html
index 543993450e3163f94c1bfee90eb1c4c6f97e08de..475163808b043aa856bb62c84b2819e9b4e34a6b 100644 (file)
--- a/templates/webpages/ic/search_de.html
+++ b/templates/webpages/ic/search_de.html
@@ -254,6 +254,8 @@
            <label for="l_soldtotal">Verkaufte Anzahl</label>
           </td>
           <td>
+           <input name="l_ean" id="l_ean" class="checkbox" type="checkbox" value="Y">
+           <label for="l_ean">EAN</label>
           </td>
          </tr>
 

diff --git a/templates/webpages/ic/search_master.html b/templates/webpages/ic/search_master.html
index 1aa7cca2c8434734008e8b5be193b909c7c1cf18..52d3a7b132dd40fe3eb478f30d886f7328b19665 100644 (file)
--- a/templates/webpages/ic/search_master.html
+++ b/templates/webpages/ic/search_master.html
@@ -254,6 +254,8 @@
            <label for="l_soldtotal"><translate>soldtotal</translate></label>
           </td>
           <td>
+           <input name="l_ean" id="l_ean" class="checkbox" type="checkbox" value="Y">
+           <label for="l_ean"><translate>EAN</translate></label>
           </td>
          </tr>