2
0
forked from Wavyzz/dolibarr
Commit Graph

859 Commits

Author SHA1 Message Date
Laurent Destailleur
53dab922fd Fix php8.2 warnings 2023-11-27 11:39:32 +01:00
Alexandre SPANGARO
af0c6899a7 Travis fix (#26708)
* Travis fix

* Travis remove warning "Line exceeds 500 characters"

* Travis remove warning "Line exceeds 500 characters"

* Travis remove warning "Line exceeds 500 characters"
2023-11-18 11:56:29 +01:00
Laurent Destailleur
a48e541093 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/core/class/html.formadmin.class.php
	htdocs/core/lib/functions.lib.php
2023-11-12 23:18:19 +01:00
Laurent Destailleur
2f340a1a77 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/comm/propal/card.php
2023-11-12 23:06:31 +01:00
atm-lena
0946220e9b Check price base type (#26503)
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
2023-11-09 15:41:39 +01:00
Laurent Destailleur
127de7e7d8 FIX On object validation, ecm index are not updated for uploaded files 2023-11-01 16:17:54 +01:00
Christophe Battarel
b3e7457cd3 NEW : add new hook tabContentCreateOrder (#26408)
* NEW : add new hook tabContentCreateOrder

* update comment

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-01 14:25:26 +01:00
Laurent Destailleur
74e1ec4099 FIX On object validation, ecm index are not updated for uploaded files 2023-10-31 19:28:11 +01:00
Christophe Battarel
1a32455e70 update comment and credentials (#26401)
* update comment

* update credentials

* remove bad commit

* update credentials

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-31 11:57:53 +01:00
Laurent Destailleur
b8728b5d07 Use a more explicit name for new hook 2023-10-30 02:39:06 +01:00
Christophe Battarel
c064893f80 NEW : add new hook OrderCard (#26380)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-30 02:30:35 +01:00
Laurent Destailleur
e1bf377f20 QUAL: Removed deprecated field remise, remise_percent, remise_absolute 2023-10-20 10:47:08 +02:00
Laurent Destailleur
0fbffea663 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-17 14:49:16 +02:00
Laurent Destailleur
fb8b4acdbf The duplicated and deprecated property ->date_livraison that was renamed
into ->delivery_date has been completely removed.
2023-10-17 10:36:11 +02:00
Laurent Destailleur
9144293f0b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-16 06:02:17 +02:00
Laurent Destailleur
48adfe9bcd Fix regression 2023-10-16 05:59:34 +02:00
Laurent Destailleur
0360d61f9c Code comment for develop 2023-10-16 05:51:47 +02:00
Laurent Destailleur
abe3f00b11 Fix regression. Restore old behaviour even if some case are not tested. 2023-10-16 05:15:39 +02:00
Noé Cendrier
a92458ebbc FIX check tva_tx before comparing price_min_ttc (#25220)
* FIX check tva_tx before comparing price_min_ttc

* better price_ttc comparison for propal, commande, facture lines

* price_ht must be transformed into number before using it for calculating
2023-10-16 04:07:10 +02:00
Laurent Destailleur
1f38e54e78 Clean code 2023-10-15 15:32:35 +02:00
Laurent Destailleur
c32fe8dc5f QUAL: Use dol_clone with parameter 2 for ->oldcopy 2023-10-11 19:10:24 +02:00
Laurent Destailleur
68404bec9b Merge pull request #22619 from mbinformatique68/develop
NEW Add the formEditObjectLine hook on commande card and invoice card
2023-10-06 19:13:58 +02:00
Laurent Destailleur
11a1630287 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-25 11:47:18 +02:00
Laurent Destailleur
55b91f00d2 Look and feel v19 2023-09-25 11:44:46 +02:00
Regis Houssin
d133075fca FIX #25982 and avoid lose selected value if error 2023-09-24 15:56:18 +02:00
Laurent Destailleur
9148d7540e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-09-20 03:09:10 +02:00
Laurent Destailleur
498af7d7bc Look and feel v19 2023-09-19 21:05:02 +02:00
Laurent Destailleur
492b726da9 Fix regression with label of order 2023-09-19 20:32:23 +02:00
Laurent Destailleur
69e7f0f1f3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-19 20:07:36 +02:00
Laurent Destailleur
8f002a2310 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-19 18:14:27 +02:00
Laurent Destailleur
101ddf2a75 FIX link to create purchase order from sale order 2023-09-19 18:05:57 +02:00
Laurent Destailleur
39dd702145 Fix warning in option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_ORDER 2023-09-19 17:59:46 +02:00
Laurent Destailleur
aab30d7638 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 15:33:04 +02:00
Regis Houssin
b6e84b1c74 FIX use urlencode for origin and originid 2023-09-06 10:02:12 +02:00
Regis Houssin
927cc91da4 FIX avoid wrong backtopage url 2023-09-06 06:44:10 +02:00
Laurent Destailleur
3343a47244 NEW billing on shipment+reception. Can be done before or after delivery. 2023-09-03 21:38:11 +02:00
Laurent Destailleur
272c51164b Fix typo Productcustomerprice into ProductCustomerPrice 2023-08-24 15:08:33 +02:00
Laurent Destailleur
bf1549e6e0 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-24 00:14:55 +02:00
Laurent Destailleur
888e8d7588 FIX bad balance of TR tag in multicurrency price view 2023-08-23 21:56:02 +02:00
Laurent Destailleur
11ad17bcf3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-09 15:00:52 +02:00
Laurent Destailleur
bdd1d89101 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-08-08 22:08:25 +02:00
Laurent Destailleur
b0e4558e3f Fix #25586 2023-08-08 21:53:52 +02:00
Laurent Destailleur
ea364ff1a3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 13:47:17 +02:00
Laurent Destailleur
bef9146bb1 Fix warnings 2023-08-05 12:50:09 +02:00
Laurent Destailleur
f18fae5271 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-06 22:24:35 +02:00
Laurent Destailleur
86864b4d53 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-06 22:22:26 +02:00
Laurent Destailleur
2a9f4da015 FIX #25290 FIX #25287 FIX #25288 2023-07-06 22:02:23 +02:00
Laurent Destailleur
f0ed7b436b Fix for #25290 2023-07-06 20:03:22 +02:00
Laurent Destailleur
eb22ebced9 Fix int 2023-07-06 19:57:09 +02:00
Laurent Destailleur
8e7d9578ca Typo 2023-07-03 21:57:43 +02:00