Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

17941 Commits

Author SHA1 Message Date
a-schild
c38e29185c Fix for #11783 2019-08-29 09:43:49 +02:00
Laurent Destailleur
77dfc19389 Try to compile css with lessc 2019-08-29 04:38:24 +02:00
Laurent Destailleur
6420a32395 Fix to reduce effect of Deny Of Service attacks 2019-08-29 03:54:31 +02:00
Laurent Destailleur
641a50a58b Fix to reduce effect of Deny Of Service attacks 2019-08-29 03:52:29 +02:00
Laurent Destailleur
0a1a930bfe Fix to reduce effect of Deny Of Service attacks 2019-08-29 03:51:58 +02:00
Laurent Destailleur
ff7c122b6d Add class specific to web page ref 2019-08-29 02:36:32 +02:00
Laurent Destailleur
76ae0cebd6 We don't need anymore code to manage dol_use_jmobile = 3 or 4 2019-08-29 01:32:10 +02:00
Laurent Destailleur
c10f755619 Fix compatibility with old multicompany modules 2019-08-29 00:19:46 +02:00
Laurent Destailleur
76e8384f09 NEW Add option multiselect for developers on the selector of language. 2019-08-28 16:06:19 +02:00
Laurent Destailleur
85016a7a45 Fix bad error when module not enabled 2019-08-28 13:12:43 +02:00
Laurent Destailleur
b05b3e897f Fix bad error when module not enabled 2019-08-28 13:11:51 +02:00
Laurent Destailleur
c0262f1e19 Fix type integer 2019-08-28 12:24:56 +02:00
Laurent Destailleur
9109eeaa77 Fix type integer 2019-08-28 12:24:35 +02:00
Laurent Destailleur
7236df37d4 FIX error management when adding a property with type real 2019-08-28 12:16:59 +02:00
Laurent Destailleur
ed42f59201 FIX error management when adding a property with type real 2019-08-28 12:10:28 +02:00
Laurent Destailleur
e3a4ad00d7 Code comment 2019-08-28 10:22:40 +02:00
Laurent Destailleur
04e11bcbd1 Doxygen 2019-08-27 20:35:42 +02:00
Laurent Destailleur
4ceb3c2e85 Add context 'ws' for web services authentication. 2019-08-27 20:35:06 +02:00
Laurent Destailleur
bb893fd3a8 FIX Missing the filter fields in export of expense report and leaves 2019-08-27 18:16:34 +02:00
Laurent Destailleur
bbda4269b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 17:55:21 +02:00
Laurent Destailleur
e09223ed4d FIX #11702 2019-08-27 17:52:46 +02:00
Tim Otte
5abfc04900 Merge branch 'develop' into develop 2019-08-27 16:37:41 +02:00
Alexandre SPANGARO
47b9af09a5 Fix stickler 2019-08-27 16:37:14 +02:00
Tim Otte
75152cb210 Added odt support to supplier orders 2019-08-27 16:22:16 +02:00
Maxime Kohlhaas
9c09876bd4 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_choose_lines_from_origin 2019-08-27 14:33:34 +02:00
Maxime Kohlhaas
4bd806ea65 Move $selectedlines to parameter 2019-08-27 14:33:28 +02:00
Alexandre SPANGARO
958361b45e Merge branch 'develop' into 11.0_digitaria 2019-08-27 14:11:27 +02:00
Alexandre SPANGARO
d7f8df2e45 NEW Digitaria model for numbering accountancy thirdparty 2019-08-27 14:03:33 +02:00
Laurent Destailleur
442793aa65 Merge pull request #11755 from jtraulle/stickler-ci 
Add .stickler.yml config file
 2019-08-27 12:39:50 +02:00
Laurent Destailleur
69688a22e0 Merge 2019-08-27 12:33:42 +02:00
Laurent Destailleur
22719b90b6 Fix remove warning 2019-08-27 12:31:15 +02:00
Laurent Destailleur
36c936357c Add phpunit testDolStringIsGoodIso 2019-08-27 12:25:24 +02:00
John Botella
c2f570ae60 FIX: remove disabled product type from product list 2019-08-27 11:54:20 +02:00
Laurent Destailleur
20f61fb9be Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 11:43:07 +02:00
Laurent Destailleur
9fb06b1e7e Fix phpcs 2019-08-27 11:42:18 +02:00
Jean Traullé
dd1e7bbc3d Merge branch 'develop' into stickler-ci 2019-08-27 08:52:33 +02:00
Jean Traullé
0702ef4e0f Fix CI (code style) 2019-08-27 08:43:58 +02:00
Laurent Destailleur
b1479e5787 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 03:41:27 +02:00
Laurent Destailleur
63dcef710e Fix phpcs 2019-08-27 03:41:02 +02:00
Laurent Destailleur
a77c8023dc Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 03:23:59 +02:00
Laurent Destailleur
4fb36ce84d Fix phpcs 2019-08-27 03:22:58 +02:00
Laurent Destailleur
290766acaa Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-26 23:57:15 +02:00
Laurent Destailleur
783c69c618 Merge pull request #11756 from ptibogxiv/patch-245 
Fix lang for "nature" in contact
 2019-08-26 22:51:23 +02:00
Laurent Destailleur
4b5d9e44b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-26 22:47:33 +02:00
Laurent Destailleur
45ff873064 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/html.form.class.php
 2019-08-26 22:44:49 +02:00
Laurent Destailleur
b6db04a727 Fix add missing filter on entity on stock listing for product combo 2019-08-26 22:42:04 +02:00
Laurent Destailleur
76bd9a09a6 FIX #11570 2019-08-26 22:34:41 +02:00
ptibogxiv
ad38478fc6 Fix lang for "nature" in contact 2019-08-26 20:01:05 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
7c5fc9f3f8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-26 16:43:33 +02:00