Commit Graph

83224 Commits

Author SHA1 Message Date
Laurent Destailleur
15f1153e82 FIX Avoid line feed when 100% 2019-12-31 17:22:12 +01:00
Laurent Destailleur
9a8459e494 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2019-12-31 14:49:21 +01:00
Laurent Destailleur
175894db26 FIX Status of direct debit payment after setting to paid. 2019-12-31 14:48:52 +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
Laurent Destailleur
defe3b20ec
Merge pull request #12764 from hregis/11.0_bug
FIX avoid php warning
2019-12-30 21:39:43 +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
Maxime Kohlhaas
7025d3839a Remove € + unsed code and file 2019-12-29 09:56:03 +01:00
Alexandre SPANGARO
a804208b32 Fix missing language key 2019-12-27 20:54:47 +01:00
Regis Houssin
c76edb20d7 FIX avoid php warning 2019-12-27 12:20:38 +01:00
Alexandre SPANGARO
9a7307eea8 FIX Missing language key for MAIN_MAXTABS_IN_CARD 2019-12-26 12:01:09 +01:00
Laurent Destailleur
8202a67e4e Fix look and feel v11 2019-12-25 23:15:56 +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 2019-12-23 22:44:34 +01:00
Laurent Destailleur
5521d13a11 Prepare 10.0.5 2019-12-23 22:12:50 +01:00
Laurent Destailleur
fc45d7d249 Comaptible php 7.4 2019-12-23 21:04:14 +01:00
Laurent Destailleur
cc8000a255 Removed not used files 2019-12-23 20:39:36 +01:00
Laurent Destailleur
9f5029aa0f Fix warning 2019-12-23 19:17:53 +01:00
Laurent Destailleur
8e78dbad69 Fix for php 7.4 2019-12-23 16:41:22 +01:00
Laurent Destailleur
f193d3edd8 Fix for php7.4 2019-12-23 16:38:37 +01:00
Laurent Destailleur
c8a39cec1c Try php 7.4 2019-12-23 16:04:35 +01:00
Laurent Destailleur
111fda9aa6 Try php 7.4 2019-12-23 16:03:20 +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
f45710a4b1 Fix phpcs 2019-12-23 15:51:23 +01:00
Laurent Destailleur
330cca994e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2019-12-23 15:49:00 +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
Laurent Destailleur
29cacec886 Fix month when using "Now" button addnowlink = 2 2019-12-23 14:39:24 +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
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
2019-12-23 14:13:26 +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
0ea5df36c1 Disable ping for alpha versions 2019-12-23 13:55:58 +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
Laurent Destailleur
93cece6a3a
Merge pull request #12738 from mapiolca/patch-16
#FIX Error Margin with Situation Invoice
2019-12-23 13:43:18 +01:00
Laurent Destailleur
b3400fac24
Merge pull request #12744 from OPEN-DSI/v10-fix-facture-duedate-and-paid
FIX set due date in object in create invoice
2019-12-23 13:42:31 +01:00
Laurent Destailleur
e963fa4b07 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-23 13:40:49 +01:00