hg merge release-5.1 (merge release5.1 into default)

Browse Source

...

This commit is contained in:

Carlos Ruiz 2018-03-19 08:27:33 -03:00

parent 6a7637bc42 00ec75b027

commit 476b1283e8

3485 changed files with 1715 additions and 1297 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0

migration/252d-253a/01_FromCompiere252dTo253a.sql → migration-historic/252d-253a/01_FromCompiere252dTo253a.sql

Unescape Escape View File

0

migration/252d-253a/02_migrationDictionary252dTo253a.sql → migration-historic/252d-253a/02_migrationDictionary252dTo253a.sql

Unescape Escape View File

0

migration/252d-253a/readme.txt → migration-historic/252d-253a/readme.txt

Unescape Escape View File

0

migration/253a-253b/migration-newLines.sql → migration-historic/253a-253b/migration-newLines.sql

Unescape Escape View File

0

migration/253a-253b/migration-replace-views.sql → migration-historic/253a-253b/migration-replace-views.sql

Unescape Escape View File

0

migration/253a-253b/migration-structure.sql → migration-historic/253a-253b/migration-structure.sql

Unescape Escape View File

0

migration/253a-253b/migration-updateElements.sql → migration-historic/253a-253b/migration-updateElements.sql

Unescape Escape View File

0

migration/253a-253b/old_migration_missing.sql → migration-historic/253a-253b/old_migration_missing.sql

Unescape Escape View File

0

migration/253a-253b/readme.txt → migration-historic/253a-253b/readme.txt

Unescape Escape View File

0

migration/253b-253b_XE/XE_Migration.sql → migration-historic/253b-253b_XE/XE_Migration.sql

Unescape Escape View File

0

migration/253b-253d/migration-bd-generated.sql → migration-historic/253b-253d/migration-bd-generated.sql

Unescape Escape View File

0

migration/253b-253d/readme.txt → migration-historic/253b-253d/readme.txt

Unescape Escape View File

0

migration/310-311/based_on_scripts/010_update_urls_on_tables_rebranding.sql → migration-historic/310-311/based_on_scripts/010_update_urls_on_tables_rebranding.sql

Unescape Escape View File

0

migration/310-311/based_on_scripts/020_patch_processes_postgresql.sql → migration-historic/310-311/based_on_scripts/020_patch_processes_postgresql.sql

Unescape Escape View File

0

migration/310-311/based_on_scripts/030_update_messages.sql → migration-historic/310-311/based_on_scripts/030_update_messages.sql

Unescape Escape View File

0

migration/310-311/migration-3.1.0-3.1.1.sql → migration-historic/310-311/migration-3.1.0-3.1.1.sql

Unescape Escape View File

0

migration/310-311/readme.txt → migration-historic/310-311/readme.txt

Unescape Escape View File

0

migration/311-312/based_on_scripts/10_update_sys_sequences.sql → migration-historic/311-312/based_on_scripts/10_update_sys_sequences.sql

Unescape Escape View File

0

migration/311-312/based_on_scripts/20_insert_new_messages.sql → migration-historic/311-312/based_on_scripts/20_insert_new_messages.sql

Unescape Escape View File

0

migration/311-312/based_on_scripts/30_create_AD_Pack.sql → migration-historic/311-312/based_on_scripts/30_create_AD_Pack.sql

Unescape Escape View File

0

migration/311-312/based_on_scripts/40_update_ad_system.sql → migration-historic/311-312/based_on_scripts/40_update_ad_system.sql

Unescape Escape View File

0

migration/311-312/based_on_scripts/50_insert_AD_Pack_dict.sql → migration-historic/311-312/based_on_scripts/50_insert_AD_Pack_dict.sql

Unescape Escape View File

0

migration/311-312/migration-311-312.sql → migration-historic/311-312/migration-311-312.sql

Unescape Escape View File

0

migration/311-312/readme.txt → migration-historic/311-312/readme.txt

Unescape Escape View File

0

migration/312-313/001_fix_phaseline_tab_error.sql → migration-historic/312-313/001_fix_phaseline_tab_error.sql

Unescape Escape View File

0

migration/312-313/002_fix_dict_2pack.sql → migration-historic/312-313/002_fix_dict_2pack.sql

Unescape Escape View File

0

