Commit Graph

19498 Commits

Author SHA1 Message Date
Laurent Destailleur
f84087ba70 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-07 14:08:01 +01:00
Laurent Destailleur
1fa61077a0 FIX #12356 2019-11-07 14:07:50 +01:00
Tobias Sekan
7dc94f1761 Fix not deactivated commercial menu button 2019-11-07 13:50:25 +01:00
Scrutinizer Auto-Fixer
0b406172fd Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-07 11:59:59 +00:00
Laurent Destailleur
f1ebfb1ba7 Merge pull request #12369 from TobiasSekan/FixAccessMainMenu
Fix main menu access for only shipment rights
2019-11-07 12:55:11 +01:00
Laurent Destailleur
4f219ae0fb Fix doc 2019-11-07 11:16:59 +01:00
Laurent Destailleur
4433cff49d Merge pull request #12346 from frederic34/centpercent
100% centpercent
2019-11-07 10:39:09 +01:00
Laurent Destailleur
5b13b9f1ff Merge pull request #12358 from frederic34/patch-20
dol_hash may salt so gravatar is not working
2019-11-07 10:37:45 +01:00
Tobias Sekan
5de36b2bab Fix main menu access for only shipment rights 2019-11-07 09:48:46 +01:00
Nicolas
f18bca7687 Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument 2019-11-06 20:51:17 +01:00
Inovea Conseil
fed6ed8760 Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument 2019-11-06 20:48:24 +01:00
Laurent Destailleur
74f2983ee1 Debug modulebuilder 2019-11-06 19:38:51 +01:00
Frédéric FRANCE
a1c8e04646 dol_hash may salt so gravatar is not working 2019-11-06 07:50:21 +01:00
Laurent Destailleur
027d94d41a Revert change that create not required new lines 2019-11-06 00:51:26 +01:00
Laurent Destailleur
e885345ef7 FIX Check on duplicate profid was not triggered. 2019-11-06 00:27:36 +01:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
7c4942b7be Fix debug BOM/MO 2019-11-05 20:14:33 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
84a8d4e7cb Debug BOM/MO 2019-11-05 19:18:12 +01:00
Laurent Destailleur
204475efb9 Removed deprecated file 2019-11-05 19:10:29 +01:00
Laurent Destailleur
4c01f33228 Fix removed a debug die 2019-11-05 15:57:22 +01:00
stickler-ci
f537ae60b6 Fixing style errors. 2019-11-05 12:52:58 +00:00
Nicolas
991e1b2747 NEW Add upload document on account statement 2019-11-05 13:51:52 +01:00
Laurent Destailleur
85ce5176b5 Fix textarea to enter a ticket 2019-11-05 13:41:01 +01:00
Laurent Destailleur
7ab19ef66b Fix selection not lose if creation of vendor invoice fails 2019-11-05 13:34:25 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
4d84ee2041 Fix var not init 2019-11-05 10:15:00 +01:00
Laurent Destailleur
c0daa1e5d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-05 10:11:49 +01:00
Laurent Destailleur
9499398f86 Code syntax 2019-11-05 10:11:28 +01:00
Laurent Destailleur
57a7370f22 Merge pull request #12327 from frederic34/patch-3
config file doesn't exists
2019-11-05 10:04:01 +01:00
Laurent Destailleur
b4d72e3e96 Fix link to setup of social network module 2019-11-05 10:00:46 +01:00
Laurent Destailleur
747113551b Debug pagination of bookmark list 2019-11-05 09:52:33 +01:00
Frédéric FRANCE
d035aefd40 config file doesn't exists 2019-11-04 21:58:40 +01:00
Laurent Destailleur
1aef1c60dd Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Laurent Destailleur
562e219cc5 Merge pull request #12314 from frederic34/patch-7
add thirdparty email in box_propales
2019-11-04 20:51:57 +01:00
Laurent Destailleur
17ea978cea Merge pull request #12306 from frederic34/escpos
Escpos
2019-11-04 20:40:12 +01:00
Laurent Destailleur
c276659acd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/ticket.lib.php
2019-11-04 20:37:49 +01:00
Laurent Destailleur
e60fff39d9 Fix phpcs 2019-11-04 20:36:55 +01:00
Laurent Destailleur
0347d82660 Merge pull request #12303 from frederic34/patch-2
css
2019-11-04 20:31:02 +01:00
Laurent Destailleur
ec8bd6327d Fix css 2019-11-04 18:53:46 +01:00
Frédéric FRANCE
6ad983bb7b Merge remote-tracking branch 'upstream/develop' into escpos 2019-11-04 18:52:29 +01:00
Laurent Destailleur
6e591d2be0 Fix css 2019-11-04 18:25:32 +01:00
Laurent Destailleur
4ca85eacc1 Debug module BOM 2019-11-04 15:45:50 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
b0ea276233 Debug MO module 2019-11-04 14:13:36 +01:00
Laurent Destailleur
1f6a86e166 Fix look and feel v11 2019-11-04 13:32:34 +01:00
Laurent Destailleur
8aa2fd04ad NEW The integrity checker now show the expected size of files 2019-11-04 13:23:48 +01:00
Laurent Destailleur
d934f5e920 Fix wrap 2019-11-04 11:44:46 +01:00
Laurent Destailleur
abc6f6ccae Fix css 2019-11-04 11:43:07 +01:00
Laurent Destailleur
5497e1e103 css 2019-11-04 11:42:27 +01:00