Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
83,748 Commits 36 Branches 189 Tags
7909055ee8cf9419683938d167bbf308fb9415ec
Commit Graph

1848 Commits

Author SHA1 Message Date
Laurent Destailleur
44eda2d4ad Fix doxygen 2020-02-20 13:42:43 +01:00
Laurent Destailleur
2ac064059a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/projet/element.php
 2020-02-18 22:40:43 +01:00
Laurent Destailleur
9ce0e6869e Fix trans 2020-02-18 11:55:39 +01:00
Laurent Destailleur
35ada37d4d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/filefunc.inc.php
 2020-02-14 19:14:26 +01:00
Laurent Destailleur
bb895cb1d8 FIX ref_client not visible in tooltip. 2020-02-13 18:00:59 +01:00
Scrutinizer Auto-Fixer
011803ac71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 11:36:05 +00:00
Laurent Destailleur
f70dd8ec06 Clean code. Load thirdparty for correct lang before generating doc 2020-02-10 00:22:53 +01:00
Laurent Destailleur
1344ce06a5 Merge pull request #12317 from OPEN-DSI/new-propal-tooltip-note 
NEW add public and private notes in propal list
 2020-02-05 21:41:17 +01:00
Laurent Destailleur
66590cca10 Update list.php 2020-02-05 21:40:49 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-01-25 14:43:57 +01:00
Laurent Destailleur
09f809f347 FIX #12913 2020-01-25 14:03:24 +01:00
Laurent Destailleur
59dfbc49a7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-22 14:42:18 +01:00
Laurent Destailleur
bfc8369418 Fix phpcs 2020-01-22 14:15:08 +01:00
Laurent Destailleur
2d07a08e55 Fix init of specimen 2020-01-21 00:22:57 +01:00
Laurent Destailleur
80483fc085 Fix init of specimen 2020-01-21 00:20:03 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-18 15:17:07 +00:00
VESSILLER
48297759fb Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-tooltip-note 2020-01-16 10:53:57 +01:00
Laurent Destailleur
2b7e45cb09 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 20:13:54 +01:00
Laurent Destailleur
98eda68afb Fix linkg to public notes 2020-01-15 19:49:45 +01:00
Laurent Destailleur
132bb67d14 Merge pull request #12364 from aspangaro/11.0_a1 
NEW Propal list - Add date start & date end
 2020-01-15 17:52:55 +01:00
Laurent Destailleur
622dc7e8d7 Debug v11 2020-01-07 22:01:55 +01:00
VESSILLER
046aba8abd FIX indented errors 2019-12-26 10:14:05 +01:00
lvessiller-opendsi
dec64b45e8 Merge branch 'develop' into new-propal-tooltip-note 2019-12-26 10:06:38 +01:00
VESSILLER
bf1bf10a53 FIX resolve conflicts 2019-12-26 09:56:35 +01:00
VESSILLER
23b4e3ad6d FIX resolve conflicts 2019-12-26 09:50:15 +01:00
Alexandre SPANGARO
af4b0f54c5 Merge remote-tracking branch 'upstream/develop' into 11.0_a1 2019-12-23 20:44:32 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Laurent Destailleur
f98713efdd Update propal.class.php 2019-12-10 19:20:23 +01:00
Laurent Destailleur
452976850f Update propal.class.php 2019-12-10 19:18:45 +01:00
David
4c463cdbb5 FIX: propal update 
Update fields 'date' and 'fin_validite'
 2019-12-10 16:16:33 +01:00
Laurent Destailleur
93d66d8213 Debug v11 2019-12-06 08:50:26 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +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
3edac06fae Form selectAvailabilityDelay returns void 2019-11-26 00:06:57 +01:00
Laurent Destailleur
fb70893229 Fix missing class reposition 2019-11-19 21:29:49 +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
171b94fc5c Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01: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