Commit Graph

8998 Commits

Author SHA1 Message Date
Frédéric France
57b440677a
Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05_01 2025-01-05 19:02:46 +01:00
Frédéric France
9eb58c9ce9
fix phpstan 2025-01-05 19:02:28 +01:00
Frédéric France
2977a1af0e
fix phpstan 2025-01-05 18:55:59 +01:00
Laurent Destailleur (aka Eldy)
1cfa3b5803 Fix warning 2025-01-05 18:34:01 +01:00
Joachim Kueter
b0ce1788d4
Backport of fix from v21 to v20
I just tried to fix the same issue and saw that it has already been fixed in develop just 18 hours ago...
2025-01-04 08:21:28 +01:00
Laurent Destailleur (aka Eldy)
14399f8159 Fix error 500 when generating contract pdf document 2025-01-03 14:10:53 +01:00
Frédéric France
ee9a5291cd
add fix phpstan 2024-12-31 16:25:57 +01:00
Laurent Destailleur (aka Eldy)
85547f7594 Debug v21 2024-12-30 00:50:33 +01:00
Laurent Destailleur
63ec064552
Merge branch 'develop' into phpstan_2024_12_15 2024-12-17 02:50:52 +01:00
Frédéric FRANCE
4d9b398437
fix phpstan 2024-12-16 11:17:10 +01:00
Frédéric France
8c5160d0aa
Merge remote-tracking branch 'upstream/develop' into phpstan_2024_12_15 2024-12-15 09:33:16 +01:00
Frédéric France
2bb990344e
fix phpstan 2024-12-15 09:17:08 +01:00
Frédéric France
eff000868b
Merge remote-tracking branch 'upstream/develop' into contact_canvas_phpstan 2024-12-15 08:41:44 +01:00
Frédéric France
1dd86e9d32
fix 2024-12-14 09:08:33 +01:00
Charlie Root
912206d99b Correction bug #32365 Warning: Attempt to read property datepaye on string 2024-12-13 23:35:47 +01:00
Laurent Destailleur (aka Eldy)
778b07dabd Debug v21 Fix tooltip on setup pages 2024-12-13 17:22:48 +01:00
Regis Houssin
1443e48a30 FIX missing init function to create accounting table 2024-12-13 07:34:49 +01:00
Laurent Destailleur (aka Eldy)
e72f23895b Fix regression 2024-12-11 19:40:39 +01:00
Laurent Destailleur (aka Eldy)
88465b7b42 Add TODO 2024-12-11 17:51:16 +01:00
Laurent Destailleur (aka Eldy)
ba6bbdda0e Fix legal mention of VAT intra europe 2024-12-11 15:08:24 +01:00
Laurent Destailleur
54f584e836
Merge branch 'develop' into develop 2024-12-10 18:47:44 +01:00
Laurent Destailleur (aka Eldy)
860f89cc44 Debug v21 2024-12-10 17:14:33 +01:00
nat
7a842dc104
Update pdf_sponge.modules.php
Does not display linked objects if the new PDF option is checked
2024-12-09 21:00:25 +01:00
Laurent Destailleur (aka Eldy)
46931f2ef6 Doc 2024-12-09 14:50:21 +01:00
Laurent Destailleur
143ce9bf0a
Merge branch 'develop' into fix_v20_pdf_space_lost_with_images_sponge 2024-12-09 01:12:47 +01:00
Laurent Destailleur
f86b847a65
Merge branch 'develop' into fix_v20_pdf_space_lost_with_images_eratosthene2 2024-12-08 22:58:03 +01:00
Laurent Destailleur
a772b4f120
Merge pull request #32201 from altairisfr/export_field_name_alias
ADD: The alternative name field for export customer invoices and orders name alias
2024-12-08 10:47:15 +01:00
ems-co
509ef2e3c0
Update pdf_standard_expensereport.modules.php 2024-12-04 18:51:09 +03:00
Noé Cendrier
ff694634ec
Merge branch 'develop' into export_field_name_alias 2024-12-04 15:09:27 +01:00
Regis Houssin
9aa4ce7ac5 FIX use GETPOST instead GETPOSTINT 2024-12-04 10:31:48 +01:00
Regis Houssin
0f50c8e1e8 Revert "FIX wrong param entity value"
This reverts commit badbc14c62.
2024-12-04 10:22:28 +01:00
Regis Houssin
badbc14c62 FIX wrong param entity value 2024-12-04 09:39:03 +01:00
Frédéric France
c9dc2952ca
fix phpstan 2024-12-03 18:26:24 +01:00
Mélina JOUM
b98d799d20 ADD: The alternative name field for export customer invoices and orders 2024-12-02 14:30:43 +01:00
Frédéric FRANCE
01297eeb86
fix phpstan (#32188)
* fix phpstan

* fix typos

* add phpdoc

* cut long line
2024-12-01 23:15:27 +01:00
Laurent Destailleur (aka Eldy)
f5ef2eee49 Debug v21 2024-12-01 15:47:01 +01:00
Laurent Destailleur (aka Eldy)
cd946f9829 Doc 2024-11-28 16:44:19 +01:00
Laurent Destailleur
9b75610f9f More complete test to show the mention "VATIsNotUsedForInvoice" 2024-11-26 13:14:39 +01:00
Mathieu Moulin
d1ded1caa1
Add option to hide only Volume (and keep weight) in shipping PDF - Issue #32030 (#32031)
* Add option to hide only Volume (and keep weight) in shipping PDF

* Fix use of option SHIPPING_PDF_HIDE_VOLUME in shipping lines

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-21 18:05:35 +01:00
Laurent Destailleur
1386d8c388 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-11-19 04:21:29 +01:00
Laurent Destailleur
e9e1175134 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-11-19 04:04:10 +01:00
Laurent Destailleur
93b11038d5 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-11-19 03:44:50 +01:00
Laurent Destailleur
99774022a5 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-11-19 03:36:44 +01:00
Laurent Destailleur
c5ebc9b7bd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-11-19 03:33:15 +01:00
HENRY Florian
b7746121c5
fix: CronJob Propertyy 'comment' do not exist replace by note_private (#31970) 2024-11-18 17:17:09 +01:00
Laurent Destailleur
a11c599a37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-18 16:27:26 +01:00
Laurent Destailleur
5891fd3022 Clean code 2024-11-18 15:43:34 +01:00
Laurent Destailleur
2d08d89d55 Trans 2024-11-18 13:58:29 +01:00
Laurent Destailleur
72fda5eeb3 Debug v21 2024-11-17 14:13:51 +01:00
Laurent Destailleur
ceaeabb115 FIX #22539 #31900 2024-11-17 01:36:19 +01:00
evarisk-kilyan
a811e061ca
fix: fatal on install step-5 (#31954)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-16 18:58:24 +01:00
Mathieu Moulin
adf59f2599
Fix mod_facture_fournisseur_tulip::getExample & get_next_value if no object in parameter (#31878) 2024-11-16 00:00:05 +01:00
alex10843
5d9d282f1b
FIX: Takepos: set the country of the default customer (#31915)
* FIX: Takepos: set the country of the default customer

* Update modTakePos.class.php

---------

Co-authored-by: Alex - Solauv <vous@exemple.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-15 23:56:14 +01:00
MaximilienR-easya
c72efea880
Fix signature box when rounded param is set (#31882) 2024-11-15 23:48:10 +01:00
Lucas Marcouiller
4b45a2a78c
fix php warning modCaptchaStandard class (#31906)
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-11-15 23:08:20 +01:00
moreauftheobald
9dee6b56af
Tracking conf->module->enabled 3 (#31905)
* Tracking $conf->module->enabled part 2

* Tracking $conf->module->enabled part 3

* Tracking $conf->module->enabled part 3

---------

Co-authored-by: Theobald <f.moreau@theobald-groupe.com>
2024-11-15 23:02:26 +01:00
Delthair
e2b6762b3c
ISSUE #31816 (#31820)
Bug correction to finalise step 5 of installation
2024-11-14 23:31:25 +01:00
Alexandre SPANGARO
70a96461af
NEW: Module Asset experimental (#31821) 2024-11-14 23:24:20 +01:00
MDW
a0f515ef12
Qual: Improve write_file typing (part 2) (#30527)
* Qual: Add abstract write_file to ModeleDon

And update phpdoc for derived classes

* Qual: Add abstract write_file to ModeleChequeReceipts

And update phpdoc for derived classes

* Qual: Add abstract write_file to ModelePDFRecruitmentCandidature

And update phpdoc for derived classes

* Qual: Add abstract write_file to ModelePDFStock & ModelePDFStockTransfer

And update phpdoc for derived classes

* Qual: Update phpdoc write_file for CommonStickerGenerator classes

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-13 23:58:32 +01:00
sonikf
1f2bb2969a
NEW: PDF Invoice show vat analysis per rate (#31381)
* Show vat analysis

* Show vat analysis

* Show vat analysis

* fix white space

* Update main.lang

* Show vat analysis

* Show vat analysis

* add copyright

* fix pre-commit

* fix pre-commit

* fix pre-commit

* fix php-stan (8.2)

* fix php-stan (8.2)

* fix php-stan (8.2)

* fix pre-commit tab

* Update pdf_other.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-13 22:41:00 +01:00
Frédéric FRANCE
2c4d1038d0
fix phpstan (#31805)
* fix

* fix

* fix

* fix

* fix
2024-11-13 22:37:17 +01:00
Frédéric FRANCE
e5320c2302
fix phpstan (#31801)
* fix phpstan

* fix phpstan

* fix phpstan

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc
2024-11-13 21:21:15 +01:00
Laurent Destailleur
aacecf4569 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-13 16:41:41 +01:00
Laurent Destailleur
a64f4327c7 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-11-13 16:40:21 +01:00
Frédéric FRANCE
8c0c033e49
add phpdoc in mailing modules (#31786)
* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* add phpdoc

* test

* test

* test

* test
2024-11-13 15:27:26 +01:00
Laurent Destailleur
ad2e2fe63d Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-11-13 12:41:15 +01:00
Eric - CAP-REL
67c2a48fc9
Add missing extrafields on strato pdf model (#31790)
* undef var

* add main extrafields on object

* remove dev debug sorry !

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-13 12:39:10 +01:00
Laurent Destailleur
8496e8a8ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-13 10:08:21 +01:00
Frédéric FRANCE
2f207dd347
switching on phpstan v2 level 10 (#31764)
* switching on phpstan v2 level 10

* switching on phpstan v2 level 10

* switching on phpstan v2 level 10

* switching on phpstan v2 level 10

* switching on phpstan v2 level 10

* version

* fix phpstan

* fix phpstan

* test

* test

* test

* test

* test

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* add action to refresh phpstan baseline

* add action to refresh phpstan baseline

* add action to refresh phpstan baseline

* add action to refresh phpstan baseline

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* update baseline
2024-11-12 23:18:02 +01:00
Laurent Destailleur
221f8e947a Debug v21 2024-11-12 19:41:21 +01:00
Laurent Destailleur
22eec4ba8a Doc 2024-11-12 02:38:34 +01:00
MDW
56dc321665
Qual: Fix phan notices (in order of appearance) (#31768)
* Qual: Fix phan notices (in order of appearance)

* Qual: Fix phan notices (in order of appearance)/2
2024-11-12 00:35:14 +01:00
MDW
9ec4618199
Qual: Fix FunctionArray phan notices (#31754)
* Qual: Fix FunctionArray phan notices

* Fix class name in typing of htdocs/modulebuilder/index.php

* Fix customreports phpdoc

* Adjust file type after completeFileArrayWithDatabaseInfo

* Further phpdoc typing improvements

* More phpdoc

* Improve typing with cast on position field

* Force phpstan version

* Add phpstan exception

* Fix array index type + adjust phan config comment
2024-11-11 14:48:18 +01:00
Frédéric FRANCE
15490b292f
fix phpstan and fix CI (#31739)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
2024-11-10 11:16:23 +01:00
Laurent Destailleur
f74d4f93b9 Debug v21 2024-11-09 14:28:26 +01:00
Laurent Destailleur
e2e8cdbc4b Finished the architecture for captcha 2024-11-09 13:58:30 +01:00
warnerbryce
8657bba32a
NEW : Adds some improvement for ODT Contracts (#31715)
* NEW : ODTSubsitution for date_start_real / Contracts

* ODT Contracts - Add deliveries langs
2024-11-08 14:47:45 +01:00
MDW
67d932e7de
Qual: Fix phpdoc for *ArrayMethod* args/return values (non api_) (#31719) 2024-11-08 14:43:12 +01:00
MDW
d8c4f678f4
Qual: Fix CI - phan/phpstan notices (#31720)
# Qual: Fix CI - phan/phpstan notices

Fix notices currently active in develop branch

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-07 04:40:45 +01:00
Anthony Berton
a5e1f09043
NEW - Add terms of sale on documents (#24846)
* NEW -  Add terms to sale on documents

* FIx

* Move in pdf other

* Change termstosale in termsofsale

* Copy

* Update admin.lang

* Update pdf_other.php

* // Terms to sale

* Update pdf_other.php

* Update pdf_einstein.modules.php

* Update pdf_eratosthene.modules.php

* Update pdf_crabe.modules.php

* Update pdf_sponge.modules.php

* Update pdf_azur.modules.php

* Update pdf_cyan.modules.php

* Update societe.class.php

* Clean

* Update pdf_other.php

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-07 03:20:49 +01:00
Laurent Destailleur
c0c89657b8 Debug v21 - look and feel 2024-11-07 03:08:02 +01:00
Laurent Destailleur
b0e10ec2e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-07 01:17:58 +01:00
Laurent Destailleur
a23a7385e7 Fix phan 2024-11-07 01:16:48 +01:00
MDW
278d301f32
Qual: Fix phan/phpstan notices in class files (part 6) (#31634)
* Qual: Fix notices for paymentdonation...workstationusergroup.class

* Qual: Fix PhanPluginRedundantReturnComment, update baseline

* Qual: Complete array phpdoc for properties
2024-11-06 23:57:45 +01:00
Laurent Destailleur
0e55db7caf WIP Captcha architecture 2024-11-06 23:02:46 +01:00
Laurent Destailleur
84c343cada WIP Captcha module architecture 2024-11-06 22:15:25 +01:00
Laurent Destailleur
b03684c0ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-06 20:17:28 +01:00
Laurent Destailleur
13ce7cfd04 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-06 20:17:14 +01:00
Laurent Destailleur
bb6c4b2ccb Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-11-06 20:16:41 +01:00
MDW
178d748cad
Qual: Fix phan/phpstan notices in class files (part 5) (#31617)
* Qual: fix commonstickergen..don.class

* Fix notifications for pdf_paiement...cronjob.class

* Qual: Fix notifications for emailcollector..price_parser.class

* Ensure that NULL is used in the database when fk's are 0/empty

* Fix notifications for pdf_paiement...cronjob.class

* Cope with updated phpstan, and make fk_origin_stock int in multiple locations
2024-11-06 20:15:15 +01:00
Frédéric FRANCE
0d7bc505d3
add phpdoc and clean phpstan baseline (#31702)
* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline

* add phpdoc and clean phpstan baseline
2024-11-06 19:39:46 +01:00
Laurent Destailleur
a9b6e6916c FIX column position on PDF of payments 2024-11-06 16:38:32 +01:00
Laurent Destailleur
4bdd848bbe Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-11-06 13:26:08 +01:00
Laurent Destailleur
37f15cfb42 NEW Add option to round weight and volumen on shipment pdf 2024-11-06 12:50:24 +01:00
Frédéric FRANCE
1adc883b56
add baseline exclude for phpstan (#31632)
* add baseline exclude for phpstan

* update

* update

* update

* update

* update

* merge

* restore one filter

* delete old errors

* fix

* fix

* fix

* $moreforfilter can t be empty

* fix

* enable check

* refresh baseline

* add phpdoc

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* update phpstan baseline

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-04 23:53:20 +01:00
MDW
e7539f2e19
Qual: Fix notices in .lib.php files (#31672)
* Qual: Fix notices in .lib.php files

* Update wrapper.php

* Update availabilities_card.php

* Update index.php

* Update document.controller.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-04 12:32:13 +01:00
Laurent Destailleur
d42465ff1f FIX error message in xls import when stream zip is not availabe. 2024-10-31 14:35:10 +01:00
MDW
f4ff437026
Qual: Fix phan/phpstan notices in class files (part 4) (#31598)
* Qual: Fix phan notices for DolibarrModules.class

* Qual: Fix notices for classes actioncomm..task.class.php

* fixup! Qual: Fix notices for classes actioncomm..task.class.php

* Qual: Fix new notices blocking PR
2024-10-30 21:33:30 +01:00
Frédéric FRANCE
1006edf1a7
remove unused code (#31633)
* remove unused code

* remove unused code
2024-10-29 23:06:25 +01:00
Laurent Destailleur
d9a5636b77 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-10-29 15:55:42 +01:00
Laurent Destailleur
f350529378 Fix export salary 2024-10-29 15:16:35 +01:00
Lucas Marcouiller
9af36e273a
Fix bad default pdf evalution naming (#31607)
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-10-28 18:19:53 +01:00
Laurent Destailleur
cb0ab53709 Look and feel v21 2024-10-27 14:08:59 +01:00
Frédéric FRANCE
6549c6d8fe
fix translations (#31585)
* fix translations

* fix translations
2024-10-27 01:29:03 +02:00
Frédéric FRANCE
0f563edb5f
replace fetch_projet() and fetch_project() by fetchProject() (#29821)
* fix cti

* fix cti

* deprecate fetch_projet fetch_project to fetchProject

* deprecate fetch_projet fetch_project to fetchProject

* deprecate fetch_projet fetch_project to fetchProject

* odfHandler->setSegment only throw OdfExceptionSegmentNotFound

* odfHandler->setSegment only throw OdfExceptionSegmentNotFound

* fix deprecated

* fix

* fix sql
2024-10-26 22:43:44 +02:00
sonikf
1778e56745
NEW: PDF add discount total if line discount exists (#31483)
* NEW: PDF add total discount if line discount exists

* NEW: PDF add total discount if line discount exists

* NEW: PDF add discount total if line discount exists

* NEW: PDF add discount total if line discount exists

* NEW: PDF add discount total if line discount exists

* NEW: PDF add discount total if line discount exists

* php doc

* Add missing translation

* fix missing translation
2024-10-26 18:29:06 +02:00
Frédéric FRANCE
0d7523d928
fix phpstan (#31567)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
2024-10-26 13:05:05 +02:00
Frédéric FRANCE
19b653a599
fix phpstan (#31564)
* fix phpstan

* fix phpstan
2024-10-26 13:03:04 +02:00
MDW
0ac595364b
Qual: Fix phan/phpstan notices in class files (part 1) (#31501)
* Ignore phpstan configuration for spelling

* Qual: Fix phan notices in class files
2024-10-25 21:00:02 +02:00
Laurent Destailleur
9ad982ad23 NEW When we export data of unlaterable log, we add an unalterable line 2024-10-25 20:13:14 +02:00
Laurent Destailleur
ea64d0baa0 Debug the list of print jobs 2024-10-25 19:05:51 +02:00
Alexandre SPANGARO
0bccfde432
NEW PDF - Add Customer accountancy code (#31544) 2024-10-25 13:43:35 +02:00
John BOTELLA
bf73accf8f
Merge branch 'develop' into fix_v20_pdf_space_lost_with_images_sponge 2024-10-25 10:29:31 +02:00
John BOTELLA
8210a0eb21
Merge branch 'develop' into fix_v20_pdf_space_lost_with_images_eratosthene2 2024-10-25 10:29:26 +02:00
Frédéric FRANCE
f9f3ffd7a2
calculate costs of BOM for doc_generic_bom_odt (#31539) 2024-10-24 20:15:47 +02:00
Laurent Destailleur
8bae2d99d8 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-10-24 20:13:12 +02:00
Laurent Destailleur
8abfcf71a9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-10-24 13:54:13 +02:00
John BOTELLA
e6b49ad9c6 Merge branch 'fix_v20_pdf_space_lost_with_images_eratosthene2' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_sponge 2024-10-24 13:29:48 +02:00
John BOTELLA
45a84cc651 Merge branch 'fix_v20_pdf_space_lost_with_images' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_sponge 2024-10-24 13:29:29 +02:00
John BOTELLA
f831417f5b Merge branch 'fix_v20_pdf_space_lost_with_images' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_eratosthene2 2024-10-24 13:28:49 +02:00
Laurent Destailleur
830029dd05 NEW Iban is saved encrypted 2024-10-24 13:03:52 +02:00
Laurent Destailleur
3bc1d35236 QUAL The property ->domiciliation and ->propio on bank accounts has been
deprecated and replaced with property ->address and ->owner_name
2024-10-24 12:38:41 +02:00
John BOTELLA
f854399117 fix php stan 2024-10-24 12:27:02 +02:00
John BOTELLA
5fc526b644 fix php stan 2024-10-24 12:24:39 +02:00
John BOTELLA
8423c2a446 fix php stan 2024-10-24 12:23:14 +02:00
John BOTELLA
659c1f23ba fix php stan 2024-10-24 12:19:37 +02:00
John BOTELLA
e3f289fbf6 Merge branch 'fix_v20_pdf_space_lost_with_images_eratosthene2' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_sponge 2024-10-24 12:17:19 +02:00
John BOTELLA
7819bef06a Merge branch 'fix_v20_pdf_space_lost_with_images' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_eratosthene2 2024-10-24 12:16:42 +02:00
John BOTELLA
387a83f471 fix php stan 2024-10-24 12:16:29 +02:00
John BOTELLA
aea4f2c069 fix php stan 2024-10-24 12:15:22 +02:00
John BOTELLA
a8ddb1f172 Merge branch 'fix_v20_pdf_space_lost_with_images_eratosthene2' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_sponge 2024-10-24 11:55:17 +02:00
John BOTELLA
d8be14bc2b fix merge conflict 2024-10-24 11:54:34 +02:00
John BOTELLA
fbb8252588 Merge branch 'fix_v20_pdf_space_lost_with_images_eratosthene2' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_sponge 2024-10-24 11:52:09 +02:00
John BOTELLA
5d53b42d7d Merge branch 'fix_v20_pdf_space_lost_with_images' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_eratosthene2 2024-10-24 11:45:16 +02:00
John BOTELLA
b7f85ffbc6 fix precommit hook 2024-10-24 11:44:37 +02:00
John BOTELLA
443d27c77c Merge branch 'fix_v20_pdf_space_lost_with_images' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_eratosthene2 2024-10-24 11:43:37 +02:00
John BOTELLA
76491666b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_v20_pdf_space_lost_with_images 2024-10-24 11:36:56 +02:00
John BOTELLA
786e280934 Merge branch 'fix_v20_pdf_space_lost_with_images_eratosthene2' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_sponge 2024-10-24 10:27:21 +02:00
John BOTELLA
e469c602e6 Image top margin 2024-10-24 10:27:06 +02:00
John BOTELLA
49bdad7fa4 Merge branch 'fix_v20_pdf_space_lost_with_images' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_sponge 2024-10-24 10:26:10 +02:00
John BOTELLA
af7bcaa31a Image top margin 2024-10-24 10:25:37 +02:00
John BOTELLA
b70b73c6d0 Merge branch 'fix_v20_pdf_space_lost_with_images' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_eratosthene2 2024-10-24 10:23:14 +02:00
John BOTELLA
8a6119b1b0 Image top margin 2024-10-24 10:21:41 +02:00
MDW
cb9ad5c259
Qual: Fix spelling (#31515)
# Qual: Fix spelling

Fix some typos in the comments (codespell).
2024-10-23 20:23:07 +02:00
Lucas Marcouiller
4d047feca7
Fix bad sql whe exporting salaries (#31526)
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-10-23 20:20:54 +02:00
Frédéric FRANCE
80171b5fe5
Update modCaptchaStandard.class.php (#31528)
* Update modCaptchaStandard.class.php

* Update modCaptchaStandard.class.php
2024-10-23 18:51:20 +02:00
John BOTELLA
007159a060 Merge branch 'fix_v20_pdf_space_lost_with_images_eratosthene2' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_sponge 2024-10-22 14:33:41 +02:00
John BOTELLA
57849c1738 Merge branch 'fix_v20_pdf_space_lost_with_images' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_eratosthene2 2024-10-22 14:32:10 +02:00
John BOTELLA
21aa2f680f
Merge branch '20.0' into fix_v20_pdf_space_lost_with_images 2024-10-22 09:01:47 +02:00
John BOTELLA
9ee4f2bd03 Fix breaks on edge 2024-10-21 09:05:28 +02:00
John BOTELLA
2b85f401af Fix breaks on edge 2024-10-21 09:03:49 +02:00
John BOTELLA
a1a2d2f99e Fix breaks on edge 2024-10-21 08:59:27 +02:00
Laurent Destailleur
a30da69104 Fix phan 2024-10-20 00:30:59 +02:00
Laurent Destailleur
acac575512 Fix phan 2024-10-20 00:20:16 +02:00
Joachim Kueter
eb3bba03cd Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-10-20 00:06:34 +02:00
Laurent Destailleur
37880a7964 Debug v21 2024-10-19 23:42:26 +02:00
Laurent Destailleur
992dc88491 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-10-19 15:33:12 +02:00
Laurent Destailleur
76ec55b81e Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-10-19 15:31:00 +02:00
Laurent Destailleur
c160da91ed Change URL for module blacklist feature 2024-10-19 15:29:43 +02:00
Laurent Destailleur
c70973c0c8 Merge v20 2024-10-19 14:44:55 +02:00
Laurent Destailleur
17c50368c1 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-10-19 14:32:08 +02:00
Laurent Destailleur
e97c1dc48e Better message 2024-10-19 13:51:05 +02:00
Laurent Destailleur
0844ed2f9b NEW Include a protection into check update to detect malware 2024-10-19 13:16:13 +02:00
Joachim Kueter
9643a27423
fix typo (#31449) 2024-10-19 01:19:21 +02:00
Joachim Kueter
6b6fabea14
fix: respect setting for VAT column (#31450) 2024-10-19 01:18:55 +02:00
Laurent Destailleur
f9eb82de7f FIX pagebreak when option PDF_ADD_POSITION is set 2024-10-18 18:43:59 +02:00
John BOTELLA
dd4536b7bd fix usage of on bottom 2024-10-18 14:34:54 +02:00
John BOTELLA
e53858a735 fix usage of on bottom 2024-10-18 14:33:34 +02:00
John BOTELLA
d0d59141af fix usage of on bottom 2024-10-18 14:31:18 +02:00
John BOTELLA
3aa716d89f Merge branch 'fix_v20_pdf_space_lost_with_images_eratosthene2' into fix_v20_pdf_space_lost_with_images_sponge 2024-10-18 14:15:18 +02:00
John BOTELLA
6eb59e5dc1 fix usage of on bottom 2024-10-18 14:14:41 +02:00
John BOTELLA
75da4150b9 Merge branch 'fix_v20_pdf_space_lost_with_images' into fix_v20_pdf_space_lost_with_images_eratosthene2 2024-10-18 14:13:03 +02:00
John BOTELLA
702ff5a865 fix usage of on bottom 2024-10-18 14:12:28 +02:00
John BOTELLA
9eeb8c64f8 Merge branch 'fix_v20_pdf_space_lost_with_images_eratosthene2' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_sponge 2024-10-18 10:04:02 +02:00
John BOTELLA
f15c22388a Merge branch 'fix_v20_pdf_space_lost_with_images' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_eratosthene2 2024-10-18 10:02:01 +02:00
John BOTELLA
68df2bf79f Merge branch '20.0' of https://github.com/Dolibarr/dolibarr into fix_v20_pdf_space_lost_with_images 2024-10-18 10:00:27 +02:00
John BOTELLA
036bff18f3 Fix sponge space lost with images 2024-10-18 09:46:07 +02:00
Laurent Destailleur
8f868ef3b9 Fix text overlapping 2024-10-18 01:07:31 +02:00
Laurent Destailleur
65e750cb4e FIX Get number of bank deposit wa not using the date. 2024-10-18 00:47:46 +02:00
Laurent Destailleur
3eebba6116 FIX When PDF_ADD_POSITION is on, the number was doing pagebreak before
the pagebreak done by the addition of description.
2024-10-17 23:46:30 +02:00
Laurent Destailleur
a7a251717e Minor fix in azur/cyan 2024-10-17 23:08:48 +02:00
John BOTELLA
9b35f08367 fix PDF space lost with images eratosthene 2024-10-17 15:15:33 +02:00
John BOTELLA
1852e13320 fix page orientation 2024-10-17 13:49:40 +02:00
Laurent Destailleur
59fd0dbae7 NEW Can choose the zip handler to build ODT 2024-10-17 12:59:24 +02:00
Laurent Destailleur
4432aaffcb Creation auto of bank account use correct bank journal 2024-10-17 04:51:28 +02:00
MDW
cee4535975
Qual: Fix phan notices in admin.lib and tax.lib + related (#31414)
* Qual: Fix admin.lib phpstan/phan notices

* Qual: Fix some argument types in Societe methods

* Fixup phpdoc

* Qual: Improve typing for static analysis

* Qual: Improve typing for static analysis

* Fix tax typing

* Qual: further phan/phpstan notice fixes in dol_generic_project_odt

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-17 03:08:38 +02:00
Laurent Destailleur
c2d381d588
Merge branch '20.0' into fix_v20_pdf_space_lost_with_images 2024-10-17 02:24:46 +02:00
Laurent Destailleur
e8299da73f Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2024-10-17 02:16:13 +02:00
Laurent Destailleur
8562dd887b Merge 2024-10-17 02:15:53 +02:00
Laurent Destailleur
dacbfecb02 Move trans into correct lang file 2024-10-17 02:12:49 +02:00
Michael Bussmann
6fca870750
EPC-QR,Sponge, Translation of INVOICE_ADD_EPC_QR_CodePay, Alignment (#31327)
* EPC_QR fixes
Display translation of INVOICE_ADD_EPC_QR_CodePay
Fixed alignment of INVOICE_ADD_EPC_QR_CodePay when QR-Code at bottom

* Reverted local font size

Signed-off-by: Michael Bussmann <bus@mb-net.net>

---------

Signed-off-by: Michael Bussmann <bus@mb-net.net>
2024-10-17 02:08:38 +02:00
MDW
33b9479692
Qual: Ignore phan notice for pagebreak property (#31427)
# Qual: Ignore phan notice for pagebreak property

The access to the undeclared pagebreak property is protected with isset().
So these notices are now suppressed.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-17 01:49:43 +02:00
MDW
9677a370e9
Qual: Nullable mysoc hint (#31393)
* Qual: Nullable mysoc hint

# Qual: Nullable mysoc hint

$mysoc can be nullable resulting in issues (#31387) so
it is best to detect these cases with static analysis

* Prevent null assignment
2024-10-17 01:44:54 +02:00
Laurent Destailleur
ce414d29d7 Fix phan 2024-10-17 01:23:23 +02:00
Frédéric FRANCE
64164dead6
missing translation close #31415 (#31432)
* missing translation

* missing translation

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-17 01:17:34 +02:00
sonikf
7903a8b780
fix typo (#31418) 2024-10-17 01:14:26 +02:00
sonikf
202263dbb5
fix PDF proposal signature area (#31420)
* fix signature

* fix signature
2024-10-17 01:04:36 +02:00
Laurent Destailleur
82f65a6410 NEW Can choose the zip handler to build ODT 2024-10-17 00:31:53 +02:00
Laurent Destailleur
956a039082 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2024-10-16 20:47:12 +02:00
Laurent Destailleur
9ad71b980a NEW Can choose the zip handler to build ODT 2024-10-16 20:46:52 +02:00