Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
129,604 Commits 36 Branches 189 Tags
40f18f5577b51b366d5f32799312433d35cf5598
Commit Graph

13058 Commits

Author SHA1 Message Date
Lamrani Abdel
3cc15d4163 New display for template email in boxes 2024-01-29 15:38:13 +01:00
Laurent Destailleur
40794458d2 Comment 2024-01-29 13:00:33 +01:00
vmaury
f033cc455f Fix : random bug when attaching file to email : no file attached 2024-01-29 01:58:07 +01:00
Laurent Destailleur
c57e16dd05 Merge pull request #27845 from vmaury/Fix_random_bug_when_attach_file_to_a_mail 
Fix : random bug when attaching file to email : no file attached
 2024-01-29 01:57:28 +01:00
Laurent Destailleur
df9349a866 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-29 01:27:25 +01:00
Laurent Destailleur
9c703c08e0 Merge pull request #27044 from defrance/patch-299 
NEW : add some bank info on odt
 2024-01-29 00:56:25 +01:00
Laurent Destailleur
b0c8266aa4 Merge pull request #27082 from altairis-benjamin/improveTicketMail 
ADD ticket subject on emails
 2024-01-29 00:49:28 +01:00
Laurent Destailleur
fab05b38da Merge pull request #27819 from thibdrev/patch-3 
qual: phpstan for htdocs/core/class/menubase.class.php
 2024-01-28 12:49:52 +01:00
Laurent Destailleur
f37657f72b Merge pull request #27830 from frederic34/patch-3 
fix tests
 2024-01-28 12:45:20 +01:00
vmaury
e66d9dd22f Fix : random bug when attaching file to email : no file attached 2024-01-28 09:32:53 +01:00
Laurent Destailleur
079b2aa3a0 Debug webportal 2024-01-27 17:58:19 +01:00
Laurent Destailleur
25a91c63cf Debug webportal module 2024-01-27 17:23:03 +01:00
Laurent Destailleur
f9de28a9e9 Qual: The color selector use the generic Dolibarr component. 2024-01-27 12:08:28 +01:00
Frédéric FRANCE
673b1727e2 fix getMultidirOutput can't find multidir_output for mycompany 2024-01-27 10:38:23 +01:00
Frédéric FRANCE
441b499a82 fix tests 2024-01-26 13:23:41 +01:00
thibdrev
7015827142 qual: phpstan for htdocs/core/class/menubase.class.php 
htdocs/core/class/menubase.class.php	500	Property Menubase::$fk_menu (int) does not accept string.
htdocs/core/class/menubase.class.php	501	Property Menubase::$position (int) does not accept string.
htdocs/core/class/menubase.class.php	509	Property Menubase::$user (int) does not accept string.
htdocs/core/class/menubase.class.php	510	Property Menubase::$tms (int) does not accept string.
 2024-01-26 09:01:32 +01:00
Laurent Destailleur
7cef1a6e00 Merge pull request #27572 from lamrani002/addInputInEmailing 
NEW  input in emailForm for put instructions
 2024-01-26 04:04:09 +01:00
Laurent Destailleur
09c52d6cf9 Update html.formmail.class.php 2024-01-26 04:03:50 +01:00
Laurent Destailleur
3a22fb28e3 Merge pull request #27784 from thibdrev/patch-3 
qual: phpstan for htdocs/compta/facture/class/facture.class.php
 2024-01-26 02:27:43 +01:00
Laurent Destailleur
c311dc3df1 Merge pull request #27796 from thibdrev/patch-15 
qual: phpstan for htdocs/core/class/html.formaccounting.class.php
 2024-01-26 02:14:02 +01:00
Laurent Destailleur
70ba182c7e Merge pull request #27806 from EchoLoGeek/bodyclass_devcampwinter 
Add morecss property to common textarea
 2024-01-26 00:40:55 +01:00
