lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
100,555 Commits 43 Branches 150 Tags 886 MiB
c03958a867
Commit Graph

6904 Commits

Author SHA1 Message Date
Laurent Destailleur
ea97992c3d css 2021-04-19 22:52:13 +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
ee9c823c33
Merge pull request #17279 from aspangaro/14a38 
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
 2021-04-19 21:42:13 +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
2df9e69293
Merge pull request #17320 from dolibit-ut/patch-279 
Update agenda.php
 2021-04-19 21:00:02 +02:00
Laurent Destailleur
474bf5cfd9 Show MAIN_SECURITY_ANTI_SSRF_SERVER_IP option into security page 2021-04-19 15:26:24 +02:00
Gauthier PC portable 024
894eb1e5a4 NEW : "+" and "-" to show / hide batch details on product "stock" tab 2021-04-19 14:34:11 +02:00
UT from dolibit
6116e22ed5
Update agenda.php 
$wikihelp  =>  $help_url
 2021-04-19 14:15:16 +02:00
Laurent Destailleur
0537fdd1c6 Add local ip into excluded IP for external URL download. 
Fix #yogosha5861
 2021-04-19 13:52:12 +02:00
stickler-ci
fff358f040 Fixing style errors. 2021-04-18 20:28:36 +00:00
ATM john
fb922d9a5a remove space 2021-04-18 22:26:27 +02:00
ATM john
da11ac42ac New check update for modules 2021-04-18 22:13:37 +02:00
Laurent Destailleur
a8a540a58d Clean code 2021-04-18 20:34:14 +02:00
Laurent Destailleur
d42ccef92d Position autoset 2021-04-18 20:33:37 +02:00
ATM john
7794927a64 New check update for modules 2021-04-18 20:12:24 +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
Laurent Destailleur
70abc04bf5
Merge pull request #17103 from Givriz/dev 
Fix compatibility phpv8
 2021-04-16 20:51:00 +02:00
Laurent Destailleur
ce9d707040
Merge pull request #17269 from bb2a/picto_massactions 
Next picto mass actions
 2021-04-16 20:40:19 +02:00
Laurent Destailleur
c841282a25
Merge pull request #17283 from Givriz/dev_2 
Compatibility phpv8 #2
 2021-04-16 20:37:31 +02:00
Givriz
86bfcd9510 Easy way to use conf->global 2021-04-16 17:10:11 +02:00
Laurent Destailleur
8b2304ec8e Better warning 2021-04-15 19:28:13 +02:00
Givriz
0a0804e7d5 Update dict.php 2021-04-15 16:36:17 +02:00
Laurent Destailleur
af39923a62 Debug v14 2021-04-15 15:41:21 +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
Dorian Vabre
12a796fd8e dynamic selector print improved, now using ref instead of id 2021-04-15 12:57:19 +02:00
Dorian Vabre
764d984ebf fix on dynamic selector 2021-04-15 12:28:53 +02:00
Dorian Vabre
98c622446e dynamic selector of service/product used for the invoice added 2021-04-15 12:14:34 +02:00
Dorian Vabre
dd7c09582f payment page structure ok, still need to confirm the attendee after the payment 2021-04-15 10:45:44 +02:00
Alexandre SPANGARO
140f098c79 NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service 2021-04-14 23:16:30 +02:00
Laurent Destailleur
d4420bbfd9 Look and feel v14 2021-04-14 22:31:44 +02:00
Givriz
47cdfee1d2 Compatibility pvpv8 2021-04-14 22:03:04 +02:00
Laurent Destailleur
195d3b578b Fix phpcs 2021-04-14 20:44:34 +02:00
Laurent Destailleur
8bfb69cdba Fix security check 2021-04-14 18:56:31 +02:00
Givriz
9b66895945 Update mails_templates.php 2021-04-14 16:06:53 +02:00
Givriz
32d401bed4 Update mails.php 2021-04-14 15:26:18 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Dorian Vabre
55afc59db2 removed useless fetch, moved link to the fetch method of the conferenceorbooth class, wip on service to use on the invoice 2021-04-14 14:33:11 +02:00
Laurent Destailleur
7f62b6c49b Look and feel v14 2021-04-13 22:58:37 +02:00
Laurent Destailleur
97292d6843 Fix phpcs 2021-04-13 20:28:25 +02:00
Givriz
bc78b87020 pvpv8 continuous integration 2021-04-13 16:32:19 +02:00
Laurent Destailleur
8c9cacba4d
Merge branch 'develop' into 14a36 2021-04-13 16:05:57 +02:00
Laurent Destailleur
3f159fa39f
Merge pull request #17251 from DorianVabre/dev_EventOrganizer 
Dev event organizer: public registration page to a conference
 2021-04-13 15:31:40 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Dorian Vabre
