lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
96,756 Commits 43 Branches 150 Tags 886 MiB
49faedae6f
Commit Graph

96756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
55e9a6596b test 2021-03-03 21:10:50 +01:00
Florian HENRY
1f2dc448d7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-03-03 20:28:27 +01:00
Florian HENRY
c682309817 migration ok 2021-03-03 20:27:55 +01:00
x
ae60f452cc FIX : pencil to update employee field on card view 2021-03-03 16:36:21 +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
stickler-ci
6cbc979520 Fixing style errors. 2021-03-03 13:52:21 +00:00
Gauthier PC portable 024
3643afd761 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-03-03 14:49:29 +01:00
Gauthier PC portable 024
ca8d2a671d FIX : conf ajax must be after main form 2021-03-03 14:47:30 +01:00
Gauthier PC portable 024
845b1c6c94 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-03-03 14:35:38 +01:00
atm-gauthier
601f78912a
Merge pull request #168 from atm-adrien/NEW/12.0_new_payments_on_salaries_devadrien 
FIX : label must be over user
 2021-03-03 14:19:05 +01:00
x
049080991d FIX : label must be over user 2021-03-03 14:13:36 +01:00
stickler-ci
e1159f422a Fixing style errors. 2021-03-03 13:11:01 +00:00
Alexandre SPANGARO
59a2fb8ed5 Merge remote-tracking branch 'upstream/develop' into 14a15 2021-03-03 14:08:40 +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
Florian Mortgat
7f40fe4ca8
Merge pull request #167 from atm-lena/NEW/12.0_new_payments_on_salaries_autocreatepaiement_conf 
Ajout conf qui permet de décocher / cocher par défaut le paiement aut…
 2021-03-03 09:14:17 +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
Frédéric FRANCE
6c30eca11d
user home 2021-03-02 22:41:20 +01:00
Florian HENRY
81f54003f6 set migration auto increment 2021-03-02 22:35:47 +01:00
stickler-ci
95d7380317 Fixing style errors. 2021-03-02 21:34:19 +00:00
Florian HENRY
c2d8dde4b1 Merge branch 'develop' of github.com:FHenry/dolibarr into develop 2021-03-02 22:33:36 +01: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
Frédéric FRANCE
b0f735350f
new box replace 2021-03-02 22:31:55 +01:00
stickler-ci
e28f844d54 Fixing style errors. 2021-03-02 21:31:48 +00:00
Frédéric FRANCE
da038cf590
new box replace 2021-03-02 22:29:02 +01:00
Florian HENRY
e5e3abd685 class conference or booth or and table actioncomm ok 2021-03-02 22:23:54 +01:00
Frédéric FRANCE
22bc3b879b
new box replace 2021-03-02 22:21:34 +01:00
Frédéric FRANCE
d68de8617b
new box replace 2021-03-02 22:00:09 +01:00
Florian HENRY
6862c206aa merge from develop 2021-03-02 21:48:35 +01:00
Frédéric FRANCE
742c12f9d6
rename new boxes 2021-03-02 20:58:21 +01:00