Commit Graph

25892 Commits

Author SHA1 Message Date
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