migration/312-313/003_add_show_help_process.sql → migration-historic/312-313/003_add_show_help_process.sql

Unescape Escape View File

0

migration/312-313/004_recreate_t_selection.sql → migration-historic/312-313/004_recreate_t_selection.sql

Unescape Escape View File

0

migration/312-313/005_recreate_M_PriceList_Create.sql → migration-historic/312-313/005_recreate_M_PriceList_Create.sql

Unescape Escape View File

0

migration/312-313/006_recreate_M_Product_BOM_Check.sql → migration-historic/312-313/006_recreate_M_Product_BOM_Check.sql

Unescape Escape View File

0

migration/312-313/007_delete_balance_update_isrecreate_para.sql → migration-historic/312-313/007_delete_balance_update_isrecreate_para.sql

Unescape Escape View File

0

migration/312-313/008_rebrand_dictionary.sql → migration-historic/312-313/008_rebrand_dictionary.sql

Unescape Escape View File

0

migration/312-313/009_rebrand_dictionary_es.sql → migration-historic/312-313/009_rebrand_dictionary_es.sql

Unescape Escape View File

0

migration/312-313/010_version313.sql → migration-historic/312-313/010_version313.sql

Unescape Escape View File

0

migration/312-313/011_PAYMENTTERMDUEDAYS.sql → migration-historic/312-313/011_PAYMENTTERMDUEDAYS.sql

Unescape Escape View File

0

migration/312-313/012_fix_typo_entitytype.sql → migration-historic/312-313/012_fix_typo_entitytype.sql

Unescape Escape View File

0

migration/313-314/001_fix_error_ExpenseSummary_message_es.sql → migration-historic/313-314/001_fix_error_ExpenseSummary_message_es.sql

Unescape Escape View File

0

migration/313-314/002_fix_error_Expensesnotreimbursed_window_es.sql → migration-historic/313-314/002_fix_error_Expensesnotreimbursed_window_es.sql

Unescape Escape View File

0

migration/313-314/003_fix_error_message_notif_request_es.sql → migration-historic/313-314/003_fix_error_message_notif_request_es.sql

Unescape Escape View File

0

migration/313-314/004_fix_bad_year_dictionary.sql → migration-historic/313-314/004_fix_bad_year_dictionary.sql

Unescape Escape View File

0

migration/313-314/005_fix_error_message_escalate_request_es.sql → migration-historic/313-314/005_fix_error_message_escalate_request_es.sql

Unescape Escape View File

0

migration/313-314/006_fix_2pack_pk_name.sql → migration-historic/313-314/006_fix_2pack_pk_name.sql

Unescape Escape View File

0

migration/313-314/007_version314.sql → migration-historic/313-314/007_version314.sql

Unescape Escape View File

0

migration/313-314/008_fix_problem_2pack_name_seqno.sql → migration-historic/313-314/008_fix_problem_2pack_name_seqno.sql

Unescape Escape View File

0

migration/313-314/009_insert_gardenworld_2007.sql → migration-historic/313-314/009_insert_gardenworld_2007.sql

Unescape Escape View File

0

migration/313-314/010_add_treebar_menu_to_system.sql → migration-historic/313-314/010_add_treebar_menu_to_system.sql

Unescape Escape View File

0

migration/313-314/011_set_autoperiod_accouting_gardenworld.sql → migration-historic/313-314/011_set_autoperiod_accouting_gardenworld.sql

Unescape Escape View File

0

migration/313-314/012_add_jasper_dictionary.sql → migration-historic/313-314/012_add_jasper_dictionary.sql

Unescape Escape View File

0

migration/313-314/013_increase_defaultvalue_length_processpara.sql → migration-historic/313-314/013_increase_defaultvalue_length_processpara.sql

Unescape Escape View File

0

migration/313-314/014_add_jasper_dictionary_es.sql → migration-historic/313-314/014_add_jasper_dictionary_es.sql

Unescape Escape View File

0

migration/313-314/015_Recreate_M_PriceList_Create.sql → migration-historic/313-314/015_Recreate_M_PriceList_Create.sql

Unescape Escape View File

0

migration/313-314/016_Recreate_C_Currency_Rate.sql → migration-historic/313-314/016_Recreate_C_Currency_Rate.sql

Unescape Escape View File

0

migration/314-315/oracle/001_patch_processes_oracle.sql → migration-historic/314-315/oracle/001_patch_processes_oracle.sql

