Commit Graph

81180 Commits

Author SHA1 Message Date
ptibogxiv
c01ab4ab53 Update adherent_type.class.php 2019-09-17 13:53:34 +02:00
ptibogxiv
cff6da34df Create traduction.php 2019-09-17 13:53:06 +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
Frédéric FRANCE
5e7b7bbc33 Update eldy.lib.php 2019-09-17 13:31:45 +02:00
Laurent Destailleur
214bf4375e Fix missing include 2019-09-17 13:28:36 +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
Laurent Destailleur
41a2a25729 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/ligne.php
2019-09-17 12:23:58 +02:00
Laurent Destailleur
90850c4d31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-17 12:20:23 +02:00
Laurent Destailleur
ab9dee631b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-17 12:20:05 +02:00
Laurent Destailleur
64c53e2e85 Fix "project i am contact for" filter 2019-09-17 12:19:33 +02:00
Laurent Destailleur
b53293d84d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-17 12:18:38 +02:00
Laurent Destailleur
a91f39ea3e FIX selection of project i am contact of. 2019-09-17 12:18:29 +02:00
Laurent Destailleur
d3b17f4f2d FIX form not closed. 2019-09-17 12:08:33 +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
Ferran Marcet
81d8055a9c New: Load invoices only if showed 2019-09-17 09:43:15 +02:00
Ferran Marcet
3f25a8d8d5 New: Load invoices only if showed 2019-09-17 09:38:08 +02:00
Ferran Marcet
e4984492b3 Dejarlo igual que develop 2019-09-17 09:32:43 +02:00
Ferran Marcet
c48fc3a2cf Merge branch 'developup' into develop
# Conflicts:
#	htdocs/compta/facture/fiche-rec.php
#	htdocs/install/mysql/migration/9.0.0-10.0.0.sql
2019-09-17 09:27:42 +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
155e8fb500 fix syntax 2019-09-17 08:18:01 +02:00
Frédéric FRANCE
0d63c43ccd add doaction to actioncommcard 2019-09-17 08:15:01 +02:00
Frédéric FRANCE
ecac1f9f40 wip 2019-09-17 08:02:55 +02:00
Frédéric FRANCE
a2d3cde291 some update after night 2019-09-17 07:59:46 +02:00
Laurent Destailleur
78386871f3 css 2019-09-17 03:33:58 +02:00
Frédéric FRANCE
fb7ef3cefc Update card.php 2019-09-16 23:12:11 +02:00
Frédéric FRANCE
f369c1a80a Update card.php 2019-09-16 20:59:13 +02:00
Frédéric FRANCE
67b73cf0e6 Update actioncomm.class.php 2019-09-16 20:57:20 +02:00
Laurent Destailleur
68842b0b63 Fix css for company logo in top menu 2019-09-16 19:08:45 +02:00
Laurent Destailleur
8d79404914 Fix css for responsive 2019-09-16 18:40:58 +02:00
Laurent Destailleur
e3480780cf Fix label on "Connect" button on Simple POS module 2019-09-16 18:31:40 +02:00
Laurent Destailleur
5233e7d8ad FIX do not output return code on screen after a select of bank account 2019-09-16 18:29:04 +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
John Botella
872f5ed85f fix_missing_expedition_table_line_tag 2019-09-16 16:49:08 +02:00
madx666
8d7d14c730 Fix return to list on page 1
When are on page 1 on any list and we go on an object, when return to the list, we are back on page 0
2019-09-16 15:39:58 +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
Laurent Destailleur
36326fa5c0 Add squarre logo 2019-09-16 15:18:35 +02:00
John Botella
010e58d957 Add switch view behavior 2019-09-16 13:56:07 +02:00
Daniel Seichter
1c5a5eb593 Added hint for setting up database (issue #11815) 2019-09-16 13:24:21 +02:00
Laurent Destailleur
23777fd5ff Fix css 2019-09-16 11:19:02 +02:00
Laurent Destailleur
abee6dceaa Fix css demo 2019-09-16 11:16:58 +02:00
Laurent Destailleur
f5dd4f4f9e css 2019-09-16 11:08:34 +02:00
Laurent Destailleur
edbf8f0186 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-16 11:01:21 +02:00
Laurent Destailleur
eb70411ae0 Css demo 2019-09-16 11:01:09 +02:00
VESSILLER
6e806a5aed FIX empty cache when we want to load specific warehouses in select 2019-09-16 10:37:55 +02:00
Laurent Destailleur
ccd468149b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-16 10:24:53 +02:00
Laurent Destailleur
4db6badfc2 Fix link when no title in search of website content 2019-09-16 10:24:41 +02:00