0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-03-16 06:13:34 +00:00
Commit graph

240 commits

Author SHA1 Message Date
Dillon-Brown
3762853fa6 Merge branch 'hotfix' into issue-4040 2017-09-06 08:11:26 +01:00
Matt Lorimer
720f4384a7 Merge branch 'hotfix-7.8.x' into hotfix
# Conflicts:
#	README.md
#	data/SugarBean.php
#	include/InlineEditing/InlineEditing.php
#	include/ListView/ListViewDisplay.php
#	include/MVC/Controller/SugarController.php
#	include/SugarFields/Fields/Html/DetailView.tpl
#	include/SugarFields/Fields/Html/SugarFieldHtml.php
#	include/clean.php
#	include/generic/DeleteRelationship.php
#	include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButton.php
#	include/language/en_us.lang.php
#	include/utils.php
#	install.php
#	install/installSystemCheck.php
#	install/language/en_us.lang.php
#	install/old_php.js
#	install/welcome.php
#	modules/Employees/Employee.php
#	modules/FP_events/language/en_us.lang.php
#	modules/Home/controller.php
#	modules/UpgradeWizard/language/en_us.lang.php
#	modules/UpgradeWizard/preflight.php
#	modules/UpgradeWizard/uw_utils.php
#	modules/Users/views/view.detail.php
#	php_version.php
#	suitecrm_version.php
#	tests/testinstall.php
2017-09-05 12:42:13 +01:00
Dillon Brown
af3f8a8b7e Fixed - Language files - PR for code re-format only 2017-08-28 13:18:10 +01:00
Dillon Brown
d2e7de409f Improved clean html for sugar fields (7.8.x ver of PR by daniel-samson ) 2017-08-18 20:44:48 +01:00
Dillon-Brown
762367e162 Fixed - Unused language strings - Part 2 (AOS_PDF_Templates) 2017-07-23 17:02:47 +00:00
Ashley Nicolson
50c5b6c774 Merge pull request from Dillon-Brown/combined_language_file_update_1
Combined copyright revision
2017-07-13 17:22:29 +01:00
Dillon-Brown
4b48d4b394 Merge branch 'hotfix' into combined_language_file_update_1 2017-07-13 13:07:21 +01:00
Daniel Samson
8880f85813 Change description field type to html 2017-07-07 08:35:03 +01:00
Daniel Samson
50aff8d159 Fixing hidden field in redirection 2017-06-21 16:07:10 +01:00
Daniel Samson
6c3e8f37ef Fixed - Leftover call to Emails/index.php in v7.9, breaks "Email Quotation" feature 2017-06-19 17:17:40 +01:00
Daniel Samson
dd78752e1b Refactored AOS_QuotesViewDetail to show popup using a smarty template 2017-06-19 16:24:19 +01:00
Ashley Nicolson
66d8cc84d7 Merge pull request from Dillon-Brown/issue-3578
Fixed  - Letter to PDF [Language]
2017-05-30 11:25:52 +01:00
Dillon Brown
736caf6838 Code reformat 2017-05-29 10:40:11 +01:00
Dillon Brown
d745834e26 Fixed - Letter to PDF [Language] 2017-05-25 09:23:34 +01:00
Ashley Nicolson
be7554c460 Merge branch 'hotfix' into develop
Conflicts:
	README.md
	modules/InboundEmail/language/en_us.lang.php
2017-05-24 11:43:47 +01:00
Ashley Nicolson
e58f1a1444 Merge pull request from sgaved/issue2153
Fixed  -Images in PDFs not showing
2017-05-16 11:50:48 +01:00
Dillon Brown
5f72b67719 Updated Liscence and entry points 2017-05-08 15:02:14 +01:00
Gyula Madarasz
dd8cbce7c4 fix insert value into email template 2017-04-21 17:01:40 +01:00
Ashley Nicolson
e316a0259d Merge pull request from sgaved/patch-18
Add ability to choose page size and orientation in pdf templates
2017-04-05 18:08:55 +01:00
Ashley Nicolson
b92d58d945 Merge pull request from sgaved/patch-12
 order templates alphabetically
2017-04-05 17:53:26 +01:00
Dillon Brown
7cb3bdf03b $field_def returned null, amended to use existing fieldName 2017-03-29 14:37:15 +01:00
Ashley Nicolson
67a9da259e Merge pull request from GeorgeWL/patch-1
Fix for Missing Header
2017-03-25 18:26:28 +00:00
sgaved
a70d66a44e Fix for key instead of value 2017-02-13 11:03:05 +00:00
George W Langham
637676bd32 Fix for Missing Header
On some browsers, if the header is not generated first then it doesn't appear on the first page.

