Commit Graph

4675 Commits

Author SHA1 Message Date
Laurent Destailleur
87e148f14c
Merge pull request #24823 from altairisfr/forcecust
NEW : TakePOS - Option TAKEPOS_NO_GENERIC_THIRDPARTY to disallow payment if no specific thirdparty selected (generic not allowed)
2024-03-19 02:29:05 +01:00
Florian HENRY
09e75b6c90 NEW: Label on Price fix:#28544 2024-03-15 09:24:45 +01:00
Eric Seigne
89d6fe8d5d add project list linked by a contact 2024-03-14 10:02:23 +01:00
Laurent Destailleur
404d594f24 Removed not used file 2024-03-11 16:39:44 +01:00
William Mead
3583c4aeea
NEW updated resource list for new fields (#28705)
* Added address, zip & town

* Added state & country

* Added phone, email, max_users & url

* Added link formatting. Cleaned code.

* Updated EN & FR localization

* Added country select list

* Cleaned code
2024-03-08 12:09:32 +01:00
Alban Durrheimer
36d364fb2d
Add sendEmailsRemindersOnSupplierInvoiceDueDate cron function (#28378)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-23 16:50:21 +01:00
Laurent Destailleur
f66b8987ec Sync transifex 2024-02-21 12:40:11 +01:00
Laurent Destailleur
fe7f94e1d9 Debug v20 2024-02-18 22:23:26 +01:00
Laurent Destailleur
66615477ae Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-02-17 20:58:40 +01:00
Laurent Destailleur
7836881a22 Sync transifex 2024-02-12 06:33:42 +01:00
Vincent Maury
e89f93024f
NEW #24031 add option MAIN_GRANDTOTAL_LIST_SHOW to always show grand total to lists (#27247)
* Fix #24031 add - if option seleced - grand total to lists

* Fix #24031 add - if option seleced - grand total to lists

* Fix #24031 add - if option seleced - grand total to lists

* Fix #24031 add - if option selected - grand total to lists

* Update ihm.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-12 05:34:45 +01:00
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
Laurent Destailleur
f07fd31c65 Fix lang 2024-01-31 21:27:21 +01:00
Laurent Destailleur
a0624e2e36
Merge branch 'develop' into features/reglementdon 2024-01-29 01:02:23 +01:00
Laurent Destailleur
92cf4f2fd1 Mutualize code 2024-01-28 16:36:01 +01:00
Laurent Destailleur
d8ede0807f Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-25 17:25:13 +01:00
Laurent Destailleur
b8686f159f Debug module receipt printer 2024-01-25 15:18:06 +01:00
Laurent Destailleur
b081652c4b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-25 12:51:55 +01:00
Laurent Destailleur
331b13c465 Sync transifex 2024-01-25 01:15:01 +01:00
Laurent Destailleur
ce21af7b6c Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-23 22:17:46 +01:00
Laurent Destailleur
cca01cbda4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-23 22:15:36 +01:00
Laurent Destailleur
b05d1c5f6e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-23 22:03:28 +01:00
William Mead
fba1aea273 Added EN & FR SourceInvoiceId localization 2024-01-19 09:43:56 +01:00
Lamrani Abdel
592e9e33d0 New Module Ai, create manualy 2024-01-16 15:52:52 +01:00
Laurent Destailleur
1d00d90872
Merge pull request #25740 from atm-thibaultf/NEW_hide_external_user_in_combobox
NEW : hide external user in combobox
2024-01-15 21:59:30 +01:00
Laurent Destailleur
32f0443289 Rename into getImagePublicURLOfObject 2024-01-12 13:45:10 +01:00
Laurent Destailleur
bf17b8767c Debug v19 2024-01-07 11:15:48 +01:00
Christophe Battarel
10a6ad9bcf
Merge branch 'develop' into forcecust 2024-01-05 09:07:13 +01:00
Laurent Destailleur
63c38da901 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-21 19:44:25 +01:00
thibdrev
2245ea09d4
add ErrorStartDateGreaterEnd to /fr_FR/errors.lang 2023-12-15 14:24:00 +01:00
Laurent Destailleur
05db4b9f8e Sync transifex 2023-12-15 13:34:39 +01:00
Thomas905
3477cb544a general donation payment page 2023-12-06 15:38:23 +01:00
Laurent Destailleur
ea4b857f28 Clean trans 2023-11-28 20:23:11 +01:00
Mohamed DAOUD
dc4d5111aa
New add evaluation report pdf module HRM (#26850)
* add rh evaluation report pdf

* Update modHRM.class.php

* fix phpcs modHRM.class.php
2023-11-26 15:51:00 +01:00
Laurent Destailleur
cb3a86a737 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-11-23 18:56:10 +01:00
Laurent Destailleur
a257dcfa48 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-23 18:48:52 +01:00
atm-lucas
73087bee2f
FIX - change error message on quantity (#26606)
* Added a new error message on quantity split

* fault correction

* Add loading translation files

* Fault

* Translation key

* Code correction

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-20 20:42:27 +01:00
William Mead
02eadb29fc
FIX #25458 intervention localizations (backport v17) (#26757)
* Fix reopen button localization. Added contributor details.

* Added EN done localization

* Added FR done localization

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
2023-11-20 20:19:43 +01:00
Laurent Destailleur
a0bba05b02 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/api_orders.class.php
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/class/api_supplier_orders.class.php
	htdocs/fourn/class/fournisseur.facture-rec.class.php
	htdocs/langs/en_US/stocks.lang
2023-11-17 18:24:53 +01:00
Laurent Destailleur
5e59e8d0e4 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/langs/en_US/stocks.lang
2023-11-17 00:44:30 +01:00
thibdrev
11ed276fe3
fix PRODUCT VARIANTS - Missing translation key for "Combination" (#26618)
* Add "Attributes" key to en_US/products.lang

* Add "Attributes" key to fr_FR/products.lang

* Change langs->trans('Combination') to lang-trans->trans('Attributes')
2023-11-16 15:19:51 +01:00
atm-sami
966e26e450
FIX add display of an error when attempting to delete a committed transaction (#26573)
* add display of an error when attempting to delete a committed transaction

* update
2023-11-14 14:53:40 +01:00
Laurent Destailleur
c6c7b6692d Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-13 15:33:32 +01:00
Laurent Destailleur
68ffe0960d Trans 2023-11-13 15:27:42 +01:00
atm-sami
53b48173f6
NEW add sorting of product price list by customer (#26483)
* added sorting of product price list by customer

* add search and sort in same time

* Update price.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-09 14:55:35 +01:00
Laurent Destailleur
85977fa402 Sync transifex 2023-11-07 21:10:28 +01:00
Laurent Destailleur
1029932e6a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-07 20:42:33 +01:00
Laurent Destailleur
e06ad780aa Clean lang files 2023-11-07 20:42:13 +01:00
daraelmin
4fc415a287
New option to define the start period of a first subscription (#26484)
* New option to define the start period of a first subscription

add default date of starting (year, month or subscription payment)
add delay for subscription period

* Update member.php

* Fix period for statistique if delay is set
2023-11-07 18:05:36 +01:00
Laurent Destailleur
c154a72d88 Debug v19 2023-11-06 19:32:04 +01:00