lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
89,109 Commits 43 Branches 150 Tags 886 MiB
9165ea9e67
Commit Graph

89109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0cb1210acc
Merge pull request #11622 from ptibogxiv/patch-206 
Fix table in admin stripe.php
 2019-08-10 01:33:57 +02:00
Laurent Destailleur
13a8ef8258
Merge pull request #11618 from ptibogxiv/patch-203 
FIX author in message / ticket API
 2019-08-10 01:33:21 +02:00
Laurent Destailleur
c647195689
Merge pull request #11632 from atm-greg/FIX_delivery_Extrafields 
FIX delivery extrafields
 2019-08-10 01:28:46 +02:00
Laurent Destailleur
76b0f42d4c
Merge pull request #11620 from ptibogxiv/patch-204 
FIX document list for products in API
 2019-08-10 01:27:52 +02:00
Laurent Destailleur
6089547e0e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-08-10 01:26:18 +02:00
Laurent Destailleur
46a5c05b75
Merge pull request #11623 from ptibogxiv/patch-207 
FIX round for application fee in stripe
 2019-08-10 01:25:07 +02:00
Laurent Destailleur
eea5ad9b81
Merge pull request #11627 from ptibogxiv/patch-209 
FIX display payment intent in stripe's charge list
 2019-08-10 01:23:06 +02:00
Laurent Destailleur
ab370137a8
Merge pull request #11628 from ptibogxiv/patch-210 
FIX display only stripe sources for customer
 2019-08-10 01:21:41 +02:00
Laurent Destailleur
2824dee11a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/product/dynamic_price/class/price_parser.class.php
 2019-08-10 01:20:17 +02:00
Laurent Destailleur
049a08f435
Merge pull request #11631 from frederic34/patch-9 
Update admin.lang
 2019-08-10 01:15:28 +02:00
Laurent Destailleur
cee92356c6
Merge pull request #11644 from frederic34/patch-11 
Update price_parser.class.php
 2019-08-10 01:11:02 +02:00
Laurent Destailleur
2a726441a0
Merge pull request #11635 from frederic34/patch-10 
FIX Return code of pdf_einstein.modules.php and proformat
 2019-08-10 01:09:48 +02:00
Laurent Destailleur
63efe82ff3
Merge pull request #11639 from ptibogxiv/patch-213 
NEW list by date_cloture on propal list
 2019-08-10 01:07:07 +02:00
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
JC Prieto
faf65f39b6
FIX: Update() function checking 
If module Project is off, shows an error.
 2019-08-06 19:14:56 +02:00