0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-03-16 06:13:34 +00:00
salesagility_SuiteCRM/modules/AOS_PDF_Templates
Matt Lorimer 2c48735fbe Merge branch 'hotfix-7.10.x' into hotfix
# Conflicts:
#	README.md
#	composer.lock
#	data/BeanFactory.php
#	files.md5
#	modules/AOD_Index/AOD_Index.php
#	modules/AOR_Conditions/conditionLines.php
#	modules/AOW_Conditions/conditionLines.php
#	modules/Activities/SetAcceptStatus.php
#	modules/Administration/views/view.backups.php
#	modules/Calendar/controller.php
#	modules/Campaigns/WizardCampaignSave.php
#	modules/Contacts/AcceptDecline.php
#	modules/Emails/Compose.php
#	modules/Opportunities/OpportunityFormBase.php
#	modules/Project/chart.php
#	modules/SavedSearch/index.php
#	service/v3_1/SugarWebServiceUtilv3_1.php
#	soap/SoapPortalHelper.php
#	suitecrm_version.php
#	tests/unit/phpunit/data/SugarBeanTest.php
#	tests/unit/phpunit/include/SugarFolders/SugarFolderTest.php
#	tests/unit/phpunit/modules/AOS_Products/AOS_ProductsTest.php
#	themes/SuiteP/css/Dawn/style.css
#	themes/SuiteP/css/Day/style.css
#	themes/SuiteP/css/Dusk/style.css
#	themes/SuiteP/css/Night/style.css
2020-03-30 10:50:29 +01:00
..
Dashlets/AOS_PDF_TemplatesDashlet Replace explicit bean instantiations in files 261 - 270 2020-01-22 13:51:16 +00:00
language Copyright revision 2018-12-31 14:25:24 +00:00
metadata no_trailing_whitespace + no_trailing_whitespace_in_comment 2019-01-25 14:24:15 +00:00
PDF_Lib Replaced alias functions 2019-10-17 13:30:22 +01:00
samples switch_case_semicolon_to_colon + switch_case_space + visibility_required 2019-01-25 14:28:56 +00:00
views Replace explicit bean instantiations in files 261 - 270 2020-01-22 13:51:16 +00:00
AOS_PDF_Templates.js Copyright notice update - Hotfix 2018-08-01 20:14:25 +01:00
AOS_PDF_Templates.php switch_case_semicolon_to_colon + switch_case_space + visibility_required 2019-01-25 14:28:56 +00:00
AOS_PDF_Templates_sugar.php switch_case_semicolon_to_colon + switch_case_space + visibility_required 2019-01-25 14:28:56 +00:00
formLetter.php Cleanup inspections 2019-03-07 10:26:31 +00:00
formLetterPdf.php Replace explicit bean instantiations in files 261 - 270 2020-01-22 13:51:16 +00:00
Forms.php initial commit 2013-09-23 20:30:44 +01:00
generatePdf.php Replace explicit bean instantiations in files 261 - 270 2020-01-22 13:51:16 +00:00
Menu.php single_blank_line_at_eof + single_class_element_per_statement + single_import_per_statement + single_line_after_imports 2019-01-25 14:26:18 +00:00
sendEmail.php Replace explicit bean instantiations in files 261 - 270 2020-01-22 13:51:16 +00:00
templateParser.php Merge remote-tracking branch 'upstream/hotfix-7.10.x' into fix/merge_statechecker 2019-11-19 14:32:37 +00:00
TemplateSampleService.php Add service class to return logo URL 2018-01-10 11:52:04 +00:00
vardefs.php no_trailing_whitespace + no_trailing_whitespace_in_comment 2019-01-25 14:24:15 +00:00