Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-02 06:13:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
145,227 Commits 38 Branches 191 Tags
0de4e225fb702681d7e9d19ecda1c1da170a357e
Commit Graph

9579 Commits

Author SHA1 Message Date
Laurent Destailleur
6d81bc77cb Fix look and feel v11 2019-12-02 11:00:09 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
Maxime Kohlhaas
a220d43bd6 Fix #11849 : missing price2num in discount split 2019-12-01 01:41:13 +01:00
Laurent Destailleur
a2a96f8796 # WARNING: head commit changed in the meantime 
Restore file for travis
 2019-12-01 00:41:11 +01:00
Frédéric FRANCE
35394639a4 The property ownerid does not exist on ActionComm 2019-11-28 22:26:25 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-28 11:36:20 +00:00
Frédéric FRANCE
b2912e688b Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-27 22:54:05 +01:00
Frédéric FRANCE
4c4ae5b6e1 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +01:00
Frédéric FRANCE
3edac06fae Form selectAvailabilityDelay returns void 2019-11-26 00:06:57 +01:00
Laurent Destailleur
e4d9f99484 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/remx.php
	htdocs/expedition/card.php
	htdocs/fourn/facture/card.php
 2019-11-22 15:04:40 +01:00
Laurent Destailleur
9eb98ca94c Merge pull request #12478 from ptibogxiv/patch-281 
FIX display job of contact list
 2019-11-22 14:26:12 +01:00
Laurent Destailleur
d487f6b84d Clean code 2019-11-22 14:10:12 +01:00
Laurent Destailleur
3daeb24da1 Fix confusion with field name in sql 2019-11-21 13:05:13 +01:00
ptibogxiv
f73bd0e0a6 FIX display job of contact list 
can see différent contact with same name but different job
 2019-11-20 13:07:26 +01:00
Laurent Destailleur
d7e8c71091 Look and feel v11 2019-11-20 12:45:15 +01:00
Frédéric FRANCE
d182eee4bf Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-19 23:26:00 +01:00
Laurent Destailleur
fb70893229 Fix missing class reposition 2019-11-19 21:29:49 +01:00
Frédéric FRANCE
2e5f539b2a Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00
Alexandre SPANGARO
b3e09e050c fix missing param 2019-11-18 11:36:12 +01:00
Alexandre SPANGARO
b11579c1bd Merge remote-tracking branch 'upstream/develop' into 11.0_a1 2019-11-18 09:26:40 +01:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields. 
Fix remove empty id
 2019-11-16 14:38:05 +01:00
Frédéric FRANCE
6784ea9fae Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
Laurent Destailleur
4fc7b8c3b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_title.tpl.php
 2019-11-14 12:49:42 +01:00
Laurent Destailleur
a29adc94f3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/card.php
	htdocs/langs/en_US/admin.lang
 2019-11-14 12:48:33 +01:00
Laurent Destailleur
9d963a7ca6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-14 12:44:32 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Laurent Destailleur
f5da126cff Fix property not defined 2019-11-14 12:01:01 +01:00
Frédéric FRANCE
a3e092b227 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8 Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:06 +01:00
Frédéric FRANCE
446c66da62 use class CONST 2019-11-14 08:15:39 +01:00
Frédéric FRANCE
3bac051521 use class CONST 2019-11-14 08:07:16 +01:00
Frédéric FRANCE
9040f6d9c7 can tag actioncomm 2019-11-13 21:18:34 +01:00
Frédéric FRANCE
3ec7568559 FIX #12385 2019-11-13 20:44:21 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Laurent Destailleur
3430a88c72 Fix $conf not defined 2019-11-12 10:13:22 +01:00
Laurent Destailleur
c02cd80b75 Clean code 2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Frédéric FRANCE
2148d6ed05 css 2019-11-11 20:33:34 +01:00
stickler-ci
bb74d2f8bd Fixing style errors. 2019-11-10 10:00:07 +00:00
Philippe GRAND
6e0c028d51 add some comment 2019-11-10 10:59:44 +01:00
Scrutinizer Auto-Fixer
812d0af1d9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 14:51:54 +00:00
Laurent Destailleur
cb1e5954f6 Fix regression 2019-11-08 13:10:41 +01:00
Laurent Destailleur
cb3fd5728b Fix color for not busy events 2019-11-08 13:04:49 +01:00
Laurent Destailleur
dc84d7e844 Code comment 2019-11-08 11:29:56 +01:00
Laurent Destailleur
34564ea084 Merge pull request #12381 from TobiasSekan/FixIcalExportAlwaysSameUser 
Fix ICAL export add a user to all events
 2019-11-08 11:26:57 +01:00
Tobias Sekan
3677855ebc Fix ICAL export add a user to all events 2019-11-07 15:45:34 +01:00