Commit Graph

77718 Commits

Author SHA1 Message Date
Laurent Destailleur
ee37cbd412
Merge pull request #11638 from ptibogxiv/patch-212
NEW list by date_cloture on order list
2019-08-10 01:06:16 +02:00
Laurent Destailleur
14fabeb377 Variable rangtouse -> ranktouse 2019-08-10 00:46:20 +02:00
Laurent Destailleur
d10bff3076
Merge pull request #11647 from Tim-Otte/develop
Fixed expedition line rangs
2019-08-10 00:41:27 +02:00
Laurent Destailleur
dd2c35f866
Merge pull request #11648 from atm-john/develop_chart_color
NEW more living colors for charts and option for "color bind" people
2019-08-10 00:39:53 +02:00
Laurent Destailleur
6a8910f109
Merge pull request #11649 from ptibogxiv/patch-216
FIX qty in invoice list on product's stats
2019-08-10 00:37:35 +02:00
Je2fb
2dee289fc6 Update price_parser.class.php
Calculation with supplier_min_price work

Conflicts:
	htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 00:21:13 +02:00
Laurent Destailleur
f752b96a7e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-10 00:14:27 +02:00
Abbes Bahfir
8f2786cf7b fix:this is not accessible in static context 2019-08-10 00:09:36 +02:00
Laurent Destailleur
7f4a00ec32
Merge pull request #11656 from frederic34/patch-12
add intval to evalmath class
2019-08-09 23:56:50 +02:00
Laurent Destailleur
803c9e87e3
Merge pull request #11657 from frederic34/patch-13
Update llx_c_price_expression.sql
2019-08-09 23:54:34 +02:00
Laurent Destailleur
88c66d24fe
Merge pull request #11662 from ptibogxiv/patch-219
FIX duration when creating service
2019-08-09 23:53:55 +02:00
Laurent Destailleur
71e07eff54
Merge pull request #11666 from OPEN-DSI/new-import-compute-values
NEW compute column value from others columns in import module
2019-08-09 23:53:30 +02:00
Laurent Destailleur
2ecf995ade
Merge pull request #11660 from Je2fb/develop
Update price_parser.class.php
2019-08-09 23:49:44 +02:00
Laurent Destailleur
6d4ba6b36b
Merge branch 'develop' into develop 2019-08-09 23:49:31 +02:00
Laurent Destailleur
0efcd590e2
Merge pull request #11668 from hregis/10.0_mc
FIX better help message with multicompany
2019-08-09 23:46:42 +02:00
Laurent Destailleur
617d4c875d
Merge pull request #11658 from frederic34/patch-14
Update societe.class.php
2019-08-09 23:45:19 +02:00
Laurent Destailleur
d245ca371e
Update societe.class.php 2019-08-09 23:45:06 +02:00
Laurent Destailleur
2de594e16e
Merge pull request #11667 from frederic34/patch-15
Add empty index.html
2019-08-09 23:43:14 +02:00
Laurent Destailleur
92c0ed9759
Merge pull request #11670 from bafbes/abb100071
fix:this is not accessible in static context
2019-08-09 23:42:27 +02:00
Abbes Bahfir
ae4efe9b75 fix:this is not accessible in static context 2019-08-09 10:02:56 +01:00
Regis Houssin
0b831ccdf7 FIX better help message with multicompany 2019-08-09 09:33:14 +02:00
Frédéric FRANCE
aa462bac23
Add empty index.html 2019-08-09 09:25:48 +02:00
VESSILLER
ae144a6910 NEW compute column value from others columns in import module 2019-08-08 17:31:16 +02:00
Je2fb
1a592f8f69
Update price_parser.class.php 2019-08-08 09:34:59 +02:00
Je2fb
4008ddc567
Update price_parser.class.php 2019-08-08 09:33:03 +02:00
ptibogxiv
322ec32ff5
FIX duration when creating service 2019-08-07 20:16:53 +02:00
John Botella
af4d5aa549 Fix color badges and status for color blind 2019-08-07 17:22:59 +02:00
Je2fb
ef285a87a8
Update price_parser.class.php
Calculation with supplier_min_price work
2019-08-07 17:16:34 +02:00
John Botella
450878cd92 Fix color deuteranopia 2019-08-07 15:13:59 +02:00
Frédéric FRANCE
372eddf0c6
Update societe.class.php 2019-08-07 13:49:14 +02:00
Frédéric FRANCE
d55377981c
Update 10.0.0-11.0.0.sql 2019-08-07 13:27:55 +02:00
Frédéric FRANCE
28100f67ac
Update llx_c_price_expression.sql 2019-08-07 13:25:14 +02:00
Frédéric FRANCE
9e88433706
add intval to evalmath class 2019-08-07 12:59:27 +02:00
John Botella
401dc12b93 Add color blind option in body for css impact 2019-08-07 12:15:55 +02:00
John Botella
63191dab7d Add user color blind option 2019-08-07 12:03:19 +02:00
John Botella
4aeaa580ea Add color blind option 2019-08-07 11:11:47 +02:00
ptibogxiv
0fc92b92a2
Update facture.php 2019-08-06 16:47:54 +02:00
ptibogxiv
ee8d99351d
Update facture.php 2019-08-06 16:28:18 +02:00
John Botella
7866c2c0d3 change color 2019-08-06 15:42:12 +02:00
Tim Otte
22202c2d27 Added missing parameter comment 2019-08-06 15:33:26 +02:00
John Botella
cafd4fc599 New living color for chart 2019-08-06 15:24:42 +02:00
Tim Otte
97223bf2eb Fixed expedition line rangs
Rang is now transferred to the database
2019-08-06 15:10:13 +02:00
Frédéric FRANCE
69985339d8
Update price_parser.class.php 2019-08-06 11:47:34 +02:00
ptibogxiv
05ac4eec52
Update charge.php 2019-08-06 00:16:18 +02:00
ptibogxiv
4de68397ae
NEW list by date_cloture on propal list 2019-08-05 21:03:48 +02:00
ptibogxiv
0cbb144628
Update list.php
sometimes we need to get last update or closed order
2019-08-05 20:52:27 +02:00
ptibogxiv
f417c85186
NEW list by date_cloture on order list 2019-08-05 20:49:41 +02:00
Frédéric FRANCE
7f23b77cbe
Update pdf_proforma.modules.php 2019-08-05 15:00:06 +02:00
Frédéric FRANCE
fde526f59d
Update pdf_einstein.modules.php 2019-08-05 14:58:50 +02:00
atm-greg
1d4fc32c20 fix second bad test 2019-08-05 13:13:56 +02:00