Commit Graph

78766 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
3caa1bd43c FIX Debug feature orderstoinvoice for suppliers 2019-09-14 18:21:37 +02:00
Laurent Destailleur
bac1e7133a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-14 17:35:19 +02:00
Laurent Destailleur
844f0903da Fix missing fields 2019-09-14 17:34:57 +02:00
Laurent Destailleur
cd21d9f339 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-14 17:14:35 +02:00
Laurent Destailleur
92c6168247
Merge pull request #11858 from ptibogxiv/patch-260
FIX new invoice with generic thirdparty in takepos
2019-09-14 17:10:32 +02:00
Laurent Destailleur
4a815da993
Merge pull request #11854 from OPEN-DSI/new-formproduct-loadWarehouses-stockmin-order
NEW add minimum stock filter in load warehoues for product form
2019-09-14 17:09:27 +02:00
Laurent Destailleur
54f0532073 Work on #4432 2019-09-14 16:51:57 +02:00
Laurent Destailleur
ace9eb9b3e
Merge pull request #11870 from hregis/10.0_mc
FIX avoid non numeric warning
2019-09-14 16:39:40 +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
Laurent Destailleur
4d1d689fc8
Merge pull request #11868 from bafbes/abb100077
New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP
2019-09-14 16:37:16 +02:00
Laurent Destailleur
d380ef1812
Update usergroup.class.php 2019-09-14 16:37:07 +02:00
Laurent Destailleur
9934f73574
Update ldap_groups.php 2019-09-14 16:36:04 +02:00
Laurent Destailleur
7965804a34
Update ldap_groups.php 2019-09-14 16:35:00 +02:00
Laurent Destailleur
e7d01f98cf
Merge pull request #11890 from atm-florian/10.0
fix: fill id for links (document tab)
2019-09-14 16:33:20 +02:00
Laurent Destailleur
7aac67f79c
Merge pull request #11884 from frederic34/patch-10
fix colspan in show_project
2019-09-14 16:33:02 +02:00
Laurent Destailleur
618874a670
Merge pull request #11886 from frederic34/patch-13
Update .editorconfig
2019-09-14 16:32:50 +02:00
Laurent Destailleur
935e84d985
Merge pull request #11885 from frederic34/patch-12
Create .stickler.yml
2019-09-14 16:32:25 +02:00
Laurent Destailleur
fbb8808f29
Merge pull request #11887 from frederic34/patch-14
Update index.php
2019-09-14 16:32:11 +02:00
Laurent Destailleur
afce060a20
Merge pull request #11889 from OPEN-DSI/new-product-list-tags-multiselect
NEW multiselect with checkbox in categories/tags search for product list
2019-09-14 16:31:48 +02:00
Laurent Destailleur
6d890800e8
Merge pull request #11893 from frederic34/patch-15
Delete interface_50_modIFTTT_IFTTT.class.php
2019-09-14 16:30:47 +02:00
Laurent Destailleur
76f478dc44 Fix look and feel 2019-09-14 14:25:47 +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
Alexandre SPANGARO
4420af683d Fix Bank entries - nowrap on amount 2019-09-14 05:44:28 +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
Laurent Destailleur
4e4172dd1b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/public/payment/newpayment.php
2019-09-13 18:56:19 +02:00