Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
78,773 Commits 35 Branches 179 Tags 1.7 GiB
cb8cfef7b1
Commit Graph

69070 Commits

Author SHA1 Message Date
Frédéric FRANCE
cb8cfef7b1
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-23 08:02:49 +02:00
Laurent Destailleur
3faca1dbd1 Enhancement for SCA 2019-09-22 21:09:01 +02:00
Laurent Destailleur
b30c55a2ee CSS 2019-09-19 23:40:38 +02:00
Laurent Destailleur
76cc40973d Fix icon size 2019-09-19 12:51:40 +02:00
Frédéric FRANCE
61e358bb9d
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-18 21:23:26 +02:00
Laurent Destailleur
2286cc2a5f Fix autojump when 1 record found 2019-09-18 20:16:39 +02:00
Laurent Destailleur
a43253eab8 Fix for deposit not correctly closed 2019-09-17 18:49:56 +02:00
Laurent Destailleur
3f6afa810c Code comment 2019-09-17 17:55:30 +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
a91f39ea3e FIX selection of project i am contact of. 2019-09-17 12:18:29 +02:00
Frédéric FRANCE
850b9fd52a
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-17 08:24:31 +02:00
Laurent Destailleur
78386871f3 css 2019-09-17 03:33:58 +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
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
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
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
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
Frédéric FRANCE
ff77d613fb
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-15 11:24:13 +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