167da1445d securekey added in 2021-04-12 17:16:24 +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
Alexandre SPANGARO
bbd774f987 Work on split module fournisseur 2021-04-12 05:50:57 +02:00
Alexandre SPANGARO
c2f7e15add Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 05:31:12 +02:00
Alexandre SPANGARO
80c6458faa Work on split module fournisseur 2021-04-11 22:25:45 +02:00
Laurent Destailleur
3893c69dc1 Enhance perf and security page 2021-04-11 21:30:41 +02:00
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
stickler-ci
2b58bc904b Fixing style errors. 2021-04-09 14:36:02 +00:00
Dorian Vabre
b3415f9031 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-09 16:23:42 +02:00
Laurent Destailleur
c0dc784061
Update eventorganization.php 2021-04-09 11:46:50 +02:00
Dorian Vabre
056143450b NEW: add config type securekey module builder 2021-04-09 10:58:33 +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
Dorian Vabre
6f51c69588 securekey ok 2021-04-08 17:15:49 +02:00
Dorian Vabre
af5b623b59 securekey added 2021-04-08 16:32:50 +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
Damien BENOIT
ac2cca51c0
Update delais.php 2021-04-07 19:37:17 +02:00
Laurent Destailleur
10fb793fb1 Enhance the security page 2021-04-06 13:56:33 +02:00
Laurent Destailleur
767aa605a2 Enhance security page 2021-04-06 13:09:00 +02:00
Laurent Destailleur
6c521073ea Fix perm id and sort of modules by id. 2021-04-05 13:52:19 +02:00
Damien BENOIT
1bac38eef2
Update company.php 2021-04-04 18:24:58 +02:00
Givriz
5ed01f6733 Fix errors phpv8 2021-04-03 17:09:14 +02:00
Laurent Destailleur
fb83d66d27 NEW Can show the project ref or label into PDF documents 2021-04-01 13:04:24 +02:00
Laurent Destailleur
06078f231b NEW Can show the project ref or label into PDF documents 2021-04-01 13:02:44 +02:00
Laurent Destailleur
39b71e1ea6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-31 23:16:42 +02:00
Laurent Destailleur
eed14ad6e1 Fix missing token 2021-03-31 23:15:33 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Laurent Destailleur
625ade1a53 Clean log 2021-03-31 12:41:44 +02:00
Laurent Destailleur
12f14f8bd5
Merge pull request #17021 from bb2a/add_option_warehouse_affect_thirparty 
ADD Option warehouse affect thirparty
 2021-03-30 19:47:19 +02:00
Laurent Destailleur
0c76d830fd
Merge pull request #17031 from dolibit-ut/patch-193 
Update PSWebServiceLibrary.class.php
 2021-03-30 19:28:50 +02:00
Laurent Destailleur
56b44d2e33
Merge pull request #17034 from dolibit-ut/patch-194 
Update sms.php
 2021-03-30 19:17:41 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
UT from dolibit
5935d7d082
Update sms.php 
href="https://www.dolistore.com/
 2021-03-30 17:42:44 +02:00
UT from dolibit
87c9b4b9fd
Update PSWebServiceLibrary.class.php 
https://
 2021-03-30 17:21:10 +02:00
