Commit Graph

84523 Commits

Author SHA1 Message Date
VESSILLER
9c4d7044a3 FIX sql bad request in product buying price extrafields 2019-12-26 16:18:26 +01:00
Laurent Destailleur
ece8390277 Add tables to store translation of all objects (like llx_product_lang) 2019-12-26 13:23:18 +01:00
Laurent Destailleur
ea4c236311 fix alignment 2019-12-26 13:05:03 +01:00
Alexandre SPANGARO
9a7307eea8 FIX Missing language key for MAIN_MAXTABS_IN_CARD 2019-12-26 12:01:09 +01:00
VESSILLER
811adad8c8 FIX notice var nbfield of array not initialized 2019-12-26 10:34:10 +01:00
VESSILLER
046aba8abd FIX indented errors 2019-12-26 10:14:05 +01:00
lvessiller-opendsi
dec64b45e8
Merge branch 'develop' into new-propal-tooltip-note 2019-12-26 10:06:38 +01:00
VESSILLER
bf1bf10a53 FIX resolve conflicts 2019-12-26 09:56:35 +01:00
VESSILLER
23b4e3ad6d FIX resolve conflicts 2019-12-26 09:50:15 +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
Laurent Destailleur
4333cf2040 Show the stripe accoutn of a cu_ and a card_ 2019-12-24 12:53:10 +01:00
Florian Mortgat
cbca0f389a Merge branch 'develop' into FIX_develop_urls_longer_than_255_chars_get_truncated_in_bookmarks 2019-12-24 10:00:20 +01:00
Florian Mortgat
7359c4140d FIX 12.0 - bookmark URLs get truncated to 255 chars - PR rescheduled for merging into the next major version (v12.0) 2019-12-24 09:54:02 +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
6f97d163f9 Fix: the stripe_account is not filled 2019-12-23 22:41:34 +01:00
Laurent Destailleur
5521d13a11 Prepare 10.0.5 2019-12-23 22:12:50 +01:00
Alexandre SPANGARO
6b55b600f1 Merge remote-tracking branch 'upstream/develop' into 12.0_a1 2019-12-23 21:31:52 +01:00
Alexandre SPANGARO
115ca50c13 Merge remote-tracking branch 'upstream/develop' into 11.0_a7 2019-12-23 21:25:43 +01:00
Alexandre SPANGARO
0f81fbe1c5 Merge remote-tracking branch 'upstream/develop' into 11.0_a6 2019-12-23 21:19:32 +01:00
Alexandre SPANGARO
ab0f77b467 Merge remote-tracking branch 'upstream/develop' into 11.0_a5 2019-12-23 21:15:17 +01:00
Alexandre SPANGARO
c646484f30 Merge remote-tracking branch 'upstream/develop' into 11.0_a4 2019-12-23 21:08:26 +01:00
Laurent Destailleur
fc45d7d249 Comaptible php 7.4 2019-12-23 21:04:14 +01:00
Alexandre SPANGARO
384651db46 Merge remote-tracking branch 'upstream/develop' into 11.0_a2 2019-12-23 21:01:17 +01:00
Alexandre SPANGARO
af4b0f54c5 Merge remote-tracking branch 'upstream/develop' into 11.0_a1 2019-12-23 20:44:32 +01:00
Laurent Destailleur
cc8000a255 Removed not used files 2019-12-23 20:39:36 +01:00
Laurent Destailleur
85f3f553c2 Fix travis 2019-12-23 20:32:44 +01:00
Laurent Destailleur
d4f3d14b65 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 19:19:10 +01:00
Laurent Destailleur
9f5029aa0f Fix warning 2019-12-23 19:17:53 +01:00
Laurent Destailleur
14c510f4be Remove php 5.5 2019-12-23 19:14:00 +01:00
Laurent Destailleur
094b37d79d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 19:12:32 +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
d24da57498 Update changelog 2019-12-23 16:26:42 +01:00
Laurent Destailleur
908e8be0da PHP Min bill 5.6 for Dolibarr 12 2019-12-23 16:25:45 +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
92708e31ce Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 15:51:59 +01:00
Laurent Destailleur
f45710a4b1 Fix phpcs 2019-12-23 15:51:23 +01:00
Laurent Destailleur
1ebf7e642f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 15:49:25 +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
d5f6ccc7a0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 14:40:36 +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