Commit Graph

78589 Commits

Author SHA1 Message Date
Laurent Destailleur
cc4c2d8a0b Prepare 10.0.6 2020-01-05 20:39:45 +01:00
Laurent Destailleur
eca91af2ca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-04 14:21:56 +01:00
Laurent Destailleur
7853427bb1 FIX product with empty stock were not visible 2020-01-04 14:21:38 +01:00
Laurent Destailleur
0dafbd194f Merge pull request #12750 from OPEN-DSI/v10-fix-product-virtual-stock-stats-sending
FIX add product qty in shipment already sent (fix for option STOCK_CALCULATE_ON_SHIPMENT_CLOSE)
2020-01-03 20:56:59 +01:00
Laurent Destailleur
37f9307732 Update product.class.php 2020-01-03 20:53:49 +01:00
Laurent Destailleur
88d97104be Merge pull request #12789 from aspangaro/10.0_p32
FIX Some problems on conciliation with others modules
2020-01-03 20:47:33 +01:00
Laurent Destailleur
e178d38bf8 Merge pull request #12791 from ptocquin/patch-1
Update api_supplier_invoices.class.php
2020-01-03 20:42:55 +01:00
Laurent Destailleur
e83b71f271 Merge pull request #12787 from aspangaro/10.0_p30
FIX Loan card - Wrong language key used
2020-01-03 20:42:01 +01:00
Laurent Destailleur
b452fc8442 Merge pull request #12788 from aspangaro/10.0_p31
FIX typo on language key
2020-01-03 20:41:04 +01:00
Laurent Destailleur
2c141d57df Merge pull request #12790 from mapiolca/patch-18
FIX an issue that shows all entities stock
2020-01-03 20:40:44 +01:00
Pierre Tocquin
8a5f3d48f4 Update api_supplier_invoices.class.php
Correction test data 'date'  lors de la création d'une facture fournisseur. `array_keys` remplacé par `array_key_exists` dans la clause `if`. Cette clause est correcte dans api_invoices.class.php.
2020-01-03 19:18:24 +01:00
Pierre Ardoin
79458ac139 FIX an issue that shows all entities stock
Before : If products are shared between several entities, the stock of each entity are to add in this page (reassort.php)
 
