Commit Graph

91029 Commits

Author SHA1 Message Date
Frédéric FRANCE
4f3b732ed5 Update societe.class.php 2020-10-27 20:14:42 +01:00
Frédéric FRANCE
0a024f285d Update contact.class.php 2020-10-27 20:13:01 +01:00
Frédéric FRANCE
6d6b143011 Update adherent.class.php 2020-10-27 20:11:18 +01:00
Frédéric FRANCE
7d30a11a26 Update functions.lib.php 2020-10-27 20:06:49 +01:00
Laurent Destailleur
9595d56235 Merge pull request #15186 from fappels/13_fix_delete_product_ajax
Fix delete product using ajax
2020-10-27 20:03:00 +01:00
Laurent Destailleur
6e0ae82048 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-27 19:57:52 +01:00
Laurent Destailleur
33e56a2d7c Fix decimal qty for #14666 2020-10-27 19:56:36 +01:00
Laurent Destailleur
d7a9e0f61a Merge pull request #15185 from Dolibarr/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2020-10-27 19:47:20 +01:00
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Francis Appels
828df6c134 Fix delete product using ajax 2020-10-27 19:45:12 +01:00
Laurent Destailleur
ec6c735d89 Clean code 2020-10-27 19:44:15 +01:00
Laurent Destailleur
ebdc1f7457 Fix scrutinizer 2020-10-27 19:34:52 +01:00
Laurent Destailleur
f7de9333bb Doxygen 2020-10-27 19:29:42 +01:00
Laurent Destailleur
f670f71df9 Fix scrutinizer 2020-10-27 19:14:03 +01:00
Laurent Destailleur
e10051800d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-27 19:06:58 +01:00
Laurent Destailleur
f54f67cae3 Fix sanitizing 2020-10-27 19:06:41 +01:00
Laurent Destailleur
7d291d075e Merge pull request #15184 from frederic34/formcolor
formcolor parameter is deprecated
2020-10-27 19:03:29 +01:00
Laurent Destailleur
1b939ab8f4 Merge pull request #15183 from frederic34/dol_fiche_end
end of dol_fiche_end
2020-10-27 19:00:32 +01:00
Laurent Destailleur
358ac4cd36 Fix scrutinizer 2020-10-27 18:55:55 +01:00
Laurent Destailleur
e099507594 Fix regression 2020-10-27 18:53:03 +01:00
Frédéric FRANCE
900452a47d formcolor parameter is deprecated 2020-10-27 18:46:42 +01:00
Laurent Destailleur
e10033143a Fix bad var 2020-10-27 18:40:44 +01:00
Laurent Destailleur
2559489920 Fix 2020-10-27 18:38:13 +01:00
Laurent Destailleur
50cf7704fe Log 2020-10-27 18:30:03 +01:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Laurent Destailleur
80d13e711c More secured getURLContent method. Add PHPUnit on getURLContent 2020-10-27 18:02:05 +01:00
Laurent Destailleur
d750dc48a1 More secured getURLContent method. Add PHPUnit on getURLContent 2020-10-27 15:06:16 +01:00
Laurent Destailleur
7efbab88a8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-27 12:49:30 +01:00
Laurent Destailleur
c6216eddd1 CSS 2020-10-27 12:49:14 +01:00
Laurent Destailleur
92f3137c3e Merge pull request #15179 from frederic34/boxmembers
add small photo in box members
2020-10-27 11:55:32 +01:00
Laurent Destailleur
4adaf67d47 Hide setup we don't need if email are disabled globally
CSS
2020-10-27 11:40:30 +01:00
Laurent Destailleur
fe357e17e8 Fix for ja 2020-10-27 11:00:50 +01:00
Laurent Destailleur
56903d3677 Fix trans 2020-10-27 10:35:22 +01:00
Laurent Destailleur
16ac8a9d52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-27 10:33:46 +01:00
Laurent Destailleur
8bcd704d9b Disable notif as it is used as a frame 2020-10-27 10:32:25 +01:00
Laurent Destailleur
5943e784ec Remove var_dump 2020-10-27 10:27:44 +01:00
Laurent Destailleur
00b49dba18 Fix label 2020-10-27 10:26:30 +01:00
Laurent Destailleur
ffc961599c FIX error 500 on cash fence 2020-10-27 10:19:00 +01:00
Laurent Destailleur
19b82047f0 Fix sql 2020-10-27 10:00:35 +01:00
Frédéric FRANCE
6fc4b1b839 add small photo in box members 2020-10-27 08:17:12 +01:00
Laurent Destailleur
c81c3ec71a Fix translation 2020-10-27 03:20:33 +01:00
Laurent Destailleur
e637b60b4b Fix regression in language files 2020-10-27 03:04:53 +01:00
Laurent Destailleur
d2a2d74f7e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/product.lib.php
	htdocs/langs/am_ET/mrp.lang
	htdocs/langs/ar_SA/mrp.lang
	htdocs/langs/az_AZ/mrp.lang
	htdocs/langs/bg_BG/mrp.lang
	htdocs/langs/bn_BD/mrp.lang
	htdocs/langs/bn_IN/mrp.lang
	htdocs/langs/bs_BA/mrp.lang
	htdocs/langs/ca_ES/mrp.lang
	htdocs/langs/cs_CZ/mrp.lang
	htdocs/langs/da_DK/mrp.lang
	htdocs/langs/de_DE/mrp.lang
	htdocs/langs/el_GR/mrp.lang
	htdocs/langs/en_US/mrp.lang
	htdocs/langs/es_ES/mrp.lang
	htdocs/langs/et_EE/mrp.lang
	htdocs/langs/eu_ES/mrp.lang
	htdocs/langs/fa_IR/mrp.lang
	htdocs/langs/fi_FI/mrp.lang
	htdocs/langs/fr_FR/mrp.lang
	htdocs/langs/gl_ES/mrp.lang
	htdocs/langs/he_IL/mrp.lang
	htdocs/langs/hi_IN/mrp.lang
	htdocs/langs/hr_HR/mrp.lang
	htdocs/langs/hu_HU/mrp.lang
	htdocs/langs/id_ID/mrp.lang
	htdocs/langs/is_IS/mrp.lang
	htdocs/langs/it_IT/mrp.lang
	htdocs/langs/ja_JP/mrp.lang
	htdocs/langs/ka_GE/mrp.lang
	htdocs/langs/km_KH/mrp.lang
	htdocs/langs/kn_IN/mrp.lang
	htdocs/langs/ko_KR/mrp.lang
	htdocs/langs/lo_LA/mrp.lang
	htdocs/langs/lt_LT/mrp.lang
	htdocs/langs/lv_LV/mrp.lang
	htdocs/langs/mk_MK/mrp.lang
	htdocs/langs/mn_MN/mrp.lang
	htdocs/langs/nb_NO/mrp.lang
	htdocs/langs/ne_NP/mrp.lang
	htdocs/langs/nl_NL/mrp.lang
	htdocs/langs/pl_PL/mrp.lang
	htdocs/langs/pt_PT/mrp.lang
	htdocs/langs/ro_RO/mrp.lang
	htdocs/langs/ru_RU/mrp.lang
	htdocs/langs/sk_SK/mrp.lang
	htdocs/langs/sl_SI/mrp.lang
	htdocs/langs/sq_AL/mrp.lang
	htdocs/langs/sr_RS/mrp.lang
	htdocs/langs/sv_SE/mrp.lang
	htdocs/langs/sw_SW/mrp.lang
	htdocs/langs/th_TH/mrp.lang
	htdocs/langs/tr_TR/mrp.lang
	htdocs/langs/uk_UA/mrp.lang
	htdocs/langs/uz_UZ/mrp.lang
	htdocs/langs/vi_VN/mrp.lang
	htdocs/langs/zh_CN/mrp.lang
	htdocs/langs/zh_HK/mrp.lang
	htdocs/langs/zh_TW/mrp.lang
	htdocs/mrp/class/mo.class.php
	htdocs/mrp/mo_agenda.php
	htdocs/mrp/mo_card.php
	htdocs/mrp/mo_document.php
	htdocs/mrp/mo_movements.php
	htdocs/mrp/mo_note.php
	htdocs/mrp/mo_production.php
2020-10-27 02:55:22 +01:00
Laurent Destailleur
313273f462 Doc 2020-10-27 02:19:43 +01:00
Laurent Destailleur
3f0a9cfce9 Fix var not defined 2020-10-27 02:03:13 +01:00
Laurent Destailleur
bb64d1a67f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-27 01:50:36 +01:00
Laurent Destailleur
32ff76178e FIX #15168 2020-10-27 01:44:00 +01:00
Laurent Destailleur
77841b8889 Merge pull request #15155 from javierybar/develop
NEW Credit note in TakePOS
2020-10-27 01:26:10 +01:00
Laurent Destailleur
96ad9d27fa Merge pull request #15174 from frederic34/patch-8
clean code interface_99_modZapier_ZapierTriggers.class.php
2020-10-27 01:25:43 +01:00
Laurent Destailleur
f801bc65c8 Merge pull request #15173 from frederic34/patch-6
Clean code interface_20_all_Logevents.class.php
2020-10-27 01:25:16 +01:00