Commit Graph

78950 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
a085b79993
Merge pull request #11898 from atm-maxime/patch-1
Remove bad copy / paste
2019-09-15 19:58:28 +02:00
Laurent Destailleur
4be60f9493
Merge pull request #11899 from atm-maxime/patch-2
Fix #11876
2019-09-15 19:26:00 +02:00
Laurent Destailleur
12d67c5f85 Rename api to get all purchase prices 2019-09-15 17:18:10 +02:00
Maxime Kohlhaas
48cbcdc757
Fix #11876 2019-09-15 17:08:21 +02:00
Laurent Destailleur
68a3c5b41c
Merge pull request #11853 from ptibogxiv/patch-259
NEW add supplier's product list
2019-09-15 17:04:17 +02:00
Laurent Destailleur
5d0ba10f34
Update api_products.class.php 2019-09-15 17:04:08 +02:00
Maxime Kohlhaas
5d4f702920
Remove bas copy / paste 2019-09-15 16:38:03 +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
23860b15ee Try a fix for #11852 2019-09-15 16:00:01 +02:00
Laurent Destailleur
421631f2be Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-15 15:53:45 +02:00
Laurent Destailleur
bb6853a635 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-15 15:53:15 +02:00
Laurent Destailleur
ab07da02c4 Fix scrutinizer 2019-09-15 15:53:04 +02:00
Laurent Destailleur
434ab2965a
Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy
NEW check if a resource is in use in an event
2019-09-15 15:47:07 +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
4d0ef33471 FIX #11857 2019-09-15 15:43:03 +02:00
Laurent Destailleur
cec5666257
Merge pull request #11872 from hregis/10.0_ldap
FIX an admin can not access his own permissions after enabling advanced permissions
2019-09-15 15:32:50 +02:00
Laurent Destailleur
27e3a2cb1d
Update perms.php 2019-09-15 15:32:43 +02:00
Laurent Destailleur
f5771e49d8 css 2019-09-15 15:21:52 +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
Laurent Destailleur
6c078bdcb0 Fix translation 2019-09-15 10:53:41 +02:00
Laurent Destailleur
5ba6a90acc Fix responsive 2019-09-15 10:49:40 +02:00
Laurent Destailleur
477c0e2aa4
Merge pull request #11897 from aspangaro/11.0_colorization
NEW Bank Add an option for colorize background color of debit or credit movement
2019-09-15 10:40:34 +02:00
Laurent Destailleur
f946ec0563
Merge pull request #11896 from tuxgasy/10.0_childtablesoncascade_isempty
Check if childtablesoncascade is not empty
2019-09-15 10:16:07 +02:00
Laurent Destailleur
7b56cbc334
Merge pull request #11892 from aspangaro/10.0_nowrap
Fix Bank entries - nowrap on amount
2019-09-15 10:01:06 +02:00
Alexandre SPANGARO
21e27389d4 NEW Bank Add an option for colorize background color of debit or credit movement 2019-09-14 20:58:12 +02:00
Laurent Destailleur
80f498f206 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-14 19:25:52 +02:00
Laurent Destailleur
bbb62f27c7 Update doc 2019-09-14 19:25:09 +02:00
TuxGasy
e0238705cc Check if childtablesoncascade is not empty 2019-09-14 19:04:43 +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
f45abc1b2a Removed useless header 2019-09-14 18:26:38 +02:00