Despues de subir la base de datos con data
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.

 Committer: root <root@croc.mimailserver.com>

 On branch develop
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   config_override.php
	modified:   custom/Extension/application/Ext/Include/MailMergeReports.php
	modified:   custom/Extension/application/Ext/Language/de_de.MailMergeReports.php
	modified:   custom/Extension/application/Ext/Language/en_us.MailMergeReports.php
	modified:   custom/Extension/application/Ext/Language/es_es.MailMergeReports.php
	modified:   custom/Extension/application/Ext/Language/sk_sk.MailMergeReports.php
	modified:   custom/Extension/modules/Administration/Ext/Administration/DHA_DocumentTemplates.php
	modified:   custom/Extension/modules/Contacts/Ext/Language/en_us.gravatar.php
	modified:   custom/Extension/modules/Contacts/Ext/Vardefs/gravatar.php
	modified:   custom/Extension/modules/Leads/Ext/Language/en_us.gravatar.php
	modified:   custom/Extension/modules/Leads/Ext/Vardefs/gravatar.php
	modified:   custom/application/Ext/Language/sk_sk.lang.ext.php
	modified:   custom/blowfish/VaobhaqRznvy.php
	modified:   custom/include/SugarFields/Fields/Image/DetailView.tpl
	modified:   custom/include/SugarFields/Fields/Image/ListView.tpl
	modified:   custom/include/SugarFields/Fields/Image/SugarFieldImage.php
	modified:   custom/modules/AOR_Reports/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/AOR_Reports/logic_hooks.php
	modified:   custom/modules/AOS_Contracts/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/AOS_Contracts/logic_hooks.php
	modified:   custom/modules/AOS_Invoices/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/AOS_Invoices/logic_hooks.php
	modified:   custom/modules/AOS_PDF_Templates/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/AOS_PDF_Templates/logic_hooks.php
	modified:   custom/modules/AOS_Product_Categories/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/AOS_Product_Categories/logic_hooks.php
	modified:   custom/modules/AOS_Products/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/AOS_Products/logic_hooks.php
	modified:   custom/modules/AOS_Products_Quotes/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/AOS_Products_Quotes/logic_hooks.php
	modified:   custom/modules/AOS_Quotes/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/AOS_Quotes/logic_hooks.php
	modified:   custom/modules/Accounts/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/Bugs/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/Bugs/logic_hooks.php
	modified:   custom/modules/Calls/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/Campaigns/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/Campaigns/logic_hooks.php
	modified:   custom/modules/Cases/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/Contacts/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/Contacts/metadata/detailviewdefs.php
	modified:   custom/modules/Contacts/metadata/listviewdefs.php
	modified:   custom/modules/Documents/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/Documents/logic_hooks.php
	modified:   custom/modules/Employees/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/Employees/logic_hooks.php
	modified:   custom/modules/FP_Event_Locations/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/FP_Event_Locations/logic_hooks.php
	modified:   custom/modules/FP_events/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/FP_events/logic_hooks.php
	modified:   custom/modules/Leads/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/Leads/metadata/detailviewdefs.php
	modified:   custom/modules/Leads/metadata/listviewdefs.php
	modified:   custom/modules/Meetings/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/Notes/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/Notes/logic_hooks.php
	modified:   custom/modules/Opportunities/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/Project/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/ProjectTask/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/ProjectTask/logic_hooks.php
	modified:   custom/modules/ProspectLists/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/ProspectLists/logic_hooks.php
	modified:   custom/modules/Prospects/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/SecurityGroups/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/SecurityGroups/logic_hooks.php
	modified:   custom/modules/Tasks/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/Tasks/logic_hooks.php
	modified:   custom/modules/Users/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/jjwg_Address_Cache/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/jjwg_Address_Cache/logic_hooks.php
	modified:   custom/modules/jjwg_Areas/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/jjwg_Areas/logic_hooks.php
	modified:   custom/modules/jjwg_Maps/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/jjwg_Maps/logic_hooks.php
	modified:   custom/modules/jjwg_Markers/DHA_DocumentTemplatesHooks.php
	modified:   custom/modules/jjwg_Markers/logic_hooks.php
	modified:   custom/themes/default/images/CreateDHA_PlantillasDocumentos.png
	modified:   custom/themes/default/images/DHA_PlantillasDocumentos.png
	modified:   custom/themes/default/images/DHA_PlantillasDocumentosVarList.png
	modified:   custom/themes/default/images/docm_image_inline.gif
	modified:   custom/themes/default/images/docx_image_inline.gif
	modified:   custom/themes/default/images/icon_DHA_PlantillasDocumentos.png
	modified:   custom/themes/default/images/icon_DHA_PlantillasDocumentos_32.png
	modified:   custom/themes/default/images/icon_address_16.png
	modified:   custom/themes/default/images/icon_bool_16.png
	modified:   custom/themes/default/images/icon_calculated_16.png
	modified:   custom/themes/default/images/icon_currency_16.png
	modified:   custom/themes/default/images/icon_date_16.png
	modified:   custom/themes/default/images/icon_datetime_16.png
	modified:   custom/themes/default/images/icon_email_16.png
	modified:   custom/themes/default/images/icon_encrypt_16.png
	modified:   custom/themes/default/images/icon_enum_16.png
	modified:   custom/themes/default/images/icon_file_16.png
	modified:   custom/themes/default/images/icon_float_16.png
	modified:   custom/themes/default/images/icon_generic_16.png
	modified:   custom/themes/default/images/icon_html_16.png
	modified:   custom/themes/default/images/icon_id_16.png
	modified:   custom/themes/default/images/icon_iframe_16.png
	modified:   custom/themes/default/images/icon_image_16.png
	modified:   custom/themes/default/images/icon_int_16.png
	modified:   custom/themes/default/images/icon_multienum_16.png
	modified:   custom/themes/default/images/icon_parent_type_16.png
	modified:   custom/themes/default/images/icon_phone_16.png
	modified:   custom/themes/default/images/icon_radioenum_16.png
	modified:   custom/themes/default/images/icon_relate_16.png
	modified:   custom/themes/default/images/icon_text_16.png
	modified:   custom/themes/default/images/icon_time_16.png
	modified:   custom/themes/default/images/icon_url_16.png
	modified:   custom/themes/default/images/icon_varchar_16.png
	modified:   custom/themes/default/images/odt_image_inline.gif
	modified:   custom/themes/default/images/pdf_image_inline.gif
	modified:   custom/themes/default/images/toggle-expand.png
	modified:   custom/themes/default/images/toggle-shrink.png
	modified:   document_templates/bf6f8534-d34a-0a86-8602-52a6ec1ff1a1.docx
	modified:   document_templates/bfd8014d-aed3-9479-fd56-52a6ec750fef.odt
	modified:   modules/DHA_PlantillasDocumentos/DHA_PlantillasDocumentos.php
	modified:   modules/DHA_PlantillasDocumentos/DHA_PlantillasDocumentos_sugar.php
	modified:   modules/DHA_PlantillasDocumentos/Generate_Document.php
	modified:   modules/DHA_PlantillasDocumentos/MassGenerateDocument.js
	modified:   modules/DHA_PlantillasDocumentos/MassGenerateDocument.php
	modified:   modules/DHA_PlantillasDocumentos/Menu.php
	modified:   modules/DHA_PlantillasDocumentos/README.txt
	modified:   modules/DHA_PlantillasDocumentos/UI_Hooks.php
	modified:   modules/DHA_PlantillasDocumentos/controller.php
	modified:   modules/DHA_PlantillasDocumentos/download_template.php
	modified:   modules/DHA_PlantillasDocumentos/examples/Opportunities.docx
	modified:   modules/DHA_PlantillasDocumentos/examples/Opportunities.odt
	modified:   modules/DHA_PlantillasDocumentos/lang_format_config.php
	modified:   modules/DHA_PlantillasDocumentos/language/de_de.lang.php
	modified:   modules/DHA_PlantillasDocumentos/language/en_us.lang.php
	modified:   modules/DHA_PlantillasDocumentos/language/es_es.lang.php
	modified:   modules/DHA_PlantillasDocumentos/language/sk_sk.lang.php
	modified:   modules/DHA_PlantillasDocumentos/librerias/OpenTBS/tbs_plugin_opentbs.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/OpenTBS/tbs_plugin_opentbs.php
	modified:   modules/DHA_PlantillasDocumentos/librerias/OpenTBS/xml_synopsis.txt
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/LEEME.txt
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/addons/pager/jquery.tablesorter.pager.css
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/addons/pager/jquery.tablesorter.pager.js
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/build.xml
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/build/ParseMaster.js
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/build/js.jar
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/build/jsmin.js
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/build/min.js
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/build/pack.js
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/build/packer.js
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/build/writeFile.js
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/assets/ajax-content.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/css/jq.css
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-ajax.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-empty-table.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-extending-defaults.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-meta-headers.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-meta-parsers.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-meta-sort-list.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-option-debug.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-option-digits.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-option-sort-force.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-option-sort-key.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-option-sort-list.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-option-sort-order.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-option-text-extraction.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-options-headers.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-pager.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-parsers.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-trigger-sort.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-triggers.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-update-cell.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/example-widgets.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/img/external.png
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/index.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/js/docs.js
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/docs/js/examples.js
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/jquery-latest.js
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/jquery.metadata.js
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/jquery.tablesorter.js
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/jquery.tablesorter.min.js
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/tests/assets/ajax-content.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/tests/cell.metadata.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/tests/checkbox.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/tests/colspan.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/tests/demo.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/tests/index.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/tests/large.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/tests/lockedOrder.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/tests/metadata.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/tests/multiple-headers.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/tests/pager.html
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/themes/blue/asc.gif
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/themes/blue/bg.gif
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/themes/blue/desc.gif
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/themes/blue/style.css
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/themes/green/asc.png
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/themes/green/bg.png
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/themes/green/desc.png
	modified:   modules/DHA_PlantillasDocumentos/librerias/TableSorter/themes/green/style.css
	modified:   modules/DHA_PlantillasDocumentos/librerias/TinyButStrong/plugins/plugins_help.htm
	modified:   modules/DHA_PlantillasDocumentos/librerias/TinyButStrong/plugins/tbs_plugin_bypage.php
	modified:   modules/DHA_PlantillasDocumentos/librerias/TinyButStrong/plugins/tbs_plugin_cache.php
	modified:   modules/DHA_PlantillasDocumentos/librerias/TinyButStrong/plugins/tbs_plugin_html.php
	modified:   modules/DHA_PlantillasDocumentos/librerias/TinyButStrong/plugins/tbs_plugin_mergeonfly.php
	modified:   modules/DHA_PlantillasDocumentos/librerias/TinyButStrong/plugins/tbs_plugin_navbar.php
	modified:   modules/DHA_PlantillasDocumentos/librerias/TinyButStrong/plugins/tbs_plugin_syntaxes.php
	modified:   modules/DHA_PlantillasDocumentos/librerias/TinyButStrong/tbs_class.php
	modified:   modules/DHA_PlantillasDocumentos/librerias/TinyButStrong/tbs_us_manual.htm
	modified:   modules/DHA_PlantillasDocumentos/librerias/dharma_utils.php
	modified:   modules/DHA_PlantillasDocumentos/librerias/jQuery/LEEME.txt
	modified:   modules/DHA_PlantillasDocumentos/librerias/jQuery/jquery.min.js
	modified:   modules/DHA_PlantillasDocumentos/metadata/SearchFields.php
	modified:   modules/DHA_PlantillasDocumentos/metadata/dashletviewdefs.php
	modified:   modules/DHA_PlantillasDocumentos/metadata/detailviewdefs.php
	modified:   modules/DHA_PlantillasDocumentos/metadata/editviewdefs.php
	modified:   modules/DHA_PlantillasDocumentos/metadata/listviewdefs.php
	modified:   modules/DHA_PlantillasDocumentos/metadata/metafiles.php
	modified:   modules/DHA_PlantillasDocumentos/metadata/popupdefs.php
	modified:   modules/DHA_PlantillasDocumentos/metadata/quickcreatedefs.php
	modified:   modules/DHA_PlantillasDocumentos/metadata/searchdefs.php
	modified:   modules/DHA_PlantillasDocumentos/metadata/studio.php
	modified:   modules/DHA_PlantillasDocumentos/metadata/subpanels/default.php
	modified:   modules/DHA_PlantillasDocumentos/plantilla_basica.docm
	modified:   modules/DHA_PlantillasDocumentos/plantilla_basica.docx
	modified:   modules/DHA_PlantillasDocumentos/plantilla_basica.odt
	modified:   modules/DHA_PlantillasDocumentos/vardefs.php
	modified:   modules/DHA_PlantillasDocumentos/views/view.config.php
	modified:   modules/DHA_PlantillasDocumentos/views/view.config.tpl
	modified:   modules/DHA_PlantillasDocumentos/views/view.detail.php
	modified:   modules/DHA_PlantillasDocumentos/views/view.edit.php
	modified:   modules/DHA_PlantillasDocumentos/views/view.varlist.js
	modified:   modules/DHA_PlantillasDocumentos/views/view.varlist.php

 Changed but not updated:
   (use "git add <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   themes/BMyA2
Merge branch 'develop' of bitbucket.org:hdblanco/suitecrmcl into develop