Commit Graph

71575 Commits

Author SHA1 Message Date
Norbert Penel
89f57d7d3b
add label to combobox
useful for BOM, etc
2019-11-30 23:45:24 +01:00
Laurent Destailleur
e62b819beb
Merge pull request #12574 from homer8173/patch-10
Default type missing for add links from module builder
2019-11-30 23:30:05 +01:00
Laurent Destailleur
7931bfa766
Merge pull request #12568 from atm-john/develop_fix_divide_by_zero
Fix division by zero
2019-11-30 23:29:11 +01:00
Laurent Destailleur
09ec15c7de
Merge pull request #12576 from homer8173/patch-11
wrong object line
2019-11-30 23:27:06 +01:00
Laurent Destailleur
c2f924f08f CSS For TakePOS 2019-11-30 23:03:30 +01:00
Norbert Penel
88c0c51396
wrong object line
was not working with units
2019-11-30 20:03:14 +01:00
Norbert Penel
e3fb27e3fc
Default type missing for add links from module builder
BOM links to add product don't precise the type (from common object)
2019-11-30 19:34:22 +01:00
Laurent Destailleur
958ffa6ec8 FIX Images in TCPDF are removed by TCPDF when it should not 2019-11-30 17:19:25 +01:00
Laurent Destailleur
1c58cc5031 Clean doc 2019-11-30 10:59:47 +01:00
Laurent Destailleur
f98f50e410 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-11-30 10:55:46 +01:00
Laurent Destailleur
aedec91b5d Fix phpcs 2019-11-30 10:55:29 +01:00
ATM John BOTELLA
b7d39b610b Fix divided by zero 2019-11-30 10:08:55 +01:00
Laurent Destailleur
30f1ce0d17
Merge pull request #12549 from frederic34/patch-11
The variable $db seems to be never defined.
2019-11-30 01:26:56 +01:00
Laurent Destailleur
d43c1d3904
Merge pull request #12547 from frederic34/patch-7
The property ownerid does not exist on ActionComm
2019-11-30 01:25:51 +01:00
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
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
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
eb69538d17 Fix if we insert a product already the product to produce 2019-11-29 23:51:46 +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
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
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
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