Commit Graph

73226 Commits

Author SHA1 Message Date
Frédéric FRANCE
77747ac2a3
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-28 16:35:12 +01:00
Laurent Destailleur
0827929ede Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2019-01-28 16:29:34 +01:00
Laurent Destailleur
5cd60f4e26 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-28 16:27:54 +01:00
Laurent Destailleur
b726939d32 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-28 16:27:25 +01:00
Laurent Destailleur
9d1a02b0d7 Fix language 2019-01-28 16:25:37 +01:00
Laurent Destailleur
9dbf41d6b2 Fix lang format 2019-01-28 16:25:06 +01:00
Laurent Destailleur
4545c0f13a Fix lang format of en_ZA 2019-01-28 16:25:01 +01:00
Laurent Destailleur
820db4e78b Fix lang format 2019-01-28 16:22:53 +01:00
Laurent Destailleur
2dea4f01f5 Fix lang format of en_ZA 2019-01-28 16:22:36 +01:00
John BOTELLA
6f12cdf236 Fix travis 2019-01-28 11:58:16 +01:00
John BOTELLA
5dbc9ddae0 fix travis 2019-01-28 11:56:20 +01:00
John BOTELLA
9a666b265f Use an other test 2019-01-28 11:53:19 +01:00
wdammak
388efb6773
Wrapping for stock movements 2019-01-28 04:36:26 +01:00
Laurent Destailleur
1ebd7048fb Add hook in list of stripe payment mode list 2019-01-28 03:00:28 +01:00
Laurent Destailleur
273c396fb9 Fix bad function 2019-01-28 02:47:03 +01:00
Laurent Destailleur
31f4513a7e Fix bad function 2019-01-28 02:46:31 +01:00
Laurent Destailleur
4398649af6 Add hooks to add column in list of payment modes 2019-01-28 01:46:59 +01:00
Laurent Destailleur
f7bcd1ef6d Fix trans 2019-01-28 01:35:12 +01:00
Frédéric FRANCE
26dea99375
Update box_task.php 2019-01-28 00:07:38 +01:00
Frédéric FRANCE
baf274af29
wip 2019-01-27 23:51:57 +01:00
Frédéric FRANCE
764a928cd6
wip 2019-01-27 23:48:36 +01:00
Frédéric FRANCE
ff39491f15
wip 2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
46bc078481 Fix phpcs 2019-01-27 23:10:10 +01:00
andreubisquerra
e0af2a3597 Subcategories 2019-01-27 21:49:48 +01:00
Frédéric FRANCE
b2c57cb4f2
fix travis 2019-01-27 19:43:56 +01:00
Laurent Destailleur
de0a057b8a Fix div not closed 2019-01-27 19:41:14 +01:00
Philippe GRAND
dfd188a863 update with html5 compliant code 2019-01-27 19:08:43 +01:00
Philippe GRAND
d7fe291422 update with html5 compliant code 2019-01-27 19:07:10 +01:00
Philippe GRAND
fe8dee4899 update with html5 compliant code 2019-01-27 19:05:07 +01:00
Philippe GRAND
71ce7ecc99 update with html5 compliant code 2019-01-27 19:02:35 +01:00
Philippe GRAND
f34c44353e Merge remote-tracking branch 'upstream/develop' into new_branch_27_01_2019 2019-01-27 18:56:56 +01:00
Philippe GRAND
9fe41041e6 update with html5 compliant code 2019-01-27 18:39:53 +01:00
Laurent Destailleur
ecc30b8ffe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2019-01-27 18:27:58 +01:00
Laurent Destailleur
97545af1fd Translation 2019-01-27 18:26:18 +01:00
Philippe GRAND
8d4005047b update with html5 compliant code 2019-01-27 18:25:46 +01:00
Philippe GRAND
f0067be9ee update with html5 compliant code 2019-01-27 18:21:20 +01:00
Philippe GRAND
19cfb563cf update with html5 compliant code 2019-01-27 18:19:29 +01:00
Philippe GRAND
448d8fc4ea Merge remote-tracking branch 'upstream/develop' into new_branch_27_01_2019 2019-01-27 18:16:49 +01:00
Laurent Destailleur
c291450a07 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-27 18:13:28 +01:00
Laurent Destailleur
7a7fd657ed Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-27 18:13:20 +01:00
Philippe GRAND
b3ecff2a83 update with html5 compliant code 2019-01-27 18:12:48 +01:00
Laurent Destailleur
a78db45178 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-27 18:12:36 +01:00
Laurent Destailleur
56838bc659 Fix missing field into migration 2019-01-27 18:11:18 +01:00
Laurent Destailleur
c33860cfab
Merge pull request #10368 from ptibogxiv/patch-91
NEW thirdparty in donation if option ON
2019-01-27 18:07:46 +01:00
Laurent Destailleur
12e75cb8c9
Merge pull request #10401 from aspangaro/10.0_accountancy2
NEW: Automatically binding for intra/export accountancy code in customer list
2019-01-27 18:06:08 +01:00
Laurent Destailleur
c467625781
Merge pull request #10429 from frederic34/patch-17
do not trim int, use cast
2019-01-27 18:00:52 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
d1befcb1ba
Merge pull request #10427 from EuskalMoneta/develop
NEW Get the list of groups of a user with the REST API.
2019-01-27 17:58:09 +01:00
Laurent Destailleur
3e78807cbc
Merge pull request #10424 from EuskalMoneta/7.0
FIX 'statut' is ignored when updating a user with the REST API.
2019-01-27 17:56:14 +01:00