Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
140,250 Commits 36 Branches 189 Tags
901b9dab72357dad4e162f94d6b53e1e84d20dd5
Commit Graph

14028 Commits

Author SHA1 Message Date
Laurent Destailleur
3187d2888e Trans 2024-04-12 13:55:41 +02:00
Laurent Destailleur
1240072591 QUAL Make the same condition only once. 2024-04-12 13:53:18 +02:00
Laurent Destailleur
11c895dc9d Try to reduce CTI errors by removing alert on less important warnings. 2024-04-12 02:28:04 +02:00
Laurent Destailleur
32438fdbb3 Test precommit 2024-04-12 02:21:33 +02:00
thomas-Ngr
0f70306c87 New : Printipp ssl (#29320) 
* BasicIPP : set SSL to TRUE

* add SSL support to printing module

* trad

* Revert "BasicIPP : set SSL to TRUE"

This reverts commit 19c7c05a26.

* fix SSL
 2024-04-12 01:25:30 +02:00
Laurent Destailleur
5ccbca4009 Trans 2024-04-11 14:40:02 +02:00
Laurent Destailleur
beda30c493 Debug v20 2024-04-11 10:55:42 +02:00
Laurent Destailleur
b5ca87bc31 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-10 13:40:19 +02:00
Laurent Destailleur
cd6aeb34ac trans 2024-04-10 13:39:55 +02:00
Laurent Destailleur
31e09f134b Fix warnings 2024-04-10 02:52:39 +02:00
Laurent Destailleur
ce2b69a1ab Trans 2024-04-09 19:17:59 +02:00
Laurent Destailleur
3ad4fdc44e Trans 2024-04-09 19:10:22 +02:00
Lucas Marcouiller
232800d776 NEW feature to merge 2 tasks (#29214) 
* first push select not saved

* add working merge

* ass merge of contact for task

* fix typo

* add of merge timespent

* Fix integration error + use of good SelectTasks

* fix precommit

* Fix CI

* fix CI

* fix bad change

* fix to make merge only an update

* remove useless field update

* fix empty array

* fix CI

* fix unused code

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
 2024-04-08 20:50:16 +02:00
Charlène Benke
e4657c6b03 MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES error (#29010) 
* MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES error

if we enable MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES we disable the native contact tabs

* Update companies.lang

* Update companies.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-04-08 12:13:38 +02:00
Laurent Destailleur
fa7bcc35db Fix name of constant MAIN_MAIL_SMS_FROM must be MAIN_SMS_FROM 2024-04-08 11:19:43 +02:00
Laurent Destailleur
0a48d1ad56 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-04-08 03:38:04 +02:00
rqi14
bab1694cfc Fix bug in translation (zh-cn) (#29264) 
"由%s验证" is in correctly written as "由%验证s", causing failure in sprintf function in translate.class.php:743.

[client 172.23.0.4:47410] PHP Fatal error:  Uncaught ValueError: Unknown format specifie                   r "\xe9" in /var/www/html/core/class/translate.class.php:743\nStack trace:\n#0 /var/www/html/core/class/translate.class.php(743): sprintf()\n#1                    /var/www/html/core/actions_massactions.inc.php(1638): Translate->transnoentitiesnoconv()\n#2 /var/www/html/holiday/list.php(221): include('...                   ')\n#3 {main}\n  thrown in /var/www/html/core/class/translate.class.php on line 743
 2024-04-07 11:48:34 +02:00
Laurent Destailleur
e27cf045b8 Trans 2024-04-04 15:55:08 +02:00
Laurent Destailleur
0fc08e8926 Clean translation files 2024-04-04 15:15:04 +02:00
Laurent Destailleur
1551d02449 Trans 2024-04-04 15:05:13 +02:00
Laurent Destailleur
05042722db Fix transifex 2024-04-04 13:12:12 +02:00
Laurent Destailleur
2620cd9ca7 Transifex sync 2024-04-04 12:04:00 +02:00
Laurent Destailleur
0fe0cd7c01 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-04 11:39:02 +02:00
Laurent Destailleur
404ba88107 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-04 11:19:45 +02:00
Laurent Destailleur
0a39067cd6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-04 11:01:06 +02:00
Laurent Destailleur
ad79acf63c QUAL removed duplicate language file 2024-04-04 11:00:35 +02:00
Frédéric FRANCE
613f8be05f Merge remote-tracking branch 'upstream/develop' into translations_errors 2024-04-03 14:47:01 +02:00
Frédéric FRANCE
c349d38897 add translations of errors 2024-04-03 14:46:46 +02:00
Laurent Destailleur
5acdcac75d Debug v20 2024-04-03 12:25:06 +02:00
Laurent Destailleur
572600bfd3 NEW Use a nicer combo list to select the export accounting format 2024-04-02 17:41:53 +02:00
Laurent Destailleur
acb80c551f Update main.lang 2024-04-02 15:03:59 +02:00
Laurent Destailleur
92797333e6 Update companies.lang 2024-04-02 15:01:44 +02:00
Laurent Destailleur
a7cd496bd2 Merge branch 'develop' into NEW_MASS_ACTION_UNASSIGN_COMMERCIAL 2024-04-02 14:57:10 +02:00
Laurent Destailleur
a8d024f9f8 Fix lang 2024-04-02 14:11:24 +02:00
Laurent Destailleur
b28b0395d0 Merge pull request #29182 from bos4711/bos-dolibarr-29098 
Fix titles in contact pages
 2024-04-02 13:52:45 +02:00
Laurent Destailleur
5b60aada26 Update companies.lang 2024-04-02 13:50:28 +02:00
Laurent Destailleur
747e6d9586 Merge branch 'sonikf-patch-fix-translation' of 
github.com:DoliGreece/dolibarr into
DoliGreece-sonikf-patch-fix-translation
 2024-04-02 13:35:12 +02:00
Laurent Destailleur
9528093a05 NEW Complete the thirdparty index page with last modified contacts 2024-04-01 14:10:35 +02:00
Laurent Destailleur
45d46f25ef Merge index page of warehouse with product index page 2024-04-01 13:33:15 +02:00
Rikard Bosnjakovic
e2b1b13ca0 Update companies.lang 2024-04-01 13:20:11 +02:00
Rikard Bosnjakovic
f2a0949c10 Update companies.lang 2024-04-01 13:16:04 +02:00
Rikard Bosnjakovic
472b3f5e3b Update companies.lang 2024-04-01 13:11:58 +02:00
Rikard Bosnjakovic
6480d936b0 Update companies.lang 2024-04-01 13:10:26 +02:00
Rikard Bosnjakovic
51a767380e Update companies.lang 2024-04-01 13:01:47 +02:00
sonikf
6757fcc5e4 Qual translation 2024-04-01 01:27:02 +03:00
sonikf
3fd5dec2f4 Qual translation 2024-04-01 01:24:13 +03:00
sonikf
e3fab9b165 Qual translation 2024-04-01 01:20:31 +03:00
sonikf
fa380f3942 Qual translation 2024-04-01 01:19:21 +03:00
sonikf
73aa6a53e6 Qual translation 2024-03-31 23:59:46 +03:00
sonikf
3b5d3f7eb9 Qual translation 2024-03-31 23:54:17 +03:00