Unescape Escape View File

0

migration/314-315/oracle/002_add_message_Charset.sql → migration-historic/314-315/oracle/002_add_message_Charset.sql

Unescape Escape View File

0

migration/314-315/oracle/003_add_message_Charset_TRL.sql → migration-historic/314-315/oracle/003_add_message_Charset_TRL.sql

Unescape Escape View File

0

migration/314-315/oracle/004_add_CopyColumnsFromTable.sql → migration-historic/314-315/oracle/004_add_CopyColumnsFromTable.sql

Unescape Escape View File

0

migration/314-315/oracle/005_add_CopyColumnsFromTable_es_MX.sql → migration-historic/314-315/oracle/005_add_CopyColumnsFromTable_es_MX.sql

Unescape Escape View File

0

migration/314-315/oracle/006_update_2pack_classname.sql → migration-historic/314-315/oracle/006_update_2pack_classname.sql

Unescape Escape View File

0

migration/314-315/oracle/007_ProductAttribute.sql → migration-historic/314-315/oracle/007_ProductAttribute.sql

Unescape Escape View File

0

migration/314-315/oracle/008_add_message_Implementation.sql → migration-historic/314-315/oracle/008_add_message_Implementation.sql

Unescape Escape View File

0

migration/314-315/oracle/009_add_StoreAttachmentsOnFilesystem.sql → migration-historic/314-315/oracle/009_add_StoreAttachmentsOnFilesystem.sql

Unescape Escape View File

0

migration/314-315/oracle/010_drop_tire_storage.sql → migration-historic/314-315/oracle/010_drop_tire_storage.sql

Unescape Escape View File

0

migration/314-315/oracle/011_create_ad_sysconfig.sql → migration-historic/314-315/oracle/011_create_ad_sysconfig.sql

Unescape Escape View File

0

migration/314-315/oracle/012_AD_Role_add_allow_info_flags.sql → migration-historic/314-315/oracle/012_AD_Role_add_allow_info_flags.sql

Unescape Escape View File

0

migration/314-315/oracle/013_add_RequestEMailProcessor.sql → migration-historic/314-315/oracle/013_add_RequestEMailProcessor.sql

Unescape Escape View File

0

migration/314-315/oracle/014_add_RequestEMailProcessor_2.sql → migration-historic/314-315/oracle/014_add_RequestEMailProcessor_2.sql

Unescape Escape View File

0

migration/314-315/oracle/015_integrate_jasper_printengine.sql → migration-historic/314-315/oracle/015_integrate_jasper_printengine.sql

Unescape Escape View File

0

migration/314-315/oracle/016_version315.sql → migration-historic/314-315/oracle/016_version315.sql

Unescape Escape View File

0

migration/314-315/oracle/017_fix_typo_entitytype.sql → migration-historic/314-315/oracle/017_fix_typo_entitytype.sql

Unescape Escape View File

0

migration/314-315/oracle/018_incomplete_sequences.sql → migration-historic/314-315/oracle/018_incomplete_sequences.sql

Unescape Escape View File

0

migration/314-315/postgresql/001_add_message_Charset.sql → migration-historic/314-315/postgresql/001_add_message_Charset.sql

Unescape Escape View File

0

migration/314-315/postgresql/002_add_message_Charset_TRL.sql → migration-historic/314-315/postgresql/002_add_message_Charset_TRL.sql

Unescape Escape View File

0

migration/314-315/postgresql/003_add_CopyColumnsFromTable.sql → migration-historic/314-315/postgresql/003_add_CopyColumnsFromTable.sql

Unescape Escape View File

0

migration/314-315/postgresql/004_add_CopyColumnsFromTable_es_MX.sql → migration-historic/314-315/postgresql/004_add_CopyColumnsFromTable_es_MX.sql

Unescape Escape View File

0

migration/314-315/postgresql/005_update_2pack_classname.sql → migration-historic/314-315/postgresql/005_update_2pack_classname.sql

Unescape Escape View File

0

migration/314-315/postgresql/006_add_message_Implementation.sql → migration-historic/314-315/postgresql/006_add_message_Implementation.sql

Unescape Escape View File

0

migration/314-315/postgresql/007_add_StoreAttachmentsOnFilesystem.sql → migration-historic/314-315/postgresql/007_add_StoreAttachmentsOnFilesystem.sql

