Commit Graph

2299 Commits

Author SHA1 Message Date
Regis Houssin
a3193a08bc FIX merge problem 2025-01-06 13:56:32 +01:00
Regis Houssin
d443446838 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into
fix_20_wrong_value_of_socid
2025-01-06 13:53:22 +01:00
Laurent Destailleur (aka Eldy)
226ecdc157 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-12-07 18:21:32 +01:00
Laurent Destailleur (aka Eldy)
413115dfe8 Fix position of column 2024-12-07 18:04:06 +01:00
Regis Houssin
5fe1eb8947 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into
fix_20_wrong_value_of_socid
2024-12-07 08:11:01 +01:00
Florian HENRY
d109647434 fix: phpstan typemismatch 2024-12-04 16:40:21 +01:00
Regis Houssin
3e3f9c755d FIX Check "$search_sale" only if it's an internal user 2024-12-02 12:10:39 +01:00
Regis Houssin
d423633266 FIX phan errors 2024-12-02 10:36:54 +01:00
Laurent Destailleur (aka Eldy)
5c321cc678 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-12-02 01:52:08 +01:00
Laurent Destailleur (aka Eldy)
9227add8f4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-12-02 01:41:40 +01:00
HENRY Florian
240c5bb311 fix: buyer and sellers in supplier invoice and supplier order list are not corectly defined (#32028)
* fix: buyer and sellers in supplier invoice and supplier order list are not corectly defined

* chore: revert bad changes
2024-11-21 23:00:41 +01:00
HENRY Florian
991f53db9e FIX: use tax with code on supplier order line give tax code missing in supplier invoice (#32018)
* FIX: use vat with code on supplier order result code missing in supplier invoice

* FIX: use vat with code on supplier order result code missing in supplier invoice
2024-11-21 17:46:54 +01:00
Quentin-Seekness
1a752c16cf Fix setincoterms Location (#32037)
* Fix setincoterms Location

* Fix location_incoterms on invoice card

* Fix location_incoterms on supplier order

* Fix location_incoterms on supplier invoice
2024-11-21 17:11:19 +01:00
moreauftheobald
4b9a5db62f Tracking conf->module->enabled 1 (#31895)
* Fix Php 8 warning on commande dispach

* Tracking $conf->module->enabled

---------

Co-authored-by: Theobald <f.moreau@theobald-groupe.com>
2024-11-15 23:02:49 +01:00
Laurent Destailleur
a17d26665c Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-10-24 20:08:28 +02:00
ATM-NicolasV
399d778a7e Fix:edition rapide de la date de livraison et propagation vers la commande (#31437)
* pouvoir modifier la date de livraison au statut brouillon et propagation de la valeur lors de la création d'une commande

* remove comment

---------

Co-authored-by: ATM-nicolasV <nicolas.vidal@atm-consutling.fr>
2024-10-24 03:14:23 +02:00
Laurent Destailleur
53a1d06678 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-10-15 15:41:31 +02:00
Laurent Destailleur
ccc27739d7 Fix bad escapement 2024-10-15 15:40:50 +02:00
Laurent Destailleur
916014707d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-10-14 21:18:24 +02:00
Laurent Destailleur
7cd1425bc1 Fix css 2024-10-14 20:17:21 +02:00
Laurent Destailleur
59dadd88a3 FIX Duplicate trigger printFieldPreListTitle 2024-09-25 13:43:11 +02:00
MaximilienR-easya
f64a07861d Fix php8 change, '' != 0 since php8 (#30997)
* Fix php8 change, '' != 0 since php8

* Update dispatch.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-09-18 01:25:28 +02:00
John BOTELLA
3380115908 Fix v20 php8 patch002 (#30931)
* Fix PHP 8 notices, warninngs, fatal

* precommit

* fix php 8 errors

* use this db

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-09-12 21:11:45 +02:00
Laurent Destailleur
23384296ea Fix #30550 2024-08-07 01:57:07 +02:00
Laurent Destailleur
6b076821e3 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-25 18:20:01 +02:00
Laurent Destailleur
f4611fcec9 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-25 18:06:37 +02:00
Laurent Destailleur
966ac2cdbc Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-07-25 18:04:42 +02:00
HENRY Florian
0982220397 FIX: Supplier Order search on date valid (#30448)
* FIX: Supplier Order search on date valid

* FIX: Supplier Order search on date valid
2024-07-24 18:12:53 +02:00
Laurent Destailleur
12c7edfd63 Debug v20 2024-07-22 12:19:56 +02:00
Alexandre SPANGARO
128769811c Add css bodylist on list (#30334)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-11 00:45:05 +02:00
Laurent Destailleur
8a4f550d64 Debug v20 2024-07-09 17:33:27 +02:00
Laurent Destailleur
a9bdd17668 Fix url 2024-07-03 02:06:01 +02:00
atm-jonathan
5794d6bbc1 missing newToken() (#30239) 2024-07-03 02:04:06 +02:00
Laurent Destailleur
4374ecebad Fix CSRF = 3 for cancel and clone 2024-06-25 12:31:24 +02:00
boudet jean pascal
028e5fd1d3 FIX add token in link validate and clone button uri generate an error wi… (#30144)
* add token in link validate and clone  button uri generate an error with MAIN_SECURITY_CSRF_WITH_TOKEN to 3

* remove dot

---------

Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-25 12:14:48 +02:00
Laurent Destailleur
96a1d5aeb5 Debug v20 2024-06-22 02:51:10 +02:00
Florent Poinsaut
495b6f0440 NEW Supplier Order canceled notification (#26882)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-05-25 14:38:35 +02:00
Sylvain Legrand
ace675d6bd NEW Add option to change all service dates at once (#29348)
* New option to change all service dates at once

* Update objectline_title.tpl.php

* Update objectline_title.tpl.php

* Update objectline_title.tpl.php
2024-05-25 13:12:35 +02:00
Laurent Destailleur
66f4562300 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-05-23 14:50:17 +02:00
Laurent Destailleur
a854e58905 FIX Missing $param in hook call for list 2024-05-23 14:41:56 +02:00
atm-etienne
dc8b79e0d4 New classify billed order without invoice (#29614)
* Add new conf in admin page for supplier order classify billed without invoice

* Add translations en_US

* Add check on new config to allow or not the classify billed button

* Add possibility to set the hidden conf to disallow classify billed button from order, from the admin page

* Update conf names and move code to right parts, according to PR returns
2024-05-22 13:30:44 +02:00
Laurent Destailleur
50cd81ef93 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-05-16 13:16:18 +02:00
Laurent Destailleur
92f6539744 Use dolPrintHTML() 2024-05-15 18:21:50 +02:00
Noé Cendrier
911571ad61 FIX: PHP8 warning if $conf->reception is checked the old fashion way (#29697) 2024-05-15 18:05:27 +02:00
Laurent Destailleur
16336a66ad Rename french module name into english 2024-05-13 10:45:20 +02:00
sonikf
5f98189729 fix #29381 backport #28039 in v. 19 (#29400) 2024-04-20 22:33:57 +01:00
Laurent Destailleur
612e41a8ca Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/19.0.0-20.0.0.sql
	htdocs/product/stock/replenish.php
	htdocs/takepos/invoice.php
2024-04-18 02:48:52 +02:00
sonikf
95aa03e3b0 FIX #28347 FIX #28962 FIX #29224 FIX #29035 (#29303)
* FIX #28347 FIX #28962 FIX #29224

* fix empty line

* Update card.php

* FIX #29035

* add multicompany support in creation of supplier order from client order

* Update card.php

Assign a subprice value of 0 to user selected lines without a vendor product price when creating a supplier order from a client order
2024-04-12 12:53:03 +02:00
Vincent Maury
6212868aca regl_mode on new command not set (#29293)
When creating a new supplier order, even if the default reglement_mode is set for this supplier, the reglement_mode for the new order is not set.
As It is for the cond_reglement
I don't understand why my update is ok, but IT IS !
2024-04-09 20:09:45 +02:00
Laurent Destailleur
14afdf6b0e Fix regression on GETPOSTINT 2024-04-03 17:50:24 +02:00