Globale Projektnummer in Einkaufs- und Verkaufsbelegen.

diff --git a/SL/OE.pm b/SL/OE.pm
index 210a87c758d743316d79cbfdbe3f2af931cd271b..1967fc05ddae552136b708e09347e78c08dec505 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -437,6 +437,7 @@ Message: $form->{message}\r| if $form->{message};
              payment_id = $form->{payment_id},
              delivery_vendor_id = $form->{delivery_vendor_id},
              delivery_customer_id = $form->{delivery_customer_id},
              payment_id = $form->{payment_id},
              delivery_vendor_id = $form->{delivery_vendor_id},
              delivery_customer_id = $form->{delivery_customer_id},

+              globalproject_id = | . conv_i($form->{"globalproject_id"}, 'NULL') . qq|,

              employee_id = $form->{employee_id},
               cp_id = | . conv_i($form->{cp_id}, 'NULL') . qq|
               WHERE id = $form->{id}|;
              employee_id = $form->{employee_id},
               cp_id = | . conv_i($form->{cp_id}, 'NULL') . qq|
               WHERE id = $form->{id}|;


@@ -670,11 +671,13 @@ sub retrieve {
                o.closed, o.reqdate, o.quonumber, o.department_id, o.cusordnumber,
                d.description AS department, o.payment_id, o.language_id, o.taxzone_id,
                 o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id,
                o.closed, o.reqdate, o.quonumber, o.department_id, o.cusordnumber,
                d.description AS department, o.payment_id, o.language_id, o.taxzone_id,
                 o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id,

+                o.globalproject_id, pr.projectnumber AS globalprojectnumber,

                 o.delivered
                FROM oe o
                JOIN $form->{vc} cv ON (o.$form->{vc}_id = cv.id)
                LEFT JOIN employee e ON (o.employee_id = e.id)
                LEFT JOIN department d ON (o.department_id = d.id)
                 o.delivered
                FROM oe o
                JOIN $form->{vc} cv ON (o.$form->{vc}_id = cv.id)
                LEFT JOIN employee e ON (o.employee_id = e.id)
                LEFT JOIN department d ON (o.department_id = d.id)

+          LEFT JOIN project pr ON (o.globalproject_id = pr.id)

                |
       . ($form->{id}
          ? qq|WHERE o.id = $form->{id}|
                |
       . ($form->{id}
          ? qq|WHERE o.id = $form->{id}|

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 4634cb19d48ffe550a69c89833e23f381c62aa3e..45c0b59abf22966c47cee69f5ddcd027d5008b35 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -531,7 +531,7 @@ sub form_header {
                <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
                 $button2
              </tr>
                <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
                 $button2
              </tr>

-           </table>
+     </table>

          </td>
        </tr>
       </table>
          </td>
        </tr>
       </table>

diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl
index 534a702feffcf03c6e66971267eecb35b469f22c..48cb61027c15c80499c1c462c35f268afa9c20ba 100644 (file)
--- a/bin/mozilla/arap.pl
+++ b/bin/mozilla/arap.pl
@@ -272,26 +272,29 @@ sub add_transaction {
 sub check_project {
   $lxdebug->enter_sub();
 
 sub check_project {
   $lxdebug->enter_sub();
 

-  for $i (1 .. $form->{rowcount}) {
-    $form->{"project_id_$i"} = "" unless $form->{"projectnumber_$i"};
-    if ($form->{"projectnumber_$i"} ne $form->{"oldprojectnumber_$i"}) {
-      if ($form->{"projectnumber_$i"}) {
+  for $i (0 .. $form->{rowcount}) {
+    my $suffix = $i ? "_$i" : "";
+    my $prefix = $i ? "" : "global";
+    $form->{"${prefix}project_id${suffix}"} = "" unless $form->{"${prefix}projectnumber$suffix"};
+    if ($form->{"${prefix}projectnumber${suffix}"} ne $form->{"old${prefix}projectnumber${suffix}"}) {
+      if ($form->{"${prefix}projectnumber${suffix}"}) {

 
         # get new project
 
         # get new project

-        $form->{projectnumber} = $form->{"projectnumber_$i"};
+        $form->{projectnumber} = $form->{"${prefix}projectnumber${suffix}"};

         if (($rows = PE->projects(\%myconfig, $form)) > 1) {
 
           # check form->{project_list} how many there are
           $form->{rownumber} = $i;
         if (($rows = PE->projects(\%myconfig, $form)) > 1) {
 
           # check form->{project_list} how many there are
           $form->{rownumber} = $i;

-          &select_project;
+          &select_project($i ? undef : 1);

           exit;
         }
 
         if ($rows == 1) {
           exit;
         }
 
         if ($rows == 1) {

-          $form->{"project_id_$i"}    = $form->{project_list}->[0]->{id};
-          $form->{"projectnumber_$i"} =
+          $form->{"${prefix}project_id${suffix}"} =
+            $form->{project_list}->[0]->{id};
+          $form->{"${prefix}projectnumber${suffix}"} =

             $form->{project_list}->[0]->{projectnumber};
             $form->{project_list}->[0]->{projectnumber};

-          $form->{"oldprojectnumber_$i"} =
+          $form->{"old${prefix}projectnumber${suffix}"} =

             $form->{project_list}->[0]->{projectnumber};
         } else {
 
             $form->{project_list}->[0]->{projectnumber};
         } else {
 


@@ -299,7 +302,7 @@ sub check_project {
           $form->error($locale->text('Project not on file!'));
         }
       } else {
           $form->error($locale->text('Project not on file!'));
         }
       } else {

-        $form->{"oldprojectnumber_$i"} = "";
+        $form->{"old${prefix}projectnumber${suffix}"} = "";

       }
     }
   }
       }
     }
   }


@@ -310,6 +313,8 @@ sub check_project {
 sub select_project {
   $lxdebug->enter_sub();
 
 sub select_project {
   $lxdebug->enter_sub();
 

+  my ($is_global) = @_;
+

   @column_index = qw(ndx projectnumber description);
 
   $column_data{ndx}           = qq|<th>&nbsp;</th>|;
   @column_index = qw(ndx projectnumber description);
 
   $column_data{ndx}           = qq|<th>&nbsp;</th>|;


@@ -387,7 +392,7 @@ sub select_project {
 |;
 
   # delete action variable
 |;
 
   # delete action variable

-  map { delete $form->{$_} } qw(action project_list header);
+  map { delete $form->{$_} } qw(action project_list header update);

 
   # save all other form variables
   foreach $key (keys %${form}) {
 
   # save all other form variables
   foreach $key (keys %${form}) {


@@ -396,6 +401,7 @@ sub select_project {
   }
 
   print qq|
   }
 
   print qq|

+<input type="hidden" name="is_global" value="$is_global">

 <input type=hidden name=nextsub value=project_selected>
 
 <br>
 <input type=hidden name=nextsub value=project_selected>
 
 <br>


@@ -418,18 +424,21 @@ sub project_selected {
   # index for new item
   $i = $form->{ndx};
 
   # index for new item
   $i = $form->{ndx};
 

-  $form->{"projectnumber_$form->{rownumber}"} =
+  my $prefix = $form->{"is_global"} ? "global" : "";
+  my $suffix = $form->{"is_global"} ? "" : "_$form->{rownumber}";
+
+  $form->{"${prefix}projectnumber${suffix}"} =

     $form->{"new_projectnumber_$i"};
     $form->{"new_projectnumber_$i"};

-  $form->{"oldprojectnumber_$form->{rownumber}"} =
+  $form->{"old${prefix}projectnumber${suffix}"} =

     $form->{"new_projectnumber_$i"};
     $form->{"new_projectnumber_$i"};

-  $form->{"project_id_$form->{rownumber}"} = $form->{"new_id_$i"};
+  $form->{"${prefix}project_id${suffix}"} = $form->{"new_id_$i"};

 
   # delete all the new_ variables
   for $i (1 .. $form->{lastndx}) {
     map { delete $form->{"new_${_}_$i"} } qw(id projectnumber description);
   }
 
 
   # delete all the new_ variables
   for $i (1 .. $form->{lastndx}) {
     map { delete $form->{"new_${_}_$i"} } qw(id projectnumber description);
   }
 

-  map { delete $form->{$_} } qw(ndx lastndx nextsub);
+  map { delete $form->{$_} } qw(ndx lastndx nextsub is_global);

 
   if ($form->{update}) {
     &{ $form->{update} };
 
   if ($form->{update}) {
     &{ $form->{update} };

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 0f9c295a1255dc89fb07bf86d60e7eb734f2e531..1b99f5fb53b8ff45b29141d50d9493624d6924a5 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -455,7 +455,15 @@ sub form_header {
           <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|"></td>
           <td><input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
         </tr>
           <td><input name="quodate" id="quodate" size="11" title="$myconfig{dateformat}" value="| . Q($form->{quodate}) . qq|"></td>
           <td><input type="button" name="b_quodate" id="trigger_quodate" value="?"></td>
         </tr>

-           </table>
+             <tr>
+          <th align="right" nowrap>| . $locale->text('Project Number') . qq|</th>
+          <td>
+            <input name="globalprojectnumber" size="11" value="| . Q($form->{globalprojectnumber}) . qq|">
+            <input type="hidden" name="oldglobalprojectnumber" value="| . Q($form->{globalprojectnumber}) . qq|">
+            <input type="hidden" name="globalproject_id" value="| . Q($form->{globalproject_id}) . qq|">
+          </td:>
+             </tr>
+     </table>

          </td>
        </tr>
       </table>
          </td>
        </tr>
       </table>

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index e29ca4c005c92e6a03d046df12a5521e10c94724..3b298f13d8891c21fa14b93e25fcf246dd3f521d 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -741,6 +741,14 @@ print qq|     <tr>
                <th align=right nowrap>| . $locale->text('Customer Order Number') . qq|</th>
                <td><input name=cusordnumber size=11 value="$form->{cusordnumber}"></td>
              </tr>
                <th align=right nowrap>| . $locale->text('Customer Order Number') . qq|</th>
                <td><input name=cusordnumber size=11 value="$form->{cusordnumber}"></td>
              </tr>

+             <tr>
+          <th align="right" nowrap>| . $locale->text('Project Number') . qq|</th>
+          <td>
+            <input name="globalprojectnumber" size="11" value="| . Q($form->{globalprojectnumber}) . qq|">
+            <input type="hidden" name="oldglobalprojectnumber" value="| . Q($form->{globalprojectnumber}) . qq|">
+            <input type="hidden" name="globalproject_id" value="| . Q($form->{globalproject_id}) . qq|">
+          </td>
+             </tr>

            </table>
           </td>
        </tr>
            </table>
           </td>
        </tr>

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 0d0d8013151aa51f7159b0c38921bb616e510e48..b0e013c023e36b00a7ae723e178e899d022385f7 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -781,6 +781,14 @@ print qq|      </table>
              $openclosed
              $employee
              $ordnumber
              $openclosed
              $employee
              $ordnumber

+             <tr>
+          <th width="70%" align="right" nowrap>| . $locale->text('Project Number') . qq|</th>
+          <td>
+            <input name="globalprojectnumber" size="11" value="| . Q($form->{globalprojectnumber}) . qq|">
+            <input type="hidden" name="oldglobalprojectnumber" value="| . Q($form->{globalprojectnumber}) . qq|">
+            <input type="hidden" name="globalproject_id" value="| . Q($form->{globalproject_id}) . qq|">
+          </td>
+             </tr>

            </table>
          </td>
        </tr>
            </table>
          </td>
        </tr>

diff --git a/locale/de/cn b/locale/de/cn
index 402c50cec0a1be191791243e9bcb9f889fcbd663..3a1fc61325127eb304583fcbc96da39378ee9a18 100644 (file)
--- a/locale/de/cn
+++ b/locale/de/cn
@@ -241,6 +241,7 @@ $self->{subs} = {
   'post'                        => 'post',
   'post_as_new'                 => 'post_as_new',
   'prepare_credit_note'         => 'prepare_credit_note',
   'post'                        => 'post',
   'post_as_new'                 => 'post_as_new',
   'prepare_credit_note'         => 'prepare_credit_note',

+  'preset_projectnumber'        => 'preset_projectnumber',

   'preview'                     => 'preview',
   'print'                       => 'print',
   'print_and_post'              => 'print_and_post',
   'preview'                     => 'preview',
   'print'                       => 'print',
   'print_and_post'              => 'print_and_post',

diff --git a/locale/de/dn b/locale/de/dn
index fe1aa2a9c0c4116151852433fa5088f9a7b9be20..2ac021613d495cae5e7aa57178f0c13d4099f1a7 100644 (file)
--- a/locale/de/dn
+++ b/locale/de/dn
@@ -228,6 +228,7 @@ $self->{subs} = {
   'order'                       => 'order',
   'part_selection_internal'     => 'part_selection_internal',
   'post_as_new'                 => 'post_as_new',
   'order'                       => 'order',
   'part_selection_internal'     => 'part_selection_internal',
   'post_as_new'                 => 'post_as_new',

+  'preset_projectnumber'        => 'preset_projectnumber',

   'print'                       => 'print',
   'print_dunning'               => 'print_dunning',
   'print_form'                  => 'print_form',
   'print'                       => 'print',
   'print_dunning'               => 'print_dunning',
   'print_form'                  => 'print_form',

diff --git a/locale/de/ic b/locale/de/ic
index 3e96773269cb05620a134026716c8774a112a8ae..891b360a5be97df97025c750d428fe0b26493359 100644 (file)
--- a/locale/de/ic
+++ b/locale/de/ic
@@ -279,6 +279,7 @@ $self->{subs} = {
   'parts_language_selection'    => 'parts_language_selection',
   'parts_subtotal'              => 'parts_subtotal',
   'post_as_new'                 => 'post_as_new',
   'parts_language_selection'    => 'parts_language_selection',
   'parts_subtotal'              => 'parts_subtotal',
   'post_as_new'                 => 'post_as_new',

+  'preset_projectnumber'        => 'preset_projectnumber',

   'price_row'                   => 'price_row',
   'print'                       => 'print',
   'print_form'                  => 'print_form',
   'price_row'                   => 'price_row',
   'print'                       => 'print',
   'print_form'                  => 'print_form',

diff --git a/locale/de/io b/locale/de/io
index e8fc49d04fea7484fd04aa6914125f0756183387..66fce08949fe794c07a2e97bada38ec907289d5c 100644 (file)
--- a/locale/de/io
+++ b/locale/de/io
@@ -162,6 +162,7 @@ $self->{subs} = {
   'order'                       => 'order',
   'part_selection_internal'     => 'part_selection_internal',
   'post_as_new'                 => 'post_as_new',
   'order'                       => 'order',
   'part_selection_internal'     => 'part_selection_internal',
   'post_as_new'                 => 'post_as_new',

+  'preset_projectnumber'        => 'preset_projectnumber',

   'print'                       => 'print',
   'print_form'                  => 'print_form',
   'print_options'               => 'print_options',
   'print'                       => 'print',
   'print_form'                  => 'print_form',
   'print_options'               => 'print_options',

diff --git a/locale/de/ir b/locale/de/ir
index 2e14867dd56d257b47d084e97c152f3a81976f4e..a517009926e02fed49e97de62c2baa67ced8f651 100644 (file)
--- a/locale/de/ir
+++ b/locale/de/ir
@@ -236,6 +236,7 @@ $self->{subs} = {
   'post_as_new'                 => 'post_as_new',
   'post_payment'                => 'post_payment',
   'prepare_invoice'             => 'prepare_invoice',
   'post_as_new'                 => 'post_as_new',
   'post_payment'                => 'post_payment',
   'prepare_invoice'             => 'prepare_invoice',

+  'preset_projectnumber'        => 'preset_projectnumber',

   'print'                       => 'print',
   'print_form'                  => 'print_form',
   'print_options'               => 'print_options',
   'print'                       => 'print',
   'print_form'                  => 'print_form',
   'print_options'               => 'print_options',

diff --git a/locale/de/is b/locale/de/is
index cd4ca7f2556e06e845cfe1111e39c575a2550973..df8420f4cbba63b724fa9dce66f7f466d32f970c 100644 (file)
--- a/locale/de/is
+++ b/locale/de/is
@@ -262,6 +262,7 @@ $self->{subs} = {
   'post_as_new'                 => 'post_as_new',
   'post_payment'                => 'post_payment',
   'prepare_invoice'             => 'prepare_invoice',
   'post_as_new'                 => 'post_as_new',
   'post_payment'                => 'post_payment',
   'prepare_invoice'             => 'prepare_invoice',

+  'preset_projectnumber'        => 'preset_projectnumber',

   'preview'                     => 'preview',
   'print'                       => 'print',
   'print_and_post'              => 'print_and_post',
   'preview'                     => 'preview',
   'print'                       => 'print',
   'print_and_post'              => 'print_and_post',

diff --git a/locale/de/oe b/locale/de/oe
index 52db95a52d7e6a993d7d340f394162daac7453eb..beaa440f9602555efa27716c81390038d9131407 100644 (file)
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -279,6 +279,7 @@ $self->{subs} = {
   'poso'                        => 'poso',
   'post_as_new'                 => 'post_as_new',
   'prepare_order'               => 'prepare_order',
   'poso'                        => 'poso',
   'post_as_new'                 => 'post_as_new',
   'prepare_order'               => 'prepare_order',

+  'preset_projectnumber'        => 'preset_projectnumber',

   'print'                       => 'print',
   'print_form'                  => 'print_form',
   'print_options'               => 'print_options',
   'print'                       => 'print',
   'print_form'                  => 'print_form',
   'print_options'               => 'print_options',

diff --git a/sql/Pg-upgrade2/globalprojectnumber_ap_ar_oe.sql b/sql/Pg-upgrade2/globalprojectnumber_ap_ar_oe.sql
new file mode 100644 (file)
index 0000000..932cad4
--- /dev/null
+++ b/sql/Pg-upgrade2/globalprojectnumber_ap_ar_oe.sql
@@ -0,0 +1,9 @@
+-- @tag: globalprojectnumber_ap_ar_oe
+-- @description: Neue Spalte für eine globale Projektnummer in Einkaufs- und Verkaufsbelegen
+-- @depends: release_2_4_1
+ALTER TABLE ap ADD COLUMN globalproject_id integer;
+ALTER TABLE ap ADD FOREIGN KEY (globalproject_id) REFERENCES project (id);
+ALTER TABLE ar ADD COLUMN globalproject_id integer;
+ALTER TABLE ar ADD FOREIGN KEY (globalproject_id) REFERENCES project (id);
+ALTER TABLE oe ADD COLUMN globalproject_id integer;
+ALTER TABLE oe ADD FOREIGN KEY (globalproject_id) REFERENCES project (id);