Now : Each entity see only her stock and not other's stock.
2020-01-03 18:05:49 +01:00
Alexandre SPANGARO
f14aaf5e50 FIX Some problems on conciliation with others modules 2020-01-03 16:35:02 +01:00
Alexandre SPANGARO
93d87d581b FIX typo on language key 2020-01-03 14:56:49 +01:00
Alexandre SPANGARO
67316c9125 FIX Loan card - Wrong language key used 2020-01-03 14:38:25 +01:00
Laurent Destailleur
103f41f571 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-31 18:22:34 +01:00
Laurent Destailleur
d2efe1d427 Fix SQL injection on type parameter in list of events 2019-12-31 17:52:28 +01:00
Laurent Destailleur
31c5f4eb0b Merge pull request #12748 from OPEN-DSI/v10-fix-projet-element-linkto
FIX remove backward compatibility projectid and uses object id instead
2019-12-31 17:40:01 +01:00
Laurent Destailleur
ff1c96f985 Merge pull request #12753 from aspangaro/10.0_p9
FIX : Some issues on salary payment
2019-12-31 17:39:08 +01:00
Laurent Destailleur
4c6c8e172f Merge pull request #12784 from Dolibarr/revert-12751-v10-fix-html-form-margin-class
Revert "FIX class Facture undefined in displaying margin information"
2019-12-31 17:33:21 +01:00
Laurent Destailleur
08d0d63a04 FIX #12760 #12763 #12755 #12765 #12751 2019-12-31 17:30:27 +01:00
Laurent Destailleur
5cc0d26eae Revert "FIX class Facture undefined in displaying margin information" 2019-12-31 17:26:02 +01:00
Laurent Destailleur
10d6d00c17 Merge pull request #12749 from OPEN-DSI/v10-fix-admin-dict-transkey-not-defined
FIX var transkey not defined in input hidden
2019-12-30 22:01:16 +01:00
Laurent Destailleur
6e90e81be1 Merge pull request #12751 from OPEN-DSI/v10-fix-html-form-margin-class
FIX class Facture undefined in displaying margin information
2019-12-30 22:00:28 +01:00
Laurent Destailleur
b067653070 Merge pull request #12757 from aspangaro/10.0_p12
FIX Missing language key for MAIN_MAXTABS_IN_CARD
2019-12-30 21:59:32 +01:00
Laurent Destailleur
aa390b8c3c Merge pull request #12771 from tuxgasy/10.0_Fix_double_value_on_update_object
Fix decimal value on update object
2019-12-30 21:50:53 +01:00
Laurent Destailleur
e2c7ee7d09 Merge pull request #12772 from hregis/10.0_mc
FIX wrong var name and avoid warning
2019-12-30 21:48:56 +01:00
Laurent Destailleur
5a34874b0a Merge pull request #12752 from OPEN-DSI/v10-fix-project-element-task-urlnew
FIX url new for task time spent in project element tab
2019-12-30 21:47:26 +01:00
Laurent Destailleur
eb659ab68c Merge pull request #12755 from ATM-Marc/FIX_10.0_margin_error500
FIX: error 500 when getting margin info for objects other than invoices
2019-12-30 21:40:26 +01:00
Regis Houssin
71a2998118 FIX wrong var name and avoid warning 2019-12-30 15:36:09 +01:00
TuxGasy
c9cc6cbbea Fix decimal value on update object 2019-12-29 23:15:49 +01:00
Alexandre SPANGARO
a804208b32 Fix missing language key 2019-12-27 20:54:47 +01:00
Alexandre SPANGARO
9a7307eea8 FIX Missing language key for MAIN_MAXTABS_IN_CARD 2019-12-26 12:01:09 +01:00
Marc de Lima Lucio
c8dfc3d9fc FIX: error 500 when getting margin info for objects other than invoices 2019-12-24 16:09:29 +01:00
Alexandre SPANGARO
44400b7866 FIX : Some issues on salary payment 2019-12-24 07:22:25 +01:00
Laurent Destailleur
07b40f043e Prepare 10.0.5 10.0.5 2019-12-23 22:44:34 +01:00
Laurent Destailleur
5521d13a11 Prepare 10.0.5 2019-12-23 22:12:50 +01:00
VESSILLER
792096ad08 FIX url new for task time spent in project element tab 2019-12-23 16:00:35 +01:00
Laurent Destailleur
3250b13f4a FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n" 2019-12-23 15:45:08 +01:00
VESSILLER
720146c45f FIX class Facture undefined in displaying margin information 2019-12-23 15:37:12 +01:00
VESSILLER
99e63ad507 FIX uses GETPOSTISSET instead of GETPOST for projectfield 2019-12-23 15:18:45 +01:00
VESSILLER
b0edd46494 FIX add product qty in shipment already sent 2019-12-23 15:07:26 +01:00
VESSILLER
e03222b831 FIX var transkey not defined in input hidden 2019-12-23 14:38:01 +01:00
VESSILLER
e7a5d26355 FIX remove backward compatibility projectid and uses object id instead 2019-12-23 14:25:54 +01:00
Laurent Destailleur
7b08ce9fb8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-23 14:01:51 +01:00
Laurent Destailleur
eb32e98127 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-23 14:01:44 +01:00
Laurent Destailleur
36e6036e9e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-23 14:01:00 +01:00
Laurent Destailleur
76d23141fd Merge pull request #12727 from fappels/patch-1
Update 6.0.0-7.0.0.sql
2019-12-23 14:00:15 +01:00
Laurent Destailleur
1229e8bc4b Merge pull request #12747 from OPEN-DSI/v10-fix-contact-card-select-state
FIX contact card state address selected after filling address
2019-12-23 13:47:16 +01:00
Laurent Destailleur
15031a3e87 Merge pull request #12746 from OPEN-DSI/v10-fix-categories-traduction-backurl
FIX add and modify category translate form with posted values on errors
2019-12-23 13:44:37 +01:00