Anthony Berton
96b450a849 20210330 2021-03-30 14:58:47 +02:00
Laurent Destailleur
d61f61ab45 Clean $_GET 2021-03-30 03:55:17 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Florian HENRY
14a90a3a9d on goung 2021-03-29 17:26:43 +02:00
Florian HENRY
5fe6aa429d Merge branch 'dev_EventOrganisation_draft' into dev_EventOrganisation 2021-03-29 12:08:02 +02:00
Florian HENRY
2def98809c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 11:55:26 +02:00
Laurent Destailleur
1bb07c0eb1 Look and feel v14 2021-03-27 13:59:50 +01:00
Florian HENRY
47675d28d7 add filter for select list attendees 2021-03-26 19:47:48 +01:00
Florian HENRY
f87711bf2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-26 18:30:08 +01:00
Laurent Destailleur
44cb9dca67 FIX must use getUrlContent to get external url in RSS module 2021-03-25 19:05:01 +01:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Laurent Destailleur
5b68c6af62 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-25 13:48:41 +01:00
Laurent Destailleur
c98f38a209 Fix #yogosha5737 2021-03-25 13:36:43 +01:00
UT from dolibit
72c194e2d8
Create index.html 2021-03-25 11:04:47 +01:00
Florian HENRY
373a52063d add commit 2021-03-24 20:13:30 +01:00
Laurent Destailleur
4015f5952e Look and feel v14 2021-03-24 12:51:14 +01:00
Laurent Destailleur
37c04b794f Add property "ticket group is public" in dicitonary of ticket groups. 2021-03-24 12:13:23 +01:00
Laurent Destailleur
e3b019f923 Clean code 2021-03-23 01:32:17 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
2b3599dba5 Clean code 2021-03-20 21:29:36 +01:00
Laurent Destailleur
d0f647301b
Merge pull request #16882 from frederic34/patch-4 
fix php8 warning
 2021-03-20 13:41:32 +01:00
Frédéric FRANCE
c1cab76722
fix php8 warning 2021-03-20 13:15:54 +01:00
Frédéric FRANCE
7df344191f
fix php8 warnings 2021-03-20 13:07:46 +01:00
Laurent Destailleur
e54ca79a8c
Merge pull request #16854 from frederic34/confglobal 
get conf global function
 2021-03-20 11:26:32 +01:00
Laurent Destailleur
430bb24049
Merge pull request #16857 from frederic34/patch-9 
fix nested comments for doxygen
 2021-03-20 11:25:11 +01:00
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments 2021-03-20 10:00:24 +01:00
Frédéric FRANCE
e2fcadef4a
fix nested comments for doxygen 2021-03-20 08:59:54 +01:00
Frédéric FRANCE
4c5ddc44dc
get conf global function 2021-03-19 17:58:01 +01:00
Laurent Destailleur
8462c4d3d3 Clean menu 2021-03-19 13:37:43 +01:00
Laurent Destailleur
ff7f1feaae Fix test on perm 2021-03-19 13:28:04 +01:00
Laurent Destailleur
aef2f1713e FIX #yogosha5673 2021-03-19 13:25:58 +01:00
Laurent Destailleur
d83d005284 FIX #yogosha5674 2021-03-19 12:44:59 +01:00
Frédéric FRANCE
7878f3cba0
fix php8 warning 2021-03-18 08:08:37 +01:00
Laurent Destailleur
b5b86d794f
Merge pull request #16740 from dolibit-ut/patch-100 
Update dav.php
 2021-03-17 17:04:07 +01:00
Laurent Destailleur
bd58e96430 Fix position of param 2021-03-17 11:12:30 +01:00
UT from dolibit
a18e27688d
Update dav.php 
$help_url = 'EN:Module_DAV';

llxHeader('', $langs->trans("DAVSetup"), $help_url);
 2021-03-16 16:54:58 +01:00
Laurent Destailleur
8246eb814b Enhance the page for security advices 2021-03-16 16:02:15 +01:00
Laurent Destailleur
e366d2c379 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
 2021-03-16 14:57:04 +01:00
UT from dolibit
a131d9be63
Update barcode.php 
$help_url   add  ->  DE:Modul_Barcode
 2021-03-15 16:19:29 +01:00
