lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,981 Commits 43 Branches 150 Tags 886 MiB
dc5557e4f7
Commit Graph

95981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Frédéric FRANCE
6cf8a46095
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-03-02 20:41:01 +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
stickler-ci
b374a8a00b Fixing style errors. 2021-03-02 15:03:36 +00:00