Commit Graph

83285 Commits

Author SHA1 Message Date
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
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
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
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
Laurent Destailleur
251723aed9 Fix css 2019-11-28 14:37:06 +01:00
Laurent Destailleur
99906ce127 Fix the root category not used for search from POS 2019-11-28 14:29:58 +01:00
Laurent Destailleur
614b82fe88 Fix var not initialized 2019-11-28 14:16:54 +01:00
Laurent Destailleur
6ee6c5d514 Fix edit of product images 2019-11-28 14:09:41 +01:00
Laurent Destailleur
d374ce99a1 Trans 2019-11-28 13:20:09 +01:00
Laurent Destailleur
0083a3aa28 Update website templates 2019-11-28 13:04:44 +01:00
Laurent Destailleur
f5f8459930 Look and feel v11 2019-11-28 12:50:38 +01:00
Laurent Destailleur
64f264be3d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-28 12:46:07 +01:00
Laurent Destailleur
819c9ccbca Start v11 beta 2019-11-28 12:44:18 +01:00
Laurent Destailleur
37a9c2e9ba Look and feel v11 2019-11-28 12:40:53 +01:00
Laurent Destailleur
5f3475d1b6
Merge pull request #12542 from Dolibarr/scrutinizer-patch-16
Scrutinizer Auto-Fixes
2019-11-28 12:38:05 +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
Laurent Destailleur
17054c94ba
Merge pull request #12525 from ptibogxiv/patch-283
NEW get company info by API
2019-11-28 12:28:18 +01:00
Laurent Destailleur
a79d1260d7
Merge pull request #12521 from atm-gauthier/develop_new_nodelai_on_askpricesupplier
FIX : delay picto is currently useless because always displaied. If o…
2019-11-28 12:23:56 +01:00
Laurent Destailleur
62a304117d
Merge pull request #12537 from ptibogxiv/patch-284
NEW add list of group and object group API
2019-11-28 12:23:02 +01:00
Laurent Destailleur
337666790e
Merge pull request #12533 from frederic34/patch-16
remove deprecated
2019-11-28 12:22:27 +01:00
Laurent Destailleur
552f2088f9
Merge pull request #12532 from frederic34/patch-15
The property rowid does not seem to exist on Adherent.
2019-11-28 12:21:35 +01:00
Laurent Destailleur
c92c56ac95
Merge pull request #12526 from frederic34/patch-6
delete file not used
2019-11-28 12:21:04 +01:00