2
0
forked from Wavyzz/dolibarr
Commit Graph

7052 Commits

Author SHA1 Message Date
Laurent Destailleur
fa4467fb5f FIX Tooltip on click was ko on smartphone 2019-03-09 18:37:07 +01:00
Frédéric FRANCE
b47a54c652 update doc in commonobject class 2019-03-09 18:05:48 +01:00
Laurent Destailleur
c6d7987b57 FIX method db->active does not exists 2019-03-09 01:06:07 +01:00
Laurent Destailleur
73b359c124 Fix class visibility 2019-03-09 00:54:10 +01:00
Laurent Destailleur
fb5757a633 Merge pull request #10775 from frederic34/fourn-html5
replace html by html5 in fourn
2019-03-08 19:36:11 +01:00
Laurent Destailleur
86f4e81a6e Merge pull request #10773 from frederic34/patch-2
Update stats.class.php
2019-03-08 19:33:40 +01:00
Laurent Destailleur
ebc2289292 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-07 20:53:16 +01:00
Laurent Destailleur
0798f7b719 NEW Can upload files from the edit page of expense report 2019-03-07 20:53:03 +01:00
Frédéric FRANCE
d96cc53f97 replace html by html5 in fourn 2019-03-07 20:46:38 +01:00
Frédéric FRANCE
1917adb980 Update stats.class.php
The property _lastfetchdate is declared private in Stats and cannot be accessed from this context.
2019-03-07 17:35:02 +01:00
Laurent Destailleur
4ecc1dac56 Merge pull request #10756 from altatof/fp2
NEW : add constant DISPLAY_DISCOUNTED_SUPPLIER_PRICE
2019-03-07 17:29:10 +01:00
John BOTELLA
97544e0aea add new dolGetStatus to LibStatut in common invoice class 2019-03-07 15:24:11 +01:00
Laurent Destailleur
8d0a8d8263 Merge pull request #10758 from altatof/lf
NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER
2019-03-07 14:18:26 +01:00
Laurent Destailleur
daaa4ca0c2 Merge pull request #10749 from frederic34/PSR2.Classes.PropertyDeclaration.VarUsed
PSR2.Classes.PropertyDeclaration.VarUsed
2019-03-07 12:49:13 +01:00
Laurent Destailleur
8ffab05f67 Merge pull request #10759 from altatof/ml
NEW : sort list of models alphabetically
2019-03-07 12:47:50 +01:00
Laurent Destailleur
fc87090669 Merge pull request #10764 from frederic34/patch-7
New format type 5 for email
2019-03-07 12:33:24 +01:00
Laurent Destailleur
a426c8e9bf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/filefunc.inc.php
	htdocs/install/upgrade2.php
	htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
Frédéric FRANCE
d39b600ff4 Update CMailFile.class.php 2019-03-06 20:29:58 +01:00
Christophe Battarel
8f8fe0648e fix bad copy paste 2019-03-06 17:24:50 +01:00
Christophe Battarel
4382a26c87 sort list of models alphabetically 2019-03-06 17:21:44 +01:00
Christophe Battarel
ceab55f26b NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER 2019-03-06 17:07:51 +01:00
Christophe Battarel
4e533b2a91 better constant test 2019-03-06 16:41:28 +01:00
Christophe Battarel
d3bb9d2cc2 add contant DISPLAY_DISCOUNTED_SUPPLIER_PRICE 2019-03-06 16:37:02 +01:00
Frédéric FRANCE
2745f98644 PSR2.Classes.PropertyDeclaration.VarUsed 2019-03-05 22:10:46 +01:00
gauthier
598d1fc914 FIX : extrafields always visible on view mode 2019-03-05 16:53:36 +01:00
Laurent Destailleur
bbbffae72b Fix phpcs 2019-03-05 16:27:19 +01:00
Laurent Destailleur
b851911708 Dolibarize module ticket 2019-03-05 12:18:46 +01:00
Laurent Destailleur
99e79d1750 Fix regression with private property 2019-03-04 14:11:07 +01:00
Laurent Destailleur
ca9449c70e Work on BOM 2019-03-04 14:01:30 +01:00
Laurent Destailleur
15a6da1a8c Fix alignement css 2019-03-03 17:03:09 +01:00
Laurent Destailleur
a5711a51ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php
2019-03-02 18:30:17 +01:00
Frédéric FRANCE
8c23b41f9a autoloader for egulias lib needed by swiftmailer 2019-03-02 14:32:52 +01:00
Frédéric FRANCE
796ea6f4ea add visibility 2019-02-28 23:19:58 +01:00
Frédéric FRANCE
4f9e35f350 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-28 20:48:23 +01:00
Laurent Destailleur
7606c73fd5 Merge pull request #10704 from iouston/patch-1
NEW add hidden option MAIN_DOC_UPLOAD_NOT_RENAME_BY_DEFAULT
2019-02-28 11:18:12 +01:00
Laurent Destailleur
c240c66789 Update html.formfile.class.php 2019-02-28 11:17:43 +01:00
Frédéric FRANCE
cc1ee2d883 add visibility 2019-02-27 23:55:18 +01:00
wdammak
8e8c68345a phpcs simplification 2019-02-27 21:41:55 +01:00
Frédéric FRANCE
9b165f6b3f add visibility 2019-02-27 20:45:07 +01:00
Laurent Destailleur
b3fb0eaf5b Merge branch 'develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 15:48:31 +01:00
Laurent Destailleur
3bffa69f1d Remove deprecated code 2019-02-27 15:23:56 +01:00
Laurent Destailleur
836eff1233 Merge pull request #10698 from wdammak/patch-32
Add parent establishment
2019-02-27 13:34:50 +01:00
Laurent Destailleur
f2dc687202 Update html.formfile.class.php 2019-02-27 13:26:37 +01:00
iouston
d1716babef disable the auto renaming on upload
add a global variable for disable the auto renaming on upload file
corresponds to the request of this post : https://www.dolibarr.fr/forum/12-howto--aide/55094-fichiers-joints-decocher-la-case-sauver-sous#107392
2019-02-27 11:17:33 +01:00
atm-quentin
7f68750ec9 FIX blank space travis 2019-02-27 09:23:15 +01:00
atm-quentin
f51b89def3 NEW supplier buyprice barcode 2019-02-27 09:22:34 +01:00
Frédéric FRANCE
5a4ac82880 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 08:23:29 +01:00
wdammak
64bd995978 Fix camelCase syntax and remove disabling of phpcs 2019-02-27 04:02:11 +01:00
Laurent Destailleur
401f587868 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/boxes/box_project.php
2019-02-27 02:27:33 +01:00
Laurent Destailleur
cbaa57b1e2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-27 02:25:42 +01:00