Commit Graph

25892 Commits

Author SHA1 Message Date
Alexandre SPANGARO
ad95caac7e Merge branch 'develop' into 14a15 2021-02-28 07:12:24 +01:00
Alexandre SPANGARO
6e1d67084d Merge remote-tracking branch 'upstream/develop' into 14a15 2021-02-28 07:09:30 +01:00
Laurent Destailleur
753b1d1e11 FIX status on tooltip on widgets 2021-02-27 19:43:56 +01:00
Laurent Destailleur
4cf2d2317f FIX Status in popup of member in widget 2021-02-27 19:16:14 +01:00
Laurent Destailleur
7dace2f459 Show 3 years in graph of widget by default. 2021-02-27 18:38:32 +01:00
Laurent Destailleur
9cf4222d3a Look and feel v14 2021-02-27 17:15:40 +01:00
Laurent Destailleur
5c0ea476e1 Look and feel v14 2021-02-27 12:45:07 +01:00
Frédéric FRANCE
8bfa7565bd Update commonobject.class.php 2021-02-27 08:52:40 +01:00
Frédéric FRANCE
2cc635fd09 FIX https://github.com/Dolibarr/dolibarr/issues/16465 2021-02-27 08:00:02 +01:00
Laurent Destailleur
34d00e5d5e Look and feel v14 2021-02-27 02:44:52 +01:00
Laurent Destailleur
8e632d08b8 NEW Add link picto to the stock movement on the detail of production 2021-02-27 00:31:29 +01:00
Frédéric FRANCE
5d4004d3f4 fix cache 2021-02-26 23:06:33 +01:00
Frédéric FRANCE
94aa116fa8 fix variable name 2021-02-26 23:01:18 +01:00
Laurent Destailleur
e7da1d7fe4 FIX #16431 2021-02-26 19:38:18 +01:00
Laurent Destailleur
dd72a52e8f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balancebymonth.php
	htdocs/accountancy/class/accountancyexport.class.php
2021-02-26 19:23:23 +01:00
Laurent Destailleur
81c2ae325b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-26 19:20:32 +01:00
Laurent Destailleur
d5566dbf8f FIX #16431 2021-02-26 19:18:03 +01:00
Frédéric FRANCE
96b0f3a25c code syntax directory 2021-02-26 16:19:52 +01:00
Gauthier PC portable 024
e598b49545 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 15:33:36 +01:00
Laurent Destailleur
5095e7f927 Merge pull request #16124 from hregis/fix_avoid_missing_url_and_token
Fix avoid missing url and token
2021-02-26 15:21:56 +01:00
Laurent Destailleur
5d0a0fe341 Clean code 2021-02-26 14:53:16 +01:00
Laurent Destailleur
a5925cc2cb Merge branch 'develop' into count_project_head 2021-02-26 13:02:54 +01:00
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
16906abc09 FIX File attachment on lots 2021-02-26 12:47:57 +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
Gauthier PC portable 024
c996871f98 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 11:50:18 +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
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
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
7b70d4b1de Merge pull request #16415 from frederic34/core_code_syntax
code syntax core directory
2021-02-26 10:29:23 +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
Christophe Battarel
445974a003 add event management to batch products 2021-02-25 15:47:14 +01:00
Alexandre SPANGARO
85d63e05d1 Move to INNER JOIN 2021-02-25 05:07:26 +01:00
Alexandre SPANGARO
e177ac566c Merge remote-tracking branch 'upstream/develop' into 14a15 2021-02-25 05:02:03 +01:00
stickler-ci
a31d5e8dc9 Fixing style errors. 2021-02-24 22:32:48 +00:00
dvdwalker
4c321341d4 Fix: Ajax on/off not saving value in DB after updating to version >=12
The issue seams to be that starting in version 12 the "[element]_UPDATE" trigger is called in file core/ajax/objectonoff.php but some properties that are required on $object are not set.
2021-02-24 19:28:47 -03:00
Laurent Destailleur
ebb4f03788 Prepare public page for autocreate contact-lead 2021-02-24 12:19:28 +01:00
Frédéric FRANCE
554e449e40 code syntax core directory 2021-02-23 22:03:23 +01:00
Regis Houssin
0a3d1ab92e FIX use var "saved_url" instead global var "$url" 2021-02-23 16:56:45 +01:00
Regis Houssin
ec5d9983e0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into
fix_avoid_missing_url_and_token

Conflicts:
	htdocs/core/js/lib_head.js.php
2021-02-23 16:55:32 +01:00
Gauthier PC portable 024
c0160a5f3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:20:15 +01:00
Laurent Destailleur
b7e2c7d87a FIX #16393 Do not sanitize <!DOCTYPE html> 2021-02-23 12:58:43 +01:00