Laurent Destailleur
d8ede0807f Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-25 17:25:13 +01:00
Laurent Destailleur
b8686f159f Debug module receipt printer 2024-01-25 15:18:06 +01:00
EchoLoGeek
67db158278 Fix PHPCS error 2024-01-25 12:53:23 +01:00
EchoLoGeek
2275dd9610 Add morecss properties to common textarea 2024-01-25 12:27:07 +01:00
thibdrev
ef22c80a82 qual: phpstan for htdocs/core/class/html.formaccounting.class.php 
htdocs/core/class/html.formaccounting.class.php	109	Method FormAccounting::select_journal() should return string but returns int.
htdocs/core/class/html.formaccounting.class.php	189	Method FormAccounting::multi_select_journal() should return string but returns int.
htdocs/core/class/html.formaccounting.class.php	339	Method FormAccounting::select_bookkeeping_importkey() should return string but returns int.
htdocs/core/class/html.formaccounting.class.php	403	Method FormAccounting::select_account() should return string but returns int.
htdocs/core/class/html.formaccounting.class.php	503	Method FormAccounting::select_auxaccount() should return string but returns int.
htdocs/core/class/html.formaccounting.class.php	526	Method FormAccounting::select_auxaccount() should return string but returns int.
htdocs/core/class/html.formaccounting.class.php	582	Method FormAccounting::selectyear_accountancy_bookkepping() should return array|string but returns int.
 2024-01-24 22:00:56 +01:00
thibdrev
3f7e51f448 Update commonobject.class.php - defineBuyPrice() return type 2024-01-24 21:04:02 +01:00
lamrani abdelwadoud
fbf46a4d4b Merge branch 'develop' into addInputInEmailing 2024-01-24 17:38:59 +01:00
MDW
2a82af74e0 Qual: Optimize + avoid recognition by trans scripts. 
# Qual: Optimize + avoid recognition by trans scripts.

This optimizes the code by avoiding contactenating the string twice.
This was detected because the new shell script (#27726) identifies
this as a fixed string and it's better to adjust the code than
make the script more complex.
 2024-01-24 14:50:49 +01:00
Laurent Destailleur
b7f50fe0d9 Merge pull request #27752 from Daoud-mohamed/Technical-debts-7 
Fix some warnings -Technical debts-
 2024-01-24 14:29:01 +01:00
Laurent Destailleur
2b3b0fb2ec Merge pull request #27764 from frederic34/patch-5 
fix phpstan
 2024-01-24 14:27:18 +01:00
Laurent Destailleur
bbc2302f00 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-24 11:58:30 +01:00
Laurent Destailleur
3eb461db7c FIX #27771 Sec: birth date and personal address not visible by default 
on vcard
 2024-01-24 11:56:56 +01:00
Laurent Destailleur
99fee99a52 Merge pull request #27769 from thibdrev/patch-4 
qual: phpdoc
 2024-01-24 10:48:41 +01:00
Laurent Destailleur
9c963b915c Merge pull request #27770 from mdeweerd/qual/fixtranskeys 
Qual: Fix translation keys.
 2024-01-24 10:48:18 +01:00
thibdrev
d0224e0714 fix conflict with last commit 2024-01-24 07:45:37 +01:00
thibdrev
1a0639662f typo 2024-01-24 07:42:35 +01:00
Laurent Destailleur
0602b40e3a FIX Debug setup of module TakePOS 2024-01-24 03:34:42 +01:00
Laurent Destailleur
b51b8ab1d5 FIX Debug setup of module TakePOS 2024-01-24 03:34:03 +01:00
MDW
565fe09cb5 Qual: Fix translation keys. 
# Qual: Fix translation keys

Modify some translation keys so that they correspond to each other,
use an existing key or fix the contents as it's not translated yet.
 2024-01-23 23:56:20 +01:00
thibdrev
fcc3ecd455 phpcs 2024-01-23 22:31:12 +01:00
thibdrev
1f73c1110e phpdoc 2024-01-23 22:26:55 +01:00
Laurent Destailleur
ce21af7b6c Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-23 22:17:46 +01:00
Laurent Destailleur
cca01cbda4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-23 22:15:36 +01:00
Frédéric FRANCE
95599f15e1 Update stats.class.php 2024-01-23 20:43:08 +01:00
Frédéric FRANCE
38323c0c9a fix phpstan 2024-01-23 20:41:06 +01:00
Laurent Destailleur
9ab352c4de Merge branch 'develop' into Technical-debts-7 2024-01-23 19:08:53 +01:00
Frédéric FRANCE
3ff524da9f Update html.formsetup.class.php 2024-01-23 16:46:33 +01:00
Laurent Destailleur
a7378be744 Fix use css of setup text item when fieldAttr are also provided 2024-01-23 16:28:36 +01:00
Laurent Destailleur
b177e68d04 Can hide first line of title in setup factory 2024-01-23 16:12:41 +01:00