Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
126,990 Commits 36 Branches 189 Tags
c2c99ab2b86b8ee4ee252a67ecf8a01d0b1cf80d
Commit Graph

740 Commits

Author SHA1 Message Date
Laurent Destailleur
ba10d60a0b Fix with php-cs-fixer 2023-12-04 12:02:35 +01:00
Laurent Destailleur
53dab922fd Fix php8.2 warnings 2023-11-27 11:39:32 +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
c154a72d88 Debug v19 2023-11-06 19:32:04 +01:00
Christophe Battarel
9580f5bc11 add hook tabContentCreateProposal (#26411) 
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-11-01 14:25:33 +01:00
Christophe Battarel
010f2cd9b8 New : Add hook tabContentViewProposal (#26400) 
* add hook tabContentViewProposal

* update credentials

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-10-31 11:54:18 +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
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
e488243dd8 Standardize code 2023-10-11 11:34:42 +02:00
Laurent Destailleur
946239dbf3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-10 23:04:47 +02:00
Laurent Destailleur
d3dd3dacfe Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-10 22:52:04 +02:00
Laurent Destailleur
4cb3ecb11e Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-10 22:47:20 +02:00
Laurent Destailleur
94e8580cbb Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-10 22:39:52 +02:00
Laurent Destailleur
152b0178c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-10 22:38:20 +02:00
dev2a
765d60efdf Fix: Apply rector rule user permission on comm folder (#26163) 2023-10-10 09:14:30 +02:00
Laurent Destailleur
e2d3404651 Merge pull request #22475 from atm-kevin/FIX_Enable_Negative_Qty_In_Propal 
FIX : Propal's negative quantities
 2023-10-06 19:10:07 +02:00
Laurent Destailleur
f5534586c1 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-05 21:09:21 +02:00
Laurent Destailleur
4afda75a4d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-05 21:01:34 +02:00
Andrés Maldonado
ab1071b70a FIX: modification of complementary attributes in commercial proposals 
The db object must not be cloned in order to avoid a PHP Fatal error:  Uncaught Exception: Serialization of 'PgSql\Connection' is not allowed
 2023-10-04 18:31:20 +02:00
Andrés Maldonado
54a0245c4d FIX: modification of complementary attributes in commercial proposals 
The db object must not be cloned in order to avoid a PHP Fatal error:  Uncaught Exception: Serialization of 'PgSql\Connection' is not allowed

This commit replaces the dol_clone function by the one in the 17.0 branch
 2023-10-04 17:48:30 +02:00
Laurent Destailleur
4298150413 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:22:33 +02:00
Laurent Destailleur
b8bd760e28 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-01 16:06:58 +02:00
Laurent Destailleur
d5443010f2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-01 16:04:16 +02:00
Laurent Destailleur
5e76fea64d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-01 15:53:36 +02:00
Laurent Destailleur
5560aab98e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-01 15:50:25 +02:00
Laurent Destailleur
b0b3d0e1e0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-01 15:43:40 +02:00
Laurent Destailleur
e20b43d8b5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2023-09-29 00:21:55 +02:00
Laurent Destailleur
f2bfdb318e phpcs 2023-09-29 00:19:32 +02:00
VESSILLER
2980d90bdd Fix load thirdparty object once time 2023-09-28 08:49:13 +02:00
VESSILLER
afe71305fa FIX thirdparty object in proposal card is not loaded 2023-09-27 12:15:44 +02:00
pascal
19a528bed4 mv fetch_project to card.php 2023-09-25 20:48:43 +02:00
Regis Houssin
d133075fca FIX #25982 and avoid lose selected value if error 2023-09-24 15:56:18 +02:00
Laurent Destailleur
c6dbb3d434 Merge branch 'develop' into dev_sign_soeciete_rib 2023-09-09 11:55:30 +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
Florian HENRY
43d20f8cc0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_sign_soeciete_rib 2023-09-04 10:52:31 +02:00
vmaury
52fce1bf0d Fix #25714 : Totals in propal not rounded according to 
MAIN_MAX_DECIMALS_SHOWN
 2023-08-28 16:43:30 +02:00
HENRY Florian
a283c6f30c Merge branch 'develop' into dev_sign_soeciete_rib 2023-08-28 15:18:30 +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