Commit Graph

867 Commits

Author SHA1 Message Date
Laurent Destailleur
438d87b3ec Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-24 14:14:37 +02:00
Laurent Destailleur
92a7101893
Merge pull request #24724 from noec764/15_FIX_Fill_DB_with_instead_of_null
FIX: Authorize '0' subprice in supplier proposal line
2023-05-21 21:02:43 +02:00
Laurent Destailleur
6350df54e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-05-21 11:22:36 +02:00
Noé Courtier
d8dd1ebd19 FIX: Authorize '0' subprice 2023-05-09 17:43:31 +02:00
Noé Courtier
bfe7cd76c2 FIX: No error message because $price_ht_devise is equal to 0 if not fill because of price2num 2023-05-09 17:12:09 +02:00
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
3ba63aec78 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-17 16:15:01 +01:00
Alexandre SPANGARO
f24ffe5b91 Supplier proposal - List - SQL error on total_ht 2023-02-16 10:20:37 +01:00
Laurent Destailleur
283ad1abcf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 20:54:16 +01:00
Laurent Destailleur
2a299068ad Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-18 20:45:44 +01:00
stickler-ci
4ee0ede6d8 Fixing style errors. 2023-01-18 08:53:28 +00:00
Noé Courtier
d344e108c9 FIX: Errors Handling for CreateFrom Hooks 2023-01-18 09:44:23 +01:00
Florian HENRY
dbc9ca9816 FIX: missing token on Supplier proposal links 2023-01-16 22:17:22 +01:00
Florian HENRY
90137268a1 FIX: missing tokan on Supplier proposal links 2023-01-16 22:15:02 +01:00
Thomas Negre
dba6c68181 Fix supplier proposal clone : when a line subprice is empty, it should be saved as 0 in the Database, not null. 2022-11-10 16:55:23 +01:00
Laurent Destailleur
77898ab456 Fix f... option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS (do not use this!) 2022-10-12 11:52:33 +02:00
Laurent Destailleur
3ef29ef592 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 18:11:23 +02:00
Laurent Destailleur
6f77359617 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 18:11:06 +02:00
Laurent Destailleur
de9c123595 Fix bad var 2022-09-09 16:40:53 +02:00
This Charlène
72c4bb9106
Update card.php 2022-09-07 23:29:41 +02:00
This Charlène
15ae870924
Update card.php 2022-09-07 23:17:24 +02:00
This Charlène
0234b352fe
php V8 warning 2022-09-07 23:13:49 +02:00
Laurent Destailleur
4b562121ec Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 14:33:02 +02:00
Laurent Destailleur
9463f24a73 Better fix 2022-07-24 11:35:56 +02:00
Laurent Destailleur
fbf70beedb
Merge pull request #21557 from emheyarssi/15.0.2
Fix #21449
2022-07-24 11:35:24 +02:00
marc
a7b593026b Fix #21449 2022-07-22 00:55:14 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty"
This reverts commit e0b664066b.
2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Christian Foellmann
4335e67249 remove old commented code 2022-06-27 12:59:06 +02:00
stickler-ci
23d948cec4 Fixing style errors. 2022-06-27 10:56:08 +00:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Alexandre SPANGARO
f8477f8b25 Look & Feel v16 - Align amount to right on card 2022-06-25 07:03:36 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
cd041c9ea1 Clean code 2022-06-03 02:41:00 +02:00
Laurent Destailleur
0bb7defa88 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/card.php
2022-06-01 16:04:11 +02:00
Laurent Destailleur
64a683c8e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/projet/tasks/task.php
2022-05-31 14:33:19 +02:00
kamel
79462c43fa FIX: Fix get origin from other than supplier proposal when add a new supplier proposal 2022-05-24 15:13:19 +02:00
Laurent Destailleur
7fd3bb0aae Remove deprecated code 2022-05-19 12:08:03 +02:00
Laurent Destailleur
a483af70df Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/contrat/index.php
2022-05-17 23:27:11 +02:00
Laurent Destailleur
c475789433 Debug v16 2022-05-17 23:23:50 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
fa7254be9a Fix picto and perm 2022-05-03 17:05:14 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
147e61472c Clean code: Remove all   entities. 2022-04-29 13:10:28 +02:00
Gauthier PC portable 024
83e8e07416 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-04-08 09:25:08 +02:00
Laurent Destailleur
26c3e235cf
Merge pull request #19459 from frederic34/productmerge
can merge products
2022-04-07 15:02:03 +02:00
Laurent Destailleur
4693ef42bd Enhance responsive 2022-04-07 11:18:56 +02:00
Laurent Destailleur
5b91ae062f All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for
code consistency purpose.
2022-04-02 10:31:58 +02:00
Laurent Destailleur
bc938d86ba NEW Can enter price with tax for predefined products on purchase objects 2022-03-26 11:22:54 +01:00