Commit Graph

72857 Commits

Author SHA1 Message Date
wdammak
c18a8bef1b
Update eldy.lib.php
Simplifying horizontal menu writing, it would simplify menu updates in the future.
The menu table can be further simplified, it's in a 2nd step if @eldy confirms this restructuring.
Already tested and it works.
2019-01-29 19:44:59 +01:00
Laurent Destailleur
cedf1bb269 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_massactions.inc.php
2019-01-29 19:13:57 +01:00
Laurent Destailleur
205b7f2e95 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-29 19:04:40 +01:00
Laurent Destailleur
3d218cadb7 FIX last_main_doc var not saved
Conflicts:
	htdocs/core/class/commonobject.class.php
2019-01-29 19:03:45 +01:00
Laurent Destailleur
3215870ae6 FIX Exclude not required field from log 2019-01-29 19:02:34 +01:00
Laurent Destailleur
9ef93bceca FIX last_main_doc var not saved 2019-01-29 18:40:47 +01:00
Laurent Destailleur
f4ecf843ee FIX Exclude not required field from log 2019-01-29 18:30:12 +01:00
Laurent Destailleur
c6755b3cf1 Fix formatting of number in quantity field 2019-01-29 15:59:41 +01:00
Laurent Destailleur
08a181bfbf Fix substitution of REF_CLIENT and REF_SUPPLIER 2019-01-29 11:00:17 +01:00
Laurent Destailleur
43c0a2232c Fix massaction 2019-01-29 10:51:34 +01:00
Laurent Destailleur
77e322b250 Fix bad var 2019-01-29 10:49:51 +01:00
Laurent Destailleur
c84b189a05 Fix duplicate recording of event when using mass action send 2019-01-29 10:49:01 +01:00
Laurent Destailleur
f6be0f7686 Fix duplicate log when using mass action email send 2019-01-29 10:48:45 +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
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
Laurent Destailleur
46bc078481 Fix phpcs 2019-01-27 23:10:10 +01:00
Laurent Destailleur
de0a057b8a Fix div not closed 2019-01-27 19:41:14 +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
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
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
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
Laurent Destailleur
05ba397156
Merge pull request #10421 from frederic34/patch-2
correct menu
2019-01-27 17:55:23 +01:00
Laurent Destailleur
a268a13c89
Merge pull request #10423 from grandoc/new_branch_27_01_2019
fix translations
2019-01-27 17:55:05 +01:00
Laurent Destailleur
da1b12a0d0
Merge pull request #10422 from frederic34/elseif
PSR2 usage of else if is discouraged
2019-01-27 17:54:21 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Laurent Destailleur
0738e0e7cc
Merge pull request #10420 from andreubisquerra/master
Remove absolute divs and add Dolistore POS category link to TakePOS
2019-01-27 17:52:34 +01:00
Laurent Destailleur
d4daa6cebd
Merge pull request #10430 from frederic34/patch-18
typo in fournisseur.product.class.php
2019-01-27 17:51:49 +01:00
Laurent Destailleur
b07513befe
Merge pull request #10431 from frederic34/argspacing
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 17:51:24 +01:00
Laurent Destailleur
3c88816bf8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-27 17:44:13 +01:00
Laurent Destailleur
d59097f65c Fix upload of module file 2019-01-27 17:40:56 +01:00
Philippe GRAND
b8ec33d29b fix translations 2019-01-27 17:28:18 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00