Commit Graph

86087 Commits

Author SHA1 Message Date
andreubisquerra
8530db6dab
Fix travis 2020-05-03 00:09:17 +02:00
andreubisquerra
32923daa9d
Fix travis 2020-05-03 00:07:52 +02:00
andreubisquerra
ac75cf318e
Fix travis 2020-05-03 00:07:04 +02:00
andreubisquerra
35713ef004
Fix travis 2020-05-03 00:05:59 +02:00
jove@bisquerra.com
81c808692e NEW Bar Restaurant tab and Auto order 2020-05-02 22:00:04 +02:00
Laurent Destailleur
518853bb96 Add image 2020-05-02 18:37:34 +02:00
Laurent Destailleur
99d7cb72a1 Fix duplicate 2020-05-02 15:40:23 +02:00
Laurent Destailleur
48e62eca0c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-02 15:19:09 +02:00
Laurent Destailleur
a88ab40384 Clean phpcs 2020-05-02 15:18:59 +02:00
Laurent Destailleur
099871e217
Merge pull request #13649 from atm-john/12.0_add_class_unitstools
NEW class tool for converting units
2020-05-02 13:05:51 +02:00
Laurent Destailleur
6bc7085297 Check more phpcs rules 2020-05-02 13:02:58 +02:00
Laurent Destailleur
a5341bed9e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-02 12:56:33 +02:00
Laurent Destailleur
e9c60e64d6 Typo 2020-05-02 12:56:22 +02:00
Laurent Destailleur
3f477d0bd5
Merge pull request #13786 from Dolibarr/scrutinizer-patch-9
Scrutinizer Auto-Fixes
2020-05-02 03:41:07 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-02 01:39:56 +00:00
Laurent Destailleur
c4b87d01ce Fix non traversable var 2020-05-02 03:36:01 +02:00
Laurent Destailleur
90bbb9beac Fix API to delete purchase price 2020-05-02 03:33:33 +02:00
Laurent Destailleur
4606b9fd9f Fix name of class Service (already used by APIs) 2020-05-02 03:29:33 +02:00
Laurent Destailleur
7c6dc930d2 Fix var not defined 2020-05-02 03:25:34 +02:00
Laurent Destailleur
62a2469c71 Fix position of modules 2020-05-02 00:41:27 +02:00
Laurent Destailleur
c2c0e6517f Fix init data of units D and H. 2020-05-01 22:44:46 +02:00
Laurent Destailleur
cc4a9ed10d
Merge pull request #13768 from TobiasSekan/MeasuringDirectoryToolTip
NEW tooltip for Unit_type and scale in "Dictionary setup - Measuring Units"
2020-05-01 22:36:04 +02:00
Laurent Destailleur
dc24738f93 Group columns about thirdparty data together 2020-05-01 22:34:49 +02:00
Laurent Destailleur
16e4c25caf
Merge pull request #13761 from aspangaro/12.0_a26
NEW: Accountancy add column thirdparty on binding page
2020-05-01 22:25:49 +02:00
Laurent Destailleur
3957b74d9a Revert "FIX: add auto incrementation to llx_c_typent.sql"
This reverts commit 14a3aa2165.
2020-05-01 22:17:33 +02:00
Laurent Destailleur
994b60b1d8 Revert use of autoincrement not possible with value 0 2020-05-01 22:17:13 +02:00
Laurent Destailleur
efb79a4008 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-01 22:16:21 +02:00
Laurent Destailleur
10af669719 Fix missing autoincrement 2020-05-01 22:14:09 +02:00
Laurent Destailleur
b3dd873656
Merge pull request #13777 from lecoqlibre/develop
FIX: add auto incrementation to llx_c_typent.sql
2020-05-01 22:13:57 +02:00
Laurent Destailleur
63bb4b82e9
Merge pull request #13772 from andreubisquerra/master
Finish send receipt by email from TakePOS
2020-05-01 22:05:57 +02:00
Laurent Destailleur
8208e81622
Merge pull request #13767 from indelog/statsbytype
Add possibility to filter stats by ThirdParty type and categorie
2020-05-01 22:05:06 +02:00
Laurent Destailleur
18a36de69b
Merge pull request #13779 from frederic34/patch-4
$tmpplugin was defined after use
2020-05-01 22:02:04 +02:00
Laurent Destailleur
b74a4c6995 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-01 22:00:11 +02:00
Laurent Destailleur
75dd5f268f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/sendings.lib.php
2020-05-01 22:00:00 +02:00
Laurent Destailleur
160009630f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
2020-05-01 21:57:28 +02:00
Laurent Destailleur
aab9a2ff75 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-01 21:03:38 +02:00
Laurent Destailleur
b41b22996f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
2020-05-01 21:03:16 +02:00
Laurent Destailleur
385f998254 Fix restore param --quick 2020-05-01 21:01:40 +02:00
Laurent Destailleur
8ed100ca87
Merge pull request #13776 from ATM-Consulting/9.0_backport_FIX_document_export
FIX Several pb in export of documents
2020-05-01 20:48:15 +02:00
Laurent Destailleur
14a81eea5f
Merge pull request #13781 from nervo/reindent-module-template
Reindent module template
2020-05-01 20:45:47 +02:00
Laurent Destailleur
cb48011b17
Merge pull request #13780 from nervo/psr-2-noncompliance
PSR-2 Noncompliance
2020-05-01 20:43:30 +02:00
Laurent Destailleur
c1b530f58f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/get_menudiv.php
2020-05-01 15:56:01 +02:00
Laurent Destailleur
1c7873b4f4 FIX Sanitizing menu parameter 2020-05-01 15:53:56 +02:00
nervo
ba0ca3f7f7 Reindent module template 2020-05-01 08:40:55 +02:00
nervo
bc32b75fd2 PSR-2 Noncompliance 2020-05-01 08:13:03 +02:00
Frédéric FRANCE
fddbe7c929
$tmpplugin was defined after use 2020-05-01 07:50:46 +02:00
Laurent Destailleur
625c7216a9 Can show date of validation in list 2020-04-30 19:51:24 +02:00
Laurent Destailleur
e4edd143c5 Fix field name 2020-04-30 19:41:46 +02:00
Laurent Destailleur
c27b3c5966 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2020-04-30 18:49:20 +02:00
Laurent Destailleur
4c27ae6530 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/card.php
2020-04-30 18:47:18 +02:00