Commit Graph

95259 Commits

Author SHA1 Message Date
Laurent Destailleur
f5406d487b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/product.lib.php
	htdocs/product/stock/productlot_card.php
	test/phpunit/SecurityTest.php
2021-02-26 12:53:06 +01:00
Laurent Destailleur
9ebf5c2be1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-26 12:48:08 +01:00
Laurent Destailleur
16906abc09 FIX File attachment on lots 2021-02-26 12:47:57 +01:00
Laurent Destailleur
00d2d28d68 NEW: Can create a lot from list
Make code like modulebuilder
2021-02-26 12:34:41 +01:00
Juanjo Menent
badd46e289 FIX: Bad project filter in ticket list 2021-02-26 11:53:23 +01:00
Laurent Destailleur
34ed5519fd
Merge pull request #16435 from altairisfr/batchevents_pr
add event management to batch products
2021-02-26 11:50:48 +01:00
Laurent Destailleur
60016cc3f3 Fix phpcs 2021-02-26 11:29:16 +01:00
Laurent Destailleur
634d94b0b7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-26 11:27:27 +01:00
Laurent Destailleur
0f44bdb90f Fix sql error 2021-02-26 11:27:03 +01:00
Laurent Destailleur
adc0313543 Fix lang 2021-02-26 11:09:15 +01:00
Laurent Destailleur
2670d4fc17 Look and feel v14 2021-02-26 11:00:58 +01:00
Laurent Destailleur
aba43b3e35 Fix init before 2021-02-26 10:44:52 +01:00
Laurent Destailleur
67db1d4937
Merge pull request #16427 from dvdwalker/ajax-fix
Fix: Option MAIN_DIRECT_STATUS_UPDATE broken. Ajax on/off not saving value in DB after updating to version >=12
2021-02-26 10:39:58 +01:00
Laurent Destailleur
ff2a348ac4
Merge pull request #16442 from frederic34/ecm_code_syntax
code syntax ecm emailcollector directories
2021-02-26 10:35:01 +01:00
Laurent Destailleur
8086737be7
Merge pull request #16438 from frederic34/patch-5
fix translation
2021-02-26 10:34:47 +01:00
Laurent Destailleur
4b846fd6e8
Merge pull request #16440 from frederic34/delivery_code_syntax
code syntax delivery directory
2021-02-26 10:34:29 +01:00
Laurent Destailleur
8b4a33ba38
Merge pull request #16439 from frederic34/datapolicy_code_syntax
code syntax datapolicy dav debugbar directories
2021-02-26 10:34:08 +01:00
Laurent Destailleur
cec9c65ab8
Merge pull request #16449 from daraelmin/daraelmin-patch-3
Fix #16420 undefined  $model_mail_selected_id
2021-02-26 10:33:56 +01:00
Laurent Destailleur
e7ae2e65d7
Update html.formmail.class.php 2021-02-26 10:33:49 +01:00
Laurent Destailleur
4e6562fad5
Merge pull request #16441 from frederic34/don_code_syntax
code syntax don directory
2021-02-26 10:33:13 +01:00
Laurent Destailleur
bfc2cb509f
Merge pull request #16443 from frederic34/expedition_code_syntax
code syntax expedition directory
2021-02-26 10:33:01 +01:00
Laurent Destailleur
48e9078ced
Merge pull request #16444 from frederic34/expensereport_code_syntax
code syntax expensereport directory
2021-02-26 10:32:28 +01:00
Laurent Destailleur
dcb1080b16
Merge pull request #16445 from frederic34/exports_code_syntax
code syntax exports externalsite directory
2021-02-26 10:32:19 +01:00
Laurent Destailleur
65195af778
Merge pull request #16448 from daraelmin/patch-1
Fix #16420 - V13.0.1 - undefined $model_mail_selected_id
2021-02-26 10:32:06 +01:00
Laurent Destailleur
e0785ac5ef
Update html.formmail.class.php 2021-02-26 10:31:02 +01:00
Laurent Destailleur
69c974800c
Update html.formmail.class.php 2021-02-26 10:30:30 +01:00
Laurent Destailleur
e84e7d881f
Merge pull request #16447 from frederic34/fourn_code_syntax
code syntax fourn directory
2021-02-26 10:29:42 +01:00
Laurent Destailleur
72691a3a63
Merge pull request #16446 from frederic34/fichinter_code_syntax
code syntax fichinter directory
2021-02-26 10:29:33 +01:00
Laurent Destailleur
7b70d4b1de
Merge pull request #16415 from frederic34/core_code_syntax
code syntax core directory
2021-02-26 10:29:23 +01:00
Laurent Destailleur
d1e530e108 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-26 10:28:05 +01:00
Laurent Destailleur
1a521bcc99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/contact/class/contact.class.php
2021-02-26 10:27:55 +01:00
Laurent Destailleur
5c0fba26e2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-26 10:25:55 +01:00
Laurent Destailleur
549136efeb Removed useless log 2021-02-26 10:25:30 +01:00
Laurent Destailleur
99a17cadb7 Fix sql syntax 2021-02-26 10:25:08 +01:00
Laurent Destailleur
8e8efce7d1 Fix sql syntax 2021-02-26 10:23:53 +01:00
Laurent Destailleur
9db211b1a7
Merge pull request #16433 from ATM-Consulting/fix/11.0_contact_updateRoles_sql_injection_of_socid
FIX 11.0 - $this->socid injected in query without checking for empty string
2021-02-26 10:22:50 +01:00
Laurent Destailleur
563a9bd7ec
Merge pull request #16408 from frederic34/categ_codesyntax
code syntax categorie collab directory
2021-02-26 10:22:15 +01:00
Laurent Destailleur
e0cf5468ef
Merge pull request #16409 from frederic34/patch-3
fix fourn card
2021-02-26 10:22:04 +01:00
Laurent Destailleur
573ab9f91f
Merge pull request #16410 from frederic34/comm_codesyntax
code syntax comm directory
2021-02-26 10:21:48 +01:00
Laurent Destailleur
9b8e8f2571
Merge pull request #16411 from frederic34/commande_codesyntax
code syntax commande directory
2021-02-26 10:21:36 +01:00
Laurent Destailleur
ccffa7e2a0
Merge pull request #16412 from frederic34/compta_codesyntax
code syntax compta directory
2021-02-26 10:21:22 +01:00
Laurent Destailleur
463dda6d7a
Merge pull request #16413 from frederic34/contact_codesyntax
code syntax contact directory
2021-02-26 10:21:01 +01:00
daraelmin
e079ceb9c3
Fix #16420 undefined $model_mail_selected_id
Set $model_mail_selected_id to 0 when it is undefined
2021-02-26 08:51:01 +01:00
daraelmin
5d31a93bf0
Fix #16420 - undefined $model_mail_selected_id
Set $model_mail_selected_id to 0 when it is undefined
2021-02-26 08:20:51 +01:00
Frédéric FRANCE
ed6d2376f1
code syntax fourn directory 2021-02-25 23:21:30 +01:00
Frédéric FRANCE
fb07484d3f
code syntax fichinter directory 2021-02-25 23:00:32 +01:00
Frédéric FRANCE
d6ffdfe835
code syntax exports externalsite directory 2021-02-25 22:50:40 +01:00
Frédéric FRANCE
8a69fa0d35
code syntax expensereport directory 2021-02-25 22:45:02 +01:00
Frédéric FRANCE
8db4291f88
code syntax expedition directory 2021-02-25 22:38:35 +01:00
Frédéric FRANCE
125c7513da
code syntax ecm emailcollector directories 2021-02-25 22:26:26 +01:00