Laurent Destailleur
1c95e2b7c7
FIX #17453
2021-05-03 14:58:29 +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
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
655056ed31
Debug v14
2021-04-29 12:10:55 +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
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
kamel
3a673c9210
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_00007
2021-04-27 12:29:10 +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
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
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
Laurent Destailleur
87393cee98
Clean code
2021-04-26 11:59:47 +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
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
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
atm-lena
3d3fb17da3
Add parameter "option" to hook formattachOptions
2021-04-23 15:41:43 +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
e71e5d533d
Fix HTML5
2021-04-19 21:30:25 +02:00
Laurent Destailleur
cad7ea0b92
css
2021-04-18 15:07:22 +02:00
Laurent Destailleur
4abf7d1c91
Better error management for SMTPS sending method
2021-04-17 13:53:52 +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
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
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
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
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
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
Alexandre SPANGARO
44133166de
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-12 21:35:03 +02:00
Laurent Destailleur
8a62d97b89
Remove one thousand of useless files
2021-04-12 15:57:16 +02:00
Laurent Destailleur
8fa943edc3
Fix select field in multiselect of languages
2021-04-12 14:26:09 +02:00
Alexandre SPANGARO
ce7c5a0c7b
Work on split module fournisseur
2021-04-11 04:24:21 +02:00