Unescape Escape View File

0

migration/314-315/postgresql/008_fix_fk_on_delete.sql → migration-historic/314-315/postgresql/008_fix_fk_on_delete.sql

Unescape Escape View File

0

migration/314-315/postgresql/009_drop_tire_storage.sql → migration-historic/314-315/postgresql/009_drop_tire_storage.sql

Unescape Escape View File

0

migration/314-315/postgresql/010_create_ad_sysconfig.sql → migration-historic/314-315/postgresql/010_create_ad_sysconfig.sql

Unescape Escape View File

0

migration/314-315/postgresql/011_AD_Role_add_allow_info_flags.sql → migration-historic/314-315/postgresql/011_AD_Role_add_allow_info_flags.sql

Unescape Escape View File

0

migration/314-315/postgresql/012_add_RequestEMailProcessor.sql → migration-historic/314-315/postgresql/012_add_RequestEMailProcessor.sql

Unescape Escape View File

0

migration/314-315/postgresql/013_add_RequestEMailProcessor_2.sql → migration-historic/314-315/postgresql/013_add_RequestEMailProcessor_2.sql

Unescape Escape View File

0

migration/314-315/postgresql/014_integrate_jasper_printengine.sql → migration-historic/314-315/postgresql/014_integrate_jasper_printengine.sql

Unescape Escape View File

0

migration/314-315/postgresql/015_version315.sql → migration-historic/314-315/postgresql/015_version315.sql

Unescape Escape View File

0

migration/314-315/postgresql/016_fix_typo_entitytype.sql → migration-historic/314-315/postgresql/016_fix_typo_entitytype.sql

Unescape Escape View File

0

migration/314-315/postgresql/017_incomplete_sequences.sql → migration-historic/314-315/postgresql/017_incomplete_sequences.sql

Unescape Escape View File

0

migration/315-316/oracle/001_allow_silent_processes.sql → migration-historic/315-316/oracle/001_allow_silent_processes.sql

Unescape Escape View File

0

migration/315-316/oracle/002_fix_language_key.sql → migration-historic/315-316/oracle/002_fix_language_key.sql

Unescape Escape View File

0

migration/315-316/oracle/003_fix_typo_C_Invoice_InvoiceCollectionType.sql → migration-historic/315-316/oracle/003_fix_typo_C_Invoice_InvoiceCollectionType.sql

Unescape Escape View File

0

migration/315-316/oracle/004_fix_typo_spanish_es_MX.sql → migration-historic/315-316/oracle/004_fix_typo_spanish_es_MX.sql

Unescape Escape View File

0

migration/315-316/oracle/005_fix_INVOICEOPEN.sql → migration-historic/315-316/oracle/005_fix_INVOICEOPEN.sql

Unescape Escape View File

0

migration/315-316/oracle/006_fix_RV_STORAGE.sql → migration-historic/315-316/oracle/006_fix_RV_STORAGE.sql

Unescape Escape View File

0

migration/315-316/oracle/007_fix_size_window_business_partner.sql → migration-historic/315-316/oracle/007_fix_size_window_business_partner.sql

Unescape Escape View File

0

migration/315-316/oracle/008_version316.sql → migration-historic/315-316/oracle/008_version316.sql

Unescape Escape View File

0

migration/315-316/postgresql/001_allow_silent_processes.sql → migration-historic/315-316/postgresql/001_allow_silent_processes.sql

Unescape Escape View File

0

migration/315-316/postgresql/002_fix_language_key.sql → migration-historic/315-316/postgresql/002_fix_language_key.sql

Unescape Escape View File

0

migration/315-316/postgresql/003_fix_typo_C_Invoice_InvoiceCollectionType.sql → migration-historic/315-316/postgresql/003_fix_typo_C_Invoice_InvoiceCollectionType.sql

Unescape Escape View File

0

migration/315-316/postgresql/004_fix_typo_spanish_es_MX.sql → migration-historic/315-316/postgresql/004_fix_typo_spanish_es_MX.sql

Unescape Escape View File

0

migration/315-316/postgresql/006_fix_RV_STORAGE.sql → migration-historic/315-316/postgresql/006_fix_RV_STORAGE.sql

Unescape Escape View File

Some files were not shown because too many files have changed in this diff Show More