2
0
forked from Wavyzz/dolibarr
Commit Graph

247 Commits

Author SHA1 Message Date
Laurent Destailleur
2b55ecceb0 Fix trans key must be short 2023-05-16 12:58:55 +02:00
Laurent Destailleur
b1811ce466 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-16 12:38:02 +02:00
Laurent Destailleur
80678cfcb9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-13 10:30:37 +01:00
stickler-ci
e0aa056845 Fixing style errors. 2023-03-09 14:40:43 +00:00
Pierre Ardoin
04f463259f Add Extrafields in Notes
Add support of extrafields in notes if its specified in extrafield's settings.
2023-03-09 15:26:59 +01:00
Laurent Destailleur
bd1366ab82 FIX method dolGetGlobalString not defined with saphir 2023-03-05 14:04:36 +01:00
Marc de Lima Lucio
5feb334da2 Merge branch '17.0' of https://github.com/Dolibarr/dolibarr into 15.0_FIX_PHP8_compatibility 2023-02-14 09:16:43 +01:00
Marc de Lima Lucio
1e53f87d51 FIX: various PHP8 compatibility fixes 2023-02-08 12:18:46 +01:00
Philippe GRAND
772966dae5 Update code for php8 compliance 2022-12-10 16:06:15 +01:00
Laurent Destailleur
2dffe3748d Debug v17 - Fix missing delete picto on ODT setup 2022-11-18 13:41:27 +01:00
Lamrani Abdel
124db0871b fix issue modify variable 2022-11-10 17:47:13 +01:00
Laurent Destailleur
018d5f5446 Merge pull request #22545 from grandoc/new_branch_10_10_2022
New branch 10 10 2022
2022-10-13 10:26:45 +02:00
Laurent Destailleur
9fa00c1771 Fix trans in comments 2022-10-12 15:29:30 +02:00
Philippe GRAND
5a1716f625 update code towards php8 compliance 2022-10-10 11:05:09 +02:00
Philippe GRAND
82c7a6e9f0 update code towards php8 compliance 2022-10-06 16:57:43 +02:00
Laurent Destailleur
be10cdee95 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-06 16:03:50 +02:00
Laurent Destailleur
8fdf4876d9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-06 15:39:10 +02:00
Philippe GRAND
a68e3676ef update code towards php8 compliance 2022-10-06 10:12:17 +02:00
Laurent Destailleur
dc30cb19b5 Merge pull request #22456 from grandoc/new_branch_29_09_2022
update code toward php8
2022-10-04 18:10:01 +02:00
Philippe GRAND
5612f1dfea update code towards php8 compliance 2022-10-03 11:40:14 +02:00
ksar
fe59054522 Supplier Reference is lost when page breaks
https://www.dolibarr.org/forum/t/pdf-aurore-modules-php-seems-to-loose-track-of-supplier-references/22856
2022-09-29 22:56:06 +02:00
Philippe GRAND
43dfb1dff0 update code toward php8 2022-09-29 12:16:32 +02:00
Frédéric France
c7ee2f413c min php version is 7.0 2022-09-27 20:48:47 +02:00
Frédéric FRANCE
dfb7c5ea48 clean aurore model 2022-09-12 14:50:55 +02:00
Laurent Destailleur
2b412af5b7 Merge pull request #22138 from defrance/patch-246
php V8 warning
2022-09-09 16:55:25 +02:00
This Charlène
ecf3a5c537 php V8 warning 2022-09-07 23:22:40 +02:00
Philippe GRAND
c3cb372f4c Update code 2022-09-03 11:22:57 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Philippe GRAND
e2df602229 add translation 2022-08-02 12:31:43 +02:00
Laurent Destailleur
08a942dca8 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-06-17 14:52:51 +02:00
Faustin
ef959ecddd FIX#21093 2022-06-11 00:18:38 +02:00
Laurent Destailleur
324721ac1e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/core/tpl/list_print_total.tpl.php
	htdocs/fichinter/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
2022-05-22 12:54:40 +02:00
Maxime Kohlhaas
bf39a259ba Fix PDF watermark over PDF text 2022-05-22 00:05:03 +02:00
Laurent Destailleur
308e7a3d9b Fix scrutinizer 2022-05-18 12:40:44 +02:00
Laurent Destailleur
49d15b691b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/expensereport/card.php
2022-04-29 17:35:36 +02:00
Laurent Destailleur
93de425c47 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
2022-04-29 17:32:28 +02:00
Florian HENRY
3d4bd1e155 FIX: truncate Customer Reference too long on PDF header (PR #20718) 2022-04-26 16:53:40 +02:00
Florian HENRY
399addfb03 mor docs 2022-04-26 16:40:27 +02:00
Laurent Destailleur
2690f4459f NEW Enhance the import. Can use 'auto' for the ref (import of orders) 2022-04-04 13:17:45 +02:00
Laurent Destailleur
dee5d8f9e8 Standardize name of button 2022-02-18 13:45:28 +01:00
Laurent Destailleur
1ca1f111b3 Fix warnings 2022-02-01 16:12:51 +01:00
Laurent Destailleur
6ddc4ba3a0 Fix bad value for total VAT on PDF 2022-02-01 13:23:52 +01:00
Laurent Destailleur
0ee0bfed85 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/fourn/commande/card.php
	test/phpunit/testvirus.txt
2022-01-23 13:04:37 +01:00
Laurent Destailleur
284fcf3ad5 FIX Company logo not found in some cases on some templates 2022-01-22 13:19:29 +01:00
Laurent Destailleur
c3a42162d9 FIX The vat code was not correctly managed on PDF templates 2022-01-08 14:43:24 +01:00
Laurent Destailleur
0037ee2254 Fix ckeditor plugins 2022-01-01 19:37:53 +01:00
Laurent Destailleur
962ac263ba Fix look and feel v15 2021-11-27 15:29:48 +01:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-25 20:07:31 +00:00
Laurent Destailleur
b4cfe35138 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 13:39:46 +02:00
Laurent Destailleur
b11dbf069e FIX Bad use of a forced contact of another company on PDF/ODT documents 2021-10-05 13:11:54 +02:00