Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-09 01:12:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
95,624 Commits 39 Branches 191 Tags
89bd9c4e05938e4e2e7cfc3f12e47d711d378c0b
Commit Graph

95624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
89bd9c4e05 fix sql 2021-03-04 07:44:31 +01:00
Florian HENRY
879e8fe5f6 fix sql 2021-03-04 07:44:00 +01:00
Florian HENRY
ec52ed445c fix ambigous 2021-03-03 22:18:42 +01:00
Florian HENRY
04c6d5dd8f fix sql 2021-03-03 22:16:35 +01:00
Florian HENRY
91b93ac7ce fix sql 2021-03-03 22:10:17 +01:00
Florian HENRY
9c256ab8a8 fix review 2021-03-03 21:40:37 +01:00
Florian HENRY
5233ad7424 revert wrong code in commonobject 2021-03-03 21:38:43 +01:00
Florian HENRY
4e2f929460 test 2021-03-03 21:11:04 +01:00
Florian HENRY
55e9a6596b test 2021-03-03 21:10:50 +01:00
Florian HENRY
1434e58031 Merge branch 'dev_EventOrganisation' of github.com:FHenry/dolibarr into dev_EventOrganisation 2021-03-03 16:28:31 +01:00
Florian HENRY
1913564b38 fix travis 2021-03-03 16:28:14 +01:00
Florian HENRY
c909306f34 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-03 16:27:05 +01:00
Laurent Destailleur
43e58f70a1 Merge pull request #16528 from frederic34/patch-4 
remove unused code
 2021-03-03 15:10:58 +01:00
Laurent Destailleur
d22f929779 Merge pull request #16526 from frederic34/patch-3 
fix unknown constant and variable
 2021-03-03 15:10:38 +01:00
Frédéric FRANCE
d05c0b749a remove unused code 2021-03-03 13:11:10 +01:00
Frédéric FRANCE
2d9f00eb57 Update commonobject.class.php 2021-03-03 12:24:44 +01:00
Laurent Destailleur
e13b01e0d7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-03-03 12:10:23 +01:00
Laurent Destailleur
da8b67da83 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-03 12:07:42 +01:00
Laurent Destailleur
5f8b52ffc9 Code comment 2021-03-03 12:05:43 +01:00
Laurent Destailleur
093eab188e Code comment 2021-03-03 12:02:57 +01:00
Frédéric FRANCE
a8bf47b9ce fix unknown constant and variable 2021-03-03 12:02:48 +01:00
Laurent Destailleur
f11a85a3e3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/compta/facture/card.php
	htdocs/contrat/card.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
 2021-03-03 11:37:34 +01:00
Laurent Destailleur
889a496661 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-03 11:31:55 +01:00
Laurent Destailleur
b5d1e36ece Fix include 2021-03-03 11:31:40 +01:00
Laurent Destailleur
6fcec3e99b Merge pull request #16522 from FHenry/13.0 
fix: warning on install
 2021-03-02 23:58:26 +01:00
Laurent Destailleur
c2f0d9f42c Update functions.lib.php 2021-03-02 23:57:37 +01:00
Laurent Destailleur
7abf572f2d Merge pull request #16512 from Hystepik/develop#1 
Fix #16432 : Update of getCountriesinEEC
 2021-03-02 23:56:37 +01:00
Laurent Destailleur
348b8d2ffe More phpunit tests 2021-03-02 23:55:41 +01:00
Laurent Destailleur
9f4bdd86b4 More robust test 2021-03-02 23:48:33 +01:00
Florian HENRY
4e5849e50b remove debug 2021-03-02 23:13:05 +01:00
Laurent Destailleur
7eb3e324c7 FIX #16503 2021-03-02 23:09:55 +01:00
Florian HENRY
30c6e268a1 fix warning 2021-03-02 22:55:43 +01:00
stickler-ci
95d7380317 Fixing style errors. 2021-03-02 21:34:19 +00:00
Florian HENRY
88f8642048 Merge branch 'dev_EventOrganisation' of github.com:FHenry/dolibarr into dev_EventOrganisation 2021-03-02 22:32:27 +01:00
Florian HENRY
5dcbea4cc5 revome dev hack 2021-03-02 22:32:12 +01:00
stickler-ci
e28f844d54 Fixing style errors. 2021-03-02 21:31:48 +00:00
Florian HENRY
e5e3abd685 class conference or booth or and table actioncomm ok 2021-03-02 22:23:54 +01:00
Florian HENRY
6862c206aa merge from develop 2021-03-02 21:48:35 +01:00
Laurent Destailleur
40f0304182 Merge pull request #16516 from OPEN-DSI/fix-commonobject-select-list-dependancies 
FIX select list dependancies on common object (FIX #16510)
 2021-03-02 19:16:03 +01:00
Laurent Destailleur
1756d2833c Merge pull request #16513 from AlexisLaurier/develop 
Avoid loss of data on RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED
 2021-03-02 19:15:22 +01:00
Laurent Destailleur
c0395d2d5b Merge pull request #16514 from frederic34/stickler_test 
test stickler
 2021-03-02 19:12:17 +01:00
Frédéric FRANCE
bb2a505404 Update eventorganization.php 2021-03-02 18:26:04 +01:00
lvessiller
66ad8fbb24 FIX select list dependancies on common object (FIX #16510) 2021-03-02 17:21:55 +01:00
Florian HENRY
34d95dcd2f Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-03-02 16:54:07 +01:00
Frédéric FRANCE
15623ae852 fix 2021-03-02 16:39:04 +01:00
Frédéric FRANCE
5d78c3530b test stickler 2021-03-02 16:34:04 +01:00
lmarcouiller
2eaa6ad6c6 Fix #16432 : Add cache use in function 2021-03-02 16:21:43 +01:00
Laurent Destailleur
c81d5ff4d0 Introduce a variable to cache some data. 2021-03-02 16:13:00 +01:00
Alexis LAURIER
516e7a3955 Merge branch 'develop' of https://github.com/AlexisLaurier/dolibarr into develop 2021-03-02 16:04:37 +01:00
Alexis LAURIER
e219972936 avoid lost of data for RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED 2021-03-02 16:04:26 +01:00