stickler-ci
f74077a2e7
Fixing style errors.
2021-12-09 08:35:12 +00:00
fr69400
d0413f423f
FIX - Missing one html conversion
2021-12-09 09:33:00 +01:00
Laurent Destailleur
f0cac384c5
Merge pull request #19553 from habot-it/patch-1
...
Add hookmanager in function pdf_pagefoot of pdf.lib.php
2021-12-08 19:18:09 +01:00
Laurent Destailleur
646ba34f89
Update functions.lib.php
2021-12-08 19:15:35 +01:00
Laurent Destailleur
ea45fdce5c
Merge pull request #19535 from Hystepik/develop#4
...
Fix : php 8.0 warnings
2021-12-08 18:44:16 +01:00
Laurent Destailleur
8f7b222764
Fix phpcs
2021-12-08 18:37:07 +01:00
Laurent Destailleur
72dc560ce8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-12-08 18:27:28 +01:00
Laurent Destailleur
69cd7ae2ab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/card.php
htdocs/public/test/badges.php
htdocs/public/test/test_exec.php
2021-12-08 18:27:03 +01:00
Laurent Destailleur
c3bfd5caa4
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/adherents/type.php
htdocs/asset/type.php
htdocs/categories/edit.php
htdocs/comm/action/card.php
htdocs/compta/bank/card.php
htdocs/contact/card.php
htdocs/contact/list.php
htdocs/core/class/extrafields.class.php
htdocs/don/card.php
htdocs/product/stock/card.php
htdocs/projet/card.php
htdocs/projet/tasks/task.php
htdocs/user/group/card.php
2021-12-08 18:21:20 +01:00
Laurent Destailleur
f1dac82a53
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/adherents/card.php
htdocs/categories/edit.php
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/product/stock/card.php
2021-12-08 17:56:05 +01:00
Laurent Destailleur
af6e21910d
FIX #19536
2021-12-08 16:47:46 +01:00
habot-it
6501bb7cbf
Update pdf.lib.php
2021-12-08 16:43:11 +01:00
Laurent Destailleur
449cbcdf46
Merge pull request #19546 from javieralapps4up/develop
...
FIX When you pay an invoice, you can send the payment multiple times.
2021-12-08 16:31:40 +01:00
Laurent Destailleur
8ff0d1f366
Update functions.lib.php
2021-12-08 15:49:52 +01:00
Laurent Destailleur
0fa82fbb4e
Merge pull request #19559 from fappels/debug_15_part2
...
Extrafield showOutputField parameter 4 'extrafieldsobjectkey' is now required
2021-12-08 15:43:01 +01:00
Laurent Destailleur
597ab407f8
Merge pull request #19568 from Hystepik/develop#2
...
Fix inventory scanning function
2021-12-08 15:30:55 +01:00
Laurent Destailleur
106b8ceec5
Merge pull request #19574 from Hystepik/develop#5
...
Fix php8.0 warnings
2021-12-08 14:36:42 +01:00
Laurent Destailleur
20f4b5389b
Fix the experimental feature to manage session in database
2021-12-07 17:39:46 +01:00
Laurent Destailleur
0e7d23e169
Fix constraint and loading on module activation.
2021-12-07 14:14:13 +01:00
lmarcouiller
c6c7abbf1d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2
2021-12-07 10:48:17 +01:00
Vincent Dieltiens
9ef2735520
Adds import for customer invoices and invoices lines
2021-12-07 09:33:18 +01:00
Laurent Destailleur
5efa31204b
FIX ECM module was mixing contributions and vat and not showing salaries
2021-12-07 02:00:34 +01:00
Francis Appels
fe40668f43
Parameter 4 extrafieldsobjectkey seems to be required now.
2021-12-06 20:32:44 +01:00
Francis Appels
f1524372ad
Fix extrafield showOutputField old syntax always hidden.
2021-12-06 16:34:50 +01:00
Yaacov Akiba Slama
04d4c06a43
Use intl extension when available
2021-12-06 15:34:20 +02:00
Yaacov Akiba Slama
8f91086e83
Add some missing characters
2021-12-06 15:33:51 +02:00
stickler-ci
39117e8089
Fixing style errors.
2021-12-06 11:06:50 +00:00
habot-it
9ee3903fc4
Update pdf.lib.php
2021-12-06 12:06:32 +01:00
Quentin VIAL-GOUTEYRON
826bde0656
FIX set optional from post
2021-12-06 11:19:12 +01:00
habot-it
2ad9761040
Add hookmanager in function pdf_pagefoot of pdf.lib.php
...
Customize PDF footers with HTML.
(Only on the last page with free text)
2021-12-06 07:47:24 +01:00
Laurent Destailleur
259b7dfe5a
NEW: Add massaction to switch status on sale / on purchase of a product.
2021-12-06 02:48:34 +01:00
Laurent Destailleur
2b505ec9b8
Fix can read category if can run takepos.
2021-12-05 13:01:05 +01:00
ATM john
5dc620b728
Merge branch 'fix_missing_formsetup_elements' of github.com:atm-john/dolibarr into fix_missing_formsetup_elements
2021-12-04 14:00:12 +01:00
ATM john
f640a9fbad
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_missing_formsetup_elements
2021-12-04 13:59:27 +01:00
Laurent Destailleur
87e221d6dd
Fix create new page
2021-12-04 00:24:59 +01:00
javieralapps4up
b024bf20ed
Update html.form.class.php
...
When you pay an invoice, you can send the payment multiple times.
2021-12-03 13:57:34 +01:00
lmarcouiller
83ea868c9a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5
2021-12-03 10:19:28 +01:00
Laurent Destailleur
c171ba3a45
Fix regression in cron jobs
2021-12-02 16:07:33 +01:00
lmarcouiller
b732d80ca5
Fix php 8.0 warnings
2021-12-02 15:56:34 +01:00
Laurent Destailleur
a3493d0132
Clean code
2021-12-02 11:33:51 +01:00
Laurent Destailleur
ca6f222662
Fix notification (pb static var unknown)
2021-12-02 11:19:44 +01:00
Laurent Destailleur
10e126eb69
Clean code on pdf templates
2021-12-02 10:43:44 +01:00
John BOTELLA
c0d00a859f
use dol_escape_htmltag
2021-12-01 16:59:30 +01:00
lmarcouiller
ed7bfb333b
fix php8.0 errors
2021-12-01 16:24:57 +01:00
Laurent Destailleur
3cb07fd1ec
Doc
2021-12-01 15:37:31 +01:00
Laurent Destailleur
259418d1dd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-12-01 12:10:14 +01:00
Laurent Destailleur
4575bbae82
Clean code for browser notifications
2021-12-01 12:00:19 +01:00
Laurent Destailleur
8bace4c64e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/memory.lib.php
htdocs/langs/en_US/holiday.lang
htdocs/ticket/card.php
2021-11-30 16:24:18 +01:00
Laurent Destailleur
3de3adad74
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/ajax/objectonoff.php
2021-11-30 16:11:12 +01:00
Laurent Destailleur
87a66c7bf0
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-11-30 15:57:14 +01:00
Laurent Destailleur
5d7f8d3831
Fix fatal error
2021-11-30 15:54:28 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html
...
deprecated html attributes
2021-11-30 14:27:12 +01:00
Laurent Destailleur
1122cd1e5e
Merge pull request #19163 from Hystepik/develop#4
...
Fix: php 8.0 warnings project
2021-11-30 14:18:23 +01:00
Laurent Destailleur
07506b523f
Clean code
2021-11-30 14:09:46 +01:00
Laurent Destailleur
f66f9082e7
Merge pull request #19509 from fr69400/patch3
...
FIX Html conversion check with PDF_BOLD_PRODUCT_LABEL
2021-11-30 14:04:10 +01:00
Ferran Marcet
ac975ecc61
Undo changes
2021-11-30 13:30:17 +01:00
Laurent Destailleur
40491ca04e
Merge pull request #19419 from FHenry/dev_new_enhance_trad_select_dictionnary
...
NEW : for developpers allow translation label in select_dictionnary
2021-11-30 12:38:18 +01:00
stickler-ci
c807286f0b
Fixing style errors.
2021-11-30 11:17:48 +00:00
fr69400
19fc862a7e
Merge branch 'patch3' of https://github.com/fr69400/dolibarr into patch3
2021-11-30 12:17:21 +01:00
Laurent Destailleur
a7f9ffd5d0
Merge pull request #19461 from frederic34/lastactivationversion
...
keep info on latest activation version of module
2021-11-30 12:16:39 +01:00
fr69400
078a040078
Update pdf.lib.php
2021-11-30 12:13:21 +01:00
Laurent Destailleur
cf4beafb68
Merge pull request #19484 from aspangaro/12p23
...
FIX Option MAIN_DIRECT_STATUS_UPDATE broken. Ajax on/off not saving value in DB after updating to version >=12
2021-11-30 11:39:44 +01:00
Laurent Destailleur
c6fb026b75
Merge pull request #19504 from fappels/14_fix_fatal_eval
...
FIX 14.0.4 fatal error on cron list.
2021-11-30 11:31:02 +01:00
Laurent Destailleur
ecdae02062
Merge pull request #19510 from frederic34/contractdirectprint
...
add direct print for contracts
2021-11-30 11:20:51 +01:00
Christian Foellmann
6608f5f0d8
update all script tags to be uniform. language="javascript" removed
...
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
2021-11-29 15:09:18 +01:00
John BOTELLA
5bdaab8dcb
Fix duplicated code
2021-11-29 14:30:04 +01:00
lmarcouiller
0d65fdad23
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2
2021-11-29 10:38:11 +01:00
Laurent Destailleur
e3e4b154e7
Fix partnership
2021-11-29 01:04:32 +01:00
Laurent Destailleur
186185267e
Clean code for v15
2021-11-29 00:49:18 +01:00
Frédéric FRANCE
308998e21c
Merge remote-tracking branch 'upstream/develop' into productmerge
2021-11-28 21:14:12 +01:00
Frédéric FRANCE
5473dbd3f0
add direct print for contracts
2021-11-28 20:55:17 +01:00
Laurent Destailleur
2d92130c1e
External backups can be downloaded from the "About info page".
2021-11-28 19:25:58 +01:00
Laurent Destailleur
c41578a3c3
Fix php compatibility
2021-11-28 15:43:22 +01:00
Laurent Destailleur
ca11dcae22
Fix php compatibility
2021-11-28 15:41:19 +01:00
Laurent Destailleur
ce651fae58
Fix php compatibility
2021-11-28 15:35:03 +01:00
Laurent Destailleur
5d31bd441e
Fix php compatibility
2021-11-28 15:34:08 +01:00
stickler-ci
a933793b8a
Fixing style errors.
2021-11-28 13:42:25 +00:00
fr69400
5a165ae2bf
FIX PDF_NOLD_PRODUCT_LABEL
2021-11-28 14:40:15 +01:00
ATM john
e97e0e4f17
Fix remove not used propertie
2021-11-28 12:18:09 +01:00
ATM john
29437a22b9
Fix comment and remove not use global
2021-11-28 12:15:31 +01:00
ATM john
a75ae6a8cf
Fix missing formsetup elements
2021-11-28 12:11:03 +01:00
Laurent Destailleur
af1baf057b
FIX #yogosha7789
2021-11-28 12:01:42 +01:00
Francis Appels
5bb21a93a1
FIX fatal error on cron list.
2021-11-27 18:25:38 +01:00
Laurent Destailleur
962ac263ba
Fix look and feel v15
2021-11-27 15:29:48 +01:00
Laurent Destailleur
6e273e47e5
css
2021-11-27 12:35:30 +01:00
Laurent Destailleur
734c9871ad
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2021-11-27 01:07:32 +01:00
Marc de Lima Lucio
f5343c55c3
FIX: holiday mass deletion: correct return of record deleted
2021-11-26 18:23:31 +01:00
Marc de Lima Lucio
1361abffe5
FIX: holiday list: only mass delete if leave request is not in draft, canceled or refused, like in card
2021-11-26 18:22:31 +01:00
Ferran Marcet
5265cd8084
Fix: correctly display the products of a warehouse in the pdf
2021-11-26 12:49:07 +01:00
Ferran Marcet
419eaa217f
dejar igual que 13
2021-11-26 12:38:09 +01:00
Ferran Marcet
ad1d553d11
Merge branch '13.0up' into 13.0
...
# Conflicts:
# htdocs/core/modules/modAdherent.class.php
# htdocs/core/modules/modProduct.class.php
# htdocs/core/modules/modProjet.class.php
# htdocs/core/modules/modResource.class.php
# htdocs/core/modules/modService.class.php
# htdocs/core/modules/modSociete.class.php
# htdocs/core/modules/modUser.class.php
2021-11-26 12:29:38 +01:00
Laurent Destailleur
bf1dfac629
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/errors.lang
htdocs/product/stock/movement_list.php
2021-11-25 21:54:06 +01:00
Alexandre SPANGARO
9d2fb782fa
FIX Option MAIN_DIRECT_STATUS_UPDATE broken. Ajax on/off not saving value in DB after updating to version >=12
2021-11-25 15:41:28 +01:00
Laurent Destailleur
78f94b1c76
Fix css and label for recurring invoices
2021-11-25 14:17:20 +01:00
Laurent Destailleur
e07008f6e9
Fix tooltip
2021-11-25 09:40:54 +01:00
Gauthier PC portable 024
641002ae96
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-11-24 09:05:24 +01:00
Frédéric FRANCE
3301790647
clean code
2021-11-23 23:56:52 +01:00
Frédéric FRANCE
21a3a6cc7a
clean code
2021-11-23 23:55:01 +01:00
Frédéric FRANCE
e6af0facdd
keep info on latest activation version of module
2021-11-23 23:27:07 +01:00
Frédéric FRANCE
d9bcd27764
can merge products but experimental
2021-11-23 21:55:48 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental
2021-11-23 21:38:29 +01:00
Laurent Destailleur
0dcbd458b8
FIX default_vat_code was not returned in some Ajax services of products
2021-11-23 13:08:00 +01:00
Laurent Destailleur
ee14aa2597
Fix: Do not loose data on error when editing a line
2021-11-23 12:11:27 +01:00
Laurent Destailleur
da897d9374
CSScss
2021-11-23 11:10:16 +01:00
Giovanni Vella
f7abf59a07
Merge branch 'Dolibarr:develop' into develop
2021-11-23 08:48:52 +01:00
Laurent Destailleur
949bc9f9bd
Make setup page of widget easier
2021-11-22 18:15:54 +01:00
stickler-ci
9975587cd5
Fixing style errors.
2021-11-22 15:26:46 +00:00
Gauthier PC portable 024
e02405edc9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop
2021-11-22 16:23:26 +01:00
Gauthier PC portable 024
9840c1e0fa
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-22 16:17:55 +01:00
Gauthier PC portable 024
e75b6ae0b4
FIX : it's better with an input number
2021-11-22 16:13:46 +01:00
Laurent Destailleur
441af6b6fb
Fix add rel="noopener noreferrer"
2021-11-22 02:35:55 +01:00
Laurent Destailleur
63cd06394f
Debug permission on supplier order.
...
Fix #huntr58ddbd8a-0faf-4b3f-aec9-5850bb19ab67
2021-11-20 15:41:31 +01:00
Laurent Destailleur
001507f54e
Fix css on disabled menu
2021-11-20 14:24:51 +01:00
Laurent Destailleur
59de140366
css
2021-11-19 23:39:25 +01:00
Laurent Destailleur
48d7378282
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/action/card.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/ar_IQ/bills.lang
htdocs/langs/ar_IQ/cashdesk.lang
htdocs/langs/ar_IQ/modulebuilder.lang
htdocs/langs/ar_IQ/partnership.lang
htdocs/langs/ar_IQ/propal.lang
htdocs/langs/ar_IQ/stocks.lang
htdocs/langs/ar_IQ/ticket.lang
htdocs/langs/en_AE/admin.lang
htdocs/langs/en_US/receptions.lang
htdocs/langs/en_ZA/admin.lang
htdocs/product/stock/class/mouvementstock.class.php
htdocs/reception/class/reception.class.php
2021-11-19 23:14:39 +01:00
Laurent Destailleur
c79fa4d3d0
NEW Add workflow action close purchase order on reception validation
...
NEW Add workflow action close purchase order on reception closing
2021-11-19 23:03:12 +01:00
Laurent Destailleur
071042b449
Code comment
2021-11-19 22:28:35 +01:00
Laurent Magnin
c8c6d5c1d2
Update functions.lib.php
2021-11-19 17:09:51 +01:00
Laurent Magnin
5f40c2e9dd
Update functions.lib.php
2021-11-19 17:08:07 +01:00
Laurent Magnin
00c7114c0b
Merge branch 'Dolibarr:develop' into fix_ticket_substitution
2021-11-19 16:52:57 +01:00
lmarcouiller
00369a5269
fix errors
2021-11-19 14:32:40 +01:00
Florian HENRY
c90082925c
fix
2021-11-19 14:30:33 +01:00
Florian HENRY
9685081967
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_enhance_trad_select_dictionnary
2021-11-19 14:27:46 +01:00
Florian HENRY
be44e5b0ca
NEW: for developper select_dictionnry can now deal with label translated
2021-11-19 14:27:29 +01:00
Hystepik
63773bf36d
Merge branch 'develop' into develop#4
2021-11-19 14:22:39 +01:00
Laurent Destailleur
cdc160b9a9
FIX column alignement on valid confirm page of shipment
2021-11-19 11:12:53 +01:00
Laurent Destailleur
f525045c44
Merge pull request #19281 from aspangaro/15a29
...
NEW Thirdparty - Add advanced right to add / edit payment information
2021-11-18 20:32:55 +01:00
Laurent Destailleur
8b1c45d0fe
Merge pull request #19413 from FHenry/dev_add_hook_marginDisplay
...
new: add hook for displayMarginInfos
2021-11-18 20:05:32 +01:00
Laurent Destailleur
e81c118a27
FIX Use the SQL standard for the if confition
2021-11-18 19:38:56 +01:00
Laurent Destailleur
d24120d6f9
Clean code
2021-11-18 19:27:40 +01:00
Laurent Destailleur
0649dc598d
Clean code
2021-11-18 19:25:07 +01:00
Laurent Destailleur
8477c0a3f1
Merge pull request #17998 from OPEN-DSI/fix_00008
...
FIX: Reload values of the specified entity when change entity in the execution of cron jobs
2021-11-18 18:41:06 +01:00
Laurent Destailleur
e609622f2b
Fix test on verifCond for value 0
2021-11-18 13:17:48 +01:00
Laurent Destailleur
2d4f971508
Fix verifCond must return false if string is '0'
...
Hide a not used property.
2021-11-18 13:10:52 +01:00
Laurent Destailleur
e652b93878
Autoswitch on inventory tab on validation of inventory
...
Fix disabled button when some data are available.
2021-11-18 12:58:31 +01:00
Florian HENRY
0f402897a4
add add_replace
2021-11-18 10:55:05 +01:00
Florian HENRY
d48df1d2c3
new: add hook for displayMarginInfos
2021-11-18 10:50:03 +01:00
Laurent Destailleur
649bf38c05
Responsive
2021-11-17 11:14:12 +01:00
Gauthier PC portable 024
72614ecc0d
Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-16 16:43:01 +01:00
Gauthier PC portable 024
375dcf7028
FIX : dev name
2021-11-16 16:42:48 +01:00
stickler-ci
19171d4f8e
Fixing style errors.
2021-11-16 15:15:55 +00:00
Gauthier PC portable 024
9d41c1390d
Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop
2021-11-16 14:20:24 +01:00
Gauthier PC portable 024
1e0d7d92a9
NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled
2021-11-16 14:09:18 +01:00
Alexandre SPANGARO
1107c6a208
Modify name of advance right
2021-11-16 04:32:09 +01:00
Alexandre SPANGARO
2ebdc6a430
Merge remote-tracking branch 'upstream/develop' into 15a29
2021-11-16 04:27:53 +01:00
Laurent Destailleur
75b6e241ce
Clean code
2021-11-15 14:06:50 +01:00
Laurent Destailleur
f2bfa8b2a1
Merge pull request #18940 from PyroShape/develop2
...
NEW : info of number of product still to dispatched in a supplier order
2021-11-15 13:58:43 +01:00
Laurent Destailleur
5af241371a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-11-15 12:32:09 +01:00
Laurent Destailleur
7b9c492798
Manage formSetup
2021-11-15 12:12:36 +01:00
Laurent Destailleur
cd2a09de42
Merge pull request #19170 from atm-john/new_setup_form_help_class
...
NEW : setup form class to help setup page creation
2021-11-15 12:12:25 +01:00
Laurent Destailleur
b87f3208ef
Merge pull request #19275 from frederic34/patch-5
...
fix error
2021-11-15 11:36:47 +01:00
Laurent Destailleur
7a6d84f0d5
Merge pull request #19365 from hregis/fix_add_ldap_hash_type_select
...
NEW add ldap password hash type select
2021-11-15 11:16:33 +01:00
Laurent Destailleur
ec7eebcf4a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-15 11:10:39 +01:00
Laurent Destailleur
16c28b505b
Add comment on a bugged option
2021-11-15 11:10:18 +01:00
Laurent Destailleur
50aee2377f
Merge pull request #19356 from frederic34/addtranslations
...
add load langs
2021-11-15 11:01:08 +01:00
Laurent Destailleur
a5d49a7850
Merge pull request #19363 from yaslama/develop
...
Import bank accounts improvements
2021-11-15 10:56:37 +01:00
lmarcouiller
238996b351
Merge branch 'develop#2' of github.com:Hystepik/dolibarr into develop#2
2021-11-15 10:13:27 +01:00
Laurent Destailleur
5b5f41606a
NEW PDF generation support format PDF/A-1b and PDF/A-3b
2021-11-15 09:02:01 +01:00
Laurent Destailleur
a368200036
Add MAIN_MEMORY_LIMIT_ARCHIVE_DATAROOT and MAIN_MEMORY_LIMIT_DUMP
2021-11-13 01:45:38 +01:00
Regis Houssin
415ee6669a
FIX missing php8 warning
2021-11-12 17:23:17 +01:00
Regis Houssin
e839d9da02
FIX syntax error
2021-11-12 16:56:26 +01:00
Regis Houssin
317060d915
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_add_ldap_hash_type_select
2021-11-12 16:53:39 +01:00
Regis Houssin
c5d70477c3
FIX compatibility with php8
2021-11-12 16:53:00 +01:00
Laurent Destailleur
715a65eab2
Clean code for md theme
2021-11-12 13:33:59 +01:00
Regis Houssin
9e5a20545d
FIX dolGetLdapPasswordHash use your own random salt
2021-11-12 13:23:11 +01:00
Regis Houssin
1169ae551f
FIX remove debug
2021-11-12 13:12:49 +01:00
Regis Houssin
968ffbcef0
FIX add ldap hash algo
2021-11-12 13:06:41 +01:00
Yaacov Akiba Slama
de435576a9
Allow WithdrawMode to be imported
2021-11-12 12:46:37 +02:00
Yaacov Akiba Slama
5c8d91ba6c
BankAccountNumber is not required.
...
The IBAN can contain all the needed information. So there is no reason for
the account number to be required
2021-11-12 12:46:18 +02:00
Regis Houssin
084a3f48c1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
fix_add_ldap_hash_type_select
2021-11-12 10:10:04 +01:00
Frédéric FRANCE
67d6ada23c
Merge branch 'Dolibarr:develop' into patch-5
2021-11-11 20:12:56 +01:00
Frédéric FRANCE
cde4e48849
Merge branch 'Dolibarr:develop' into addtranslations
2021-11-11 20:12:20 +01:00
Frédéric FRANCE
fd1585eda0
add load langs
2021-11-11 18:23:34 +01:00
Laurent Destailleur
aab9c2e6ca
Fix #yogosha7605
2021-11-11 18:20:31 +01:00
Frédéric FRANCE
c245e4b388
Merge remote-tracking branch 'upstream/develop' into patch-5
2021-11-11 17:18:50 +01:00
Laurent Destailleur
0021381201
Fix #yogosha7605
2021-11-11 17:08:35 +01:00
Frédéric FRANCE
38d3b9ca71
fix regex
2021-11-11 16:54:20 +01:00
Laurent Destailleur
06f378db18
FIX Bad use of dol_concatdesc()
2021-11-11 15:31:19 +01:00
Laurent Destailleur
c5f3f42867
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-11 15:13:39 +01:00
Laurent Destailleur
66f1dd8545
Fix avoid too large PDF
2021-11-11 15:12:31 +01:00
Laurent Destailleur
e46e622049
Merge pull request #19349 from BitKFu/total_discount
...
Added -Propal- as a missing class name to the commondocgenerator.class.php
2021-11-11 15:03:02 +01:00
Laurent Destailleur
c6ecf87a8a
Update commondocgenerator.class.php
2021-11-11 15:02:51 +01:00
Laurent Destailleur
da2f3e7b40
Code comment
2021-11-11 14:55:59 +01:00
Laurent Destailleur
0665dac594
Merge pull request #19348 from ptibogxiv/patch-449
...
FIX bug if multicompany disabled
2021-11-11 14:38:28 +01:00
Laurent Destailleur
9cb094b466
Fix error method not defined
2021-11-11 14:37:25 +01:00
Laurent Destailleur
a3d2dcb97f
Merge pull request #19351 from cfoellmann/PR/block-massaction-delete
...
block deletion of items not free to delete (is_deletable)
2021-11-11 14:33:23 +01:00
Laurent Destailleur
28aa17e4fd
FIX calculation of balance in conciliation page on desc sorting.
2021-11-11 14:27:17 +01:00
Laurent Destailleur
0443302c3d
FIX calculation of balance in conciliation page on desc sorting.
2021-11-11 13:49:21 +01:00
Laurent Destailleur
bbd97c6e16
Code comment
2021-11-11 13:36:04 +01:00
Christian Foellmann
6a216e520f
block deletion of items not free to delete (is_deletable)
2021-11-11 11:06:05 +01:00
Laurent Destailleur
47dd7335a9
Debug v15
2021-11-10 21:34:41 +01:00
stickler-ci
7c5810dee6
Fixing style errors.
2021-11-10 14:19:14 +00:00
Gerhard Stephan
285bd67d90
Added -Propal- as a missing class name to the commondocgenerator.class.php
2021-11-10 15:16:36 +01:00
ptibogxiv
0afaf080ee
FIX bug if multicompany disabled
...
avoid bad constantes
2021-11-10 14:53:17 +01:00
Giovanni Vella
78df3f54c4
Merge branch 'Dolibarr:develop' into develop
2021-11-10 13:55:18 +01:00
Laurent Destailleur
13e8e3d33c
Look and feel v15
2021-11-08 19:15:02 +01:00
Laurent Destailleur
8636527125
Clean code
2021-11-08 17:53:18 +01:00
Laurent Destailleur
f4b2a6ec92
Fix negative colors for bars
2021-11-08 14:51:14 +01:00
Laurent Destailleur
c464a1cfd2
Fix colors
2021-11-08 14:37:21 +01:00
Gerhard Stephan
b34fb95f4f
Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
2021-11-08 10:59:04 +01:00
Laurent Destailleur
e8e0768eec
Fix phpcs
2021-11-08 03:47:16 +01:00
Laurent Destailleur
28dcdb0708
Merge pull request #19283 from bb2a/NEW_SUBSTITUTION_ONLINE_SIGN_PROPAL
...
NEW - Substitution proposal online sign
2021-11-08 03:46:09 +01:00
Laurent Destailleur
43406e7d61
Merge pull request #19321 from nicolas-eoxia/new_redirect_after_login
...
NEW : redirect after connection in login page #19320
2021-11-08 03:27:48 +01:00
Laurent Destailleur
d026c721cf
Update security2.lib.php
2021-11-08 03:27:27 +01:00
Laurent Destailleur
a94b2b4f7e
Clean code
2021-11-08 03:22:49 +01:00
Laurent Destailleur
be1ca6ebab
Clean code
2021-11-08 03:21:15 +01:00
Giovanni Vella
e36d2b5398
Merge branch 'Dolibarr:develop' into develop
2021-11-07 21:53:52 +01:00
Laurent Destailleur
eaf2c6e89c
Fix $action not defined
2021-11-07 17:49:31 +01:00
Laurent Destailleur
2e499c2d17
Fix unknown property
2021-11-07 17:46:08 +01:00
Laurent Destailleur
6829507372
Fix missing $db
2021-11-07 17:44:34 +01:00
Laurent Destailleur
66f85d674d
Fix warning scrutinizer
2021-11-07 17:43:17 +01:00
Laurent Destailleur
1934a37676
Escape to avoid false positive, even if it should be useless.
2021-11-07 17:35:43 +01:00
Laurent Destailleur
969fe16442
Debug mass actions of partnership module
2021-11-07 16:51:18 +01:00
Laurent Destailleur
552d32ccd6
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-11-07 13:54:07 +01:00
Laurent Destailleur
3b7c385c6c
Fix syntax error
2021-11-07 13:53:30 +01:00
Laurent Destailleur
2234522519
Debug module parnership. Add the type of partnership.
2021-11-07 13:51:31 +01:00
Laurent Destailleur
713db0e613
Removed function pdf_getTotalQty (duplicate with pdf_getlineqty)
2021-11-07 12:26:44 +01:00
Laurent Destailleur
ccc1d4d1fa
Fix warning
2021-11-07 12:24:25 +01:00
Laurent Destailleur
dd2207d6c5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/core/db/DoliDB.class.php
htdocs/resource/list.php
2021-11-06 21:11:05 +01:00
Laurent Destailleur
7e68f9e013
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/db/DoliDB.class.php
htdocs/resource/list.php
2021-11-06 21:04:17 +01:00
Laurent Destailleur
edbcf78495
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-11-06 20:39:05 +01:00
Laurent Destailleur
0bc5ec8c78
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-11-06 20:38:29 +01:00
Laurent Destailleur
65105a3e05
Better log
2021-11-06 19:27:50 +01:00
Laurent Destailleur
77864f2c2c
NEW Can set value for EHLO smtp command in MAIL_SMTP_USE_FROM_FOR_HELO
2021-11-06 19:11:47 +01:00
Alexandre SPANGARO
1cd864e395
Merge remote-tracking branch 'upstream/develop' into 15a29
2021-11-06 05:06:21 +01:00
Nicolas Domenech
61d97ccd22
NEW : redirect after connection in login page
2021-11-05 16:02:24 +01:00
Laurent Destailleur
897b00faf0
Clean code
2021-11-05 14:23:19 +01:00
Laurent Destailleur
e8a550cb21
Merge pull request #19273 from frederic34/patch-1
...
fix warning (bad const)
2021-11-05 14:02:41 +01:00
Laurent Destailleur
b9d5f77937
Merge pull request #19276 from frederic34/patch-7
...
fix warnings
2021-11-05 14:01:14 +01:00
Laurent Destailleur
e430fe5f94
Merge pull request #19302 from FHenry/dev_addhook_dolbanner
...
NEW: for developpers add hook for moreHTMLRef in dol_banner_tab
2021-11-05 13:28:39 +01:00
Laurent Destailleur
01b1ce5fb5
Merge pull request #19313 from cfoellmann/PR/fix-holiday-docpreview
...
fix DocumentPreview on holiday documents
2021-11-05 13:03:22 +01:00
Laurent Destailleur
19b9412c13
FIX #19305
2021-11-05 12:49:33 +01:00
Laurent Destailleur
3959d12a39
Update DoliDB.class.php
2021-11-05 12:42:42 +01:00
Christian Foellmann
58ae45a88b
fix DocumentPreview on holiday documents
2021-11-04 13:58:38 +01:00
ATM john
dd8d4e9e98
Fix missing return status
2021-11-04 12:10:19 +01:00
Ferran Marcet
3f426abc29
Qual: If hidden option BANK_CAN_RECONCILIATE_CASHACCOUNT is activated, show Account Statements tab on Cash Accounts
2021-11-04 10:56:55 +01:00
Regis Houssin
3fb0e3c5ad
NEW add html.formldap.class.php
2021-11-03 22:56:15 +01:00
Florian HENRY
054d98b942
fix ref
2021-11-03 16:31:35 +01:00
Florian HENRY
a4c4732d5d
NEW: for developpers add hook for moreHTMLRef in dol_banner_tab
2021-11-03 16:18:03 +01:00
daraelmin
d334fe1292
Fix Bad count of subscription by year
...
If
2021-11-03 13:12:33 +01:00
John BOTELLA
12b046cb68
Fix class name
2021-11-02 14:11:36 +01:00
John BOTELLA
bbe71c9c32
Rename var
2021-11-02 14:07:36 +01:00
John BOTELLA
b98efd7e44
Add rank item management and add Hook
2021-11-02 13:55:12 +01:00
Anthony Berton
5bb6185e64
add_substitution
2021-11-02 12:37:39 +01:00
Alexandre SPANGARO
dd7ee9e5f4
Merge remote-tracking branch 'upstream/develop' into 15a29
2021-11-02 04:52:50 +01:00
Alexandre SPANGARO
155eae1772
Add advanced right to add / update thirdparty payment information
2021-11-02 04:52:16 +01:00
Alexandre SPANGARO
f73f3cd55f
typo
2021-11-02 04:50:29 +01:00
Benjamin Chantalat
85776f7529
Avoid function calls in a FOR loop test part
2021-11-01 20:08:00 +01:00
stickler-ci
85372a7083
Fixing style errors.
2021-11-01 18:57:35 +00:00
Benjamin Chantalat
7b88f1da3f
Change to have number of item dispached on number of total item
2021-11-01 19:56:55 +01:00
Frédéric FRANCE
d7c0d87aeb
Update mod_facture_fournisseur_tulip.php
2021-11-01 13:35:25 +01:00
Frédéric FRANCE
18918d4e9d
Update actions_addupdatedelete.inc.php
2021-11-01 13:34:13 +01:00
Frédéric FRANCE
55243dedb6
fix typo
2021-11-01 13:32:19 +01:00
Regis Houssin
c5e6893289
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
fix_add_ldap_hash_type_select
Conflicts:
htdocs/core/class/ldap.class.php
2021-11-01 11:16:33 +01:00
Regis Houssin
772c3eb43a
Works on ldap password hash type
2021-11-01 11:13:44 +01:00
John BOTELLA
ea641b707d
Factoring
2021-11-01 10:32:37 +01:00
John BOTELLA
4c016cc3be
integrate fix from V14
2021-11-01 10:11:43 +01:00
John BOTELLA
c28e9f5f7c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_setup_form_help_class
2021-11-01 10:08:37 +01:00
Frédéric FRANCE
b992deb084
fix warnings
2021-11-01 09:44:43 +01:00
Frédéric FRANCE
39777d4cc5
fix error
2021-11-01 09:37:07 +01:00
Frédéric FRANCE
cb8e1ce8f0
fix warning
2021-11-01 09:20:22 +01:00
Laurent Destailleur
7d07da527d
Debug v15
2021-11-01 03:30:22 +01:00
Laurent Destailleur
3e1fa44657
Fix phpdoc
2021-11-01 03:23:38 +01:00
Laurent Destailleur
6acc8a6582
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/ldap.class.php
2021-11-01 03:17:51 +01:00
Laurent Destailleur
7dcd98b9bb
Merge pull request #19234 from hregis/fix_see_ldap_connected_server
...
FIX show connected server if we have a primary and secondary ldap server
2021-11-01 02:46:28 +01:00
Laurent Destailleur
1b336456ce
Code comment
2021-11-01 02:44:14 +01:00
Laurent Destailleur
d4348b8e53
Merge pull request #19264 from frederic34/patch-1
...
fix warning
2021-11-01 02:35:48 +01:00
Laurent Destailleur
6480425130
Merge pull request #19269 from frederic34/patch-8
...
fix unknown function
2021-11-01 02:31:59 +01:00
Frédéric FRANCE
75eff571d9
fix unknown function
2021-10-31 22:27:39 +01:00
Frédéric FRANCE
270ddfda1f
fix scrutinizer
2021-10-31 22:24:25 +01:00
Frédéric FRANCE
7d60cddaac
fix warning
...
same test at line 65
2021-10-31 19:36:31 +01:00
Laurent Destailleur
d21278b0ef
Merge branch 'develop' into fix_php8
2021-10-31 17:54:32 +01:00
Laurent Destailleur
40683720a3
Merge pull request #19182 from frederic34/propallist
...
fix warnings in propal list
2021-10-31 17:51:52 +01:00
Laurent Destailleur
6a4344af8a
Merge pull request #19187 from frederic34/patch-8
...
fix warning
2021-10-31 17:51:16 +01:00
Laurent Destailleur
ae103f20ca
Merge pull request #19204 from FHenry/fix_introduced_scrutinizer
...
Fix introduced scrutinizer
2021-10-31 17:37:31 +01:00
Laurent Destailleur
efa8b7943e
Merge
2021-10-31 17:22:40 +01:00
Laurent Destailleur
bea85db413
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-31 17:20:09 +01:00
Laurent Destailleur
0e4c113e7f
Fix phpcs
2021-10-31 17:11:23 +01:00
Laurent Destailleur
42b043feef
Merge pull request #19213 from atm-greg/FIX_restrictedArea_for_payment_delete
...
FIX restrictedArea for payment delete
2021-10-31 17:06:47 +01:00
Laurent Destailleur
682ad98918
Update security.lib.php
2021-10-31 17:06:37 +01:00
Laurent Destailleur
e79dd52c9c
Merge pull request #19212 from fr69400/develop
...
[minor] Fix some warning
2021-10-31 17:04:47 +01:00
Laurent Destailleur
fb6a1d1f51
FIX #19210
2021-10-31 16:59:48 +01:00
Laurent Destailleur
a635dc6df3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/bookmarks/card.php
2021-10-31 16:50:34 +01:00
Laurent Destailleur
51b0758263
Merge pull request #19219 from FHenry/14_fix_warning
...
fix: warning dol_print_date setTimeStamp when time empty
2021-10-31 16:49:13 +01:00
Laurent Destailleur
d891dd8ddc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/stocks.lang
htdocs/product/stats/card.php
htdocs/projet/element.php
htdocs/salaries/card.php
2021-10-31 16:19:10 +01:00
Laurent Destailleur
f989b145af
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-31 15:59:23 +01:00
Laurent Destailleur
4f2cd2ba18
FIx #19227
2021-10-31 15:59:03 +01:00
Laurent Destailleur
82e7c4b237
Merge pull request #19244 from hregis/fix_missing_access_right
...
FIX missing service access right
2021-10-31 15:15:33 +01:00
Laurent Destailleur
e6e440e573
Fix #19257 error in the page Overview of a project
2021-10-31 15:14:15 +01:00
Laurent Destailleur
da4fe03be7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/ticket/card.php
2021-10-31 14:37:33 +01:00
Laurent Destailleur
ca8dab36a3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.formticket.class.php
htdocs/core/modules/modAdherent.class.php
htdocs/core/modules/modProjet.class.php
2021-10-31 14:33:44 +01:00
Laurent Destailleur
27d9ee9fc0
Merge pull request #19240 from frederic34/patch-15
...
fix warnings
2021-10-31 13:56:54 +01:00
Laurent Destailleur
7232e38dbe
Merge pull request #19248 from fmarcet/12.0
...
Fix: Import don't work if extrafield is separator
2021-10-31 13:54:31 +01:00
Laurent Destailleur
ed9f0c4ad9
Fix labels
2021-10-31 13:42:08 +01:00
John BOTELLA
ca766c2e71
Factoring
2021-10-31 09:29:20 +01:00
Alexandre SPANGARO
70ed633171
Update label perms
2021-10-31 07:23:34 +01:00
Alexandre SPANGARO
3242400855
Clean module HRM
2021-10-31 06:26:41 +01:00
Alexandre SPANGARO
54b81312b5
FIX Ticket - Duplicate field project when we create ticket from project
2021-10-30 22:49:32 +02:00
Laurent Destailleur
0017c15974
Debug v15
2021-10-30 17:19:46 +02:00
John BOTELLA
cdf1538ffa
fix save using template
2021-10-30 16:36:51 +02:00
John BOTELLA
41beffccde
Merge branch 'new_setup_form_help_class' of github.com:atm-john/dolibarr into new_setup_form_help_class
2021-10-30 12:55:26 +02:00
John BOTELLA
3a86221290
add more customisation
2021-10-30 12:54:13 +02:00
Giovanni Vella
badf52b295
Merge branch 'Dolibarr:develop' into develop
2021-10-29 15:35:56 +02:00
Laurent Destailleur
be6b1e29ad
Add logs
2021-10-29 13:32:32 +02:00
Ferran Marcet
9f23528ccd
Fix: Import don't work if extrafield is separator
2021-10-29 12:39:22 +02:00
Ferran Marcet
1336d3e791
Fix: Import don't work if extrafield is separator
2021-10-29 12:25:50 +02:00
Laurent Destailleur
fe7e1d4118
Look and feel v15
2021-10-29 09:40:38 +02:00
Regis Houssin
8df90a1f54
FIX missing service access right
2021-10-29 08:28:41 +02:00
Frédéric FRANCE
787cef4440
fix warnings
2021-10-28 20:34:05 +02:00
Marc de Lima Lucio
15455ed470
FIX: deposit payment terms: correctly store default deposit percent value if not defined
2021-10-28 16:54:47 +02:00
Marc de Lima Lucio
7e059c0a22
NEW: deposit payment terms: futureproof evolutions by storing field as a string
2021-10-28 16:53:28 +02:00
Marc de Lima Lucio
668088a63f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-28 15:54:18 +02:00
stickler-ci
134e5cb5e6
Fixing style errors.
2021-10-28 13:52:29 +00:00
Regis Houssin
390d5eccaf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_see_ldap_connected_server
2021-10-28 15:47:31 +02:00
Regis Houssin
f497492e62
FIX compatibility with php8
2021-10-28 15:40:05 +02:00
Laurent Destailleur
ffc07efb64
Look and feel v15
2021-10-28 14:28:24 +02:00
Regis Houssin
ae6d16c830
FIX mhash function is deprecated since php 8.1.0
2021-10-28 13:36:53 +02:00
Regis Houssin
72484961ab
FIX show connected server if we have a primary and secondary ldap server
2021-10-28 12:13:28 +02:00
Laurent Destailleur
d1794d7948
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modAdherent.class.php
2021-10-28 11:05:38 +02:00
Laurent Destailleur
f033e91cb0
phpcs
2021-10-28 11:03:27 +02:00
Laurent Destailleur
41bba0e879
Fix import of members
2021-10-28 00:12:41 +02:00
Laurent Destailleur
97d97af932
Clean: Remove fields for social networks (merged into "socialnetworks")
2021-10-27 16:39:34 +02:00
Florian HENRY
46119c99a2
fix: warning dol_print_date setTimeStamp when time empty
2021-10-27 09:23:54 +02:00
Laurent Destailleur
4bde20dd8d
Can make update during import of members
2021-10-27 09:23:03 +02:00
Laurent Destailleur
f12c709ec1
Fix checkbox
2021-10-27 03:09:12 +02:00
Laurent Destailleur
e85548d470
Fix look and feel v14
2021-10-27 03:06:50 +02:00
stickler-ci
6fd08bc5ef
Fixing style errors.
2021-10-26 14:56:56 +00:00
atm-greg
406089ef0c
FIX restrictedArea for payment delete
2021-10-26 16:47:16 +02:00
fr69400
761ec7b790
Update functions.lib.php
2021-10-26 16:45:40 +02:00
fr69400
e4b3dda7f0
Update functions.lib.php
...
FIX : Duplicate entry in array
FIX : Unasigned variable
FIX : Type mismatch
FIX : Wrong variable
2021-10-26 15:27:12 +02:00
Laurent Destailleur
7393abea8f
Fix phpcs
2021-10-26 14:42:26 +02:00
Laurent Destailleur
2436f0967b
Fix translation of Nature of member in import.
2021-10-26 14:37:15 +02:00
Laurent Destailleur
e9ba9fc103
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:52:00 +02:00
Laurent Destailleur
da2ce063b3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/contact/card.php
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/product/card.php
htdocs/public/emailing/mailing-unsubscribe.php
2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/list.php
htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:29:47 +02:00
Scrutinizer Auto-Fixer
5567310e44
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-25 20:07:31 +00:00
Florian HENRY
cfd88cb6e5
fix scrutinizer error
2021-10-25 21:50:27 +02:00
Laurent Destailleur
f64cd9d859
Fix bookmarks page
2021-10-25 21:28:52 +02:00
Laurent Destailleur
20c874d441
Fix escape sql params.
2021-10-25 18:48:44 +02:00
Laurent Destailleur
dc1226b116
Fix #yogosha7508
2021-10-25 18:40:19 +02:00
Florian HENRY
52a4f4869d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8
2021-10-25 16:54:30 +02:00
Laurent Destailleur
02632e9e88
Fix need write permission on object to link/remove resource
2021-10-25 16:32:37 +02:00
Laurent Destailleur
7533d4495d
Fix bug huntr.dev
2021-10-25 15:39:02 +02:00
Laurent Destailleur
d916fe121a
css
2021-10-25 13:57:02 +02:00
Laurent Destailleur
15c80327b1
data-key for extrafielsds has prefix of element
2021-10-25 13:29:08 +02:00
Laurent Destailleur
f5562177e7
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-25 13:06:33 +02:00
Laurent Destailleur
940c69b46d
Clean code
2021-10-25 12:09:17 +02:00
Laurent Destailleur
98f4f0b1c9
Merge
2021-10-25 11:52:24 +02:00
Florian HENRY
b282673f61
fix php8 warning
2021-10-25 09:01:05 +02:00
Frédéric FRANCE
03a8c5f0cb
Update commonfields_edit.tpl.php
2021-10-24 19:21:58 +02:00
Frédéric FRANCE
72a665b901
fix warning
2021-10-24 19:19:32 +02:00
Laurent Destailleur
b8250be237
css for toolitp
2021-10-24 16:35:42 +02:00
Frédéric FRANCE
677ac4635d
fix warnings in propal list
2021-10-24 14:34:47 +02:00
Laurent Destailleur
55d30884b8
Remove strange code
2021-10-24 13:15:01 +02:00
Laurent Destailleur
d3f630e4b5
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0
2021-10-24 13:06:41 +02:00
Laurent Destailleur
dc32350ee7
Code comment
2021-10-24 13:02:45 +02:00
Laurent Destailleur
8076357f93
Merge pull request #17185 from bb2a/formconfirm_notification
...
[NEW] Add option for notification in message form
2021-10-24 13:00:39 +02:00
Laurent Destailleur
a26539c3e4
Merge pull request #19173 from frederic34/patch-1
...
Fix Undefined array key
2021-10-24 12:33:44 +02:00
Laurent Destailleur
dcb433756d
Merge pull request #19174 from frederic34/fixticketlist
...
fix warnings in ticket list
2021-10-24 12:31:57 +02:00
Giovanni Vella
a855ef1329
current date default format string
...
Added a default format for date/time tag DOL_PRINT_CURR_DATE
2021-10-24 12:07:23 +02:00
Giovanni Vella
037c36abf0
Merge branch 'Dolibarr:develop' into develop
2021-10-24 11:54:48 +02:00
Maxime Kohlhaas
6abd4cc120
Fix #8716 : tasks were not shown in ecm auto tree
2021-10-24 11:38:45 +02:00
Frédéric FRANCE
cc374e9eb1
fix warnings in ticket list
2021-10-24 10:02:12 +02:00
Frédéric FRANCE
6d2cedb439
Fix Undefined array key
...
Fix Undefined array key 1 in htdocs/core/lib/project.lib.php on line 314
2021-10-24 09:33:54 +02:00
stickler-ci
61576dad53
Fixing style errors.
2021-10-24 00:17:18 +00:00
John BOTELLA
fdcb9674d8
Remove prints
2021-10-24 02:09:49 +02:00
John BOTELLA
aaa7fd5b3a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_setup_form_help_class
2021-10-24 01:38:42 +02:00
John BOTELLA
d3d3a87ce9
Add new class to help setup generation
2021-10-24 01:38:13 +02:00
Laurent Destailleur
6ad9eb8ef1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/api_products.class.php
htdocs/recruitment/recruitmentcandidature_list.php
htdocs/recruitment/recruitmentjobposition_list.php
2021-10-24 00:02:15 +02:00
Laurent Destailleur
fc29aa7d3b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-10-23 23:58:00 +02:00
Laurent Destailleur
44b030e23e
Merge branch 'develop' into NEW_stockstransfers
2021-10-23 22:57:35 +02:00
Laurent Destailleur
e12d9ee979
Merge pull request #19156 from frederic34/defaultvaluegetglobal
...
can specify default in getDolGlobalString and getDolGlobalInt
2021-10-23 22:42:40 +02:00
Laurent Destailleur
5078e3d863
Merge pull request #19161 from Dolibarr/scrutinizer-patch-3
...
Scrutinizer Auto-Fixes
2021-10-23 22:38:15 +02:00
Laurent Destailleur
06c1d79c05
Update html.form.class.php
2021-10-23 22:36:55 +02:00
Lucas Marcouiller
58b28d3d7d
Fix: fix php 8.0 warnings project
2021-10-23 22:32:03 +02:00
Maxime Kohlhaas
29950a6afa
Replace != by <> in SQL requests
2021-10-23 22:27:29 +02:00
Maxime Kohlhaas
00b617d17f
Fix #18961 : no_email field has been replaced by mailing_unsubscribe table
2021-10-23 22:22:45 +02:00
Scrutinizer Auto-Fixer
f7a41f1848
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-23 20:22:10 +00:00
Frédéric FRANCE
635cb34606
fix warning
2021-10-23 21:10:43 +02:00
Frédéric FRANCE
08e5b55d16
can specify default in getDolGlobalString and getDolGlobalInt
2021-10-23 21:06:37 +02:00
Lucas Marcouiller
aec5e41656
Fix : fix php 8.0 warnings
2021-10-23 19:09:23 +02:00
Lucas Marcouiller
385d2c8d72
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3
2021-10-23 16:13:42 +02:00
Lucas Marcouiller
b3e9aeef7a
Fix : PHP 8.0 warnings
2021-10-23 16:12:44 +02:00
Lucas Marcouiller
bc4373a5de
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4
2021-10-23 11:47:06 +02:00
Lucas Marcouiller
6ccd8ce83a
Fix : PHP errors 8.0
2021-10-23 11:45:06 +02:00
Laurent Destailleur
f5aebbf6b8
Merge pull request #19127 from frederic34/usermyactions
...
fix warnings
2021-10-23 11:38:18 +02:00
Laurent Destailleur
6ec19bca9d
Merge pull request #19128 from frederic34/warnfixes
...
fix warnings
2021-10-23 11:38:03 +02:00
Laurent Destailleur
a9bba23ef5
Merge pull request #19138 from Hystepik/scrutinizerfix
...
Fix : scrutinizer errors
2021-10-23 11:23:13 +02:00
Laurent Destailleur
7b496add01
Merge pull request #19137 from Hystepik/develop#3
...
Fix: PHP 8.0 Warnings
2021-10-23 11:22:04 +02:00
Laurent Destailleur
98f1637e0f
Merge pull request #19116 from evarisk-theo/fix-link-object-to-categories
...
Fix link object to categories
2021-10-23 11:21:41 +02:00
Lucas Marcouiller
d1ec71197a
Fix : scrutinizer errors
2021-10-23 11:10:58 +02:00
Hystepik
67711bdea9
Merge branch 'develop' into develop#3
2021-10-23 10:59:36 +02:00
Lucas Marcouiller
953a56b08c
Fix: PHP 8.0 Warnings
2021-10-23 10:57:03 +02:00
Giovanni Vella
d624928a5d
Merge branch 'Dolibarr:develop' into develop
2021-10-23 10:56:54 +02:00
Frédéric FRANCE
cad2cf9b6f
fix warnings
2021-10-23 07:20:30 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings
2021-10-23 07:13:08 +02:00
Frédéric FRANCE
2d92e6006c
fix warnings
2021-10-23 07:04:13 +02:00
John BOTELLA
55cdb8ac6f
Fix numeric value
2021-10-23 01:00:24 +02:00
Florian HENRY
bb4eb2feea
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8
2021-10-22 23:38:44 +02:00
Laurent Destailleur
81882f8243
Merge pull request #19065 from javieralapps4up/develop
...
Access forbidden when the password of other users is changed
2021-10-22 22:52:55 +02:00
Laurent Destailleur
900d7512f2
Merge pull request #19121 from frederic34/fixrightswarning
...
fix multiple warnings
2021-10-22 22:47:28 +02:00
Frédéric FRANCE
fafabe3be2
fix multiple warnings
2021-10-22 22:22:55 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings
2021-10-22 22:15:59 +02:00
Theo
a36c966f15
add: quick link categories to adherent
2021-10-22 16:13:54 +02:00
Laurent Destailleur
ef0b527379
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-22 15:57:16 +02:00
Laurent Destailleur
c81bf68578
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/compta/cashcontrol/cashcontrol_list.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/modulebuilder/index.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/product/class/api_products.class.php
2021-10-22 15:56:44 +02:00
Theo
29f847c13a
add: quick link categories to project
2021-10-22 15:48:39 +02:00
Laurent Destailleur
d54423990d
Merge pull request #19077 from polkiko/email_contentlines
...
FIX Content line substitution in email
2021-10-22 15:37:45 +02:00
Laurent Destailleur
808e9e030a
Merge pull request #19094 from Hystepik/scrutinizerfix
...
Fix: scrutinizer errors + boxes activation
2021-10-22 15:37:17 +02:00
Florian HENRY
87ac58efb6
fix php 8
2021-10-22 15:27:36 +02:00
polkiko
fd64f8966b
Fixed in-line substitution if there is no object
2021-10-22 15:19:11 +02:00
Florian HENRY
b94d74f194
fix php8 warning
2021-10-22 14:58:09 +02:00
Giovanni Vella
c77d1206d3
NEW: receipt beep alternative and current date/time
...
I have added the alternative command for the beep (when that does not work) and the possibility to print the current date and time on the receipt.
2021-10-22 14:45:28 +02:00
Lucas Marcouiller
daafe652b9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2
2021-10-22 14:39:18 +02:00
Laurent Destailleur
a55497561f
Merge pull request #19096 from Hystepik/develop#4
...
Fix : french labels of box_graph_new_vs_close
2021-10-22 14:31:39 +02:00
Laurent Destailleur
c1b2778ffc
Merge pull request #19093 from Hystepik/develop#3
...
Fix : Error on fetchAll on line
2021-10-22 14:23:05 +02:00
Lucas Marcouiller
1ecd0a2be7
Fix : french labels of box_graph_new_vs_close
2021-10-22 14:17:47 +02:00
Florian HENRY
3f211417c2
review
2021-10-22 12:19:16 +02:00
Lucas Marcouiller
75b1518611
Merge branch 'develop' of github.com:Dolibarr/dolibarr into scrutinizerfix
2021-10-22 12:02:33 +02:00
Lucas Marcouiller
33e4d750d7
Fix: scrutinizer errors + boxes activation
2021-10-22 12:01:46 +02:00
Laurent Destailleur
42dceeafd4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-22 11:58:17 +02:00
Laurent Destailleur
f354427b3c
Fix warning
2021-10-22 11:58:00 +02:00
Lucas Marcouiller
b3f15167dc
Fix : Error on fetchAll on line
2021-10-22 11:55:21 +02:00
Laurent Destailleur
e4a757ff9e
Merge pull request #19086 from FHenry/14_fix_various_warning
...
fix: fix various php warning
2021-10-22 11:39:48 +02:00
Florian HENRY
0c770b8810
fix various warning
2021-10-22 10:54:33 +02:00
Florian HENRY
64bb2e6ece
fix various warning
2021-10-22 10:49:47 +02:00
Frédéric FRANCE
d1c9877c41
fix missing code comment
2021-10-22 07:02:44 +02:00
Laurent Destailleur
f7b12208d1
Merge pull request #18802 from javieralapps4up/14.0
...
Close : #18801 Jan-30 + 1m IS NOT Mar-2
2021-10-22 00:01:42 +02:00
Polkiko
0c47a88098
FIX Content line substitution in email
2021-10-21 23:53:37 +02:00
Laurent Destailleur
18e421448c
Merge pull request #19041 from frederic34/patch-5
...
doxygen
2021-10-21 23:34:42 +02:00
Laurent Destailleur
556a6eaaf3
Merge pull request #19040 from frederic34/patch-4
...
doxygen
2021-10-21 23:22:06 +02:00
Laurent Destailleur
0b5d63aabe
Merge pull request #19043 from frederic34/patch-7
...
doxygen
2021-10-21 23:21:55 +02:00
Laurent Destailleur
9a989ca308
Merge pull request #19044 from frederic34/patch-8
...
doxygen
2021-10-21 23:20:32 +02:00
Laurent Destailleur
16d2a9c1bd
Merge pull request #19046 from frederic34/patch-10
...
doxygen
2021-10-21 23:20:17 +02:00
Laurent Destailleur
988f208dff
Merge pull request #19042 from frederic34/patch-6
...
doxygen
2021-10-21 23:20:03 +02:00
Laurent Destailleur
82be96e254
Merge pull request #19039 from frederic34/patch-2
...
doxygen
2021-10-21 23:07:13 +02:00
Laurent Destailleur
7ea993e448
Merge pull request #19045 from frederic34/patch-9
...
doxygen
2021-10-21 23:03:55 +02:00
Laurent Destailleur
ffd954b454
Merge pull request #19053 from frederic34/patch-17
...
fix doxygen nested comment
2021-10-21 23:02:54 +02:00
Laurent Destailleur
232616fc77
Merge pull request #19052 from frederic34/patch-16
...
fix doxygen nested comment
2021-10-21 23:02:20 +02:00
Laurent Destailleur
c126c48a92
Merge pull request #19072 from atm-maxime/fix_expense_report_rules
...
Fix MAIN_USE_EXPENSE_RULE is now stable
2021-10-21 23:02:05 +02:00
Maxime Kohlhaas
ae6cae0313
Fix MAIN_USE_EXPENSE_RULE is now stable
2021-10-21 22:57:50 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer
...
fix: scrutinizer
2021-10-21 22:52:20 +02:00
Laurent Destailleur
88f870c6e3
Merge pull request #19060 from vincentjdc/original-file-hook-checkSecureAccess
...
Allow hook 'checkSecureAccess' to change original_file
2021-10-21 22:39:29 +02:00
Laurent Destailleur
da4ecb46b3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-21 22:32:10 +02:00
Laurent Destailleur
db6c793044
Text in english
2021-10-21 22:31:51 +02:00
Florian HENRY
96722d55ef
fix scrutinzer
2021-10-21 19:13:05 +02:00
atm-lena
bdc8854baa
Clean
2021-10-21 18:54:07 +02:00
atm-lena
03765528e1
Contract line : update boolean
2021-10-21 18:42:06 +02:00
javieralapps4up
f50dfe8571
Update security.lib.php
2021-10-21 18:20:06 +02:00
javieralapps4up
5d854dcce1
FIX #19064
...
Access forbidden when the password of other users is changed
Steps to reproduce the behavior
User with lire and password (user) perms, but no creer.
When this user saves or cancels the edition of the password of another user, he is sent to the prohibited page
2021-10-21 18:17:43 +02:00
Florian HENRY
85ec2c408c
fix scrutinizer
2021-10-21 18:15:15 +02:00
Lucas Marcouiller
4d2b96d029
fix inventory scan
2021-10-21 18:08:20 +02:00
Lucas Marcouiller
1f64b09430
WIP : fix inventory scan
2021-10-21 18:07:54 +02:00
Florian HENRY
f66f5cbfb8
fix: scrutinizer
2021-10-21 17:10:39 +02:00
Florian HENRY
4795190a75
fix: scrutinizer
2021-10-21 17:09:48 +02:00
Florian HENRY
e9fe668725
fix: scrutinizer
2021-10-21 16:48:04 +02:00
Vincent Dieltiens
3a48fe2d66
Allow hook 'checkSecureAccess' to change original_file
2021-10-21 16:06:18 +02:00
Florian HENRY
f68c3c17aa
fix php warning
2021-10-21 15:50:04 +02:00
Frédéric FRANCE
2eb524cc31
fix doxygen nested comment
2021-10-21 12:31:08 +02:00
Frédéric FRANCE
8778296784
fix doxygen nested comment
2021-10-21 12:29:27 +02:00
Frédéric FRANCE
89f4066ead
doxygen
2021-10-21 11:57:02 +02:00
Frédéric FRANCE
d83485cc7b
doxygen
2021-10-21 11:55:24 +02:00
Frédéric FRANCE
a082dc6504
doxygen
2021-10-21 11:54:15 +02:00
Frédéric FRANCE
a4555d6304
doxygen
2021-10-21 11:53:17 +02:00
Frédéric FRANCE
a528f8e98b
doxygen
2021-10-21 11:52:18 +02:00
Frédéric FRANCE
82b9dc6c87
doxygen
2021-10-21 11:50:48 +02:00
Frédéric FRANCE
bca3bcf8c9
doxygen
2021-10-21 11:49:24 +02:00
Frédéric FRANCE
d41c1393ba
Update box_graph_new_vs_close_ticket.php
2021-10-21 11:48:20 +02:00
Frédéric FRANCE
197818684b
doxygen
2021-10-21 11:47:32 +02:00
atm-lena
806c53d4c4
FIX Ret PR
2021-10-21 09:49:14 +02:00
Laurent Destailleur
a3d81f0ddd
Move module as stable
2021-10-20 16:05:13 +02:00
Laurent Destailleur
e43b33028c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Laurent Destailleur
4a5293fc9c
Rewrite getDictionaryValue (Use a cache file and consistent return code)
2021-10-20 14:41:40 +02:00
Laurent Destailleur
e4d0bf7a91
Merge pull request #18967 from aspangaro/15a23
...
NEW Add sortorder on units list
2021-10-20 12:50:32 +02:00
Alexandre SPANGARO
632751cebc
Use getDolGlobalInt()
2021-10-20 12:37:49 +02:00
kamel
7b41d1d87f
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into fix_00008
2021-10-20 09:35:30 +02:00
Gauthier PC portable 024
4614b0dd65
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-10-20 09:13:58 +02:00
Gauthier PC portable 024
61a34829c1
FIX : this is a development version
2021-10-20 09:11:08 +02:00
Alexandre SPANGARO
bee6abd6fc
Merge branch '14.0' into 14p24
2021-10-20 07:38:54 +02:00
javieralapps4up
2ca0a1facf
Update date.lib.php
2021-10-20 00:36:24 +02:00
Laurent Destailleur
421b692942
Clean last br for wysiwyg
2021-10-19 21:48:25 +02:00
Laurent Destailleur
12d211815b
Debug v15
2021-10-19 21:38:36 +02:00
Laurent Destailleur
4764075cc7
Merge pull request #19016 from hregis/fix_possibility_to_bypass_main_antivirus_constants
...
FIX add possibility to bypass MAIN_ANTIVIRUS_* constants
2021-10-19 19:04:09 +02:00
Laurent Destailleur
121cb8f708
Merge pull request #19019 from Hystepik/develop#2
...
Fix: selectGroupTickets multilevel
2021-10-19 19:02:35 +02:00
kamel
f328bb32f6
Corrections
2021-10-19 17:34:03 +02:00
Laurent Destailleur
bfdf88ca6c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-19 16:48:00 +02:00
Laurent Destailleur
0cae464bfa
Debug v15
2021-10-19 16:47:43 +02:00
lmarcouiller
f5942300e0
fix CI bot error
2021-10-19 16:09:06 +02:00
lmarcouiller
d8cd6b6f55
Fix autoselect multilevel
2021-10-19 15:54:25 +02:00
Regis Houssin
db01fed447
FIX error when defining an already existing constant
2021-10-19 12:36:33 +02:00
Laurent Destailleur
6193e31eb4
Merge pull request #18999 from polkiko/payment_receipt
...
NEW Added linked files page and send mail possibility in payments
2021-10-19 12:25:37 +02:00
Regis Houssin
acbae5cafb
FIX add possibility to bypass MAIN_ANTIVIRUS_* constants
2021-10-19 12:14:42 +02:00
lmarcouiller
dd6457b259
FIX: boxes php 8.0 errors and warnings
2021-10-19 10:24:59 +02:00
Laurent Destailleur
c40a73162e
Look and feel v15
2021-10-18 21:20:58 +02:00
Laurent Destailleur
252c910962
Debug feature for proposal signature
2021-10-18 20:46:28 +02:00
Jesús Jerez
43ac3230c3
Merge branch 'develop' into payment_receipt
2021-10-18 19:53:36 +02:00
Laurent Destailleur
297580ed11
Merge pull request #19011 from Hystepik/develop#2
...
NEW: Online proposal signature
2021-10-18 19:41:58 +02:00
Laurent Destailleur
a81d6ef405
Debug v15
2021-10-18 19:13:36 +02:00
Laurent Destailleur
b0230ad42b
Look and feel v15
2021-10-18 16:45:14 +02:00
lvessiller
98a613edec
FIX show end hours in events linked to objects
2021-10-18 14:31:37 +02:00
lmarcouiller
0c2cf9980d
NEW: online propal signature
2021-10-18 14:28:30 +02:00
Alexandre SPANGARO
053740792f
Update accounting.lib.php
2021-10-18 10:19:50 +02:00
kamel
152aab4903
Add test if actual entity is different to the entity provided
2021-10-18 10:10:31 +02:00
lmarcouiller
c3a45dabad
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2
2021-10-18 09:51:45 +02:00
stickler-ci
4c5e959911
Fixing style errors.
2021-10-17 23:52:24 +00:00
Polkiko
074b5589bd
NEW Added documents page and send mail possibility in payments
...
- Documents page has been added to the payments page so that documents can be linked and see the generated pdf documents.
- The possibility of sending payments by email has been added, attaching the payment receipts in pdf.
- In pdf standard model of payment, the possibility of seeing the active iban of a third party has been added if it exists.
2021-10-18 01:15:12 +02:00
Laurent Destailleur
7bcc76c1aa
Fix margin rates and mark rates are 2 different columns
2021-10-17 19:41:02 +02:00
Laurent Destailleur
b318ccb2af
Fix margin rates and mark rates are 2 different columns
2021-10-17 19:39:56 +02:00
Laurent Destailleur
099b2da2dc
FIX #18974
2021-10-17 18:58:34 +02:00
Laurent Destailleur
0aa90e82ea
Clean code
2021-10-17 15:47:29 +02:00
Laurent Destailleur
79177b0a11
Rename method into selectLotDataList
2021-10-17 14:38:12 +02:00
Laurent Destailleur
0727e182ac
Merge pull request #18997 from hregis/fix_add_zstd_compression
...
NEW add support for zstd compression
2021-10-17 13:49:06 +02:00
Laurent Destailleur
b66155de4b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/list.php
htdocs/filefunc.inc.php
2021-10-17 13:30:13 +02:00
Laurent Destailleur
b30d7371a4
Fix allow ' - ' into file name
2021-10-17 12:21:22 +02:00
stickler-ci
9fa6a8daa7
Fixing style errors.
2021-10-17 10:05:58 +00:00
Regis Houssin
84e4bd8820
NEW add zstd compression
2021-10-17 11:59:25 +02:00
Laurent Destailleur
c896c05464
Merge pull request #18989 from FHenry/dev_18986
...
NEW: Add budget field into task #18986
2021-10-16 21:16:01 +02:00
Laurent Destailleur
830e067eff
Fix for tzuser
2021-10-16 21:03:47 +02:00
Laurent Destailleur
94c48d3573
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-10-16 19:40:22 +02:00
Laurent Destailleur
dd0809b528
Fix trans labels status
2021-10-16 19:37:57 +02:00
Laurent Destailleur
25967da832
Merge pull request #18970 from hregis/fix_avoid_warning_non_numeric
...
FIX avoid non-numeric warning
2021-10-16 19:22:16 +02:00
Laurent Destailleur
1bee543eef
Merge pull request #18987 from atm-gauthier/NEW_more_param_on_function_deleteByParentField
...
NEW : we need to be able to put more filters on deleteByParentField() function
2021-10-16 19:11:52 +02:00
Laurent Destailleur
9469c0dc2b
Update commonobject.class.php
2021-10-16 19:10:50 +02:00
Laurent Destailleur
bbe867a7a9
Update commonobject.class.php
2021-10-16 19:06:50 +02:00
Laurent Destailleur
a28d01ca83
Use PDF/A format instead of PDF
2021-10-16 18:59:01 +02:00
Laurent Destailleur
f8010dfcbc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/reception/list.php
htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
lmarcouiller
9eb8dadfd9
WIP : signature of propal
2021-10-15 16:58:59 +02:00
Florian HENRY
ab9ba4e0a2
NEW: feature #18986
2021-10-15 10:53:17 +02:00
Gauthier PC portable 024
5ef681ef91
FIX : stickler
2021-10-15 10:36:47 +02:00
Florian HENRY
5f4410468d
add filed budget in task
2021-10-15 10:24:56 +02:00
Gauthier PC portable 024
412746ec8f
NEW : we need to be able to put more filters on deleteByParentField() function
2021-10-15 10:18:32 +02:00
atm-lena
ff7727466a
Function updateExtrafield : replace empty value to null
2021-10-14 17:13:44 +02:00
lvessiller
5d22eeeff2
FIX user date timezone offset
2021-10-14 16:06:22 +02:00
Regis Houssin
f14de50bd7
FIX check if numeric value
2021-10-13 14:26:43 +02:00
Regis Houssin
ce37323f69
FIX avoid non-numeric warning
2021-10-13 14:14:30 +02:00
Marc de Lima Lucio
29768a1c6e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-13 11:33:04 +02:00
Alexandre SPANGARO
41d6a96342
Merge remote-tracking branch 'upstream/develop' into 15a23
2021-10-13 03:29:57 +02:00
Laurent Destailleur
4fc93ca7fa
Fix css
2021-10-13 02:36:23 +02:00
Laurent Destailleur
e6c451cdae
Fix responsive
2021-10-12 23:50:23 +02:00
Laurent Destailleur
f3ea05b701
Merge pull request #17873 from atm-quentin/FIX_multiple_order_linked_to_facture
...
NEW when multiple order linked to facture, show list into note.
2021-10-12 14:30:34 +02:00
Laurent Destailleur
faf3700dcc
Merge pull request #18947 from altairisfr/TICKETS_MESSAGE_FORCE_MAIL
...
NEW : add constant TICKETS_MESSAGE_FORCE_MAIL
2021-10-12 12:38:20 +02:00
Laurent Destailleur
791a7206ee
Fix var not defined
2021-10-12 11:48:51 +02:00
Laurent Destailleur
6168e844bd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-10-12 01:43:20 +02:00
Laurent Destailleur
2e32254574
Fix rul to shipment files
2021-10-11 20:36:10 +02:00
Laurent Destailleur
c4ca9e92a6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-10-11 20:18:46 +02:00
Laurent Destailleur
4e9c7c9efb
FIX Attachment of pdf into shipment when sending email
2021-10-11 20:04:45 +02:00
Christophe Battarel
96bdd61684
NEW : add constant TICKETS_MESSAGE_FORCE_MAIL
2021-10-11 17:36:31 +02:00
Laurent Destailleur
3a32787f15
Fix for backward compatibility
2021-10-11 16:14:34 +02:00
Laurent Destailleur
5fc0802eb1
Fix for backward compatibility
2021-10-11 16:13:55 +02:00
Gauthier PC portable 024
ca18db8f50
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-10-11 16:01:47 +02:00
Laurent Destailleur
5666c63de2
Merge pull request #18850 from atm-gauthier/NEW/integration_GPEC_code
...
New : integration gpec, source code
2021-10-11 15:39:54 +02:00
Laurent Destailleur
f3c16ba490
Merge pull request #18905 from indelog/fix_origin_invoice_custom
...
Fix creataing invoice originating for custom module object
2021-10-11 15:26:07 +02:00
Laurent Destailleur
e3045f24cd
Merge pull request #18923 from aspangaro/15a24
...
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
2021-10-11 15:20:27 +02:00
Indelog
94875cdc77
Fix : Re-add bloc to set $withtargettype and $withsourcetype
2021-10-11 13:37:37 +02:00
Laurent Destailleur
33e811ee96
Merge pull request #18926 from FHenry/fix_get_thirdparties_option_select
...
fix: option COMPANY_SHOW_ADDRESS_SELECTLIST and SOCIETE_ADD_REF_IN_LIST work in ajaxcompanies
2021-10-11 11:50:35 +02:00
Laurent Destailleur
05ddcf5132
Merge pull request #18927 from vincentjdc/supplier-order-export-validation-date-user
...
NEW Allow exporting supplier order validation date + validation user
2021-10-11 11:09:31 +02:00
Alexandre SPANGARO
754b13a83f
NEW Add sortorder on units list
2021-10-11 08:58:00 +02:00
Laurent Destailleur
a57925b0b7
FIX edition of fields on credit transfer tab
2021-10-11 01:43:36 +02:00
Laurent Destailleur
7180f5eeff
css
2021-10-10 21:25:46 +02:00
Laurent Destailleur
874731af84
The 'action=delete&file=...' has been replaced with
...
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
2021-10-10 21:11:48 +02:00
Benjamin Chantalat
65c0167d07
ADD : info of number of product still to dispatched in a supplier order
2021-10-10 20:50:51 +02:00
Gauthier PC portable 024
1a11135aa4
FIX : travis and stickler
2021-10-08 14:00:47 +02:00
Florian HENRY
5d393f201c
fix sql
2021-10-08 13:17:09 +02:00
Vincent Dieltiens
592fff1cfa
Allow exporting supplier order validation date + validation user
2021-10-08 13:09:16 +02:00
Laurent Destailleur
1b504b3e2c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-08 12:15:18 +02:00
Laurent Destailleur
806d832549
Fix canonical url for open graph
2021-10-08 12:00:13 +02:00
Laurent Destailleur
a057c7c2a7
Add og graph
2021-10-08 11:49:28 +02:00
Laurent Destailleur
da0a9e13f5
Fix twitter tag
2021-10-08 11:41:45 +02:00
Laurent Destailleur
cb490c0eac
Allow twitter cards per page.
2021-10-08 11:06:28 +02:00
Laurent Destailleur
816e4cdde6
Comment
2021-10-08 10:59:11 +02:00
Alexandre SPANGARO
c7fd9328cd
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
2021-10-08 06:29:22 +02:00
Alexandre SPANGARO
e68d9dc73c
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
2021-10-07 22:02:56 +02:00
Gauthier PC portable 024
ca3899dbf1
FIX : travis + several fixes
2021-10-07 14:00:31 +02:00
Gauthier PC portable 024
de48c1bdde
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code
2021-10-07 11:23:37 +02:00
Gauthier PC portable 024
409c19a582
FIX : useless code
2021-10-07 11:19:04 +02:00
Gauthier PC portable 024
59f5f9b0c6
FIX : travis feedback
2021-10-07 10:37:47 +02:00
Gauthier PC portable 024
70648477a7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-10-07 10:37:09 +02:00
Alexandre SPANGARO
adfae30112
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
2021-10-07 06:18:39 +02:00
Laurent Destailleur
9cf46eaf25
Fix stats graphs
2021-10-06 20:29:48 +02:00
Laurent Destailleur
34187d53f6
Fix missing invoice in stats when due date is unknown/null
2021-10-06 20:10:36 +02:00
Laurent Destailleur
88a482c615
Fix phpcs
2021-10-06 18:40:32 +02:00
Laurent Destailleur
520a4f55f8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-10-06 18:34:03 +02:00
Laurent Destailleur
96b617cb4d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/eventorganization/conferenceorboothattendee_card.php
htdocs/mrp/mo_list.php
2021-10-06 18:30:26 +02:00
Gauthier PC portable 024
231f809106
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code
2021-10-06 17:55:36 +02:00
Indelog
18fb3a352b
Add hook to overide sourcetype and targettype for linked object
...
This add hook `setLinkedObjectSourceTargetType` in
`CommonObject::showLinkToObjectBlock()` and in
`CommonObject::fetchObjectLinked()` to allow overiding sourcetype and
targettype by custom modules.
2021-10-06 17:18:45 +02:00
Laurent Destailleur
4208964153
Merge branch 'develop' into patch-10
2021-10-06 16:09:54 +02:00
Laurent Destailleur
7e0ec949c0
Merge pull request #18915 from vincentjdc/vat-number-societe-list
...
NEW Add `SOCIETE_SHOW_VAT_IN_LIST` to display VAT number in combo list of thirdparties
2021-10-06 15:33:46 +02:00
Vincent Dieltiens
2889af9fae
Add SOCIETE_SHOW_VAT_IN_LIST option to let the possibility to display (and search) VAT number in list of 'societe'
2021-10-06 15:23:23 +02:00
Laurent Destailleur
4be2d1414e
Fix regression
2021-10-06 14:03:10 +02:00
Francis Appels
dceb2b5341
Fix fatal error
2021-10-06 13:36:11 +02:00
Laurent Destailleur
329bc331db
Merge pull request #18899 from fappels/14_fix_espadon
...
FIX fatal error on expedition espadon model
2021-10-06 13:29:47 +02:00
Laurent Destailleur
ea3e3b133d
Debug eventorganization modules
2021-10-06 12:55:07 +02:00
Indelog
45e6ea45dc
Fix stickler
2021-10-06 12:19:10 +02:00
Indelog
fb775e2c6e
Fix Add module part in llx_element_element on CommonObject::add_object_linked()
...
Add module part to target type if object has $module property and is'nt
in core modules.
2021-10-06 12:14:46 +02:00
Laurent Destailleur
93b4853f8e
Fix var_dump
2021-10-06 11:52:12 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21
...
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 16:51:41 +02:00
Gauthier PC portable 024
1d4d4dfe18
FIX : ihm
2021-10-05 15:43:57 +02:00
Marc de Lima Lucio
fb13b666b8
FIX: deposit payment terms: susbstitute percentage in payment term label with bespoke substitution key
2021-10-05 15:26:43 +02:00
Marc de Lima Lucio
0d174ebd71
cMerge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-05 14:57:21 +02:00
Laurent Destailleur
413164f5c0
NEW can upload the odt file for product doc template
2021-10-05 13:48:13 +02:00
Laurent Destailleur
b4cfe35138
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-05 13:39:46 +02:00
Marc de Lima Lucio
6ed9e00b4d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms
2021-10-05 13:35:50 +02:00
Laurent Destailleur
b11dbf069e
FIX Bad use of a forced contact of another company on PDF/ODT documents
2021-10-05 13:11:54 +02:00
Marc de Lima Lucio
f4c22c0ae7
FIX: deposit payment terms: PHPDoc
2021-10-05 13:02:12 +02:00
Laurent Destailleur
379dd9ccbb
Fix position of text
2021-10-05 12:09:03 +02:00
Indelog
6c82b1d0e1
Fix creataing invoice originating for custom module
...
This fix the invoice create form when we provide `origin` element in
url. The actual create form overide the value for origin field with
`$objectsrc->element`. This make creation of invoice originating from a custom
module module impossible because we need the module part to instantiate
the class for the custom module object.
This also modify Common Object::fetch Object Linked() to append the
module part for `$sourcetype` and `$targettype` if it not set and object
have module property and it not in core module.
2021-10-05 11:35:43 +02:00
Marc de Lima Lucio
b06857136a
NEW: deposit payment terms: show percentage on proposal/order PDFs
2021-10-05 11:31:03 +02:00
Marc de Lima Lucio
54782f5d4c
FIX: deposit payment terms: don't show percentage input on lists
2021-10-05 11:11:27 +02:00
Laurent Destailleur
50470f84c4
Look and feel v15. Stay at same position on doc generation
2021-10-05 11:03:51 +02:00
Marc de Lima Lucio
337531f832
FIX: deposit payment terms: correctly restrict them to objet other than invoices and template invoices
2021-10-05 10:54:22 +02:00
Laurent Destailleur
f0703b414a
css
2021-10-05 10:24:31 +02:00
Alexandre SPANGARO
3f26ab195b
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 09:46:48 +02:00
Alexandre SPANGARO
edf91ce77c
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 09:41:03 +02:00
Laurent Destailleur
355f17be3d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-10-05 09:11:37 +02:00
Laurent Destailleur
5ad02ccc32
MAIN_EMAIL_ADD_TRACK_ID removed, MAIN_FIX_FOR_BUGGED_MTA 1 by defaut
2021-10-05 09:11:20 +02:00
Alexandre SPANGARO
d10ec688c7
HTML5 - <font> tag is deprecated, replace by <span>
2021-10-05 09:03:13 +02:00
Alexandre SPANGARO
463efd3802
Missing language key
2021-10-05 06:26:19 +02:00
Francis Appels
d3cbda08dc
Fix fatal error
2021-10-04 22:12:50 +02:00
Laurent Destailleur
9617bbb463
Merge pull request #18788 from fr69400/develop
...
New : Add showdocument hook
2021-10-04 20:13:50 +02:00
Laurent Destailleur
2f6a4fa04a
Update html.formfile.class.php
2021-10-04 19:20:37 +02:00
Laurent Destailleur
950fccc186
Merge branch 'develop' into NEW_deposit_payment_terms
2021-10-04 19:06:42 +02:00
Marc de Lima Lucio
1b2494855d
NEW: deposit payment terms: set required invoice fields + filter payment terms with deposits in select + UI
2021-10-04 18:09:24 +02:00
Laurent Destailleur
86c8a53f24
Merge pull request #18892 from aspangaro/15a23
...
FIX Remove Isle of Man of ECC's countries compatible with VAT Rules
2021-10-04 15:32:40 +02:00
Laurent Destailleur
6060f0bfb0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/main.lang
2021-10-04 14:53:44 +02:00
Gauthier PC portable 024
0dd3681e50
FIX : several debug
2021-10-04 14:08:11 +02:00
Gauthier PC portable 024
73e741ca74
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-10-04 11:10:38 +02:00
Laurent Destailleur
66310b14d7
Better way to present open invoice graph
2021-10-04 05:34:14 +02:00
Laurent Destailleur
7b02560c4f
Better way to present open invoice graph
2021-10-04 05:27:07 +02:00
Laurent Destailleur
b3cb56f2ef
Clean css
2021-10-04 04:14:31 +02:00
Laurent Destailleur
d6e1a6be93
Look and feel v14
2021-10-03 18:20:01 +02:00
Alexandre SPANGARO
42bb9ac6d2
Better URL
2021-10-03 05:49:54 +02:00
Alexandre SPANGARO
042d520061
Change Url
2021-10-03 05:30:49 +02:00
Laurent Destailleur
8ba18f4d73
Merge pull request #18884 from frederic34/patch-9
...
doxygen
2021-10-02 20:38:27 +02:00
Laurent Destailleur
7e48d6d31b
Merge pull request #18886 from frederic34/patch-11
...
doxygen
2021-10-02 20:38:20 +02:00
Laurent Destailleur
bcb7d8c07a
Merge pull request #18887 from frederic34/patch-12
...
doxygen
2021-10-02 20:38:13 +02:00
Laurent Destailleur
1451e95e79
Merge pull request #18888 from frederic34/patch-13
...
doxygen
2021-10-02 20:37:53 +02:00
Laurent Destailleur
902fed1f0d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/ecm/index.php
2021-10-02 20:09:06 +02:00
Frédéric FRANCE
828c1d41e7
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:49:33 +02:00
Frédéric FRANCE
0ebe4de80a
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:48:27 +02:00
Frédéric FRANCE
1ba0369f01
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:47:30 +02:00
Frédéric FRANCE
c33d8ac49b
doxygen
...
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
2021-10-02 13:40:33 +02:00
Laurent Destailleur
d064ab2b17
Add more action to GET action to check
2021-10-02 12:58:15 +02:00
Laurent Destailleur
c664b78800
MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3)
2021-10-01 12:37:32 +02:00
Laurent Destailleur
c244d7375c
MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3)
2021-10-01 12:30:24 +02:00
Laurent Destailleur
166d3b08d6
Add LIBXML_NONET to simplexml_load_string
2021-09-30 20:12:01 +02:00
Laurent Destailleur
673a2982a5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/card.php
2021-09-30 16:32:40 +02:00
Laurent Destailleur
0bf1db2fd4
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-09-30 16:29:10 +02:00
Laurent Destailleur
ed264182c6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/product/card.php
htdocs/takepos/receipt.php
2021-09-30 16:28:42 +02:00
Laurent Destailleur
44bb5ebf34
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
2021-09-30 16:23:34 +02:00
Laurent Destailleur
bb6399e12a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/product/card.php
2021-09-30 16:21:36 +02:00
Laurent Destailleur
fc4a16b356
Fix avoid error when trigger run on downgraded version.
2021-09-30 16:18:07 +02:00
Laurent Destailleur
3d4bb66853
Clean code
2021-09-30 15:59:47 +02:00
Laurent Destailleur
608b6f5fa3
Clean code
2021-09-30 15:24:57 +02:00
Laurent Destailleur
9460ad152e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-30 14:46:39 +02:00
Laurent Destailleur
d764080636
Add tag data-ignoreidfordnd=1 to ignor lines for drage and drop lines
2021-09-30 14:43:19 +02:00
stickler-ci
c5ad75c7c1
Fixing style errors.
2021-09-30 12:27:01 +00:00
Laurent Destailleur
3565a47954
Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop
2021-09-30 14:24:30 +02:00
Laurent Destailleur
ee79df9bc7
Merge pull request #18839 from indelog/fix_list_of_autoecmfiles
...
Fix FormFile::list_of_autoecmfiles object_instance classname after hook
2021-09-30 13:39:16 +02:00
Laurent Destailleur
ae9643bbef
Update html.formfile.class.php
2021-09-30 13:38:38 +02:00
Laurent Destailleur
3deb424b4f
Merge pull request #18845 from indelog/fix_doc_prev_ecm
...
Fix show for external module in ecm index auto page
2021-09-30 13:36:49 +02:00
Laurent Destailleur
98d8bad955
Merge pull request #18843 from indelog/fix_ecm_deletion
...
Fix append module suffix on src_object_type when create ecm file
2021-09-30 13:32:42 +02:00
Laurent Destailleur
4fe9a4fd30
Merge pull request #18846 from hregis/fix_avoid_warning_if_not_an_array
...
FIX avoid warning if $categories is an id
2021-09-30 13:30:37 +02:00
Laurent Destailleur
1595b38498
Fix param $morecss on img_mime
2021-09-30 00:28:47 +02:00
Laurent Destailleur
a9805fbfc1
NEW The protection MAIN_SECURITY_CSRF_WITH_TOKEN=1 is on by default
2021-09-29 17:34:31 +02:00
Laurent Destailleur
34dacca77c
Css
2021-09-29 16:31:40 +02:00
Marc de Lima Lucio
b0aa502ed4
NEW: deposit payment terms: set deposit percentage in proposals/orders + get from origin document or company
2021-09-29 14:51:30 +02:00
Laurent Destailleur
0f55eea276
css
2021-09-29 14:48:50 +02:00
Marc de Lima Lucio
4d6c1d892b
NEW: deposit payment terms: set deposit percentage in company card
2021-09-29 14:03:35 +02:00
Marc de Lima Lucio
4b3fc4d7f3
NEW: deposit payment terms: add input in payment conditions form
2021-09-29 13:02:32 +02:00
Laurent Destailleur
9fe72597ab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-29 12:43:27 +02:00
Regis Houssin
6e08ecde04
FIX indentation
2021-09-29 08:47:22 +02:00
Laurent Destailleur
baadf2dc6c
Fix reposition
2021-09-29 01:51:34 +02:00
Laurent Destailleur
1e840fe7ed
Code comment
2021-09-28 18:07:04 +02:00
Laurent Destailleur
e15277bb6c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-28 17:23:07 +02:00
Regis Houssin
43a47999d7
FIX avoid warning if $categories is an id
2021-09-28 16:35:01 +02:00
Indelog
fae0337b3e
Fix show for external module in ecm index auto page
...
This set the correct `modulepart` parameter for link generated to
`document.php` of ecm auto index page if `src_object_type` for
ecm document has a module suffix (`@modulename`).
2021-09-28 16:22:28 +02:00
Indelog
5b8b55cfba
Fix append module suffix on src_object_type when create ecm file
...
Files added to `llx_ecm_files` for externals modules never be removed on
object deletion.
When `CommonObject::deleteEcmFiles()` is called with `mode=1`, it use
this sql filter to find the file related to the object which is removed
:
```
$sql .= " WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".((int) $this->id).")";
```
We see it append `'@'.$this->module` to `$this->table_element` but when
file is add to the `llx_ecm_files` by
`CommonObject::commonGenerateDocument()` , it added whiteout the
`'@'.$this->module` suffix. So the file is never remove from
`llx_ecm_files` when object is deleted.
This fix it by appending module suffix on `src_object_type` if object
has `module` property when add document to the `llx_ecm_files`.
2021-09-28 15:26:08 +02:00
Alexandre SPANGARO
9426af8f6a
NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3)
2021-09-28 13:16:44 +02:00
Laurent Destailleur
0c52817426
Merge pull request #18821 from aspangaro/15a20
...
NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3)
2021-09-28 13:14:16 +02:00
Laurent Destailleur
43637c936c
Merge pull request #18825 from grandoc/new_branch_25_09_2021
...
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\doliba…
2021-09-28 12:56:43 +02:00
Laurent Destailleur
8f4fb9fd3c
Update barcode.lib.php
2021-09-28 12:56:33 +02:00
Laurent Destailleur
a70f5dd90e
Doc
2021-09-28 12:12:11 +02:00
Indelog
2472dff67b
Fix FormFile::list_of_autoecmfiles object_instance classname after hook
...
FormFile::list_of_autoecmfiles() can instantiate object with parameters
resulting of hook `addSectionECMAuto` but for do this,
it use `${$hookmanager->resArray['classname']}` which return a
`null`. Instead we should do this
`$hookmanager->resArray['classname']`.
2021-09-28 12:08:45 +02:00
Laurent Destailleur
0e3ec3ea2d
Trans
2021-09-28 11:56:43 +02:00
Laurent Destailleur
80165811e0
Clean code
2021-09-27 15:50:19 +02:00
Laurent Destailleur
d4cc60640b
Clean code
2021-09-27 15:41:58 +02:00
javieralapps4up
11723c2cd0
Update date.lib.php
...
Without words, sorry
2021-09-27 14:49:22 +02:00
javieralapps4up
c4f1eb0c46
Update date.lib.php
...
Fix my error
2021-09-27 14:32:03 +02:00
Laurent Destailleur
37603b451a
Fix token in url
2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
2021-09-27 11:40:47 +02:00
Gauthier PC portable 024
fde0f1ac25
NEW : HRM integration, source code
2021-09-27 11:20:38 +02:00
Laurent Destailleur
4f6586d6a8
Fix token
2021-09-26 20:35:54 +02:00
Laurent Destailleur
d5d4b8d8e0
Fix escape the undescore on search in website module
2021-09-26 14:21:23 +02:00
Laurent Destailleur
567334318a
Fix sql eventorganization
2021-09-25 21:13:55 +02:00
Philippe Grand
f7041ef1fc
Update box_members_last_subscriptions.php
2021-09-25 19:03:08 +02:00
Philippe Grand
2edad621b8
Update box_members_last_modified.php
2021-09-25 19:02:28 +02:00
Philippe Grand
694754267c
Update box_members_by_type.php
2021-09-25 19:01:54 +02:00
Philippe Grand
dbe459bc3f
Update box_members_subscriptions_by_year.php
2021-09-25 18:59:39 +02:00
Philippe GRAND
67cc5155b1
fix :Warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\lib\barcode.lib.php on line 62
2021-09-25 18:15:44 +02:00
Philippe GRAND
1feb6e676c
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_by_type.php on line 70
2021-09-25 16:17:24 +02:00
Philippe GRAND
6b3cf5d482
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_subscriptions_by_year.php on line 70
2021-09-25 16:15:31 +02:00
Philippe GRAND
d9110a8114
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_subscriptions.php on line 70
2021-09-25 16:13:35 +02:00
Philippe GRAND
f8609a4619
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_modified.php on line 70
2021-09-25 16:09:34 +02:00
Alexandre SPANGARO
372ba6cf0b
NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3)
2021-09-25 07:49:08 +02:00
Laurent Destailleur
9a3d6679f0
Merge pull request #18778 from Hystepik/develop#1
...
Fix : KM articles in public/ticket/create_ticket.php
2021-09-24 13:35:17 +02:00
lmarcouiller
68c9f4064b
Fix sql in fetchKnowledgeRecord
2021-09-24 10:43:52 +02:00
Laurent Destailleur
4706ebe004
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-09-24 02:34:59 +02:00
Laurent Destailleur
70d255740b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/class/task.class.php
2021-09-24 02:33:48 +02:00
Laurent Destailleur
cd46ccdb66
Code comment
2021-09-24 02:31:15 +02:00
Laurent Destailleur
b09c4166b3
Fix set position of lines in tasks of a project
2021-09-24 02:24:04 +02:00
Laurent Destailleur
4c80e0425b
Fix date for tasks created during project creation
2021-09-24 02:10:42 +02:00
Laurent Destailleur
38b8ed9092
Merge pull request #18792 from cfoellmann/PR/minor-button-fixes
...
another set of cleanup for action buttons
2021-09-24 01:55:25 +02:00
Laurent Destailleur
f98d425064
Merge branch 'develop' into Link-to-MO
2021-09-24 01:54:21 +02:00
Quentin VIAL-GOUTEYRON
72bb1062cc
FIX proforma pdf name
2021-09-23 15:15:35 +02:00
lmarcouiller
ef70cd680c
fix to match sql syntax
2021-09-23 15:00:55 +02:00
Quentin VIAL-GOUTEYRON
9d5f288ca3
FIX Totalttc into total
2021-09-23 14:30:00 +02:00
Laurent Destailleur
9d5f6fbc1b
Code comment
2021-09-23 13:39:48 +02:00
Laurent Destailleur
b08b7d2f68
NEW Can show progression of task into combo list of tasks
2021-09-23 13:20:42 +02:00
Laurent Destailleur
c39c823b66
Debug Date of line of services mandatory
2021-09-23 13:01:04 +02:00
Laurent Destailleur
545b4c56d5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-23 12:14:54 +02:00
Laurent Destailleur
d39ab4c288
Clean code
2021-09-23 12:14:32 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object
...
NEW : field and behavior in product object
2021-09-23 12:14:09 +02:00
Laurent Destailleur
4a43ed2852
Fix scrutinizer
2021-09-23 12:05:55 +02:00
Laurent Destailleur
2538ebec03
Better test
2021-09-23 11:40:29 +02:00
Ilias Patsiaouras
977db0a2ba
add MO to the list of possible object to link
2021-09-23 11:38:50 +02:00
Laurent Destailleur
a48a8231a1
Fix scrutinizer
2021-09-23 11:33:58 +02:00
Laurent Destailleur
d38c3028eb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
2021-09-23 02:41:53 +02:00
Laurent Destailleur
51b6318f88
FIX Test when date of invoie is in future (pb with TZ and offset)
2021-09-23 02:14:01 +02:00
Laurent Destailleur
60c11725ae
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-23 02:11:11 +02:00
Laurent Destailleur
1e0a7e4342
FIX Test when date of invoie is in future (pb with TZ and offset)
2021-09-23 02:10:39 +02:00
stickler-ci
e5cff0ede1
Fixing style errors.
2021-09-22 16:07:36 +00:00
javieralapps4up
e74043d48e
Close : #18801 Jan-30 + 1m IS NOT Mar-2
...
Close : #18801 related to avoid this behaviour https://bugs.php.net/bug.php?id=74013
2021-09-22 17:56:31 +02:00
Laurent Destailleur
87da490b58
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-09-22 15:26:35 +02:00
Laurent Destailleur
6f9fc205ef
Merge pull request #18796 from altairis-noe/warehouse_project_elements
...
FIX: add warehouse in projects' overview count
2021-09-22 15:24:05 +02:00
Noé Cendrier
066013c31f
typo stickler
2021-09-22 15:15:39 +02:00
Laurent Destailleur
2824c8b8ab
FIX support of localtax on expense report
2021-09-22 15:11:18 +02:00
Laurent Destailleur
6c7c6c9efd
FIX legal issue on expense report pdf (must also show price without tax)
2021-09-22 12:47:06 +02:00
Christian Foellmann
08b395e127
another set of cleanup for action buttons
2021-09-22 08:43:30 +02:00
stickler-ci
49fd1b761c
Fixing style errors.
2021-09-21 20:27:33 +00:00
fr69400
73b0d8079c
Update html.formfile.class.php
2021-09-21 22:23:14 +02:00
Laurent Destailleur
c433d6ef4f
Merge pull request #18785 from hregis/fix_warning_php8
...
FIX check if method exists instead in class
2021-09-21 19:20:14 +02:00
Laurent Destailleur
7420234494
Merge pull request #18769 from ywarnier/turnover
...
Add turnover homepage box
2021-09-21 19:13:56 +02:00
Laurent Destailleur
b7fadd0307
Merge pull request #18773 from aspangaro/15a18
...
Missing language key
2021-09-21 19:08:32 +02:00
stickler-ci
12be914d04
Fixing style errors.
2021-09-21 16:49:00 +00:00
fr69400
c4dd6be9f8
Add showdocument hook
2021-09-21 18:47:34 +02:00
stickler-ci
d6632757f9
Fixing style errors.
2021-09-21 16:06:03 +00:00
Regis Houssin
e227bdb22b
FIX check if method exists instead
2021-09-21 17:58:00 +02:00
Noé Cendrier
c89468428e
add warehouse in projects elements count
2021-09-21 17:22:55 +02:00
Regis Houssin
48ce3ea4d3
FIX check if $categories is not empty
2021-09-21 16:31:07 +02:00
ksar
f2b39b3eeb
FIX #18767 : Adherent delete
...
Adherent Delete was not working due to the fact that
$features = 'adherent';
$feature2 = 'cotisation';
And $user->rights->$feature->$subfeature->supprimer does not exist
Also I used the double declaration of salaries.
2021-09-21 11:27:41 +02:00
lmarcouiller
a7ff9d4889
Fix : KM articles in public/ticket/create_ticket.php
2021-09-21 11:26:49 +02:00
Alexandre SPANGARO
76f7efc193
Missing language key
2021-09-21 03:08:43 +02:00
Yannick Warnier
35e70e7936
Fix method visibility
2021-09-20 23:58:38 +02:00
Yannick Warnier
348c1c4caa
Fix empty assignation line
2021-09-20 23:57:49 +02:00
stickler-ci
d919ef9c4c
Fixing style errors.
2021-09-20 17:57:10 +00:00
Yannick Warnier
c40b22facd
Add turnover homepage box
2021-09-20 19:41:13 +02:00
Laurent Destailleur
deb1965cd5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/compta/paiement/list.php
htdocs/core/class/commonobject.class.php
htdocs/mrp/mo_list.php
htdocs/projet/tasks/task.php
htdocs/public/payment/newpayment.php
2021-09-20 17:15:12 +02:00
Laurent Destailleur
c75fbb7642
FIX fetch of product with modulebuilder load too much data
2021-09-20 16:00:11 +02:00
Laurent Destailleur
0eff2fa15b
FIX default language defined for IN country
2021-09-20 13:20:54 +02:00
Laurent Destailleur
360e3290b5
typo
2021-09-20 04:20:20 +02:00
Laurent Destailleur
14c8bdce1a
Better desciption of option
2021-09-19 19:25:38 +02:00
Laurent Destailleur
a747c71cf5
css
2021-09-19 19:19:28 +02:00
Laurent Destailleur
1d597e8a72
Fix add unset* action as sensible GET actions
2021-09-19 18:03:38 +02:00
Laurent Destailleur
96436cac3d
FIX unprivileged user can attach agenda with leave.
2021-09-19 00:50:23 +02:00
Laurent Destailleur
d760686239
Fix case of newtoken()
2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a
Fix add action delete* as sensitive action
2021-09-18 22:04:41 +02:00
Laurent Destailleur
62b721a904
Add deletecontact as sentitive action
...
Replace dol_buildpath with DOL_URL_ROOT
2021-09-18 19:34:46 +02:00
Laurent Destailleur
30fb0d65bd
Merge pull request #18745 from Hystepik/develop#1
...
Fix actions_addupdatedelete.inc.php on lang
2021-09-18 16:09:04 +02:00
Laurent Destailleur
061cbc4266
Merge pull request #18750 from maksimstojkovic/develop
...
Fix Warehouse PDF Generation Error
2021-09-18 16:08:16 +02:00
Laurent Destailleur
39d55b11b4
Merge pull request #18753 from maksimstojkovic/fix-movement-typo
...
Fix typo in pdf_standard.modules.php
2021-09-18 16:07:41 +02:00
Laurent Destailleur
052511d081
Fix sql error
2021-09-18 15:05:31 +02:00
Laurent Destailleur
5fa62f25fa
Fix registration of attendee
2021-09-18 12:39:26 +02:00
Laurent Destailleur
b1c6a6e8d1
Fix show/hide combo when next combo has no item inside.
2021-09-17 19:38:55 +02:00
Laurent Destailleur
68a391b395
Fix not empty second level combo if first one not yet defined
2021-09-17 19:19:41 +02:00
Laurent Destailleur
7ed9e21266
Fix sql error
2021-09-17 19:16:46 +02:00
Maksim Stojkovic
d69ef7c134
Fix typo in pdf_standard.modules.php
2021-09-18 03:12:13 +10:00
Laurent Destailleur
91cd991828
Simplify the selectgroupTicket.
2021-09-17 16:52:42 +02:00
Maksim Stojkovic
44ff73f5de
Remove unused $nblines assignment
...
Fixes the following warning received when attempting to generate a warehouse stock document using the default template:
`count(): Parameter must be an array or an object that implements Countable in /var/www/html/core/modules/stock/doc/pdf_standard.modules.php on line 211`.
$nblines is subsequently assigned on line 326, after which it is then used.
2021-09-17 23:50:00 +10:00
Gauthier PC portable 024
e6c9627195
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-09-17 15:47:23 +02:00
Lucas Marcouiller
e7a32834b7
Fix actions_addupdatedelete.inc.php on lang
2021-09-17 12:55:09 +02:00
Laurent Destailleur
0ae8403fb4
Merge pull request #18690 from lainwir3d/add_rest_api_key_modify_right
...
CLOSE #18689 REST API module: add api key generate / modify right.
2021-09-17 12:10:03 +02:00
Laurent Destailleur
fdcd523c55
Merge branch 'develop' into develop#1
2021-09-17 11:59:20 +02:00
Lucas Marcouiller
20e8dd4c54
Fix error on html.for.class on ismultientitymanaged test
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-09-17 11:30:45 +02:00
Lucas Marcouiller
0191e3b6ea
Fix error on html.for.class on ismultientitymanaged test
2021-09-17 11:23:16 +02:00
stickler-ci
46e8f1bebf
Fixing style errors.
2021-09-17 10:59:42 +02:00
antonin_tdj
5f19291285
Avoir Error 19 Constraint Violation (in case of password unchanged)
2021-09-17 10:59:35 +02:00
antonin_tdj
8f3ff32c82
fix ldap passw bug with activedirectory
...
Fix to avoid LDAP Error: 53 (Unwilling to perform) on Samba4 AD
2021-09-17 10:59:09 +02:00
Laurent Destailleur
20b50993bb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-09-17 10:57:15 +02:00
Laurent Destailleur
6a73fc6e44
Merge pull request #18724 from ibuiv/patch-1
...
Fix ldap passw bug with activedirectory
2021-09-17 10:54:05 +02:00
Laurent Destailleur
1a705adf6e
Merge pull request #18726 from cfoellmann/PR/button-classes
...
add missing css classes to buttons
2021-09-17 10:52:13 +02:00
Laurent Destailleur
775544d47d
Merge pull request #18727 from Hystepik/develop#4
...
Close #18677 : new show articles of KM
2021-09-17 10:51:38 +02:00
Laurent Destailleur
3a8a813c4e
Merge pull request #18730 from esion-net/patch-2
...
NEW Expose bank account holder, label and number
2021-09-17 10:50:11 +02:00
Laurent Destailleur
bed697c98d
Merge pull request #18732 from esion-net/patch-2
...
NEW Expose bank account holder, label and number
2021-09-17 10:49:51 +02:00
Laurent Destailleur
7cbb7d7f44
Merge pull request #18733 from esion-net/patch-3
...
NEW Expose bank account holder, label and number
2021-09-17 10:48:52 +02:00
Laurent Destailleur
02bed7ce01
Fix sanitize
2021-09-17 10:45:59 +02:00
Florian HENRY
47efccad75
remove debug
2021-09-16 17:13:34 +02:00
Florian HENRY
820a007731
NEW: add MRP into Object Linked Box
2021-09-16 17:10:06 +02:00
Florian
b9e637a2b2
Expose bank account holder, label and number
...
NEW Expose bank account holder, label and number
2021-09-16 15:52:19 +02:00
Florian
3091448d1a
Expose bank account holder, label and number
...
Useful for automated texts on invoices to have those values available as well.
2021-09-16 15:40:25 +02:00
Laurent Destailleur
49ef24edcb
Fix trans
2021-09-16 15:16:18 +02:00
Laurent Destailleur
b70764af88
Fix translation of ticket categories
2021-09-16 15:08:04 +02:00
Laurent Destailleur
e9a3cca609
Fix lang file
2021-09-16 14:50:38 +02:00
Laurent Destailleur
1177e86f2e
Fix language of group of tickets
2021-09-16 14:46:14 +02:00
Laurent Destailleur
d9751704c8
Fix ambiguous field
2021-09-16 14:37:38 +02:00
Laurent Destailleur
086754e149
Fix translation of category codes
2021-09-16 14:31:20 +02:00
Laurent Destailleur
8909702619
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/bom/class/bom.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/eventorganization.lang
htdocs/product/class/productfournisseurprice.class.php
2021-09-16 13:40:05 +02:00
lmarcouiller
04a024570c
update fetchKnowledge and html.formticket
2021-09-16 13:19:43 +02:00
Laurent Destailleur
9918873719
Better log
2021-09-16 13:07:02 +02:00
Christian Foellmann
fd1d4d9073
add missing css classes to buttons
2021-09-16 11:33:42 +02:00
stickler-ci
9d3b680259
Fixing style errors.
2021-09-16 07:31:23 +00:00
antonin_tdj
8c1b3efc47
Avoir Error 19 Constraint Violation (in case of password unchanged)
2021-09-16 09:31:00 +02:00
Laurent Destailleur
aab8d4a628
css
2021-09-16 02:24:25 +02:00
Laurent Destailleur
b1cb32c743
Fix some sql
2021-09-15 20:03:38 +02:00
antonin_tdj
2c73c19bd5
fix ldap passw bug with activedirectory
...
Fix to avoid LDAP Error: 53 (Unwilling to perform) on Samba4 AD
2021-09-15 18:26:32 +02:00
lmarcouiller
b26e9be36f
Close #18677 : new show articles of KM
2021-09-15 15:36:57 +02:00
Laurent Destailleur
6dbf316e66
Fix links
2021-09-14 17:56:06 +02:00
Laurent Destailleur
21462d0b82
Fix can reset filter in setup
2021-09-14 17:24:53 +02:00
lmarcouiller
4762fd9c2e
Close #18678 : Implemention of tags/categories KM
2021-09-13 11:22:55 +02:00
Laurent Destailleur
ce9a10bd90
Fix description of some options
2021-09-13 03:43:25 +02:00
Laurent Destailleur
bbacb4e740
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-13 02:45:00 +02:00
stickler-ci
e424df6447
Fixing style errors.
2021-09-12 12:15:33 +00:00
lainwir3d
2fe85f2a86
CLOSE #18689 REST API module: add api key generate / modify right.
2021-09-12 15:47:56 +04:00
Laurent Destailleur
ce33f39bb0
Clean code. Menu must be greyed in get_menudiv
2021-09-11 15:43:26 +02:00
Laurent Destailleur
c005a20cc0
Fix ldap with ssl
2021-09-11 03:27:59 +02:00
Laurent Destailleur
f8b1e4d482
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-10 20:56:15 +02:00
Laurent Destailleur
edb1f31a19
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/accountancy/supplier/index.php
2021-09-10 20:55:52 +02:00
Laurent Destailleur
9dcf3e49d0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
2021-09-10 20:50:34 +02:00
Laurent Destailleur
2f4463c983
FIX Collapsing of extrafields has disappeared.
2021-09-10 20:49:22 +02:00
Laurent Destailleur
5d512243b8
Merge pull request #18683 from FHenry/14_fix_search_evt_tab
...
fix: on Event tabs, if no evt type use in filter, filter on label and state not apply
2021-09-10 19:57:12 +02:00
Laurent Destailleur
4bbda0115c
Merge pull request #18682 from vincentjdc/product-price-in-product-select
...
Add product-id and price-id in dataset of product select
2021-09-10 19:51:24 +02:00
Laurent Destailleur
3980e4a32b
Merge pull request #18681 from FHenry/14_fix_extrafield_separator_type
...
fix: show display/hide icon on extrafield type separator
2021-09-10 19:49:26 +02:00
Laurent Destailleur
d50c518b70
Merge pull request #18676 from FHenry/14_fix_ajax_company_ambious_column
...
fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken
2021-09-10 19:49:12 +02:00
Laurent Destailleur
ae5b5defd5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-10 17:17:07 +02:00
Laurent Destailleur
a1e51e212e
Array of fields accept 'tdcss' property
2021-09-10 17:16:42 +02:00
Florian HENRY
257686c2fe
fix: on Event tabs, if no evt type use in filter, filter on label and state not apply
2021-09-10 15:45:03 +02:00
Vincent Dieltiens
b3984798ba
Add product-id and price-id in dataset of product select
2021-09-10 15:32:16 +02:00
Florian HENRY
f3a555ec69
fix: show display/hide icon on extrafield type separator
2021-09-10 15:17:09 +02:00
Christian Foellmann
29820f446d
fix import of product desc without wrong linebreaks
2021-09-10 13:37:42 +02:00
Laurent Destailleur
6f3170494f
Merge pull request #18673 from cfoellmann/PR/input-desc
...
fix import of product desc without wrong linebreaks
2021-09-10 13:36:45 +02:00
Florian HENRY
ef888d5fca
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_ajax_company_ambious_column
2021-09-10 13:26:05 +02:00
Florian HENRY
c66181a00e
fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken
2021-09-10 13:25:40 +02:00
Laurent Destailleur
11b6259130
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/langs/en_US/admin.lang
2021-09-10 11:40:45 +02:00
Christian Foellmann
e5192de9f2
fix import of product desc without wrong linebreaks
2021-09-10 11:36:08 +02:00
Laurent Destailleur
6a296bf6c2
Debug setup
2021-09-10 10:18:46 +02:00
Laurent Destailleur
d382e8d8c9
Clean setup and translation
2021-09-10 09:21:37 +02:00
Laurent Destailleur
875b93aff2
Merge branch 'develop' into 15a8
2021-09-09 19:26:01 +02:00
Laurent Destailleur
ffd7f60830
FIX #18589 #18617
2021-09-09 19:21:32 +02:00
Laurent Destailleur
fa28621709
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/reception/list.php
2021-09-09 16:11:29 +02:00
Laurent Destailleur
4d5621ea6f
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-09-09 14:59:12 +02:00
Laurent Destailleur
f1758b6f0c
Merge pull request #18623 from atm-gauthier/14.0_fix_salary_extrafields
...
14.0 fix salary extrafields are no more available
2021-09-09 14:58:54 +02:00
fr69400
ad0c4c518f
Update row.php
...
right write doesn't exist for supplier_proposal
->line order dont works
2021-09-09 14:42:43 +02:00
Laurent Destailleur
402757bdfe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-09 14:41:51 +02:00
Laurent Destailleur
3581c37b83
Merge pull request #18626 from fr69400/develop
...
FIX : line reorder dont work on supplier_proposal
2021-09-09 14:41:30 +02:00
Laurent Destailleur
cbe08183ac
Merge pull request #18648 from atm-gauthier/NEW_mass_delete_objects
...
NEW : mass action delete, no more break if at least one object has child
2021-09-09 14:38:49 +02:00
Laurent Destailleur
d9cdddd688
Update actions_massactions.inc.php
2021-09-09 14:35:19 +02:00
Laurent Destailleur
7eba2f6f39
Code comment
2021-09-09 14:32:59 +02:00
stickler-ci
1e8870eb95
Fixing style errors.
2021-09-09 09:30:29 +00:00
Gauthier PC portable 024
4e78a24a13
FIX : if delete return < 0, we break and rollback, if == 0, we set event message warning and we test other objects of list
2021-09-09 11:25:46 +02:00
stickler-ci
dd7f6b6a5c
Fixing style errors.
2021-09-09 08:17:52 +00:00
jpb
91e624fd5d
change test
2021-09-09 10:14:39 +02:00
Laurent Destailleur
9fe9d0e9bf
Merge pull request #18630 from hregis/fix_wrong_table_element_line
...
FIX wrong table_element_line
2021-09-09 04:59:27 +02:00
Laurent Destailleur
ac8dfb2dd5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-09-09 04:41:55 +02:00
Laurent Destailleur
d42492c67b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/dolreceiptprinter.class.php
2021-09-09 04:41:39 +02:00
Laurent Destailleur
6d7cb01951
Merge pull request #18645 from atm-adrien/FIX_add_token
...
FIX : Add token to remove error when removing widget
2021-09-09 04:31:03 +02:00
Laurent Destailleur
e4a7903700
Merge pull request #18657 from moreauftheobald/14.0_fiix_knowledgemanagement_menu
...
Fix: Enable Knowledge Management Menu
2021-09-09 03:23:26 +02:00
Laurent Destailleur
61d5152209
Update eldy.lib.php
2021-09-09 03:23:04 +02:00
Laurent Destailleur
348fe00ffb
Merge pull request #18653 from Hystepik/develop_v14#2
...
Fix permission for salaries module
2021-09-09 03:02:34 +02:00
Laurent Destailleur
ad9bf27bea
Clean code
2021-09-09 02:26:49 +02:00
Laurent Destailleur
034c5651c8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/eventorganization/class/conferenceorbooth.class.php
htdocs/langs/en_US/eventorganization.lang
htdocs/public/eventorganization/attendee_subscription.php
2021-09-08 22:13:35 +02:00
Laurent Destailleur
e0fa4e4b5c
Fix phpcs
2021-09-08 21:19:01 +02:00
MOREAU FRANCK
04026dd0b0
fix Stickler CI review
2021-09-08 19:51:34 +02:00
Laurent Destailleur
57a2ea3a53
Fix sql error
2021-09-08 19:49:24 +02:00
Laurent Destailleur
405beb77f5
Fix sql error
2021-09-08 19:45:55 +02:00
MOREAU FRANCK
e9505c1109
Update V14
2021-09-08 18:23:44 +02:00
lmarcouiller
a5e670291e
Fix permission for salaries module
2021-09-08 15:36:51 +02:00
Laurent Destailleur
0b68da4e9e
Debug organizedeventregistration module
2021-09-08 02:27:52 +02:00
Laurent Destailleur
b92784c04b
Fix autoselect of thirdparty
2021-09-07 23:38:33 +02:00
Laurent Destailleur
3cc888f4df
Debug event module
2021-09-07 23:19:36 +02:00
Laurent Destailleur
3df005778c
Debug event module
2021-09-07 19:48:32 +02:00
Laurent Destailleur
32a09e9494
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/salaries/paiement_salary.php
2021-09-07 17:47:00 +02:00
Laurent Destailleur
4e0ae972f1
Fix css
2021-09-07 17:26:31 +02:00
Gauthier PC portable 024
938092d67c
NEW : when we delete several objects with massaction, if somes object has child we must see which objects are concerned and nevertheless delete objects which can be deleted
2021-09-07 16:46:48 +02:00
ksar
e26e6288c2
FIX #18591 : Remove double quotes of SQL Queries
...
FIX #18591 : Remove double quotes of SQL Queries for postgresql compatibility
2021-09-07 15:22:02 +02:00
Adrien Raze
5f58eefc79
Merge branch '14.0' of https://github.com/Dolibarr/dolibarr into FIX_add_token
2021-09-07 14:48:23 +02:00
Adrien Raze
948d2bc4e9
FIX : Add token when remove the last widget on home page
2021-09-07 14:43:37 +02:00
Laurent Destailleur
586e5c8b5b
Can set sort order in the ->fields description array for foreign key
2021-09-07 14:10:26 +02:00
Laurent Destailleur
51a751f088
Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT
2021-09-06 19:00:01 +02:00
Regis Houssin
7d8023fea7
FIX wrong table_element_line
2021-09-06 16:21:30 +02:00
Gauthier PC portable 024
d121544810
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-09-06 16:08:39 +02:00
fr69400
5c9100986d
Update row.php
...
right write doesn't exist for supplier_proposal
->line order dont works
2021-09-06 15:19:35 +02:00
stickler-ci
1043bc964d
Fixing style errors.
2021-09-06 12:58:06 +00:00
Gauthier PC portable 024
be1c08ddfe
FIX : salary extrafields don't work and table is not well named
2021-09-06 12:30:39 +02:00
jpb
06b9f90383
merge conflict
2021-09-06 09:52:28 +02:00
jpb
65a2486f94
merge conflict
2021-09-06 09:43:52 +02:00
Laurent Destailleur
2d6b9a2a0a
CSS
2021-09-06 03:26:27 +02:00
Laurent Destailleur
8e90a374e0
Responsive
2021-09-06 01:47:18 +02:00
Laurent Destailleur
f288f36b71
NEW Can use textarea field into confirm popup.
...
Reponsive
2021-09-06 01:42:54 +02:00
Laurent Destailleur
ed3919da13
Look and feel
2021-09-05 02:25:32 +02:00
Laurent Destailleur
2928c3dc9b
NEW Add a PDF document template for Manufacturing Orders
2021-09-05 02:18:53 +02:00
Laurent Destailleur
d0bbd33bb2
Merge pull request #18602 from mschamp/develop
...
Manufacturing order pdf template
2021-09-05 02:03:09 +02:00
Laurent Destailleur
138af805b3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-04 14:11:38 +02:00
Laurent Destailleur
4e7549ab7d
css
2021-09-04 13:53:31 +02:00
stickler-ci
35f3742d08
Fixing style errors.
2021-09-04 11:05:50 +00:00
mschamp
db6a2844ad
Add files via upload
2021-09-04 12:36:54 +02:00
Laurent Destailleur
ee066ad725
Cast sql var
2021-09-03 21:25:43 +02:00
Laurent Destailleur
a7d9889c40
Merge pull request #18592 from fr69400/develop
...
FIX : delete image from card.php page dont remove the thumbs
2021-09-03 15:12:04 +02:00
fr69400
a89a6b6343
bug image delete
...
Remove linked image from card.php (section builddoc) dont remove the thumbs of image file
2021-09-03 14:18:44 +02:00
Laurent Destailleur
e965d6d6f2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/pdf.php
htdocs/api/class/api_access.class.php
2021-09-03 11:02:21 +02:00
Laurent Destailleur
dc81f1de68
Fix var_dump
2021-09-03 11:00:14 +02:00
Laurent Destailleur
35e5480f2f
Fix var init
2021-09-03 10:58:43 +02:00
Laurent Destailleur
77e9f15360
Work on #18448
2021-09-02 22:52:17 +02:00
Laurent Destailleur
dd6647e6cb
Fix label import fields
2021-09-02 21:03:49 +02:00
Laurent Destailleur
8ea1a9602b
NEW Add import / export of MO and BOMLines - Close #18499
2021-09-02 21:00:31 +02:00
Laurent Destailleur
67db0f1bdb
Add link "Now" on date selection when cloning social contribution
2021-09-02 19:15:21 +02:00
Laurent Destailleur
51b1cd583b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-09-02 18:48:20 +02:00
Laurent Destailleur
7017a98071
Merge pull request #18446 from henrynopo/patch-6
...
Added function - using list of location_incoterms
2021-09-02 18:47:15 +02:00
Laurent Destailleur
147583d58b
Remove useless parameters
2021-09-02 17:25:11 +02:00
Laurent Destailleur
fd2bfc82f2
Fix #18581 Fix #18582
2021-09-02 17:20:14 +02:00
Laurent Destailleur
b04ea59a51
More sql sanitizing
2021-09-02 13:58:42 +02:00
Laurent Destailleur
cac1a7ba5f
Fix sql request when using encrypt
2021-09-02 13:45:44 +02:00
Laurent Destailleur
e22bd5c048
Fix better format address for jp in romaji
2021-09-02 10:39:56 +02:00
Laurent Destailleur
8600d8d00d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-01 22:50:06 +02:00
Laurent Destailleur
076bfd82a3
FIX option "Default value for field 'Refuse bulk emailings'"
2021-09-01 22:38:47 +02:00
Laurent Destailleur
c762840dec
FIX option "Default value for field 'Refuse bulk emailings'"
2021-09-01 22:37:15 +02:00
Laurent Destailleur
7c7e89cc3b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
2021-09-01 18:41:44 +02:00
Laurent Destailleur
4810db3dbf
Merge pull request #18498 from GurvanKervern/undefVars2
...
Undef vars2
2021-09-01 18:36:26 +02:00
Laurent Destailleur
c4acfe5fc0
Merge pull request #18577 from Givriz/dev_2
...
Compatibility phpv8
2021-09-01 18:06:06 +02:00
Laurent Destailleur
82d878dd7a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
2021-09-01 17:59:07 +02:00
Laurent Destailleur
79a25248cd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2021-09-01 17:55:32 +02:00
Laurent Destailleur
74f3b98ea9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2021-09-01 17:54:21 +02:00
Laurent Destailleur
38c0e93285
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/public/project/index.php
2021-09-01 17:52:04 +02:00
stickler-ci
1457afb9b9
Fixing style errors.
2021-09-01 15:35:23 +00:00
Laurent Destailleur
60e4e23870
Update object_discounts.tpl.php
2021-09-01 17:33:18 +02:00
Laurent Destailleur
65c92f176c
Merge pull request #18553 from Hystepik/develop#1
...
Fix : KnowledgeManagement menu permission
2021-09-01 16:43:01 +02:00
Givriz
688d217bed
Compatibility phpv8
2021-09-01 16:39:28 +02:00
Laurent Destailleur
ef2bb99476
Update commonobject.class.php
2021-09-01 16:29:08 +02:00
Laurent Destailleur
b66bd781a4
Clean code
2021-09-01 16:26:59 +02:00
Laurent Destailleur
1027f1059e
Merge pull request #18574 from FHenry/14_eventorg
...
fix: disabled module Event Org when project disabled
2021-09-01 16:17:55 +02:00
Laurent Destailleur
14ca7db5d7
Typo in log
2021-09-01 16:17:31 +02:00
Vincent Dieltiens
59e917cd5f
regroup BILL_SUPPLIER_VALIDATE actions
...
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2021-09-01 16:14:44 +02:00
Vincent Dieltiens
65ccbb6249
Regroup BILL_SUPPLIER_VALIDATE triggers under the same condition
2021-09-01 16:06:36 +02:00
Laurent Destailleur
46a38506a5
Merge pull request #18562 from vincentjdc/bill-supplier-validate
...
Bill supplier validate
2021-09-01 16:04:50 +02:00
Florian HENRY
bb6dda087c
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_eventorg
2021-09-01 15:23:04 +02:00
Florian HENRY
bae73b9a52
disabled module on inactive
2021-09-01 15:16:11 +02:00
Laurent Destailleur
375557e092
FIX Menu List of project was not visible.
2021-09-01 15:10:02 +02:00
Alexandre SPANGARO
dbe6861f79
Merge remote-tracking branch 'upstream/develop' into 15a8
2021-09-01 14:09:02 +02:00
Laurent Destailleur
9da82af74f
Merge pull request #18566 from Dolibarr/scrutinizer-patch-2
...
Scrutinizer Auto-Fixes
2021-09-01 13:36:20 +02:00
Laurent Destailleur
19f0db23df
Fix scrutinizer bugs
2021-08-31 20:31:05 +02:00
Scrutinizer Auto-Fixer
312ca95feb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-08-31 18:18:28 +00:00
Laurent Destailleur
d2d7b0defd
Fix duplicate ;
2021-08-31 20:15:41 +02:00
Maxime Kohlhaas
d09d036f06
Fix supplier invoice pdf generation canelle
...
Thirdparty wrongly fetched was causing errors on mass generation
2021-08-31 16:10:55 +02:00
Laurent Destailleur
c7444865a1
Fix css
2021-08-31 13:16:37 +02:00
Laurent Destailleur
0aa4868c34
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-31 13:14:01 +02:00
Vincent Dieltiens
a3f4ba11aa
regroup BILL_SUPPLIER_VALIDATE actions
2021-08-31 12:47:32 +02:00
Vincent Dieltiens
19587fb88b
Regroup BILL_SUPPLIER_VALIDATE triggers under the same condition
2021-08-31 12:45:03 +02:00
Laurent Destailleur
cceba665a2
NEW Option "Add a link on the PDF to make the online payment"
2021-08-31 12:29:14 +02:00
Laurent Destailleur
b29fc5552d
Fix id in link
2021-08-30 22:10:26 +02:00
Laurent Destailleur
60832c6e87
css
2021-08-30 21:48:46 +02:00
Laurent Destailleur
8639956b79
Fix position of information on lines of documents
2021-08-30 21:22:00 +02:00
Laurent Destailleur
b78771f8c4
Fix select empty value for thirdparties select combo
2021-08-30 18:56:52 +02:00
Adrien Raze
709a297563
NEW : Allow drag and drop on kits
2021-08-30 14:45:42 +02:00
lmarcouiller
31abb98a91
Fix : KnowledgeManagement menu permission
2021-08-30 14:38:36 +02:00
Laurent Destailleur
fbdee1316a
Code comment
2021-08-29 19:36:11 +02:00
Gurvan Kervern
66d1e5c74d
Update eldy.lib.php
2021-08-29 18:15:09 +08:00
Laurent Destailleur
3336b5c405
Fixed implementation for #18373
2021-08-28 21:19:04 +02:00
Laurent Destailleur
c188ef0438
Fixed implementation for #18373
2021-08-28 21:09:52 +02:00
Laurent Destailleur
20e681d025
Revert "[NEW] PDF Document ref in title option"
2021-08-28 20:59:12 +02:00
Laurent Destailleur
f2f3c5daf5
Merge pull request #18373 from bb2a/PDF_Ref_In_Title
...
[NEW] PDF Document ref in title option
2021-08-28 20:41:55 +02:00
Laurent Destailleur
e2eaa9b46e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-28 18:54:48 +02:00
Gurvan Kervern
5fd0e6ac28
Update eldy.lib.php
2021-08-29 00:50:00 +08:00
Laurent Destailleur
de44dcb691
Fix var init
2021-08-28 18:48:24 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons
...
replace remaining SubmitCancel buttons
2021-08-28 18:39:06 +02:00
Laurent Destailleur
8b996627eb
Merge pull request #18462 from grandoc/new_branch_22_08_2021
...
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\ht…
2021-08-28 18:35:40 +02:00
Laurent Destailleur
c1d3ddf10b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-28 18:31:06 +02:00
Laurent Destailleur
881d176996
css
2021-08-28 17:30:53 +02:00
Laurent Destailleur
bb94ea7334
Fix debug car reception: Fill/reset link, colspan, translation
2021-08-28 17:24:05 +02:00
Laurent Destailleur
0e38e1e2c4
NEW Add hook hookGetEntity.
...
Change name and param of hook
2021-08-28 14:51:49 +02:00
Laurent Destailleur
9bed2557f5
Merge pull request #18514 from cfoellmann/PR/hook-functionGetEntity
...
add hook 'functionGetEntity'
2021-08-28 14:46:32 +02:00
stickler-ci
3598e0a246
Fixing style errors.
2021-08-28 07:32:07 +00:00
henrynopo
4ae29c53aa
Update pdf_espadon.modules.php
2021-08-28 15:30:05 +08:00
Laurent Destailleur
c02fb6b9a8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-28 03:15:47 +02:00
Laurent Destailleur
acf0386a9b
Fix css
2021-08-28 03:14:48 +02:00
Laurent Destailleur
29abbbe2fb
Clean code
2021-08-28 01:45:53 +02:00
Laurent Destailleur
51a4d7630f
Clean code
2021-08-28 00:56:37 +02:00
Laurent Destailleur
11096a5453
Add hook checkSecureAccess.
...
It replaces mymodule_SUBPERMCATEGORY_FOR_DOCUMENTS and
mymodule_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS
2021-08-28 00:54:57 +02:00
Laurent Destailleur
2dd91bf312
Clean code
2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6
Clean code
2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6
Clean code by adding cast int.
2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5
Clean code by adding cast int.
2021-08-27 16:33:03 +02:00
Christian Foellmann
ac7f0f8a4e
add hook 'functionGetEntity' to manipulate entities for queries on the fly
2021-08-26 15:04:59 +02:00
Laurent Destailleur
931f712c5f
Fix import gender man/woman, not 0/1 + import of thirdparty for members
2021-08-26 11:55:22 +02:00
Laurent Destailleur
ac2fc9c57f
Fix import gender man/woman, not 0/1 + import of thirdparty for members
2021-08-26 11:53:57 +02:00
Laurent Destailleur
65629711d0
FIX #18484
2021-08-25 14:53:14 +02:00
stickler-ci
9512861913
Fixing style errors.
2021-08-25 11:43:32 +00:00
henrynopo
236554948c
Add files via upload
2021-08-25 19:40:58 +08:00
GurvanKervern
7161b1ba59
Fix undef vars 6
...
To remove PHP8 warnings
2021-08-25 18:45:40 +08:00
GurvanKervern
8c99291638
Fix undef vars 5
...
To remove PHP8 warnings
2021-08-25 18:28:32 +08:00
Laurent Destailleur
e4cbc2140e
Fix doc and token renewal with NOSESSION
2021-08-24 21:48:38 +02:00
Christian Foellmann
f094b4c70c
fix up most of the remaining submit inputs
2021-08-24 17:04:17 +02:00
Laurent Destailleur
07ab352877
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2021-08-24 16:37:18 +02:00
Laurent Destailleur
e0fd8b5eb8
Simplify code
2021-08-24 15:28:59 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function
...
improve forms - buttonsSaveCreate()
2021-08-24 15:26:03 +02:00
Laurent Destailleur
15da97f1da
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/compta/facture/card.php
htdocs/product/price.php
2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/product/price.php
2021-08-24 15:00:35 +02:00
Laurent Destailleur
f93e899c0f
Merge pull request #18472 from FHenry/dev_php8
...
fix: php 8 warning
2021-08-24 14:18:29 +02:00
Laurent Destailleur
366fa13fc0
NEW Add property "copytoclipboard" in modulebuilder
2021-08-24 13:19:53 +02:00
Laurent Destailleur
a6ddc90d5b
Fix responsive
2021-08-23 23:53:58 +02:00
Laurent Destailleur
dc006b0ebb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9
Cast numeric into on sql request
2021-08-23 19:33:24 +02:00
Laurent Destailleur
23829ae637
Cast numeric into on sql request
2021-08-23 18:56:46 +02:00
Florian HENRY
4dc542acad
fix: php 8 warning
2021-08-23 18:29:04 +02:00
Laurent Destailleur
d4b5ee6c85
Fix cast into variable into sql request.
2021-08-23 17:41:11 +02:00
Laurent Destailleur
4460206709
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-23 16:04:16 +02:00
Laurent Destailleur
d46dfd017a
FIX #yogosha6944 Protection against traversal path.
2021-08-23 16:00:03 +02:00
Laurent Destailleur
a25346e302
FIX Date of payment of subscription must not be set to 1970-01-01.
...
Fix look and feel v14
2021-08-23 15:00:29 +02:00
Laurent Destailleur
983d7e5177
FIX Add option $noescapecommand in executeCLI for better compatibility
2021-08-23 12:26:16 +02:00
Laurent Destailleur
041784876d
Fix option $nolog
2021-08-23 12:25:59 +02:00
Laurent Destailleur
227f01b000
Fix can add a redirection into the executeCLI method.
2021-08-23 12:25:48 +02:00
Laurent Destailleur
fdffc0c13a
NEW Add param $nolog to avoid logging into dol_delete_recursive_dir()
2021-08-23 12:25:29 +02:00
Laurent Destailleur
b0817e132f
FIX Add option $noescapecommand in executeCLI for better compatibility
2021-08-23 12:19:16 +02:00
Laurent Destailleur
8c017b9406
Sanitize $ and ; for filesystem path (like files).
2021-08-23 12:18:04 +02:00
Laurent Destailleur
cced15e50a
Fix option $nolog
2021-08-23 11:58:14 +02:00
Laurent Destailleur
eec5fba333
Fix can add a redirection into the executeCLI method.
2021-08-23 11:51:08 +02:00
Laurent Destailleur
34c1991730
NEW Add param $nolog to avoid logging into dol_delete_recursive_dir()
2021-08-23 11:32:25 +02:00
Philippe GRAND
7c2d19ffaf
FIX : indentation
2021-08-23 10:20:22 +02:00
Philippe GRAND
f88fdbe71d
FIX : for php8 compliance
2021-08-23 10:12:28 +02:00
Philippe GRAND
7baf98dbfa
fix : Undefined property: Conf:: in C:\wamp64\www\dolibarr-140\htdocs\core\class\html.form.class.php on line 7957
2021-08-22 23:15:36 +02:00
Philippe GRAND
538b2e2a5f
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\core\class\commonobject.class.php on line 1705
2021-08-22 19:47:06 +02:00
Philippe GRAND
2e3b9fce49
fix : Undefined array key 4 in C:\wamp64\www\dolibarr-140\htdocs\core\class\extrafields.class.php on line 1721
2021-08-22 12:18:26 +02:00
Philippe GRAND
6619099be9
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\core\actions_builddoc.inc.php on line 69
2021-08-22 12:05:30 +02:00
Alexandre SPANGARO
a1d3e21e77
NEW IHM - Include new options to manage dashboard
2021-08-22 05:25:13 +02:00
Laurent Destailleur
ff3f85b214
Fix case sensitive
2021-08-22 01:44:52 +02:00
Laurent Destailleur
58fa0740c3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/errors.lang
2021-08-22 01:41:18 +02:00
Christian Foellmann
3f895f7dc5
correct codestyle
2021-08-21 19:57:52 +02:00
Christian Foellmann
7ca490088a
fix codestyle issues
2021-08-21 19:51:31 +02:00
Florian HENRY
1cc04c54ca
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project
2021-08-21 15:29:32 +02:00
Laurent Destailleur
04a922b5f4
Implement the noescapetags into dol_escape_htmltag
2021-08-21 13:27:33 +02:00
Laurent Destailleur
68d24661db
Try to fix the ' that show ' on PDF
2021-08-21 12:19:50 +02:00
Christian Foellmann
d706c3b1ec
use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination
2021-08-20 14:41:30 +02:00
jpb
a3bae451d5
Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object
2021-08-20 14:06:43 +02:00
jpb
ed65bca666
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object
2021-08-20 14:06:13 +02:00
jpb
d9a07acfa3
remove duplicate code
2021-08-20 14:05:22 +02:00
henrynopo
0933b6c39f
Update html.form.class.php
2021-08-20 20:04:53 +08:00
Laurent Destailleur
335e1ff405
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-20 12:45:37 +02:00
Laurent Destailleur
10ddd621ca
Fix escape error message
2021-08-20 12:40:49 +02:00
henrynopo
b2252106c3
Added function - using list of location_incoterms
...
Added function to call for list of location_incoterms from the existing order records or table of location_incoterms.
Accordingly, an dditional ajex file namely "locationincoterms.php" and a database table namely c_location_incoterms are required.
2021-08-20 10:43:34 +08:00
stickler-ci
c750c5f7cf
Fixing style errors.
2021-08-19 14:45:55 +00:00
Anthony Berton
58b50d02c7
default ref in title 2
2021-08-19 16:43:35 +02:00
Anthony Berton
10c445cf6a
default ref in title
2021-08-19 16:13:41 +02:00
Laurent Destailleur
eb70cb2ecc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-19 02:49:24 +02:00
Laurent Destailleur
399a44ea20
Update objectline_create.tpl.php
2021-08-18 21:40:49 +02:00
Laurent Destailleur
cec94b5f33
Merge pull request #18433 from aspangaro/15a2
...
NEW Ihm admin - Add tabs
2021-08-18 21:30:41 +02:00
Laurent Destailleur
c2bfc87c34
Merge pull request #18435 from henrynopo/patch-2
...
Added China into the list of country using State / province in address
2021-08-18 21:28:16 +02:00
Laurent Destailleur
13e64d2f79
Fix replace file_get_contents with getURLContent
2021-08-18 19:46:37 +02:00
Gauthier PC portable 024
9098356b1f
FIX : travis feedbacks
2021-08-18 19:44:40 +02:00
Laurent Destailleur
ee6a2f73db
css install
2021-08-18 19:32:07 +02:00
Gauthier PC portable 024
c56c74bbdd
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-08-18 18:31:11 +02:00
henrynopo
526ea1a9b3
Added China into the list of country using State / province in address
2021-08-18 22:30:28 +08:00
jpb
fcd485f614
merge conflict
2021-08-18 09:16:28 +02:00
Anthony Berton
fcdb4bfafb
Merge branch 'develop' into PDF_Ref_In_Title
2021-08-18 08:43:20 +02:00
Laurent Destailleur
82db3ae1a9
NEW Use lang selector when using a field key 'lang' in modulebuilder
2021-08-18 01:54:13 +02:00
Laurent Destailleur
3bc8a7345c
Merge branch 'develop' into develop#1
2021-08-18 00:37:23 +02:00
Laurent Destailleur
da3fb82868
Merge pull request #18175 from defrance/patch-170
...
FIX : "disabled" field missing on definition
2021-08-17 23:34:34 +02:00
Laurent Destailleur
bbcea38793
Fix phpcs
2021-08-17 21:58:06 +02:00
Alexandre SPANGARO
a7cb9b2143
NEW Ihm admin - Add tabs
2021-08-17 21:29:15 +02:00
Laurent Destailleur
1ff6c33276
Merge pull request #17537 from kastoras/create_share_on_file_upload_with_other_setup
...
New Add option MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE to share file on any file upload
2021-08-17 20:11:54 +02:00
stickler-ci
5d0318c98f
Fixing style errors.
2021-08-17 18:11:12 +00:00
Laurent Destailleur
659f24efa9
Update files.lib.php
2021-08-17 20:10:47 +02:00
Laurent Destailleur
9521a9e77f
Clean code
2021-08-17 20:02:19 +02:00
Laurent Destailleur
59c9c48844
Merge branch 'develop' into new_validation_method_for_common_object
2021-08-17 19:35:36 +02:00
Laurent Destailleur
84073c6373
Merge branch 'develop' into patch-169
2021-08-17 19:31:30 +02:00
Laurent Destailleur
2a19c02f19
Merge pull request #18178 from defrance/patch-171
...
PHP V8 warning error, use of not declared array
2021-08-17 19:29:49 +02:00
Laurent Destailleur
f0f8210918
Update DolibarrModules.class.php
2021-08-17 19:28:26 +02:00
Laurent Destailleur
5d70ce4f99
Merge pull request #18310 from Hystepik/develop#2
...
Close #18302 : Mass action leave requests aproval
2021-08-17 19:23:30 +02:00
Laurent Destailleur
4f29a01da4
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-17 19:12:21 +02:00
Laurent Destailleur
95721d36ab
Merge pull request #17687 from FHenry/dev_massaction_paid_custom_invoice
...
NEW : mass action paid customer invoice
2021-08-17 19:10:49 +02:00
Laurent Destailleur
0858487119
Fix #18343
2021-08-17 18:52:33 +02:00
Laurent Destailleur
e8646c7919
Merge branch 'develop' into PDF_Propal_frame_option
2021-08-17 18:30:37 +02:00
Laurent Destailleur
33697cec1c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-08-17 18:13:18 +02:00
Laurent Destailleur
fb1e5f72d3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-17 18:11:08 +02:00
Laurent Destailleur
8eba57f722
Merge branch 'develop' into PDF_Option_show_code_client
2021-08-17 16:51:01 +02:00
Laurent Destailleur
9c78f8f647
Merge branch 'develop' into PDF_Ref_In_Title
2021-08-17 16:46:06 +02:00
Laurent Destailleur
27a580dc95
Merge branch 'develop' into PDF_show_sender_name
2021-08-17 16:41:19 +02:00
Laurent Destailleur
a0d82e6bf7
Merge pull request #18404 from lainwir3d/add_url_shipment_substitute
...
CLOSE #18403 Add __URL_SHIPMENT__ substitute to get the shipment URL
2021-08-17 16:36:09 +02:00
Laurent Destailleur
582bf1415e
Update functions.lib.php
2021-08-17 16:35:43 +02:00
Laurent Destailleur
2035499a34
Merge pull request #18402 from lainwir3d/add_newref_substitute
...
CLOSE #18401 Add __NEWREF__ subtitute to get new object reference.
2021-08-17 16:34:11 +02:00
Laurent Destailleur
3e5deeadf4
Merge pull request #18406 from vincentjdc/supplier-order-hide-product-label
...
NEW : Adds PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES to hide product label in supplier order lines
2021-08-17 16:24:19 +02:00
Laurent Destailleur
284207aeb3
Merge pull request #18429 from atm-quentin/NEW_hook_after_rank_update
...
NEW hook after rank update
2021-08-17 16:15:44 +02:00
Laurent Destailleur
7986f4881c
Update commonobject.class.php
2021-08-17 16:12:45 +02:00
Laurent Destailleur
1a8ad5abfa
Propagate $outputlangs to getExtrafieldContent method.
2021-08-17 15:50:28 +02:00
Laurent Destailleur
f18f970b08
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-17 13:52:36 +02:00
Laurent Destailleur
7d61609462
FIX #yogosha6907
2021-08-17 13:13:04 +02:00
Quentin VIAL-GOUTEYRON
5f4ab188cf
NEW hook after rank update
2021-08-17 09:33:50 +02:00
Laurent Destailleur
92d6ad9597
Removed old simple POS module ('cashdesk' module)
2021-08-17 04:57:53 +02:00
Laurent Destailleur
a31f991b39
Doc
2021-08-17 04:41:33 +02:00
Laurent Destailleur
7a3649b6e5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-08-17 03:21:13 +02:00
Laurent Destailleur
f51bcf0038
Debug notification module
2021-08-17 03:20:57 +02:00
Laurent Destailleur
06a0d922cc
NEW Can use the result_mode of mysqli driver. Save memory for list count
2021-08-16 22:01:58 +02:00
Alexandre SPANGARO
f88abb9a6f
Add parenthesis
2021-08-15 07:32:46 +02:00
Alexandre SPANGARO
0d467972cd
Merge branch '12.0' into 12p18
2021-08-15 07:19:33 +02:00
lainwir3d
2125bc9aa5
CLOSE #18403 Add __URL_SHIPMENT__ substitute to get the URL of a shipment
2021-08-12 17:15:57 +04:00
lainwir3d
84b8717693
CLOSE #18401 Add __NEWREF__ subtitute to get new object reference.
...
Allow the use of __NEWREF__ to get for example the new reference a draft order will get after validation.
2021-08-12 17:05:00 +04:00
lainwir3d
cd60d09d9e
FIX #18399 Fix shipment validation email template override.
...
Object type name for shipment was apparently wrong.
2021-08-12 16:16:45 +04:00
Vincent Dieltiens
e691217d00
Add a Global variable 'PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES' to have the possibility to hide product label in supplier order lines.
2021-08-12 13:56:41 +02:00
jpb
b1cba14718
merge conflict
2021-08-12 09:36:34 +02:00
Laurent Destailleur
d7317025e9
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/pdf_other.php
2021-08-11 22:09:05 +02:00
Laurent Destailleur
ef4468153d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2021-08-11 22:07:13 +02:00
Laurent Destailleur
0cf2164260
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2021-08-11 21:15:30 +02:00
Laurent Destailleur
dd70d68b4c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-08-11 21:06:42 +02:00
Laurent Destailleur
eba55d0cf2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2021-08-11 21:06:33 +02:00
Laurent Destailleur
bfedd4a04c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-11 20:47:51 +02:00
Laurent Destailleur
23713d1deb
Merge pull request #18328 from lainwir3d/shipment_close_order_on_close
...
NEW #18326 Workflow: Close order on shipment closing.
2021-08-11 20:47:06 +02:00
Laurent Destailleur
34b53592b8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-08-11 19:44:33 +02:00
Laurent Destailleur
310b5c974b
Fix help
2021-08-11 19:43:12 +02:00
Anthony Berton
d421d3d8e3
Merge branch 'develop' into PDF_Ref_In_Title
2021-08-11 18:39:32 +02:00
Anthony Berton
32e5b531ba
Merge branch 'develop' into PDF_show_sender_name
2021-08-11 18:38:30 +02:00
Anthony Berton
956bd00c13
CHANGE_CONST_ADD_DOC
2021-08-11 18:37:13 +02:00
Anthony Berton
fb42e3f473
add_doc
2021-08-11 18:25:48 +02:00
Anthony Berton
652cd3afa5
Merge branch 'develop' into PDF_Option_show_code_client
2021-08-11 18:17:58 +02:00
Anthony Berton
a8562704cf
add_doc
2021-08-11 18:16:53 +02:00
Anthony Berton
0bab31e973
Merge branch 'develop' into PDF_Propal_frame_option
2021-08-11 18:12:02 +02:00
Anthony Berton
e89c1b49a8
add_espadon_doc
2021-08-11 17:44:40 +02:00
Anthony Berton
c62c53bf5e
add_sponge_doc
2021-08-11 17:42:43 +02:00
Anthony Berton
fc10fd0901
add_cyan_doc
2021-08-11 17:32:09 +02:00
Anthony Berton
8d1a53ce98
add eratosthene doc
2021-08-11 16:28:13 +02:00
Anthony Berton
c5e8302ba2
Const
2021-08-11 16:18:16 +02:00
Laurent Destailleur
1cdab44252
Merge pull request #18363 from fappels/15_update_hook_printOriginObjectLine
...
Remove strange check on hook printOriginObjectLine.
2021-08-11 15:55:55 +02:00
Laurent Destailleur
8da328b183
Update extrafields_list_search_sql.tpl.php
2021-08-11 15:44:48 +02:00
Laurent Destailleur
6fbd93999f
css
2021-08-11 13:33:51 +02:00
stickler-ci
3e2b4b45c1
Fixing style errors.
2021-08-11 11:00:11 +00:00
Anthony Berton
40329b9181
other_doc
2021-08-11 12:59:34 +02:00
Anthony Berton
967d526307
other_frame
2021-08-11 12:41:50 +02:00
Anthony Berton
b8ccbf39f3
other_doc
2021-08-11 12:39:24 +02:00
stickler-ci
b7441aaf45
Fixing style errors.
2021-08-11 10:37:06 +00:00
Anthony Berton
b45a57060f
const_and_other_doc
2021-08-11 12:36:16 +02:00
Anthony Berton
816648f283
other_docs
2021-08-11 12:28:44 +02:00
Laurent Destailleur
f48a9aa3ad
Optimize size of html
2021-08-10 19:44:55 +02:00
Laurent Destailleur
21df418468
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-10 19:28:44 +02:00
Laurent Destailleur
4faf6f5d84
Fix crlf
2021-08-10 19:28:06 +02:00
stickler-ci
1d9d90036d
Fixing style errors.
2021-08-10 15:14:41 +00:00
Laurent Destailleur
bef0989b15
Missing declaration
2021-08-10 13:34:21 +02:00
Anthony Berton
6a41edd3c2
ok
2021-08-10 13:02:37 +02:00
Marc de Lima Lucio
b610cc1c6c
FIX: shipping validation workflow: 'ORDER_CLOSE' trigger called from wrong object
2021-08-10 11:18:25 +02:00
Anthony Berton
366625f300
const
2021-08-10 09:50:14 +02:00
Anthony Berton
f8df845442
Const and Com
2021-08-10 09:45:15 +02:00
Anthony Berton
3b04c28c4f
const
2021-08-10 09:41:40 +02:00
Anthony Berton
284b40f152
CONST
2021-08-10 09:38:07 +02:00
Anthony Berton
0bead55836
ok
2021-08-09 18:11:36 +02:00
stickler-ci
adc6f883e2
Fixing style errors.
2021-08-09 16:03:13 +00:00
Anthony Berton
6b3b6fd508
ok
2021-08-09 18:01:43 +02:00
stickler-ci
190ae8377e
Fixing style errors.
2021-08-09 15:42:38 +00:00
Anthony Berton
41457d2adb
ok
2021-08-09 17:16:48 +02:00
Laurent Destailleur
591b4c6793
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-09 16:49:16 +02:00
Quentin VIAL-GOUTEYRON
108a5ff7cb
FIX postgre filter select search extrafield
2021-08-09 15:14:25 +02:00
Francis Appels
91ef2a44fd
Remove strange check on hook printOriginObjectLine.
...
Now need reshook.
2021-08-09 11:17:11 +02:00
Laurent Destailleur
029da815b2
Code comment
2021-08-08 12:35:52 +02:00
Laurent Destailleur
47d57b1ed2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-08 12:23:44 +02:00
Laurent Destailleur
78e993c9f3
Fix permission to read reports
2021-08-08 12:23:14 +02:00
Laurent Destailleur
7247b99170
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-08 12:15:25 +02:00
Laurent Destailleur
28ff7c894b
Fix missing permission
2021-08-08 12:14:40 +02:00
Laurent Destailleur
fec5a22c65
Fix filter to find files of a ref.
2021-08-06 13:26:01 +02:00
Laurent Destailleur
4c3c613568
Fix filter to find files of a ref.
2021-08-06 13:24:40 +02:00
Laurent Destailleur
c0c46fb704
FIX Link of download main doc on vat list
2021-08-06 12:20:12 +02:00
Laurent Destailleur
6cefd0a756
FIX Link of download main doc on vat list
2021-08-06 12:18:51 +02:00
Laurent Destailleur
047bbbb298
NEW Can set/unset the usual working day of the week
2021-08-05 14:42:28 +02:00
jpb
04d406bd39
remove useless boolean statment
2021-08-05 09:09:11 +02:00
Laurent Destailleur
76038e692d
NEW Use an ajax call for the clicktodial feature instead of href link.
2021-08-04 20:07:12 +02:00
jpb
f99ba2c1e1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object
2021-08-04 17:26:23 +02:00
Hystepik
e02d93c401
Merge branch 'develop' into develop#1
2021-08-04 16:15:50 +02:00
Laurent Destailleur
ce0d9f3b17
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-04 12:38:56 +02:00
Laurent Destailleur
aaefb7b324
Fix css
2021-08-04 12:38:28 +02:00
lmarcouiller
8cbbcc01a9
Update to make lan field common
2021-08-04 11:25:23 +02:00
Laurent Destailleur
6c19524fd7
code comment
2021-08-04 00:12:49 +02:00
Laurent Destailleur
5becf13f2b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-03 17:09:09 +02:00
Laurent Destailleur
ede571dcfe
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2021-08-03 17:08:49 +02:00
Laurent Destailleur
d3fa85cdb4
Merge pull request #18324 from Hystepik/develop#4
...
Close #18043 : fk_user_assign in create ticket
2021-08-03 17:06:55 +02:00
Laurent Destailleur
1c981ccb9d
Fix look and feel v14
2021-08-03 17:03:34 +02:00
Gauthier PC portable 024
6e7fa5ffeb
FIX : stickler feddbacks
2021-08-03 16:53:44 +02:00
stickler-ci
2577936670
Fixing style errors.
2021-08-03 14:39:28 +00:00
stickler-ci
1da9829d61
Fixing style errors.
2021-08-03 14:08:23 +00:00
Gauthier PC portable 024
1d2527b991
FIX : weight and units display
2021-08-03 16:00:32 +02:00
lainwir3d
4873a91afc
CLOSE #18326 Workflow: Close order on shipment closing.
...
Allow an order to be closed automatically when all linked shipment have been closed and all products / items have been shipped.
2021-08-03 17:55:28 +04:00
Laurent Destailleur
ce38ccc121
Merge pull request #18184 from ksar-ksar/patch-5
...
FIX #18181
2021-08-03 15:35:20 +02:00
Laurent Destailleur
070fc26dcb
Merge pull request #18309 from grandoc/new_branch_02_08_2021
...
New branch 02 08 2021
2021-08-03 15:31:25 +02:00
lmarcouiller
c8fd7ccbb6
Close #18043 : fk_user_assign in create ticket
2021-08-03 15:06:53 +02:00
Laurent Destailleur
d0c57dac34
FIx #18217 - Salary - link 'salary' of bank_url not managed
2021-08-03 15:02:09 +02:00
stickler-ci
9d2552e77b
Fixing style errors.
2021-08-03 09:29:25 +00:00
Quentin VIAL-GOUTEYRON
2fab637b92
add dol_concatdesc
2021-08-03 11:26:57 +02:00
Quentin VIAL-GOUTEYRON
f22a02a7ef
fix br
2021-08-03 11:21:47 +02:00
Gauthier PC portable 024
335dca7fc3
FIX : No paiement information for pdf eagle proforma
2021-08-03 09:41:10 +02:00
Laurent Destailleur
0058e32207
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-02 19:03:38 +02:00
Laurent Destailleur
eced1c824a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/core/class/html.form.class.php
htdocs/projet/tasks/time.php
2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/accountancy/tpl/export_journal.tpl.php
htdocs/projet/tasks/time.php
2021-08-02 18:31:26 +02:00
stickler-ci
042e2f9893
Fixing style errors.
2021-08-02 15:31:24 +00:00
Gauthier PC portable 024
b83b77beb5
NEW : stock transfer sheet proforma + default model system like cmd invoice, etc...
2021-08-02 17:28:41 +02:00
lmarcouiller
1cef6d31e8
Close #18302 : Mass action leave requests
2021-08-02 15:45:55 +02:00
Philippe GRAND
3c05cd0757
fix typo and translation
2021-08-02 12:41:55 +02:00
Philippe GRAND
703217acd0
backward
2021-08-02 12:39:45 +02:00
Philippe GRAND
3acb304dd3
fix typo and translation
2021-08-02 12:35:46 +02:00
Gauthier PC portable 024
a45bab10bd
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-08-02 10:09:18 +02:00
Laurent Destailleur
d8a9a0cfb8
Merge pull request #18188 from frederic34/patch-11
...
fix php8 warnings
2021-08-01 23:42:17 +02:00
Laurent Destailleur
3ca1e1c4c0
Merge pull request #18196 from FHenry/develop_addexport
...
new: add column into export invoice
2021-08-01 23:32:51 +02:00
Laurent Destailleur
957b373ecd
Merge pull request #18200 from frederic34/notify
...
notify class indent
2021-08-01 23:27:49 +02:00
Laurent Destailleur
b67487b2ca
Fix reposition
2021-07-31 17:28:43 +02:00
Laurent Destailleur
7eb8232b75
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-31 17:21:05 +02:00
Laurent Destailleur
bd35d86268
Debug v14
2021-07-31 17:20:48 +02:00
Laurent Destailleur
b332d02d20
Merge pull request #18248 from cfoellmann/agenda-fcomm-cancel
...
NEW add agenda auto creation on supplier_order cancellation
2021-07-31 17:02:08 +02:00
Laurent Destailleur
cb2c7d1485
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-31 17:00:00 +02:00
Laurent Destailleur
85a02c5615
Merge pull request #18288 from FHenry/14_deveventorg
...
NEW: EventOrganization Module #FoundationFunding
2021-07-31 16:57:07 +02:00
Laurent Destailleur
530a773eaa
Merge pull request #18300 from cfoellmann/fix-tomail-field
...
fix `tomail` param in mail form usage
2021-07-31 16:55:01 +02:00
Laurent Destailleur
af95169d1d
Update actions_sendmails.inc.php
2021-07-31 16:54:18 +02:00
Laurent Destailleur
6f449cfd6c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-31 16:33:38 +02:00
Laurent Destailleur
0c024ca96b
Merge pull request #18297 from cfoellmann/hook-menu
...
NEW add hook 'menuLeftMenuItems' to filter the leftmenu items
2021-07-31 16:13:49 +02:00
Laurent Destailleur
9f293066ab
Merge pull request #18206 from Hystepik/develop#2
...
New : Inventory scanner tool implemented
2021-07-31 13:27:18 +02:00
Laurent Destailleur
58fa6ac4ab
Merge pull request #18215 from netdrag/order_supplier_email_sender-patch-1
...
Order Supplier Email Sender Extension
2021-07-31 12:29:49 +02:00
Laurent Destailleur
04911bde25
Merge pull request #18277 from atm-florianm/FIX_forum_post_37369_wrong_conf_used
...
FIX $conf->task used but it does not exist, use $conf->projet instead
2021-07-31 12:20:18 +02:00
Laurent Destailleur
9dc61adcc7
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-30 18:44:15 +02:00
Laurent Destailleur
9c626bede4
Fix dol_hash for sha256
2021-07-30 18:43:35 +02:00
Gauthier PC portable 024
142f93e50c
FIX : functions visibility
2021-07-30 15:35:31 +02:00
Christian Foellmann
f830a0f5e2
fix tomail param in mail form usage
2021-07-30 15:20:41 +02:00
Laurent Destailleur
5995e01bd1
Merge pull request #18280 from ptibogxiv/patch-439
...
Fix for php 8
2021-07-30 15:19:54 +02:00
Christian Foellmann
055a5c4ab6
fix hook name
2021-07-30 15:19:05 +02:00
Gauthier PC portable 024
846f0366d3
FIX : travis feedbacks
2021-07-30 14:17:36 +02:00
stickler-ci
3ceb451734
Fixing style errors.
2021-07-30 11:19:18 +00:00
Christian Foellmann
0102e73306
add hook 'menu_LeftMenuArray' to filter the leftmenu items
2021-07-30 13:15:01 +02:00
jpb
15578c2ec2
merge conflict
2021-07-30 10:57:04 +02:00
Florian HENRY
510cf36bbd
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg
2021-07-30 09:26:55 +02:00
Laurent Destailleur
047c575d61
Fix some errors on ticket module
2021-07-30 01:42:52 +02:00
Laurent Destailleur
0c3bf536f2
Fix field resolution
2021-07-30 01:10:15 +02:00
Florian HENRY
6f3080c67c
send mail from ConfOrBooth list to attendees or santd company
2021-07-29 19:24:12 +02:00
Florian HENRY
ae5bb956ac
fix invoice in stand registration pb
2021-07-29 17:18:05 +02:00
stickler-ci
9805281733
Fixing style errors.
2021-07-29 14:20:50 +00:00
Gauthier PC portable 024
3f42689633
FIX : name
2021-07-29 16:17:12 +02:00
Gauthier PC portable 024
6d460d78ca
NEW : Stocks transfers objects management
2021-07-29 16:09:07 +02:00
Alexandre SPANGARO
ca6dd8850a
FIX: Manage credit note on situation invoice for calculate margin
2021-07-29 15:24:08 +02:00
ptibogxiv
da482018d2
Fix for php 8
2021-07-29 10:51:51 +02:00
Christian Foellmann
b9cb04d4b7
Merge branch 'develop' into agenda-fcomm-cancel
2021-07-29 08:14:02 +02:00
atm-florian
fdd0ab8461
FIX $conf->task used but it does not exist, use $conf->projet instead
2021-07-28 23:56:44 +02:00
Josep Lluís
e7af8e9d5e
FIX totalDayAll hours in tasks
...
The extra days hours were not considered in total hours
2021-07-28 19:40:33 +02:00
Frédéric FRANCE
ae5d17815f
Update dolreceiptprinter.class.php
2021-07-28 19:39:17 +02:00
Laurent Destailleur
9b73fac947
Merge pull request #18245 from frederic34/patch-12
...
Update dolreceiptprinter.class.php
2021-07-28 19:38:29 +02:00
Laurent Destailleur
d2311bcdeb
Merge pull request #18234 from ptibogxiv/patch-432
...
fix for php 8
2021-07-28 19:36:13 +02:00
Laurent Destailleur
07c4c36520
Merge pull request #18271 from Hystepik/develop_v14#2
...
Fix a bug in ecm for v14
2021-07-28 19:16:33 +02:00
ptibogxiv
99e256a417
Update functions.lib.php
2021-07-28 18:22:26 +02:00
Josep Lluís
20add7d3fc
FIX totalDayAll hours in tasks
...
The extra days hours were not considered in total hours
2021-07-28 18:02:55 +02:00
Laurent Destailleur
2b2c8f076b
Merge pull request #18231 from ptibogxiv/patch-429
...
Fix for php 8
2021-07-28 17:37:07 +02:00
Laurent Destailleur
fe2d229ba9
Merge pull request #18235 from ptibogxiv/patch-433
...
Fix for php8
2021-07-28 17:35:01 +02:00
Laurent Destailleur
0476b36c6c
Merge pull request #18238 from ptibogxiv/patch-436
...
Fix for php8
2021-07-28 17:29:54 +02:00
Laurent Destailleur
12a0029fb7
Merge pull request #18240 from ptibogxiv/patch-438
...
Fix for php 8
2021-07-28 17:28:49 +02:00
lmarcouiller
df8f099857
Fix a bug in ecm for v14
2021-07-28 15:57:12 +02:00
Laurent Destailleur
9dc45ac6ec
Merge pull request #18251 from cfoellmann/improve-makeorder
...
Improve makeorder
2021-07-28 15:41:09 +02:00
kamel
b4ccb1b355
Corrections stickler-ci
2021-07-28 12:29:17 +02:00
kamel
2cd7513936
NEW: add link to a element by ref
2021-07-28 12:18:35 +02:00
Ferran Marcet
67cc580797
Fix: Bad rights on inventory module
2021-07-28 10:45:47 +02:00
Lenin Rivas
6038ef6bba
Add filter select company
...
Add filter with name alias and tva intra
2021-07-27 12:28:18 -05:00
Christian Foellmann
d9529f2600
save makeorder comment to agenda item
2021-07-27 16:37:34 +02:00
Christian Foellmann
faf50a5aaa
add agenda auto creation on supplier_order cancellation
2021-07-27 15:06:28 +02:00
Frédéric FRANCE
bc8be62809
Update dolreceiptprinter.class.php
2021-07-27 10:26:51 +02:00
ptibogxiv
54c151916d
Fix for php 8
2021-07-26 15:42:43 +02:00
ptibogxiv
3cb56d3ec6
Fix for php8
2021-07-26 15:35:31 +02:00
ptibogxiv
36ba5c6a71
Fix for php8
2021-07-26 15:22:50 +02:00
ptibogxiv
dc30052d3e
fix for php 8
2021-07-26 15:07:52 +02:00
ptibogxiv
b0e2ef4a6c
Update extrafields_edit.tpl.php
2021-07-26 14:53:18 +02:00
ptibogxiv
026e61f1ec
Update extrafields_edit.tpl.php
2021-07-26 14:53:06 +02:00
ptibogxiv
d443485939
Update extrafields_edit.tpl.php
2021-07-26 14:52:24 +02:00
Laurent Destailleur
079b014b14
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-26 00:41:35 +02:00
Laurent Destailleur
505543e18e
Fix #yogosha6704
2021-07-26 00:37:47 +02:00
stickler-ci
5524320fbc
Fixing style errors.
2021-07-23 17:46:44 +00:00
Florian HENRY
e93a362a0d
fix: since be62c2f7 commit selectlist from formconfirm were behind the form confirm
2021-07-23 18:33:18 +02:00
Laurent Destailleur
4c505619e3
FIX look and field v14
2021-07-23 00:02:14 +02:00
netdrag
6cfd8c6f24
Order Supplier Email Sender Extension
...
Extended the advanced options to specify an email address for the order supplier. Useful if you operate under a brand, but order under a different.
2021-07-22 18:38:22 +02:00
Frédéric FRANCE
44fa70c7c7
notify class indent
2021-07-22 09:24:14 +02:00
Frédéric FRANCE
5e6c942caf
notify class indent
2021-07-22 09:22:42 +02:00
Florian HENRY
8eafbf9101
add column into export invoice
2021-07-21 17:00:57 +02:00
stickler-ci
252765303e
Fixing style errors.
2021-07-21 07:48:57 +00:00
jpb
0396573b91
fix focusout on mandatoryPeriod only
2021-07-21 09:46:38 +02:00
jpb
2189af1f2a
Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object
2021-07-21 08:57:09 +02:00
jpb
62d007e232
add focusout constraint
2021-07-21 08:56:40 +02:00
stickler-ci
c93e2cda0d
Fixing style errors.
2021-07-21 06:31:07 +00:00
jpb
32f9b1a556
fix cmd fourn no msg
2021-07-21 08:26:41 +02:00
Laurent Destailleur
062c39c40d
Fix html entities when we should not
2021-07-21 01:40:45 +02:00
jpb
d61b831737
add field in create product
2021-07-20 22:39:30 +02:00
Frédéric FRANCE
828e65c724
Update html.form.class.php
2021-07-20 20:56:01 +02:00
Frédéric FRANCE
71b95f3511
fix php8 warnings
2021-07-20 20:54:27 +02:00
ksar
4d6b63dbed
FIX #18181
...
FIX #18181
2021-07-20 16:14:47 +02:00
stickler-ci
2f0ba41a53
Fixing style errors.
2021-07-20 13:35:10 +00:00
lmarcouiller
dd9eb28230
Barcode scanner tool update
2021-07-20 14:43:36 +02:00
jpb
367e839239
change class css and behavior js
2021-07-20 13:56:30 +02:00
jpb
e11afb7da0
add color on date dield and warning on line
2021-07-20 11:23:35 +02:00
BENKE Charlene
98a2c35ab5
PHP V8 warning error, use of not declared array
2021-07-19 17:51:06 +02:00
BENKE Charlene
acdac32845
FIX : "disabled" field missing on definition
2021-07-19 13:46:50 +02:00
lmarcouiller
b309af0ab8
First push new scan quanty inventory
2021-07-19 13:43:48 +02:00
BENKE Charlene
09954a3047
Update html.formcompany.class.php
2021-07-19 11:01:06 +02:00
Laurent Destailleur
c0d54fe608
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-16 15:03:52 +02:00
Laurent Destailleur
0ccc2d9033
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-16 15:01:11 +02:00
Laurent Destailleur
af1c43c70d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/modules/modBarcode.class.php
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
2021-07-16 14:05:42 +02:00
Laurent Destailleur
2fc8a80070
Merge pull request #17883 from marc-dll/develop_NEW_holiday_cron
...
NEW: holiday: handle monthly balance updates with cronjob
2021-07-16 12:48:12 +02:00
Florian HENRY
63a47112ae
new: #18162
2021-07-16 11:14:30 +02:00
Florian HENRY
c928de89c6
fix: print barcode sould not be available for external user
2021-07-16 10:41:06 +02:00
Laurent Destailleur
ce27feda84
Debug v14
...
Fix email collector (Creation of thirparty, set of extrafields)
2021-07-16 00:12:58 +02:00
Laurent Destailleur
9aad07f20c
Remove log
2021-07-15 21:57:32 +02:00
Laurent Destailleur
5da40d80f7
Fix css
2021-07-15 16:35:06 +02:00
Laurent Destailleur
83d931f3c7
FIX #18143
2021-07-14 17:40:36 +02:00
Laurent Destailleur
fb8ecf10d9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-14 14:49:30 +02:00
Laurent Destailleur
638a66fbb9
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
2021-07-14 14:49:06 +02:00
Laurent Destailleur
a773652c04
Fix phpcs
2021-07-14 14:37:07 +02:00
Laurent Destailleur
7281a51eff
Merge pull request #18148 from AlexisLaurier/fix/CommonObjectShowInputFieldCheckboxAndRadio
...
fix showInputField checkbox and radio type
2021-07-14 13:55:53 +02:00
Laurent Destailleur
a88ab8e443
Merge pull request #18147 from atm-john/fix_dialog_btn
...
Fix : dialog BTN and add doc
2021-07-14 13:53:41 +02:00
Laurent Destailleur
21f295565a
Merge pull request #18144 from Hystepik/develop#1
...
Fix : remove of a button which was forgotten
2021-07-14 13:50:42 +02:00
Alexis LAURIER
cd5e1d603e
fix showInputField checkbox and radio type
2021-07-14 12:02:03 +02:00
ATM john
87c26ae0e2
Add php doc
2021-07-14 10:07:03 +02:00
Laurent Destailleur
724d00fc6c
Fix phpcs
2021-07-14 02:20:15 +02:00
ATM john
1a330e0b88
Fix dialog BTN and add doc
2021-07-14 00:02:55 +02:00
Gauthier PC portable 024
0fe46b53d8
FIX : method_exists needs object at first param
2021-07-13 15:18:40 +02:00
lmarcouiller
9a12b5e424
Fix : remove of a button which was forgotten
2021-07-13 15:17:01 +02:00
Laurent Destailleur
b12aae4a99
FIX amount of payment deleted in unalterable log (for old record must
...
look the log of creation to know amount).
2021-07-13 14:26:32 +02:00
evarisk-theo
f0599095ee
Merge branch 'Dolibarr:develop' into add-ticket-categories-functions
2021-07-13 14:04:14 +02:00
Théo David
66f38d0012
fix: rename select_tickets_list into selectTicketsList
2021-07-13 14:00:16 +02:00
Laurent Destailleur
af99cab839
CSS
2021-07-13 13:46:20 +02:00
Laurent Destailleur
e755d68b06
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-13 13:22:20 +02:00
Laurent Destailleur
0d12f25341
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-13 13:21:50 +02:00
Laurent Destailleur
d1a00c26aa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/functions.lib.php
2021-07-13 13:14:27 +02:00
Laurent Destailleur
bbce0f9c1b
Update html.form.class.php
2021-07-13 13:01:34 +02:00
Laurent Destailleur
f1c7207514
Merge pull request #18135 from Hystepik/develop#1
...
Fix #18110 : update of formticket.class.php
2021-07-13 11:48:36 +02:00
stickler-ci
85adefe721
Fixing style errors.
2021-07-13 08:08:01 +00:00
lmarcouiller
35b29481c7
Close #18131 : new massaction for thirdparty
2021-07-13 10:05:38 +02:00
Laurent Destailleur
d3f324c2d4
Try a better fix for #18105
2021-07-12 16:55:16 +02:00
stickler-ci
5b1525e77c
Fixing style errors.
2021-07-12 14:15:28 +00:00
lmarcouiller
cfb03f065c
Fix #18110 : update of formticket.class.php
2021-07-12 16:12:28 +02:00
Théo David
12e327d6b4
fix: remove phpcs:enable tag
2021-07-12 14:37:07 +02:00
Théo David
b59c1f1a34
fix: rename select_tickets into selectTickets
2021-07-12 14:17:30 +02:00
John BOTELLA
deb9a374f3
Fix ui event badge status
2021-07-12 12:28:21 +02:00
Laurent Destailleur
7533c9e3a5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/fr_FR/interventions.lang
2021-07-12 12:01:53 +02:00
David
642d84a844
fix: code syntax
2021-07-12 09:26:18 +02:00
evarisk-theo
41b0735150
Merge branch 'Dolibarr:develop' into add-ticket-categories-functions
2021-07-12 09:10:15 +02:00
Laurent Destailleur
c9242d83ab
Clean code
2021-07-11 20:16:47 +02:00
Laurent Destailleur
fb13746644
Merge pull request #18019 from ATM-Consulting/NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword
...
NEW: make it easier to set the `keyword`, `keywords` and `description` attributes of an ecm file object
2021-07-11 20:15:29 +02:00
ATM john
7ad1738944
Fix setError
2021-07-11 15:58:34 +02:00
ATM john
19ab5ce420
Fix comments
2021-07-11 14:13:24 +02:00
ATM john
dc3f960ce8
Add validate to module builder
2021-07-11 14:05:26 +02:00
Laurent Destailleur
25d6f1a7c8
More complete exemple.
2021-07-11 01:58:37 +02:00
Laurent Destailleur
e7b3280c17
Debug v14 with nojs
2021-07-11 01:12:52 +02:00
Laurent Destailleur
97ac547fe2
Fix/debug the numbering module to autocalculate a new lot.
2021-07-11 00:44:36 +02:00
Laurent Destailleur
64bd4ef784
Fix component to select ticket groups
2021-07-10 20:09:51 +02:00
Laurent Destailleur
f65aa6024f
Add replace into forbidden sql in read-only mode
2021-07-10 09:42:20 +02:00
Laurent Destailleur
3fadd5cda5
NEW Add $dolibarr_main_db_readonly in conf.php for readonly access.
2021-07-09 19:37:12 +02:00
Laurent Destailleur
e51e31dc11
Merge pull request #18087 from atm-john/new_modal_btn_option
...
New : Add js confirm modal option to BTN created with dolGetButtonAction
2021-07-09 10:09:08 +02:00
Florian Mortgat
924cff44f3
FIX PR feedback: in addFileIntoDatabaseIndex, return error if $object is set with an ID but without a table_element
2021-07-09 09:16:27 +02:00
Florian Mortgat
407f314498
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword
2021-07-09 09:11:11 +02:00
Laurent Destailleur
d9475b8b2b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 23:46:35 +02:00
Laurent Destailleur
463fadb776
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-07-08 23:45:26 +02:00
Laurent Destailleur
aa9d98a336
Clean code of lib_notification. Now use cache like other js.
2021-07-08 23:20:55 +02:00
Laurent Destailleur
1306ff4c0b
Clean code of lib_notification. Now use cache like other js.
2021-07-08 23:19:43 +02:00
ATM john
c2ce8e3c9d
Fix comment
2021-07-08 22:29:41 +02:00
Laurent Destailleur
12b1f5b23b
Fix sql
2021-07-08 21:05:56 +02:00
Laurent Destailleur
797797d38b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 20:59:48 +02:00
Laurent Destailleur
1209253d57
Sanitize data
2021-07-08 18:12:15 +02:00
Alexandre SPANGARO
eaa6987e8b
Fix: formconfim if type radio must be :checked to get correct value
2021-07-08 17:15:03 +02:00
Laurent Destailleur
856d6eab4a
Merge pull request #18102 from altairisfr/expe_extra
...
FIX display of extrafields on shipping lines
2021-07-08 16:35:38 +02:00
Laurent Destailleur
b84fc94324
Merge pull request #18104 from fappels/14_fix_php8_warning_part4
...
14 fix php8 warning on user page
2021-07-08 16:31:25 +02:00
Laurent Destailleur
752b55ac98
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 14:04:07 +02:00
Laurent Destailleur
ad11f7b66d
Fix type of param
...
Fix test of ckeditor for html doc
Fix when MAIN_RESTRICTHTML_ONLY_VALID_HTML is on
2021-07-08 13:59:04 +02:00
Laurent Destailleur
16ee47b12c
Fix warning.
...
Reduce memory need for getmin/max on large graphs.
2021-07-08 11:13:15 +02:00
Laurent Destailleur
34c7295cbc
Make code more jquery compliant
2021-07-07 21:01:30 +02:00
Laurent Destailleur
9d3f7c5cdd
Support fk_parent into dictionary of ticket categories
2021-07-07 18:30:10 +02:00
Francis Appels
0e2c57fe65
Fix php 8 warning on user page
2021-07-07 14:50:10 +02:00
Christophe Battarel
7e174412b7
FIX display of extrafields on shipping lines
2021-07-07 10:30:01 +02:00
Laurent Destailleur
34f1cfe575
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/index.php
2021-07-07 02:09:53 +02:00
Laurent Destailleur
ff94c60cc7
Fix GETPOST with restricthtml
2021-07-07 01:45:31 +02:00
Laurent Destailleur
f286017cab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-06 19:03:55 +02:00
Laurent Destailleur
f761a2d3b8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-06 19:02:49 +02:00
Laurent Destailleur
9fc2d9fc03
Fix phpcs
2021-07-06 19:02:03 +02:00
Laurent Destailleur
82e96016cd
Merge pull request #18092 from fappels/14_fix_php8_part3
...
Fix php8 warning
2021-07-06 18:52:05 +02:00
Florian Mortgat
9f7be989c2
FIX 13.0 - fatal - missing inclusion of ajax.lib.php for calling ajax_autocompleter()
2021-07-06 17:38:37 +02:00
Laurent Destailleur
5444d45e68
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-06 16:13:40 +02:00
Laurent Destailleur
e1a45df0d8
Fix phpunit
2021-07-06 16:12:11 +02:00
Laurent Destailleur
ced4ea1314
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/tpl/objectline_view.tpl.php
2021-07-06 15:59:59 +02:00
Laurent Destailleur
3c0e841877
Fix function not found
2021-07-06 15:55:43 +02:00
Laurent Destailleur
37801184c0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/holiday/class/holiday.class.php
Fix case of newByMonth
2021-07-06 15:35:17 +02:00
Laurent Destailleur
1cfa43c085
Merge pull request #18088 from aspangaro/14p1
...
FIX Accountancy - Link from admin
2021-07-06 14:48:26 +02:00
Laurent Destailleur
555f1c719b
Debug v14
2021-07-06 04:29:25 +02:00
Laurent Destailleur
61ed899608
Fix set discount on line in TakePos
2021-07-06 03:53:42 +02:00
Laurent Destailleur
c901e518a7
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-06 02:11:28 +02:00
Laurent Destailleur
3dff7e29cc
Fix #yogosha6567
2021-07-06 01:44:05 +02:00
Laurent Destailleur
0dfa7bdbcc
Add option MAIN_RESTRICTHTML_ONLY_VALID_HTML
2021-07-06 00:47:43 +02:00
Laurent Destailleur
2a5699a9a2
Merge
2021-07-05 23:07:40 +02:00
Laurent Destailleur
f8eadf6fe1
Fix #yogosha6561
2021-07-05 22:42:48 +02:00
Laurent Destailleur
db95339085
Code comment
2021-07-05 20:32:05 +02:00
Laurent Destailleur
a04ed363c7
Look and feel v14
2021-07-05 19:28:50 +02:00
Laurent Destailleur
e2d7de3146
css
2021-07-05 18:56:24 +02:00
Laurent Destailleur
adec77e449
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-05 18:47:24 +02:00
Laurent Destailleur
65adb16191
Fix increase entrophy of default password generation.
2021-07-05 17:55:17 +02:00
Laurent Destailleur
f648185839
Fix phpcs
2021-07-05 17:34:25 +02:00
Laurent Destailleur
c0118c7de2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-07-05 17:08:27 +02:00
Laurent Destailleur
d414bcb572
Fix phpcs
2021-07-05 17:08:10 +02:00
Laurent Destailleur
fe5c4f4a0e
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-05 17:04:38 +02:00
Laurent Destailleur
8b07e99e05
Fix for ' inserted by CKEditor instead of '
2021-07-05 16:08:47 +02:00
Francis Appels
1333ca3660
Fix php 8 warning on not set field keys
2021-07-05 14:51:34 +02:00
Laurent Destailleur
b7c86f3aec
Fix ldap
2021-07-05 11:41:55 +02:00
Alexandre SPANGARO
8bde61c2c6
FIX Accountancy - Link from admin
2021-07-05 06:58:10 +02:00
ATM john
752fe22c68
Add simple auto mode
2021-07-04 23:24:38 +02:00
ATM john
a709cc583f
Add modal option to btn
2021-07-04 22:59:53 +02:00
Laurent Destailleur
5779a56ae0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-04 21:23:53 +02:00
Laurent Destailleur
7013f01a41
Fix look and feel v14
2021-07-04 21:14:46 +02:00
Laurent Destailleur
f6efe51032
Fix trouble with product id = -1
2021-07-04 21:02:02 +02:00
Laurent Destailleur
5853aa4c1e
Look and feel v14
2021-07-04 20:08:34 +02:00
Laurent Destailleur
0cccfb1cee
Fix phpcs v14
2021-07-04 19:23:04 +02:00
Laurent Destailleur
d1c6a9899c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-03 18:33:00 +02:00
Laurent Destailleur
30f9eb9f23
Fix phpcs
2021-07-03 18:32:52 +02:00
Laurent Destailleur
9b7c0a9246
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2021-07-03 18:32:31 +02:00
Laurent Destailleur
b43fddfc74
Merge pull request #18058 from altairisfr/exportprices
...
add labels and export only latest prices
2021-07-02 16:35:58 +02:00
Laurent Destailleur
dbd2d2eb20
Merge pull request #18069 from marc-dll/13.0_FIX_holiday_menus
...
FIX: holiday: status filter parameter has been renamed but not in links it was used
2021-07-02 16:35:14 +02:00
Laurent Destailleur
6ae1d192e4
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/card.php
2021-07-02 16:14:12 +02:00
Laurent Magnin
db0b00f93a
Standard ticket substitutions
2021-07-02 12:30:07 +02:00
John BOTELLA
167ae5b0f2
Merge branch 'develop' into new_validation_method_for_common_object
2021-07-02 12:04:14 +02:00
Laurent Magnin
b2e0a530a0
Merge branch 'Dolibarr:develop' into fix_ticket_substitution
2021-07-02 11:49:55 +02:00
Marc de Lima Lucio
97938f489e
FIX: holiday: status filter parameter has been renamed but not in links it was used
2021-07-02 11:35:26 +02:00
Théo David
079608fe00
NEW #18046 Add ticket ticket categories functions
2021-07-02 10:26:03 +02:00
Frédéric FRANCE
3aa24cccff
fix can't remove extrafield date or datetime value
2021-07-01 15:15:35 +02:00
Laurent Destailleur
9392624e54
Fix deletion of line on replacement invoice
2021-07-01 13:36:04 +02:00
Laurent Destailleur
5b34ea6c22
FIX permission to close a proposal when using advanced permissions
2021-07-01 03:06:40 +02:00
Laurent Destailleur
4cff865c6b
Trans
2021-06-30 18:22:40 +02:00
Laurent Destailleur
bf7f8f7c45
Fix phpcs
2021-06-30 17:28:23 +02:00
Laurent Destailleur
aec4d6016c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-30 17:27:40 +02:00
Laurent Destailleur
6cb5ea6ec2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-30 17:27:20 +02:00
Laurent Destailleur
bda36337cd
Prepare fix #yogosha6443
2021-06-30 17:22:36 +02:00
Christophe Battarel
ac6cb5853e
fix for multientity
2021-06-30 15:35:55 +02:00
Laurent Destailleur
7c2121c439
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/tpl/objectline_edit.tpl.php
2021-06-30 15:06:16 +02:00
Laurent Destailleur
068622bced
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-06-30 15:00:23 +02:00
Laurent Destailleur
a914ffa42c
CSS
2021-06-30 15:00:04 +02:00
Laurent Destailleur
b6a538f439
Merge pull request #18056 from aspangaro/14b16
...
FIX Accountancy - Clean virtual zero on the import
2021-06-30 14:44:12 +02:00
Laurent Destailleur
51456741d9
FIX Can't edit replacement invoice
...
FIX Status of invoice when making a replacement invoice
2021-06-30 12:43:44 +02:00
Christophe Battarel
3b4ea5c5af
use formintervention
2021-06-30 10:56:09 +02:00
Christophe Battarel
27e2c62cab
Merge branch 'develop' into timespent2inter
2021-06-30 10:34:22 +02:00
Christophe Battarel
4f2e579bb2
add labels and export only latest prices
2021-06-30 10:21:31 +02:00
Christophe Battarel
0b5e231dd5
add labels and export only latest prices
2021-06-30 10:18:14 +02:00
Florian Mortgat
5d4c40fffa
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword
2021-06-30 09:36:34 +02:00
Florian Mortgat
94416072d8
FIX after PR feedback: remove uses of keyword attribute of EcmFiles (use keywords instead)
2021-06-30 09:34:49 +02:00
Alexandre SPANGARO
f95b5be971
FIX Accountancy - Clean virtual zero on the import
2021-06-30 04:55:22 +02:00
Alexandre SPANGARO
6f12812329
FIX Accountancy - Clean virtual zero on the import
2021-06-29 23:07:20 +02:00
Laurent Destailleur
02a5755876
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/langs/nl_NL/main.lang
2021-06-29 19:59:51 +02:00
Laurent Destailleur
6196a77e64
Merge pull request #17861 from marc-dll/develop_NEW_project_block_timesheet
...
NEW: project time spent: conf to prevent recording time after X months
2021-06-29 19:53:20 +02:00
Laurent Destailleur
c7befd9acc
Fix php8 (related to #18019 )
2021-06-29 19:49:37 +02:00
Laurent Destailleur
eab6fc9347
Merge pull request #18053 from fappels/14_fix_php8_part2
...
Fix php8 warning
2021-06-29 19:17:09 +02:00
Laurent Destailleur
2860e12b65
Update objectline_view.tpl.php
2021-06-29 19:16:29 +02:00
Laurent Destailleur
0f020d5b20
Fix for phpv8
2021-06-29 19:05:18 +02:00
Laurent Destailleur
7aeb652c66
Better sanitizing, fix phpcs
2021-06-29 18:22:36 +02:00
Laurent Destailleur
796b2d201a
Enhance the sanitizing.
2021-06-29 18:17:27 +02:00
Francis Appels
1b7b45d72a
Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2
2021-06-29 16:56:48 +02:00
Francis Appels
051bb3f3ef
Fix some core php8 warnings.
...
Fixing php 8 warnings seems also to solve some situations like a paiment condition removed from dictionary can not be selected.
2021-06-29 16:37:07 +02:00
lmarcouiller
3d41c00199
New : selectGroupTicket multilevel >1 level
2021-06-29 16:13:03 +02:00
Laurent Destailleur
25c6b64b1e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/modules/delivery/doc/pdf_storm.modules.php
htdocs/core/modules/reception/doc/pdf_squille.modules.php
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
2021-06-29 15:58:26 +02:00
Christophe Battarel
c8f55907eb
stickler
2021-06-29 15:52:50 +02:00
Laurent Destailleur
1cf3408f5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/class/contact.class.php
2021-06-29 15:52:39 +02:00
Christophe Battarel
d423e47d3b
stickler
2021-06-29 15:50:41 +02:00
Laurent Destailleur
ba4a01dbea
Merge pull request #18037 from atm-maxime/fix_mo_stuff
...
Fix MO and BOM links in boxes
2021-06-29 15:42:09 +02:00
Laurent Destailleur
ab4dbcf5ae
Update box_mos.php
2021-06-29 15:41:48 +02:00
Laurent Destailleur
474df5fef2
Update box_boms.php
2021-06-29 15:41:21 +02:00
Christophe Battarel
ef8aaa7fd7
generate intervention from time spent
2021-06-29 15:26:04 +02:00
Laurent Destailleur
69e0381e55
Prepare v14
2021-06-29 02:39:20 +02:00
Francis Appels
9b59f264fd
Fix some php 8 warning
2021-06-28 20:00:10 +02:00
Laurent Destailleur
2e2d9002ad
Code comment
2021-06-27 14:54:17 +02:00
Maxime Kohlhaas
8332385bd5
Fix links in box last BOM
2021-06-27 08:42:08 +02:00
Maxime Kohlhaas
d86caa39e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_mo_stuff
2021-06-27 08:34:11 +02:00
Laurent Destailleur
4ff2ff779b
css
2021-06-26 16:35:33 +02:00
Laurent Destailleur
b3b96ddb7a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-26 16:11:13 +02:00
Laurent Destailleur
bbc6b9aa1b
Look and feel v14
2021-06-26 16:10:56 +02:00
Laurent Destailleur
e62ed28701
Debug v14
2021-06-26 15:39:52 +02:00
Laurent Destailleur
f4a512fa7b
Merge pull request #18004 from OPEN-DSI/new-export-parent-compnay-document-lines
...
NEW parent company on exports
2021-06-26 12:30:57 +02:00
Laurent Destailleur
97f5a0e541
Merge pull request #18018 from frederic34/patch-7
...
export value of checkbox instead id with EXPORT_LABEL_FOR_SELECT
2021-06-26 12:24:01 +02:00
Laurent Destailleur
781df5a8a8
Merge pull request #18016 from fappels/13_fix_klaas
...
FIX #17919 pictures in docs.
2021-06-26 12:22:57 +02:00
Laurent Destailleur
012f326168
Merge pull request #18020 from Hystepik/develop#1
...
Fix : error display fr phone number
2021-06-26 12:18:16 +02:00
Laurent Destailleur
2fd47615eb
Fix load of conf when using alternative $db
2021-06-26 01:46:14 +02:00
Laurent Destailleur
6e3647af2c
Debug v14
2021-06-26 00:08:19 +02:00
Laurent Destailleur
c7b03da7e6
Fix bad object used
2021-06-25 23:43:22 +02:00
lvessiller
2cb2ec02d6
NEW parent compnay in order supplier lines export
2021-06-25 17:04:19 +02:00
Francis Appels
ec805d36fe
Remove deprecated level parameter.
2021-06-25 10:02:23 +02:00
lmarcouiller
98244a5e44
Fix : error display fr phone number
2021-06-24 14:20:19 +02:00
Francis Appels
88f7ca9214
Fix MAIN_GENERATE_RECEPTION_WITH_PICTURE
2021-06-24 12:27:39 +02:00
Laurent Destailleur
cfc5646059
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-24 12:18:30 +02:00
Laurent Destailleur
a2d451dbfb
Missing extrafield on report
2021-06-24 12:17:32 +02:00
Francis Appels
dc9e71084b
Fix missing posYAfterImage for nexy for espadon and squille
2021-06-24 12:15:29 +02:00
Frédéric FRANCE
47b1d2b7df
export value of checkbox instead id with EXPORT_LABEL_FOR_SELECT
2021-06-24 11:54:05 +02:00
Florian Mortgat
d0a4ae88b1
NEW: make it easier to set the keyword, keywords and description attributes of an ecm file object
2021-06-24 11:50:34 +02:00
Francis Appels
d20bd5bcf6
fix ctrl-y
2021-06-24 10:18:21 +02:00
Francis Appels
09382e0505
FIX #17919 pictures in docs.
...
Supplier order and proposal worked for me.
Supplier invoice not implemented need new feature request.
2021-06-24 10:12:34 +02:00
atm-lena
7eddf43aef
FIX List and Create Companies Left Menus
2021-06-23 17:33:02 +02:00
Laurent Destailleur
4327d53c60
Fix closing linkto section when js on.
2021-06-23 14:38:24 +02:00
Laurent Destailleur
acce226c05
Debug cash fence feature (missing report per vat rate)
2021-06-23 13:00:50 +02:00
Laurent Destailleur
82ee5c2825
Clean code
2021-06-23 10:42:27 +02:00
Laurent Destailleur
d57699b7d7
css
2021-06-23 10:22:51 +02:00
Laurent Destailleur
5c6c708531
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-23 02:45:22 +02:00
Laurent Destailleur
40b35cc44a
Fix upload file form has disappear
2021-06-23 02:45:06 +02:00
Laurent Destailleur
30087bd16a
Merge pull request #18001 from aspangaro/14b15
...
Fix Forget information in tooltip for direct download
2021-06-23 02:31:45 +02:00
Laurent Destailleur
cf28fcc8cd
CSS
2021-06-23 02:22:49 +02:00
Laurent Destailleur
62822c424c
Fix php8
2021-06-23 01:34:14 +02:00
Laurent Destailleur
c08255657e
Fix pgsql
2021-06-22 18:59:14 +02:00
Laurent Destailleur
12748640a5
Add log
2021-06-22 18:04:06 +02:00
Laurent Destailleur
bcffbe3d67
Test fix
2021-06-22 17:09:02 +02:00
Laurent Destailleur
2f6a91f506
Look and feel v14
2021-06-22 15:25:49 +02:00
lvessiller
21ebfb6094
NEW parent company on exports
2021-06-22 14:13:18 +02:00
Alexandre SPANGARO
f1a5d4009f
Merge remote-tracking branch 'upstream/develop' into 14b15
2021-06-22 14:07:52 +02:00
Laurent Destailleur
d6e9947cd4
CSS
2021-06-22 12:30:50 +02:00
Laurent Destailleur
8887f71c26
Doc
2021-06-22 10:57:16 +02:00
ATM john
b8244edb89
Merge branch 'new_validation_method_for_common_object' of github.com:atm-john/dolibarr into new_validation_method_for_common_object
2021-06-21 21:54:53 +02:00
ATM john
4d043b713c
WIP - create validation method for common object
2021-06-21 21:54:03 +02:00
Alexandre SPANGARO
23f6e183d3
Forget information in tooltip for direct download
2021-06-21 21:51:41 +02:00
Laurent Destailleur
6014e4407f
Clean code
2021-06-21 20:50:56 +02:00
Laurent Destailleur
a0b594fbdc
Debug emailcollector
2021-06-21 19:47:43 +02:00
kamel
488d875854
Correction
2021-06-21 16:51:54 +02:00
kamel
dd61c49722
Correction
2021-06-21 16:44:31 +02:00
kamel
ba7b6a8d51
FIX: Reload values of the specified entity when change entity in the execution of cron job
2021-06-21 16:38:36 +02:00
Laurent Destailleur
31db1dc412
Fix management of visibility of export/import templates.
2021-06-21 15:03:45 +02:00
Laurent Destailleur
561e75d0f8
Merge pull request #17992 from frederic34/patch-8
...
fix warnings
2021-06-21 11:39:40 +02:00
Laurent Destailleur
bb8d5cec1b
More complete management of
...
MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL
2021-06-21 11:36:28 +02:00
Laurent Destailleur
5bfd82e528
Clean code
2021-06-21 11:23:53 +02:00
Laurent Destailleur
59a7d5b89d
Introduce option
...
MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL
2021-06-21 11:13:30 +02:00
Maxime Kohlhaas
2d9d46b9b5
Merge branch 'develop' of github.com:atm-maxime/dolibarr into fix_mo_stuff
2021-06-20 21:08:28 +02:00
Frédéric FRANCE
6fb17b9777
fix warnings
2021-06-20 18:28:25 +02:00
Laurent Destailleur
c78f4a9248
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-20 17:20:24 +02:00
Laurent Destailleur
65110411ac
Doc
2021-06-20 17:20:12 +02:00
Laurent Destailleur
f486595e13
Fix dolSqlDateFilter
2021-06-20 16:55:22 +02:00
Laurent Destailleur
3b09cc8e16
Merge pull request #17988 from frederic34/patch-7
...
fix php warning
2021-06-20 16:40:25 +02:00
Laurent Destailleur
5ad999e46d
css
2021-06-20 16:39:30 +02:00
Laurent Destailleur
6aeba1b79d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-20 16:36:05 +02:00
Laurent Destailleur
68b8a6a916
css
2021-06-20 16:35:49 +02:00
Frédéric FRANCE
4739694ad7
fix php warning
2021-06-20 16:24:58 +02:00
Laurent Destailleur
ab34a105c7
Merge pull request #17985 from grandoc/new_branch_20_06_2021
...
internationalization
2021-06-20 12:54:18 +02:00
Laurent Destailleur
a9dd5e8764
Fix css hidoneprint
2021-06-20 12:52:04 +02:00
Philippe GRAND
ae293d61c6
internationalization
2021-06-20 11:59:02 +02:00
Philippe GRAND
fb13d74467
internationalization
2021-06-20 11:56:49 +02:00
Philippe GRAND
dbee213db1
internationalization
2021-06-20 11:54:51 +02:00
Philippe GRAND
1480123f7d
internationalization
2021-06-20 11:53:21 +02:00
Philippe GRAND
e33db2876a
internationalization
2021-06-20 11:51:02 +02:00
Philippe GRAND
c06fcd36fb
internationalization
2021-06-20 11:48:30 +02:00
Philippe GRAND
d60d15883f
internationalization
2021-06-20 11:46:22 +02:00
Philippe GRAND
a4e63a1a26
internationalization
2021-06-20 11:43:05 +02:00
Philippe GRAND
057e78d8c3
internationalization
2021-06-20 11:40:54 +02:00
Philippe GRAND
b07d2f257a
internationalization
2021-06-20 11:37:51 +02:00
Philippe GRAND
14af45057c
internationalization
2021-06-20 11:35:37 +02:00
Philippe GRAND
748c10c2f9
internationalization
2021-06-20 11:32:25 +02:00
Philippe GRAND
1207944761
internationalization
2021-06-20 11:29:47 +02:00
Philippe GRAND
9ccc9d0d3d
internationalization
2021-06-20 11:27:49 +02:00
Philippe GRAND
93512fd501
internationalization
2021-06-20 11:26:25 +02:00
Philippe GRAND
ddaa9ecfc1
internationalization
2021-06-20 11:24:36 +02:00
Philippe GRAND
9acbb984a1
internationalization
2021-06-20 11:22:17 +02:00
Philippe GRAND
e5083d18af
internationalization
2021-06-20 11:20:20 +02:00
Philippe GRAND
5977fe23e7
internationalization
2021-06-20 11:18:07 +02:00
Philippe GRAND
f8187eb70e
internationalization
2021-06-20 11:16:03 +02:00
Philippe GRAND
0d60323e41
internationalization
2021-06-20 11:13:31 +02:00
Philippe GRAND
e2ef205036
internationalization
2021-06-20 11:11:41 +02:00
Philippe GRAND
d3a9b03c89
internationalization
2021-06-20 11:08:53 +02:00
Philippe GRAND
f4199ca99e
internationalization
2021-06-20 11:06:04 +02:00
Philippe GRAND
e5f43cc678
internationalization
2021-06-20 11:03:28 +02:00
Philippe GRAND
33ffb8b943
internationalization
2021-06-20 11:01:38 +02:00
Philippe GRAND
e61d60e125
internationalization
2021-06-20 10:49:05 +02:00
Laurent Destailleur
e3e2dfd764
Fix generation of ODT (test if temporary directory is writable)
2021-06-20 05:11:46 +02:00
Laurent Destailleur
1a6647e690
Debug v14
2021-06-20 04:10:25 +02:00
Laurent Destailleur
ce818d4f44
Debug doc templates of ODF
2021-06-20 03:41:45 +02:00
Laurent Destailleur
8df9815049
Add warning to help understand bug of post_max_size.
2021-06-20 01:04:16 +02:00
Laurent Destailleur
0e80784de9
Add warning to help understand bug of post_max_size.
2021-06-20 00:32:25 +02:00
Laurent Destailleur
bf460526c0
Add warning when submiting file larger than post_max_size.
2021-06-20 00:27:24 +02:00
Laurent Destailleur
4a3da84098
Clean code
2021-06-19 23:52:52 +02:00
Laurent Destailleur
414b5e612f
Better info on upload size limit
2021-06-19 22:11:16 +02:00
Laurent Destailleur
edb4cf4130
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
README.md
htdocs/filefunc.inc.php
2021-06-19 20:05:25 +02:00
Laurent Destailleur
f303e6664b
Fix reposition do not add several times the page_y parameter.
2021-06-19 15:32:20 +02:00
Marc GUENNEUGUES
4346958455
Correct rights in core/ajax/row.php
2021-06-18 20:03:03 +02:00
Gauthier PC portable 024
50bc832532
FIX : better correction
2021-06-17 10:48:48 +02:00
Laurent Destailleur
61bd572a9c
Fix token for ajax call
2021-06-17 03:37:52 +02:00
Laurent Destailleur
3754c2c3c9
Fix name of field
2021-06-17 00:59:11 +02:00
Laurent Destailleur
f850f058fa
Look and feel v14
2021-06-16 21:06:55 +02:00
Laurent Destailleur
8c18837095
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-16 19:01:03 +02:00
Laurent Destailleur
f6998d7c32
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2021-06-16 19:00:52 +02:00
Gauthier PC portable 024
657972b79b
FIX : Tracking number label shouldn't be displaied on "espadon" model if shipping tracking number is empty
2021-06-16 16:49:24 +02:00
Laurent Destailleur
b2221d2c3a
Update extrafields.class.php
2021-06-16 14:31:22 +02:00
Antonin MARCHAL
d5cb81982d
fix wrong display on extrafields type = double
2021-06-16 14:21:23 +02:00
Frédéric FRANCE
5d79143401
fix php warning
2021-06-16 11:50:52 +02:00
Laurent Destailleur
e503f73e95
Comment dead code
2021-06-15 22:28:39 +02:00
Laurent Destailleur
8b238c43ce
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-15 22:23:46 +02:00
Laurent Destailleur
36f599519e
Merge pull request #17935 from frederic34/patch-8
...
fix php warning
2021-06-15 22:18:26 +02:00
Laurent Destailleur
6bf8e425c5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-15 22:18:07 +02:00
Laurent Destailleur
87a19af86d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/contacts.tpl.php
2021-06-15 22:17:53 +02:00
Laurent Destailleur
2a3b330e1e
Fix newToken()
2021-06-15 22:10:59 +02:00
Laurent Destailleur
ac7ad64737
Merge pull request #17934 from frederic34/patch-7
...
fix php warning
2021-06-15 22:08:37 +02:00
Laurent Destailleur
5ddf12b29c
Fix set language
2021-06-15 22:06:26 +02:00
Laurent Destailleur
1c87420895
Fix #yogosha6411
2021-06-15 20:22:36 +02:00
Laurent Destailleur
3a5770f679
Clean code
2021-06-15 20:16:05 +02:00
Laurent Destailleur
83ec4cbd71
Reponsive
2021-06-15 15:19:46 +02:00
Laurent Destailleur
80760d7960
Fix permissions
2021-06-15 14:18:09 +02:00
Frédéric FRANCE
5ceb957059
fix php warning
2021-06-15 08:48:52 +02:00
Frédéric FRANCE
8fbdde9ec3
Update contacts.tpl.php
2021-06-15 08:43:14 +02:00
Frédéric FRANCE
cd615b1717
fix php warning
2021-06-15 08:31:08 +02:00
Laurent Destailleur
3b9936f7e2
Fix responsive
2021-06-15 01:18:17 +02:00
stickler-ci
82f195dc30
Fixing style errors.
2021-06-14 19:15:53 +00:00
ATM john
be367c589f
WIP - create validation method for common object
2021-06-14 21:12:48 +02:00
ATM john
23765bf459
WIP - create validation method for common object
2021-06-14 20:59:46 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-06-14 13:37:02 +00:00
Laurent Destailleur
617338cccd
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-14 14:50:15 +02:00
Laurent Destailleur
4464aeb639
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-14 14:44:08 +02:00
Laurent Destailleur
6078267f86
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
2021-06-14 14:43:46 +02:00
Laurent Destailleur
dcca3011ee
Clean code
2021-06-14 14:41:50 +02:00
Laurent Destailleur
e41a3a2f42
Merge pull request #17867 from OPEN-DSI/v11-fix-clone-invoice-with-acount-line
...
FIX clone invoice with acount line
2021-06-14 14:41:05 +02:00
Laurent Destailleur
b588aee704
Merge pull request #17917 from fappels/14_create_thumbs_php8.0
...
Fix create image thumbs on php 8.0
2021-06-14 14:07:21 +02:00
Laurent Destailleur
03fbd68da4
Update images.lib.php
2021-06-14 14:05:48 +02:00
Laurent Destailleur
5cc86d2319
Fix #yogosha6370
2021-06-14 13:51:09 +02:00
Laurent Destailleur
046215f64a
Fix PHP8
2021-06-14 02:08:28 +02:00
Laurent Destailleur
f8f951977c
Debug v14
2021-06-14 01:33:01 +02:00
Francis Appels
a019996bc8
Fix create image thumbs on php 8.0
2021-06-13 17:36:51 +02:00
Laurent Destailleur
026d919a03
Merge pull request #17900 from frederic34/patch-7
...
fix warnings
2021-06-13 16:15:58 +02:00
Frédéric FRANCE
ebc0cc75dd
fix warning
2021-06-13 15:37:54 +02:00
Laurent Destailleur
abfc87c1de
Fix separator extrafields must not appear as selected fields
2021-06-13 13:32:41 +02:00
Laurent Destailleur
8b9af8f5ab
Responsive
2021-06-13 01:27:04 +02:00
Laurent Destailleur
9ba0fe07f0
Fix phpcs
2021-06-12 18:47:29 +02:00
Frédéric FRANCE
a723a8f93e
remove phpcs warning
2021-06-12 18:40:00 +02:00
ATM john
43ecba2e63
WIP - create validation method for common object
2021-06-12 14:16:40 +02:00
ATM john
578dc9adde
WIP - create validation method for common object
2021-06-12 12:58:20 +02:00
Laurent Destailleur
1933072712
Merge pull request #17893 from atm-john/develop_fix_missing_hooks_for_stock_mvm
...
New : Missing hook for stock movements list
2021-06-11 19:58:21 +02:00
Laurent Destailleur
bbb751dc53
Merge pull request #17822 from frederic34/zapier_create_contacts
...
add more capabilities for zapier
2021-06-11 19:51:01 +02:00
Laurent Destailleur
04a500f516
Merge pull request #17850 from moreauftheobald/Develop_hook_on_product_stat
...
Adding hooks on product stat in order to allow to expand stat on othe…
2021-06-11 19:33:37 +02:00
Laurent Destailleur
5d2f5b2305
Update product.lib.php
2021-06-11 19:33:07 +02:00
Laurent Destailleur
37ebedcafa
Update product.lib.php
2021-06-11 19:32:25 +02:00
Laurent Destailleur
756786f717
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/core/class/discount.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modFournisseur.class.php
htdocs/fourn/facture/card.php
htdocs/holiday/list.php
htdocs/paybox/admin/paybox.php
htdocs/paypal/admin/paypal.php
htdocs/product/price.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/permonth.php
htdocs/projet/activity/perweek.php
htdocs/stripe/admin/stripe.php
2021-06-11 19:05:05 +02:00
Laurent Destailleur
a057f17e56
Merge pull request #17878 from AlexisLaurier/fix/depositTranslationInInvoice
...
remove useless check on invoice line content when generating pdf
2021-06-11 18:13:58 +02:00
Laurent Destailleur
9e6890c719
Merge pull request #17884 from frederic34/patch-12
...
fix warning
2021-06-11 18:02:54 +02:00
Laurent Destailleur
ffb879d152
Merge pull request #17880 from frederic34/patch-8
...
fix warning
2021-06-11 18:02:45 +02:00
Laurent Destailleur
fbe970c739
Merge pull request #17879 from frederic34/patch-7
...
try to fix
2021-06-11 18:02:29 +02:00
Laurent Destailleur
0b4385b554
Merge pull request #17885 from frederic34/patch-13
...
fix warnings
2021-06-11 18:00:48 +02:00
Laurent Destailleur
0bbe2210f2
FIX #17649
2021-06-11 17:58:52 +02:00
Laurent Destailleur
92dc0d28ce
Fix disallow reserved values for field name
2021-06-11 17:50:52 +02:00
Laurent Destailleur
73a1119b26
Clean code
2021-06-11 15:21:24 +02:00
Laurent Destailleur
1605564d5e
Clean code
2021-06-11 14:54:18 +02:00
John BOTELLA
99cada2d43
Fix missing hooks
2021-06-11 14:42:51 +02:00
Laurent Destailleur
e17ab1cca6
Clean code
2021-06-11 09:22:01 +02:00
Laurent Destailleur
b0b2bb4d86
Fix trans
2021-06-11 09:20:59 +02:00
Frédéric FRANCE
f58cf14ae9
Update html.formmail.class.php
2021-06-10 22:28:19 +02:00
Frédéric FRANCE
86f39795c0
fix warnings
2021-06-10 22:26:58 +02:00
Frédéric FRANCE
acc41adb8d
fix warning
2021-06-10 22:22:24 +02:00
stickler-ci
82feb57fcf
Fixing style errors.
2021-06-10 19:56:03 +00:00
Marc de Lima Lucio
1e7df0ba9f
NEW: holiday: handle monthly updates with cronjob
2021-06-10 21:53:06 +02:00
Frédéric FRANCE
759472f5d1
fix warning
2021-06-10 20:58:56 +02:00
Frédéric FRANCE
3cb17d7535
fix warning
2021-06-10 20:40:10 +02:00
Frédéric FRANCE
648c1ef3a6
try to fix
2021-06-10 20:32:45 +02:00
Laurent Destailleur
4e87a08282
Try fix for #17866
2021-06-10 19:02:53 +02:00
Alexis LAURIER
1a2434818d
remove useless check on deposit line content when generating pdf
2021-06-10 18:00:49 +02:00
Laurent Destailleur
1bf63c7862
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
2021-06-10 16:53:09 +02:00
Laurent Destailleur
c44a368213
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-10 16:47:53 +02:00
Laurent Destailleur
24f8b6386e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2021-06-10 16:47:45 +02:00
stickler-ci
aae636bdc7
Fixing style errors.
2021-06-10 12:28:26 +00:00
Quentin VIAL-GOUTEYRON
1d279dedaa
missing &
2021-06-10 14:24:01 +02:00
Quentin VIAL-GOUTEYRON
71386479ad
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into FIX_multiple_order_linked_to_facture
2021-06-10 14:22:15 +02:00
Laurent Destailleur
92b20d3595
Merge pull request #17831 from atm-john/11.0_fix_doc_childtablesoncascade
...
FIX : childtablesoncascade doc
2021-06-10 12:59:19 +02:00
Laurent Destailleur
8a46fd376f
Update commonobject.class.php
2021-06-10 12:58:42 +02:00
Laurent Destailleur
1666e1277b
Merge pull request #17851 from atm-john/13.0_fix_php7_warning
...
Fix php 7 warning : Only variables should be passed by reference
2021-06-10 12:20:26 +02:00
Laurent Destailleur
32491dc668
Merge pull request #17868 from prolyfix/patch-1
...
bug resolution: exception
2021-06-10 12:09:20 +02:00
Laurent Destailleur
c4dcad5e6b
Fix regression
2021-06-10 11:57:42 +02:00
Laurent Destailleur
ea0db5a574
Fix popup of invoice
2021-06-10 01:10:35 +02:00
Laurent Destailleur
c40bc085b2
Fix v14
2021-06-10 00:55:10 +02:00
Laurent Destailleur
9afe8e54a7
Fix
2021-06-10 00:41:15 +02:00
Laurent Destailleur
067f37e22e
Clean code
2021-06-10 00:09:38 +02:00
prolyfix
e4d3fd4861
bug resolution: exception
...
when a user test the send mail functionality, an exception is thrown: $object is null in the method_exists's function. and thus not allowed.
Adding is_object resolve the problem
2021-06-09 23:09:31 +02:00
Laurent Destailleur
f472ff4fd9
Add phpunit for dol_eval
2021-06-09 17:47:27 +02:00
Laurent Destailleur
f1c94ac659
NEW Reduce scope of dol_eval function.
2021-06-09 17:44:42 +02:00
lvessiller
c37c371392
FIX clone invoice with acount line
2021-06-09 17:18:01 +02:00
Laurent Destailleur
0b7b12685f
Clean code
2021-06-09 16:41:43 +02:00
Laurent Destailleur
2681d58107
FIx CVE ID: CVE-2021-33816
2021-06-09 16:41:31 +02:00
Laurent Destailleur
fb46ece906
Fix yogosha 6347
2021-06-09 15:36:47 +02:00
Dorian Vabre
0a23cf029d
using strlen instead of count
2021-06-09 14:13:50 +02:00
Laurent Destailleur
c375668ab6
Clean code
2021-06-09 12:41:53 +02:00
Gauthier PC portable 024
4b6fb7dd47
FIX : auto rounding on "_FORMATED_" tags
2021-06-09 12:26:28 +02:00
Marc de Lima Lucio
4c6dfd8d5c
Merge branch 'NEW_13.0_project_block_timesheet' of github.com:marc-dll/dolibarr into develop
2021-06-09 11:03:04 +02:00
MOREAU FRANCK
a141d722ad
Adding hooks on product stat in order to allow to expand stat on other modules
...
stickler-ci test corrections
2021-06-09 08:39:06 +02:00
Marc de Lima Lucio
6733d278d8
NEW: project time spent: conf to prevent recording time after X months
2021-06-08 18:13:18 +02:00
MOREAU FRANCK
4b8dfc1abe
Adding hooks on product stat in order to allow to expand stat on other modules
2021-06-08 18:11:59 +02:00
MOREAU FRANCK
2e66509245
Adding hooks on product stat in order to allow to expand stat on other modules
2021-06-08 15:47:20 +02:00
Laurent Destailleur
1aeb91eb9a
FIX entry menus that has been lost in v13
...
Look and feel v14
2021-06-08 13:44:11 +02:00
John BOTELLA
5131ab5199
Fix php 7 warning : Only variables should be passed by reference
2021-06-08 12:36:08 +02:00
MOREAU FRANCK
207dc1df55
Adding hooks on product stat in order to allow to expand stat on other modules
2021-06-08 12:34:26 +02:00
stickler-ci
453ff4aa66
Fixing style errors.
2021-06-07 14:19:06 +00:00
Quentin VIAL-GOUTEYRON
66f7085225
Merge branch '12.0' of https://github.com/Dolibarr/dolibarr into FIX_multiple_order_linked_to_facture
2021-06-07 16:02:16 +02:00
Quentin VIAL-GOUTEYRON
d6c6170e9d
fix multiple order linked to invoice
2021-06-07 16:01:58 +02:00
Laurent Destailleur
0144d6c0fd
Inventory is now stable feature
2021-06-07 11:30:46 +02:00
Laurent Destailleur
d6cbb9007f
Debug ticket form to add a local file
2021-06-07 01:43:24 +02:00
Laurent Destailleur
242f8b2544
Debug v14
2021-06-07 01:23:34 +02:00
Maxime Kohlhaas
a63d3364b4
Fix links in box last MO
2021-06-06 22:51:27 +02:00
ATM john
801f6cab2d
WIP - create validation method for common object
2021-06-06 21:58:59 +02:00
ATM john
f1b1dcd1b1
WIP - create validation method for common object
2021-06-06 21:53:17 +02:00
ATM john
aa94d40ad0
WIP - create validation method for common object
2021-06-06 21:12:03 +02:00
Frédéric FRANCE
8401fa3ce7
add trigger member
2021-06-06 17:57:48 +02:00
Frédéric FRANCE
a0f0c86ae6
Merge remote-tracking branch 'upstream/develop' into zapier_create_contacts
2021-06-06 17:09:35 +02:00
Laurent Destailleur
9f177a0c63
Debug v14
2021-06-06 16:36:41 +02:00
Laurent Destailleur
a1bb7129da
Debug v14
2021-06-06 15:29:49 +02:00
ATM john
1aca7efce3
Fix childtablesoncascade doc
2021-06-06 13:15:03 +02:00
Frédéric FRANCE
efb5ec2901
search by name or email
2021-06-06 10:32:04 +02:00
Laurent Destailleur
70af18148b
Debug modulebuilder v14
2021-06-05 17:49:01 +02:00
Laurent Destailleur
273c4c2880
Fix typo
2021-06-05 15:28:41 +02:00
Laurent Destailleur
fb0d2cdddc
Debug v14
2021-06-05 15:27:49 +02:00
Laurent Destailleur
1e657b8621
Fix value of showoncombobox
2021-06-05 15:14:10 +02:00
Laurent Destailleur
ddbfb5d734
Fix translation of note of product
2021-06-05 11:14:06 +02:00
Laurent Destailleur
7a93365836
Fix bad name of var
2021-06-05 11:07:38 +02:00
Frédéric FRANCE
f6bc1c6414
add trigger contact
2021-06-05 09:37:38 +02:00
Laurent Destailleur
b6ba1de3b3
Fix remove use of captcha on backoffice for ticket creation
2021-06-05 02:18:45 +02:00
Laurent Destailleur
0147ffa737
Fix css
2021-06-04 14:38:22 +02:00
Laurent Destailleur
333cd9f48a
Merge pull request #17750 from daraelmin/patch-2
...
Fix #17743 newpayement source membersubscription is member
2021-06-04 13:04:17 +02:00
Laurent Destailleur
a94ef88549
Merge pull request #17748 from frederic34/patch-13
...
Update pdf_canelle.modules.php
2021-06-04 12:34:27 +02:00
Laurent Destailleur
f656214a66
Merge pull request #17746 from frederic34/patch-12
...
doxygen
2021-06-04 12:32:26 +02:00
Laurent Destailleur
f7c5a9e13a
Merge pull request #17757 from frederic34/patch-19
...
fix warning
2021-06-04 11:54:26 +02:00
Laurent Destailleur
702de427bd
Merge pull request #17758 from frederic34/patch-20
...
fix warnings
2021-06-04 11:52:53 +02:00
Laurent Destailleur
c67ea954f7
Merge pull request #17752 from frederic34/patch-14
...
fix warnings
2021-06-04 11:51:01 +02:00
Laurent Destailleur
c3ed30345e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 11:45:24 +02:00
Laurent Destailleur
2586fcd1a3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commandestats.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/holiday/month_report.php
htdocs/product/class/product.class.php
htdocs/product/stock/class/mouvementstock.class.php
htdocs/societe/list.php
2021-06-04 11:20:38 +02:00
Laurent Destailleur
6f1c49abcc
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/commande/class/commandestats.class.php
htdocs/user/class/usergroup.class.php
2021-06-04 11:04:18 +02:00
Laurent Destailleur
b31b210324
Merge pull request #17773 from Hystepik/develop#4
...
New : add of a new param in selectGroupTicket
2021-06-04 10:37:18 +02:00
Laurent Destailleur
4c592401e6
Merge pull request #17781 from cfoellmann/refuse-note
...
ADD note to supplier order refusal
2021-06-04 10:10:17 +02:00
Laurent Destailleur
ce64ebc167
Merge pull request #17805 from frederic34/patch-22
...
fix warning
2021-06-04 08:58:53 +02:00
Laurent Destailleur
8ba651bb88
Merge pull request #17812 from frederic34/patch-24
...
fix warning
2021-06-04 08:57:10 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode
2021-06-03 21:47:10 +02:00
Frédéric FRANCE
ee55a5568f
fix warning
2021-06-03 15:14:31 +02:00
Inovea Conseil
c534b7fcce
FIX delete object actionComm
2021-06-03 14:36:47 +02:00
ATM john
a7300d01b0
WIP - create validation method for common object
2021-06-03 09:49:07 +02:00
Frédéric FRANCE
ef032f9fa0
fix warning
2021-06-03 08:33:44 +02:00
Christian Foellmann
68579f9cda
fix html linebreak
2021-06-02 08:17:34 +02:00
Laurent Destailleur
0071d63fbb
Fix for ro-md language
2021-05-31 13:35:03 +02:00
Christian Foellmann
55d48077a3
ADD note to supplier order refusal
2021-05-31 10:45:34 +02:00
lmarcouiller
301d6ecd57
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4
2021-05-31 09:31:58 +02:00
lmarcouiller
ab64f467f5
add of a new param in selectGroupTicket
2021-05-31 09:31:38 +02:00
Laurent Destailleur
ea21e1dbfb
Fix color selection for ticket graph
2021-05-30 20:19:02 +02:00
Laurent Destailleur
d2bda7ad09
Set a maxlength on fields
2021-05-30 19:01:43 +02:00
Laurent Destailleur
4f6385338a
Fix option CAT_HIGH_QUALITY_IMAGES
2021-05-28 18:15:26 +02:00
Laurent Destailleur
81a94f5642
FIX option MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE
2021-05-28 18:04:45 +02:00
Frédéric FRANCE
ca0654323f
fix warnings
2021-05-27 23:11:05 +02:00
Frédéric FRANCE
d0b8a80c7a
fix warning
2021-05-27 22:56:20 +02:00
Frédéric FRANCE
52d44bd75e
fix warnings
2021-05-27 22:28:59 +02:00
daraelmin
4095c69582
Fix #17743 newpayement source membersubscription is member
...
Fix #17743 newpayement source membersubscription is not valid anymore
@eldy I'm not sure, but the bug may still occure with external module referring to membersubscription instead of member.
2021-05-27 21:09:49 +02:00
Frédéric FRANCE
f1b32dce17
Update pdf_canelle.modules.php
2021-05-27 17:07:59 +02:00
Frédéric FRANCE
00d60aa65a
doxygen
2021-05-27 16:54:41 +02:00
Frédéric FRANCE
3ebe6eb014
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF
2021-05-27 00:02:01 +02:00
Laurent Destailleur
8b1b2019f8
Update html.form.class.php
2021-05-26 17:24:27 +02:00
Laurent Destailleur
c3c0ad1c8d
Update html.form.class.php
2021-05-26 17:20:09 +02:00
Antonin MARCHAL
d11d1a2018
lint(stickler)
2021-05-26 17:10:12 +02:00
Antonin MARCHAL
8dd2af42df
fix(param) select_produits_fournisseur_list
2021-05-26 16:44:35 +02:00
Laurent Destailleur
f9d6438bae
Debug v14
2021-05-25 23:26:03 +02:00
Laurent Destailleur
a22a659d6e
Merge pull request #17716 from frederic34/patch-5
...
fix allowed preview
2021-05-25 22:53:28 +02:00
Laurent Destailleur
8576cf1b72
Fix combo when we must no hide value with key -1
2021-05-25 22:51:37 +02:00
Frédéric FRANCE
4c698ce798
Update html.form.class.php
2021-05-25 22:11:30 +02:00
Frédéric FRANCE
c76cf60e15
Update html.form.class.php
2021-05-25 22:09:58 +02:00
Laurent Destailleur
9b2fb74dca
Merge pull request #17635 from FHenry/fix_13_cyan_salesman_as_note
...
fix : hidden option MAIN_ADD_CREATOR_IN_NOTE should use dol_concatdesc rather than php concat oparator
2021-05-25 21:40:12 +02:00
Laurent Destailleur
bad90240bc
Update pdf_cyan.modules.php
2021-05-25 21:39:50 +02:00
Laurent Destailleur
c7a56e3f99
Merge pull request #17690 from Givriz/dev_1
...
Compatibility phpv8
2021-05-25 20:36:56 +02:00
Laurent Destailleur
714334c585
Merge pull request #17698 from OPEN-DSI/new-translate-order-supplier
...
NEW translate supplier order menus and button
2021-05-25 20:34:17 +02:00
Laurent Destailleur
80e77f597d
Merge pull request #17701 from FHenry/13.0_fix_formconfirm
...
fix: formconfim if type radio must be :checked to get correct value
2021-05-25 20:03:10 +02:00
Laurent Destailleur
673eb73d0a
Merge branch 'develop' into dev_1
2021-05-25 19:55:31 +02:00
Laurent Destailleur
67372ff7d4
Merge branch 'develop' into patch-1
2021-05-25 19:45:56 +02:00
Laurent Destailleur
b9de8561a9
Fix regression
2021-05-25 15:59:36 +02:00
Laurent Destailleur
97154f8267
Fix timezone into widgets
2021-05-25 00:29:32 +02:00
Laurent Destailleur
dd48c3ee9d
Remove deprecated __REFCLIENT__ (Replaced with __REF_CLIENT__)
2021-05-25 00:08:06 +02:00
Laurent Destailleur
bb64a25638
Fix CWE-269 - huntr - Fix set of email without edit user permission
2021-05-24 22:11:24 +02:00
Laurent Destailleur
31af74f852
FIX CWE-269 - huntr - Can download files of an agenda event
2021-05-24 20:07:04 +02:00
Laurent Destailleur
d4310f49c4
FIX CWE-79 - huntr - Fix option MAIN_ALLOW_SVG_FILES_AS_IMAGES
2021-05-24 19:46:19 +02:00
Laurent Destailleur
cdf3b7f9a8
Fix responsive
2021-05-24 19:05:25 +02:00
piernov
60176f7f5e
Fix add/del user to group modifies LDAP group
...
Adding or removing a user from a group modifies the user object on Dolibarr's side.
In LDAP however, members of a group are stored in the group itself.
Therefore group must be updated after adding/removing a user from it.
Update group in LDAP with new list of users at the end of USER_MODIFY trigger.
2021-05-24 18:01:27 +02:00
gmilad
89f150dd95
Fix #16100 Update utils.class.php
...
Fix #16100
End French Forum :
https://www.dolibarr.fr/forum/t/erreur-sauvegarde-dump-base-de-donnees/35009/7
2021-05-22 21:28:45 +02:00
Laurent Destailleur
a0418fc17d
FIX CWE-269 huntr - download of files of project
2021-05-21 18:53:09 +02:00
Laurent Destailleur
11fa523070
FIX CWE-269
2021-05-21 15:54:11 +02:00
Florian HENRY
609d405685
fix: formconfim if type radio must be :checked to get correct value
2021-05-21 15:38:03 +02:00
lvessiller
38bd595ebd
NEW translate supplier order menus and button
2021-05-21 14:18:46 +02:00
Givriz
0c5a934e10
Compatibility phpv8
2021-05-20 17:40:44 +02:00
Laurent Destailleur
5191a419d3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-20 15:05:55 +02:00
Laurent Destailleur
45bc686f7f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/product/price.php
2021-05-20 15:05:30 +02:00
Laurent Destailleur
4c1e6afe2c
Merge pull request #17664 from Givriz/dev_1
...
Compatibility phpv8
2021-05-20 14:29:18 +02:00
Florian HENRY
62bc6e9e1f
on going
2021-05-20 13:15:32 +02:00
Laurent Destailleur
a3c28edfbb
Fix regenerate wrapper when rebuilding cache
2021-05-20 10:34:49 +02:00
Laurent Destailleur
dbd7292cd6
Replace doubleval into floatval
2021-05-20 09:22:55 +02:00
Laurent Destailleur
20c3ebeb51
Make SimplePOS deprecated
2021-05-19 19:46:46 +02:00
Laurent Destailleur
92ccf5982a
Fix responsive
2021-05-19 14:38:39 +02:00
Laurent Destailleur
8f5c898dae
CSS
2021-05-19 14:13:42 +02:00
Laurent Destailleur
173ef6e877
Look and feel v14
2021-05-19 14:04:01 +02:00
Laurent Destailleur
a8d36a3a55
Debug v14
2021-05-19 13:56:13 +02:00
Laurent Destailleur
026cc1b35a
Debug for smartphone
2021-05-19 13:21:09 +02:00
Laurent Destailleur
58ffee193f
Debug v14
2021-05-19 13:07:25 +02:00
Laurent Destailleur
75f7ab41f0
css
2021-05-19 12:13:21 +02:00
Laurent Destailleur
78cf2b59c8
Debug feature copy-paste on smarpthone
2021-05-19 11:47:58 +02:00
Givriz
1cf7d0cee7
Compatibility phpv8
2021-05-18 20:13:26 +02:00
Florian Mortgat
6cccd77508
FIX 13.0 - error message says MAIN_DISABLE_ALL_MAILS is set when it isn't + unhandled swiftmailer error (failed recipients due to RFC 2822 non-compliance)
2021-05-18 17:57:23 +02:00
Laurent Destailleur
271ba884db
css
2021-05-18 17:24:17 +02:00
Laurent Destailleur
a00ae6c918
css
2021-05-18 17:00:20 +02:00
Laurent Destailleur
c2cb055b0a
Fix look and feel v14
2021-05-18 14:00:29 +02:00
Laurent Destailleur
303d60a0bd
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-18 12:45:34 +02:00
Laurent Destailleur
0c4884bb2c
Fix sql error
2021-05-18 12:44:56 +02:00
Laurent Destailleur
5babd107a0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/replenish.php
2021-05-18 12:43:52 +02:00
Laurent Destailleur
495d2e79f4
Update html.form.class.php
2021-05-18 12:35:30 +02:00
Laurent Destailleur
b6dbe45242
Fix permissions on page to move position of file
2021-05-18 01:58:54 +02:00
Laurent Destailleur
ba0e95a4ff
FIX huntr CWE-79
2021-05-17 23:47:16 +02:00
Bastien Schils
1a38d075a6
html.form.class.php: Fixed SQL error (projects)
...
1. Strings should be quoted by single quotes
2. GROUP BY declaration must list all fields from SELECT statement
2021-05-17 18:35:50 +02:00
Laurent Destailleur
d888e4b3bf
Merge pull request #17385 from Givriz/dev_1
...
Compatibility phpv8
2021-05-17 16:29:49 +02:00
Florian HENRY
6f3d19b7b6
dol_concatdesc better than concat operator
2021-05-17 15:12:25 +02:00
Laurent Destailleur
bffdc8fa95
Merge pull request #17587 from FHenry/dev_fix_sale_top_menu_supplieronly
...
fix: when only supplier module is Active top menu should be displayed
2021-05-17 13:48:03 +02:00
Laurent Destailleur
4a488ad60a
Update eldy.lib.php
2021-05-17 13:47:48 +02:00
Florian HENRY
f95bd2f439
fixw that
2021-05-17 11:40:36 +02:00
Laurent Destailleur
1b25c4daa0
Fix phpcs
2021-05-17 11:29:51 +02:00
Laurent Destailleur
f25c57b1f6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 11:26:43 +02:00
Laurent Destailleur
6402ef9496
Fix colors
2021-05-17 11:26:31 +02:00
Laurent Destailleur
082ae2e627
Fix trans
2021-05-17 11:11:17 +02:00
Laurent Destailleur
d0c634a99c
Merge pull request #17489 from Hystepik/develop#1
...
Fix #17475 : Add of List-Unsubscribe in mass emailing
2021-05-17 10:23:21 +02:00
Florian HENRY
6ffbc2744e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_sale_top_menu_supplieronly
2021-05-17 09:22:51 +02:00
Laurent Destailleur
8dc6241aee
Clean dead code
2021-05-17 08:58:02 +02:00
Laurent Destailleur
ac95302fa7
Clean comment
2021-05-17 08:48:02 +02:00
Laurent Destailleur
40106ff767
Update html.formmail.class.php
2021-05-17 08:35:29 +02:00
Laurent Destailleur
09a6946281
Update html.formmail.class.php
2021-05-17 08:34:58 +02:00
Laurent Destailleur
4768729c09
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/core/class/rssparser.class.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
htdocs/expedition/list.php
2021-05-17 07:57:32 +02:00
Laurent Destailleur
2f2ba933f8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/user/class/usergroup.class.php
2021-05-17 07:33:28 +02:00
Laurent Destailleur
b8b2928dd1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-17 07:29:30 +02:00
Laurent Destailleur
5a15dbf545
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/user/class/usergroup.class.php
2021-05-17 07:29:19 +02:00
Laurent Destailleur
17b08cc22f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 07:27:13 +02:00
Laurent Destailleur
6bf66adff0
Fix remove some $_REQUEST
2021-05-17 07:27:02 +02:00
Laurent Destailleur
84ae2a2f91
Merge pull request #17624 from atm-maxime/patch-2
...
Update box_dolibarr_state_board.php
2021-05-17 07:15:50 +02:00
Laurent Destailleur
6a2afabcac
Merge pull request #17617 from piernov/11.0-fix-LDAPposixGroupId
...
Fix: properly set gid for Group LDAP synchro
2021-05-17 07:14:25 +02:00
Laurent Destailleur
88cdda2b8a
Merge pull request #17612 from frederic34/patch-3
...
avoid sql error with sql_mode=only_full_group_by
2021-05-17 07:12:11 +02:00
Laurent Destailleur
ad64b43e30
Update html.form.class.php
2021-05-17 07:11:41 +02:00
Laurent Destailleur
428ab1b67a
Merge pull request #17626 from atm-maxime/fix/ticket
...
Fix ticket when module societe not enabled
2021-05-17 06:59:32 +02:00
Laurent Destailleur
78b38f75a1
Minor fixes
2021-05-17 06:39:18 +02:00
Laurent Destailleur
d1ff2e3590
Add comment
2021-05-17 06:18:47 +02:00
Laurent Destailleur
9a8bd2c24b
Add missing field
...
Fix duplicate / in url
2021-05-17 06:13:26 +02:00
Maxime Kohlhaas
d3ff549b21
Fix ticket when module societe not enabled
2021-05-16 18:48:18 +02:00
Maxime Kohlhaas
d4aa0ae422
Update box_dolibarr_state_board.php
...
Global stats box is always enabled
2021-05-16 18:26:26 +02:00
Maxime Kohlhaas
7af0bda3a5
Update admin_extrafields_view.tpl.php
2021-05-16 11:33:07 +02:00
piernov
1cbe0e3f2d
Fix: properly set gid for Group LDAP synchro
...
Even if the gidNumber field was set in the configuration, a gid different from the Dolibarr's one was generated and stored into LDAP.
Now the gidNumber is properly set to Dolibarr's gid if gidNumber field is set in the LDAP module configuration.
2021-05-15 18:01:34 +02:00
Maxime Kohlhaas
db32f882e8
Fix use of DatePropal instead of Date
2021-05-15 07:45:04 +02:00
Frédéric FRANCE
cff0b69ce0
avoid sql error with sql_mode=only_full_group_by
...
SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM llx_societe as s, llx_contrat as t, llx_contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (2) AND t.entity IN (1)[DB_ERROR_1140] In aggregated query without GROUP BY, expression #4 of SELECT list contains nonaggregated column 'dolibarrdev.t.rowid'; this is incompatible with sql_mode=only_full_group_by
2021-05-14 18:30:56 +02:00
Laurent Destailleur
f504cbcec4
Fix log
2021-05-12 19:18:51 +02:00
Laurent Destailleur
aa2d85276e
Debug v14
2021-05-12 18:38:22 +02:00
Florian HENRY
394d43543d
fix: when only supplier module is ON top menu should be displayed
2021-05-12 12:04:50 +02:00
Laurent Destailleur
a665ff5bda
Copy-Paste works also for hidden fields
2021-05-12 11:51:39 +02:00
Laurent Destailleur
cfded75d11
Debug v14
2021-05-12 09:27:04 +02:00
lmarcouiller
cd4583a841
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-05-12 09:08:19 +02:00
Laurent Destailleur
b8254186ce
Clean code
2021-05-12 09:07:36 +02:00
Laurent Destailleur
8971fde420
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-11 23:49:59 +02:00
Laurent Destailleur
f84817f0f6
FIX rss module on servers with allow_url_fopen=0
2021-05-11 23:49:33 +02:00
Frédéric FRANCE
a948fc4ed8
Update extrafields.class.php
2021-05-11 22:12:15 +02:00
stickler-ci
b8a3485c4c
Fixing style errors.
2021-05-11 19:33:23 +00:00
Laurent Destailleur
b5a43c8d1d
FIX #17502
2021-05-11 21:31:43 +02:00
kastoras
cd9ea9566b
Change parameter name to MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE
2021-05-11 22:31:38 +03:00
kastoras
55caff1dd9
Merge remote-tracking branch 'origin/create_share_on_file_upload_with_other_setup' into develop
2021-05-11 22:23:12 +03:00
Laurent Destailleur
4ec763a436
Merge pull request #17497 from Hystepik/develop_v13#2
...
Fix #17491 : date extrafield filter works well now
2021-05-11 21:15:50 +02:00
Laurent Destailleur
91312f0411
Fix url for emailing unsubscribe
2021-05-11 21:13:52 +02:00
Laurent Destailleur
aa05788d62
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/compta/bank/class/account.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/security.lib.php
htdocs/core/modules/societe/mod_codeclient_elephant.php
htdocs/filefunc.inc.php
test/phpunit/CodingPhpTest.php
2021-05-11 20:34:46 +02:00
Laurent Destailleur
c0689b3884
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-11 20:18:43 +02:00
Laurent Destailleur
c3b5491805
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-11 20:18:36 +02:00
Laurent Destailleur
971d611eb6
Fix phpcs
2021-05-11 20:12:25 +02:00
Laurent Destailleur
780254bfd4
Merge pull request #17533 from daraelmin/daraelmin-mailing-subskey
...
New substitution key for member new form url in mailing
2021-05-11 19:41:12 +02:00
Laurent Destailleur
6591c3f50e
Merge pull request #17538 from AlexisLaurier/fix/restrictedAreaPaymentFournDelete
...
bug fix - deletion of invoice supplier payment
2021-05-11 19:27:05 +02:00
Laurent Destailleur
8336f56b40
Merge pull request #17539 from AlexisLaurier/fix/elephantClientCodeVerifDispoMultiEntity
...
add entity check on verif_dispo mod_codeclient_elephant
2021-05-11 19:13:17 +02:00
Frédéric FRANCE
e0cc6a4981
fix $db in class
2021-05-11 18:34:43 +02:00
Laurent Destailleur
eab3ac0615
Merge pull request #17558 from aspangaro/14b6
...
Fix Title supplier proposal
2021-05-11 18:18:35 +02:00
Laurent Destailleur
22b1d87973
Merge pull request #17555 from andreubisquerra/develop
...
NEW DOL_VALUE_PLACE tag in TakePOS template
2021-05-11 18:17:01 +02:00
Laurent Destailleur
d98e046fbd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-11 18:02:37 +02:00
Laurent Destailleur
56b0b5a1f1
Merge pull request #17575 from frederic34/patch-12
...
fix php8 warning
2021-05-11 18:00:29 +02:00
Laurent Destailleur
bea1b83e3f
Merge pull request #17570 from frederic34/patch-7
...
fix php8 warning
2021-05-11 17:58:59 +02:00
Laurent Destailleur
1c79b47147
Merge pull request #17574 from frederic34/patch-11
...
fix php8 warning
2021-05-11 17:58:17 +02:00
Laurent Destailleur
d8cbb735a3
Fix rtl language for pdf
2021-05-11 17:58:00 +02:00
Laurent Destailleur
c37ccc10b1
Debug v14
2021-05-11 14:50:04 +02:00
Pierre Payet
ff178667a3
add thirdparty customer code to substitutionarray
2021-05-11 12:33:35 +02:00
atm-lena
8fb474c687
Add Hook Extrafields Update - init extrafieldssdao
2021-05-11 11:35:54 +02:00
Frédéric FRANCE
eccfa40396
fix php8 warning
...
remove variables not used
2021-05-11 08:28:35 +02:00
Frédéric FRANCE
7e1ed07910
fix php8 warning
2021-05-11 08:26:03 +02:00
Frédéric FRANCE
9725c8f309
fix php8 warning
2021-05-11 08:05:30 +02:00
Alexandre SPANGARO
427221c8d3
Merge remote-tracking branch 'upstream/develop' into 14b6
2021-05-11 07:02:04 +02:00
Laurent Destailleur
d7a5e342ab
Optimize some widgets
2021-05-10 20:16:51 +02:00
Laurent Destailleur
6499270619
v14
2021-05-10 15:29:23 +02:00
Laurent Destailleur
2dd3148e3f
Fix look and feel v14
2021-05-10 15:24:07 +02:00
Laurent Destailleur
a2cd181435
FIX Debug reception module
2021-05-10 11:53:19 +02:00
Alexandre SPANGARO
100b0f297e
Fix Title supplier proposal contact card
2021-05-10 06:32:28 +02:00
Alexandre SPANGARO
c0062e2d41
Move title to v14 ergonomy
2021-05-10 06:26:58 +02:00
stickler-ci
3ee26fc881
Fixing style errors.
2021-05-09 21:37:58 +00:00
andreubisquerra
8aa8c14323
Fix
2021-05-09 22:53:05 +02:00
andreubisquerra
5a5811a716
NEW DOL_VALUE_PLACE tag in TakePOS template
...
Very important in restaurant orders
2021-05-09 22:37:00 +02:00
Laurent Destailleur
19bae333c9
Add option MAIN_SHOW_PASSWORD_INTO_LOG
2021-05-09 22:07:08 +02:00
Laurent Destailleur
1fb5b0f681
Fix rtl languages
2021-05-09 20:25:57 +02:00
Laurent Destailleur
3ad8827c8a
Clean code
2021-05-09 20:17:17 +02:00
Laurent Destailleur
8cc100012d
Fix vulnerabiity: External users can set a public note
2021-05-09 12:50:46 +02:00
Alexis LAURIER
e4a430f638
add entity check on verif_dispo mod_codeclient_elephant
2021-05-08 10:24:08 +02:00
Alexis LAURIER
d04c741a3b
add payment_fourn delete proper check into security.lib
2021-05-08 09:12:17 +02:00
stickler-ci
fc26e5eecf
Fixing style errors.
2021-05-07 20:42:53 +00:00
kastoras
1a385052f6
New Create share link on file upload
...
Create MAIN_CREATE_SHARE_ON_FILE_UPLOAD, when this set to 1 and a file is uploaded a shared link will be created
2021-05-07 23:39:14 +03:00
daraelmin
bfac47c84e
Too much underscore
2021-05-07 17:16:58 +02:00
daraelmin
a75d6e9050
Add tooltip
2021-05-07 17:14:33 +02:00
lmarcouiller
f054169036
revert of last push error of branch
2021-05-07 15:56:33 +02:00
lmarcouiller
0466704dc7
Fix #17477 : Sql error in invoices cards
2021-05-07 15:49:49 +02:00
lmarcouiller
bf64bde571
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-05-07 15:22:10 +02:00
lmarcouiller
b41a87ff70
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-05-07 12:06:46 +02:00
stickler-ci
d108496c67
Fixing style errors.
2021-05-07 07:47:49 +00:00
lmarcouiller
c39dbd81b3
Fix #17491 : Update of fix date extrafield filter
2021-05-07 09:47:15 +02:00
lmarcouiller
5dcdb06e91
Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#2
2021-05-07 09:46:37 +02:00
lmarcouiller
f4291dc985
commit missing file
2021-05-07 09:20:18 +02:00
lmarcouiller
0f2ce8687d
Fix #17475 : Update of previous fix
2021-05-07 09:19:44 +02:00
Frédéric FRANCE
a56dc4ff65
fix mulitple module using completeTabsHead
...
complete $template['head'] in module and return 0 to not replace instead return $head and replace
2021-05-06 22:28:03 +02:00
Laurent Destailleur
6159321bed
NEW Show picto of module into the list of dictionaries
2021-05-06 18:31:36 +02:00
Laurent Destailleur
6b825cbc3b
Clean code
2021-05-06 18:06:19 +02:00
Laurent Destailleur
a22d3f8627
Merge pull request #17301 from andreubisquerra/master
...
NEW More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
2021-05-06 17:20:46 +02:00
Laurent Destailleur
d5c737ddb6
Update modTakePos.class.php
2021-05-06 17:19:28 +02:00
Laurent Destailleur
bd5e141d26
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/mails_templates.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
htdocs/societe/consumption.php
2021-05-06 17:07:44 +02:00
Laurent Destailleur
3090c124f0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-06 16:59:06 +02:00
Laurent Destailleur
8410f4a9c9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/mails_templates.php
htdocs/societe/consumption.php
htdocs/user/class/user.class.php
2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/societe/consumption.php
2021-05-06 16:52:36 +02:00
Laurent Destailleur
7515de456f
Merge pull request #17495 from daraelmin/daraelmin-patch-2
...
New 5 substitutions keys "online payment link" in mailing
2021-05-06 16:36:10 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment
...
new: working on conference or booth object and event type #FoundationFunding
2021-05-06 16:31:30 +02:00
Laurent Destailleur
0867be4af5
Merge pull request #17513 from dolibit-ut/patch-320
...
Update modules_member.class.php
2021-05-06 16:27:45 +02:00
lmarcouiller
7d649dd90e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-05-06 16:26:30 +02:00
Laurent Destailleur
864c2a0bf7
Merge pull request #17506 from atm-gauthier/FIX_column_adding_management_in_dom_added_with_ajax_case
...
FIX : if dom is added with ajax, selector needs to keep working
2021-05-06 16:24:26 +02:00
Laurent Destailleur
5a927702c0
Merge pull request #17500 from fmarcet/develop
...
NEW: Add import on BOM
2021-05-06 16:21:09 +02:00
Laurent Destailleur
9e057332f0
Merge pull request #17486 from NextGestion/dolibarr_partnership
...
Dolibarr partnership
2021-05-06 16:11:13 +02:00
UT from dolibit
9cd78e6ecf
Update modules_member.class.php
2021-05-06 16:00:49 +02:00
Laurent Destailleur
a0f85044fc
Merge pull request #17510 from Hystepik/develo#2
...
Fix #17501 : Undownloable attached file
2021-05-06 16:00:20 +02:00
Laurent Destailleur
21ce99338b
Merge pull request #17504 from FHenry/13.0
...
fix missing token
2021-05-06 15:57:45 +02:00
lmarcouiller
d55309c847
fix rename file
2021-05-06 09:46:54 +02:00
Laurent Destailleur
19f78b2e8f
More compact gui
2021-05-05 19:13:40 +02:00
Gauthier PC portable 024
9108651a7a
FIX : if dom is added with ajax, selector need to keep working
2021-05-05 17:25:12 +02:00
Florian HENRY
adc8620506
fix: allow webdavs link type
2021-05-05 17:14:58 +02:00
Florian HENRY
e62c6be54c
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0
2021-05-05 17:06:03 +02:00
Florian HENRY
7857da4db7
fix missing token
2021-05-05 17:05:51 +02:00
lmarcouiller
6589bab20a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2
2021-05-05 16:48:28 +02:00
lmarcouiller
ed59a8851f
Fix #17501 : Undownloable attached file
2021-05-05 16:48:04 +02:00
Ferran Marcet
6f66efacb8
New: Add import on BOM
2021-05-05 13:47:43 +02:00
Marc de Lima Lucio
139ae3db00
FIX: pgsql: prevent 'WHERE 1'
2021-05-05 11:49:11 +02:00
stickler-ci
95be7e8a63
Fixing style errors.
2021-05-05 09:29:52 +00:00
lmarcouiller
b739e7ba22
Fix #17491 : date extrafield filter works well now
2021-05-05 11:26:15 +02:00
Laurent Destailleur
f1929eb106
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-05 00:16:27 +02:00
Laurent Destailleur
3807804acc
Fix option MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE
2021-05-05 00:15:52 +02:00
stickler-ci
fb3c8e698e
Fixing style errors.
2021-05-04 20:59:32 +00:00
daraelmin
b04dfcadc7
Add function to get html online payment link
2021-05-04 21:55:19 +02:00
Laurent Destailleur
bf52b54db6
Add date in error message
2021-05-04 19:43:33 +02:00
lmarcouiller
457a96bc34
Fix #17475 : Add of List-Unsubscribe in mass emailing
2021-05-04 15:11:30 +02:00
Laurent Destailleur
526235d020
Fix substitution of mix html/nohtml
...
Fix send email reminder for past due date of invoices
More PHPUnit test
2021-05-04 13:33:18 +02:00
NextGestion
6f85cab6c4
Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership
2021-05-04 10:55:19 +01:00
daraelmin
729a5677ad
Group tooltip by key type
2021-05-04 01:53:46 +02:00
daraelmin
9ab7f4ec01
Add tooltip for new substitution keys
2021-05-04 01:41:32 +02:00
Laurent Destailleur
1d0c0a8d2a
Fix phpcs
2021-05-04 00:35:36 +02:00
Laurent Destailleur
bb64c330f6
Merge pull request #17441 from fappels/13_tokenonactiondelete
...
FIX missing token on dolGetButtonAction for action delete
2021-05-04 00:21:55 +02:00
Laurent Destailleur
b2901bfae0
Make code simpler
2021-05-04 00:15:06 +02:00
Laurent Destailleur
16f1651d4e
Add missing action events in trigger
2021-05-04 00:04:44 +02:00
Laurent Destailleur
6e32efdb40
Fix phpcs
2021-05-03 20:22:36 +02:00
Laurent Destailleur
e4499976e9
Disable empty tabs
2021-05-03 19:56:31 +02:00
Laurent Destailleur
a3431a790a
Merge pull request #17404 from bb2a/doctemplate
...
New Add option for doctemplate
2021-05-03 19:45:40 +02:00
Laurent Destailleur
9973085613
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/comm/propal/card.php
htdocs/compta/bank/releve.php
htdocs/compta/paiement/rapport.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/reception/card.php
htdocs/societe/societecontact.php
2021-05-03 19:36:49 +02:00
Laurent Destailleur
9dc36d13c3
Enhance error management
2021-05-03 19:25:16 +02:00
Laurent Destailleur
cbc481dc60
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/adherents/list.php
htdocs/adherents/type.php
htdocs/core/lib/company.lib.php
2021-05-03 19:01:47 +02:00
Laurent Destailleur
17cb441569
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-03 18:58:50 +02:00
Laurent Destailleur
540e4f3d2e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-03 18:58:41 +02:00
Laurent Destailleur
b7816f3d96
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-03 18:58:03 +02:00
Laurent Destailleur
2d7ecb8a44
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/boxes/box_produits_alerte_stock.php
2021-05-03 18:57:52 +02:00
Laurent Destailleur
33a20ae9a1
Update extrafields.class.php
2021-05-03 16:16:44 +02:00
Laurent Destailleur
5962f1cccd
Merge pull request #17445 from OPEN-DSI/new-societe-compta-code-digiteria
...
NEW rise code tries in digeteria customer and supplier accountant code
2021-05-03 15:57:46 +02:00
Laurent Destailleur
7b706d6fe5
Fix phpunit for crop of image
2021-05-03 15:56:56 +02:00
Laurent Destailleur
5d870d5802
FIx #17447
2021-05-03 15:36:34 +02:00
Laurent Destailleur
1c95e2b7c7
FIX #17453
2021-05-03 14:58:29 +02:00
Laurent Destailleur
c6a9117a00
Graph color
2021-05-03 14:03:50 +02:00
Laurent Destailleur
b22f2dd2c8
Merge pull request #17415 from Hystepik/develo#2
...
Close #17271 : Replacement of 2 graphes in /compta/index.php
2021-05-03 13:56:44 +02:00
Laurent Destailleur
a806a18455
Reduce sql
2021-05-03 13:35:10 +02:00
Laurent Destailleur
39e27b6f38
Minor perf enhancement
2021-05-03 12:32:31 +02:00
Laurent Destailleur
2a47128e2d
Code comment
2021-05-03 11:00:41 +02:00
Laurent Destailleur
2bef447229
Clean code
2021-05-02 16:24:52 +02:00
Laurent Destailleur
efda17657d
Fix conversion in webp
2021-05-02 15:29:52 +02:00
Laurent Destailleur
39f7d0bed8
Fix conversion of images
2021-05-02 15:15:27 +02:00
Laurent Destailleur
92c1022b8e
Fix duplicate in webp
2021-05-02 14:49:07 +02:00
Laurent Destailleur
8176898430
Fix lang
2021-05-02 14:31:03 +02:00
Laurent Destailleur
a54e60d345
Look and feel v14
2021-05-02 13:13:55 +02:00
Laurent Destailleur
3edb929f9e
Debug v14
2021-05-02 12:43:28 +02:00
Laurent Destailleur
24a58b1956
Removed not used permission
2021-05-02 11:21:01 +02:00
Laurent Destailleur
4e7e6048de
Debug generation of webp
2021-05-01 15:42:49 +02:00
Laurent Destailleur
99d655b983
Debug generation of webp
2021-05-01 15:38:58 +02:00
Laurent Destailleur
575d335374
Debug generation of webp
2021-05-01 15:12:30 +02:00
Laurent Destailleur
0ee1d4b322
Reduce log verbosity
2021-05-01 13:22:01 +02:00
Laurent Destailleur
69511e2706
Debug
2021-04-30 16:15:35 +02:00
lvessiller
ab89fe73c2
NEW rise code tries in digeteria customer and supplier accountant code
2021-04-30 16:08:46 +02:00
Laurent Destailleur
e99355a0c2
Clean html
2021-04-30 15:22:17 +02:00
ATM john
6e4962bb39
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0_fix_showInputField_checkbox_selection
2021-04-30 12:22:31 +02:00
ATM john
6c1e0919c8
Fix checkbox multiselect pre-selected value from get/post
2021-04-30 12:20:43 +02:00
Laurent Destailleur
67fd5477c9
Merge pull request #17427 from Hystepik/develop#4
...
New Module Knowledge Management
2021-04-30 12:12:15 +02:00
Francis Appels
773b16928d
only if no token
2021-04-30 11:15:01 +02:00
Laurent Destailleur
5a1f2db024
Clean sql
2021-04-30 10:57:21 +02:00
Francis Appels
05a96b3ee2
FIX missing token on dolGetButtonAction for action delete
2021-04-30 10:46:05 +02:00
stickler-ci
81b964db45
Fixing style errors.
2021-04-30 08:12:24 +00:00
atm-lena
5e98d99321
FIX SQL Error show_contacts : socialnetworks
2021-04-30 10:04:21 +02:00
Laurent Destailleur
e7e2953a9e
Look and feel
2021-04-29 15:49:44 +02:00
Laurent Destailleur
e3767557d8
Fix phpcs
2021-04-29 12:33:49 +02:00
Laurent Destailleur
655056ed31
Debug v14
2021-04-29 12:10:55 +02:00
Florian HENRY
a7b093ed81
FIX: Espadon PDF shippment model with long public note now wroking
2021-04-29 11:34:09 +02:00
lmarcouiller
d4fb9c7c47
knowledgemanager finished
2021-04-29 10:49:56 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment
2021-04-29 10:31:43 +02:00
Laurent Destailleur
a2245bd7db
Fix add of box
2021-04-29 10:13:43 +02:00
Laurent Destailleur
de8e291c7e
Debug v14
2021-04-29 10:01:10 +02:00
lmarcouiller
6da32015f4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4
2021-04-29 09:45:30 +02:00
lmarcouiller
799d1de830
Update incoice.lib.php and index.php match eldy's requests
2021-04-29 09:31:49 +02:00
Anthony Berton
bb5a11ff75
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/17185
2021-04-29 00:06:35 +02:00
Anthony Berton
c1e6109c4b
Update
2021-04-29 00:03:16 +02:00
Laurent Destailleur
6f1f26096e
Debug partnership module
2021-04-28 23:25:26 +02:00
Anthony Berton
5d17e26738
add_pdf_template_and_read_if_module_activate
2021-04-28 23:25:03 +02:00
Laurent Destailleur
64374f46da
Debug v14
2021-04-28 23:01:20 +02:00
Laurent Destailleur
846bab38da
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-28 22:45:10 +02:00
Laurent Destailleur
b1d858eb26
Fix translation of new modules
2021-04-28 22:44:57 +02:00
Laurent Destailleur
9934e28c2a
Merge pull request #17423 from FHenry/dev_new_notif_trigger
...
Add ORDER_CREATE trigger for notificiation
2021-04-28 21:39:45 +02:00
Laurent Destailleur
95ecb95ff1
FIX dol_print_date for %a and %b with some timezone
2021-04-28 20:47:28 +02:00
Laurent Destailleur
18e911a636
FIX dol_print_date for %a and %b with some Timezone
2021-04-28 20:44:22 +02:00
Laurent Destailleur
2dc597f5d0
Make setup easier to understand
2021-04-28 18:04:00 +02:00
Florian HENRY
8dd331d461
Add ORDER CREATE trigger for notificiation
2021-04-28 17:55:03 +02:00
Laurent Destailleur
75a8dc28ea
Merge pull request #17261 from aspangaro/14a39
...
Maxi debug of societe/product per entity
2021-04-28 17:06:45 +02:00
Laurent Destailleur
6b74a656ed
Merge pull request #17412 from daraelmin/daraelmin-patch-box-adhstatusconst
...
Clean code (use adh status const in boxes)
2021-04-28 16:48:31 +02:00
Laurent Destailleur
9f56ce6c53
Merge pull request #17405 from Hystepik/develop#1
...
Fix #17219 : complement of PR 17161
2021-04-28 15:48:38 +02:00
lmarcouiller
d753ef6393
edit of modKnowledgeManagement.class
2021-04-28 15:28:00 +02:00
lmarcouiller
97043ca665
New module KnowledgeManagement
2021-04-28 14:57:49 +02:00
Laurent Destailleur
e50494152d
Fix label
2021-04-28 11:22:45 +02:00
lmarcouiller
be22d43c60
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2
2021-04-28 09:24:18 +02:00
lmarcouiller
7782e849e2
changes to implement eldy's advices
2021-04-28 09:22:10 +02:00
lmarcouiller
c1069c5f16
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-04-28 09:03:36 +02:00
daraelmin
50a5dd7ff3
Use adh const
2021-04-27 23:28:49 +02:00
daraelmin
e7f1170736
Use adherent status const
2021-04-27 23:22:29 +02:00
Laurent Destailleur
cb72a010cd
FIX notifications for expense report has disappeared.
2021-04-27 22:14:19 +02:00
Laurent Destailleur
0a871546ee
Merge pull request #17379 from atm-adrien/FIX_add_function_price2num_to_productAlertStock_box_12.0
...
FIX : Add function price2num for rounding values in productAlertStock…
2021-04-27 18:45:26 +02:00
lmarcouiller
52bf0f0359
Close #17271 : Replament of 2 graph in compta/index.php
2021-04-27 16:02:46 +02:00
kamel
3a673c9210
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_00007
2021-04-27 12:29:10 +02:00
lmarcouiller
8896e7c0d5
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-04-27 11:18:33 +02:00
lmarcouiller
758ba67adc
Fix #17219 : new complement of PR 17161
2021-04-27 10:50:45 +02:00
Adrien Raze
e8c2085abd
FIX : Change parameters MF to MS for price2num() function
2021-04-27 09:24:22 +02:00
Laurent Destailleur
4b204301a9
Enhance logs
2021-04-27 03:25:49 +02:00
Laurent Destailleur
3e013ebad0
Fix mass action delete of cron jobs
2021-04-27 03:16:11 +02:00
Laurent Destailleur
5bb2531364
Enhance ticket module
2021-04-27 02:52:24 +02:00
Laurent Destailleur
d6cdfcdd8c
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/paiement/card.php
htdocs/compta/paiement/class/paiement.class.php
htdocs/public/members/new.php
2021-04-27 02:07:48 +02:00
Laurent Destailleur
48a50f3b10
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/paiement/card.php
htdocs/compta/paiement/class/paiement.class.php
2021-04-27 01:58:19 +02:00
Laurent Destailleur
e82965090f
Merge pull request #17395 from Robin-Yann/13-fix-combo-prospect
...
13 fix combo prospect
2021-04-27 01:18:57 +02:00
Anthony Berton
6353084777
init
2021-04-27 00:22:39 +02:00
Laurent Destailleur
d1fd26356f
Merge pull request #17377 from gmilad/gmilad-scayt-210423
...
NEW : Update doleditor.class.php for easily activate SCAYT
2021-04-26 23:38:23 +02:00
Laurent Destailleur
062dc28850
Merge pull request #17388 from aspangaro/14a30
...
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
2021-04-26 21:18:48 +02:00
Laurent Destailleur
f66c506011
Merge pull request #17381 from atm-lena/12.0_FormAttachOptions_AddHookParameters_Options
...
Add parameter "option" to hook formattachOptions
2021-04-26 21:00:12 +02:00
Laurent Destailleur
c849ce79e9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-26 19:21:38 +02:00
Laurent Destailleur
d138e7410b
Clean code
2021-04-26 19:12:23 +02:00
kamel
9c46b234cf
FIX Supplier invoices (deposit, multicurency in lines)
2021-04-26 17:43:27 +02:00
lmarcouiller
080bd90c93
Fix #17219 : complement of PR 17161
2021-04-26 16:15:09 +02:00
stickler-ci
1a4e1b1ae9
Fixing style errors.
2021-04-26 13:46:37 +00:00
Laurent Destailleur
14baec95dc
Clean code
2021-04-26 15:44:24 +02:00
Alexandre SPANGARO
d95be3e08b
Merge remote-tracking branch 'upstream/develop' into 14a39
2021-04-26 13:53:16 +02:00
Laurent Destailleur
87393cee98
Clean code
2021-04-26 11:59:47 +02:00
Laurent Destailleur
c9d6bc70e8
Clean code
2021-04-26 10:22:28 +02:00
stickler-ci
ebd3b00016
Fixing style errors.
2021-04-26 07:24:00 +00:00
Robin-Yann
836b811449
Merge branch 'develop' into 13-fix-combo-prospect
2021-04-26 09:21:32 +02:00
Robin
04c97d2695
FIX combo Prospect / Customers / Supplier in society list
2021-04-26 09:05:47 +02:00
Laurent Destailleur
c3d3b79315
Fix test on Local url
2021-04-25 22:11:57 +02:00
Laurent Destailleur
fd2d317b4a
Fix #yogosha5881
2021-04-25 15:55:36 +02:00
Laurent Destailleur
2fd2c67139
Clean edit of user card
2021-04-25 15:21:31 +02:00
Laurent Destailleur
9f03054fc4
Fix #yogosha5877
2021-04-24 20:52:48 +02:00
Laurent Destailleur
d0cc64479d
Fix protect sql
2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
f60df8964a
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
2021-04-24 08:05:00 +02:00
Givriz
a451fee68f
Compatibility phpv8
2021-04-23 18:01:11 +02:00
atm-lena
3d3fb17da3
Add parameter "option" to hook formattachOptions
2021-04-23 15:41:43 +02:00
Adrien Raze
c5775cc902
FIX : Add parameter to function price2num()
2021-04-23 12:31:45 +02:00
Adrien Raze
2ab17c44e9
FIX : Add function price2num for rounding values in productAlertStock box
2021-04-23 11:11:47 +02:00
Dorian Vabre
b441c600bb
fixing error introduced in a previous commit
2021-04-23 10:32:28 +02:00
gmilad
b9c33fc8b6
Update doleditor.class.php for
...
(English below)
Bonjour,
Voici une proposition d'ajout de fonctionnalité afin de pouvoir activer facilement le plugins SpellCheckAsYouType (SCAYT) de CKEditor, pour l'historique voir ce fils de discutions sur le forum Francophone de Dolibarr :
https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad
Amicalement,
Gaëtan.
(English below)
Hello,
Here is a proposal to add functionality to easily activate the SpellCheckAsYouType (SCAYT) plugins of CKEditor, for the history see this thread on the Dolibarr forum:
https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad
Kind regards,
Gaëtan.
2021-04-23 00:45:07 +02:00
Dorian Vabre
4c57a6c207
wip on mail, sending ok but no content
2021-04-20 17:28:18 +02:00
Dorian Vabre
a500d83c0b
linked invoice and attendee
2021-04-20 16:09:22 +02:00
Laurent Destailleur
1bd2bd3237
Fix php8 warning
2021-04-20 12:46:41 +02:00
Laurent Destailleur
14f009f550
Fix CURLOPT_CONNECT_TO
2021-04-20 12:19:46 +02:00
Laurent Destailleur
f1f63cd4e2
Enhance detection of update available
2021-04-20 11:56:26 +02:00
Laurent Destailleur
4fde184afb
Add the setup page of module accounting to not search where is setup
2021-04-20 11:40:43 +02:00
Alexandre SPANGARO
d27030df3f
Merge remote-tracking branch 'upstream/develop' into 14a39
2021-04-20 04:43:14 +02:00
Alexandre SPANGARO
d66540bf00
Revert "Split mod fournisseur"
...
This reverts commit 78dbf4f7ff
2021-04-20 04:42:51 +02:00
Laurent Destailleur
3aee28fb1b
Merge pull request #17263 from atm-adrien/NEW_add_userGroup_for_user_exports_develop
...
NEW : Add possibility to exports userGroups fields on user exports
2021-04-19 21:58:38 +02:00
Laurent Destailleur
18d87ae575
Merge pull request #17255 from Givriz/dev_1
...
Compatibility phpv8
2021-04-19 21:44:25 +02:00
Laurent Destailleur
e71e5d533d
Fix HTML5
2021-04-19 21:30:25 +02:00
Laurent Destailleur
c966914f67
Merge branch 'develop' into new/check_update_for_module
2021-04-19 21:26:01 +02:00
Laurent Destailleur
46ea1084f5
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/cibles.php
htdocs/core/extrafieldsinexport.inc.php
htdocs/product/stock/card.php
2021-04-19 20:59:10 +02:00
Laurent Destailleur
3df79dd3c8
Avoid error on PHP 5.6
2021-04-19 20:49:31 +02:00
NextGestion
7cab4dd19d
Manage partnership for members & code optimisation
2021-04-19 15:17:57 +01:00
Laurent Destailleur
a8187af8ef
Use MAIN_SECURITY_ANTI_SSRF_SERVER_IP as whitelist for local IP.
2021-04-19 15:16:00 +02:00
Laurent Destailleur
08ded970e2
NEW Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP
2021-04-19 15:01:36 +02:00
NextGestion
263e110ca3
Enhance module Member
2021-04-19 13:19:32 +01:00
Laurent Destailleur
0537fdd1c6
Add local ip into excluded IP for external URL download.
...
Fix #yogosha5861
2021-04-19 13:52:12 +02:00
Laurent Destailleur
61df76dd9a
Fix pb in date format %a %b when using a negative timezone
...
Enhance date management and unit tests.
2021-04-19 12:48:08 +02:00
Laurent Destailleur
23b11491d2
Can filter also on payment mode
2021-04-19 11:11:01 +02:00
Laurent Destailleur
ad84af1d0a
Fix id cron task
2021-04-19 10:39:16 +02:00
Laurent Destailleur
634c8c9fa4
Add a schedule dtask to send reminder by email on date due.
2021-04-19 10:38:52 +02:00
ATM john
d25c544a7a
Merge branch 'new/check_update_for_module' of github.com:atm-john/dolibarr into new/check_update_for_module
2021-04-18 22:50:43 +02:00
ATM john
b337422576
Remove ctrl+v
2021-04-18 22:50:34 +02:00
stickler-ci
8ab117a62f
Fixing style errors.
2021-04-18 20:40:34 +00:00
ATM john
781756913b
Fix code Stickler
2021-04-18 22:38:18 +02:00
ATM john
da11ac42ac
New check update for modules
2021-04-18 22:13:37 +02:00
ATM john
7794927a64
New check update for modules
2021-04-18 20:12:24 +02:00
Laurent Destailleur
cad7ea0b92
css
2021-04-18 15:07:22 +02:00
Laurent Destailleur
3502c4c269
Debug sitemap generation
2021-04-18 13:45:46 +02:00
NextGestion
973ea370e8
Fixing errors
2021-04-17 13:38:23 +01:00
NextGestion
5a8742b3eb
Cancel Partnership For Expired Members & Warning of partnership if Dolibarr backlink not found on partner website
2021-04-17 13:25:28 +01:00
NextGestion
87bcb212df
Merge branch 'develop' into dolibarr_partnership
2021-04-17 13:51:21 +01:00
Laurent Destailleur
4abf7d1c91
Better error management for SMTPS sending method
2021-04-17 13:53:52 +02:00
Alexandre SPANGARO
78dbf4f7ff
Split mod fournisseur
2021-04-17 07:49:19 +02:00
Laurent Destailleur
c929c05dc5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-17 03:33:31 +02:00
Laurent Destailleur
0d8a354934
Set default length of password to 12 car.
...
FIX #yogosha5855
2021-04-17 03:11:58 +02:00
andreubisquerra
83da58b85f
Fix travis
2021-04-17 01:17:48 +02:00
jove@bisquerra.com
712e1c4e7c
NEW Edit sales lines rights in TakePOS
2021-04-17 01:06:30 +02:00
Laurent Destailleur
70abc04bf5
Merge pull request #17103 from Givriz/dev
...
Fix compatibility phpv8
2021-04-16 20:51:00 +02:00
Laurent Destailleur
1a3e9cae68
Comment
2021-04-16 20:44:30 +02:00
Laurent Destailleur
c841282a25
Merge pull request #17283 from Givriz/dev_2
...
Compatibility phpv8 #2
2021-04-16 20:37:31 +02:00
Laurent Destailleur
a31efd248f
Merge pull request #17280 from andreubisquerra/develop
...
Add DOL_PRINT_OBJECT_LINES_WITH_NOTES tag in TakePOS
2021-04-16 20:29:58 +02:00
Laurent Destailleur
9eaf836c8e
Merge pull request #17281 from altairisfr/warehouses_in_project
...
Warehouses in project
2021-04-16 20:29:21 +02:00
Givriz
86bfcd9510
Easy way to use conf->global
2021-04-16 17:10:11 +02:00
Laurent Magnin
4aab805b4e
FIX:Add ticket substition template
2021-04-16 12:39:39 +02:00
NextGestion
0d4a1d061a
Merge branch 'develop' into dolibarr_partnership
2021-04-16 11:01:08 +01:00
NextGestion
9304b3c474
Manage mass action "Send email" for Partnership module
2021-04-16 09:54:11 +01:00
Florian HENRY
99b7deba14
Merge branch '13.0' of github.com:Dolibarr/dolibarr into fix_13_toomanytestmenu
2021-04-16 10:37:50 +02:00
Florian HENRY
0cd567f256
fix double test
2021-04-16 10:37:42 +02:00
Laurent Destailleur
38f54d0582
FIX Missing extrafields into export of agenda record
2021-04-16 10:26:35 +02:00
Laurent Destailleur
ceb50d90ca
NEW Add a page about security setup advices
...
NEW Add a page about performance setup advices
2021-04-15 19:25:37 +02:00
Laurent Destailleur
db5dcd3e52
NEW When a doc file is shared, link is visible from main page of doc.
2021-04-15 17:56:55 +02:00
Laurent Destailleur
f1d55d38ba
Show link to shared file if it exists.
2021-04-15 17:09:15 +02:00
Laurent Destailleur
707efa7765
Debug v14
2021-04-15 15:54:54 +02:00
Laurent Destailleur
bf547cf20d
Debug v14
2021-04-15 14:33:48 +02:00
Laurent Destailleur
7e4f7f7200
Nicer page of widget setup
2021-04-15 13:31:40 +02:00
Laurent Destailleur
09365c29c9
Nicer page of widget setup
2021-04-15 13:22:03 +02:00
altairis-noe
3fe0eb54c7
association of warehouses to projects
2021-04-15 09:59:08 +02:00
andreubisquerra
662caadd18
Add DOL_PRINT_OBJECT_LINES_WITH_NOTES tag in TakePOS
2021-04-14 23:32:08 +02:00
Givriz
47cdfee1d2
Compatibility pvpv8
2021-04-14 22:03:04 +02:00
Givriz
598156de04
Update modDataPolicy.class.php
...
There was useless condition
2021-04-14 17:58:46 +02:00
Laurent Destailleur
b298420ac5
Fix bad test
2021-04-14 15:12:40 +02:00
Laurent Destailleur
a68a5b0c04
Look and feel v14
2021-04-14 15:11:26 +02:00
NextGestion
4e45011e45
Manage Partnership for third-party
2021-04-14 13:59:38 +01:00
stickler-ci
bcab8d5164
Fixing style errors.
2021-04-14 07:49:18 +00:00
Adrien Raze
c83819bd90
NEW : Add possibility to exports userGroups fields on user exports
2021-04-14 09:44:01 +02:00
Alexandre SPANGARO
2f31720896
Maxi debug of societe/product per entity
2021-04-14 04:45:17 +02:00
Laurent Destailleur
033a243372
Merge pull request #17166 from altairisfr/product_masks
...
Product masks
2021-04-13 23:06:09 +02:00
Laurent Destailleur
7f62b6c49b
Look and feel v14
2021-04-13 22:58:37 +02:00
Laurent Destailleur
25a6aa1388
NEW Add data-eec=1 for EEC countries on select for js interaction
2021-04-13 22:50:50 +02:00
Laurent Destailleur
161baa672a
Fix phpcs
2021-04-13 21:11:02 +02:00
Laurent Destailleur
358bb87ae2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/payments.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/projet/card.php
htdocs/public/payment/newpayment.php
htdocs/societe/list.php
htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
Laurent Destailleur
f54fd1063b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-13 19:39:08 +02:00
Laurent Destailleur
c93f88e47a
Debug mass action after regression on close on proposal
2021-04-13 19:38:55 +02:00
Laurent Destailleur
192fcb89d2
Merge pull request #17097 from NextGestion/dolibarr_partnership
...
Create Partnership Module
2021-04-13 16:33:54 +02:00
Givriz
bc78b87020
pvpv8 continuous integration
2021-04-13 16:32:19 +02:00
Laurent Destailleur
d09be1f86f
Do not make new twice
2021-04-13 16:18:18 +02:00
Laurent Destailleur
adbebac0fc
Merge pull request #17243 from frederic34/patch-3
...
fix MAIN_ADD_PDF_BACKGROUND
2021-04-13 15:41:20 +02:00
Robin
0839ee25cd
FIX missing parameter in select for POP
...
All options can be modified for selector in pop
2021-04-13 10:44:14 +02:00
Frédéric FRANCE
d007e75a8e
Update pdf_eratosthene.modules.php
2021-04-13 09:55:04 +02:00
Frédéric FRANCE
8085f10995
Update pdf_einstein.modules.php
2021-04-13 09:53:51 +02:00
Frédéric FRANCE
8953c0ac3a
Update pdf_cyan.modules.php
2021-04-13 09:49:30 +02:00
Frédéric FRANCE
ee4f846eb9
Update pdf_azur.modules.php
2021-04-13 09:49:03 +02:00
Frédéric FRANCE
fcca5d7d5c
Update pdf_sponge.modules.php
2021-04-13 09:47:15 +02:00
Frédéric FRANCE
9ce6d841cc
Update pdf_crabe.modules.php
2021-04-13 09:40:16 +02:00
Alexandre SPANGARO
44133166de
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-12 21:35:03 +02:00
Laurent Destailleur
a7a95cff03
Fix payment link for renewal with a unique secure key
2021-04-12 16:41:40 +02:00
Damien BENOIT
9abc7a5b0d
Update modDataPolicy.class.php
2021-04-12 16:16:48 +02:00
Laurent Destailleur
3d681d96c4
Merge pull request #17205 from DorianVabre/dev_EventOrganizer
...
new: working on conference or booth object and event type #FoundationFunding
2021-04-12 16:06:13 +02:00
Givriz
7a54e5d346
Using empty instead of isset
...
I used empty instead of isset, and I fixed some problems of my previous pull request
2021-04-12 16:03:56 +02:00
Laurent Destailleur
8a62d97b89
Remove one thousand of useless files
2021-04-12 15:57:16 +02:00
altairis-noe
ab39cfdf09
oops, better if we test the right const
2021-04-12 14:32:05 +02:00
Laurent Destailleur
8fa943edc3
Fix select field in multiselect of languages
2021-04-12 14:26:09 +02:00
altairis-noe
beecc6f935
Merge branch 'product_masks' of github.com:altairisfr/dolibarr into product_masks
2021-04-12 14:13:37 +02:00
altairis-noe
a61c1f8807
checkboxes for custom masks
2021-04-12 14:01:36 +02:00
Laurent Destailleur
5dd0d05c4e
Test to disable text in menu
2021-04-12 12:07:11 +02:00
Laurent Destailleur
86328462c7
Enhance getURLContent
2021-04-12 11:20:44 +02:00
Alexandre SPANGARO
8d72448f43
Add right supplier_order
2021-04-12 09:47:16 +02:00
Alexandre SPANGARO
87cc1b2601
Add right supplier_invoice
2021-04-12 07:37:34 +02:00
Alexandre SPANGARO
2a1a22763d
Work on split module fournisseur
2021-04-12 06:51:00 +02:00
Alexandre SPANGARO
f749111148
Work on split module fournisseur
2021-04-12 06:27:46 +02:00
Alexandre SPANGARO
ab35b6b4f2
Work on split module fournisseur
2021-04-12 06:21:25 +02:00
Alexandre SPANGARO
77d751b03e
Work on split module fournisseur
2021-04-12 05:41:37 +02:00
Alexandre SPANGARO
80c6458faa
Work on split module fournisseur
2021-04-11 22:25:45 +02:00
Alexandre SPANGARO
ab5599a672
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-11 20:53:30 +02:00
Laurent Destailleur
f437e70ac6
Selection of theme is easier
2021-04-11 16:11:05 +02:00
Alexandre SPANGARO
ce7c5a0c7b
Work on split module fournisseur
2021-04-11 04:24:21 +02:00
Laurent Destailleur
ac64938266
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-10 15:31:39 +02:00
Laurent Destailleur
8526ca5304
Merge pull request #17121 from 0x00FE/add-friday-holiday
...
NEW Add support for Friday as a holiday
2021-04-10 15:30:57 +02:00
Laurent Destailleur
be800e07f2
Use urlencode even on security key
2021-04-10 15:27:44 +02:00
Laurent Destailleur
35a64e08bf
Fix link
2021-04-10 14:12:51 +02:00
Laurent Destailleur
cb57546d99
NEW Can hide columns "time consumed" on timesheet per week.
2021-04-10 13:53:23 +02:00
Laurent Destailleur
1444920f57
Merge pull request #17204 from Hystepik/develop#1
...
Close #17193 : Move button added with PR 17161
2021-04-10 13:02:21 +02:00
Laurent Destailleur
6241ba559b
Trans
2021-04-10 12:44:41 +02:00
Laurent Destailleur
11330fd6c2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-10 12:42:55 +02:00
Laurent Destailleur
ce6f8eebf5
Close #17206 Add comment on type of constants
2021-04-10 12:42:43 +02:00
Laurent Destailleur
b6e4bdbc6c
Merge pull request #17210 from Csardelacal/dev/goodfriday
...
Good friday is a holiday
2021-04-10 12:33:26 +02:00
Laurent Destailleur
1b88f05f28
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-10 12:06:21 +02:00
Laurent Destailleur
3895142772
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2021-04-10 12:06:11 +02:00
César de la Cal Bretschneider
eadd8defaf
Good friday is a holiday
2021-04-10 11:39:48 +02:00
Laurent Destailleur
83e272951f
Fix phpcs
2021-04-10 00:31:20 +02:00
Laurent Destailleur
52213d0ac7
Fix duplicate permissions
2021-04-09 21:15:43 +02:00
Ahmad Hadeed
63f7369adb
Fixing 'stickler-ci' complaint, function description not in order
2021-04-09 21:16:24 +03:00
Ahmad Hadeed
20e51016ed
fixing function description comment to satisfy 'stickler-ci'
2021-04-09 21:11:37 +03:00
Ahmad Hadeed
937fe333f1
Moving Friday to end of function declaration to maintain backward compatibility
2021-04-09 20:49:39 +03:00
Dorian Vabre
b3415f9031
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer
2021-04-09 16:23:42 +02:00
lmarcouiller
19ee78e123
Close #17193 : Move button convert in webp
2021-04-09 15:44:47 +02:00
Laurent Destailleur
42ddb6e5f0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/website2.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/paiementfourn.class.php
htdocs/public/ticket/view.php
2021-04-09 14:17:41 +02:00
Laurent Destailleur
4b1974080a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-04-09 14:02:24 +02:00
Laurent Destailleur
f5881c6199
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/index.php
htdocs/fourn/class/fournisseur.commande.class.php
2021-04-09 14:02:14 +02:00
Laurent Destailleur
b008cb6b6f
Merge pull request #17147 from glu000/13.0-fix17146
...
13.0-fix17146
2021-04-09 13:57:50 +02:00
Laurent Destailleur
4016c300d2
Fix missing lin to thirdparty on some actions
2021-04-09 13:38:29 +02:00
Laurent Destailleur
a50b0e7441
Debug inventory module
2021-04-09 13:15:27 +02:00
NextGestion
d6e4cb7d0b
Merge branch 'develop' into dolibarr_partnership
2021-04-09 12:01:44 +01:00
Laurent Destailleur
95d3dabdf6
Update website2.lib.php
2021-04-09 12:48:06 +02:00
Gauthier PC portable 024
c35c15e782
FIX : test must be === and not ==
2021-04-09 11:31:50 +02:00
Laurent Destailleur
d098bf412d
Move directory to match the one of composer package for phpspreadsheet
2021-04-08 17:35:52 +02:00
Dorian Vabre
60341e8a14
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer
2021-04-08 17:29:16 +02:00
Laurent Destailleur
f8b5bee9eb
Add function getListOfPossibleImageExt
2021-04-08 14:20:59 +02:00
Laurent Destailleur
244e83e18d
Merge pull request #17164 from draceo/art261-7
...
Add bill tax code article for non profit organization VAT (fixes #17163 )
2021-04-08 13:46:22 +02:00
stickler-ci
c2cd54325f
Fixing style errors.
2021-04-08 11:44:24 +00:00
Laurent Destailleur
aacea00460
Merge pull request #17167 from OPEN-DSI/fix_00004
...
NEW : Add new permok for edit extrafields on contact card
2021-04-08 13:43:39 +02:00
Anthony Berton
f613688b28
add_option
2021-04-08 13:37:09 +02:00
Laurent Destailleur
93269bab9e
Merge pull request #17183 from OPEN-DSI/fix_00005
...
FIX : Fix warning
2021-04-08 13:14:53 +02:00
kamel
1ec6317b80
FIX : Fix warning (function errorHandler() is not defined in this class so let the class handle the errors)
2021-04-08 10:33:27 +02:00
Laurent Destailleur
489cff46a3
FIX #yogosha5828
2021-04-08 00:37:17 +02:00
Laurent Destailleur
59c8e70fd2
Fix #yogosha4510
2021-04-07 23:43:10 +02:00
Laurent Destailleur
6c4f5b851d
Use all param of getURLContent
2021-04-07 23:31:16 +02:00
Laurent Destailleur
1e1b963ca7
Restriction on name of files
2021-04-07 19:38:54 +02:00
kamel
c06cc6d75a
NEW : Add new permok for edit extrafields on contact card
2021-04-07 17:28:13 +02:00
Florent Peyraud
7be9a98ef0
Add bill tax code article for non profit organization VAT
2021-04-07 13:51:08 +02:00
NextGestion
ace958240d
Merge branch 'develop' into dolibarr_partnership
2021-04-07 12:30:37 +01:00
stickler-ci
c9aed75837
Fixing style errors.
2021-04-07 11:24:31 +00:00
NextGestion
5f5f0eb3f3
Add menu entries into thirdparty menu or member menu & Allow extrafields
2021-04-07 12:21:59 +01:00
Laurent Destailleur
f4d56c710b
Fix log levels
2021-04-07 12:43:28 +02:00
Dorian Vabre
f7b6e239e9
nouvelle page attendee_subscription créée, lien ajouté sur la conferenceorbooth_card (non cliquable)
2021-04-07 10:06:38 +02:00
Indelog
17fa9559a3
Fix empty string WEBSITE_OTHERLANG
...
If post WEBSITE_OTHERLANG with empty value or with value like this
'en,,sv' or 'en,sv,' we can get an otherlang with empty value. This can lead
unexpected behaviour when we use an element of otherlang to set the
subdirectory name to store pages for a sub lang.
2021-04-07 09:29:40 +02:00
Günter Lukas
04a55a3df3
Fix #17146
2021-04-07 09:08:34 +02:00
Laurent Destailleur
fcc6431896
Merge pull request #17136 from aspangaro/14a35
...
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-07 02:51:32 +02:00
Indelog
4d60fe8ff9
Fix empty $sublang dolSavePageAlias
...
Avoid to loop on `explode(',', $object->otherlang)` if
`$object->otherlang` is empty. Else we loop once on empty string which
is set in `$sublang` and erase the main alias for the page.
2021-04-06 22:21:00 +02:00
Laurent Destailleur
12e847ade1
Fix color of reports. Fix include_once into include.
2021-04-06 22:18:32 +02:00
Laurent Destailleur
7ff74768eb
Fix pb with renaming field total
2021-04-06 20:16:14 +02:00
Laurent Destailleur
0377508100
Fix sql
2021-04-06 20:10:29 +02:00
Laurent Destailleur
dbc1780817
Merge pull request #16376 from aspangaro/14a22
...
Code enhanced - Standardize field name #14697
2021-04-06 20:01:38 +02:00
NextGestion
78b4aa61fa
Add a new tab "Partnership" on the record of a thirdparty or a member (depending on setup)
2021-04-06 18:57:45 +01:00
Laurent Destailleur
b7cd3270cb
Merge pull request #17118 from ptibogxiv/patch-424
...
FIX uniformization of external link
2021-04-06 19:36:26 +02:00
Laurent Destailleur
bbbf1dc7c8
Merge pull request #17133 from dolibit-ut/patch-235
...
Update box.php
2021-04-06 19:31:45 +02:00
Laurent Destailleur
d1df327284
Add tab for import/export profiles
2021-04-06 18:51:43 +02:00
Laurent Destailleur
38f3693fc7
Look and feel v14
2021-04-06 18:18:07 +02:00
NextGestion
debef2fb6d
initial Batch to cancel partnership for expired members
2021-04-06 15:53:51 +01:00
Laurent Destailleur
10fb793fb1
Enhance the security page
2021-04-06 13:56:33 +02:00
Alexandre SPANGARO
36e4f5aa22
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-06 10:29:44 +02:00
Alexandre SPANGARO
82b652df8a
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-06 09:15:34 +02:00
Ahmad Hadeed
f2f2aed6cd
Fix 3 weekend holiday behavior after adding support to Friday as a holiday.
2021-04-05 22:05:22 +03:00
UT from dolibit
40059f1d05
Update box.php
...
$userid defined twice
2021-04-05 20:37:58 +02:00
Laurent Destailleur
a3fb8d3e14
Factorize code
2021-04-05 19:34:56 +02:00
stickler-ci
caa2facd47
Fixing style errors.
2021-04-05 17:09:25 +00:00
Ahmad Hadeed
235725b528
Add support for Friday as a holiday and some comment alignment fixes
2021-04-05 19:57:33 +03:00
Laurent Destailleur
95de241245
FIx #yogosha5774
2021-04-05 15:21:17 +02:00
Laurent Destailleur
685c880e6c
Debug module workstation
2021-04-05 14:56:47 +02:00
Laurent Destailleur
6c521073ea
Fix perm id and sort of modules by id.
2021-04-05 13:52:19 +02:00
ptibogxiv
1b3b2ca023
Update payments.lib.php
2021-04-05 13:52:09 +02:00
Laurent Destailleur
6fc19c626d
Try fix for #17094
2021-04-04 17:05:01 +02:00
Alexandre SPANGARO
f64d0377c5
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-04 06:03:41 +02:00
Laurent Destailleur
1a70aebba6
NEW Can set a target image in dolcropresize function.
2021-04-04 01:12:25 +02:00
Givriz
5ed01f6733
Fix errors phpv8
2021-04-03 17:09:14 +02:00
Laurent Destailleur
17437670b1
Set include of js as async
2021-04-03 13:24:34 +02:00
NextGestion
21f86c05d4
Merge branch 'develop' into dolibarr_partnership
2021-04-03 09:44:21 +01:00
NextGestion
6cac5f2212
Create Partnership Module
2021-04-03 09:24:07 +01:00
Laurent Destailleur
5ce9bc5801
FIX #yogosha5748
2021-04-02 23:23:44 +02:00
Laurent Destailleur
cadef101db
Fix var name
2021-04-02 21:40:33 +02:00
