2
0
forked from Wavyzz/dolibarr
Commit Graph

96 Commits

Author SHA1 Message Date
MDW
7b54824d49 Fix #28071 - New branch to fix bad merge (#28083)
* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Qual: Introduce getDataToShowPhoto to prepare generic code

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix missing trans

* Fix langs

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Remove useless files in web templates

* Clean code

* Fix duplicate translation key

* Fix duplicate translation key

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix duplicate key

* Fix $object

* Debug v19

* WIP SMSing

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* WIP EMAILINGS_SUPPORT_ALSO_SMS

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* WIP SMSing

* Debug the "validate" feature

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Clean code

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Enhance rector to fix empty($user->rights->modulex->perm1)

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

* Fix template to use v19 dev rules

* Fix use v19 dev rules

* Fix phpunit

* Debug v19

* Clean code

* Use rector to convert user->rights into user->hasRight

* Clean code

* Use rector to convert user->rights into user->hasRight

* Use rector to convert user->rights into user->hasRight

* Clean code

* Fix phpcs

* add editorconfig for sql files (#27999)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* add model_pdf field in llx_ticket-ticket.sql (#27996)

* add model_pdf field in llx_ticket-ticket.sql

* Update 19.0.0-20.0.0.sql

* Update 19.0.0-20.0.0.sql

* Improve wording in README (#27994)

* fix phpstan (#27989)

* fix phpstan

* Update UserRightsToFunction.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Qual: Fix spelling/working in datapolicy translations (#28006)

# Qual: Fix spelling/wording in datapolicy translations

Fixed some spelling and wording in datapolicy translations.

* qual: phpstan for htdocs/ticket/class/ticketstats.class.php (#27986)

htdocs/ticket/class/ticketstats.class.php	98	Parameter #1 $year (string) of method TicketStats::getNbByMonth() should be compatible with parameter $year (int) of method Stats::getNbByMonth()

* Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop

* Fix user with readonly perm on email template must be able to read.

* Fix doc

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Better message

* Add missing fields in merge of thirdparty

* Debug v19 selection of ticket printer per terminal

* Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

* Use constant

* NEW: Adding a recipient on emails sent, change status to sent partialy.

* fix travis (#28052)

* fix travis

* Update partnership.class.php

* fix php doc (#28047)

* fix undefined array key (#28048)

* Add region and departament for Cuba (#28046)

* Update llx_10_c_regions.sql

Add Cuba Regions (id_country=77)

* Update llx_20_c_departements.sql

Add Provinces Cuba (id country=77)

* Find the typo (#28050)

* Find the typo

* clean code

* add last_main_doc field to product (#28045)

* add las_main_doc field to product

* add field fetch

* NEW Add Categorie filter for ActionComm (#28041)

* New Add Categorie filter for ActionComm

New Add Categorie filter for ActionComm

* Fix space errors

Fix space errors

* Fix space errors 2

Fix space errors 2

* Update cunits.class.php (#28056)

FIX: error SQL when creating a Cunit

* Update codespell-lines-ignore.txt to avoid PR merge conflict

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: thibdrev <thibault.drevet@gmail.com>
Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
Co-authored-by: Ikarus <44511582+LeKarSol@users.noreply.github.com>
Co-authored-by: Anthony Damhet <73399671+EchoLoGeek@users.noreply.github.com>
Co-authored-by: Quentin-Seekness <72733832+Quentin-Seekness@users.noreply.github.com>
2024-02-09 15:58:49 +01:00
MDW
85ad4ecdf8 Qual: Spelling for htdocs/[a-b]* (#27422)
Mostly comments, one variable changed from misspelling to .
Also changed CNAT to C.N.A.T in comment to avoid fix from CNAT to CAN'T.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-01-12 20:58:09 +01:00
Laurent Destailleur
e2f49c407f Clean sql request to use exist instead of left join 2024-01-09 10:44:50 +01:00
Laurent Destailleur
89686e74dc Clean code 2023-12-26 22:33:22 +01:00
daraelmin
a815c99d53 FIX suggested end for membership can be before subscription start (#26351)
* Fix wrong debug log

* Fix suggested end for membership can be in the past

MEMBER_SUBSCRIPTION_SUGGEST_END_OF_YEAR and MEMBER_SUBSCRIPTION_SUGGEST_END_OF_MONTH should be based on the subscription start date, not on the creation date

* Fix typo
2023-10-26 12:48:40 +02:00
Laurent Destailleur
373230c9e0 Debug v18 2023-08-15 12:55:47 +02:00
Laurent Destailleur
0397211a93 Fix warning 2023-07-01 12:49:54 +02:00
Laurent Destailleur
f0fd249498 Fix warnings 2023-06-26 16:22:00 +02:00
daraelmin
3039c62738 FIX better box member by tag
Fix total is missing for each row
Fix Link on category points now in the adherent list filtered by category
Fix order in box is now same as the select in the list
2023-05-21 18:18:12 +02:00
Laurent Destailleur
9d8af9c530 Fix restore option to have non samples stats 2023-05-17 00:04:37 +02:00
daraelmin
6abf459da5 Fix copyright 2023-05-14 16:57:44 +02:00
daraelmin
873f1bc8e8 remove new feature
Must wait for an other PR
2023-05-14 16:53:12 +02:00
daraelmin
a67330a0ff fix merge 2023-05-14 15:59:23 +02:00
daraelmin
31c03ad7d8 Merge branch 'develop' into daraelmin-stats-adh-by-status 2023-05-14 12:17:05 +02:00
Laurent Destailleur
8675abeec8 Merge pull request #23342 from daraelmin/daraelmin-box-adh-tags
NEW Add widget box_members_by_tags.php
2023-01-26 00:55:42 +01:00
Laurent Destailleur
edad39a93b FIX stats page for donation 2022-12-27 21:02:21 +01:00
daraelmin
5d09076a8f Doc 2022-12-26 22:56:26 +01:00
daraelmin
95cea254e5 Fix missing few up to date members 2022-12-26 22:39:17 +01:00
daraelmin
ffae98085b New box box_members_by_tags.php 2022-12-26 22:36:05 +01:00
daraelmin
61536455c2 Comment 2022-12-23 14:25:52 +01:00
daraelmin
b1e5c92455 Clean code 2022-12-23 14:22:07 +01:00
daraelmin
0506f028c9 Add MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH in widget and graphh 2022-12-23 14:21:23 +01:00
stickler-ci
be34e7d53a Fixing style errors. 2022-12-22 21:53:30 +00:00
daraelmin
9501d844d0 Merge branch 'daraelmin-stats-adh-by-status' of https://github.com/daraelmin/dolibarr into daraelmin-stats-adh-by-status 2022-12-22 22:37:11 +01:00
daraelmin
26370ff1c8 Remove With rollup 2022-12-22 22:35:35 +01:00
stickler-ci
6436306634 Fixing style errors. 2022-12-22 15:25:09 +00:00
daraelmin
e16994bcff Fix add not used active member type 2022-12-22 16:23:18 +01:00
daraelmin
0ae8809ae2 Use db->ifsql instead of case when 2022-12-22 12:40:12 +01:00
daraelmin
f1f510cf60 Copyright 2022-12-20 19:40:58 +01:00
stickler-ci
21e22ee990 Fixing style errors. 2022-12-20 18:06:23 +00:00
daraelmin
01e9d1bf4b NEW : Uniformize stat adh in boxes and index 2022-12-20 18:38:01 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Frédéric FRANCE
46c4f28478 fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
21edb498c0 Merge pull request #17987 from daraelmin/daraelmin-patch-1
Fix 17986 error on comparing integer and string in strict sql
2021-06-20 17:26:56 +02:00
Laurent Destailleur
002471b1fe Update adherentstats.class.php 2021-06-20 17:25:58 +02:00
daraelmin
cfd7c610db Use dolSqlDateFilter instead of SQL function YEAR 2021-06-20 17:14:28 +02:00
daraelmin
a54a955a65 Use year() instead of date_format 2021-06-20 15:40:32 +02:00
daraelmin
831cc4f4b7 Fix 17986 error on comparing integer and string in strict sql 2021-06-20 14:19:05 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
7dd69a2b2b Fix escape 2020-09-19 20:11:04 +02:00
Laurent Destailleur
59bc8ee07c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/stats/byproperties.php
	htdocs/adherents/stats/geo.php
	htdocs/admin/system/dolibarr.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/admin.lang
	htdocs/product/class/product.class.php
2020-09-14 02:49:19 +02:00
Laurent Destailleur
701b83db38 FIX Bad number of subscription (forgotten when member was resiliated) 2020-09-14 02:38:12 +02:00
Frédéric FRANCE
ccc859ec80 add new rule 2020-05-21 09:12:18 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +02:00