Commit Graph

6564 Commits

Author SHA1 Message Date
Laurent Destailleur
075cacb8cf Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF 2020-12-09 17:40:28 +01:00
Regis Houssin
c18e8ac317 FIX regenerate mycompany logos thumbs if not exists 2020-12-09 09:28:46 +01:00
Laurent Destailleur
6e479af5b6 Merge pull request #15661 from frederic34/adminsms
fix trans removing html
2020-12-07 22:45:14 +01:00
Laurent Destailleur
ff1e6ec371 Merge pull request #15665 from frederic34/admin_boxes
fix style
2020-12-07 22:40:51 +01:00
Laurent Destailleur
d9ba821411 Merge pull request #15669 from frederic34/template
typo ortho
2020-12-07 22:35:45 +01:00
Laurent Destailleur
3fb63e6a4b Look and feel v13 2020-12-07 15:51:22 +01:00
Frédéric FRANCE
d1204e5e9b typo ortho 2020-12-05 15:35:52 +01:00
Laurent Destailleur
991cfde0a2 Fix css 2020-12-05 14:46:29 +01:00
Frédéric FRANCE
8996dd9803 fix style 2020-12-05 10:28:40 +01:00
Frédéric FRANCE
cccc670c05 fix trans removing html 2020-12-05 08:45:58 +01:00
Laurent Destailleur
bb0c33a49e Merge pull request #15654 from frederic34/commonkanban
keep common if wanted
2020-12-04 22:25:51 +01:00
Frédéric FRANCE
4039ca269f fix translation removing html 2020-12-04 21:08:51 +01:00
stickler-ci
d89970ddd1 Fixing style errors. 2020-12-04 19:31:53 +00:00
Frédéric FRANCE
c8407b2f91 keep common if wanted 2020-12-04 20:28:05 +01:00
Laurent Destailleur
e7306625f0 Fix look and feel v13 2020-12-04 15:28:12 +01:00
Laurent Destailleur
56d56929ec Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/dolibarr.php
2020-12-03 16:39:22 +01:00
Laurent Destailleur
ac29db92cb FIX #15618 2020-12-03 16:35:42 +01:00
Laurent Destailleur
1ec3d4cfdf CSS 2020-12-03 13:19:35 +01:00
Laurent Destailleur
bfe4eb7309 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/emailcollector_card.php
	htdocs/core/modules/modProduct.class.php
2020-12-03 11:26:53 +01:00
Laurent Destailleur
b324425db8 code comment 2020-12-03 11:19:41 +01:00
Laurent Destailleur
0fd865d8af FIX Better error message with IMAP when connection fails 2020-12-03 11:16:02 +01:00
Laurent Destailleur
748630eb25 FIX Better error message when IMAP connection fails 2020-12-03 11:15:06 +01:00
Laurent Destailleur
cf2dd28a21 Fix warning when setup not complete. 2020-11-30 19:40:53 +01:00
Christian Foellmann
f801dd7d66 PR toggle FCKeditor on public/private notes 2020-11-30 16:39:14 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
7634212811 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/phpinfo.php
	htdocs/commande/stats/index.php
	htdocs/compta/facture/stats/index.php
2020-11-29 21:35:03 +01:00
Laurent Destailleur
150dd71774 Look and feel v13 2020-11-29 16:02:39 +01:00
Laurent Destailleur
6c65ebef0d Look and feel v13 2020-11-29 15:16:53 +01:00
Laurent Destailleur
df17c2f26a Removed dead code generating warning.
CSS
2020-11-28 16:48:32 +01:00
Laurent Destailleur
41984f9934 Clean code 2020-11-28 14:00:35 +01:00
Laurent Destailleur
7e6af6a54f FIX translation not loaded for error message of numbering modules 2020-11-28 02:09:27 +01:00
Frédéric FRANCE
12dce9cd75 avoid large screen for code 2020-11-26 23:53:10 +01:00
Frédéric FRANCE
f03930e55e doxygen 2020-11-26 23:49:42 +01:00
Laurent Destailleur
4da4499569 FIX Param joinfiles not sanitized
Conflicts:
	htdocs/admin/mails_templates.php
2020-11-26 23:07:52 +01:00
Laurent Destailleur
4114201da9 FIX Param joinfiles not sanitized 2020-11-26 23:05:49 +01:00
Laurent Destailleur
61c0c7f0a6 Fix GETPOST second param 2020-11-26 22:59:05 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99 CSS 2020-11-23 12:29:38 +01:00
Laurent Destailleur
60bfbe2e57 Merge pull request #15448 from Givriz/dev
Feature : creation of a "button-save" class
2020-11-21 23:44:30 +01:00
Laurent Destailleur
f39ad2359a Debug 2020-11-21 17:01:17 +01:00
Laurent Destailleur
bf94ce6aad Fix warnings 2020-11-21 16:49:54 +01:00
Laurent Destailleur
95b79094df Fix warning.
Module cron is more clear.
2020-11-21 16:27:50 +01:00
Laurent Destailleur
3534555909 Fix setup of scheduled jobs 2020-11-21 14:14:53 +01:00
Givriz
c48129e279 Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Frédéric FRANCE
f92b5e87dc doxygen 2020-11-13 14:35:04 +01:00
Laurent Destailleur
a98d025f5a Clean option for replenishment on real stock. 2020-11-13 11:06:51 +01:00
Laurent Destailleur
56bc788d16 Merge pull request #15375 from frederic34/patch-6
doxygen
2020-11-13 09:33:36 +01:00
Laurent Destailleur
350d694181 Fix security page 2020-11-12 19:15:44 +01:00
Frédéric FRANCE
64c48a246a The method PrestaShopWebservice::... is not static, but was called statically 2020-11-12 18:53:26 +01:00
Frédéric FRANCE
caa82a1e2f Update PSWebServiceLibrary.class.php 2020-11-12 18:43:52 +01:00