Commit Graph

99547 Commits

Author SHA1 Message Date
Laurent Destailleur
a09db63c7b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/contrat/list.php
	htdocs/don/class/api_donations.class.php
	htdocs/societe/class/societe.class.php
2021-05-25 20:17:54 +02:00
Laurent Destailleur
98d60870d5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:46 +02:00
Laurent Destailleur
1b5f7b78b5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:34 +02:00
Laurent Destailleur
307c5cb276
Merge pull request #17702 from r3dge/13.0
bug fix : replacing orders by donations and setting required field to…
2021-05-25 20:12:07 +02:00
Laurent Destailleur
0d31db0ba5
Update don.class.php 2021-05-25 20:11:46 +02:00
Laurent Destailleur
6d637bf1e1
Merge pull request #17707 from FHenry/12_fix_export_balance
fix: export balance with double quote
2021-05-25 19:36:57 +02:00
Laurent Destailleur
b9de8561a9 Fix regression 2021-05-25 15:59:36 +02:00
Laurent Destailleur
d18fc6ca3c Fix init 2021-05-25 15:38:12 +02:00
Laurent Destailleur
a840afa72a Fix missing entry into table 2021-05-25 15:24:28 +02:00
Laurent Destailleur
71b35ef0e5 Fix regression - can't reset parent company 2021-05-25 12:11:06 +02:00
Laurent Destailleur
fb6aea72b8 Fix syntax error 2021-05-25 12:06:29 +02:00
Laurent Destailleur
857be16e12 Log 2021-05-25 12:03:38 +02:00
Laurent Destailleur
fedf7645b1 Fix regression, can't reset parent company. 2021-05-25 12:02:33 +02:00
Laurent Destailleur
97154f8267 Fix timezone into widgets 2021-05-25 00:29:32 +02:00
Laurent Destailleur
dd48c3ee9d Remove deprecated __REFCLIENT__ (Replaced with __REF_CLIENT__) 2021-05-25 00:08:06 +02:00
Laurent Destailleur
bb64a25638 Fix CWE-269 - huntr - Fix set of email without edit user permission 2021-05-24 22:11:24 +02:00
Laurent Destailleur
31af74f852 FIX CWE-269 - huntr - Can download files of an agenda event 2021-05-24 20:07:04 +02:00
Laurent Destailleur
d4310f49c4 FIX CWE-79 - huntr - Fix option MAIN_ALLOW_SVG_FILES_AS_IMAGES 2021-05-24 19:46:19 +02:00
Laurent Destailleur
cdf3b7f9a8 Fix responsive 2021-05-24 19:05:25 +02:00
Florian HENRY
7d223beae5 fix: export balance with doublequote 2021-05-24 12:51:58 +02:00
r3dge
647997af28 fixing error on date 2021-05-23 18:15:00 +02:00
r3dge
f81136231a fixing PUT request for donation update 2021-05-23 18:09:10 +02:00
Laurent Destailleur
a0418fc17d FIX CWE-269 huntr - download of files of project 2021-05-21 18:53:09 +02:00
Laurent Destailleur
4df70dc3f4 Fix CWE-269 huntr 2021-05-21 16:22:45 +02:00
r3dge
67cab8c1f2 bug fix : replacing orders by donations and setting required field to allow post action in rest API for url donations. See issue #17700 2021-05-21 16:01:04 +02:00
Laurent Destailleur
11fa523070 FIX CWE-269 2021-05-21 15:54:11 +02:00
Laurent Destailleur
c1c2f44e38 Update file COPYRIGHT 2021-05-21 14:16:49 +02:00
Laurent Destailleur
b5af3b17d5 Update doc 2021-05-21 14:03:52 +02:00
Laurent Destailleur
fbe491c4da FIX CWE-79 huntr 2021-05-21 12:17:56 +02:00
Laurent Destailleur
cfd035e1de css 2021-05-20 21:25:36 +02:00
Laurent Destailleur
7833ac8fb0 Code comment 2021-05-20 17:53:28 +02:00
Laurent Destailleur
c561669edf Code comment 2021-05-20 17:02:22 +02:00
Laurent Destailleur
f2d706950a
Merge pull request #17688 from DorianVabre/fix_dev_getpost_agenda
fix: getpost exportagenda apha to alpha
2021-05-20 16:54:02 +02:00
Dorian Vabre
ab4ae85eb8 fix: getpost exportagenda apha to alpha 2021-05-20 16:33:04 +02:00
Laurent Destailleur
625aab34d6 Fix phpcs 2021-05-20 15:30:33 +02:00
Laurent Destailleur
eb0f4d9765 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 15:26:26 +02:00
Laurent Destailleur
93501a1147 Fix phpcs 2021-05-20 15:25:56 +02:00
Laurent Destailleur
3359ae93d8
Merge pull request #17654 from atm-adrien/FIX_missing_hooks
FIX : Missing hook in cibles.php (for mailing)
2021-05-20 15:24:12 +02:00
Laurent Destailleur
5191a419d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 15:05:55 +02:00
Laurent Destailleur
45bc686f7f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/product/price.php
2021-05-20 15:05:30 +02:00
Laurent Destailleur
04e9f2c988 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/admin/translation.php
2021-05-20 15:00:39 +02:00
Laurent Destailleur
93558d5bbb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-05-20 14:58:57 +02:00
Laurent Destailleur
865ecf7a94 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/translation.php
2021-05-20 14:58:50 +02:00
Laurent Destailleur
91f85abb7e Fix only comment to understand code are allowed 2021-05-20 14:55:37 +02:00
Laurent Destailleur
7a24d6399b
Merge pull request #17680 from SylvainLegrand/13.0
avoid an infinite loop between a parent company and a branch when updating customer rates
2021-05-20 14:54:28 +02:00
Laurent Destailleur
28487fac12
Create societe.class.php 2021-05-20 14:53:50 +02:00
stickler-ci
94ca682cbf Fixing style errors. 2021-05-20 12:51:53 +00:00
Laurent Destailleur
b64c307358
Update societe.class.php 2021-05-20 14:50:02 +02:00
Laurent Destailleur
890d0f8040
Update societe.class.php 2021-05-20 14:38:24 +02:00
Laurent Destailleur
e8d9e9e697
Merge pull request #17659 from gmilad/gmilad-fix-17608-b10
Fix issue #17608 for branch 10
2021-05-20 14:34:12 +02:00