Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 17:31:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
139,989 Commits 36 Branches 190 Tags
c403fc901b1918d747febe6fb5d3091b23c15600
Commit Graph

11395 Commits

Author SHA1 Message Date
Laurent Destailleur
2e533f692f Debug v20 2024-04-20 13:17:53 +02:00
Laurent Destailleur
4b8a3304b0 Trans 2024-04-20 13:08:35 +02:00
Laurent Destailleur
6222a7556b Trans 2024-04-19 16:49:28 +02:00
Laurent Destailleur
0e6b0aa750 Trans 2024-04-19 16:47:15 +02:00
Laurent Destailleur
bf3ec1a163 Trans 2024-04-19 16:42:47 +02:00
Laurent Destailleur
1e7e3f3a0a Trans 2024-04-19 16:35:40 +02:00
Laurent Destailleur
b7a07d8348 Look and feel v20 2024-04-19 15:54:09 +02:00
Laurent Destailleur
612e41a8ca Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/19.0.0-20.0.0.sql
	htdocs/product/stock/replenish.php
	htdocs/takepos/invoice.php
 2024-04-18 02:48:52 +02:00
Laurent Destailleur
64ecea7c83 FIX #26959 2024-04-14 02:53:20 +02:00
Laurent Destailleur
d4c74cf572 Debug v20 2024-04-13 14:14:25 +02:00
Laurent Destailleur
23c4cfd2b4 NEW Add SMTP AUTH method PLAIN 2024-04-13 13:05:52 +02:00
Laurent Destailleur
80d1c418de Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-13 11:35:47 +02:00
Laurent Destailleur
8059a2b99b Trans 2024-04-13 11:35:29 +02:00
Alexandre SPANGARO
ef10f793cc NEW Accountancy - Expense report - Add an option to use end period for transfer (#26706) 
* NEW Accountancy - Expense report - Add an option to use end period for transfer

* Update accountancy.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-04-12 23:10:27 +02:00
atm-adrien
99e85334b5 FIX : Error when updating user (#29304) 
* FIX : Error management

* FIW : PR returns

* FIX : PR returns error
 2024-04-12 16:31:25 +02:00
Laurent Destailleur
be52b8d75d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-12 14:32:59 +02:00
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
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
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