Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
123,878 Commits 36 Branches 189 Tags
3a2b48f16cee99bc9a8612aa1c40407bbc0c7334
Commit Graph

123878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saami PERDRIX - ATM Consulting
3a2b48f16c backport de #cc85a1a 2023-12-11 16:58:22 +01:00
Sébastien NASSIET
181ee31c47 doActions hook on update category (#26726) 
* doActions hook on update category

* Update edit.php
 2023-11-19 00:08:49 +01:00
Christophe Battarel
75a7d0de9b fix shipping ref if already set (#26156) 
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-11-18 14:11:34 +01:00
Laurent Destailleur
be509634a4 Fix phpunit 2023-11-18 02:13:49 +01:00
Laurent Destailleur
b4f31eeee8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-18 01:34:41 +01:00
Laurent Destailleur
e0bffbb7d9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-18 01:25:36 +01:00
Laurent Destailleur
1b91a9f83b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-11-18 01:24:59 +01:00
Laurent Destailleur
05f6575abe Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-18 01:21:35 +01:00
Laurent Destailleur
29e3386e6f Fix #26584 Fix #26673 2023-11-18 01:21:17 +01:00
Frédéric FRANCE
5ae8da372a fix phpcs (#26697) 2023-11-18 00:42:52 +01:00
Maxime Kohlhaas
a680d1e34d Fix strpos inversion for expedition and receipt in files.lib (#26701) 2023-11-18 00:42:15 +01:00
Laurent Destailleur
90556039a1 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-17 17:59:00 +01:00
Laurent Destailleur
5db512229b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-17 17:58:48 +01:00
Maxime Kohlhaas
c756aa8ad3 Fix tasklist extrafields (#26672) 
* Fix : value of extrafields not displayed in task list on a project

* Fix : icon to select columns was not displayed
 2023-11-17 16:39:49 +01:00
Maxime Kohlhaas
d7851240b4 Fix : on supplier order, vat for all lines wasn't working with 0 value (#26675) 2023-11-17 16:27:00 +01:00
Saami PERDRIX
57eb6136a4 Trigger on update note (#26666) 
* ajout trigger sur update_note

* nom des triggers adapté selon objet
 2023-11-17 14:14:28 +01:00
Noé Cendrier
afca8ee6cb typo (#26665) 2023-11-17 14:13:29 +01:00
Laurent Destailleur
ac248dfd90 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-17 12:03:56 +01:00
Laurent Destailleur
042d583070 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-17 12:03:38 +01:00
Laurent Destailleur
3a0b3fd8a8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-17 12:02:36 +01:00
Laurent Destailleur
6ea48ac22a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-17 12:02:21 +01:00
HENRY Florian
102356d2c4 fix: When sendmail failed it return false, result is KO, need to say it to user (#26631) 
* fix: When sendmail failed it return false, need to be tested as is

* fix: When sendmail failed it return false, so >=0 do not trigger error

* fix: When sendmail failed it return false, so >=0 do not trigger error

* Update CMailFile.class.php

* Update actions_sendmails.inc.php

* Update actions_sendmails.inc.php

* Update CMailFile.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-17 12:01:03 +01:00
HENRY Florian
dd0b78fb55 fix: keep filter on type code : dol_escape_htmltag an array is not possible (#26639) 
* fix: filter type code on ticket list

* fix: keep filter on type code : dol_escape_htmltag an array is not possible
 2023-11-17 11:45:37 +01:00
Eric
337fa2ac67 add category map to categorie (#26649) 2023-11-17 03:44:15 +01:00
Laurent Destailleur
9748ece49f Fix phpcs 2023-11-17 01:40:11 +01:00
Laurent Destailleur
7c68dc3d1e Fix phpcs 2023-11-17 01:17:23 +01:00
Laurent Destailleur
144be811fc Fix phpcs 2023-11-17 00:54:15 +01:00
Laurent Destailleur
5e59e8d0e4 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/langs/en_US/stocks.lang
 2023-11-17 00:44:30 +01:00
Maxime Kohlhaas
de0b733430 Fix : missing getEntity for hrm public holiday (#26627) 2023-11-16 23:27:20 +01:00
Laurent Destailleur
f375c41ebb Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-16 15:50:02 +01:00
Laurent Destailleur
bc70788ace Fix phpcs 2023-11-16 15:49:21 +01:00
MDW
c4542895d7 Fix recurrent supplier invoice generation (title) (#26601) 2023-11-16 15:43:48 +01:00
lvessiller-opendsi
8444c1e389 FIX pagination parameters on save and cancel buttons (#26605) 2023-11-16 15:41:34 +01:00
HENRY Florian
7c43aa86c9 fix: mising delete inventory perms with MAIN_USE_ADVANCED_PERMS (#26617) 
* fix: mising delete inventory perms

* fix: mising delete inventory perms
 2023-11-16 15:31:20 +01:00
kkhelifa-opendsi
fdb81c3ceb FIX: Fix set private note (#26610) 2023-11-16 15:26:51 +01:00
thibdrev
11ed276fe3 fix PRODUCT VARIANTS - Missing translation key for "Combination" (#26618) 
* Add "Attributes" key to en_US/products.lang

* Add "Attributes" key to fr_FR/products.lang

* Change langs->trans('Combination') to lang-trans->trans('Attributes')
 2023-11-16 15:19:51 +01:00
Christian Humpel
df31421e86 Integrate 'sqlfilterlines' in API for commande. (#26612) 
Co-authored-by: christian.humpel <christian.humpel@gmail.com>
 2023-11-16 15:05:32 +01:00
Christian Humpel
d567bdaa53 Integrate 'sqlfilterlines' in API for supplierorders. (#26613) 
Co-authored-by: christian.humpel <christian.humpel@gmail.com>
 2023-11-16 15:00:13 +01:00
Günter Lukas
06915267a7 Fix #26620 (#26622) 
Fix calculation of total amount of multicurrency
 2023-11-16 14:59:07 +01:00
Laurent Destailleur
a1c040dcc1 Doc 2023-11-15 23:52:48 +01:00
atm-sami
966e26e450 FIX add display of an error when attempting to delete a committed transaction (#26573) 
* add display of an error when attempting to delete a committed transaction

* update
 2023-11-14 14:53:40 +01:00
thibdrev
1ba7d135e0 delete method isReconciled() because it is now inherited (#26591) 2023-11-14 14:29:25 +01:00
Laurent Destailleur
9464c0a040 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-14 02:27:24 +01:00
Laurent Destailleur
c81f7a01d1 FIX #26518 2023-11-14 02:26:33 +01:00
thibdrev
a97335ce3a fix Customer Invoice - Display payment delete button solely if payment isn't reconciled (#26568) 
* add function isReconciled()

* display payment delete button solely if payment isn't reconciled

* phpcs

* phpcs
 2023-11-14 02:05:40 +01:00
Alexandre SPANGARO
f5702f7710 FIX Social contribution - Payment list - Wrong information in type column (#26561) 2023-11-13 21:01:44 +01:00
Laurent Destailleur
68ffe0960d Trans 2023-11-13 15:27:42 +01:00
Laurent Destailleur
061f340f90 Debug v19 2023-11-13 15:20:56 +01:00
thibdrev
86bad02b9d FIX #26553 Supplier invoice - Do not display the delete button for reconciled payment (#26554) 
* do not display delete button if payment is reconciled

* add isReconciled() function

* phpcs fix: replace spaces by tab

* phpcs fix: Whitespace found at end of line

* phpcs
 2023-11-12 23:41:59 +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