Compare commits

...

3823 Commits

Author SHA1 Message Date
Laurent Destailleur
45d56dffd2 Make v19.0.1 2024-03-17 00:29:24 +01:00
Laurent Destailleur
55e7edc12c Merge pull request #28907 from ksar-ksar/19.0
UPDATE: Doliwamp to PHP V7.4
2024-03-17 00:05:53 +01:00
ksar
61196a1a86 Update makepack-howto.txt 2024-03-16 23:02:39 +01:00
ksar
7b8cbf0e5e UPDATE: Doliwamp to PHP V7.4
UPDATE Doliwamp to PHP V7.4.

Warning : You need to update the Micrsoft Visual C++ Redistributable for Visual Studio from 2015 to at least 2017
2024-03-16 22:52:17 +01:00
Laurent Destailleur
c6812a2015 Merge pull request #28902 from TI-Sin-Problemas/fix/28892
Fix #28892 change default table ref on modulebuilder new dictionaries
2024-03-16 21:37:02 +01:00
Alfredo Altamirano
4ee4d1678f fix #28892 change default table ref on modulebuilder new dictionaries 2024-03-16 16:59:31 +00:00
Laurent Destailleur
b1a880626c Look and feel v19 2024-03-16 14:23:16 +01:00
Laurent Destailleur
8220626d78 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-14 23:45:24 +01:00
Laurent Destailleur
16e5d08b36 FIX #yogosha21416 2024-03-14 23:40:46 +01:00
Laurent Destailleur
5ab5a914a6 Merge pull request #28851 from fmarcet/19.0_exped
Fix: Correction so that warehouse does not have to be indicated if it is a service
2024-03-14 22:43:27 +01:00
Laurent Destailleur
229e914685 Merge pull request #28849 from fmarcet/19.0_take
Fix: Correction for batches with letters in Takepos
2024-03-14 22:39:19 +01:00
Ferran Marcet
9430bebbb1 Fix: Correction so that warehouse does not have to be indicated if it is a service 2024-03-14 16:44:07 +01:00
Ferran Marcet
54bdad710d Fix: Correction for batches with letters in Takepos 2024-03-14 16:40:54 +01:00
Ferran Marcet
7fddff9302 Fix: Correction for batches with letters in Takepos 2024-03-14 16:40:14 +01:00
Ferran Marcet
3f4033a8e2 Fix: Correction for batches with letters in Takepos 2024-03-14 16:39:08 +01:00
Ferran Marcet
05a9dc5f72 Fix: Correction for batches with letters in Takepos 2024-03-14 16:33:38 +01:00
Laurent Destailleur
8bfc0779c4 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-13 22:20:08 +01:00
Laurent Destailleur
987ec0b772 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-13 15:54:36 +01:00
Laurent Destailleur
b9ed346711 FIX edit bank suggested for credit transfer payment in invoice setup
when bank is closed.
2024-03-13 15:54:15 +01:00
Ferran Marcet
c7d6213428 Fix: Improve display and fix update 2024-03-13 11:35:24 +01:00
Laurent Destailleur
1a184c88d1 Merge pull request #28788 from fmarcet/19
Fix: Error in the treatment of the date and the name of the variable
2024-03-12 17:54:36 +01:00
Ferran Marcet
6679565638 Fix: Error in the treatment of the date and the name of the variable 2024-03-12 17:01:59 +01:00
Laurent Destailleur
c4d7d135a8 Merge pull request #28779 from fmarcet/19
Fix: Error in the SQL to update the stock from batch to non-batch
2024-03-12 14:13:53 +01:00
Ferran Marcet
2ee52c1659 Fix: Error in the SQL to update the stock from batch to non-batch management 2024-03-12 13:44:19 +01:00
Laurent Destailleur
c2602eadf7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-11 18:29:07 +01:00
Laurent Destailleur
ae7e8a972b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-11 13:39:26 +01:00
Laurent Destailleur
e72671bf50 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-11 13:39:04 +01:00
Maximilien Valenzano
68441677f7 fix: update currency when selected supplier (#28760) 2024-03-11 12:41:30 +01:00
Laurent Destailleur
c7d0ee18be Fix escape 2024-03-11 10:19:50 +01:00
Laurent Destailleur
1431582b82 Fix cursor 2024-03-11 10:10:17 +01:00
Laurent Destailleur
453eb9c242 FIX: upload odt files should not start/end with space 2024-03-10 15:53:35 +01:00
Laurent Destailleur
8ef22dc461 Fix css 2024-03-10 00:47:00 +01:00
Laurent Destailleur
cecd3bc1b6 FIX Picto in top menu 2024-03-09 23:47:28 +01:00
le-reparateur
b601dabf66 Update fournisseur.product.class.php (#28729)
* Update fournisseur.product.class.php

#28710

* Update fournisseur.product.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-03-09 15:14:23 +01:00
Can Arslan
e74e638b26 FIX: skip adding tab if user doesn't have permission (#28698)
verifCond function checks whether user has right and we should skip adding it if user doesn't have right
2024-03-08 12:28:31 +01:00
Can Arslan
491e85037a FIX: PHP Warning: Undefined variable $mode (#28697) 2024-03-07 23:09:54 +01:00
Laurent Destailleur
10aa278aca Fix add a type to allow sanitization of import rule='compute'. 2024-03-07 21:38:40 +01:00
Sébastien NASSIET
2636a64461 Set import_key in import when update record (#28657)
* Set import_key in import when update record

* Update import_xlsx.modules.php
2024-03-07 20:43:45 +01:00
Jon Bendtsen
cbd331256d using note_public since note_private is not working (#28675)
Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
2024-03-07 19:02:08 +01:00
Rikard Bosnjakovic
8870be3c3d Update card.php (#28679)
Fix #25130

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-03-07 16:43:50 +01:00
Laurent Destailleur
eb3d9799e5 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-07 16:34:53 +01:00
Laurent Destailleur
2d8223eefb Doc 2024-03-07 16:16:49 +01:00
atm-adrien
7bb55aa225 FIX : Translation for select (#28677)
* FIX : Adding thez dependencies list feature for select fields

* FIX : Adding some spaces

* FIX : View

* FIX : Translating
2024-03-07 15:56:17 +01:00
Laurent Destailleur
f1aa29507a Fix sec more complete list of forbidden function 2024-03-06 15:01:25 +01:00
Laurent Destailleur
1a9fa740a5 Fix quote 2024-03-06 13:32:15 +01:00
Laurent Destailleur
8a2578d742 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-06 01:58:54 +01:00
Laurent Destailleur
1552fac711 Fix strict-origin 2024-03-06 01:54:41 +01:00
Laurent Destailleur
43b1adb4c6 Fix bad var name in security setup page 2024-03-06 01:40:06 +01:00
John BOTELLA
26c307c0a4 Fix extrafield ajax search default on edit (#28631) 2024-03-05 17:16:11 +01:00
Laurent Destailleur
d7f3feba74 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-05 04:00:09 +01:00
Christian Humpel
6cc9ac5542 FIX: Count of virtual stock at Services and MoLine with disabled stock change (#28580)
* fix the count of virtual stock

* - fix "Found non sanitized string" ?

---------

Co-authored-by: christian.humpel <christian.humpel@gmail.com>
2024-03-04 18:59:37 +01:00
Frédéric FRANCE
d0c0dee616 fix typo in ChangeLog (#28613)
* fix typo in ChangeLog

* Update ChangeLog
2024-03-04 18:23:03 +01:00
Frédéric FRANCE
a0444ef55d fix can't delete pdf if ref is not encoded (#28630) 2024-03-04 17:58:43 +01:00
Laurent Destailleur
9f1393f6ea Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-04 14:46:54 +01:00
Laurent Destailleur
e82c6af5bc FIX permission on payment file of a tax 2024-03-04 14:03:17 +01:00
Laurent Destailleur
1e00cf34d4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-03 19:50:22 +01:00
Laurent Destailleur
af6a091ab2 Fix 19.0.1 2024-03-03 18:55:10 +01:00
Laurent Destailleur
d199b042b4 Prepare 19.0.1 2024-03-03 18:50:28 +01:00
PsyCrow
41bdcff4da Update facture.class.php (#28591)
* Update facture.class.php

FIX  #22948

* Update facture.class.php
2024-03-03 16:58:52 +01:00
Frédéric FRANCE
16319e5103 fix codespell (#28594) 2024-03-03 15:48:36 +01:00
Laurent Destailleur
d44fb6c87e Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-03 13:12:22 +01:00
Laurent Destailleur
21feee3bc8 FIX Better test on validity of compute field syntax with parenthesis 2024-03-03 13:11:54 +01:00
Laurent Destailleur
f875201b46 Fix #19404 FIX #22721 2024-03-02 18:59:57 +01:00
Laurent Destailleur
4b2fb64b51 css 2024-03-02 18:34:40 +01:00
Laurent Destailleur
b870a84d8a FIX #28564 2024-03-01 20:19:37 +01:00
Laurent Destailleur
6e7263a047 Revert "FIX #28533 Mo::deleteLine removes the "main" MoLine if consumed line …" (#28564)
This reverts commit c069f3f161.
2024-03-01 19:25:06 +01:00
Laurent Destailleur
4e78d4e007 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-01 19:05:58 +01:00
Laurent Destailleur
47861abb48 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-01 19:05:46 +01:00
Sébastien NASSIET
3ac149af81 Limite la liste des fournisseurs aux fournisseurs actifs (#28556) 2024-03-01 18:47:06 +01:00
Laurent Destailleur
07a5a8f7dd Fix bad filter propagated 2024-03-01 18:46:27 +01:00
Laurent Destailleur
1b1edaf0a6 php syntax 2024-03-01 18:40:48 +01:00
atm-adrien
de76330aae FIX : Adding the dependencies list feature for extrafields "select" (#28549)
* FIX : Adding thez dependencies list feature for select fields

* FIX : Adding some spaces

* FIX : View
2024-03-01 18:39:32 +01:00
Laurent Destailleur
24397000fe Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-01 18:16:31 +01:00
Laurent Destailleur
17015095aa Add option to allow better compatibility with computed fields using
unsecured chars
2024-03-01 18:15:58 +01:00
Regis Houssin
0ac22e1f75 FIX avoid warning "error parsing attribute name in Entity" (#28543) 2024-03-01 12:49:35 +01:00
Christian Humpel
c069f3f161 FIX #28533 Mo::deleteLine removes the "main" MoLine if consumed line is delete (#28535)
* fix #28533

* qual for github actions

* fix use $this->db in classes

---------

Co-authored-by: christian.humpel <christian.humpel@gmail.com>
2024-03-01 12:47:37 +01:00
PsyCrow
4b7d25975f Update html.form.class.php (#28540)
* Update html.form.class.php

Fix PHP Warning:  Undefined array key "labeladddateof"

* Update html.form.class.php

* Update html.form.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-03-01 12:45:08 +01:00
PsyCrow
73359442d4 Update paiement.php (#28539)
Fix #28485
2024-03-01 12:38:56 +01:00
Regis Houssin
2d936bf1c9 FIX postgresql error (#28542)
* FIX postgresql error

* FIX better index name
2024-03-01 12:38:06 +01:00
Sébastien NASSIET
e6c4583bc4 Prevent infinite loop with add notrigger parameter to the functions create, update & setMultiLangs (#28530) 2024-02-29 20:23:08 +01:00
Sébastien NASSIET
632b06c5d8 ajout unitprice dans import FIX #28382 (#28531) 2024-02-29 20:22:38 +01:00
Bahfir Abbes
ef05096297 Fix:False constant name (#28532)
Conflicts:
	htdocs/mrp/class/mo.class.php

Fix:False constant name
2024-02-29 20:19:46 +01:00
Laurent Destailleur
fdbd3584ee Fix name of webservice
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/commande/card.php
2024-02-29 20:11:07 +01:00
Laurent Destailleur
6f2c09affe Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/adherents/subscription/card.php
2024-02-29 15:47:50 +01:00
sonikf
1e11de0624 FIX #28491 (#28522) 2024-02-29 14:27:05 +01:00
PsyCrow
aa37b755e0 Update paiement.php (#28449)
PHP Warning:  Undefined variable $totalrecucreditnote
PHP Warning:  Undefined variable $totalrecudeposits
2024-02-27 14:03:53 +01:00
Laurent Destailleur
2ddfe02e0c Doc 2024-02-27 13:08:15 +01:00
Laurent Destailleur
0a345e37a0 Fix delete not used table 2024-02-27 13:01:42 +01:00
Laurent Destailleur
3a9a133e36 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-27 11:30:11 +01:00
Laurent Destailleur
7d28285ac7 CSS 2024-02-27 11:29:53 +01:00
Frédéric FRANCE
39d8732879 fix missing status if unread (status = 0) (#28443) 2024-02-27 00:14:22 +01:00
sonikf
52d1fe8c67 fix translation for non latin languages (#28437)
* fix translation for non latin languages

* fix translation for non latin languages
2024-02-26 22:55:42 +01:00
Laurent Destailleur
052cdd0259 FIX #28429 2024-02-26 16:36:12 +01:00
Laurent Destailleur
72d84f546f Fix can disable port on command line 2024-02-25 22:01:20 +01:00
Laurent Destailleur
628feb9c34 Fix warning 2024-02-25 21:10:35 +01:00
Laurent Destailleur
c171ce2065 Fix bad function 2024-02-25 19:04:05 +01:00
Laurent Destailleur
614af968c9 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-25 17:23:13 +01:00
Laurent Destailleur
4897d1eb97 Fix warning 2024-02-25 17:23:06 +01:00
Laurent Destailleur
076cde3005 Fix warning 2024-02-25 17:20:28 +01:00
Laurent Destailleur
0a9d454055 Fix revert 2024-02-25 17:01:37 +01:00
Laurent Destailleur
05914b4c78 Fix warning 2024-02-25 16:57:45 +01:00
Laurent Destailleur
4c3830b909 Fix set the default value 2024-02-25 13:06:31 +01:00
Laurent Destailleur
fca9ebe72f Fix field position 2024-02-25 12:59:42 +01:00
Laurent Destailleur
1a25a086cb FIX quote in sql request 2024-02-24 17:49:11 +01:00
Laurent Destailleur
f502435d62 FIX position of field in list of field in shipment list 2024-02-23 17:24:02 +01:00
Laurent Destailleur
8ad9dc5b44 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-23 16:41:33 +01:00
Laurent Destailleur
f8c6d5a6a1 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-23 15:25:36 +01:00
Laurent Destailleur
7b1dc74b9e Fix corrupted data 2024-02-23 15:25:22 +01:00
Can Arslan
2a03df95b4 FIX: duplicate with lines: 414-416 (#28358) 2024-02-22 19:17:38 +01:00
Laurent Destailleur
288d14b7af Fix changelog 2024-02-22 02:58:16 +01:00
MDW
5f9047b2e3 #FIX modulenames (#28338)
* Fix: modulename

* Fix: modulename
2024-02-22 02:45:57 +01:00
Can Arslan
7112c5a782 FIX: PHP Warning: Undefined variable $lib (#28342) 2024-02-22 02:42:57 +01:00
Laurent Destailleur
3d688cfb55 FIX Bad picto on list of permission of a user when user not admin 2024-02-22 01:13:27 +01:00
Laurent Destailleur
cfa1b78efe FIX disabled pito of menu must be greyed. 2024-02-22 00:44:21 +01:00
Laurent Destailleur
32d35d5443 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-22 00:18:42 +01:00
Laurent Destailleur
efd2afb8f9 comment 2024-02-22 00:11:48 +01:00
Laurent Destailleur
c396dcdfbb Fix from #27211 2024-02-22 00:09:45 +01:00
MDW
5a4c8c6ce7 FIx: modulenames (#28337)
* Fix modulename

* Fix modulename

* Fix modulename
2024-02-21 19:10:32 +01:00
Laurent Destailleur
b5400ff7a9 Comment 2024-02-21 17:41:19 +01:00
Laurent Destailleur
bcd5baa62e Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-21 16:04:23 +01:00
Jon Bendtsen
6d480ff782 error in </span> tag (#28316)
Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
2024-02-20 20:46:22 +01:00
Laurent Destailleur
0f8b433142 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-20 14:48:51 +01:00
Laurent Destailleur
0492fb6098 FIX close #28279 2024-02-20 14:46:56 +01:00
Laurent Destailleur
7ff44dfc3e FIX Responsive on admin project 2024-02-19 23:37:57 +01:00
Laurent Destailleur
43996fff1f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-19 18:23:48 +01:00
Laurent Destailleur
3e8ee34f9c FIX Bad column for total in bom list 2024-02-19 16:58:59 +01:00
Laurent Destailleur
f599ae779a FIX some tooltips has disappeared on invoice action button 2024-02-19 15:00:52 +01:00
Laurent Destailleur
059c69667c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-19 09:59:57 +01:00
Laurent Destailleur
1ec1704de9 FIX Picto for mime 2024-02-19 09:58:42 +01:00
Laurent Destailleur
c95c16dda0 Comment 2024-02-18 22:20:50 +01:00
Laurent Destailleur
1c0068c248 Doc 2024-02-18 18:27:10 +01:00
Laurent Destailleur
7f32a49121 Fix tooltip 2024-02-18 18:26:40 +01:00
Laurent Destailleur
e38e9618ac Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-18 17:14:03 +01:00
Laurent Destailleur
0ae66f7ff2 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-18 15:41:28 +01:00
Laurent Destailleur
da9b9370bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-18 15:41:18 +01:00
Frédéric FRANCE
f4f96de45b fix address on several lines (#28227) 2024-02-18 15:26:14 +01:00
Laurent Destailleur
a72077731f FIX Bad CRLF when sending text only content. Fix dol_htmlwithnojs() 2024-02-18 02:23:04 +01:00
Laurent Destailleur
72298b8954 FIX bad timzeone for the start/end date of an event 2024-02-18 01:34:45 +01:00
Laurent Destailleur
2f57173574 Fix timezone for event 2024-02-18 01:33:21 +01:00
Laurent Destailleur
85be2aa98e Add dol_escape_htmltag 2024-02-17 19:48:30 +01:00
Laurent Destailleur
f4c9d683f5 Fix log message 2024-02-17 19:36:33 +01:00
Laurent Destailleur
17c3f6003e Fix pb letting think a user with no perm can change prospect status 2024-02-17 19:30:42 +01:00
Laurent Destailleur
00f69f90e6 FIX Pb in redirect of a website page in USEDOLIBARRSERVER mode 2024-02-17 15:11:20 +01:00
Frédéric FRANCE
2c8ffdc160 fix wrong test (#28202) 2024-02-16 12:16:41 +01:00
Laurent Destailleur
f2961901fe Doc 2024-02-16 03:10:30 +01:00
Niels Scheunemann
ddb04db200 FIX: Shipment closing action has wrong value (#28174)
Change the value of the action parameter from "close" to "classifyclosed" to make the button work again.
2024-02-15 14:53:54 +01:00
Laurent Destailleur
75c050236e FIX missing trans 2024-02-14 15:22:58 +01:00
Laurent Destailleur
70e2fcee16 FIX Bad condition on button back to draft on recruitment job. 2024-02-14 15:20:56 +01:00
Laurent Destailleur
a626b1b693 FIX migration missing 2 columns in llx_resource and 1 in llx_user 2024-02-14 14:14:16 +01:00
Laurent Destailleur
7c3abe84b4 FIX Value of field int = 0 from modulebuilder must nto be set to null 2024-02-14 01:38:20 +01:00
MDW
540502e578 Correct spelling errors (#28134)
# Correct spelling errors

Correct spelling errors that newly appeared in 19.0 and block ci.
2024-02-12 16:33:03 +01:00
Laurent Destailleur
1bfe7acbb5 Fix package for 19.0 2024-02-12 15:05:28 +01:00
Laurent Destailleur
400e831d82 Fix dark mode for TakePOS. Clean log 2024-02-12 13:41:46 +01:00
Laurent Destailleur
c61753f73a Debug v19 2024-02-12 12:44:29 +01:00
Laurent Destailleur
7836881a22 Sync transifex 2024-02-12 06:33:42 +01:00
Laurent Destailleur
8143e76e6d Prepare 19.0 2024-02-12 06:17:52 +01:00
Laurent Destailleur
f6dd2f808e Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-12 03:35:51 +01:00
Laurent Destailleur
ff2d609814 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_production.php
2024-02-12 03:35:39 +01:00
Laurent Destailleur
a104fbe7b3 Log 2024-02-10 16:59:09 +01:00
Laurent Destailleur
c1c7b04cba Debug v19 2024-02-10 12:02:09 +01:00
Laurent Destailleur
c261b84667 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-09 19:06:52 +01:00
Laurent Destailleur
5637dd2f3f Fix do not use oauth if link was not clicked 2024-02-09 16:15:08 +01:00
Laurent Destailleur
2743639947 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-09 13:33:04 +01:00
Laurent Destailleur
0f53fe10d1 FIX oauth authent must be done only on click on link
Better message for notification denied.
2024-02-09 13:32:44 +01:00
Laurent Destailleur
290cb8447a comment 2024-02-09 12:12:54 +01:00
Frédéric FRANCE
0790abe530 fix social networks icons (#28078) 2024-02-09 11:35:36 +01:00
Laurent Destailleur
265fff296c Fix warnings Close #27917 2024-02-08 15:06:35 +01:00
Laurent Destailleur
7783575bf7 Fix bad parameter 2024-02-08 15:02:54 +01:00
Laurent Destailleur
8e0559f9a4 Debug v19 2024-02-08 04:23:29 +01:00
William Mead
43ec918e63 FIX #27670 Qual clean ticket libstatut method (#28025)
* Fixed empty labelStatus. Refactored logic.

* Added contributor details

* Cleaned PHPDoc
2024-02-08 02:07:05 +01:00
Laurent Destailleur
e8e7a3fe95 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-08 01:36:24 +01:00
Laurent Destailleur
550e4e8c9a Fix compatibility
Conflicts:
	htdocs/resource/class/dolresource.class.php
2024-02-08 00:26:55 +01:00
thibdrev
ad141c1e1f qual: phpstan for htdocs/core/class/cunits.class.php (#28064)
htdocs/core/class/cunits.class.php	88	Property CommonDict::$active (int) does not accept string.
htdocs/core/class/cunits.class.php	415	Method CUnits::getUnitFromCode() should return int but returns string.
2024-02-08 00:15:44 +01:00
Laurent Destailleur
1322c20f91 Clean code 2024-02-08 00:04:50 +01:00
Laurent Destailleur
5d6448a8a2 css 2024-02-07 23:54:30 +01:00
Laurent Destailleur
9acceb8e8e Debug v19 2024-02-07 23:52:03 +01:00
Laurent Destailleur
02517b7c3f Fix #28055 2024-02-07 20:47:47 +01:00
Frédéric FRANCE
1ecc0b15c4 fix display (#28029) 2024-02-07 20:47:37 +01:00
Frédéric FRANCE
c8fb2d9043 fix can't set odt directory (#28028) 2024-02-07 19:36:48 +01:00
Laurent Destailleur
097290fc38 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/comm/action/peruser.php
	htdocs/core/class/commonobject.class.php
2024-02-07 18:16:57 +01:00
Quentin-Seekness
0ad3581e00 Update cunits.class.php (#28056)
FIX: error SQL when creating a Cunit
2024-02-07 17:29:45 +01:00
William Mead
27002a95e4 Fixed undefined thirdparty_id property (#28044) 2024-02-07 16:29:57 +01:00
William Mead
48fff89e9e Fixed undefined action linkback variable (#28043) 2024-02-07 16:28:35 +01:00
Ikarus
66604c12d3 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)
2024-02-07 16:26:07 +01:00
sonikf
c45b7fb844 fix undefined array key (#28048) 2024-02-07 16:25:37 +01:00
boudet jean pascal
fe63333c28 FIX : move input type hidden (#28054)
* move input type hidden

* pre-commit from another dev

* Delete htdocs/includes/mike42/escpos-php/doc/escpos.conf

---------

Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-07 16:24:11 +01:00
Laurent Destailleur
f828cc5119 Debug v19 2024-02-07 12:28:35 +01:00
Laurent Destailleur
c66b434c80 Fix for export 2024-02-06 18:41:45 +01:00
Laurent Destailleur
8b8aa3a27f Fix comment 2024-02-06 17:46:12 +01:00
Laurent Destailleur
be830d31be Debug v19 selection of ticket printer per terminal 2024-02-06 17:06:47 +01:00
Laurent Destailleur
b40ebfa9e8 Better log for debug 2024-02-06 11:57:27 +01:00
Laurent Destailleur
e4365c15c6 Fix missing table llx_societe_account into the merge 2024-02-06 11:50:02 +01:00
Laurent Destailleur
4e5ba6c673 Debug v19 2024-02-06 10:11:35 +01:00
noec764
130b86de02 FIX: Reduction Input wasn't recovered properly (#28014)
Co-authored-by: Noé <noe@scopen.fr>
2024-02-05 13:49:45 +01:00
Laurent Destailleur
f1f92f8922 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-05 01:43:00 +01:00
Frédéric FRANCE
10eaa1d269 fix saved model_pdf after generating odt (#28005) 2024-02-05 01:10:35 +01:00
Laurent Destailleur
6dca2e6bf0 Debug v19 2024-02-04 16:29:40 +01:00
Laurent Destailleur
7c88705f14 Fix template to use v19 dev rules 2024-02-04 16:05:02 +01:00
Laurent Destailleur
f9a1e7b9f4 Debug v19 2024-02-03 20:43:42 +01:00
Laurent Destailleur
d8a3508cbe Debug v19 2024-02-03 17:26:10 +01:00
Laurent Destailleur
fe0b321d10 Debug v19 2024-02-03 16:23:30 +01:00
Laurent Destailleur
4aeda8d28d Fix escapeforlike/escape 2024-02-03 15:29:40 +01:00
Laurent Destailleur
ce63c161cc Fix field name 2024-02-03 13:25:43 +01:00
Laurent Destailleur
a3d0fbd279 Debug v19 2024-02-03 13:00:10 +01:00
Laurent Destailleur
eccc60056f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-03 01:53:10 +01:00
Laurent Destailleur
9a73612d65 Doc 2024-02-02 13:40:09 +01:00
Laurent Destailleur
0f931ef471 Disable ajax tooltip by default. Still trouble of persistent popup. 2024-02-02 13:29:02 +01:00
Laurent Destailleur
fedbc0f08e Fix use of not existing object 2024-02-02 12:51:11 +01:00
Laurent Destailleur
8fef5b3d5c Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-02 12:47:15 +01:00
Laurent Destailleur
ba95db0175 Fix use of socid 2024-02-02 12:44:47 +01:00
MDW
4d0fbc657e Qual: Backport pre-commit to 19.0 (#27950)
* Qual: Backport pre-commit to 17.0

Backport the pre-commit tool to bring extra checks to the older versions
so that they are fixed earlier before merging in upper versions.

Other PRs will be created for backporting to 18.0 and 19.0.
The PRs should be accepted in reverse order:
- develop;
- 19.0:
- 18.0;
- 17.0.

That should avoid merge conflicts and ensure that options (and ignored
messages or steps) are adapted to the version branch.

* Qual: Backport pre-commit to 18.0

# Qual: Backport pre-commit to 18.0

Backport the pre-commit tool to bring extra checks to the older versions
so that they are fixed earlier before merging in upper versions.

Other PRs will be created for backporting to 18.0 and 19.0.
The PRs should be accepted in reverse order:
- develop;
- 19.0:
- 18.0;
- 17.0.

That should avoid merge conflicts and ensure that options (and ignored
messages or steps) are adapted to the version branch.

* Qual: Backport pre-commit to 19.0

# Qual: Backport pre-commit to 19.0

Backport the pre-commit tool to bring extra checks to the older versions
so that they are fixed earlier before merging in upper versions.

Other PRs will be created for backporting to 18.0 and 19.0.
The PRs should be accepted in reverse order:
- develop;
- 19.0:
- 18.0;
- 17.0.

That should avoid merge conflicts and ensure that options (and ignored
messages or steps) are adapted to the version branch.
2024-02-01 17:37:25 +01:00
Laurent Destailleur
b0fd166142 Add MAIN_MAIL_FORCE_FROM to fix sending email with mono user SMTP 2024-02-01 13:12:21 +01:00
Laurent Destailleur
75df3bc24d FIX #27375 2024-02-01 12:43:46 +01:00
Laurent Destailleur
3bb3a8d6ed Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-01 12:23:21 +01:00
Laurent Destailleur
4cba87129c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-01 12:22:54 +01:00
Laurent Destailleur
badf3e1971 Fix payment mode/term and label and sort order in export 2024-02-01 11:53:55 +01:00
Laurent Destailleur
bd88f1df67 Merge pull request #27926 from noec764/18_FIX_Global_filter_deleted_on_massactions
FIX: Save global filter when clicking on massaction buttons
2024-01-31 19:28:00 +01:00
Laurent Destailleur
f152d5e0fd Update massactions_pre.tpl.php 2024-01-31 19:24:58 +01:00
Laurent Destailleur
9843f31814 Fix warning 2024-01-31 18:26:09 +01:00
Noé
9beb210ead FIX: Save global filter when clicking on massaction buttons 2024-01-31 15:11:37 +01:00
Laurent Destailleur
16accb3460 Fix missing due date 2024-01-31 11:19:52 +01:00
Laurent Destailleur
1d69089702 FIX Must use the ICS and not IDS bu default 2024-01-31 03:49:13 +01:00
Laurent Destailleur
423837a750 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-30 22:20:43 +01:00
Laurent Destailleur
79d9cab115 Include instruction to fix character set of a column 2024-01-30 22:19:41 +01:00
Laurent Destailleur
5e3bc5acf3 Merge pull request #27881 from aspangaro/19b26
Fix SQL migration
2024-01-30 15:59:02 +01:00
Alexandre SPANGARO
15004cb256 Fix SQL migration 2024-01-30 06:52:10 +01:00
Laurent Destailleur
fb29cd2623 Tab 2024-01-30 00:45:07 +01:00
Laurent Destailleur
f0392a0caf Fix link with entity 2024-01-29 15:03:46 +01:00
Laurent Destailleur
1b58a37cf5 Fix label of prospect 2024-01-29 13:41:51 +01:00
Laurent Destailleur
c934340580 Doc 2024-01-29 13:12:06 +01:00
Laurent Destailleur
40794458d2 Comment 2024-01-29 13:00:33 +01:00
Laurent Destailleur
2840a88e6d Fix warnings 2024-01-29 11:37:17 +01:00
Laurent Destailleur
eab0093750 Fix var not defined 2024-01-29 11:24:37 +01:00
Laurent Destailleur
60da05679b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-29 10:30:19 +01:00
Laurent Destailleur
70ab796c23 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-29 10:30:01 +01:00
vmaury
f033cc455f Fix : random bug when attaching file to email : no file attached 2024-01-29 01:58:07 +01:00
Laurent Destailleur
ee810d65da Close #27842 2024-01-29 01:52:43 +01:00
Laurent Destailleur
ecbfeaddc5 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-29 01:26:55 +01:00
Laurent Destailleur
4ff9c9dfc5 Merge pull request #27826 from FHenry/19_fix_product_time_on_tasktime
fix: broken feature in 19 for product on task time
2024-01-28 12:48:09 +01:00
Laurent Destailleur
7573737ff1 Merge pull request #27827 from W1W1-M/fix-parent-company-list-column
FIX #27705 empty parent company list column
2024-01-28 12:45:46 +01:00
Laurent Destailleur
56a6332d33 Merge pull request #27837 from frederic34/patch-5
fix getMultidirOutput can't find multidir_output for mycompany
2024-01-28 12:43:54 +01:00
Laurent Destailleur
b784cfe5aa Update doc 2024-01-28 00:48:41 +01:00
Laurent Destailleur
54db200122 Update doc 2024-01-28 00:45:43 +01:00
Laurent Destailleur
f3ce7a2a93 Debug v19 Fix label of option 2024-01-28 00:37:48 +01:00
Laurent Destailleur
2a7a47d3ad Debug v19 - missing migration line 2024-01-28 00:14:19 +01:00
Laurent Destailleur
04fbfd2cb9 Fix the quick add button when js disabled 2024-01-28 00:02:36 +01:00
Laurent Destailleur
85516e3926 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-27 23:43:57 +01:00
Laurent Destailleur
6f19f3c1fb Clean css 2024-01-27 23:38:18 +01:00
Frédéric FRANCE
673b1727e2 fix getMultidirOutput can't find multidir_output for mycompany 2024-01-27 10:38:23 +01:00
Laurent Destailleur
bf80809a96 Debug v19 2024-01-27 01:34:53 +01:00
William Mead
78c06fbd07 Fixed empty parent company list column 2024-01-26 11:08:50 +01:00
Florian HENRY
5a412c66f7 fix broken feature in 19 for product on task time 2024-01-26 10:58:23 +01:00
Laurent Destailleur
98a8942188 Merge pull request #27781 from Slordef/18.0-fourn-add-line-currency-auto-update
FIX: add product line update fields price
2024-01-26 02:36:53 +01:00
Laurent Destailleur
5d830a7422 Merge pull request #27797 from fappels/19_fix_doc
Improve doc selectWarehouses and loadWarehouses
2024-01-26 02:13:36 +01:00
Laurent Destailleur
64e246a4f6 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-26 01:53:38 +01:00
Laurent Destailleur
1516b4d501 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-26 01:52:22 +01:00
Laurent Destailleur
8795e58c25 Doc 2024-01-26 01:42:33 +01:00
Laurent Destailleur
66a628b306 Removed useless initHook. Must use the context of main calling page. 2024-01-26 01:08:59 +01:00
Laurent Destailleur
76ad592561 Merge pull request #27812 from mc2rcanarslan/patch-9
FIX: wrong alias
2024-01-26 00:45:15 +01:00
Laurent Destailleur
70b20309e8 Merge pull request #27816 from frederic34/patch-3
fix pre-commit
2024-01-26 00:34:42 +01:00
Laurent Destailleur
5d60fb6da8 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/filefunc.inc.php
2024-01-26 00:24:30 +01:00
Frédéric FRANCE
5448261947 fix pre-commit 2024-01-25 23:32:53 +01:00
Laurent Destailleur
c6d59e5ddd Fix lang 2024-01-25 22:31:56 +01:00
Laurent Destailleur
233e5a3307 Fix trans 2024-01-25 22:19:31 +01:00
Laurent Destailleur
2566109648 Fix lang 2024-01-25 21:15:00 +01:00
Can Arslan
6a3c5cce69 FIX: wrong alias 2024-01-25 11:14:55 -07:00
Laurent Destailleur
b8686f159f Debug module receipt printer 2024-01-25 15:18:06 +01:00
Laurent Destailleur
fc4ba2b170 css 2024-01-25 13:53:53 +01:00
Laurent Destailleur
0791d32070 css 2024-01-25 13:50:01 +01:00
Laurent Destailleur
86c787821a Fix colspan 2024-01-25 12:57:19 +01:00
Francis Appels
5f694a1173 also for selectWarehouses 2024-01-25 10:16:22 +01:00
Francis Appels
c983256937 Improve doc of loadWarehouses 2024-01-25 09:53:51 +01:00
Laurent Destailleur
7a4128b8b6 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-25 01:38:49 +01:00
Laurent Destailleur
d873cc43ed Fix missing migration 2024-01-25 01:38:28 +01:00
Laurent Destailleur
331b13c465 Sync transifex 2024-01-25 01:15:01 +01:00
Maximilien Valenzano
d74af432a0 fix: add product line update fields price 2024-01-24 18:15:51 +01:00
Laurent Destailleur
cb1c3a5bb1 Debug v19 2024-01-24 14:36:35 +01:00
Laurent Destailleur
ce1eaa65a5 Debug v19 2024-01-24 14:12:46 +01:00
Laurent Destailleur
0cadd3037d Debug v19 2024-01-24 12:03:08 +01:00
Laurent Destailleur
3eb461db7c FIX #27771 Sec: birth date and personal address not visible by default
on vcard
2024-01-24 11:56:56 +01:00
Laurent Destailleur
04920c9b54 Fix do not lose input field on error 2024-01-24 11:21:56 +01:00
Laurent Destailleur
0602b40e3a FIX Debug setup of module TakePOS 2024-01-24 03:34:42 +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
6dcd32d921 Merge pull request #27758 from aspangaro/19b26
Update VAT rate 2024 for Switzerland
2024-01-23 19:05:42 +01:00
Alexandre SPANGARO
52c005e909 Update VAT rate 2024 for Switzerland 2024-01-23 17:41:41 +01:00
Laurent Destailleur
713865659d Merge pull request #27757 from Dolibarr/revert-27727-FIX_prospectlevel_doesnt_have_rowid
Revert "FIX : llx_prospectlevel doesn't have rowid"
2024-01-23 17:30:05 +01:00
Laurent Destailleur
5524645dca Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-23 17:29:18 +01:00
Laurent Destailleur
9bcf02c408 Clean code 2024-01-23 17:29:09 +01:00
Laurent Destailleur
dbeb55774f Revert "FIX : llx_prospectlevel doesn't have rowid" 2024-01-23 17:24:00 +01:00
Laurent Destailleur
78cfa9c347 Merge pull request #27727 from atm-sami/FIX_prospectlevel_doesnt_have_rowid
FIX : llx_prospectlevel doesn't have rowid
2024-01-23 17:16:35 +01:00
Laurent Destailleur
48332f26f4 Merge pull request #27749 from frederic34/patch-12
replace deprecated function
2024-01-23 16:57:07 +01:00
Frédéric FRANCE
e6ea6a95ce replace deprecated function 2024-01-23 14:24:28 +01:00
Laurent Destailleur
679896f110 log 2024-01-23 13:14:25 +01:00
Laurent Destailleur
1f43efd08c Debug v19 2024-01-23 11:39:38 +01:00
Laurent Destailleur
9a9ca50b49 Debug v19 2024-01-23 11:07:53 +01:00
Laurent Destailleur
2b5155ef02 Fix typo 2024-01-23 10:38:25 +01:00
Laurent Destailleur
4123a5b6fb Debug v19 2024-01-23 09:58:12 +01:00
Laurent Destailleur
27607f5241 Fix tr 2024-01-23 09:46:55 +01:00
samifilali26
128b0776a0 update 2024-01-22 15:48:41 +01:00
MDW
ee398214c2 Fix: Add missing argument to dol_print_error
# Fix: Add missing  argument to dol_print_error

Required  argument was missing.
2024-01-20 00:39:39 +01:00
Laurent Destailleur
72649eb9c6 Clean code 2024-01-20 00:39:13 +01:00
Laurent Destailleur
4c4ee11abf Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-19 20:08:04 +01:00
Laurent Destailleur
916c017aa6 Debug v19 2024-01-19 20:04:11 +01:00
Laurent Destailleur
e3b09fcdb8 Fix test always wrong 2024-01-19 16:41:21 +01:00
Laurent Destailleur
9d40711723 Fix type of prospect level 2024-01-19 16:25:46 +01:00
Laurent Destailleur
4ac88dac52 Fix #yogosha20013 2024-01-19 16:09:45 +01:00
Laurent Destailleur
63cb470e39 Fix #yogosha19893 2024-01-19 15:29:26 +01:00
Laurent Destailleur
f711d0d144 Typo doc 2024-01-19 12:36:07 +01:00
Laurent Destailleur
941a8eda2f Debug v19 2024-01-19 11:28:02 +01:00
Laurent Destailleur
3b918ad274 Tooltip 2024-01-19 11:19:43 +01:00
Laurent Destailleur
b5abb27e26 Debug v19 2024-01-19 11:09:11 +01:00
Laurent Destailleur
6e79bca10c Trans 2024-01-19 10:50:35 +01:00
Laurent Destailleur
3d7f76964d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-19 10:45:20 +01:00
Laurent Destailleur
be9e94a4a2 Fix duplicate trnaslation key 2024-01-19 10:45:00 +01:00
Laurent Destailleur
f241dacbdc css 2024-01-18 22:11:02 +01:00
Laurent Destailleur
7acee285a8 Fix test 2024-01-18 21:07:05 +01:00
Laurent Destailleur
f1f952c65f Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-18 18:43:05 +01:00
Laurent Destailleur
b7212cbac4 Try bette fix for #27586 2024-01-18 18:06:10 +01:00
Laurent Destailleur
055a598584 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-18 16:04:23 +01:00
Laurent Destailleur
3579d8f8d6 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-18 13:38:36 +01:00
Laurent Destailleur
246c7a3f5b Update doc 2024-01-18 13:38:28 +01:00
Laurent Destailleur
cfcb9bc2a0 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-18 13:31:40 +01:00
Laurent Destailleur
c32fafea4e Merge pull request #27603 from defrance/patch-317
stock transfert realy not stable
2024-01-18 13:00:21 +01:00
Laurent Destailleur
6e487735f6 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-18 12:10:41 +01:00
Laurent Destailleur
bc0fc46f21 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-18 12:10:29 +01:00
Charlène Benke
0a97f1b19c stock transfert realy not stable
I detected quite a few bugs, absence of token, error in class definition on certain page...
I don't understand how we could declare this module stable overnight without having a minimum of testing it.
2024-01-18 12:06:14 +01:00
Laurent Destailleur
31d8600811 Merge pull request #27568 from comaiteseb/19.0
FIX #27536 VAT of the buyer's country not applied while SERVICE_ARE_ECOMMERCE_200238EC option is activated
2024-01-18 11:05:14 +01:00
Laurent Destailleur
88aed1a661 Merge pull request #27598 from GregChant/fix-time
Fix extrafields select columns valuebilled
2024-01-18 10:51:51 +01:00
Grégoire Chanton
eadb6625f0 fiix depreciated 2024-01-18 07:15:41 +01:00
Grégoire Chanton
c1255c7d95 Set variable $projectstatic->usage_bill_tim for field compatibility 2024-01-18 06:59:09 +01:00
Laurent Destailleur
0719a2f9dc Fix missing tms field 2024-01-18 00:47:02 +01:00
Mathieu "rid" Soula
c7557671e1 Fix add tms field into llx_bom_bomline 2024-01-18 00:45:12 +01:00
Laurent Destailleur
1773d432a4 Fix logs 2024-01-18 00:44:42 +01:00
Laurent Destailleur
8ca7f0c989 Fix var_dump 2024-01-17 20:38:22 +01:00
Laurent Destailleur
fc67947834 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-17 20:23:46 +01:00
Laurent Destailleur
af3bb1d144 Merge 2024-01-17 20:23:38 +01:00
Laurent Destailleur
f7485182f7 Fix warning and MAIN_MAIL_AUTOCOPY_... 2024-01-17 19:52:17 +01:00
Laurent Destailleur
c5c251b142 Merge pull request #27580 from fappels/19_fix_productbatch_findall
Fix default lot number not shown in mode SHIPPING_DISPLAY_STOCK_ENTRY…
2024-01-17 18:12:30 +01:00
Sébastien NASSIET
ec23bc3c90 Syntax error crrected 2024-01-17 16:03:14 +01:00
Sébastien NASSIET
b70faf9132 oubli correction de la logique pour la TVA Intraco vers un particulier 2024-01-17 11:04:26 +01:00
Francis Appels
7fb2d570c3 Fix default lot number not shown in mode SHIPPING_DISPLAY_STOCK_ENTRY_DATE 2024-01-17 10:55:08 +01:00
Laurent Destailleur
8eab0776e4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-16 14:19:02 +01:00
Sébastien NASSIET
efdaa0c9ec phpcs correction 2024-01-16 13:49:15 +01:00
Sébastien NASSIET
f53aa7c505 phpcs correction 2024-01-16 13:45:38 +01:00
Sébastien NASSIET
da099c1c0e FIX #27536 2024-01-16 12:42:45 +01:00
Laurent Destailleur
543e79ab78 Clean code 2024-01-16 11:33:56 +01:00
Laurent Destailleur
ee2ed963e8 FIX #22506 2024-01-15 21:32:17 +01:00
Laurent Destailleur
85c016f0a8 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-15 18:06:34 +01:00
Laurent Destailleur
55067371ca Doc 2024-01-15 18:06:11 +01:00
Laurent Destailleur
3fe1dd387c Merge pull request #27541 from frederic34/patch-1
fix incorrect case
2024-01-15 18:02:28 +01:00
Frédéric FRANCE
3599b43005 fix incorrect case 2024-01-15 17:39:31 +01:00
Laurent Destailleur
2533362cf0 Merge pull request #27533 from GregChant/fix-column
Update balance.php
2024-01-15 17:30:10 +01:00
Laurent Destailleur
21efad237a Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-15 17:19:41 +01:00
Greg Chanton
9e3c6f1dd6 Update balance.php
adds conditions to correctly manage column alignment following the MAIN_CHECKBOX_LEFT_COLUMN option
2024-01-15 14:53:25 +01:00
Laurent Destailleur
9a1a5fd91c Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-15 14:35:24 +01:00
Laurent Destailleur
88da390677 Fix error message 2024-01-15 14:34:28 +01:00
Laurent Destailleur
d9acb22f5d Merge pull request #27530 from comaiteseb/patch-6
FIX #27529 Error PHP8.1 : Type Error in /space/www/2cvp/Dolibarr/htdocs/main.inc.php:2202
2024-01-15 11:36:43 +01:00
Christophe TREMBLAY-GUILLOUX
1a33117e86 File not joined : slash is missing in case DOL_DATA_ROOT doesn't end with slash 2024-01-15 11:33:30 +01:00
Sébastien NASSIET
b836f049a3 Issue #27529
Check if $value2 is an array.
2024-01-15 11:24:44 +01:00
Laurent Destailleur
6b0a3ac1bc Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-15 02:00:55 +01:00
Laurent Destailleur
da514596bb css 2024-01-15 02:00:07 +01:00
Francis Appels
3d82778516 Fix modulebuilder fetchAll with extrafield (#27500) 2024-01-14 18:00:48 +01:00
Alexandre SPANGARO
6ac9b959d7 Accountancy - Add help url everywhere (#27480)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-01-13 15:48:54 +01:00
Laurent Destailleur
8c4ed9f14c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-13 11:17:28 +01:00
Laurent Destailleur
4cf06431ff Fix template 2024-01-12 22:30:30 +01:00
Laurent Destailleur
7d16aa4626 Fix bad constant 2024-01-12 22:01:50 +01:00
Laurent Destailleur
d8db27eac1 Debug v19 2024-01-12 21:53:50 +01:00
Laurent Destailleur
8ef27e6ed2 FIX Filter on rate 2024-01-12 21:51:58 +01:00
Laurent Destailleur
a88ba91d97 Fix look and feel v19 2024-01-12 21:51:53 +01:00
Laurent Destailleur
569d9426d7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-12 21:40:51 +01:00
Laurent Destailleur
11d6b891fa FIX SQL error 2024-01-12 21:37:19 +01:00
Laurent Destailleur
1c86073a9e Fix phpcs 2024-01-12 17:06:22 +01:00
John BOTELLA
58cf5609ca FIX php 8.2 warning (#27465)
* fix php 8.2 warning

* Fix warning
2024-01-12 17:03:57 +01:00
Laurent Destailleur
34f5c1e293 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-11 13:47:14 +01:00
Laurent Destailleur
34c2ca539a Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-11 13:41:50 +01:00
Laurent Destailleur
f2669da370 Debug v19 2024-01-11 13:41:38 +01:00
MDW
11f457ddc8 # Fix: remove parameter in getSelectInvoiceSubtype call (#27314)
Parameters were already invalid when this was added in 65b9f4e6de.
See 65b9f4e6de/htdocs/core/class/html.form.class.php (L10865C59-L10865C59) .
2024-01-11 10:47:05 +01:00
Laurent Destailleur
13f701e8dc Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-11 01:41:49 +01:00
Laurent Destailleur
77a922a72e Debug v19 2024-01-11 01:41:13 +01:00
MDW
412f8406dd Fix: Change TCPDF::_out to public because of pdf.lib.php (#27333)
# Fix: Change TCPDF::_out to public because of pdf.lib.php

TCPDF::_out is used 2 times as ->_out(...) in htdocs/core/lib/pdf.lib.php.
Changing php.lib.php requires more analysis.  Making TCPDF::_out public is
the quick solution.
2024-01-10 22:10:13 +01:00
Laurent Destailleur
d7651e971c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-10 17:44:31 +01:00
Laurent Destailleur
0618e5b90d Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-10 17:40:47 +01:00
Laurent Destailleur
a4030d145a FIX #27315 2024-01-10 17:40:28 +01:00
MDW
963afede5e Fix: Match local variable name to parameter variable name (#27316)
# Fix: Match local variable name to parameter variable name

Improve consistency and avoids that phan reports suspicious parameter order
2024-01-10 17:38:23 +01:00
MDW
da0bebc9ae Fix: formmail - add_attached_files - argument name consistency (#27338)
# Fix: formmail - add_attached_files - argument name consistency

Phan determined suspicious naming as arg #2 to add_attached_files is  while
that was the name for the first argument by the caller.

Also, on examination, only the first parameter is needed as add_attached_files
handles the other two in the same manner.
2024-01-10 16:56:40 +01:00
MDW
95da30a224 Fix: files.lib.php - Add optional sort parameter to array_multisort for static tool check (#27340)
# Fix: files.lib.php - Add optional sort parameter to array_multisort for static tool check

Phan flags the call to array_multisort as suspicious - adding the optional sort parameter
avoids this.
2024-01-10 16:41:39 +01:00
Laurent Destailleur
e9205dcdb1 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-10 16:23:01 +01:00
David
82c93e6812 FIX: typo when adding height after custom header (#27384)
'extra_under_header_shift' instead of 'extra_under_address_shift'

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-01-10 15:40:36 +01:00
nat
c06166267e FIX #27312 2024-01-10 15:32:24 +01:00
Laurent Destailleur
2841f4723c Fix a header must be followed by exit 2024-01-10 15:21:04 +01:00
Frédéric FRANCE
7b45347b01 dol_compress_dir creates invalid zip with windoze 2024-01-10 15:20:12 +01:00
Laurent Destailleur
e770259b3f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-10 15:12:50 +01:00
Laurent Destailleur
64eff062f2 Clean code 2024-01-10 15:10:15 +01:00
Laurent Destailleur
2c1e7a8381 Merge pull request #27339 from mdeweerd/optim/dol_mimetype
Perf: Optimise dol_mimetype
2024-01-10 15:05:01 +01:00
Laurent Destailleur
b2d1c8a0b2 Merge pull request #27351 from W1W1-M/fix-intervention-done-confirmation-notification
FIX notification information on intervention done confirmation message (v19+)
2024-01-10 14:34:31 +01:00
Laurent Destailleur
bcb3d92e15 Merge pull request #27364 from mdeweerd/fix/donotreuse_key_inforeach
Fix: Do not reuse $key from scope as foreach key
2024-01-10 12:39:38 +01:00
Laurent Destailleur
953c1a5417 Merge pull request #27372 from mdeweerd/fix/foreach_no_outerscope_var_reuse
Fix: Do not reuse same variable names in inner scope foreach.
2024-01-10 12:36:51 +01:00
Laurent Destailleur
4fa4694a34 Fix closing form 2024-01-10 11:24:14 +01:00
MDW
10a13dd906 Fix: Do not reuse same variable names in inner scope foreach.
# Fix: Do not reuse same variable names in inner scope foreach.

Phan reports:  PhanPluginLoopVariableReuse: Variable  used in loop was also used in an outer loop
2024-01-09 22:25:56 +01:00
Laurent Destailleur
c13228efe8 Fix #yogosha19828 2024-01-09 20:50:30 +01:00
MDW
5684813476 Fix: Do not reuse from scope as foreach key
Phan report: Variable  used in loop was also used in an outer loop.
2024-01-09 20:39:24 +01:00
Laurent Destailleur
6871fb275a Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-09 17:12:53 +01:00
Laurent Destailleur
a20b3eea43 Debug v19 2024-01-09 17:12:33 +01:00
Laurent Destailleur
cdf2e4408c Debug v19 2024-01-09 16:56:32 +01:00
William Mead
1964a3e595 Added notification information on intervention done confirmation message 2024-01-09 15:09:07 +01:00
MDW
728bfeadba Perf: Optimise dol_mimetype
# Perf: Optimise dol_mimetype

All preg_match() calls were executed even if they are all exclusive.
2024-01-08 22:15:11 +01:00
Laurent Destailleur
4064d1d2bf Merge pull request #27332 from mdeweerd/fix/make_method_public
Fix: make PrestaShopWebservice::executeRequest method public
2024-01-08 21:26:27 +01:00
MDW
b60a152c2c Fix: Make executeRequest public
htdocs/admin/dolistore/ajax/image.php uses executeRequest,
changing that is more effort than making the method public.
2024-01-08 17:52:19 +01:00
Laurent Destailleur
368efbb77f Debug v19 2024-01-07 20:43:05 +01:00
Laurent Destailleur
7f7f904541 Debug v19 2024-01-07 20:23:52 +01:00
Laurent Destailleur
619aa10797 Debug v19 2024-01-07 19:32:53 +01:00
Laurent Destailleur
02f267c36b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-07 16:31:44 +01:00
Laurent Destailleur
c5cf8b8805 Debug v19 2024-01-07 15:07:59 +01:00
Laurent Destailleur
57742db14f Debug v19 2024-01-07 13:38:13 +01:00
Laurent Destailleur
8c8075a2c3 Debug v19 2024-01-07 12:49:43 +01:00
Laurent Destailleur
e0b5c48539 Debug v19 2024-01-07 12:02:06 +01:00
Laurent Destailleur
bf17b8767c Debug v19 2024-01-07 11:15:48 +01:00
Laurent Destailleur
450707e4be Removed a file that is bugged and output bugged empty data on screen 2024-01-06 23:01:31 +01:00
Laurent Destailleur
fc36553265 Fix #yogosha19809 2024-01-06 22:33:39 +01:00
Laurent Destailleur
d251f25830 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-06 16:43:09 +01:00
Laurent Destailleur
76ee9e506d Debug v19 2024-01-06 16:43:01 +01:00
Laurent Destailleur
5d2c32e4d5 Debug v19 2024-01-06 16:11:04 +01:00
Laurent Destailleur
37c9408d58 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-06 13:02:37 +01:00
Laurent Destailleur
c6c40e4c4a Fix css 2024-01-06 13:01:58 +01:00
Laurent Destailleur
190d04858e Merge pull request #27306 from frederic34/patch-8
fix create invoice from contract with free service line
2024-01-05 18:57:28 +01:00
Frédéric FRANCE
045b42d3b8 Update card.php 2024-01-05 16:08:14 +01:00
Frédéric FRANCE
3ed18dc92c fix create invoice from contract with free service line 2024-01-05 15:47:24 +01:00
Laurent Destailleur
b027ca3837 Fix bad email tested 2024-01-05 12:28:28 +01:00
Laurent Destailleur
242c403f50 Fix missing SPF info of the noreply email 2024-01-05 12:19:52 +01:00
Laurent Destailleur
30275625ac Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-05 02:46:53 +01:00
Laurent Destailleur
7aecc84fdd css 2024-01-05 02:34:08 +01:00
Laurent Destailleur
29d5f43ac4 Merge pull request #27292 from frederic34/patch-3
Update element.php
2024-01-05 02:03:28 +01:00
Christophe Battarel
b64ecef81d fix ajax search for external modules 2024-01-05 01:33:31 +01:00
Alexandre Janniaux
425f10d71e install: upgrade2: add missing modules
Those modules cannot be enabled from the upgrade2 script if they are not
in the list.
2024-01-05 01:28:53 +01:00
Laurent Destailleur
32dec98d14 Fix warning 2024-01-04 15:06:37 +01:00
Frédéric FRANCE
cd7b2ead85 Update element.php 2024-01-04 12:12:36 +01:00
Laurent Destailleur
b7510b86b5 Debug v19 2024-01-04 03:32:39 +01:00
Laurent Destailleur
8c1e8d2c91 Debug v19 2024-01-04 03:31:06 +01:00
Laurent Destailleur
41ccd47cbe Merge pull request #27101 from cfoellmann/19/PR/blockedlog-project
NEW add data type 'project' to blockedlog
2024-01-04 00:34:27 +01:00
Laurent Destailleur
27807750e5 Merge pull request #27288 from fappels/19_fix_php_warning
Fix php warning
2024-01-03 23:30:44 +01:00
Francis Appels
d36733d79b Fix php warning 2024-01-03 19:54:15 +01:00
Laurent Destailleur
1ee48746c2 Fix demo 2024-01-03 17:46:41 +01:00
Laurent Destailleur
6b0a4d578f Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-03 17:34:50 +01:00
Laurent Destailleur
1cb3099e10 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-03 17:33:23 +01:00
Laurent Destailleur
3d9866f461 Prepare 19.0 2024-01-03 17:33:13 +01:00
Laurent Destailleur
0d2a0d3cd2 Fix warning 2024-01-03 16:17:53 +01:00
Laurent Destailleur
a95d6604b4 Merge pull request #27287 from atm-john/19.0_fix_warning_php8.2
fix warning php 8.2
2024-01-03 16:03:50 +01:00
John BOTELLA
d4d89b6bfb fix warning php 8.2 2024-01-03 14:53:31 +01:00
Frédéric FRANCE
01c78a0aa5 Update init_menu_auguria.sql 2024-01-02 18:28:44 +01:00
Laurent Destailleur
c5fea74716 Fix bad default value set 2024-01-02 16:24:57 +01:00
Laurent Destailleur
acfbc74f06 Debug v19 2024-01-02 15:17:57 +01:00
Laurent Destailleur
5a169c5932 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-02 14:55:14 +01:00
Laurent Destailleur
7d6ef6b809 Fix warning 2024-01-02 13:59:05 +01:00
Laurent Destailleur
e2180cba42 Fix warning 2024-01-02 13:57:41 +01:00
Laurent Destailleur
47994f8cd9 Clean code 2024-01-02 13:45:08 +01:00
Laurent Destailleur
1eb5cd137c Clean code 2024-01-02 13:36:37 +01:00
Laurent Destailleur
af1f136ae6 Merge pull request #27252 from nicolas-eoxia/add_JS_element_target_contact_tpl
#27249 [TPL] add: JS element target for contact line in contact tpl
2024-01-02 13:32:08 +01:00
Laurent Destailleur
9357278bac Fix var not used 2024-01-02 13:17:38 +01:00
Laurent Destailleur
54d81a4e74 Fix value for date of survey was truncated 2024-01-02 13:16:41 +01:00
Laurent Destailleur
a3b176aa32 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-02 12:59:22 +01:00
Laurent Destailleur
5ae29f4052 Fix check php native imap only if php <= 8.3 2024-01-02 12:58:40 +01:00
Laurent Destailleur
f36d31f5f9 Merge pull request #27275 from frederic34/patch-3
undefined variable $user
2024-01-02 12:28:01 +01:00
Laurent Destailleur
696c901e62 Merge pull request #27253 from Hystepik/fix-phpstan-warnings
Fix html.form warnings
2024-01-02 12:27:40 +01:00
Laurent Destailleur
83addfcef0 Merge pull request #27258 from defrance/patch-313
FIX : php 8.1 depreciated strftime
2024-01-02 12:26:39 +01:00
Laurent Destailleur
71537a97e5 Merge pull request #27261 from John-H-Smith/api-404-fix
FIX: API response codes on 'no entity found' set to 200 with empty result
2024-01-02 12:25:21 +01:00
Frédéric FRANCE
041de86b68 undefined variable $user 2024-01-02 12:21:44 +01:00
Laurent Destailleur
bb44bb32f8 Fix message 2024-01-02 00:47:56 +01:00
Laurent Destailleur
6f4f38e168 Fix sql error 2024-01-01 20:53:08 +01:00
Laurent Destailleur
77306d7155 Fix sql 2024-01-01 20:14:11 +01:00
Laurent Destailleur
08ed421a03 css 2024-01-01 20:02:26 +01:00
Fabian Heinz
e1fccda141 Removed white spaces after lines 2023-12-31 15:25:18 +01:00
Fabian Heinz
b78632a20e api fixes
According to [RFC2616](https://www.rfc-editor.org/rfc/rfc2616#section-10.2), APIs should return 2xx status codes if the request was correct.
The response should be status 200 with an empty result array.
2023-12-31 14:11:05 +01:00
Fabian Heinz
aa43e18d56 API status code fix
apis currently returning 404 if no entry found fixed
2023-12-31 14:05:21 +01:00
Laurent Destailleur
8b51aa507b Debug v19 2023-12-30 19:50:41 +01:00
Laurent Destailleur
5d159e8231 Fix js error 2023-12-30 19:39:48 +01:00
Laurent Destailleur
482adfd7a0 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-30 13:11:15 +01:00
Charlène Benke
3d82583353 Update mod_recruitmentjobposition_standard.php 2023-12-30 08:27:32 +01:00
Charlène Benke
c2262f76f1 Update mod_recruitmentcandidature_standard.php 2023-12-30 08:27:15 +01:00
Charlène Benke
64cba23a37 Update mod_partnership_standard.php 2023-12-30 08:26:40 +01:00
Charlène Benke
d5c7d8dcdf Update mod_myobject_standard.php 2023-12-30 08:26:04 +01:00
Charlène Benke
0b841b9d11 Update mod_knowledgerecord_standard.php 2023-12-30 08:25:19 +01:00
Charlène Benke
3ac7c8646f Update mod_takepos_ref_simple.php 2023-12-30 08:24:52 +01:00
Charlène Benke
cd711535f4 Update mod_supplier_proposal_marbre.php 2023-12-30 08:24:22 +01:00
Charlène Benke
064aca2825 Update mod_supplier_payment_bronan.php 2023-12-30 08:23:59 +01:00
Charlène Benke
383b1ff3cb Update mod_commande_fournisseur_muguet.php 2023-12-30 08:23:32 +01:00
Charlène Benke
3bfc95bdb8 Update mod_facture_fournisseur_cactus.php 2023-12-30 08:22:42 +01:00
Charlène Benke
132df2c8ae Update mod_stocktransfer_standard.php 2023-12-30 08:22:08 +01:00
Charlène Benke
c74546295a Update mod_reception_beryl.php 2023-12-30 08:21:26 +01:00
Charlène Benke
1b41537087 Update mod_propale_marbre.php 2023-12-30 08:21:02 +01:00
Charlène Benke
58087b56fc Update mod_task_simple.php 2023-12-30 08:20:25 +01:00
Charlène Benke
f9b00c244e Update mod_payment_cicada.php 2023-12-30 08:19:22 +01:00
Charlène Benke
8e7ad7dce4 Update mod_evaluation_standard.php 2023-12-30 08:18:34 +01:00
Charlène Benke
9800ce0bca Update mod_holiday_madonna.php 2023-12-30 08:18:05 +01:00
Charlène Benke
66788f7f5b Update mod_pacific.php 2023-12-30 08:17:15 +01:00
Charlène Benke
09ec073782 Update mod_facture_mars.php 2023-12-30 08:16:49 +01:00
Charlène Benke
ed35c637c1 Update mod_expensereport_jade.php 2023-12-30 08:16:24 +01:00
Charlène Benke
c32b1c4ed0 Update mod_expedition_safor.php 2023-12-30 08:15:57 +01:00
Charlène Benke
00110f11c9 Update mod_delivery_jade.php 2023-12-30 08:15:32 +01:00
Charlène Benke
1a0e475705 Update mod_contract_serpis.php 2023-12-30 08:15:09 +01:00
Charlène Benke
259e61b34f Update mod_commande_marbre.php 2023-12-30 08:14:43 +01:00
Charlène Benke
64f0656051 Update mod_chequereceipt_mint.php 2023-12-30 08:14:22 +01:00
Charlène Benke
612062d7ab Update mod_bom_standard.php 2023-12-30 08:13:51 +01:00
Charlène Benke
de020ca4ab php 8.1 depreciated strftime 2023-12-30 08:13:16 +01:00
Laurent Destailleur
33f3e6bf6e Use stripe version 2022-11-15 by default. 2023-12-30 04:46:21 +01:00
Laurent Destailleur
ec63d2cf55 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-30 04:28:00 +01:00
Laurent Destailleur
6aad6e1e5d FIX public user photo not visible if $dolibarr_main_instance_unique_id
not defined into conf file.
2023-12-30 04:27:23 +01:00
Laurent Destailleur
a7c712b3a5 Merge pull request #27251 from defrance/patch-312
FIX : php 8.1 suppress strftime
2023-12-29 18:56:14 +01:00
Laurent Destailleur
cbe860f88f Update html.form.class.php 2023-12-29 18:55:07 +01:00
Laurent Destailleur
544f8413cd FIX #yogosha19721 2023-12-29 18:41:46 +01:00
Laurent Destailleur
ab3737e569 Fix libxml_disable_entity_loader(true) must be called only if LIBXML is
lower than 20900 (disabled by default for libxml 2.9.0)
2023-12-29 17:55:09 +01:00
Laurent Destailleur
ef312e960c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-29 16:53:09 +01:00
Laurent Destailleur
7b42e2d7c2 Enhance statistics tool 2023-12-29 16:35:27 +01:00
Hystepik
5eef510a8e Fix html.form warnings 2023-12-29 16:18:20 +01:00
Laurent Destailleur
1dfc95fd40 Enhace statistics tool 2023-12-29 16:08:22 +01:00
Nicolas Domenech
0c75288c65 #27249 [TPL] add: JS element target for contact line in contact tpl 2023-12-29 15:51:52 +01:00
Charlène Benke
0d7bbcb996 Update index.php 2023-12-29 11:50:51 +01:00
Charlène Benke
9ec7372418 Update index.php 2023-12-29 11:48:43 +01:00
Charlène Benke
f4329d2eb1 Update supplier_turnover.php 2023-12-29 11:24:03 +01:00
Charlène Benke
c4d1aaa09e Update index.php 2023-12-29 11:22:46 +01:00
Charlène Benke
e953da3711 Update index.php 2023-12-29 11:21:05 +01:00
Charlène Benke
6707f35556 Update sellsjournal.php 2023-12-29 11:18:27 +01:00
Charlène Benke
3a168767cd Update purchasesjournal.php 2023-12-29 11:17:34 +01:00
Charlène Benke
2dfb2cc7c4 Update graph.php 2023-12-29 11:16:19 +01:00
Charlène Benke
77be41720d Update graph.php 2023-12-29 11:13:26 +01:00
Charlène Benke
9c3a52d1ea FIX : php 8.1 suppress strftime 2023-12-29 11:12:13 +01:00
Laurent Destailleur
f0ebe74fba FIX Test if email is an answer by emailcollector 2023-12-29 04:01:55 +01:00
Laurent Destailleur
27ca9e6d98 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-12-29 03:09:00 +01:00
Laurent Destailleur
961deffd35 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-28 19:59:43 +01:00
Laurent Destailleur
4ea3dd9dc2 Debug v19 2023-12-28 19:55:35 +01:00
Laurent Destailleur
aa0057d8d7 Clean code 2023-12-28 19:39:27 +01:00
Laurent Destailleur
fb31a103ea Merge pull request #27107 from mdeweerd/php8.2/utf8_xxcode
Fix utf8_encoding/decoding (PHP8.2 deprecation)
2023-12-28 19:32:27 +01:00
Laurent Destailleur
70ce043b58 Merge pull request #27165 from defrance/patch-310
Php V8 warning
2023-12-28 19:28:43 +01:00
Laurent Destailleur
47a633cf2e Update card.php 2023-12-28 19:28:28 +01:00
Laurent Destailleur
6a9f6049d4 Add patch comment 2023-12-28 19:07:27 +01:00
Laurent Destailleur
3fea8ec20a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-28 19:04:57 +01:00
Laurent Destailleur
98fdb5dd6e Merge pull request #27244 from iznomip/patch-1
fix(tcpdf): implicit conversion from float
2023-12-28 19:04:37 +01:00
Laurent Destailleur
f6acd6dfe1 Update tcpdf.php 2023-12-28 19:04:23 +01:00
Laurent Destailleur
c5205d0297 Fix perm 2023-12-28 18:58:01 +01:00
Laurent Destailleur
5619d634d3 Merge pull request #27243 from vmaury/Fix_23248_product_price_not_updated_when_user_is_ext
Fix #23248 Prices not updated when external user (client) create a propal or command
2023-12-28 18:56:32 +01:00
iznomip
459f6eb529 fix(tcpdf): implicit conversion from float 2023-12-28 16:51:58 +01:00
vmaury
ec9b048e2e Fix #23248 Prices not updated when external user (client) create a propal or command 2023-12-28 16:34:47 +01:00
Laurent Destailleur
bdaff375a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-28 12:46:17 +01:00
Laurent Destailleur
fb6bd52c03 Merge pull request #27233 from idayat-noufou/fix_time_plus_duree
Fix: Unsupported operand types
2023-12-28 12:44:00 +01:00
Laurent Destailleur
b7f9374322 Merge branch 'develop' into fix_time_plus_duree 2023-12-28 12:42:45 +01:00
Laurent Destailleur
e5f5c499a4 Update date.lib.php 2023-12-28 12:42:15 +01:00
Laurent Destailleur
aff0d68035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-12-28 12:39:45 +01:00
Laurent Destailleur
163a09d6fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-12-28 12:37:34 +01:00
Laurent Destailleur
dc525dd78e Merge pull request #27235 from grandoc/new_branch_28_12_2023
fix : Warning: Undefined property: stdClass:: in /home/httpd/vhosts/a…
2023-12-28 12:34:43 +01:00
Laurent Destailleur
9484953b7a Update functions.lib.php 2023-12-28 12:34:09 +01:00
Laurent Destailleur
e1e528bd34 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-28 12:33:16 +01:00
Laurent Destailleur
96e46d1890 Clean code 2023-12-28 12:32:48 +01:00
Laurent Destailleur
1b301190eb Merge pull request #27230 from cfoellmann/patch-1
fix functions name
2023-12-28 12:32:35 +01:00
Philippe GRAND
7a6a916218 fix : Warning: Undefined property: stdClass:: in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/lib/functions.lib.php on line 138 and correct tabs 2023-12-28 11:54:48 +01:00
Philippe GRAND
f5f1543dac fix : Warning: Undefined property: stdClass:: in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/lib/functions.lib.php on line 138 2023-12-28 11:49:19 +01:00
Idayat NOUFOU
a2a9d8d9ad Fix: Unsupported operand types 2023-12-28 10:49:45 +01:00
Christian Foellmann
a2d584a4ad fix functions name 2023-12-28 09:40:35 +01:00
MDW
b5b8a2a874 Fix utf8_encoding/decoding (PHP8.2 deprecation)
Fix files that were missed in #27018
2023-12-27 19:45:37 +01:00
Laurent Destailleur
858825be6d Merge pull request #27228 from artis-auxilium/fix_forge_criteria
Fix: Add not in operator
2023-12-27 19:27:12 +01:00
Laurent Destailleur
3f0c177561 Fix test to cancel holiday 2023-12-27 16:42:50 +01:00
Laurent Destailleur
1be09f478a Debug v19 2023-12-27 16:39:17 +01:00
Laurent Destailleur
83a7756a2e Merge pull request #26528 from daraelmin/daraelmin-patch-4
FIX darkmode for public subscription page
2023-12-27 16:17:00 +01:00
Laurent Destailleur
ad727a7827 Merge branch 'develop' into daraelmin-patch-4 2023-12-27 16:16:38 +01:00
Laurent Destailleur
564436d9c0 Merge pull request #26586 from defrance/patch-280
FIX : Cleaning code
2023-12-27 16:13:44 +01:00
Laurent Destailleur
3ef872bb3d Merge pull request #27175 from cfoellmann/19/PR/hooks-contact
QUAL fix hooks on contact.php files - fixes contexts
2023-12-27 16:05:00 +01:00
Laurent Destailleur
322d74128f Merge pull request #27090 from defrance/patch-303
php V8 warning
2023-12-27 16:03:04 +01:00
Laurent Destailleur
365e1293ca Update clientfourn.php 2023-12-27 16:02:53 +01:00
Laurent Destailleur
aecb32ed97 Merge pull request #27089 from defrance/patch-302
php V8 warning
2023-12-27 16:02:24 +01:00
Dev2a
91f5cae071 Fix: Add not in operator 2023-12-27 15:53:55 +01:00
Laurent Destailleur
486c300ce7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-27 15:04:46 +01:00
Laurent Destailleur
32e709a0f4 Debug v19 2023-12-27 14:56:00 +01:00
Laurent Destailleur
eea5699371 Merge pull request #27197 from cfoellmann/19/PR/fix-warehouse-table
QUAL fix stock list table with proper header
2023-12-27 14:50:25 +01:00
Laurent Destailleur
1f4002d601 Merge pull request #27218 from pdermody/pdermody/fix-est-calendar
Fixed issue where last days in current and previous month produce incorrect results in timezones west of GMT
2023-12-27 14:30:19 +01:00
Laurent Destailleur
1da423c5f0 Merge branch 'develop' into pdermody/fix-est-calendar 2023-12-27 14:26:36 +01:00
Laurent Destailleur
784b8a44b7 Update index.php 2023-12-27 14:23:41 +01:00
Laurent Destailleur
5fb3b4615f Merge pull request #27212 from frederic34/patch-3
Update PclZipProxy.php
2023-12-27 14:19:33 +01:00
Laurent Destailleur
61c5c6f88d Fix regression 2023-12-27 13:09:25 +01:00
Laurent Destailleur
e2c0a76c11 Fix regex 2023-12-27 12:14:45 +01:00
Laurent Destailleur
b28ae5d8d3 Clean code 2023-12-27 12:12:20 +01:00
Laurent Destailleur
89686e74dc Clean code 2023-12-26 22:33:22 +01:00
Laurent Destailleur
0f9f31e651 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-26 22:28:26 +01:00
Laurent Destailleur
b75cbc54a8 Enhance rector cleaning code 2023-12-26 22:28:07 +01:00
Laurent Destailleur
04c9b41370 Enhance rector cleaning code 2023-12-26 21:59:08 +01:00
Laurent Destailleur
096a6251dd Fix warnings 2023-12-26 14:54:38 +01:00
Laurent Destailleur
29927b1660 Fix warning 2023-12-26 14:49:38 +01:00
Laurent Destailleur
b6ca71ce9a Debug v19 2023-12-26 14:31:31 +01:00
Laurent Destailleur
e97967e243 Fix warning 2023-12-26 12:39:28 +01:00
Laurent Destailleur
840e4558a7 Fix display for PWA 2023-12-26 12:31:46 +01:00
Paul Dermody
53cf64e1c9 Fixed issue where last days in current and previous month produce incorrect results in timezones west of GMT. This is due to the fact that the date() function uses the local time zone to do its work which will be the day before the intended date. Note: Does dol_mktime() have a similar problem? 2023-12-25 14:29:44 -06:00
Laurent Destailleur
1985d1fd4d Fix warnings 2023-12-23 20:00:57 +01:00
Laurent Destailleur
07f4c9b335 Fix warnings 2023-12-23 19:47:10 +01:00
Laurent Destailleur
7bb32a04b4 Fix warnings 2023-12-23 19:33:51 +01:00
Laurent Destailleur
8874ef8454 Debug v19 2023-12-23 18:47:38 +01:00
Laurent Destailleur
5870e62fce Debug v19 2023-12-23 12:33:19 +01:00
Laurent Destailleur
15242875f4 Debug v19 2023-12-23 11:01:49 +01:00
Laurent Destailleur
34f05d0ff9 Debug v19 - remove version check of ckeditor 2023-12-23 10:43:19 +01:00
Laurent Destailleur
54f3e10d49 Debug v19 2023-12-23 10:27:09 +01:00
Laurent Destailleur
00fd0bdf35 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-23 10:17:38 +01:00
Laurent Destailleur
484dd8e426 Debug v19 2023-12-23 10:17:28 +01:00
Laurent Destailleur
be75f48f9c Merge pull request #27213 from Hystepik/fix-phpstan-warnings
fix some warnings phpstan
2023-12-23 09:18:28 +01:00
Laurent Destailleur
94be5e32aa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-22 16:52:54 +01:00
Hystepik
0453b3efe2 fix some warnings phpstan 2023-12-22 16:10:14 +01:00
Frédéric FRANCE
00f5a7bc4c Update PclZipProxy.php 2023-12-22 15:22:40 +01:00
Laurent Destailleur
ec0cac88c3 comment 2023-12-22 12:07:40 +01:00
Laurent Destailleur
9746cc18e0 Merge pull request #27157 from mdeweerd/php8/fix-deprecation/upgrade-ps-ws-lib
Fix Update PSWebServiceLibrary to fix deprecated function call libxml…
2023-12-22 11:31:18 +01:00
Laurent Destailleur
c120d002ab Merge pull request #27178 from mc2rcanarslan/patch-5
FIX: removed duplicate code
2023-12-22 11:23:53 +01:00
Laurent Destailleur
c8508614b1 Merge pull request #27180 from laurantines/patch-4
[FIX] Update card.php
2023-12-22 11:23:16 +01:00
Laurent Destailleur
b3020923b7 Merge pull request #27186 from Hystepik/fix-php-warnings-code-smell
Fix some php code smell
2023-12-22 11:07:07 +01:00
Laurent Destailleur
1a7668389c Merge pull request #27189 from Hystepik/fix-php-stan-warnings
Fix some phpstan warnings
2023-12-22 11:05:25 +01:00
Laurent Destailleur
0d9f153786 Merge pull request #27193 from Hystepik/Fix-#27190-inventory-setting-label
Fix #27190 Set inventory to draft and label
2023-12-22 11:02:13 +01:00
Christian Foellmann
21ceec2a59 QUAL fix stock list table with proper header 2023-12-22 11:01:13 +01:00
Laurent Destailleur
8e65a00dfc Merge pull request #27195 from cfoellmann/19/PR/log-project-delete
NEW create action log entry for deleting project
2023-12-22 11:00:49 +01:00
Laurent Destailleur
12db55d4b6 Merge pull request #27199 from cfoellmann/19/PR/respect-disabledraft
QUAL respect DISABLEDRAFT on project edit
2023-12-22 10:56:39 +01:00
Laurent Destailleur
75be304b84 Merge pull request #27204 from vmaury/fix_27203_uglymessages
Fix #27203 avoid ugly messages
2023-12-22 10:55:24 +01:00
Lucas Marcouiller
d05de60ec7 Merge branch 'develop' into Fix-#27190-inventory-setting-label 2023-12-22 10:02:20 +01:00
Hystepik
46572116ab change question set to draft 2023-12-22 10:02:08 +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
Laurent Destailleur
c6040146b2 Add more function to disable. Add preg_quote to avoid false positive. 2023-12-21 19:39:02 +01:00
vmaury
dc74eaa3fc Fix #27203 avoid ugly messages 2023-12-21 19:26:30 +01:00
vmaury
b5d4b53597 Fix #27203 avoid ugly messages 2023-12-21 19:23:12 +01:00
vmaury
e7071dd8c4 Fix #27203 avoid ugly messages 2023-12-21 19:17:39 +01:00
Laurent Destailleur
5ce90555ee Removed useless file #yogosha19667 2023-12-21 18:29:55 +01:00
Christian Foellmann
c72644cd84 QUAL respect DISABLEDRAFT on project edit 2023-12-21 17:44:48 +01:00
Laurent Destailleur
6f721a4704 Fix css 2023-12-21 16:57:38 +01:00
Christian Foellmann
29da3406ff NEW create action log entry for deleting project 2023-12-21 16:03:00 +01:00
Laurent Destailleur
5c6c5853ab Clean code 2023-12-21 15:27:13 +01:00
Hystepik
c8031a6f4f Fix #27190 Set inventory to draft and label 2023-12-21 14:30:28 +01:00
Lucas Marcouiller
06e17be0c0 Merge branch 'develop' into fix-php-stan-warnings 2023-12-21 13:44:41 +01:00
Hystepik
d08f91e4cb Fix some phpstan warnings 2023-12-21 13:43:19 +01:00
Laurent Destailleur
b1fa6f596f Add experimental security option
MAIN_SECURITY_FORCE_ACCESS_CONTROL_ALLOW_ORIGIN
2023-12-21 13:01:09 +01:00
Laurent Destailleur
40d1029964 Fix debug v19 - "Show more" on ACE editor was broken 2023-12-21 12:09:54 +01:00
Laurent Destailleur
d21a5000a8 Fix #yogosha19665 2023-12-21 11:48:00 +01:00
Laurent Destailleur
fbf91cc211 Fix #yogosha19665 2023-12-21 11:43:30 +01:00
Laurent Destailleur
1838bc0031 Fix #yogosha19630 2023-12-21 10:46:05 +01:00
Laurent Destailleur
4c7c456e8a css 2023-12-21 10:40:22 +01:00
Laurent Destailleur
756180cfb5 Debug v19 2023-12-20 22:21:41 +01:00
Laurent Destailleur
a767028464 Clean code 2023-12-20 21:35:23 +01:00
Laurent Destailleur
0db281a919 FIX SEC we must not propagate SQL requests as parameters. 2023-12-20 21:35:04 +01:00
Laurent Destailleur
e119ad19c0 Clean code 2023-12-20 17:44:20 +01:00
Hystepik
5e4a4da130 Fix some php codce smell 2023-12-20 14:22:45 +01:00
LauraDiaz
8a556a8cb5 Update card.php 2023-12-20 09:30:08 +01:00
Laurent Destailleur
fe1b6c2723 FIX Menu Create of project no working on smartphone with no top menu. 2023-12-19 22:32:49 +01:00
Laurent Destailleur
1182a3a960 Try css 2023-12-19 22:12:29 +01:00
Laurent Destailleur
644fb7cc6a css 2023-12-19 21:48:22 +01:00
MDW
e998257235 libxml - reintroduce security measure not in the official PS WebServiceLib 2023-12-19 19:53:44 +01:00
MDW
77f6606b1b Fix Dolibar PHP-CS requirements 2023-12-19 19:43:53 +01:00
MDW
e9de2f6bbb Fix Update PSWebServiceLibrary to fix deprecated function call libxml_disable_entity_loader()
# Fix PSWebServiceLibrary.class.php: PhanDeprecatedFunctionInternal: Call to deprecated function \libxml_disable_entity_loader()

See https://github.com/Dolibarr/dolibarr/actions/runs/7242938198/job/19729044021#step:5:32
2023-12-19 19:43:53 +01:00
Laurent Destailleur
af610ea9f8 Fix warning 2023-12-19 18:47:42 +01:00
Laurent Destailleur
4f23141743 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-19 17:47:06 +01:00
Laurent Destailleur
1f738e5a7b Clean code 2023-12-19 17:46:39 +01:00
Can Arslan
3f9053170e FIX: removed duplicate code
removed duplicate code (with line 407)
2023-12-19 09:08:14 -07:00
Laurent Destailleur
fb5393149a Merge pull request #27096 from defrance/patch-308
php V8 warning
2023-12-19 16:27:30 +01:00
Laurent Destailleur
0832ed2443 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-19 16:24:51 +01:00
Laurent Destailleur
70c53b4568 Debug v19 2023-12-19 16:24:04 +01:00
Laurent Destailleur
27df30b773 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-12-19 16:22:02 +01:00
Laurent Destailleur
caaf0468cd Merge pull request #27091 from defrance/patch-304
php V8 warning
2023-12-19 16:16:08 +01:00
Laurent Destailleur
3e6dad286c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-19 16:14:58 +01:00
Laurent Destailleur
10ee30214f Merge pull request #27094 from defrance/patch-306
php V8 warning
2023-12-19 16:14:10 +01:00
Laurent Destailleur
653ca808db Merge pull request #27093 from defrance/patch-305
php V8 warning
2023-12-19 16:12:40 +01:00
Laurent Destailleur
8fc0d12ee1 Merge pull request #27095 from defrance/patch-307
php V8 warning
2023-12-19 16:12:14 +01:00
Laurent Destailleur
50e79b6510 Merge pull request #27097 from altairisfr/compohooks
add hooks to product composition card
2023-12-19 16:11:26 +01:00
Laurent Destailleur
d6e4b71958 Merge pull request #27104 from cfoellmann/19/PR/stings-supplier
make UI strings differenciate between orders torward customer or supplier
2023-12-19 16:08:48 +01:00
Laurent Destailleur
368c72b014 Merge pull request #27139 from frederic34/patch-19
parameter is mandatory and cant be string
2023-12-19 15:58:42 +01:00
Laurent Destailleur
a9d3925290 Clean code 2023-12-19 15:58:19 +01:00
Laurent Destailleur
13e4fe7010 Merge pull request #27118 from frederic34/patch-3
fix phpdoc
2023-12-19 15:56:10 +01:00
Laurent Destailleur
23615499d8 Merge pull request #27156 from mdeweerd/qual/fix/undeclared/showmenu
Fix $showmenu seen as undeclared by static checker.
2023-12-19 15:53:28 +01:00
Laurent Destailleur
1d2e58ce5a Merge pull request #27155 from mdeweerd/fix/commande/card/getDolGlobalInt
Fix dolGetGlobalInt -> getDolGlobalInt
2023-12-19 15:53:01 +01:00
Laurent Destailleur
d104f3c797 Merge pull request #27174 from Tetras-Libre/FIX-Blank-page-when-creating-event-with-a-missing-required-extra-field
Fix blank page when creating event with a missing required extra field
2023-12-19 15:42:35 +01:00
Laurent Destailleur
cd02d94ad8 Merge pull request #27160 from mdeweerd/qual/phpcs-config
Qual Ease the use of phpcs with configuration file at root
2023-12-19 15:40:43 +01:00
Laurent Destailleur
2668e49010 Merge pull request #27162 from frederic34/patch-4
FIX #27148
2023-12-19 15:39:53 +01:00
Laurent Destailleur
6386b02963 Fix phpunit for postgresql 2023-12-19 15:10:59 +01:00
Laurent Destailleur
97ae114265 FIX Universal search syntax accept string with ' in the IN 2023-12-19 15:01:21 +01:00
Christian Foellmann
045c623536 QUAL fix hooks on contact.php files - fixes contexts 2023-12-19 14:39:29 +01:00
Laurent Destailleur
d423665551 Fix regression 2023-12-19 14:12:13 +01:00
Laurent Destailleur
e7c405425c Debug v19 2023-12-19 14:03:17 +01:00
Laurent Destailleur
1044e5c7d4 Debug v19 2023-12-19 12:33:55 +01:00
Laurent Destailleur
7f5df80efd Debug v19 2023-12-19 11:51:48 +01:00
David Beniamine
55fb88472b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into FIX-Blank-page-when-creating-event-with-a-missing-required-extra-field 2023-12-19 11:45:18 +01:00
David Beniamine
8b33443006 FIX #27173 2023-12-19 11:45:02 +01:00
Laurent Destailleur
d27fd80472 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-19 10:38:33 +01:00
Laurent Destailleur
34ec6fa142 Doc 2023-12-19 09:58:04 +01:00
Frédéric FRANCE
b356adab3c Merge branch 'develop' into patch-4 2023-12-19 09:16:58 +01:00
Laurent Destailleur
a19ebd6b71 css 2023-12-19 01:34:16 +01:00
Laurent Destailleur
f78ae130ae Debug v19 2023-12-19 01:27:21 +01:00
Laurent Destailleur
37defc8e34 css 2023-12-19 01:07:50 +01:00
Laurent Destailleur
4611330143 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-19 00:51:27 +01:00
Laurent Destailleur
d20cfb42b8 Fix MO PDF template not correctly enabled 2023-12-19 00:50:51 +01:00
Laurent Destailleur
0b0f05523e FIX #yogosha19628 2023-12-18 19:47:49 +01:00
Laurent Destailleur
932f9f28e6 css 2023-12-18 19:19:58 +01:00
Laurent Destailleur
67dbe4d4ef Duplicate protection agains external entity 2023-12-18 19:16:35 +01:00
Charlène Benke
b881dca994 php V8 warning 2023-12-18 16:53:12 +01:00
Laurent Destailleur
7193fae3dd Fix security on doc signature. Fix bad position of signature file. 2023-12-18 16:41:40 +01:00
Laurent Destailleur
327cbfca3f css 2023-12-18 15:22:40 +01:00
Frédéric FRANCE
735cfee1d7 FIX 2023-12-18 15:14:07 +01:00
Laurent Destailleur
a7fa5accf9 Debug v19 2023-12-18 15:06:25 +01:00
Laurent Destailleur
0bcf61d220 Debug v19 2023-12-18 14:36:24 +01:00
Laurent Destailleur
f6fc9a41a6 Debug v19 2023-12-18 14:13:00 +01:00
Laurent Destailleur
b49aff4d02 Debug v19 2023-12-18 13:51:25 +01:00
MDW
c0145d7958 Qual Ease the use of phpcs with configuration file at root
# Qual Add .phpcs.xml.dist

This configuration file at the root still references the configuration
file used in the CI flows, but it allows running 'phpcs' from the root
without having to specify anything else than the files you want to check.
2023-12-18 13:17:16 +01:00
Frédéric FRANCE
7da8bc5892 Merge branch 'develop' into patch-19 2023-12-18 11:02:06 +01:00
Frédéric FRANCE
65e528f619 Merge branch 'develop' into patch-3 2023-12-18 09:22:56 +01:00
MDW
0391e02b28 Fix seen as undeclared by static checker.
# Fix  seen as undeclared by static checker.
https://github.com/Dolibarr/dolibarr/pull/26480/checks#step:5:79
https://github.com/Dolibarr/dolibarr/pull/26480/checks#step:5:80
2023-12-18 05:00:39 +01:00
MDW
e49f32ab2d dolGetGlobalInt -> getDolGlobalInt
Detected with phan -> https://github.com/Dolibarr/dolibarr/actions/runs/7242660297/job/19728384233?pr=26480#step:5:39
2023-12-18 03:13:37 +01:00
Laurent Destailleur
770bc15ca3 Debug v19 2023-12-18 00:02:21 +01:00
Laurent Destailleur
5e28ab0ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-17 23:54:37 +01:00
Laurent Destailleur
4dc5483b12 Fix warning 2023-12-17 23:54:08 +01:00
Laurent Destailleur
45bfea94a6 Removed not used code 2023-12-17 23:36:18 +01:00
Laurent Destailleur
689ba89b21 Merge pull request #27108 from altairisfr/ORDER_REOPEN_TO_DRAFT_2023
add constant ORDER_REOPEN_TO_DRAFT
2023-12-17 23:27:56 +01:00
Laurent Destailleur
c6e33a89a4 Doc 2023-12-17 23:21:59 +01:00
Laurent Destailleur
b5cce1c718 Merge pull request #27110 from defrance/patch-309
php V8 warning
2023-12-17 23:20:19 +01:00
Laurent Destailleur
abdfd74d25 Merge pull request #27114 from mc2rcanarslan/patch-4
FIX: wrong object field assignment
2023-12-17 23:15:09 +01:00
Laurent Destailleur
3c926883b4 Merge pull request #27115 from JonBendtsen/patch-1
Thirdparty email missing in send message form for ticket #27034
2023-12-17 23:14:51 +01:00
Laurent Destailleur
084d2ee34e Merge pull request #27119 from frederic34/patch-4
fix phpdoc
2023-12-17 23:11:20 +01:00
Laurent Destailleur
e1b94535f7 Merge pull request #27120 from frederic34/patch-9
clean code
2023-12-17 23:10:31 +01:00
Laurent Destailleur
01a30c55eb Merge pull request #27122 from frederic34/patch-7
fix warning
2023-12-17 23:09:25 +01:00
Laurent Destailleur
a50bb45d24 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-17 23:02:03 +01:00
Laurent Destailleur
6c873e66da Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-17 22:53:22 +01:00
Laurent Destailleur
98009ea6be Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/langs/en_US/recruitment.lang
	htdocs/master.inc.php
	htdocs/projet/contact.php
2023-12-17 22:17:14 +01:00
Laurent Destailleur
a342ef5ecf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-17 21:37:44 +01:00
Laurent Destailleur
2b6ec12218 Merge pull request #27127 from Hystepik/fix-funnel-graph
Fix funnel of prospection display
2023-12-17 21:33:17 +01:00
Laurent Destailleur
0b3f93930d Merge pull request #27129 from jyhere/patch-7
FIX: product association clone
2023-12-17 21:29:01 +01:00
Laurent Destailleur
6802c0f364 Merge pull request #27131 from frederic34/patch-8
fix phpdoc
2023-12-17 21:28:14 +01:00
Laurent Destailleur
de69e82c0a Merge pull request #27133 from frederic34/patch-13
fix initAsSpecimen values
2023-12-17 21:27:57 +01:00
Laurent Destailleur
c128bd02aa Merge pull request #27134 from frederic34/patch-14
fix return value
2023-12-17 21:27:35 +01:00
Laurent Destailleur
ca16b212dc Merge pull request #27135 from frederic34/patch-15
fix set values
2023-12-17 21:25:24 +01:00
Laurent Destailleur
fd1e723b6e Merge pull request #27136 from frederic34/patch-16
add phpdoc in subclass
2023-12-17 21:24:55 +01:00
Laurent Destailleur
8157b7a334 Merge pull request #27137 from frederic34/patch-17
fix phpdoc
2023-12-17 21:23:40 +01:00
Laurent Destailleur
a00099ed16 Fix sql standard 2023-12-17 21:20:11 +01:00
Laurent Destailleur
9f621d0ff5 Merge pull request #27138 from frederic34/patch-18
fix phpdoc
2023-12-17 20:58:05 +01:00
Laurent Destailleur
afdb24324a Merge pull request #27140 from frederic34/patch-20
fix defaults values
2023-12-17 20:57:34 +01:00
Laurent Destailleur
44b2f9067d Merge pull request #27142 from frederic34/patch-22
fix default value
2023-12-17 20:56:28 +01:00
Laurent Destailleur
f38fad5023 Merge pull request #27143 from frederic34/patch-23
fix default value
2023-12-17 20:55:44 +01:00
Laurent Destailleur
625aa2fa6b Merge pull request #27146 from atm-john/issue_265856_part_002
NEW : llxHeader body css for modulebuilder see #26856
2023-12-17 20:55:20 +01:00
Laurent Destailleur
b3762798a7 Merge pull request #27149 from alexandre-janniaux/commande-test-create-soc/1
FIX: CommandeTest: fix create when no company exists
2023-12-17 20:54:23 +01:00
Laurent Destailleur
a9bdab922b Merge pull request #27150 from alexandre-janniaux/companybankaccounttest-societe/1
FIX: CompanyBankAccountTest: fix create when no societe exists
2023-12-17 20:54:07 +01:00
Laurent Destailleur
f6d1d61d69 Merge pull request #27151 from alexandre-janniaux/contrattest-create-societe/1
FIX: ContratTest: fix create when no societe exists
2023-12-17 20:53:50 +01:00
Alexandre Janniaux
f728bda625 ContratTest: add more error context 2023-12-17 16:06:06 +01:00
Alexandre Janniaux
c2c99ab2b8 FIX: ContratTest: fix create when no societe exists
The testContratCreate() is using the default value for Contrat::socid,
which is defined by Contrat::initAsSpecimen to `0`. But if no companies
have been created, the test will fail with the following error:

    Failed asserting that 0 is less than -1.

Or with the additional logging:

    UnknownError: ERROR:  23503: insert or update on table "llx_contrat" violates foreign key constraint "fk_contrat_fk_soc"
    DETAIL:  Key (fk_soc)=(1) is not present in table "llx_societe".                                                        
    SCHEMA NAME:  public                                                                                                    
    TABLE NAME:  llx_contrat                                                                                                
    CONSTRAINT NAME:  fk_contrat_fk_soc                                                                                     
    LOCATION:  ri_ReportViolation, ri_triggers.c:2596 -,                                                                    
    Failed asserting that 0 is less than -1.

The test doesn't really depends on specific test data so we can create
the company directly instead.
2023-12-17 16:06:05 +01:00
Alexandre Janniaux
da3b4d10df FIX: CompanyBankAccountTest: fix create when no societe exists
The testCompanyBankAccountCreate() is using the default value for
CompanyBankAccount::socid, which is defined by
CompanyBankAccount::initAsSpecimen to `0`. But if no companies have been
created, the test will fail with the following error:

    Failed asserting that 0 is less than -1.

Or with the additional logging:

    ERROR:  23503: insert or update on table "llx_societe_rib" violates foreign key constraint "llx_societe_rib_fk_societe"                                                   
    DETAIL:  Key (fk_soc)=(1) is not present in table "llx_societe".                                                                                                          
    SCHEMA NAME:  public                                                                                                                                                      
    TABLE NAME:  llx_societe_rib                                                                                                                                              
    CONSTRAINT NAME:  llx_societe_rib_fk_societe                                                                                                                              
    LOCATION:  ri_ReportViolation, ri_triggers.c:2596, ERROR:  23503: insert or update on table "llx_societe_rib" violates foreign key constraint "llx_societe_rib_fk_societe"
    DETAIL:  Key (fk_soc)=(1) is not present in table "llx_societe".                                                                                                          
    SCHEMA NAME:  public                                                                                                                                                      
    TABLE NAME:  llx_societe_rib                                                                                                                                              
    CONSTRAINT NAME:  llx_societe_rib_fk_societe                                                                                                                              
    LOCATION:  ri_ReportViolation, ri_triggers.c:2596                                                                                                                         
    Failed asserting that 0 is less than -1.

The test doesn't really depends on specific test data so we can create
the company directly instead.
2023-12-17 15:55:26 +01:00
Alexandre Janniaux
0cc1cfc1ee FIX: CommandeTest: fix create when no company exists
The testCommandeCreate() is using the default value for Commande::socid,
which is defined by Command::initAsSpecimen to `0`. But if no companies
have been created, the test will fail with the following error:

    Failed asserting that 0 is less than -1.

Or with the additional logging:

    ERROR:  23503: insert or update on table "llx_commande" violates foreign key constraint "fk_commande_fk_soc"
    DETAIL:  Key (fk_soc)=(1) is not present in table "llx_societe".                                            
    SCHEMA NAME:  public                                                                                        
    TABLE NAME:  llx_commande                                                                                   
    CONSTRAINT NAME:  fk_commande_fk_soc                                                                        
    LOCATION:  ri_ReportViolation, ri_triggers.c:2596,                                                          
    Failed asserting that 0 is less than -1.

The test doesn't really depends on specific test data so we can create
the company directly instead.
2023-12-17 15:45:25 +01:00
Laurent Destailleur
d4f61dcf59 Fix nusoap bug 2023-12-17 13:23:06 +01:00
Laurent Destailleur
55f5c6663d Fix regression on css lost on flags 2023-12-17 13:11:58 +01:00
Laurent Destailleur
b99fcbb5ad Remove deprecated files in migration 2023-12-16 20:14:47 +01:00
Laurent Destailleur
78d5e71a8f FIX #yogosha19506 2023-12-16 19:24:41 +01:00
Frédéric FRANCE
35c58da5c4 Merge branch 'develop' into patch-17 2023-12-16 17:50:21 +01:00
Laurent Destailleur
91e53f9434 FIX #yogosha19474 2023-12-16 17:05:32 +01:00
Laurent Destailleur
b7a48691df Fix #yogosha19473 2023-12-16 16:50:53 +01:00
Laurent Destailleur
9765a18265 Debug v19 2023-12-16 16:26:38 +01:00
Laurent Destailleur
eda3ec4d04 Fix menu. Debug v19. 2023-12-16 14:50:54 +01:00
ATM john
00cba14e99 Add llxHeader body css for modulebuilder 2023-12-16 14:38:13 +01:00
Frédéric FRANCE
93de531f37 fix default value 2023-12-16 11:09:26 +01:00
Frédéric FRANCE
8d39f4c149 fix default value 2023-12-16 11:07:09 +01:00
Frédéric FRANCE
2e543ddf82 fix defaults values 2023-12-16 10:12:35 +01:00
Frédéric FRANCE
8642916d74 parameter is mandatory and cant be string 2023-12-16 10:07:33 +01:00
Frédéric FRANCE
5dc443b202 fix phpdoc 2023-12-16 10:00:21 +01:00
Frédéric FRANCE
188bf6f959 fix when actioncode is array 2023-12-16 00:13:56 +01:00
Frédéric FRANCE
64b7f55825 fix phpdoc 2023-12-15 23:59:39 +01:00
Frédéric FRANCE
86a4ae9236 add phpdoc in subclass 2023-12-15 22:54:40 +01:00
Frédéric FRANCE
f11dc69bea fix set values 2023-12-15 22:50:02 +01:00
Frédéric FRANCE
7099cf530f fix return value 2023-12-15 22:47:00 +01:00
Frédéric FRANCE
565a9eb191 fix initAsSpecimen values 2023-12-15 22:31:32 +01:00
Frédéric FRANCE
e9aa68e3fa fix phpdoc 2023-12-15 20:36:10 +01:00
Laurent Destailleur
2cb4dd29f8 Fix td balance 2023-12-15 19:06:21 +01:00
Laurent Destailleur
540c69e303 Debug v19 2023-12-15 19:02:53 +01:00
Laurent Destailleur
f9a9b3610e Fix missing total 2023-12-15 18:53:55 +01:00
jyhere
286631629e FIX: product association clone 2023-12-15 18:27:37 +01:00
Laurent Destailleur
2a5fbe3537 Fix language 2023-12-15 17:31:58 +01:00
Hystepik
bac413ff27 Fix funnel of prospection display 2023-12-15 16:19:05 +01:00
Laurent Destailleur
3c7745cc71 Fix analyses of file code 2023-12-15 14:44:50 +01:00
Laurent Destailleur
d560dfc2c6 Fix analyses of file code 2023-12-15 14:41:03 +01:00
Laurent Destailleur
37dcaf4dee css 2023-12-15 14:21:51 +01:00
Laurent Destailleur
f5a58e7693 Fix warnings 2023-12-15 14:20:54 +01:00
Laurent Destailleur
ec9c0a0a88 Fix regression 2023-12-15 14:18:30 +01:00
Laurent Destailleur
88efa1cd61 Tipo 2023-12-15 14:17:20 +01:00
Laurent Destailleur
5720f295be Fix warning 2023-12-15 13:58:48 +01:00
Laurent Destailleur
a515ceedda Fix warnings 2023-12-15 13:54:56 +01:00
Laurent Destailleur
44f24746ed Fix warnings 2023-12-15 13:49:09 +01:00
Frédéric FRANCE
0031da2a79 fix warning 2023-12-15 13:36:32 +01:00
Laurent Destailleur
05db4b9f8e Sync transifex 2023-12-15 13:34:39 +01:00
Frédéric FRANCE
42190957fe clean code 2023-12-15 13:04:30 +01:00
Frédéric FRANCE
23e1915b3b fix phpdoc 2023-12-15 12:51:23 +01:00
Frédéric FRANCE
568125f1d8 Update inventory.class.php 2023-12-15 12:43:24 +01:00
Frédéric FRANCE
f144fccc3d fix phpdoc 2023-12-15 12:41:08 +01:00
Laurent Destailleur
71f721fbd9 Fix warning 2023-12-15 12:31:07 +01:00
Laurent Destailleur
d92c65ad91 FIX infinite loop in API call/trigger by adding a caller 2023-12-15 12:15:33 +01:00
Frédéric FRANCE
ee7584425c fix phpdoc 2023-12-15 12:02:32 +01:00
Laurent Destailleur
957c483890 Swith phpstan level to 2 2023-12-15 11:18:04 +01:00
Laurent Destailleur
dae7bb5e80 Fix phpstan 2023-12-15 11:02:50 +01:00
Laurent Destailleur
dc134cddba FIX Remove useless code line that make phpstan hang with not enough
memory
2023-12-15 10:46:49 +01:00
Laurent Destailleur
3487b76052 Fix phpcs 2023-12-15 10:28:16 +01:00
Jon Bendtsen
0c24c8e679 Thirdparty email missing in send message form for ticket #27034
all credit to TedinfoRegis who suggested this change in "Thirdparty email missing in send message form for ticket #27034 "
2023-12-14 21:59:50 +01:00
Can Arslan
2ab12ba6ad FIX: wrong object assignment 2023-12-14 13:58:20 -07:00
Laurent Destailleur
03c05b4fd8 Debug v19 2023-12-14 18:05:46 +01:00
Charlène Benke
d01150d613 php V8 warning 2023-12-14 17:29:58 +01:00
Laurent Destailleur
80576444f7 Debug v19 2023-12-14 16:00:05 +01:00
Christophe Battarel
30d181c933 aadd constant ORDER_REOPEN_TO_DRAFT 2023-12-14 15:35:37 +01:00
Laurent Destailleur
20a934d724 Fix sql error 2023-12-14 15:32:23 +01:00
Laurent Destailleur
68d89d4421 Fix pgsql install 2023-12-14 15:29:20 +01:00
Laurent Destailleur
6ca736e8a5 Debug v19 2023-12-14 15:16:11 +01:00
Laurent Destailleur
2aced0faaa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-12-14 14:52:34 +01:00
Laurent Destailleur
14ba1138c4 Fix payment SEPA for salary 2023-12-14 14:51:30 +01:00
Laurent Destailleur
33dd878f9e Fix payment SEPA for salary 2023-12-14 14:48:22 +01:00
Laurent Destailleur
1a7f674bd5 Fix add tms field to help debug v19 and sepa payment pbs 2023-12-14 14:01:28 +01:00
Laurent Destailleur
d5722ee4b2 Fix payment SEPA for salary 2023-12-14 13:50:29 +01:00
Christian Foellmann
88c0700ee5 QUAL make UI strings differenciate between orders torward customer or supplier 2023-12-14 13:42:15 +01:00
Christian Foellmann
b87d96203d NEW add data type 'project' to blockedlog 2023-12-14 12:39:08 +01:00
Christophe Battarel
2330184232 add hooks to product composition card 2023-12-14 11:00:02 +01:00
Charlène Benke
d83cdf9452 we erase only subtotal filed value 2023-12-14 10:57:41 +01:00
Charlène Benke
bcf015533e Update list_det.php 2023-12-14 10:56:11 +01:00
Charlène Benke
c385a3ca3b Update bankentries_list.php 2023-12-14 10:32:37 +01:00
Charlène Benke
2165e5d84b php V8 warning 2023-12-14 10:31:22 +01:00
Charlène Benke
bc7f6f5081 php V8 warning 2023-12-14 10:29:07 +01:00
Laurent Destailleur
63328fc246 Merge pull request #27062 from altairisfr/fixamountht
fix missing declaration
2023-12-14 10:27:36 +01:00
Charlène Benke
36e2a345fc php V8 warning 2023-12-14 10:25:36 +01:00
Charlène Benke
4877680958 php V8 warning 2023-12-14 10:19:33 +01:00
Charlène Benke
6ee5917d30 php V8 warning 2023-12-14 10:15:24 +01:00
Charlène Benke
0a3aa3ae48 php V8 warning 2023-12-14 10:00:15 +01:00
Christophe Battarel
2a48d3497d better fix 2023-12-14 09:36:08 +01:00
Laurent Destailleur
880fc534b8 Merge pull request #27040 from fappels/19_fix-warehouse_list
Fix warehouse list
2023-12-14 02:43:41 +01:00
Laurent Destailleur
2c4a6b645a Merge pull request #27061 from cfoellmann/19/PR/string
improve translation string for action generation on email sent
2023-12-14 02:37:51 +01:00
Laurent Destailleur
e145a087fb Merge pull request #27084 from altairisfr/MAIN_IGNORE_CONTACTS_ON_CLONING
add constant MAIN_IGNORE_CONTACTS_ON_CLONING
2023-12-14 01:49:43 +01:00
Laurent Destailleur
df47acdbd7 Merge pull request #27086 from altairisfr/PROPAL_DISABLE_AUTOUPDATE_ON_CLOSE
add constant PROPAL_DISABLE_AUTOUPDATE_ON_CLOSE
2023-12-14 01:47:44 +01:00
Laurent Destailleur
0fc4be5d2b Merge pull request #27067 from alexandre-janniaux/commande-error-forward/1
Qual: command: forward database error on failure
2023-12-14 01:39:59 +01:00
Laurent Destailleur
bd8333d712 Merge pull request #27069 from msoula/develop
FIX SQL query construction using category as filter.
2023-12-14 01:39:21 +01:00
Laurent Destailleur
72d6e0063c Merge pull request #27074 from ATM-NicolasV/missing_dol_hash
FIX : missing require_once .'/core/lib/security.lib.php' for dol_hash()
2023-12-14 01:35:33 +01:00
Laurent Destailleur
c58cc0bbc4 Debug look and feel 2023-12-14 00:35:14 +01:00
Laurent Destailleur
b266c26781 Debug css v19 2023-12-14 00:29:57 +01:00
Laurent Destailleur
a976620d62 Fix load language 2023-12-14 00:25:46 +01:00
Laurent Destailleur
3a7379531f Fix trans 2023-12-14 00:23:25 +01:00
Laurent Destailleur
1fb9c7bec8 Log 2023-12-13 22:09:39 +01:00
Laurent Destailleur
ac32537234 Fix filter lost on page to transfer in accountancy 2023-12-13 22:04:39 +01:00
Laurent Destailleur
1b7edbb44f Fix warnings 2023-12-13 21:57:56 +01:00
Laurent Destailleur
0a2e28435e Debug v19 2023-12-13 20:33:36 +01:00
Laurent Destailleur
fe99114fc1 Debug v19 2023-12-13 19:42:23 +01:00
Laurent Destailleur
23b62d928c Debug v19 2023-12-13 18:45:00 +01:00
Laurent Destailleur
003c758f70 FIX Bad format of date when updating an extrafield field date 2023-12-13 18:16:33 +01:00
Christophe Battarel
a65631c355 add constant PROPAL_DISABLE_AUTOUPDATE_ON_CLOSE 2023-12-13 16:49:55 +01:00
Christophe Battarel
a0f097c0a8 add constant MAIN_IGNORE_CONTACTS_ON_CLONING 2023-12-13 16:44:12 +01:00
Laurent Destailleur
2840487031 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-13 16:35:56 +01:00
Laurent Destailleur
d3b0032fb7 Fix date 2023-12-13 16:35:47 +01:00
Laurent Destailleur
fb083a6cfc Fix warning with rector 2023-12-13 16:33:17 +01:00
Laurent Destailleur
5b9b916ad8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-12-13 15:20:53 +01:00
Laurent Destailleur
8f7d258a83 Work on rector to fix warnings 2023-12-13 15:19:25 +01:00
Laurent Destailleur
fc1411f9a4 Work on rector to fix warnings 2023-12-13 14:59:22 +01:00
Laurent Destailleur
72006c6b76 Work on rector to fix warnings 2023-12-13 14:23:18 +01:00
Laurent Destailleur
7d109e9419 Fix phpcs 2023-12-13 12:46:23 +01:00
Laurent Destailleur
e040219fdc Fix phpcs 2023-12-13 12:45:07 +01:00
Laurent Destailleur
4cf9c9f5bc Doc 2023-12-13 11:32:18 +01:00
Christian Foellmann
01a32bd7ba improve translation string for action generation on email sent to work better in different languages 2023-12-13 11:24:16 +01:00
ATM-NicolasV
f4099bdf28 missing require_once .'/core/lib/security.lib.php' for dol_hash() 2023-12-13 09:41:20 +01:00
Mathieu "rid" Soula
687f3a7426 FIX SQL query construction using category as filter.
Correct the table to use for filtering warehouses by category (category_societe --> category_warehouse)
2023-12-12 23:47:05 +01:00
Alexandre Janniaux
d9e81cbabe command: forward database error on failure
If the database triggered a failure, it wasn't reported in the tests
because $this->error was not set. Conversely, the error was always
printed through dol_print_error() whose documentation explicitely states
that it should not be used for class and $this->error should be used
instead.
2023-12-12 19:18:16 +01:00
Laurent Destailleur
c512effb03 Fix phpcs 2023-12-12 11:58:28 +01:00
Christophe Battarel
11e3101a7e fix missing declaration 2023-12-12 11:27:08 +01:00
Laurent Destailleur
435c8f0366 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-12 03:30:07 +01:00
Laurent Destailleur
45abbf8a3d Enhance rector rules 2023-12-12 03:29:51 +01:00
Laurent Destailleur
4c7dfea535 Clean code 2023-12-12 01:40:26 +01:00
Laurent Destailleur
4dedd85b70 Merge pull request #27060 from mc2rcanarslan/patch-3
FIX: PHPDoc return type
2023-12-12 00:58:36 +01:00
Laurent Destailleur
0f0bd8adea Doc 2023-12-12 00:55:01 +01:00
Laurent Destailleur
49b9a89f2d FIX #26743 FIX #26733 2023-12-12 00:51:54 +01:00
Laurent Destailleur
db79a874a3 Debug v19 2023-12-12 00:13:36 +01:00
Can Arslan
9a5a24a634 FIX: PHPDoc return type 2023-12-11 16:03:20 -07:00
Laurent Destailleur
df7fc7cd4e Debug v19 2023-12-11 23:58:47 +01:00
Laurent Destailleur
f9b045bf59 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-11 23:34:48 +01:00
Laurent Destailleur
c13cecbf87 Debug v19 2023-12-11 23:33:53 +01:00
Laurent Destailleur
854c46fe2c Merge pull request #27054 from defrance/patch-301
php V8 warning
2023-12-11 23:08:04 +01:00
Laurent Destailleur
255bb9c8ca Merge pull request #27053 from atm-saamiperdrix/FIX_WarningsOnEmailConfig
GetDolGlobalString oublié sur config mails
2023-12-11 23:06:58 +01:00
Laurent Destailleur
5a1b74050c Merge pull request #27055 from atm-saamiperdrix/FIX_backportcc85a1a
backport de #cc85a1a
2023-12-11 23:06:30 +01:00
Laurent Destailleur
2c599b7099 CSS 2023-12-11 21:23:59 +01:00
Laurent Destailleur
c4dc94fd35 Fix warning 2023-12-11 18:22:35 +01:00
Laurent Destailleur
c7bce53c7f Fix warning 2023-12-11 18:16:32 +01:00
Laurent Destailleur
e48f8c815c Fix warning 2023-12-11 18:14:35 +01:00
Laurent Destailleur
0ec3de4230 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-11 18:04:55 +01:00
Laurent Destailleur
b20e130dba Debug v19 2023-12-11 18:04:39 +01:00
Laurent Destailleur
8df6fc6688 Fix warning 2023-12-11 17:48:40 +01:00
Saami PERDRIX - ATM Consulting
3a2b48f16c backport de #cc85a1a 2023-12-11 16:58:22 +01:00
Charlène Benke
b2dd3bec9e php V8 warning
append when you add a file on folder and select the tabs for the first time,
2023-12-11 16:53:21 +01:00
Saami PERDRIX - ATM Consulting
837fcd0d14 clean 2023-12-11 16:34:57 +01:00
Saami PERDRIX - ATM Consulting
ab741aab11 clean 2023-12-11 16:34:20 +01:00
Saami PERDRIX - ATM Consulting
c501e7f0cc clean 2023-12-11 16:33:24 +01:00
Saami PERDRIX - ATM Consulting
14f67c09e4 clean 2023-12-11 16:32:22 +01:00
Saami PERDRIX - ATM Consulting
e98780232f clean 2023-12-11 16:31:07 +01:00
Laurent Destailleur
58eca0ac04 Merge pull request #27006 from mdeweerd/qual/php-cs-fixer-no-public-const
QUAL Fix php-cs-fixer config to avoid 'public const' not ok for PHP7.0
2023-12-11 15:51:59 +01:00
Laurent Destailleur
8a9eaaf0f6 Merge pull request #27027 from frederic34/patch-8
fix phpdoc
2023-12-11 15:49:05 +01:00
Laurent Destailleur
b4adaacddf Merge pull request #27031 from Hystepik/fix-comm-index-contrat
Fix comm index page on contract
2023-12-11 15:48:43 +01:00
Laurent Destailleur
8b80d2d570 Merge branch 'FIX_BackToPageCommCreate' of https://github.com/ATM-Consulting/dolibarr into develop 2023-12-11 15:44:18 +01:00
Laurent Destailleur
73ac9b3f5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-11 15:38:25 +01:00
Laurent Destailleur
ae1c3bc3c1 Trans 2023-12-11 15:38:04 +01:00
Laurent Destailleur
b697375edc Removed not used var 2023-12-11 15:31:33 +01:00
Laurent Destailleur
d1b819c56a Merge pull request #27032 from Hystepik/fix-some-php-stan-errors
Fix some php code smell
2023-12-11 15:22:03 +01:00
Laurent Destailleur
a3e0c95687 Update fournisseur.facture.class.php 2023-12-11 15:20:52 +01:00
Laurent Destailleur
c5e507b61d Merge pull request #27035 from defrance/patch-296
if $totalarray['type'] not present we consider it as number
2023-12-11 15:04:39 +01:00
Laurent Destailleur
c54fd9a9dd Update list_print_total.tpl.php 2023-12-11 15:02:59 +01:00
Laurent Destailleur
c3d569968f Doc 2023-12-11 14:59:09 +01:00
Laurent Destailleur
48e49a1849 Merge pull request #27036 from defrance/patch-297
php V8 warning on masscommandorder
2023-12-11 14:48:22 +01:00
Laurent Destailleur
6b0b7deda6 Merge pull request #27038 from JonBendtsen/develop
QUAL continuation of request made by eldy in #25946
2023-12-11 14:47:02 +01:00
Laurent Destailleur
8022ebcdd7 Merge pull request #27046 from defrance/patch-300
php V8 Warning
2023-12-11 14:26:20 +01:00
Laurent Destailleur
6201c15d91 Update odf.php 2023-12-11 14:25:20 +01:00
Charlène Benke
486bb3bc65 php V8 Warning 2023-12-11 12:36:54 +01:00
Laurent Destailleur
cdecce8485 Fix trans 2023-12-11 10:47:07 +01:00
Laurent Destailleur
44bfd28332 Debug v19 2023-12-11 10:09:43 +01:00
Laurent Destailleur
9608f59485 Debug v19 2023-12-11 10:00:24 +01:00
Laurent Destailleur
ee2543b516 Clean code 2023-12-11 09:13:51 +01:00
Laurent Destailleur
2e445b2a6d Debug v19 2023-12-11 09:13:10 +01:00
Laurent Destailleur
6c8116fa7e Show limit in nb of lines to explain error 500 in export of excel 2023-12-11 01:37:45 +01:00
Francis Appels
22f6e43155 Fix warehouse list 2023-12-10 19:22:28 +01:00
Laurent Destailleur
29dc12dd58 Option MAIN_DISALLOW_URL_INTO_DESCRIPTIONS accept 1 or 2 value.
Value 1 should be ready to be on by default in a next version.
Fix #yogosha18900
2023-12-10 16:19:05 +01:00
Laurent Destailleur
2e3c9dc87e Update doc 2023-12-10 14:34:43 +01:00
Laurent Destailleur
8bd8f48425 Doc 2023-12-10 14:29:30 +01:00
Laurent Destailleur
1add19cecc Debug v19 2023-12-10 13:51:14 +01:00
Jon Bendtsen
f125899db2 continuation of request made by eldy in https://github.com/Dolibarr/dolibarr/pull/25946 2023-12-10 00:10:18 +01:00
Laurent Destailleur
1c56957866 Fix error on first launch of a cron job 2023-12-09 21:15:32 +01:00
Laurent Destailleur
8227c155a0 Fix MAIN_SHOW_TECHNICAL_ID 2023-12-09 21:03:00 +01:00
Laurent Destailleur
d63aeeed9f Debug v19 2023-12-09 20:41:56 +01:00
Laurent Destailleur
100a657633 Debug v19 - Support of bank payment rejection on SEPA. 2023-12-09 20:28:28 +01:00
Laurent Destailleur
02735fab0a Debug v19 2023-12-09 19:20:19 +01:00
Laurent Destailleur
e6bdd3ffbf Debug v19 2023-12-09 17:53:32 +01:00
Charlène Benke
4b3e8109eb Update list.php for prevent mass order warning 2023-12-09 12:36:02 +01:00
Charlène Benke
d55198a94f php v8 warning 2023-12-09 12:32:32 +01:00
Charlène Benke
3b90dce0cb if $totalarray['type'] not present we consider it as number
in many list the  $totalarray['type'] is not present so we add a default value, the time that all list.php are corrected
2023-12-09 10:39:13 +01:00
Laurent Destailleur
19db69859d css 2023-12-09 00:09:40 +01:00
Laurent Destailleur
f1a36f242c Debug v19 2023-12-09 00:07:29 +01:00
Laurent Destailleur
453d5e5c26 Fix #yogosha19443 2023-12-08 23:45:18 +01:00
Laurent Destailleur
9d479c5df0 Debug v19 2023-12-08 21:39:10 +01:00
Laurent Destailleur
d248840779 Debug v19 2023-12-08 21:09:32 +01:00
Laurent Destailleur
01a207a592 Debug v19 2023-12-08 20:57:01 +01:00
Laurent Destailleur
230371a6c9 Debug v19 2023-12-08 19:08:42 +01:00
Laurent Destailleur
4010624dee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-12-08 18:37:50 +01:00
Laurent Destailleur
f5e2ccbe08 Debug v19 2023-12-08 18:37:19 +01:00
Laurent Destailleur
33663f4ccf Debug v19 2023-12-08 18:32:38 +01:00
Laurent Destailleur
06c00f799c Doc 2023-12-08 18:10:38 +01:00
Laurent Destailleur
c11a729a87 Debug v19 for for Stripe IPN API 2023-10-16 2023-12-08 18:04:03 +01:00
Laurent Destailleur
ab46b4d061 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-08 17:29:25 +01:00
Laurent Destailleur
dbf4a1e041 Debug ipn 2023-12-08 17:29:03 +01:00
Hystepik
8d7ab21ad6 Fix some php code smell 2023-12-08 14:23:34 +01:00
Hystepik
a3d405bdc8 FIx comm index page on contract 2023-12-08 12:41:36 +01:00
Laurent Destailleur
bd7e5abc5a Trans 2023-12-08 11:16:57 +01:00
Frédéric FRANCE
9326e03be8 Merge branch 'develop' into patch-8 2023-12-08 07:53:59 +01:00
Laurent Destailleur
603ec5e6ec Merge pull request #26943 from xabitrigo/API_GET_bankaccount_links
CLOSE #26942 Add REST API endpoint: GET /bankaccounts/{id}/lines/{line_id}/links
2023-12-08 02:09:22 +01:00
Laurent Destailleur
f23c7f6b90 Merge pull request #26949 from hansemschnokeloch/fix-26871
Fix #26871
2023-12-08 02:08:34 +01:00
Laurent Destailleur
60af6843fd Clean code 2023-12-08 02:05:51 +01:00
Laurent Destailleur
89e1e1b859 Merge pull request #26980 from atm-jonathan/FIX_in_array()_list.php
FIX in_array() on key
2023-12-08 01:59:32 +01:00
Laurent Destailleur
ac09a7cbd1 Merge pull request #27015 from defrance/patch-295
FIX 'type' of total array instead 'pos'
2023-12-08 01:58:05 +01:00
Laurent Destailleur
b02d8c3b43 Merge pull request #26999 from mdeweerd/php8.2/lessphp
Fix #26308 Integration & review of changes in ca-dsgn/lessphp v0.8.0
2023-12-08 01:57:40 +01:00
Laurent Destailleur
ade09ec4ab Merge pull request #27012 from fappels/19_fix_missing_webp_thumbnails
Fix missing webp thumbnails creation.
2023-12-08 01:45:39 +01:00
Laurent Destailleur
64b0ab7783 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-08 01:45:15 +01:00
Laurent Destailleur
06c5c6687a Debug v19 2023-12-08 01:42:29 +01:00
Laurent Destailleur
8a90fc2735 Merge pull request #27013 from defrance/patch-294
php V8 warning
2023-12-08 01:35:58 +01:00
Laurent Destailleur
eb69a66da0 Update bankentries_list.php 2023-12-08 01:35:43 +01:00
Laurent Destailleur
fdbf437d6e Fix warning 2023-12-08 01:34:52 +01:00
Laurent Destailleur
289e0b4b20 Merge branch 'develop' into patch-295 2023-12-08 01:20:51 +01:00
Laurent Destailleur
52a5b402ef Merge pull request #27018 from mdeweerd/php8.2/utf8_xxcoding
Fix utf8_encoding/decoding (PHP8.2 deprecation)
2023-12-08 01:11:17 +01:00
Laurent Destailleur
604f2676ea Merge pull request #27024 from frederic34/patch-3
fix default value
2023-12-08 01:09:34 +01:00
Laurent Destailleur
601b632e57 Merge pull request #27019 from mdeweerd/qual/inc-travis-php-error-reporting
Qual/inc travis php error reporting
2023-12-08 01:07:08 +01:00
Laurent Destailleur
215b5d7945 Merge pull request #27023 from frederic34/invalidphpdoc
fix invalid phpdoc comment
2023-12-08 01:06:05 +01:00
Laurent Destailleur
341e018802 Merge pull request #27026 from frederic34/patch-7
fix invalid phpdoc
2023-12-08 01:05:37 +01:00
Laurent Destailleur
6ded68da43 Merge pull request #27025 from frederic34/patch-4
fix phpdoc
2023-12-08 01:05:16 +01:00
Frédéric FRANCE
5fbd5c28b6 fix phpdoc 2023-12-07 20:33:06 +01:00
Frédéric FRANCE
75ba559708 fix invalid phpdoc 2023-12-07 20:30:46 +01:00
Frédéric FRANCE
236b99a3df fix phpdoc 2023-12-07 20:21:20 +01:00
Frédéric FRANCE
3313eb25da fix default value 2023-12-07 20:11:37 +01:00
Frédéric FRANCE
56163dff96 fix invalid phpdoc comment 2023-12-07 20:03:24 +01:00
Laurent Destailleur
aebfcee392 Fix owner of a sender profile is visible by default. 2023-12-07 16:33:16 +01:00
Laurent Destailleur
fbb4adfb13 FIx #yogosha19311 2023-12-07 16:12:43 +01:00
Laurent Destailleur
836e1514d8 Fix #yogosha19313 2023-12-07 16:08:32 +01:00
Laurent Destailleur
726fcec580 FIX #yogosha19312 2023-12-07 15:59:19 +01:00
Laurent Destailleur
1569a6ba79 Debug v19 2023-12-07 15:00:52 +01:00
Laurent Destailleur
20a9a9d298 Debug v19. dolibarr_main_stream_enabled must be changed into
dolibarr_main_stream_to_disable
2023-12-07 14:56:06 +01:00
MDW
ea5844cc8a fixup! Qual Increase PHP Error reporting in travis check 2023-12-07 14:48:51 +01:00
MDW
b694abae73 Qual Increase PHP Error reporting in travis check 2023-12-07 14:48:51 +01:00
Francis Appels
33e6f63828 Update regenerate script to include webp 2023-12-07 09:29:37 +01:00
Charlène Benke
94b7fc604e FIX 'type' of total array instead 'pos' 2023-12-07 08:31:33 +01:00
MDW
b0414dd078 Fix utf8_encoding/decoding (rather than creating new function replacements) 2023-12-07 03:37:05 +01:00
Charlène Benke
8193e5185b php V8 warning
some bad variable
2023-12-06 23:03:34 +01:00
Charlène Benke
0756bb5e5d Update fournisseurs.php 2023-12-06 22:44:06 +01:00
Laurent Destailleur
ce94dfbdc1 Fix warning 2023-12-06 22:38:33 +01:00
Laurent Destailleur
b4d0ba5f06 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-06 22:36:46 +01:00
Laurent Destailleur
dfc7bc799f Fix warning 2023-12-06 22:36:05 +01:00
Laurent Destailleur
2a7f9378c9 Doc 2023-12-06 20:49:32 +01:00
Laurent Destailleur
432a847ad9 Merge pull request #27004 from frederic34/fix-20231206
avoid phpstan error with phpdoc
2023-12-06 18:27:48 +01:00
Francis Appels
6a7011b684 Fix missing webp thumbnails creation. 2023-12-06 17:08:09 +01:00
Laurent Destailleur
c3d1aa30ad Merge pull request #26908 from frederic34/incompatiblewithtype
QUAL: fix default value incompatible with type
2023-12-06 16:51:35 +01:00
Laurent Destailleur
65b019dd80 Merge pull request #26947 from frederic34/patch-8
remove MAIN_USE_PHP_WRITEEXCEL
2023-12-06 16:48:23 +01:00
Laurent Destailleur
be14fc65e9 Code comment 2023-12-06 16:46:04 +01:00
Laurent Destailleur
a2f445bbda Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-06 16:43:13 +01:00
Laurent Destailleur
e614a5d247 Trans 2023-12-06 16:42:58 +01:00
MDW
3bf1a8516c QUAL Fix php-cs-fixer configuration to not create 'public const' constants incompatible with 7.0 2023-12-06 16:25:17 +01:00
Laurent Destailleur
3fdef3fc73 Merge pull request #26946 from frederic34/patch-7
fix phpstan
2023-12-06 16:20:21 +01:00
Laurent Destailleur
eeaf0b8f57 Merge pull request #26954 from hansemschnokeloch/fix-26953
Fix #26953
2023-12-06 16:19:32 +01:00
Laurent Destailleur
8896ae4800 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-06 16:18:41 +01:00
Laurent Destailleur
bd2e2c5c75 FIX #26944 2023-12-06 16:18:28 +01:00
Laurent Destailleur
ef018a849e Clean code 2023-12-06 16:06:22 +01:00
Laurent Destailleur
b56688706b Merge pull request #26967 from DaBootO/develop
FIX #26965 add check for global variable VARIANT_ALLOW_STOCK_MOVEMEMENT
2023-12-06 16:02:07 +01:00
Laurent Destailleur
735531f153 Merge pull request #26966 from frederic34/patch-9
fix auguria
2023-12-06 16:00:59 +01:00
Laurent Destailleur
7c151ab94d Merge pull request #26948 from hansemschnokeloch/fix-26912
FIX #26912
2023-12-06 15:59:46 +01:00
Laurent Destailleur
f7db09aa05 Merge pull request #26977 from dvasseur/contact-ratefix
FIX: contract / discount rate was rounded to 2 digits
2023-12-06 15:49:25 +01:00
Laurent Destailleur
aafa04d81b Merge pull request #26979 from mdeweerd/fix/define-global-lang
FIX Define global  (detected undefined phan #26480)
2023-12-06 15:47:09 +01:00
Frédéric FRANCE
61b79fda17 avoid phpstan error with phpdoc 2023-12-06 15:46:39 +01:00
Laurent Destailleur
20d3fe4a78 Merge pull request #26989 from SylvainLegrand/SET_SUPPLIER_INVOICE_PAID_ON_DISCOUNT_EQUAL
Set supplier invoice as paid on equal credit note or discount
2023-12-06 15:33:49 +01:00
Laurent Destailleur
be24f4d047 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-06 15:20:28 +01:00
Laurent Destailleur
3c898b0b87 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-06 15:20:20 +01:00
MDW
3147852d8c Integration & review of changes in ca-dsgn/lessphp v0.8.0
Integration while maintaining dolibarr's layout.

Some changes ignored such as "|| true" in several locations.

26d2dbd46d
2023-12-06 15:13:05 +01:00
Laurent Destailleur
0c4636c345 Merge pull request #26981 from atm-saamiperdrix/FIX_warningOnComptaResult
fixed PHP8 warning
2023-12-06 15:02:06 +01:00
Laurent Destailleur
e0d2ba1afd Merge pull request #26990 from defrance/patch-290
php v8 warning
2023-12-06 14:57:29 +01:00
Laurent Destailleur
c89b077ebc Merge pull request #26991 from defrance/patch-291
php v8 warning on edit project
2023-12-06 14:57:09 +01:00
Laurent Destailleur
f380d9c259 Merge pull request #26997 from defrance/patch-293
FIX : bad element (commande vs ficheinter)
2023-12-06 14:56:32 +01:00
Laurent Destailleur
56859e5fe8 Merge pull request #26992 from defrance/patch-292
php v8 warning
2023-12-06 14:56:13 +01:00
Charlène Benke
fa39edec46 FIX : bad element (commande vs ficheinter) 2023-12-06 14:09:08 +01:00
Saami PERDRIX - ATM Consulting
15cb20837a fix warning on email config 2023-12-06 13:35:43 +01:00
Charlène Benke
d6b3791383 php v8 warning 2023-12-06 08:12:54 +01:00
Charlène Benke
2071fdcbc7 Update card.php 2023-12-06 07:40:59 +01:00
Charlène Benke
689d02d705 php v8 warning on edit project 2023-12-06 07:29:44 +01:00
Charlène Benke
a96683ebbd php v8 warning
var not used and generate error
2023-12-06 07:22:00 +01:00
Sylvain Legrand
cdf9d045d6 Update card.php
When using a discount or credit equal to the invoice amount, set that invoice as paid.
2023-12-06 06:41:08 +01:00
Laurent Destailleur
729451faa2 FIX To support domain names with TLD on 2 levels. 2023-12-06 00:46:00 +01:00
Laurent Destailleur
c9fc494796 FIX To support domain names with TLD on 2 levels. 2023-12-06 00:27:52 +01:00
Laurent Destailleur
4497901155 Doc 2023-12-05 23:05:26 +01:00
MDW
0dd46d1b2c FIX Define global (detected undefined phan #26480) 2023-12-05 19:46:43 +01:00
Saami PERDRIX - ATM Consulting
19bda196fb fixed PHP8 warning 2023-12-05 16:52:43 +01:00
Jonathan Lescaut
771b735384 FIX in_array() on key 2023-12-05 16:12:18 +01:00
Laurent Destailleur
236e96f66a Debug v19 2023-12-05 15:23:38 +01:00
Laurent Destailleur
13ab8172ef Debug v19 2023-12-05 15:21:26 +01:00
Laurent Destailleur
e8e9ff6867 Debug v19 2023-12-05 14:50:42 +01:00
Laurent Destailleur
0d491e4253 Debug v19 2023-12-05 14:47:13 +01:00
Laurent Destailleur
891c0684fb Show a hidden property if defined to help debug 2023-12-05 13:29:46 +01:00
Frédéric FRANCE
1334e707bb Merge branch 'develop' into patch-9 2023-12-05 12:30:20 +01:00
David
829adfcf5d FIX: discount rate was rounded to 2 digits
price2num() was called with 2 params instead of 3, the second one being '2', the rate was rounded to 2 digits.
2023-12-05 11:19:13 +01:00
Laurent Destailleur
00657ace00 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-05 10:45:58 +01:00
Laurent Destailleur
d191220683 Debug v19 2023-12-05 10:45:46 +01:00
Laurent Destailleur
f9ac359054 Fix manifest 2023-12-05 10:08:16 +01:00
Laurent Destailleur
d7df50d978 FIX protection on fetch if 2 record found 2023-12-05 00:44:31 +01:00
Dario Contrino
92161b67cd FIX #26965 add check for global variable VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT
Adding an OR clause in the check if product is a variant.
Same structure as in check if user has rights to create movement.
2023-12-04 21:51:02 +01:00
Frédéric FRANCE
7c266a5820 fix auguria 2023-12-04 21:48:27 +01:00
Laurent Destailleur
2f939121c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-04 21:32:31 +01:00
Laurent Destailleur
c60d9e352e Merge pull request #26964 from hansemschnokeloch/fix-26962
Fix #26962
2023-12-04 21:17:27 +01:00
Laurent Destailleur
5fb751bcd1 Debug v19 2023-12-04 21:10:07 +01:00
Laurent Destailleur
91b21b66ba Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-04 21:04:36 +01:00
Laurent Destailleur
e4536e0a2e Merge pull request #26963 from cesar-bsd-com-br/patch-1
FIX: total_time at bottom in project overview only showing last value, instead of a sum of all records
2023-12-04 20:10:32 +01:00
pascal
0fbc2e03d0 fix #26962 2023-12-04 19:03:21 +01:00
Cesar Rodrigues
95d0712152 Fix total_time at bottom in project overview
Fix the total_time variable, that is always showing only the last line value, instead of a sum.

This PR is related to https://github.com/Dolibarr/dolibarr/issues/26962
2023-12-04 14:44:17 -03:00
Laurent Destailleur
55ae5ad349 Fix php-cs 2023-12-04 14:02:33 +01:00
Laurent Destailleur
619155f65e Fix with php-cs-fixer 2023-12-04 13:53:48 +01:00
Laurent Destailleur
4daacd3371 Fix with php-cs-fixer 2023-12-04 13:49:31 +01:00
Laurent Destailleur
1c9429643a Fix php-cs 2023-12-04 13:46:42 +01:00
Frédéric FRANCE
e6d64d84a9 Merge branch 'develop' into patch-7 2023-12-04 12:53:26 +01:00
Frédéric FRANCE
e331745156 Merge branch 'develop' into patch-8 2023-12-04 12:53:09 +01:00
Laurent Destailleur
c98b7ae0cb Fix php-cs-fixer 2023-12-04 12:37:08 +01:00
Laurent Destailleur
705ebea947 Fix php-cs-fixer 2023-12-04 12:36:57 +01:00
Laurent Destailleur
eebe4370fb Fix php-cs-fixer 2023-12-04 12:36:19 +01:00
Laurent Destailleur
7606fdd84f Debug v19 2023-12-04 12:29:38 +01:00
Laurent Destailleur
a7125280bc Fix with php-cs-fixer 2023-12-04 12:12:12 +01:00
Laurent Destailleur
c409b32e1a Fix with php-cs-fixer 2023-12-04 12:08:22 +01:00
Laurent Destailleur
d0b6b9fe65 Fix with php-cs-fixer 2023-12-04 12:07:53 +01:00
Laurent Destailleur
9e1b90e4a1 Fix with php-cs-fixer 2023-12-04 12:07:31 +01:00
Laurent Destailleur
1babae58a4 Fix with php-cs-fixer 2023-12-04 12:05:28 +01:00
Laurent Destailleur
be78ad6afd Fix with php-cs-fixer 2023-12-04 12:05:17 +01:00
Laurent Destailleur
b5728632ef Fix with php-cs-fixer 2023-12-04 12:05:11 +01:00
Laurent Destailleur
2eb630cd00 Fix with php-cs-fixer 2023-12-04 12:05:02 +01:00
Laurent Destailleur
54e6de0d7f Fix with php-cs-fixer 2023-12-04 12:04:36 +01:00
pascal
71c6bd9715 Fix 26953 2023-12-04 12:03:01 +01:00
Laurent Destailleur
ba10d60a0b Fix with php-cs-fixer 2023-12-04 12:02:35 +01:00
Laurent Destailleur
987d6c41b9 Fix with php-cs-fixer 2023-12-04 11:41:14 +01:00
Laurent Destailleur
de7d3c2bf8 Fix with php-cs-fixer 2023-12-04 11:22:28 +01:00
Laurent Destailleur
881e32f03a Fix with php-cs-fixer 2023-12-04 11:21:01 +01:00
Laurent Destailleur
cbd4d75c22 Fix php-cs-fixer for PHP 7.1 2023-12-04 11:11:14 +01:00
Laurent Destailleur
085f6e26f3 Fix phpcs 2023-12-04 10:25:02 +01:00
Laurent Destailleur
fa594ab779 fix phpcs 2023-12-04 10:24:06 +01:00
Laurent Destailleur
23c6b59818 Fix phpcs 2023-12-04 10:23:11 +01:00
Laurent Destailleur
b282251fbc Fix phpcs 2023-12-04 10:22:29 +01:00
Laurent Destailleur
697c8d14b7 Fix phpcs 2023-12-04 10:16:54 +01:00
Laurent Destailleur
31ab27f631 Fix phpcs 2023-12-04 10:10:44 +01:00
Laurent Destailleur
5ddb01a0b6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-03 21:03:26 +01:00
Laurent Destailleur
fca403b49b Debug php-cs-fixer 2023-12-03 21:03:18 +01:00
pascal
fa47d02cd5 fix 26871 2023-12-03 21:00:19 +01:00
Laurent Destailleur
40c6a5b3e4 Debug php-cs-fixer 2023-12-03 20:57:54 +01:00
Laurent Destailleur
309b308adc Debug php-cs-fixer 2023-12-03 20:45:02 +01:00
Laurent Destailleur
a04dafff18 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-03 20:32:45 +01:00
Laurent Destailleur
386c91790a Fix warning 2023-12-03 20:32:08 +01:00
pascal
475357448a FIX #26912 2023-12-03 15:25:22 +01:00
Frédéric FRANCE
8f2c1b0327 remove MAIN_USE_PHP_WRITEEXCEL 2023-12-03 14:07:56 +01:00
Frédéric FRANCE
d910c408f8 fix phpstan 2023-12-03 13:38:59 +01:00
Laurent Destailleur
a99135a92b Merge pull request #26849 from mdeweerd/qual/php-cs-fixer
QUAL PHP-CS-FIXER configuration and applied upgrade to PHP7.1 + Possiblity to fix PSR-12
2023-12-03 12:56:34 +01:00
Laurent Destailleur
8c9d2895ce Merge pull request #26940 from frederic34/patch-8
fix phpstan
2023-12-03 12:52:13 +01:00
Laurent Destailleur
b5f7b9b47e Merge pull request #26939 from frederic34/patch-4
fix phpstan
2023-12-03 12:51:43 +01:00
Laurent Destailleur
9fdd081763 Merge pull request #26938 from frederic34/patch-3
fix phpstan
2023-12-03 12:51:23 +01:00
Laurent Destailleur
0942e8e6f7 Merge pull request #26937 from frederic34/patch-7
fix phpstan
2023-12-03 12:51:09 +01:00
Laurent Destailleur
a8860c9360 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-03 12:50:07 +01:00
Laurent Destailleur
aa44100cbc Add test to check if a security experimental feature can work 2023-12-03 12:49:52 +01:00
Laurent Destailleur
78268779c3 Fix warnings 2023-12-03 12:02:33 +01:00
xabitrigo
01fc1432ca Fix #26942 phpcs code style 2023-12-03 02:23:38 +01:00
xabitrigo
8e6fdb50b7 CLOSE #26942 REST API GET /bankaccounts/{id}/lines/{line_id}/links 2023-12-03 02:13:30 +01:00
Frédéric FRANCE
91d8758e52 fix phpstan 2023-12-02 22:28:04 +01:00
Frédéric FRANCE
bc6d4d0dff fix phpstan 2023-12-02 22:06:12 +01:00
Frédéric FRANCE
5cec32977d fix phpstan 2023-12-02 22:02:45 +01:00
Frédéric FRANCE
2010c2d385 Merge branch 'develop' into incompatiblewithtype 2023-12-02 21:30:33 +01:00
Laurent Destailleur
753660a1e8 Merge pull request #26935 from frederic34/patch-4
fix phpstan
2023-12-02 21:18:38 +01:00
Laurent Destailleur
c30cb9c14f Merge pull request #26932 from matthieu-michou-wattandsea/patch-3
Update api_thirdparties.class.php
2023-12-02 21:18:24 +01:00
Laurent Destailleur
e2768d0002 Merge pull request #26931 from matthieu-michou-wattandsea/patch-2
Update api_contacts.class.php
2023-12-02 21:18:16 +01:00
Frédéric FRANCE
adfc58bd7d fix phpstan 2023-12-02 21:18:10 +01:00
Laurent Destailleur
a5f921b64c Merge pull request #26934 from frederic34/patch-3
fix missing token
2023-12-02 21:13:57 +01:00
Laurent Destailleur
04f5762435 Update stocktransfer.php 2023-12-02 21:13:42 +01:00
Frédéric FRANCE
b6d9cbc19e fix phpstan 2023-12-02 20:53:59 +01:00
Frédéric FRANCE
b10eda1a79 fix missing token 2023-12-02 20:51:42 +01:00
Laurent Destailleur
3d0cbf15b0 Look and feel v1 2023-12-02 20:39:07 +01:00
Laurent Destailleur
3ecfc1b55f Fix css 2023-12-02 20:27:09 +01:00
Laurent Destailleur
c6ab06967f Debug v19 2023-12-02 19:25:09 +01:00
Laurent Destailleur
1e83b61476 CSS 2023-12-02 19:17:46 +01:00
Laurent Destailleur
7ede5d8f82 Debug v19 2023-12-02 19:13:51 +01:00
Laurent Destailleur
3addb1dd26 Fix min php 2023-12-02 16:39:17 +01:00
Laurent Destailleur
bed683b070 Doc 2023-12-02 16:24:10 +01:00
Laurent Destailleur
1779fed19c Debug v19 2023-12-02 16:10:58 +01:00
Laurent Destailleur
268320b02a Debug v19 2023-12-02 16:06:06 +01:00
Laurent Destailleur
7835c1f6bc Debug setup 2023-12-02 15:49:29 +01:00
Laurent Destailleur
df6ca57763 Debug v19 2023-12-02 15:20:42 +01:00
Laurent Destailleur
7c756574b6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-12-02 14:52:36 +01:00
Laurent Destailleur
f9a8bffd4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-02 12:43:12 +01:00
Laurent Destailleur
f6f61bf5ff Merge pull request #26925 from mdeweerd/qual/base-language
QUAL: correct base language (en_US) to American English + other
2023-12-02 12:31:49 +01:00
Laurent Destailleur
cc35ae88f2 Merge pull request #26928 from frederic34/patch-4
fix phpstan
2023-12-02 12:27:25 +01:00
Laurent Destailleur
d42d9f54e8 Merge pull request #26930 from frederic34/patch-8
remove unused code fix phpstan
2023-12-02 12:27:07 +01:00
Laurent Destailleur
8897c15553 Merge pull request #26929 from frederic34/patch-7
remove unused code fix phpstan
2023-12-02 12:26:51 +01:00
Laurent Destailleur
9d247aadb0 Merge pull request #26927 from frederic34/patch-3
fix phpdoc for phpstan
2023-12-02 12:26:29 +01:00
Laurent Destailleur
f74f3a4a5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-02 11:53:55 +01:00
Laurent Destailleur
e83be2bb75 FIX The combo of custom groups has disappeared 2023-12-02 11:53:13 +01:00
matthieu-michou-wattandsea
71a1c6a497 Update api_thirdparties.class.php
fix API REST changed POST to PUT in thirdparties addCategory
2023-12-02 10:30:01 +01:00
matthieu-michou-wattandsea
ff995afd1e Update api_contacts.class.php
fix API REST addCategory
2023-12-02 10:20:38 +01:00
Frédéric FRANCE
bd8233d4e7 remove unused code fix phpstan 2023-12-02 08:03:18 +01:00
Frédéric FRANCE
a6acec9807 remove unused code fix phpstan 2023-12-02 07:58:25 +01:00
Frédéric FRANCE
c720e1926b fix phpstan 2023-12-01 23:15:10 +01:00
Frédéric FRANCE
6c1d7363db fix phpdoc for phpstan 2023-12-01 22:58:30 +01:00
MDW
c7ac316290 QUAL: correct base language (en_US) to American English + other corrections 2023-12-01 20:18:42 +01:00
Laurent Destailleur
5329fae6d5 Merge pull request #26911 from HLFH/fix-sumup-payment-switch-link
Fix TakePOS SumUp connector
2023-12-01 19:55:58 +01:00
Laurent Destailleur
e27478230f Update pay.php 2023-12-01 19:53:25 +01:00
Frédéric FRANCE
53c8a3acf8 clean phpdoc for phpstan (#26905) 2023-12-01 19:51:32 +01:00
Laurent Destailleur
0d1983766e Fix order of param 2023-12-01 19:48:26 +01:00
Laurent Destailleur
9992371b16 doc 2023-12-01 19:39:25 +01:00
Laurent Destailleur
b5f2d2fb10 Debug v19 2023-12-01 14:06:22 +01:00
Laurent Destailleur
e1f3765f16 Debug v19 2023-12-01 11:41:48 +01:00
Laurent Destailleur
a362bf97e1 Allow failure for php 8.3 2023-12-01 11:10:12 +01:00
Laurent Destailleur
71e737a8d2 PHP 8.3 2023-12-01 11:03:54 +01:00
Gaspard d'Hautefeuille
32e1991c04 Add multicurrency support 2023-12-01 06:25:58 +01:00
Gaspard d'Hautefeuille
90fca395ba Amount was set to 0 instead of the real amount 2023-12-01 05:05:11 +01:00
Gaspard d'Hautefeuille
dc25f652d0 Add SumUp connector compatibility with SumUp app on iOS
https://github.com/sumup/sumup-android-api
VS https://github.com/sumup/sumup-ios-url-scheme

The amount field is deprecated on the Android API but not on the iOS API. The iOS API does not support the total field, only the Android API does support the total field. Hopefully, the Android API only supports the amount field that is only partially deprecated on the Android API. For maximum compatibility with both Android/iOS SumUp app, best to keep this field as "amount" rather than "total".
2023-12-01 04:36:50 +01:00
Laurent Destailleur
4a43e5c4f8 Prepare for php 8.3 2023-11-30 22:49:46 +01:00
Frédéric FRANCE
55d63d0b13 fix default value incompatible with type 2023-11-30 21:51:32 +01:00
Laurent Destailleur
11cc69fb14 Travis is using PHP 8.2 max now 2023-11-30 21:48:32 +01:00
Laurent Destailleur
240869f2f2 Fix warnings 2023-11-30 21:45:58 +01:00
Laurent Destailleur
f2995e50d9 Fix warning 2023-11-30 21:29:26 +01:00
Laurent Destailleur
d461778439 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-30 21:27:09 +01:00
Laurent Destailleur
468c459c63 FIX Test charset of url grabbing and convert it into UTF-8 if not 2023-11-30 21:23:13 +01:00
Laurent Destailleur
da244466b7 Add phpunit on utf8_check and utf8_valid 2023-11-30 21:22:20 +01:00
sonikf
af516f5f9f fix Public Virtual Card translation (#26904)
* fix Public Virtual Card translation

* fix Public Virtual Card translation

* fix Public Virtual Card translation

* fix Public Virtual Card translation

* fix Public Virtual Card translation

* fix Public Virtual Card translation

* fix Public Virtual Card translation

* fix Public Virtual Card translation

* fix Public Virtual Card translation

* fix Public Virtual Card translation

* fix Public Virtual Card translation

* fix Public Virtual Card translation
2023-11-30 18:09:41 +01:00
lamrani abdelwadoud
15bf064c61 FIX linked files when change ref issue #26844 (#26873)
* fix linked files when change ref

* update fullpath in table

* escape filepath in sql request

* fix cast id

* Update line.php

* Update line.php

* Update errors.lang

* Update line.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-30 18:09:13 +01:00
Laurent Destailleur
27ede744a9 Doc 2023-11-30 18:06:07 +01:00
Frédéric FRANCE
0f0d0e44fd fix hidden phpstan error (#26889) 2023-11-30 17:45:41 +01:00
Frédéric FRANCE
046c89cfc7 fix hidden phpstan error (#26888) 2023-11-30 17:45:26 +01:00
Frédéric FRANCE
2b36fd5586 fix hidden phpstan error (#26890) 2023-11-30 17:45:12 +01:00
Frédéric FRANCE
cdcd1c4562 fix hidden phpstan error (#26891) 2023-11-30 17:44:59 +01:00
Frédéric FRANCE
bffbe18f82 fix hidden phpstan error (#26892) 2023-11-30 17:44:45 +01:00
Frédéric FRANCE
e5da78eabe fix hidden phpstan error (#26893) 2023-11-30 17:44:34 +01:00
Charlène Benke
29f5027c9f php V8 warning (#26900) 2023-11-30 17:44:14 +01:00
Saami PERDRIX
b7b190950f fix warnings on inventory when batch is null (#26901) 2023-11-30 17:43:24 +01:00
Charlène Benke
f97debdd50 php V8 Warning (#26903) 2023-11-30 17:42:26 +01:00
sonikf
0fa2d80381 fix translation (#26902)
* fix translation

* fix translation

* fix typo

* Update main.lang

* fix typo

* fix syntax

* fix translation
2023-11-30 17:34:13 +01:00
Laurent Destailleur
c417949a7e Fix phpunit 2023-11-30 00:06:05 +01:00
Laurent Destailleur
7809b66688 Doc 2023-11-29 23:18:49 +01:00
Laurent Destailleur
3e1d5b1748 Fix for MAIN_RESTRICTHTML_ONLY_VALID_HTML 2023-11-29 23:17:22 +01:00
Laurent Destailleur
b3c4697c7d Fix error management 2023-11-29 23:07:29 +01:00
Laurent Destailleur
d809825c21 Fix phpunit 2023-11-29 22:02:10 +01:00
Laurent Destailleur
0d61ee74c7 Fix phpunit 2023-11-29 20:32:03 +01:00
Laurent Destailleur
09c7b1e270 Prepare CI for PHP 8.2 2023-11-29 20:28:14 +01:00
Laurent Destailleur
43f9210ab4 SEC: Add option MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY 2023-11-29 20:19:21 +01:00
Laurent Destailleur
3a78357253 Try an implementation a fix to avoid infinite loop in sync api - trigger 2023-11-29 16:20:37 +01:00
Laurent Destailleur
aaca019f54 Clean code 2023-11-29 12:57:16 +01:00
Laurent Destailleur
9143e837de code smell 2023-11-29 12:50:16 +01:00
Laurent Destailleur
2c6eacc005 FIX Missing hx tags in dol_escape_htmltag with common 2023-11-29 12:44:10 +01:00
Laurent Destailleur
449b27e8dc Fix warning 2023-11-28 22:54:48 +01:00
Laurent Destailleur
8dfb523e2f Fix warning 2023-11-28 22:52:34 +01:00
Laurent Destailleur
bfbdab6084 Debug v19 2023-11-28 22:44:01 +01:00
Laurent Destailleur
4a8dae277d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-28 22:34:31 +01:00
Laurent Destailleur
e4d7f97c09 Fix missing const 2023-11-28 22:33:24 +01:00
Regis Houssin
d0b168e333 FIX sort natural to have the trigger 100 after 99 (#26887)
* FIX sort natural to have trigger 100 after 99

* FIX wrong trigger status
2023-11-28 22:31:36 +01:00
Laurent Destailleur
60409c8fff Look and feel 2023-11-28 22:26:56 +01:00
Laurent Destailleur
a73e76c5cc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-28 20:56:59 +01:00
Laurent Destailleur
21239060df Debug v19 2023-11-28 20:56:20 +01:00
Laurent Destailleur
ea4b857f28 Clean trans 2023-11-28 20:23:11 +01:00
MDW
88e71ef252 Add script to run php-cs-fixer 2023-11-28 16:32:41 +01:00
MDW
caccf8a9fb Add .php-cs-fixer.dist.php configuration 2023-11-28 15:56:28 +01:00
HENRY Florian
f74d652e10 fix: phpstan (#26748)
* fix: remove phpstan warning

* 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
2023-11-28 15:42:13 +01:00
Laurent Destailleur
955ecd1c16 Fix params in phpunit 2023-11-28 15:35:31 +01:00
Laurent Destailleur
56e8872ddc Clean code+warnings: The delete() method of AdherentType, Contact,
Delivery, MultiCurrency, CurrencyRate now need $user as first parameter.
2023-11-28 15:33:42 +01:00
Laurent Destailleur
a629cebb79 Doc 2023-11-28 15:00:55 +01:00
Laurent Destailleur
508c2c1926 Reduce default limit of email collected from 100 to 50 2023-11-28 14:59:16 +01:00
Laurent Destailleur
11b80eaae8 FIX emailcollector can read "Messages envoyés" directory 2023-11-28 14:53:18 +01:00
Laurent Destailleur
9a4aa58ce9 Fix message to unlock upgrade 2023-11-28 14:00:15 +01:00
Laurent Destailleur
1980c9a8b8 Add log to debug email collector 2023-11-28 13:51:49 +01:00
Laurent Destailleur
d3496a3f5a Fix must reset some field when cloning emailcollector 2023-11-28 13:40:40 +01:00
Laurent Destailleur
9513ed761a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-28 12:40:40 +01:00
Laurent Destailleur
6664190179 Clean code
Should also make merge of #24911 after release easier. Note: Adding a
control on screen must be done after adding control into so we will
start by adding checkSellOrEatByMandatory() into create/update of
productlot.
2023-11-28 12:40:21 +01:00
Florent Poinsaut
f9a09bf09a FIX Email text supplier order bis (#26884) 2023-11-28 11:41:26 +01:00
Pascal Hubrecht
f1e384cc51 FIX #26881 (#26883) 2023-11-28 11:30:48 +01:00
Florent Poinsaut
3cd3f0da3f FIX email text for supplier order (#26880)
* Fix email text for supplier order

* Update other.lang

* Update other.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-28 11:29:57 +01:00
Laurent Destailleur
c23e726ce0 Debug v19 2023-11-28 10:42:48 +01:00
Laurent Destailleur
bc1574c418 Debug v19 2023-11-28 10:37:07 +01:00
Laurent Destailleur
e12818be0a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-11-28 10:34:03 +01:00
Laurent Destailleur
552e745908 Debug v19 2023-11-28 10:33:06 +01:00
andreubisquerra
afbee4111e FIX free product box size (#26874)
Resize the 'free product' box and hide scroll bar. And use percentage instead of fixed size to improve on mobile.
2023-11-28 09:17:17 +01:00
Alexandre SPANGARO
a462edcea5 Missing dolGetButtonTitleSeparator() (#26876)
* Debug v19 - Missing title column for description & fix order

* Missing Button title separator

* Missing Button title separator
2023-11-28 09:16:21 +01:00
Laurent Destailleur
91e6028eb2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-27 20:49:02 +01:00
Laurent Destailleur
9f353a5701 Fix setup page and tooltip 2023-11-27 20:44:29 +01:00
Laurent Destailleur
54ab138aa3 Merge pull request #26872 from lucynasci/patch-1
PHP V8 Warning
2023-11-27 18:59:52 +01:00
Laurent Destailleur
2080a38068 Update list.php 2023-11-27 18:59:17 +01:00
Laurent Destailleur
a241d85f84 FIX #26858 2023-11-27 18:45:08 +01:00
Laurent Destailleur
75bb35e829 Doc 2023-11-27 18:20:22 +01:00
Laurent Destailleur
1c28552c53 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-27 18:13:57 +01:00
Laurent Destailleur
9454cfd546 Clean code 2023-11-27 18:13:01 +01:00
lucynasci
fbeaf96928 PHP V8 Warning 2023-11-27 17:11:40 +01:00
Laurent Destailleur
1d589fd74e Fix warnings 2023-11-27 13:26:44 +01:00
Laurent Destailleur
06736918de Fix warning 2023-11-27 12:33:07 +01:00
Laurent Destailleur
b69059af76 Fix warning 2023-11-27 12:24:18 +01:00
Laurent Destailleur
fa79a93a51 Fix warning 2023-11-27 12:16:09 +01:00
Laurent Destailleur
4c844dfd12 Fix warnings 2023-11-27 12:13:50 +01:00
Laurent Destailleur
abba23fc5e Fix regression Trait not found 2023-11-27 12:09:56 +01:00
Laurent Destailleur
075ee02901 Fix php8.2 warnings 2023-11-27 12:08:48 +01:00
Laurent Destailleur
e8dc651877 Fix php8.2 warnings 2023-11-27 11:56:32 +01:00
Laurent Destailleur
a136f304a6 Fix php8.2 warnings 2023-11-27 11:46:58 +01:00
Laurent Destailleur
7785ae93a1 Fix php8.2 warnings 2023-11-27 11:41:05 +01:00
Laurent Destailleur
53dab922fd Fix php8.2 warnings 2023-11-27 11:39:32 +01:00
Laurent Destailleur
de96af8543 Fix warning php8.2 2023-11-27 11:24:19 +01:00
Alexandre SPANGARO
406065f56b Debug v19 - Missing title column for description & fix order (#26859) 2023-11-26 21:41:17 +01:00
Laurent Destailleur
9a4adae1dd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-26 19:23:21 +01:00
Laurent Destailleur
8561ff789a Doc 2023-11-26 19:23:07 +01:00
Laurent Destailleur
bdcd37e9c9 Doc 2023-11-26 19:21:47 +01:00
Laurent Destailleur
fb330231cf Doc 2023-11-26 19:19:37 +01:00
Laurent Destailleur
989e76839e Fix warning 2023-11-26 17:39:13 +01:00
Laurent Destailleur
ef6b4adaf6 Fix warning 2023-11-26 17:27:14 +01:00
Lucas Marcouiller
300f3a8a96 Fix some phpstan errors (#26845)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-11-26 15:53:10 +01:00
Frédéric FRANCE
812ab70e0e fix phpstan (#26846) 2023-11-26 15:52:18 +01:00
Frédéric FRANCE
93b925a0d2 fix phpstan (#26847) 2023-11-26 15:52:05 +01:00
Frédéric FRANCE
748f362c86 clean code (#26848) 2023-11-26 15:51:48 +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
Charlène Benke
5ca156386d php V8 warning (#26853) 2023-11-26 15:37:58 +01:00
Laurent Destailleur
a5b909a6e9 CSS 2023-11-25 01:41:24 +01:00
Laurent Destailleur
b7ad118507 Doc 2023-11-24 17:20:38 +01:00
Laurent Destailleur
1ac9bcab59 Debug v19 2023-11-24 16:30:31 +01:00
Laurent Destailleur
25a25dfcd7 Debug v19 2023-11-24 15:36:05 +01:00
Laurent Destailleur
574502c6fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-24 10:23:38 +01:00
Laurent Destailleur
00320ea801 Fix warnings 2023-11-24 10:23:21 +01:00
Laurent Destailleur
5dd41e3dd5 Clean CSS 2023-11-24 10:20:01 +01:00
Laurent Destailleur
e6eb34a8db Fiw warnings: The private array ->status_short, ->statuts and
->status_long are now array ->labelStatusShort and ->labelStatus
everywhere.
2023-11-24 10:10:24 +01:00
Frédéric FRANCE
938afdb06e fix phpstan (#26841) 2023-11-24 09:30:49 +01:00
Frédéric FRANCE
89c2ddc45b remove deprecated from initAsSpecimen (#26840) 2023-11-24 09:30:31 +01:00
Frédéric FRANCE
8e6cdb177d fix phpstan (#26839) 2023-11-24 09:28:43 +01:00
Frédéric FRANCE
19c103f2ba fix phpstan (#26838) 2023-11-24 09:28:23 +01:00
Frédéric FRANCE
bb2741ef58 fix phpstan (#26837) 2023-11-24 09:28:02 +01:00
Frédéric FRANCE
3a182e99aa fix phpstan (#26836) 2023-11-24 09:27:42 +01:00
Frédéric FRANCE
09c28bae05 fix phpstan (#26835) 2023-11-24 09:27:22 +01:00
Frédéric FRANCE
2cacb02cca remove deprecated from initAsSpecimen (#26834) 2023-11-24 09:27:06 +01:00
Frédéric FRANCE
5d3087b089 fix phpstan (#26833) 2023-11-23 19:40:47 +01:00
Laurent Destailleur
6c0c1a9881 Add option ACCOUNTANCY_FISCAL_PERIOD_MODE to support 2 mode for fiscal
year
2023-11-23 19:09:34 +01:00
Alexandre SPANGARO
ba1f811921 Closure period - Add information on index & warning on each journal pages (#26742)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-23 18:58:59 +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
1d3bc31cb7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-23 18:39:22 +01:00
Laurent Destailleur
7fa5565a36 Doc 2023-11-23 18:07:05 +01:00
sonikf
22e5ef6e18 fix fetch vat details not working for some use cases (#26771)
* fix not working for some use cases

* fix not working for some use cases

* use DOL_URL_ROOT

* fix travis

* Fix missing address
2023-11-23 17:47:17 +01:00
Alexandre SPANGARO
8d203f4fd4 Debug v19 (#26784)
* Translate comment

* Fix undefined variable

* Fix undefined variable

* Fix undefined variable - better fix

* Add translation of ProfId so that it is not displayed in admin

* Remove manual definition and call getDefaultImageSizes() instead
2023-11-23 17:45:59 +01:00
Frédéric FRANCE
3a39ec684c fix phpstan (#26804) 2023-11-23 17:45:11 +01:00
atm-jonathan
69f66f2a48 FIX warning addLine Facture fk_prev_id and situation_percent (#26825)
* addLine Facture fk_prev_id and situation_percent

* retour PR
2023-11-23 17:44:32 +01:00
MDW
ff44558e36 FIX Get array value for arrayname in loop. (#26805)
Reported by phan: htdocs/mrp/class/api_mos.class.php:369 PhanTypeMismatchForeach 'arraytoconsume'|'arraytoproduce' passed to foreach instead of array
2023-11-23 17:30:43 +01:00
sonikf
a8b2c631ab fix #25348 (#26806)
* fix #25348

* fix #25348
2023-11-23 17:28:32 +01:00
MDW
146e780ddd QUAL Fix typing hint for date (which is int|string) (#26808) 2023-11-23 17:25:44 +01:00
Frédéric FRANCE
7f0a0b6356 fix phpstan (#26807) 2023-11-23 17:25:26 +01:00
Frédéric FRANCE
81c22d00f1 fix phpstan (#26809) 2023-11-23 17:24:55 +01:00
Alexandre SPANGARO
85d5e7caec Debug v19 (#26810)
* Fix Warning: Invalid argument supplied for foreach()

* Fix Warning: Invalid argument supplied for foreach()

* Fix Undefined variable - Remove useless parameter

* Fix Undefined variable $helpurl

* Fix Undefined property $import_key

* Fix Undefined variable $totalpaid

* Fix undefined variable $nb

* Update payments.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-23 17:24:35 +01:00
Laurent Destailleur
48da52d877 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-11-23 17:18:27 +01:00
Frédéric FRANCE
a58f84f1d5 fix phpstan (#26811) 2023-11-23 17:13:20 +01:00
IC-Nicolas
47de053b06 NEW &arrayfields into doAction (#26832) 2023-11-23 17:09:52 +01:00
Frédéric FRANCE
010c2dd4be fix phpstan (#26812)
* fix phpstan

* Update pdf_storm.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-23 17:09:36 +01:00
Frédéric FRANCE
25435eeb1a fix phpdoc (#26829)
* fix phpdoc

* Update pdf.lib.php
2023-11-23 17:07:32 +01:00
Frédéric FRANCE
184d93d252 fix phpstan (#26813)
* fix phpstan

* Update pdf_strato.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-23 17:06:33 +01:00
Laurent Destailleur
5b50135a53 FIX #26813 2023-11-23 15:14:19 +01:00
Frédéric FRANCE
de1b8da5ed fix phpstan (#26814) 2023-11-23 15:12:13 +01:00
Frédéric FRANCE
dfd25926f1 fix phpstan (#26815) 2023-11-23 15:11:32 +01:00
Frédéric FRANCE
e229d63bfd fix phpstan (#26816) 2023-11-23 15:11:18 +01:00
Frédéric FRANCE
628786df6a Update fournisseur.facture.class.php (#26822) 2023-11-23 14:59:21 +01:00
Lucas Marcouiller
8dce28e29b Fix bookcal public page 2 (#26827)
* fix bookcal public page

* fx booking link with calendar

* booking list on calendar_card

* fix display on wrong values

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-11-23 14:58:00 +01:00
Laurent Destailleur
ac615448bb Debug v19 2023-11-22 14:28:03 +01:00
Laurent Destailleur
ed93a4b1cb Debug v19 2023-11-22 13:22:59 +01:00
Laurent Destailleur
127b5ecf65 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-22 11:17:01 +01:00
Laurent Destailleur
b89ad8e215 Update stripe comments 2023-11-22 11:16:36 +01:00
Frédéric FRANCE
0e4d06c8f4 NEW add tpl for delivery (#26789)
* add tpl for delivery

* fix tooltip
2023-11-22 09:32:08 +01:00
John BOTELLA
b758bb9ab4 Offset non-falsy-string on array{} in empty() does not exist. (#26745) 2023-11-22 09:27:12 +01:00
Laurent Destailleur
f70cac6cb8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-22 00:25:35 +01:00
Lucas Marcouiller
88e9e091cf fix some php stan errors (#26747)
* fis some php stan errors

* fix dolchmod

* Update stats.class.php

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-22 00:23:16 +01:00
moreauftheobald
d756151956 Fix PHP STAN ERROR ON fournisseur commande class (#26717)
* Fix PHP STAN ERROR ON fournisseur commande class

* Fix phpstan fournisseur commande class

* Fix phpstan fournisseur commande class

* Remove Rang property

* Remove Rang property

* Update fournisseur.commande.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-22 00:17:15 +01:00
Laurent Destailleur
b57b002494 Fix warning 2023-11-22 00:16:00 +01:00
Laurent Destailleur
0b789d5615 Fix warning 2023-11-22 00:12:21 +01:00
Frédéric FRANCE
9ff62f157c fix phpstan (#26775)
* fix phpstan

* Update fournisseur.facture.class.php

* Update fournisseur.facture.class.php
2023-11-22 00:00:37 +01:00
Laurent Destailleur
9d86d922a4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-22 00:00:13 +01:00
Laurent Destailleur
e211c0e334 Clean code 2023-11-21 23:59:58 +01:00
Frédéric FRANCE
f1ad6d7643 fix phpstan (#26776) 2023-11-21 23:44:26 +01:00
Frédéric FRANCE
a5715670ec fix phpstan (#26777)
* fix phpstan

* Update main.inc.php
2023-11-21 23:43:49 +01:00
Frédéric FRANCE
c5c793465b fix phpstan (#26778) 2023-11-21 23:43:05 +01:00
Frédéric FRANCE
d6affb437d fix phpstan (#26779) 2023-11-21 23:42:41 +01:00
Frédéric FRANCE
b8a4181748 delete unused code (fix phpstan also) (#26780) 2023-11-21 23:40:43 +01:00
Frédéric FRANCE
8a19e2f251 fix phpstan (#26781) 2023-11-21 23:39:52 +01:00
Frédéric FRANCE
91a2ae578e fix phpstan (#26782) 2023-11-21 23:39:29 +01:00
Frédéric FRANCE
315e3b4804 fix phpstan (#26783) 2023-11-21 23:38:30 +01:00
Alexandre SPANGARO
80911d2274 Debug v19 (#26785)
* Fix Warning: Invalid argument supplied for foreach()

* Fix Warning: Invalid argument supplied for foreach()
2023-11-21 23:31:59 +01:00
Laurent Destailleur
73f5b2e5c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-21 23:28:34 +01:00
Frédéric FRANCE
ac83341ba2 fix phpstan (#26788) 2023-11-21 23:20:52 +01:00
Sylvain Legrand
83b4ddc0cd New variable to accept a deposit invoice as available credit even unpaid (#26792)
* New variable to accept a deposit invoice as available credit even unpaid

In many activities, the final invoice must be issued while the requested deposit has not yet been paid.
Often it is the payment deadlines which generate this situation (for example in the finishing work)

* Update card.php

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-21 23:20:20 +01:00
Frédéric FRANCE
7da90d61e8 fix phpstan (#26803) 2023-11-21 23:16:46 +01:00
Laurent Destailleur
fad47c8d9e Debug v19 2023-11-21 23:16:17 +01:00
Lucas Marcouiller
7ac162ed91 Fix bookcal data structure (#26791)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-11-21 23:12:44 +01:00
Frédéric FRANCE
6add83ca94 fix phpstan (#26801) 2023-11-21 23:09:09 +01:00
Frédéric FRANCE
632a49bab6 Update html.formintervention.class.php (#26802) 2023-11-21 23:08:33 +01:00
Frédéric FRANCE
e371a593dc fix phpstan (#26800)
this remove false positive
2023-11-21 23:07:59 +01:00
Laurent Destailleur
4ca565fa95 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-21 23:05:56 +01:00
Laurent Destailleur
40898cac50 Close #26790 2023-11-21 23:05:40 +01:00
Frédéric FRANCE
7ac05c7549 fix phpstan (#26799)
* fix phpstan

* Update commoninvoice.class.php

* Update facture.class.php

* Update commoninvoice.class.php

* fix properties
2023-11-21 21:36:34 +01:00
Frédéric FRANCE
5c1a579792 fix phpstan (#26797) 2023-11-21 21:35:53 +01:00
Frédéric FRANCE
00aa2ef289 fix phpstan (#26798) 2023-11-21 21:35:27 +01:00
Frédéric FRANCE
e8a6bd4436 fix phpstan (#26796) 2023-11-21 21:34:47 +01:00
Laurent Destailleur
9f79c5b5f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-21 12:18:00 +01:00
Laurent Destailleur
aeec2101e3 Clean log 2023-11-21 12:17:10 +01:00
Laurent Magnin
d2ebffa64c fix: comment translation into English (#26702) 2023-11-21 00:24:11 +01:00
John BOTELLA
fba227d618 Replace hook ll header (#26736)
* Change behavior of keydown

* Fix accessibility

* New hook llxHeader to replace changeHelpURL

* remove space

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-21 00:06:59 +01:00
Frédéric FRANCE
3a17b15432 fix phpstan (#26774) 2023-11-21 00:00:06 +01:00
Frédéric FRANCE
bfab3aa077 fix phpstan (#26773) 2023-11-20 23:59:09 +01:00
Francis Appels
7d11edcc6e Add printFieldListSearchParam hook to product list (#26769) 2023-11-20 23:58:08 +01:00
MDW
3c966469ef QUAL No return values in __construct(), correct PHPDoc for typing (#26768) 2023-11-20 23:47:06 +01:00
Frédéric FRANCE
be9cbeb1b6 Update DolibarrModules.class.php (#26770) 2023-11-20 23:45:35 +01:00
Frédéric FRANCE
f0cff09768 fix phpstan (#26772)
* fix phpstan

* Update server_order.php
2023-11-20 23:39:12 +01:00
Laurent Destailleur
eb0eac0dfa FIX delivery note disappear after generation 2023-11-20 21:47:48 +01:00
Laurent Destailleur
f5240781a1 Fix phpcs 2023-11-20 21:25:52 +01:00
Laurent Destailleur
406447d1d5 Trans 2023-11-20 21:16:32 +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
Regis Houssin
ca7fe7e29e FIX MAIN_LANG_DEFAULT was no longer saved during installation (#26637) 2023-11-20 20:38:42 +01:00
Frédéric FRANCE
714c076785 fix typos in apstats.php (#26749)
* fix typos in apstats.php

* Update apstats.php
2023-11-20 20:20:14 +01:00
sonikf
06874fdd90 fix translation (#26754) 2023-11-20 20:18:59 +01:00
Frédéric FRANCE
fd31c47439 fix duplicate (#26753) 2023-11-20 20:18:24 +01:00
IC-Nicolas
78259c37ce Duplicate entries (#26759) 2023-11-20 20:17:24 +01:00
UT from dolibit
11a98067b5 Update README.md (#26762)
added some new available modules
2023-11-20 20:15:16 +01:00
Beef
7be1ba3432 Fixes syntax errors in Advanced Stock Transfer and adds checks for null values (#26766) 2023-11-20 20:14:35 +01:00
Laurent Destailleur
da4bdfe822 FIX #26751 2023-11-20 20:13:24 +01:00
Laurent Destailleur
ff38cc4bdd Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-20 20:02:30 +01:00
Laurent Destailleur
472f25d945 Debug v19: Caches must be stored into conf->cache['nameofcache'] 2023-11-20 19:50:47 +01:00
Laurent Destailleur
a9c2a44074 CSS 2023-11-20 18:23:28 +01:00
Laurent Destailleur
ed122e5408 Clean depracted table 2023-11-20 17:46:57 +01:00
Laurent Destailleur
e7a629b319 Debug v19 2023-11-20 14:54:13 +01:00
Laurent Destailleur
090ecd3611 Debug v19 2023-11-20 12:31:30 +01:00
Laurent Destailleur
1a6d8e304d Fix responsive and css. Rename time spent. 2023-11-20 11:41:02 +01:00
Laurent Destailleur
806e3a11f6 Filters on list must not use the LEFT JOIN but EXISTS into the WHERE. 2023-11-19 16:01:50 +01:00
Laurent Destailleur
a18c8ab380 Fix warnings 2023-11-19 13:39:54 +01:00
Laurent Destailleur
219bb50cac Fix warning 2023-11-19 13:34:36 +01:00
Laurent Destailleur
196017f957 Fix false positive 2023-11-19 13:26:00 +01:00
Laurent Destailleur
c5f863f10f Fix warnings 2023-11-19 13:21:08 +01:00
Laurent Destailleur
27b5061cbd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-19 13:13:39 +01:00
Laurent Destailleur
938b2da768 Clean code for closing of fiscal period and be ready for alternative
mode of working.
2023-11-19 13:12:58 +01:00
Laurent Destailleur
ab10297db7 Rename method for a more generic use 2023-11-19 12:42:06 +01:00
lamrani abdelwadoud
c8ad1e616b Solution to restore a massive stock movement error. (#26623)
* NEW functionality for save movement reversed

* remove variable

* Fix variable to be properly validated or sanitized

* cast variable

* Fix for cast variable injection on SQL

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-19 10:58:16 +01:00
Laurent Destailleur
b55e8de320 Removed a deprecated substitution tag 2023-11-19 10:55:25 +01:00
Laurent Destailleur
42d1c3b938 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-19 10:54:37 +01:00
evarisk-micka
af8ca9a205 NEW #26676 [MassAction] add missing substitution variables (#26678)
* NEW #26676 [MassAction] add missing substitution variables

* Update massactions_pre.tpl.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-19 10:53:50 +01:00
Sébastien NASSIET
0fcfae30f8 Add doActions Hook on all actions on Categories (#26744)
* Update card.php

* Update photos.php

* Update edit.php
2023-11-19 10:50:21 +01:00
Alexandre SPANGARO
eb11c19823 Supplier invoice - payment list - Manage Checkbox on left column (#26741)
* Travis fix

* Travis remove warning "Line exceeds 500 characters"

* Travis remove warning "Line exceeds 500 characters"

* Travis remove warning "Line exceeds 500 characters"

* Supplier invoice - payment list - Manage Checkbox on left column
2023-11-19 10:46:22 +01:00
Laurent Destailleur
3c6bc209e2 Add autorefresh 2023-11-19 10:38:15 +01:00
Laurent Destailleur
7f5b230dd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-19 10:33:19 +01:00
Laurent Destailleur
5d1fe5adf8 CSS 2023-11-19 10:32:11 +01:00
andreubisquerra
63643e5437 Finishing auto TakePOS setup with default account (#26683)
* Finishing auto TakePOS setup with default account

* Travis FIX

* Travis fix

* Update modTakePos.class.php

* Copy customer logic

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-19 01:56:53 +01:00
Frédéric FRANCE
cb26b28869 Update functions2.lib.php (#26734)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-19 01:02:21 +01:00
IC-Nicolas
adee8ac1a8 FIX fix phpstan double copy of variable (#26739) 2023-11-19 01:01:38 +01:00
Regis Houssin
030f7ffde1 FIX avoid php8.2 warnings (#26720)
* FIX avoid php8.2 warnings

* FIX avoid travis error

* FIX travis error

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-19 00:56:46 +01:00
Eric
c3939fc4d0 fix undef line and action (#26646)
* fix undef line and action

* fix update quantity

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-19 00:54:39 +01:00
HENRY Florian
d5343cfedb fix: phpstan (#26721)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix: phpstan

* fix: phpstan
2023-11-19 00:52:16 +01:00
Thibault Fiacre
7706c9ef23 NEW workstation module is stable (#26593) 2023-11-19 00:49:57 +01:00
Rémi Champlon
79154f4864 Fix : right to show suppliers count on thirdparty index (#26686)
* thirdparty stats : use supplier read  right

* fix

---------

Co-authored-by: Rémi Champlon <remi.champlon@vold.lu>
2023-11-19 00:49:19 +01:00
IC-Nicolas
ae608c3bb7 Unused method in Dolibarr (#26737) 2023-11-19 00:47:23 +01:00
Maxime Kohlhaas
a8c0c63565 Fix : cost calculation on a bom using workstation (#26738) 2023-11-19 00:46:09 +01:00
Laurent Destailleur
9062e8988d Changelog 2023-11-19 00:35:13 +01:00
Laurent Destailleur
7f1443effa Fix name of constant 2023-11-19 00:33:37 +01:00
Laurent Destailleur
f52beb7bce Fix phpcs 2023-11-18 23:51:52 +01:00
Laurent Destailleur
5c1a7e7541 Debug v19 2023-11-18 23:50:35 +01:00
moreauftheobald
1e36013e34 fix phpstan reception class (#26729)
* fix PHP STAN error on MO class

* fix PHP STAN error on MO class

* Update mo.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-18 23:25:16 +01:00
atm-sami
5a5483a610 New add extrafields for mo line (#26395)
* added recursive deletion option for child MOs + added recursive recovery method for child MOs

* add number of MOs in form_confirm

* update to delete number of mo childs if is null

* added checking of an infinity loop

* review PR

* add extrafields for mo lines

* update

* update for travis

* Update 18.0.0-19.0.0.sql

* Update functions.sql

* Delete htdocs/install/mysql/tables/llx_mrp_production_extrafields.key.sql

* Delete htdocs/install/mysql/tables/llx_mrp_production_extrafields.sql

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-18 23:17:57 +01:00
Laurent Destailleur
9d26ccb801 Missing dbversion 2023-11-18 19:03:47 +01:00
Laurent Destailleur
d769b2884d Debug v19 2023-11-18 18:07:11 +01:00
Laurent Destailleur
3b3105fb20 CSS 2023-11-18 17:55:47 +01:00
Laurent Destailleur
2374cdd76c Debug v19 2023-11-18 17:45:00 +01:00
Laurent Destailleur
6c2fdfd4b7 Debug v19 2023-11-18 17:05:22 +01:00
Lucas Marcouiller
bba49ba486 Fix bookcal public page (#26725)
* fix select all availabilities days

* generate array all availabilities ranges

* booking with new way

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-11-18 16:56:17 +01:00
HENRY Florian
adeded25f4 Dev phpstan (#26723)
* fix: remove phpstan warning

* fix phpstan

* fix phpstan

* fix phpstan
2023-11-18 16:49:39 +01:00
Eric
47702c0cfd Fix paymentsalary undef (#26636)
* nom (deprecated) -> name

* fix phpstan undef propertties

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-18 16:32:02 +01:00
HENRY Florian
3b252e50a3 fix: add /build/phpstan/phpstan/phpstan/vendor/bin and custom bootstrap.php in gitingnore and review README (#26679)
* fix: add /build/phpstan/phpstan/phpstan/vendor/bin and custom bootstrap.php in gitingnore and review README

* add other custom files

* add other custom files
2023-11-18 15:11:40 +01:00
Laurent Destailleur
b141312f3c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-18 14:13:54 +01:00
Thomas C
62ee44c058 fix property author id (#26685) 2023-11-18 12:47:42 +01:00
Eric
4f47f26aad undef chid from PaymentSalary -> id + deprecated doc (#26690)
* undef chid from PaymentSalary -> id + deprecated doc

* Update card.php

* Update paiement_salary.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-18 12:46:29 +01:00
Eric
ee05f34237 Paymentsalary datepayment datep (#26688)
* datepayment to datep member var

* datepayment to datep member var
2023-11-18 12:39:25 +01:00
Laurent Destailleur
f02a9d17eb Code comment 2023-11-18 12:27:32 +01:00
Thomas C
317243a2a9 FIX : property fichinter (#26689)
* fix property fichinter

* fix int to string

* Update fichinter.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-18 12:12:40 +01:00
ayoubayed
1a9128e861 [#26692] Fixed : undefined var on accountacyexport.class.php && facture.class.php (#26698)
Co-authored-by: Ayoub BAYED <ayoub@code42.fr>
2023-11-18 12:11:08 +01:00
Maxime Kohlhaas
a4bf031a32 Add offset in reserved words for extrafields (#26709) 2023-11-18 12:02:08 +01:00
Rémi Champlon
54bc3e69f8 New : Authorize credit note to 0 (#26710)
* authorize credit not to 0

* fix

---------

Co-authored-by: Rémi Champlon <remi.champlon@vold.lu>
2023-11-18 12:00:46 +01:00
Alexandre SPANGARO
af0c6899a7 Travis fix (#26708)
* Travis fix

* Travis remove warning "Line exceeds 500 characters"

* Travis remove warning "Line exceeds 500 characters"

* Travis remove warning "Line exceeds 500 characters"
2023-11-18 11:56:29 +01:00
Regis Houssin
3fb520aa3f FIX sql syntax error (#26711) 2023-11-18 11:55:12 +01:00
HENRY Florian
d1e6ac9acc Fix: php stan (#26713)
* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan
2023-11-18 11:54:37 +01:00
Regis Houssin
295d5a167c FIX avoid php8.2 warning : undefined variable (#26712) 2023-11-18 11:51:41 +01:00
Alexandre SPANGARO
072bdbdc9a NEW Accountancy - Added management of tax period closures #FPC21 (#25859)
* NEW Accountancy - Added management of tax period closures

* Unlock function fiscal year & closure admin page

* Fix travis

* Fix Visibility function

* Fix indent & space

* Fix indent

* Fix travis

* Update text

* Add action to generate has new entry with sub-ledger accounts details

* Return code

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-18 11:25:43 +01:00
John BOTELLA
506cd26be9 Fix search dropdown accessibility (#26696)
* Change behavior of keydown

* Fix accessibility
2023-11-18 02:26:10 +01:00
John BOTELLA
2efd482e73 Change behavior of keydown (#26677) 2023-11-18 02:21:45 +01:00
Laurent Destailleur
6227580bda Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-18 02:16:29 +01:00
Laurent Destailleur
2a2ad7b3e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-18 02:16:09 +01:00
HENRY Florian
f209cc5a94 fix: update setcost_price in htdocs/product/fournisseurs.php (#26700)
* fix: update setcost_price in htdocs/product/fournisseurs.php

* bettre fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-18 02:15:57 +01:00
Laurent Destailleur
1508d2121c Code comment 2023-11-18 02:11:59 +01:00
HENRY Florian
e487d663d6 fix:project Class Categerie not found on list project when module categorie is not enabled (#26699) 2023-11-18 01:43:16 +01:00
Eric
ca2a267537 undefined fk_parent_line (#26695) 2023-11-18 01:42:19 +01:00
Laurent Destailleur
c19fc54298 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-18 01:35:25 +01:00
Laurent Destailleur
a0f962ce96 Fix phpunit 2023-11-18 01:33:11 +01:00
Laurent Destailleur
ba10c95148 Clean code 2023-11-18 01:30:34 +01:00
Laurent Destailleur
353298ec62 Code comment 2023-11-18 01:23:30 +01:00
Laurent Destailleur
07a3774749 Debug v19 2023-11-17 23:44:02 +01:00
Laurent Destailleur
f43249916e Fix management of password type in extrafields 2023-11-17 23:01:59 +01:00
Laurent Destailleur
226bf734fc Fix missing token 2023-11-17 22:10:51 +01:00
Laurent Destailleur
6ca0154784 Fix management of password type with pass_crypted 2023-11-17 22:09:35 +01:00
Laurent Destailleur
261452111e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-17 18:25:08 +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
evarisk-micka
5f67a182b8 NEW #26668 [SQL] add SPL in dict form_juridique (#26669) 2023-11-17 16:40:40 +01:00
Rémi Champlon
88c558e0f9 fix : update product quantity (#26674)
Co-authored-by: Rémi Champlon <remi.champlon@vold.lu>
2023-11-17 16:28:31 +01:00
Laurent Destailleur
07432b8def Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-17 16:24:57 +01:00
MDW
9cb872c8d3 Fix spelling in base language (#26671) 2023-11-17 16:20:49 +01:00
Laurent Destailleur
050402f371 CSS 2023-11-17 16:13:46 +01:00
Laurent Destailleur
9babd301fc CSS 2023-11-17 15:40:28 +01:00
Laurent Destailleur
6dad4cca82 CSS 2023-11-17 15:14:55 +01:00
Thomas C
d8cc72c75b NEW : addMoreActionsButtons in doncard (#26670)
* addMoreActionsButtons doncard

* indent
2023-11-17 14:28:09 +01:00
evarisk-micka
cf0c2882dc NEW #26660 [Task] add hook on getNomUrl (#26662)
* ADD #26660 [Task] hook on getNomUrl

* Update task.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-17 14:27:13 +01:00
MDW
cd9920e3ff FIX hardspace before empty (#26667)
Was reported by phan as:
htdocs/product/stock/stocktransfer/class/stocktransfer.class.php:483 PhanUndeclaredFunction Call to undeclared function \ empty()
2023-11-17 14:15:56 +01:00
Laurent Destailleur
5ddc5d3f76 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-17 12:37:01 +01:00
Laurent Destailleur
51a90b5865 Fix infinite loop 2023-11-17 12:36:41 +01:00
Regis Houssin
8af42acf8e FIX avoid error during install (#26630) 2023-11-17 12:17:59 +01:00
Regis Houssin
d9eaa5b974 FIX broken feature to show 0 value (#26658) 2023-11-17 11:39:56 +01:00
HENRY Florian
70a5a85eac fix: various getDol, display error on public page (#26652)
* fix: various getDol, display error on public page

* fix: various getDol, display error on public page
2023-11-17 11:39:16 +01:00
Laurent Destailleur
7bce1a0975 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-17 11:36:19 +01:00
Laurent Destailleur
58e3415126 Clean code 2023-11-17 11:36:01 +01:00
moreauftheobald
1425cecac9 Correction OnStock Question class files "Access to an undefined property" (#26659)
* Correction On contract class files "Access to an undefined property"

* Correction On contract class files "Access to an undefined property"

* Update stocktransfer.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-17 11:35:36 +01:00
Laurent Destailleur
e57517d06d Clean code 2023-11-17 11:19:51 +01:00
moreauftheobald
e3ed9946c3 Correction On reception class files "Access to an undefined property" (#26661) 2023-11-17 10:58:25 +01:00
moreauftheobald
0b128f7ad2 Fix Contrat "Access to an undefined property" (#26657)
* Add entity management on contact list on thirdparty card

* Correction On contract class files "Access to an undefined property"
2023-11-17 10:55:09 +01:00
Frédéric FRANCE
b181b4c5ea fix phpstan level 1 (#26651) 2023-11-17 10:54:39 +01:00
Laurent Destailleur
0a3bc87b72 Fix warning 2023-11-17 03:33:37 +01:00
Laurent Destailleur
6add12177b Fix warnings 2023-11-17 03:16:38 +01:00
Laurent Destailleur
dd073a07b1 Fix warnings 2023-11-17 03:06:24 +01:00
Laurent Destailleur
c2c610adbc Fix warning 2023-11-17 02:18:24 +01:00
Laurent Destailleur
4034164954 Fix warning 2023-11-17 02:17:12 +01:00
Laurent Destailleur
d564b6b39c Fix warnings 2023-11-17 02:10:45 +01:00
Laurent Destailleur
9f63591dec Fix warning 2023-11-17 01:51:22 +01:00
Laurent Destailleur
9afc08b3bf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-17 01:49:34 +01:00
Frédéric FRANCE
cd27e25536 fix phpstan (#26650)
found with phpstan at level 1
Array has 2 duplicate keys with value 0 (0, 0).
2023-11-17 01:47:22 +01:00
Laurent Destailleur
8909223452 Fix CSS 2023-11-17 01:13:00 +01:00
Frédéric FRANCE
a497eb0897 fix phpstan (#26645) 2023-11-17 00:25:34 +01:00
Frédéric FRANCE
445824f783 fix phpstan (#26638) 2023-11-16 23:39:02 +01:00
lvessiller-opendsi
f5af28e1fb NEW substitute expiration date (#26628) 2023-11-16 23:36:31 +01:00
sonikf
10e56262ea FIX #9598 (#26600)
* NEW: Add support for supplier recurring invoice

* NEW: Add support for supplier contract recurring invoice

* Add tests

* We must not force supplier to become customer

* FIX PHPCS

* fix wrong test
2023-11-16 23:29:00 +01:00
lvessiller-opendsi
3dd502b38f NEW subject and message paramaeters on notification hook (#26625) 2023-11-16 23:27:50 +01:00
moreauftheobald
3859335bdc Add entity management on contact list on thirdparty card (#26629) 2023-11-16 23:26:38 +01:00
moreauftheobald
279343ee56 Ddevelop fix product class (#26632)
* Add entity management on contact list on thirdparty card

* Correction On procduct class files "Access to an undefined property"
2023-11-16 23:26:08 +01:00
John BOTELLA
5736f9f8ec Set main feature level from 2 to 1 for MAIN_ACTIVATE_VALIDATION_RESULT (#26634) 2023-11-16 23:22:35 +01:00
Eric
c9ea039ac5 Fix salary socid (#26635)
* nom (deprecated) -> name

* fix this->socid undefined
2023-11-16 23:22:22 +01:00
Eric
f175fc27f6 fix phpstan undef property (#26640) 2023-11-16 23:19:33 +01:00
Frédéric FRANCE
c6846d8036 increase phpstan level (#26642) 2023-11-16 23:17:02 +01:00
Frédéric FRANCE
d4eea462b9 fix phpstan (#26641) 2023-11-16 23:16:21 +01:00
Eric
1b42495a18 fix undef pmp (#26643) 2023-11-16 23:15:41 +01:00
Eric
ae0ce54497 errors -> error and errorss -> errors (#26644) 2023-11-16 23:15:10 +01:00
Laurent Destailleur
f5af021407 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-16 15:50:06 +01:00
MDW
e47811a710 QUAL Improve spelling in documentation strings/text (#26611) 2023-11-16 15:33:55 +01:00
Alexandre SPANGARO
631a5ea066 Invoice - payment list - Manage Checkbox on left column (#26604) 2023-11-16 15:32:50 +01:00
Laurent Destailleur
e910c3fa4e CSS 2023-11-16 15:14:01 +01:00
Lucas Marcouiller
68d996b482 fix some phpstan errors (#26608)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-11-16 15:01:46 +01:00
Pascal Hubrecht
13f2ae60ef fix duplicate index in llx_expensereport (#26614) 2023-11-16 15:00:42 +01:00
Maxime Kohlhaas
6d749046a1 Fix SQL migration 18-19 (#26626) 2023-11-16 14:56:09 +01:00
Laurent Destailleur
29e616fa8b CSS 2023-11-15 19:26:14 +01:00
Laurent Destailleur
599632c671 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-11-15 11:47:58 +01:00
Laurent Destailleur
0cc541bb4a Standardize fields 2023-11-15 11:47:15 +01:00
Laurent Destailleur
ed81003169 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-14 23:15:15 +01:00
Laurent Destailleur
db8662f8e2 Doc 2023-11-14 23:14:59 +01:00
thomas-Ngr
d5bb63df5d Reception dispatch : copy previous entrepot (#26597) 2023-11-14 22:39:18 +01:00
Laurent Destailleur
c0510fc0f5 Debug v19 2023-11-14 20:59:31 +01:00
Charlène Benke
8c8e806a8f NEW : extrafields based on fontawesome (#26598)
* NEW : extrafields based on fontawesome

allow to define a field contain a icon based on fontawesome
on input we have an icon picker
on ouput we display the icon

* Update extrafields.class.php

* Update extrafields.class.php

* Update extrafields.class.php
2023-11-14 20:51:43 +01:00
lamrani abdelwadoud
c082074129 NEW functionality for clone job profile (#26599)
* NEW functionality for combined salary invoice and supplier invoice

* remove print_r

* NEW functionality for clone jobProfile
2023-11-14 18:21:15 +01:00
Laurent Destailleur
102d782d9e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-14 18:04:06 +01:00
Laurent Destailleur
6d51b53ff4 Doc 2023-11-14 18:03:56 +01:00
Charlène Benke
849b148813 positioning arrayfields definition befor doactions hook (#26595)
If the definition of arrayfields are after, we can't change the content of the array list like on the other page
2023-11-14 18:01:54 +01:00
Laurent Destailleur
0072986060 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-14 17:59:59 +01:00
Laurent Destailleur
d9df238ac4 Clean code and prepare database for reception from any source 2023-11-14 17:33:50 +01:00
sonikf
0fbc5bd423 NEW: Supplier template invoive extrafields (#26570)
* NEW: Supplier template invoive extrafields

* NEW: Supplier template invoive extrafields

* NEW: Supplier template invoive extrafields
2023-11-14 14:46:48 +01:00
Frédéric FRANCE
79b4c0f1b9 clean code (#26585)
* clean code

* Update commoninvoice.class.php

* Update commoninvoice.class.php
2023-11-14 14:43:54 +01:00
Frédéric FRANCE
213ebc5e26 fix phpstan (#26592)
htdocs/core/modules/propale/doc/pdf_azur.modules.php	1312	Undefined variable: $resteapayer
2023-11-14 14:25:04 +01:00
Thibault Fiacre
e9fc774afc NEW stock transfert module is now stable (#26594) 2023-11-14 14:22:32 +01:00
Alexandre SPANGARO
b56b93e901 Cheque - List - Dolibarize (#26583)
* Cheque - List - Dolibarize

* Double <tr class="liste_titre_filter">

* Remove double printFieldListWhere

* fix removefilter on date
2023-11-14 12:02:58 +01:00
Laurent Destailleur
4ecab54c28 Fix phpunit 2023-11-14 12:02:09 +01:00
Charlène Benke
a258d4193b FIX : Cleaning code 2023-11-14 10:43:26 +01:00
lvessiller-opendsi
5fdfa4b971 NEW order by batch number in product batch find all method (#26486)
* NEW order by batch number in product batch find all method

* Remove const PRODUCTBATCH_ORDER_BY_BATCH_NUMBER
2023-11-14 02:47:12 +01:00
Laurent Destailleur
0770ce640e Debug v19 2023-11-14 02:42:02 +01:00
sonikf
e861372512 fix label placement (#26580) 2023-11-14 02:30:54 +01:00
Laurent Destailleur
c5e204b1b0 Doc 2023-11-14 02:04:08 +01:00
sonikf
7a6d60160f Enable by default standalone credit note and invoice subtype for Greece (#26562) 2023-11-14 01:56:26 +01:00
Frédéric FRANCE
d46988fe62 add missing migration table index (#26576) 2023-11-14 01:54:29 +01:00
Regis Houssin
c9d2d77fef NEW add barcode function to check if EAN13 is valid (#26567) 2023-11-14 01:54:04 +01:00
Mohamed DAOUD
eba4756156 Fix some warnings -technical debt- (#26514)
* fix-warnings

* fix the last commit

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-14 01:52:42 +01:00
Frédéric FRANCE
310e67aa48 add extrafields count (#26578) 2023-11-14 01:50:45 +01:00
Laurent Destailleur
c920428d84 Fix bug in ckeditor when used in mode readonly 2023-11-14 01:48:44 +01:00
Laurent Destailleur
804ee3b517 Debug v19 and option MAIN_DISALLOW_URL_INTO_DESCRIPTIONS 2023-11-14 01:32:42 +01:00
Laurent Destailleur
ca3f5eaadf Debug v19 2023-11-14 00:56:30 +01:00
Alexandre SPANGARO
c6551dc1ad Review salaries (#26560)
* Avoid some warnings PHP8.x

* Refer to $permissiontoxxx & review

* Review $title

* Refer to $permissiontoxxx & review

* Refer to $permissiontoxxx & review
2023-11-13 21:07:38 +01:00
Frédéric FRANCE
a11b4ed8b0 fix phpstan (#26569) 2023-11-13 21:00:59 +01:00
atm-sami
3406ebbe3b New add extrafields for mo line with sql (#26564)
* added recursive deletion option for child MOs + added recursive recovery method for child MOs

* add number of MOs in form_confirm

* update to delete number of mo childs if is null

* added checking of an infinity loop

* review PR

* add extrafields for mo line with SQL
2023-11-13 20:58:23 +01:00
Eric
058f2ec844 nom (deprecated) -> name (#26571) 2023-11-13 20:57:01 +01:00
Saami PERDRIX
398ad8d1f7 L'entrée de menu GRH > Notes de frais > Règlements n'est plus affiché (#26572)
quand le module banque est désactivé
2023-11-13 20:56:41 +01:00
Saami PERDRIX
a22a3ed7b4 Fix: ajout indemnites kilometriques non fonctionnels avec mariadb >= 10.6 (#26574) 2023-11-13 20:49:58 +01:00
Laurent Destailleur
6173075b73 SEC: Fix #yogosha18324 2023-11-13 20:46:06 +01:00
Laurent Destailleur
31b5528151 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-13 19:08:50 +01:00
Laurent Destailleur
d5139398cd Remove warning we should not have in a common usage. 2023-11-13 19:08:33 +01:00
Laurent Destailleur
967d7747cd css 2023-11-13 15:44:31 +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
c8c8618e55 Debug v19 2023-11-13 15:17:55 +01:00
Laurent Destailleur
f36154a14f css 2023-11-13 14:26:34 +01:00
Laurent Destailleur
d86159409d Doc 2023-11-13 14:03:14 +01:00
Frédéric FRANCE
400128243b confirm delete extrafield (#26565) 2023-11-13 13:01:14 +01:00
Laurent Destailleur
69642e1048 Fix missing the src type and id when uploading a file as a message of
ticket
2023-11-13 12:36:38 +01:00
Laurent Destailleur
7659bba97a Fix bad delete of lines into llx_ecm_files 2023-11-13 12:24:47 +01:00
Laurent Destailleur
20321d67da Prepare 19.0 2023-11-13 10:18:10 +01:00
Laurent Destailleur
46662c1ed4 Prepare freeze 2023-11-13 03:31:35 +01:00
Laurent Destailleur
3d3a7ff497 Fix tool 2023-11-13 03:18:44 +01:00
Laurent Destailleur
8fd688bb51 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-11-13 02:59:22 +01:00
Laurent Destailleur
2d6559d74f Fix warning 2023-11-13 02:42:47 +01:00
Alexandre SPANGARO
7fa9fb80fa FIX #25967 Supplier export - Missing filter on accountancy buy account (#26559) 2023-11-12 23:33:28 +01:00
Laurent Destailleur
a48e541093 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/core/class/html.formadmin.class.php
	htdocs/core/lib/functions.lib.php
2023-11-12 23:18:19 +01:00
sonikf
65b9f4e6de NEW: Add invoice subtype in customer template invoice (#26543)
* Add invoice subtype in template invoice

* Add invoice subtype in template invoice

* Add invoice subtype in template invoice
2023-11-12 22:08:46 +01:00
Klaas Oldenburger
a1c295185d Update main.lang (#26546)
correcting date short format to dutch settings
2023-11-12 21:59:28 +01:00
daraelmin
0ca99264a6 grey in bright mode 2023-11-12 18:02:04 +01:00
Laurent Destailleur
b709de584c Debug v19 2023-11-11 15:35:23 +01:00
Laurent Destailleur
b6b63b8655 Typo 2023-11-11 15:02:24 +01:00
Laurent Destailleur
b702928190 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-11 13:44:20 +01:00
Laurent Destailleur
3ecbab81cd Close #26542. The PR was not atomic and contains both a fix for a
control and a change in priority of lines processed. This generated
conflicts in merge process with old version. So I try to report the most
important (the fix) manually.
2023-11-11 13:32:16 +01:00
andreubisquerra
3a87df33a8 NEW TakePOS compatibility with lots and serials (#26426)
* NEW TakePOS compatibility with lots and serials

* Travis FIX

* Remove special_code

* Last improvements

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-11 12:23:12 +01:00
sonikf
455dcd8eb9 NEW: Propagate invoice extrafields into template invoice (#26529)
* NEW: Propagate invoice extrafields into template invoice

Also rearrange form fields to be on par with other invoice creation screens look and feel

* fix PHPCS
2023-11-10 19:03:39 +01:00
lamrani abdelwadoud
5a105ad462 NEW functionality for combined salary invoice and supplier invoice (#26541)
* NEW functionality for combined salary invoice and supplier invoice

* remove print_r
2023-11-10 19:00:30 +01:00
lamrani abdelwadoud
07d2d6b861 NEW functionality for get bon prelevement in ligne order (#26540)
* Fix massaction checkbox for display it on right side

* get all order lines request
2023-11-10 18:56:52 +01:00
lamrani abdelwadoud
d549b06295 NEW clone skill object (#26526) 2023-11-10 18:53:32 +01:00
sonikf
c18588550b NEW: Add invoice subtype in template invoice (SQL part) (#26535)
* Add column subtype

* Add column subtype

* Add column subtype in llx_facture_rec and llx_facture_fourn_rec
2023-11-10 18:52:17 +01:00
lamrani abdelwadoud
c4b2555667 Fix massaction checkbox for display it on right side (#26539) 2023-11-10 18:49:20 +01:00
Frédéric FRANCE
3c31401c9c fix auguria init (#26534)
* fix auguria init

* fix auguria init

* fix auguria init
2023-11-10 18:48:18 +01:00
Frédéric FRANCE
ed9d5ce2c3 fix phpstan (#26537) 2023-11-10 18:45:52 +01:00
lamrani abdelwadoud
01d3526d8d FIX sql request in function checkIfSalary (#26538)
* fix sql request in function checkIfSalary

* Update bonprelevement.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-10 18:45:20 +01:00
Laurent Destailleur
44227666d3 NEW Better protection against reserved words 2023-11-10 18:20:02 +01:00
Laurent Destailleur
6cdb7c929a Debug v19 2023-11-10 15:10:41 +01:00
Laurent Destailleur
07d5a937e7 css 2023-11-09 17:47:10 +01:00
Laurent Destailleur
f601be4764 CSS 2023-11-09 16:04:05 +01:00
Laurent Destailleur
3118b9fb4c Debug v19 2023-11-09 15:50:42 +01:00
Laurent Destailleur
e36e3c8421 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-09 15:44:28 +01:00
Laurent Destailleur
955af0695e Fix return code 2023-11-09 15:44:17 +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
398077462c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-09 14:29:05 +01:00
Laurent Destailleur
c16ac9b7de Debug v19. Prepare compatibility 8.2 2023-11-09 14:28:50 +01:00
Laurent Destailleur
991c1fe6e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-11-09 11:51:52 +01:00
Mohamed DAOUD
6db7c487d2 NEW #19501 Add two hooks in dolreceiptprinter.php (#26439)
* Add two hooks in dolreceiptprinter.php

* fix PHPCS error

* fix PHPCS errors
2023-11-09 11:47:10 +01:00
Laurent Destailleur
a9f8b1d8bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-09 11:31:38 +01:00
Laurent Destailleur
8a5d57b09a Debug v19 2023-11-09 11:31:16 +01:00
Laurent Destailleur
4cd4221a52 Debug v19. Remove some TODO. 2023-11-09 10:56:13 +01:00
lamrani abdelwadoud
b36f758810 NEW Get list evaluation with skills details in user fiche (#26510)
* get eval in ficheUser

* get evaluation with details in skill section for user

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-08 20:38:11 +01:00
lvessiller-opendsi
2ff8ddb4fa NEW lazy load to substitute project variables (#26451)
* NEW lazy load to substitute project variables

* FIX load class file

* Keep key to substitute if no link with project
2023-11-08 17:30:51 +01:00
Mohamed DAOUD
00cbaa094c fix-warnings (#26500) 2023-11-08 17:26:00 +01:00
V-Py
7f0da987a3 Fix #26504 Default value extrafield line object (#26506) 2023-11-08 17:25:07 +01:00
sonikf
b97413e7f7 fix translation and typos (#26502)
* fix translation

* fix typo

* fix typo

* fix typo

* fix translation
2023-11-08 17:23:26 +01:00
Laurent Destailleur
6288b803ea Debug v19 2023-11-08 17:22:34 +01:00
Laurent Destailleur
cc6d960d78 Debug v19 2023-11-08 16:30:01 +01:00
Laurent Destailleur
ccfaaeb03b Debug v19 2023-11-08 16:25:49 +01:00
Laurent Destailleur
d177b8e133 Fix phpcs 2023-11-07 21:13:23 +01:00
Laurent Destailleur
85977fa402 Sync transifex 2023-11-07 21:10:28 +01:00
Laurent Destailleur
6ea4c4d732 Sync transifex 2023-11-07 21:06:44 +01:00
Laurent Destailleur
f96e3a6771 Translate 2023-11-07 21:03:05 +01:00
Laurent Destailleur
f92a8fb63f Trans 2023-11-07 20:59: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
Frédéric FRANCE
22a37bf36a QUAL group all flag images into 1 sprite file. (#26459)
* add flag sprite

* add missing

* wip

* wip

* add script used to generate flags sprite

* add script used to generate flags sprite

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-07 18:52:08 +01:00
sonikf
edac1bb6cc Add missing info for proper use and creation of template invoice (clients and vendors) (#26475)
* Add missing info for proper use and creation of template invoice

* Add missing info for proper use and creation of template invoice

* fix trans of generated invoice
2023-11-07 18:18:06 +01:00
Pichi1966
8acc47220d Update stockatdate.php (#26481)
As commented in #23782 this update is to clean and clarify the code for future evolution of stocktodate.
In fact the calculated value in the SQL request is the current stock value and not the estimated stock value at date value.
Therefore I changed in SQL request the estimatedvalue to currentvalue and reused as a variable for a better understanding and for future use (other PR) as it will be interesting to get a comparison between stockatdate value to currentstock value. Also some others changes are required to improve the page speed.
2023-11-07 18:07:46 +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
Christophe Battarel
455c061172 add hook tabContentEditThirdparty (#26487)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-07 17:59:44 +01:00
Christophe Battarel
221f497e0f add hook tabContentViewThirdparty (#26488)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-07 17:59:05 +01:00
Christophe Battarel
57d6aee0d9 add hook tabContentCreateThirdparty (#26489)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-07 17:58:52 +01:00
Mohamed DAOUD
1e053e4d7f fix-warnings-1 (#26490) 2023-11-07 17:58:35 +01:00
jyhere
f5cf5b6399 CHANGE: Allow local media in wysiwyg if dolibarr on private network (#26494) 2023-11-07 17:50:28 +01:00
Laurent Destailleur
d71e396206 css 2023-11-07 15:51:31 +01:00
Laurent Destailleur
fd846e3ad0 CSS v19 2023-11-07 15:43:37 +01:00
Laurent Destailleur
74ff2acc6c Debug v19 2023-11-07 15:03:45 +01:00
Laurent Destailleur
1e2d06bf80 Debug v19 2023-11-07 14:18:33 +01:00
Laurent Destailleur
e5d9fb10e5 Debug v19 2023-11-07 13:12:07 +01:00
Laurent Destailleur
dc8616a110 Fix multicompany 2023-11-07 11:12:44 +01:00
Laurent Destailleur
cb81978080 NEW Add field TechnicalID in list of users 2023-11-07 11:07:31 +01:00
Laurent Destailleur
dc07b9f567 Debug v19 2023-11-07 10:55:23 +01:00
Laurent Destailleur
e6f9609eb4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-11-07 10:51:32 +01:00
Laurent Destailleur
be58db508d Debug v19 2023-11-07 10:51:00 +01:00
Laurent Destailleur
9322554a6f Fix responsive 2023-11-07 02:36:18 +01:00
Laurent Destailleur
de3fec95f5 Debug v19 2023-11-07 02:27:47 +01:00
Laurent Destailleur
7de48435ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-07 01:06:08 +01:00
Laurent Destailleur
d9674b1828 Clean code 2023-11-07 01:05:54 +01:00
Laurent Destailleur
78600b0f61 Trans 2023-11-06 21:01:15 +01:00
Laurent Destailleur
659cdfa975 Add a test with a german char 2023-11-06 20:35:41 +01:00
Laurent Destailleur
8ec367406d Clean code 2023-11-06 20:23:33 +01:00
Laurent Destailleur
75ac561595 Fix warnings 2023-11-06 20:08:27 +01:00
Laurent Destailleur
9ef047e75e Doc 2023-11-06 20:02:47 +01:00
Laurent Destailleur
ca78eff61f Fix round 2023-11-06 20:00:16 +01:00
Laurent Destailleur
3bd677ffb9 Debug v19 2023-11-06 19:59:19 +01:00
Laurent Destailleur
c154a72d88 Debug v19 2023-11-06 19:32:04 +01:00
Laurent Destailleur
09e504c18e Debug v19 2023-11-06 17:26:13 +01:00
Laurent Destailleur
96db44174e css 2023-11-06 17:20:42 +01:00
Laurent Destailleur
6fc0a868f5 Debug v19 2023-11-06 16:51:37 +01:00
Laurent Destailleur
27d2a1a220 Debug v19 2023-11-06 16:34:35 +01:00
Laurent Destailleur
56bb63c388 Debug v19 2023-11-06 16:29:00 +01:00
Laurent Destailleur
f1b436451e Debug v19 2023-11-06 16:26:44 +01:00
Laurent Destailleur
7cd178e3f9 Debug v19 2023-11-06 16:25:26 +01:00
lamrani abdelwadoud
23ce23021f NEW functionality for request_transfer (#26078)
* NEW functionality for request_transfer

* fix problem

* fix problem in transferBank

* fix request sql

* ajust functions for salary invoices

* add badges for each onglet invoice and salary

* Fix update in table bon_prelevement for amount

* Fix in section virement_request list of bonPrelevements

* for prelevemts lignes

* for prelevemts lignes

* update sql for get lignes prelevement with correct info

* update sql for get lignes prelevement with correct info

* add function for check if invoice salaries

* adjust bonprelevement for get salaries

* fix incoherences in create function for class BonPrelevement

* fix request sql for insert in prelevement ligne table

* fix problems and incoherences

* remove parametre  from function

* add parenthensises for cast  in sql request

* disable button when make demande virement

* fix condition for type

* fix conflit "

* fix whitespace

* fix condition for sourcetype

* fix page demandes.php for list salaries invoices

* add prefix db

* fix incoherences for conditions

* Update virement_request.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-06 16:09:05 +01:00
Mohamed DAOUD
a1597e6eb1 Fix some warnings -technical debt- (#26466)
* fix warnings 1

* fix previous commit 1

* Update facture-rec.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-06 16:00:24 +01:00
Laurent Destailleur
b962cce609 Code comment 2023-11-06 15:26:57 +01:00
Laurent Destailleur
1e0598cc73 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-06 14:00:21 +01:00
Laurent Destailleur
7f2f902f11 Clean code 2023-11-06 14:00:02 +01:00
Laurent Destailleur
ed8e12aee7 PERF: Removed a useless fetch_thirdparty 2023-11-06 13:36:26 +01:00
atm-lena
85beb3ea5d Unit Management for MO lines (#26120)
* Unit Management for products in bom and mo

* WIP

* Unit in to produce tab

* FIX wip

* float val

* Fix Travis

* fk_unit type int

* Clean code

* Clean code

* FIX code sniffer

* Update llx_mrp_production.sql

* Update 18.0.0-19.0.0.sql

---------

Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-06 11:15:43 +01:00
antonin_tdj
78f1b2f02b Fix Bad Behaviour custom constant (#26462) 2023-11-06 10:56:27 +01:00
Laurent Destailleur
54e598c3cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-06 01:44:47 +01:00
Laurent Destailleur
6d97542bbf FIX label of menu entry 2023-11-06 01:43:45 +01:00
sonikf
ab41ccf314 fix #26050 #26225 and fiscal year report (#26456) 2023-11-06 01:40:03 +01:00
Laurent Destailleur
7624035bd1 Code comment 2023-11-06 01:32:30 +01:00
Laurent Destailleur
59661e917f Clean code 2023-11-06 01:19:17 +01:00
Laurent Destailleur
604b01e803 Show error message 2023-11-06 00:56:44 +01:00
Laurent Destailleur
98f92b1bbc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-06 00:53:26 +01:00
Laurent Destailleur
fe0eb11d16 Fix missing migration 2023-11-06 00:52:21 +01:00
andreubisquerra
0214df1fbd fk_entrepot fix (#26465) 2023-11-06 00:36:49 +01:00
Laurent Destailleur
2198335e37 css 2023-11-06 00:35:32 +01:00
Laurent Destailleur
b65d5c8740 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-05 19:52:54 +01:00
Laurent Destailleur
7b464fa8f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-11-05 19:39:35 +01:00
Laurent Destailleur
67f1d4345a Doc 2023-11-05 18:59:47 +01:00
Laurent Destailleur
8622ce6601 Debug v19 2023-11-04 18:11:26 +01:00
Laurent Destailleur
78f443e87b Debug v19 2023-11-04 17:05:59 +01:00
Laurent Destailleur
2a2dec2f88 Debug v19 2023-11-04 16:02:24 +01:00
Laurent Destailleur
c0ab3e0dff Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-04 13:10:00 +01:00
Laurent Destailleur
93746a805a Close #321 2023-11-04 13:02:18 +01:00
Florian Mortgat
73524c2f81 [modulebuilder] FIX handling of the $filter parameter in fetchAll() method (#25931)
* FIX handling of the $filter parameter for fetchAll: the previous version can result in invalid SQL

* Remove #[AllowDynamicProperties] attribute from Conf class (cf. PR #25931)

* Ensure sql-building strings are detectably sanitized to avoid PR rejection
2023-11-03 23:01:57 +01:00
Christophe Battarel
8f54413a69 add hook tabContentCreateSupplierInvoice (#26430)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 20:58:49 +01:00
Christophe Battarel
12ae62b2af NEW : add hook tabContentViewSupplierInvoice (#26431)
* add hook tabContentViewSupplierInvoice

* wrong hook name

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 20:58:33 +01:00
Christophe Battarel
975b49b269 add hook tabContentViewSupplierProposal (#26432)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 20:58:24 +01:00
Christophe Battarel
bd2fe307cd add hook tabContentCreateSupplierProposal (#26433)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 20:58:15 +01:00
Christophe Battarel
5c3069e51a add hook tabContentCreateProduct (#26434)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 20:58:04 +01:00
Christophe Battarel
20b99b6a98 add hook tabContentViewProduct (#26435)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 19:59:23 +01:00
Christophe Battarel
fccc2c1824 add hook tabContentEditProduct (#26436)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-03 19:58:42 +01:00
thibdrev
3b30a94e43 fix error message ErrorThisBankReceiptIsAlreadyUsed is not translated (#26448)
* fix missing translation for ErrorThisBankReceiptIsAlreadyUsed

* add translation key to fr_FR

* modify error message key in releve.php
2023-11-03 16:30:29 +01:00
Lenin Rivas
1e6788aec6 NEW Manage rate indirect. (#26449)
* Indirect exchange rate

* Indirect exchange rate

* Indirect exchange rate

* Indirect exchange rate
2023-11-03 16:29:40 +01:00
HENRY Florian
a3437c7207 fix: display details quantity in Kit in PDF #26359 (#26454)
* add detail qty in kit displayed in PDF line

* fix: #26359
2023-11-03 16:27:02 +01:00
daraelmin
61bf0aad74 FIX darkmode for public subscription page 2023-11-02 15:46:41 +01:00
Laurent Destailleur
99f50e5fa1 Fix comment 2023-11-02 14:12:57 +01:00
Laurent Destailleur
440baec6e7 Debug v19 2023-11-02 02:04:09 +01:00
Laurent Destailleur
534f545ace Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-02 02:00:17 +01:00
Laurent Destailleur
b92d685940 Debug v19 2023-11-02 01:59:51 +01:00
daraelmin
63ccf17402 FIX #24367 - membership duration is the default duration adhtype (#26428)
* FIX #24367 - membership duration is the default duration adhtype

* avoid error for old database

* avoid error for old database

* Update paymentok.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-02 01:33:46 +01:00
Laurent Destailleur
d0d937f2e7 Tool to calculate nb of commits and developers for each version branch 2023-11-01 20:08:01 +01:00
Laurent Destailleur
2e863d7bf2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-01 16:34:37 +01:00
Laurent Destailleur
a1f4c0c635 NEW Enhance github_commits_perversion to get more stats on git commits 2023-11-01 16:34:20 +01:00
ptibogxiv
b3a08fc0c7 Fix v19 look on shipment.php (#26427) 2023-11-01 15:56:51 +01:00
Laurent Destailleur
f9c29489d6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-01 15:52:32 +01:00
Laurent Destailleur
0708f0c53f Add fields to allow batch management into POS module 2023-11-01 15:52:02 +01:00
Laurent Destailleur
0562f89347 Can find a stock id from a couple batch-warehouse 2023-11-01 15:35:29 +01:00
ptibogxiv
2adb0b5213 NEW shipment can include service (for information and invoicing) (#26407)
* NEW shipment can include service (for information and invoicing)

add an optionnal option for include service on shipment because some business need invoicing only from shipment so actually dont get services on invoice autmatically.

this is a first PR for validation of this secret option before upload other PR

* Update shipment.php

* Update card.php
2023-11-01 15:02:40 +01:00
Alexandre SPANGARO
ba458ddfd6 Review of ledger display (#26423)
* Review of ledger display

* typo

* Update listbyaccount.php

* Update listbyaccount.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-01 15:00:48 +01:00
Christophe Battarel
23c944a104 NEW : customize position in complete_head_from_modules (#26406)
* NEW : customize position in complete_head_from_modules

* fix parenthesis search

* fix position search

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-01 15:00:29 +01:00
manavb2214
80734cc945 Update CONTRIBUTING.md (#26412)
Fixed a Typographical Error.
2023-11-01 14:25:48 +01:00
Christophe Battarel
9580f5bc11 add hook tabContentCreateProposal (#26411)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-01 14:25:33 +01:00
Christophe Battarel
b3e7457cd3 NEW : add new hook tabContentCreateOrder (#26408)
* NEW : add new hook tabContentCreateOrder

* update comment

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-01 14:25:26 +01:00
Christophe Battarel
3afaa266c3 add hook tabContentCreateInvoice (#26413)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-01 14:25:14 +01:00
manavb2214
de0fe8ee85 Update CONTRIBUTING.md (#26415)
Fixed Typo Error.
2023-11-01 14:24:56 +01:00
Christophe Battarel
13072a1df2 add hook tabContentViewSupplierOrder (#26417)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-01 14:24:31 +01:00
Christophe Battarel
002f10a9aa NEW : add hook tabContentCreateSupplierOrder (#26418)
* add hook tabContentViewSupplierOrder

* wrong hook name

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-11-01 14:24:10 +01:00
manavb2214
af4638657e Update CONTRIBUTING.md (#26420)
Fixed typo error.
2023-11-01 14:23:42 +01:00
Alexandre SPANGARO
e2debe7cd8 FIX Accountancy - Journal - problem with displaying label in getNomUrl (#26424) 2023-11-01 14:23:24 +01:00
Laurent Destailleur
f18e7dd8b2 Look and feel v19 2023-11-01 12:55:31 +01:00
Laurent Destailleur
74e1ec4099 FIX On object validation, ecm index are not updated for uploaded files 2023-10-31 19:28:11 +01:00
Laurent Destailleur
a0c5dffacb Fix must update facture_fourn_rec when merging thirdparties 2023-10-31 18:18:15 +01:00
Laurent Destailleur
774cfce57b Fix must update facture_fourn_rec when merging thirdparties 2023-10-31 18:15:15 +01:00
Laurent Destailleur
494908f1d2 Fix when using non standard action and canvas 2023-10-31 17:53:35 +01:00
Laurent Destailleur
edaab57f2e Endpoint for API /partnershipapi and /recruitment has been renamed into
/partnerships and /recruitments to follow name conventions.
2023-10-31 13:37:15 +01:00
Laurent Destailleur
ca145ef912 QUAL: Endpoint for API /partnershipapi has been renamed into
/partnerships to follow conventions
2023-10-31 13:31:02 +01:00
Laurent Destailleur
ecd4c7bbc7 Comment 2023-10-31 13:05:27 +01:00
Laurent Destailleur
f8a773591c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-31 13:03:11 +01:00
Laurent Destailleur
fb65ad919e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-31 13:03:04 +01:00
atm-sami
cfdc3d1af3 NEW add recursive deletion option for child m os (#26102)
* added recursive deletion option for child MOs + added recursive recovery method for child MOs

* add number of MOs in form_confirm

* update to delete number of mo childs if is null

* added checking of an infinity loop

* review PR
2023-10-31 12:25:59 +01:00
Laurent Destailleur
e308e0046f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-31 12:00:29 +01:00
Laurent Destailleur
571520717d Redo forgotten migration instruction in v18 2023-10-31 11:59:57 +01:00
Florent Poinsaut
7bcd6c2a3a FIX #25793 V18.0.1 : Cannot add time spent (#26405) 2023-10-31 11:59:07 +01:00
Christophe Battarel
1a32455e70 update comment and credentials (#26401)
* update comment

* update credentials

* remove bad commit

* update credentials

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-31 11:57:53 +01:00
jyhere
d2355e91e9 NEW: add a $notrigger param to Product::updatePrice() method (#26404)
* NEW: add a $notrigger param to Product::updatePrice() method

* Update product.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-31 11:57:25 +01:00
Christophe Battarel
4c8870f205 add hook tabContentViewInvoice (#26402)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-31 11:54:39 +01:00
Christophe Battarel
010f2cd9b8 New : Add hook tabContentViewProposal (#26400)
* add hook tabContentViewProposal

* update credentials

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-31 11:54:18 +01:00
Laurent Destailleur
cf6dac2d1f css if stock negative 2023-10-31 11:50:07 +01:00
Francis Appels
ee269b4608 FIX: update product with stock to lot or serial type. (#23002)
* git init

* Fixing style errors.

* Add split of serial defaults

* Fix remaining part

* Fix on  remaining decimal part

* Revert "Fix on  remaining decimal part"

This reverts commit b91f884ddc.

* Revert "Fix remaining part"

This reverts commit 35a6631b29.

* Revert "Add split of serial defaults"

This reverts commit 37009afcbc.

* Remove split for serial numbers and replace by error message.

* Fix stickler CI

* Fix missing product id for lot number fetch

* Allow update for data consistency, but show warning in stock card and stocks by lot/serial list

---------

Co-authored-by: Francis Appels <francis@vps399724.ovh.net.novalocal>
Co-authored-by: stickler-ci <support@stickler-ci.com>
2023-10-31 11:47:38 +01:00
Francis Appels
48ddc2408a New allow modify stock_theorique, not only replace by hook. (#26398) 2023-10-31 11:39:28 +01:00
Laurent Destailleur
59b9d12ed5 FIX upload of files src_object_type 2023-10-31 10:44:58 +01:00
Laurent Destailleur
1a8176253c Debug v19 2023-10-31 10:36:04 +01:00
Laurent Destailleur
9132bbc7b6 Fix mysql 2023-10-31 10:33:13 +01:00
Laurent Destailleur
28ec65f602 Fix php compatibility 2023-10-31 00:50:44 +01:00
Laurent Destailleur
8f91e6bce8 FIX src_object_id and ttype not filed when uploading a file with API. 2023-10-31 00:47:55 +01:00
Laurent Destailleur
b6be0eb34e Add column oauth2_email 2023-10-31 00:21:46 +01:00
Laurent Destailleur
4dce3a2a71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-31 00:15:49 +01:00
Laurent Destailleur
564c5cd5e8 Debug v19 2023-10-31 00:15:31 +01:00
Laurent Destailleur
5d856b1007 Doc 2023-10-30 19:16:14 +01:00
Mohamed DAOUD
322b4d8be9 Adding __NEXT_MONTH_TEXT__ in mail template (#26391) 2023-10-30 18:04:42 +01:00
Laurent Destailleur
aab6d9af62 Fix trans 2023-10-30 17:37:18 +01:00
Laurent Destailleur
47f5a6396e Can edit label of a field of an object 2023-10-30 17:23:22 +01:00
Laurent Destailleur
1558772d83 Debug v19 2023-10-30 17:14:46 +01:00
Laurent Destailleur
b713ef80ff Debug v19 2023-10-30 16:32:35 +01:00
Laurent Destailleur
858e0dbf11 Fix php7.1 2023-10-30 14:26:21 +01:00
Laurent Destailleur
173fea5554 FIX badge on user skills tab 2023-10-30 14:23:27 +01:00
Laurent Destailleur
2649093815 Fix php 7.1 compatibility 2023-10-30 14:06:25 +01:00
Laurent Destailleur
b53d845085 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-30 13:39:28 +01:00
Laurent Destailleur
24e043934a Debug delete evaluation 2023-10-30 13:23:46 +01:00
William Mead
3c87423364 Qual cleaner code for InterfaceLogevents (#26347)
* Renamed text variable to label

* Added label variable

* Fixed typos

* Fixed PHPDoc

* Added runTrigger method return type

* Refactored to use super class constructor

* Added contributor details. Cleaned indentation.

* Added user login failed string

* Added label & description localized strings

* Converted event label, description & date variables to class properties. Added class method to initialize event data. Refactored & cleaned code.

* Added user string parameter

* Cleaned code

* Moved langs loading

* Added code comment

* Cleaned code

* Added code comment

* Fixed PHPDoc comments

* Refactored event label & description assignment

* Deleted unneeded empty lines

* Added event action text dictionary. Refactored event data initialization. Added static class method for dynamic localization to check if event text has an event action key n.

* Updated string parameter placement

* Added condition to check if event description has an event action key in order to do dynamic frontend translation

* Updated code comments. Renamed event action array.

* Added user status key

* Cleaned code

* Update interface_20_all_Logevents.class.php

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-30 04:12:43 +01:00
Mohamed DAOUD
08ef416958 New: Adding the PDF option displaying the product's barcode number (#26345)
* Add a PDF option to show barcode number of product

* Add space before and after IF keyword

* fix error phpcs

* add barcode label before barcode number

* Use outputlangs and not langs

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-30 03:13:12 +01:00
Mohamed DAOUD
636f9eaced Add column sales representative third party list (#26387)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-30 02:59:52 +01:00
Laurent Destailleur
b8728b5d07 Use a more explicit name for new hook 2023-10-30 02:39:06 +01:00
Christophe Battarel
c064893f80 NEW : add new hook OrderCard (#26380)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-30 02:30:35 +01:00
Vaibhav
9567c3fd23 Update README.md (#26388) 2023-10-30 02:26:09 +01:00
sonikf
26674ba5d1 fix typo (#26389) 2023-10-30 02:24:22 +01:00
Laurent Destailleur
16ea13ecb8 NEW Allow sync of currency rates with currency layer by default. 2023-10-30 01:38:20 +01:00
Laurent Destailleur
c13d1abd0c Debug v19 2023-10-29 17:55:02 +01:00
Laurent Destailleur
0158c3ff68 Debug v19 2023-10-29 17:36:00 +01:00
Laurent Destailleur
582a6f7f45 Debug v19 2023-10-29 16:44:41 +01:00
Laurent Destailleur
d285f03120 Debug v19 2023-10-29 14:54:27 +01:00
Laurent Destailleur
2368b29d77 Fix trans 2023-10-29 13:55:30 +01:00
Laurent Destailleur
9591f7bff2 Fix trans 2023-10-29 13:52:42 +01:00
Laurent Destailleur
fecd134099 Update doc 2023-10-28 02:27:49 +02:00
Laurent Destailleur
00e706120d Fix warning 2023-10-28 02:17:48 +02:00
Laurent Destailleur
20f4051a4b Clean code 2023-10-28 02:14:47 +02:00
Laurent Destailleur
cca296c3ab Clean code 2023-10-28 02:10:34 +02:00
Laurent Destailleur
6d7d698371 Debug v19 2023-10-28 02:06:07 +02:00
Laurent Destailleur
939cf8b200 FIX Popup on service ref when product module not enabled 2023-10-28 00:59:31 +02:00
Laurent Destailleur
8333410ca1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-28 00:07:17 +02:00
Laurent Destailleur
46bfae63a3 Responsive 2023-10-28 00:06:06 +02:00
Alexandre Janniaux
a7619ecc92 Workflow: code quality with early return (#26365)
* workflow: use setErrorsFromObject when suitable

* workflow: shipping: use early return in for loop

* workflow: shipping: combine to previous early return

* workflow: shipping: reindent after last changes

No functional changes.

* workflow: reception: use early return when suitable

* workflow: reception: use early return

* workflow: reception: reindent after last changes

No functional changes.

* workflow: ticket: use early return

* workflow: ticket: combine condition through an early return

* workflow: ticket: reindent after last changes

No functional changes.

* workflow: propal: remove else condition after terminal if

* Update interface_20_modWorkflow_WorkflowManager.class.php

* Update interface_20_modWorkflow_WorkflowManager.class.php

* Update interface_20_modWorkflow_WorkflowManager.class.php

* Update interface_20_modWorkflow_WorkflowManager.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-27 19:17:27 +02:00
Lucas Marcouiller
d8116b8ce4 Fix recruitement candidature cancel pre-action (#26386)
* Fix recruitement candidature cancel pre-action

* fix lang file

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-10-27 17:40:34 +02:00
Laurent Destailleur
05718dd43e Add performance index 2023-10-27 15:01:11 +02:00
Noé Cendrier
9138486c59 NEW filter on from/to period rather than month/year (#26378) 2023-10-27 12:47:11 +02:00
Laurent Destailleur
e5da68b3bd Debug v19 2023-10-26 21:16:04 +02:00
Laurent Destailleur
e68d5ebc35 Debug v19 2023-10-26 21:11:36 +02:00
Laurent Destailleur
197f0a19ec NEW Add more param on fetch() to prepare perf optimization 2023-10-26 21:05:37 +02:00
Laurent Destailleur
a4218a142c Look and feel v19 2023-10-26 18:11:34 +02:00
Laurent Destailleur
3403f35753 Code comment 2023-10-26 18:00:23 +02:00
andreubisquerra
4761d70cd9 NEW Default customer, category and product when enable TakePOS (#25031)
* Default customer, category and product when enable TakePOS

* Update cashdesk.lang

* Default category and product when enable TakePOS

Easy setup for TakePOS. Create a category and product when TakePOS is enabled. It checks if TakePOS has already been configured to avoid recreating the category and productif it has already been created.

* Update modTakePos.class.php

* Update modTakePos.class.php

* Update cashdesk.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-26 17:58:42 +02:00
Christophe Battarel
11c1094b76 FIX : TakePOS - fix option TAKEPOS_PRODUCT_IN_STOCK must read on the POS warehouse (#24809)
* fix stock displayed

* fix php8

* fix php8

* fix

* php8

* fix group by

* fix empty

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-26 17:49:19 +02:00
Laurent Destailleur
9d25ea418f Clean code to use getDolGlobalInt 2023-10-26 17:45:03 +02:00
lamrani abdelwadoud
40fb7c5fa7 FIX Payement infos for Fournisseur add change company condition for get default infos (#26305)
* add change company condition for get default infos

* fix it for compta/facture also
2023-10-26 17:12:57 +02:00
Alexandre SPANGARO
145cfcbb26 NEW : Allow to have products not managed in stocks - SQL Part (#26190)
* NEW : Allow to have products not managed in stocks - SQL Part

* Update as proposed
2023-10-26 16:34:17 +02:00
Alexandre Janniaux
c3b3840f08 QUAL Refactor merging companies and fix #26272 with Reception objects (#26320)
* societe: add missing model_pdf field

The field is used by the class but wasn't declared.

* societe: expose Societe::mergeCompany

The code is directly copied from societe/card.php with as less changes
as possible.

The original code came from deb91ad7c1.

* societe: remove fields from property copy

$phone_pro and $fk_project are not existing for societe. This was added
from deb91ad7c1.

* SocieteTest: test the merge functionality

This test is a simple smoke test to check that the mergeCompany() will
work correctly on simple case and actually merge the details of the
company.

More complex deduplication pattern with objects referencing the deleted
Societe object, will be written for each of the different object class
in their respective test file.

* societe: card: use the new mergeCompany function

Since the code is almost the same, there should be no differences in
behaviour right now.

* societe: api_thirdparties: use Societe::mergeCompany()

* societe: fix issue when merging companies

When a Societe object is merged against another, its related objects are
supposed to reference the new Societe object so that the databse doesn't
raise foreign key errors.

The list references the objects that need to be transformed, and
Reception objects weren't part of this list.

Fix #26272

* ReceptionTest: check company merge hook

Before a Societe object is destroyed from the database, every object
referencing the FK should be destroyed or should reference another
object.

In the case of two companies being merged, the case arises and Reception
objects need to be moved to the new company. This commit brings a
non-regression test for this case.

Refs #26272

* Update societe.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-26 16:30:38 +02:00
Laurent Destailleur
9fc5accd81 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-26 15:58:41 +02:00
atm-lucas
3f75077f5e NEW - Add edit line on MO (#26122)
* Added the possibility of editing lines

* Review code

* add exit

* Add same action

* check Travis

* Travis

* Update mo_production.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-26 14:11:27 +02:00
Mohamed DAOUD
990f9113fc FIX - Auto fill the field end of period with end of month when cloning a salary (#26263)
* Auto fill the field end of period

* Auto fill the field end of period without jsDate

* using formatDate function to format displayed date
2023-10-26 14:03:21 +02:00
Laurent Destailleur
74609c90a8 Code comment 2023-10-26 14:03:13 +02:00
Anthony Berton
dc8d6f9ca2 FIX - Search product category on list det order (#26168)
* FIX - Search product category on list det order

* Search for tag/category

* add search Operator

* Clean

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-26 13:57:40 +02:00
Charlène Benke
091d50e809 NEW : Add custom Text on footer total (#26334)
* NEW : Add custom Text on footer total

This function allows you to add a small text to each invoice below the total.
Just add a miscellaneous parameter to activate it
(to wish the happy new year or an indication of invoicing)

* Update pdf_crabe.modules.php

* Update pdf_crabe.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-26 13:55:10 +02:00
Laurent Destailleur
ca3c7f0a37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-26 13:52:22 +02:00
Laurent Destailleur
b4da41c8e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-26 13:40:57 +02:00
Lucas Marcouiller
96146fcb6a New add note for mailing (#26331)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-26 13:40:44 +02:00
HENRY Florian
3fc0b88633 fix: if field is boolean in filedsarray, it bus be boolean as datatype fog PgSQL (#26335) 2023-10-26 13:37:21 +02:00
Laurent Destailleur
3e146187ec Doc 2023-10-26 13:31:20 +02:00
Laurent Destailleur
35906c0af6 Fix bad test 2023-10-26 12:43:29 +02:00
Florent Poinsaut
753430de5f Fix error return value in the dol_delete_preview (#26360) 2023-10-26 12:40:21 +02:00
Lucas Marcouiller
af17b767c0 fix some warnings php8 (#26346)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-10-26 12:37:18 +02:00
William Mead
3697580d7a Fix resource data structure missing address state (#26370)
* Added fk_state foreign key

* Update llx_resource.key.sql

* Update 18.0.0-19.0.0.sql

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-26 12:36:12 +02:00
Laurent Destailleur
a21443bebe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-26 12:35:29 +02:00
Bhargav Shirin Nalamati
fc3cd7dfcf fixed typo license (#26364) 2023-10-26 12:25:54 +02:00
sonikf
b177af109e fix suppliers bills payment url (#26374) 2023-10-26 12:25:34 +02:00
Laurent Destailleur
40ea006536 Debug v19 2023-10-26 12:22:54 +02:00
Laurent Destailleur
d3c9549154 Comment dead code 2023-10-26 01:36:44 +02:00
Laurent Destailleur
2075179795 Fix responsive 2023-10-26 01:34:36 +02:00
Laurent Destailleur
e564b063da FIX Bad error message when dir not writable 2023-10-25 20:14:14 +02:00
Laurent Destailleur
1c99bb0344 Add a tooltip to explain why a link is not visible 2023-10-25 15:53:31 +02:00
Laurent Destailleur
7cec963a97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-24 17:00:48 +02:00
Laurent Destailleur
5b15b5c647 QUAL Move conf->global into getDolGlobal... 2023-10-24 17:00:13 +02:00
Laurent Destailleur
6913cafadd NEW Add a rule to fix empty($conf->global->...) into !getDolGlobal... 2023-10-24 16:57:15 +02:00
Laurent Destailleur
70e475d0ce Fix warnings 2023-10-24 15:40:36 +02:00
Laurent Destailleur
ab775998d1 Add code comment 2023-10-24 14:22:06 +02:00
Florian Mortgat
ac5c9d051f NEW: hidden conf to disable use of dns_get_record (which can become unresponsive) (#26339) 2023-10-24 13:14:39 +02:00
Benjamin Neumann
f7d77cbd7d NEW Generic doc template for donations (#26338)
* NEW Generic doc template for donations

Can be used to create written acknowledgments to substantiate a charitable
contribution in the United States, but it is not specific to the United
States.

Multi-lingual.

If the global setting DONATION_NOTE_PUBLIC is greater than 0, the public
note for the donation is also included. This can be used in the United
States to notate if a donation is not entirely deductible.

* FIX Style errors.

* FIX A new typo
2023-10-24 13:13:40 +02:00
Laurent Destailleur
a318031034 QUAL Standardize code. Renamed ID of user properties into ->user_xxx_id 2023-10-24 11:37:29 +02:00
Laurent Destailleur
87b29bcd28 Doc 2023-10-24 03:45:21 +02:00
Laurent Destailleur
96a90cf552 Add test file 2023-10-24 03:25:50 +02:00
Laurent Destailleur
1950669a24 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-24 03:23:37 +02:00
Laurent Destailleur
1734adfd27 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-24 03:05:46 +02:00
Laurent Destailleur
674ff5999c Trans 2023-10-24 01:36:44 +02:00
Laurent Destailleur
1d1a1c88f6 NEW Date format dayhoursec is using year on 2 char on smartphones 2023-10-24 01:13:43 +02:00
Anthony Berton
2c01a59e60 FIX - param in order list det (#26298)
* FIX - param in order list det

* Clean

* $newcardbutton

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
2023-10-23 21:48:43 +02:00
Rahul
a5545e83df doc(README): remove typo (#26315)
## Description:

This Pull Request fixes a typographical error in the README.md file.


## Changes Made:

 - Corrected "recommanded" to "recommended" and "Receiption" to "Reception" in the README.md file.

## Additional Information:

This fix is not related to any existing issue. It's a minor typo that I noticed while reviewing the README.

Thank you for considering this contribution.
2023-10-23 19:21:15 +02:00
MDW
acea5c17dd each is deprecated in PHP7.2 and removed in PHP8.0 (#26317)
See https://www.php.net/manual/en/function.each.php
2023-10-23 19:20:55 +02:00
PriteshJadhav132
ef1ccdf6b1 remove typo (#26316) 2023-10-23 19:19:36 +02:00
MDW
e036e32caa qual Annotation/initialisation fixes (#26318) 2023-10-23 19:19:10 +02:00
sonikf
19012cad47 fix typo (#26321) 2023-10-23 19:17:34 +02:00
sonikf
99ee3523b0 fix errors in /fourn/facture/list.php (#26324) 2023-10-23 19:16:59 +02:00
Alexandre SPANGARO
ce28ab6b35 NEW #26312 Manage intermediate BIC - SQL Part (#26325) 2023-10-23 19:13:02 +02:00
William Mead
e9fda9653d New perf & qual sections for PR template (#26328)
* NEW performance & code quality enhancements template sections

* Reordered commit keyword categories to match pull request template

* Adjusted instructions

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
2023-10-23 19:00:03 +02:00
William Mead
08f17dab0b Qual logevents action switch (#26330)
* QUAL use switch case instead of if elseif statements for actions

* Deleted unnecessary action comments

* Added default case

* Added contributor details

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
2023-10-23 18:58:57 +02:00
Laurent Destailleur
551e3f5994 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-23 18:54:36 +02:00
Laurent Destailleur
b7de0baedd Fix phpunit 2023-10-23 18:54:16 +02:00
gdsoftdev
2d303b7c95 fix account code binding for supplier invoice (#26333) 2023-10-23 18:30:27 +02:00
atm-gauthier
f46482a72a NEW Can switch product batch management to no management. (#21691)
* NEW : When an user unset the batch management of products, transformation of each batch stock mouvement in global stock mouvement

* FIX : Alert on deserialize product

* FIX : Correction of the trad

* Fixing style errors.

* FIX : PR returns

* FIX : using llx_product_batch table

* FIX : langs

* Fixing style errors.

* FIX : $value must be an absolute value

* FIX : init $inventorycode before while loop

* Fixing style errors.

* FIX : "Yes (unique serial number required)" choice must not be available on product edit if its current status batch is "Yes (lot required)"

* Fixing style errors.

* FIX : Just display a message when we change from batch to serial

* Fixing style errors.

* Update card.php

* Update card.php

* Update product.class.php

* Update product.class.php

---------

Co-authored-by: Adrien Raze <adrien.raze@atm-consulting.fr>
Co-authored-by: stickler-ci <support@stickler-ci.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-23 18:05:21 +02:00
Laurent Destailleur
5d6cf7cd51 dolPrintHTMLForAttribute remove \n 2023-10-23 13:15:01 +02:00
Laurent Destailleur
d8d3faa50f dolPrintHTMLForAttribute remove \n 2023-10-23 13:14:59 +02:00
Laurent Destailleur
0b11668660 FIX better management of <br> for dolGetFirstLine 2023-10-23 12:26:23 +02:00
Laurent Destailleur
f2e29d12de Fix travis 2023-10-21 18:11:07 +02:00
Laurent Destailleur
326bd356f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-21 18:03:40 +02:00
Laurent Destailleur
53adeb9be2 Try to fix travis 2023-10-21 18:01:32 +02:00
Laurent Destailleur
9275684ed1 Clean code 2023-10-21 17:58:31 +02:00
Alexandre SPANGARO
e6986446cb NEW #22531 Expense report - Add two fields into export : Qty & Unit price (excl.) (#26309) 2023-10-21 16:29:37 +02:00
Alexandre Janniaux
9fe9eee18a FIX|Fix some minor issues on Reception and add a new test for it (#26310)
* reception: reOpen: mirror $this->statut in $this->status

$this->statut is the deprecated variable, $this->status should also get
the correct value.

* reception: setDraft: mirror $this->statut in $this->status

$this->statut is the deprecated variable, $this->status should also get
the correct value.

* reception: add missing $weight field

Fix warning:

    Undefined property: Reception::$weight

* societe: add country_id field

* reception: use getDolGlobalInt when suitable

Using empty() implies that the value actually exists on the stdClass at
$conf->global, but it's not always the case. getDolGlobalInt will handle
this smoothly by checking first, which solves warnings like those:

    Undefined property: stdClass::$STOCK_CALCULATE_ON_RECEPTION

* ReceptionTest: add new test

The test checks the usual workflow of the Reception class, with, on the
one hand, the common CRUD operations:
 - create
 - fetch
 - update
 - delete

And on the other hand, the status handling for Reception:
 - valid: STATUS_DRAFT -> STATUS_VALID
 - setClosed: STATUS_VALID -> STATUS_CLOSED
 - reOpen: STATUS_CLOSED -> STATUS_VALID
 - setDraft: STATUS_VALID -> STATUS_DRAFT

The stocks lines are not tested yet, and the error cases, like any other
transition not described above, are not tested either. The permissions
for some of the operations are hardcoded for the test and there is no
failure check when the permission is not set yet.
2023-10-21 16:28:30 +02:00
MDW
24f8488b48 QUAL Force subclass MINVERSION (#26314)
* Define DoliDB::VERSIONMIN as mandatory constant in subclass

See https://stackoverflow.com/a/43134924/6378634

This also helps static tool checks

* fixup! Define DoliDB::VERSIONMIN as mandatory constant in subclass
2023-10-21 16:27:52 +02:00
Laurent Destailleur
25ace1d042 Debug v19 2023-10-21 16:23:58 +02:00
Laurent Destailleur
4b214b4100 Fix #yogosha18281 2023-10-21 02:39:27 +02:00
Laurent Destailleur
62c1baaa61 Clean param 2023-10-20 21:01:59 +02:00
Laurent Destailleur
777c6bffa5 Debug v19 2023-10-20 20:33:19 +02:00
Laurent Destailleur
b23dc8478c php 8.2 2023-10-20 17:46:26 +02:00
Laurent Destailleur
fad21985da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-20 16:36:53 +02:00
Laurent Destailleur
cad186aed5 css 2023-10-20 16:36:28 +02:00
William Mead
a4dd36d967 NEW resource improvements - data structure (#26285)
* NEW improved resource data structure

* Added data structure v18-v19 migration

* Added null as default

* Revert "Added null as default"

This reverts commit c17d144800.

* Added null as default

* Added contributor details

* Renamed user_places to max_users

* Update llx_resource.sql

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-20 14:59:04 +02:00
Laurent Destailleur
ece2d0267f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-20 14:57:25 +02:00
mc2contributor
60fa585a7f CLOSE #23331 Add support for parent projects (#24856) 2023-10-20 14:33:39 +02:00
V-Py
9361b1269b FIX #25143 Using default_values for extrafields by replacing GETPOSTISSET by GETPOST (#25233)
* FIX #25143 Using default_values for extrafields

* Update extrafields.class.php

correct the indentation error
2023-10-20 14:28:52 +02:00
MDW
19b1dd5a11 Fix misspelled @throw -> @throws (#26297)
Identified using phan, see #26262
2023-10-20 14:12:42 +02:00
Laurent Destailleur
ba04ba4f0e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-20 13:08:51 +02:00
William Mead
b0a7332e8f FIX intervention closed agenda action message (#26294)
Co-authored-by: William Mead <william.mead@manchenumerique.fr>
2023-10-20 12:59:48 +02:00
Laurent Destailleur
65f78b6e86 Close #26293 manually to avoid duplicate menu statistics 2023-10-20 12:59:12 +02:00
Laurent Destailleur
455fb4417a Look and feel v19 2023-10-20 12:57:58 +02:00
Pascal Hubrecht
0628dd057d FIX #26291 (#26292) 2023-10-20 12:53:03 +02:00
AmazingBeu
bc528fed67 fix SQL syntax error introduced in 9861b50 (#26289) 2023-10-20 12:52:36 +02:00
Rikard Bosnjakovic
cebd3f831c Update list.php (#26287)
* Update list.php

Add the Description column in the list of possible columns to select from when vieweing Products.

* Update list.php

Spaces -> tabs
2023-10-20 12:51:05 +02:00
Laurent Destailleur
3a5f36cc4a Removed dead code 2023-10-20 11:34:36 +02:00
Laurent Destailleur
466c72c80f Fix warning 2023-10-20 11:30:05 +02:00
Laurent Destailleur
8ef60a311e Fix missing property 2023-10-20 11:25:10 +02:00
Laurent Destailleur
76c00767ad Fix typo class name 2023-10-20 11:22:36 +02:00
MDW
706d0f6053 Fix __METHOD__ usage outside class-method (#26286) 2023-10-20 11:20:02 +02:00
MDW
6077ad2130 Fix Supplier_Proposal->SupplierProposal (detected with Phan) (#26282) 2023-10-20 10:55:15 +02:00
Florent Poinsaut
82fdfb03ca Use fetch_project method in email (#26284) 2023-10-20 10:53:14 +02:00
Rémi Champlon
654d9ac635 FIX : export separator config with multientity (#26253)
* fix export separator condig with multi entity

* Revert "fix export separator condig with multi entity"

This reverts commit 69042260ee.

* update dolibarr_set_const

---------

Co-authored-by: Rémi Champlon <remi.champlon@vold.lu>
2023-10-20 10:51:23 +02:00
Laurent Destailleur
e1bf377f20 QUAL: Removed deprecated field remise, remise_percent, remise_absolute 2023-10-20 10:47:08 +02:00
Laurent Destailleur
7a694d3485 Fix phpunit 2023-10-20 03:59:02 +02:00
nikolay-brookstein
48793b92e6 Update German Accounts (SKR03/SKR04 2023-01-03) (#26242)
* Update German Accounts (SKR03/SKR04 2023-01-03)

* Update German Accounts (SKR03/SKR04 2023-01-03) (+cleanup)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-20 03:30:25 +02:00
Alexandre SPANGARO
58bdcb5245 Dolibarize - Look & feel v19 (#26246)
* NEW Accountancy - Add quick navigation with keyb. shortcut on ledger

* TitleSeparator - Job list

* TitleSeparator - Position list

* TitleSeparator

* TitleSeparator

* TitleSeparator

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Variable $newcardbutton already define

* Define $newcardbutton

* TitleSeparator

* TitleSeparator

* TitleSeparator

* TitleSeparator

* TitleSeparator
2023-10-20 03:20:44 +02:00
kkhelifa-opendsi
91ff39d2e6 NEW: Add option for cancel consumed and produced lines (delete lines and rollback stocks) when delete or cancel an manufacturing order (#26254) 2023-10-20 03:09:58 +02:00
Vincent Maury
526ad4868c Fix 26256 : Workstation not working in multicompanys mode (#26257) 2023-10-20 03:07:25 +02:00
Laurent Destailleur
2a21a166d9 Fix warning 2023-10-20 03:05:40 +02:00
Laurent Destailleur
371dd4551a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-20 03:03:24 +02:00
Lucas Marcouiller
02aa90ef96 New add auto update multicurrency rate (#26255)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-10-20 03:00:40 +02:00
Noé Cendrier
bdf96c8a06 NEW add Hooks and prepare extrafields management for product invoices consumptions (#26280) 2023-10-20 02:43:43 +02:00
Laurent Destailleur
c49a044490 Clean code 2023-10-20 02:35:18 +02:00
MDW
e7c49922a6 Fix some items detected by phan (see #26262) (#26264)
* Fix some items detected by phan (see #26262)

* Update fournisseur.facture-rec.class.php

* Update fournisseur.facture-rec.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-20 02:28:51 +02:00
MDW
c0c5eccfb5 Fix some phan notices (not critical) (#26265) 2023-10-20 02:22:07 +02:00
Eric
349fd7fd1f add windows temp to tmpfilename (#26273) 2023-10-20 02:21:26 +02:00
General-Q
0a90d9cc64 Fix install bug (#26275) 2023-10-20 02:20:52 +02:00
Lucas Marcouiller
42865a975a Fix some code smell (#26277)
* Fix some code smell

* Update commande.class.php

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-20 02:20:26 +02:00
sonikf
76d7acb676 fix umbiguous product/service translations (#26276) 2023-10-20 02:17:03 +02:00
Laurent Destailleur
a60040366d Debug v19 2023-10-20 02:10:26 +02:00
Laurent Destailleur
cbfdeeef23 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-20 01:34:33 +02:00
lamrani abdelwadoud
1949eb564f NEW updating by adjust request Sql for Salary invoice (#26279)
* adjust request Sql for Salary invoice

* remove print_r

* Update bonprelevement.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-20 01:34:08 +02:00
sonikf
d89954210e fix cannot cancel salary when language is not latin (#26281) 2023-10-20 01:29:09 +02:00
Laurent Destailleur
b49c67fe0c Debug v19 2023-10-20 01:28:42 +02:00
Laurent Destailleur
5174522f6e PHP 8.2 2023-10-20 01:25:05 +02:00
Laurent Destailleur
48c415cf43 Fix bad link 2023-10-20 01:10:30 +02:00
Laurent Destailleur
f53ef65b99 Debug v19 2023-10-20 01:00:15 +02:00
Laurent Destailleur
d978c1da88 Fix warning 2023-10-19 21:48:55 +02:00
Laurent Destailleur
9d83688e21 FIX Bad filter on menu Services - expired 2023-10-19 15:21:36 +02:00
Laurent Destailleur
268812fa3c CSS 2023-10-18 23:55:54 +02:00
Laurent Destailleur
5fcf870fdf Fix filter 2023-10-18 21:08:08 +02:00
Laurent Destailleur
8e5d22d7f7 Fix warning 2023-10-18 21:05:21 +02:00
Laurent Destailleur
3ce02f1181 Debug v19 2023-10-18 18:37:00 +02:00
Laurent Destailleur
f803b991e6 Setup of website module to enable login/pass is easier 2023-10-18 18:16:10 +02:00
Laurent Destailleur
896bab643f FIX Look and feel v18 2023-10-18 17:49:13 +02:00
Laurent Destailleur
9e5984825f Look and feel v19 2023-10-18 17:23:49 +02:00
Laurent Destailleur
bc53a21224 css 2023-10-18 17:05:40 +02:00
Laurent Destailleur
4033038d5f Fix restore ticket top menu entry in auguria module 2023-10-18 16:41:00 +02:00
Laurent Destailleur
315030099a FIX dol_eval with function starting with ! 2023-10-18 16:19:59 +02:00
Laurent Destailleur
9f9a649f4c FIX dol_eval with function starting with ! 2023-10-18 16:12:57 +02:00
Laurent Destailleur
c31dd14d7c FIX dol_eval with function starting with ! 2023-10-18 16:10:53 +02:00
Laurent Destailleur
bba45ee44a Fix missing Cash control menu in auguria 2023-10-18 14:19:02 +02:00
Laurent Destailleur
cd738b1964 Debug v19 2023-10-18 13:50:21 +02:00
Laurent Destailleur
b1c1c6b32d FIX Tooltip for search syntax must not appear on date fields 2023-10-18 13:50:04 +02:00
Laurent Destailleur
7a74fa25e3 Fix regression 2023-10-18 12:34:49 +02:00
Laurent Destailleur
8daf1db666 Fix warning 2023-10-18 11:13:11 +02:00
Laurent Destailleur
2f14087c0c Debug v19 2023-10-18 03:50:15 +02:00
Laurent Destailleur
c61e9f47c8 Fix reception 2023-10-18 03:44:07 +02:00
Laurent Destailleur
ec3cc1c376 css 2023-10-18 03:39:22 +02:00
Laurent Destailleur
0f09954a31 Combo list of invoice subtypes is limited to current country. 2023-10-18 03:33:36 +02:00
Laurent Destailleur
c51b633c9f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-18 03:26:00 +02:00
Anthony Berton
46eb35d362 NEW - Add label to price level when changing price (#26240)
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
2023-10-18 03:06:56 +02:00
sonikf
732fb2fa04 NEW: Invoice subtypes for customers and vendors (#26233)
* NEW: Invoice subtypes for customers and vendors

* fix PHPCS

* fix PHPCS

* fix PHPCS

* fix PHPCS

* fix possible SQL Injection

* remove hardcoded tests

* remove hardcoded tests

* fix travis ci error
2023-10-18 02:33:14 +02:00
Mohamed DAOUD
5b28ed0f4f Replacing yes/no by checkboxes on thirdparty views (#26236)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-17 16:46:02 +02:00
Anthony Berton
8cbbd88f52 FIX - Edit price product if status_buy or status is empty (#26239)
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
2023-10-17 16:39:55 +02:00
Laurent Destailleur
0274dcddd6 css 2023-10-17 16:12:13 +02:00
Laurent Destailleur
c0f04dc078 Debug v19 2023-10-17 15:51:35 +02:00
Laurent Destailleur
9a8db612b3 Fix phpunit error 2023-10-17 15:48:38 +02:00
Laurent Destailleur
2cfa9f8290 Debug v19 2023-10-17 15:43:56 +02:00
Laurent Destailleur
fd2ccf584b Look and feel v19 2023-10-17 15:27:07 +02:00
Laurent Destailleur
0fbffea663 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-17 14:49:16 +02:00
Laurent Destailleur
f11e6b9cc7 Look and feel v19 2023-10-17 14:25:30 +02:00
Laurent Destailleur
a181d6c713 Debug v19 2023-10-17 14:15:43 +02:00
Laurent Destailleur
a77b29aada Look and feel v19 2023-10-17 12:36:12 +02:00
Laurent Destailleur
b37a438067 The property ->user_validation to store ID of user validating has been
renamed into ->user_validation_id.
2023-10-17 11:10:25 +02:00
Laurent Destailleur
f18529f944 Clean code 2023-10-17 10:52:19 +02:00
Laurent Destailleur
fb8b4acdbf The duplicated and deprecated property ->date_livraison that was renamed
into ->delivery_date has been completely removed.
2023-10-17 10:36:11 +02:00
Laurent Destailleur
2fdf26731b Fix php8 error 2023-10-16 21:35:00 +02:00
Laurent Destailleur
01a139158d Debug v19 2023-10-16 21:15:03 +02:00
Laurent Destailleur
cdf53e402e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-16 20:57:07 +02:00
Laurent Destailleur
d6086f07b4 Fix regression triggers was not triggered 2023-10-16 20:55:56 +02:00
Laurent Destailleur
b0895b93ae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-16 20:29:29 +02:00
jyhere
6c6f1225d2 FIX: missing category import update key (#26229)
Updates should use 2 keys : label and type

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-16 19:04:00 +02:00
VIAL-GOUTEYRON Quentin
61afa1c84b NEW : conf to display date entry stock exped and sort in date order (#22625)
* NEW : Date d'entree en stock sur les exped au moment de la création

* add en trad

* Ajout conf pour la date d'entree en stock

* add trad

* trad

* Fixing style errors.

* modif for only full group by

---------

Co-authored-by: stickler-ci <support@stickler-ci.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-16 18:38:37 +02:00
Anthony Berton
5639352df7 NEW - Right for stats orders (#24607)
* NEW - Right for stats orders

* NEW: use account address in sepa mandate (#23642)

* New: allow to display account address in pdf sepa mandate. Fix: use ->proprio because ->account_owner does not exist.

* Stickler fix

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: thomas-Ngr <tnegre@open-dsi.fr>
2023-10-16 17:19:07 +02:00
Henning Kleen
b157ddd606 NEW Allow generation of delivery note through REST-API (#26226)
Add support for (re-)generating a delivery note through the /documents/builddoc API endpoint
2023-10-16 15:50:23 +02:00
William Mead
2f023e162a NEW show VAT free amount on payment input close #26208 (#26209)
* NEW Added VAT free & VAT amounts on payment input

* Fixed VAT amount translation strings. Added amount including VAT CSS class.

* Added amount including VAT CSS class.

* Added contributor details

* Fixed contributor indentation after GitHub merge conflict error

* Deleted blank line at start of control structure

* Revert "NEW Added VAT free & VAT amounts on payment input"

This partially reverts commit 9333afb0

* Revert "Added amount including VAT CSS class."

This reverts commit 8a4c308ae0.

* Removed contributor details

This reverts commit 165645cc

* NEW payment full amount detail tooltip

* Reverted commit aa78a1e2

* Reverted commit 165645ccd5

* Added full amount detail tooltip for multicurrency

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
2023-10-16 15:43:23 +02:00
Laurent Destailleur
275227e742 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-16 14:57:59 +02:00
Laurent Destailleur
58194357ca FIX FICHINTER_DATE_WITHOUT_HOUR (hour must not be set). Close #23388 2023-10-16 14:57:24 +02:00
thomas-Ngr
4c266db8d4 NEW: use account address in sepa mandate (#23642)
* New: allow to display account address in pdf sepa mandate. Fix: use ->proprio because ->account_owner does not exist.

* Stickler fix
2023-10-16 13:34:26 +02:00
Laurent Destailleur
574fd8d6ad Fix warning 2023-10-16 06:06:08 +02:00
Laurent Destailleur
16951f447c Add performance index 2023-10-16 05:50:43 +02:00
Laurent Destailleur
2cc0301960 Fix warning 2023-10-16 05:37:36 +02:00
Laurent Destailleur
37bd40607e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-16 03:42:25 +02:00
Laurent Destailleur
001abfad4d Fix phpcs 2023-10-16 03:02:48 +02:00
Laurent Destailleur
801d669c9f Fix php8.2 2023-10-16 02:56:54 +02:00
Laurent Destailleur
f9bf9cd8d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-16 02:50:23 +02:00
Laurent Destailleur
0ab330102f Fix phpcs 2023-10-16 02:50:05 +02:00
Alexandre SPANGARO
6e8fcb0b9d NEW Accountancy - FEC/FEC2 format export with attachments (#26192)
* NEW Accountancy - FEC/FEC2 format export with attachments

* Fix spaces

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-16 01:53:55 +02:00
Christophe Battarel
20f1a0f3a6 NEW : TakePOS - amount label with or without tax in free product (#24829)
* NEW : TakePOS - amount label with or without tax in free product

* fix php8

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-16 01:43:49 +02:00
Laurent Destailleur
251ccf85ea Debug v19 2023-10-15 23:13:20 +02:00
Laurent Destailleur
bf7a8725a5 Debug v19 2023-10-15 22:08:09 +02:00
Laurent Destailleur
cdf9389b58 CSS v19 2023-10-15 22:02:33 +02:00
Laurent Destailleur
7d73255844 css 2023-10-15 21:52:33 +02:00
Laurent Destailleur
6717d53b11 FIX dolDispatchToDo return was always false since several years 2023-10-15 21:51:10 +02:00
Laurent Destailleur
3c55413ee1 Doc 2023-10-15 21:35:16 +02:00
Laurent Destailleur
fcd768ef43 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-15 21:18:27 +02:00
thomas-Ngr
17d288dd29 Add hook printFieldListSearchParam on project list (#26214)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-15 20:20:08 +02:00
Alexandre SPANGARO
2dc351457d NEW Accountancy - Add quick navigation with keyb. shortcut on ledger (#26221) 2023-10-15 19:19:53 +02:00
Laurent Destailleur
7a3e6606b7 Fix php8.2 warnings 2023-10-15 18:46:18 +02:00
Laurent Destailleur
c2bdb3be90 Fix php8.2 warnings 2023-10-15 18:41:39 +02:00
Laurent Destailleur
b8c8e903c2 Fix php8.2 warnings 2023-10-15 18:39:13 +02:00
Laurent Destailleur
4f4ede2e32 Fix php8.2 warnings 2023-10-15 18:14:14 +02:00
Laurent Destailleur
8731499d9a Clean code 2023-10-15 15:43:49 +02:00
Laurent Destailleur
1f38e54e78 Clean code 2023-10-15 15:32:35 +02:00
Laurent Destailleur
2c5809e77b Doc 2023-10-15 15:05:36 +02:00
Laurent Destailleur
8a2e0aa7cd Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2023-10-15 14:56:20 +02:00
Laurent Destailleur
3b8439e7c5 NEW Show id of module on the tooltip module help page 2023-10-14 18:29:01 +02:00
Laurent Destailleur
2ae5314a23 Fix warning 2023-10-14 16:34:28 +02:00
Laurent Destailleur
b8a057d3d7 Debug v19 2023-10-14 16:25:39 +02:00
Laurent Destailleur
cbb60d8b5e Debug v19 2023-10-14 16:23:28 +02:00
Laurent Destailleur
266b7ac61b Clean code (standardize reception with shipment) 2023-10-14 15:25:52 +02:00
Laurent Destailleur
255dc5e33b css 2023-10-14 14:22:15 +02:00
Laurent Destailleur
5aba596cde CSS v19 2023-10-14 14:17:30 +02:00
Laurent Destailleur
8c7433a5af Responsive 2023-10-14 01:16:19 +02:00
Laurent Destailleur
4594188984 Debug v19 2023-10-14 01:10:25 +02:00
Laurent Destailleur
1a026a7dd6 css 2023-10-14 00:06:34 +02:00
Laurent Destailleur
b985ad1f2e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-13 20:08:00 +02:00
Laurent Destailleur
d11543c806 Debug v19 2023-10-13 20:07:39 +02:00
sonikf
30080e997f fix #25941 (#26206)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-13 17:57:12 +02:00
Laurent Destailleur
9f13d74534 Clean code 2023-10-13 16:49:59 +02:00
Laurent Destailleur
0e7c5debed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-13 16:38:51 +02:00
Christophe Battarel
3a9db24c2c NEW : TakePOS - add constant to choose contact instead of customer (#24807)
* add constant to choose contact instead of customer in TakePOS

* fix conflict

* fix

* check perm

* fix phpcs

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-13 16:19:10 +02:00
William Mead
2fd9a0708f Fix #26215 fichinter modify line PHP error (#26216)
* FIX fichinter modify line

* Adjusted contributor line indent

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
2023-10-13 16:14:00 +02:00
Laurent Destailleur
a8b4b9ec14 Debug v19 2023-10-13 16:08:30 +02:00
sonikf
7077cb31b4 fix travis ci error in #25941 (#26207) 2023-10-13 15:43:42 +02:00
sonikf
a41611a552 fix typo (#26213) 2023-10-13 15:43:11 +02:00
Laurent Destailleur
af186509b9 Fix error management 2023-10-13 15:42:15 +02:00
Laurent Destailleur
3f1964a892 Fix warnings 2023-10-13 15:15:51 +02:00
Laurent Destailleur
e358ef9fa0 NEW Can modify the picto into modulebuilder 2023-10-13 15:08:50 +02:00
Laurent Destailleur
c507adeef7 NEW Top menu support picto of modules that are font awesome picto. 2023-10-13 15:00:51 +02:00
Christophe Battarel
09541d5dad NEW : TakePOS - add constant to check qty asked is available (#24820)
* credentials

* NEW : TakePOS - add constant to check qty asked is available

* fix php8

* fix

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-12 20:24:55 +02:00
Laurent Destailleur
68fe6cbf26 Merge branch 'altairisfr-reduction' into develop 2023-10-12 20:09:29 +02:00
Laurent Destailleur
caf00b2456 Merge branch 'reduction' of https://github.com/altairisfr/dolibarr into
altairisfr-reduction
2023-10-12 20:09:00 +02:00
Laurent Destailleur
1e720b5d40 Code comment for #23820 2023-10-12 19:51:10 +02:00
Laurent Destailleur
6871c63090 Manual merge for #24883 2023-10-12 19:39:11 +02:00
Laurent Destailleur
2e3c378ec0 Fix phpcs 2023-10-12 18:47:19 +02:00
Anthony Berton
70d8ced6fa FIX - Clean in list det order (#26201)
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
2023-10-12 18:42:15 +02:00
Charlène Benke
c1488e15fa bad internal filter with forgeSQLFromUniversalSearchCriteria (#26202)
the filter (s.client:in:(1,2)) not work, same problem with s.client in (1,2)

we need to use now :   (s.client:in:1,2)
2023-10-12 18:41:57 +02:00
Randall Mora
3ba1449602 doActions,printFieldListTitle,printFieldListValue to hookmanager (#24971)
* Update card.php

Add events doActions,printFieldListTitle,printFieldListValue to hookmanager

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-12 18:14:20 +02:00
ATM-Nicolas
9ef5d4ae2c NEW : Library including math and financial functions (#25035) 2023-10-12 18:01:16 +02:00
andreubisquerra
9274f7f507 Ask to create cash account if there is no cash account in TakePOS (#25036) 2023-10-12 17:59:59 +02:00
Benjamin Falière
131fa0d52b NEW subproduct triggers in product class (#25142)
* NEW subproduct triggers in product class

* add notrigger parameter to functions

* add doc comment for new parameters

---------

Co-authored-by: Benjamin Falière <benjamin.faliere@altairis.fr>
2023-10-12 17:50:18 +02:00
dolibarr95
879c6d1e1f NEW Add more company informations (ProfId7 to 10) (#25266)
* Update company.php

Add more "company  professional" Id informations.
4 new constants

* Update pdf.lib.php

pdf page footer add ProfId

* Update pdf.lib.php

add profid10

* Update companies.lang

ProfId 7 to 10
2023-10-12 17:44:08 +02:00
Pascal Hubrecht
bd1ae42ece New | Add AGENDA_SORT_EVENT_TYPE_BY_POSITION_FIRST hidden conf to change sort method of actions (#25375)
* Position defined in dictionnary must be main sort criterion

The position defined in the dictionary must be the main sort criterion.

* Use AGENDA_SORT_EVENT_TYPE_BY_POSITION_FIRST hidden conf to sort by position
2023-10-12 17:18:50 +02:00
tgsw
de5b97c7e7 Show product description (#26193)
* Show product description

shows product-description on list of products when hover the product-ref

* Update product.class.php

limiting the display to 5 lines
2023-10-12 15:39:42 +02:00
thomas-Ngr
af0bf77d0d fix duplicate ticket information (#26199)
* FIX duplicate data on ticket creation: fk_user_create

* Light code format on ticket/card.php
2023-10-12 15:38:05 +02:00
sonikf
1e3e53ffb5 SQL for invoice subtype (#26198)
* Add more subtypes for Greece

* Update llx_c_invoice_subtype.key.sql

* Update llx_c_invoice_subtype.sql

* Update llx_facture_fourn.sql

* Update 18.0.0-19.0.0.sql
2023-10-12 15:35:41 +02:00
Laurent Destailleur
bec11a4407 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-12 15:30:34 +02:00
Laurent Destailleur
f1330e5998 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-12 15:01:26 +02:00
Laurent Destailleur
7bc0e6d58c Code comment 2023-10-12 15:00:57 +02:00
jyhere
f67f8e54c2 CHANGE: allow to prepend html to morehtmlstatus content in hook (#26197) 2023-10-12 13:55:36 +02:00
Laurent Destailleur
03a4813693 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-12 13:16:37 +02:00
Anthony Berton
a29616d81a NEW - Row in list higher height (#26177)
* NEW - Line be most height in list

* Param for height row

* Update style.css.php

* Update style.css.php

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-12 13:16:17 +02:00
Laurent Destailleur
70f6d998fb Clean code: add condition on deprecated assembly and stock kit 2023-10-12 13:06:54 +02:00
lamrani abdelwadoud
01ffbb25a4 NEW column in table prelevement_lignes for fk_user (#26196)
* add column in  table prelevement_lignes for fk_user

* Update llx_prelevement_lignes.sql

* Update llx_prelevement_lignes.sql

* Update 18.0.0-19.0.0.sql

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-12 12:59:12 +02:00
Laurent Destailleur
2d6a82a030 Clean code 2023-10-12 12:49:57 +02:00
Alexandre SPANGARO
432af47458 FIX Accountancy - Quadra format export with attachments - Recover also supplier invoice in archive (#26191)
* FIX Accountancy - Quadra format with source file - Recover also supplier invoice in archive

* Fix dir_output on expense report

* Fix spaces

* Comment
2023-10-12 11:17:49 +02:00
Laurent Destailleur
4ece4e58c5 Clean code 2023-10-11 20:22:56 +02:00
Laurent Destailleur
244e472beb Exclude some files 2023-10-11 20:02:29 +02:00
Laurent Destailleur
bae75281e3 QUAL: Code fix using rector 2023-10-11 19:44:06 +02:00
Laurent Destailleur
da2260d3c7 QUAL: Code fix using rector 2023-10-11 19:35:18 +02:00
Laurent Destailleur
6aeccf1d48 Name of file 2023-10-11 19:11:32 +02:00
Laurent Destailleur
57271d7f42 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-11 19:10:48 +02:00
Laurent Destailleur
c32fe8dc5f QUAL: Use dol_clone with parameter 2 for ->oldcopy 2023-10-11 19:10:24 +02:00
Lucas Marcouiller
aab0897bb6 Fix evaluation interview module (#26183)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-10-11 18:05:55 +02:00
dev2a
b2ec9132ee Fix: Correction of overlapping text in the payment list (#26186) 2023-10-11 18:00:25 +02:00
dev2a
205a863aef New: Add concat et array index fetch (#26188) 2023-10-11 17:58:28 +02:00
dev2a
72ae107471 New: Add param for generate script script (#26187) 2023-10-11 17:57:07 +02:00
Laurent Destailleur
92ec85df26 Debug v19 2023-10-11 14:40:02 +02:00
Laurent Destailleur
c228977c0a Debug v1 2023-10-11 13:45:30 +02:00
Laurent Destailleur
7d7c579030 Fix warning 2023-10-11 13:17:14 +02:00
Laurent Destailleur
c07ac94d86 Fix warning 2023-10-11 13:01:37 +02:00
Laurent Destailleur
ce87d92301 Code comment 2023-10-11 12:22:38 +02:00
Laurent Destailleur
cc552a498c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-11 12:04:37 +02:00
Laurent Destailleur
aea0083abc Better fix for #26124 2023-10-11 12:04:09 +02:00
Regis Houssin
cdf4292415 FIX remove DISTINCT when MULTICOMPANY_TRANSVERSE_MODE is used (#26143)
* FIX (WIP) remove DISTINCT when MULTICOMPANY_TRANSVERSE_MODE is used

* FIX optimize code

* FIX replace with $this->db->prefix()

* FIX works on uniformize MULTICOMPANY_TRANSVERSE_MODE

* FIX syntax error
2023-10-11 11:38:56 +02:00
Laurent Destailleur
e488243dd8 Standardize code 2023-10-11 11:34:42 +02:00
Laurent Destailleur
20e3339de3 Clean code 2023-10-11 03:45:53 +02:00
Benjamin Falière
b220e1acbd NEW Assign contact to a ticket message (#24735)
* NEW Assign contact to a ticket message

* FIX conflict

---------

Co-authored-by: Benjamin Falière <benjamin.faliere@altairis.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-11 03:36:15 +02:00
Laurent Destailleur
005bab38c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-11 03:24:47 +02:00
Laurent Destailleur
b3971c54a4 Close #25984 Can have a combo of category with both picto and full path 2023-10-11 03:22:52 +02:00
Laurent Destailleur
43b60b87c3 Debug v19 2023-10-11 03:02:47 +02:00
Laurent Destailleur
616f0e41d4 Clean code 2023-10-11 02:54:19 +02:00
Randall Mora
7613e59eb2 Update card.php (#24972)
Add events doActions,printFieldListTitle,printFieldListValue to the hookmanager
2023-10-11 02:39:12 +02:00
Anthony Berton
cbe981b3be FIX - Sub-total on last line to list det order (#26178)
* FIX - Sub-total on last line to list det order

* Clean

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
2023-10-11 01:55:20 +02:00
Laurent Destailleur
a7ac0a248f Debug v19 2023-10-11 00:39:38 +02:00
Laurent Destailleur
3e0e64ac41 Clean code 2023-10-11 00:21:25 +02:00
Laurent Destailleur
d4d6c3c03e Fix regex 2023-10-10 23:54:41 +02:00
Laurent Destailleur
bfc8a76567 Clean code 2023-10-10 23:52:46 +02:00
Laurent Destailleur
f94e316e61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-10 23:47:02 +02:00
Laurent Destailleur
3a0eed1a9b Code comment 2023-10-10 23:44:10 +02:00
Laurent Destailleur
ea2aabb1e4 Fix warning 2023-10-10 23:36:14 +02:00
Anthony Berton
2f84780221 FIX (#26179)
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
2023-10-10 23:31:56 +02:00
Laurent Destailleur
946239dbf3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-10 23:04:47 +02:00
Laurent Destailleur
a9b3732584 Clean code. Setup Show left column was lost on saving page. 2023-10-10 22:36:54 +02:00
Laurent Destailleur
30a0d4df26 FIX PHP warning 2023-10-10 22:35:35 +02:00
Laurent Destailleur
94b56cc0ca Code comment 2023-10-10 22:25:52 +02:00
Laurent Destailleur
8ace854225 Debug v19 2023-10-10 22:10:37 +02:00
Laurent Destailleur
98ca102e1c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-10 21:48:07 +02:00
Laurent Destailleur
874d60c230 css 2023-10-10 21:29:38 +02:00
Florent Poinsaut
74702d207a NEW Add a button to create a product or a service from an order or an invoice (#26173)
* add product and service from invoice object line

* Typo

* compatibility with other modules than billing

make "add production and service from invoice" compatible with modules other than billing

* using $object->id instead of param

making it usable with all modules and freshly created objects

---------

Co-authored-by: aetiom <8208943+aetiom@users.noreply.github.com>
2023-10-10 21:29:19 +02:00
Anthony Berton
8d3f4f9bd3 FIX - getDolGlobalInt('MAIN_CHECKBOX_LEFT_COLUMN') for list det order (#26176)
* FIX - getDolGlobalInt('MAIN_CHECKBOX_LEFT_COLUMN') for list det order

* FIX $totalarray['nbfield']

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
2023-10-10 21:16:21 +02:00
Lucas Marcouiller
694dc8d171 New Add js scanner expedition repartition (#26126)
* add scanner js component

* new line creation

* add security + remove unused code

* add of object to test

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-10-10 19:34:54 +02:00
dev2a
f60d45de95 NEW: Add refactoring user permission (#26162)
* Feat: Add refactoring user permission

* Fix: Correction hasRight on isset

* Fix: PHPCS
2023-10-10 19:13:14 +02:00
Anthony Berton
79b02494cf FIX - getDolGlobalInt for left colum (#26169)
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
2023-10-10 18:39:14 +02:00
Lucas Marcouiller
97c4898f9c Fix createCommon line creation loop (#26171)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-10-10 18:38:50 +02:00
Mohamed DAOUD
0620eab415 [FIX] Warnings in ModuleBuilder Configuration Page (#26149)
* Fix Warnings in ModuleBuilder Configuration Page

* Fix Warnings in ModuleBuilder Configuration Page
2023-10-10 09:19:49 +02:00
dev2a
765d60efdf Fix: Apply rector rule user permission on comm folder (#26163) 2023-10-10 09:14:30 +02:00
Anthony Berton
36d1b73101 FIX - Search label or description on list det order (#26160)
* FIX - Search label or description on list det order

* Clean

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
2023-10-10 09:10:31 +02:00
Alexandre Janniaux
d0ba74a88c sync_contacts_dolibarr2ldap: fix typo (#26161) 2023-10-10 09:08:09 +02:00
Anthony Berton
a8a283c34f NEW - Add culum Technical ID in liste det order (#26164)
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
2023-10-10 09:07:44 +02:00
Anthony Berton
c9b4aca8c6 NEW - Sub total in list (#26165)
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
2023-10-10 09:07:25 +02:00
William Mead
751854a1a9 NEW Added total line to third-parties list (#26148)
Co-authored-by: William Mead <william.mead@manchenumerique.fr>
2023-10-09 20:22:31 +02:00
William Mead
b0494d8098 FIX extrafield list filter (#26159)
Co-authored-by: William Mead <william.mead@manchenumerique.fr>
2023-10-09 20:08:00 +02:00
Christophe Battarel
e2c89ca452 fix shipping ref if already set (#26156)
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-09 19:52:21 +02:00
fboitel
092aa58814 NEW #22626 date filter thirdparties contracts projects (#22707)
* Creation and modification date range filter for thierdparties

* Order for good looking

* Creation and modification date range filter for projects

* conflict

* Update list.php

* Update list.php

---------

Co-authored-by: Faustin <faustin.boitel@bordeaux-inp.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-09 19:51:38 +02:00
Laurent Destailleur
e19e1da5de CSS 2023-10-09 17:12:20 +02:00
Laurent Destailleur
1a249237a0 Debug v19 2023-10-09 16:46:47 +02:00
Laurent Destailleur
2762cc84fb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-09 15:45:26 +02:00
Laurent Destailleur
df454003da FIX php8.2 2023-10-09 15:44:57 +02:00
thibdrev
985c9b0219 fix #22501 (#22502)
* Update functions.lib.php

Add NAF/APE formatting option to dol_print_profids().

* Update card.php

Format NAF/APE code with a point as separator (such as "69.20Z")

* Fixing style errors.

* Update card.php

* Fixing style errors.

* Update functions.lib.php

* Update card.php

* Update functions.lib.php

* Update functions.lib.php

---------

Co-authored-by: stickler-ci <support@stickler-ci.com>
2023-10-09 14:44:29 +02:00
Anthony Berton
a6098cf643 NEW - create a product from a free line in a document (#22324)
* NEW - create a product from a free line in a document

* Change

* clean code

* Update objectline_create.tpl.php

---------

Co-authored-by: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-10-09 14:36:28 +02:00
Laurent Destailleur
0ecf2b3327 Fix warnings 2023-10-09 14:14:37 +02:00
Laurent Destailleur
bf2ab5453c Fix warnings 2023-10-09 13:30:51 +02:00
Laurent Destailleur
19aea3d9b5 CSS 2023-10-09 13:23:22 +02:00
Laurent Destailleur
797d5d6dc6 Fix warnings 2023-10-09 12:10:09 +02:00
Laurent Destailleur
61b287f782 Fix phpcs 2023-10-09 10:38:47 +02:00
Laurent Destailleur
af8a0a9243 Merge pull request #26136 from artis-auxilium/rector
Add Rector (automatic refactoring)
2023-10-09 10:34:50 +02:00
Laurent Destailleur
f661f88b6d Merge pull request #26140 from aspangaro/19a7
Update some object
2023-10-09 10:28:54 +02:00
Laurent Destailleur
f450e23ce6 Clean code: set_paid is deprecated. Replaced with setPaid. 2023-10-09 10:22:49 +02:00
Laurent Destailleur
11f4940765 Doc 2023-10-09 10:18:03 +02:00
Laurent Destailleur
39b6b34820 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-09 09:36:30 +02:00
Laurent Destailleur
f0d536ec20 Merge pull request #26139 from artis-auxilium/global_to_function2
Fix: Change access to $conf->global to function getDolGlobal
2023-10-09 09:31:12 +02:00
Laurent Destailleur
ffbb05167a Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-09 09:28:51 +02:00
Laurent Destailleur
52a7f84485 Merge pull request #26141 from aspangaro/19a6
NEW Loan - Can upload a file with drag and drop
2023-10-09 09:24:35 +02:00
Laurent Destailleur
b56605c5d4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-09 09:22:47 +02:00
Alexandre SPANGARO
4b46e59f79 Fa-icon & copyright 2023-10-09 06:40:30 +02:00
Alexandre SPANGARO
1a47a9d279 NEW Loan - Can upload a file with drag and drop 2023-10-09 06:34:20 +02:00
Alexandre SPANGARO
f40cad28c5 Update loan list 2023-10-09 06:09:44 +02:00
Alexandre SPANGARO
52ec4107aa Update social contrib list 2023-10-09 05:50:24 +02:00
Alexandre SPANGARO
53671958c0 typo 2023-10-09 05:49:40 +02:00
Alexandre SPANGARO
ed6c985344 Update paymentvat.class 2023-10-09 05:49:16 +02:00
Dev2a
b76c402a09 Fix: Change access to $conf->global to function getDolGlobal (manual) 2023-10-08 23:25:46 +02:00
Dev2a
fcd4c4e429 Fix: Change access to $conf->global to function getDolGlobal (automatique) 2023-10-08 23:19:49 +02:00
Dev2a
2be26dfdf5 Feat: Remove check before get global (!empty, isset) 2023-10-08 22:52:10 +02:00
Laurent Destailleur
9d466793fa Merge pull request #24760 from NextGestion/dolibarr_fixbugs
NEW Can restore product in stock when deleting the supplier invoice
2023-10-08 21:58:55 +02:00
Laurent Destailleur
87c1f521fb Merge pull request #22135 from dolibit-ut/patch-536
Update card.php
2023-10-08 21:47:03 +02:00
Laurent Destailleur
8740c85ff3 The method ProductcustomerPrice->fetch_all_log() has been renamed into
camel case ->fetchAllLog()
2023-10-08 21:44:42 +02:00
Dev2a
dc4e17a353 Add Rector (automatic refactoring)
Add first rule: access global to function (getDolGlobalInt, getDolGlobalString)
2023-10-08 20:25:46 +02:00
Laurent Destailleur
04c2317761 Merge pull request #26130 from aspangaro/19a8
Update contact.class.php
2023-10-08 18:47:41 +02:00
Laurent Destailleur
d67d9e54c3 Merge pull request #26132 from aspangaro/19a9
Update fiscal year
2023-10-08 18:41:57 +02:00
Laurent Destailleur
7939e9e4e9 Debug v19 2023-10-08 14:11:31 +02:00
Laurent Destailleur
b5036b7a0d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-08 12:07:01 +02:00
Laurent Destailleur
0193a47913 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-08 11:58:06 +02:00
Laurent Destailleur
6ead0d2b30 Fix warning for php 7.0 2023-10-08 11:57:37 +02:00
Alexandre SPANGARO
bec24600e7 Fix $newcardbutton 2023-10-07 18:58:51 +02:00
Alexandre SPANGARO
1534b76082 Update Status 2023-10-07 08:17:26 +02:00
Alexandre SPANGARO
83f0b6deaf Copyright 2023-10-07 08:04:21 +02:00
Alexandre SPANGARO
52a449eed8 Update fiscal year list 2023-10-07 08:03:04 +02:00
Alexandre SPANGARO
1149666ef0 Update contact.class.php 2023-10-07 07:21:49 +02:00
Alexandre SPANGARO
a52bd6d7d9 Remove duplicate code 2023-10-07 07:15:18 +02:00
Alexandre SPANGARO
6201174f6a Update contact.class.php 2023-10-07 07:02:22 +02:00
Laurent Destailleur
68404bec9b Merge pull request #22619 from mbinformatique68/develop
NEW Add the formEditObjectLine hook on commande card and invoice card
2023-10-06 19:13:58 +02:00
Laurent Destailleur
84f4a6375e Merge pull request #26127 from W1W1-M/new-fichinter-close-notification
NEW close notification for interventions
2023-10-06 18:12:20 +02:00
William Mead
55c90c947f Fixed space after cast 2023-10-06 15:37:02 +02:00
William Mead
199eeff390 Merge branch 'Dolibarr:develop' into new-fichinter-close-notification 2023-10-06 14:36:29 +02:00
William Mead
721090e8b5 Added missing localization of word Done 2023-10-06 14:31:52 +02:00
William Mead
2568b6c63b Fixed intervention done confirmation popup 2023-10-06 14:10:06 +02:00
William Mead
b9de0e49d8 Added intervention closed confirmation text 2023-10-06 09:34:41 +02:00
William Mead
68b731d9ac Added intervention closed notification email text 2023-10-06 09:16:33 +02:00
William Mead
b29a06a0a6 Cleaned code 2023-10-06 09:15:48 +02:00
Laurent Destailleur
8ce07dfa83 Merge pull request #22573 from rycks/13.0_fix_sellist_add_order_by_option
Close #22571 : order by could be set
2023-10-06 05:02:29 +02:00
Laurent Destailleur
6cd7ef77fc Merge branch 'develop' into 13.0_fix_sellist_add_order_by_option 2023-10-06 01:42:22 +02:00
Laurent Destailleur
9deebe63d8 Update commonobject.class.php 2023-10-06 01:41:44 +02:00
Laurent Destailleur
c3a9ba5506 Update commonobject.class.php 2023-10-05 21:29:30 +02:00
Laurent Destailleur
b0cc8d7b0d Merge branch '18.0' into 13.0_fix_sellist_add_order_by_option 2023-10-05 21:25:19 +02:00
Laurent Destailleur
b307774dde Update commonobject.class.php 2023-10-05 21:17:40 +02:00
Laurent Destailleur
955439a673 SEC: Add action confirm_... as sensitive to need a CSRF token 2023-10-05 21:09:55 +02:00
Laurent Destailleur
2aee9fc5a9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-05 21:09:33 +02:00
Laurent Destailleur
f5534586c1 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-05 21:09:21 +02:00
Laurent Destailleur
5b0483bf13 Merge pull request #26113 from defrance/patch-277
php warning and field not used
2023-10-05 20:47:40 +02:00
Laurent Destailleur
e0ff53bcaa Merge pull request #26106 from thomas-Ngr/develop_fix_duplicate_ticket_information
fix ticket card: set origin_email to null
2023-10-05 20:42:25 +02:00
Laurent Destailleur
8488c05b6a Merge pull request #24872 from MaximilienR-easya/dev_New_linked_file_shared_public_side
New access to msg linked files via public interface
2023-10-05 20:41:23 +02:00
Laurent Destailleur
0f448389d1 Update actions_ticket.class.php 2023-10-05 20:40:24 +02:00
Laurent Destailleur
a2b6532c5a Debug v19 2023-10-05 16:32:38 +02:00
Laurent Destailleur
553776a77a Enhance error message when set character set failed 2023-10-05 12:58:44 +02:00
William Mead
b3ce1af29d NEW Added notification on closed intervention 2023-10-05 12:11:39 +02:00
Laurent Destailleur
6e40408683 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-05 11:27:41 +02:00
Laurent Destailleur
76a7801975 Fix warning 2023-10-05 11:27:00 +02:00
Laurent Destailleur
1b8c72f30d fix html typo 2023-10-05 11:08:19 +02:00
Laurent Destailleur
c3ae353a2a Work on session add 2023-10-04 21:12:50 +02:00
Laurent Destailleur
3700b047ec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-04 13:04:54 +02:00
Laurent Destailleur
40f10588e3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-04 13:04:31 +02:00
Charlène Benke
bf1437ff8b Update note.php 2023-10-04 12:17:56 +02:00
Charlène Benke
f59a0f5eba warning error and duplicate 2023-10-04 12:17:02 +02:00
Laurent Destailleur
ee4d662ca7 Merge pull request #26091 from elkoiko/fix-warnings-contrat-and-contratligne
FIX warnings for undefined properties in Contrat and ContratLigne
2023-10-04 09:46:11 +02:00
tnegre
df097d74bd fix ticket card: set origin_email to null 2023-10-04 09:43:54 +02:00
Laurent Destailleur
dd2e68d8ea Merge pull request #26097 from hregis/fix_wrong_entity_field
FIX field entity is DEFAULT 1 NOT NULL
2023-10-04 09:42:48 +02:00
Laurent Destailleur
1ad05e2a73 Merge pull request #26098 from aspangaro/19a8
NEW Project - List - use select2 multiselect for status
2023-10-04 09:41:29 +02:00
Laurent Destailleur
884aad581b Merge pull request #26103 from declic3000/patch-2
FIX : Update api_supplier_orders.class.php
2023-10-04 09:34:34 +02:00
Laurent Destailleur
73bdb71507 Fix bom 2023-10-03 19:54:06 +02:00
Laurent Destailleur
5bcd89d66c Debug v19 2023-10-03 19:39:22 +02:00
Guillaume Wauquier
3b6f4f717c FIX : Update api_supplier_orders.class.php
Constat : L'api ne renvoie pas le même resultat que l'interface dolibarr. la construction de la requete est incorrecte.

Requete obtenu avant correctif:
SELECT t.rowid, sc.fk_soc, sc.fk_user, t.fk_soc
FROM llx_commande_fournisseur as t,
     llx_societe_commerciaux as sc
WHERE t.entity IN (1) AND t.fk_soc = sc.fk_soc AND t.rowid = sc.fk_soc AND sc.fk_user = 4
ORDER BY t.rowid ASC
LIMIT 101

Le t.rowid = sc.fk_soc compare des endives et des parpaings. => suppression de la ligne 143 à 145.

Et ensuite correction des conditionnelles pour construire une requete correcte.
2023-10-03 19:37:43 +02:00
Alexandre SPANGARO
5f6a4bb785 Merge branch 'develop' into 19a8 2023-10-03 03:27:46 +02:00
Laurent Destailleur
6e18d1b7ab Start to introduce dolibarr_main_dolcrypt_key 2023-10-03 02:00:00 +02:00
Laurent Destailleur
4fe2c674f1 Set log as a warning 2023-10-03 00:52:26 +02:00
Laurent Destailleur
6fe66999f8 Fix include of example 2023-10-03 00:31:13 +02:00
Laurent Destailleur
5537ccede2 FIX update_extras must use updateExtraFields 2023-10-03 00:23:06 +02:00
Alexandre SPANGARO
16a0025e93 NEW Project - List - use select2 multiselect for status 2023-10-02 22:57:53 +02:00
Laurent Destailleur
d3dc6615db Remove deprecated use of ->modelpdf (good is ->model_pdf) 2023-10-02 21:49:08 +02:00
Regis Houssin
0040ff24e1 FIX field entity is DEFAULT 1 NOT NULL 2023-10-02 21:26:27 +02:00
Laurent Destailleur
46bc9de594 Merge pull request #25871 from DoliGreece/sonikf-patch-fetch-vat-details
NEW: Retrieve vat details from the Greek Ministry of Finance GSIS SOAP web service and autocomplete third party fields
2023-10-02 18:38:40 +02:00
Laurent Destailleur
59fc407e43 Merge branch 'develop' into fix-warnings-contrat-and-contratligne 2023-10-02 18:19:53 +02:00
Laurent Destailleur
e8f5f32141 Merge pull request #26093 from solution-libre/fix-reduce--unnecessary-complexity
FIX Reduce  unnecessary complexity
2023-10-02 18:17:15 +02:00
Laurent Destailleur
12bed4e004 Merge pull request #26083 from hansemschnokeloch/fix-25127
FIX #25127
2023-10-02 17:36:17 +02:00
Laurent Destailleur
5bc9be8fc3 Merge pull request #26092 from OPEN-DSI/develop_new_add_trigger_delete_bank_account_line
NEW: Add trigger when delete a bank account line
2023-10-02 17:21:00 +02:00
Florent Poinsaut
ffee2af478 FiX CI 2023-10-02 17:01:53 +02:00
Florent Poinsaut
25bd19d7e5 Unneccesary else 2023-10-02 16:58:28 +02:00
Florent Poinsaut
17f8bc6c1f Reduce unnecessary complexity 2023-10-02 16:44:44 +02:00
Pascal Hubrecht
8bd9177eba Merge branch 'Dolibarr:develop' into fix-25127 2023-10-02 16:28:01 +02:00
Kamel Khelifa
ee921ab540 NEW: Add trigger when delete a bank account line 2023-10-02 15:52:44 +02:00
Laurent Destailleur
34fc0f14d2 Fix warnings 2023-10-02 15:41:14 +02:00
Laurent Destailleur
042ce496c7 Fix phpcs 2023-10-02 15:38:38 +02:00
Thomas Couacault
3028bd3784 FIX typo $tva_tx instead of $txtva 2023-10-02 14:42:58 +02:00
Thomas Couacault
3d96b66664 FIX: Delete use of unassigned product_description member in ContratLigne class 2023-10-02 14:22:11 +02:00
Laurent Destailleur
4cf1dc1a2f Fix picto clear search 2023-10-02 13:21:09 +02:00
Laurent Destailleur
669386d45c Fix error message 2023-10-02 12:53:50 +02:00
Laurent Destailleur
7f0eb701d7 Fix decrypt 2023-10-02 11:48:28 +02:00
Laurent Destailleur
f9288ce862 Look and feel v18 2023-10-02 11:26:26 +02:00
Thomas Couacault
7433501e08 FIX: Undefined property $pa_ht in Contrat::updateline 2023-10-02 11:23:35 +02:00
Pascal Hubrecht
86850e05c6 Merge branch 'Dolibarr:develop' into fix-25127 2023-10-02 11:15:16 +02:00
pascal
c6803b5c10 Add console log message 2023-10-02 11:08:55 +02:00
Laurent Destailleur
3c65aad61a Fix bad date read 2023-10-02 09:48:55 +02:00
Laurent Destailleur
53f767e7bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-01 21:19:18 +02:00
Laurent Destailleur
06e04aa897 css 2023-10-01 20:53:37 +02:00
Laurent Destailleur
8851615528 Look and feel v19 2023-10-01 20:15:01 +02:00
Laurent Destailleur
b2a6823e56 Merge pull request #26087 from hregis/fix_menu_force_entity
NEW possibility to deselect line when create a recurring invoice + missing to use fk_parent_line
2023-10-01 17:54:05 +02:00
Laurent Destailleur
2e431468a0 FIX #25996 FIX #25997 2023-10-01 17:24:25 +02:00
Laurent Destailleur
2a49ebb114 CSS 2023-10-01 16:23:06 +02:00
Laurent Destailleur
b8bd760e28 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-01 16:06:58 +02:00
Laurent Destailleur
28758ccee3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-01 15:36:08 +02:00
Laurent Destailleur
10ba3743c1 NEW Can upload/delete ODT template for project and tasks 2023-10-01 15:35:51 +02:00
Laurent Destailleur
e5cc3f9a74 FIX Can't delete an ODT template in setup of member 2023-10-01 15:23:06 +02:00
Laurent Destailleur
622016563e Fix save of setup of odt path for projects 2023-10-01 14:57:29 +02:00
Laurent Destailleur
62ad3d12d2 Merge pull request #26076 from hansemschnokeloch/fix-26066
FIX #26066
2023-10-01 13:37:25 +02:00
Laurent Destailleur
c16313007a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-01 13:24:00 +02:00
Regis Houssin
fbc841095e NEW possibility to deselect line when create a recurring invoice 2023-10-01 11:47:37 +02:00
Laurent Destailleur
cf02e40d1e CSS 2023-09-30 19:40:09 +02:00
pascal
1a10894e88 FIX #25127 2023-09-30 17:51:14 +02:00
Laurent Destailleur
fa9f6a7c0d Merge pull request #26068 from Kazimir42/patch-1
FIX : Inventory lines saving with big inventory
2023-09-30 13:44:11 +02:00
Laurent Destailleur
282575dd6a Missing total for stock at date 2023-09-30 11:58:17 +02:00
Laurent Destailleur
f5bf4a6ec4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-30 11:54:12 +02:00
Laurent Destailleur
0ab39adfbb Merge pull request #26070 from jyhere/jyhere/fix-stockatdate-sellvalue
FIX: stockatdate sell value is not at date
2023-09-30 11:49:26 +02:00
Laurent Destailleur
f7ac851c50 Merge pull request #26047 from TheRealBeef/develop
FIX #26033 Stock Movement associated with project doesn't show up in Project / Overview window
2023-09-30 11:03:34 +02:00
Laurent Destailleur
c1b74f9338 Fix phpunit regression 2023-09-29 17:04:11 +02:00
Pascal Hubrecht
6a3ff1cd73 Merge branch 'Dolibarr:develop' into fix-26066 2023-09-29 17:00:23 +02:00
Laurent Destailleur
72e17fe60e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-09-29 16:53:54 +02:00
pascal
084b205975 FIX #26066
Fix #26066 and add missing $page parameter
2023-09-29 16:28:42 +02:00
Laurent Destailleur
532fd91b57 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-29 16:27:27 +02:00
Laurent Destailleur
3cb78be3ac Clean code 2023-09-29 16:27:07 +02:00
Laurent Destailleur
e957c285bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-29 12:07:42 +02:00
Laurent Destailleur
e25ffc5fef NEW Add the picto phone of thirdparty on the kanban view of projects 2023-09-29 12:04:18 +02:00
Jyhere
93a4a1f90c FIX: stockatdate sellvalue is not at date 2023-09-29 11:36:46 +02:00
Laurent Destailleur
93bbd6770e Fix function stream_wrapper_restore not found 2023-09-29 11:20:30 +02:00
Rémi Champlon
753a4e810a Fix order on saving inventory 2023-09-29 09:30:08 +02:00
Laurent Destailleur
519aa293a6 Merge pull request #26063 from hansemschnokeloch/fix-25230
FIX #25230 Supplier invoice API partial payment
2023-09-29 00:36:40 +02:00
Laurent Destailleur
7e858125fb Fix phpcs 2023-09-29 00:32:08 +02:00
Laurent Destailleur
e20b43d8b5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2023-09-29 00:21:55 +02:00
Laurent Destailleur
f2bfdb318e phpcs 2023-09-29 00:19:32 +02:00
Laurent Destailleur
261460b804 Merge pull request #25946 from JonBendtsen/add_stock_2_service_menu
adding stock menu point to services menu
2023-09-29 00:00:32 +02:00
Laurent Destailleur
1f5fd2e5b5 Merge branch 'develop' into add_stock_2_service_menu 2023-09-28 23:09:17 +02:00
Laurent Destailleur
24b2dd805b Merge pull request #26058 from defrance/patch-276
FIX : Bad hidden variable Name
2023-09-28 22:54:49 +02:00
Laurent Destailleur
54f5317eab Merge pull request #26061 from elkoiko/undefined-property-pa_ht-class-contrat
fix: Undefined property: Contrat::$pa_ht
2023-09-28 22:53:54 +02:00
pascal
b271695b3e update phpdoc 2023-09-28 18:00:17 +02:00
pascal
dbfa676e48 FIX #25230 2023-09-28 17:53:23 +02:00
Thomas Couacault
04b811427d fix: Undefined property: Contrat::$pa_ht 2023-09-28 15:38:16 +02:00
Charlène Benke
d8fac8081f FIX : Bad hidden variable Name
the hidden constant MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT had been renamed since version 9 to SHIPPING_PDF_DISPLAY_AMOUNT_HT
but not in this pdf file
2023-09-28 10:25:09 +02:00
Laurent Destailleur
04fd4c44df Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-28 01:11:59 +02:00
Laurent Destailleur
3cc1496c0d Merge pull request #23063 from alsoft10/16.0-emailcollector
Feature created #23062
2023-09-28 01:09:36 +02:00
Laurent Destailleur
1c6c9bcfb7 Merge branch 'develop' into 16.0-emailcollector 2023-09-28 01:09:11 +02:00
Laurent Destailleur
be61b1cb47 Update emailcollector.class.php 2023-09-28 01:05:58 +02:00
Laurent Destailleur
79f1c7be95 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-28 01:01:18 +02:00
Laurent Destailleur
644f43c67c Fix fontawesome v5 compatibility 2023-09-28 01:00:36 +02:00
Laurent Destailleur
18bbbf579d Merge pull request #23171 from Easya-Solutions/new-inventory-without-kit
NEW inventory without virtual products (kits)
2023-09-28 00:35:12 +02:00
Laurent Destailleur
88de198fe5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-28 00:30:33 +02:00
Laurent Destailleur
9e55289894 Merge pull request #26053 from carmelchas/develop
Update ticket.class.php - SQL Syntax Error
2023-09-28 00:30:11 +02:00
Charles
8377b8f3f0 Update ticket.class.php - SQL Syntax Error
Function "loadCacheCategoriesTickets" query had two WHERE clauses.  Change the second "WHERE" to "AND".
2023-09-27 14:14:03 -05:00
Laurent Destailleur
719e896ee8 css 2023-09-27 20:12:43 +02:00
Laurent Destailleur
12bfe76d39 Save the warehouse_id in shipment distribution of lot/serial 2023-09-27 20:03:51 +02:00
Laurent Destailleur
db9bd4326a css 2023-09-27 17:39:27 +02:00
Laurent Destailleur
992726e424 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 17:20:18 +02:00
Laurent Destailleur
7bbc3bab05 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 17:17:41 +02:00
Laurent Destailleur
9de68944f5 Merge pull request #26048 from solution-libre/fix-notnull-key-missing
Fix notnull key missing
2023-09-27 15:46:06 +02:00
Laurent Destailleur
be8051a14b Merge pull request #26040 from aspangaro/19a6
NEW FontAwesome - Add possibility to select another version
2023-09-27 15:44:40 +02:00
Laurent Destailleur
45cf4c40fb Merge pull request #26042 from aspangaro/19a8
Review ticket admin page
2023-09-27 15:40:17 +02:00
Laurent Destailleur
5411a18e1b Fix warning 2023-09-27 12:53:58 +02:00
Florent Poinsaut
2992fc280c Merge branch 'develop' into fix-notnull-key-missing 2023-09-27 11:45:01 +02:00
Florent Poinsaut
a661570aec Fix notnull key missing 2023-09-27 11:43:21 +02:00
Laurent Destailleur
cdfa7c901a Merge pull request #25532 from lamrani002/formAddPropertyMB
NEW Form for add object's property on moduleBuilder
2023-09-27 11:34:07 +02:00
Beef
5bdad9aa25 Merge branch 'Dolibarr:develop' into develop 2023-09-27 10:56:33 +02:00
TheRealBeef
45bf2cd9a8 Updated to display the Advanced Stock Transfers
Regular stock transfers can not be associated with projects in normal use, so the previous functionality was depreciated.
2023-09-27 10:52:39 +02:00
sonikf
da92e4be32 fix remove unnecessary exposed service paramaters 2023-09-27 09:52:34 +03:00
Alexandre SPANGARO
e1c1042d42 Review ticket admin page 2023-09-27 06:16:37 +02:00
Laurent Destailleur
b9336c024a Merge pull request #25566 from hansemschnokeloch/rest-extra
Add filter to restrict the data returned
2023-09-27 00:56:51 +02:00
Laurent Destailleur
9d38e14c30 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 00:43:05 +02:00
Laurent Destailleur
cc0a07d433 Better cyclomatic complexity 2023-09-27 00:42:54 +02:00
Laurent Destailleur
9e3ad1cf24 Merge pull request #25656 from hansemschnokeloch/develop-1
FIX Add substitution variables from project into propal
2023-09-27 00:12:48 +02:00
Laurent Destailleur
73464757a3 Merge pull request #25944 from DoliGreece/sonikf-fix-translation
fix translation
2023-09-27 00:04:48 +02:00
Laurent Destailleur
7846947f0c Fix ref_supplier must be null if not defined 2023-09-26 23:24:14 +02:00
Laurent Destailleur
42f4bfe8a3 Merge pull request #26024 from frederic34/patch-8
phpstan
2023-09-26 22:53:55 +02:00
Alexandre SPANGARO
0fd8123606 NEW FontAwesome - Add possibility to select another version 2023-09-26 21:49:15 +02:00
Laurent Destailleur
3c48cbaac0 Doc 2023-09-26 21:07:20 +02:00
Laurent Destailleur
266dea3b7e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-26 21:04:04 +02:00
Laurent Destailleur
8021eb0b5d Merge pull request #26029 from fappels/develop_fix_link_index
Fix Error on the uk_links index of the llx_links table #25926
2023-09-26 21:03:52 +02:00
Laurent Destailleur
b21a24aa97 Add AssetModel in AllTest 2023-09-26 20:52:49 +02:00
Laurent Destailleur
5733b9f558 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-26 20:45:04 +02:00
Laurent Destailleur
dc2bd648d5 Merge pull request #26028 from Hystepik/assetModel-test-file
New asset model phpunit test
2023-09-26 20:42:44 +02:00
Laurent Destailleur
9761a11acd Merge pull request #26030 from frederic34/patch-6
phpstan
2023-09-26 20:42:21 +02:00
Laurent Destailleur
26da51e1c4 Merge pull request #26031 from Quentin-Seekness/patch-11
Update card.php line desc
2023-09-26 20:42:00 +02:00
pascal
80f060c771 fix tab indentation 2023-09-26 18:43:25 +02:00
pascal
871f896962 implementation of properties filter 2023-09-26 18:04:48 +02:00
Quentin-Seekness
70ecf5a123 Update card.php line desc
We don't need the label to be the description if there was not any in origin line.
2023-09-26 10:27:59 +02:00
Frédéric FRANCE
97cc6a48ec phpstan 2023-09-26 09:58:51 +02:00
Frédéric FRANCE
419332718a phpstan 2023-09-26 09:57:55 +02:00
Frédéric FRANCE
0298fb3b40 phpstan 2023-09-26 09:54:51 +02:00
Laurent Destailleur
bd5c111f1a Better error message 2023-09-26 00:56:52 +02:00
Pascal Hubrecht
9835385f58 Merge branch 'Dolibarr:develop' into rest-extra 2023-09-25 20:59:57 +02:00
pascal
19a528bed4 mv fetch_project to card.php 2023-09-25 20:48:43 +02:00
Pascal Hubrecht
7c8403d82f Merge branch 'Dolibarr:develop' into develop-1 2023-09-25 20:37:58 +02:00
Francis Appels
94dadee77f Fix Error on the uk_links index of the llx_links table #25926 2023-09-25 17:17:52 +02:00
Laurent Destailleur
bc73033d22 FIX Name of application used in email payment AK not defined 2023-09-25 16:39:40 +02:00
Hystepik
d157e8f660 New asset model phpunit test 2023-09-25 14:54:32 +02:00
Frédéric FRANCE
9621a6a56d phpstan
htdocs/core/modules/printing/modules_printing.php	96	Access to an undefined property PrintingDriver::$name.
htdocs/core/modules/printing/modules_printing.php	100	Access to an undefined property PrintingDriver::$desc.
htdocs/core/modules/printing/printgcp.modules.php	246	Access to an undefined property printing_printgcp::$resprint.
htdocs/core/modules/printing/printgcp.modules.php	540	Access to an undefined property printing_printgcp::$resprint.
htdocs/core/modules/printing/printipp.modules.php	241	Access to an undefined property printing_printipp::$resprint.
2023-09-25 13:24:34 +02:00
Laurent Destailleur
11a1630287 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-25 11:47:18 +02:00
Laurent Destailleur
55b91f00d2 Look and feel v19 2023-09-25 11:44:46 +02:00
Laurent Destailleur
277ed6a7c3 Merge pull request #25936 from DoliGreece/develop
Use getDolGlobalString() getDolGlobalInt()
2023-09-25 02:24:39 +02:00
Laurent Destailleur
d24c340e6b Merge pull request #25995 from lamrani002/addMassActions
NEW updating by adding massactions for delete projects in societe tab
2023-09-25 02:19:24 +02:00
Laurent Destailleur
a5b967cd36 Merge pull request #25993 from frederic34/patch-9
phpstan
2023-09-25 02:04:21 +02:00
Laurent Destailleur
cb4987884e Merge pull request #25992 from frederic34/patch-8
phpstan
2023-09-25 02:03:50 +02:00
Laurent Destailleur
2440f60ee4 Merge pull request #25991 from frederic34/phpstaninvoice
Phpstan
2023-09-25 02:03:07 +02:00
Laurent Destailleur
96751440b4 Merge pull request #26007 from sonikf/sonikf-patch-2
FIX #26005
2023-09-25 01:56:08 +02:00
Laurent Destailleur
34a1251aed Merge pull request #25994 from frederic34/patch-11
fix unknown variable
2023-09-25 01:54:57 +02:00
Laurent Destailleur
cee015e460 Merge pull request #26016 from bloxera/devcamp2023-11
Fix PHPStan issues
2023-09-25 01:53:06 +02:00
Laurent Destailleur
dcb5fc07e2 Merge pull request #26019 from hregis/fix_menu_force_entity
FIX #25982 and avoid lose selected value if error
2023-09-25 01:51:45 +02:00
Regis Houssin
d133075fca FIX #25982 and avoid lose selected value if error 2023-09-24 15:56:18 +02:00
priojk
2f734857c8 Fix PHPStan issues 2023-09-23 17:20:53 +02:00
priojk
7f0b3f3414 Revert "Fix PHPStan issues"
This reverts commit 922ef1d9a5.
2023-09-23 17:18:42 +02:00
priojk
922ef1d9a5 Fix PHPStan issues 2023-09-23 17:14:33 +02:00
sonikf
f45a35860f Fix #26005 2023-09-23 13:11:56 +03:00
Lamrani Abdel
4a423e4729 NEW functionality mmassactions for delete projects 2023-09-22 14:06:11 +02:00
Frédéric FRANCE
446479d2b9 fix unknown variable 2023-09-22 13:45:37 +02:00
sonikf
40238a5105 fix Uncaught SyntaxError: JSON.parse: unexpected character at line 1 column 2 of the JSON data 2023-09-22 14:32:59 +03:00
sonikf
3c539bee6a Add top_httphead('application/json'); 2023-09-22 14:32:05 +03:00
Frédéric FRANCE
2eaa5a076e phpstan 2023-09-22 13:31:45 +02:00
Frédéric FRANCE
abca049228 phpstan 2023-09-22 13:20:41 +02:00
sonikf
9199bce9da Add test on !empty($u) 2023-09-22 12:56:40 +03:00
sonikf
faee21b0d3 Use GETPOST instead of $_REQUEST 2023-09-22 12:53:41 +03:00
sonikf
6864de475e remove ! operator 2023-09-22 11:12:45 +03:00
Frédéric FRANCE
560489e4a6 phpstan 2023-09-22 09:28:56 +02:00
Frédéric FRANCE
daf2f06ac8 phpstan 2023-09-22 09:07:04 +02:00
Frédéric FRANCE
7cf93529a8 phpstan 2023-09-22 09:03:27 +02:00
Laurent Destailleur
a68b00de4e Enhance APStats 2023-09-22 04:59:32 +02:00
Laurent Destailleur
a899a0e01c Enhance APStats 2023-09-22 04:36:44 +02:00
Laurent Destailleur
590cd06a79 Merge pull request #25818 from Hystepik/fix-bokcal-extrafield
Fix add bookcal extrafields
2023-09-22 02:52:23 +02:00
Laurent Destailleur
0115c2485f Merge pull request #25969 from lamrani002/editNationalRegistrationNumber
New updating for edit NRC in skills tabs in user fiche
2023-09-22 02:50:36 +02:00
Laurent Destailleur
b250fc14c2 Fix encrypt password field not yet encrypted 2023-09-22 01:23:48 +02:00
Laurent Destailleur
f70608c60f CSS 2023-09-22 01:21:32 +02:00
Laurent Destailleur
7d37731a9e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-09-22 01:21:00 +02:00
Laurent Destailleur
e3e4e859e5 Fix reset of password 2023-09-22 01:20:21 +02:00
Laurent Destailleur
e9f80875b7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-22 01:19:49 +02:00
Laurent Destailleur
6bb5c3841d Merge pull request #25978 from frederic34/imageemailcollector
create thumbnail and fill ecmfiles
2023-09-21 19:37:22 +02:00
Laurent Destailleur
2aea4ff29f Merge pull request #25980 from atm-maxime/new_idprofcheck_be
NEW : add IdProfCheck on thirdparty for BE (xxxx.xxx.xxx)
2023-09-21 19:33:05 +02:00
Laurent Destailleur
1cdf727e7d Merge pull request #25981 from frederic34/patch-8
phpstan remove duplicate
2023-09-21 19:31:27 +02:00
Laurent Destailleur
fa34a91873 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-21 19:30:37 +02:00
Laurent Destailleur
7b2240c267 CSS 2023-09-21 19:19:01 +02:00
Laurent Destailleur
ca5bcd0fd7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-21 19:09:16 +02:00
Laurent Destailleur
8a7371af5e NEW Tooltips are using ajax by default 2023-09-21 19:06:49 +02:00
Laurent Destailleur
e45d4c69b4 CSS 2023-09-21 19:06:27 +02:00
Laurent Destailleur
7e4e49f1fb FIX css for forbidden entry in dropdown button action 2023-09-21 18:54:45 +02:00
Laurent Destailleur
7bf8637e75 Merge pull request #25990 from noec764/NEW_add_preselected_values_on_update_import
NEW: Add preselected update keys attribute to import class and select it by default if filled
2023-09-21 18:24:19 +02:00
Laurent Destailleur
e952b3be85 Code comment 2023-09-21 18:19:05 +02:00
Laurent Destailleur
affa6fe46d Fix dol_now 2023-09-21 18:09:07 +02:00
Laurent Destailleur
0492a78c66 Merge pull request #25988 from Easya-Solutions/fix-expedition-line-batch-create
FIX sql to create batch from shipping line
2023-09-21 18:04:46 +02:00
Noé Courtier
8d38378d3b NEW: Add preselected update keys attribute to import class and select it by default if filled 2023-09-21 16:52:06 +02:00
VESSILLER
089d24bef0 FIX sql to create batch from shipping line 2023-09-21 14:30:37 +02:00
Laurent Destailleur
08ac0e9ee4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-21 12:38:41 +02:00
Laurent Destailleur
10b2cd7399 NEW Add the status of partnership to select partnership for emailing 2023-09-21 12:17:40 +02:00
Laurent Destailleur
277d69fe0f Fix use of empty in selectarray when label start with entity char & 2023-09-21 12:11:16 +02:00
Frédéric FRANCE
de8912fa72 mutualize code 2023-09-21 10:12:12 +02:00
Frédéric FRANCE
6a2d0e5408 mutualize code 2023-09-21 09:43:00 +02:00
Jon Bendtsen
cc8aac4ab5 change by request 2023-09-20 21:35:22 +02:00
Frédéric FRANCE
f008bf5021 phpstan remove duplicate
::error file=htdocs/core/lib/functions.lib.php,line=4139,col=0::Array has 2 duplicate keys with value 'int' ('int', 'int').
2023-09-20 21:15:51 +02:00
Maxime Kohlhaas
373a1d544c NEW : add IdProfCheck on thirdparty for BE (xxxx.xxx.xxx) 2023-09-20 18:14:55 +02:00
Frédéric FRANCE
6c64b9c483 create thumbnail and fill ecmfiles 2023-09-20 15:14:43 +02:00
Lamrani Abdel
d45627aae4 fix problem 2023-09-20 14:22:30 +02:00
Laurent Destailleur
abd236e804 Fix picto of data type 2023-09-20 03:14:48 +02:00
Laurent Destailleur
9148d7540e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-09-20 03:09:10 +02:00
Laurent Destailleur
8bb1c55440 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-20 03:04:30 +02:00
Laurent Destailleur
864d4ad776 Look and feel v19 2023-09-20 03:02:31 +02:00
Laurent Destailleur
f7af03308a NEW Add a public page to list all open surveys 2023-09-20 02:48:35 +02:00
sonikf
21ad78cfa6 fix mistake 2023-09-20 01:38:39 +03:00
sonikf
8c4dd102e6 Update definition 2023-09-20 01:30:28 +03:00
Laurent Destailleur
5d47349bc3 Merge pull request #25953 from Easya-Solutions/new-invoice-list-due-date-filter
NEW start and end date for due date filter on invoice list
2023-09-20 00:10:47 +02:00
Laurent Destailleur
3b2b844304 Merge pull request #25958 from frederic34/patch-9
phpstan
2023-09-20 00:03:13 +02:00
Laurent Destailleur
2a3f42cb42 Merge pull request #25937 from frederic34/patch-6
phpstan
2023-09-20 00:02:51 +02:00
Laurent Destailleur
6f90160a27 Merge pull request #25930 from hregis/fix_menu_force_entity
FIX multicompany compatibility
2023-09-19 23:58:47 +02:00
Laurent Destailleur
346a49ca3f Merge pull request #25938 from santiagopim/develop
NEW chart of accounts ES PCG08-PYME-CAT in catalan language
2023-09-19 23:56:38 +02:00
Laurent Destailleur
d0c565ff67 Merge pull request #25939 from aspangaro/19a7
FIX #25885 Accountancy - Need more space on pcg_type for predefined groups
2023-09-19 23:49:49 +02:00
Laurent Destailleur
f8bc26d0cc Merge pull request #25947 from JonBendtsen/add_variant_2_service_menu
adding variants menu entry to services menu
2023-09-19 23:42:48 +02:00
Laurent Destailleur
16cae861e1 Merge pull request #25957 from frederic34/patch-8
phpstan
2023-09-19 23:26:52 +02:00
Laurent Destailleur
663dc3ad82 Merge pull request #25959 from frederic34/patch-11
phpstan
2023-09-19 23:26:06 +02:00
Laurent Destailleur
613346bb97 Merge pull request #25960 from Hystepik/fix-boocal-bugs
fix some bugs in bookcal module
2023-09-19 23:25:45 +02:00
Laurent Destailleur
f97f9fb323 Merge pull request #25964 from frederic34/patch-12
phpstan
2023-09-19 23:08:02 +02:00
Laurent Destailleur
96db455313 Merge pull request #25966 from frederic34/colorseries
phpstan
2023-09-19 22:46:32 +02:00
Laurent Destailleur
a0174f723a Merge pull request #25974 from lamrani002/imageType
New picto for type for properties objects in modulebuilder
2023-09-19 22:44:45 +02:00
Laurent Destailleur
ce66267ae5 Merge pull request #25972 from thomas-Ngr/develop_fix_duplicate_ticket_information
FIX : duplicate ticket information
2023-09-19 22:41:16 +02:00
Laurent Destailleur
e8edd115f1 Fix status 2023-09-19 21:16:32 +02:00
Laurent Destailleur
77c6fe1693 css 2023-09-19 21:13:05 +02:00
Laurent Destailleur
498af7d7bc Look and feel v19 2023-09-19 21:05:02 +02:00
Laurent Destailleur
492b726da9 Fix regression with label of order 2023-09-19 20:32:23 +02:00
Laurent Destailleur
69e7f0f1f3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-19 20:07:36 +02:00
Lamrani Abdel
0f0f66f252 New picto for type in modulebuilder 2023-09-19 19:25:24 +02:00
tnegre
1c70a2b3da FIX when creating tickets from public interface and backoffice at the same time, values from the ticket created on public interface were not erased during creation from backoffice. 2023-09-19 17:08:06 +02:00
Laurent Destailleur
bd4efca9e7 Add result message on extrafield deletion 2023-09-19 16:42:50 +02:00
Laurent Destailleur
4fa60709d5 NEW Add a button to re-encrypt data of a dolcrypt extrafield password 2023-09-19 16:07:45 +02:00
Laurent Destailleur
c735e6e75f Trans 2023-09-19 14:57:14 +02:00
Lamrani Abdel
c57e7ebdba New updating for edit NRC in skills tabs 2023-09-19 13:33:25 +02:00
Laurent Destailleur
c07abcc67c NEW Add different picto for each type of extrafields (date, string, ...) 2023-09-19 13:24:03 +02:00
Frédéric FRANCE
51568a6093 phpstan 2023-09-19 09:48:14 +02:00
Frédéric FRANCE
bf9aaf5600 phpstan 2023-09-19 09:09:08 +02:00
Laurent Destailleur
cb62571d31 Fix link to create an event, bad current date 2023-09-18 19:05:15 +02:00
Laurent Destailleur
4122d14b43 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-18 18:43:46 +02:00
Laurent Destailleur
9c1e3fc6a0 Look and feel v19 - message view use the action type icon 2023-09-18 18:41:52 +02:00
Laurent Destailleur
ba7c03fbf7 Fix tzuser on link to create an event 2023-09-18 16:31:37 +02:00
Laurent Destailleur
811bc1fb25 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-18 13:22:37 +02:00
Hystepik
2347d5cb9a fix some bugs in bookcal module 2023-09-18 13:12:11 +02:00
Frédéric FRANCE
ac9ac76e67 phpstan 2023-09-18 12:20:16 +02:00
Hystepik
fdeb589315 modify table names 2023-09-18 12:17:19 +02:00
Frédéric FRANCE
667b3877d8 phpstan 2023-09-18 12:11:11 +02:00
Frédéric FRANCE
0de4f372a6 phpstan
::error file=htdocs/core/modules/expedition/doc/pdf_rouget.modules.php,line=113,col=0::Access to an undefined property pdf_rouget::$posxqtytoship.
::error file=htdocs/core/modules/expedition/doc/pdf_rouget.modules.php,line=528,col=0::Access to an undefined property pdf_rouget::$posxqtytoship.
::error file=htdocs/core/modules/expedition/doc/pdf_rouget.modules.php,line=532,col=0::Access to an undefined property pdf_rouget::$posxqtytoship.
::error file=htdocs/core/modules/expedition/doc/pdf_rouget.modules.php,line=533,col=0::Access to an undefined property pdf_rouget::$posxqtytoship.
::error file=htdocs/core/modules/expedition/doc/pdf_rouget.modules.php,line=678,col=0::Access to an undefined property pdf_rouget::$posxqtytoship.
::error file=htdocs/core/modules/expedition/doc/pdf_rouget.modules.php,line=718,col=0::Access to an undefined property pdf_rouget::$posxqtytoship.
::error file=htdocs/core/modules/expedition/doc/pdf_rouget.modules.php,line=722,col=0::Access to an undefined property pdf_rouget::$posxqtytoship.
::error file=htdocs/core/modules/expedition/doc/pdf_rouget.modules.php,line=723,col=0::Access to an undefined property pdf_rouget::$posxqtytoship.
::error file=htdocs/core/modules/expedition/doc/pdf_rouget.modules.php,line=812,col=0::Access to an undefined property pdf_rouget::$posxqtytoship.
::error file=htdocs/core/modules/expedition/doc/pdf_rouget.modules.php,line=817,col=0::Access to an undefined property pdf_rouget::$posxqtytoship.
::error file=htdocs/core/modules/expedition/doc/pdf_rouget.modules.php,line=817,col=0::Access to an undefined property pdf_rouget::$posxqtytoship.
::error file=htdocs/core/modules/expedition/doc/pdf_rouget.modules.php,line=819,col=0::Access to an undefined property pdf_rouget::$posxqtytoship.
::error file=htdocs/core/modules/expedition/doc/pdf_rouget.modules.php,line=820,col=0::Access to an undefined property pdf_rouget::$posxqtytoship.
2023-09-18 12:02:49 +02:00
VESSILLER
f53eae38f7 Fix rename search option 2023-09-18 11:52:07 +02:00
VESSILLER
880384dccd NEW start and end date for due date filter on invoice list 2023-09-18 10:54:45 +02:00
Jon Bendtsen
ea67e11acc adding variants to services menu 2023-09-17 23:20:44 +02:00
Jon Bendtsen
b0e636eabf figured out how to only enable this menu point if STOCK supports services 2023-09-17 23:03:40 +02:00
Jon Bendtsen
55799d5b6c adding stock menu point to services. Probably should test that stocks are enabled for services, but couldn't get that to work 2023-09-17 22:46:25 +02:00
sonikf
44e690dadd fix translation 2023-09-17 21:19:43 +03:00
Laurent Destailleur
65a2761a83 FIX Deletion of time spent line from the full list 2023-09-17 12:32:21 +02:00
Alexandre SPANGARO
3bb4b042c5 FIX #25885 Accountancy - Need more space on pcg_type for predefined groups 2023-09-17 07:15:29 +02:00
Laurent Destailleur
6c87f0acce css 2023-09-17 02:20:20 +02:00
sonikf
edcabc95e0 fix error 2023-09-16 21:50:39 +03:00
sonikf
5118acc22c fix omission 2023-09-16 21:46:22 +03:00
Santiago Payà Miralta
0ab9307ee5 Merge branch 'Dolibarr:develop' into develop 2023-09-16 19:01:36 +02:00
Frédéric FRANCE
c351d92158 phpstan
::error file=htdocs/core/class/html.formmail.class.php,line=310,col=0::Cannot unset offset string on array.
::error file=htdocs/core/class/html.formmail.class.php,line=311,col=0::Cannot unset offset string on array.
::error file=htdocs/core/class/html.formmail.class.php,line=312,col=0::Cannot unset offset string on array.
2023-09-16 16:37:56 +02:00
Laurent Destailleur
d02c615f40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-09-16 15:14:22 +02:00
sonikf
1393e11e40 Use getDolGlobalString() 2023-09-16 15:15:52 +03:00
Laurent Destailleur
cd692cfc74 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-16 13:20:20 +02:00
Laurent Destailleur
bb0c53996f FIX #25929 #25934 2023-09-16 13:20:04 +02:00
Laurent Destailleur
44068850ae Code comment 2023-09-16 13:13:58 +02:00
Laurent Destailleur
97229bbc62 Merge pull request #25637 from frederic34/develop-2
Display warehouse usage
2023-09-16 13:08:37 +02:00
Laurent Destailleur
4b38b61bf1 Update entrepot.class.php 2023-09-16 13:08:10 +02:00
sonikf
03f24fdbea use getDolGlobalInt() 2023-09-16 02:30:56 +03:00
sonikf
7ffc143810 Use getDolGlobalString() 2023-09-16 02:22:27 +03:00
sonikf
466babd3a7 Use getDolGlobalString() 2023-09-16 01:51:27 +03:00
sonikf
d8de149018 Use getDolGlobalString() 2023-09-16 01:45:29 +03:00
sonikf
d8ceb56ddc use getDolGlobalInt() 2023-09-15 23:37:18 +03:00
Santiago Payà i Miralta
b721401afa NEW Add chart of accounts PCG08-PYME-CAT for ES in catalan language 2023-09-15 20:41:45 +02:00
Santiago Payà i Miralta
e3bf274362 Revised accounts for spanish chart of accounts PCG08-PYME. 2023-09-15 19:12:30 +02:00
Santiago Payà i Miralta
3650a1be79 Vertical aligned spanish chart of accounts PCG08-PYME. 2023-09-15 16:51:14 +02:00
Regis Houssin
7d321a8365 FIX wrong filter 2023-09-15 14:47:45 +02:00
Regis Houssin
80bc47948c FIX multicompany compatibility 2023-09-15 14:41:48 +02:00
Laurent Destailleur
21bcc807d1 Merge pull request #25928 from altairisfr/hookimport3
move hook at the right place
2023-09-15 11:55:58 +02:00
Christophe Battarel
74ee3a2452 move hook at the right place 2023-09-15 10:55:16 +02:00
Laurent Destailleur
791382c356 Merge pull request #25920 from altairisfr/hookimport
NEW : add new hook AfterImportInsert
2023-09-15 02:38:41 +02:00
Laurent Destailleur
8f2a31686e Merge pull request #25918 from altairisfr/model2
NEW : memorize model name for pdf hooks
2023-09-15 02:32:09 +02:00
Laurent Destailleur
8bb86a516b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-15 01:50:25 +02:00
Laurent Destailleur
aaf571442d Merge pull request #25916 from frederic34/patch-7
clean code phpstan
2023-09-15 01:05:04 +02:00
Laurent Destailleur
e178c9223f Merge pull request #25915 from frederic34/patch-6
phpstan
2023-09-14 20:52:16 +02:00
Frédéric FRANCE
b900579b3f Update timespent.class.php 2023-09-14 18:16:30 +02:00
Laurent Destailleur
686fe29c40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-14 16:42:10 +02:00
Laurent Destailleur
00609fb6c7 FIX Warning 2023-09-14 15:31:05 +02:00
Christophe Battarel
cbe119c81f NEW : add new hook AfterImportInsert 2023-09-14 15:24:25 +02:00
Christophe Battarel
85b5148ff4 update model_pdf in object 2023-09-14 14:55:36 +02:00
Frédéric FRANCE
6483704e78 clean code phpstan
::error file=htdocs/core/class/timespent.class.php,line=1004,col=0::Instantiated class TimeSpentLine not found.
2023-09-14 14:04:23 +02:00
Frédéric FRANCE
d681876aa4 phpstan
::error file=htdocs/core/class/cunits.class.php,line=75,col=0::Access to an undefined property CUnits::$libelle.
::error file=htdocs/core/class/cunits.class.php,line=302,col=0::Access to an undefined property CUnits::$libelle.
2023-09-14 13:56:55 +02:00
Laurent Destailleur
773f68ab4f Merge pull request #25849 from solution-libre/feat-add-ORDER_SUPPLIER_SUBMIT-notif
NEW add order supplier submit notif
2023-09-14 12:49:48 +02:00
Laurent Destailleur
d02665d516 Trans 2023-09-14 12:04:43 +02:00
Laurent Destailleur
09d15b8eb2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-14 11:33:59 +02:00
Laurent Destailleur
8b94eed5d2 Merge pull request #25904 from dolibit-ut/patch-763
Update myobject_card.php
2023-09-14 11:28:47 +02:00
Laurent Destailleur
6e96676261 Merge pull request #25909 from frederic34/patch-6
phpstan
2023-09-14 11:27:06 +02:00
Laurent Destailleur
6bdddf1076 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-14 11:26:32 +02:00
Laurent Destailleur
0181a5b57c Trans 2023-09-14 11:25:47 +02:00
Laurent Destailleur
6d42c38904 typo 2023-09-14 10:54:18 +02:00
Frédéric FRANCE
16eaaf93e8 phpstan
::error file=htdocs/main.inc.php,line=2134,col=0::Undefined variable: $stringforfirstkey
2023-09-14 09:37:16 +02:00
UT from dolibit
785b274700 Update myobject_card.php 2023-09-13 23:10:22 +02:00
Laurent Destailleur
a74c2bfb8e Merge pull request #25903 from JonBendtsen/develop
adding mariadb and mariadb-dump to the list of restricted os commands
2023-09-13 23:07:48 +02:00
Laurent Destailleur
3257b9f2f2 Doc 2023-09-13 23:02:17 +02:00
Jon Bendtsen
154ce1329f adding mariadb and mariadb-dump to the list of restricted os commands 2023-09-13 22:58:36 +02:00
Laurent Destailleur
4435d59d9e Merge pull request #25811 from FHenry/dev_fix_optimze_peruser
fix: Optimize event per user view :  INNER JOIN always better to use index than WHERE (or LEFT JOIN with WHERE)
2023-09-13 22:43:02 +02:00
Laurent Destailleur
658de57c85 Merge pull request #25878 from Easya-Solutions/new-webportal
NEW WebPortal site account type
2023-09-13 18:39:30 +02:00
Laurent Destailleur
433afb4b22 Merge pull request #25892 from fappels/develop_fix_price_export
FIX missing price levels in product price export
2023-09-13 18:32:23 +02:00
Laurent Destailleur
86ab16b697 Fix bad name convetion for intervention 2023-09-13 18:29:58 +02:00
Laurent Destailleur
076b024b1f Code comment 2023-09-13 18:23:05 +02:00
Laurent Destailleur
7e8826f872 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-13 18:16:43 +02:00
Laurent Destailleur
6c5bef8294 FIX #25894 2023-09-13 18:16:31 +02:00
Laurent Destailleur
a89c9b962b Merge pull request #25889 from alexforte/develop
New: Update Ticket translation for it_IT
2023-09-13 18:01:36 +02:00
Laurent Destailleur
f7faa1f40d Merge pull request #25893 from fappels/develop_add_index_dispatch
Add index in commande_fournisseur_dispatch + Fix migration
2023-09-13 18:01:14 +02:00
Laurent Destailleur
3c1128c227 Merge branch 'develop' into develop_add_index_dispatch 2023-09-13 18:00:25 +02:00
Laurent Destailleur
7d8e8ab9ae Merge pull request #25895 from frederic34/fk_warhouse
fix sql
2023-09-13 17:56:37 +02:00
Frédéric FRANCE
94c8a41917 fix sql 2023-09-13 16:36:46 +02:00
Francis Appels
d8ad2afc4f Fix migration 2023-09-13 14:41:44 +02:00
Francis Appels
efcf2e25fe Add index to commande_fournisseur_dispatch 2023-09-13 14:41:12 +02:00
Alessandro Forte
257f927a84 New: Update Ticket translation for it_IT 2023-09-13 12:36:30 +02:00
Laurent Destailleur
0be8ccda83 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-13 12:16:44 +02:00
Laurent Destailleur
bc89f535b1 Qual: Clean code 2023-09-13 11:36:44 +02:00
sonikf
b1da68c048 FIX use getDolGlobalString() and include main.inc.php 2023-09-13 12:29:39 +03:00
sonikf
04dd93bb44 FIX use getDolGlobalString() 2023-09-13 12:29:28 +03:00
sonikf
ceaefa5b09 FIX use getDolGlobalString() 2023-09-13 12:29:22 +03:00
Francis Appels
4ed109bae1 FIX missing price levels in product price export 2023-09-13 11:18:40 +02:00
Laurent Destailleur
85bfa4de35 Fix warning 2023-09-13 10:53:07 +02:00
Laurent Destailleur
60a52d0bc6 Remove TODO 2023-09-13 10:46:18 +02:00
Laurent Destailleur
94cd4bcb7f Merge pull request #25888 from frederic34/oauthms
add comment
2023-09-13 10:03:50 +02:00
Frédéric FRANCE
50e4581116 add comment 2023-09-13 08:46:01 +02:00
Laurent Destailleur
90f8962786 Merge pull request #25876 from atm-thibaultf/NEW_CONF_Allow_modify_ticket_evenif_closed
NEW - Conf allow modify ticket classification even if closed
2023-09-13 03:22:06 +02:00
Laurent Destailleur
75e1d3d54b Merge pull request #25883 from frederic34/module_import
phpstan
2023-09-13 03:11:37 +02:00
Laurent Destailleur
0c3e516e57 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-13 03:08:46 +02:00
Laurent Destailleur
b748581c57 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-09-13 03:05:21 +02:00
Laurent Destailleur
69bf082125 Merge 2023-09-13 03:04:22 +02:00
sonikf
fc26731025 fix CI errors 2023-09-12 21:27:22 +03:00
sonikf
4278b6629f fix PHPCS 2023-09-12 21:04:38 +03:00
sonikf
e7d8f04187 fix ci errors 2023-09-12 21:04:32 +03:00
sonikf
3a44203ddf fix PHPCS 2023-09-12 20:26:00 +03:00
sonikf
5cae3823fd fix PHPCS 2023-09-12 20:25:17 +03:00
Laurent Destailleur
47f7d782a2 Merge pull request #25877 from Easya-Solutions/new-webportal-sql
NEW WebPortal SQL
2023-09-12 18:53:25 +02:00
Frédéric France
92c4d53fca phpstan 2023-09-12 18:51:40 +02:00
Frédéric France
3931e23b73 phpstan 2023-09-12 18:43:46 +02:00
Frédéric France
0672cafd78 phpstan 2023-09-12 18:43:06 +02:00
Frédéric France
f2dbc418f1 phpstan 2023-09-12 18:40:55 +02:00
Laurent Destailleur
22e08835a2 Clean comment 2023-09-12 17:53:28 +02:00
Laurent Destailleur
88fe278f01 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-12 17:46:51 +02:00
Laurent Destailleur
1667a5a740 Add QUAL and PERF as possible key for commit description 2023-09-12 17:46:13 +02:00
Laurent Destailleur
404fac05ea Merge pull request #25874 from DoliGreece/sonikf-fix-translation
Fix exported .csv translation
2023-09-12 17:31:01 +02:00
Laurent Destailleur
18b65ddb2f Merge pull request #25875 from frederic34/phpstan2
phpstan
2023-09-12 17:30:24 +02:00
Laurent Destailleur
b98921fc80 Trans 2023-09-12 16:05:55 +02:00
Laurent Destailleur
41240a0758 NEW More accurate tooltip on what admin permissions are 2023-09-12 15:58:42 +02:00
Laurent Destailleur
836e22adcf Better help on administrator flag 2023-09-12 15:45:20 +02:00
VESSILLER
e06608d87f Fix PHP CS 2023-09-12 14:51:57 +02:00
VESSILLER
f40cc4658f Fix PHP CS 2023-09-12 14:46:44 +02:00
VESSILLER
6fab00eba9 NEW WebPortal SQL 2023-09-12 14:28:05 +02:00
VESSILLER
30f907cf17 Update from develop 2023-09-12 14:25:04 +02:00
Laurent Destailleur
da699ce3cd Typo 2023-09-12 13:29:44 +02:00
Laurent Destailleur
553fba65e1 Fix #yogosha17587 2023-09-12 13:19:48 +02:00
atm-thibaultf
7420d86073 Add help tooltip lang 2023-09-12 13:15:14 +02:00
atm-thibaultf
363ac9f926 NEW CONF allow modify ticket classification even if closed 2023-09-12 13:07:21 +02:00
Frédéric FRANCE
98388e3bd4 phpstan 2023-09-12 12:28:53 +02:00
sonikf
ff8f4dda9f Fix exported .csv translation 2023-09-12 12:25:57 +03:00
Florent Poinsaut
2443c8edd6 Merge branch 'Dolibarr:develop' into feat-add-ORDER_SUPPLIER_SUBMIT-notif 2023-09-12 10:16:44 +02:00
Florent Poinsaut
84c742a688 add ORDER_SUPPLIER_SUBMIT notif 2023-09-12 10:15:47 +02:00
Laurent Destailleur
d2cf489f21 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-12 09:43:21 +02:00
Laurent Destailleur
f9e3c2873c Typo trans 2023-09-12 09:43:08 +02:00
sonikf
b77e20b6bf Request VAT details from the Greek Ministry of Finance GSIS SOAP web service 2023-09-12 01:05:49 +03:00
sonikf
ad323a6de8 Update company.php 2023-09-12 01:02:35 +03:00
sonikf
e3106915d3 Update companies.lang 2023-09-12 00:47:28 +03:00
sonikf
ee09db0e55 Retrieve vat details from the Greek Ministry of Finance GSIS SOAP web service and autocomplete third party fields 2023-09-12 00:44:22 +03:00
Laurent Destailleur
689f4b63ea Merge pull request #25870 from frederic34/patch-6
phpstan
2023-09-11 21:53:06 +02:00
Laurent Destailleur
fd151230db Merge pull request #24912 from FHenry/dev_peruser_by_quarter
NEW: agenda per user use quarter hour split instead of half hour split
2023-09-11 21:49:55 +02:00
Laurent Destailleur
10012d7a42 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-11 20:35:06 +02:00
Laurent Destailleur
5ab7d65876 Merge pull request #23866 from FHenry/dev_change_notetaskivoice
NEW: Invoice time from task, make task note better display in invoiceline
2023-09-11 19:44:59 +02:00
Laurent Destailleur
e40a5063a9 Clean code 2023-09-11 19:02:03 +02:00
Frédéric FRANCE
1c887d1e0f phpstan 2023-09-11 18:02:50 +02:00
Laurent Destailleur
666aaf771c Merge pull request #25867 from AlbanDurrheimer/fix-holiday-mail
FIX holiday mail with halfday == 0
2023-09-11 17:18:41 +02:00
Laurent Destailleur
1dc928c728 Fix warning 2023-09-11 15:36:08 +02:00
Laurent Destailleur
a98b9a86b7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-11 15:34:13 +02:00
Laurent Destailleur
1ce4921fb0 Remove duplicate string 2023-09-11 15:30:56 +02:00
Laurent Destailleur
a0914e6e70 USe css for badge instead of parenthesis 2023-09-11 15:08:06 +02:00
Alban Durrheimer
954320422c Fix holiday mail with halfday == 0 2023-09-11 14:56:54 +02:00
Laurent Destailleur
31c74d8d95 Fix warning 2023-09-11 14:06:33 +02:00
Laurent Destailleur
d8e3cd2a5f Fix look and feel supplier recuring invoices 2023-09-11 13:50:15 +02:00
Laurent Destailleur
00f5904b66 Close #21912 2023-09-11 12:38:43 +02:00
Laurent Destailleur
61ca55b4d0 FIX Look and feel v18 2023-09-11 12:09:45 +02:00
Laurent Destailleur
164b00d437 CSS 2023-09-11 12:07:01 +02:00
Laurent Destailleur
ec7ca1b367 Doc 2023-09-11 11:56:29 +02:00
Laurent Destailleur
8cfdff96de Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-11 11:53:38 +02:00
Laurent Destailleur
e20f9ca44a Merge pull request #20960 from homer8173/patch-37
Close #20930 NEW Use ajax for state loading after country change
2023-09-11 11:53:08 +02:00
Laurent Destailleur
538b63eaad Merge branch 'develop' into patch-37 2023-09-11 11:51:06 +02:00
Laurent Destailleur
2a0f028d19 Update ziptown.php 2023-09-11 11:46:46 +02:00
Laurent Destailleur
909a9c0ba3 Merge pull request #25864 from DoliGreece/sonikf-fix-translation
Fix translation
2023-09-11 11:42:53 +02:00
Laurent Destailleur
fb02c41105 Clean code and remove warnings 2023-09-11 11:28:30 +02:00
sonikf
2e9040df78 Update errors.lang 2023-09-11 11:58:31 +03:00
sonikf
aa6453d739 Update errors.lang 2023-09-11 11:50:58 +03:00
Laurent Destailleur
683a0df4c8 Merge branch 'develop' into dev_fix_optimze_peruser 2023-09-11 10:35:41 +02:00
Florian HENRY
33347e293a Merge branch 'dev_change_notetaskivoice' of github.com:FHenry/dolibarr into dev_change_notetaskivoice 2023-09-11 10:34:40 +02:00
Florian HENRY
365c1c7da6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_change_notetaskivoice 2023-09-11 10:34:00 +02:00
Laurent Destailleur
a93cc99e4d Merge pull request #25858 from aspangaro/19a6
NEW Accountancy - Option to choose length of lettering code
2023-09-11 09:40:42 +02:00
Laurent Destailleur
1f5aca084f Merge pull request #25863 from Dolibarr/dependabot/github_actions/actions/checkout-4
Bump actions/checkout from 3 to 4
2023-09-11 09:39:35 +02:00
dependabot[bot]
b0f7ebab18 Bump actions/checkout from 3 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-11 05:08:42 +00:00
Laurent Destailleur
fb68aef969 NEW Can manage ODT documents for groups of users. 2023-09-10 22:13:04 +02:00
Laurent Destailleur
a640a70713 FIX Look and feel search v18 2023-09-10 22:04:28 +02:00
Laurent Destailleur
ab3b506978 FIX Error message 2023-09-10 21:52:19 +02:00
Laurent Destailleur
6960bc2123 Better responsive menu on smartphone 2023-09-10 21:44:00 +02:00
Laurent Destailleur
aa78a1e27a Fix missing translation 2023-09-10 21:41:55 +02:00
Alexandre SPANGARO
4b6a3fcf01 Fix travis 2023-09-10 21:27:34 +02:00
Alexandre SPANGARO
24ecdd232c Use str_pad 2023-09-10 21:23:15 +02:00
Alexandre SPANGARO
3b9be1f8cd Merge branch 'develop' into 19a6 2023-09-10 21:17:24 +02:00
Laurent Destailleur
58d7531048 Fix warning 2023-09-10 20:39:22 +02:00
Laurent Destailleur
7f43ec2c3e css 2023-09-10 20:35:10 +02:00
Laurent Destailleur
d45c70a8dc Fix phpunit 2023-09-10 20:27:57 +02:00
Laurent Destailleur
b546e7c624 css 2023-09-10 20:24:58 +02:00
Laurent Destailleur
557fe235d1 Fix warnings 2023-09-10 19:41:14 +02:00
Laurent Destailleur
150c2baee7 Fix warning 2023-09-10 19:34:30 +02:00
Laurent Destailleur
b265dd0548 NEW extrafields password accepts 'dolcrypt' algorithm (reversible algo) 2023-09-10 19:29:49 +02:00
Laurent Destailleur
5d3d6558b9 FIX Bad length for value 2023-09-10 18:53:45 +02:00
Laurent Destailleur
91fa48199a Fix warnings 2023-09-10 17:41:22 +02:00
Laurent Destailleur
876a44703d Fix warning 2023-09-10 17:30:00 +02:00
HENRY Florian
90203cf346 Merge branch 'develop' into dev_change_notetaskivoice 2023-09-10 17:26:17 +02:00
HENRY Florian
81fcc80443 Merge branch 'develop' into dev_fix_optimze_peruser 2023-09-10 17:26:11 +02:00
Laurent Destailleur
5ce6b1850f Fix warning 2023-09-10 16:52:43 +02:00
Laurent Destailleur
f9f3f1135d Fix warning 2023-09-10 16:50:52 +02:00
Laurent Destailleur
b256b929e7 Merge branch 'develop' into 19a6 2023-09-10 15:39:00 +02:00
Laurent Destailleur
b2ae9ea888 Fix warnings 2023-09-10 15:23:32 +02:00
Laurent Destailleur
ad9e11542c Fix phpunit warning 2023-09-10 15:16:46 +02:00
Laurent Destailleur
aca8da763e Merge branch 'develop' into 19a6 2023-09-10 14:56:32 +02:00
Laurent Destailleur
23876058a1 Update doc for tcpdf patch to do 2023-09-10 14:49:39 +02:00
Laurent Destailleur
54042ffc3c Merge branch 'develop' into 19a6 2023-09-10 14:05:53 +02:00
HENRY Florian
9b36c57d4b Merge branch 'develop' into dev_change_notetaskivoice 2023-09-10 13:32:35 +02:00
Florian HENRY
25b0ee01b0 fix travis 2023-09-10 13:31:54 +02:00
Florian HENRY
41a69466e2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_optimze_peruser 2023-09-10 13:27:43 +02:00
sonikf
baaaebc007 Update commercial.lang 2023-09-10 13:55:17 +03:00
Florian HENRY
293fbb8ef4 fix travis 2023-09-10 12:47:34 +02:00
Florian HENRY
407064d00f fix travis 2023-09-10 12:44:22 +02:00
Alexandre SPANGARO
348b564ed0 NEW Accountancy - Option to choose length of lettering code 2023-09-10 10:52:45 +02:00
Laurent Destailleur
6f3310da75 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-09 21:43:10 +02:00
Laurent Destailleur
91c416b98b FIX #24908 #25824 2023-09-09 21:42:52 +02:00
Laurent Destailleur
053aa19c34 Merge pull request #25856 from lamrani002/titleOfApi
NEW updating by adding tooltip for api section in Modulebuilder
2023-09-09 21:27:14 +02:00
Laurent Destailleur
52fb2aa2bb Merge pull request #25854 from dolibit-ut/patch-761
Update myobject_note.php
2023-09-09 21:26:30 +02:00
Laurent Destailleur
2fd7483977 Merge pull request #25855 from dolibit-ut/patch-762
Update myobject_list.php
2023-09-09 21:26:18 +02:00
Laurent Destailleur
830bebe18e Merge pull request #25857 from frederic34/stocktransfer
phpstan
2023-09-09 21:25:40 +02:00
Laurent Destailleur
bd10d3944a Restore stop on error 2023-09-09 21:17:53 +02:00
Laurent Destailleur
bc71380410 Fix sql errors 2023-09-09 21:16:58 +02:00
Laurent Destailleur
7d1a456a2b Test travis 2023-09-09 20:34:35 +02:00
Laurent Destailleur
0ec4b2802a test travis 2023-09-09 20:22:39 +02:00
Laurent Destailleur
b553b2ce12 Test travis 2023-09-09 20:15:19 +02:00
Laurent Destailleur
ebea5fc485 Try to add travis log on error only 2023-09-09 19:52:09 +02:00
Laurent Destailleur
1159325903 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-09 19:41:14 +02:00
Laurent Destailleur
1acbbda254 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-09 15:33:09 +02:00
Laurent Destailleur
f039c70f8a Fix class not found 2023-09-09 14:49:56 +02:00
Frédéric France
13f16ad13f phpstan 2023-09-09 13:42:54 +02:00
Lamrani Abdel
f82e3fc27e NEW updating by adding tooltip for api section in Modulebuilder 2023-09-09 12:44:38 +02:00
UT from dolibit
d71820aaa7 Update myobject_list.php 2023-09-09 12:38:56 +02:00
UT from dolibit
5ac3219a4b Update myobject_note.php 2023-09-09 12:34:06 +02:00
Laurent Destailleur
47df801779 Merge branch 'OPEN-DSI-develop_add_all_id_prof_checker_for_code_compta_customer_and_supplier' into develop 2023-09-09 12:09:52 +02:00
Laurent Destailleur
9ce32c0213 Merge branch
'develop_add_all_id_prof_checker_for_code_compta_customer_and_supplier'
of https://github.com/OPEN-DSI/dolibarr into
OPEN-DSI-develop_add_all_id_prof_checker_for_code_compta_customer_and_supplier
2023-09-09 12:08:41 +02:00
Laurent Destailleur
2d61f37208 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2023-09-09 12:02:13 +02:00
Laurent Destailleur
ca5e9c5155 Merge pull request #24639 from FHenry/dev_sign_soeciete_rib
feat: RIB Online Sign
2023-09-09 11:56:43 +02:00
Laurent Destailleur
c6dbb3d434 Merge branch 'develop' into dev_sign_soeciete_rib 2023-09-09 11:55:30 +02:00
Laurent Destailleur
ae077925f1 NEW Menu editor is reponsive 2023-09-09 11:52:14 +02:00
Frédéric FRANCE
f2d29dd32d Merge branch 'develop' into develop-2 2023-09-09 09:41:08 +02:00
Laurent Destailleur
4d18d37333 Merge pull request #25845 from frederic34/patch-10
phpdoc
2023-09-08 23:04:14 +02:00
Laurent Destailleur
32f6008425 Code comment 2023-09-08 22:26:23 +02:00
Laurent Destailleur
dea413eaed Merge branch 'develop' into fix-bokcal-extrafield 2023-09-08 21:36:38 +02:00
Laurent Destailleur
ef3590d659 Fi phpcs 2023-09-08 21:34:54 +02:00
Laurent Destailleur
575aa4af43 Merge pull request #25847 from lamrani002/addChangeLogToDoc
NEW functionality add section changeLog to Doc in MB
2023-09-08 21:33:16 +02:00
Laurent Destailleur
ba8113529d Merge pull request #25842 from frederic34/patch-8
phpstan
2023-09-08 21:31:55 +02:00
Laurent Destailleur
60dfea8a6b Merge pull request #25846 from lamrani002/AddPageDict
NEW functionnality by add page for create dictionary
2023-09-08 21:31:00 +02:00
Laurent Destailleur
184f5fb5b5 Merge branch 'develop' into patch-10 2023-09-08 21:29:36 +02:00
Laurent Destailleur
f9694498c4 Fix migration 2023-09-08 21:23:11 +02:00
Laurent Destailleur
fb5f4c1dc2 NEW Add phpunit for REST API of contacts 2023-09-08 21:12:59 +02:00
Laurent Destailleur
4f4f0757c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-09-08 19:23:55 +02:00
Laurent Destailleur
8c7b0d2c26 Merge pull request #25850 from DoliGreece/sonikf-patch-translation
Fix translation + some Transifex issues
2023-09-08 19:21:54 +02:00
Florian HENRY
997c3b460d fix travis 2023-09-08 19:14:11 +02:00
Laurent Destailleur
d7aa1455e6 Merge pull request #25848 from frederic34/patch-6
clean code
2023-09-08 19:14:04 +02:00
Laurent Destailleur
89e1f41b47 Merge branch 'develop' into addChangeLogToDoc 2023-09-08 19:13:25 +02:00
Laurent Destailleur
79ab8ce709 Merge branch 'develop' into AddPageDict 2023-09-08 19:13:19 +02:00
Laurent Destailleur
c44ed2e56e Merge branch 'develop' into patch-8 2023-09-08 19:12:51 +02:00
Laurent Destailleur
37c4acf8e0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 19:11:14 +02:00
Laurent Destailleur
33288ee66a Try to fix phpunit on dol_eval 2023-09-08 19:10:44 +02:00
sonikf
4395e7d3a9 Update hrm.lang 2023-09-08 18:15:23 +03:00
sonikf
7c60667d3d Update assets.lang 2023-09-08 18:10:01 +03:00
sonikf
12f24af8c8 Update orders.lang 2023-09-08 18:05:28 +03:00
sonikf
aa1030bb59 Update admin.lang 2023-09-08 18:03:47 +03:00
Laurent Destailleur
16a317eccc Merge pull request #24881 from jyhere/jyhere/export-custom-compute
NEW ADD: custom compute for exports
2023-09-08 16:41:16 +02:00
sonikf
27ec4029e8 Update admin.lang 2023-09-08 17:29:29 +03:00
sonikf
3fe7e6672f Update receiptprinter.lang 2023-09-08 17:26:33 +03:00
sonikf
62c1b7fdb9 Update errors.lang 2023-09-08 17:23:39 +03:00
Frédéric FRANCE
266ea0a34d clean code 2023-09-08 16:06:36 +02:00
Laurent Destailleur
4f12346c3f Clean code 2023-09-08 15:41:07 +02:00
Laurent Destailleur
aab30d7638 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 15:33:04 +02:00
Laurent Destailleur
803aca262e Fix edit colors with html5 component 2023-09-08 15:25:50 +02:00
Lamrani Abdel
f2b72ec15a NEW functionality add section changeLog to Doc in MB 2023-09-08 14:45:59 +02:00
Laurent Destailleur
6dbd7e35f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 14:17:17 +02:00
Laurent Destailleur
c379420d86 Fix regression in dol_eval 2023-09-08 14:12:12 +02:00
sonikf
5b6b18e115 Update ticket.lang 2023-09-08 15:07:17 +03:00
sonikf
ea64e69a41 Update main.lang 2023-09-08 15:04:53 +03:00
sonikf
704cbbe266 Update main.lang 2023-09-08 14:59:21 +03:00
sonikf
d153d7778f Update errors.lang 2023-09-08 14:52:47 +03:00
sonikf
bd970931c0 Update admin.lang 2023-09-08 14:44:25 +03:00
sonikf
ea1a1b8bad Update hrm.lang 2023-09-08 14:41:59 +03:00
sonikf
ec71da27be Update sendings.lang 2023-09-08 14:39:20 +03:00
Lamrani Abdel
5adf2ccf5b fix problem 2023-09-08 12:11:52 +02:00
Frédéric FRANCE
373424f8ed phpdoc 2023-09-08 11:57:11 +02:00
Laurent Destailleur
9ca23dee12 Merge pull request #25809 from frederic34/patch-6
phpstan
2023-09-08 11:51:23 +02:00
Laurent Destailleur
19be291211 Merge pull request #25810 from frederic34/patch-7
phpstan
2023-09-08 11:50:26 +02:00
Laurent Destailleur
0ead94b5ed Merge pull request #25812 from FHenry/dev_repairusecorrectcollation
new: add in repair.php force_collation_from_conf_on_tables
2023-09-08 11:48:48 +02:00
Laurent Destailleur
e5c49cd006 Merge pull request #25844 from frederic34/patch-9
do not trunc label but only use css overflowmax
2023-09-08 11:42:51 +02:00
Laurent Destailleur
e3688382ba Merge pull request #25821 from vmaury/fix_25820
Order by salary lastname in hollidays month report (instead of fk_user)
2023-09-08 11:26:33 +02:00
Frédéric FRANCE
01232b721d do not trunc label but only use css overflowmax 2023-09-08 11:25:54 +02:00
Laurent Destailleur
eef311dee7 Merge pull request #25823 from frederic34/loadlangs
fix loadlangs
2023-09-08 11:25:35 +02:00
Laurent Destailleur
d91ce60ab4 Merge pull request #25819 from frederic34/setascustomer
deprecate set_as_client
2023-09-08 11:23:06 +02:00
Laurent Destailleur
0914bc5c63 Merge pull request #25838 from mc2rcanarslan/fix_product_sql_error
fix: missing space in generated product sql
2023-09-08 10:57:15 +02:00
Frédéric FRANCE
6f0e82f5d7 phpstan 2023-09-08 09:49:47 +02:00
Frédéric FRANCE
198e7bf795 Merge remote-tracking branch 'upstream/develop' into loadlangs 2023-09-08 09:28:48 +02:00
Frédéric FRANCE
1fa038c017 Merge branch 'develop' into develop-2 2023-09-08 09:13:17 +02:00
Laurent Destailleur
e9787451a8 Disallow more use of parenthesis into dol_eval 2023-09-08 05:51:06 +02:00
Laurent Destailleur
c2f8c4f47c Sec: param onlysimplestring is always 1 or 2 2023-09-08 02:29:20 +02:00
Laurent Destailleur
684c0b88b5 Sec: More robust call for dol_eval (with param '2') for computed fields 2023-09-08 01:57:47 +02:00
Laurent Destailleur
80c0c9c344 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 01:40:30 +02:00
Laurent Destailleur
9ed7bb77cd Sec: Increase list of not allowed function in dol_eval 2023-09-08 01:36:26 +02:00
Can Arslan
d3f3147de3 fix: unknown column error on generated product sql 2023-09-07 12:53:50 -06:00
Laurent Destailleur
66a4433896 Fix regression 2023-09-07 17:39:54 +02:00
Laurent Destailleur
862f10f7fd Fix error management 2023-09-07 17:28:51 +02:00
Frédéric FRANCE
70f21d96a4 Merge branch 'develop' into patch-6 2023-09-07 16:03:30 +02:00
Florian HENRY
060b27285b Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_change_notetaskivoice 2023-09-07 13:21:36 +02:00
Laurent Destailleur
b61998ec4b Log 2023-09-07 12:13:10 +02:00
Florian HENRY
8e328c58cb fix travis 2023-09-07 09:16:47 +02:00
Laurent Destailleur
0a853fe794 Removed files links.lang 2023-09-07 03:30:41 +02:00
Laurent Destailleur
05b067283a Removed useless file 2023-09-07 03:27:39 +02:00
Laurent Destailleur
94758009dd NEW Can see the favicon file into setup of properties of a website 2023-09-06 18:35:40 +02:00
Laurent Destailleur
20162a6d11 Fix support of xlink:href links in website module. 2023-09-06 17:11:30 +02:00
Frédéric FRANCE
e6f249eaca fix loadlangs 2023-09-06 17:00:19 +02:00
Frédéric FRANCE
9f53892fbe fix loadlangs 2023-09-06 16:57:50 +02:00
Laurent Destailleur
f8e5bcdb62 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-06 15:12:21 +02:00
vmaury
d32f76b394 Order by salary lastname in hollidays month report (instead of fk_user) 2023-09-06 14:54:40 +02:00
Frédéric FRANCE
26dff90658 deprecate set_as_client 2023-09-06 14:38:35 +02:00
Hystepik
9e789eaa0b fix extrafields 2023-09-06 12:46:13 +02:00
Hystepik
11986275dd Fix add bookcal extrafields 2023-09-06 12:27:36 +02:00
Florian HENRY
cac1d7f617 new: all in repair.php force_collation_from_conf_on_tables 2023-09-06 11:09:46 +02:00
Florian HENRY
3af376444e fix: inner jion always better to use index than where 2023-09-06 10:32:59 +02:00
Frédéric FRANCE
9715d5fbc7 phpstan 2023-09-06 08:57:00 +02:00
Frédéric FRANCE
68ba7d2300 phpstan 2023-09-06 08:52:01 +02:00
Florian HENRY
be4da9b22c Merge branch 'dev_sign_soeciete_rib' of github.com:FHenry/dolibarr into dev_sign_soeciete_rib 2023-09-06 08:32:28 +02:00
Florian HENRY
37b43f97ce fix getDol 2023-09-06 08:32:13 +02:00
Florian HENRY
16f00adb8c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_sign_soeciete_rib 2023-09-06 08:22:00 +02:00
Laurent Destailleur
0d76c49244 Trans 2023-09-06 03:19:38 +02:00
Laurent Destailleur
84d12cf591 NEW Add option TAKEPOS_HIDE_PRODUCT_PRICES to hide prices in TakePOS 2023-09-06 02:38:57 +02:00
Laurent Destailleur
94950bee7d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-06 01:42:48 +02:00
Laurent Destailleur
e2bf0315c3 Fix fatal error on mod_contrat_olive. Missing getExample() 2023-09-06 01:42:35 +02:00
Laurent Destailleur
c795d6df0b Merge pull request #25806 from frederic34/patch-6
phpstan
2023-09-05 23:40:16 +02:00
Laurent Destailleur
0e7703f0ce Merge pull request #25805 from lamrani002/checkBeforereWrite
NEW functionality for Checkin comments begin and end before each actions
2023-09-05 23:39:58 +02:00
Laurent Destailleur
e280bc0b11 Merge pull request #25804 from lamrani002/addBadgeInMB
NEW functionnality for add badge for each tabs
2023-09-05 23:37:58 +02:00
Laurent Destailleur
baa3863334 css 2023-09-05 22:41:17 +02:00
Laurent Destailleur
5f5e4738a5 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 22:38:39 +02:00
Laurent Destailleur
46919d1ac6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 21:39:15 +02:00
Laurent Destailleur
150de687bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-05 20:13:38 +02:00
HENRY Florian
ed1e8a825d Merge branch 'develop' into dev_sign_soeciete_rib 2023-09-05 19:17:11 +02:00
Florian HENRY
d0fb3839c3 reveiw 2023-09-05 19:15:43 +02:00
Florian HENRY
0b6297b5c5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_change_notetaskivoice 2023-09-05 19:14:12 +02:00
Lamrani Abdel
d8c51cb311 check before each actions 2023-09-05 18:54:08 +02:00
Lamrani Abdel
b739b5b76d add badge for each tabs 2023-09-05 18:50:04 +02:00
Frédéric FRANCE
6b2a8ae744 phpstan 2023-09-05 18:27:30 +02:00
Laurent Destailleur
68d67a7fed Merge pull request #25791 from frederic34/patch-8
phpstan
2023-09-05 18:15:45 +02:00
Laurent Destailleur
408c73fbe1 Merge pull request #25790 from frederic34/patch-7
phpstan
2023-09-05 18:15:29 +02:00
Laurent Destailleur
d0ace0f1b7 Merge pull request #25788 from frederic34/patch-6
phpstan
2023-09-05 18:14:17 +02:00
Laurent Destailleur
52a57aabac Merge pull request #25797 from sonikf/patch-1
Fix translation
2023-09-05 18:02:39 +02:00
Laurent Destailleur
325eecdb7f Merge pull request #25801 from Hystepik/bookcal_dev_2
New : Bookcal dev 2
2023-09-05 18:01:59 +02:00
Laurent Destailleur
e9cb81ded8 Code comment 2023-09-05 17:40:09 +02:00
Laurent Destailleur
c95c006810 Fix regression 2023-09-05 17:01:04 +02:00
Laurent Destailleur
6459c862b8 Comment 2023-09-05 16:50:23 +02:00
Hystepik
2701f8a2a8 New : Bookcal dev 2 2023-09-05 16:32:02 +02:00
Laurent Destailleur
82e7f829b0 NEW Support of js into the Dolibarr server preview 2023-09-05 15:55:44 +02:00
Lamrani Abdel
8f7d68ac8e add function for check comments for sections before any actions 2023-09-05 15:43:23 +02:00
Frédéric FRANCE
476e645e16 Merge branch 'develop' into develop-2 2023-09-05 15:35:13 +02:00
Laurent Destailleur
4be3933e5d Fix regression 2023-09-05 13:36:55 +02:00
sonikf
c340943f40 Fix translation 2023-09-05 13:55:44 +03:00
Florian HENRY
7a45f083a5 fix travais 2023-09-05 09:22:18 +02:00
Laurent Destailleur
924da777bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-04 23:26:35 +02:00
Laurent Destailleur
f403558a8f QUAL: Standardize code and look and feel for dictionaries 2023-09-04 22:49:55 +02:00
Laurent Destailleur
4f1f9ec455 NEW Add filter on status of line of a dictionary 2023-09-04 21:23:07 +02:00
Frédéric FRANCE
56bb72c1af phpstan 2023-09-04 20:39:00 +02:00
Frédéric FRANCE
cd81c2e18d phpstan 2023-09-04 20:29:33 +02:00
Florian HENRY
0694c8224d review SQL for develop 2023-09-04 19:35:33 +02:00
Florian HENRY
d9674c1503 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_sign_soeciete_rib 2023-09-04 19:31:12 +02:00
Laurent Destailleur
0263728d5b Enable phpcs for PR too 2023-09-04 16:47:44 +02:00
Laurent Destailleur
4b5c7677d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-09-04 16:42:55 +02:00
Frédéric FRANCE
2a1a855b6a phpstan 2023-09-04 16:38:27 +02:00
Laurent Destailleur
af4f36a9cb Merge pull request #25500 from mc2contributor/fixExtraFields
Fix inconsistent is-empty check for extrafields
2023-09-04 16:34:28 +02:00
Laurent Destailleur
4ae9cea409 Merge pull request #25787 from Daviid-P/fix_typo_type_bonprelevement
Fix typo, sr.type = 'bank' -> sr.type = 'ban'
2023-09-04 16:20:42 +02:00
Laurent Destailleur
bc806bf1e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-04 16:15:03 +02:00
Florian HENRY
cb4d04734d fix travais 2023-09-04 15:23:11 +02:00
David Pareja Rodriguez
9f389415ce Fix typo, sr.type = 'bank' -> sr.type = 'ban' 2023-09-04 15:19:25 +02:00
Laurent Destailleur
02a64325eb Update commonobject.class.php 2023-09-04 15:13:46 +02:00
Laurent Destailleur
aadf9b34e4 Merge pull request #25618 from Daviid-P/remove_unnecessary_queries_from_bonprelevement_class_php
Removed classes instantiations and fetch to avoid multiple DB queries per invoice
2023-09-04 15:09:41 +02:00
Laurent Destailleur
29a9c7f5de Merge pull request #25631 from ibuiv/ibuiv-fix-computedfields-on-lists
Fix Computed Extrafields on list
2023-09-04 15:07:32 +02:00
Laurent Destailleur
91c48e29bf Include commit starting with PERF, SEC, QUAL 2023-09-04 14:52:40 +02:00
Laurent Destailleur
d54855c2ea Merge pull request #25784 from Daviid-P/remove_unnecessary_queries_from_sellsjournal_php
Remove unnecessary queries from sellsjournal php
2023-09-04 14:41:17 +02:00
Laurent Destailleur
2ce1b34890 Merge pull request #25785 from frederic34/edit_bom_workstation
NEW can edit bomline workstation
2023-09-04 14:39:49 +02:00
Laurent Destailleur
8e2d98ea9b Update bom_card.php 2023-09-04 14:38:43 +02:00
Frédéric FRANCE
5871e8d457 can edit bomline workstation 2023-09-04 14:01:14 +02:00
Frédéric FRANCE
f413a7b6d8 can edit bomline workstation 2023-09-04 13:59:28 +02:00
David Pareja Rodriguez
916030b8f1 Merge branch 'remove_unnecessary_queries_from_bonprelevement_class_php' of https://github.com/Daviid-P/dolibarr into remove_unnecessary_queries_from_bonprelevement_class_php 2023-09-04 13:24:47 +02:00
David Pareja Rodriguez
39c46ec162 Switch prelevement_demande alias from pfd to pd 2023-09-04 13:24:32 +02:00
David
9ab30ddc50 Merge branch 'Dolibarr:develop' into remove_unnecessary_queries_from_sellsjournal_php 2023-09-04 13:22:05 +02:00
David Pareja Rodriguez
2373ef1caa Replicate changes from PR 25763 2023-09-04 13:20:11 +02:00
Laurent Destailleur
1d537c2ec0 Merge branch 'develop' into remove_unnecessary_queries_from_bonprelevement_class_php 2023-09-04 12:40:44 +02:00
Laurent Destailleur
0d2986c818 Merge pull request #25624 from mschamp/BE-Verkort
Be verkort
2023-09-04 12:33:54 +02:00
Laurent Destailleur
024ba5c06c Merge pull request #25763 from Daviid-P/remove_unnecessary_queries_from_purchasesjournal_php
Remove unnecessary queries
2023-09-04 12:24:09 +02:00
Laurent Destailleur
32bf31e6b8 Merge branch 'develop' into remove_unnecessary_queries_from_purchasesjournal_php 2023-09-04 12:17:40 +02:00
Laurent Destailleur
8bc8708d5a Merge pull request #25781 from frederic34/patch-6
phpstan
2023-09-04 12:03:43 +02:00
Frédéric FRANCE
59a20d9dff phpstan 2023-09-04 11:36:04 +02:00
Florian HENRY
43d20f8cc0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_sign_soeciete_rib 2023-09-04 10:52:31 +02:00
David Pareja Rodriguez
4b2a972902 Requested changes 2023-09-04 08:45:19 +02:00
David Pareja Rodriguez
246f381a07 Requested changes 2023-09-04 08:23:16 +02:00
Laurent Destailleur
24d03009e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-04 02:38:22 +02:00
Laurent Destailleur
5911270703 Dict must extends CommonDict 2023-09-04 02:36:20 +02:00
Laurent Destailleur
c3ee677256 Ignore rule 2023-09-04 02:29:15 +02:00
Laurent Destailleur
248a7c091c Merge pull request #25776 from mamisoa/develop
FIX delete deprecated file Object.php that crashes REST API
2023-09-03 23:07:20 +02:00
Laurent Destailleur
d1ea274315 Update upgrade2.php 2023-09-03 23:06:48 +02:00
Laurent Destailleur
ecc665b55a Merge pull request #25777 from frederic34/patch-6
phpstan
2023-09-03 23:05:25 +02:00
Laurent Destailleur
3343a47244 NEW billing on shipment+reception. Can be done before or after delivery. 2023-09-03 21:38:11 +02:00
Laurent Destailleur
3675ec0b42 Enhance look of apstats 2023-09-03 18:51:34 +02:00
Laurent Destailleur
3f25ff69bc Clean code 2023-09-03 18:09:32 +02:00
Laurent Destailleur
92fd69b84b Fix warnings 2023-09-03 18:06:38 +02:00
Laurent Destailleur
4d17c6441a CSS 2023-09-03 17:36:23 +02:00
Laurent Destailleur
345668b2ca Default html for an url is no more a 'float' div 2023-09-03 17:31:50 +02:00
Laurent Destailleur
d0ef625ba0 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-03 17:14:37 +02:00
mschamp
5628985042 Change ID's
Replace 200... with 10... in the ID
2023-09-03 11:35:06 +02:00
Frédéric FRANCE
573b9dd77a phpstan 2023-09-03 09:54:56 +02:00
Laurent Destailleur
e3a86e327e Fix warning 2023-09-03 02:05:43 +02:00
Mamisoa
2826d48971 Merge pull request #1 from mamisoa/mamisoa-patch-1
FIX delete deprecated file Object.php
2023-09-03 00:16:37 +02:00
Mamisoa
f2d8246581 FIX delete deprecated file Object.php
Delete deprecated file Object.php that cause REST API to crash
2023-09-03 00:11:47 +02:00
Laurent Destailleur
1f636c742a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-02 22:40:30 +02:00
Laurent Destailleur
455a1dcc66 Type ip is ip 2023-09-02 22:38:07 +02:00
Laurent Destailleur
4240358986 Merge pull request #25775 from frederic34/patch-7
phpstan
2023-09-02 22:22:40 +02:00
Laurent Destailleur
f6dc654e7a Merge pull request #25774 from frederic34/patch-6
phpstan
2023-09-02 22:22:17 +02:00
Frédéric FRANCE
3a6b561605 phpstan 2023-09-02 21:23:15 +02:00
Frédéric FRANCE
f72c22f6b7 phpstan 2023-09-02 21:15:42 +02:00
Laurent Destailleur
247ab6a93e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-09-02 20:54:10 +02:00
Laurent Destailleur
bc53cd7643 Merge pull request #25313 from kubajznik/extrafields-support-selectForForms
NEW #25312 Support extrafields in selectForForms
2023-09-02 18:40:14 +02:00
Laurent Destailleur
bd008d78b5 Fix label of cron 2023-09-02 11:36:03 +02:00
Laurent Destailleur
72a1f56f4e Merge pull request #25769 from frederic34/formmailandsms
phpstan
2023-09-02 11:30:25 +02:00
Laurent Destailleur
de72f6d7eb Add test on $error 2023-09-02 11:18:43 +02:00
Laurent Destailleur
ae2e383b0e Test on $error 2023-09-02 11:17:47 +02:00
Frédéric France
e0189c654c phpcs 2023-09-02 10:18:46 +02:00
Frédéric France
0a3bb161f8 phpstan 2023-09-02 10:14:25 +02:00
Laurent Destailleur
2d70da7f02 Merge pull request #23396 from warnerbryce/develop
Add a substitution Category Of Operations into ODT generation for Invoices
2023-09-02 02:11:10 +02:00
Laurent Destailleur
10249b9c88 Merge branch 'develop' into develop 2023-09-02 02:05:40 +02:00
Laurent Destailleur
6f0bd65750 Merge pull request #25759 from frederic34/partnership
clean numbering module
2023-09-01 20:34:47 +02:00
Laurent Destailleur
6633908a5b Merge pull request #25766 from frederic34/patch-9
doc
2023-09-01 20:34:08 +02:00
Laurent Destailleur
5f578f4b57 Merge pull request #25760 from frederic34/patch-7
phpstan
2023-09-01 20:33:16 +02:00
Laurent Destailleur
0c0c5e9fa4 Merge pull request #25758 from frederic34/patch-6
remove duplicate line
2023-09-01 20:32:56 +02:00
Laurent Destailleur
dcf3f378b6 Merge pull request #25765 from frederic34/patch-8
phpstan
2023-09-01 20:32:41 +02:00
Laurent Destailleur
b1492ed4ff Merge pull request #25768 from mc2contributor/fixWarning
Fix attempt to access stdClass::$* on query result
2023-09-01 20:32:10 +02:00
Laurent Destailleur
df4781a521 Update commonobject.class.php 2023-09-01 20:30:43 +02:00
Laurent Destailleur
ca1e139c6a Update commonobject.class.php 2023-09-01 20:28:42 +02:00
Laurent Destailleur
bfcc0f5e95 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-01 19:39:00 +02:00
Laurent Destailleur
49d7fd7b73 Look of apstats 2023-09-01 19:38:47 +02:00
Roger Dueck
725d870669 Fix attempt to access stdClass::$* on query result 2023-09-01 09:27:24 -06:00
Frédéric FRANCE
022c7f0dc3 doc 2023-09-01 15:38:00 +02:00
Frédéric FRANCE
eaf63b60c5 phpstan 2023-09-01 14:54:35 +02:00
David Pareja Rodriguez
d6c2fb9d9b Fix using wrong variable on num_rows 2023-09-01 13:19:04 +02:00
David Pareja Rodriguez
a1fe51b613 Missing counter increase 2023-09-01 12:13:08 +02:00
David Pareja Rodriguez
c235d4ec4f Remove unnecessary queries 2023-09-01 11:48:16 +02:00
David
5888d2db0c Merge branch 'develop' into remove_unnecessary_queries_from_bonprelevement_class_php 2023-09-01 11:43:48 +02:00
Frédéric FRANCE
69f070d8fd phpstan 2023-09-01 09:18:23 +02:00
Frédéric France
9132529b69 clean numbering module 2023-09-01 00:50:15 +02:00
Laurent Destailleur
5e729d399e Merge pull request #25698 from dolibit-ut/patch-750
Update myobject_document.php
2023-09-01 00:48:29 +02:00
Laurent Destailleur
b6430fb897 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-01 00:40:48 +02:00
Frédéric FRANCE
509384e319 remove duplicate line 2023-09-01 00:28:47 +02:00
Laurent Destailleur
79592394b3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-01 00:20:32 +02:00
Laurent Destailleur
ce68b5aa44 Merge pull request #25702 from aspangaro/19a5
FIX Accountancy - List of accounts - Compatibility left column checkbox + Search id_import + Hooks + Undefined variable
2023-09-01 00:20:23 +02:00
Laurent Destailleur
80587532eb Merge pull request #25757 from frederic34/productlotcard
clean code
2023-09-01 00:13:38 +02:00
Laurent Destailleur
2f6f99b9c5 Disabled a duplicate github action 2023-09-01 00:12:22 +02:00
Laurent Destailleur
40e739dab6 Clean dead code 2023-09-01 00:08:31 +02:00
Laurent Destailleur
f9f5affbd2 Clean code, remove use of $statuts and $statuts_short 2023-09-01 00:02:16 +02:00
Frédéric France
2f698f8521 clean code 2023-09-01 00:01:43 +02:00
Frédéric France
c311086c9d clean code 2023-08-31 23:59:14 +02:00
Laurent Destailleur
7ecf52f6a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-31 23:54:51 +02:00
Laurent Destailleur
189e2f30c6 Merge pull request #25703 from frederic34/patch-6
phpstan
2023-08-31 23:52:56 +02:00
Laurent Destailleur
47ca9a407a Merge pull request #25706 from FHenry/dev_quality_management_on_lot_BDD
feat: Database change for #25681
2023-08-31 23:42:03 +02:00
Laurent Destailleur
6fec39e4e2 Merge branch 'develop' into dev_quality_management_on_lot_BDD 2023-08-31 23:41:52 +02:00
Laurent Destailleur
4624ce05a2 Merge pull request #25708 from dolibit-ut/patch-752
Update /htdocs/comm/index.php
2023-08-31 23:36:34 +02:00
Laurent Destailleur
d545f6d55c Merge pull request #25710 from dolibit-ut/patch-754
Update /htdocs/asset/list.php
2023-08-31 23:34:42 +02:00
Laurent Destailleur
9fb94307a1 Merge pull request #25715 from vmaury/Fix_25714
Fix #25714 : Totals in propal not rounded according to MAIN_MAX_DECIMALS_SHOWN
2023-08-31 23:34:09 +02:00
Laurent Destailleur
bd025ba399 Merge pull request #25716 from frederic34/fixphpstan2
fix phpstan
2023-08-31 23:31:38 +02:00
Laurent Destailleur
a6cf5db718 Doc 2023-08-31 23:26:07 +02:00
Laurent Destailleur
75ae6a811b Merge pull request #25721 from dolibit-ut/patch-759
Update htdocs / accountancy / bookkeeping / list.php
2023-08-31 23:22:32 +02:00
Laurent Destailleur
07925d8f23 css 2023-08-31 22:59:34 +02:00
Laurent Destailleur
fef0d44111 Merge pull request #25732 from thomas-Ngr/develop_fix_opensurvey_ajoutdates
FIX opensurvey add hours
2023-08-31 22:16:39 +02:00
Frédéric France
4e81d65bd8 Merge remote-tracking branch 'upstream/develop' into fixphpstan2 2023-08-31 20:57:37 +02:00
Laurent Destailleur
323ab90346 Merge pull request #25736 from mc2rcanarslan/fix_duplicate_object_facture
fix: removed duplicate object creation
2023-08-31 19:48:12 +02:00
Laurent Destailleur
e595fb6f40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-31 19:46:10 +02:00
Laurent Destailleur
647735e732 Merge pull request #25733 from pmlaroche-legascope/develop
bug l'IBAN client n'est pas repris dans les templates
2023-08-31 19:45:38 +02:00
Laurent Destailleur
87982faa0b Merge pull request #25734 from atm-arnaud/FIX_actioncomm_now_button_on_date_end
FIX actioncomm with now button on date end
2023-08-31 19:43:17 +02:00
Laurent Destailleur
6f3b0f8493 Merge pull request #25737 from lamrani002/writeProps
NEW function for parsing props and update Write props
2023-08-31 19:41:41 +02:00
Laurent Destailleur
8dca9ccae1 Merge pull request #25753 from Hystepik/fix-bookcal-structure
Fix bookcal database structure
2023-08-31 18:57:05 +02:00
Laurent Destailleur
d523391c87 Merge branch 'develop' into fix-bookcal-structure 2023-08-31 18:56:58 +02:00
Laurent Destailleur
7f598794f2 Merge pull request #25747 from mc2contributor/removeDuplicate
Remove duplicate code
2023-08-31 18:52:08 +02:00
Laurent Destailleur
aa3b042b9a Merge pull request #25744 from dolibit-ut/patch-760
Update llx_10_c_regions.sql
2023-08-31 18:51:30 +02:00
Laurent Destailleur
3211badd3a Merge pull request #25681 from FHenry/dev_quality_management_on_lot
FIX: review quality managment on product lot
2023-08-31 18:32:41 +02:00
Laurent Destailleur
d6c331e950 Fix warning 2023-08-31 18:26:38 +02:00
Laurent Destailleur
66a8e41e7e FIX fatal error with some parameters 2023-08-31 16:13:48 +02:00
Hystepik
c545f05fcd Fix bookcal database structure 2023-08-31 14:21:23 +02:00
tnegre
3cea3c86f8 FIX: when adding new times on a survey, all hours would be erased. 2023-08-31 12:25:43 +02:00
UT from dolibit
5ca3b19db6 Update llx_10_c_regions.sql
Departments/Counties
2023-08-31 12:02:16 +02:00
tnegre
9b960b684d FIX date survey : button to add dates would not work. Session would store cells numbers which would stay to 10 for next surveys created. 2023-08-31 11:47:57 +02:00
Laurent Destailleur
5d9d44479e Code comment 2023-08-31 01:06:13 +02:00
Laurent Destailleur
f7300eeaa4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-31 00:10:26 +02:00
Laurent Destailleur
078dc84709 Fix reposition 2023-08-30 23:42:45 +02:00
Laurent Destailleur
732cd3a851 Fix regression 2023-08-30 23:23:45 +02:00
Roger Dueck
3ac1a66e63 Remove duplicate code 2023-08-30 15:05:29 -06:00
Laurent Destailleur
c63b9a82cc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-30 22:14:14 +02:00
UT from dolibit
9547a3f263 Update llx_10_c_regions.sql
Departements
2023-08-30 21:57:15 +02:00
Lamrani Abdel
2ba38eaaae update function for writeProps and deleteProps and parsing string 2023-08-30 17:00:12 +02:00
Lamrani Abdel
1cb7bae800 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-08-30 16:55:21 +02:00
Can Arslan
b5d19157b8 fix: removed duplicate object creation
lines 183 && 189
2023-08-30 08:49:28 -06:00
atm-arnaud
162f73e4df FIX actioncomm with now button on date end 2023-08-30 15:04:24 +02:00
pmlaroche-legascope
1a98b9f817 bug iban client non repris dans les templates
company_default_bank_iban et
company_default_bank_bic ne sont pas substitué dans les templates, ces champs sont calculés dans get_substitutionarray_object, mais vide maintenant, sans doute suite à l'introduction de compte bancaire multiples pour les fiches clients
2023-08-30 14:47:51 +02:00
Laurent Destailleur
9ce9eac595 Merge pull request #25084 from FliyFly/feature2#21426
NEW Add possibility to choose separator #21426
2023-08-30 12:16:40 +02:00
Laurent Destailleur
8376c5bcef Merge branch 'develop' into feature2#21426 2023-08-30 12:12:45 +02:00
lamrani abdelwadoud
1d3f2fc34a Merge branch 'develop' into formAddPropertyMB 2023-08-30 12:11:42 +02:00
Laurent Destailleur
b866c1c79c Merge pull request #25724 from Hystepik/birthday-contact-list
Close #23493 Add birthday to contact list
2023-08-30 10:40:37 +02:00
Laurent Destailleur
839e5c2d13 Merge pull request #25705 from Hystepik/fix-25452-bom-mo-desactivation
Fix #25452 disable Bom & Mo when product disabled
2023-08-30 10:39:49 +02:00
Laurent Destailleur
c4e10260fb Merge pull request #25727 from frederic34/patch-7
phpstan
2023-08-30 10:38:54 +02:00
Laurent Destailleur
3640288d88 Merge branch 'develop' into patch-7 2023-08-30 10:38:47 +02:00
Laurent Destailleur
605570a394 Fix warning 2023-08-30 09:33:34 +02:00
Laurent Destailleur
1f94c26dff Fix warnings 2023-08-30 09:28:44 +02:00
Laurent Destailleur
f0a35155ac Fix warning 2023-08-30 09:21:05 +02:00
Frédéric FRANCE
b21d59daf7 phpstan 2023-08-30 08:24:51 +02:00
Laurent Destailleur
41a1aeaf8d Fix warning 2023-08-29 23:01:06 +02:00
Laurent Destailleur
e249b04357 Fix warnings 2023-08-29 22:58:54 +02:00
Laurent Destailleur
16128657b9 Fix warning 2023-08-29 22:54:13 +02:00
Laurent Destailleur
1ceca9804d Fix warning 2023-08-29 22:53:09 +02:00
Laurent Destailleur
2f9ea19ad1 Fix warnings 2023-08-29 22:13:38 +02:00
Laurent Destailleur
d4e5e6ee8b Fix canvas 2023-08-29 22:00:19 +02:00
Laurent Destailleur
de6cb5f4ee Fix warnings 2023-08-29 21:58:28 +02:00
Frédéric France
a75bc75b1d doc 2023-08-29 20:49:23 +02:00
Frédéric France
5c451ed387 Merge remote-tracking branch 'upstream/develop' into fixphpstan2 2023-08-29 20:40:44 +02:00
Hystepik
66f8757e1e Close #23493 Add birthday to contact list 2023-08-29 15:46:45 +02:00
Laurent Destailleur
bb161a3d97 Trans 2023-08-29 13:11:37 +02:00
Laurent Destailleur
2a0b64de25 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-29 12:40:35 +02:00
Laurent Destailleur
c3e5529d87 Trans 2023-08-29 11:46:35 +02:00
Frédéric France
3201f97212 clean code 2023-08-28 21:10:05 +02:00
Frédéric France
711f91b358 fix phpstan 2023-08-28 20:26:35 +02:00
UT from dolibit
bf614a955e Update htdocs / accountancy / bookkeeping / list.php 2023-08-28 20:10:36 +02:00
Frédéric France
11fe884715 fix phpstan 2023-08-28 18:46:09 +02:00
Frédéric France
adcf71717c fix phpstan 2023-08-28 18:21:35 +02:00
Laurent Destailleur
42d24fa4f1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-28 17:39:06 +02:00
Laurent Destailleur
dbd65ca242 NEW Option to show label, ref+label or only ref of product in TakePOS 2023-08-28 17:34:05 +02:00
vmaury
52fce1bf0d Fix #25714 : Totals in propal not rounded according to
MAIN_MAX_DECIMALS_SHOWN
2023-08-28 16:43:30 +02:00
Florian HENRY
36f051617d fix syntax 2023-08-28 15:38:33 +02:00
HENRY Florian
a283c6f30c Merge branch 'develop' into dev_sign_soeciete_rib 2023-08-28 15:18:30 +02:00
HENRY Florian
97042001f6 Merge branch 'develop' into dev_change_notetaskivoice 2023-08-28 15:14:42 +02:00
UT from dolibit
f57da2b89a Update /htdocs/asset/list.php
// Get paramaters
$mode
2023-08-28 15:08:34 +02:00
Florian HENRY
9681ff7e17 fix travis 2023-08-28 14:57:59 +02:00
UT from dolibit
1baff187f2 Update /htdocs/comm/index.php 2023-08-28 14:52:59 +02:00
Florian HENRY
e3253cd8d7 fix travis 2023-08-28 14:40:01 +02:00
UT from dolibit
833d967ee4 Update myobject_document.php 2023-08-28 14:16:29 +02:00
Florian HENRY
bb195694bb Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_quality_management_on_lot 2023-08-28 12:41:46 +02:00
Florian HENRY
52e57f8c8b feat: Database change for #25681 2023-08-28 12:40:24 +02:00
Hystepik
963e475284 Fix #25452 disable Bom & Mo when product disabled 2023-08-28 11:35:37 +02:00
Frédéric FRANCE
314b7aa3f8 phpstan 2023-08-28 08:03:21 +02:00
Alexandre SPANGARO
fbd262236b FIX Accountancy - List of accounts - Compatibility left column checkbox + Search id_import + Hooks + Undefined variable 2023-08-28 07:40:44 +02:00
Laurent Destailleur
8eb26b1bb0 Merge pull request #25695 from dolibit-ut/patch-749
Update /htdocs/product/list.php
2023-08-28 00:29:59 +02:00
Laurent Destailleur
1eb949b29b Merge pull request #25697 from frederic34/patch-6
phpstan
2023-08-28 00:25:09 +02:00
Laurent Destailleur
57cb01f1d8 Merge pull request #25701 from frederic34/patch-9
phpstan
2023-08-28 00:21:59 +02:00
Laurent Destailleur
06a7d0f398 Merge pull request #25700 from frederic34/patch-8
phpstan
2023-08-28 00:14:02 +02:00
Laurent Destailleur
0c3db0bac3 Merge pull request #25699 from frederic34/patch-7
phpstan
2023-08-28 00:13:22 +02:00
Frédéric FRANCE
7f69c3fd5f phpstan 2023-08-27 21:05:27 +02:00
Frédéric FRANCE
4b3bf4961d phpstan 2023-08-27 20:58:07 +02:00
Frédéric FRANCE
4d43424bab phpstan 2023-08-27 20:46:27 +02:00
UT from dolibit
3982051455 Update myobject_document.php
edit / sort general defined options
2023-08-27 20:42:14 +02:00
Frédéric FRANCE
a613d4f679 phpstan 2023-08-27 20:31:09 +02:00
UT from dolibit
c036988467 Update /htdocs/product/list.php
isModEnabled('workstation')
2023-08-27 19:36:48 +02:00
Laurent Destailleur
b66a18254d Fix empt and getDolGlobal 2023-08-27 18:19:36 +02:00
Laurent Destailleur
5d4f53046a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-27 18:18:34 +02:00
Laurent Destailleur
552a079379 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-27 16:05:46 +02:00
Laurent Destailleur
9bd119c8fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-27 15:45:45 +02:00
Laurent Destailleur
1ac3bdae5d Fix path dirscc 2023-08-27 15:45:29 +02:00
Laurent Destailleur
26d6d9fe4a Merge pull request #25694 from frederic34/patch-6
phpstan
2023-08-27 15:42:00 +02:00
Laurent Destailleur
75ad10e02a Merge pull request #25693 from steinjer/patch-1
Add german association to llx_c_forme_juridique.sql
2023-08-27 15:41:01 +02:00
Laurent Destailleur
25a62170f0 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-27 15:40:37 +02:00
Laurent Destailleur
652deda959 NEW Add index on prelevement_demande 2023-08-27 15:36:53 +02:00
Frédéric FRANCE
cbdd080aa3 phpstan 2023-08-27 15:02:43 +02:00
Laurent Destailleur
53e1ddd390 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-27 14:49:19 +02:00
Laurent Destailleur
59aa4d36e2 Merge pull request #25692 from frederic34/patch-7
phpstan
2023-08-27 14:49:05 +02:00
Laurent Destailleur
dbfcea0ee3 Merge pull request #25691 from frederic34/patch-6
phpstan
2023-08-27 14:48:34 +02:00
Laurent Destailleur
8cd24a8688 FIX #25690 Use the global cache now 2023-08-27 14:47:48 +02:00
Jörg
8e4cf5a1ad Update llx_c_forme_juridique.sql
add german association verein
2023-08-27 13:45:53 +02:00
Frédéric FRANCE
8ef2167f91 phpstan 2023-08-27 09:40:55 +02:00
Frédéric FRANCE
a142d48d26 phpstan 2023-08-27 09:19:58 +02:00
Laurent Destailleur
2b69d07b28 Trans 2023-08-26 23:22:42 +02:00
Laurent Destailleur
388d5ef3d4 Debug and protection of form for contact/prospect creation 2023-08-26 23:06:49 +02:00
Laurent Destailleur
b77c2d471a Merge pull request #25644 from oussamanhairech/develop19major
#25379 create a public page to record a prospect
2023-08-26 22:49:24 +02:00
Laurent Destailleur
d5e63e03f9 Merge pull request #25666 from JonBendtsen/Adding_foreninger_as_business_entity_type
Adding foreninger as DK business entity types
2023-08-26 22:45:19 +02:00
Laurent Destailleur
754f6c8278 Update 8.0.0-9.0.0.sql 2023-08-26 22:44:55 +02:00
Laurent Destailleur
7ba40c9aa5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-26 22:41:39 +02:00
Laurent Destailleur
faa9793bea Merge pull request #25682 from frederic34/frederic34-patch-1-2
phpcs for only modified files
2023-08-26 22:41:22 +02:00
Laurent Destailleur
89143099e8 Clean github actions 2023-08-26 22:41:03 +02:00
Laurent Destailleur
8d8fa01b2b FIX #25685 2023-08-26 22:28:04 +02:00
Laurent Destailleur
ae89f278ef NEW Can include product variants in list of products 2023-08-26 22:18:49 +02:00
Laurent Destailleur
8946320154 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-26 21:50:43 +02:00
Laurent Destailleur
e56c1710bb Clean code 2023-08-26 21:49:24 +02:00
Laurent Destailleur
d666e003ec Merge pull request #20676 from defrance/patch-182
NEW : add parent product column on list
2023-08-26 21:47:16 +02:00
Laurent Destailleur
09bd38ae55 Update list.php 2023-08-26 21:47:05 +02:00
Laurent Destailleur
2dbf1dd99a Merge branch 'develop' into patch-182 2023-08-26 21:46:10 +02:00
Frédéric FRANCE
0d1bf16b9f Merge branch 'develop' into frederic34-patch-1-2 2023-08-26 21:40:48 +02:00
Laurent Destailleur
477640f10f Merge pull request #25686 from frederic34/fixstats
fix phpstan
2023-08-26 20:34:36 +02:00
Laurent Destailleur
c23a9515f3 FIX Bank receipt was empty 2023-08-26 15:25:54 +02:00
Laurent Destailleur
742a64c9dc Fix IPN 2023-08-26 13:07:02 +02:00
Laurent Destailleur
ed131aaa9a NEW Enhance IPN to support payment_intent.succeeded for both card/ban 2023-08-26 13:02:04 +02:00
Frédéric France
f3e912c43c Merge remote-tracking branch 'upstream/develop' into fixstats 2023-08-26 12:59:36 +02:00
Laurent Destailleur
056d5c8aea Code comment 2023-08-26 12:21:42 +02:00
Laurent Destailleur
8cc3d2358b NEW Remove hardcoded code for OVH sms. Generic method is ok now. 2023-08-26 12:02:19 +02:00
Laurent Destailleur
3199bd7137 Clean code 2023-08-26 11:07:30 +02:00
Frédéric France
6fb42df226 Merge remote-tracking branch 'upstream/develop' into fixstats 2023-08-26 11:02:36 +02:00
Laurent Destailleur
b49c326824 Clean deprecated code on old fields skype, twitter, ... 2023-08-26 10:57:49 +02:00
Laurent Destailleur
c9e926f333 Fix warning 2023-08-26 10:30:43 +02:00
Laurent Destailleur
b0e5b950f6 FIX API /product/getAttributes 2023-08-26 10:20:52 +02:00
Laurent Destailleur
55bb9d7136 Fix warnings 2023-08-26 10:16:46 +02:00
Laurent Destailleur
5aca60fb52 Fix trans 2023-08-26 09:56:14 +02:00
Laurent Destailleur
4ed3330a36 Fix merge 2023-08-26 02:30:18 +02:00
Laurent Destailleur
948f8fe67e Try to log payment error for SEPA try 2023-08-26 02:28:17 +02:00
Laurent Destailleur
736cf9bedc Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-26 01:49:39 +02:00
Laurent Destailleur
c0e2d55549 Fix warnings 2023-08-26 00:43:51 +02:00
Laurent Destailleur
1293f48018 Fix phpunit 2023-08-26 00:05:58 +02:00
Laurent Destailleur
a0455c72a3 Test phpunit 2023-08-25 23:44:55 +02:00
Laurent Destailleur
a296751543 Fix phpunit 2023-08-25 22:04:37 +02:00
Laurent Destailleur
3345add205 Enhance the stripe multiaccount capabilities 2023-08-25 21:57:16 +02:00
Laurent Destailleur
38caf95cad Log 2023-08-25 19:25:59 +02:00
Laurent Destailleur
6f54e25467 Fix #yogosha user changing pass must not see pass (it not admin) 2023-08-25 19:17:22 +02:00
Frédéric France
9d3cfe67cb fix phpstan 2023-08-25 18:29:00 +02:00
Frédéric France
62384fe7b3 fix phpstan 2023-08-25 18:21:24 +02:00
Frédéric France
961c03269d fix phpstan 2023-08-25 18:10:50 +02:00
Laurent Destailleur
4c2645147c Fix phpunit API warnings 2023-08-25 15:52:31 +02:00
Laurent Destailleur
7e062f9391 Fix phpunit API warnings 2023-08-25 15:49:09 +02:00
Laurent Destailleur
c6a30bcf9e Fix phpunit 2023-08-25 15:45:12 +02:00
Florian HENRY
1f19482f97 review 2023-08-25 14:52:26 +02:00
Laurent Destailleur
256fe9ecf8 Add more REST phpunit tests 2023-08-25 14:48:41 +02:00
Frédéric FRANCE
0b678fa515 Update phpcs.yml 2023-08-25 14:45:07 +02:00
Laurent Destailleur
bcd3401e47 Fix phpunit 2023-08-25 13:58:27 +02:00
Frédéric FRANCE
e147374241 Update cpaiement.class.php 2023-08-25 13:44:53 +02:00
Frédéric FRANCE
f8ef7f7f00 Create phpcs.yml 2023-08-25 13:41:30 +02:00
Florian HENRY
17fa595c88 FIX: review quality managment on product lot 2023-08-25 12:50:13 +02:00
Laurent Destailleur
519318953d Merge pull request #25661 from frederic34/fixnumgenerator
fix numbering modules
2023-08-25 00:37:27 +02:00
Laurent Destailleur
93876bc5a0 Merge pull request #25660 from frederic34/frederic34-patch-1-1
doc
2023-08-25 00:34:38 +02:00
Laurent Destailleur
690f3ac94f Merge pull request #25663 from frederic34/frederic34-patch-1-2
fix const
2023-08-25 00:34:04 +02:00
Laurent Destailleur
ba42e2cee2 Merge pull request #25664 from frederic34/frederic34-patch-1-3
doc
2023-08-25 00:33:36 +02:00
Laurent Destailleur
6035522ead Merge pull request #25668 from frederic34/frederic34-patch-1-4
fix unknown variable
2023-08-25 00:33:19 +02:00
Laurent Destailleur
b0029c751f Merge pull request #25669 from frederic34/frederic34-patch-1-5
fix doc
2023-08-25 00:32:51 +02:00
Laurent Destailleur
82f26d06dc Merge pull request #25670 from frederic34/frederic34-patch-1-6
Fix doc and try to ignore phpstan warning
2023-08-25 00:32:31 +02:00
Laurent Destailleur
3f5d32867f Merge pull request #25672 from frederic34/frederic34-patch-1-7
fix doc and Call to an undefined method FormSetup::setErrors().
2023-08-25 00:32:03 +02:00
Laurent Destailleur
402a060d98 Merge pull request #25673 from frederic34/frederic34-patch-1-8
remove not used variable
2023-08-25 00:30:44 +02:00
Laurent Destailleur
676159d7bd Merge pull request #25676 from oussamanhairech/develop19major1
#14295 Rest API Contact test
2023-08-25 00:26:00 +02:00
Laurent Destailleur
b679603c83 Merge pull request #25667 from ultrasites/feature/email-template-shipping-method
add email variable for shipping method
2023-08-24 22:25:08 +02:00
Laurent Destailleur
23f4fb9cdd NEW Add more tables activated by module activation only 2023-08-24 20:12:02 +02:00
oussamanhairech
572192a01f #14295 Rest API Contact test 2023-08-24 18:21:06 +02:00
VESSILLER
ce94ab70df NEW rights and check access to create portal accounts 2023-08-24 17:34:04 +02:00
Laurent Destailleur
73c199adbf Fix warnings 2023-08-24 16:15:18 +02:00
Laurent Destailleur
2107bce73d Clean code not used 2023-08-24 15:55:27 +02:00
Laurent Destailleur
bcb85bdb13 Fix warnings 2023-08-24 15:49:53 +02:00
Laurent Destailleur
58d2248698 Fix typo in class name 2023-08-24 15:42:53 +02:00
Laurent Destailleur
5e9b019d2a Remove dead code 2023-08-24 15:34:16 +02:00
Laurent Destailleur
bd3a73646f Fix lost files in custom 2023-08-24 15:20:04 +02:00
Laurent Destailleur
1ed7ce2d0c Class CommonStickerGenerator must extends CommonDocGenerator 2023-08-24 15:17:24 +02:00
Laurent Destailleur
272c51164b Fix typo Productcustomerprice into ProductCustomerPrice 2023-08-24 15:08:33 +02:00
Laurent Destailleur
b471cdc9ca Fix typo of class Evaluationline into EvaluationLine 2023-08-24 15:03:15 +02:00
Laurent Destailleur
85180a3044 Clean code 2023-08-24 14:55:23 +02:00
Laurent Destailleur
5dbdffbdbe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-24 14:32:13 +02:00
Laurent Destailleur
a8b5cfb23e Clean test files 2023-08-24 14:31:54 +02:00
Laurent Destailleur
d78891eed8 Clean test files 2023-08-24 14:31:10 +02:00
Laurent Destailleur
e9e6a8d0a8 Fix warnings 2023-08-24 14:19:45 +02:00
Frédéric FRANCE
40080023c3 Merge branch 'develop' into develop-2 2023-08-24 12:55:39 +02:00
oussamanhairech
b3427b4611 #25379 cleaning code 2023-08-24 12:02:01 +02:00
Frédéric FRANCE
3f84913087 remove not used variable 2023-08-24 11:36:14 +02:00
Frédéric FRANCE
d270efcc6f fix doc and Call to an undefined method FormSetup::setErrors(). 2023-08-24 11:29:29 +02:00
Frédéric FRANCE
330e756282 Fix doc and try to ignore phpstan warning 2023-08-24 09:59:27 +02:00
Frédéric FRANCE
7a73323fdf fix doc 2023-08-24 09:49:02 +02:00
Frédéric FRANCE
1b336e0907 fix unknown variable 2023-08-24 09:42:27 +02:00
Frédéric FRANCE
55fce9d041 Merge branch 'develop' into frederic34-patch-1-3 2023-08-24 09:01:13 +02:00
Manuel Dierkes
e1fa825213 add email variable for shipping method 2023-08-24 06:18:21 +00:00
Laurent Destailleur
03f4f9d530 Fix phpunit 2023-08-24 01:47:41 +02:00
Laurent Destailleur
000cc6be82 Enhance Stripe payment SEPA to allow to choose stripe env 2023-08-24 01:37:04 +02:00
Laurent Destailleur
bf1549e6e0 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-24 00:14:55 +02:00
Jon Bendtsen
8bf591f0c1 adding DK non profit organisations to business entity types
we have some non profit organisations here in DK that could not be chosen in the list.
2023-08-23 22:42:45 +02:00
Jon Bendtsen
55c20fa1e6 Update 8.0.0-9.0.0.sql
In Denmark we have some non profit sport organisations, and since I am thinking of using Dolibarr for a nonprofit dance organisation I needed this kind of business entity type.

Source
https://erhvervsstyrelsen.dk/regler-erhverv/virksomhedstyper/foreninger/generelt-om-foreninger
2023-08-23 22:39:39 +02:00
Laurent Destailleur
6c17d19405 FIX Adding a product in recurring invoice does not use the correct VAT 2023-08-23 21:08:01 +02:00
Frédéric FRANCE
575495bdda doc 2023-08-23 21:03:52 +02:00
Laurent Destailleur
65c4e92e87 Fix regression after removing ->brouillon. 2023-08-23 20:53:26 +02:00
Frédéric FRANCE
732b33c4a7 Merge branch 'develop' into develop-2 2023-08-23 20:45:40 +02:00
Laurent Destailleur
f4bf4b31d5 Clean code 2023-08-23 19:36:59 +02:00
Laurent Destailleur
3b69bbb0b6 Merge pull request #20144 from atm-adrien/NEW_include_sub_warehouse_in_inventory
NEW : Include sub warehouse in inventory
2023-08-23 19:33:06 +02:00
Laurent Destailleur
68e8f517d2 Merge branch 'develop' into NEW_include_sub_warehouse_in_inventory 2023-08-23 19:31:37 +02:00
Laurent Destailleur
59d8909d4b Fix warnings 2023-08-23 19:29:14 +02:00
Laurent Destailleur
7b3663422d Revert "Remove .idea no more used (Qodana abandonned)"
This reverts commit e69c7792fd.
2023-08-23 18:50:08 +02:00
Laurent Destailleur
e69c7792fd Remove .idea no more used (Qodana abandonned) 2023-08-23 18:45:10 +02:00
Frédéric FRANCE
4d607a8fac fix const 2023-08-23 18:40:30 +02:00
Laurent Destailleur
ad44ab7bff Fix int 2023-08-23 18:26:27 +02:00
Laurent Destailleur
14d153923e Fix phpcs 2023-08-23 17:53:12 +02:00
Laurent Destailleur
a64f5bf3da Add a tool to build statistics on project 2023-08-23 16:36:29 +02:00
Frédéric FRANCE
ece628b835 fix doc 2023-08-23 13:51:58 +02:00
Frédéric FRANCE
cf53ac8e53 fix doc 2023-08-23 13:51:14 +02:00
Frédéric FRANCE
75d219468c fix numbering modules 2023-08-23 13:42:49 +02:00
Frédéric FRANCE
44773e22d3 doc 2023-08-23 13:20:37 +02:00
Pascal Hubrecht
a48290cd3c Update propal.class.php 2023-08-23 07:31:53 +02:00
Pascal Hubrecht
4908906747 Update functions.lib.php 2023-08-23 07:29:46 +02:00
Laurent Destailleur
3c14458b96 Add tool to count lines of code 2023-08-23 03:52:51 +02:00
Laurent Destailleur
ce009a82d1 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-23 03:00:27 +02:00
Laurent Destailleur
5a2cf41882 css 2023-08-23 02:24:43 +02:00
Laurent Destailleur
0cf5748163 Add table c_type_container only if module on. Add column position. 2023-08-23 02:08:57 +02:00
Laurent Destailleur
71e20b8d13 Log 2023-08-23 00:37:13 +02:00
Laurent Destailleur
da43b25111 NEW Add column extraparams on societe_rib 2023-08-22 17:34:47 +02:00
Pascal Hubrecht
d5519325e4 Update functions.lib.php 2023-08-22 13:07:48 +02:00
Laurent Destailleur
032e041e6f Fix bad var 2023-08-22 11:41:19 +02:00
Laurent Destailleur
038e50ce84 Add the external system payment name in list of fields for payment modes 2023-08-22 11:31:57 +02:00
Laurent Destailleur
30892b7bae Add the external system payment name in list of fields for payment modes 2023-08-22 11:14:40 +02:00
Laurent Destailleur
b372286188 FIX Bad link into message 2023-08-22 11:08:50 +02:00
Laurent Destailleur
36b1ae15a4 NEW Can edit both the Test and Live stripe customer account on payment 2023-08-22 10:41:38 +02:00
Laurent Destailleur
7b8c1d58b8 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-22 08:59:28 +02:00
Laurent Destailleur
ba9b8cac6b Fix phpstan 2023-08-21 14:36:53 +02:00
Laurent Destailleur
329473c3cb Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-21 14:14:44 +02:00
Laurent Destailleur
d190f54c75 Fix phpstan 2023-08-21 14:13:00 +02:00
Laurent Destailleur
5e586bfb07 Fix phpstan 2023-08-21 14:03:43 +02:00
Laurent Destailleur
3096f5d1f0 NEW Save date of RUM creation when creating a Stripe SEPA mandate 2023-08-21 02:33:45 +02:00
Laurent Destailleur
974917e9a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-20 23:57:45 +02:00
Laurent Destailleur
6b2c19105e When creating a mandate on SEPA Stripe, we save stripe mandate ID 2023-08-20 23:55:00 +02:00
Laurent Destailleur
151cd24b32 Merge pull request #25634 from lamrani002/addApiUrlToDoc
NEW functionality for Add api url to documentation in ModuleBuilder
2023-08-19 22:11:17 +02:00
David Pareja Rodriguez
0890c37ae2 Fix check always ended up setting to null 2023-08-19 22:09:57 +02:00
David Pareja Rodriguez
e9cfb1e08a Simplify verification 2023-08-19 22:09:57 +02:00
David Pareja Rodriguez
f471bbae20 Forgot to modify checkSwiftForAccount and checkIbanForAccount 2023-08-19 22:09:57 +02:00
David Pareja Rodriguez
ad140ea4bc Removed classes instantiations and fetch to avoid multiple DB queries per invoice 2023-08-19 22:09:57 +02:00
Laurent Destailleur
5c7a042413 Merge pull request #25639 from aspangaro/19a3
NEW Accountancy - Add hooks on PrintFieldList for sellsjournal
2023-08-19 22:07:46 +02:00
Laurent Destailleur
4b981088cf Merge pull request #25643 from MaximilienR-easya/dev_Fix_ticket_ref
Fix a bug with fetch with the object used to create the ticket
2023-08-19 13:23:41 +02:00
Laurent Destailleur
70a36bd38b Merge pull request #25640 from altairisfr/checkqtyshipped
NEW : add constant to check if qty shipped not greater than qty ordered
2023-08-19 12:16:29 +02:00
Laurent Destailleur
76d00740ea Merge pull request #25646 from fappels/develop_improve_clone_price
Improve product clone_price method
2023-08-19 12:08:17 +02:00
Laurent Destailleur
08258bce30 Merge pull request #25632 from frederic34/develop-1
doc
2023-08-19 12:06:35 +02:00
VESSILLER
b1190826ed NEW webportal site account 2023-08-18 17:37:41 +02:00
Francis Appels
5b5e7fec9a Improve product clone_price method 2023-08-18 13:02:30 +02:00
Frédéric FRANCE
6ea9150950 Update stocks.lang 2023-08-18 09:31:02 +02:00
Frédéric FRANCE
db86e10287 Update stocks.lang 2023-08-18 09:31:02 +02:00
Frédéric FRANCE
effa308eea Dispaly warehouse usage 2023-08-18 09:31:02 +02:00
Laurent Destailleur
24040c78bb Tooltip for help in ODT doc generation setup is now clickable 2023-08-18 01:46:54 +02:00
Laurent Destailleur
a4d04b84f5 css 2023-08-18 01:06:47 +02:00
Laurent Destailleur
1f5ea59b1f NEW Add option in PDF for purchase order and quotation to hide prices 2023-08-17 20:44:31 +02:00
Laurent Destailleur
886c70c192 Removed a trigger key that should not exists 2023-08-17 16:22:22 +02:00
Laurent Destailleur
ed5c5716bb Fix regression on clone of product 2023-08-17 15:37:17 +02:00
Christophe Battarel
6f1e9d59ca fix qty check 2023-08-17 15:19:08 +02:00
oussamanhairech
0c9807ec30 #25379 create a public page to record a prospect 2023-08-17 15:17:14 +02:00
Maximilien Rozniecki
58c864b889 Fix a bug with fetching with the object used to create the ticket 2023-08-17 14:53:19 +02:00
Laurent Destailleur
b0b000a9bb Debug v18 bad color theme 2023-08-17 14:42:02 +02:00
Christophe Battarel
6f3f75478f fix stupid 2023-08-17 11:14:50 +02:00
Christophe Battarel
d53772f21d add constant to check if qty shipped not greater than qty ordered 2023-08-17 11:11:49 +02:00
Alexandre SPANGARO
c8831f14b4 NEW Accountancy - Add hooks on PrintFieldList for sellsjournal 2023-08-17 06:39:59 +02:00
Laurent Destailleur
d2f8b5dbfa Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-16 21:12:23 +02:00
Laurent Destailleur
3359b93b50 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-16 20:05:49 +02:00
Laurent Destailleur
134cd1ca51 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-16 18:29:11 +02:00
Laurent Destailleur
5f774bc960 clean search 2023-08-16 18:28:51 +02:00
Laurent Destailleur
fb4e772e0a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-16 18:08:21 +02:00
Laurent Destailleur
61a319f790 NEW Perf avoid 2 useless fetch into the triggers of agenda. 2023-08-16 17:57:41 +02:00
Laurent Destailleur
1abcef076f NEW Suport html content for combo list of email recipient 2023-08-16 17:55:44 +02:00
antonin_tdj
1d08e387fd Fix Computed Extrafields on list 2023-08-16 16:08:03 +02:00
Lamrani Abdel
e60087cfc9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-08-16 12:53:15 +02:00
Lamrani Abdel
a5326f8586 create function for generate api urls and add them to documentation 2023-08-16 12:45:01 +02:00
Frédéric FRANCE
30ed164074 Update interface_20_modWorkflow_WorkflowManager.class.php 2023-08-16 11:53:08 +02:00
Frédéric FRANCE
460e229407 doc 2023-08-16 11:50:18 +02:00
Laurent Destailleur
d86bbc623a Merge branch 'develop' into rest-extra 2023-08-16 02:33:27 +02:00
Laurent Destailleur
59e380ee8f Merge pull request #25602 from altairisfr/fixdelivered
FIX : avoid draft and cancelled shippings when searching if order should be set delivered
2023-08-16 02:28:15 +02:00
Laurent Destailleur
7e22434ae8 Merge pull request #25619 from aspangaro/19a3
NEW Add triggers COMPANY_RIB_XXX already present in companybankaccount.class.php
2023-08-16 02:07:01 +02:00
Laurent Destailleur
f66b51a32f Merge pull request #25620 from lamrani002/editMainPropsOfMB
NEW functionality for edit properties in description tab for ModuleBuilder
2023-08-16 02:06:03 +02:00
Laurent Destailleur
c13f7cddbd Merge pull request #25621 from frederic34/frederic34-patch-1-1
fix numbering getExample
2023-08-16 01:42:49 +02:00
Laurent Destailleur
bc517aef8b Merge pull request #25628 from dolibit-ut/develop-2
Update ChangeLog
2023-08-16 01:40:56 +02:00
Laurent Destailleur
5606ad4f0a Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-15 21:07:40 +02:00
Laurent Destailleur
72dbb35d13 Debug v18 2023-08-15 18:25:00 +02:00
Laurent Destailleur
f478d05e3b Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-15 17:34:48 +02:00
Laurent Destailleur
399a6a485b Add revenuestamp column on vendor invoice side like customer side 2023-08-15 17:34:28 +02:00
Laurent Destailleur
aea21bc413 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-15 15:54:55 +02:00
Laurent Destailleur
390bbe90b6 Trans 2023-08-15 11:25:13 +02:00
Laurent Destailleur
b1e1eecf24 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-15 00:31:51 +02:00
Alexandre SPANGARO
1efc606f60 Merge branch 'develop' into 19a3 2023-08-14 16:21:50 +02:00
Laurent Destailleur
30ec8c463b FIX Test on duplictae for SEPA payemnt requests 2023-08-14 15:40:22 +02:00
Laurent Destailleur
53cc7087a7 FIX bank payment request not visible into badge 2023-08-14 14:37:35 +02:00
Laurent Destailleur
2177b4de58 Fix date disabled must appear in strike 2023-08-14 14:24:41 +02:00
UT from dolibit
b759425975 Update ChangeLog 2023-08-14 12:41:20 +02:00
Lamrani Abdel
91695449a4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-08-14 12:40:29 +02:00
Lamrani Abdel
bd67313d34 finish this functionnality 2023-08-14 12:37:21 +02:00
Laurent Destailleur
c3dafa05c0 Add a better error message on API login if token is not valid. 2023-08-14 12:25:52 +02:00
Laurent Destailleur
f5052fc2d3 Clean code 2023-08-14 04:16:32 +02:00
Laurent Destailleur
713d765e30 NEW drop down for action button show a simple button if only 1 action 2023-08-14 03:37:22 +02:00
mschamp
5ff0e17e8f Update llx_accounting_account_be.sql Add Dutch version 2023-08-13 21:13:50 +02:00
Laurent Destailleur
633f9e56fd Try to remove js in rich text doc 2023-08-13 16:40:46 +02:00
Laurent Destailleur
18504c9b38 Doc 2023-08-13 16:40:24 +02:00
Laurent Destailleur
e1dbeb58ea Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-13 16:35:08 +02:00
Laurent Destailleur
bfde27ea36 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-13 16:33:23 +02:00
Frédéric FRANCE
286ee22e06 Merge branch 'develop' into frederic34-patch-1-1 2023-08-12 06:12:25 +02:00
Laurent Destailleur
a7fca15f12 Clean label for direct debit and credit transfer into llx_bank. 2023-08-12 03:52:34 +02:00
Laurent Destailleur
0b93989082 Debug v18 2023-08-12 02:28:26 +02:00
Laurent Destailleur
4e6e50a19e Debug v18 2023-08-12 01:48:40 +02:00
Laurent Destailleur
1dd96fa3f0 Fix phpunit 2023-08-12 01:10:13 +02:00
Laurent Destailleur
b3f8795414 Fix phpunit 2023-08-12 01:08:04 +02:00
Frédéric FRANCE
496b751f90 Update mod_sn_free.php 2023-08-11 20:57:56 +02:00
Frédéric FRANCE
295fba5886 Update mod_lot_free.php 2023-08-11 20:56:30 +02:00
Laurent Destailleur
c9f1ee08dc Fix phpunit 2023-08-11 20:15:01 +02:00
Lamrani Abdel
9f0523dc1d add functionality for edit property of module 2023-08-11 19:34:35 +02:00
Laurent Destailleur
e4eafcc52e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-11 18:31:27 +02:00
Roger Dueck
c107814a1a Fix inconsistent is-empty check for extrafields 2023-08-11 08:22:51 -06:00
Alexandre SPANGARO
e6b3d143eb NEW Add triggers COMPANY_RIB_XXX already present in companybankaccount.class.php 2023-08-11 15:52:59 +02:00
Laurent Destailleur
2e5a895eed Merge pull request #25578 from FliyFly/feature#25044
New|NEW(#25044) new option visibility parameter
2023-08-11 14:20:23 +02:00
Laurent Destailleur
c5d6f3f5b0 Merge pull request #25398 from lamrani002/testMB
NEW Upgrade in module builder in menu section
2023-08-11 14:16:13 +02:00
Laurent Destailleur
bfb0f4c00a Merge pull request #25509 from altairis-benjamin/externalContributors
NEW add and list external contributors on ticket public interface
2023-08-11 13:20:31 +02:00
Laurent Destailleur
3263982b24 Merge pull request #25616 from frederic34/develop-1
remove debug
2023-08-11 13:19:41 +02:00
Laurent Destailleur
18d013a6f7 NEW Merge the "Create ..." buttons on contract into one. 2023-08-11 13:18:43 +02:00
Frédéric FRANCE
8b3deed61a remove debug 2023-08-11 12:59:06 +02:00
Laurent Destailleur
35e4565ccc Avoid duplicate feature with TICKET_LINK_TO_CONTRACT_WITH_HARDLINK 2023-08-11 12:58:23 +02:00
Laurent Destailleur
e91f0d88c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-11 12:34:27 +02:00
Laurent Destailleur
39b53051d4 Merge pull request #25577 from defrance/develop-2
NEW add Ticket tab on contract
2023-08-11 12:33:14 +02:00
Laurent Destailleur
3bc6fcc7e8 Fix missing include 2023-08-11 12:32:47 +02:00
Laurent Destailleur
df4761e42a Fix numbering of shipments 2023-08-11 12:14:28 +02:00
Laurent Destailleur
0ab376887c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-11 11:56:59 +02:00
Laurent Destailleur
5905fd2425 The method get_substitutionarray_shipment_lines() has been removed. Use
the generic get_substitutionarray_lines() instead.
2023-08-11 11:56:50 +02:00
Laurent Destailleur
daaf931e0c Merge pull request #25601 from MaximilienR-easya/dev_Fix
Fix non-existing function
2023-08-11 11:56:29 +02:00
Laurent Destailleur
722cfe5e83 Update doc_generic_reception_odt.modules.php 2023-08-11 11:51:43 +02:00
Laurent Destailleur
a15f317a4f Update ticket.php 2023-08-11 11:46:31 +02:00
Laurent Destailleur
b3e36765a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-11 11:43:07 +02:00
Laurent Destailleur
28620c58b8 Clean code 2023-08-11 11:42:49 +02:00
Laurent Destailleur
6275926f4b Update ticket.php 2023-08-11 11:26:21 +02:00
Laurent Destailleur
a5a68cfe0a Update contrat.class.php 2023-08-11 11:24:23 +02:00
Laurent Destailleur
dee51bcf99 Merge pull request #25599 from aspangaro/19a2
NEW Accountancy - Add hooks on PrintFieldList for expensereportsjournal, purchasesjournal
2023-08-11 11:20:24 +02:00
Laurent Destailleur
1f194aa075 Merge pull request #25608 from oscim/develop-4
Update facture.class.php
2023-08-11 11:18:31 +02:00
Laurent Destailleur
de2cf11784 Merge pull request #25605 from defrance/develop-3
new add filter on link
2023-08-11 11:17:47 +02:00
Laurent Destailleur
09b4f427af Update extrafields.class.php 2023-08-11 11:16:51 +02:00
Laurent Destailleur
f797a1cdcc Merge pull request #25607 from lamrani002/updateDictInMB
NEW functionnality for edit name of dictionnary and delete it in MB
2023-08-11 11:11:05 +02:00
Laurent Destailleur
0bb3b6c73a Update facture.class.php 2023-08-11 11:08:01 +02:00
Laurent Destailleur
0349c2186d Fix invoice 2023-08-11 11:00:59 +02:00
Laurent Destailleur
4bbe3a8416 Fix warnings 2023-08-11 10:58:04 +02:00
Laurent Destailleur
3cacf59984 Merge pull request #25611 from defrance/develop-5
php v8 warning
2023-08-11 10:50:18 +02:00
Laurent Destailleur
912ce53338 Merge pull request #25610 from defrance/develop-4
php V8 warning
2023-08-11 10:47:21 +02:00
Laurent Destailleur
6c9529205b Merge pull request #25606 from frederic34/frederic34-patch-1-1
fix syntax error
2023-08-11 10:46:57 +02:00
Laurent Destailleur
505505b7fb NEW Add modifications of template invoices into agenda 2023-08-11 10:43:13 +02:00
Lamrani Abdel
5b96e10ebe Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-08-11 10:24:38 +02:00
Laurent Destailleur
a3021ce24b Debug v18 2023-08-11 10:06:06 +02:00
Laurent Destailleur
a061ef1e67 Doc 2023-08-11 10:03:16 +02:00
Laurent Destailleur
577642eac5 Merge pull request #24965 from aspangaro/18a9
NEW VAT rate - Add entity
2023-08-11 09:47:16 +02:00
Laurent Destailleur
f83c5df66f Update price.php 2023-08-11 09:46:08 +02:00
Alexandre SPANGARO
bf0dabfe45 Remove DROP 2023-08-11 09:40:36 +02:00
Charlène Benke
637e9788ef Update ticket.class.php
dislexic time sorry
2023-08-11 09:00:51 +02:00
Alexandre SPANGARO
ffd68671b8 Merge branch 'develop' into 18a9 2023-08-11 06:10:13 +02:00
Laurent Destailleur
46af9720c8 Debug v18 2023-08-10 18:00:42 +02:00
Charlène Benke
a8f2afd1e1 php v8 warning
many values are not well defined when use BOM
Just change this one but we need to pass more time for debug it
2023-08-10 15:46:10 +02:00
Charlène Benke
c12592ee6b php V8 warning
append if workstation module not enabled
2023-08-10 15:20:55 +02:00
Charlène Benke
ea112f6e07 Merge branch 'develop' into develop-2 2023-08-10 14:03:30 +02:00
Laurent Destailleur
cfb4e4bee2 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-10 13:14:19 +02:00
Laurent Destailleur
b04c1df588 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-10 13:14:04 +02:00
Laurent Destailleur
df6b9947b0 Debug SEPA payment 2023-08-10 13:13:52 +02:00
Laurent Destailleur
5bd5fb8753 Debug SEPA payment 2023-08-10 12:57:31 +02:00
Laurent Destailleur
8c99d538d4 Save the ext_payment_site value into llx_societe_rib for Stripe SEPA. 2023-08-10 12:28:22 +02:00
oscim
6adfa77436 Update facture.class.php
Add date et user close  in cancel methode
2023-08-10 11:54:46 +02:00
Laurent Destailleur
7c3f8a1dfe Fix warning 2023-08-10 11:48:08 +02:00
Laurent Destailleur
4f94f898a3 Fix warnings 2023-08-10 11:42:59 +02:00
Laurent Destailleur
c68d8a8dc8 Add nb of errors 2023-08-10 11:39:58 +02:00
Laurent Destailleur
707d853e84 Clean code 2023-08-10 11:29:09 +02:00
Lamrani Abdel
77a9388aed add button on top 2023-08-10 10:41:58 +02:00
Frédéric FRANCE
7d4f407e13 fix syntax error 2023-08-10 10:30:18 +02:00
Lamrani Abdel
d963d0cd67 add edit/delete on dicionary list 2023-08-10 10:04:17 +02:00
Charlène Benke
5bbcfd2c4c new add filter on link
allow to add a filter on array as defined on selectForForms
with remplacement id
// Bom:bom/class/bom.class.php:0:(t.fk_product:=:$ID$):ref
2023-08-10 09:37:20 +02:00
Laurent Destailleur
f681d140a5 Fix var_dump 2023-08-10 02:41:09 +02:00
Laurent Destailleur
31f07f0bec Fix phpcs 2023-08-09 18:33:43 +02:00
Laurent Destailleur
9d0117429d Fix phpcs 2023-08-09 18:32:56 +02:00
Laurent Destailleur
06bd68f252 Merge branch 'develop' into develop-2 2023-08-09 18:20:15 +02:00
Laurent Destailleur
6d63f464bb Fix php inherit 2023-08-09 18:18:20 +02:00
Charlène Benke
6ce2b54a3a Asked change made 2023-08-09 18:01:02 +02:00
Laurent Destailleur
08e428b46d Fix missing param 2023-08-09 18:00:31 +02:00
Laurent Destailleur
15ddb9a3a8 Fix inherit of CommonNumRef 2023-08-09 17:35:35 +02:00
Christophe Battarel
5f1bbc602e avoid draft shippings when searching if order should be flagged as delivered 2023-08-09 17:04:59 +02:00
Laurent Destailleur
d700b2e8d8 Debug v18 Fix set date properties of an extrafields 2023-08-09 17:03:04 +02:00
Maximilien Rozniecki
5d8778f301 Fix non-existing function 2023-08-09 16:48:15 +02:00
Lamrani Abdel
cb9c34bfc1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-08-09 16:46:50 +02:00
Laurent Destailleur
4f63273e28 Clean code 2023-08-09 16:02:27 +02:00
Laurent Destailleur
1f2a8e0df5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-09 15:24:56 +02:00
Laurent Destailleur
1d19e41439 Fix trans 2023-08-09 15:24:45 +02:00
Laurent Destailleur
9870ed253c Merge pull request #25588 from Easya-Solutions/new-supplier-invoice-credit-note-standalone
NEW no need to create invoice supplier object on supplier card for standalone credit note
2023-08-09 15:23:23 +02:00
Laurent Destailleur
298522d791 Merge pull request #25598 from lamrani002/removeDictionaryInMB
New|NEW functionality for remove dictionary in ModuleBuilder
2023-08-09 15:20:41 +02:00
Alexandre SPANGARO
375d1926af NEW Accountancy - Add hooks on PrintFieldList for expensereportsjournal, purchasesjournal 2023-08-09 15:10:32 +02:00
Laurent Destailleur
848f12ab42 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-09 15:02:58 +02:00
Laurent Destailleur
04b7b0aaa6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-09 15:02:34 +02:00
Laurent Destailleur
eaaa635bb6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-09 15:01:52 +02:00
Laurent Destailleur
11ad17bcf3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-09 15:00:52 +02:00
Laurent Destailleur
db2a70b86a NEW Factorize a lot of code for numbering modules 2023-08-09 14:50:28 +02:00
Laurent Destailleur
7bbaf37ffe Introduce an interface for num ref generators 2023-08-09 14:05:13 +02:00
Laurent Destailleur
22fac91a24 Merge pull request #25573 from lamrani002/helpTitleWhenDeleteDon
NEW  updating for display Help title when try to delete Don (issue  #25314)
2023-08-09 13:47:11 +02:00
Lamrani Abdel
d0dc3b019c fix problem for namedic 2023-08-09 13:43:44 +02:00
Laurent Destailleur
b1f8c2fd29 Code comment 2023-08-09 13:29:19 +02:00
Lamrani Abdel
ce7de59782 fix problem in file 2023-08-09 13:24:04 +02:00
Laurent Destailleur
5b13065bd8 Merge pull request #25503 from dolibit-ut/patch-727
Update interface_20_all_Logevents.class.php
2023-08-09 13:22:47 +02:00
Laurent Destailleur
10e2a35aa6 Update interface_20_all_Logevents.class.php 2023-08-09 13:21:56 +02:00
Lamrani Abdel
5a825f519b update functionnality for delete dict 2023-08-09 13:19:52 +02:00
UT from dolibit
e532b1a894 Update comment.php (#25539) 2023-08-09 13:15:36 +02:00
UT from dolibit
5c926d9876 Update comment.php (#25540) 2023-08-09 13:15:22 +02:00
UT from dolibit
60dfe4b60e Update element.php (#25541)
sorting of   

if (isModEnabled(' ')) {
	require_once

merged two 'stock' entries
2023-08-09 13:14:50 +02:00
UT from dolibit
fa3d62cbbb Update availabilities_agenda.php (#25542) 2023-08-09 13:10:54 +02:00
UT from dolibit
029ce5e9dd Update availabilities_card.php (#25543) 2023-08-09 13:10:46 +02:00
UT from dolibit
383133c03a Update availabilities_contact.php (#25544) 2023-08-09 13:10:35 +02:00
Laurent Destailleur
33cc8e1ff9 Doc 2023-08-09 13:08:57 +02:00
UT from dolibit
fbea01dd4c Update availabilities_list.php (#25546) 2023-08-09 12:57:08 +02:00
UT from dolibit
179a8f2c5b Update availabilities_document.php (#25545) 2023-08-09 12:56:58 +02:00
UT from dolibit
067748fc8a Update booking_agenda.php (#25548) 2023-08-09 12:56:47 +02:00
UT from dolibit
8225126582 Update availabilities_note.php (#25547) 2023-08-09 12:56:36 +02:00
UT from dolibit
655b0d4a40 Update booking_list.php (#25553) 2023-08-09 12:56:25 +02:00
UT from dolibit
54151f91ee Update booking_contact.php (#25550) 2023-08-09 12:56:01 +02:00
UT from dolibit
51f1062722 Update booking_card.php (#25549) 2023-08-09 12:55:51 +02:00
UT from dolibit
8f8bde08a4 Update booking_document.php (#25552) 2023-08-09 12:55:37 +02:00
UT from dolibit
3d5f649405 Update booking_note.php (#25554) 2023-08-09 12:55:24 +02:00
Lamrani Abdel
513dc9c0dc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into removeDictionaryInMB 2023-08-09 12:44:23 +02:00
Lamrani Abdel
d5e023dd51 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-08-09 12:43:35 +02:00
Lamrani Abdel
d5140b312a new functionnality for remove dict 2023-08-09 12:42:37 +02:00
lamrani abdelwadoud
2e8525933c Add new dictionary for modulebuilder (#25592)
* product_card problem unexpected tocken

* new update for function generate_doc

* new function for create dictionnary

* add function for create new dictionary

* fix problem

* update function for building correct string

* optimize function and fix incoherences

* optimize function and fix incoherences

* Revert "optimize function and fix incoherences"

This reverts commit ecbd902a9f.
2023-08-09 12:37:20 +02:00
Laurent Destailleur
109b54d942 Clean code 2023-08-09 12:33:30 +02:00
Laurent Destailleur
99f3f35dd0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-09 12:26:48 +02:00
Laurent Destailleur
dc298892f1 Fix status 2023-08-09 12:26:32 +02:00
Lamrani Abdel
b4454be591 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-08-09 10:32:29 +02:00
VESSILLER
a59c95d176 Replace translate key with CorrectedInvoiceNotFound 2023-08-09 08:25:31 +02:00
HENRY Florian
5b196bf082 FEAT: new field type 'checkbox' for CommonObject with arrayofkeyval (like extrafeilds) (#25564) 2023-08-08 22:21:33 +02:00
UT from dolibit
3c76800e69 Update card.php (#25558)
* Update card.php

edit require_once

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-08-08 22:17:50 +02:00
Quentin-Seekness
d57af23dbc Change modulepart to expedition (#25567) 2023-08-08 22:12:36 +02:00
altairis-melina
f69dea7474 NEW : Date field for shipment export (#25574)
* new_export_field date_valid

* fix
2023-08-08 22:10:53 +02:00
onhairech
585d6d3699 #24710 Special Characters button in CKEditor is missing in v17 (#25568) 2023-08-08 22:03:58 +02:00
Lucas Marcouiller
6c5704924e Fix Bookcal module add booking (#25570)
* first push : booking can be done

* add verification of booking aleardy booked

* add page after booking

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-08-08 21:44:23 +02:00
Maxime Kohlhaas
59eb53295a Fix : modules must not give default permissions (#25575) 2023-08-08 21:41:38 +02:00
UT from dolibit
7872a5889f Update card.php (#25579) 2023-08-08 21:31:17 +02:00
Frédéric FRANCE
6be7975563 typo (#25582) 2023-08-08 21:25:58 +02:00
oscim
8acf9732c5 Update bookkeeping.class.php (#25589)
add support $mode for delete row in bookeeping in other methode to delete
2023-08-08 21:17:38 +02:00
Regis Houssin
dd268982b5 FIX missing multicompany filter (#25585) 2023-08-08 21:15:17 +02:00
kkhelifa-opendsi
f49ecdb6ef NEW: Add get_substitutionarray_other() on shipping odt (#25080) 2023-08-08 21:04:02 +02:00
noec764
6d484d83e5 NEW: Add hooks on import, step 5 - 6 (#24915)
* NEW: Add triggers on import success

* FIX: add No trigger parameter

* Fixing style errors.

* FIX: Replace triggers by hooks

* Fixing style errors.

* FIX: Remove commentary

* FIX: Remove Comment

* Update import_csv.modules.php

* FIX: Correct errors handling

* FIX: add reference on $obj to provide $obj->nbinsert and $obj->nbupdate

---------

Co-authored-by: stickler-ci <support@stickler-ci.com>
2023-08-08 20:48:18 +02:00
Vincent Maury
f488e3f358 New 24318 Add Rotate_Image_Button in Preview (#25052) 2023-08-08 20:40:42 +02:00
MaximilienR-easya
543a10d274 added barcode as a filter inside the export (#25180) 2023-08-08 20:39:37 +02:00
Laurent Destailleur
6daf47e0e5 Add flag to isolate sections 2023-08-08 20:22:31 +02:00
Laurent Destailleur
8ed4e6e3fa NEW Add ext payment system ID in the payment page with link to Stripe 2023-08-08 19:54:53 +02:00
Laurent Destailleur
664f507a0c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-08 13:05:16 +02:00
Laurent Destailleur
819daa8e03 Fix phpstan 2023-08-08 12:55:18 +02:00
Laurent Destailleur
6c00cae6e2 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-08 12:00:46 +02:00
Laurent Destailleur
2d347d22b0 Fix default sort order in cron list 2023-08-08 11:34:49 +02:00
VESSILLER
99fd8b9960 NEW no need to create invoice supplier object on supplier card for standalone credit note 2023-08-08 10:11:48 +02:00
Laurent Destailleur
ba21dab4dd Debug IPN to support when payment done by another system 2023-08-08 09:39:23 +02:00
Laurent Destailleur
026fde4b6e Better log in IPN 2023-08-08 09:32:02 +02:00
Benjamin Falière
219562b48a Use getDolGlobalInt 2023-08-08 09:17:09 +02:00
Benjamin Falière
6deb40983c NEW add and list external contributors 2023-08-08 09:17:09 +02:00
Laurent Destailleur
d51da409fe Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-07 20:04:02 +02:00
Laurent Destailleur
fe78c0aeaa Log 2023-08-07 19:59:59 +02:00
Laurent Destailleur
ae98f59bcd NEW Add a protection on purgeFiles 2023-08-07 18:18:07 +02:00
Lamrani Abdel
92fee2c449 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-08-07 14:23:59 +02:00
Laurent Destailleur
400d6255a0 Doc for rector 2023-08-06 14:45:35 +02:00
Laurent Destailleur
9f55ff7026 Debug v18 2023-08-06 14:07:36 +02:00
Laurent Destailleur
c055d58028 Add a parent class for dictionary classes 2023-08-06 14:05:35 +02:00
Laurent Destailleur
b43ca2a0ad Clean code 2023-08-06 13:39:32 +02:00
Laurent Destailleur
38be78e87f Fix warning 2023-08-06 13:19:34 +02:00
Laurent Destailleur
c1b0f187bc Fix warnings 2023-08-06 13:02:33 +02:00
Laurent Destailleur
8b1ed46df6 Fix warning 2023-08-06 12:47:45 +02:00
Laurent Destailleur
921a6f3135 Fix warning 2023-08-06 12:26:27 +02:00
Laurent Destailleur
9e3db267bc Doc 2023-08-06 11:56:31 +02:00
Laurent Destailleur
1aa535e994 Fix regressions 2023-08-06 01:41:53 +02:00
Laurent Destailleur
38a160873d Standardize code 2023-08-06 01:26:06 +02:00
Laurent Destailleur
34f32f6a57 Remove false warning 2023-08-06 01:17:39 +02:00
Laurent Destailleur
f21c168a84 Removed $brouillon property 2023-08-06 01:16:12 +02:00
Laurent Destailleur
e3e73d9096 Work on renaming libelle into label 2023-08-06 01:14:36 +02:00
Laurent Destailleur
466cd7495d Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-06 00:46:58 +02:00
Laurent Destailleur
5f42fea6b2 Fix phpstan 2023-08-06 00:43:15 +02:00
Laurent Destailleur
da1d622f80 Fix warnings 2023-08-06 00:41:59 +02:00
Laurent Destailleur
c0f27e5a57 Fix warning 2023-08-06 00:30:00 +02:00
Laurent Destailleur
0076ec69b8 The property ->brouillon has been removed from all classes. It was not
reliable and was a duplicate of ->status == self::STATUS_DRAFT.
2023-08-06 00:16:25 +02:00
Laurent Destailleur
0baf8d4117 Fix warnings 2023-08-05 22:57:12 +02:00
Laurent Destailleur
8270180700 Fix for phpstan when force https redirect deinfed into conf 2023-08-05 22:00:42 +02:00
Laurent Destailleur
a8493d2f88 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 22:00:04 +02:00
Laurent Destailleur
d012615d6b Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 21:05:52 +02:00
Laurent Destailleur
90028fc97b Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 20:31:05 +02:00
Laurent Destailleur
0a498fb8f8 Fix phpcs 2023-08-05 19:30:14 +02:00
Laurent Destailleur
08fa36d52a Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 15:48:56 +02:00
Laurent Destailleur
b077e10ce6 Clean code 2023-08-05 15:48:31 +02:00
Laurent Destailleur
7ce9bf6b23 Clean code 2023-08-05 15:44:28 +02:00
Laurent Destailleur
91982253a0 Clean code 2023-08-05 14:59:31 +02:00
Laurent Destailleur
0658c91bb6 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 14:21:40 +02:00
Laurent Destailleur
3f8e343b10 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 14:10:42 +02:00
Laurent Destailleur
ea364ff1a3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 13:47:17 +02:00
Laurent Destailleur
bce7b869c2 Test phpstan 2023-08-05 13:46:58 +02:00
Laurent Destailleur
fc94e39d58 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-05 12:40:47 +02:00
Laurent Destailleur
f7593826ba Standardize tab name 2023-08-04 18:43:28 +02:00
Laurent Destailleur
4d737480d5 Fix title 2023-08-04 18:38:45 +02:00
Laurent Destailleur
81b8d1e532 Clean code 2023-08-04 18:33:07 +02:00
Laurent Destailleur
a4c54e5059 Debug v18 2023-08-04 18:24:56 +02:00
FLIO
fb51b4555a edit the select for 0 assigned and 1 everyone 2023-08-04 18:12:02 +02:00
FLIO
7472316779 New|NEW(#25044) new option for choose project visibility 2023-08-04 17:38:59 +02:00
Laurent Destailleur
216ab4c190 Fix phpunit 2023-08-04 17:26:38 +02:00
Charlène Benke
8539fa5cfa Update html.formticket.class.php 2023-08-04 15:44:23 +02:00
Charlène Benke
311d41a6b3 Update card.php 2023-08-04 15:42:25 +02:00
Charlène Benke
37b13d97b5 Update contract.lib.php 2023-08-04 15:01:21 +02:00
Charlène Benke
3281db8743 Update ticket.php 2023-08-04 14:54:57 +02:00
Charlène Benke
55ee3dc0a2 Create ticket.php 2023-08-04 14:52:01 +02:00
Charlène Benke
ffc7624245 Update ticket.class.php for link to contract 2023-08-04 14:50:31 +02:00
Charlène Benke
65d48d10f1 add getTicketsArray function 2023-08-04 14:44:04 +02:00
Laurent Destailleur
bd9bed835a exakat only once per month 2023-08-04 10:55:47 +02:00
Laurent Destailleur
0e7bcef866 Clean code 2023-08-04 10:51:11 +02:00
Charlène Benke
357df19d53 Update ticket.class.php 2023-08-04 10:40:02 +02:00
Charlène Benke
8d370554c3 add contract field on utl 2023-08-04 10:36:46 +02:00
Charlène Benke
14a043a309 add contract field 2023-08-04 10:35:32 +02:00
Laurent Destailleur
c6a1c5cfcd Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-04 04:31:22 +02:00
Laurent Destailleur
630e305161 Standardize db drivers. No more static class. 2023-08-04 04:18:59 +02:00
Laurent Destailleur
36eef9d106 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-04 04:07:47 +02:00
Laurent Destailleur
d877b50bc7 Debug v18 2023-08-04 03:53:32 +02:00
Laurent Destailleur
b1cafe10f0 Fix warnings 2023-08-04 03:52:03 +02:00
Laurent Destailleur
00731380bc Fix phpstan 2023-08-04 03:42:46 +02:00
Laurent Destailleur
2777857f5b Fix phpstan 2023-08-04 03:24:41 +02:00
Laurent Destailleur
23b35492fd Test phpstan 2023-08-04 02:57:10 +02:00
Laurent Destailleur
76338116bf Test phpstan 2023-08-04 02:38:10 +02:00
Laurent Destailleur
39d847b74a Test for exakat 2023-08-04 01:56:56 +02:00
Laurent Destailleur
076e5eac86 perf hack 2023-08-04 01:02:19 +02:00
Laurent Destailleur
e8ac645abd Exclude some files 2023-08-04 00:56:11 +02:00
Laurent Destailleur
192f29b795 Trans 2023-08-04 00:44:40 +02:00
Laurent Destailleur
296aa8cd06 Add also GET action sepa... protected by CSRF 2023-08-04 00:22:46 +02:00
Laurent Destailleur
6062a60625 Code comment 2023-08-04 00:13:29 +02:00
Laurent Destailleur
3d9e1e65de Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-03 23:02:15 +02:00
Laurent Destailleur
6d9e890a17 Fix param mandatory 2023-08-03 23:00:39 +02:00
Laurent Destailleur
f464c97e98 Code comment 2023-08-03 22:39:41 +02:00
Lamrani Abdel
a327f6fb52 fix incohenrent 2023-08-03 16:18:44 +02:00
Lamrani Abdel
7c736dc85b new update when try to delete don 2023-08-03 16:14:00 +02:00
pascal
f9e37412c6 Add filter to restric properties returned 2023-08-03 09:32:43 +02:00
Laurent Destailleur
feb53f1d6a Clean code 2023-08-02 23:19:57 +02:00
FLIO
d4b722959f edit the function selectarray for remove the script for separator and move it where we want to use this 2023-08-02 20:20:08 +02:00
FLIO
458bd56f70 Merge branch 'develop' into feature2#21426 2023-08-02 20:08:26 +02:00
Lamrani Abdel
52a2d3174c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-08-02 19:35:02 +02:00
Maxime Kohlhaas
b5d84cbb55 Fix : uniformize RCUR instead of RECUR (#25536) 2023-08-02 19:32:04 +02:00
Lucas Marcouiller
fe7eed9197 Fix bookcal booking structure (#25559)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-08-02 19:23:33 +02:00
UT from dolibit
9443be693f Update availabilities_extrafields.php (#25555)
* Update availabilities_extrafields.php

* Update availabilities_extrafields.php

delete  button part
2023-08-02 19:22:56 +02:00
UT from dolibit
abfdb0a853 Update booking_extrafields.php (#25556)
delete Buttons part
2023-08-02 19:20:37 +02:00
UT from dolibit
f0dbc21956 Update ChangeLog (#25561)
is line 22 the sames as line 15 ?
2023-08-02 19:17:30 +02:00
UT from dolibit
4d5a06a3f3 Update calendar_extrafields.php (#25557) 2023-08-02 19:17:14 +02:00
UT from dolibit
f44c74d310 Update commonobject.class.php (#25560) 2023-08-02 19:17:05 +02:00
antonin_tdj
a00045b94c Check was after submit (#25551)
Check was added in the wrong place. 
I moved it a few lines before.
2023-08-02 19:16:47 +02:00
Laurent Destailleur
e7c2dcead6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-02 16:19:24 +02:00
Laurent Destailleur
c1d9efee13 Doc 2023-08-02 16:11:53 +02:00
Laurent Destailleur
b6f66058c3 Add custom toolbar for ckeditor inline 2023-08-02 16:04:13 +02:00
Lucas Marcouiller
0688dcfb75 New : add deletedraft massaction to orders_list (#25170)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-08-02 12:18:09 +02:00
Laurent Destailleur
a8ef7cdd12 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-02 12:09:10 +02:00
Lucas Marcouiller
ab6c05f4db New : can overwrite email_from on mail templates (#25086)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-08-02 12:05:44 +02:00
Lamrani Abdel
9837e1ab62 fix css problem 2023-08-02 12:04:30 +02:00
lamrani abdelwadoud
01efddbc23 Merge branch 'develop' into formAddPropertyMB 2023-08-02 11:52:56 +02:00
Laurent Destailleur
3c6d681d22 Test again exakat 2023-08-02 03:05:08 +02:00
Laurent Destailleur
759ba40780 Test for sonarqube 2023-08-02 03:03:26 +02:00
Laurent Destailleur
a127dd2d15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-02 00:41:43 +02:00
Laurent Destailleur
dfe00afd40 Exclude warning 2023-08-02 00:41:21 +02:00
Laurent Destailleur
b76dadd5c5 Clean code 2023-08-02 00:37:02 +02:00
Laurent Destailleur
17d813a8d5 Clean code 2023-08-02 00:34:52 +02:00
Laurent Destailleur
9249ae6176 Doc 2023-08-02 00:27:53 +02:00
onhairech
84243dc5e4 Fix #25416 :the email subject is not replaced when an email template… (#25534)
* Fix #25416 :the email subject is not replaced when an email template is applied in tickets

* Update html.formticket.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-08-02 00:02:53 +02:00
NextGestion
7eb09403c6 Merge branch 'Dolibarr:develop' into dolibarr_fixbugs 2023-08-01 18:54:34 +01:00
Laurent Destailleur
49e63e1d38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-08-01 19:17:09 +02:00
Laurent Destailleur
b52f426518 Remove hardcoded value 2023-08-01 18:52:35 +02:00
Charlène Benke
3cbea573f4 harmonize hook name (#25350)
* harmonize hook name

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-08-01 18:47:54 +02:00
antonin_tdj
8c3c607225 NEW LDAP Active Directory UserAccountControl (#25507)
* fix ldapGroup

* add default userAccountControl to admin

* add const on activation

* update triggers create and enable/disable

---------

Co-authored-by: amarchal <antonin@letempledujeu.fr>
2023-08-01 18:20:51 +02:00
Laurent Destailleur
1808d77ce6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-01 17:52:13 +02:00
Laurent Destailleur
a90de0f66c Debug v18 2023-08-01 17:51:44 +02:00
Laurent Destailleur
c76a244b27 Close #25502 2023-08-01 17:25:28 +02:00
Lucas Marcouiller
679edeab09 NEW #25512 applicative anti bruteforce - security on too many login attempts (#25520)
* Close #25512 New security on too many login attempts

* Update security_other.php

* Update functions_dolibarr.php

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-08-01 17:16:50 +02:00
Laurent Destailleur
6a962cbefa Debug v19 2023-08-01 17:06:22 +02:00
Olivier Lesueur
4a14ba2083 Use SSL connection to MySQL server if server name starts with ssl:// (#25525)
* Use SSL connection to MySQL server if server name starts with ssl://

* Update mysqli.class.php

---------

Co-authored-by: Olivier Lesueur <o.lesueur@crm.fnattp.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-08-01 16:58:32 +02:00
Anthony Berton
467bbdb64c FIX - database last_main_doc for user (#25531)
* FIX - database last_main_doc for user

* Fix column display (#25490)

* Fix php syntax (#25508)

* FIX Fatal Error PHP 8 : division by 0 (#25384)

* FIX Fatal Error PHP 8 : division by 0

* Update objectline_view.tpl.php

---------

Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Fix phpcs

* FIX fatal error on Stripe setup page and security when terminal not used

* FIX Try to fix the date of invoice on TakePOS on eastern timezone

* FIX - database last_main_doc for user

* Update objectline_view.tpl.php

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: John BOTELLA <john.botella@atm-consulting.fr>
Co-authored-by: ptibogxiv <support@ptibogxiv.net>
Co-authored-by: atm-lena <52402938+atm-lena@users.noreply.github.com>
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-08-01 16:51:30 +02:00
Laurent Destailleur
723c731a87 Fix warning 2023-08-01 14:16:07 +02:00
Laurent Destailleur
3d8f14e78d Debug v19 2023-08-01 14:14:54 +02:00
Laurent Destailleur
6ddee88615 FIX Duplicate warning message 2023-08-01 13:55:33 +02:00
Laurent Destailleur
9482ae5215 Debug sort filter 2023-08-01 13:50:58 +02:00
lamrani abdelwadoud
b88c9307d7 New for sorting fields on leave balances #18011 (#25526)
* product_card problem unexpected tocken

* add field employees for sort and select for hide & show fields

* button show & hide

* fix conflit

* fix conflit

* fix conflit
2023-08-01 13:40:08 +02:00
Laurent Destailleur
332f8ad95c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-01 13:15:48 +02:00
Laurent Destailleur
014b4d21ea Update security 2023-08-01 13:04:31 +02:00
Lamrani Abdel
22dc2e7f4c fix conflits 2023-08-01 13:01:40 +02:00
Lamrani Abdel
4a234961dd fix conflits 2023-08-01 12:38:26 +02:00
Lamrani Abdel
027ac42dd3 fix conflits 2023-08-01 12:37:14 +02:00
Lamrani Abdel
6b130d218a fix conflits 2023-08-01 12:36:12 +02:00
Lamrani Abdel
91188882dc fix conflits 2023-08-01 12:34:46 +02:00
Lamrani Abdel
7742b2c5e0 test button & update the select type 2023-08-01 12:30:36 +02:00
Laurent Destailleur
1a039e04a8 Update link to report a vulnerability 2023-08-01 12:13:43 +02:00
Laurent Destailleur
d17a88834e Update security.md 2023-08-01 12:13:03 +02:00
Laurent Destailleur
cef58c11da Uodate security 2023-08-01 11:55:06 +02:00
Laurent Destailleur
280ed8ef83 Update the SECURITY.md file 2023-08-01 11:52:22 +02:00
Lamrani Abdel
a58fe61ea0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-08-01 11:05:27 +02:00
Laurent Destailleur
4c81205014 Fix trans 2023-07-31 21:56:01 +02:00
Laurent Destailleur
5ac5dce4cb Look and feel v19 2023-07-31 21:44:03 +02:00
Laurent Destailleur
05a4b0a3e2 Fix debug v18 2023-07-31 21:43:36 +02:00
Laurent Destailleur
d040f5c8a9 Experiment color type 2023-07-31 20:16:49 +02:00
NextGestion
da75946676 Fix translation 2023-07-31 15:56:29 +01:00
NextGestion
9677539e19 Merge branch 'Dolibarr:develop' into dolibarr_fixbugs 2023-07-31 15:19:45 +01:00
Lamrani Abdel
25d5d6dca4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-07-31 16:08:02 +02:00
Laurent Destailleur
21559be84d Upgrade ckeditor 4.22.1 2023-07-31 15:36:55 +02:00
Laurent Destailleur
fc225cc5dd Fix tool dos2unix 2023-07-31 15:32:56 +02:00
Laurent Destailleur
40ebf86eab Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-31 13:51:32 +02:00
Laurent Destailleur
07a8dc3b5c Debug v19 2023-07-31 04:14:18 +02:00
Laurent Destailleur
840fe26bda Fix trans 2023-07-31 04:11:56 +02:00
Laurent Destailleur
016ab20155 Fix warning 2023-07-31 03:52:05 +02:00
Laurent Destailleur
9302a427a9 Debug v19 2023-07-31 03:29:45 +02:00
Laurent Destailleur
6277cb836f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-31 02:44:26 +02:00
Laurent Destailleur
7d8ce6a7f0 Fix phpcs 2023-07-31 02:43:22 +02:00
Laurent Destailleur
f901827556 Fix condition 2023-07-31 02:41:03 +02:00
Maxime Kohlhaas
bcce9da09d New : add a dashboard showing number of orders to bill #17963 (#18600)
* New : add a dashboard showing number of orders to bill #17963

* Fix orders statuses for dashboard and list

* Fix label in dashboard
2023-07-31 02:36:10 +02:00
iouston
f6a5cc67c8 Add hdden option ACCOUNTANCY_JOURNAL_USE_CURRENT_MONTH (#25499)
Sometimes customers ask to have the current month by default on this form, so this option did it
2023-07-31 02:00:55 +02:00
Florent Poinsaut
cdc8bc1b6f FIX add notification hook to allow external module trigger (#25506) 2023-07-31 01:54:49 +02:00
Florent Poinsaut
e2915d2979 NEW Add picto in product/service list in object lines (#25511) 2023-07-31 01:41:24 +02:00
Frédéric FRANCE
4dc4d492c7 Fix Undefined variable dol_dst (#25514) 2023-07-31 01:37:04 +02:00
Frédéric FRANCE
79f645f9e1 clean code (#25516) 2023-07-31 01:36:33 +02:00
Laurent Destailleur
506da9fea0 Debug script 2023-07-30 19:44:23 +02:00
Laurent Destailleur
7cbc8728a5 FIX warnings 2023-07-30 19:44:04 +02:00
Laurent Destailleur
672f3284c6 Debug 2023-07-30 19:05:21 +02:00
Laurent Destailleur
a8347300b5 Finish tool to regenerate proposal files 2023-07-30 18:56:36 +02:00
Laurent Destailleur
c0d75460ad Fix warning 2023-07-30 18:53:32 +02:00
Laurent Destailleur
980923e4b2 Fix warnings 2023-07-30 18:47:40 +02:00
Laurent Destailleur
6748835cee Fix warning 2023-07-30 18:42:05 +02:00
Laurent Destailleur
f580a9aca4 NEW Add a CLI tool to regenerate all documents 2023-07-30 18:33:03 +02:00
Laurent Destailleur
78212d3b9d Fix warning 2023-07-30 18:32:44 +02:00
Laurent Destailleur
9b31b26b11 Doc 2023-07-30 04:42:46 +02:00
Laurent Destailleur
19f5622c8b Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-30 04:16:13 +02:00
Laurent Destailleur
2f8130d74a NEW Add tab Events/Agenda on recurring invoices 2023-07-29 21:02:52 +02:00
Laurent Destailleur
e12bfb3e3c Can re-enable a default disabled stream with conf.php 2023-07-29 17:31:27 +02:00
Laurent Destailleur
69c7579610 Reenable phar 2023-07-29 16:41:20 +02:00
Lamrani Abdel
1a6c53ef86 add autocomplete for an input 2023-07-28 19:41:25 +02:00
Laurent Destailleur
de81075b95 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-28 14:42:57 +02:00
Florent Poinsaut
c8c3345415 Fix bad parameter in backtopage algo of product (#25510) 2023-07-28 14:42:09 +02:00
Laurent Destailleur
38d6abbc76 Better fail2ban files 2023-07-28 14:19:27 +02:00
Lamrani Abdel
fac590261f fix button and change the page 2023-07-28 01:19:03 +02:00
Laurent Destailleur
124570d31d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-27 18:29:48 +02:00
Frédéric FRANCE
22d059c183 Doc (#25497) 2023-07-27 17:51:41 +02:00
Frédéric FRANCE
3bf1093afa Doc (#25498) 2023-07-27 17:45:40 +02:00
Laurent Destailleur
31082fbea0 Log 2023-07-27 15:51:32 +02:00
Laurent Destailleur
c53c2ebd9d Trans 2023-07-27 15:09:25 +02:00
UT from dolibit
155848585f Update interface_20_all_Logevents.class.php
$langs->load("users");     only once at the start
2023-07-27 13:16:00 +02:00
mschamp
c1cdf49cba Update llx_accounting_abc.sql
Add the dutch chart
2023-07-26 17:39:36 +02:00
Jakub Stříbrný
6ec130d2e6 add $isextrafieldmanaged to expedition.class.php 2023-07-26 14:58:55 +02:00
Jakub Stříbrný
38037089dd add $isextrafieldmanaged to facture.class.php 2023-07-26 14:57:50 +02:00
Jakub Stříbrný
bb1aad54c0 add $isextrafieldmanaged to contact.class.php 2023-07-26 14:56:25 +02:00
Jakub Stříbrný
a73024bec8 add extrafieldmanaged in commande.class.php 2023-07-26 14:54:58 +02:00
Lamrani Abdel
cd4a3cae9a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-07-26 11:54:27 +02:00
Pascal Hubrecht
4f14f52410 FIX unexistant POST variables (#25309)
The $_POST['price_ht_devise'] and $_POST['price_ttc_devise'] don't exist. The correct variables are multicurrency_price_ht and multicurrency_price_ttc
2023-07-26 03:22:33 +02:00
Laurent Destailleur
57adce857c Fix phpcs 2023-07-26 02:47:49 +02:00
Laurent Destailleur
74acbcf72d Fix phpcs 2023-07-26 02:46:43 +02:00
Laurent Destailleur
a3d691e631 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-26 01:58:07 +02:00
Laurent Destailleur
d8fba18a9a Doc 2023-07-26 01:49:05 +02:00
Laurent Destailleur
3ef192903b Trans 2023-07-25 23:51:24 +02:00
Laurent Destailleur
9e3eeb0ac6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-25 23:47:47 +02:00
Laurent Destailleur
761565cabb Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-25 23:47:28 +02:00
UT from dolibit
cc3468abe3 Update box_graph_invoices_permonth.php (#25467) 2023-07-25 23:17:38 +02:00
Alban Durrheimer
c86b608a41 NEW Add more information to holiday mailings (#25461)
* Add more information to holiday mailings

* Fix leave type in mailings
2023-07-25 23:17:09 +02:00
UT from dolibit
37937f2a46 Update modHRM.class.php (#25474)
defgroup brief
2023-07-25 23:15:53 +02:00
UT from dolibit
25c4e51076 Update llx_20_c_departements.sql (#25470) 2023-07-25 23:15:43 +02:00
UT from dolibit
0d0395fce3 Update modApi.class.php (#25478) 2023-07-25 23:14:17 +02:00
UT from dolibit
3d44cb7cb5 Update modFournisseur.class.php (#25476)
defgroup brief
2023-07-25 23:13:50 +02:00
UT from dolibit
73a82b7d8a Update modNotification.class.php (#25477)
defgroup brief
2023-07-25 23:13:42 +02:00
UT from dolibit
09d286c0dd Update llx_10_c_regions.sql (#25469) 2023-07-25 23:12:53 +02:00
UT from dolibit
54c7e0af2e Update modMrp.class.php (#25475)
defgroup brief
2023-07-25 23:11:37 +02:00
UT from dolibit
c96e1de4b0 Update modUser.class.php (#25482)
defgroup brief
2023-07-25 23:11:21 +02:00
UT from dolibit
161684bc24 Update modEmailCollector.class.php (#25481)
defgroup brief
2023-07-25 23:11:09 +02:00
UT from dolibit
3915bbaa14 Update modReception.class.php (#25479)
defgroup brief
2023-07-25 23:10:46 +02:00
UT from dolibit
96b0b3f005 Update modExpedition.class.php (#25484)
defgroup brief
2023-07-25 23:10:32 +02:00
UT from dolibit
2fee75b81a Update modECM.class.php (#25480)
defgroup brief
2023-07-25 23:10:06 +02:00
UT from dolibit
2c8be18715 Update box_clients.php (#25468) 2023-07-25 23:09:52 +02:00
UT from dolibit
6c52d2d68f Update modHoliday.class.php (#25473)
defgroup brief
2023-07-25 23:09:16 +02:00
UT from dolibit
9c864759a2 Update modSyslog.class.php (#25483)
defgroup brief
2023-07-25 23:08:49 +02:00
UT from dolibit
29f8ac9171 Update modComptabilite.class.php (#25485)
defgroup brief
2023-07-25 23:07:57 +02:00
UT from dolibit
d2e15b149b Update modExport.class.php (#25486)
defgroup brief
2023-07-25 23:07:28 +02:00
Lamrani Abdel
5377e72593 make button add property 2023-07-25 20:32:13 +02:00
Lamrani Abdel
9c84fb61c2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-07-25 15:29:16 +02:00
Laurent Destailleur
9c62e76c46 NEW Disable not used PHP streams 2023-07-25 12:30:09 +02:00
Laurent Destailleur
b08d24348c Add 2 more dangerous function to disable 2023-07-25 12:00:50 +02:00
Laurent Destailleur
b1b2736116 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-24 23:21:50 +02:00
Laurent Destailleur
1bb649bc7e Fix phpcs 2023-07-24 22:54:45 +02:00
Laurent Destailleur
202283b034 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-24 20:56:40 +02:00
Laurent Destailleur
eec8868cfb Clean code 2023-07-24 19:52:31 +02:00
dependabot[bot]
f0922c8d8b Bump JetBrains/qodana-action from 2023.1.5 to 2023.2.1 (#25441)
Bumps [JetBrains/qodana-action](https://github.com/jetbrains/qodana-action) from 2023.1.5 to 2023.2.1.
- [Release notes](https://github.com/jetbrains/qodana-action/releases)
- [Commits](https://github.com/jetbrains/qodana-action/compare/v2023.1.5...v2023.2.1)

---
updated-dependencies:
- dependency-name: JetBrains/qodana-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-07-24 19:41:27 +02:00
UT from dolibit
6f8845a214 Update box_commandes.php (#25435) 2023-07-24 19:39:25 +02:00
UT from dolibit
489b632021 Update box_graph_propales_permonth.php (#25437) 2023-07-24 19:39:15 +02:00
UT from dolibit
1a6203b5a3 Update modules_boxes.php (#25436)
* Update modules_boxes.php

* Update modules_boxes.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-07-24 19:39:00 +02:00
UT from dolibit
1cf187da83 Update box_graph_nb_ticket_last_x_days.php (#25438) 2023-07-24 19:38:16 +02:00
UT from dolibit
583a268c35 Update index.php (#25444) 2023-07-24 19:32:11 +02:00
UT from dolibit
0ea0b29e63 Update qodana.yaml (#25440)
sorting alphabetical
2023-07-24 19:23:48 +02:00
sonikf
a836abcf93 FIX fullscreen translation (#25442) 2023-07-24 19:23:18 +02:00
Eric
e9d6a28e66 16.0 urgent fix societe class (#25443)
* Fix : set_as_client can't use prospect/customer value if disabled (#25380)

* fix missing { on societe.class.php

---------

Co-authored-by: Maxime Kohlhaas <maxime@atm-consulting.fr>
2023-07-24 19:22:54 +02:00
UT from dolibit
22becb2ff4 Update box_lastlogin.php (#25445) 2023-07-24 19:22:15 +02:00
UT from dolibit
9bdee115d9 Update os.php (#25447) 2023-07-24 19:21:54 +02:00
UT from dolibit
3ed32f33a9 Update card.php (#25450)
isModEnabled('workstation')
2023-07-24 19:05:00 +02:00
UT from dolibit
f4a5620807 Update wrapper.php (#25449) 2023-07-24 19:04:20 +02:00
Oussama
dcc01599d4 New|NEW(#24834) new option for hide the footer (#25464)
* New|NEW new option for hide the footer of tickets on the public interface

* fix condition in index

---------

Co-authored-by: FLIO <oflifli@nltechno.com>
2023-07-24 19:03:54 +02:00
Laurent Destailleur
09b7c870eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-07-24 19:02:23 +02:00
Laurent Destailleur
6a79459deb Fix phpcs 2023-07-24 19:00:56 +02:00
UT from dolibit
c643f3c712 Update mo_production.php (#25451) 2023-07-24 18:46:47 +02:00
UT from dolibit
e897037a5d Update mo_movements.php (#25456) 2023-07-24 18:46:36 +02:00
UT from dolibit
c7729b22c3 Update mod_ticket_universal.php (#25463)
translations
2023-07-24 18:46:07 +02:00
UT from dolibit
b1befd8bd7 Update mod_project_universal.php (#25462) 2023-07-24 18:45:56 +02:00
UT from dolibit
4e9da73eab Update bom.class.php (#25457) 2023-07-24 18:45:39 +02:00
UT from dolibit
7dfc5f8375 Update mo_card.php (#25455)
if (isModEnabled('workstation')) {
	require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstation.class.php';
}
2023-07-24 18:44:43 +02:00
UT from dolibit
bc23f3c592 Update box_members_last_subscriptions.php (#25433) 2023-07-23 23:52:09 +02:00
UT from dolibit
f75024e5b8 Update box_mos.php (#25431) 2023-07-23 23:51:51 +02:00
UT from dolibit
6d77cb4511 Update box_members_by_tags.php (#25432) 2023-07-23 23:51:41 +02:00
UT from dolibit
3eac209f68 Update box_supplier_orders_awaiting_reception.php (#25434) 2023-07-23 23:51:23 +02:00
UT from dolibit
234a9cb1a6 Update box_graph_nb_tickets_type.php (#25430) 2023-07-23 23:51:11 +02:00
Laurent Destailleur
5f0080779a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-23 23:47:57 +02:00
Laurent Destailleur
ffa2f40a41 Fix for sql int comparison on rowid 2023-07-23 23:47:01 +02:00
Lucas Marcouiller
00fd59bd23 Fix : bookcal database structure adding calendar (#25352)
* Fix : bookcal database structure adding calendar

* fix avalabilities class

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-07-23 23:31:12 +02:00
UT from dolibit
63d9f66657 Update box_graph_invoices_peryear.php (#25429) 2023-07-23 23:27:11 +02:00
kkhelifa-opendsi
08fabc8cc5 NEW: Add hook on selectLotDataList() function (#25368) 2023-07-23 23:26:57 +02:00
UT from dolibit
f2b0ca9d42 Update box_graph_orders_permonth.php (#25428) 2023-07-23 23:24:24 +02:00
UT from dolibit
87c135d8bd Update box_goodcustomers.php (#25427) 2023-07-23 23:24:12 +02:00
jyhere
a80425e3e8 ADD: doActions hook on product composition card (#25371) 2023-07-23 23:08:39 +02:00
UT from dolibit
5f4cd74ff0 Update box_funnel_of_prospection.php (#25426) 2023-07-23 23:07:40 +02:00
UT from dolibit
ed80b052c4 Update box_comptes.php (#25425) 2023-07-23 23:07:18 +02:00
UT from dolibit
5d68e59c92 Update box_birthdays_members.php (#25424) 2023-07-23 23:07:01 +02:00
UT from dolibit
50447f72d2 Update box_project_opportunities.php (#25423) 2023-07-23 23:06:46 +02:00
UT from dolibit
80bfb97369 Update box_project.php (#25422) 2023-07-23 22:50:05 +02:00
Noé Cendrier
76dd29e4ec FIX - V19 is not an SQL instruction ;) (#25377)
* - V19 is not an SQL instruction ;)

* we are now heading to 19.0 versions
2023-07-23 22:46:03 +02:00
UT from dolibit
33a4f3660b Update box_last_modified_ticket.php (#25421) 2023-07-23 22:45:19 +02:00
UT from dolibit
d166db5067 Update box_last_ticket.php (#25420) 2023-07-23 22:45:09 +02:00
Frédéric FRANCE
8df4d00d82 add missing global (#25378) 2023-07-23 22:38:54 +02:00
Lenin Rivas
ebbcfc612c Add constant MAIN_PDF_TITLE_TEXT_COLOR (#25382) 2023-07-23 22:37:34 +02:00
Lucas Marcouiller
260adee01a New : Add code client to export product multiprice (#25386)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-07-23 22:36:16 +02:00
UT from dolibit
24d69cd7fc Update box_boms.php (#25419) 2023-07-23 22:34:44 +02:00
atm-adrien
ebb6c95939 FIX : Make manufacturing_date visible to replace datec (#25381) 2023-07-23 22:32:58 +02:00
UT from dolibit
a5392cba0a Update actions_card_service.class.php (#25418)
/**
 *	Class with controller methods for service canvas
 */
2023-07-23 22:27:01 +02:00
UT from dolibit
3560f957d2 Update accountingjournal.class.php (#25417)
Class to manage accounting journals
2023-07-23 22:26:43 +02:00
mc2contributor
b89399d44f Fix undefined index and property warnings (#25389)
* Fix undefined index and property warnings

* Fix issues in EmailCollector
2023-07-23 22:24:11 +02:00
UT from dolibit
c8b54ebe93 Update public_card.php (#25390) 2023-07-23 22:11:47 +02:00
UT from dolibit
3a12c163b3 Update subscriptionok.php (#25391) 2023-07-23 22:04:30 +02:00
Laurent Destailleur
c15f773e19 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-07-23 21:53:14 +02:00
Laurent Destailleur
b06156536c Fix mb_strlen 2023-07-23 21:50:17 +02:00
jyhere
c38651075e FIX: workflow for closing supplier order dn't work (wrong source type) (#25407)
* FIX: workflow for closing supplier order dn't work (wrong source type)

* FIX: sql error when passing origin and origin id, no need to pass theses values

$object->origin is set to "commandeFournisseur', and it's definitively not working with the setStatus method.
SQL error : Table 'dolibarr.llx_commandeFournisseur' doesn't exist

I suppose origin should never be set to commandeFournisseur, but 'order_supplier' instead. Also, setStatus() $elementType is meant to be a table_element value, not an element value.

* Update interface_20_modWorkflow_WorkflowManager.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-07-23 21:44:20 +02:00
Pascal Hubrecht
90251e8c30 FIX #25400 fatal error when text value starts with equal sign (#25410)
* Fix #25400

* Update export_excel2007.modules.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-07-23 21:35:07 +02:00
sonikf
b7c87b6f70 Disable standard invoice if "create credit note" button is pressed (#25414) 2023-07-23 21:31:20 +02:00
Frédéric FRANCE
ac25be7c26 fix parenthesis (#25401) 2023-07-23 20:03:23 +02:00
mc2contributor
9119288795 Add missing argument (#25403) 2023-07-23 20:00:58 +02:00
mc2contributor
1f6100d897 Fix undefined array key warnings on $this->datacolor[$i] (#25404) 2023-07-23 19:58:42 +02:00
Florent Poinsaut
ea8cc555d5 Fix duplicated deletion of linked object in supplier invoice (#25415) 2023-07-23 19:38:57 +02:00
Laurent Destailleur
3bcf6ee655 CSS 2023-07-23 00:39:22 +02:00
Laurent Destailleur
838c5683fb Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2023-07-23 00:33:20 +02:00
Laurent Destailleur
47f10f2553 Better placeholder 2023-07-23 00:32:35 +02:00
Laurent Destailleur
d8815660c7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-22 16:28:32 +02:00
Laurent Destailleur
07fbb2da9d Doc 2023-07-21 19:40:40 +02:00
Lamrani Abdel
a6ed391b60 fix problem 2023-07-21 16:19:04 +02:00
Lamrani Abdel
230545943f fix incoherent 2023-07-21 16:02:22 +02:00
Laurent Destailleur
09c6c06ecd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-07-21 14:48:50 +02:00
Laurent Destailleur
e4ce4d5576 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-21 14:46:07 +02:00
Laurent Destailleur
72494fc48e NEW Add a goto url from smartphone search page 2023-07-20 21:24:35 +02:00
Laurent Destailleur
a587b732e4 Add migration v19 2023-07-20 20:37:11 +02:00
Laurent Destailleur
5b8c58773a Merge branch '18.0' of github.com:Dolibarr/dolibarr into develop 2023-07-20 12:10:22 +02:00
Laurent Destailleur
57eaa541ac Merge branch '18.0' of github.com:Dolibarr/dolibarr into develop 2023-07-20 11:33:02 +02:00
Laurent Destailleur
862c81494c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-20 01:10:19 +02:00
Lamrani Abdel
00bec4e971 fix 2023-07-19 16:27:33 +02:00
Lamrani Abdel
a25c9f58e8 product_card problem unexpected tocken 2023-07-19 16:24:59 +02:00
Lamrani Abdel
a5d2c5c625 other fixes 2023-07-19 13:12:39 +02:00
Lamrani Abdel
f0977b2467 add auto fill in for url when add menu 2023-07-19 12:43:11 +02:00
Lamrani Abdel
94f5896d43 fix incoherences in update menu in relation to select permission 2023-07-19 11:57:13 +02:00
Laurent Destailleur
e9273d6183 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/takepos/receipt.php
2023-07-19 04:19:15 +02:00
Lamrani Abdel
4bd9a62a44 add select perms for each object when add menu 2023-07-18 12:24:16 +02:00
Lamrani Abdel
e6527a79e5 fix some incoherence in ModuleBuilder menus 2023-07-17 18:31:00 +02:00
mc2contributor
21b02d5698 Add 'name' property for fetching user's name (#25359) 2023-07-16 13:54:08 +01:00
mc2contributor
3ba8505e70 Add missing Canadian territories (#25364) 2023-07-16 13:46:07 +01:00
ptibogxiv
aaf4f57ae9 Fix php 8 list.php (#25363) 2023-07-16 13:40:00 +01:00
Jakub Stříbrný
e76641c491 Add emptyObjectVars() to CommonObject (#25357)
To be able ti unset all vars when looping and fetching in each loop.
2023-07-13 17:18:10 +02:00
Charlène Benke
76d1430dfa extrafields fails on update (#25356) 2023-07-13 17:14:43 +02:00
Lucas Marcouiller
f202bc62f3 Fix : modulebuilder security check (#25354)
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-07-13 17:13:43 +02:00
Jakub Stříbrný
0cff3efddd Merge branch 'Dolibarr:develop' into extrafields-support-selectForForms 2023-07-13 16:38:25 +02:00
Lucas Marcouiller
91020eacfa Fix : bookcal database structure (#25326)
* Fix : bookcal database structure

* fix status

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
2023-07-12 16:13:32 +02:00
HENRY Florian
a366e567e8 fix: cornas PDF have to use the same way of display column as cyan (#25329)
* fix: use std method to display column titles

* reveiw with cyan
2023-07-12 14:22:27 +02:00
Laurent Destailleur
c8ba68cda8 fix: dev/examples/zapier/package.json to reduce vulnerabilities (#25316)
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-SEMVER-3247795

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
2023-07-12 13:24:55 +02:00
UT from dolibit
4ca8d2ef78 Update admin.lang (#25322) 2023-07-12 13:24:31 +02:00
UT from dolibit
eb53dd2d87 Update ChangeLog (#25323)
minor adjustments / assortments
+
two duplicate entries deleted:
- Ticket - notification email
- PDF - more recend model as default
2023-07-12 13:24:21 +02:00
Charlène Benke
95c15b12a2 php V8 error on ticket module (#25327)
* php V8 warning

append on create contract

* php V8 warning

* Update card.php
2023-07-12 13:15:04 +02:00
Yoan Mollard
6a9c9c684f Show nb docs in list of suppliers invoices (#25338)
* FIX Selection of customer on second or more parallel sell in TakePOS

* FIX Bad management of localtax on TakePOS due to typo error in var name

* FIX Missing localtaxes on receipt in TakePOS

* Show nb docs in list of suppliers invoices

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-07-12 12:55:53 +02:00
mc2contributor
bbbf425697 Fix undefined property (#25337) 2023-07-12 12:28:20 +02:00
jyhere
3681486fe8 FIX: misleading phpdoc (#25342) 2023-07-12 12:27:12 +02:00
Jakub Stříbrný
7442a85514 check if object has extrafields 2023-07-11 06:40:33 +02:00
Laurent Destailleur
231658cf68 Fix regression 2023-07-10 20:01:46 +02:00
Laurent Destailleur
83eb8fed61 Doc 2023-07-10 04:03:57 +02:00
Laurent Destailleur
9c54c7e52f Trans 2023-07-10 03:55:00 +02:00
Laurent Destailleur
cc39dc5074 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-10 03:35:11 +02:00
Laurent Destailleur
395cee32d9 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-10 03:21:24 +02:00
Laurent Destailleur
456e6441b9 Debug v18 2023-07-10 03:16:21 +02:00
Laurent Destailleur
aade58c437 Debuv 18 2023-07-10 02:41:11 +02:00
Laurent Destailleur
700dd5d3f0 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-10 02:31:48 +02:00
Laurent Destailleur
d88736dd74 Debug v18 2023-07-10 01:09:02 +02:00
Laurent Destailleur
f1a10e5b40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-09 15:11:33 +02:00
Bahfir Abbes
3c3f5896d2 Fix:warehouses table name is entrepot which does not hold an fk_soc field, so _checkAccessToResource returns always false and must be disabled before fix. (#25135)
* Fix:warehouses table name is entrepot which does not hold an fk_soc field, so _checkAccessToResource returns always false and must be disabled before fix.

* Fix:warehouses table name is entrepot which does not hold an fk_soc field, so _checkAccessToResource returns always false and must be disabled before fix.

* Fix check params

It is sufficient to fix check parameters to get  it working

* Update api_warehouses.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-07-09 15:11:16 +02:00
Laurent Destailleur
e80c37daa0 Merge pull request #25243 from gdsoftdev/17.0_stock_export_barcode
NEW add product barcode on stock exports
2023-07-09 15:09:10 +02:00
Laurent Destailleur
74f10e5861 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-09 15:08:15 +02:00
Laurent Destailleur
2f8d99e2a5 Merge pull request #25247 from defrance/patch-266
NEW add contract link on ticket
2023-07-09 15:07:43 +02:00
Laurent Destailleur
7ff460152e FIX #24085 #25270 2023-07-09 15:07:01 +02:00
Laurent Destailleur
45c8de9407 Merge pull request #25270 from FliyFly/fix#24085
NEW #24085 Add the Project filter
2023-07-09 15:01:51 +02:00
Laurent Destailleur
30b79277cb Merge pull request #25172 from ATM-NicolasV/add_hook_bank
NEW|New [Add hook in user bank page]
2023-07-09 15:01:12 +02:00
Laurent Destailleur
0a939e579c Merge pull request #25186 from Hystepik/develop#3
New : mass modification of status for coferenceorbooth
2023-07-09 14:59:28 +02:00
Laurent Destailleur
7a8f845baa Merge pull request #25203 from frederic34/fix/getSelectConditionsPaiements
NEW do not add default value in list
2023-07-09 14:46:12 +02:00
Laurent Destailleur
b74fe4f99b Test CI 2023-07-09 14:20:28 +02:00
Laurent Destailleur
043bda80a0 Test CI 2023-07-09 14:04:57 +02:00
Laurent Destailleur
2c835002bd Test CI 2023-07-09 13:48:34 +02:00
Laurent Destailleur
abab31aa85 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-07-09 13:48:20 +02:00
Laurent Destailleur
34908a72c7 Test CI 2023-07-09 13:48:05 +02:00
Laurent Destailleur
671a534a1c Merge pull request #25305 from vmaury/fix-25302
Fix #25302 Sum of tasks time spent on project referrers page
2023-07-09 13:38:21 +02:00
Laurent Destailleur
a448b8166a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-09 13:29:29 +02:00
Laurent Destailleur
44588d2689 Merge pull request #25308 from mc2rcanarslan/develop
FIX: project status bug when PROJECT_CREATE_NO_DRAFT is set
2023-07-09 13:29:08 +02:00
Laurent Destailleur
3998413445 Doc 2023-07-09 13:12:17 +02:00
Laurent Destailleur
4b708e9f3f Fix warning 2023-07-09 12:43:32 +02:00
Jakub Stříbrný
bcd5666e01 Support extrafields in selectForForms 2023-07-09 12:16:05 +02:00
mc2rcanarslan
f6206770bd fix: project status bug when PROJECT_CREATE_NO_DRAFT is set 2023-07-07 15:24:12 +00:00
vmaury
d47f004759 Fix #25302 Sum of tasks time spent on project referrers page (projet/element.php) 2023-07-07 16:16:55 +02:00
Laurent Destailleur
f18fae5271 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-07-06 22:24:35 +02:00
Laurent Destailleur
eb22ebced9 Fix int 2023-07-06 19:57:09 +02:00
Laurent Destailleur
8990b47390 Fix css 2023-07-06 19:35:57 +02:00
Laurent Destailleur
ecff51e5d6 Merge pull request #25232 from Hystepik/develop#4
Fix : some dolibarr log warnings
2023-07-06 01:23:10 +02:00
Laurent Destailleur
51cc1a227a Merge pull request #25262 from defrance/patch-268
php v8 warning, tva_npr var not initialised
2023-07-06 00:02:44 +02:00
Laurent Destailleur
0e878a875b Merge pull request #25279 from OPEN-DSI/develop_new_add_context_movement_stock_on_consume_produce_in_mrp
NEW: Add context for the movement stock (role toconsume/toproduce) on mrp
2023-07-06 00:01:51 +02:00
Laurent Destailleur
4c37cefac4 Merge pull request #25285 from mc2contributor/fixUnknownColumn
fix: Unknown column 'fk_projet' in 'field list' when trying to link...
2023-07-06 00:00:22 +02:00
Laurent Destailleur
533360ff27 Test CI 2023-07-05 23:57:43 +02:00
Can Arslan
7d0cdd67e9 fix: Unknown column 'fk_projet' in 'field list' when trying to link... 2023-07-05 13:27:11 -06:00
Laurent Destailleur
92219bb43e Try to replace stickler 2023-07-05 20:03:02 +02:00
Kamel Khelifa
2c39cc4de3 NEW: Add context for the movement stock (role toconsume/toproduce) on mrp 2023-07-05 17:43:32 +02:00
Hystepik
7aad3649ca better fix for date 2023-07-05 13:33:22 +02:00
FLIO
11509c2e94 fix the condition if you put nothing in the selectbox 2023-07-05 13:16:12 +02:00
Laurent Destailleur
a2671fdbb2 Prepare v19 2023-07-05 12:15:44 +02:00
Laurent Destailleur
9427b4e051 Typo 2023-07-05 11:03:18 +02:00
FLIO
b8232551da remove comments 2023-07-04 23:22:28 +02:00
FLIO
afa4cc7bce FIX|Fix (#24085) Add the Project filter 2023-07-04 23:19:04 +02:00
Charlène Benke
f72df4510c Update card.php
php v8 warning, tva_npr var not initialised
2023-07-04 12:14:44 +02:00
Hystepik
08ff6583dc better fix 2023-07-04 11:36:06 +02:00
Frédéric France
e65f4c0ec6 fix 2023-07-03 21:17:53 +02:00
Frédéric France
107cdc8810 fix 2023-07-03 21:09:34 +02:00
Frédéric France
5584609662 fix 2023-07-03 21:08:29 +02:00
Charlène Benke
f56bc55b49 Update 18.0.0-19.0.0.sql 2023-07-02 14:00:50 +02:00
Charlène Benke
ff7a2ca40c Update 18.0.0-19.0.0.sql
add fk_contract on ticket table
2023-06-30 12:26:44 +02:00
Charlène Benke
9b596c6e19 Create 18.0.0-19.0.0.sql 2023-06-30 12:24:30 +02:00
Charlène Benke
48541caee5 add contact field 2023-06-30 12:22:27 +02:00
Jé GDSOFT
a09adc9633 stock : exports : ajout code barre du produit 2023-06-30 11:08:30 +02:00
Hystepik
3fa04fb7a8 Fix : some dolibarr log warnings 2023-06-29 15:09:27 +02:00
Frédéric France
9de8c4b9e3 Merge remote-tracking branch 'upstream/develop' into fix/getSelectConditionsPaiements 2023-06-27 20:29:37 +02:00
Frédéric FRANCE
276a6ae6a4 do not add default value in list 2023-06-26 13:58:44 +02:00
Frédéric FRANCE
37e39f5305 do not add default value in list 2023-06-26 13:48:16 +02:00
Adrien Raze
72b0b8c708 Merge branch 'NEW_include_sub_warehouse_in_inventory' of github.com:atm-adrien/dolibarr into NEW_include_sub_warehouse_in_inventory 2023-06-26 11:00:52 +02:00
Adrien Raze
0d759e8090 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_include_sub_warehouse_in_inventory 2023-06-26 10:46:13 +02:00
Hystepik
1395a9ff8f New : mass modification of status for coferenceorbooth 2023-06-23 16:32:01 +02:00
x
db213f6870 Merge remote-tracking branch 'origin' into add_hook_bank 2023-06-22 14:25:50 +02:00
FLIO
4c032f8814 NEW Add possibility to choose separator #21426 2023-06-13 02:13:09 +02:00
Florian HENRY
3c4548120b Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_sign_soeciete_rib 2023-06-08 23:34:01 +02:00
Alexandre SPANGARO
3b58dabb2a Fix travis 2023-06-06 10:02:19 +02:00
Alexandre SPANGARO
092ef32501 NEW VAT rate - Add entity 2023-06-06 04:56:57 +02:00
Florian HENRY
72e3d37692 review 2023-06-05 13:59:12 +02:00
Florian HENRY
a77f8a43e3 review 2023-06-05 13:56:57 +02:00
Florian HENRY
affb039ff0 feat: agenda per user use quarter hour split instead of half hour split 2023-05-30 09:37:49 +02:00
stickler-ci
bc9b02e888 Fixing style errors. 2023-05-29 08:33:50 +00:00
ATM-NicolasV
4920bfc540 remove custom dir in .gitignore and add to custom .gitignore 2023-05-29 09:45:31 +02:00
ATM-NicolasV
bd27a9ded2 remove custom dir in .gitignore and add to custom .gitignore 2023-05-29 09:44:58 +02:00
ATM-NicolasV
f97ebce52a remove custom dir in .gitignore and add to custom .gitignore 2023-05-29 09:43:49 +02:00
ATM-NicolasV
cf1b584a49 Merge branch 'develop' of github.com:ATM-NicolasV/dolibarr into develop 2023-05-29 09:41:11 +02:00
stickler-ci
407859eae4 Fixing style errors. 2023-05-29 08:22:15 +00:00
ATM-NicolasV
db3332aace remove custom dir in .gitignore 2023-05-29 09:39:14 +02:00
ATM-NicolasV
ac6623a5ce remove custom dir in .gitignore 2023-05-29 09:33:39 +02:00
HENRY Florian
58a65cff15 Merge branch 'develop' into dev_sign_soeciete_rib 2023-05-27 12:00:56 +02:00
stickler-ci
99e7abced3 Fixing style errors. 2023-05-25 16:01:00 +00:00
NextGestion
5a47f1f009 Revert products to stock : No or Yes 2023-05-25 16:52:15 +01:00
Jyhere
d7673084cf ADD: custom compute for exports 2023-05-25 16:53:26 +02:00
NextGestion
2faded0f21 Revert user card.php 2023-05-25 14:59:04 +01:00
NextGestion
d2e2c51970 Revert user card.php 2023-05-25 12:54:27 +01:00
stickler-ci
a66d0e2683 Fixing style errors. 2023-05-25 11:22:03 +00:00
NextGestion
30cc76b074 Stock modification when deleting an invoice supplier : add a question during action to ask if stock must be reverted or not 2023-05-25 12:15:50 +01:00
NextGestion
c9ca3e09e6 Merge branch 'Dolibarr:develop' into dolibarr_fixbugs 2023-05-25 11:28:27 +01:00
stickler-ci
e802f88742 Fixing style errors. 2023-05-25 08:41:19 +00:00
codesieg
27f1f8c70e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2023-05-25 10:32:59 +02:00
codesieg
190a5e8b28 add hook in user bank page 2023-05-25 10:31:34 +02:00
Christophe Battarel
7b3dbd6095 add short translation 2023-05-25 09:11:08 +02:00
Christophe Battarel
5ae38d9079 add short translation 2023-05-25 09:09:10 +02:00
Christophe Battarel
36a3f5173c add short translation 2023-05-25 09:07:52 +02:00
Maximilien Rozniecki
508aea8089 Fix travis 2023-05-24 17:14:58 +02:00
Maximilien Rozniecki
381ddbe799 Fix travis 2023-05-24 17:04:55 +02:00
Maximilien Rozniecki
d2d116b6df Fix travis 2023-05-24 16:45:35 +02:00
stickler-ci
f99fc41698 Fixing style errors. 2023-05-24 13:57:33 +00:00
Maximilien Rozniecki
3c95faf5c6 New access to msg linked files via public interface 2023-05-24 10:13:59 +02:00
Florian HENRY
a1306f381f feat: RIB Online Sign 2023-05-21 17:52:15 +02:00
Christophe Battarel
17aa80ed81 french translation 2023-05-17 16:32:43 +02:00
Christophe Battarel
5a4a7c5062 differenciate invoice discount and line discount 2023-05-17 16:13:14 +02:00
NextGestion
c9427cef8b Processing a return from @eldy "The fetch is using $id so the test should be on $id" 2023-05-15 10:25:20 +01:00
NextGestion
12471dcb06 Processing a return from @eldy "So we should not have setEventMessage inside such method" 2023-05-15 09:48:45 +01:00
NextGestion
2666905896 Merge branch 'Dolibarr:develop' into dolibarr_fixbugs 2023-05-15 09:31:52 +01:00
stickler-ci
92adfd2826 Fixing style errors. 2023-05-13 12:37:05 +00:00
NextGestion
ccc03f6c76 Handle stock movement in supplier invoice when the option "Stock can be negative" activated 2023-05-13 13:35:30 +01:00
NextGestion
bf241481e5 Merge branch 'dolibarr_fixbugs' of https://github.com/NextGestion/dolibarr into dolibarr_fixbugs 2023-05-13 10:54:59 +01:00
NextGestion
46eb222407 Fix| Header title in user card 2023-05-13 10:54:41 +01:00
stickler-ci
68b75d7b27 Fixing style errors. 2023-05-13 08:56:17 +00:00
NextGestion
b184e34611 Fix| Products not removed from stock when deleting the supplier invoice 2023-05-13 09:53:45 +01:00
Florian HENRY
01cce0becb feat: RIB Online Sign 2023-05-05 12:49:30 +02:00
Florian HENRY
1dfb815f94 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_sign_soeciete_rib 2023-05-05 11:50:40 +02:00
Florian HENRY
ce2b2f345f feat: RIB Online Sign 2023-05-05 11:48:24 +02:00
Florian HENRY
93255a0250 feat: RIB Online Sign 2023-05-03 23:59:45 +02:00
Florian HENRY
a071e873ff feat: RIB Online Sign 2023-05-03 22:11:49 +02:00
Florian HENRY
c4f191c461 chores: comments 2023-05-03 21:42:53 +02:00
Florian HENRY
a2b609272d chores: comments 2023-05-03 21:38:47 +02:00
Florian HENRY
bfe857c31b chores: comments 2023-05-03 21:38:08 +02:00
Florian HENRY
e8c61828ef chores: comments 2023-05-03 21:36:24 +02:00
Florian HENRY
8d67bddbd6 chores: comments 2023-05-03 21:15:20 +02:00
Florian HENRY
e7e7b7db0e chores: comments 2023-05-03 21:14:53 +02:00
Florian HENRY
a4bd368f1d chores: miriad of getDolGlobal and hesRight uses along side this feature 2023-05-03 21:13:39 +02:00
Florian HENRY
31b6076f1c feat: RIB Online Sign 2023-05-03 13:54:25 +02:00
Florian HENRY
ab98d25ed8 feat: RIB Online Sign 2023-05-02 22:41:48 +02:00
Florian HENRY
92cc654778 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_sign_soeciete_rib 2023-05-02 22:35:24 +02:00
Florian HENRY
ea231c6bf4 feat: companybankaccount fields definition 2023-05-02 22:35:05 +02:00
Florian HENRY
dda88295dc feat: companybankaccount fields definition 2023-05-02 22:33:47 +02:00
Florian HENRY
3cdb997898 feat: RIB Online Sign 2023-05-02 15:53:45 +02:00
Florian HENRY
60b4f3ea9f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_sign_soeciete_rib 2023-05-02 09:22:31 +02:00
Florian HENRY
3c99043678 feat: RIB Online Sign 2023-04-28 12:31:08 +02:00
Florian HENRY
7a4f64ad87 feat: RIB Online Sign 2023-04-28 11:32:41 +02:00
Florian HENRY
2b88a728e5 feat: RIB Online Sign 2023-04-28 10:49:51 +02:00
Gauthier PC portable 024
c9cee2c808 Merge branch '16.0' of github.com:Dolibarr/dolibarr into 16.0_cdcconseil 2023-04-27 09:19:27 +02:00
Florian HENRY
683c4c2a70 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_change_notetaskivoice 2023-04-24 10:59:35 +02:00
atm-lena
1663895143 Merge branch '16.0' of https://github.com/Dolibarr/dolibarr into 16.0_cdcconseil 2023-04-06 10:49:06 +02:00
Florian HENRY
aeb0f9b92e merge from develop 2023-04-02 12:51:06 +02:00
Florian HENRY
47c86eff53 merge from develop 2023-04-02 12:37:06 +02:00
Laurent Destailleur
a3eb26f179 Merge branch 'develop' into NEW_include_sub_warehouse_in_inventory 2023-04-01 12:13:11 +02:00
Florian HENRY
d46ff73804 On going 2023-03-03 09:34:24 +01:00
Florian HENRY
5399e8b60e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_change_notetaskivoice 2023-03-03 08:52:44 +01:00
Florian HENRY
18fae5e10a test 2023-02-28 09:18:29 +01:00
Florian HENRY
c54ab940ac fix dol_concatdesc 2023-02-14 08:36:35 +01:00
Florian HENRY
3ab6494a75 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_change_notetaskivoice 2023-02-12 15:06:15 +01:00
Florian HENRY
571caa7a6c NEW: Invoice time from task, make task note better display in invoice line 2023-02-10 11:11:52 +01:00
Eric Seigne
498e8b6b83 better comments 2023-01-28 14:50:56 +01:00
Eric Seigne
750cb036ff field nb 7 2023-01-28 14:48:31 +01:00
Eric Seigne
aedd23034c Merge remote-tracking branch 'rycks/13.0_fix_sellist_add_order_by_option' into 13.0_fix_sellist_add_order_by_option 2023-01-28 14:46:09 +01:00
Eric Seigne
7d4b459639 change to 7 to be close to extrafields + reverse doc 2023-01-28 14:43:00 +01:00
Eric Seigne
bd96609e2e Merge branch '13.0' of https://github.com/Dolibarr/dolibarr into 13.0_fix_sellist_add_order_by_option 2023-01-26 22:49:02 +01:00
Warner Bryce
78b383efa4 Corrections added by Eldy 2023-01-04 09:01:27 +01:00
stickler-ci
25bfd4d855 Fixing style errors. 2023-01-03 09:08:32 +00:00
Warner Bryce
0671ec697f Add a substitution Category Of Operations into ODT generation for Invoices 2023-01-03 10:06:58 +01:00
stickler-ci
11da2351df Fixing style errors. 2023-01-03 08:32:22 +00:00
Warner Bryce
a4a66e60f8 Add a substitution Category Of Operations into ODT generation for Invoices 2023-01-03 09:26:10 +01:00
VESSILLER
1eb3c69acd NEW inventory without virtual products (kits) 2022-12-09 15:44:36 +01:00
root
12a3d7432e Feature Request : #23062 2022-12-01 13:32:52 +05:30
root
871789c499 Feature Request : #23062 2022-12-01 13:20:34 +05:30
Hasanuzzaman Sattar
669eaa2828 Merge branch 'Dolibarr:16.0' into 16.0 2022-12-01 11:29:29 +05:30
Hasanuzzaman Sattar
e6361dfba9 Merge branch 'Dolibarr:16.0' into 16.0 2022-11-26 14:31:00 +05:30
root
cd2fc2347d #23011 2022-11-26 14:29:00 +05:30
stickler-ci
dec546eec0 Fixing style errors. 2022-11-25 11:05:58 +00:00
root
81b4f6dce1 #22947 2022-11-25 16:34:55 +05:30
Hasanuzzaman Sattar
a43de62987 Merge branch 'Dolibarr:16.0' into 16.0 2022-11-25 16:09:01 +05:30
root
64014396c8 Merge branch '16.0' of github.com:alsoft10/dolibarr into 16.0 2022-11-24 14:14:19 +05:30
root
4504c53007 #22941 2022-11-24 14:14:03 +05:30
MB Informatique
52365b2d87 Merge branch 'Dolibarr:develop' into develop 2022-11-07 14:07:03 +01:00
MB Informatique
682e090e87 Merge branch 'Dolibarr:develop' into develop 2022-10-19 14:25:38 +02:00
mbinformatique68
16609c8d39 NEW Add the formEditObjectLine hook on invoice card 2022-10-19 14:25:18 +02:00
mbinformatique68
d30b1b4860 NEW Add the formEditObjectLine hook on commande card 2022-10-18 16:33:30 +02:00
Laurent Destailleur
ea1a01b33f Update commonobject.class.php 2022-10-17 23:35:34 +02:00
Eric Seigne
c3cfb306fd fix #22571 : order by could be set 2022-10-14 00:56:10 +02:00
UT from dolibit
a2f4db6a8a Update card.php
Line 792:  $prodcustprice->fetch_all   =>  $prodcustprice->fetchAll
2022-09-07 20:45:08 +02:00
stickler-ci
761d82b6f0 Fixing style errors. 2022-05-21 17:00:45 +00:00
Norbert Penel
16bdd0dc49 FIX #20930 2022-05-21 18:54:38 +02:00
kamel
e1eb85ffb0 relaunch travis 2022-05-13 11:53:23 +02:00
kamel
23fe8bef37 Correction Stickler CI 2022-05-13 10:53:00 +02:00
kamel
32f3a2aff6 NEW - Add all id prof checker on thirdparty for code compta customer and supplier 2022-05-13 10:45:18 +02:00
Adrien Raze
df9c70d41e Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_include_sub_warehouse_in_inventory 2022-05-09 11:15:46 +02:00
Adrien Raze
a3be6a0c2c FIX : When conf is active, option "include subwarehouse" must be checked by default 2022-04-28 12:11:59 +02:00
stickler-ci
8f670ce96d Fixing style errors. 2022-04-22 08:25:49 +00:00
Adrien Raze
3bfde968a3 Merge branch 'NEW_include_sub_warehouse_in_inventory' of github.com:atm-adrien/dolibarr into NEW_include_sub_warehouse_in_inventory 2022-04-22 10:20:03 +02:00
Adrien Raze
9323b366ad FIX : Retours PR 2022-04-22 10:18:07 +02:00
BENKE Charlene
ac81bacb4f ADD : add parent product column on list
if show_child products is enabled, add a column who contains the parent product
2022-04-20 13:57:09 +02:00
stickler-ci
2150c93f61 Fixing style errors. 2022-04-07 15:49:53 +00:00
Adrien Raze
468f4d18cb FIX : PR returns 2022-04-07 17:43:40 +02:00
Adrien Raze
43428f622f FIX : Add sub warehouse management on inventory.php file 2022-03-31 15:28:03 +02:00
Adrien Raze
2cd707e573 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_include_sub_warehouse_in_inventory 2022-03-31 14:24:35 +02:00
Adrien Raze
8ee566c943 Merge branch 'NEW_include_sub_warehouse_in_inventory' of github.com:atm-adrien/dolibarr into NEW_include_sub_warehouse_in_inventory 2022-03-07 10:57:06 +01:00
Adrien Raze
beac2ff628 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_include_sub_warehouse_in_inventory 2022-03-07 10:22:01 +01:00
stickler-ci
23cd8bde29 Fixing style errors. 2022-02-24 15:54:37 +00:00
Adrien Raze
168b1c7578 NEW : remove include_subwarehouse form llx_inventory database table 2022-02-24 16:51:14 +01:00
Adrien Raze
f9c5da4ae2 NEW : Added of a popup on validation instead of a database fielld to know if the user wants to include subwarehouse 2022-02-24 16:49:13 +01:00
stickler-ci
abc450e44c Fixing style errors. 2022-02-24 10:30:48 +00:00
Adrien Raze
50028dadef FIX : Travis returns 2022-02-24 11:27:14 +01:00
Adrien Raze
02917f28df FIX : PR Returns 2022-02-24 10:41:46 +01:00
Adrien Raze
d9ec956c3b Merge branch 'NEW_include_sub_warehouse_in_inventory' of github.com:atm-adrien/dolibarr into NEW_include_sub_warehouse_in_inventory 2022-02-22 15:57:50 +01:00
Adrien Raze
6807c53a0f FIX : Travis errors 2022-02-22 15:56:55 +01:00
Adrien Raze
62bf1e4273 FIX : Stickler errors 2022-02-22 15:54:45 +01:00
stickler-ci
e74e0ffada Fixing style errors. 2022-02-22 14:38:25 +00:00
Adrien Raze
ab8cd6aa06 FIX : Global conf 2022-02-22 14:50:25 +01:00
Adrien Raze
670dc2f95b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_include_sub_warehouse_in_inventory 2022-02-22 14:48:27 +01:00
Adrien Raze
c60047b3c8 NEW : Add recurring behaviour 2022-02-21 17:18:05 +01:00
Adrien Raze
16f6aaf1c8 NEW : Add new field into $fields array + Creation of the function getChildWarehouse() 2022-02-17 17:24:04 +01:00
Adrien Raze
7e7638792e NEW : Added of the field "include_sub_warehouse" in the table "llx_inventory" 2022-02-17 16:20:35 +01:00
5572 changed files with 269191 additions and 219836 deletions

View File

@@ -7,18 +7,18 @@ Bug reports and feature requests
<a name="not-a-support-forum"></a>*Note*: **GitHub Issues is not a support forum.** If you have questions about Dolibarr / need help using the software, please use [the forums](https://www.dolibarr.org/forum.php). Forums exist in different languages.
Issues are managed on [GitHub](https://github.com/Dolibarr/dolibarr/issues).
Default **language here is english**. So please prepare your contributions in english.
Default **language here is English**. So please prepare your contributions in English.
1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem.
2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request.
3. Tell us the version you are using! (look at /htdocs/admin/system/dolibarr.php? and check if you are using the latest version)
4. Write a report with as much detail as possible (Use [screenshots](https://help.github.com/articles/issue-attachments) or even screencasts and provide logging and debugging informations whenever possible).
4. Write a report with as much detail as possible (Use [screenshots](https://help.github.com/articles/issue-attachments) or even screencasts and provide logging and debugging information whenever possible).
5. Delete unnecessary submissions.
6. **Check your Message at Preview before sending.**
<a name="code"></a>Code
<a name="code"></a>Submit code
---------------------
### Basic workflow
@@ -35,20 +35,22 @@ Default **language here is english**. So please prepare your contributions in en
Unless you're fixing a bug, all pull requests should be made against the *develop* branch.
If you're fixing a bug, it is preferred that you cook your fix and pull request it
against the oldest version affected that's still supported.
If you're fixing a bug, it is preferred that you cook your fix and pull request it against an oldest version affected.
We officially support versions N, N 1 and N 2 for N the latest version available.
We recommend to push it into N - 2 for N the latest version available, if not possible into version N - 1, and finally into develop.
This is just a recommendation, currently, if you push a bug fix on a very old version, it is still merged and propagated into
higher versions.
Choose your base branch accordingly.
The rule N - 2 is just a tip if you don't know which version to choose to get the best the best compromise between ease of correction
and number of potential beneficiaries of the correction.
### General rules
Please don't edit the ChangeLog file. File will be generated from all commit messages during release process by the project manager.
Please don't edit the ChangeLog file. This file is generated from all commit messages during release process by the project manager.
### <a name="commits"></a>Commits
Use clear commit messages with the following structure:
```
```plaintext
[KEYWORD] [ISSUENUM] DESC
LONGDESC
@@ -66,10 +68,13 @@ where
#### Keyword
In uppercase if you want to have the log comment appears into the generated ChangeLog file.
The keyword can be ommitted if your commit does not fit in any of the following categories:
The keyword can be omitted if your commit does not fit in any of the following categories:
- Fix/FIX: for a bug fix
- New/NEW: for an unreferenced new feature (Opening a feature request and using close is prefered)
- Close/CLOSE: for closing a referenced feature request
- New/NEW: for an unreferenced new feature (Opening a feature request and using close is preferred)
- Perf/PERF: for a performance enhancement
- Qual/QUAL: for quality code enhancement or re-engineering
#### Issuenum
If your commit fixes a referenced bug or feature request.
@@ -90,19 +95,19 @@ Feel free to express technical details, use cases or anything relevant to the cu
This section can span multiple lines.
Try to keep lines under 120 characters.
If your PR is a change on interface, you must also paste a screenshot showing the new screen.
#### Examples
<pre>
FIX|Fix #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
or
NEW|New Short description (In upper case to appear into ChangeLog, use this if you add a feature not tracked, otherwise use CLOSE #456)
or
CLOSE|Close #456 Short description (where #456 is number of feature request, if it exists. In upper case to appear into ChangeLog)
or
NEW|New|QUAL|Qual|PERF|Perf Short description (In upper case to appear into ChangeLog, use this if you add a feature not tracked, otherwise use CLOSE #456)
or
Short description (when the commit is not introducing feature nor closing a bug)
Long description (Can span accross multiple lines).
Long description (Can span across multiple lines).
</pre>
### Pull Requests
@@ -119,7 +124,7 @@ Also, some code changes need a prior approbation:
* if you want to include a new external library (into htdocs/includes directory), please ask before to the core project manager (mention @dolibarr-jedi in your issue) to see if such a library can be accepted.
* if you add a new tables or fields, you MUST first submit a standalone PR with the data structure changes you plan to add/modify (and only data structure changes). Start development only once this data structure has been accepted.
* if you add new tables or fields, you MUST first submit a standalone PR with the data structure changes you plan to add/modify (and only data structure changes). Start development only once this data structure has been accepted.
Once a PR has been submitted, you may need to wait for its integration. It is common that the project leader let the PR open for a long delay to allow every developer discuss about the PR (A label is added in such a case).
@@ -130,7 +135,8 @@ If your PR has errors reported by the Continuous Integration Platform, it means
If the PR is valid, and is kept open for a long time, a tag will also be added on the PR to describe the status of your PR and why the PR is kept open. By putting your mouse on the tag, you will get a full explanation of the tag/status that explain why your PR has not been integrated yet.
In most cases, it gives you information of things you have to do to have the PR taken into consideration (for example a change is requested, a conflict is expected to be solved, some questions were asked). If you have a yellow, red flag of purple flag, don't expect to have your PR validated. You must first provide the answer the tag ask you. The majority of open PR are waiting an action of the author of the PR.
Statistics on Dolibarr project shows that 95% of submitted PR are reviewed and tagged. Average answer delay is also one of the best among Open source projects (just few days before having the Answer Tag set). This is one of the most important ratio of answered PR in Open Source world for a major project. Don't expect the core team to reach the 100%. A so high ratio is very rare on a so popular project and with the increasing popularity of Dolibarr, this ratio will probably decrease in future to a more common level.
Statistics on Dolibarr project shows that 95% of submitted PR are reviewed and tagged. Average answer delay is also one of the best among Open source projects (just few days before having the Answer Tag set). This is one of the most important ratio of answered PR in Open Source world for a major project. Don't expect the core team to reach the 100%.
A so high ratio is very rare on a so popular project and with the increasing popularity of Dolibarr, this ratio will probably decrease in future to a more common level.
### Resources
@@ -144,7 +150,7 @@ All other translations are managed online at [Transifex](https://www.transifex.c
Translations done on transifex are available in the next major release.
Note: Sometimes, the source text (english) is modified. In such a case, the translation is reset. Transifex assume that if the original source
Note: Sometimes, the source text (English) is modified. In such a case, the translation is reset. Transifex assume that if the original source
has changed, the translation is surely no more correct so must be done again. But old translation is not lost and you can use the tab "History"
to retrieve all old translation of a source text, and restore the translation in one click with no need to retranslate it if there is no need to.

View File

@@ -68,4 +68,4 @@ body:
id: files
attributes:
label: Attached files
description: Screenshots, screencasts, dolibarr.log, debugging informations
description: Screenshots, screencasts, dolibarr.log, debugging information

View File

@@ -1,7 +1,7 @@
# Instructions
*This is a template to help you make good pull requests. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report.*
*Please:*
- *only keep the "FIX", "CLOSE" or "NEW" section* (use uppercase to have the PR appears into the ChangeLog, lowercase will not appears)
- *only keep the "FIX", "CLOSE", "NEW", "PERF" or "QUAL" section* (use uppercase to have the PR appears into the ChangeLog, lowercase will not appears)
- *follow the project [contributing guidelines](/.github/CONTRIBUTING.md)*
- *replace the bracket enclosed texts with meaningful information*
@@ -16,3 +16,12 @@
# NEW|New [*Short description*]
[*Long description*]
# PERF|Perf #[*issue_number Short description*]
[*Long description*]
# QUAL|Qual #[*issue_number Short description*]
[*Long description*]

View File

@@ -21,7 +21,7 @@ jobs:
fetch-depth: 1
#php-version: '7.1'
- name: 'Qodana Scan'
uses: JetBrains/qodana-action@v2023.1.5
uses: JetBrains/qodana-action@v2023.2.1
#with:
# php-version: '7.1'
env:

View File

@@ -2,8 +2,9 @@
name: "Exakat analysis"
on:
# execute once a month, the 1st
schedule:
- cron: "0 20 * * *"
- cron: "0 20 1 * *"
workflow_dispatch:
branches:
- develop
@@ -15,11 +16,13 @@ jobs:
exakat:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Exakat
uses: docker://exakat/exakat-ga
with:
ignore_rules: 'Classes/UseInstanceof,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant'
ignore_dirs: '/htdocs/includes,/build,/dev,/doc,/scripts,/test'
ignore_rules: 'Classes/UseInstanceof,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/NestedTernary,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant'
ignore_dirs: '/htdocs/includes/,/htdocs/install/doctemplates/,/build/,/dev/,/doc/,/scripts/,/test/'
file_extensions: php
project_reports: Perfile

View File

@@ -235,7 +235,7 @@ jobs:
sudo cat /etc/apache2/sites-enabled/000-default.conf
sudo service apache2 restart
curl -I localhost
- name: Chech Apache availability
- name: Check Apache availability
run: |
echo "Checking webserver availability by a wget -O - --debug http://127.0.0.1"
# Ensure we stop on error with set -e

View File

@@ -190,7 +190,7 @@ jobs:
sudo cat /etc/apache2/sites-enabled/000-default.conf
sudo service apache2 restart
curl -I localhost
- name: Chech Apache availability
- name: Check Apache availability
run: |
echo "Checking webserver availability by a wget -O - --debug http://127.0.0.1"
# Ensure we stop on error with set -e

View File

@@ -11,7 +11,7 @@ jobs:
phpcs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 50 # important!

View File

@@ -1,6 +1,8 @@
name: GitHub CI PHPCS and PHPCBF
on: push
on:
pull_request:
types: [opened]
#on:
# push:
# paths:
@@ -11,7 +13,7 @@ jobs:
# uses: ./.github/workflows/files_changed.yaml
# with:
# folder_path: .*
linter_name:
name: Run & fix PHP Code Sniffer
runs-on: ubuntu-latest
@@ -19,7 +21,9 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 10
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}
# fetch-depth: 10
- name: echo Get list of all changed files
run: |
@@ -39,6 +43,21 @@ jobs:
phpcs_ref_name: ${{github.ref_name}}
phpcs_github_event_name: ${{github.event_name}}
phpcs_files: ${{ needs.filesChanged.outputs.all_changed_files }}
- uses: stefanzweifel/git-auto-commit-action@v4 # auto commit the fixes action for GitHub
#- uses: stefanzweifel/git-auto-commit-action@v4 # auto commit the fixes action for GitHub
# with:
# commit_message: Fix PHPCS errors by GitHub PHPCSfixer action
- name: Commit changes
uses: EndBug/add-and-commit@v9.1.3
with:
commit_message: Fix PHPCS errors by GitHub PHPCSfixer action
default_author: github_actions
committer_name: GitHub Actions
committer_email: actions@github.com
#author_name: PHP CS fixer
#author_email: eldy@destailleur.fr
#committer_name: PHP CS fixer
#committer_email: eldy@destailleur.fr
message: 'PHP CS fixer github action'
add: '*.php'

13
.gitignore vendored
View File

@@ -59,11 +59,12 @@ package-lock.json
doc/install.lock
/.asciidoctorconfig.adoc
# Qodana
.idea/vcs.xml
.idea/modules.xml
.idea/workspace.xml
.idea/inspectionProfiles/Project_Default.xml
.idea/jsLinters/jshint.xml
.idea
/composer.json
/composer.lock
/build/phpstan/phpstan
/build/phpstan/bootstrap_custom.php
phpstan_custom.neon
/.php-cs-fixer.cache
/.php_cs.cache

63
.php-cs-fixer.dist.php Normal file
View File

@@ -0,0 +1,63 @@
<?php
/* PHP 7.0 */
$finder = (new PhpCsFixer\Finder())
->in(__DIR__)
->exclude([
'core/includes',
'custom',
'documents',
'doctemplates',
'vendor',
'install/doctemplates',
'htdocs/custom',
'htdocs/includes',
'htdocs/install/doctemplates',
])
->notPath('vendor');
/* PHP 7.4+ */
/*
$finder = (new PhpCsFixer\Finder())
->in(__DIR__)
->exclude([
'custom',
'documents',
'htdocs/custom',
'htdocs/includes',
])
->notPath([
'vendor',
]);
*/
return (new PhpCsFixer\Config())
->setRules([
// Apply PSR-12 as per https://wiki.dolibarr.org/index.php?title=Langages_et_normes#PHP:~:text=utiliser%20est%20le-,PSR%2D12,-(https%3A//www
'@PSR12' => true, // Disabled for now to limit number of changes
// Minimum version Dolibarr v18.0.0
// Compatibility with min 7.1 is announced with Dolibarr18.0 but
// app is still working with 7.0 so no reason to abandon compatiblity with this target for the moment.
// So we use target PHP70 for the moment.
'@PHP70Migration' => true,
//'@PHP71Migration' => true,
// Avoid adding public to const (incompatible with PHP 7.0):
'visibility_required' => ['elements'=>['property', 'method']],
//'strict_param' => true,
//'array_syntax' => ['syntax' => 'short'],
//'list_syntax' => false,
//'visibility_required' => false,
'array_syntax' => false,
'ternary_to_null_coalescing' => false
])
->setFinder($finder)
// TAB Indent violates PSR-12 "must" rule, but used in code
// (See https://www.php-fig.org/psr/psr-12/#24-indenting )
->setIndent("\t")
// All files MUST use the Unix LF line ending only
// https://www.php-fig.org/psr/psr-12/#22-files
->setLineEnding("\n")
;

13
.phpcs.xml.dist Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0"?>
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="PHP_CodeSniffer" xsi:noNamespaceSchemaLocation="phpcs.xsd">
<!--
Documentation:
https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-Ruleset
-->
<rule ref="dev/setup/codesniffer/ruleset.xml"/>
<arg value="p"/>
<arg name="colors"/>
<arg name="extensions" value="php,inc" />
</ruleset>

View File

@@ -1,236 +0,0 @@
# .scrutinizer.yml
#build:
# - php-scrutinizer-run
build:
nodes:
analysis:
tests:
override:
- command: php-scrutinizer-run
idle_timeout: 8000
#- php-scrutinizer-run --sub-project-dir=htdocs/admin
imports:
- php
filter:
excluded_paths:
- build/
- dev/
- doc/
- documents/
- node_modules/
- test/
- htdocs/custom/
- htdocs/includes/
- htdocs/install/doctemplates/
#dependency_paths:
# - htdocs/includes/
paths:
- htdocs/*
- scripts/*
tools:
# php_analyzer. Doc on https://scrutinizer-ci.com/docs/tools/php/php-analyzer/
php_analyzer:
enabled: true
extensions:
- php
#dependency_paths:
# - htdocs/includes/
filter:
excluded_paths:
- build/
- dev/
- doc/
- documents/
- htdocs/custom/
- htdocs/includes/
- htdocs/install/doctemplates/
- htdocs/core/class/lessc.class.php
- node_modules/
- test/
paths:
- htdocs/*
- scripts/*
config:
parameter_reference_check:
enabled: true
checkstyle:
enabled: false
no_trailing_whitespace: true
naming:
enabled: true
local_variable: ^[a-z][a-zA-Z0-9]*$
abstract_class_name: ^Abstract|Factory$
utility_class_name: Utils?$
constant_name: ^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)*$
property_name: ^[a-z][a-zA-Z0-9]*$
method_name: ^(?:[a-z]|__)[a-zA-Z0-9]*$
parameter_name: ^[a-z][a-zA-Z0-9]*$
interface_name: ^[A-Z][a-zA-Z0-9]*Interface$
type_name: ^[A-Z][a-zA-Z0-9]*$
exception_name: ^[A-Z][a-zA-Z0-9]*Exception$
isser_method_name: ^(?:is|has|should|may|supports)
unreachable_code:
enabled: true
check_access_control:
enabled: true
typo_checks:
enabled: true
check_variables:
enabled: true
check_calls:
enabled: true
too_many_arguments: true
missing_argument: true
argument_type_checks: lenient # Allowed Values: "disabled", "lenient", "strict"
suspicious_code:
enabled: true
overriding_parameter: false
overriding_closure_use: true
parameter_closure_use_conflict: true
parameter_multiple_times: true
non_existent_class_in_instanceof_check: true
non_existent_class_in_catch_clause: true
assignment_of_null_return: true
non_commented_switch_fallthrough: true
non_commented_empty_catch_block: true
overriding_private_members: true
use_statement_alias_conflict: true
precedence_in_condition_assignment: true
dead_assignments:
enabled: true
verify_php_doc_comments:
enabled: false
parameters: true
return: true
suggest_more_specific_types: true
ask_for_return_if_not_inferrable: true
ask_for_param_type_annotation: true
loops_must_use_braces:
enabled: true
check_usage_context:
enabled: true
simplify_boolean_return:
enabled: false
phpunit_checks:
enabled: false
reflection_checks:
enabled: true
# Checks Common Precedence Mistakes
precedence_checks:
enabled: true
assignment_in_condition: true
comparison_of_bit_result: true
basic_semantic_checks:
enabled: true
# Disabled unused code. In most cases, we want to keep it.
unused_code:
enabled: false
deprecation_checks:
enabled: true
useless_function_calls:
enabled: true
metrics_lack_of_cohesion_methods:
enabled: true
metrics_coupling:
enabled: true
stable_code:
namespace_prefixes: []
classes: []
doctrine_parameter_binding:
enabled: false
doctrine_entity_manager_injection:
enabled: false
symfony_request_injection:
enabled: false
doc_comment_fixes:
enabled: true
reflection_fixes:
enabled: false
use_statement_fixes:
enabled: true
remove_unused: true
# Whether you would like multiple imports in one USE statement to be preserved, e.g. ``use A, B;``.
preserve_multiple: false
# Whether you would like to preserve blank lines between use statements.
preserve_blanklines: false
order_alphabetically: false
# To use specific config for a specific path, use path_configs: (see example on page https://scrutinizer-ci.com/docs/configuration/tool_config_structure)
# php_depend
#php_pdepend:
# enabled: false
# configuration_file: null
# suffixes:
# - php
# excluded_dirs: { }
# filter:
# excluded_paths:
# - 'build/*'
# - 'dev/*'
# - 'doc/*'
# - 'test/*'
# - 'htdocs/includes/*'
# paths: { }
# change tracking
#php_changetracking:
# enabled: false
# bug_patterns:
# - '\bfix(?:es|ed)?\b'
# feature_patterns:
# - '\badd(?:s|ed)?\b'
# - '\bimplement(?:s|ed)?\b'
# filter:
# excluded_paths:
# - 'build/*'
# - 'dev/*'
# - 'doc/*'
# - 'documents/*'
# - 'htdocs/includes/*'
# - 'node_modules/*'
# - 'test/*'
# paths: { }
# Similar code detection
#php_sim:
# enabled: false
# min_mass: 30
# filter:
# excluded_paths:
# - 'build/*'
# - 'dev/*'
# - 'doc/*'
# - 'documents/*'
# - 'htdocs/includes/*'
# - 'node_modules/*'
# - 'test/*'
# paths: { }
# Coding-Style / Bug Detection
#js_hint:
# enabled: false
# use_native_config: true
# extensions:
# - js
# filter:
# excluded_paths:
# - 'build/*'
# - 'dev/*'
# - 'doc/*'
# - 'documents/*'
# - 'htdocs/includes/*'
# - 'node_modules/*'
# - 'test/*'
# paths: { }
# config: { }
# path_configs: { }
before_commands: { }
after_commands: { }
artifacts: { }
build_failure_conditions: { }

View File

@@ -1,14 +0,0 @@
---
linters:
phpcs:
standard: 'dev/setup/codesniffer/ruleset.xml'
extensions: 'php'
tab_width: 4
fixer: true
fixers:
enable: true
files:
ignore:
- 'htdocs/includes/*'

View File

@@ -8,7 +8,7 @@ dist: focal
language: generic
scan_logs: false
#scan_logs: false
git:
depth: 1
@@ -31,25 +31,27 @@ env:
jobs:
fast_finish: true
#allow_failures:
#- php: nightly
allow_failures:
- php: '8.3'
include:
- stage: PHP 7.0-8.1
- stage: PHP min and max
if: type = push
php: '7.1'
env:
- DB=postgresql
- TRAVIS_PHP_VERSION=7.1
- stage: PHP 7.0-8.1
- stage: PHP min and max
if: type = pull_request OR type = push
php: '8.1'
php: '8.2'
env:
- DB=mysql
- TRAVIS_PHP_VERSION=8.2
- stage: PHP 8.3
if: type = push AND branch = develop
php: '8.3'
env:
- DB=mysql
- TRAVIS_PHP_VERSION=8.1
#- stage: PHP Dev
# if: type = push AND branch = developdisabled
# php: '8.2'
# env: DB=mysql
- TRAVIS_PHP_VERSION=8.3
notifications:
email:
@@ -81,7 +83,13 @@ before_install:
if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then
sudo apt install unzip apache2 php8.1 php8.1-cli php8.1-curl php8.1-mysql php8.1-pgsql php8.1-gd php8.1-imap php8.1-intl php8.1-ldap php8.1-xml php8.1-mbstring php8.1-xml php8.1-zip libapache2-mod-php8.1
fi
if [ "$TRAVIS_PHP_VERSION" = '8.2' ]; then
sudo apt install unzip apache2 php8.2 php8.2-cli php8.2-curl php8.2-mysql php8.2-pgsql php8.2-gd php8.2-imap php8.2-intl php8.2-ldap php8.2-xml php8.2-mbstring php8.2-xml php8.2-zip libapache2-mod-php8.2
fi
if [ "$TRAVIS_PHP_VERSION" = '8.3' ]; then
sudo apt install unzip apache2 php8.3 php8.3-cli php8.3-curl php8.3-mysql php8.3-pgsql php8.3-gd php8.3-imap php8.3-intl php8.3-ldap php8.3-xml php8.3-mbstring php8.3-xml php8.3-zip libapache2-mod-php8.3
fi
- |
echo Install pgsql if run is for pgsql
if [ "$DB" = 'postgresql' ]; then
@@ -112,6 +120,9 @@ install:
if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then
sudo update-alternatives --set php /usr/bin/php8.1
fi
if [ "$TRAVIS_PHP_VERSION" = '8.2' ]; then
sudo update-alternatives --set php /usr/bin/php8.2
fi
php -i | head -
- |
@@ -122,6 +133,8 @@ install:
php -r "if (hash_file('SHA384', '/tmp/composer-setup.php') === '$HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
sudo php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer
sudo chmod -R a+rwx /usr/local/bin/composer
#sudo apt install composer
composer -V
composer -n config -g vendor-dir htdocs/includes
echo
@@ -146,7 +159,7 @@ install:
squizlabs/php_codesniffer ^3
fi
# phpunit 9 is required for php 8
if [ "$TRAVIS_PHP_VERSION" = '8.0' ] || [ "$TRAVIS_PHP_VERSION" = '8.1' ] || [ "$TRAVIS_PHP_VERSION" = '8.2' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
if [ "$TRAVIS_PHP_VERSION" = '8.0' ] || [ "$TRAVIS_PHP_VERSION" = '8.1' ] || [ "$TRAVIS_PHP_VERSION" = '8.2' ] || [ "$TRAVIS_PHP_VERSION" = '8.3' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
sudo composer self-update 2.4.4
composer -n require --ignore-platform-reqs phpunit/phpunit ^8 \
php-parallel-lint/php-parallel-lint ^1.2 \
@@ -255,8 +268,9 @@ before_script:
- |
export CONF_FILE=htdocs/conf/conf.php
echo "Setting up Dolibarr $CONF_FILE"
echo "Setting up Dolibarr '$CONF_FILE'"
echo '<?php' > $CONF_FILE
echo 'error_reporting(E_ALL);' >> $CONF_FILE
echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
echo '$'dolibarr_main_document_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $CONF_FILE
echo '$'dolibarr_main_data_root=\'$TRAVIS_BUILD_DIR/documents\'';' >> $CONF_FILE
@@ -321,26 +335,54 @@ script:
--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --exclude htdocs/includes/webklex --blame .
fi
if [ "$TRAVIS_PHP_VERSION" = "8.2" ]; then
parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --exclude htdocs/includes/webklex --blame .
fi
if [ "$TRAVIS_PHP_VERSION" = "8.3" ]; then
parallel-lint -e php --exclude dev/tools/test/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --exclude htdocs/includes/webklex --blame .
fi
set +e
echo
- |
echo "Checking coding style (only for Pull Requests builds and 1 version to not overload travis and avoid duplicate tests)"
echo "Checking coding style (only for 1 version to not overload travis and avoid duplicate tests)"
# Ensure we catch errors
set -e
# Exclusions are defined in the ruleset.xml file
if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
#if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
if [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
fi
if [ "$TRAVIS_PHP_VERSION" = "8.2" ]; then
phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
fi
if [ "$TRAVIS_PHP_VERSION" = "8.3" ]; then
phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
fi
set +e
echo
- |
echo "Checking missing debug"
echo "Checking missing debug (only for 1 version to not overload travis and avoid duplicate tests)"
# Ensure we catch errors
set -e
# Exclusions are defined in the ruleset.xml file
if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
#if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
if [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
fi
if [ "$TRAVIS_PHP_VERSION" = "8.2" ]; then
var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
fi
if [ "$TRAVIS_PHP_VERSION" = "8.3" ]; then
var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
fi
set +e
@@ -352,6 +394,7 @@ script:
# Ensure we catch errors
set +e
echo '<?php ' > $INSTALL_FORCED_FILE
echo 'error_reporting(E_ALL);' >> $INSTALL_FORCED_FILE
echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE
if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE
@@ -371,6 +414,7 @@ script:
echo '$'force_install_mainforcehttps=false';' >> $INSTALL_FORCED_FILE
echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE
#cat $INSTALL_FORCED_FILE
echo
- |
echo "Upgrading Dolibarr"
@@ -436,15 +480,22 @@ script:
php upgrade.php 17.0.0 18.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade17001800.log
php upgrade2.php 17.0.0 18.0.0 > $TRAVIS_BUILD_DIR/upgrade17001800-2.log
php step5.php 17.0.0 18.0.0 > $TRAVIS_BUILD_DIR/upgrade17001800-3.log
php upgrade.php 18.0.0 19.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade18001900.log || cat $TRAVIS_BUILD_DIR/upgrade18001900.log
php upgrade2.php 18.0.0 19.0.0 > $TRAVIS_BUILD_DIR/upgrade18001900-2.log || cat $TRAVIS_BUILD_DIR/upgrade18001900-2.log
php step5.php 18.0.0 19.0.0 > $TRAVIS_BUILD_DIR/upgrade18001900-3.log || cat $TRAVIS_BUILD_DIR/upgrade18001900-3.log
set +e
echo
#show table content and log
- |
echo Show some debug info like table content or log
#echo '\d llx_adherent' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis'
#cat $TRAVIS_BUILD_DIR/upgrade500600.log
cat $TRAVIS_BUILD_DIR/upgrade18001900.log
echo
- |
echo Result of migration scripts
ls -alrt $TRAVIS_BUILD_DIR/
echo Show content of last file
cat $TRAVIS_BUILD_DIR/"$(ls -rt $TRAVIS_BUILD_DIR/ | tail -n1)"
@@ -463,6 +514,7 @@ script:
echo
#cat /tmp/dolibarr_install.log
cat $TRAVIS_BUILD_DIR/enablemodule.log
echo
- |
echo "Unit testing"
@@ -472,6 +524,7 @@ script:
phpunitresult=$?
echo "Phpunit return code = $phpunitresult"
set +e
echo
after_script:
- |

View File

@@ -200,12 +200,6 @@ source_file = htdocs/langs/en_US/ldap.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:link]
file_filter = htdocs/langs/<lang>/link.lang
source_file = htdocs/langs/en_US/link.lang
source_lang = en_US
type = MOZILLAPROPERTIES
[o:dolibarr-association:p:dolibarr:r:loan]
file_filter = htdocs/langs/<lang>/loan.lang
source_file = htdocs/langs/en_US/loan.lang

View File

@@ -23,20 +23,22 @@ Licence of dependencies of third-party components used by Dolibarr (all compatib
Component Version License GPL Compatible Usage
-------------------------------------------------------------------------------------
PHP libraries:
EvalMath 1.0 BSD Yes Safe math expressions evaluation
EvalMath 1.0 BSD Yes Safe math expressions evaluation. Used by dynamic price only. TODO Replace with dol_eval ?
Escpos-php 3.0 MIT License Yes Thermal receipt printer library, for use with ESC/POS compatible printers
GeoIP2 0.2.0 Apache License 2.0 Yes Lib to make geoip convert
MathPHP 2.8.1 MIT License Yes Modern math library for PHP (only few files)
Mobiledetect 2.8.41 MIT License Yes Detect mobile devices browsers
NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package)
NuSoap 0.9.16 LGPL 2.1+ Yes Library to develop SOAP Web services. From https://github.com/f00b4r/nusoap/tree/v0.9.16
PEAR Mail_MIME 1.8.9 BSD Yes NuSoap dependency
ParseDown 1.7.4 MIT License Yes Markdown parser
PCLZip 2.8.4 LGPL-3+ Yes Library to zip/unzip files
PHPDebugBar 1.18.2 MIT License Yes Used only by the module "debugbar" for developers
PHP-Imap 2.7.2 MIT License Yes Library to use IMAP with OAuth
PHPSpreadSheet 1.12.0 LGPL-2.1+ Yes Read/Write XLS files, read ODS files
php-iban 4.1.1 LGPL-3+ Yes Parse and validate IBAN (and IIBAN) bank account information in PHP
PHP-Iban 4.1.1 LGPL-3+ Yes Parse and validate IBAN (and IIBAN) bank account information in PHP
PHP-Imap 2.7.2 MIT License Yes Library to use IMAP with OAuth
PHPoAuthLib 0.8.2 MIT License Yes Library to provide oauth1 and oauth2 to different service
PHPPrintIPP 1.3 GPL-2+ Yes Library to send print IPP requests
PrestaShop-WS-Lib 94feb5f OSL-3.0 No Library providing API client for Prestashop.
PSR/Logs 1.0 MIT License Yes Library for logs (used by DebugBar)
PSR/simple-cache ? MIT License Yes Library for cache (used by PHPSpreadSheet)
Restler 3.1.1 LGPL-3+ Yes Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
@@ -52,7 +54,7 @@ bacon, dasprid, swiss-qr-bill, kmukku, symfony/validator
JS libraries:
Ace 1.4.14 BSD Yes JS library to get code syntaxique coloration in a textarea.
ChartJS 3.7.1 MIT License Yes JS library for graph
CKEditor 4.18 LGPL-2.1+ Yes Editor WYSIWYG
CKEditor 4.22.1 LGPL-2.1+ Yes Editor WYSIWYG
jQuery 3.6.4 MIT License Yes JS library
jQuery UI 1.13.2 GPL and MIT License Yes JS library plugin UI
jQuery select2 4.0.13 GPL and Apache License Yes JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css

439
ChangeLog
View File

@@ -2,6 +2,322 @@
English Dolibarr ChangeLog
--------------------------------------------------------------
***** ChangeLog for 19.0.1 compared to 19.0.0 *****
FIX: 16.0 - parent company gets emptied when updating a third party from the card in edit mode (#28269)
FIX: 17.0: $num doesn't take trigger-modified newref into account, leading to inconsistencies if BILL_SUPPLIER_VALIDATE changes the invoice's ref (#28684)
FIX: #22948
FIX: #24265 regression cannot see all product on takepos (#28753)
FIX: #28205
FIX: #28251 Fixing subpermission name on api_multicurrencies.class.php (#28252)
FIX: #28369
FIX: #28429
FIX: #28491 (#28522)
FIX: #28518 (#28520)
FIX: #28533 Mo::deleteLine removes the "main" MoLine if consumed line is delete (#28535)
FIX: #28564
FIX: Adding the dependencies list feature for extrafields "select" (#28549)
FIX: Add new hidden conf "DISABLE_QTY_OVERWRITTEN" (#28523)
FIX: Amount of localtaxes in foreign currency was wrong on screen and PDF
FIX: an error in a complex else condition
FIX: avoid error "Column 'entity' in where clause is ambiguous" (#28270)
FIX: avoid Unknown column 'pfp.ref_fourn' (#28145)
FIX: avoid warning "error parsing attribute name in Entity" (#28543)
FIX: Bad column for total in bom list
FIX: Bad condition on button back to draft on recruitment job.
FIX: Bad CRLF when sending text only content. Fix dol_htmlwithnojs()
FIX: Bad picto on list of permission of a user when user not admin
FIX: bad timzeone for the start/end date of an event
FIX: Better test on validity of compute field syntax with parenthesis
FIX: close #28279
FIX: Count of virtual stock at Services and MoLine with disabled stock change (#28580)
FIX: disabled pito of menu must be greyed.
FIX: Don't display column when it's out of date (#28271)
FIX: duplicate with lines: 414-416 (#28358)
FIX: edit bank suggested for credit transfer payment in invoice setup
FIX: Error When cloning fourn price no default value for tva_tx (#28368)
FIX: fatal error Unsupported operand types when recording load payment
FIX: Fix create shipping with product who have negative stocks on warehouse but the negative stock transfert is allowed (#26217)
FIX: migration missing 2 columns in llx_resource and 1 in llx_user
FIX: missing trans
FIX: notification module: for supplier orders (any of the 3 triggers), user can choose an e-mail template in conf, but the conf is not used when sending the notification (#28216)
FIX: Not trancate the multicurrency rate shown on cards (even if the global MAIN_MAX_DECIMALS_SHOWN is set to 0) (#28211)
FIX: Option MAIN_DOC_USE_TIMING can be a string with date format
FIX: Payment on customer invoice - Remove accountid in url if empty for apply default value (#28156)
FIX: Pb in redirect of a website page in USEDOLIBARRSERVER mode
FIX: permission on payment file of a tax
FIX: PHP Warning: Undefined variable $lib (#28342)
FIX: PHP Warning: Undefined variable $mode (#28697)
FIX: Picto for mime
FIX: Picto in top menu
FIX: position of field in list of field in shipment list
FIX: postgresql error (#28542)
FIX: quote in sql request
FIX: Responsive on admin project
FIX: Shipment closing action has wrong value (#28174)
FIX: skip adding tab if user doesn't have permission (#28698)
FIX: some tooltips has disappeared on invoice action button
FIX: Special code is now transmitted by args only in order supplier (#28546)
FIX: Special code is now transmitted by args only in order supplier (#28619)
FIX: subscription must be editable when accounting isn't reconciled (#28469)
FIX: Translation for select (#28677)
FIX: upload odt files should not start/end with space
FIX: Value of field int = 0 from modulebuilder must nto be set to null
FIX: Wrong currency shown in TakePOS payment page
FIX: #yogosha21416
***** ChangeLog for 19.0.0 compared to 18.0.0 *****
For users:
----------
NEW: Compatibility with PHP 8.2
NEW: Module Workstation (used to enhance the module BOM and Manufacturing Order) is now stable
NEW: Add a confirmation popup when deleting extrafields
NEW: Add type 'icon' type for extrafields
NEW: Close #20930 Use ajax for state loading after country change
NEW: #23331 Add support for parent projects (#24856)
NEW: #22531 Expense report - Add two fields into export : Qty & Unit price (excl.) (#26309)
NEW: #22626 date filter thirdparties contracts projects (#22707)
NEW: #24085 Add the Project filter
NEW: #25312 Support extrafields in selectForForms
NEW: #26312 Manage intermediate BIC - SQL Part (#26325)
NEW: Accountancy - Add quick navigation with keyboard shortcut on ledger (#26221)
NEW: Accountancy - FEC/FEC2 format export with attachments (#26192)
NEW: Accountancy - Option to choose length of lettering code
NEW: Add a button to create a product or a service from an order or an invoice (#26173)
NEW: Add a button to re-encrypt data of a dolcrypt extrafield password
NEW: Add a CLI tool to regenerate all documents
NEW: Add a goto url from smartphone search page
NEW: Add all id prof checker on thirdparty for code compta customer and supplier
NEW: add and list external contributors on ticket public interface
NEW: Add a protection on purgeFiles
NEW: Add a public page to list all open surveys
NEW: Add chart of accounts PCG08-PYME-CAT for ES in catalan language
NEW: add constant to check if qty shipped not greater than qty ordered
NEW: Add context for the movement stock (role toconsume/toproduce) on mrp
NEW: Add contract link on ticket
NEW: Add culum Technical ID in list of details lines of an order (#26164)
NEW: ADD: custom compute for exports
NEW: Add custom Text on footer total (#26334)
NEW: Add different picto for each type of extrafields (date, string, ...)
NEW: Add edit line on MO (#26122)
NEW: Added notification on closed intervention
NEW: Added of a popup on validation instead of a database fielld to know if the user wants to include subwarehouse
NEW: Added of the field "include_sub_warehouse" in the table "llx_inventory"
NEW: Added total line to third-parties list (#26148)
NEW: Added VAT free & VAT amounts on payment input
NEW: Add ext payment system ID in the payment page with link to Stripe
NEW: Add field TechnicalID in list of users
NEW: Add filter on status of line of a dictionary
NEW: Add get_substitutionarray_other() on shipping odt (#25080)
NEW: add IdProfCheck on thirdparty for BE (xxxx.xxx.xxx)
NEW: Add index on prelevement_demande
NEW: Add invoice subtype in customer invoice (#26543) and template invoice (SQL part) (#26535)
NEW: Add label to price level when changing price (#26240)
NEW: Add modifications of template invoices into agenda
NEW: Add more company informations (ProfId7 to 10) (#25266)
NEW: Add more information to holiday mailings (#25461)
NEW: Add more param on fetch() to prepare perf optimization
NEW: Add more tables activated by module activation only
NEW: Add new field into $fields array + Creation of the function getChildWarehouse()
NEW: Add option for cancel consumed and produced lines (delete lines and rollback stocks) when delete or cancel an manufacturing order (#26254)
NEW: Add option in PDF for purchase order and quotation to hide prices
NEW: Add option TAKEPOS_HIDE_PRODUCT_PRICES to hide prices in TakePOS
NEW: add order supplier submit notif
NEW: add parent product column on list
NEW: Add picto in product/service list in object lines (#25511)
NEW: Add possibility to choose separator #21426
NEW: Add preselected update keys attribute to import class and select it by default if filled
NEW: add product barcode on stock exports
NEW: Add recurring behaviour
NEW: add recursive deletion option for child m os (#26102)
NEW: Add refactoring user permission (#26162)
NEW: add sorting of product price list by customer (#26483)
NEW: Add tab Events/Agenda on recurring invoices
NEW: Add the formEditObjectLine hook on commande card and invoice card
NEW: Add the picto phone of thirdparty on the kanban view of projects
NEW: Add the status of partnership to select partnership for emailing
NEW: add Ticket tab on contract
NEW: agenda per user use quarter hour split instead of half hour split
NEW: Allow generation of delivery note through REST-API (#26226)
NEW: Allow sync of currency rates with currency layer by default.
NEW: Allow to have products not managed in stocks - SQL Part (#26190)
NEW: Assign contact to a ticket message (#24735)
NEW: Better protection against reserved words
NEW: billing on shipment+reception. Can be done before or after delivery.
NEW: can edit bomline workstation
NEW: Can edit both the Test and Live stripe customer account on payment
NEW: Can include product variants in list of products
NEW: Can manage ODT documents for groups of users.
NEW: Can modify the picto into modulebuilder
NEW: Can restore product in stock when deleting the supplier invoice
NEW: Can see the favicon file into setup of properties of a website
NEW: Can switch product batch management to no management. (#21691)
NEW: Can upload/delete ODT template for project and tasks
NEW: chart of accounts ES PCG08-PYME-CAT in catalan language
NEW: clone skill object (#26526)
NEW: close notification for interventions
NEW: column in table prelevement_lignes for fk_user (#26196)
NEW: CONF allow modify ticket classification even if closed
NEW: conf to display date entry stock exped and sort in date order (#22625)
NEW: create a product from a free line in a document (#22324)
NEW: customize position in complete_head_from_modules (#26406)
NEW: Date d'entree en stock sur les exped au moment de la création
NEW: Date field for shipment export (#25574)
NEW: Date format dayhoursec is using year on 2 char on smartphones
NEW: Default customer, category and product when enable TakePOS (#25031)
NEW: do not add default value in list
NEW: drop down for action button show a simple button if only 1 action
NEW: Enhance github_commits_perversion to get more stats on git commits
NEW: Enhance IPN to support payment_intent.succeeded for both card/ban
NEW: extrafields password accepts 'dolcrypt' algorithm (reversible algo)
NEW: Factorize a lot of code for numbering modules
NEW: filter on from/to period rather than month/year (#26378)
NEW: FontAwesome - Add possibility to select another version
NEW: Form for add object's property on moduleBuilder
NEW: Can generate SEPA files for salaries (#26541)
NEW: massactions to delete projects
NEW: Generic doc template for donations (#26338)
NEW: Get list evaluation with skills details in user fiche (#26510)
NEW: hidden conf to disable use of dns_get_record (which can become unresponsive) (#26339)
NEW: improved resource data structure
NEW: Include sub warehouse in inventory
NEW: inventory without virtual products (kits)
NEW: Invoice subtypes for customers and vendors (#26233)
NEW: Invoice time from task, make task note better display in invoice line
NEW: lazy load to substitute project variables (#26451)
NEW: LDAP Active Directory UserAccountControl (#25507)
NEW: Library including math and financial functions (#25035)
NEW: Loan - Can upload a file with drag and drop
NEW: Manage rate indirect. (#26449)
NEW: memorize model name for pdf hooks
NEW: Menu editor is reponsive
NEW: Merge the "Create ..." buttons on contract into one.
NEW: More accurate tooltip on what admin permissions are
NEW: (#24834) new option for hide the footer (#25464)
NEW: (#25044) new option for choose project visibility
NEW: new option for hide the footer of tickets on the public interface
NEW: no need to create invoice supplier object on supplier card for standalone credit note
NEW: Option to show label, ref+label or only ref of product in TakePOS
NEW: payment full amount detail tooltip
NEW: possibility to deselect line when create a recurring invoice + missing to use fk_parent_line
NEW: Project - List - use select2 multiselect for status
NEW: Propagate invoice extrafields into template invoice (#26529)
NEW: remove include_subwarehouse form llx_inventory database table
NEW: resource improvements - data structure (#26285)
NEW: Retrieve vat details from the Greek Ministry of Finance GSIS SOAP web service and autocomplete third party fields
NEW: Right for stats orders (#24607)
NEW: rights and check access to create portal accounts
NEW: Row in list higher height (#26177)
NEW: Save date of RUM creation when creating a Stripe SEPA mandate
NEW: shipment can include service (for information and invoicing) (#26407)
NEW: Show id of module on the tooltip module help page
NEW: show VAT free amount on payment input close #26208 (#26209)
NEW: start and end date for due date filter on invoice list
NEW: Sub total in list (#26165)
NEW: Suport html content for combo list of email recipient
NEW: Website: Support of js into the Dolibarr server preview
NEW: TakePOS - add constant to check qty asked is available (#24820)
NEW: TakePOS - add constant to choose contact instead of customer (#24807)
NEW: TakePOS - amount label with or without tax in free product (#24829)
NEW: TakePOS compatibility with lots and serials (#26426)
NEW: Top menu support picto of modules that are font awesome picto.
NEW: updating by adding massactions for delete projects in societe tab
NEW: updating by adding tooltip for api section in Modulebuilder
NEW: updating by adjust request Sql for Salary invoice (#26279)
NEW: updating for display Help title when try to delete Don (issue #25314)
NEW: Upgrade in module builder in menu section
NEW: use account address in sepa mandate (#23642)
NEW: VAT rate - Add entity
NEW: When an user unset the batch management of products, transformation of each batch stock mouvement in global stock mouvement
NEW: PDF Generation for each Human Resource Evaluations.
SEC: #25512 applicative anti bruteforce - security on too many login attempts (#25520)
SEC: Add action confirm_... as sensitive to need a CSRF token
SEC: Disable not used PHP streams
SEC: Add option MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY
For developers or integrators:
------------------------------
QUAL Reduce very seriously the technical debt (using PHPStan, Psalm and Rector)
NEW Tool in dev/tools/rector to autofix code using style coding practice rules
PERF: Removed a useless fetch_thirdparty
PERF: Perf avoid 2 useless fetch into the triggers of agenda.
PERF: performance & code quality enhancements template sections
QUAL: Remove hardcoded code for OVH sms. Generic method is ok now.
QUAL: Code fix using rector
QUAL: Force subclass MINVERSION (#26314)
QUAL: group all flag images into 1 sprite file. (#26459)
QUAL: Move conf->global into getDolGlobal...
QUAL: Refactor merging companies and fix #26272 with Reception objects (#26320)
QUAL: Removed deprecated field remise, remise_percent, remise_absolute
QUAL: Standardize code and look and feel for dictionaries
QUAL: Standardize code. Renamed ID of user properties into ->user_xxx_id
QUAL: Use dol_clone with parameter 2 for ->oldcopy
QUAL: use switch case instead of if elseif statements for actions
QUAL: Better respect of REST API RFC.
NEW: [Add hook in user bank page]
NEW: #19501 Add two hooks in dolreceiptprinter.php (#26439)
NEW: Accountancy - Add hooks on PrintFieldList for expensereportsjournal, purchasesjournal, sellsjournal
NEW: add a $notrigger param to Product::updatePrice() method (#26404)
NEW: Add a rule to fix empty($conf->global->...) into !getDolGlobal...
NEW: Add column extraparams on societe_rib
NEW: Add hook on selectLotDataList() function (#25368)
NEW: add Hooks and prepare extrafields management for product invoices consumptions (#26280)
NEW: Add hooks on import, step 5 - 6 (#24915)
NEW: add hook tabContentCreateSupplierOrder (#26418)
NEW: add hook tabContentViewSupplierInvoice (#26431)
NEW: add new hook AfterImportInsert
NEW: add new hook OrderCard (#26380)
NEW: add new hook tabContentCreateOrder (#26408)
NEW: Add phpunit for REST API of contacts
NEW: Add triggers COMPANY_RIB_XXX already present in companybankaccount.class.php
NEW: Add triggers on import success
NEW: Add trigger when deleting a bank account line
NEW: subproduct triggers in product class (#25142)
NEW: ModuleBuilder: add section changeLog to Doc in MB
NEW: ModuleBuilder: Add api url to documentation in ModuleBuilder
NEW: ModuleBuilder: Checkin comments begin and end before each actions
NEW: ModuleBuilder: edit properties in description tab for ModuleBuilder
NEW: ModuleBuilder: remove dictionary in ModuleBuilder
NEW: ModuleBuilder: add page for create dictionary
NEW: ModuleBuilder: add badge for each tabs
NEW: ModuleBuilder: for edit name of dictionnary and delete it in MB
NEW: add barcode function to check if EAN13 is valid (
WARNING:
--------
The following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
* Recheck the setup of your module Workflow to see if you need to enable the new setting to have shipment set to billed automatically when
an invoice from a shipment is validated (and if your process is to make invoice on shipment and not on order), because this setup has changed.
* The hook changeHelpURL is replaced by llxHeader
* The property ->brouillon has been removed from all classes. It was not reliable and was a duplicate of ->status == self::STATUS_DRAFT.
* The duplicated and deprecated property ->date_livraison that was renamed into ->delivery_date has been completely removed.
* The property ->user_close to store ID of closing user has been renamed into ->user_closing_id.
* The property ->user_validation to store ID of user validating has been renamed into ->user_validation_id.
* The property ->user_creation to store ID of user of creation has been renamed into ->user_creation_id.
* The property ->user_modification to store ID of user of modification has been renamed into ->user_modification_id.
* The private array ->status_short, ->statuts and ->status_long are now array ->labelStatusShort and ->labelStatus everywhere.
* The duplicate property ->user_creat, ->date_creat, ->date_valid have been removed (use instead user_creation, date_creation, date_validation).
* The method get_substitutionarray_shipment_lines() has been removed. Use the generic get_substitutionarray_lines() instead.
* The method ProductcustomerPrice->fetch_all_log() has been renamed into camel case ->fetchAllLog()
* It was possible to use a variable $soc or $right inside a PHP code condition of some extrafields properties, this is no more true (this 2 variables are no more global variables).
* New hook files of modules actions_mymodule.class.php should now "extends CommonHookActions"
* Endpoint for API /partnershipapi and /recruitment has been renamed into /partnerships and /recruitments to follow name conventions.
* Hidden option ACCOUNTANCY_AUTOFIX_MISSING_LINK_TO_USER_ON_SALARY_BANK_PAYMENT has been renamed into ACCOUNTANCY_AUTOFIX_MISSING_LINK_TO_USER_ON_SALARY_BANK_PAYMENT
* The delete() method of AdherentType, Contact, Delivery, MultiCurrency, CurrencyRate now need $user as first parameter.
* A very high number of class properties (with old name in french) are now deprecated in favor of the property name in english.
* The load of hook context productdao has been removed before calling loadvirtualstock. Modules must use the context of main parent page or 'all' for all cases.
***** ChangeLog for 18.0.5 compared to 18.0.4 *****
FIX: 17.0: deprecated field should only be a fallback
FIX: 17.0 - php8 warnings: test for $field existence before checking if it is null or empty
@@ -259,8 +575,8 @@ FIX: when adding new times on a survey, all hours would be erased.
***** ChangeLog for 18.0.0 compared to 17.0.0 *****
For uses:
---------
For users:
----------
NEW: PHP 8.2 compatibility (not yet complete).
NEW: Module Workstations Management upgraded to stable status.
@@ -273,66 +589,56 @@ NEW: Accountancy - Manage intra-community VAT on supplier invoices - FPC22
NEW: Accountancy - iSuiteExpert export model
NEW: Accountancy - Quadratus export with attachments in accountancy export
NEW: Accountancy - Can filter on a custom group of accounts. Perf or ledger list.
NEW: Can upload a file with drag and drop on purchase invoice, vats, salaries and social contributions
NEW: Accountancy - Can select the export format during export of journals
NEW: Accountancy - sort of column of custom group of account
NEW: Can upload a file with drag and drop on purchase invoice, vats, salaries and social contributions
NEW: Authentication: #22740 add OpenID Connect impl
NEW: Authentication: add experimental support for Google OAuth2 connexion
NEW: Authentication: can now edit service name for OAuth token
NEW: Add a public virtual card page for each user
NEW: Add a status on supplier price ref (WIP to close a supplier ref)
NEW: add bookmarks in selectable landing pages for users
NEW: Add column ext_payment_site into societe_rib to allow multiple payment mode
NEW: add convertion of images to webp for a single image in website media editor
NEW: Add CRC for currency symbol before amount
NEW: add customer code to invoices listing
NEW: Add filter on nb of generation done in list of recurring invoices
NEW: Add filters and sort on product unit column
NEW: Add link to edit VAT list from error message of missing VAT
NEW: add margins in paiement/card.php
NEW: Add mass action delete on VAT
NEW: Add origin info when create a product batch when created from a movement stock
NEW: Add possibility to choose format #21426
NEW: Add SQL contraint on product_stock table to allow only exsting product and warehouse #23543
NEW: Add STRIPE_DEBUG, a way to log Stripe IPN
NEW: An external module can modify the quick search fields
NEW: Auto activate some modules on install (Export/Import/Wysiwyg editor)
NEW: Autofill email form with the email template with status "Default" on
NEW: Bank name no more mandatory on creation. Can be generated if empty.
NEW: Bank: Add fields zip, town, country for owner of a bank account
NEW: Bank: Bank name no more mandatory on creation. Can be generated if empty.
NEW: Bank: Add fields zip, town, country for owner of a bank account
NEW: batch referential objets
NEW: Can add the add now link on date into addfieldvalue()
NEW: Can add an array of several links in date selector
NEW: Can bin accounting line for a given month
NEW: Can edit account on miscellaneous payment (if not transfered)
NEW: Can edit inline the VAT number from supplier tab
NEW: Can fill date of salary payment with date of start of salary
NEW: Can go back to draft on shipment when stock change not on validate
NEW: Can modify bank account of sepa payment (if file not sent yet)
NEW: Customers: add date due and labels into customer comm card
NEW: Can select the export format during export of journals
NEW: Can set a checkbox in formconfirm by clicking on the label
NEW: Can set flag default value on email templates
NEW: Can set the page "List of opportunities" as landing page
NEW: Can show the sql request used on emailing selection
NEW: Can show the SQL request used on emailing selection
NEW: can stay on edit field when errors occurs
NEW: comment in api_mymodule for seperate methods
NEW: constant PROPALE_ADDON_NOTE_PUBLIC_DEFAULT
NEW: create email substitution variable for intervention signature URL
NEW: Contacts: presend mass action in contact list
NEW: Contacts: hook printFieldListFrom in contact list
NEW: Customers: add date due and labels into customer comm card
NEW: Debug the custom CSS feature to avoid a directory search/scan at
NEW: dev name
NEW: Disable bad reputation product price
NEW: dolExplodeIntoArray can accept regex
NEW: dol_sort_array can sort on alphabetical order even if val is num
NEW: element time integration code + SQL
NEW: Email: autofill email form with the email template with status "Default" on
NEW: Email: don't have closed contact proposed as receiver for the mails
NEW: Email: can set flag default value on email templates
NEW: Email-Collector: add field reply-to in email collector as possible filter
NEW: Email-Collector: substitute date now in email collector
NEW: Email-Collector: operation type in email collector to load or create contact
NEW: Email-Collector: easier setup - can also use ! for negative search
NEW: Email-Templates: show module into list of email templates
NEW: Events: can add any contact on events if global MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT is set at 1
NEW: Events: list with color
NEW: expend/collapse list of social networks
NEW: Filter on amount and qty on list of service's contracts
NEW: Events: remove default percentage for event creation url
NEW: formconfirm can support field with format datetime
NEW: getCommonSubstitutionArray to have more substitute keys
NEW: GeoIP: Can test a geoip conversion from the geoip setup page
NEW: GUI: add a CSS editor into the admin GUI
NEW: GUI: add dropdown button actions (example on Create button on project)
@@ -343,16 +649,17 @@ NEW: GUI: can set background style with MAIN_LOGIN_BACKGROUND_STYLE
NEW: Help: Tooltip to explain how to add a photo on a product
NEW: Help: Possibility to link to German pages in help
NEW: helper functions for dates + small demo case
NEW: hook printFieldListFrom in contact list
NEW: HR - Salary: can fill date of salary payment with date of start of salary
NEW: HR - Salary: can modify the date of payment of a salary (if not reconciled)
NEW: HR - Salary: date for salary payment includes the hour/min
NEW: HR - Salary: adding button Send Email on the salary file
NEW: Import: filter on entity in import
NEW: Import: map table to element for get entity in import
NEW: inc.php: handle parameters from argv
NEW: Invoice - show category of operations
NEW: Installation: Auto activate some modules on install (Export/Import/Wysiwyg editor)
NEW: Invoice: show category of operations
NEW: Invoice: add customer code to invoices listing
NEW: Keep a link between user created from recruitment and application
NEW: List product in orders
NEW: Mass Actions: Better responsive for mass actions
NEW: Members: add numbering modules for members
NEW: Members: add widget box_members_by_tags.php
@@ -366,75 +673,75 @@ NEW: No overwrite of optionals during put() contact
NEW: Notifications: add Customer Order delivered (ORDER_NEW) in module Notification
NEW: Notifications: for Sign or Refused Propal from Online Page
NEW: Now we can edit amount on VAT and salaries clone action
NEW: only get openned contact from liste_contact function, to not have acces to closed contact as mail receiver
NEW: only get opened contact from liste_contact function, to not have access to closed contact as mail receiver
NEW: Option: MAIN_SECURITY_MAXFILESIZE_DOWNLOADED #yogosha10660
NEW: Option to manage deposit slips for more payment modes (not only
NEW: Option to show column for field and line selection on the left
NEW: Orders: add sub total in order list det
NEW: Orders: list product in orders
NEW: Orders export: allow to export field 'shipment method'
NEW: payment default values when supplier order created from reception
NEW: Payment : manage contracts
NEW: presend mass action in contact list
NEW: Payment: manage contracts
NEW: Payment: sepaStripe now creates the payment mode with type pm_ using new API
NEW: Payment: add partial payment reason "withholding tax"
NEW: Payment: Can edit account on miscellaneous payment (if not transfered)
NEW: Print PDF: category of operation for crabe PDF model
NEW: Print PDF: Name and date to print on PDF Sign
NEW: Print PDF: Use the more recent PDF templates for documents by default on a fresh install
NEW: Print PDF: Option PDF_SHOW_PHONE_AFTER_USER_CONTACT to show phone after specific assigned contact on PDF
NEW: Print PDF: Option PDF_SHOW_EMAIL_AFTER_USER_CONTACT to show email after specific assigned contact on PDF
NEW: product images on popup are cached
NEW: Products: Add origin info when create a product batch when created from a movement stock
NEW: Products: Add statistics by amount on statistics of products.
NEW: Products: Add SQL contraint on product_stock table to allow only existing product and warehouse #23543
NEW: Proposals: filter for Signed+Billed in proposals
NEW: Proposals: can modify margin rates in offers like VAT rates
NEW: Proposals: option filter for NoSalesRepresentativeAffected in proposals list
NEW: Provide the oldcopy value when calling setValueFrom() function with a trigger key
NEW: Proposals: constant PROPALE_ADDON_NOTE_PUBLIC_DEFAULT
NEW: Reception: can receive more than qty ordered on reception
NEW: referential objects of batch
NEW: remove default percentage for event creation url
NEW: remove keys whose table element is the same as element in map list
NEW: repair script skip views
NEW: search on time spent duration range
NEW: Security: Save date to invalidate other session into user table
NEW: Security: Invalidate all sessions of a user when password is modified.
NEW: search on time spent duration range
NEW: sepaStripe now creates the payment mode with type pm_ using new API
NEW: set payment default values when supplier order created from reception
NEW: Service Contracts: Filter on amount and qty on list of service's contracts
NEW: set today start time at beginning
NEW: Show counter of access of website in website list
NEW: Show main currency in company info user tooltip
NEW: Show module into list of emails templates
NEW: Show picto into the combobox of widgets
NEW: Show supplier invoice ref of direct debit transfer tab invoices
NEW: show supplier name in getNomUrl of supplier order
NEW: sort of column of custom group of account
NEW: Supplier Invoices: add ability of ODT support to supplier invoices
NEW: Social Networks: expend/collapse list of social networks
NEW: Stock limit for alert and desired optimal stock by product and warehouse import
NEW: Stock: Add warehouse create and modify triggers.
NEW: Stock: Can select several warehouses into the view stock at date in past
NEW: Stripe: add STRIPE_DEBUG, a way to log Stripe IPN
NEW: Supplier Invoices: add ability of ODT support to supplier invoices
NEW: Supplier Order: show supplier name in getNomUrl of supplier order
NEW: Supplier Order: set payment default values when supplier order created from reception
NEW: Supplier Price: Add a status on supplier price ref (WIP to close a supplier ref)
NEW: Support different bank account for several direct debit payments
NEW: Support multiselect in the warehouse selection combo box
NEW: Option: MAIN_SECURITY_MAXFILESIZE_DOWNLOADED #yogosha10660
NEW: Survey: Comment on survey is possible only after vote.
NEW: tables: llx_element_time to store time spent on several elements (mo, ticket...)
NEW: TakePOS: adapt category and product pictures sizes on TakePOS
NEW: TakePOS: limit load products in TakePOS
NEW: The batch for remind on due date can be setup for using validation date
NEW: The refresh link for imap collector is always visible
NEW: The upgrade process can be done by creating a file upgrade.unlock
NEW: Tickets: --Send an email when ticket assigned--
NEW: The refresh link for IMAP collector is always visible
NEW: Third-Party: use an ajax component to switch prospection status on thirdparty list
NEW: Tickets: Send a notification email when ticket assigned
NEW: Tickets: set ticket status to answered if the client has answered from the public interface
NEW: Tickets: added an option to display the progress of tickets on the public interface
NEW: Tickets: add link to thirdparty tickets history
NEW: Tickets: notify also the contributor affected to a ticket if a new message public is post (add global TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ALSO_CONTRIBUTOR)
NEW: Upgrades: The upgrade process can be done by creating a file upgrade.unlock
NEW: Use a cache file for external RSS in calendar
NEW: Use by default the domain $dolibarr_main_url_root for SMTP HELO
NEW: use more recent model by default
NEW: Users: add a public virtual card page for each user
NEW: VAT can be modified during add of line
NEW: Website Module: Increment website counter on each page access in website module
NEW: write all fields and their properties in asciidoc format
NEW: Can add an array of several links in date selector
NEW: Option PDF_SHOW_PHONE_AFTER_USER_CONTACT to show phone after specific assigned contact on PDF
NEW: Option PDF_SHOW_EMAIL_AFTER_USER_CONTACT to show email after specific assigned contact on PDF
NEW: Website Module: Show counter of access of website in website list
NEW: Widgets: Show picto into the combobox of widgets
NEW: Widgets: Implement MAIN_ACTIVATE_FILECACHE on birthday widget
NEW: Widgets: Add widget "The next upcoming events"
NEW: Widgets: Add widget of open opportunities
NEW: use an ajax component to switch prospection status on thirdparty list
NEW: Add partial payment reason "withholding tax"
@@ -444,18 +751,28 @@ For developers or integrators:
NEW: Make it possible to select hours and minutes in form_confirm
NEW: add triggers on mailing
NEW: Add a trigger when create a shipping line batch and fix propagate missing errors
NEW: add function for listiong objects from directory
NEW: add function for listing objects from directory
NEW: add helplist property to describe fields of objects
NEW: add hook in loadLotStock() in html.formproduct.class.php file, add hook 'llxFooter', Add hook online sign
NEW: Update lib parsedownto 1.7.4, phpspreadsheet lib to v1.12, ESCPOS v3.0, jquery, Stripe.
NEW: Support contact in post() document API
NEW: More APIs (update currency rate, upload of supplier documents, ...)
NEW: API: Support contact in post() document API
NEW: API: more APIs (update currency rate, upload of supplier documents, ...)
NEW: Hooks: printFieldListFrom in contact list
NEW: Hooks: add hook in loadLotStock() in html.formproduct.class.php file
NEW: Hooks: add hook 'llxFooter'
NEW: Hooks: add hook online sign
NEW: Hooks: add sent info in the parameters provided to the hook sendMailAfter
NEW: Libraries: Update libs parsedownto 1.7.4, phpspreadsheet lib to v1.12, ESCPOS v3.0, jquery, Stripe.
NEW: ModuleBuilder: updating in modulbuilder on tab Menu when adding object
NEW: ModuleBuilder: add/edit permissions
NEW: ModuleBuilder: better generated documentation
NEW: add sent info in the parameters provided to the hook sendMailAfter
NEW: add setAsSelectUser into factory for generic setup page
NEW: add option keepspace into dol_string_nospecialchar()
NEW: dol_sort_array can sort on alphabetical order even if val is num
NEW: dolExplodeIntoArray can accept regex
NEW: element time integration code + SQL
NEW: tables: llx_element_time to store time spent on several elements (mo, ticket...)
NEW: Provide the oldcopy value when calling setValueFrom() function with a trigger key
NEW: getCommonSubstitutionArray to have more substitute keys
NEW: write all fields and their properties in asciidoc format
WARNING:

View File

@@ -70,7 +70,7 @@ Note: *Le processus de migration peut être lancé manuellement et plusieurs foi
## CE QUI EST NOUVEAU
See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
Voir le fichier [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog).
## CE QUE DOLIBARR PEUT FAIRE
@@ -88,11 +88,11 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
- Gestion de contrats de services
- Gestion de stock et inventaires
- Gestion des expéditions
- Gestion des demandes de congès
- Gestion des demandes de congés
- Gestion des notes de frais
- Gestion de recrutement
- GED (Gestion Electronique de Documents)
- EMailings de masse
- E-Mailings de masse
- Réalisation de sondages
- Gestion d'adhérents
- Point de vente/Caisse enregistreuse
@@ -107,17 +107,17 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
- Support des codes barres
- Calcul des marges
- Connectivité LDAP
- Intégratn de ClickToDial
- Intégration de ClickToDial
- Intégration RSS
- Intégation Skype
- Intégration de système de paiements (Paypal, Stripe, Paybox...)
- Intégration Skype
- Intégration de système de paiements (PayPal, Stripe, Paybox...)
-
### Divers
- Multi-langue.
- Multi-utilisateurs avec différents niveaux de permissions par module.
- Multi-devise.
- Multidevise.
- Peux être multi-société par ajout du module externe multi-société.
- Plusieurs thèmes visuels.
- Application simple à utiliser.
@@ -127,7 +127,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
- Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
- Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
- Support natif de nombreuses fonctions spécifiques aux pays comme:
- La tax espagnole TE et ISPF
- La taxe espagnole TE et ISPF
- Gestion de la TVA NPR (non perçue récupérable - pour les utilisateurs français des DOM-TOM)
- La loi française Finance 2016 et logiciels de caisse
- La double taxe canadienne
@@ -139,7 +139,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
### Extension
Dolibarr peut aussi être étendu à volonté avec l'ajout de module/applications externes développées par des développeus tiers, disponible sur [DoliStore](https://www.dolistore.com).
Dolibarr peut aussi être étendu à volonté avec l'ajout de modules/applications externes développées par des développeurs tiers, disponible sur [DoliStore](https://www.dolistore.com).
## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
@@ -168,15 +168,15 @@ Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/CO
## ACTUALITES ET RESEAUX SOCIAUX
Suivez le projet Dolibarr project sur les réseaux francophones
Suivez le projet Dolibarr sur les réseaux francophones
- [Facebook](https://www.facebook.com/dolibarr.fr)
- [Twitter](https://www.twitter.com/dolibarr_france)
- [X](https://www.twitter.com/dolibarr_france)
ou sur les réseaux anglophones
- [Facebook](https://www.facebook.com/dolibarr)
- [Twitter](https://www.twitter.com/dolibarr)
- [X](https://www.twitter.com/dolibarr)
- [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
- [GitHub](https://github.com/Dolibarr/dolibarr)

View File

@@ -9,7 +9,7 @@ Dolibarr ERP & CRM is a modern software package that helps manage your organizat
It's an Open Source Software suite (written in PHP with optional JavaScript enhancements) designed for small, medium or large companies, foundations and freelancers.
You can freely use, study, modify or distribute it according to its licence.
You can freely use, study, modify or distribute it according to its license.
You can use it as a standalone application or as a web application to access it from the Internet or a LAN.
@@ -47,9 +47,9 @@ On GNU/Linux, first check if your distribution has already packaged Dolibarr.
- Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
- Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommanded if you know git as it makes it easier if you want to upgrade later):
- Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommended if you know git as it makes it easier if you want to upgrade later):
`git clone https://github.com/dolibarr/dolibarr -b x.y` (where x.y is main version like 3.6, 9.0, ...)
`git clone https://github.com/dolibarr/dolibarr -b x.y` (where x.y is the main version like 3.6, 9.0, ...)
- Set up your web server to use "*dolibarr/htdocs*" as root if your web server does not have an already defined directory to point to.
@@ -57,7 +57,7 @@ On GNU/Linux, first check if your distribution has already packaged Dolibarr.
- From your browser, go to the dolibarr "install/" page
The URL will depends on how you web setup was setup to point to your dolibarr installation. It may looks like:
The URL will depends on how your web setup was set up to point to your dolibarr installation. It may look like:
`http://localhost/dolibarr/htdocs/install/`
@@ -71,7 +71,7 @@ On GNU/Linux, first check if your distribution has already packaged Dolibarr.
- Follow the installer instructions
### Saas/Cloud setup
### SaaS/Cloud setup
If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See [https://saas.dolibarr.org](https://saas.dolibarr.org)). However, this third solution is not free.
@@ -81,7 +81,7 @@ Dolibarr supports upgrading, usually without the need for any (commercial) suppo
- At first make a backup of your Dolibarr files & then [see](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
- Check that your installed PHP version is supported by the new version [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
- Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
- Overwrite all old files from the 'dolibarr' directory with files provided into the new version's package.
- At first next access, Dolibarr will redirect you to the "install/" page to follow the upgrade process.
 If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file in the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
@@ -98,13 +98,13 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
Product Management
- Products and/or Services catalog
- Products and/or Services catalogue
- Stock / Warehouse management + Inventory
- Barcodes
- Batches / Lots / Serials
- Product Variants
- Bill of Materials (BOM)
- Manufacturing Orders
- Manufacturing Orders (MO)
Customer/Sales Management
@@ -114,7 +114,8 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
- Customer Orders management
- Contracts/Subscription management
- Interventions management
- Ticket System
- Ticket System (+ Knowledge management)
- Partnership management
- Shipping management
- Customer Invoices/Credit notes and payment management
- Point of Sale (POS)
@@ -124,7 +125,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
- Suppliers/Vendors + Contacts
- Supplier (price) requests
- Purchase Orders management
- Delivery/Receiption
- Delivery/Reception
- Supplier Invoices/credit notes and payment management
- INCOTERMS
@@ -141,16 +142,18 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
Collaboration
- Shared calendar/agenda (with ical and vcal import/export for third party tools integration)
- Shared calendar/agenda (with ical and vcal import/export for third-party tools integration)
- Projects & Tasks management
- Event organization
- Ticket System
- Surveys
HR
HR - Human Resources Management
- Employee's leaves management
- Expense reports
- Recruitment management
- Employee/staff management
- Timesheets
### Other application/modules
@@ -168,20 +171,20 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
- Payment platforms integration (PayPal, Stripe, Paybox...)
- Email-Collector
(around 100 modules available by default, 1000+ on the addon market place)
(around 100 modules available by default, 1000+ addons at the official marketplace Dolistore.com)
### Other general features
- Multi-Language Support (Localization in most major languages)
- Multi-Users and groups with finely grained rights
- Multi-users and groups with finely-grained rights
- Multi-Currency
- Multi-Company (by adding of an external module)
- Very user friendly and easy to use
- Very user-friendly and easy to use
- Customizable dashboards
- Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
- APIs (REST, SOAP)
- Code that is easy to understand, maintain and develop (PHP with no heavy framework; trigger and hook architecture)
- Support a lot of country specific features:
- Support a lot of country-specific features:
- Spanish Tax RE and ISPF
- French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
- Canadian double taxes (federal/province) and other countries using cumulative VAT
@@ -189,7 +192,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
- Argentina invoice numbering using A,B,C...
- ZATCA e-invoicing QR-Code
- Compatible with [European directives](https://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
- Compatible with data privacy rules (europe GDPR, ...)
- Compatible with data privacy rules (Europe GDPR, ...)
- ...
- Flexible PDF & ODT generation for invoices, proposals, orders...
- ...
@@ -204,7 +207,7 @@ See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequ
### Extending
Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
Dolibarr can be extended with a lot of other external applications or modules from third-party developers available at the [DoliStore](https://www.dolistore.com).
## WHAT DOLIBARR CAN'T DO YET
@@ -212,19 +215,19 @@ These are features that Dolibarr does **not** yet fully support:
- Tasks dependencies in projects
- Payroll module
- No native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
- No native embedded Webmail, but you can send emails to contacts in Dolibarr with e.g. offers, invoices, etc.
- Dolibarr can't do coffee (yet)
## DOCUMENTATION
Administrator, user, developer and translator's documentations are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
Administrator, user, developer and translator's documentation are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
## CONTRIBUTING
This project exists thanks to all the people who contribute.
Please read the instructions how to contribute (report a bug/error, a feature request, send code ...) [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
Please read the instructions on how to contribute (report a bug/error, a feature request, send code ...) [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
A view on Contributors:
A View on Contributors:
[![Dolibarr](https://opencollective.com/dolibarr/contributors.svg?width=890&button=false)](https://github.com/Dolibarr/dolibarr/graphs/contributors)
@@ -239,7 +242,7 @@ See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) fil
Follow Dolibarr project on:
- [Facebook](https://www.facebook.com/dolibarr)
- [Twitter](https://www.twitter.com/dolibarr)
- [X](https://x.com/dolibarr)
- [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
- [Reddit](https://www.reddit.com/r/Dolibarr_ERP_CRM/)
- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)

View File

@@ -20,9 +20,9 @@ We believe that the future of software is online SaaS. This means software are m
If you believe you've found a security bug in our service, we are happy to work with you to resolve the issue promptly and ensure you are fairly rewarded for your discovery.
Any type of denial of service attacks is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.
Any type of denial-of-service attack is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.
We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: [https://www.dolibarr.org/download](https://www.dolibarr.org/download)) to get access on every side of application.
We recommend to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: [https://www.dolibarr.org/download](https://www.dolibarr.org/download)) to get access on every side of application.
### User Agent
@@ -30,7 +30,7 @@ If you try to find bug on Dolibarr, we recommend to append to your user-agent he
### Account access
You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put into your own web server virtual host from [https://www.dolibarr.org/download](https://www.dolibarr.org/download)
You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put in your own web server virtual host from [https://www.dolibarr.org/download](https://www.dolibarr.org/download)
## Eligibility and Responsible Disclosure
@@ -38,7 +38,7 @@ We are happy to thank everyone who submits valid reports which help us improve t
You must be the first reporter of the vulnerability (duplicate reports are closed).
You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommand to install software on your own platform.
You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommend to install software on your own platform.
You must not leak, manipulate, or destroy any user data of third parties to find your vulnerability.
@@ -48,27 +48,31 @@ Reports are processed around once a month.
ONLY vulnerabilities discovered, when the following setup on test platform is used, are "valid":
* The version to analyze must be the last version available into "develop" branch or into last stable "vX.Y" released version.
* $dolibarr_main_prod must be set to 1 into conf.php
* $dolibarr_nocsrfcheck must be kept to the value 0 into conf.php (this is the default value)
* The version to analyze must be the last version available in the "develop" branch. Reports on vulnerabilities already fixed (so already reported) in the develop branch will not be validated.
* $dolibarr_main_prod must be set to 1 in conf.php
* $dolibarr_nocsrfcheck must be kept to the value 0 in conf.php (this is the default value)
* $dolibarr_main_force_https must be set to something else than 0.
* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 3 into backoffice menu Home - Setup - Other (this protection should be set to 3 soon by default). CSRF attacks are accepted but
double check that you have set MAIN_SECURITY_CSRF_WITH_TOKEN to value 3.
* ONLY security reports on modules provided by default and with the "stable" status are valid (troubles into "experimental", "developement" or external modules are not valid vulnerabilities).
* Some constant must be set in the backoffice menu Home - Setup - Other
- MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 3
- MAIN_RESTRICTHTML_ONLY_VALID_HTML = 1
- MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 1
- MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 1
CSRF attacks and HTML injections are accepted but double check this setup that is experimental setup that already fix a lot of case and soon enabled by default.
* ONLY security reports on modules provided by default and with the "stable" status are valid (troubles in "experimental", "development" or external modules are not valid vulnerabilities).
* The root of web server must link to htdocs and the documents directory must be outside of the web server root (this is the default when using the default installer but may differs with external installer).
* The web server setup must be done so that only the documents directory is in write mode. The root directory called htdocs must be read-only.
* The modules DebugBar and ModuleBuilder must NOT be enabled. (by default, these modules are not enabled. They are developer tools)
* Ability for a high level user to edit web site pages into the CMS by including HTML or Javascript is an expected feature. Vulnerabilities into the website module are validated only if HTML or Javascript injection can be done by a non allowed user.
* Fail2ban rules for rate limit on the login page,password forgotten page, api calls and all public pages (/public/*) must be installed as recommendend into the section "About - Admin tools - Section Access limits and mitigation".
* Ability for a high-level user to edit web site pages in the CMS by including HTML or JavaScript is an expected feature. Vulnerabilities in the website module are validated only if HTML or JavaScript injection can be done by a non-allowed user.
* Fail2ban rules for rate limit on the login page, forgotten password page, API calls and all public pages (/public/*) must be installed as recommended in the section "About - Admin tools - Section Access limits and mitigation".
Scope is the web application (back office) and the APIs.
Scope is the web application (backoffice) and the APIs.
## Examples of vulnerabilities that are Qualified for reporting.
* Remote code execution (RCE)
* Local files access and manipulation (LFI, RFI, XXE, SSRF, XSPA)
* Code injections (JS, SQL, PHP). HTML are covered only for fields that are not description, notes or comments fields (where rich content is allowed on purpose).
* Cross-Site Scripting (XSS), except from setup page of module "External web site" (allowing any content here, editable by admin user only, is accepted on purpose) and except into module "Web site" when permission to edit website content is allowed (injecting any data in this case is allowed too).
* Cross-Site Scripting (XSS), except from setup page of module "External web site" (allowing any content here, editable by admin user only, is accepted on purpose) and except in the module "Web site" when permission to edit website content is allowed (injecting any data in this case is allowed too).
* Cross-Site Requests Forgery (CSRF) with real security impact (when using GET URLs, CSRF are qualified only for creating, updating or deleting data from pages restricted to admin users)
* Open redirect
* Broken authentication & session management
@@ -76,24 +80,21 @@ Scope is the web application (back office) and the APIs.
* Cross-Origin Resource Sharing (CORS) with real security impact
* Horizontal and vertical privilege escalation
* "HTTP Host Header" XSS
* Software version disclosure (for non admin users only)
* Stack traces or path disclosure (for non admin users only)
* Software version disclosure (for non-admin users only)
* Stack traces or path disclosure (for non-admin users only)
## Examples of vulnerabilities that are Non-qualified for reporting.
* "Self" XSS
* SSL/TLS best practices
* Denial of Service attacks
* Clickjacking/UI redressing
* Physical or social engineering attempts or issues that require physical access to a victims computer/device
* Presence of autocomplete attribute on web forms
* Vulnerabilities affecting outdated browsers or platforms, or vulnerabilities inside browsers themself.
* Logout and other instances of low-severity Cross-Site Request Forgery
* Missing security-related HTTP headers which do not lead directly to a vulnerability
* Reports from automated web vulnerability scanners (Acunetix, Vega, etc.) that have not been validated
* Reports on features on modules flagged as "deprecated", "experimental" or "development" if the module needs to be enabled for that (this is not the case on production).
* Software or libraries versions, private IP disclosure, Stack traces or path disclosure when logged-in user is admin.
* Any vulnerabilities due to a configuration different than the one defined in chapter "Scope for qualified vulnerabilities".
* Vulnerabilities affecting outdated browsers or platforms, or vulnerabilities inside browsers themself.
* Brute force attacks on login page, password forgotten page or any public pages (/public/*) are not qualified if the recommended fail2ban rules were not installed.
* SSL/TLS best practices
* Invalid or missing SPF (Sender Policy Framework) records (Incomplete or missing SPF/DKIM/DMARC)
* Reports on features flagged as "experimental" or "development"
* Software version or private IP disclosure when logged-in user is admin
* Stack traces or path disclosure when logged-in user is admin
* Any vulnerabilities due to a configuration different than the one defined into chapter "Scope for qualified vulnerabilities".
* Brute force attacks on login page, password forgotten page or any public pages (/public/*) are not qualified if the fail2ban recommended fail2ban rules were not installed.
* Physical or social engineering attempts or issues that require physical access to a victims computer/device

View File

@@ -1,16 +1,17 @@
<?php
$force_install_message='KeepDefaultValuesMamp';
$force_install_main_data_root='/Applications/MAMP/dolibarr_documents';
$force_install_type='mysqli';
$force_install_dbserver='localhost';
$force_install_port='8889';
$force_install_database='dolibarr';
$force_install_createdatabase='1';
$force_install_databaselogin='dolibarrmysql';
$force_install_databasepass='root';
$force_install_createuser='1';
$force_install_databaserootlogin='root';
$force_install_databaserootpass='root';
$force_install_dolibarrlogin='admin';
$force_install_nophpinfo='1';
$force_install_lockinstall='444';
$force_install_message = 'KeepDefaultValuesMamp';
$force_install_main_data_root = '/Applications/MAMP/dolibarr_documents';
$force_install_type = 'mysqli';
$force_install_dbserver = 'localhost';
$force_install_port = '8889';
$force_install_database = 'dolibarr';
$force_install_createdatabase = '1';
$force_install_databaselogin = 'dolibarrmysql';
$force_install_databasepass = 'root';
$force_install_createuser = '1';
$force_install_databaserootlogin = 'root';
$force_install_databaserootpass = 'root';
$force_install_dolibarrlogin = 'admin';
$force_install_nophpinfo = '1';
$force_install_lockinstall = '444';

View File

@@ -1,7 +1,7 @@
# How to use it ?
The docker-compose.yml file is a sample of a config file to use to build and run Dolibarr in the current workspace with Docker.
This docker image is intended for developpement usage.
This docker image is intended for development usage.
For production usage you should consider other contributor reference like https://hub.docker.com/r/tuxgasy/dolibarr
Before build/run, define the variable HOST_USER_ID as following:

View File

@@ -43,5 +43,5 @@ DoliWampWillStartApacheMysql=L'instal·lador DoliWamp intentarà iniciar o reini
OldVersionFoundAndMoveInNew=S'ha trobat una versió antiga de base de dades i ha estat moguda per a ser utilitzada per la nova versió de Dolibarr
OldVersionFoundButFailedToMoveInNew=S'ha trobat una versió antiga de base de dades, però no es pot moure per a ser utilitzada per la nova versió de Dolibarr
DLLMissing=La teva instal·lació windows no té el component "Microsoft Visual C++ Redistributable for Visual Studio 2015". Instal·la primer la versió de 32-bit (vcredist_x86.exe) (pots trobar-la a https://www.microsoft.com/en-us/download/) i reiniciar després la instal·lació/actualització de DoliWamp.
DLLMissing=La teva instal·lació windows no té el component "Microsoft Visual C++ Redistributable for Visual Studio 2017". Instal·la primer la versió de 32-bit (vcredist_x86.exe) (pots trobar-la a https://www.microsoft.com/en-us/download/) i reiniciar després la instal·lació/actualització de DoliWamp.
ContinueAnyway=Continua igualment (el procés d'instal·lació podria fallar sense aquest prerequisit)

View File

@@ -44,5 +44,5 @@ DoliWampWillStartApacheMysql=DoliWamp installer will now start or restart Apache
OldVersionFoundAndMoveInNew=An old database version has been found and moved to be used by the new Dolibarr version
OldVersionFoundButFailedToMoveInNew=An old database version has been found but could not be moved to be used with the new Dolibarr version
DLLMissing=Your Windows installation is missing The "Microsoft Visual C++ Redistributable for Visual Studio 2015" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
DLLMissing=Your Windows installation is missing The "Microsoft Visual C++ Redistributable for Visual Studio 2017" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170) and restart DoliWamp installation/upgrade after.
ContinueAnyway=Continue anyway (install process may fail without this prerequisite)

View File

@@ -2,47 +2,47 @@
[CustomMessages]
NameAndVersion=%1 version %2
AdditionalIcons=Ic<EFBFBD>nes suppl<EFBFBD>mentaires :
CreateDesktopIcon=Cr<EFBFBD>er une ic<EFBFBD>ne sur le &Bureau
CreateQuickLaunchIcon=Cr<EFBFBD>er une ic<EFBFBD>ne dans la barre de &Lancement rapide
AdditionalIcons=Icônes supplémentaires :
CreateDesktopIcon=Créer une icône sur le &Bureau
CreateQuickLaunchIcon=Créer une icône dans la barre de &Lancement rapide
ProgramOnTheWeb=Page d'accueil de %1
UninstallProgram=D<EFBFBD>sinstaller %1
LaunchProgram=Ex<EFBFBD>cuter %1
UninstallProgram=Désinstaller %1
LaunchProgram=Exécuter %1
AssocFileExtension=&Associer %1 avec l'extension de fichier %2
AssocingFileExtension=Associe %1 avec l'extension de fichier %2...
YouWillInstallDoliWamp=Vous allez installer DoliWamp sur votre ordinateur (donc Dolibarr + tous ses composants pr<EFBFBD>requis comme Apache, Mysql et PHP).
ThisAssistantInstallOrUpgrade=AVERTISSEMENT: L'utilisation d'un ERP CRM install<EFBFBD> sur un ordinateur local peut <EFBFBD>tre dangereuse: si votre ordinateur tombe en panne, vous pouvez perdre toutes vos donn<EFBFBD>es. Faites-le si vous <EFBFBD>tes pr<EFBFBD>t <EFBFBD> g<EFBFBD>rer les sauvegardes vous-m<EFBFBD>me s<EFBFBD>rieusement. Sinon, utilisez plut<EFBFBD>t une installation en Saas (voir https://saas.dolibarr.org).
IfYouHaveTechnicalKnowledge=De plus, si vous avez des comp<EFBFBD>tences techniques et envisagez de partager votre Apache, Mysql et PHP avec d''autres applications que Dolibarr, vous ne devriez pas utiliser cet assistant mais faire plut<EFBFBD>t une installation manuelle de Dolibarr sur un serveur existant <EFBFBD>quip<EFBFBD> de Apache, Mysql et PHP.
ButIfYouLook=Mais si vous recherchez une installation cl<EFBFBD> en main automatis<EFBFBD>e sur une poste local, vous <EFBFBD>tes sur la bonne voie...
DoYouWantToStart=Voulez-vous d<EFBFBD>marrer le processus d'installation ?
YouWillInstallDoliWamp=Vous allez installer DoliWamp sur votre ordinateur (donc Dolibarr + tous ses composants prérequis comme Apache, Mysql et PHP).
ThisAssistantInstallOrUpgrade=AVERTISSEMENT: L'utilisation d'un ERP CRM installé sur un ordinateur local peut être dangereuse: si votre ordinateur tombe en panne, vous pouvez perdre toutes vos données. Faites-le si vous êtes prêt à gérer les sauvegardes vous-même sérieusement. Sinon, utilisez plutôt une installation en Saas (voir https://saas.dolibarr.org).
IfYouHaveTechnicalKnowledge=De plus, si vous avez des compétences techniques et envisagez de partager votre Apache, Mysql et PHP avec d''autres applications que Dolibarr, vous ne devriez pas utiliser cet assistant mais faire plutôt une installation manuelle de Dolibarr sur un serveur existant équipé de Apache, Mysql et PHP.
ButIfYouLook=Mais si vous recherchez une installation clé en main automatisée sur une poste local, vous êtes sur la bonne voie...
DoYouWantToStart=Voulez-vous démarrer le processus d'installation ?
TechnicalParameters=Param<EFBFBD>tres techniques
IfFirstInstall=S'il s'agit de la premi<EFBFBD>re installation, merci de sp<EFBFBD>cifier ces quelques param<EFBFBD>tres techniques. Si vous ne les comprennez pas, <EFBFBD>tes non s<EFBFBD>r, ou proc<EFBFBD>dez <EFBFBD> une mise <EFBFBD> jour, laissez les champs avec les valeurs propos<EFBFBD>es par d<EFBFBD>faut.
TechnicalParameters=Paramètres techniques
IfFirstInstall=S'il s'agit de la première installation, merci de spécifier ces quelques paramètres techniques. Si vous ne les comprennez pas, êtes non sûr, ou procédez à une mise à jour, laissez les champs avec les valeurs proposées par défaut.
; WARNING !!! STRINGS FOR THIS 4 STRINGS MUST BE LOWER THAN 70 CHARACTERS
SMTPServer=Serveur SMTP (le votre ou de votre FAI, premi<EFBFBD>re installation uniquement):
ApachePort=Port Apache (premi<EFBFBD>re installation uniquement, le choix standard est 80):
MySqlPort=Port Mysql (premi<EFBFBD>re installation uniquement, le choix standard est 3306):
MySqlPassword=Mot de passe serveur+base MySql de root (premi<EFBFBD>re installation uniquement):
SMTPServer=Serveur SMTP (le votre ou de votre FAI, première installation uniquement):
ApachePort=Port Apache (première installation uniquement, le choix standard est 80):
MySqlPort=Port Mysql (première installation uniquement, le choix standard est 3306):
MySqlPassword=Mot de passe serveur+base MySql de root (première installation uniquement):
FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lock. Vous pouvez ignorer l'avertissement mais il est possible que vous deviez le supprimer manuellement plus tard. Dans ce cas, cela vous sera signal<EFBFBD>. Cliquez sur OK pour continuer...
FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lock. Vous pouvez ignorer l'avertissement mais il est possible que vous deviez le supprimer manuellement plus tard. Dans ce cas, cela vous sera signalé. Cliquez sur OK pour continuer...
PortAlreadyInUse=Le port %1 semble d<EFBFBD>j<EFBFBD> utilis<EFBFBD>. Il est recommand<EFBFBD> d'annuler pour revenir en arri<EFBFBD>re et sp<EFBFBD>cifier une autre valeur pour le port %2. Annuler le choix et choisir une autre valeur ?
PortAlreadyInUse=Le port %1 semble déjà utilisé. Il est recommandé d'annuler pour revenir en arrière et spécifier une autre valeur pour le port %2. Annuler le choix et choisir une autre valeur ?
FirefoxDetected=Firefox a <EFBFBD>t<EFBFBD> d<EFBFBD>tect<EFBFBD> sur votre ordinateur. Voulez-vous en faire votre navigateur par d<EFBFBD>faut pour Dolibarr ?
ChromeDetected=Chrome a <EFBFBD>t<EFBFBD> d<EFBFBD>tect<EFBFBD> sur votre ordinateur. Voulez-vous en faire votre navigateur par d<EFBFBD>faut pour Dolibarr ?
ChooseDefaultBrowser=Merci de choisir votre navigateur par d<EFBFBD>faut (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Si vous n'<EFBFBD>tes pas s<EFBFBD>r, cliquez simplement sur Ouvrir :
FirefoxDetected=Firefox a été détecté sur votre ordinateur. Voulez-vous en faire votre navigateur par défaut pour Dolibarr ?
ChromeDetected=Chrome a été détecté sur votre ordinateur. Voulez-vous en faire votre navigateur par défaut pour Dolibarr ?
ChooseDefaultBrowser=Merci de choisir votre navigateur par défaut (iexplore.exe, firefox.exe, chrome.exe, MicrosoftEdge.exe...). Si vous n'êtes pas sûr, cliquez simplement sur Ouvrir :
LaunchNow=Lancer Dolibarr maintenant
ProgramHasBeenRemoved=Les fichiers du programme Dolibarr ont <EFBFBD>t<EFBFBD> supprim<EFBFBD>s. Toutefois, tous vos fichiers de donn<EFBFBD>es sont toujours dans le r<EFBFBD>pertoire %1. Vous devez supprimer ce r<EFBFBD>pertoire manuellement pour avoir une d<EFBFBD>sinstallation compl<EFBFBD>te.
ProgramHasBeenRemoved=Les fichiers du programme Dolibarr ont été supprimés. Toutefois, tous vos fichiers de données sont toujours dans le répertoire %1. Vous devez supprimer ce répertoire manuellement pour avoir une désinstallation complète.
DoliWampWillStartApacheMysql=L'installeur DoliWamp va maintenant d<EFBFBD>marrer ou red<EFBFBD>marrer Apache et Mysql, ceci peut durer de quelques secondes <EFBFBD> une minute apr<EFBFBD>s cette confirmation. D<EFBFBD>marrer l'installation ou mise <EFBFBD> jour du serveur web et base de donn<EFBFBD>es requis par Dolibarr ?
DoliWampWillStartApacheMysql=L'installeur DoliWamp va maintenant démarrer ou redémarrer Apache et Mysql, ceci peut durer de quelques secondes à une minute après cette confirmation. Démarrer l'installation ou mise à jour du serveur web et base de données requis par Dolibarr ?
OldVersionFoundAndMoveInNew=Une ancienne version de base a <EFBFBD>t<EFBFBD> trouv<EFBFBD>e et d<EFBFBD>plac<EFBFBD>e pour fonctionner avec la nouvelle version de Dolibarr.
OldVersionFoundButFailedToMoveInNew=Une ancienne version de base a <EFBFBD>t<EFBFBD> trouv<EFBFBD>e mais ne peut <EFBFBD>tre d<EFBFBD>plac<EFBFBD>e pour <EFBFBD>tre utilis<EFBFBD>e avec la nouvelle version de Dolibarr.
OldVersionFoundAndMoveInNew=Une ancienne version de base a été trouvée et déplacée pour fonctionner avec la nouvelle version de Dolibarr.
OldVersionFoundButFailedToMoveInNew=Une ancienne version de base a été trouvée mais ne peut être déplacée pour être utilisée avec la nouvelle version de Dolibarr.
DLLMissing=L'installation de votre Windows est incompl<EFBFBD>te. Il manque le composant "Micrsoft Visual C++ Redistributable for Visual Studio 2015". Installer la version 32-bit (vcredist_x86.exe) d'abord (vous pourrez le trouver <EFBFBD> https://www.microsoft.com/fr-fr/download/) puis relancer l'installation de DoliWamp apr<EFBFBD>s.
ContinueAnyway=Continuer malgr<EFBFBD> tout (le process d'installaton <EFBFBD>chouera)
DLLMissing=L'installation de votre Windows est incomplète. Il manque le composant "Micrsoft Visual C++ Redistributable for Visual Studio 2017". Installer la version 32-bit (vcredist_x86.exe) d'abord (vous pourrez le trouver à https://www.microsoft.com/fr-fr/download/) puis relancer l'installation de DoliWamp après.
ContinueAnyway=Continuer malgré tout (le process d'installaton échouera)

View File

@@ -43,5 +43,5 @@ DoliWampWillStartApacheMysql=Die DoliWamp-Installation wird nun starten oder Apa
OldVersionFoundAndMoveInNew=Eine alte Datenbankversion wurde gefunden und verschoben, um von der neuen Dolibarr-Version verwendet zu werden.
OldVersionFoundButFailedToMoveInNew=Eine alte Datenbankversion wurde gefunden, konnte jedoch nicht verschoben werden, um mit der neuen Dolibarr-Version verwendet zu werden.
DLLMissing=Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2015" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
DLLMissing=Your Windows installation is missing The "Micrsoft Visual C++ Redistributable for Visual Studio 2017" component. Please install the 32-bit version (vcredist_x86.exe) first (you can find it at https://www.microsoft.com/en-us/download/) and restart DoliWamp installation/upgrade after.
ContinueAnyway=Fahren Sie trotzdem fort (der Installationsvorgang kann ohne diese Voraussetzung fehlschlagen).

View File

@@ -43,5 +43,5 @@ DoliWampWillStartApacheMysql=El instalador DoliWamp intentará iniciar o reinici
OldVersionFoundAndMoveInNew=Se ha encontrado una versión antigua de base de datos y ha sido movida para ser utilizada por la nueva versión de Dolibarr
OldVersionFoundButFailedToMoveInNew=Se ha encontrado una versión antigua de base de datos, pero no se pudo mover para ser utilizada por la nueva versión de Dolibarr
DLLMissing=Su instalación Windows no tiene el componente "Microsoft Visual C++ Redistributable for Visual Studio 2015". Instale primero la versión de 32-bit (vcredist_x86.exe) (puedes encontrarlo en https://www.microsoft.com/en-us/download/) y reiniciar después la instalación/actualización de DoliWamp.
DLLMissing=Su instalación Windows no tiene el componente "Microsoft Visual C++ Redistributable for Visual Studio 2017". Instale primero la versión de 32-bit (vcredist_x86.exe) (puedes encontrarlo en https://www.microsoft.com/en-us/download/) y reiniciar después la instalación/actualización de DoliWamp.
ContinueAnyway=Continua igualmente (el proceso de instalación podría fallar sin este prerequisito)

View File

@@ -1,5 +1,5 @@
#-------------------------------------------------------------------#
# Makefile
# Makefile to build UsedPort exe
#-------------------------------------------------------------------#
# 1.0 Laurent Destailleur Creation
#-------------------------------------------------------------------#

View File

@@ -253,6 +253,7 @@ int main(int argc, char **argv)
//----------------
int noarg,curseurarg,help=0,invalide=0;
char option;
char *endptr;
for (noarg=1;noarg<argc;noarg++) {
if (((argv[noarg][0])=='/') || ((argv[noarg][0])=='-')) {
@@ -261,7 +262,7 @@ for (noarg=1;noarg<argc;noarg++) {
if (strlen(argv[noarg]) < 3) { ++noarg; curseurarg=0; }
switch (option) {
case 's': strncpy(Host,argv[noarg]+curseurarg,sizeof(Host)); break;
case 'p': Port=atoi(argv[noarg]+curseurarg); break;
case 'p': Port=strtol(argv[noarg] + curseurarg, &endptr, 10); break; // Get port from "-p80" (curseurarg = 2) or "-p 80" (curseurarg = 0)
case '?': help=-1;break; // Help
case 'h': help=-1;break; // Help
case 'v': help=-1;break; // Help
@@ -270,6 +271,20 @@ for (noarg=1;noarg<argc;noarg++) {
}
}
// Check for conversion errors
if (*endptr != '\0') {
// Handle error: Invalid input format
printf("Invalid port number format\n");
exit(-1);
}
// Check for overflow
if (Port < 0 || Port > INT_MAX) {
// Handle error: Port number out of range
printf("Port number out of range\n");
exit(-1);
}
help=!(Port > 0);
// Show usage

View File

@@ -100,9 +100,9 @@ Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversi
; Apache, Php, Mysql
; Put here path of Wampserver applications
; Value OK: apache 2.4.51, php 7.3.33, mariadb10.6.5 (wampserver3.2.6_x64.exe)
; Value OK: apache 2.4.51, php 7.4.26, mariadb10.6.5 (wampserver3.2.6_x64.exe)
Source: "C:\wamp64\bin\apache\apache2.4.51\*.*"; DestDir: "{app}\bin\apache\apache2.4.51"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
Source: "C:\wamp64\bin\php\php7.3.33\*.*"; DestDir: "{app}\bin\php\php7.3.33"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
Source: "C:\wamp64\bin\php\php7.4.26\*.*"; DestDir: "{app}\bin\php\php7.4.26"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
Source: "C:\wamp64\bin\mariadb\mariadb10.6.5\*.*"; DestDir: "{app}\bin\mariadb\mariadb10.6.5"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
; Mysql data files (does not overwrite if exists)
@@ -121,7 +121,7 @@ Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flag
Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.51\conf"; Flags: ignoreversion;
Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mariadb\mariadb10.6.5"; Flags: ignoreversion;
Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.3.33"; Flags: ignoreversion;
Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.4.26"; Flags: ignoreversion;
Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
@@ -228,7 +228,7 @@ begin
//version des applis, a modifier pour chaque version de WampServer 2
apacheVersion := '2.4.51';
phpVersion := '7.3.33' ;
phpVersion := '7.4.26' ;
mysqlVersion := '10.6.5';
smtpServer := 'localhost';

View File

@@ -251,7 +251,7 @@ safe_mode_protected_env_vars = LD_LIBRARY_PATH
; and below. This directive makes most sense if used in a per-directory
; or per-virtualhost web server configuration file. This directive is
; *NOT* affected by whether Safe Mode is turned On or Off.
open_basedir = "WAMPROOT"
open_basedir = "WAMPROOT;C:\WINDOWS\TEMP"
; This directive allows you to disable certain functions for security reasons.
; It receives a comma-delimited list of function names. This directive is

View File

@@ -22,13 +22,13 @@
* \brief This script create a xml checksum file
*/
if (! defined('NOREQUIREDB')) {
if (!defined('NOREQUIREDB')) {
define('NOREQUIREDB', '1'); // Do not create database handler $db
}
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
$path=dirname(__FILE__).'/';
$path = dirname(__FILE__).'/';
// Test if batch mode
if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -44,9 +44,9 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
* Main
*/
$includecustom=0;
$includeconstants=array();
$buildzip=0;
$includecustom = 0;
$includeconstants = array();
$buildzip = 0;
if (empty($argv[1])) {
print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value] [buildzip=1]\n";
@@ -55,7 +55,7 @@ if (empty($argv[1])) {
}
$i=0;
$i = 0;
$result = array();
while ($i < $argc) {
if (!empty($argv[$i])) {
@@ -71,10 +71,10 @@ while ($i < $argc) {
$includeconstants[$i] = $result["includeconstant"];
}
if (!empty($result["buildzip"])) {
$buildzip=1;
$buildzip = 1;
}
if (preg_match('/includeconstant=/', strval($argv[$i]))) {
$tmp=explode(':', $result['includeconstant'], 3); // $includeconstant has been set with previous parse_str()
$tmp = explode(':', $result['includeconstant'], 3); // $includeconstant has been set with previous parse_str()
if (count($tmp) != 3) {
print "Error: Bad parameter includeconstant=".$result['includeconstant'] ."\n";
exit -1;
@@ -93,16 +93,16 @@ if (empty($release)) {
$savrelease = $release;
// If release is auto, we take current version
$tmpver=explode('-', $release, 2);
$tmpver = explode('-', $release, 2);
if ($tmpver[0] == 'auto' || $tmpver[0] == 'autostable') {
$release=DOL_VERSION;
$release = DOL_VERSION;
if ($tmpver[1] && $tmpver[0] == 'auto') {
$release.='-'.$tmpver[1];
$release .= '-'.$tmpver[1];
}
}
if (empty($includecustom)) {
$tmpverbis=explode('-', $release, 2);
$tmpverbis = explode('-', $release, 2);
if (empty($tmpverbis[1]) || $tmpver[0] == 'autostable') {
if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto') {
print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
@@ -110,7 +110,7 @@ if (empty($includecustom)) {
exit -1;
}
} else {
$tmpverter=explode('-', DOL_VERSION, 2);
$tmpverter = explode('-', DOL_VERSION, 2);
if ($tmpverter[0] != $tmpverbis[0]) {
print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
@@ -118,7 +118,7 @@ if (empty($includecustom)) {
}
}
} else {
if (! preg_match('/'.preg_quote(DOL_VERSION, '/').'-/', $release)) {
if (!preg_match('/'.preg_quote(DOL_VERSION, '/').'-/', $release)) {
print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parameter (ex: '.DOL_VERSION.'-mydistrib).'."\n";
print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
exit -1;
@@ -137,13 +137,13 @@ foreach ($includeconstants as $countrycode => $tmp) {
print "\n";
//$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
$outputdir=dirname(dirname(__FILE__)).'/htdocs/install';
$outputdir = dirname(dirname(__FILE__)).'/htdocs/install';
print 'Delete current files '.$outputdir.'/filelist*.xml*'."\n";
dol_delete_file($outputdir.'/filelist*.xml*', 0, 1, 1);
$checksumconcat=array();
$checksumconcat = array();
$outputfile=$outputdir.'/filelist-'.$release.'.xml';
$outputfile = $outputdir.'/filelist-'.$release.'.xml';
$fp = fopen($outputfile, 'w');
if (empty($fp)) {
print 'Failed to open file '.$outputfile."\n";
@@ -156,8 +156,8 @@ fputs($fp, '<checksum_list version="'.$release.'" date="'.dol_print_date(dol_now
foreach ($includeconstants as $countrycode => $tmp) {
fputs($fp, '<dolibarr_constants country="'.$countrycode.'">'."\n");
foreach ($tmp as $constname => $constvalue) {
$valueforchecksum=(empty($constvalue)?'0':$constvalue);
$checksumconcat[]=$valueforchecksum;
$valueforchecksum = (empty($constvalue) ? '0' : $constvalue);
$checksumconcat[] = $valueforchecksum;
fputs($fp, ' <constant name="'.$constname.'">'.$valueforchecksum.'</constant>'."\n");
}
fputs($fp, '</dolibarr_constants>'."\n");
@@ -172,26 +172,26 @@ $files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom
*/
// Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.php)
$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
$regextoexclude = '('.($includecustom?'':'custom|').'documents|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
$files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
$dir='';
$needtoclose=0;
$dir = '';
$needtoclose = 0;
foreach ($files as $filetmp) {
$file = $filetmp['fullname'];
//$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
if ($newdir!=$dir) {
if ($newdir != $dir) {
if ($needtoclose) {
fputs($fp, ' </dir>'."\n");
}
fputs($fp, ' <dir name="'.$newdir.'">'."\n");
$dir = $newdir;
$needtoclose=1;
$needtoclose = 1;
}
if (filetype($file)=="file") {
$md5=md5_file($file);
$checksumconcat[]=$md5;
if (filetype($file) == "file") {
$md5 = md5_file($file);
$checksumconcat[] = $md5;
fputs($fp, ' <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
}
}
@@ -205,7 +205,7 @@ fputs($fp, md5(join(',', $checksumconcat))."\n");
fputs($fp, '</dolibarr_htdocs_dir_checksum>'."\n");
$checksumconcat=array();
$checksumconcat = array();
fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n");
@@ -215,27 +215,27 @@ $iterator2 = new RecursiveIteratorIterator($dir_iterator2);
// Need to ignore document custom etc. Note: this also ignore natively symbolic links.
$files = new RegexIterator($iterator2, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
*/
$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
$regextoexclude='(custom|documents|conf|install)$'; // Exclude dirs
$regextoinclude = '\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
$regextoexclude = '(custom|documents|conf|install)$'; // Exclude dirs
$files = dol_dir_list(dirname(__FILE__).'/../scripts/', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
$dir='';
$needtoclose=0;
$dir = '';
$needtoclose = 0;
foreach ($files as $filetmp) {
$file = $filetmp['fullname'];
//$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
if ($newdir!=$dir) {
if ($newdir != $dir) {
if ($needtoclose) {
fputs($fp, ' </dir>'."\n");
}
fputs($fp, ' <dir name="'.$newdir.'" >'."\n");
$dir = $newdir;
$needtoclose=1;
$needtoclose = 1;
}
if (filetype($file)=="file") {
$md5=md5_file($file);
$checksumconcat[]=$md5;
if (filetype($file) == "file") {
$md5 = md5_file($file);
$checksumconcat[] = $md5;
fputs($fp, ' <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
}
}

View File

@@ -2,7 +2,7 @@
#----------------------------------------------------------------------------
# \file build/makepack-dolibarr.pl
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
# \author (c)2004-2020 Laurent Destailleur <eldy@users.sourceforge.net>
# \author (c)2004-2023 Laurent Destailleur <eldy@users.sourceforge.net>
#
# This is list of constant you can set to have generated packages moved into a specific dir:
#DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'
@@ -369,12 +369,12 @@ if ($nboftargetok) {
}
if (! $BUILD || $BUILD eq '0-rc') # For a major version
{
print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log `git rev-list --boundary '.$MAJOR.'.'.$MINOR.'..origin/develop | grep ^- | cut -c2- | head -n 1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\|PERF\|SEC\|QUAL\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
}
else # For a maintenance release
{
#print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\'| sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. | grep -v "Merge branch" | grep -v "Merge pull" | grep "^ " | sed -e "s/^[0-9a-z]* *//" | grep -e \'^FIX\|NEW\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
#print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e \'^FIX\|NEW\|PERF\|SEC\|QUAL\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\'| sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
print 'cd ~/git/dolibarr_'.$MAJOR.'.'.$MINOR.'; git log '.$MAJOR.'.'.$MINOR.'.'.($BUILD-1).'.. | grep -v "Merge branch" | grep -v "Merge pull" | grep "^ " | sed -e "s/^[0-9a-z]* *//" | grep -e \'^FIX\|NEW\|PERF\|SEC\|QUAL\|CLOSE\' | sort -u | sed \'s/FIXED:/FIX:/g\' | sed \'s/FIXED :/FIX:/g\' | sed \'s/FIX :/FIX:/g\' | sed \'s/FIX /FIX: /g\' | sed \'s/CLOSE/NEW/g\' | sed \'s/NEW :/NEW:/g\' | sed \'s/NEW /NEW: /g\' > /tmp/aaa';
}
print "\n";
if (! $ret)
@@ -538,6 +538,8 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/security`;
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/tools/php-cs-fixer/vendor`;
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/tools/rector/vendor`;
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/uml`;
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/vagrant`;
$ret=`rm -fr $BUILDROOT/$PROJECT/dev/xdebug`;
@@ -581,6 +583,7 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/factory*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/forceproject*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/lead*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/langs/*/README.md`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/management*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/multicompany*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/ndf*`;
@@ -627,15 +630,21 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/tests`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/tests`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/LICENSE`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/examples`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/examples`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/vendor`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/webmozart`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/autoload.php`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/bin`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/bin`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/*/bin`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/*/*/bin`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/*/*/*/bin`;
}
# Build package for each target

View File

@@ -29,12 +29,13 @@ Prerequisites to build autoexe DoliWamp package from Windows:
> Install Perl for Windows (https://strawberryperl.com/)
> Install isetup-5.5.8.exe (https://www.jrsoftware.org)
> Install WampServer-3.2.*-64.exe (Apache 2.4.51, PHP 7.3.33, MariaDB 10.6.5 for example. Version must match the values found into doliwamp.iss)
> Install Microsoft Visual C++ Redistributable 2017 (https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170)
> Install WampServer-3.2.6-64.exe (Apache 2.4.51, PHP 7.4.26, MariaDB 10.6.5 for example. Version must match the values found into doliwamp.iss)
> Install GIT for Windows (https://git-scm.com/ => You must choose option "Add Git bash profile", "Git commit as-is")
> Install Dolibarr current version:
git clone https://github.com/dolibarr/dolibarr or git clone --branch X.Y https://github.com/dolibarr/dolibarr
> Add the path of PHP (C:\wamp64\bin\php\php7.3.33) and InnoSetup (C:\Program Files (x86)\Inno Setup 5) into the %PATH% of Windows.
> Add the path of PHP (C:\wamp64\bin\php\php7.4.26) and InnoSetup (C:\Program Files (x86)\Inno Setup 5) into the %PATH% of Windows.
> Create a config file c:\dolibarr\dolibarr\htdocs\conf\conf.php with content
<?php
@@ -43,6 +44,7 @@ Prerequisites to build autoexe DoliWamp package from Windows:
***** Actions to do a BETA *****
This files describe steps made by Dolibarr packaging team to make a
beta version of Dolibarr, step by step.
@@ -67,6 +69,7 @@ Recopy the content of the output file into the file ChangeLog.
***** Actions to do a RELEASE *****
This files describe steps made by Dolibarr packaging team to make a
complete release of Dolibarr, step by step.

View File

@@ -3,9 +3,7 @@ README (English)
Building a Patch file
##################################################
This directory contains tools to build a patch
after a developer has made changes on files in its
Dolibarr tree.
The output patch file can then be submited on Dolibarr
dev mailing-list, with explanation on its goal, for
inclusion in main branch.
This directory contains tools to build a patch after a developer has made changes on files in its Dolibarr tree.
The output patch file can then be submited on Dolibarr dev mailing-list, with explanation on its goal, for inclusion in main branch.
Using this tool is now deprecated. You must use git pull requests to submit contributions.

View File

@@ -1,9 +1,22 @@
PHPStan
https://phpstan.org
PHPStan (https://phpstan.org)
-----------------------------
PHPStan requires PHP >= 7.1
Install: composer require --dev phpstan/phpstan
Config File is: ./phpstan.neon
Config File: phpstan.neon
In dolibarr/build/phpstan
mkdir phpstan
cd phpstan
composer require --dev phpstan/phpstan
Build report from CLI:
In dolibarr/
mv htdocs/custom /tmp/
php build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/commande/class
php build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/
mv /tmp/custom htdocs
Build HTML report from Cron:
Example of line to add into a cron to generate a HTML report:
0 1 5 * * cd /home/dolibarr/preview.dolibarr.org/dolibarr; chmod -R u+w /home/dolibarr/preview.dolibarr.org/dolibarr; git pull; /home/dolibarr/phpstan/vendor/bin/phpstan -v analyze -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=github | awk ' BEGIN{ print "Date "strftime("%Y-%m-%d")"<br>" } { print $0"<br>" } END{ print NR } ' > /home/dolibarr/doxygen.dolibarr.org/phpstan/index.html

View File

@@ -1,11 +1,16 @@
<?php
// Defined some constants and load Dolibarr env to reduce PHPStan bootstrap that fails to load a lot of things.
//define('DOL_DOCUMENT_ROOT', __DIR__ . '/../../htdocs');
//define('DOL_DATA_ROOT', __DIR__ . '/../../documents');
//define('DOL_URL_ROOT', '/');
// Load the main.inc.php file to have functions env defined
if (! defined("NOLOGIN")) define("NOLOGIN", '1');
if (! defined("NOHTTPSREDIRECT")) define("NOHTTPSREDIRECT", '1');
if (!defined("NOLOGIN")) {
define("NOLOGIN", '1');
}
if (!defined("NOHTTPSREDIRECT")) {
define("NOHTTPSREDIRECT", '1');
}
global $conf, $langs, $user, $db;
include_once __DIR__ . '/../../htdocs/main.inc.php';

View File

@@ -1,4 +1,5 @@
<?php
//
// Take a look at conf.php.example file for an example of conf.php file
// and explanations for all possibles parameters.

1
dev/.gitignore vendored
View File

@@ -1 +1,2 @@
/spec
/tools/rector/vendor/

View File

@@ -18,7 +18,7 @@ With
CKEDITOR (4.6.2):
CKEDITOR (4.22.1):
-----------------
* In ckeditor/ckeditor/contents.css
Replace:
@@ -26,7 +26,12 @@ Replace:
With
body { ... margin: 5px;
* In ckeditor/ckeditor/ckeditor.js
Replace:
d.items&&
With
d&&d.items&&
ESCPOS:
-------
@@ -36,40 +41,59 @@ With
protected $connector;
SABRE:
------
rm -fr ./htdocs/includes/sabre/sabre/bin;
rm -fr ./htdocs/includes/sabre/sabre/*/bin;
rm -fr ./htdocs/includes/sabre/sabre/*/*/bin;
rm -fr ./htdocs/includes/sabre/sabre/*/*/*/bin;
rm -fr ./htdocs/includes/sabre/sabre/*/*/*/*/bin;
NUSOAP:
-------
* In file nusoap.php, to avoid a warning,
Replace
if (isset($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {
By
if (! is_array($this->methodreturn) && isset($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {
* Line 1257 of file nusoap.php. Add:
* In file nusoap.php, to avoid a warning,
Replace call to serialize_val with no bugged value
libxml_disable_entity_loader(true); // Avoid load of external entities (security problem). Required only for libxml < 2.
* Line 4346 of file nusoap.php
* In all files, replace constructor names into __construct. Replace also parent::constructor_name with parent::__construct
$rev = array();
preg_match('/\$Revision: ([^ ]+)/', $this->revision, $rev);
$this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".(isset($rev[1]) ? $rev[1] : '').")";
* Line 4222 of file nusoap.php
$rev = array();
preg_match('/\$Revision: ([^ ]+)/', $this->revision, $rev);
$this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".(isset($rev[1]) ? $rev[1] : '').")";
* Line 6566 of file nusoap.php, replace
if (count($attrs) > 0) {
with
if (is_array($attrs) && count($attrs) > 0) {
TCPDF:
------
* Replace in tcpdf.php:
* Modify in tcpdf.php: make TCPDF::_out public.
(htdocs/core/lib/pdf.lib.php uses it as a public method)
Change:
protected function _out($s)
to
public function _out($s)
Change in method's _out phpdoc:
* @protected
to
* @public
* Replace in tcpdf.php:
if (isset($this->imagekeys)) {
foreach($this->imagekeys as $file) {
unlink($file);
}
}
with
if (isset($this->imagekeys)) {
foreach($this->imagekeys as $file) {
// DOL CHANGE If we keep this, source image files are physically destroyed
@@ -77,8 +101,7 @@ with
}
}
* Replace in tcpdf.php
* Replace in tcpdf.php:
$preserve = array(
'file_id',
'internal_encoding',
@@ -86,9 +109,7 @@ with
'bufferlen',
'buffer',
'cached_files',
with
$preserve = array(
'file_id',
'internal_encoding',
@@ -99,14 +120,11 @@ with
// @CHANGE DOL
'imagekeys',
* Replace in tcpdf.php
* Replace in tcpdf.php:
if (!@TCPDF_STATIC::file_exists($file)) {
return false;
}
with
if (!@TCPDF_STATIC::file_exists($file)) {
// DOL CHANGE If we keep this, the image is not visible on pages after the first one.
//var_dump($file.' '.(!@TCPDF_STATIC::file_exists($file)));
@@ -116,13 +134,10 @@ with
$file = $tfile;
}
}
* Replace in tcpdf.php
* Replace in tcpdf.php:
if (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
with
// @CHANGE LDR Add support for src="file://..." links
if (strpos($imgsrc, 'file://') === 0) {
$imgsrc = str_replace('file://', '/', $imgsrc);
@@ -138,12 +153,10 @@ with
}
elseif (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
* In tecnickcom/tcpdf/include/tcpdf_static.php, in function fopenLocal, replace
* In tecnickcom/tcpdf/include/tcpdf_static.php, in function fopenLocal, replace:
if (strpos($filename, '://') === false) {
with
if (strpos($filename, '//') === 0) {
// Share folder on a (windows) server
// e.g.: "//[MyServerName]/[MySharedFolder]/"
@@ -152,11 +165,16 @@ with
}
elseif (strpos($filename, '://') === false)
* To avoid to have QRcode changed because generated with a random mask, replace
* To avoid to have QRcode changed because generated with a random mask, replace:
define('QR_FIND_FROM_RANDOM', 2);
with:
with
define('QR_FIND_FROM_RANDOM', false);
* Change line:
imagesetpixel($imgalpha, $xpx, $ypx, $alpha);
into
imagesetpixel($imgalpha, $xpx, $ypx, (int) $alpha);
* Removed useless directories ("examples", "tools")
* Optionnaly, removed all fonts except
@@ -184,6 +202,23 @@ In htdocs/includes/tecnickcom/tcpdf/tcpdf.php
return strval($number);
}
* Add this at begin of tcpdf_autoconfig.php
// @CHANGE LDR DOCUMENT_ROOT fix for IIS Webserver
if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
if (isset($_SERVER['SCRIPT_FILENAME']) && isset($_SERVER['PHP_SELF'])) {
$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF'])));
} elseif(isset($_SERVER['PATH_TRANSLATED'])) {
$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF'])));
} else {
// define here your DOCUMENT_ROOT path if the previous fails (e.g. '/var/www')
$_SERVER['DOCUMENT_ROOT'] = '/';
}
}
$_SERVER['DOCUMENT_ROOT'] = str_replace('//', '/', $_SERVER['DOCUMENT_ROOT']);
if (substr($_SERVER['DOCUMENT_ROOT'], -1) != '/') {
$_SERVER['DOCUMENT_ROOT'] .= '/';
}
TCPDI:

View File

@@ -25,7 +25,7 @@
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
$path=dirname(__FILE__).'/';
$path = dirname(__FILE__).'/';
// Test if batch mode
if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,13 +34,13 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
}
// Global variables
$version='1.7';
$error=0;
$version = '1.7';
$error = 0;
// -------------------- START OF YOUR CODE HERE --------------------
// Include Dolibarr environment
require_once $path."../../htdocs/master.inc.php";
require_once $path."../../../htdocs/master.inc.php";
// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
//$langs->setDefaultLang('en_US'); // To change default language of $langs
@@ -48,8 +48,8 @@ $langs->load("main"); // To load language file for default language
@set_time_limit(0);
// Load user and its permissions
$result=$user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
if (! $result > 0) {
$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
if (!$result > 0) {
dol_print_error('', $user->error);
exit;
}
@@ -74,20 +74,20 @@ $obj->note_public = 'A public comment';
$obj->note_private = 'A private comment';
$obj->cond_reglement_id = 1;
$line1=new FactureLigne($db);
$line1->tva_tx=10.0;
$line1->remise_percent=0;
$line1->qty=1;
$line1->total_ht=100;
$line1->total_tva=10;
$line1->total_ttc=110;
$obj->lines[]=$line1;
$line1 = new FactureLigne($db);
$line1->tva_tx = 10.0;
$line1->remise_percent = 0;
$line1->qty = 1;
$line1->total_ht = 100;
$line1->total_tva = 10;
$line1->total_ttc = 110;
$obj->lines[] = $line1;
// Create invoice
$idobject=$obj->create($user);
$idobject = $obj->create($user);
if ($idobject > 0) {
// Change status to validated
$result=$obj->validate($user);
$result = $obj->validate($user);
if ($result > 0) {
print "OK Object created with id ".$idobject."\n";
} else {
@@ -102,7 +102,7 @@ if ($idobject > 0) {
// -------------------- END OF YOUR CODE --------------------
if (! $error) {
if (!$error) {
$db->commit();
print '--- end ok'."\n";
} else {

View File

@@ -25,7 +25,7 @@
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
$path=dirname(__FILE__).'/';
$path = dirname(__FILE__).'/';
// Test if batch mode
if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,13 +34,13 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
}
// Global variables
$version='1.11';
$error=0;
$version = '1.11';
$error = 0;
// -------------------- START OF YOUR CODE HERE --------------------
// Include Dolibarr environment
require_once $path."../../htdocs/master.inc.php";
require_once $path."../../../htdocs/master.inc.php";
// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
//$langs->setDefaultLang('en_US'); // To change default language of $langs
@@ -48,8 +48,8 @@ $langs->load("main"); // To load language file for default language
@set_time_limit(0);
// Load user and its permissions
$result=$user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
if (! $result > 0) {
$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
if (!$result > 0) {
dol_print_error('', $user->error);
exit;
}
@@ -75,17 +75,17 @@ $com->note_private = 'A private comment';
$com->source = 1;
$com->remise_percent = 0;
$orderline1=new OrderLine($db);
$orderline1->tva_tx=10.0;
$orderline1->remise_percent=0;
$orderline1->qty=1;
$com->lines[]=$orderline1;
$orderline1 = new OrderLine($db);
$orderline1->tva_tx = 10.0;
$orderline1->remise_percent = 0;
$orderline1->qty = 1;
$com->lines[] = $orderline1;
// Create order
$idobject=$com->create($user);
$idobject = $com->create($user);
if ($idobject > 0) {
// Change status to validated
$result=$com->valid($user);
$result = $com->valid($user);
if ($result > 0) {
print "OK Object created with id ".$idobject."\n";
} else {
@@ -100,7 +100,7 @@ if ($idobject > 0) {
// -------------------- END OF YOUR CODE --------------------
if (! $error) {
if (!$error) {
$db->commit();
print '--- end ok'."\n";
} else {

View File

@@ -25,7 +25,7 @@
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
$path=dirname(__FILE__).'/';
$path = dirname(__FILE__).'/';
// Test if batch mode
if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,13 +34,13 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
}
// Global variables
$version='1.10';
$error=0;
$version = '1.10';
$error = 0;
// -------------------- START OF YOUR CODE HERE --------------------
// Include Dolibarr environment
require_once $path."../../htdocs/master.inc.php";
require_once $path."../../../htdocs/master.inc.php";
// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
//$langs->setDefaultLang('en_US'); // To change default language of $langs
@@ -48,8 +48,8 @@ $langs->load("main"); // To load language file for default language
@set_time_limit(0);
// Load user and its permissions
$result=$user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
if (! $result > 0) {
$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
if (!$result > 0) {
dol_print_error('', $user->error);
exit;
}
@@ -65,7 +65,7 @@ $db->begin();
require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
// Create instance of object
$myproduct=new Product($db);
$myproduct = new Product($db);
// Definition of product instance properties
$myproduct->ref = '1234';
@@ -91,7 +91,7 @@ if ($idobject > 0) {
// -------------------- END OF YOUR CODE --------------------
if (! $error) {
if (!$error) {
$db->commit();
print '--- end ok'."\n";
} else {

View File

@@ -25,7 +25,7 @@
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
$path=dirname(__FILE__).'/';
$path = dirname(__FILE__).'/';
// Test if batch mode
if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,13 +34,13 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
}
// Global variables
$version='1.7';
$error=0;
$version = '1.7';
$error = 0;
// -------------------- START OF YOUR CODE HERE --------------------
// Include Dolibarr environment
require_once $path."../../htdocs/master.inc.php";
require_once $path."../../../htdocs/master.inc.php";
// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
//$langs->setDefaultLang('en_US'); // To change default language of $langs
@@ -48,8 +48,8 @@ $langs->load("main"); // To load language file for default language
@set_time_limit(0);
// Load user and its permissions
$result=$user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
if (! $result > 0) {
$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
if (!$result > 0) {
dol_print_error('', $user->error);
exit;
}
@@ -71,10 +71,10 @@ $obj->login = 'ABCDEF';
$obj->nom = 'ABCDEF';
// Create user
$idobject=$obj->create($user);
$idobject = $obj->create($user);
if ($idobject > 0) {
// Change status to validated
$result=$obj->setStatut(1);
$result = $obj->setStatut(1);
if ($result > 0) {
print "OK Object created with id ".$idobject."\n";
} else {
@@ -82,7 +82,7 @@ if ($idobject > 0) {
dol_print_error($db, $obj->error);
}
} elseif ($obj->error == 'ErrorLoginAlreadyExists') {
print "User with login ".$obj->login." already exists\n";
print "User with login ".$obj->login." already exists\n";
} else {
$error++;
dol_print_error($db, $obj->error);
@@ -91,7 +91,7 @@ if ($idobject > 0) {
// -------------------- END OF YOUR CODE --------------------
if (! $error) {
if (!$error) {
$db->commit();
print '--- end ok'."\n";
} else {

View File

@@ -25,7 +25,7 @@
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
$path=dirname(__FILE__).'/';
$path = dirname(__FILE__).'/';
// Test if batch mode
if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,13 +34,13 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
}
// Global variables
$version='1.7';
$error=0;
$version = '1.7';
$error = 0;
// -------------------- START OF YOUR CODE HERE --------------------
// Include Dolibarr environment
require_once $path."../../htdocs/master.inc.php";
require_once $path."../../../htdocs/master.inc.php";
// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
//$langs->setDefaultLang('en_US'); // To change default language of $langs
@@ -48,8 +48,8 @@ $langs->load("main"); // To load language file for default language
@set_time_limit(0);
// Load user and its permissions
$result=$user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
if (! $result > 0) {
$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
if (!$result > 0) {
dol_print_error('', $user->error);
exit;
}
@@ -57,7 +57,7 @@ $user->getrights();
print "***** ".$script_file." (".$version.") *****\n";
if (! isset($argv[1])) { // Check parameters
if (!isset($argv[1])) { // Check parameters
print "Usage: ".$script_file." id_thirdparty ...\n";
exit;
}
@@ -72,9 +72,9 @@ require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
// Create contract object
$obj = new Contrat($db);
$obj->socid=$argv[1];
$obj->socid = $argv[1];
$listofcontractsforcompany=$obj->getListOfContracts('all');
$listofcontractsforcompany = $obj->getListOfContracts('all');
print $listofcontractsforcompany;

View File

@@ -0,0 +1,124 @@
{
"id": "evt_123456789",
"object": "event",
"api_version": "2023-10-16",
"created": 1702053463,
"data": {
"object": {
"id": "pi_123456789",
"object": "payment_intent",
"amount": 60,
"amount_capturable": 0,
"amount_details": {
"tip": {
}
},
"amount_received": 0,
"application": null,
"application_fee_amount": null,
"automatic_payment_methods": null,
"canceled_at": null,
"cancellation_reason": null,
"capture_method": "automatic",
"client_secret": "pi_123456789_secret_123456789",
"confirmation_method": "automatic",
"created": 1702053448,
"currency": "eur",
"customer": "cus_123456789",
"description": "Stripe payment from makeStripeSepaRequest: DID=31262-INV=123-CUS=123 did=123 ref=FA2312-123",
"invoice": null,
"last_payment_error": {
"code": "",
"decline_code": "generic_decline",
"message": "The transaction can't be processed because your customer's account information is missing or incorrect. Collect a new mandate and ask your customer to provide their name and address exactly as it appears on their bank account. After this, you can attempt the transaction again.",
"payment_method": {
"id": "pm_123456789",
"object": "payment_method",
"billing_details": {
"address": {
"city": null,
"country": "FR",
"line1": null,
"line2": null,
"postal_code": null,
"state": null
},
"email": "email@example.com",
"name": "Test example",
"phone": null
},
"created": 1692688898,
"customer": "cus_123456789",
"livemode": false,
"metadata": {
"dol_version": "19.0.0-dev",
"dol_thirdparty_id": "123",
"ipaddress": "1.2.3.4",
"dol_id": "123",
"dol_type": "companypaymentmode",
"dol_entity": "1"
},
"sepa_debit": {
"bank_code": "123",
"branch_code": "",
"country": "AT",
"fingerprint": "123456789",
"generated_from": {
"charge": null,
"setup_attempt": null
},
"last4": "3202"
},
"type": "sepa_debit"
},
"type": "card_error"
},
"latest_charge": "py_123456789",
"livemode": false,
"metadata": {
"dol_version": "19.0.0-beta",
"dol_thirdparty_id": "123",
"ipaddress": "1.2.3.4",
"dol_id": "123",
"dol_type": "facture",
"dol_entity": "1"
},
"next_action": null,
"on_behalf_of": null,
"payment_method": null,
"payment_method_configuration_details": null,
"payment_method_options": {
"card": {
"installments": null,
"mandate_options": null,
"network": null,
"request_three_d_secure": "automatic"
},
"sepa_debit": {
}
},
"payment_method_types": [
"card",
"sepa_debit"
],
"processing": null,
"receipt_email": null,
"review": null,
"setup_future_usage": null,
"shipping": null,
"source": null,
"statement_descriptor": "DID=123-",
"statement_descriptor_suffix": "DID=123-",
"status": "requires_payment_method",
"transfer_data": null,
"transfer_group": null
}
},
"livemode": false,
"pending_webhooks": 1,
"request": {
"id": null,
"idempotency_key": null
},
"type": "payment_intent.payment_failed"
}

View File

@@ -15,7 +15,7 @@
"npm": ">=5.6.0"
},
"dependencies": {
"zapier-platform-core": "11.3.1"
"zapier-platform-core": "15.0.1"
},
"devDependencies": {
"mocha": "^5.2.0",

View File

@@ -1,5 +1,7 @@
README
------
Scripts in this directory can be used to load or purge data of a database instance.
Scripts in this directory can be used to load massive data or purge data of a database instance.
WARNING: Some of this script may delete definitely data.
To init data for a demo, use instead the tool into dev/initdemo

View File

@@ -45,9 +45,9 @@ require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
* Parameters
*/
define(GEN_NUMBER_FACTURE, 1);
define('GEN_NUMBER_FACTURE', $argv[1] ?? 1);
$year = 2016;
$dates = array (mktime(12, 0, 0, 1, 3, $year),
$dates = array(mktime(12, 0, 0, 1, 3, $year),
mktime(12, 0, 0, 1, 9, $year),
mktime(12, 0, 0, 2, 13, $year),
mktime(12, 0, 0, 2, 23, $year),
@@ -168,7 +168,8 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0) {
$result=$object->validate($fuser);
if ($result) {
print " OK with ref ".$object->ref."\n";;
print " OK with ref ".$object->ref."\n";
;
} else {
dol_print_error($db, $object->error);
}

View File

@@ -51,9 +51,9 @@ require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
* Parametre
*/
define(GEN_NUMBER_COMMANDE, 10);
define('GEN_NUMBER_COMMANDE', $argv[1] ?? 10);
$year = 2016;
$dates = array (mktime(12, 0, 0, 1, 3, $year),
$dates = array(mktime(12, 0, 0, 1, 3, $year),
mktime(12, 0, 0, 1, 9, $year),
mktime(12, 0, 0, 2, 13, $year),
mktime(12, 0, 0, 2, 23, $year),

View File

@@ -50,7 +50,7 @@ include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
* Parameters
*/
define(GEN_NUMBER_PRODUIT, 100000);
define('GEN_NUMBER_PRODUIT', $argv[1] ?? 100);
$ret=$user->fetch('', 'admin');
@@ -64,18 +64,24 @@ $user->getrights();
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
$resql=$db->query($sql);
if ($resql) {
$num = $db->num_rows($resql); $i = 0;
$num = $db->num_rows($resql);
$i = 0;
while ($i < $num) {
$row = $db->fetch_row($resql); $productsid[$i] = $row[0]; $i++;
$row = $db->fetch_row($resql);
$productsid[$i] = $row[0];
$i++;
}
}
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
$resql=$db->query($sql);
if ($resql) {
$num = $db->num_rows($resql); $i = 0;
$num = $db->num_rows($resql);
$i = 0;
while ($i < $num) {
$row = $db->fetch_row($resql); $societesid[$i] = $row[0]; $i++;
$row = $db->fetch_row($resql);
$societesid[$i] = $row[0];
$i++;
}
} else {
print "err";
@@ -84,9 +90,12 @@ if ($resql) {
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
$resql=$db->query($sql);
if ($resql) {
$num = $db->num_rows($resql); $i = 0;
$num = $db->num_rows($resql);
$i = 0;
while ($i < $num) {
$row = $db->fetch_row($resql); $commandesid[$i] = $row[0]; $i++;
$row = $db->fetch_row($resql);
$commandesid[$i] = $row[0];
$i++;
}
} else {
print "err";
@@ -99,7 +108,7 @@ for ($s = 0; $s < GEN_NUMBER_PRODUIT; $s++) {
$produit = new Product($db);
$produit->type = mt_rand(0, 1);
$produit->status = 1;
$produit->ref = ($produit->type?'S':'P').time().$s;
$produit->ref = ($produit->type ? 'S' : 'P').time().$s;
$produit->label = 'Label '.time().$s;
$produit->description = 'Description '.time().$s;
$produit->price = mt_rand(1, 999.99);

View File

@@ -47,9 +47,9 @@ require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
* Parameters
*/
define(GEN_NUMBER_PROPAL, 10);
define('GEN_NUMBER_PROPAL', $argv[1] ?? 10);
$year = 2016;
$dates = array (mktime(12, 0, 0, 1, 3, $year),
$dates = array(mktime(12, 0, 0, 1, 3, $year),
mktime(12, 0, 0, 1, 9, $year),
mktime(12, 0, 0, 2, 13, $year),
mktime(12, 0, 0, 2, 23, $year),
@@ -152,8 +152,8 @@ $user->rights->propal->creer=1;
$user->rights->propal->propal_advance->validate=1;
if (!empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php")) {
require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php";
if (getDolGlobalString('PROPALE_ADDON') && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/" . getDolGlobalString('PROPALE_ADDON').".php")) {
require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/" . getDolGlobalString('PROPALE_ADDON').".php";
}
$i=0;

View File

@@ -53,7 +53,7 @@ $listoflastname = array("Joe","Marc","Steve","Laurent","Nico","Isabelle","Doroth
* Parametre
*/
define(GEN_NUMBER_SOCIETE, 10);
define('GEN_NUMBER_SOCIETE', $argv[1] ?? 10);
$ret=$user->fetch('', 'admin');
@@ -67,7 +67,8 @@ $user->getrights();
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
$resql=$db->query($sql);
if ($resql) {
$num = $db->num_rows($resql); $i = 0;
$num = $db->num_rows($resql);
$i = 0;
while ($i < $num) {
$row = $db->fetch_row($resql);
$productsid[$i] = $row[0];
@@ -78,7 +79,8 @@ if ($resql) {
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
$resql=$db->query($sql);
if ($resql) {
$num = $db->num_rows($resql); $i = 0;
$num = $db->num_rows($resql);
$i = 0;
while ($i < $num) {
$row = $db->fetch_row($resql);
$societesid[$i] = $row[0];
@@ -91,7 +93,8 @@ if ($resql) {
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
$resql=$db->query($sql);
if ($resql) {
$num = $db->num_rows($resql); $i = 0;
$num = $db->num_rows($resql);
$i = 0;
while ($i < $num) {
$row = $db->fetch_row($resql);
$commandesid[$i] = $row[0];
@@ -117,12 +120,13 @@ for ($s = 0; $s < GEN_NUMBER_SOCIETE; $s++) {
$soc->country_id=1;
$soc->country_code='FR';
// Un client sur 3 a une remise de 5%
$user_remise=mt_rand(1, 3); if ($user_remise==3) {
$user_remise=mt_rand(1, 3);
if ($user_remise==3) {
$soc->remise_percent=5;
}
print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
$soc->note_private = 'Company created by the script generate-societe.php';
$socid = $soc->create();
$socid = $soc->create($user);
if ($socid >= 0) {
$rand = mt_rand(1, 4);

View File

@@ -62,9 +62,9 @@ dol_syslog($script_file." launched with arg ".implode(',', $argv));
$mode = $argv[1];
$filepath = $argv[2];
$filepatherr = $filepath.'.err';
$defaultlang = empty($argv[3])?'en_US':$argv[3];
$startlinenb = empty($argv[4])?1:$argv[4];
$endlinenb = empty($argv[5])?0:$argv[5];
$defaultlang = empty($argv[3]) ? 'en_US' : $argv[3];
$startlinenb = empty($argv[4]) ? 1 : $argv[4];
$endlinenb = empty($argv[5]) ? 0 : $argv[5];
if (empty($mode) || ! in_array($mode, array('test','confirm','confirmforced')) || empty($filepath)) {
print "Usage: $script_file (test|confirm|confirmforced) filepath.csv [defaultlang] [startlinenb] [endlinenb]\n";

View File

@@ -63,8 +63,8 @@ $mode = $argv[1];
$filepath = $argv[2];
$filepatherr = $filepath.'.err';
//$defaultlang = empty($argv[3])?'en_US':$argv[3];
$startlinenb = empty($argv[3])?1:$argv[3];
$endlinenb = empty($argv[4])?0:$argv[4];
$startlinenb = empty($argv[3]) ? 1 : $argv[3];
$endlinenb = empty($argv[4]) ? 0 : $argv[4];
if (empty($mode) || ! in_array($mode, array('test','confirm','confirmforced')) || empty($filepath)) {
print "Usage: $script_file (test|confirm|confirmforced) filepath.csv [startlinenb] [endlinenb]\n";
@@ -128,8 +128,8 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
$object->client = $fields[7];
$object->fournisseur = $fields[8];
$object->name = $fields[13]?trim($fields[13]):$fields[0];
$object->name_alias = $fields[0]!=$fields[13]?trim($fields[0]):'';
$object->name = $fields[13] ? trim($fields[13]) : $fields[0];
$object->name_alias = $fields[0] != $fields[13] ? trim($fields[0]) : '';
$object->address = trim($fields[14]);
$object->zip = trim($fields[15]);

View File

@@ -63,8 +63,8 @@ $mode = $argv[1];
$filepath = $argv[2];
$filepatherr = $filepath.'.err';
//$defaultlang = empty($argv[3])?'en_US':$argv[3];
$startlinenb = empty($argv[3])?1:$argv[3];
$endlinenb = empty($argv[4])?0:$argv[4];
$startlinenb = empty($argv[3]) ? 1 : $argv[3];
$endlinenb = empty($argv[4]) ? 0 : $argv[4];
if (empty($mode) || ! in_array($mode, array('test','confirm','confirmforced')) || empty($filepath)) {
print "Usage: $script_file (test|confirm|confirmforced) filepath.csv [startlinenb] [endlinenb]\n";

View File

@@ -5,15 +5,17 @@
#
# Laurent Destailleur - eldy@users.sourceforge.net
#------------------------------------------------------
# Usage: initdemopassword.sh confirm
# Usage: initdemopassword.sh confirm
# usage: initdemopassword.sh confirm base port login pass
#------------------------------------------------------
# shellcheck disable=2006,2034,2046,2064,2068,2086,2155,2166,2186,2172,2268
# shellcheck disable=2012,2016,2154
export mydir=`echo "$0" | sed -e 's/initdemopassword.sh//'`;
if [ "x$mydir" = 'x' -o "x$mydir" = 'x./' ]
then
export mydir="."
export mydir="."
fi
export id=`id -u`;
@@ -56,103 +58,107 @@ then
fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
trap "rm -f $fichtemp" 0 1 2 5 15
$DIALOG --title "Reset login password" --clear \
--inputbox "Mysql database name :" 16 55 dolibarrdemo 2> $fichtemp
--inputbox "Mysql database name :" 16 55 dolibarrdemo 2> $fichtemp
valret=$?
case $valret in
0)
base=`cat $fichtemp`;;
1)
exit;;
255)
exit;;
0)
base=`cat $fichtemp` ;;
1)
exit ;;
255)
exit ;;
esac
rm $fichtemp
# ---------------------------- database port
DIALOG=${DIALOG=dialog}
fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
trap "rm -f $fichtemp" 0 1 2 5 15
$DIALOG --title "Reset login password" --clear \
--inputbox "Mysql port (ex: 3306):" 16 55 3306 2> $fichtemp
--inputbox "Mysql port (ex: 3306):" 16 55 3306 2> $fichtemp
valret=$?
case $valret in
0)
port=`cat $fichtemp`;;
1)
exit;;
255)
exit;;
0)
port=`cat $fichtemp` ;;
1)
exit ;;
255)
exit ;;
esac
rm $fichtemp
# ----------------------------- demo login
DIALOG=${DIALOG=dialog}
DIALOG="$DIALOG --ascii-lines"
fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
trap "rm -f $fichtemp" 0 1 2 5 15
$DIALOG --title "Reset login password" --clear \
--inputbox "Login to reset :" 16 55 dolibarrdemologin 2> $fichtemp
--inputbox "Login to reset :" 16 55 dolibarrdemologin 2> $fichtemp
valret=$?
case $valret in
0)
demologin=`cat $fichtemp`;;
1)
exit;;
255)
exit;;
0)
demologin=`cat $fichtemp` ;;
1)
exit ;;
255)
exit ;;
esac
rm fichtemp
# ----------------------------- demo pass
DIALOG=${DIALOG=dialog}
DIALOG="$DIALOG --ascii-lines"
fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
trap "rm -f $fichtemp" 0 1 2 5 15
$DIALOG --title "Reset login password" --clear \
--inputbox "Pass to set :" 16 55 dolibarrdemopass 2> $fichtemp
--inputbox "Pass to set :" 16 55 dolibarrdemopass 2> $fichtemp
valret=$?
case $valret in
0)
demopass=`cat $fichtemp`;;
1)
exit;;
255)
exit;;
0)
demopass=`cat $fichtemp` ;;
1)
exit ;;
255)
exit ;;
esac
rm fichtemp
export documentdir=`cat $mydir/../../htdocs/conf/conf.php | grep '^\$dolibarr_main_data_root' | sed -e 's/$dolibarr_main_data_root=//' | sed -e 's/;//' | sed -e "s/'//g" | sed -e 's/"//g' `
# ---------------------------- confirmation
DIALOG=${DIALOG=dialog}
$DIALOG --title "Reset login password" --clear \
--yesno "Do you confirm ? \n Mysql database : '$base' \n Mysql port : '$port' \n Demo login: '$demologin' \n Demo password : '$demopass'" 15 55
--yesno "Do you confirm ? \n Mysql database : '$base' \n Mysql port : '$port' \n Demo login: '$demologin' \n Demo password : '$demopass'" 15 55
case $? in
0) echo "Ok, start process...";;
1) exit;;
255) exit;;
0) echo "Ok, start process..." ;;
1) exit ;;
255) exit ;;
esac
fi
# ---------------------------- run sql file
if [ "x$port" != "x0" ]
then
export Pport="-P$port"
fi
if [ "x$passwd" != "x" ]
then
export passwd="-p$passwd"
fi
#echo "mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile"
#mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
#echo "mysql $Pport -u$admin $passwd $base < $mydir/$dumpfile"
#mysql $Pport -u$admin $passwd $base < $mydir/$dumpfile
if [ "x${demopasshash}" != "xpassword_hash" ]
then
echo '<?php echo MD5("'$demopass'"); ?>' > /tmp/tmp.php
echo '<?php echo MD5("'$demopass'"); ?>' > /tmp/tmp.php
newpass=`php -f /tmp/tmp.php`
else
echo '<?php echo password_hash("'$demopass'", PASSWORD_DEFAULT); ?>' > /tmp/tmp.php
@@ -160,22 +166,22 @@ else
fi
#rm /tmp/tmp.php
echo "echo \"UPDATE llx_user SET pass_crypted = '$newpass' WHERE login = '$demologin';\" | mysql -P$port $base"
echo "UPDATE llx_user SET pass_crypted = '$newpass' WHERE login = '$demologin';" | mysql -P$port $base
echo "echo \"UPDATE llx_user SET pass_crypted = '$newpass' WHERE login = '$demologin';\" | mysql $Pport $base"
echo "UPDATE llx_user SET pass_crypted = '$newpass' WHERE login = '$demologin';" | mysql $Pport $base
export res=$?
if [ $res -ne 0 ]; then
echo "Error to execute sql with mysql -P$port -u$admin -p***** $base"
echo "Error to execute sql with mysql $Pport -u$admin -p***** $base"
exit
fi
fi
if [ -s "$mydir/initdemopostsql.sql" ]; then
echo A file initdemopostsql.sql was found, we execute it.
echo "mysql -P$port $base < \"$mydir/initdemopostsql.sql\""
mysql -P$port $base < "$mydir/initdemopostsql.sql"
echo "mysql $Pport $base < \"$mydir/initdemopostsql.sql\""
mysql $Pport $base < "$mydir/initdemopostsql.sql"
else
echo No file initdemopostsql.sql found, so no extra sql action done.
fi
fi
if [ "x$res" = "x0" ]

File diff suppressed because one or more lines are too long

View File

@@ -4655,75 +4655,6 @@ INSERT INTO `llx_menu` VALUES (19289,'all',1,'cashdesk','top','cashdesk',0,NULL,
/*!40000 ALTER TABLE `llx_menu` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `llx_milestone`
--
DROP TABLE IF EXISTS `llx_milestone`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `llx_milestone` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`fk_element` int(11) NOT NULL,
`elementtype` varchar(16) NOT NULL,
`label` varchar(255) NOT NULL,
`options` varchar(255) DEFAULT NULL,
`priority` int(11) DEFAULT '0',
`tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`fk_user_modif` int(11) DEFAULT NULL,
PRIMARY KEY (`rowid`),
UNIQUE KEY `uk_milestone_fk_element` (`fk_element`,`elementtype`),
KEY `idx_milestone_fk_user_modif` (`fk_user_modif`),
CONSTRAINT `fk_milestone_fk_user_modif` FOREIGN KEY (`fk_user_modif`) REFERENCES `llx_user` (`rowid`)
) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `llx_milestone`
--
LOCK TABLES `llx_milestone` WRITE;
/*!40000 ALTER TABLE `llx_milestone` DISABLE KEYS */;
INSERT INTO `llx_milestone` VALUES (2,779,'facture','azerty',NULL,0,'2013-03-09 12:19:30',NULL),(3,780,'facture','fsdf',NULL,0,'2013-03-09 13:01:08',NULL),(4,781,'facture','hhh',NULL,0,'2013-03-09 14:06:37',NULL);
/*!40000 ALTER TABLE `llx_milestone` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `llx_monitoring_probes`
--
DROP TABLE IF EXISTS `llx_monitoring_probes`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `llx_monitoring_probes` (
`rowid` int(11) NOT NULL AUTO_INCREMENT,
`title` varchar(64) NOT NULL,
`groupname` varchar(64) DEFAULT NULL,
`url` varchar(250) NOT NULL,
`useproxy` int(11) DEFAULT '0',
`checkkey` varchar(250) DEFAULT NULL,
`maxval` int(11) DEFAULT NULL,
`frequency` int(11) DEFAULT '60',
`active` int(11) DEFAULT '1',
`status` int(11) DEFAULT '0',
`lastreset` datetime DEFAULT NULL,
`oldesterrortext` text,
`oldesterrordate` datetime DEFAULT NULL,
PRIMARY KEY (`rowid`),
UNIQUE KEY `uk_monitoring_probes` (`title`)
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `llx_monitoring_probes`
--
LOCK TABLES `llx_monitoring_probes` WRITE;
/*!40000 ALTER TABLE `llx_monitoring_probes` DISABLE KEYS */;
INSERT INTO `llx_monitoring_probes` VALUES (1,'aaa',NULL,'http://www.chiensderace.com',0,'chiens',1000,10,1,1,'2011-04-20 23:46:41',NULL,NULL),(2,'ChatsDeRace',NULL,'http://www.chatsderace.com',0,'chats',1000,5,1,1,'2011-04-20 23:46:41',NULL,NULL);
/*!40000 ALTER TABLE `llx_monitoring_probes` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `llx_notify`
--

View File

@@ -245,6 +245,16 @@ export list="
--ignore-table=$base.llx_c_ticketsup_category
--ignore-table=$base.llx_c_ticketsup_severity
--ignore-table=$base.llx_c_ticketsup_type
--ignore-table=$base.llx_cabinetmed_c_banques
--ignore-table=$base.llx_cabinetmed_c_examconclusion
--ignore-table=$base.llx_cabinetmed_cons_extrafields
--ignore-table=$base.llx_cabinetmed_diaglec
--ignore-table=$base.llx_cabinetmed_examaut
--ignore-table=$base.llx_cabinetmed_exambio
--ignore-table=$base.llx_cabinetmed_examenprescrit
--ignore-table=$base.llx_cabinetmed_motifcons
--ignore-table=$base.llx_cabinetmed_patient
--ignore-table=$base.llx_cabinetmed_societe
--ignore-table=$base.llx_congespayes
--ignore-table=$base.llx_congespayes_config
--ignore-table=$base.llx_congespayes_events
@@ -328,6 +338,8 @@ export list="
--ignore-table=$base.tmp_llx_accouting_account
--ignore-table=$base.tmp_llx_product_batch
--ignore-table=$base.tmp_llx_product_batch2
--ignore-table=$base.tmp_tmp
--ignore-table=$base.tmp_user
"
echo "mysqldump -P$port -u$admin -p***** $list $base > $mydir/$dumpfile"
mysqldump -P$port -u$admin $passwd $list $base > $mydir/$dumpfile

View File

@@ -21,7 +21,7 @@
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
$path=dirname(__FILE__).'/';
$path = dirname(__FILE__).'/';
// Test if batch mode
if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -30,39 +30,39 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
}
// Global variables
$error=0;
$error = 0;
$sourceserver=isset($argv[1])?$argv[1]:''; // user@server:/src/file
$password=isset($argv[2])?$argv[2]:'';
$dataserver=isset($argv[3])?$argv[3]:'';
$database=isset($argv[4])?$argv[4]:'';
$loginbase=isset($argv[5])?$argv[5]:'';
$passwordbase=isset($argv[6])?$argv[6]:'';
$sourceserver = isset($argv[1]) ? $argv[1] : ''; // user@server:/src/file
$password = isset($argv[2]) ? $argv[2] : '';
$dataserver = isset($argv[3]) ? $argv[3] : '';
$database = isset($argv[4]) ? $argv[4] : '';
$loginbase = isset($argv[5]) ? $argv[5] : '';
$passwordbase = isset($argv[6]) ? $argv[6] : '';
// Include Dolibarr environment
$res=0;
if (! $res && file_exists($path."../../master.inc.php")) {
$res=@include $path."../../master.inc.php";
$res = 0;
if (!$res && file_exists($path."../../master.inc.php")) {
$res = @include $path."../../master.inc.php";
}
if (! $res && file_exists($path."../../htdocs/master.inc.php")) {
$res=@include $path."../../htdocs/master.inc.php";
if (!$res && file_exists($path."../../htdocs/master.inc.php")) {
$res = @include $path."../../htdocs/master.inc.php";
}
if (! $res && file_exists("../master.inc.php")) {
$res=@include "../master.inc.php";
if (!$res && file_exists("../master.inc.php")) {
$res = @include "../master.inc.php";
}
if (! $res && file_exists("../../master.inc.php")) {
$res=@include "../../master.inc.php";
if (!$res && file_exists("../../master.inc.php")) {
$res = @include "../../master.inc.php";
}
if (! $res && file_exists("../../../master.inc.php")) {
$res=@include "../../../master.inc.php";
if (!$res && file_exists("../../../master.inc.php")) {
$res = @include "../../../master.inc.php";
}
if (! $res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
$res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
$res = @include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
}
if (! $res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
$res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
$res = @include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
}
if (! $res) {
if (!$res) {
die("Failed to include master.inc.php file\n");
}
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -72,13 +72,13 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
* Main
*/
$login='';
$server='';
$login = '';
$server = '';
if (preg_match('/^(.*)@(.*):(.*)$/', $sourceserver, $reg)) {
$login=$reg[1];
$server=$reg[2];
$sourcefile=$reg[3];
$targetfile=basename($sourcefile);
$login = $reg[1];
$server = $reg[2];
$sourcefile = $reg[3];
$targetfile = basename($sourcefile);
}
if (empty($sourceserver) || empty($server) || empty($login) || empty($sourcefile) || empty($password) || empty($database) || empty($loginbase) || empty($passwordbase)) {
print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh databaseserver databasename loginbase passbase\n";
@@ -88,22 +88,23 @@ if (empty($sourceserver) || empty($server) || empty($login) || empty($sourcefile
}
$targetdir='/tmp';
$targetdir = '/tmp';
print "Get dump file from server ".$server.", path ".$sourcefile.", connect with login ".$login." loaded into localhost\n";
$sftpconnectstring=$sourceserver;
$sftpconnectstring = $sourceserver;
print 'SFTP connect string : '.$sftpconnectstring."\n";
//print 'SFTP password '.$password."\n";
// SFTP connect
if (! function_exists("ssh2_connect")) {
dol_print_error('', 'ssh2_connect function does not exists'); exit(1);
if (!function_exists("ssh2_connect")) {
dol_print_error('', 'ssh2_connect function does not exists');
exit(1);
}
$connection = ssh2_connect($server, 22);
if ($connection) {
if (! @ssh2_auth_password($connection, $login, $password)) {
if (!@ssh2_auth_password($connection, $login, $password)) {
dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password), LOG_ERR);
exit(-5);
} else {
@@ -121,16 +122,16 @@ if ($connection) {
print 'Get file '.$sourcefile.' into '.$targetdir.$targetfile."\n";
ssh2_scp_recv($connection, $sourcefile, $targetdir.$targetfile);
$fullcommand="cat ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
$fullcommand = "cat ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
if (preg_match('/\.bz2$/', $targetfile)) {
$fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
$fullcommand = "bzip2 -c -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
}
if (preg_match('/\.gz$/', $targetfile)) {
$fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
$fullcommand = "gzip -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
}
print "Load dump with ".$fullcommand."\n";
$output=array();
$return_var=0;
$output = array();
$return_var = 0;
print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n";
exec($fullcommand, $output, $return_var);
foreach ($output as $line) {

View File

@@ -21,7 +21,7 @@
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
$path=dirname(__FILE__).'/';
$path = dirname(__FILE__).'/';
// Test if batch mode
if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -30,34 +30,34 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
}
// Global variables
$error=0;
$error = 0;
$confirm=isset($argv[1])?$argv[1]:'';
$confirm = isset($argv[1]) ? $argv[1] : '';
// Include Dolibarr environment
$res=0;
if (! $res && file_exists($path."../../master.inc.php")) {
$res=@include $path."../../master.inc.php";
$res = 0;
if (!$res && file_exists($path."../../master.inc.php")) {
$res = @include $path."../../master.inc.php";
}
if (! $res && file_exists($path."../../htdocs/master.inc.php")) {
$res=@include $path."../../htdocs/master.inc.php";
if (!$res && file_exists($path."../../htdocs/master.inc.php")) {
$res = @include $path."../../htdocs/master.inc.php";
}
if (! $res && file_exists("../master.inc.php")) {
$res=@include "../master.inc.php";
if (!$res && file_exists("../master.inc.php")) {
$res = @include "../master.inc.php";
}
if (! $res && file_exists("../../master.inc.php")) {
$res=@include "../../master.inc.php";
if (!$res && file_exists("../../master.inc.php")) {
$res = @include "../../master.inc.php";
}
if (! $res && file_exists("../../../master.inc.php")) {
$res=@include "../../../master.inc.php";
if (!$res && file_exists("../../../master.inc.php")) {
$res = @include "../../../master.inc.php";
}
if (! $res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
$res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
$res = @include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
}
if (! $res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
$res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
$res = @include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
}
if (! $res) {
if (!$res) {
die("Failed to include master.inc.php file\n");
}
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -76,56 +76,56 @@ if (empty($confirm)) {
}
$tmp=dol_getdate(dol_now());
$tmp = dol_getdate(dol_now());
$tables=array(
'propal'=>array(0=>'datep', 1=>'fin_validite', 2=>'date_valid', 3=>'date_cloture'),
'commande'=>array(0=>'date_commande', 1=>'date_valid', 2=>'date_cloture'),
'facture'=>array(0=>'datec', 0=>'datef', 1=>'date_valid', 2=>'date_lim_reglement'),
'paiement'=>array(0=>'datep'),
'bank'=>array(0=>'datev', 1=>'dateo'),
'commande_fournisseur'=>array(0=>'date_commande', 1=>'date_valid', 3=>'date_creation', 4=>'date_approve', 5=>'date_approve2', 6=>'date_livraison'),
'supplier_proposal'=>array(0=>'datec', 1=>'date_valid', 2=>'date_cloture'),
'expensereport'=>array(0=>'date_debut', 1=>'date_fin', 2=>'date_create', 3=>'date_valid', 4=>'date_approve', 5=>'date_refuse', 6=>'date_cancel'),
'holiday'=>array(0=>'date_debut', 1=>'date_fin', 2=>'date_create', 3=>'date_valid', 5=>'date_refuse', 6=>'date_cancel'),
'ticket'=>array(0=>'datec', 1=>'date_read', 2=>'date_close')
$tables = array(
'propal' => array(0 => 'datep', 1 => 'fin_validite', 2 => 'date_valid', 3 => 'date_cloture'),
'commande' => array(0 => 'date_commande', 1 => 'date_valid', 2 => 'date_cloture'),
'facture' => array(0 => 'datec', 1 => 'datef', 2 => 'date_valid', 3 => 'date_lim_reglement'),
'paiement' => array(0 => 'datep'),
'bank' => array(0 => 'datev', 1 => 'dateo'),
'commande_fournisseur' => array(0 => 'date_commande', 1 => 'date_valid', 3 => 'date_creation', 4 => 'date_approve', 5 => 'date_approve2', 6 => 'date_livraison'),
'supplier_proposal' => array(0 => 'datec', 1 => 'date_valid', 2 => 'date_cloture'),
'expensereport' => array(0 => 'date_debut', 1 => 'date_fin', 2 => 'date_create', 3 => 'date_valid', 4 => 'date_approve', 5 => 'date_refuse', 6 => 'date_cancel'),
'holiday' => array(0 => 'date_debut', 1 => 'date_fin', 2 => 'date_create', 3 => 'date_valid', 5 => 'date_refuse', 6 => 'date_cancel'),
'ticket' => array(0 => 'datec', 1 => 'date_read', 2 => 'date_close')
);
$year=2010;
$currentyear=$tmp['year'];
$year = 2010;
$currentyear = $tmp['year'];
while ($year <= $currentyear) {
//$year=2021;
$delta1=($currentyear - $year);
$delta2=($currentyear - $year - 1);
$delta1 = ($currentyear - $year);
$delta2 = ($currentyear - $year - 1);
//$delta=-1;
if ($delta1) {
foreach ($tables as $tablekey => $tableval) {
print "Correct ".$tablekey." for year ".$year." and move them to current year ".$currentyear." ";
$sql="select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." < DATE_ADD(NOW(), INTERVAL -1 YEAR)";
$sql = "select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." < DATE_ADD(NOW(), INTERVAL -1 YEAR)";
//$sql="select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." > NOW()";
$resql = $db->query($sql);
if ($resql) {
$num = $db->num_rows($resql);
$i=0;
$i = 0;
while ($i < $num) {
$obj=$db->fetch_object($resql);
$obj = $db->fetch_object($resql);
if ($obj) {
print ".";
$sql2="UPDATE ".MAIN_DB_PREFIX.$tablekey." set ";
$j=0;
$sql2 = "UPDATE ".MAIN_DB_PREFIX.$tablekey." set ";
$j = 0;
foreach ($tableval as $field) {
if ($j) {
$sql2.=", ";
$sql2 .= ", ";
}
$sql2.= $field." = ".$db->ifsql("DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR) > NOW()", "DATE_ADD(".$field.", INTERVAL ".$delta2." YEAR)", "DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR)");
$sql2 .= $field." = ".$db->ifsql("DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR) > NOW()", "DATE_ADD(".$field.", INTERVAL ".$delta2." YEAR)", "DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR)");
$j++;
}
$sql2.=" WHERE rowid = ".$obj->rowid;
$sql2 .= " WHERE rowid = ".$obj->rowid;
//print $sql2."\n";
$resql2 = $db->query($sql2);
if (! $resql2) {
if (!$resql2) {
dol_print_error($db);
}
}

View File

@@ -13,7 +13,7 @@
# fail2ban-client status web-accesslog-limit403
#
# To test rule file on a existing log file
# fail2ban-regex /var/log/apache2/access.log /etc/fail2ban/filter.d/web-accesslog-limit403.conf
# fail2ban-regex /var/log/apache2/access.log /etc/fail2ban/filter.d/web-accesslog-limit403.conf --print-all-matched
failregex = <HOST> - - .*HTTP/[0-9]+(.[0-9]+)?" 403
ignoreregex =

View File

@@ -13,7 +13,7 @@
# fail2ban-client status web-dolibarr-limitpublic
#
# To test rule file on a existing log file
# fail2ban-regex /mypath/documents/dolibarr.log /etc/fail2ban/filter.d/web-dolibarr-limitpublic.conf
# fail2ban-regex /mypath/documents/dolibarr.log /etc/fail2ban/filter.d/web-dolibarr-limitpublic.conf --print-all-matched
failregex = ^ [A-Z\s]+ <HOST>\s+--- Access to .*/public/
ignoreregex =

View File

@@ -13,7 +13,7 @@
# fail2ban-client status web-dolibarr-rulesbruteforce
#
# To test rule file on a existing log file
# fail2ban-regex /mypath/documents/dolibarr.log /etc/fail2ban/filter.d/web-dolibarr-rulesbruteforce.conf
# fail2ban-regex /mypath/documents/dolibarr.log /etc/fail2ban/filter.d/web-dolibarr-rulesbruteforce.conf --print-all-matched
failregex = ^ [A-Z\s]+ <HOST>\s+functions_.*::check_user_.* Authentication KO
ignoreregex =

View File

@@ -13,7 +13,7 @@
# fail2ban-client status web-dolibarr-rulespassforgotten
#
# To test rule file on a existing log file
# fail2ban-regex /mypath/documents/dolibarr.log /etc/fail2ban/filter.d/web-dolibarr-rulespassforgotten.conf
# fail2ban-regex /mypath/documents/dolibarr.log /etc/fail2ban/filter.d/web-dolibarr-rulespassforgotten.conf --print-all-matched
failregex = ^ [A-Z\s]+ <HOST>\s+--- Access to .*/passwordforgotten.php - action=buildnewpassword
ignoreregex =

View File

@@ -3,10 +3,10 @@ QODANA TUTO
This README explains how to use qodana to generate static analytics reports on the code
Install docker
apt install docker
Install qodana
Install qodana into ~/.loca/bin/qodana
curl -fsSL https://jb.gg/qodana-cli/install | bash
To run inspection on CLI
cd ~/git/dirtoscan

View File

@@ -0,0 +1,15 @@
= Install SonarQube locally
Check you are using Install Java SDK 17
java --version must show 61
To install java sdk 17 on ubuntu:
sudo apt update
sudo apt install -y openjdk-17-jdk
Unzip the sonar package into a directory
Edit the file conf/sonar.properties to modify port 9000 and 9001 (already used by Eclipse or xdebug) into 9080 and 9081
Launch sonar with
bin/linux*/sonar.sh console

View File

@@ -1 +1 @@
Files and tools were moved into htdocs/modulebuilder/template
Files and tools of a skeleton to build a module were moved into htdocs/modulebuilder/template

1
dev/tools/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
/vendor/

438
dev/tools/apstats.php Executable file
View File

@@ -0,0 +1,438 @@
#!/usr/bin/env php
<?php
/*
* Copyright (C) 2023 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
* \file dev/tools/apstats.php
* \brief Script to report Advanced Statistics on a coding project
*/
$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
$path = dirname(__FILE__) . '/';
// Test si mode batch
$sapi_type = php_sapi_name();
if (substr($sapi_type, 0, 3) == 'cgi') {
echo "Error: You are using PHP for CGI. To execute " . $script_file . " from command line, you must use PHP for CLI mode.\n";
exit();
}
error_reporting(E_ALL & ~E_DEPRECATED);
define('PRODUCT', "apstats");
define('VERSION', "1.0");
$phpstanlevel = 2;
print '***** '.constant('PRODUCT').' - '.constant('VERSION').' *****'."\n";
if (empty($argv[1])) {
print 'You must run this tool being into the root of the project.'."\n";
print 'Usage: '.constant('PRODUCT').'.php pathto/outputfile.html [--dir-scc=pathtoscc] [--dir-phpstan=pathtophpstan]'."\n";
print 'Example: '.constant('PRODUCT').'.php documents/apstats/index.html --dir-scc=/snap/bin --dir-phpstan=~/git/phpstan/htdocs/includes/bin';
exit(0);
}
$outputpath = $argv[1];
$outputdir = dirname($outputpath);
$outputfile = basename($outputpath);
if (!is_dir($outputdir)) {
print 'Error: dir '.$outputdir.' does not exists or is not writable'."\n";
exit(1);
}
$dirscc = '';
$dirphpstan = '';
$i = 0;
while ($i < $argc) {
$reg = array();
if (preg_match('/--dir-scc=(.*)$/', $argv[$i], $reg)) {
$dirscc = $reg[1];
}
if (preg_match('/--dir-phpstan=(.*)$/', $argv[$i], $reg)) {
$dirphpstan = $reg[1];
}
$i++;
}
$timestart = time();
// Count lines of code of Dolibarr itself
/*
$commandcheck = 'cloc . --exclude-dir=includes --exclude-dir=custom --ignore-whitespace --vcs=git';
$resexec = shell_exec($commandcheck);
$resexec = (int) (empty($resexec) ? 0 : trim($resexec));
// Count lines of code of external dependencies
$commandcheck = 'cloc htdocs/includes --ignore-whitespace --vcs=git';
$resexec = shell_exec($commandcheck);
$resexec = (int) (empty($resexec) ? 0 : trim($resexec));
*/
// Count lines of code of application
$commandcheck = ($dirscc ? $dirscc.'/' : '').'scc . --exclude-dir=htdocs/includes,htdocs/custom,htdocs/theme/common/fontawesome-5,htdocs/theme/common/octicons';
print 'Execute SCC to count lines of code in project: '.$commandcheck."\n";
$output_arrproj = array();
$resexecproj = 0;
exec($commandcheck, $output_arrproj, $resexecproj);
// Count lines of code of dependencies
$commandcheck = ($dirscc ? $dirscc.'/' : '').'scc htdocs/includes htdocs/theme/common/fontawesome-5 htdocs/theme/common/octicons';
print 'Execute SCC to count lines of code in dependencies: '.$commandcheck."\n";
$output_arrdep = array();
$resexecdep = 0;
exec($commandcheck, $output_arrdep, $resexecdep);
// Get technical debt
$commandcheck = ($dirphpstan ? $dirphpstan.'/' : '').'phpstan --level='.$phpstanlevel.' -v analyze -a build/phpstan/bootstrap.php --memory-limit 5G --error-format=github';
print 'Execute PHPStan to get the technical debt: '.$commandcheck."\n";
$output_arrtd = array();
$resexectd = 0;
exec($commandcheck, $output_arrtd, $resexectd);
$arrayoflineofcode = array();
$arraycocomo = array();
$arrayofmetrics = array(
'proj' => array('Bytes' => 0, 'Files' => 0, 'Lines' => 0, 'Blanks' => 0, 'Comments' => 0, 'Code' => 0, 'Complexity' => 0),
'dep' => array('Bytes' => 0, 'Files' => 0, 'Lines' => 0, 'Blanks' => 0, 'Comments' => 0, 'Code' => 0, 'Complexity' => 0)
);
// Analyse $output_arrproj
foreach (array('proj', 'dep') as $source) {
print 'Analyze SCC result for lines of code for '.$source."\n";
if ($source == 'proj') {
$output_arr = &$output_arrproj;
} elseif ($source == 'dep') {
$output_arr = &$output_arrdep;
} else {
print 'Bad value for $source';
die();
}
foreach ($output_arr as $line) {
if (preg_match('/^(───|Language|Total)/', $line)) {
continue;
}
//print $line."<br>\n";
if (preg_match('/^Estimated Cost.*\$(.*)/i', $line, $reg)) {
$arraycocomo[$source]['currency'] = preg_replace('/[^\d\.]/', '', str_replace(array(',', ' '), array('', ''), $reg[1]));
}
if (preg_match('/^Estimated Schedule Effort.*\s([\d\s,]+)/i', $line, $reg)) {
$arraycocomo[$source]['effort'] = str_replace(array(',', ' '), array('.', ''), $reg[1]);
}
if (preg_match('/^Estimated People.*\s([\d\s,]+)/i', $line, $reg)) {
$arraycocomo[$source]['people'] = str_replace(array(',', ' '), array('.', ''), $reg[1]);
}
if (preg_match('/^Processed\s(\d+)\s/i', $line, $reg)) {
$arrayofmetrics[$source]['Bytes'] = $reg[1];
}
if (preg_match('/^(.*)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)$/', $line, $reg)) {
$arrayoflineofcode[$source][$reg[1]]['Files'] = $reg[2];
$arrayoflineofcode[$source][$reg[1]]['Lines'] = $reg[3];
$arrayoflineofcode[$source][$reg[1]]['Blanks'] = $reg[4];
$arrayoflineofcode[$source][$reg[1]]['Comments'] = $reg[5];
$arrayoflineofcode[$source][$reg[1]]['Code'] = $reg[6];
$arrayoflineofcode[$source][$reg[1]]['Complexity'] = $reg[7];
}
}
if (!empty($arrayoflineofcode[$source])) {
foreach ($arrayoflineofcode[$source] as $key => $val) {
$arrayofmetrics[$source]['Files'] += $val['Files'];
$arrayofmetrics[$source]['Lines'] += $val['Lines'];
$arrayofmetrics[$source]['Blanks'] += $val['Blanks'];
$arrayofmetrics[$source]['Comments'] += $val['Comments'];
$arrayofmetrics[$source]['Code'] += $val['Code'];
$arrayofmetrics[$source]['Complexity'] += $val['Complexity'];
}
}
}
$timeend = time();
/*
* View
*/
$html = '<html>'."\n";
$html .= '<meta charset="utf-8">'."\n";
$html .= '<meta http-equiv="refresh" content="300">'."\n";
$html .= '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
$html .= '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.min.css" integrity="sha512-q3eWabyZPc1XTCmF+8/LuE1ozpg5xxn7iO89yfSOd5/oKvyqLngoNGsx8jq92Y8eXJ/IRxQbEC+FGSYxtk2oiw==" crossorigin="anonymous" referrerpolicy="no-referrer" />'."\n";
$html .= '<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js" integrity="sha512-3gJwYpMe3QewGELv8k/BX9vcqhryRdzRMxVfq6ngyWXwo03GFEzjsUm8Q7RZcHPHksttq7/GFoxjCVUjkjvPdw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>'."\n";
$html .= '
<style>
body {
margin: 10px;
margin-left: 50px;
margin-right: 50px;
}
h1 {
font-size: 1.5em;
font-weight: bold;
padding-top: 5px;
padding-bottom: 5px;
margin-top: 5px;
margin-bottom: 5px;
}
header {
text-align: center;
}
header, section.chapter {
margin-top: 10px;
margin-bottom: 10px;
padding: 10px;
}
table {
border-collapse: collapse;
}
th,td {
padding-top: 5px;
padding-bottom: 5px;
padding-left: 10px;
padding-right: 10px;
}
.left {
text-align: left;
}
.right {
text-align: right;
}
.nowrap {
white-space: nowrap;
}
.opacitymedium {
opacity: 0.5;
}
.centpercent {
width: 100%;
}
.hidden {
display: none;
}
.trgroup {
background-color: #EEE;
}
.seedetail {
color: #000088;
cursor: pointer;
}
.box {
padding: 20px;
font-size: 1.2em;
margin-top: 10px;
margin-bottom: 10px;
width: 200px;
}
.box.inline-box {
display: inline-block;
text-align: center;
margin-left: 10px;
}
.back1 {
background-color: #884466;
color: #FFF;
}
.back2 {
background-color: #664488;
color: #FFF;
}
div.fiche>form>div.div-table-responsive {
min-height: 392px;
}
div.fiche>form>div.div-table-responsive, div.fiche>form>div.div-table-responsive-no-min {
overflow-x: auto;
}
.div-table-responsive {
line-height: 120%;
}
.div-table-responsive, .div-table-responsive-no-min {
overflow-x: auto;
min-height: 0.01%;
}
/* Force values for small screen 767 */
@media only screen and (max-width: 767px)
{
body {
margin: 5px;
margin-left: 5px;
margin-right: 5px;
}
}
</style>'."\n";
$html .= '<body>'."\n";
$html .= '<header>'."\n";
$html .= '<h1>Advanced Project Statistics</h1>'."\n";
$currentDate = date("Y-m-d H:i:s"); // Format: Year-Month-Day Hour:Minute:Second
$html .= '<span class="opacitymedium">Generated on '.$currentDate.' in '.($timeend - $timestart).' seconds</span>'."\n";
$html .= '</header>'."\n";
$html .= '<section class="chapter" id="linesofcode">'."\n";
$html .= '<h2>Lines of code</h2>'."\n";
$html .= '<div class="div-table-responsive">'."\n";
$html .= '<table class="centpercent">';
$html .= '<tr class="loc">';
$html .= '<th class="left">Language</th>';
$html .= '<th class="right">Bytes</th>';
$html .= '<th class="right">Files</th>';
$html .= '<th class="right">Lines</th>';
$html .= '<th class="right">Blanks</th>';
$html .= '<th class="right">Comments</th>';
$html .= '<th class="right">Code</th>';
//$html .= '<td class="right">'.$val['Complexity'].'</td>';
$html .= '</tr>';
foreach (array('proj', 'dep') as $source) {
$html .= '<tr class="trgroup" id="source'.$source.'">';
if ($source == 'proj') {
$html .= '<td>All files without dependencies';
} elseif ($source == 'dep') {
$html .= '<td>All files of dependencies only';
}
$html .= ' &nbsp; &nbsp; <span class="seedetail" data-source="'.$source.'">(See detail per file type...)</span>';
$html .= '<td class="right">'.formatNumber($arrayofmetrics[$source]['Bytes']).'</td>';
$html .= '<td class="right">'.formatNumber($arrayofmetrics[$source]['Files']).'</td>';
$html .= '<td class="right">'.formatNumber($arrayofmetrics[$source]['Lines']).'</td>';
$html .= '<td class="right">'.formatNumber($arrayofmetrics[$source]['Blanks']).'</td>';
$html .= '<td class="right">'.formatNumber($arrayofmetrics[$source]['Comments']).'</td>';
$html .= '<td class="right">'.formatNumber($arrayofmetrics[$source]['Code']).'</td>';
$html .= '<td></td>';
$html .= '</tr>';
if (!empty($arrayoflineofcode[$source])) {
foreach ($arrayoflineofcode[$source] as $key => $val) {
$html .= '<tr class="loc hidden source'.$source.' language'.str_replace(' ', '', $key).'">';
$html .= '<td>'.$key.'</td>';
$html .= '<td class="right"></td>';
$html .= '<td class="right nowrap">'.(empty($val['Files']) ? '' : formatNumber($val['Files'])).'</td>';
$html .= '<td class="right nowrap">'.(empty($val['Lines']) ? '' : formatNumber($val['Lines'])).'</td>';
$html .= '<td class="right nowrap">'.(empty($val['Blanks']) ? '' : formatNumber($val['Blanks'])).'</td>';
$html .= '<td class="right nowrap">'.(empty($val['Comments']) ? '' : formatNumber($val['Comments'])).'</td>';
$html .= '<td class="right nowrap">'.(empty($val['Code']) ? '' : formatNumber($val['Code'])).'</td>';
//$html .= '<td class="right">'.(empty($val['Complexity']) ? '' : $val['Complexity']).'</td>';
$html .= '<td class="nowrap">TODO graph here...</td>';
$html .= '</tr>';
}
}
}
$html .= '<tr class="trgroup">';
$html .= '<td class="left">Total</td>';
$html .= '<td class="right nowrap">'.formatNumber($arrayofmetrics['proj']['Bytes'] + $arrayofmetrics['dep']['Bytes']).'</td>';
$html .= '<td class="right nowrap">'.formatNumber($arrayofmetrics['proj']['Files'] + $arrayofmetrics['dep']['Files']).'</td>';
$html .= '<td class="right nowrap">'.formatNumber($arrayofmetrics['proj']['Lines'] + $arrayofmetrics['dep']['Lines']).'</td>';
$html .= '<td class="right nowrap">'.formatNumber($arrayofmetrics['proj']['Blanks'] + $arrayofmetrics['dep']['Blanks']).'</td>';
$html .= '<td class="right nowrap">'.formatNumber($arrayofmetrics['proj']['Comments'] + $arrayofmetrics['dep']['Comments']).'</td>';
$html .= '<td class="right nowrap">'.formatNumber($arrayofmetrics['proj']['Code'] + $arrayofmetrics['dep']['Code']).'</td>';
//$html .= '<td>'.$arrayofmetrics['Complexity'].'</td>';
$html .= '<td></td>';
$html .= '</tr>';
$html .= '</table>';
$html .= '</div>';
$html .= '</section>'."\n";
$html .= '<section class="chapter" id="projectvalue">'."\n";
$html .= '<h2>Project value</h2><br>'."\n";
$html .= '<div class="box inline-box back1">';
$html .= 'COCOMO (Basic organic model) value:<br>';
$html .= '<b>$'.formatNumber((empty($arraycocomo['proj']['currency']) ? 0 : $arraycocomo['proj']['currency']) + (empty($arraycocomo['dep']['currency']) ? 0 : $arraycocomo['dep']['currency']), 2).'</b>';
$html .= '</div>';
$html .= '<div class="box inline-box back2">';
$html .= 'COCOMO (Basic organic model) effort<br>';
$html .= '<b>'.formatNumber($arraycocomo['proj']['people'] * $arraycocomo['proj']['effort'] + $arraycocomo['dep']['people'] * $arraycocomo['dep']['effort']);
$html .= ' monthes people</b><br>';
$html .= '</section>'."\n";
$tmp = '';
$nblines = 0;
foreach ($output_arrtd as $line) {
$reg = array();
//print $line."\n";
preg_match('/^::error file=(.*),line=(\d+),col=(\d+)::(.*)$/', $line, $reg);
if (!empty($reg[1])) {
$tmp .= '<tr><td>'.$reg[1].'</td><td>'.$reg[2].'</td><td>'.$reg[4].'</td></tr>'."\n";
$nblines++;
}
}
$html .= '<section class="chapter" id="technicaldebt">'."\n";
$html .= '<h2>Technical debt <span class="opacitymedium">(PHPStan level '.$phpstanlevel.' -> '.$nblines.' warnings)</span></h2><br>'."\n";
$html .= '<div class="div-table-responsive">'."\n";
$html .= '<table class="list_technical_debt">'."\n";
$html .= '<tr><td>File</td><td>Line</td><td>Type</td></tr>'."\n";
$html .= $tmp;
$html .= '</table>';
$html .= '</div>';
$html .= '</section>'."\n";
$html .= '
<script>
$(document).ready(function() {
$( ".seedetail" ).on( "click", function() {
var source = $(this).attr("data-source");
console.log("Click on "+source);
jQuery(".source"+source).toggle();
} );
});
</script>
';
$html .= '</body>';
$html .= '</html>';
$fh = fopen($outputpath, 'w');
if ($fh) {
fwrite($fh, $html);
fclose($fh);
print 'Generation of output file '.$outputfile.' done.'."\n";
} else {
print 'Failed to open '.$outputfile.' for ouput.'."\n";
}
/**
* function to format a number
*
* @param string|int $number Number to format
* @param int $nbdec Number of decimal digits
* @return string Formated string
*/
function formatNumber($number, $nbdec = 0)
{
return number_format($number, 0, '.', ' ');
}

View File

@@ -4,6 +4,7 @@
// Conversion du PDF en image png si fichier png non existant
// Save a stripe payment was done in realy life so later we will be able to force a commit on recorded payments
// To make a Stripe SEPA payment request, we must have the payment mode source already saved into societe_rib and retreived with ->sepaStripe
// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
//break; // No break for sortfield and sortorder so we can cumulate fields (is it realy usefull ?)
$errmsg = 'Failed to retreive paymentintent or charge from id';
$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
@@ -35,15 +36,19 @@
// remove invalid value, as it didnt match anything
// we dont use the rank from orderline because we may have lines from several orders
dol_syslog("makeStripeSepaRequest get stripe connet account", LOG_DEBUG);
if (isset($this->oldcopy->array_options["options_".$key]) && $this->array_options["options_".$key] == $this->oldcopy->array_options["options_".$key]) { // If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
print '<input type="hidden" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">'; // class is requied to be used by javascript callForResult();
print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">'; // class is requied to be used by javascript callForResult();
print 'jQuery("select[name=\''.$paramkey.'\']").focus();'."\n"; // Not really usefull, but we keep it in case of.
$filles[$obj->fk_categorie_fille] = 1; // Set record for this child
$i2++; // a criteria for 1 more field was added to string (we can add several citeria for the same field as it is a multiselect search criteria)
$invoiceid = -1; // There is more than one invoice payed by this payment
$line->pa_ht = $line->pa_ht; // we choosed to have buy/cost price always positive, so no revert of sign here
$mesg .= '<br>Unkown Error, please refers to your administrator';
$result = $adh->setPassword($user, $this->pass, (!getDolGlobalString('DATABASE_PWD_ENCRYPTED') ? 0 : 1), 1); // Cryptage non gere dans module adherent
$result = $adh->setPassword($user, $this->pass, (empty($conf->global->DATABASE_PWD_ENCRYPTED) ? 0 : 1), 1); // Cryptage non gere dans module adherent
$result = $line->insert(0, 1); // When creating credit note with same lines than source, we must ignore error if discount alreayd linked
$s = array(); // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
$value = ((!empty($this->array_options) && array_key_exists("options_".$key.$keysuffix, $this->array_options)) ? $this->array_options["options_".$key.$keysuffix] : null); // Value may be cleaned or formated later
$ways = $c->print_all_ways(' &gt;&gt; ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
'capture' => true, // Charge immediatly
@@ -66,10 +71,13 @@
// Show subproducts of product (not recommanded)
// TODO Que faire si update echoue car on update avec un login deja existant pour un autre compte.
// dont try to send email if no recipient
// note: $cs->mandate contians ID of mandate on Stripe side
// nous avons au moins une reponse
// nous n'avons pas de reponse => n'existe pas
//'visible'=>$fille->visible,
break; // break for loop incase of error
dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found old pass in database", LOG_WARNING);
dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - hash ".$cryptType." of pass is ok");
hide: { delay: 50 }, /* If I enable effect:\'toggle\' here, a bug appears: the tooltip is shown when collpasing a new dir if it was shown before */
if ($reg[1] == 'thi') { // Third-party
if (empty($objMod->dictionaries) && !empty($objMod->dictionnaries)) {
@@ -87,6 +95,7 @@
$repid[$obj->id] = $label;
$reponsesadd = str_split($obj->reponses);
$s = array(); // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
$s = array(); // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
$serie[$i] .= 'd' . $i . '.push([' . $x . ', ' . $y . ']);' . "\n";
$serie[$i] .= 'd' . $i . '.push({"label":"' . dol_escape_js($legends[$x]) . '", "data":' . $y . '});' . "\n";
$sql .= " SET reponses = '".$db->escape($reponsesadd)."'";
@@ -107,6 +116,7 @@
// Label mouvement
// Login is successfull with this method
// Lot/serie
// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer but may be NOT (for example a transfer of an email rewriten)
// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer or NOT (a transfer rewriten)
// Not a recongized record
// Note: This suppose that "pass_indatabase_crypted" is a md5 (guaranted by the previous test if "(empty($conf->global->MAIN_SECURITY_HASH_ALGO))"
@@ -153,6 +163,9 @@
$heigth = $tmp[3];
$info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte
$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte
$info[getDolGlobalString('LDAP_FIELD_PASSWORD')] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte
$info[getDolGlobalString('LDAP_MEMBER_FIELD_PASSWORD')] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte
$objectoffield = $object; //For compatibily with the computed formula
$optstart .= ' data-tvatx-formated="' . dol_escape_htmltag(price($objp->tva_tx, 0, $langs, 1, -1, 2)) . '"';
$optstart .= ' data-tvatx-formated="'.dol_escape_htmltag(price($objp->tva_tx, 0, $langs, 1, -1, 2)).'"';
$outprice_ht = price($objp->price); // formated for langage user because is inserted into input field
@@ -167,6 +180,7 @@
$this->user_closing = $cluser;
$this->user_cloture = $cluser;
$usertime = 0; // We dont modify date because we want to have date into memory datep and datef stored as GMT date. Compensation will be done during output.
$valuetoshow = ucfirst($value); // Par defaut
$ways = $c->print_all_ways(' &gt;&gt; ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
&& $obj->status != $tmpobject::STATUS_ABANDONED // Not abandonned
'adress'=>$obj->adress,
@@ -174,6 +188,7 @@
'transparency'=>$object->transparency, // Force transparency on onwer from preoperty of event
/* Remove selected id as soon as we type or delete a char (it means old selection is wrong). Use keyup/down instead of change to avoid loosing the product id. This is needed only for select of predefined product */
/*case 'select': // Not required, we chosed value='0' for undefined values
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
// Batch number managment
// Calculcate number of days consumed
// Cas des factures liees par un autre objet (ex: commande)
@@ -183,6 +198,7 @@
// For exemple, we may have error: 'No such customer: cus_XXXXX; a similar object exists in live mode, but a test mode key was used to make this request.'
// For full day events, date are also GMT but they wont but converted using tz during output
// If translation exists, we use it, otherwise, we use tha had coded label
// If we want to closed payed invoices
// Line dates planed
// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer or NOT (a transfer rewriten)
// Note: $obj->halfday is 0:Full days, 2:Sart afternoon end morning, -1:Start afternoon, 1:End morning
@@ -191,8 +207,10 @@
// On selectionne les groupes auquel fait parti le user
// On verifie l'emplacement du modele
// Onwer
// Option to reload page to retrieve customer informations. Note, this clear other input
// Produit non deja existant
// Search submenu fot this mainmenu entry
// Selection of all product stock mouvements that contains batchs
// Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide
// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
// Strip off the beggining '<'
@@ -213,6 +231,7 @@
// at a time, and thats just stupid, so lets just hope this doesnt appear anywhere in the actual data
// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
// if we have a PROJECTLEADER contact and we dont use it as recipient we store the contact object for later use
// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
// save curent cell padding
//$sql .= " AND (status <> 3 OR close_code <> 'abandon')"; // Not abandonned for undefined reason
//Esle it's separated key/value and coma list
@@ -231,6 +250,7 @@
error="Database $dbname NOT successfully droped. You have to do it manually."
foreach ($cats as $fille) {
if (!empty($childrens)) {
if (!getDolGlobalString('PROJECT_DISABLE_UNLINK_FROM_OVERVIEW') || $user->admin) { // PROJECT_DISABLE_UNLINK_FROM_OVERVIEW is empty by defaut, so this test true
if (!isset($filles[$obj->fk_categorie_fille])) { // Only one record as child (a child has only on parent).
if ($conf->file->mailing_limit_sendbyweb != '-1') { // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
if ($login && $login != '--bad-login-validity--') { // Login is successfull
@@ -246,20 +266,29 @@
jQuery("#mouvement").trigger("change");
print "ERROR: Failed to include file '".$filephp."'. Try to edit and re-save page ith this ID.";
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
setEventMessages($langs->trans('Bad value for email, emai lwas not verified by Google'), null, 'errors');
} else { // Pour les autres schémas, les membres sont listés sous forme de DN complets
$newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->hasRight('compta', 'resultat', 'lire'));
* Section Creditor (sepa Crediteurs bloc lines)
* Section Debitor (sepa Debiteurs bloc lines)
"confirm" => $confirmnow, // Do not confirm immediatly during creation of intent
"confirm" => $confirmnow, // try to confirm immediatly after create (if conditions are ok)
$ErrorLongMsg = "Session expired. Can't retreive PaymentType. Payment has not been validated.";
$accountparent->account_number = $obj->account_number2; // Sotre an account number for output
$action = 'transfert';
$allways = $parent->get_all_ways();
$bugbaseurl .= urlencode("## [Attached files](https://help.github.com/articles/issue-attachments) (Screenshots, screencasts, dolibarr.log, debugging informations…)\n");
$childs[] = array_combine($keys, $values);
$curent = getDolGlobalString($thisTypeConfName, getDolGlobalString('FACTURE_ADDON_PDF'));
$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
$info[$conf->global->LDAP_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
$info[getDolGlobalString('LDAP_FIELD_PASSWORD')] = $this->pass; // this->pass = mot de passe non crypte
$info[getDolGlobalString('LDAP_MEMBER_FIELD_PASSWORD')] = $this->pass; // this->pass = mot de passe non crypte
$initialY = $tab_top + 7;
$invoicestatic->statut = $obj->fk_statut; // For backward comaptibility
$jsListType .= (!empty($jsListType) ? ',' : '').'"'.$type.'":"'.$curent.'"';
$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');
$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');
$object->actionmsg = dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachs);
@@ -268,13 +297,16 @@
$paramfortooltiptd .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"'; // Attribut to put on td tag to store tooltip
$paramfortooltiptd .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on td tag to store tooltip
$showfield = 1; // Par defaut
$societe->note_private = "Default customer automaticaly created by Point Of Sale module activation. Can be used as the default generic customer in the Point Of Sale setup. Can also be edited or removed if you don't need a generic customer.";
$tagdatabase = true; // We don't know what it was before, so now we consider we are version choosed.
$this->category->childs[] = $this->_cleanObjectDatas($cat);
$this->civility_id = $obj->civility_code; // Bad. Kept for backard compatibility
$this->date_delivery = $this->db->jdate($obj->date_delivery); // Date planed
$this->liste_array = $repid;
$this->statut = self::STATUS_DRAFT; // dperecated
$this->stringtoshow .= $serie[$i] . "\n";
$this->stringtoshow .= $this->mirrorGraphValues ? '[' . -$serie[$i] . ',' . $serie[$i] . ']' : $serie[$i];
$this->stringtoshow .= $this->mirrorGraphValues ? '[-' . $serie[$i] . ',' . $serie[$i] . ']' : $serie[$i];
$this->stringtoshow .= ' data: [' . $serie[$i] . ']';
$this->stringtoshow .= '<!-- Serie ' . $i . ' -->' . "\n";
$tmp = array('id_users'=>$obj->id_users, 'nom'=>$obj->name, 'reponses'=>$obj->reponses);
@@ -287,8 +319,10 @@
/* Removed due to awful harcoded values
/*case 'select': // Not required, we chosed value='0' for undefined values
// $pdf->GetY() here can't be used. It is bottom of the second addresse box but first one may be higher
// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
// Add entry into bank accoun
// Add field of attribut
// Add link to the Direct Debit if invoice redused ('InvoiceRefused') in bank_url
// Ajout de l'utilisateur dans le groupe
// Batch number managment
// By default, electronic transfert from bank to bank
@@ -307,6 +341,7 @@
// Fonctions de conversion non presente dans ce PHP
// Get lines of sources alread delivered
// Get next free nuber for the ref of bon
// Get next free nunber for the ref of bon prelevement
// If create form is coming from same page, it means that post was sent but an error occured
// If not abandonned
// If option "one bill per third" is set, and an invoice for this thirdparty was already created, we re-use it.
@@ -323,10 +358,12 @@
// No temp directory provided, so we are not able to support convertion of data:image into physical images.
// On verifie l'emplacement du modele
// Option to reload page to retrieve customer informations. Note, this clear other input
// Or set status to "In porgress" if the client has answered and if the ticket has started
// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
// Payment informations
// Proprietes particulieres a facture de remplacement
// Recursive call if there is childs to child
// Retreive lines
// See example with selectsearchbox.php. This case is reserverd for the selectesearchbox.php so we can
// Seperate "Real Name" from eMail address
// Should not happend. Entries are added
@@ -336,11 +373,13 @@
// Subscription informations
// TODO : if base exists in unit dictionary table, remove this convertion exception and update convertion infos in database.
// TODO Can we set it to submited ?
// TODO Replace this with a checkbox for each payment mode: "Send request to XXX immediatly..."
// TODO We can't, we dont' have full path of file, only last_main_doc and ->element, so we must first rebuild full path $destfull
// This convert an embedd file with src="/viewimage.php?modulepart... into a cid link
// This make 12 calls for each accountancy account (12 monthes M)
// Validate immediatly the order
// Warning, the function may add a LF so we are forced to trim to compare with old $out without having always a difference and an infinit loop.
// We chack if file exists
// We check if lines of invoice are not already transfered into accountancy
// We dont want on all entities, we delete all and current
// We must filter on assignement table
@@ -369,8 +408,10 @@
continue; // The field was not submited to be saved
dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], curren date is ".dol_now());
dol_syslog("functions_isallowed::check_user_api_key Authentication KO for '".$login."': The user login has a validity between [".$fuser->datestartvalidity." and ".$fuser->dateendvalidity."], curren date is ".dol_now());
dol_syslog('Bad password, connexion refused (see a previous notice message for more info)', LOG_NOTICE);
dol_syslog('Bad password, connexion refused', LOG_DEBUG);
dol_syslog('Bad value for code, connexion refused');
dol_syslog('Bad value for code, connexion refused', LOG_NOTICE);
dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
foreach ($allways as $way) {
foreach ($legends as $val) { // Loop on each serie
@@ -392,7 +433,11 @@
print '<div class="inline-block marginrightonly">'; // Button include dynamic contant
return $this->trigger(9, "an unexpected error occured");
} // don't wast resourses if we don't need them...
} elseif ($links[$key]['type'] == 'banktransfert') { // transfert between 1 local account and another local account
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
* @param array $menu_array_before Table of menu entries to show before entries of menu handler. This param is deprectaed and must be provided to ''.
* @param string $head Optionnal head lines
* Ouput html header of a page. It calls also top_httphead()
$action = ''; // Do not show form post if there was at least one successfull sent
$action = 'transfert';
$alreadyfound = array($id=>1); // We init array of found object to start of tree, so if we found it later (should not happened), we stop immediatly
@@ -424,6 +469,7 @@
$paramfortooltiptd = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : ''); // Attribut to put on td text tag
$paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
$pdf->MultiCell($this->posxdiscount - $this->posxunit, 2, $outputlangs->transnoentities("Label Mouvement"), '', 'C');
$pdf->MultiCell(190, 5, $outputlangs->transnoentities("Informations"), '', 'L');*/
$pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
$result -= $amountToBreakdown; // And canceled substraction has been replaced by breakdown
$result = $ldap->add($dn, $info, $user); // Wil fail if already exists
@@ -444,6 +490,9 @@
$sql = 'SELECT s.reponses';
$sql2 .= " SET reponses = '".$db->escape($newcar)."'";
$this->category->childs = array();
$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STDEST", "Contact destinataire transfert de stocks", 1, NULL, 0)');
$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STFROM", "Contact expéditeur transfert de stocks", 1, NULL, 0)');
$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "internal", "STRESP", "Responsable du transfert de stocks", 1, NULL, 0)');
$this->emetteur->country_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
$this->error = 'update_note was called on objet with property table_element not defined';
$this->modelpdf = $modelpdf; // For bakward compatibility
@@ -464,11 +513,13 @@
'sr.type' => "Type ban is defaut",
/* Disabled because bcc must remain by defintion not visible
// $_POST contains fk_commandefourndet_X_Y where Y is num of product line and X is number of splitted line
// $new_array_options will be used for direct update, so must contains formated data for the UPDATE.
// $opt['filter[id]'] contais list of product id that are result of search
// 1 - Association des utilisateurs du groupe LDAP au groupe Dolibarr
// 2 - Suppression des utilisateurs du groupe Dolibarr qui ne sont plus dans le groupe LDAP
// A redirect is added if API call successfull
// Action according to choosed sending method
// Action according to the choosed sending method
// Add entry into bank accoun
// Add personnal information
// Adding <b> may convert the original string into a HTML string. Sowe have to first
@@ -486,6 +537,7 @@
// Chercher un contact existant avec cette adresse email
// Color of earch arc
// Defaut
// Delivery date planed
// Discard check of mandatory fiedls for other fields
// Documents are stored above the web pages root to prevent being downloaded without authentification
// Dont't use entity if you use rowid
@@ -523,11 +575,13 @@
// On verifie si aucun paiement n'a ete effectue
// On verifie si la balise prefix est utilisee
// On verifie si la facture a des paiements
// Option to reload page to retrieve customer informations.
// Option to reload page to retrieve customer informations. Note, this clear other input
// Parameteres execution
// Programm next run
// Replace espacing \' by ''.
// Replace protected special codes with matching number of _ as wild card caracter
// Retained warranty : usualy use on construction industry
// Select des informations du projet
// Set default encryption to yes, generate a salt and set default encryption algorythm (but only if there is no user yet into database)
// Show var initialized by include fo paypal lib at begin of this file
@@ -562,6 +616,7 @@
// add variables subtitutions ticket
// count the orders to ship in theorical stock when some are already removed by invoice validation.
// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
// employee informations
// et on met la quantité de la ligne dans la limite du "budget" indiqué par dispatch.qty
// if "frequency" is empty or = 0, the reccurence is disabled
// mise a jour des reponses utilisateurs dans la base
@@ -570,10 +625,13 @@
// on verifie si l'objet est utilisé
// only if socid not filled else it's allready done upper
// procédure de remplacement de la table pour ajouter la contrainte
// reload page to retrieve customer informations
// reload page to retrieve supplier informations
// save curent cell padding
// si le curseur est un booleen on retourne la valeur 0
// this conf is actually hidden, by default we use 10% for "be carefull or warning"
//Add hook to filter on user (for exemple on usergroup define in custom modules)
//Another call for easy debugg
//Calcultate new task end date with difference between origin proj end date and origin task end date
//Calcultate new task start date with difference between old proj start date and origin task start date
//Calcultate new task start date with difference between origin proj start date and origin task start date
@@ -585,9 +643,11 @@
//XXX: Should be done just befor commit no ?
//but the note is saved, so just add a notification will be enought
//if ($user->socid > 0) $socid = $user->socid; // For external user, no check is done on company because readability is managed by public status of project and assignement.
//print $langs->trans("Desription").' : ';
//print "connexion de type=".$conf->db->type." sur host=".$conf->db->host." port=".$conf->db->port." user=".$conf->db->user." name=".$conf->db->name;
//si le sujet n'est pas celui qui a été effacé alors on concatene
//si on voit une erreur, le fond de la case est rouge
The selectForForms is called with parameter $objectfield defined, so tha app can retreive the filter inside the ajax component instead of being provided as parameters. The
console.log("Load desciption into text area : "+description);
continue; // We discard parametes starting with ?
dol_print_error('', get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");
@@ -643,6 +703,8 @@
if ($value) { // If we have -1 here, pb is into insert, not into ouptut (fix insert instead of changing code here to compensate)
if (empty($objimport->array_import_convertvalue[0][$tmpcode])) { // If source file does not need convertion
jQuery("#mouvement").change(function() {
let hours = hour.getHours().toString().padStart(2, "0"); // Formater pour obtenir deux chiffres
let mins = hour.getMinutes().toString().padStart(2, "0"); // Formater pour obtenir deux chiffres
preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthese on tente recherche de traduction
print " - Error cant find payment mode for ".$condpayment."\n";
print "Expedition inexistante ou acces refuse";
@@ -651,6 +713,8 @@
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
print '<a class="cursoradd" href="'.$urltocreate.'">'; // Explicit link, usefull for nojs interfaces
print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? 'checked="checked"' : 'checked="checked"') . ' value="1">'; // Assujeti par defaut en creation
print __METHOD__." module accouting must be enabled.\n";
print __METHOD__." module accouting must be enabled.\n"; exit(-1);
return -1; // Alternate souce not found
return false; // Sould be 6
@@ -672,6 +736,7 @@
$action = ''; // Do not show form post if there was at least one successfull sent
$action = 'transfert';
$allways = $this->get_all_ways(); // Load array of categories
$asciiDocTable = "[options=\"header\"]\n|===\n|Objet | URLs\n";
$buyingprice = (GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value
$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value
$canbedeleted = $object->can_be_deleted(); // Renvoi vrai si compte sans mouvements
@@ -692,6 +757,7 @@
$keyval = substr($nvpstr, $intial, $keypos);
$ldap = new Ldap(); // Les parametres sont passes et recuperes via $conf
$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915); // we use year 1915 to be sure to not have existing invoice for this year (usefull only if numbering is {0000@1}
$localobject->date_creation = dol_mktime(12, 0, 0, 1, 1, 1980); // we use year 1915 to be sure to not have existing invoice for this year (usefull only if numbering is {0000@1}
$mail = 'bidon@unvalid.unvalid';
$myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep the reference (refering to the same target/variable)
$nbofsubproducts = count($prodschild); // This include only first level of childs
@@ -724,6 +790,7 @@
$sql .= " AND mc.statut NOT IN (-1,0)"; // -1 erreur, 0 non envoye, 1 envoye avec succes
$sql .= " WHERE u.email != ''"; // u.email IS NOT NULL est implicite dans ce test
$sql .= " WHERE u.email <> ''"; // u.email IS NOT NULL est implicite dans ce test
$sql .= " label = 'Annulation mouvement ID ".((int) $this->id)."',";
$sql .= " tms = tms"; // La date de derniere modif doit changer sauf pour la mise a jour de date de derniere connexion
$sql .= ", '".$this->db->escape($url)."'"; // dperecated
$sql = "SELECT id_users, nom as name, id_sondage, reponses";
@@ -761,6 +828,7 @@
$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
$this->rights[$r][3] = 1; // La permission est-elle une permission par defaut
$this->rights[1][1] = 'Lire ses notes de frais et deplacements et celles de sa hierarchy';
$this->rights[1][3] = 0; // La permission est-elle une permission par defaut
$this->rights[1][3] = 1; // La permission est-elle une permission par defaut
$this->rights[2][3] = 0; // La permission est-elle une permission par defaut
$this->rights[3][1] = 'Lire mouvements de stocks';
@@ -773,6 +841,7 @@
'filles' => array('name'=>'filles', 'type'=>'tns:FillesArray')
'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Paid', 3=>'Abandonned')),
'qty_regulated' => array('type'=>'double', 'label'=>'QtyDelta', 'visible'=>1, 'enabled'=>1, 'position'=>34, 'index'=>1, 'help'=>'Qty aadded or removed (filled once movements are validated)'),
'type_mouvement' =>array('type'=>'smallint(6)', 'label'=>'Type mouvement', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
/* Definition de la date limite */
/* Liste des taches et role sur les projets ou taches */
/* width: ...px; If I use with, there is trouble on size of flex boxes solved with min + (max that is a little bit higer than min) */
@@ -821,8 +890,11 @@
// Exclude unsubscribed email adresses
// Files missings
// First, we get the max value (reponse immediate car champ indexe)
// For a string that is already HTML (contains HTML tags) but badly formated
// For a string that is already HTML (contains HTML tags) with special tags but badly formated
// For backward compatiblity, we detect file stored into an old path
// For each file build select list with PDF extention
// For exemple if element is project
// For external user, no check is done on company because readability is managed by public status of project and assignement.
// For external user, no check is done on company permission because readability is managed by public status of project and assignement.
// Forced filter on socid is similar to forced filter on project. TODO Use project assignement to allow to not use filter on project
@@ -831,6 +903,7 @@
// How the date for data are formated (format used bu jsgantt)
// How the date for data are formated (format used by dol_print_date)
// If lib not found in language file, we get label from cache/databse
// If on smartphone or optmized for small screen
// If option choosed, we create invoice
// If resultset not provided, we take the last used by connexion
// If stock increment is done on reception (recommanded choice)
@@ -844,6 +917,7 @@
// Links beetween objects are stored in this table
// Load extrafields if not allready done
// Load extrafiels if not allready does
// Load librairies to check BAN
// Log the init of hook but only for hooks thare are declared to be managed
// Loop on each line keword was found into file.
// Mis a jour contact
@@ -862,6 +936,7 @@
// Option to reload page to retrieve customer informations.
// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
// Ouput page under the Dolibarr top menu
// Parameteres execution
// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
// Permettre l'exclusion de groupes
// Permettre l'inclusion de groupes
@@ -870,6 +945,7 @@
// Refresh / Reload web site (for non javascript browers)
// Remove '<' into remainging, so remove non closing html tags like '<abc' or '<<abc'. Note: '<123abc' is not a html tag (can be kept), but '<abc123' is (must be removed).
// Remove fields not relevent to categories
// Renaming can be done when we rename globaly a bank receipt but not when changing 1 line from one receipt into another one.
// Replace protected special codes with matching number of _ as wild card caracter
// Reset the substraction for this amount
// Retained warranty : usualy use on construction industry
@@ -893,7 +969,10 @@
// TODO Remove hooks with type 'output' (exemple createFrom). All hooks must be converted into 'addreplace' hooks.
// TODO Remove hooks with type 'output' (exemple getNomUrl). All hooks must be converted into 'addreplace' hooks.
// Tableau des parametres complementaires du post
// Test with restricthtml + MAIN_RESTRICTHTML_ONLY_VALID_HTML + MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY to test disabling of bad atrributes
// Test with restricthtml + MAIN_RESTRICTHTML_ONLY_VALID_HTML only to test disabling of bad atrributes
// Test with restricthtml + MAIN_RESTRICTHTML_ONLY_VALID_HTML to test disabling of bad atrributes
// Test with restricthtml + MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY only to test disabling of bad atrributes
// Test with restricthtml + MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES to test disabling of bad atrributes
// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
// This improvment as provided by 'SirSir' to
@@ -927,9 +1006,11 @@
// reload page to retrieve customer informations
// reload page to retrieve supplier informations
// save curent cell padding
// submited to nothing.
// substract 1 because array start from 0
// this conf is actually hidden, by default we use 10% for "be carefull or warning"
// to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
// variable submitted at all, so no way to make a difference between variable not submited and variable
//$array_selected = array("s.rowid"=>1, "s.nom"=>2); // Mut be fields found into declaration of dataset
//$signature_line = dol_hash($keyforsignature, '5'); // Not really usefull
//Add hook to filter on user (for exemple on usergroup define in custom modules)
@@ -956,6 +1037,7 @@
console.log("Change montly amount echeance="+echeance+" idcap="+idcap+" capital="+capital);
dol_syslog("The user login has a validity between [".$user->datestartvalidity." and ".$user->dateendvalidity."], curren date is ".dol_now());
dol_syslog("Warning: Function form_constantes is calle with parameter strictw3c = 0, this is deprecated. Value must be 2 now.", LOG_DEBUG);
dol_syslog("line.php update bank line to set the new bank receipt nuber", LOG_DEBUG);
dol_syslog(get_class($this)."::getCustomerAccount Try to find the first system customer id for ".$site." of thirdparty id=".$id." (exemple: cus_.... for stripe)", LOG_DEBUG);
dol_syslog(get_class($this)."::setCategoriesCommon Oject Id:".$this->id.' type_categ:'.$type_categ.' nb tag add:'.count($categories), LOG_DEBUG);
foreach ($allways as $way) {
@@ -965,9 +1047,12 @@
http_response_code(202); // If we use 202, this is not really an error message, but this allow to ouput message on command line tools
if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest))) { // With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
if (!empty($this->phone)) { // If a phone of thirdparty is defined, we add it ot mobile of contacts
if (!getDolGlobalString('PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN')) { // Note that some countries still need bank number, BIC/IBAN not enougth for them
if (!is_array($this->userassigned) && !empty($this->userassigned)) { // For backward compatibility when userassigned was an int instead fo array
if ($lines[$i]->fk_parent == $parent || $level < 0) { // if $level = -1, we dont' use sublevel recursion, we show all lines
if ($lines[$i]->fk_task_parent == $parent || $level < 0) { // if $level = -1, we dont' use sublevel recursion, we show all lines
if ($objectfield) { // We must retreive the objectdesc from the field or extrafield
if ($this->label == 'Annulation mouvement ID'.$this->id) {
if ($user->hasRight('stock', 'mouvement', 'creer')) {
if (GETPOST('import_name')) { // If we have submited a form, we take value used fot the update try
if (dol_strlen($phone) == 10) {// fixe 6 chiffres +352_AA_BB_CC
@@ -993,10 +1078,12 @@
print 'This website or feature is currently temporarly not available or failed after a technical error.<br><br>This may be due to a maintenance operation. Current status of operation ('.dol_print_date(dol_now(), 'dayhourrfc').') are on next line...<br><br>'."\n";
return $childs;
return $objet->compteur;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Lable")), null, 'errors');
unset($object->supplierprices); // Mut use another API to get them
while ($i < $nblot) { // Loop on each serie
} else // We decrease agressiveness
} else { // If thirdparty unkown, output the waiting account
} else { // We decrease agressiveness
} else { // old method. deprecated because ot can't retrieve type
} elseif (!empty($this->childtables)) { // If object has childs linked with a foreign key field, we check all child tables.
} elseif (!empty($this->fk_element) && !empty($this->childtables)) { // If object has childs linked with a foreign key field, we check all child tables.
@@ -1043,6 +1130,7 @@
* @param int $socid Id ot third party or 0 for all or -1 for empty list
* @param int $id Id du paiement dont il faut afficher les infos
* @param mixed $gm 'gmt'=Input informations are GMT values, 'tzserver'=Local to server TZ
* @param string $method Method of transmision to bank (0=Internet, 1=Api...)
* @param string $method method of transmision to bank
* @param string $method method of transmision to bank (0=Internet, 1=Api...)
* @param string $dolibarr_main_db_pass Mot de passe user a creer
@@ -1065,6 +1153,7 @@
* @param string $close_note Commentaire renseigne si on classe a payee alors que paiement incomplet (cas escompte par exemple)
* @return array Tableau info des attributs
* @return int < 0 if KO (infinit loop), >= 0 if OK
* @return int Return integer < 0 if KO (infinit loop), >= 0 if OK
* @return array Tableau des informations des champs de la table
* @return string Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
* @return int 0 en cas de succes
@@ -1073,6 +1162,8 @@
* Charge indicateurs this->nb pour le tableau de bord
* Charge les informations d'ordre info dans l'objet commande
* Charge les informations d'ordre info dans l'objet facture
* Classify the reception as invoiced (used for exemple by trigger when WORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE is on)
* Classify the shipping as invoiced (used for exemple by trigger when WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE is on)
* Connexion to server
* Define properties fullpath, fullrelativename, fulllabel of a directory of array this->cats and all its childs.
* For category id_categ and its childs available in this->cats, define property fullpath and fulllabel.
@@ -1119,6 +1210,7 @@
* Si le (pays vendeur = pays acheteur) alors la TVA par defaut=TVA du produit vendu. Fin de regle.
* Sinon la TVA proposee par defaut=0. Fin de regle.
* Si vendeur non assujeti a TVA, TVA par defaut=0. Fin de regle.
* - string (categories ids seprated by comma)
* - string (categories ids seprated by comma)
* - string (categories ids seprated by comma)
* All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
@@ -1305,6 +1397,7 @@
* @param array $arrayofcriterias Array of available search criterias. Example: array($object->element => $object->fields, 'otherfamily' => otherarrayoffields, ...)
* @param array $search_component_params Array of selected search criterias
* @param bool $gm 1=Input informations are GMT values, otherwise local to server TZ
* @param int $fk_product_stock id product_stock for objet
* @param int $disabledoutputofmessages Clear all messages stored into session without diplaying them
* @param int $lineid Id of production line to filter childs
* @param int $noescapecommand 1=Do not escape command. Warning: Using this parameter needs you alreay have sanitized the $command parameter. If not, it will lead to security vulnerability.
@@ -1343,6 +1436,7 @@
* @param array $info content informations of field
* @param boolean $confirmnow false=default, true=try to confirm immediatly after create (if conditions are ok)
* @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
* @param int $fk_socpeople Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
* @param int $fk_socpeople Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link
* @param int $default_font_size default siez of font
* @param int $id id du paiement dont il faut afficher les infos
@@ -1355,6 +1449,7 @@
* @param int $disablestockchangeforsubproduct Disable stock change for sub-products of kit (usefull only if product is a subproduct)
* @param int $nbmax Number maxium of photos (0=no maximum)
* @param int $id Id of product to search childs of
* @param string $extrafieldsobjectkey The key to use to store retreived data (commonly $object->table_element)
* @param string $extrafieldsobjectkey The key to use to store retreived data (for example $object->table_element)
* @param string $moreparam To add more parametes on html input tag
* @param string $moreparam To add more parametes on html input tag
@@ -1374,11 +1469,19 @@
* @param int $month Specifig month - Can be empty
* @param int $year Specifig year - Can be empty
* @param int $_type Interger value representing Mail Transport Type
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $str Original string to encode and optionaly truncate
* @param string $page Url of page to call if confirmation is OK. Can contains parameters (param 'action' and 'confirm' will be reformated)
* @param string $editvalue When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of numeric value, or a select combo). Use '' to use same than $value
* @param string $output_format (html/opton (for option html only)/array (to return options arrays
* @param string $page Page name (website id must also be filled if this parameter is used). Exemple 'myaliaspage' or 'fr/myaliaspage'
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $properties Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
* @param string $_path Path to the sendmail execuable
* @param string $key Authentification key
* @param string $selected Id remise fixe pre-selectionnee
@@ -1388,6 +1491,7 @@
* @return string Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
* @return float|string Total amout of discount
* @return int <0 if KO, number of equipments found if OK
* @return int Return integer <0 if KO, number of equipments found if OK
* @return string Javacript code to manage dependency
* @return string Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
* @return array Array with inforation on table
@@ -1406,15 +1510,20 @@
* @var array Custom family informations
* @var array Header informations. Usually created at runtime by loadBox().
* @var array box dependancies
* @var boolean $standard_conforming_string Set this to true if postgres accept only standard encoding of sting using '' and not \'
* @var int Postion
* @var int Date for cancelation
* @var int ID for cancelation
* @var int -1=Unkown duration
* @var int Amount can be choosen by the visitor during subscription (0 or 1)
* @var int Code modifiable si il est invalide
* @var int Subsription required (0 or 1)
* @var int availabilty ID
* @var integer|string Date delivery planed
* @var string The name of constant to use to scan ODT files (Exemple: 'COMMANDE_ADDON_PDF_ODT_PATH')
* @var string Hash to identify ticket publically
* @var string availabilty code
* @var string availabilty label
* @var string ref custome
* Active Directory ne supporte pas les connexions anonymes
* Attention ce module est utilise par defaut si aucun module n'a
@@ -1434,6 +1543,7 @@
* Exemple: { "socid": 2, "date": 1595196000, "type": 0, "lines": [{ "fk_product": 2, "qty": 1 }] }
* Flag to 1 if we must clean ambiguous charaters for the autogeneration of password (List of ambiguous char is in $this->Ambi)
* Function to know all custom groupd from an accounting account
* Function to shwo the combo select to chose a type of field (varchar, int, email, ...)
* Function used to return childs of Mo
* If paid completelly, this->close_code will be null
* Inserts all informations into database.
@@ -1492,6 +1602,7 @@
* Return connexion ID
* Return direct childs id of a category into an array
* Return list of auxilary accounts. Cumulate list from customers, suppliers and users.
* Return list of categories having choosed type
* Return list of product formated for output
* Return the addtional SQL JOIN query for filtering a list by a category
* Return the addtional SQL SELECT query for filtering a list by a category
@@ -1509,6 +1620,7 @@
* ete definit dans la configuration
* or a COMMA delimted string, and inserts them into a highly
* reload conf value from databases is an aliase of loadValueFromConf
* reverse mouvement for object by updating infos
* statique et publique. Le nombre de parametres est determine automatiquement.
* the tagret is useful with hooks : that allow externals modules to add setup items on good place
* the underlaying array is destroyed and reconstructed.
@@ -1520,6 +1632,7 @@
# Log directoves
$IBS_RETOUR = "montant:M;ref:R;auto:A;trans:T"; // Format des parametres du get de validation en reponse (url a definir sous paybox)
$alwaysuncheckedmodules = array('dav', 'dynamicprices', 'incoterm', 'loan', 'multicurrency', 'paybox', 'paypal', 'stripe', 'google', 'printing', 'scanner', 'skype', 'website'); // Module we dont want by default
$alwaysuncheckedmodules = array('dav', 'dynamicprices', 'incoterm', 'loan', 'multicurrency', 'paybox', 'paypal', 'stripe', 'google', 'printing', 'scanner', 'socialnetworks', 'website'); // Module we dont want by default
$amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)
$controle = $tableau[$report][10];
$data = getDecodeValue($mege, $type);
@@ -1530,6 +1643,8 @@
$intial = 0;
$ldaprecords = $ldap->getRecords('*', $conf->global->LDAP_MEMBER_DN, $conf->global->LDAP_KEY_MEMBERS, $required_fields, 'member'); // Fiter on 'member' filter param
$ldaprecords = $ldap->getRecords('*', $conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields, 'user'); // Fiter on 'user' filter param
$ldaprecords = $ldap->getRecords('*', getDolGlobalString('LDAP_MEMBER_DN'), getDolGlobalString('LDAP_KEY_MEMBERS'), $required_fields, 'member'); // Fiter on 'member' filter param
$ldaprecords = $ldap->getRecords('*', getDolGlobalString('LDAP_USER_DN'), getDolGlobalString('LDAP_KEY_USERS'), $required_fields, 'user'); // Fiter on 'user' filter param
$mege = imap_fetchbody($mbox, $jk, $fpos);
$mege = imap_fetchbody($mbox, $jk, $fpos, FT_UID);
$object->status = $object->fk_statut; // for backwad compatibility
@@ -1556,6 +1671,7 @@
// Add format informations and link to download example
// Affichage de la liste des projets de la semaine
// Bit 1: 0 ligne normale - 1 si ligne de remise fixe
// Build filter to diplay only concerned lines
// By default use tls decied by PHP.
// Cas des parametres TAX_MODE_SELL/BUY_SERVICE/PRODUCT
// Chargement de la classe
@@ -1621,9 +1737,11 @@
// We open a list of transaction of a dedicated account and no page was set by defaut
// When a dictionnary is commented
// add properties and declare them in consturctor
// buil format asciidoc for urls in table
// but in some situations that is required (update legal informations for example)
// for gravatar use get_avatar_from_service('gravatar', md5 hash email@adress, size-in-px )
// on transfert les données de l'un vers l'autre
// rewrite dictionnary if
// si le filtrage est parametre pour l'export ou pas
// start and end date that change with time andd that may be different that the period of reference for price.
// verify informations entred
@@ -1674,6 +1792,7 @@
print '<option value="1"'.(GETPOST('mouvement') ? ' selected="selected"' : '').'>'.$langs->trans("Delete").'</option>';
print '<select name="mouvement" id="mouvement" class="minwidth100 valignmiddle">';
print '<tr><td colspan="2"><br>*** Force modules not found physicaly to be disabled (only modules adding js, css or hooks can be detected as removed physicaly)</td></tr>';
print 'Failed to open '.$outputfile.' for ouput.'."\n";
print 'Missing paramater s, c or a';
print 'Sorry, it seems your internet connexion is off.<br>';
print ajax_combobox("mouvement");
@@ -1687,6 +1806,7 @@
public $date_delivery; // Date delivery planed
public $debug_api; // usefull if no dialog
public $emetteur; // Objet societe qui emet
public $fk_origin_stock; // rowid in llx_product_batch table (not usefull)
public $graph; // Objet Graph (Artichow, Phplot...)
public $infofiles; // Used to return informations by function getDocumentsLink
public $lastsearch_values; // To store last saved search criterias for user
@@ -1878,6 +1998,7 @@
* \brief Onglet informations personnelles d'un contact
* \brief Page fiche LDAP groupe
* \brief Tab to manage contacts/adresses of proposal
* @return boolean True if informations are valid, false otherwise
* @return boolean True if informations are valid, false otherwise
* @return string Formated string
* @return string Return list fo image format
@@ -1930,8 +2051,10 @@
* @return string String with formated amounts ('19,6' or '19,6%' or '8.5% (NPR)' or '8.5% *' or '19,6 (CODEX)')
* @return array|int Array with details of VATs (per rate), -1 if no accountancy module, -2 if not yet developped, -3 if error
* @return array|int Array with details of VATs (per third parties), -1 if no accountancy module, -2 if not yet developped, -3 if error
* Classe mere des modeles de numerotation des references de bon de livraison
* Classe mere des modeles de numerotation des references de members
* Classe mere des modeles de numerotation des references de projets
* Classe mere des modeles de numerotation des tickets de caisse
* Classe permettant la gestion des stats des expensereports et notes de frais
* Delete files into database index using search criterias.
* Get formated error messages to output (Used to show messages on html output).
@@ -1996,6 +2119,7 @@
* @param string $objectname name of object whant to remove
* @retun boolean
* @return array returns an associtive array containing the response from the server.
* @return string Formated string
* @return string A HTML table that conatins a list with open (unpaid) supplier invoices
* @return string Formated value
* @return array Array of mesures
@@ -2018,6 +2142,7 @@
* Correspondance des livraisons et des commandes clients dans la table llx_co_liv
* Creation objet $langs (must be before all other code)
* For action=add, use: $var = GETPOST('var'); // No GETPOSTISSET, so GETPOST always called and default value is retreived if not a form POST, and value of form is retreived if it is a form POST.
* Generate Urls and add them to documentaion module
* It is usefull to search for a particular key and displaying arrays.
* Lattest modified orders
* Les catégories filles, sous tableau dez la catégorie
@@ -2072,14 +2197,17 @@
$FULLTAG = GETPOST("fulltag", 'alpha'); // fulltag is tag with more informations
$array = array(1=>'Value 1', 2=>'Value 2', 3=>'Value 3 ith a very long text. aze eazeae e ae aeae a e a ea ea ea e a e aea e ae aeaeaeaze.');
$conf = new stdClass(); // instantiate $conf explicitely
$html .= ' monthes people</b><br>';
$permissiontoadd = $user->rights->stock->mouvement->creer;
$permissiontodelete = $user->rights->stock->mouvement->creer; // There is no deletion permission for stock movement as we shoul dnever delete
$permissiontodelete = $user->rights->stock->mouvement->creer; // There is no deletion permission for stock movement as we should never delete
$permissiontoread = $user->rights->stock->mouvement->lire;
$seledted = !getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY') ? array() : explode(',', getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY'));
$seledted = empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY) ? array() : explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY);
$sql = "SELECT id_users, nom as name, id_sondage, reponses";
$sql = 'SELECT nom as name, reponses';
$tag = GETPOST('tag'); // To retreive the emailing, and recipient
$tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')) + 2; // date('w') is 0 fo sunday
$usercancreate = $user->rights->stock->mouvement->creer;
$usercancreate = (($user->rights->stock->mouvement->creer));
$usercandelete = $user->rights->stock->mouvement->creer;
@@ -2138,6 +2266,7 @@ $usercanread = (($user->rights->stock->mouvement->lire));
/* Affichage de la liste des projets du mois */
/* Badge style is based on boostrap framework */
/* Force values on one colum for small screen */
/* The buttonplus isgrowing on hover (dont know why). This is to avoid to have the cellegrowing too */
/* To make a div popup, we must use a position aboluste inside a position relative */
/* USING IMAGES FOR WEATHER INTEAD OF FONT AWESOME */
/* Warning: setting this may make screen not beeing refreshed after a combo selection */
@@ -2206,6 +2335,7 @@ $usercanread = (($user->rights->stock->mouvement->lire));
// TODO ajouter regle pour restreindre acces paiement
// Table to store complete informations (will replace all other table). Key is table name.
// Test to check image can be publically viewed is done inside the viewimage.php wrapper.
// The session_set_save_handler() at end of this fille will replace default session management.
// This 2 lines are usefull only if we want to exclude some Urls from the explorer
// This refresh list of dirs, not list of files (for preformance reason). List of files is refresh only if dir was not synchronized.
// To disable a constant whithout javascript
@@ -2214,9 +2344,11 @@ $usercanread = (($user->rights->stock->mouvement->lire));
// We keep it with value ForceBuyingPriceIfNull = 2 for retroactive effect but results are unpredicable.
// We must filter on assignement table
// badge color ajustement for color blind
// chek if salary pl
// current rule: uptodate = the end date is in future or no subcription required
// librarie core
// librarie jobs
// reverse mouvement of stock
// status color ajustement for color blind
//Activate Set adress in list
//Another call for easy debugg
@@ -2363,6 +2495,7 @@ NEW: Add SQL contraint on product_stock table to allow only exsting product and
NEW: Add email in event history, for reminder email of expired subsription
NEW: Add exemple of setup for multitail to render dolibarr log files
NEW: Add hidden option MAIN_EMAIL_SUPPORT_ACK to restore Email ack checkbox (feature abandonned by mailers)
NEW: Add more company informations (ProfId7 to 10) (#25266)
NEW: Add option to disable globaly some notifications emails.
NEW: Add option to display thirdparty adress in combolist
NEW: Add ressource extrafields.
@@ -2394,15 +2527,20 @@ NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status into ea
NEW: Introduce position of records into dictionnary of type of contacts
NEW: Introduce use of cache for thumbs images of users to save bandwith.
NEW: Look and feel v11: Some setup pages are by default direclty in edit mode.
NEW: Menu editor is reponsive
NEW: Merge all boxes "related objects" into one. This save a lot of room on most card and avoid often horizontal scoll.
NEW: ModuleBuilder - More feature that can be modifed after module generation
NEW: ModuleBuilder: for edit name of dictionnary and delete it in MB
NEW: On page to see/edit contact of an ojbect, the status of contact is visible (for both external and internal users).
NEW: Page to check if the operations/items created between two dates have attached item(s) and possibility to download all attachements
NEW: Payment: Can edit account on miscellaneous payment (if not transfered)
NEW: Product stock and subproduct stock are independant
NEW: Products: Add SQL contraint on product_stock table to allow only existing product and warehouse #23543
NEW: Remove tooltip tipTip library replaced with standatd jquery tooltip
NEW: Start to introduce search filters on dictionnaries for vat list.
NEW: Support of deployement of metapackages
NEW: When a new field to show into lists is selected, the form is automatically submited and field added.
NEW: When an user unset the batch management of products, transformation of each batch stock mouvement in global stock mouvement
NEW: X-Axis on graph are shown verticaly when there is a lot of values.
NEW: add API shipment mode dictionnary
NEW: add a prospect status for the contact with managment of custom icon
@@ -2430,11 +2568,13 @@ Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test
Store, search and retreive any article to keep your knowledge into a database. It can be used to manage a list of FAQ, or a database
The keyword can be ommitted if your commit does not fit in any of the following categories:
The output patch file can then be submited on Dolibarr
The output patch file can then be submited on Dolibarr dev mailing-list, with explanation on its goal, for inclusion in main branch.
This directory contains ruleset files to use to develop Dolibarr EPR & CRM.
This directory contains several subdirectories with entries for informations on Dolibarr.<br>
This docker image intended for developpement usage.
This docker image is intended for developpement usage.
This module provides a sheduled job that scan regularly one or several IMAP email boxes, with filtering rules, to automatically record data in your application, like
Une ligne represente un element : data[$x]
Upgrading to any other version or database system is abolutely required BEFORE trying to
We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: [https://www.dolibarr.org/download](https://www.dolibarr.org/download)) to get access on every side of application.
You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommand to install software on your own platform.
@@ -2447,6 +2587,7 @@ elseif ($year && $month && $day) $daytoparsegmt = dol_mktime(0, 0, 0, $month, $d
function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, $fk_pa, $paht)
function print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $action, $showextcals = array(), $actioncode = '', $usergroupid = '', $excludetype = '', $resourceid = 0)
if (!$user->hasRight('stock', 'mouvement', 'lire')) {
if (!empty($conf->variants->eabled) && !getDolGlobalString('VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT')) { // Add test to exclude products that has variants
if (!empty($conf->variants->eabled) && empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) { // Add test to exclude products that has variants
if (!empty($contactname)) { // acces a partir du module de recherche
if ($action == "transfert") {
@@ -2462,3 +2603,4 @@ print '<div class="div-table-responsive-no-min">'; // You can use div-table-resp
print_barre_liste($langs->trans("Sessions"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, ($num ? $num : ''), 'setup'); // Do not show numer (0) if no session found (it means we can't know)
print_liste_field_titre("Prority", $_SERVER["PHP_SELF"], "t.priority", "", $param, '', $sortfield, $sortorder);
session_start(); // To be able to keep info into session (used for not losing pass during navigation. pass must not transit through parmaeters)
} // this are value submited after submit of action 'submitdateselect'

View File

@@ -37,14 +37,14 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
exit();
}
error_reporting(E_ALL & ~ E_DEPRECATED);
error_reporting(E_ALL & ~E_DEPRECATED);
define('PRODUCT', "pg2mysql");
define('VERSION', "2.0");
// this is the default, it can be overridden here, or specified as the third parameter on the command line
$config['engine'] = "InnoDB";
if (! ($argv[1] && $argv[2])) {
if (!($argv[1] && $argv[2])) {
echo "Usage: php pg2mysql_cli.php <inputfilename> <outputfilename> [engine]\n";
exit();
} else {
@@ -141,7 +141,7 @@ function pg2mysql_large($infilename, $outfilename)
echo "Filesize: " . formatsize($fs) . "\n";
while ($instr = fgets($infp)) {
$linenum ++;
$linenum++;
$memusage = round(memory_get_usage(true) / 1024 / 1024);
$len = strlen($instr);
$pgsqlchunk[] = $instr;
@@ -163,7 +163,7 @@ function pg2mysql_large($infilename, $outfilename)
}
if (strlen($instr) > 3 && ($instr[$len - 3] == ")" && $instr[$len - 2] == ";" && $instr[$len - 1] == "\n") && $inquotes == false) {
$chunkcount ++;
$chunkcount++;
if ($linenum % 10000 == 0) {
$currentpos = ftell($infp);
@@ -246,7 +246,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
if (is_array($input)) {
$lines = $input;
} else {
$lines = split("\n", $input);
$lines = explode("\n", $input);
}
if ($header) {
@@ -302,7 +302,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
$output .= 'DROP TABLE IF EXISTS `' . $reg2[1] . '`;' . "\n";
}
$output .= $line;
$linenumber ++;
$linenumber++;
continue;
}
@@ -313,7 +313,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
$output .= $tbl_extra;
$output .= $line;
$linenumber ++;
$linenumber++;
$tbl_extra = "";
continue;
}
@@ -395,10 +395,10 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
if (strstr($line, " CONSTRAINT ")) {
$line = "";
// and if the previous output ended with a , remove the ,
$lastchr = substr($output, - 2, 1);
$lastchr = substr($output, -2, 1);
// echo "lastchr=$lastchr";
if ($lastchr == ",") {
$output = substr($output, 0, - 2) . "\n";
$output = substr($output, 0, -2) . "\n";
}
}
@@ -408,9 +408,9 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
if (substr($line, 0, 11) == "INSERT INTO") {
$line = str_replace('public.', '', $line);
if (substr($line, - 3, - 1) == ");") {
if (substr($line, -3, -1) == ");") {
// we have a complete insert on one line
list ($before, $after) = explode(" VALUES ", $line, 2);
list($before, $after) = explode(" VALUES ", $line, 2);
// we only replace the " with ` in what comes BEFORE the VALUES
// (ie, field names, like INSERT INTO table ("bla","bla2") VALUES ('s:4:"test"','bladata2');
// should convert to INSERT INTO table (`bla`,`bla2`) VALUES ('s:4:"test"','bladata2');
@@ -424,13 +424,13 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
$after = str_replace(", E'", ", '", $after);
$output .= $before . " VALUES " . $after;
$linenumber ++;
$linenumber++;
continue;
} else {
// this insert spans multiple lines, so keep dumping the lines until we reach a line
// that ends with ");"
list ($before, $after) = explode(" VALUES ", $line, 2);
list($before, $after) = explode(" VALUES ", $line, 2);
// we only replace the " with ` in what comes BEFORE the VALUES
// (ie, field names, like INSERT INTO table ("bla","bla2") VALUES ('s:4:"test"','bladata2');
// should convert to INSERT INTO table (`bla`,`bla2`) VALUES ('s:4:"test"','bladata2');
@@ -453,7 +453,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
$output .= $before . " VALUES " . $after;
do {
$linenumber ++;
$linenumber++;
// in after, we need to watch out for escape format strings, ie (E'escaped \r in a string'), and ('bla',E'escaped \r in a string')
// ugh i guess its possible these strings could exist IN the data as well, but the only way to solve that is to process these lines one character
@@ -477,7 +477,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
}
// echo "inquotes=$inquotes\n";
}
} while (substr($lines[$linenumber], - 3, - 1) != ");" || $inquotes);
} while (substr($lines[$linenumber], -3, -1) != ");" || $inquotes);
}
}
if (substr($line, 0, 16) == "ALTER TABLE ONLY") {
@@ -486,14 +486,14 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
$line = str_replace("public.", "", $line);
$pkey = $line;
$linenumber ++;
$linenumber++;
if (!empty($lines[$linenumber])) {
$line = $lines[$linenumber];
} else {
$line = '';
}
if (strstr($line, " PRIMARY KEY ") && substr($line, - 3, - 1) == ");") {
if (strstr($line, " PRIMARY KEY ") && substr($line, -3, -1) == ");") {
$reg2 = array();
if (preg_match('/ALTER TABLE ([^\s]+)/', $pkey, $reg2)) {
if (empty($arrayofprimaryalreadyintabledef[$reg2[1]])) {
@@ -580,7 +580,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
}
}
$linenumber ++;
$linenumber++;
}
return array('output' => $output,'outputatend' => $outputatend);

View File

@@ -10,21 +10,21 @@
# Syntax
if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
then
echo "This script detect or clean files with CR+LF into files with LF only. All source files are included, also files into includes."
echo "This script detect or clean files with CR+LF into files with LF only. All source files are included, including files into includes."
echo "Usage: fixdosfiles.sh [list|fix]"
fi
# To detec
if [ "x$1" = "xlist" ]
then
find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep -v "CRLF" | grep -v 'custom\/' | grep -v 'documents\/website' | grep -v 'documents\/medias' | grep -v 'documents\/sellyoursaas' | grep CRLF
find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep -v 'custom\/' | grep -v 'documents\/website' | grep -v 'documents\/medias' | grep -v 'documents\/sellyoursaas' | grep CRLF
# find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" \) -exec file "{}" + | grep -v "CRLF" | grep -v 'custom\/' | grep -v 'documents\/website' | grep -v 'documents\/medias' | grep -v 'documents\/sellyoursaas' | grep -v 'htdocs\/includes' | grep CRLF
fi
# To convert
if [ "x$1" = "xfix" ]
then
for fic in `find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep -v "CRLF" | grep -v 'custom\/' | grep -v 'documents\/website' | grep -v 'documents\/medias' | grep -v 'documents\/sellyoursaas' | grep CRLF | awk -F':' '{ print $1 }' `
for fic in `find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep -v 'custom\/' | grep -v 'documents\/website' | grep -v 'documents\/medias' | grep -v 'documents\/sellyoursaas' | grep CRLF | awk -F':' '{ print $1 }' `
do
echo "Fix file $fic"
dos2unix "$fic"

View File

@@ -1,10 +1,11 @@
#!/bin/sh
#
# Count number of different contributors and number of commits for a given year.
# Can be used for statistics (for example to generate the inforgraphy of the year)
#
if [ "x$1" = "x" ]; then
echo "Usage: $0 YEAR"
echo "Usage: $0 YEARSTART [YEAREND]"
exit
fi
@@ -12,10 +13,15 @@ fi
FROM=$1-01-01
TO=$1-12-31
echo "Number of contributors for the year"
echo "git log --since $FROM --before $TO | grep ^Author | sort -u -f -i -b | wc -l"
git log --since $FROM --before $TO | grep ^Author | sort -u -f -i -b | wc -l
if [ "x$2" != "x" ]; then
TO=$2-12-31
fi
echo "--- Number of contributors for the year"
echo "git log --since $FROM --before $TO | grep ^Author | awk -F'<' '{ print $1 }' | iconv -f UTF-8 -t ASCII//TRANSLIT | sort -u -f -i -b | wc -l"
git log --since $FROM --before $TO | grep '^Author' | awk -F"<" '{ print $1 }' | iconv -f UTF-8 -t ASCII//TRANSLIT | sort -u -f -i -b | wc -l
echo "Number of commit for the year"
git log --pretty='format:%cd' --date=format:'%Y' | uniq -c | awk '{print "Year: "$2", commits: "$1}' | grep "Year: $1"
echo "--- Number of commit for the year"
echo "git log --pretty='format:%cd' --date=format:'%Y' | sort | uniq -c | awk '{ if (\$2 >= '"$1"') { print \"Year: \"\$2\", commits: \"\$1 } }'"
git log --pretty='format:%cd' --date=format:'%Y' | sort | uniq -c | awk '{ if ($2 >= '$1') { print "Year: "$2", commits: "$1 } }'

View File

@@ -3,16 +3,47 @@
# Count number of commits per user and per versions (using date for version detection)
#
Releases=("17.0" "18.0" "develop")
Dates=("2023-02-01" "2023-08-31" "2050-01-01")
let "counter = 1"
Releases=("3.9" "4.0" "5.0" "6.0" "7.0" "8.0" "9.0" "10.0" "11.0" "12.0" "13.0" "14.0" "15.0" "16.0" "17.0" "18.0" "develop")
let "counter = 0"
echo "Copy script into /tmp/github_commits_perversion.sh"
cp $0 /tmp/github_commits_perversion.sh
echo "Delete /tmp/git"
rm -fr /tmp/git
echo "Create and go into /tmp/git"
mkdir /tmp/git
cd /tmp/git
git clone https://github.com/Dolibarr/dolibarr.git
cd /tmp/git/dolibarr
firstline=1
for i in "${Releases[@]}"
do
echo "=== $counter git shortlog -s -n --after=${Dates[counter-1]} --before=${Dates[counter]}"
git shortlog -s -n --after=${Dates[counter-1]} --before=${Dates[counter]}
echo -n "Total $i: "
git log --pretty=oneline --after=${Dates[counter-1]} --before=${Dates[counter]} | wc -l
if [ $firstline -eq 1 ]; then
firstline=0
continue
fi
#echo "=== Version $i (counter $counter):"
echo "=== Version $i (counter $counter):"
echo "Get common commit ID between origin/${Releases[counter]} and origin/${Releases[counter+1]}"
echo "git merge-base origin/${Releases[counter]} origin/${Releases[counter+1]}"
commitidcommon=`git merge-base origin/${Releases[counter]} origin/${Releases[counter+1]}`
echo "Found commitid=$commitidcommon"
echo "Checkout into version $i"
git checkout $i
#git shortlog -s -n --after=YYYY-MM-DD --before=YYYY-MM-DD | tr '[:lower:]' '[:upper:]' > /tmp/github_commits_perversion.txt
git shortlog -s -n $commitidcommon.. | tr '[:lower:]' '[:upper:]' > /tmp/github_commits_perversion.txt
#cat /tmp/github_commits_perversion.txt
echo "Total for version $i:"
echo -n "- Nb of commits: "
git log $commitidcommon.. --pretty=oneline | tr '[:lower:]' '[:upper:]' > /tmp/github_commits_perversion2.txt
cat /tmp/github_commits_perversion2.txt | wc -l
echo -n "- Nb of different authors: "
awk ' { print $2 } ' < /tmp/github_commits_perversion.txt | sort -u | wc -l
echo "======================="
echo
let "counter +=1"

57
dev/tools/make_sprite.sh Normal file
View File

@@ -0,0 +1,57 @@
#!/bin/bash
# Based of: https://gist.github.com/jaymzcd/342399 and https://github.com/buren/flag-sprite-maker
# uses imagemagick to stich together all images in a folder and
# then writes a css file with the correct offsets along with a
# test html page for verification that its all good
# Usage:
# $ ./make_sprite.sh path class_name image_extension
set -euo pipefail
IFS=$'\n\t'
name='output'; # output will be placed in a folder named this
path="${1:-}" # Path to flag images
classname=${2:-flag}"-sprite"
ext="."${3:-png}; # the extension to iterate over for input files
css="$name/$classname.css";
html="$name/test.html";
rm -fr $name;
mkdir $name;
touch $css $html;
echo "Generating sprite file...";
convert $path*$ext -append $name/$classname$ext;
echo "Sprite complete! - Creating css & test output...";
echo -e "<html>\n<head>\n\t<link rel=\"stylesheet\" href=\"`basename $css`\" />\n</head>\n<body>\n\t<h1>Sprite test page</h1>\n" >> $html
echo -e ".$classname {\n\tbackground:url('$classname$ext') no-repeat top left; display:inline-block;\n}" >> $css;
counter=0;
offset=0;
for file in $path*$ext
do
width=`identify -format "%[fx:w]" "$file"`;
height=`identify -format "%[fx:h]" "$file"`;
idname=`basename "$file" $ext`;
clean=${idname// /-}
echo -e ".$classname.$clean {" >> $css;
echo -e "\tbackground-position:0 -${offset}px;" >> $css;
echo -e "\twidth: ${width}px;" >> $css;
echo -e "\theight: ${height}px;\n}" >> $css;
echo -e "<div style=\"display:inline-block;width:100px;\"><div style=\"overflow-x:hidden;text-overflow:ellipsis;white-space:nowrap;\">$clean</div> <a href=\"#\" class=\"$classname $clean\"></a></div>\n" >> $html;
let offset+=$height;
let counter+=1;
echo -e "\t#$counter done";
done
echo -e "<h2>Full sprite:</h2>\n<img src=\"$classname$ext\" />" >> $html;
echo -e "</body>\n</html>" >> $html;
echo -e "\nComplete! - $counter sprites created, css written & test page output.";

3
dev/tools/php-cs-fixer/.gitignore vendored Normal file
View File

@@ -0,0 +1,3 @@
/vendor/
/composer.json
/composer.lock

View File

@@ -0,0 +1,80 @@
#!/bin/bash
#
# Usage:
# Optionally set COMPOSER_CMD to the command to use to run composer.
# Optionally set COMPOSER_VENDOR_DIR to your vendor path for composer.
#
# Run php-cs-fixer by calling this script:
# ./run-php-cs-fixer.sh check # Only checks (not available with PHP 7.0)
# ./run-php-cs-fixer.sh fix # Fixes
#
# You can fix only a few files using
# ./run-php-cs-fixer.sh fix htdocs/path/to/myfile.php
#
# You can run this from the root directory of dolibarr
# dev/tools/run-php-cs-fixer.sh fix htdocs/path/to/myfile.php
#
# You can provide the environment variables on the CLI like this:
# COMPOSER_CMD="php ~/composer.phar" COMPOSER_VENDOR_DIR="~/vendor" ./run-php-cs-fixer.sh
#
# or export them:
# export COMPOSER_CMD="~/composer.phar"
# export COMPOSER_VENDOR_DIR="~/vendor"
# ./run-php-cs-fixer.sh
#
# Or some other method
#
MYDIR=$(dirname "$(realpath "$0")")
export COMPOSER_VENDOR_DIR=${COMPOSER_VENDOR_DIR:=$MYDIR/vendor}
COMPOSER_CMD=${COMPOSER_CMD:composer}
MINPHPVERSION="7.0"
echo "***** run-php-cs-fixer.sh *****"
if [ "x$1" = "x" ]; then
echo "Syntax: run-php-cs-fixer.sh check|fix [path_from_root_project]"
exit 1;
fi
#
# Check composer is available
#
if [ ! -r "${COMPOSER_CMD}" ] ; then
echo composer is not available or not in path. You can give the path of composer by setting COMPOSER_CMD=/pathto/composer
echo Example: export COMPOSER_CMD="~/composer.phar"
echo Example: export COMPOSER_CMD="/usr/local/bin/composer"
exit 1;
fi
#
# Install/update php-cs-fixer
#
echo Install php-cs-fixer
PHP_CS_FIXER="${COMPOSER_VENDOR_DIR}/bin/php-cs-fixer"
if [ ! -r "${PHP_CS_FIXER}" ] ; then
[[ ! -e "${COMPOSER_VENDOR_DIR}" ]] && ${COMPOSER_CMD} install
[[ -e "${COMPOSER_VENDOR_DIR}" ]] && ${COMPOSER_CMD} update
php${MINPHPVERSION} ${COMPOSER_CMD} require --dev friendsofphp/php-cs-fixer
echo
fi
# With PHP 7.0, php-cs-fixer is V2 (command check not supported)
# With PHP 8.2, php-cs-fixer is V3
(
echo cd "${MYDIR}/../../.."
cd "${MYDIR}/../../.." || exit
CMD=
# If no argument, run check by default
[[ "$1" == "" ]] && CMD=check
# shellcheck disable=SC2086
echo php${MINPHPVERSION} "${PHP_CS_FIXER}" $CMD "$@"
php${MINPHPVERSION} "${PHP_CS_FIXER}" $CMD "$@"
)

2
dev/tools/rector/.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
/test.php
/vendor

View File

@@ -0,0 +1,28 @@
### Refactoring code with [rector](https://getrector.com)
#### Installation
Run in this folder
```shell
cd dev/tools/rector
```
Install rector with composer
```shell
composer install
```
#### Usage
##### To make changes (Add --dry-run for test mode only)
```shell
./vendor/bin/rector process --dry-run
```
##### To make changes on a given directory
```shell
./vendor/bin/rector process [--dry-run] [--clear-cache] ../../../htdocs/core/
```

View File

@@ -0,0 +1,19 @@
{
"name": "dolibarr/rector",
"type": "project",
"license": "GplV3",
"authors": [
{
"name": "Dev2a",
"email": "contact@dev2a.pro"
}
],
"require-dev": {
"rector/rector": "^0.18.5"
},
"autoload-dev": {
"psr-4": {
"Dolibarr\\Rector\\": "./src"
}
}
}

137
dev/tools/rector/composer.lock generated Normal file
View File

@@ -0,0 +1,137 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "f2998987cad52db5ab60d5ff0672ce05",
"packages": [],
"packages-dev": [
{
"name": "phpstan/phpstan",
"version": "1.10.38",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "5302bb402c57f00fb3c2c015bac86e0827e4b691"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/5302bb402c57f00fb3c2c015bac86e0827e4b691",
"reference": "5302bb402c57f00fb3c2c015bac86e0827e4b691",
"shasum": ""
},
"require": {
"php": "^7.2|^8.0"
},
"conflict": {
"phpstan/phpstan-shim": "*"
},
"bin": [
"phpstan",
"phpstan.phar"
],
"type": "library",
"autoload": {
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "PHPStan - PHP Static Analysis Tool",
"keywords": [
"dev",
"static analysis"
],
"support": {
"docs": "https://phpstan.org/user-guide/getting-started",
"forum": "https://github.com/phpstan/phpstan/discussions",
"issues": "https://github.com/phpstan/phpstan/issues",
"security": "https://github.com/phpstan/phpstan/security/policy",
"source": "https://github.com/phpstan/phpstan-src"
},
"funding": [
{
"url": "https://github.com/ondrejmirtes",
"type": "github"
},
{
"url": "https://github.com/phpstan",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
"type": "tidelift"
}
],
"time": "2023-10-06T14:19:14+00:00"
},
{
"name": "rector/rector",
"version": "0.18.5",
"source": {
"type": "git",
"url": "https://github.com/rectorphp/rector.git",
"reference": "2a3b82f317e431fc142d21f3303891a4e64c96eb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/rectorphp/rector/zipball/2a3b82f317e431fc142d21f3303891a4e64c96eb",
"reference": "2a3b82f317e431fc142d21f3303891a4e64c96eb",
"shasum": ""
},
"require": {
"php": "^7.2|^8.0",
"phpstan/phpstan": "^1.10.35"
},
"conflict": {
"rector/rector-doctrine": "*",
"rector/rector-downgrade-php": "*",
"rector/rector-phpunit": "*",
"rector/rector-symfony": "*"
},
"bin": [
"bin/rector"
],
"type": "library",
"autoload": {
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Instant Upgrade and Automated Refactoring of any PHP code",
"keywords": [
"automation",
"dev",
"migration",
"refactoring"
],
"support": {
"issues": "https://github.com/rectorphp/rector/issues",
"source": "https://github.com/rectorphp/rector/tree/0.18.5"
},
"funding": [
{
"url": "https://github.com/tomasvotruba",
"type": "github"
}
],
"time": "2023-10-05T11:25:40+00:00"
}
],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": [],
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],
"platform-dev": [],
"plugin-api-version": "2.2.0"
}

View File

@@ -0,0 +1,62 @@
<?php
declare(strict_types=1);
use Rector\Config\RectorConfig;
use Rector\Core\ValueObject\PhpVersion;
use Rector\Set\ValueObject\LevelSetList;
return static function (RectorConfig $rectorConfig): void {
$rectorConfig->phpVersion(PhpVersion::PHP_71);
//$rectorConfig->indent(' ', 4);
// Traits seems not supported correctly by rector without declaring them as bootstrapFiles
$arrayoftraitfiles = array(
__DIR__ . '/../../../htdocs/core/class/commonincoterm.class.php',
__DIR__ . '/../../../htdocs/core/class/commonpeople.class.php',
__DIR__ . '/../../../htdocs/core/class/commonsocialnetworks.class.php'
);
$rectorConfig->bootstrapFiles($arrayoftraitfiles);
$rectorConfig->paths([
__DIR__ . '/../../../htdocs/',
__DIR__ . '/../../../scripts/',
__DIR__ . '/../../../test/phpunit/',
]);
$rectorConfig->skip([
'**/includes/**',
'**/custom/**',
'**/vendor/**',
'**/rector/**', // Disable this line to test the "test.php" file.
__DIR__ . '/../../../htdocs/custom/',
__DIR__ . '/../../../htdocs/install/doctemplates/*'
]);
$rectorConfig->parallel(240);
// Register rules
//$rectorConfig->rule(Rector\Php71\Rector\List_\ListToArrayDestructRector::class);
//$rectorConfig->rule(Rector\Php72\Rector\FuncCall\CreateFunctionToAnonymousFunctionRector::class);
//$rectorConfig->rule(Rector\Php72\Rector\FuncCall\GetClassOnNullRector::class);
//$rectorConfig->rule(Rector\Php72\Rector\Assign\ListEachRector::class);
//$rectorConfig->rule(Rector\Php72\Rector\FuncCall\ParseStrWithResultArgumentRector::class);
//$rectorConfig->rule(Rector\Php72\Rector\FuncCall\StringifyDefineRector::class);
//$rectorConfig->rule(ReplaceEachAssignmentWithKeyCurrentRector::class);
$rectorConfig->rule(Rector\CodeQuality\Rector\FuncCall\FloatvalToTypeCastRector::class);
$rectorConfig->rule(Rector\CodeQuality\Rector\FuncCall\BoolvalToTypeCastRector::class);
$rectorConfig->rule(Rector\CodeQuality\Rector\NotEqual\CommonNotEqualRector::class);
//$rectorconfig->rule(Rector\CodeQuality\Rector\If_\CompleteMissingIfElseBracketRector::class);
$rectorConfig->rule(Rector\CodeQuality\Rector\For_\ForRepeatedCountToOwnVariableRector::class);
$rectorConfig->rule(Dolibarr\Rector\Renaming\GlobalToFunction::class);
$rectorConfig->rule(Dolibarr\Rector\Renaming\UserRightsToFunction::class);
$rectorConfig->rule(Dolibarr\Rector\Renaming\EmptyGlobalToFunction::class);
// Add all predefined rules to migrate to up to php 71
// $rectorConfig->sets([
// LevelSetList::UP_TO_PHP_71
// ]);
};

View File

@@ -0,0 +1,216 @@
<?php
namespace Dolibarr\Rector\Renaming;
use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr\ArrayDimFetch;
use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
use PhpParser\Node\Expr\BinaryOp\Concat;
use PhpParser\Node\Expr\BinaryOp\Equal;
use PhpParser\Node\Expr\BooleanNot;
use PhpParser\Node\Expr\Empty_;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Expr\Isset_;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Name;
use PhpParser\Node\Scalar\String_;
use Rector\Core\NodeManipulator\BinaryOpManipulator;
use Rector\Core\Rector\AbstractRector;
use Rector\Php71\ValueObject\TwoNodeMatch;
use Symplify\RuleDocGenerator\Exception\PoorDocumentationException;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use Rector\Strict\Rector\BooleanNot\BooleanInBooleanNotRuleFixerRector;
/**
* Class with Rector custom rule to fix code
*/
class EmptyGlobalToFunction extends AbstractRector
{
/**
* @var \Rector\Core\NodeManipulator\BinaryOpManipulator
*/
private $binaryOpManipulator;
/**
* Constructor
*
* @param BinaryOpManipulator $binaryOpManipulator The $binaryOpManipulator
*/
public function __construct(BinaryOpManipulator $binaryOpManipulator)
{
$this->binaryOpManipulator = $binaryOpManipulator;
}
/**
* getRuleDefinition
*
* @return RuleDefinition
* @throws PoorDocumentationException
*/
public function getRuleDefinition(): RuleDefinition
{
return new RuleDefinition(
'Change $conf->global to getDolGlobal',
[new CodeSample(
'$conf->global->CONSTANT',
'getDolGlobalInt(\'CONSTANT\')'
)]
);
}
/**
* Return a node type from https://github.com/rectorphp/php-parser-nodes-docs/
*
* @return string[]
*/
public function getNodeTypes(): array
{
return [Node\Expr\BooleanNot::class, Node\Expr\Empty_::class];
}
/**
* refactor
*
* @param Node $node A node
* @return FuncCall|BooleanNot
*/
public function refactor(Node $node)
{
if ($node instanceof Node\Expr\BooleanNot) {
if (!$node->expr instanceof Node\Expr\Empty_) {
return null;
}
// node is !empty(...) so we set node to ...
$newnode = $node->expr->expr;
$tmpglobal = $newnode->var;
if (is_null($tmpglobal)) {
return null;
}
if (!$this->isName($tmpglobal, 'global')) {
return null;
}
$tmpconf = $tmpglobal->var;
if (!$this->isName($tmpconf, 'conf')) {
return null;
}
$nameforconst = $this->getName($newnode);
if (is_null($nameforconst)) {
return null;
}
$constName = new String_($nameforconst);
// We found a node !empty(conf->global->XXX)
return new FuncCall(
new Name('getDolGlobalString'),
[new Arg($constName)]
);
}
if ($node instanceof Node\Expr\Empty_) {
// node is empty(...) so we set node to ...
$newnode = $node->expr;
$tmpglobal = $newnode->var;
if (is_null($tmpglobal)) {
return null;
}
if (!$this->isName($tmpglobal, 'global')) {
return null;
}
$tmpconf = $tmpglobal->var;
if (!$this->isName($tmpconf, 'conf')) {
return null;
}
$nameforconst = $this->getName($newnode);
if (is_null($nameforconst)) {
return null;
}
$constName = new String_($nameforconst);
return new BooleanNot(new FuncCall(
new Name('getDolGlobalString'),
[new Arg($constName)]
));
}
return null;
}
/**
* Get nodes with check empty
*
* @param BooleanAnd $booleanAnd A BooleandAnd
* @return TwoNodeMatch|null
*/
private function resolveTwoNodeMatch(BooleanAnd $booleanAnd): ?TwoNodeMatch
{
return $this->binaryOpManipulator->matchFirstAndSecondConditionNode(
$booleanAnd,
// $conf->global == $value
function (Node $node): bool {
if (!$node instanceof Equal) {
return \false;
}
return $this->isGlobalVar($node->left);
},
// !empty(...) || isset(...)
function (Node $node): bool {
if ($node instanceof BooleanNot && $node->expr instanceof Empty_) {
return $this->isGlobalVar($node->expr->expr);
}
if (!$node instanceof Isset_) {
return $this->isGlobalVar($node);
}
return \true;
}
);
}
/**
* Check if node is a global access with format conf->global->XXX
*
* @param Node $node A node
* @return bool Return true if noe is conf->global->XXX
*/
private function isGlobalVar($node)
{
if (!$node instanceof PropertyFetch) {
return false;
}
if (!$this->isName($node->var, 'global')) {
return false;
}
$global = $node->var;
if (!$global instanceof PropertyFetch) {
return false;
}
if (!$this->isName($global->var, 'conf')) {
return false;
}
return true;
}
/**
* @param Node $node Node to be parsed
* @return Node|void Return the name of the constant
*/
private function getConstName($node)
{
if ($node instanceof PropertyFetch && $node->name instanceof Node\Expr) {
return $node->name;
}
$name = $this->getName($node);
if (empty($name)) {
return;
}
return new String_($name);
}
}

View File

@@ -0,0 +1,391 @@
<?php
namespace Dolibarr\Rector\Renaming;
use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr\ArrayDimFetch;
use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
use PhpParser\Node\Expr\BinaryOp\Concat;
use PhpParser\Node\Expr\BinaryOp\Equal;
use PhpParser\Node\Expr\BooleanNot;
use PhpParser\Node\Expr\Empty_;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Expr\Isset_;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Name;
use PhpParser\Node\Scalar\String_;
use Rector\Core\NodeManipulator\BinaryOpManipulator;
use Rector\Core\Rector\AbstractRector;
use Rector\Php71\ValueObject\TwoNodeMatch;
use Symplify\RuleDocGenerator\Exception\PoorDocumentationException;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use PhpParser\Node\Expr\BinaryOp\NotEqual;
use PhpParser\Node\Expr\BinaryOp\Greater;
use PhpParser\Node\Expr\BinaryOp\GreaterOrEqual;
use PhpParser\Node\Expr\BinaryOp\Smaller;
use PhpParser\Node\Expr\BinaryOp\SmallerOrEqual;
use PhpParser\Node\Expr\BinaryOp\NotIdentical;
/**
* Class with Rector custom rule to fix code
*/
class GlobalToFunction extends AbstractRector
{
/**
* @var \Rector\Core\NodeManipulator\BinaryOpManipulator
*/
private $binaryOpManipulator;
/**
* Constructor
*
* @param BinaryOpManipulator $binaryOpManipulator The $binaryOpManipulator
*/
public function __construct(BinaryOpManipulator $binaryOpManipulator)
{
$this->binaryOpManipulator = $binaryOpManipulator;
}
/**
* getRuleDefinition
*
* @return RuleDefinition
* @throws PoorDocumentationException
*/
public function getRuleDefinition(): RuleDefinition
{
return new RuleDefinition(
'Change $conf->global to getDolGlobal in context (1) conf->global Operator Value or (2) function(conf->global...)',
[new CodeSample(
'$conf->global->CONSTANT',
'getDolGlobalInt(\'CONSTANT\')'
)]
);
}
/**
* Return a node type from https://github.com/rectorphp/php-parser-nodes-docs/
*
* @return string[]
*/
public function getNodeTypes(): array
{
return [FuncCall::class, MethodCall::class, Equal::class, NotEqual::class, Greater::class, GreaterOrEqual::class, Smaller::class, SmallerOrEqual::class, NotIdentical::class, BooleanAnd::class, Concat::class, ArrayDimFetch::class];
}
/**
* refactor
*
* @param Node $node A node
* @return FuncCall|Equal|Concat|ArrayDimFetch|void
* return $node unchanged or void to do nothing
*/
public function refactor(Node $node)
{
if ($node instanceof Node\Expr\ArrayDimFetch) {
if (!isset($node->dim)) {
return;
}
if ($this->isGlobalVar($node->dim)) {
$constName = $this->getConstName($node->dim);
if (empty($constName)) {
return;
}
$node->dim = new FuncCall(
new Name('getDolGlobalString'),
[new Arg($constName)]
);
}
return $node;
}
if ($node instanceof FuncCall) {
$tmpfunctionname = $this->getName($node);
// If function is ok. We must avoid a lot of cases like isset(), empty()
if (in_array($tmpfunctionname, array('dol_escape_htmltag', 'dol_hash', 'make_substitutions', 'min', 'max', 'explode'))) {
//print "tmpfunctionname=".$tmpfunctionname."\n";
$args = $node->getArgs();
$nbofparam = count($args);
if ($nbofparam >= 1) {
$tmpargs = $args;
foreach ($args as $key => $arg) { // only 1 element in this array
//var_dump($key);
//var_dump($arg->value);exit;
if ($this->isGlobalVar($arg->value)) {
$constName = $this->getConstName($arg->value);
if (empty($constName)) {
return;
}
$a = new FuncCall(new Name('getDolGlobalString'), [new Arg($constName)]);
$tmpargs[$key] = new Arg($a);
$r = new FuncCall(new Name($tmpfunctionname), $tmpargs);
return $r;
}
}
}
}
return $node;
}
if ($node instanceof MethodCall) {
$tmpmethodname = $this->getName($node->name);
// If function is ok. We must avoid a lot of cases
if (in_array($tmpmethodname, array('idate'))) {
//print "tmpmethodname=".$tmpmethodname."\n";
$expr = $node->var;
$args = $node->getArgs();
$nbofparam = count($args);
if ($nbofparam >= 1) {
$tmpargs = $args;
foreach ($args as $key => $arg) { // only 1 element in this array
//var_dump($key);
//var_dump($arg->value);exit;
if ($this->isGlobalVar($arg->value)) {
$constName = $this->getConstName($arg->value);
if (empty($constName)) {
return;
}
$a = new FuncCall(new Name('getDolGlobalString'), [new Arg($constName)]);
$tmpargs[$key] = new Arg($a);
$r = new MethodCall($expr, $tmpmethodname, $tmpargs);
return $r;
}
}
}
}
return $node;
}
if ($node instanceof Concat) {
if ($this->isGlobalVar($node->left)) {
$constName = $this->getConstName($node->left);
if (empty($constName)) {
return;
}
$leftConcat = new FuncCall(
new Name('getDolGlobalString'),
[new Arg($constName)]
);
$rightConcat = $node->right;
}
if ($this->isGlobalVar($node->right)) {
$constName = $this->getConstName($node->right);
if (empty($constName)) {
return;
}
$rightConcat = new FuncCall(
new Name('getDolGlobalString'),
[new Arg($constName)]
);
$leftConcat = $node->left;
}
if (!isset($leftConcat, $rightConcat)) {
return;
}
return new Concat($leftConcat, $rightConcat);
}
if ($node instanceof BooleanAnd) {
$nodes = $this->resolveTwoNodeMatch($node);
if (!isset($nodes)) {
return;
}
/** @var Equal $node */
$node = $nodes->getFirstExpr();
}
// Now process all comparison like:
// $conf->global->... Operator Value
$typeofcomparison = '';
if ($node instanceof Equal) {
$typeofcomparison = 'Equal';
}
if ($node instanceof NotEqual) {
$typeofcomparison = 'NotEqual';
}
if ($node instanceof Greater) {
$typeofcomparison = 'Greater';
}
if ($node instanceof GreaterOrEqual) {
$typeofcomparison = 'GreaterOrEqual';
}
if ($node instanceof Smaller) {
$typeofcomparison = 'Smaller';
}
if ($node instanceof SmallerOrEqual) {
$typeofcomparison = 'SmallerOrEqual';
}
if ($node instanceof NotIdentical) {
$typeofcomparison = 'NotIdentical';
//var_dump($node->left);
}
if (empty($typeofcomparison)) {
return;
}
if (!$this->isGlobalVar($node->left)) {
return;
}
// Test the type after the comparison conf->global->xxx to know the name of function
$typeright = $node->right->getType();
switch ($typeright) {
case 'Scalar_LNumber':
$funcName = 'getDolGlobalInt';
break;
case 'Scalar_String':
$funcName = 'getDolGlobalString';
break;
default:
return;
}
$constName = $this->getConstName($node->left);
if (empty($constName)) {
return;
}
if ($typeofcomparison == 'Equal') {
return new Equal(
new FuncCall(
new Name($funcName),
[new Arg($constName)]
),
$node->right
);
}
if ($typeofcomparison == 'NotEqual') {
return new NotEqual(
new FuncCall(
new Name($funcName),
[new Arg($constName)]
),
$node->right
);
}
if ($typeofcomparison == 'Greater') {
return new Greater(
new FuncCall(
new Name($funcName),
[new Arg($constName)]
),
$node->right
);
}
if ($typeofcomparison == 'GreaterOrEqual') {
return new GreaterOrEqual(
new FuncCall(
new Name($funcName),
[new Arg($constName)]
),
$node->right
);
}
if ($typeofcomparison == 'Smaller') {
return new Smaller(
new FuncCall(
new Name($funcName),
[new Arg($constName)]
),
$node->right
);
}
if ($typeofcomparison == 'SmallerOrEqual') {
return new SmallerOrEqual(
new FuncCall(
new Name($funcName),
[new Arg($constName)]
),
$node->right
);
}
if ($typeofcomparison == 'NotIdentical') {
return new NotIdentical(
new FuncCall(
new Name($funcName),
[new Arg($constName)]
),
$node->right
);
}
}
/**
* Get nodes with check empty
*
* @param BooleanAnd $booleanAnd A BooleandAnd
* @return TwoNodeMatch|null
*/
private function resolveTwoNodeMatch(BooleanAnd $booleanAnd): ?TwoNodeMatch
{
return $this->binaryOpManipulator->matchFirstAndSecondConditionNode(
$booleanAnd,
// Function to check if we are in the case $conf->global->... == $value
function (Node $node): bool {
if (!$node instanceof Equal) {
return \false;
}
return $this->isGlobalVar($node->left);
},
// !empty(...) || isset(...)
function (Node $node): bool {
if ($node instanceof BooleanNot && $node->expr instanceof Empty_) {
return $this->isGlobalVar($node->expr->expr);
}
if (!$node instanceof Isset_) {
return $this->isGlobalVar($node);
}
return \true;
}
);
}
/**
* Check if node is a global access with format conf->global->XXX
*
* @param Node $node A node
* @return bool Return true if node is conf->global->XXX
*/
private function isGlobalVar($node)
{
if (!$node instanceof PropertyFetch) {
return false;
}
if (!$this->isName($node->var, 'global')) {
return false;
}
$global = $node->var;
if (!$global instanceof PropertyFetch) {
return false;
}
if (!$this->isName($global->var, 'conf')) {
return false;
}
return true;
}
/**
* @param Node $node Node to be parsed
* @return Node|void Return the name of the constant
*/
private function getConstName($node)
{
if ($node instanceof PropertyFetch && $node->name instanceof Node\Expr) {
return $node->name;
}
$name = $this->getName($node);
if (empty($name)) {
return;
}
return new String_($name);
}
}

View File

@@ -0,0 +1,153 @@
<?php
namespace Dolibarr\Rector\Renaming;
use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Scalar\String_;
use PhpParser\NodeTraverser;
use Rector\Core\PhpParser\Node\NodeFactory;
use Rector\Core\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
* Class to refactor User rights
*/
class UserRightsToFunction extends AbstractRector
{
/**
* @param \Rector\Core\PhpParser\Node\NodeFactory $nodeFactory node factory
*/
public function __construct(NodeFactory $nodeFactory)
{
$this->nodeFactory = $nodeFactory;
}
/**
* @throws \Symplify\RuleDocGenerator\Exception\PoorDocumentationException
* @return RuleDefinition
*/
public function getRuleDefinition(): RuleDefinition
{
return new RuleDefinition(
'Change \$user->rights->module->permission to \$user->hasRight(\'module\', \'permission\')',
[new CodeSample(
'$user->rights->module->permission',
'$user->hasRight(\'module\', \'permission\')'
)]
);
}
/**
* Return a node type from https://github.com/rectorphp/php-parser-nodes-docs/
*
* @return string[]
*/
public function getNodeTypes(): array
{
return [
Node\Expr\Assign::class,
Node\Expr\PropertyFetch::class,
Node\Expr\BooleanNot::class,
Node\Expr\Empty_::class,
Node\Expr\Isset_::class,
Node\Stmt\ClassMethod::class
];
}
/**
* @param \PhpParser\Node $node node to be changed
* @return \PhpParser\Node|\PhpParser\Node[]|\PhpParser\Node\Expr\MethodCall|void|null| int
*/
public function refactor(Node $node)
{
if ($node instanceof Node\Stmt\ClassMethod) {
$excludeMethods = ['getrights', 'hasRight'];
/** @var \PHPStan\Analyser\MutatingScope $scope */
$scope = $node->getAttribute('scope');
$class = $scope->getClassReflection();
$classes = ['UserGroup', 'User'];
if (isset($class) && in_array($class->getName(), $classes)) {
if (in_array($this->getName($node), $excludeMethods)) {
return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
}
}
}
if ($node instanceof Node\Expr\Assign) {
return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
}
$isInverse = false;
if ($node instanceof Node\Expr\BooleanNot) {
if (!$node->expr instanceof Node\Expr\Empty_) {
return null;
}
$node = $node->expr->expr;
}
if ($node instanceof Node\Expr\Empty_) {
$node = $node->expr;
$isInverse = true;
}
if ($node instanceof Node\Expr\Isset_) {
// Take first arg for isset (No code found with multiple isset).
$node = $node->vars[0];
}
if (!$node instanceof Node\Expr\PropertyFetch) {
return;
}
$data = $this->getRights($node);
if (!isset($data)) {
return;
}
$args = [new Arg($data['module']), new Arg($data['perm1'])];
if (!empty($data['perm2'])) {
$args[] = new Arg($data['perm2']);
}
$method = $this->nodeFactory->createMethodCall($data['user'], 'hasRight', $args);
if ($isInverse) {
return new Node\Expr\BooleanNot($method);
}
return $method;
}
/**
* @param \PhpParser\Node\Expr\PropertyFetch $node node
* @return array|null
*/
private function getRights(Node\Expr\PropertyFetch $node)
{
$perm2 = '';
if (!$node->var instanceof Node\Expr\PropertyFetch) {
return null;
}
// Add a test to avoid rector error on html.formsetup.class.php
if (!$node->name instanceof Node\Expr\Variable && is_null($this->getName($node))) {
//var_dump($node);
return null;
//exit;
}
$perm1 = $node->name instanceof Node\Expr\Variable ? $node->name : new String_($this->getName($node));
$moduleNode = $node->var;
if (!$moduleNode instanceof Node\Expr\PropertyFetch) {
return null;
}
if (!$moduleNode->var instanceof Node\Expr\PropertyFetch) {
return null;
}
if (!$this->isName($moduleNode->var, 'rights')) {
$perm2 = $perm1;
$perm1 = $moduleNode->name instanceof Node\Expr\Variable ? $moduleNode->name : new String_($this->getName($moduleNode));
$moduleNode = $moduleNode->var;
}
$module = $moduleNode->name instanceof Node\Expr\Variable ? $moduleNode->name : new String_($this->getName($moduleNode));
$rights = $moduleNode->var;
if (!$this->isName($rights, 'rights') || !isset($perm1) || !isset($module)) {
return null;
}
if (!$rights->var instanceof Node\Expr\Variable) {
return null;
}
$user = $rights->var;
return compact('user', 'module', 'perm1', 'perm2');
}
}

View File

@@ -1,146 +0,0 @@
#!/usr/bin/env php
<?php
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
/**
* \file dev/tools/spider.php
* \brief Script to spider Dolibarr app.
*
* To use it:
* - Disable module "bookmark"
* - Exclude param optioncss, token, sortfield, sortorder
*/
$crawledLinks=array();
const MAX_DEPTH=2;
/**
* @param string $url URL
* @param string $depth Depth
* @return string String
*/
function followLink($url, $depth = 0)
{
global $crawledLinks;
$crawling=array();
if ($depth>MAX_DEPTH) {
echo "<div style='color:red;'>The Crawler is giving up!</div>";
return;
}
$options=array(
'http'=>array(
'method'=>"GET",
'user-agent'=>"gfgBot/0.1\n"
)
);
$context=stream_context_create($options);
$doc=new DomDocument();
@$doc->loadHTML(file_get_contents($url, false, $context));
$links=$doc->getElementsByTagName('a');
$pageTitle=getDocTitle($doc, $url);
$metaData=getDocMetaData($doc);
foreach ($links as $i) {
$link=$i->getAttribute('href');
if (ignoreLink($link)) continue;
$link=convertLink($url, $link);
if (!in_array($link, $crawledLinks)) {
$crawledLinks[]=$link;
$crawling[]=$link;
insertIntoDatabase($link, $pageTitle, $metaData, $depth);
}
}
foreach ($crawling as $crawlURL)
followLink($crawlURL, $depth+1);
}
/**
* @param string $site Site
* @param string $path Path
* @return string String
*/
function convertLink($site, $path)
{
if (substr_compare($path, "//", 0, 2)==0)
return parse_url($site)['scheme'].$path;
elseif (substr_compare($path, "http://", 0, 7)==0
or substr_compare($path, "https://", 0, 8)==0
or substr_compare($path, "www.", 0, 4)==0
)
return $path;
else return $site.'/'.$path;
}
/**
* @param string $url URL
* @return boolean
*/
function ignoreLink($url)
{
return $url[0]=="#" or substr($url, 0, 11) == "javascript:";
}
/**
* @param string $link URL
* @param string $title Title
* @param string $metaData Array
* @param int $depth Depth
* @return void
*/
function insertIntoDatabase($link, $title, &$metaData, $depth)
{
//global $crawledLinks;
echo "Inserting new record {URL= ".$link.", Title = '$title', Description = '".$metaData['description']."', Keywords = ' ".$metaData['keywords']."'}<br/><br/><br/>";
//²$crawledLinks[]=$link;
}
/**
* @param string $doc Doc
* @param string $url URL
* @return string URL/Title
*/
function getDocTitle(&$doc, $url)
{
$titleNodes=$doc->getElementsByTagName('title');
if (count($titleNodes)==0 or !isset($titleNodes[0]->nodeValue))
return $url;
$title=str_replace('', '\n', $titleNodes[0]->nodeValue);
return (strlen($title)<1)?$url:$title;
}
/**
* @param string $doc Doc
* @return array Array
*/
function getDocMetaData(&$doc)
{
$metaData=array();
$metaNodes=$doc->getElementsByTagName('meta');
foreach ($metaNodes as $node)
$metaData[$node->getAttribute("name")] = $node->getAttribute("content");
if (!isset($metaData['description']))
$metaData['description']='No Description Available';
if (!isset($metaData['keywords'])) $metaData['keywords']='';
return array(
'keywords'=>str_replace('', '\n', $metaData['keywords']),
'description'=>str_replace('', '\n', $metaData['description'])
);
}
followLink("http://localhost/dolibarr_dev/htdocs");

View File

@@ -1,4 +1,5 @@
<?php
//============================================================+
// File name : example_016.php
// Begin : 2008-03-04

View File

@@ -1,4 +1,5 @@
<?php
// This source file must be UTF-8 encoded
/*
$filename='filewithé';

View File

@@ -74,7 +74,6 @@ class autoTranslator
*/
private function parseRefLangTranslationFiles()
{
$files = $this->getTranslationFilesArray($this->_refLang);
$counter = 1;
foreach ($files as $file) {
@@ -241,7 +240,7 @@ class autoTranslator
if ($this->_outputpagecode == 'UTF-8') {
$val=$this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2));
} else {
$val=utf8_decode($this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2)));
$val=mb_convert_encoding($this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2)), 'ISO-8859-1');
}
}
@@ -276,7 +275,7 @@ class autoTranslator
private function getLineValue($line)
{
$arraykey = explode('=', $line, 2);
return trim(isset($arraykey[1])?$arraykey[1]:'');
return trim(isset($arraykey[1]) ? $arraykey[1] : '');
}
/**
@@ -334,8 +333,8 @@ class autoTranslator
//print "Url to translate: ".$url."\n";
if (! function_exists("curl_init")) {
print "Error, your PHP does not support curl functions.\n";
die();
print "Error, your PHP does not support curl functions.\n";
die();
}
$ch = curl_init();

View File

@@ -210,7 +210,8 @@ foreach ($dups as $string => $pages) {
$inadmin=0;
foreach ($pages as $file => $lines) {
if ($file == 'main.lang') {
$inmain=1; $inadmin=0;
$inmain=1;
$inadmin=0;
}
if ($file == 'admin.lang' && ! $inmain) {
$inadmin=1;
@@ -568,16 +569,16 @@ if ((!empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($ar
if (empty($unused)) {
print "No string not used found.\n";
} else {
$filetosave='/tmp/'.($argv[2]?$argv[2]:"").'notused.lang';
$filetosave='/tmp/'.($argv[2] ? $argv[2] : "").'notused.lang';
print "Strings in en_US that are never used are saved into file ".$filetosave.":\n";
file_put_contents($filetosave, implode("", $unused));
print "To remove from original file, run command :\n";
if (($argv[2]?$argv[2]:"")) {
print 'cd htdocs/langs/en_US; mv '.($argv[2]?$argv[2]:"")." ".($argv[2]?$argv[2]:"").".tmp; ";
if (($argv[2] ? $argv[2] : "")) {
print 'cd htdocs/langs/en_US; mv '.($argv[2] ? $argv[2] : "")." ".($argv[2] ? $argv[2] : "").".tmp; ";
}
print "diff ".($argv[2]?$argv[2]:"").".tmp ".$filetosave." | grep \< | cut -b 3- > ".($argv[2]?$argv[2]:"");
if (($argv[2]?$argv[2]:"")) {
print "; rm ".($argv[2]?$argv[2]:"").".tmp;\n";
print "diff ".($argv[2] ? $argv[2] : "").".tmp ".$filetosave." | grep \< | cut -b 3- > ".($argv[2] ? $argv[2] : "");
if (($argv[2] ? $argv[2] : "")) {
print "; rm ".($argv[2] ? $argv[2] : "").".tmp;\n";
}
}
}

View File

@@ -58,10 +58,10 @@ $rc = 0;
// Get and check arguments
$lPrimary = isset($argv[1])?$argv[1]:'';
$lSecondary = isset($argv[2])?$argv[2]:'';
$lPrimary = isset($argv[1]) ? $argv[1] : '';
$lSecondary = isset($argv[2]) ? $argv[2] : '';
$lEnglish = 'en_US';
$filesToProcess = isset($argv[3])?$argv[3]:'';
$filesToProcess = isset($argv[3]) ? $argv[3] : '';
if (empty($lPrimary) || empty($lSecondary) || empty($filesToProcess)) {
$rc = 1;
@@ -272,7 +272,16 @@ foreach ($filesToProcess as $fileToProcess) {
// key is redundant
if (array_key_exists($key, $aPrimary)) {
print "Key $key is redundant in file $lPrimaryFile (line: $cnt) - Already found into ".$fileFirstFound[$key]." (line: ".$lineFirstFound[$key].").\n";
print "Key $key is redundant in file $lPrimaryFile (line: $cnt)";
if (!empty($fileFirstFound[$key])) {
print " - Already found into ".$fileFirstFound[$key];
print " (line: ".$lineFirstFound[$key].").\n";
} else {
$fileFirstFound[$key] = $fileToProcess;
$lineFirstFound[$key] = $cnt;
print " - Already found into main file.\n";
}
continue;
} else {
$fileFirstFound[$key] = $fileToProcess;
@@ -308,7 +317,7 @@ foreach ($filesToProcess as $fileToProcess) {
|| in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/', $key) || preg_match('/^FormatHour/', $key)
) {
//print "Key $key differs (aSecondary=".$aSecondary[$key].", aPrimary=".$aPrimary[$key].", aEnglish=".$aEnglish[$key].") so we add it into new secondary language (line: $cnt).\n";
fwrite($oh, $key."=".(empty($aSecondary[$key])?$aPrimary[$key]:$aSecondary[$key])."\n");
fwrite($oh, $key."=".(empty($aSecondary[$key]) ? $aPrimary[$key] : $aSecondary[$key])."\n");
}
}
if (! feof($handle)) {

1
htdocs/.gitignore vendored
View File

@@ -24,5 +24,4 @@
/abricot*
/nomenclature*
/of/
/workstation/
/oblyon*

View File

@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2013-2016 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2020 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2016-2018 Laurent Destailleur <eldy@users.sourceforge.net>
/* Copyright (C) 2013-2016 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2024 Alexandre Spangaro <aspangaro@easya.solutions>
* Copyright (C) 2016-2018 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ $id = GETPOST('id', 'int');
$rowid = GETPOST('rowid', 'int');
$massaction = GETPOST('massaction', 'aZ09');
$optioncss = GETPOST('optioncss', 'alpha');
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'accountingaccountlist'; // To manage different context of search
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountingaccountlist'; // To manage different context of search
$mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
$search_account = GETPOST('search_account', 'alpha');
@@ -49,7 +49,7 @@ $search_accountparent = GETPOST('search_accountparent', 'alpha');
$search_pcgtype = GETPOST('search_pcgtype', 'alpha');
$search_import_key = GETPOST('search_import_key', 'alpha');
$toselect = GETPOST('toselect', 'array');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$confirm = GETPOST('confirm', 'alpha');
$chartofaccounts = GETPOST('chartofaccounts', 'int');
@@ -66,7 +66,7 @@ if (!$user->hasRight('accounting', 'chartofaccount')) {
}
// Load variable for pagination
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma');
$sortorder = GETPOST('sortorder', 'aZ09comma');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -111,7 +111,8 @@ $hookmanager->initHooks(array('accountancyadminaccount'));
*/
if (GETPOST('cancel', 'alpha')) {
$action = 'list'; $massaction = '';
$action = 'list';
$massaction = '';
}
if (!GETPOST('confirmmassaction', 'alpha')) {
$massaction = '';
@@ -143,10 +144,13 @@ if (empty($reshook)) {
$search_labelshort = "";
$search_accountparent = "";
$search_pcgtype = "";
$search_import_key = "";
$search_array_options = array();
}
if ((GETPOST('valid_change_chart', 'alpha') && GETPOST('chartofaccounts', 'int') > 0) // explicit click on button 'Change and load' with js on
|| (GETPOST('chartofaccounts', 'int') > 0 && GETPOST('chartofaccounts', 'int') != getDolGlobalInt('CHARTOFACCOUNTS'))) { // a submit of form is done and chartofaccounts combo has been modified
$error = 0;
if ($chartofaccounts > 0 && $permissiontoadd) {
// Get language code for this $chartofaccounts
$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_country as c, '.MAIN_DB_PREFIX.'accounting_system as a';
@@ -154,7 +158,9 @@ if (empty($reshook)) {
$resql = $db->query($sql);
if ($resql) {
$obj = $db->fetch_object($resql);
$country_code = $obj->code;
if ($obj) {
$country_code = $obj->code;
}
} else {
dol_print_error($db);
}
@@ -217,14 +223,15 @@ if (empty($reshook)) {
/*
* View
*/
$form = new Form($db);
$formaccounting = new FormAccounting($db);
llxHeader('', $langs->trans("ListAccounts"));
$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilit&eacute;_en_Partie_Double#Configuration';
llxHeader('', $langs->trans("ListAccounts"), $help_url);
if ($action == 'delete') {
$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"].'?id='.$id, $langs->trans('DeleteAccount'), $langs->trans('ConfirmDeleteAccount'), 'confirm_delete', '', 0, 1);
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$id, $langs->trans('DeleteAccount'), $langs->trans('ConfirmDeleteAccount'), 'confirm_delete', '', 0, 1);
print $formconfirm;
}
@@ -233,11 +240,24 @@ $pcgver = getDolGlobalInt('CHARTOFACCOUNTS');
$sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.account_number, aa.account_parent, aa.label, aa.labelshort, aa.fk_accounting_category,";
$sql .= " aa.reconcilable, aa.active, aa.import_key,";
$sql .= " a2.rowid as rowid2, a2.label as label2, a2.account_number as account_number2";
// Add fields from hooks
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
$sql = preg_replace('/,\s*$/', '', $sql);
$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version AND aa.entity = ".((int) $conf->entity);
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON a2.rowid = aa.account_parent AND a2.entity = ".((int) $conf->entity);
// Add table from hooks
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
$sql .= " WHERE asy.rowid = ".((int) $pcgver);
//print $sql;
if (strlen(trim($search_account))) {
$lengthpaddingaccount = 0;
if (getDolGlobalInt('ACCOUNTING_LENGTH_GACCOUNT') || getDolGlobalInt('ACCOUNTING_LENGTH_AACCOUNT')) {
@@ -260,7 +280,7 @@ if (strlen(trim($search_account))) {
$search_account_tmp_clean = $search_account_tmp;
$search_account_clean = $search_account;
$startchar = '%';
if (strpos($search_account_tmp, '^') === 0) {
if (substr($search_account_tmp, 0, 1) === '^') {
$startchar = '';
$search_account_tmp_clean = preg_replace('/^\^/', '', $search_account_tmp);
$search_account_clean = preg_replace('/^\^/', '', $search_account);
@@ -284,6 +304,15 @@ if (strlen(trim($search_accountparent)) && $search_accountparent != '-1') {
if (strlen(trim($search_pcgtype))) {
$sql .= natural_search("aa.pcg_type", $search_pcgtype);
}
if (strlen(trim($search_import_key))) {
$sql .= natural_search("aa.import_key", $search_import_key);
}
// Add where from hooks
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
$sql .= $db->order($sortfield, $sortorder);
//print $sql;
@@ -298,16 +327,6 @@ if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
}
}
// List of mass actions available
if ($user->hasRight('accounting', 'chartofaccount')) {
$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
}
if (in_array($massaction, array('presend', 'predelete', 'closed'))) {
$arrayofmassactions = array();
}
$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
$arrayofselected = is_array($toselect) ? $toselect : array();
$sql .= $db->plimit($limit + 1, $offset);
dol_syslog('accountancy/admin/account.php:: $sql='.$sql);
@@ -316,6 +335,8 @@ $resql = $db->query($sql);
if ($resql) {
$num = $db->num_rows($resql);
$arrayofselected = is_array($toselect) ? $toselect : array();
$param = '';
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
$param .= '&contextpage='.urlencode($contextpage);
@@ -338,13 +359,18 @@ if ($resql) {
if ($search_pcgtype) {
$param .= '&search_pcgtype='.urlencode($search_pcgtype);
}
if ($optioncss != '') {
if ($search_import_key) {
$param .= '&search_import_key='.urlencode($search_import_key);
}
if ($optioncss != '') {
$param .= '&optioncss='.urlencode($optioncss);
}
// Add $param from hooks
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
$param .= $hookmanager->resPrint;
if (!empty($conf->use_javascript_ajax)) {
print '<!-- Add javascript to reload page when we click "Change plan" -->
<script type="text/javascript">
@@ -358,7 +384,19 @@ if ($resql) {
</script>';
}
// List of mass actions available
if ($user->hasRight('accounting', 'chartofaccount')) {
$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
}
if (in_array($massaction, array('presend', 'predelete', 'closed'))) {
$arrayofmassactions = array();
}
$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
$newcardbutton = '';
$newcardbutton = dolGetButtonTitle($langs->trans('Addanaccount'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/accountancy/admin/card.php?action=create', '', $permissiontoadd);
print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
if ($optioncss != '') {
@@ -371,10 +409,10 @@ if ($resql) {
print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
$newcardbutton .= dolGetButtonTitle($langs->trans("New"), $langs->trans("Addanaccount"), 'fa fa-plus-circle', './card.php?action=create');
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'accounting_account', 0, $newcardbutton, '', $limit, 0, 0, 1);
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
// Box to select active chart of account
print $langs->trans("Selectchartofaccounts")." : ";
print '<select class="flat minwidth200" name="chartofaccounts" id="chartofaccounts">';
@@ -391,11 +429,11 @@ if ($resql) {
print '<option value="-1">&nbsp;</option>';
while ($i < $numbis) {
$obj = $db->fetch_object($resqlchart);
print '<option value="'.$obj->rowid.'"';
print ($pcgver == $obj->rowid) ? ' selected' : '';
print '>'.$obj->pcg_version.' - '.$obj->label.' - ('.$obj->country_code.')</option>';
if ($obj) {
print '<option value="'.$obj->rowid.'"';
print ($pcgver == $obj->rowid) ? ' selected' : '';
print '>'.$obj->pcg_version.' - '.$obj->label.' - ('.$obj->country_code.')</option>';
}
$i++;
}
} else {
@@ -407,8 +445,8 @@ if ($resql) {
print '<br>';
$parameters = array('chartofaccounts' => $chartofaccounts, 'permissiontoadd' => $permissiontoadd, 'permissiontodelete' => $permissiontodelete);
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $accounting, $action); // Note that $action and $object may have been modified by hook
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
print '<br>';
@@ -418,6 +456,11 @@ if ($resql) {
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
$moreforfilter = '';
if ($moreforfilter) {
print '<div class="liste_titre liste_titre_bydiv centpercent">';
print $moreforfilter;
print '</div>';
}
$accountstatic = new AccountingAccount($db);
$accountparent = new AccountingAccount($db);
@@ -427,12 +470,14 @@ if ($resql) {
print '<div class="div-table-responsive">';
print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Line for search fields
// Fields title search
// --------------------------------------------------------------------
print '<tr class="liste_titre_filter">';
// Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '<td class="liste_titre maxwidthsearch">';
$searchpicto = $form->showFilterButtons();
print '<td class="liste_titre center maxwidthsearch">';
$searchpicto = $form->showFilterButtons('left');
print $searchpicto;
print '</td>';
}
@@ -458,11 +503,17 @@ if ($resql) {
if (!empty($arrayfields['categories']['checked'])) {
print '<td class="liste_titre"></td>';
}
// Fields from hook
$parameters = array('arrayfields'=>$arrayfields);
$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Import key
if (!empty($arrayfields['aa.import_key']['checked'])) {
print '<td class="liste_titre"><input type="text" class="flat width75" name="search_import_key" value="'.$search_import_key.'"></td>';
}
if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
if (!empty($arrayfields['aa.reconcilable']['checked'])) {
print '<td class="liste_titre">&nbsp;</td>';
}
@@ -472,52 +523,77 @@ if ($resql) {
}
// Action column
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '<td class="liste_titre maxwidthsearch">';
print '<td class="liste_titre center maxwidthsearch">';
$searchpicto = $form->showFilterButtons();
print $searchpicto;
print '</td>';
}
print '</tr>';
print '</tr>'."\n";
$totalarray = array();
$totalarray['nbfield'] = 0;
// Fields title label
// --------------------------------------------------------------------
print '<tr class="liste_titre">';
// Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');
$totalarray['nbfield']++;
}
if (!empty($arrayfields['aa.account_number']['checked'])) {
print_liste_field_titre($arrayfields['aa.account_number']['label'], $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
$totalarray['nbfield']++;
}
if (!empty($arrayfields['aa.label']['checked'])) {
print_liste_field_titre($arrayfields['aa.label']['label'], $_SERVER["PHP_SELF"], "aa.label", "", $param, '', $sortfield, $sortorder);
$totalarray['nbfield']++;
}
if (!empty($arrayfields['aa.labelshort']['checked'])) {
print_liste_field_titre($arrayfields['aa.labelshort']['label'], $_SERVER["PHP_SELF"], "aa.labelshort", "", $param, '', $sortfield, $sortorder);
$totalarray['nbfield']++;
}
if (!empty($arrayfields['aa.account_parent']['checked'])) {
print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, '', $sortfield, $sortorder, 'left ');
$totalarray['nbfield']++;
}
if (!empty($arrayfields['aa.pcg_type']['checked'])) {
print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type,aa.account_number', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help'], 1);
$totalarray['nbfield']++;
}
if (!empty($arrayfields['categories']['checked'])) {
print_liste_field_titre($arrayfields['categories']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, '', $arrayfields['categories']['help'], 1);
$totalarray['nbfield']++;
}
// Hook fields
$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (!empty($arrayfields['aa.import_key']['checked'])) {
print_liste_field_titre($arrayfields['aa.import_key']['label'], $_SERVER["PHP_SELF"], 'aa.import_key', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.import_key']['help'], 1);
$totalarray['nbfield']++;
}
if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
if (!empty($arrayfields['aa.reconcilable']['checked'])) {
print_liste_field_titre($arrayfields['aa.reconcilable']['label'], $_SERVER["PHP_SELF"], 'aa.reconcilable', '', $param, '', $sortfield, $sortorder);
$totalarray['nbfield']++;
}
}
if (!empty($arrayfields['aa.active']['checked'])) {
print_liste_field_titre($arrayfields['aa.active']['label'], $_SERVER["PHP_SELF"], 'aa.active', '', $param, '', $sortfield, $sortorder);
$totalarray['nbfield']++;
}
// Action column
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
$totalarray['nbfield']++;
}
print "</tr>\n";
// Loop on record
// --------------------------------------------------------------------
$i = 0;
while ($i < min($num, $limit)) {
$obj = $db->fetch_object($resql);
@@ -631,6 +707,11 @@ if ($resql) {
}
}
// Fields from hook
$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Import id
if (!empty($arrayfields['aa.import_key']['checked'])) {
print "<td>";
@@ -641,8 +722,8 @@ if ($resql) {
}
}
if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
// Activated or not reconciliation on accounting account
if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
// Activated or not reconciliation on an accounting account
if (!empty($arrayfields['aa.reconcilable']['checked'])) {
print '<td class="center">';
if (empty($obj->reconcilable)) {
@@ -719,9 +800,16 @@ if ($resql) {
print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
}
print "</table>";
print "</div>";
print '</form>';
$db->free($resql);
$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
print '</table>'."\n";
print '</div>'."\n";
print '</form>'."\n";
} else {
dol_print_error($db);
}

View File

@@ -8,7 +8,7 @@
* Copyright (C) 2011 Remy Younes <ryounes@gmail.com>
* Copyright (C) 2012-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@ltairis.fr>
* Copyright (C) 2011-2016 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2011-2024 Alexandre Spangaro <aspangaro@easya.solutions>
* Copyright (C) 2015 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2016 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
*
@@ -47,7 +47,7 @@ if (isModEnabled('accounting')) {
// Load translation files required by the page
$langs->loadLangs(array('accountancy', 'admin', 'companies', 'compta', 'errors', 'holiday', 'hrm', 'resource'));
$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';
$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view';
$confirm = GETPOST('confirm', 'alpha');
$id = 31;
$rowid = GETPOST('rowid', 'alpha');
@@ -59,7 +59,7 @@ $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"')
$actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
$listoffset = GETPOST('listoffset', 'alpha');
$listlimit = GETPOST('listlimit', 'int') > 0 ?GETPOST('listlimit', 'int') : 1000;
$listlimit = GETPOST('listlimit', 'int') > 0 ? GETPOST('listlimit', 'int') : 1000;
$active = 1;
$sortfield = GETPOST("sortfield", 'aZ09comma');
@@ -125,18 +125,10 @@ $tabfieldinsert[31] = "pcg_version,label,fk_country";
$tabrowid = array();
$tabrowid[31] = "";
// Condition to show dictionary in setup page
$tabcond = array();
$tabcond[31] = isModEnabled('accounting');
// List of help for fields
$tabhelp = array();
$tabhelp[31] = array('pcg_version'=>$langs->trans("EnterAnyCode"));
// List of check for fields (NOT USED YET)
$tabfieldcheck = array();
$tabfieldcheck[31] = array();
// Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
$elementList = array();
@@ -173,9 +165,12 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
if ($fieldnamekey == 'pcg_version') {
$fieldnamekey = 'Pcg_version';
}
if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
if ($fieldnamekey == 'label') {
$fieldnamekey = 'Label';
}
if ($fieldnamekey == 'country') {
$fieldnamekey = "Country";
}
setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
}
@@ -195,9 +190,9 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
// Si verif ok et action add, on ajoute la ligne
if ($ok && GETPOST('actionadd', 'alpha')) {
if ($tabrowid[$id]) {
// Recupere id libre pour insertion
// Get free id for insert
$newid = 0;
$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
$sql = "SELECT MAX(".$tabrowid[$id].") newid from ".$tabname[$id];
$result = $db->query($sql);
if ($result) {
$obj = $db->fetch_object($result);
@@ -296,11 +291,6 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
setEventMessages($db->error(), null, 'errors');
}
}
//$_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition
}
if (GETPOST('actioncancel', 'alpha')) {
//$_GET["id"]=GETPOST('id', 'int'); // Force affichage dictionnaire en cours d'edition
}
if ($action == 'confirm_delete' && $confirm == 'yes') { // delete
@@ -411,7 +401,9 @@ if ($action == 'disable_favorite') {
$form = new Form($db);
$formadmin = new FormAdmin($db);
llxHeader();
$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilit&eacute;_en_Partie_Double#Configuration';
llxHeader('', $langs->trans("Pcg_version"), $help_url);
$titre = $langs->trans($tablib[$id]);
$linkback = '';
@@ -458,6 +450,7 @@ if ($id) {
print '<table class="noborder centpercent">';
// Form to add a new line
if ($tabname[$id]) {
$fieldlist = explode(',', $tabfield[$id]);
@@ -472,12 +465,14 @@ if ($id) {
if ($fieldlist[$field] == 'code') {
$valuetoshow = $langs->trans("Code");
}
if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
if ($fieldlist[$field] == 'label') {
$valuetoshow = $langs->trans("Label");
$class = 'minwidth300';
}
if ($fieldlist[$field] == 'country') {
if (in_array('region_id', $fieldlist)) {
print '<td>&nbsp;</td>'; continue;
print '<td>&nbsp;</td>';
continue;
} // For region page, we do not show the country input
$valuetoshow = $langs->trans("Country");
}
@@ -487,6 +482,7 @@ if ($id) {
if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') {
$valuetoshow = $langs->trans("Pcg_version");
}
//var_dump($value);
if ($valuetoshow != '') {
print '<td class="'.$class.'">';
@@ -524,7 +520,8 @@ if ($id) {
$tmpaction = 'create';
$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
$reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
$error = $hookmanager->error; $errors = $hookmanager->errors;
$error = $hookmanager->error;
$errors = $hookmanager->errors;
if (empty($reshook)) {
fieldListAccountModel($fieldlist, $obj, $tabname[$id], 'add');
@@ -621,20 +618,24 @@ if ($id) {
$tmpaction = 'edit';
$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
$error = $hookmanager->error; $errors = $hookmanager->errors;
$error = $hookmanager->error;
$errors = $hookmanager->errors;
if (empty($reshook)) {
fieldListAccountModel($fieldlist, $obj, $tabname[$id], 'edit');
}
print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
print '&nbsp;<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
print '<td colspan="3" class="right">';
print '<a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
print '&nbsp;<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
print '</td>';
} else {
$tmpaction = 'view';
$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
$error = $hookmanager->error; $errors = $hookmanager->errors;
$error = $hookmanager->error;
$errors = $hookmanager->errors;
if (empty($reshook)) {
foreach ($fieldlist as $field => $value) {
@@ -674,9 +675,11 @@ if ($id) {
}
// Can an entry be erased or disabled ?
$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
$iserasable = 1;
$canbedisabled = 1;
$canbemodified = 1; // true by default
$url = $_SERVER["PHP_SELF"].'?token='.newToken().($page ? '&page='.$page : '').'&sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
$url = $_SERVER["PHP_SELF"].'?token='.newToken().($page ? '&page='.$page : '').'&sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ? urlencode($obj->code) : '');
if ($param) {
$url .= '&'.$param;
}
@@ -710,6 +713,8 @@ if ($id) {
$i++;
}
} else {
print '<tr><td colspan="6"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
}
} else {
dol_print_error($db);
@@ -737,11 +742,10 @@ $db->close();
* @param string $context 'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
* @return void
*/
function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context = '')
function fieldListAccountModel($fieldlist, $obj = null, $tabname = '', $context = '')
{
global $conf, $langs, $db;
global $langs, $db;
global $form;
global $region_id;
global $elementList, $sourceList;
$formadmin = new FormAdmin($db);
@@ -774,29 +778,23 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
print '<td>';
}
if ($fieldlist[$field] == 'type_cdr') {
print $form->selectarray($fieldlist[$field], array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
print $form->selectarray($fieldlist[$field], array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''));
} else {
print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''), 1);
}
print '</td>';
} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
print '<td><input type="text" class="flat" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" size="10" name="'.$fieldlist[$field].'"></td>';
print '<td><input type="text" class="flat" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" size="10" name="'.$fieldlist[$field].'"></td>';
} else {
print '<td>';
$size = ''; $class = '';
if ($fieldlist[$field] == 'code') {
$size = 'size="8" ';
$class = '';
if ($fieldlist[$field] == 'pcg_version') {
$class = 'width150';
}
if ($fieldlist[$field] == 'position') {
$size = 'size="4" ';
if ($fieldlist[$field] == 'label') {
$class = 'width300';
}
if ($fieldlist[$field] == 'libelle') {
$size = 'centpercent';
}
if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type') {
$size = 'size="2" ';
}
print '<input type="text" '.$size.' class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" name="'.$fieldlist[$field].'">';
print '</td>';
}
}

View File

@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2020 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2013-2024 Alexandre Spangaro <aspangaro@easya.solutions>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software; you can redistribute it and/or modify
@@ -85,7 +85,7 @@ if ($action == 'add' && $user->hasRight('accounting', 'chartofaccount')) {
// Clean code
// To manage zero or not at the end of the accounting account
if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
if (getDolGlobalString('ACCOUNTING_MANAGE_ZERO')) {
$account_number = $account_number;
} else {
$account_number = clean_account($account_number);
@@ -148,7 +148,7 @@ if ($action == 'add' && $user->hasRight('accounting', 'chartofaccount')) {
// Clean code
// To manage zero or not at the end of the accounting account
if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
if (getDolGlobalString('ACCOUNTING_MANAGE_ZERO')) {
$account_number = $account_number;
} else {
$account_number = clean_account($account_number);
@@ -215,7 +215,7 @@ $accountsystem->fetch(getDolGlobalInt('CHARTOFACCOUNTS'));
$title = $langs->trans('AccountAccounting')." - ".$langs->trans('Card');
$help_url = 'EN:Category:Accounting';
$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilit&eacute;_en_Partie_Double#Configuration';
llxheader('', $title, $help_url);

View File

@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2016 Jamal Elbaz <jamelbaz@gmail.pro>
* Copyright (C) 2017-2022 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2017-2024 Alexandre Spangaro <aspangaro@easya.solutions>
* Copyright (C) 2022 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
@@ -113,7 +113,9 @@ if ($action == 'delete') {
$form = new Form($db);
$formaccounting = new FormAccounting($db);
llxheader('', $langs->trans('AccountingCategory'));
$help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilit&eacute;_en_Partie_Double#Configuration';
llxHeader('', $langs->trans('AccountingCategory'), $help_url);
$linkback = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
$titlepicto = 'setup';
@@ -135,6 +137,7 @@ $s = $formaccounting->select_accounting_category($cat_id, 'account_category', 1,
if ($formaccounting->nbaccounts_category <= 0) {
print '<span class="opacitymedium">'.$s.'</span>';
} else {
print $s;
print '<input type="submit" class="button small" value="'.$langs->trans("Select").'">';
}
print '</td></tr>';

Some files were not shown because too many files have changed in this diff Show More