Commit Graph

78307 Commits

Author SHA1 Message Date
Laurent Destailleur
7cee643c05 Prepare 10.0.8 2020-04-02 18:51:25 +02:00
Laurent Destailleur
5622c1947b Prepare 10.0.7 2020-04-02 12:23:53 +02:00
Laurent Destailleur
d0c179e1e9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:54:32 +02:00
Laurent Destailleur
878c4fb106 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-03-30 19:53:40 +02:00
Laurent Destailleur
fbce8fcfe3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:53:31 +02:00
Laurent Destailleur
125e964352 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:50:47 +02:00
Laurent Destailleur
b081cf5cba Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/product/class/product.class.php
2020-03-30 19:48:41 +02:00
Laurent Destailleur
3ea9c297ea Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2020-03-30 19:46:23 +02:00
Laurent Destailleur
474260e526
Merge pull request #13447 from c3do/patch-1
Fix can set desiredstock to (int) 0 from API Rest
2020-03-30 19:46:02 +02:00
Laurent Destailleur
7466eaade3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:37:01 +02:00
Laurent Destailleur
9fcbec9f02 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:36:07 +02:00
Laurent Destailleur
06ad21f2e8
Merge pull request #13442 from fappels/9.0_newToken
Improve modulebuilder compatiblity with maintained versions.
2020-03-30 19:35:45 +02:00
Laurent Destailleur
ff44e2d2ac
Merge pull request #13448 from atm-quentin/FIX_missing_array_option_supplier_proposal_to_supplier_order
FIX missing array option
2020-03-30 19:35:20 +02:00
atm-quentin
64207ef58d FIX missing array option 2020-03-30 14:18:59 +02:00
Cédric
eead9a93d3
Fix can set desiredstock to (int) 0 from API Rest
When you set desiredstock to 0 as an integer from the API, it registers to null in the database. Using is_numeric() fixes this.
2020-03-30 13:03:13 +02:00
Francis Appels
3eda785ca5 Add newline end of file 2020-03-30 10:36:49 +02:00
Francis Appels
076caa11ab Add token functions to improve modulebuilder compatiblity with maintained versions. 2020-03-30 10:28:20 +02:00
Laurent Destailleur
30379b4cba Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	.travis.yml
2020-03-26 03:57:02 +01:00
Laurent Destailleur
81ae6c45ea composer is a big mess 2020-03-26 03:47:58 +01:00
Laurent Destailleur
39f7742387 Update travis config 2020-03-26 03:46:39 +01:00
Laurent Destailleur
386d478b65 Add os in travis 2020-03-26 03:44:58 +01:00
Laurent Destailleur
ddf233f2ed Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	.travis.yml
2020-03-26 03:39:46 +01:00
Laurent Destailleur
5fdf23bba8 Fix exclude fucking composer dependencies 2020-03-26 03:36:16 +01:00
Laurent Destailleur
84fc394e6f Fix exclude fucking composer dependencies 2020-03-26 03:29:29 +01:00
Laurent Destailleur
b48c21dbcb If we need more var here, we must fix to have var starting with search_ 2020-03-25 18:47:42 +01:00
Laurent Destailleur
e160ea2bee Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-25 18:45:55 +01:00
Laurent Destailleur
a7ba23d845
Merge pull request #13419 from atm-gauthier/9.0_search_status_on_bookmarks
FIX : when we filter a list on a view status, we want this filter to …
2020-03-25 18:44:40 +01:00
Laurent Destailleur
925554d15e More accurate result 2020-03-25 18:27:53 +01:00
Laurent Destailleur
74667c2943
Merge pull request #13422 from OPEN-DSI/v10-fix-invoice-remain-to-pay
FIX get remain to pay with rounding decimals
2020-03-25 18:26:33 +01:00
VESSILLER
c516a54f78 FIX get remain to pay with rounding decimals 2020-03-25 11:53:47 +01:00
gauthier
81af385259 FIX : when we filter a list on a view status, we want this filter to be on bookmark that we create 2020-03-25 10:27:59 +01:00
Laurent Destailleur
04a875f43b
Merge pull request #13404 from hregis/10.0_mc2
FIX remove unused var, $usercancreate can be change by Multicompany
2020-03-23 15:13:19 +01:00
Regis Houssin
45579b0986 FIX remove unused var, $usercancreate can be change by Multicompany 2020-03-23 07:01:23 +01:00
Laurent Destailleur
ef86311639
Merge pull request #13224 from mapiolca/patch-38
# Fix Compatibility with NOTMODIFYOTHERENTITYFOURNPRICE const.
2020-03-22 20:32:15 +01:00
Pierre Ardoin
26f6f04486
forgot ";" 2020-03-17 10:08:18 +01:00
Pierre Ardoin
564f412957
correction due to comments @hregis and @eldy 2020-03-17 10:04:43 +01:00
Laurent Destailleur
5dc403cb66 FIX #13304 2020-03-12 12:19:24 +01:00
Laurent Destailleur
27bdee9df1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-11 17:01:47 +01:00
Laurent Destailleur
c9b715b7ad Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-11 17:01:31 +01:00
Laurent Destailleur
7afbb5ce9c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-03-11 17:00:01 +01:00
Laurent Destailleur
467dc2da7a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2020-03-11 16:59:35 +01:00
Laurent Destailleur
4bdf10c995 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2020-03-11 16:44:03 +01:00
Laurent Destailleur
13ffc186b7
Merge pull request #13324 from atm-florianm/FIX_10.0_status_column_empty_in_invoices_box_when_using_MAIN_STATUS_USES_CSS
FIX 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS
2020-03-11 16:41:24 +01:00
Laurent Destailleur
8808b7df87
Merge pull request #13325 from atm-florianm/FIX_10.0_load_langs_in_box_commandes
FIX 10.0 - missing translations for "orders" homepage "orders" box
2020-03-11 16:39:43 +01:00
Laurent Destailleur
7f759c6ff5
Merge pull request #13322 from atm-lena/6.0_FIX_FournCommandClone_ExtrafieldsLines
FIX - Clone Fourn Command, add line's extrafields
2020-03-11 16:36:27 +01:00
atm-lena
20aa51f26b FIX - Clone Fourn Command, add line's extrafields Part 2 2020-03-11 15:26:49 +01:00
Florian Mortgat
ce01cf278d FIX 10.0 - translations for "orders" not loaded in the homepage box 2020-03-11 11:45:57 +01:00
Florian Mortgat
6d1f62c1d9 FIX 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS 2020-03-11 11:03:19 +01:00
atm-lena
35f32391a0 FIX - Clone Fourn Command, add line's extrafields 2020-03-10 14:46:15 +01:00
Laurent Destailleur
aaf9aef5c8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/contrat/list.php
2020-03-06 14:17:21 +01:00