Commit Graph

97383 Commits

Author SHA1 Message Date
Frédéric FRANCE
3b6d01ffae
code syntax contact directory 2021-02-23 21:16:15 +01:00
Frédéric FRANCE
61600a9e65
code syntax compta directory 2021-02-23 21:09:01 +01:00
Frédéric FRANCE
6dfca9f1f5
code syntax commande directory 2021-02-23 20:46:19 +01:00
Frédéric FRANCE
55a5e46527
code syntax comm directory 2021-02-23 20:26:57 +01:00
Frédéric FRANCE
398e820a31
code syntax comm directory 2021-02-23 20:26:22 +01:00
Frédéric FRANCE
faabec4edc
code syntax comm directory 2021-02-23 20:25:33 +01:00
Frédéric FRANCE
f19bbb89f3
code syntax comm directory 2021-02-23 20:24:49 +01:00
Frédéric FRANCE
8fe1eac48b
code syntax comm directory 2021-02-23 20:23:21 +01:00
Frédéric FRANCE
52ae7d79ae
code syntax comm directory 2021-02-23 20:22:36 +01:00
Frédéric FRANCE
5931051c88
code syntax comm directory 2021-02-23 18:59:19 +01:00
Frédéric FRANCE
464e4442b1
fix fourn card 2021-02-23 18:23:14 +01:00
Frédéric FRANCE
6fcb7a96a1
code syntax categorie collab directory 2021-02-23 18:04:37 +01:00
Frédéric FRANCE
70446fe28e
code syntax cashdesk directory 2021-02-23 17:58:31 +01:00
Frédéric FRANCE
3c8089af0d
code syntax bom directory 2021-02-23 17:51:46 +01:00
Frédéric FRANCE
9b48e1a649
code syntax api directory 2021-02-23 17:44:43 +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
Laurent Destailleur
2642e1d1b3 Code syntax 2021-02-23 15:35:16 +01:00
Gauthier PC portable 024
d7e997712f Merge branch 'NEW/add_real_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:32:00 +01:00
Gauthier PC portable 024
e16bb70922 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:31:12 +01:00
Gauthier PC portable 024
79e878c26b FIX : salary date 2021-02-23 15:30:42 +01:00
stickler-ci
c8b8c55054 Fixing style errors. 2021-02-23 14:22:55 +00: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
Gauthier PC portable 024
4f767c0823 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:18:44 +01:00
Gauthier PC portable 024
a767bffc3a FIX : correction of payment salaries list on employee tab of user card 2021-02-23 15:08:27 +01:00
Laurent Destailleur
0009ce1646 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-23 14:49:23 +01:00
Laurent Destailleur
888c072af0 NEW Can set a percentage when creating an invoice from another object 2021-02-23 14:48:54 +01:00
Frédéric FRANCE
00f10d1850
fix typo 2021-02-23 13:33:27 +01:00
Laurent Destailleur
b7e2c7d87a FIX #16393 Do not sanitize <!DOCTYPE html> 2021-02-23 12:58:43 +01:00
Frédéric FRANCE
f50ce6f91f
add cache on project head 2021-02-23 12:19:49 +01:00
Laurent Destailleur
822bfc957c
Merge pull request #16368 from FHenry/dev_EventOrganisation_draft
NEW : Tab on project for Event Organization #FoundationFunding
2021-02-23 12:09:00 +01:00
Laurent Destailleur
0a0299c085
Merge pull request #16392 from frederic34/patch-3
css
2021-02-23 12:07:01 +01:00
Laurent Destailleur
7ae50cf2e5
Merge pull request #16390 from frederic34/patch-2
fix propal fetch
2021-02-23 12:05:51 +01:00
Laurent Destailleur
a70a58f7ad
Merge pull request #16391 from frederic34/assetcodesyntax
code syntax
2021-02-23 12:01:10 +01:00
Laurent Destailleur
d2e1f9fce9 FIX #16096 #16085 Any call of ajax pages must provide the token 2021-02-23 11:13:57 +01:00
Regis Houssin
77cecf58ce Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into fix_avoid_missing_url_and_token 2021-02-23 11:10:32 +01:00
Laurent Destailleur
7d0d51411b
Merge pull request #16394 from daraelmin/daraelmin-patch-3
Fix #16096 missing CSRF token and use post instead get
2021-02-23 11:05:29 +01:00
Laurent Destailleur
34dcebea78 Code comment 2021-02-23 11:03:34 +01:00
Regis Houssin
7c32e43c68 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into fix_avoid_missing_url_and_token 2021-02-23 08:19:18 +01:00
Frédéric FRANCE
9f6c2f3eaa
css 2021-02-23 00:14:11 +01:00
Frédéric FRANCE
337689d5d2
code syntax 2021-02-22 21:36:42 +01:00
Florian HENRY
fa65956801 Merge branch 'develop' into dev_EventOrganisation_draft 2021-02-22 21:02:22 +01:00
Florian HENRY
f800e86e61 Merge branch 'dev_EventOrganisation_draft' of github.com:FHenry/dolibarr into dev_EventOrganisation_draft 2021-02-22 21:01:22 +01:00
Florian HENRY
c9a51d971d rename column 2021-02-22 21:00:54 +01:00
Frédéric FRANCE
926a88ff51
Update propal.class.php 2021-02-22 21:00:24 +01:00
Frédéric FRANCE
bb276566c6
code syntax 2021-02-22 19:05:32 +01:00
Frédéric FRANCE
5199e3da5b
code syntax 2021-02-22 18:50:45 +01:00
Laurent Destailleur
8c1902be1b Missing space 2021-02-22 18:40:15 +01:00
Frédéric FRANCE
95524abd22
code syntax 2021-02-22 18:38:03 +01:00
Frédéric FRANCE
6f93deae40
fix propal fetch 2021-02-22 18:21:12 +01:00