Commit Graph

80590 Commits

Author SHA1 Message Date
Laurent Destailleur
31936a0ffe
Merge pull request #12304 from frederic34/patch-3
css
2019-11-04 20:54:02 +01:00
Laurent Destailleur
bdbec58461
Merge pull request #12309 from ptibogxiv/patch-274
NEW change duration membertype
2019-11-04 20:53:42 +01:00
Laurent Destailleur
6857e0d7a7
Merge pull request #12312 from frederic34/patch-5
fix
2019-11-04 20:52:42 +01:00
Laurent Destailleur
1f42d66793
Merge branch 'develop' into patch-5 2019-11-04 20:52:36 +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
149fcfbe3c
Merge pull request #12322 from frederic34/patch-8
Fix external/internal status in user tooltip list
2019-11-04 20:51:38 +01:00
Laurent Destailleur
e61f28ed17
Merge pull request #12318 from grandoc/new_branch_04_11_2019
fix translation
2019-11-04 20:50:58 +01:00
Laurent Destailleur
17ea978cea
Merge pull request #12306 from frederic34/escpos
Escpos
2019-11-04 20:40:12 +01:00
Laurent Destailleur
4566159e69
Merge pull request #12313 from frederic34/patch-6
Update list.php
2019-11-04 20:38:21 +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
Frédéric FRANCE
5e9b02955b
Merge branch 'develop' into patch-5 2019-11-04 20:33:02 +01:00
Laurent Destailleur
0347d82660
Merge pull request #12303 from frederic34/patch-2
css
2019-11-04 20:31:02 +01:00
Frédéric FRANCE
d59b0a33f3
Fix external/internal status in user tooltip list 2019-11-04 20:16:34 +01:00
Laurent Destailleur
dbb90914bc Better Trans 2019-11-04 19:53:27 +01:00
Laurent Destailleur
5d41268d1e CSS 2019-11-04 19:28:04 +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
1e44d4ec83 Fix css 2019-11-04 18:38:49 +01:00
Laurent Destailleur
6e591d2be0 Fix css 2019-11-04 18:25:32 +01:00
Laurent Destailleur
a0db0fccbe Debug BOM 2019-11-04 15:56:45 +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
stickler-ci
4480d7dd88 Fixing style errors. 2019-11-04 14:09:43 +00:00
Philippe GRAND
2909f8141e fix translation 2019-11-04 15:08:43 +01:00
Laurent Destailleur
e67a1a8118 Debug 2019-11-04 14:20:42 +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
e2bae297ea Look and feel v11 2019-11-04 13:27:01 +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
Laurent Destailleur
666e60a883 Responsive 2019-11-04 11:40:54 +01:00
Laurent Destailleur
1053112843 css 2019-11-04 11:07:08 +01:00
Laurent Destailleur
ed3f95b4a6 Responsive 2019-11-04 10:55:08 +01:00
Frédéric FRANCE
60198190fc
Update box_propales.php 2019-11-03 23:55:04 +01:00
Frédéric FRANCE
317ba9c047
Merge remote-tracking branch 'upstream/develop' into escpos 2019-11-03 23:49:36 +01:00
Frédéric FRANCE
0de1c5b69d
Update list.php
Invalid argument supplied for foreach() in /htdocs/asset/list.php on line 410
2019-11-03 23:29:28 +01:00
Laurent Destailleur
4909a21f8a Fix css 2019-11-03 22:09:20 +01:00
Frédéric FRANCE
c580aab543
wip 2019-11-03 20:13:01 +01:00
Frédéric FRANCE
877f40a1c8
price 2019-11-03 20:07:11 +01:00
Frédéric FRANCE
fecc9e86a5
wip 2019-11-03 19:55:56 +01:00
Laurent Destailleur
f242cf4cc1 Debug modulebuilder 2019-11-03 19:15:32 +01:00
Frédéric FRANCE
06021b23a3
wip 2019-11-03 19:04:18 +01:00
Laurent Destailleur
99a4781a42 Fix better support for multicurrency for template invoices 2019-11-03 18:58:26 +01:00
Frédéric FRANCE
f25196dcdc
wip 2019-11-03 18:27:36 +01:00
Frédéric FRANCE
b8202f6ed4
wip 2019-11-03 18:15:24 +01:00
Frédéric FRANCE
2da87bcdc7
Update UserTest.php 2019-11-03 17:52:58 +01:00
Laurent Destailleur
630a150b09 Fix multicurrency rate must be visible if currency differs only 2019-11-03 17:48:16 +01:00