Commit Graph

89109 Commits

Author SHA1 Message Date
Laurent Destailleur
6944b67b1e
Merge pull request #12548 from frederic34/patch-8
functions return void
2019-11-30 01:25:04 +01:00
Laurent Destailleur
b0e005bcee
Merge pull request #12550 from frederic34/patch-13
missing $conf
2019-11-30 01:21:58 +01:00
Laurent Destailleur
68b36411b4
Merge pull request #12551 from frederic34/patch-14
The property table_element_date does not exist on Project
2019-11-30 01:20:41 +01:00
Laurent Destailleur
7b828d1f0b
Merge pull request #12563 from atm-maxime/fix_notification_user_diabled
Fix #12448 : notifications were sent to disabled user or contacts
2019-11-30 01:18:35 +01:00
Laurent Destailleur
6bff3c7fd9
Merge pull request #12561 from atm-maxime/fix_loan_currency
Fix #12496 : currency was € in loan schedule
2019-11-30 01:17:43 +01:00
Laurent Destailleur
35b4318cee
Merge pull request #12552 from frederic34/patch-15
$head was never initialized
2019-11-30 01:16:40 +01:00
Laurent Destailleur
557ea14334
Merge pull request #12555 from frederic34/patch-19
avoid placeid to be string or string[]
2019-11-30 01:15:53 +01:00
Maxime Kohlhaas
2a3012f12d Fix #12481 : fix ticket creation from thirdparty, mission $socid var 2019-11-30 01:15:47 +01:00
Laurent Destailleur
ce78a7665d
Merge pull request #12554 from frederic34/patch-18
doxygen
2019-11-30 01:14:35 +01:00
Laurent Destailleur
f605bdc085
Merge pull request #12553 from frederic34/patch-17
The variable $notrigger seems to be never defined
2019-11-30 01:13:50 +01:00
Laurent Destailleur
f0cc559f4c
Merge pull request #12562 from atm-maxime/fix_loan_update_rate
Fix #12502 : loan rate wasn't updatable
2019-11-30 01:11:00 +01:00
Maxime Kohlhaas
02b5da5db1 Fix #12448 : notifications were sent to disabled user or contacts 2019-11-30 00:57:21 +01:00
ATM John BOTELLA
ff55c9da4a Fix task extrafield error 2019-11-30 00:56:45 +01:00
Maxime Kohlhaas
9116110737 Fix #12502 : loan rate wasn't updatable 2019-11-30 00:35:32 +01:00
Laurent Destailleur
eb69538d17 Fix if we insert a product already the product to produce 2019-11-29 23:51:46 +01:00
Maxime Kohlhaas
d480da5629 Fix #12496 : currency was € in loan schedule 2019-11-29 23:43:42 +01:00
Laurent Destailleur
fe815ed432 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-11-29 23:19:39 +01:00
Laurent Destailleur
a8b9cc1286 Fix export of image 2019-11-29 23:19:23 +01:00
Inovea Conseil
cfffcab950 Merge remote-tracking branch 'Dolibarr/develop' into develop 2019-11-29 18:01:28 +01:00
David Beniamine
828aa9bd93
Sort products by reference 2019-11-29 15:59:25 +01:00
Laurent Destailleur
0a3614adbf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-29 11:42:16 +01:00
Laurent Destailleur
3b9d2abcb2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/product.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/list.php
2019-11-29 11:42:08 +01:00
Laurent Destailleur
a4a805f618 Doxygen 2019-11-29 11:32:22 +01:00
Laurent Destailleur
3acd0bc2ff FIX Reduce number of request for list of products 2019-11-29 11:32:09 +01:00
Laurent Destailleur
eed8f242b8 Update demo 2019-11-29 10:23:18 +01:00
Laurent Destailleur
268535a320 Update demo 2019-11-29 10:05:46 +01:00
Tobias Sekan
f304dd424b
Fix can't create files on shared folder (Windows) 2019-11-29 07:46:39 +01:00
Tobias Sekan
b820234870
Merge pull request #2 from Dolibarr/develop
merge with current
2019-11-29 07:32:28 +01:00
Frédéric FRANCE
956ce9ea8f
avoid placeid to be string or string[]
Are you sure $placeid > 0 ? $placeid : 0 of type integer|string|string[] can be used in echo?
2019-11-28 23:31:28 +01:00
ptibogxiv
753439efee
Update stripe.php 2019-11-28 23:23:08 +01:00
Frédéric FRANCE
6d8c59991d
doxygen 2019-11-28 23:21:42 +01:00
Frédéric FRANCE
b02e81197a
The variable $notrigger seems to be never defined 2019-11-28 23:11:37 +01:00
Frédéric FRANCE
00a80e498e
$head was never initialized 2019-11-28 23:06:04 +01:00
Frédéric FRANCE
7bbd500e81
The property table_element_date does not exist on Project
see line 612
2019-11-28 23:02:14 +01:00
Frédéric FRANCE
3dfb586d15
missing $conf 2019-11-28 22:50:39 +01:00
Frédéric FRANCE
45c537707f
The variable $db seems to be never defined. 2019-11-28 22:39:41 +01:00
Frédéric FRANCE
06839e9a7f
functions return void 2019-11-28 22:34:53 +01:00
Frédéric FRANCE
35394639a4
The property ownerid does not exist on ActionComm 2019-11-28 22:26:25 +01:00
ptibogxiv
16d08bd903
Update newpayment.php 2019-11-28 22:19:52 +01:00
ptibogxiv
b9c0f961c9
Update stripe.class.php 2019-11-28 22:17:49 +01:00
ptibogxiv
f6bc48e6d7
FIX minimal stripe update for compatibility
cf https://stripe.com/guides/important-update-for-connect
2019-11-28 22:13:11 +01:00
Frédéric FRANCE
6a529aa4cc
restore initdata for tests 2019-11-28 21:57:58 +01:00
Frédéric FRANCE
c214dd0675
Form select_produits returns void 2019-11-28 21:23:53 +01:00
Frédéric FRANCE
0ac8444b12
The condition $nolinesbefore is always true. 2019-11-28 21:12:16 +01:00
Laurent Destailleur
78eb6ae17d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-28 16:44:16 +01:00
Laurent Destailleur
3148f6a9fa Add file for demo v11 2019-11-28 16:44:05 +01:00
Laurent Destailleur
616623c4f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-28 16:24:53 +01:00
Laurent Destailleur
c906d04434 Fix var not defined 2019-11-28 16:24:46 +01:00
Laurent Destailleur
d58bb5f66b Fix link to user 2019-11-28 16:16:55 +01:00
Laurent Destailleur
1636d341c7 Debug module BOM
Enhance demo data for TakePOS
2019-11-28 15:18:14 +01:00