2
0
forked from Wavyzz/dolibarr
Commit Graph

69068 Commits

Author SHA1 Message Date
Laurent Destailleur
1e5276f420 Merge pull request #8871 from el00ruobuob/patch-1
Update main.inc.php with charset
2018-05-29 10:48:54 +02:00
Laurent Destailleur
6b8b173cc3 Merge pull request #8869 from frederic34/patch-13
Update llx_paiementfourn.sql #8723
2018-05-29 10:47:29 +02:00
Laurent Destailleur
4b58158588 Update 7.0.0-8.0.0.sql 2018-05-29 10:47:14 +02:00
Laurent Destailleur
18898558e4 Merge branch 'develop' into patch-13 2018-05-29 10:46:28 +02:00
Laurent Destailleur
fe2795d7f9 Merge pull request #8867 from ptibogxiv/patch-28
Fix error in list.php
2018-05-29 10:45:13 +02:00
Laurent Destailleur
bf480b27f0 Merge pull request #8865 from frederic34/patch-11
Update admin.php for variant
2018-05-29 10:44:56 +02:00
Laurent Destailleur
285e74668b Merge pull request #8864 from frederic34/patch-10
Fix Travis
2018-05-29 10:44:16 +02:00
Laurent Destailleur
b3cfed3d04 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-29 10:22:04 +02:00
Laurent Destailleur
01c8b33483 FIX 8870 2018-05-29 10:18:45 +02:00
Laurent Destailleur
7b824e3c48 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-29 10:13:48 +02:00
Laurent Destailleur
7eea70ebc8 FIX #8858 #8860 Backport better compatibility fix 2018-05-29 10:13:34 +02:00
Laurent Destailleur
323bf6ef1f Merge pull request #8873 from frederic34/loadlangs
loadlangs
2018-05-29 10:07:10 +02:00
Laurent Destailleur
21dab0d8ee Merge pull request #8866 from frederic34/patch-12
Fix Travis for 7.0
2018-05-29 10:04:38 +02:00
Laurent Destailleur
f83dedf1b0 Fix space/tab 2018-05-29 10:04:20 +02:00
Laurent Destailleur
b9682660d6 Merge pull request #8834 from Oeris/develop
NEW : adds billing contacts ids to REST API returns
2018-05-29 10:01:42 +02:00
Laurent Destailleur
0f50b0ffb1 Code comment 2018-05-29 10:00:08 +02:00
Marc de Lima Lucio
ea9e833ab8 FIX: missing parenthesis 2018-05-28 15:03:24 +02:00
florian HENRY
16503fee58 fix commend list 2018-05-28 10:46:47 +02:00
Neil Orley
748be12da2 Get external contacts ids instead of BILLING contacts ids. 2018-05-28 09:42:24 +02:00
Neil Orley
4ad1f81ea9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2018-05-28 09:30:21 +02:00
wdammak
9ec6387a63 Add movement generateDocument function (mode dev) 2018-05-28 05:21:53 +01:00
Frédéric FRANCE
055508f343 remove one warning 2018-05-27 20:56:45 +02:00
Laurent Destailleur
5da89e1cad Remove log 2018-05-27 19:33:46 +02:00
Laurent Destailleur
f3f252e88b Fix duplicate record before creating primary key 2018-05-27 19:31:03 +02:00
Frédéric FRANCE
8bfe70899f phpcs 2018-05-27 18:52:31 +02:00
Frédéric FRANCE
5c8f966898 Merge remote-tracking branch 'upstream/develop' into loadlangs 2018-05-27 18:41:17 +02:00
Laurent Destailleur
3f489ee3c6 Fix look and feel v7 for popup on ref of social contributions payments 2018-05-27 17:58:32 +02:00
Frédéric FRANCE
7eabc612e2 limit length of lines to 500 chars 2018-05-27 15:53:18 +02:00
Frédéric FRANCE
e2a557aadd limit length of lines to 500 chars 2018-05-27 15:04:12 +02:00
Frédéric FRANCE
a0055174c4 loadlangs 2018-05-27 09:58:23 +02:00
Frédéric FRANCE
84f2b31d46 loadlangs 2018-05-27 09:40:17 +02:00
Frédéric FRANCE
4d5c28b597 loadlangs 2018-05-27 09:27:09 +02:00
Frédéric FRANCE
ca9749eecc Delete config 2018-05-27 00:32:41 +02:00
Frédéric FRANCE
753ba7ee17 Update assets_extrafields.php 2018-05-27 00:16:44 +02:00
Frédéric FRANCE
ec7516728d Update assets_type_extrafields.php 2018-05-27 00:15:46 +02:00
Frédéric FRANCE
03bfb9a941 Update setup.php 2018-05-27 00:14:43 +02:00
Frédéric FRANCE
022d457284 loadlangs 2018-05-27 00:06:49 +02:00
Frédéric FRANCE
d986909109 loadlangs 2018-05-26 23:52:52 +02:00
Frédéric FRANCE
622c394283 loadlangs 2018-05-26 21:11:25 +02:00
Frédéric FRANCE
f5605bdd7d loadlangs 2018-05-26 20:51:17 +02:00
Frédéric FRANCE
30a3b95368 loadlangs 2018-05-26 20:32:23 +02:00
Frédéric FRANCE
f24a6ed4d6 loadlangs 2018-05-26 19:03:41 +02:00
Frédéric FRANCE
67e0abdd66 loadlangs 2018-05-26 18:52:14 +02:00
Frédéric FRANCE
f53f7bbf40 loadlangs 2018-05-26 18:41:16 +02:00
Frédéric FRANCE
58e5715ac3 loadlangs 2018-05-26 17:57:30 +02:00
Frédéric FRANCE
812b182680 loadlangs 2018-05-26 17:04:23 +02:00
Frédéric FRANCE
e87ff4d9b0 loadlangs 2018-05-26 16:24:54 +02:00
Frédéric FRANCE
9cd7bb3f58 loadlangs 2018-05-26 16:03:19 +02:00
Frédéric FRANCE
0a90f2d690 loadlangs 2018-05-26 15:50:03 +02:00
Frédéric FRANCE
cbed5c8349 loadlangs 2018-05-26 15:41:32 +02:00