lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
83,748 Commits 43 Branches 150 Tags 886 MiB
7909055ee8
Commit Graph

83748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
6555f5d74f More default hmtl tags in restricthtmlonly 2020-02-17 20:55:17 +01:00
Pierre Ardoin
ef64e20367
Fix not display value 2020-02-17 19:34:09 +01:00
Pierre Ardoin
f8e18a3826
Fix Not displayed email 2020-02-17 19:25:25 +01:00
Pierre Ardoin
a773b86ad1
Fix not displayed value 2020-02-17 19:23:48 +01:00
Pierre Ardoin
29cfd6d857
Fix issue with Multicompany 
Before : can't find photo

Now : ok
 2020-02-17 19:18:22 +01:00
Regis Houssin
a5de331410 FIX Multicompany compatibility 2020-02-17 19:13:37 +01:00
Pierre Ardoin
f1bbe1c64d
Fix issue not show photo. 2020-02-17 19:09:58 +01:00
Laurent Destailleur
be7bed7063 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-17 14:00:05 +01:00
Laurent Destailleur
e59ac41182 Fix phpcs 2020-02-17 13:59:44 +01:00
Laurent Destailleur
299219891e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-17 12:41:45 +01:00
Laurent Destailleur
25fa83bd06 Fix phpcs 2020-02-17 12:40:26 +01:00
Laurent Destailleur
a6b0fec90b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee FIX duplicate class name into some log lines 2020-02-17 12:34:00 +01:00
Laurent Destailleur
1904ae0e82 FIX Type of contact for event does not exists and not supported 
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER

Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-02-17 12:25:51 +01:00
Laurent Destailleur
549bf076d7 Fix prefix of log 2020-02-17 12:22:52 +01:00
Laurent Destailleur
a02f5cde92 FIX Type of contact for event does not exists and not supported 
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
 2020-02-17 12:21:07 +01:00
gauthier
523d09536c FIX : must be == and not = 2020-02-17 12:20:19 +01:00
Laurent Destailleur
bf281b7dab Comment 2020-02-17 11:51:49 +01:00
Jamie Slome
2d9162aedb
Merge branch 'develop' into develop 2020-02-17 10:49:41 +00:00
Jamie Slome
1bbe4469f1
Merge pull request #1 from mufeedvh/develop 
Merging fix - on-behalf of @mufeedvh, executed by huntr.dev (011-php-dolibarr).
 2020-02-17 10:33:46 +00:00
Jamie Slome
59572f15a9
Merge pull request #2 from 0xRoM/develop 
Merging fix - on-behalf of @0xRoM, executed by huntr.dev (011-php-dolibarr).
 2020-02-17 10:32:57 +00:00
oscim
d1652ee9e3
Update bank.php 
For authorize line manager to see wages paid
 2020-02-17 11:18:34 +01:00
Alexandre SPANGARO
aa9d00c62e FIX 2020-02-17 07:47:08 +01:00
Alexandre SPANGARO
76a369d351 NEW: Donation - Update FR CERFA to 11580*04 2020-02-17 07:43:24 +01:00
Laurent Destailleur
4b5cda5cd2 Code comment on OAUth ahtent 2020-02-16 21:16:00 +01:00
Laurent Destailleur
20797920d7 Fix phpcs 2020-02-16 19:35:52 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
52aebce789 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-16 18:16:05 +01:00
Laurent Destailleur
ac7a077c77 FIX Vulnerability in module from modulebuilder. Only fields with type 
html can contains HTML.
 2020-02-16 18:14:10 +01:00
Laurent Destailleur
5b87b12e64 FIX Vulnerability reported by code16 2020-02-16 18:06:25 +01:00
Laurent Destailleur
7cdfc3ca65 FIX HTML Injection 2020-02-16 12:55:32 +01:00
Laurent Destailleur
dc3a15945d Add method getKanbanView() 2020-02-16 12:05:00 +01:00
ptibogxiv
08b06f48c9
NEW : api for get user's documents 2020-02-15 20:33:12 +01:00
Laurent Destailleur
ed778bd28f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/ticket/view.php
 2020-02-15 18:13:35 +01:00
Laurent Destailleur
9b6179850a CSS 2020-02-15 18:07:49 +01:00
Laurent Destailleur
f14cd9f49f Look and feel v11 2020-02-15 18:07:23 +01:00
Laurent Destailleur
2b3cc0d048 Fix add both public id and ref in topic 2020-02-15 18:00:09 +01:00
Laurent Destailleur
f47966a25a NEW Restore version of application on main screen for screenshot 2020-02-15 17:20:11 +01:00
Laurent Destailleur
6c9fb06292 Perf 2020-02-15 10:56:44 +01:00
Laurent Destailleur
824dac31d9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-15 10:41:39 +01:00
Laurent Destailleur
69bd616e73 css 2020-02-15 10:40:32 +01:00
josemariagomezroncero
601cd3809c
Correction 2020-02-14 20:16:10 +01:00
Laurent Destailleur
a312adf2b0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
 2020-02-14 19:57:31 +01:00
Laurent Destailleur
d3d572c8d3 FIX Avoid to download the export if we just press enter to refresh form 2020-02-14 19:55:50 +01:00
Laurent Destailleur
a7df72ee6f FIX #13067 2020-02-14 19:34:26 +01:00
Laurent Destailleur
58a2a71605
Merge pull request #13067 from maboelfotoh/custom 
NEW add Opening Balance column to balance.php
 2020-02-14 19:25:18 +01:00
Laurent Destailleur
35ada37d4d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/filefunc.inc.php
 2020-02-14 19:14:26 +01:00
Laurent Destailleur
58ad62aa7b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-14 19:12:11 +01:00
Laurent Destailleur
3bc122ecf6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-14 19:05:58 +01:00
Laurent Destailleur
3faed758b3 FIX #13110 2020-02-14 19:05:39 +01:00