Laurent Destailleur
614720fc0a FIX #16671 Can not generate zip file of documents in backup tool 2021-03-15 14:51:36 +01:00
Frédéric FRANCE
191ca62420
fix php8 warning 2021-03-15 00:11:37 +01:00
Laurent Destailleur
5faecef0e1 Look and feel v14 2021-03-13 18:56:02 +01:00
Laurent Destailleur
0dfe79e619 CSS 2021-03-13 14:10:07 +01:00
Laurent Destailleur
c2200e6ffd Clean code 2021-03-10 16:41:48 +01:00
Laurent Destailleur
c3a047ee06 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
 2021-03-08 19:31:47 +01:00
Laurent Destailleur
89066e50f8 css 2021-03-08 12:07:01 +01:00
Laurent Destailleur
c0e0300eb3 Enhance the page security 2021-03-08 11:08:58 +01:00
Frédéric FRANCE
fee5bbf65b
fix usage of else if 2021-03-07 09:12:46 +01:00
Laurent Destailleur
cbd6357f45
Merge pull request #16556 from marc-dll/NEW_ldap_group_filter 
NEW: LDAP: usergroup search can be filtered
 2021-03-06 11:08:24 +01:00
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
 2021-03-05 19:29:09 +01:00
stickler-ci
06cabb35ec Fixing style errors. 2021-03-05 10:24:28 +00:00
Marc de Lima Lucio
25b1469b54 FIX: ldap group search test: bad key used + edit label/comments + remove useless code 2021-03-05 11:18:51 +01:00
Marc de Lima Lucio
f731545af4 NEW: ldap: filter search on usergroups 2021-03-05 11:14:21 +01:00
Laurent Destailleur
ffa0e6c391 FIX Timezone management for datetime on list of events 2021-03-04 15:34:29 +01:00
Frédéric FRANCE
bb2a505404
Update eventorganization.php 2021-03-02 18:26:04 +01:00
Laurent Destailleur
7f1d61f8a8 Fix phpcs 2021-03-02 15:34:43 +01:00
Florian HENRY
812d3279b3 Merge branch 'dev_new_conf_defaulteventstatus' of github.com:FHenry/dolibarr into dev_new_conf_defaulteventstatus 2021-03-02 11:06:52 +01:00
Florian HENRY
0f7144a391 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus 2021-03-02 11:05:20 +01:00
Laurent Destailleur
ebc3210308 FIX #16343 2021-03-02 01:58:36 +01:00
stickler-ci
54d35fa59f Fixing style errors. 2021-03-01 20:00:32 +00:00
Florian HENRY
f62386a6a5 set Default values as CURD classes 2021-03-01 20:36:42 +01:00
Florian HENRY
1b57d2a4a0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus 2021-03-01 19:57:54 +01:00
Florian HENRY
7d3bd131ab default envent status 2021-03-01 19:54:30 +01:00
Florian HENRY
0edae6e19a add class default values 2021-03-01 18:25:23 +01:00
Laurent Destailleur
87bc0f9c24 Fix align 2021-02-28 14:28:41 +01:00
Laurent Destailleur
886cbc61c8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_members.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-02-28 13:37:45 +01:00
Laurent Destailleur
3a19cbb062 FIX #16420 #16423 #16488 #16477 2021-02-28 12:47:24 +01:00
Frédéric FRANCE
608b933ef5
code syntax admin dir 2021-02-26 22:04:03 +01:00
Frédéric FRANCE
5199e3da5b
code syntax 2021-02-22 18:50:45 +01:00
Laurent Destailleur
f6080d45fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:26 +01:00
Laurent Destailleur
0d01041166 css 2021-02-21 12:10:07 +01:00
Laurent Destailleur
8f91dd48c9 Fix file integrity message 2021-02-20 11:46:48 +01:00
Laurent Destailleur
2904cc803f Fix selection in combo 2021-02-18 13:56:13 +01:00
Laurent Destailleur
bfe71e8509 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-17 14:28:19 +01:00
Florian HENRY
8b5ac45e34 fix typo 2021-02-16 19:29:45 +01:00
Florian HENRY
02a2610432 NEW: Conf for default actiomm status when created from card 2021-02-16 19:22:36 +01:00
Florian Mortgat
186dcab1b7 Merge branch 'NEW/12.0_new_payments_on_vat' of github.com:ATM-Consulting/dolibarr into NEW/14.0_new_payments_on_vat_default_checkbox_value 2021-02-16 16:28:14 +01:00
Florian Mortgat
037de5eac6 FIX no js + UX (button "modify") 2021-02-16 16:15:02 +01:00
Florian Mortgat
363fe1f52f NEW 12.0: option to leave the "Automatically create a total payment" checkbox empty on the tax creation page 2021-02-16 15:44:24 +01:00
Laurent Destailleur
73f4a6bfc2 css 2021-02-16 13:29:54 +01:00
Laurent Destailleur
6a46078449 Fix bad url 2021-02-16 12:59:46 +01:00
Laurent Destailleur
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
Laurent Destailleur
0506bb5e62 Trans 2021-02-16 10:43:29 +01:00
Laurent Destailleur
32370bf63d Look and feel v14 2021-02-15 20:13:38 +01:00
Laurent Destailleur
0bac454f25 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-15 16:40:45 +01:00
Laurent Destailleur
8b34c29be9 Fix translation 2021-02-15 16:39:30 +01:00
Laurent Destailleur
7b383b58c6 Trans 2021-02-15 16:35:51 +01:00
Laurent Destailleur
ad9f58d246
Update mails_templates.php 2021-02-15 15:57:08 +01:00
Laurent Destailleur
e802dd87f4
Merge branch 'develop' into dev_EventOrganisation_setuppage 2021-02-14 21:37:45 +01:00
Laurent Destailleur
9e16cd5b77 Look and feel v14 2021-02-14 20:47:57 +01:00
stickler-ci
a830c52156 Fixing style errors. 2021-02-14 16:36:28 +00:00
Florian HENRY
5958373f47 set icon fa 2021-02-14 17:31:30 +01:00
Florian HENRY
21a8d4d470 ok for setup pages 2021-02-14 17:06:49 +01:00
Florian HENRY
b5055a5edb config pages ok 2021-02-14 16:41:57 +01:00
Florian HENRY
d7dfb9138a working on setup 2021-02-14 15:00:20 +01:00
Florian HENRY
0bcfbb08d8 on going 2021-02-11 17:16:38 +01:00
Florian HENRY
13522fdf5f start module dev 2021-02-11 17:05:04 +01:00
Laurent Destailleur
401b4f641d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
 2021-02-08 22:13:50 +01:00