To fix this, the order of the generation is changed.
2017-01-12 13:42:19 +00:00
Matt Lorimer
4b435cf0fb Merge remote-tracking branch 'origin/feature/filtersearch' into develop
# Conflicts:
#	modules/AOP_Case_Updates/Case_Updates.php
#	themes/SuiteP/js/style.js
2016-12-30 19:41:06 +01:00
Simeon Gaved
d1279cad9c Fixed 2153 -Images in PDFs not showing 2016-12-21 11:10:04 +00:00
Ashley Nicolson
6f52729851 Merge branch 'scrm-36-staging' of https://github.com/daniel-samson/SuiteCRM into daniel-samson-scrm-36-staging
Conflicts:
	themes/SuiteP/css/style.css
2016-12-01 12:51:47 +00:00
Daniel Samson
ce38910cad Cleaning up list view
(cherry picked from commit a2e899e)
2016-12-01 10:03:54 +00:00
Jerzy Brzezinski
9b44869c6f fixed - return: true/false instead of 1/0 2016-11-22 15:42:47 +00:00
Uladzimir Barysiuk
9e598caf33 Fixed - changed line 63 to make sure that it applies special formatting if the type of $field_def is dynamicenum 2016-11-15 15:16:59 +00:00
Ashley Nicolson
80c8b9eccf Addressed the public folder (since htaccess won't allow access to upload folder) and provided the height and width sizes. 2016-11-14 23:58:19 +00:00
Uladzimir Barysiuk
d27704f20f Fixed - added image generating link to the template parser. 2016-09-26 09:38:35 +01:00
sgaved
9f63bb3b0d Update detailviewdefs.php 2016-09-21 15:15:23 +01:00
sgaved
b5b6aaf10d Update editviewdefs.php 2016-09-21 15:14:43 +01:00
sgaved
a297b91e00 Update en_us.lang.php 2016-09-21 15:14:05 +01:00
sgaved
bb7cd8221b Update generatePdf.php 2016-09-21 15:13:12 +01:00
sgaved
9519c5da27 Update vardefs.php 2016-09-21 15:09:55 +01:00
sgaved
d09ca3f975 Fix - MultiSelect field issue in PDF 2016-09-21 11:45:20 +01:00
Matt Lorimer
093e3b221a Revert Invalid Fix
Cannot change product_qty  to integer
2016-09-05 21:33:53 +02:00
Jerzy Brzezinski
27dbd6b595 Fixed Conversion of Quotes to PDF not show 0 in right side. 2016-08-25 13:52:31 +01:00
Ashley Nicolson
2c67548e38 Merge conflicts for daniel-samson 2016-08-08 12:05:48 +01:00
Matt Lorimer
a24d2df66c update generatePdf to use BeanFactory 2016-07-03 16:03:04 +01:00
Matt Lorimer
ce5a2b9eb9 Fixed , Fixed - Favorites search does not work with SQL Server 2016-06-01 22:52:08 +01:00
Matt Lorimer
2d0ade25ba Merge branch 'hotfix-7.5.x' into hotfix 2016-05-12 22:01:16 +02:00
Matt Lorimer
47ebefcd36 Fixed Favorites search does not work with SQL Server 2016-05-12 22:00:28 +02:00
gymad
72c27f1bcb Fixed - 7.6 upgrade __construct incompatible with legacy custom modules and customisations - write back the old styled constructors to changed files in 7.6 automatically, constructor arguments and deprecated phpdoc and log message added 2016-04-29 15:12:28 +01:00
gymad
627cd239fa merge hotfix and resolve a conflict 2016-04-27 12:04:24 +01:00
gyula
0d89e37d72 Fixed - Blank white screen when trying to generate pdf 2016-04-22 10:58:17 +01:00
Matt Lorimer
851ee82045 Merge branch 'hotfix' into develop
# Conflicts:
#	modules/Relationships/RelationshipHandler.php
2016-04-18 18:55:53 +02:00
Matt Lorimer
d285e94e2c php 7 compatibility - variable Interpolation issues 2016-04-14 15:19:39 +02:00
Matt Lorimer
51b2beb6d2 Merge branch 'hotfix' into develop 2016-04-06 21:41:15 +01:00
Matt Lorimer
83b3696ee2 Merge Php7 - all tests are passing 2016-04-06 21:38:58 +01:00
Jim Mackin
a66c3e2d98 Merge pull request from tfreier/hotfix
Avoid creating img tag if there is no product image
2016-04-05 15:21:47 +01:00
jakabadambalazs
a5acea6133 applied php7fix patch 2016-03-24 10:22:58 +01:00
Till Freier
d86a60b143 avoid creating img tag if there is no product image 2016-03-22 11:33:37 -07:00
Graeme McLaren
0d066041e6 Fixed : Modified search and replace arrays 2016-03-17 17:46:57 +00:00
Matthew
75d51751df moving extension modules to core 2016-01-17 23:15:06 +00:00
Matthew
d0c4910bfb Merge branch 'develop' into nmcustom
Conflicts:
	include/generic/SugarWidgets/SugarWidgetSubPanelDelegatesSelectButton.php
	modules/jjwg_Maps/language/es_es.lang.php
2016-01-17 15:10:25 +00:00
Matthew
4c9ecacca6 remove es_es lang from default 2016-01-17 15:08:26 +00:00
Horus68
633f3e0c7e Delete ru.php 2015-12-21 14:41:56 +00:00
Horus68
4629311de0 Delete fr_fr.lang.php 2015-12-21 14:41:23 +00:00
sgaved
52bbad468f order templates alphabetically
Orders templates alphabetically as suggested in enchancement 
2015-11-26 16:47:15 +00:00
Matthew
9e412507e0 Removed redundant legacy language files 2015-11-18 14:40:10 +00:00
Daniel Samson
fa61d8e47b The parse_template_bean only checks for enum and multi-enum. Adding check for radio enum. 2015-11-13 17:51:25 +00:00
Matthew
7dae6d8db3 Merge branch 'hotfix-7.3.2' into develop
Conflicts:
	suitecrm_version.php
2015-10-30 14:13:59 +00:00
Matt Lorimer
fcb82e26c5 Merge pull request from sgaved/patch-8
Update generatePdf.php to avoid blank pages
2015-10-21 21:52:52 +02:00
Uladzimir Barysiuk
829d680191 Fix for issue 2015-10-15 08:16:44 +01:00
sgaved
ced4fae628 Update generatePdf.php to avoid blank pages
Tinymce places <p> tags around page breaks which can cause blank pages when generating a pdf
2015-09-29 15:19:20 +01:00
Lewis Jessett
7a8cbd81dd Added all of the favorites code. 2015-09-08 15:25:52 +01:00
sgaved
bdc4d6f5ec Fix for
Fix for  Chinese Characters not displaying in pdf
2015-07-10 15:47:03 +01:00
Matthew
403088c0da Merge branch 'hotfix-7.1.6' into hotfix-7.2.1
Conflicts:
	modules/Calendar/Cal.js
2015-03-10 17:01:52 +00:00
Matthew
210b57eb69 Fixed MsSQL compatibility issues 2015-03-10 17:01:21 +00:00
JanSiero
74777f27a1 PHP 5.4 Compatibility: rewrite preg_replace e-modifier 2014-08-29 19:53:39 +02:00
Matthew
67563a002b Fixed Contracts print pdf missing 2014-07-03 16:01:04 +01:00
Matthew
007737af62 Fixed Issue where line items would generate incorrectly in the pdf when only one item displayed in the line 2014-04-17 10:07:20 +01:00
Lewis Jessett
90550339a8 Fix for Issue with Integers and windows server when merging a pdf template. 2014-04-04 13:34:42 +01:00
Matthew
1edd21afb6 Merge branch 'develop' of https://github.com/likhobory/SuiteCRM into likhobory-develop
Conflicts:
	custom/application/Ext/Language/ru_ru.lang.ext.php
2014-03-31 11:40:01 +01:00
Matthew
202734a5fc FIX issue with generate pdf with service lines 2014-03-31 11:17:24 +01:00
Matthew
0052f946f3 removed temp files 2014-03-14 16:25:23 +00:00
Matthew
07648eb317 Merge branch 'likhobory-master' into hotfix-7.0.2
Conflicts:
	custom/modules/Home/language/ru_ru.lang.php
2014-01-17 12:24:53 +00:00
likhobory
d483936769 RUSSIAN RAPIRA language files is updated 2014-01-17 15:12:30 +04:00
William Rennie
06748539f3 Corrected error with previous AOS_PDF_Templates translation modification. 2014-01-15 09:46:31 +00:00
William Rennie
4447d99c23 Message and label in module AOS_PDF_Templates fixed as this could not be translated. 2014-01-14 20:30:08 +00:00
Matthew
51ff3dc7b5 Merge branch 'likhobory-master' into hotfix-7.0.2 2014-01-13 11:54:44 +00:00
SalesAgility
3035b4327e Russian RAPIRA language file 2014-01-11 19:45:02 +04:00
Matthew
d1b1120929 Merge branch 'jorgeobeaga-es_es.lang' into hotfix-7.0.2 2014-01-10 10:58:48 +00:00
Matthew
329d6b3cfc Fixed PDF Query for MSSQL 2013-11-25 14:52:13 +00:00
Jorge Obeaga
c0b5e8c5eb Translations on AOP, AOR, AOS, AOW and other modules 2013-11-22 18:01:12 -03:00
Matthew
de8d3c281c fixed Install 2013-10-20 17:24:10 +01:00
Matthew
8e51b0e900 initial commit 2013-09-23 20:30:44 +01:00