Commit Graph

6137 Commits

Author SHA1 Message Date
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
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Laurent Destailleur
d17c177251
Merge pull request #12684 from frederic34/hookagendaperuser
add hook like for per day/week/month
2019-12-14 13:52:51 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Laurent Destailleur
6a03015fa4 Fix warning 2019-12-13 16:29:58 +01:00
Laurent Destailleur
d38c73c90a FIX output of emails from and error on emailing pages. 2019-12-13 15:52:08 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo 2019-12-11 19:11:13 +01:00
Frédéric FRANCE
5c59ddb357
add hook like for per day/week/month 2019-12-10 21:11:52 +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
Scrutinizer Auto-Fixer
54ca37dc65 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-09 09:35:58 +00:00
Laurent Destailleur
4d489f64b0 Fix getpost 2019-12-06 17:42:09 +01:00
Laurent Destailleur
796f34628d Debug v11 2019-12-06 17:40:22 +01:00
Laurent Destailleur
a4272ab947 Debug v11 2019-12-06 09:20:45 +01:00
Laurent Destailleur
93d66d8213 Debug v11 2019-12-06 08:50:26 +01:00
Florian Mortgat
3f6715a377 FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list 2019-12-05 15:34:41 +01:00
Laurent Destailleur
7a1a932755 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/list.php
	htdocs/main.inc.php
2019-12-03 15:03:10 +01:00
Laurent Destailleur
d153918a10 Fix trans 2019-12-03 15:00:52 +01:00
Laurent Destailleur
41a176ce72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/remx.php
	htdocs/core/modules/modStripe.class.php
	htdocs/product/stock/replenish.php
	htdocs/stripe/payout.php
2019-12-03 13:58:15 +01:00
Laurent Destailleur
eb5a2bd1a5 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/expensereport/card.php
	htdocs/user/card.php
2019-12-03 13:52:42 +01:00
Laurent Destailleur
072db96b11 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-03 13:48:38 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-03 10:17:29 +00:00
Laurent Destailleur
6f7343b14f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-02 11:01:26 +01:00
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
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
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
Laurent Destailleur
fb70893229 Fix missing class reposition 2019-11-19 21:29:49 +01:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields.
Fix remove empty id
2019-11-16 14:38:05 +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
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
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