Merging latest changes from stable branch up to 2.3.24

[fa-stable.git] / sql / alter2.4.php

diff --git a/sql/alter2.4.php b/sql/alter2.4.php
index 7fc60b38716106f89dd2fbcb08948fde3e0db8a8..768da67b0b523b5c4e289ff3c08ab731c5845eab 100644 (file)
--- a/sql/alter2.4.php
+++ b/sql/alter2.4.php
@@ -249,9 +249,11 @@ class fa2_4 extends fa_patch {
                //remove obsolete and temporary columns.
                // this have to be done here as db_import rearranges alter query order
                $dropcol = array(
+                               'tax_groups' => array('tax_shipping'),
                                'tax_group_items' => array('rate'),
                                'budget_trans' => array('type', 'type_no', 'person_id', 'person_type_id', 'memo_'),
                                'cust_branch' => array('contact_name', 'disable_trans'),
+                               'stock_moves' => array('discount_percent', 'visible', 'person_id'),
                );
 
                foreach($dropcol as $table => $columns)