Merge branch 'master' into dev

[kivitendo-erp.git] / SL / DB / Helper / Mappings.pm

diff --git a/SL/DB/Helper/Mappings.pm b/SL/DB/Helper/Mappings.pm
index 7f281e3..5267449 100644 (file)
--- a/SL/DB/Helper/Mappings.pm
+++ b/SL/DB/Helper/Mappings.pm
@@ -18,7 +18,16 @@ my @lxoffice_blacklist_permanent = qw(
 my @lxoffice_blacklist_temp = qw(
 );
 
-my @lxoffice_blacklist = (@lxoffice_blacklist_permanent, @lxoffice_blacklist_temp);
+# tables created by crm module
+my @crm_blacklist = qw(
+);
+
+# tables created by cash register
+my @cash_register_blacklist = qw(
+ekartikel ekbon ekkunde ektext erptasten
+);
+
+my @lxoffice_blacklist = (@lxoffice_blacklist_permanent, @lxoffice_blacklist_temp, @crm_blacklist, @cash_register_blacklist);
 
 # map table names to their models.
 # unlike rails we have no singular<->plural magic.
@@ -41,10 +50,12 @@ my %lxoffice_package_names = (
   contacts                       => 'contact',
   csv_import_profiles            => 'csv_import_profile',
   csv_import_profile_settings    => 'csv_import_profile_setting',
+  csv_import_reports             => 'csv_import_report',
+  csv_import_report_rows         => 'csv_import_report_row',
+  csv_import_report_status       => 'csv_import_report_status',
   custom_variable_configs        => 'custom_variable_config',
   custom_variables               => 'custom_variable',
   custom_variables_validity      => 'custom_variable_validity',
-  customertax                    => 'customer_tax',
   datev                          => 'datev',
   defaults                       => 'default',
   delivery_orders                => 'delivery_order',
@@ -67,15 +78,12 @@ my %lxoffice_package_names = (
   inventory                      => 'inventory',
   invoice                        => 'invoice_item',
   language                       => 'language',
-  license                        => 'license',
-  licenseinvoice                 => 'license_invoice',
   makemodel                      => 'make_model',
   notes                          => 'note',
   orderitems                     => 'order_item',
   oe                             => 'order',
   parts                          => 'part',
   partsgroup                     => 'parts_group',
-  partstax                       => 'parts_tax',
   payment_terms                  => 'payment_term',
   periodic_invoices              => 'periodic_invoice',
   periodic_invoices_configs      => 'periodic_invoices_config',
@@ -98,7 +106,7 @@ my %lxoffice_package_names = (
   translation_payment_terms      => 'translation_payment_term',
   units                          => 'unit',
   units_language                 => 'units_language',
-  vendortax                      => 'vendor_tax',
+  vendor                         => 'vendor',
 );
 
 my (%lxoffice_tables_to_packages, %lxoffice_tables_to_manager_packages, %lxoffice_packages_to_tables);