Commit Graph

112374 Commits

Author SHA1 Message Date
Laurent Destailleur
cfd9e7ed62 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-17 16:17:06 +01:00
Laurent Destailleur
481edd95fd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-17 16:15:58 +01:00
Laurent Destailleur
aefe12f01b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-17 16:15:46 +01:00
Laurent Destailleur
3ba63aec78 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-17 16:15:01 +01:00
Laurent Destailleur
884ecc9e87 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-02-17 16:14:37 +01:00
Laurent Destailleur
711bf2e6a8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-02-17 16:14:23 +01:00
Laurent Destailleur
0f9af62808
Merge pull request #23938 from rycks/13.0_fix_undefined_var
msg is not defined
2023-02-16 22:01:59 +01:00
Eric Seigne
bf9a44ac6f msg is not defined 2023-02-16 21:48:55 +01:00
Laurent Destailleur
a7d79a1f75
Merge pull request #23913 from simnandez/15.0
Fix Bad assignation for external users access
2023-02-16 21:11:37 +01:00
Laurent Destailleur
d27e296b82
Merge pull request #23931 from atm-GregM/FIX_15.0_dolibarr_parse_error
FIX parse error and NAN
2023-02-16 21:05:34 +01:00
Laurent Destailleur
5d58c993bd
Merge pull request #23930 from aspangaro/14p42
Supplier proposal - List - SQL error on total_ht
2023-02-16 21:02:12 +01:00
stickler-ci
390e7c83b2 Fixing style errors. 2023-02-16 10:48:41 +00:00
GregM
9e1b8bcd4c FIX parse error and NAN 2023-02-16 11:33:43 +01:00
Alexandre SPANGARO
f24ffe5b91 Supplier proposal - List - SQL error on total_ht 2023-02-16 10:20:37 +01:00
Laurent Destailleur
94002bf85c Fix sql 2023-02-15 20:38:38 +01:00
Laurent Destailleur
c259ca09b8 Enhance script to repair database when stock by lot differ from stock 2023-02-15 20:14:48 +01:00
Laurent Destailleur
6db1c1cd2f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-15 18:22:06 +01:00
Laurent Destailleur
d511291b4b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-15 18:18:53 +01:00
Laurent Destailleur
89817c8ead Fix message for profit calculation 2023-02-15 18:17:06 +01:00
Laurent Destailleur
b57d1ed263 FIX Profit calculation on project preview tab. 2023-02-15 18:16:54 +01:00
Laurent Destailleur
32d27887b1 Fix message for profit calculation 2023-02-15 18:11:25 +01:00
Laurent Destailleur
d04043f3d8 FIX Profit calculation on project preview tab. 2023-02-15 18:04:23 +01:00
Laurent Destailleur
1b925ec53f FIX Profit calculation on project preview tab. 2023-02-15 17:59:27 +01:00
Juanjo Menent
670ae506e3 Fix: Bad assignation for external users access 2023-02-15 10:47:25 +01:00
Laurent Destailleur
7db2c9706d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-14 10:59:23 +01:00
Laurent Destailleur
3278b7bc86 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-02-13 23:38:07 +01:00
Laurent Destailleur
6eda0f4c2e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2023-02-13 21:58:26 +01:00
Laurent Destailleur
5217ae28f8 Fix load of margin infos 2023-02-13 21:35:48 +01:00
Laurent Destailleur
b8aad7d760
Merge pull request #23894 from altairis-benjamin/isArray
FIX bad check on if in get_all_ways
2023-02-13 18:10:11 +01:00
Laurent Destailleur
c3214ff3e0
Merge pull request #23895 from rycks/13_fix_loi_de_finance_525
fix loi de finance 525
2023-02-13 18:09:07 +01:00
Laurent Destailleur
b40cd67fa8
Merge pull request #23878 from hregis/fix_can_not_set_prospect_status
FIX Object of class LDAP\Connection could not be converted to string
2023-02-13 18:05:37 +01:00
Eric Seigne
cac9a00bac fix loi de finance 525 2023-02-13 16:19:00 +01:00
Benjamin Falière
c3fc14a45a FIX bad check on if in get_all_ways 2023-02-13 16:05:12 +01:00
Laurent Destailleur
e9c5f515ce Fix #huntrb1412070-740e-4119-8e4b-61bdc3af42aa 2023-02-13 14:35:02 +01:00
Laurent Destailleur
239f7a1eb0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-13 13:58:03 +01:00
Laurent Destailleur
927a87851d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-13 13:57:02 +01:00
Laurent Destailleur
f569048eb2 Fix #hunter7a048bb7-bfdd-4299-931e-9bc283e92bc8 2023-02-13 13:54:28 +01:00
Regis Houssin
9c706061be FIX Object of class LDAP\Connection could not be converted to string 2023-02-11 08:48:09 +01:00
Laurent Destailleur
23b4e999fb Better sql for unique index 2023-02-10 19:44:34 +01:00
Laurent Destailleur
1e2a3ffa5d
Merge pull request #23858 from elcf/16.0-uk
Merge pull request #23817 from elcf/develop
2023-02-10 19:42:35 +01:00
Laurent Destailleur
a10bd18601
Merge pull request #23872 from aspangaro/14p42
FIX : Missing right to edit service note when module product is disabled
2023-02-10 19:39:10 +01:00
Alexandre SPANGARO
c61326cdae Merge branch '14.0' into 14p42 2023-02-10 15:01:29 +01:00
Alexandre SPANGARO
1bc16f47c0 FIX : Missing right to edit service note when module product is disabled 2023-02-10 15:00:27 +01:00
Laurent Destailleur
7358dfa20f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-09 23:20:09 +01:00
Laurent Destailleur
73b894dca3 Fix the qty in stock when product has no lot 2023-02-09 23:19:58 +01:00
Laurent Destailleur
802ee770c3 FIX #23860 2023-02-09 19:25:55 +01:00
Laurent Destailleur
17881050e3
Merge pull request #23859 from FHenry/15_fix_ref_fourn_column_size
FIX: product ref fourn same size in supplier order/invoice as in product price fourn
2023-02-09 18:24:55 +01:00
Laurent Destailleur
6362e3612b
Merge pull request #23856 from atm-quentin/FIX_16.0_strato_pdf
FIX strato pdf
2023-02-09 18:18:25 +01:00
Florian HENRY
8bd6f070aa FIX: product ref fourn same size in supplier order/invoice as in product price fourn 2023-02-09 17:22:45 +01:00
Laurent Destailleur
69b690c45e Merge pull request #23817 from elcf/develop
Added key name to unique constraint
2023-02-09 11:36:41 -04:00