Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

18964 Commits

Author SHA1 Message Date
Laurent Destailleur
345ac28c89 Fix js injection 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/user/group/card.php
 2019-09-18 14:21:02 +02:00
John Botella
d72548bd76 add filters 2019-09-18 13:43:34 +02:00
Frédéric FRANCE
c01ab451cc Update box_fournisseurs.php 2019-09-17 23:04:43 +02:00
Frédéric FRANCE
c38c0bec1c Update box_fournisseurs.php 2019-09-17 23:03:37 +02:00
Frédéric FRANCE
87d41256d4 Update box_contacts.php 2019-09-17 22:59:23 +02:00
Laurent Destailleur
3f6afa810c Code comment 2019-09-17 17:55:30 +02:00
Laurent De Coninck
49b75e3f52 support referent in the beluga export. 
The beluga export of a project, now supports additional referents, coming from the hooks. When the element is present in the view of all elements of the project, the beluga export will also export this element.

[see: X]
 2019-09-17 17:40:42 +02:00
ptibogxiv
c8bfd2c7c2 NEW translation for member type 
usefull for sync with API and multilanguage front end or application
 2019-09-17 13:37:34 +02:00
Laurent Destailleur
24cb1390e4 FIX Update of leave request when CSRF with token is on 
FIX Export of leave request show the number of open days
 2019-09-17 13:17:25 +02:00
gauthier
2ac8bd4e16 FIX : If we share invoice, we need to see discount created from a deposit on each entity 2019-09-17 11:59:58 +02:00
Frédéric FRANCE
a44836ae40 Update CMailFile.class.php 2019-09-17 10:15:55 +02:00
VESSILLER
3654a5d01c FIX selectFields for GROUP BY and show only if units defined 2019-09-17 10:05:35 +02:00
Frédéric FRANCE
850b9fd52a Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-17 08:24:31 +02:00
Frédéric FRANCE
e43f3a0f58 Update functions.lib.php 2019-09-16 18:07:06 +02:00
Frédéric FRANCE
5c00712c0a Update functions.lib.php 2019-09-16 17:57:40 +02:00
VESSILLER
555ea977c9 NEW Add units in select products lines 2019-09-16 15:32:31 +02:00
Laurent Destailleur
34fc04903a Introduce a logo squarred into setup (MAIN_INFO_SOCIETE_LOGO_SQUARRED, 
MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI, ...)
 2019-09-16 15:26:13 +02:00
John Botella
010e58d957 Add switch view behavior 2019-09-16 13:56:07 +02:00
Laurent Destailleur
0194f48041 Merge pull request #10795 from altatof/clonecat 
NEW : copy linked categories on product clone process
 2019-09-15 16:34:42 +02:00
Laurent Destailleur
eda17e9c54 Merge pull request #11850 from OPEN-DSI/new-stock-import-warehouse-parent 
NEW add parent id or ref column in warehouse import
 2019-09-15 15:44:33 +02:00
Laurent Destailleur
6bfba0b731 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2019-09-15 15:17:38 +02:00
Laurent Destailleur
76b3668368 FIX regression with option to hide picto on top menu 2019-09-15 15:15:59 +02:00
Laurent Destailleur
755057c99f FIX regression with option to hide picto on top menu 2019-09-15 15:15:46 +02:00
Laurent Destailleur
544a1237bc FIX regression with option to hide picto on top menu 2019-09-15 15:11:13 +02:00
Laurent Destailleur
7019e69ee2 FIX regression with option to hide picto on top menu 2019-09-15 15:09:36 +02:00
TuxGasy
e0238705cc Check if childtablesoncascade is not empty 2019-09-14 19:04:43 +02:00
Frédéric FRANCE
904d0ecaee Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-14 18:42:31 +02:00
Frédéric FRANCE
1e652a41af Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 18:41:51 +02:00
Laurent Destailleur
9f6fe0bf5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
 2019-09-14 18:27:58 +02:00
Laurent Destailleur
584549df11 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:25:31 +02:00
Laurent Destailleur
697b25aa82 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-14 18:24:00 +02:00
Laurent Destailleur
56e070cd7f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:23:20 +02:00
Frédéric FRANCE
6444c7378f Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-14 16:40:23 +02:00
Frédéric FRANCE
e5417cccd8 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:40:00 +02:00
Laurent Destailleur
1d865a250e Merge pull request #11866 from bafbes/abb100076 
fix: repetition in error message
 2019-09-14 16:39:24 +02:00
Laurent Destailleur
c015bbda14 Update ldap.class.php 2019-09-14 16:39:08 +02:00
Frédéric FRANCE
c9c7d60fc0 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:37:10 +02:00
Frédéric FRANCE
08f056a0f4 Delete interface_50_modIFTTT_IFTTT.class.php 
IFTTT has been removed
 2019-09-14 09:09:41 +02:00
Laurent Destailleur
aad6b003fb Add cache in fetch_optionnals() to avoid duplicate call to 
fetch_name_optionals_label
 2019-09-14 00:02:48 +02:00
florian HENRY
224b4c147a Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2019-09-13 15:25:25 +02:00
florian HENRY
7966bfc2df fix: fill id for links (document tab) 2019-09-13 15:25:16 +02:00
Laurent Destailleur
166d56f7a3 Removed function dol_micro_time. Use native PHP microtime instead. 2019-09-13 11:15:49 +02:00
Frédéric FRANCE
de3a67f5bd Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-12 21:52:06 +02:00
Frédéric FRANCE
0d3a2f800b fix colspan in show_project 2019-09-12 21:39:57 +02:00
ATM john
859904587f add private support and title buttons 2019-09-12 21:17:48 +02:00
Frédéric FRANCE
6f33874d75 add entity 2019-09-12 21:13:00 +02:00
Frédéric FRANCE
cd109d04cd add function 2019-09-12 20:44:24 +02:00
John Botella
7dcb871048 Fix private message type 2019-09-12 18:39:29 +02:00
Laurent Destailleur
56a99f6e6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-12 11:22:13 +02:00
florian HENRY
d6dcbc714c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-12 09:38:14 +02:00