Laurent Destailleur
9453caa5be Avoid message when not required 2021-02-08 22:12:12 +01:00
Laurent Destailleur
6df6286688 Fix IMAP_FORCE_NORSH and option for imap without ssl 2021-02-08 19:21:32 +01:00
Laurent Destailleur
6892ad9630 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-02-08 17:25:05 +01:00
Laurent Destailleur
b04c342939 FIX #16215 2021-02-08 15:00:57 +01:00
Laurent Destailleur
9f9ace0565 FIX Localtax must be converted with price2num 2021-02-07 22:15:21 +01:00
Laurent Destailleur
dcae054352
Merge pull request #16202 from frederic34/patch-2 
remove var not used
 2021-02-07 19:57:25 +01:00
Frédéric FRANCE
8d49ca9f0d
fix html 2021-02-07 18:49:46 +01:00
Frédéric FRANCE
9aca5f0535
Update propal.php 2021-02-07 18:21:39 +01:00
Frédéric FRANCE
e37ca613d2
Update prelevement.php 2021-02-07 18:20:46 +01:00
Frédéric FRANCE
8d90063e8f
Update paymentbybanktransfer.php 2021-02-07 18:19:57 +01:00
Frédéric FRANCE
51da7273a4
Update payment.php 2021-02-07 18:18:45 +01:00
Laurent Destailleur
245fd6168d Move text into tab 2021-02-05 14:11:34 +01:00
Laurent Destailleur
726ef265f2 Look and feel v14 2021-02-04 19:21:07 +01:00
Laurent Destailleur
eee49b9132 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/delais.php
 2021-02-04 13:50:07 +01:00
Laurent Destailleur
eca010937f FIX Trigger on expense report was not fired 
FIX Bad dates on info tabs
 2021-02-04 11:56:53 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
c9e232f2ff Try to fix import/export timeout by dynamic increase 2021-02-03 18:00:27 +01:00
Laurent Destailleur
4d029194d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
 2021-02-02 13:22:23 +01:00