Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,062 Commits 36 Branches 189 Tags
2c7029850aadb9106ee5341f11f079dda48c0fd6
Commit Graph

68062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2c7029850a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
	htdocs/website/index.php
 2018-07-21 20:28:26 +02:00
Laurent Destailleur
1d8c42265c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modFacture.class.php
 2018-07-21 20:26:19 +02:00
Laurent Destailleur
a1180f79bd Fix missing customer code and ref customer 2018-07-21 12:56:18 +02:00
Laurent Destailleur
f419964c76 Fix Debug website module 2018-07-20 15:01:50 +02:00
Laurent Destailleur
8247bb683c Debug website module 2018-07-19 21:35:21 +02:00
Laurent Destailleur
445db58966 FIX website in inline edit mode 2018-07-19 16:06:48 +02:00
Laurent Destailleur
e362a0e9df FIX website in inline edit mode 2018-07-19 16:06:06 +02:00
Laurent Destailleur
efa5cdeab1 More complete list of allowed html tags 2018-07-19 15:24:48 +02:00
Laurent Destailleur
5523312f87 Fix missing email 2018-07-18 15:36:07 +02:00
Laurent Destailleur
7273cb97b2 Fix trans 2018-07-18 14:32:51 +02:00
Laurent Destailleur
38de5a8f2a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-18 14:25:19 +02:00
Laurent Destailleur
bef777e19d Fix default order for bank entry list 2018-07-18 14:24:58 +02:00
Laurent Destailleur
19bb8a5091 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/accountancy.lang
 2018-07-18 14:12:28 +02:00
Laurent Destailleur
33d67ea332 Fix ref on list 2018-07-18 14:09:44 +02:00
Laurent Destailleur
4beca8d989 Fix restore look and feel 2018-07-18 13:00:38 +02:00
Laurent Destailleur
6ad0cd37b0 Translation 2018-07-18 11:57:49 +02:00
Laurent Destailleur
66f9153490 Fix css 2018-07-18 11:33:53 +02:00
Laurent Destailleur
f60e04dcb4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-17 22:33:36 +02:00
Laurent Destailleur
cecb0f8829 Fix missing lib 2018-07-17 22:33:20 +02:00
Laurent Destailleur
4b044779dc Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-17 22:31:58 +02:00
Laurent Destailleur
969aea98e1 Fix label of copy must not be same 2018-07-17 22:31:28 +02:00
Laurent Destailleur
47cb1f920e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-17 21:43:08 +02:00
Laurent Destailleur
7662f8f25c Fix balance 2018-07-17 21:39:41 +02:00
Laurent Destailleur
c68b9493e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-17 21:21:20 +02:00
Laurent Destailleur
a7853211d6 Fix balance when sorting of value date desc 2018-07-17 21:20:38 +02:00
Laurent Destailleur
45b298a5d0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-07-17 18:17:36 +02:00
Laurent Destailleur
34c2facff1 Fix missing link on bank account 2018-07-17 18:16:30 +02:00
Laurent Destailleur
7dc552a54e Fix alignement 2018-07-17 18:10:42 +02:00
Laurent Destailleur
cbc4a04465 Fix nowrap on smartphone 2018-07-17 18:05:49 +02:00
Laurent Destailleur
26507ee712 Code comment 2018-07-17 14:02:08 +02:00
Laurent Destailleur
7fcec5f6c3 Fix duplicate tab "contact" on thirdparty 2018-07-17 13:54:13 +02:00
Laurent Destailleur
8249179fb8 Fix duplicate tab "contact" on thirdparty 2018-07-17 13:50:26 +02:00
Laurent Destailleur
d4a5491753 Fix duplicate tab "contact" on thirdparty 2018-07-17 13:48:08 +02:00
Laurent Destailleur
508133b336 Clean code 2018-07-17 13:04:54 +02:00
Laurent Destailleur
651ba74007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-16 15:45:50 +02:00
Laurent Destailleur
f747cefda3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-16 15:44:44 +02:00
Laurent Destailleur
45a45b0dec NEW Can enable a module, even external module, from command line 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-16 15:35:00 +02:00
Laurent Destailleur
e5f2fbf8db Fix trans 2018-07-16 15:21:29 +02:00
Laurent Destailleur
8df834bd2a Debug module ticket 2018-07-16 12:13:34 +02:00
Laurent Destailleur
37e16b5ff2 Trans 2018-07-16 11:55:59 +02:00
Laurent Destailleur
41605ed4a7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-07-16 11:29:47 +02:00
Laurent Destailleur
e92ab19a06 Fix var not defined 2018-07-16 11:26:23 +02:00
Laurent Destailleur
c477ca8266 Fix scrutinizer 2018-07-16 11:25:21 +02:00
Laurent Destailleur
4128cee3ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-16 11:21:29 +02:00
Laurent Destailleur
e3d9e609d5 Fix var not defined 2018-07-16 11:20:54 +02:00
Laurent Destailleur
d3cc2c81eb Better detail for time elapsed 2018-07-16 11:14:39 +02:00
Laurent Destailleur
89cc048fff FIX Init of contact in combo list when thirdparty not yet known 2018-07-16 10:46:10 +02:00
Laurent Destailleur
c94437c3cf Fix file in wrong dir 2018-07-16 10:14:51 +02:00
Laurent Destailleur
35ed89a517 Fix scrutinizer 2018-07-16 10:11:52 +02:00
Laurent Destailleur
76c6f28d85 Merge pull request #9035 from grandoc/new_branch_29_06_2018 
update code
 2018-07-16 10:09:46 +02:00