Commit Graph

24559 Commits

Author SHA1 Message Date
Antonin MARCHAL
d5cb81982d fix wrong display on extrafields type = double 2021-06-16 14:21:23 +02:00
Frédéric FRANCE
5d79143401
fix php warning 2021-06-16 11:50:52 +02:00
Laurent Destailleur
8b238c43ce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-15 22:23:46 +02:00
Laurent Destailleur
36f599519e
Merge pull request #17935 from frederic34/patch-8
fix php warning
2021-06-15 22:18:26 +02:00
Laurent Destailleur
6bf8e425c5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-15 22:18:07 +02:00
Laurent Destailleur
87a19af86d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/contacts.tpl.php
2021-06-15 22:17:53 +02:00
Laurent Destailleur
2a3b330e1e Fix newToken() 2021-06-15 22:10:59 +02:00
Laurent Destailleur
ac7ad64737
Merge pull request #17934 from frederic34/patch-7
fix php warning
2021-06-15 22:08:37 +02:00
Laurent Destailleur
5ddf12b29c Fix set language 2021-06-15 22:06:26 +02:00
Laurent Destailleur
1c87420895 Fix #yogosha6411 2021-06-15 20:22:36 +02:00
Laurent Destailleur
3a5770f679 Clean code 2021-06-15 20:16:05 +02:00
Laurent Destailleur
83ec4cbd71 Reponsive 2021-06-15 15:19:46 +02:00
Laurent Destailleur
80760d7960 Fix permissions 2021-06-15 14:18:09 +02:00
Frédéric FRANCE
5ceb957059
fix php warning 2021-06-15 08:48:52 +02:00
Frédéric FRANCE
8fbdde9ec3
Update contacts.tpl.php 2021-06-15 08:43:14 +02:00
Frédéric FRANCE
cd615b1717
fix php warning 2021-06-15 08:31:08 +02:00
Laurent Destailleur
3b9936f7e2 Fix responsive 2021-06-15 01:18:17 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-06-14 13:37:02 +00:00
Laurent Destailleur
617338cccd Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-14 14:50:15 +02:00
Laurent Destailleur
4464aeb639 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-14 14:44:08 +02:00
Laurent Destailleur
6078267f86 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
2021-06-14 14:43:46 +02:00
Laurent Destailleur
dcca3011ee Clean code 2021-06-14 14:41:50 +02:00
Laurent Destailleur
e41a3a2f42
Merge pull request #17867 from OPEN-DSI/v11-fix-clone-invoice-with-acount-line
FIX clone invoice with acount line
2021-06-14 14:41:05 +02:00
Laurent Destailleur
b588aee704
Merge pull request #17917 from fappels/14_create_thumbs_php8.0
Fix create image thumbs on php 8.0
2021-06-14 14:07:21 +02:00
Laurent Destailleur
03fbd68da4
Update images.lib.php 2021-06-14 14:05:48 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
f8f951977c Debug v14 2021-06-14 01:33:01 +02:00
Francis Appels
a019996bc8 Fix create image thumbs on php 8.0 2021-06-13 17:36:51 +02:00
Laurent Destailleur
026d919a03
Merge pull request #17900 from frederic34/patch-7
fix warnings
2021-06-13 16:15:58 +02:00
Frédéric FRANCE
ebc0cc75dd
fix warning 2021-06-13 15:37:54 +02:00
Laurent Destailleur
abfc87c1de Fix separator extrafields must not appear as selected fields 2021-06-13 13:32:41 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00
Laurent Destailleur
9ba0fe07f0 Fix phpcs 2021-06-12 18:47:29 +02:00
Frédéric FRANCE
a723a8f93e
remove phpcs warning 2021-06-12 18:40:00 +02:00
Laurent Destailleur
1933072712
Merge pull request #17893 from atm-john/develop_fix_missing_hooks_for_stock_mvm
New :  Missing hook for stock movements list
2021-06-11 19:58:21 +02:00
Laurent Destailleur
bbb751dc53
Merge pull request #17822 from frederic34/zapier_create_contacts
add more capabilities for zapier
2021-06-11 19:51:01 +02:00
Laurent Destailleur
04a500f516
Merge pull request #17850 from moreauftheobald/Develop_hook_on_product_stat
Adding hooks on product stat in order to allow to expand stat on othe…
2021-06-11 19:33:37 +02:00
Laurent Destailleur
5d2f5b2305
Update product.lib.php 2021-06-11 19:33:07 +02:00
Laurent Destailleur
37ebedcafa
Update product.lib.php 2021-06-11 19:32:25 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
2021-06-11 19:05:05 +02:00
Laurent Destailleur
a057f17e56
Merge pull request #17878 from AlexisLaurier/fix/depositTranslationInInvoice
remove useless check on invoice line content when generating pdf
2021-06-11 18:13:58 +02:00
Laurent Destailleur
9e6890c719
Merge pull request #17884 from frederic34/patch-12
fix warning
2021-06-11 18:02:54 +02:00
Laurent Destailleur
ffb879d152
Merge pull request #17880 from frederic34/patch-8
fix warning
2021-06-11 18:02:45 +02:00
Laurent Destailleur
fbe970c739
Merge pull request #17879 from frederic34/patch-7
try to fix
2021-06-11 18:02:29 +02:00
Laurent Destailleur
0b4385b554
Merge pull request #17885 from frederic34/patch-13
fix warnings
2021-06-11 18:00:48 +02:00
Laurent Destailleur
0bbe2210f2 FIX #17649 2021-06-11 17:58:52 +02:00
Laurent Destailleur
92dc0d28ce Fix disallow reserved values for field name 2021-06-11 17:50:52 +02:00
Laurent Destailleur
73a1119b26 Clean code 2021-06-11 15:21:24 +02:00
Laurent Destailleur
1605564d5e Clean code 2021-06-11 14:54:18 +02:00