lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
101,079 Commits 43 Branches 150 Tags 886 MiB
638a66fbb9
Commit Graph

101079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
638a66fbb9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
 2021-07-14 14:49:06 +02:00
Laurent Destailleur
8b040ec8f2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-14 14:47:38 +02:00
Laurent Destailleur
a3526a2649 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/actions_addupdatedelete.inc.php
 2021-07-14 14:46:05 +02:00
Laurent Destailleur
ebd9ce5c8d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-07-14 14:42:41 +02:00
Laurent Destailleur
a773652c04 Fix phpcs 2021-07-14 14:37:07 +02:00
Laurent Destailleur
b552c6b4fe Fix status color 2021-07-14 14:32:05 +02:00
Laurent Destailleur
7281a51eff
Merge pull request #18148 from AlexisLaurier/fix/CommonObjectShowInputFieldCheckboxAndRadio 
fix showInputField checkbox and radio type
 2021-07-14 13:55:53 +02:00
Laurent Destailleur
90fa36b46a
Merge pull request #18145 from atm-gauthier/12.0_fix_method_exists 
FIX : method_exists needs object at first param
 2021-07-14 13:52:03 +02:00
Alexis LAURIER
cd5e1d603e fix showInputField checkbox and radio type 2021-07-14 12:02:03 +02:00
Laurent Destailleur
724d00fc6c Fix phpcs 2021-07-14 02:20:15 +02:00
Gauthier PC portable 024
0fe46b53d8 FIX : method_exists needs object at first param 2021-07-13 15:18:40 +02:00
Laurent Destailleur
ba8d60f4d4 FIX amount of payment deleted in unalterable log (for old record must 
look the log of creation to know amount).
 2021-07-13 14:48:05 +02:00
Laurent Destailleur
b12aae4a99 FIX amount of payment deleted in unalterable log (for old record must 
look the log of creation to know amount).
 2021-07-13 14:26:32 +02:00
Laurent Destailleur
0d9cf07035 Show ref of invoice into tooltip 2021-07-13 14:07:35 +02:00
Laurent Destailleur
af99cab839 CSS 2021-07-13 13:46:20 +02:00
Laurent Destailleur
e755d68b06 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-13 13:22:20 +02:00
Laurent Destailleur
0d12f25341 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-13 13:21:50 +02:00
Laurent Destailleur
d1a00c26aa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/functions.lib.php
 2021-07-13 13:14:27 +02:00
Laurent Destailleur
7a589921fe Fix #18142 2021-07-13 13:10:19 +02:00
Laurent Destailleur
4c29a3ad99 Fix migration 2021-07-13 13:06:28 +02:00
Laurent Destailleur
f1c7207514
Merge pull request #18135 from Hystepik/develop#1 
Fix #18110 : update of formticket.class.php
 2021-07-13 11:48:36 +02:00
Laurent Destailleur
e5ed5edeab
Merge pull request #18140 from Hystepik/develop#2 
Close #18131 : new massaction for thirdparty
 2021-07-13 11:45:47 +02:00
Laurent Destailleur
df3d88570c Fix missing column in migration 2021-07-13 11:39:08 +02:00
stickler-ci
85adefe721 Fixing style errors. 2021-07-13 08:08:01 +00:00
lmarcouiller
35b29481c7 Close #18131 : new massaction for thirdparty 2021-07-13 10:05:38 +02:00
Laurent Destailleur
f9d60b15d9 Fix phpcs 2021-07-12 23:56:42 +02:00
Laurent Destailleur
202ee8340a FIX #18091 2021-07-12 23:01:34 +02:00
Christophe Battarel
a15d895b4b fix badge status bgcolor 2021-07-12 17:00:42 +02:00
Laurent Destailleur
224bbe96c3
Merge pull request #18133 from altairisfr/fixbadge 
fix badge status bgcolor
 2021-07-12 17:00:12 +02:00
Laurent Destailleur
d3f324c2d4 Try a better fix for #18105 2021-07-12 16:55:16 +02:00
stickler-ci
5b1525e77c Fixing style errors. 2021-07-12 14:15:28 +00:00
lmarcouiller
cfb03f065c Fix #18110 : update of formticket.class.php 2021-07-12 16:12:28 +02:00
Christophe Battarel
91d27a556c fix badge status bgcolor 2021-07-12 14:09:16 +02:00
Laurent Destailleur
45b6e9aeb9
Merge pull request #18132 from atm-john/14.0_fix_ui_event 
Fix UI event badge status
 2021-07-12 13:22:55 +02:00
Laurent Destailleur
6f4090f567
Merge pull request #18127 from evarisk-theo/add-ticket-categories-data-model 
add: ticket categories data model
 2021-07-12 13:19:47 +02:00
John BOTELLA
deb9a374f3 Fix ui event badge status 2021-07-12 12:28:21 +02:00
Laurent Destailleur
a2de6c00a0 Prepare 13.0.4 2021-07-12 12:26:21 +02:00
Laurent Destailleur
7533c9e3a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/interventions.lang
 2021-07-12 12:01:53 +02:00
Laurent Destailleur
0cde1cfc38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-12 11:56:13 +02:00
Laurent Destailleur
977600e3a5 v15 2021-07-12 11:55:30 +02:00
Laurent Destailleur
ac1999f59d FIX #18130 2021-07-12 11:08:32 +02:00
Laurent Destailleur
5319e1d266 Fix help 2021-07-12 10:56:01 +02:00
Laurent Destailleur
e989284f14 Fix setup help 2021-07-12 10:50:37 +02:00
Laurent Destailleur
aa8fc6ba83 css 2021-07-12 10:45:18 +02:00
Laurent Destailleur
aece3844c6 Fix better error message if password is empty 2021-07-12 10:35:25 +02:00
evarisk-theo
8496c9e57f
Merge branch 'Dolibarr:develop' into add-ticket-categories-data-model 2021-07-12 09:09:53 +02:00
Laurent Destailleur
4b2bbd0364 Sync transifex 2021-07-11 20:27:03 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop 
NEW add hookmanager on note pages
 2021-07-11 20:25:16 +02:00
Laurent Destailleur
c9242d83ab Clean code 2021-07-11 20:16:47 +02:00
Laurent Destailleur
fb13746644
Merge pull request #18019 from ATM-Consulting/NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword 
NEW: make it easier to set the `keyword`, `keywords` and `description` attributes of an ecm file object
 2021-07-11 20:15:29 +02:00