Commit Graph

97355 Commits

Author SHA1 Message Date
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
stickler-ci
e4022e25e9 Fixing style errors. 2021-04-06 14:56:23 +00:00
NextGestion
debef2fb6d initial Batch to cancel partnership for expired members 2021-04-06 15:53:51 +01:00
NextGestion
6da2c47360 Add template email for cancel partnership 2021-04-05 18:13:51 +01:00
NextGestion
4464903ffc remove unnecessary files 2021-04-05 11:47:16 +01:00
NextGestion
21f86c05d4
Merge branch 'develop' into dolibarr_partnership 2021-04-03 09:44:21 +01:00
NextGestion
05e267d09c Fix parameter $notrigger 2021-04-03 09:40:44 +01:00
stickler-ci
eb4d8848e2 Fixing style errors. 2021-04-03 08:29:04 +00:00
NextGestion
6cac5f2212 Create Partnership Module 2021-04-03 09:24:07 +01:00
Laurent Destailleur
231f441876 Look and feel v14 2021-04-03 02:11:16 +02:00
Laurent Destailleur
858693d631 CSS 2021-04-03 01:39:08 +02:00
Laurent Destailleur
5ce9bc5801 FIX #yogosha5748 2021-04-02 23:23:44 +02:00
Laurent Destailleur
92da23945b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
2021-04-02 22:51:14 +02:00
Laurent Destailleur
65ea4285c8 Merge branch 'altairisfr-pr_batch_mask' into develop 2021-04-02 22:50:08 +02:00
Laurent Destailleur
cbbaecd100 Merge branch 'pr_batch_mask' of https://github.com/altairisfr/dolibarr
into altairisfr-pr_batch_mask

# Conflicts:
#	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
2021-04-02 22:49:49 +02:00
Laurent Destailleur
d0bea99e91
Merge pull request #17075 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
2021-04-02 22:44:31 +02:00
Laurent Destailleur
25e32c4fcd
Merge branch 'develop' into dev_EventOrganisation 2021-04-02 22:43:10 +02:00
Laurent Destailleur
d9a8673ca3
Merge pull request #17078 from dolibit-ut/patch-205
Update llx_10_c_regions.sql
2021-04-02 22:35:03 +02:00
Laurent Destailleur
942c6f6687
Merge pull request #17079 from dolibit-ut/patch-206
Update llx_20_c_departements.sql
2021-04-02 22:34:41 +02:00
Laurent Destailleur
af17a07d87
Merge pull request #17080 from dolibit-ut/patch-207
Update workstation_document.php
2021-04-02 22:34:24 +02:00
Laurent Destailleur
e422d77c28
Merge pull request #17081 from dolibit-ut/patch-208
Update workstation_list.php
2021-04-02 22:34:16 +02:00
Laurent Destailleur
b3ce53c9ab
Merge pull request #17082 from dolibit-ut/patch-209
Update workstation_note.php
2021-04-02 22:34:06 +02:00
Laurent Destailleur
1c47072c94
Merge pull request #17083 from dolibit-ut/patch-210
Update workstation_agenda.php
2021-04-02 22:33:56 +02:00
Laurent Destailleur
b528011392
Merge pull request #17084 from dolibit-ut/patch-211
Create index.html
2021-04-02 22:33:48 +02:00
Laurent Destailleur
ecac9d3c47
Merge pull request #17085 from dolibit-ut/patch-212
Create index.html
2021-04-02 22:33:38 +02:00
Laurent Destailleur
02c1d65702
Merge pull request #17086 from dolibit-ut/patch-213
Create index.html
2021-04-02 22:33:23 +02:00
Laurent Destailleur
51ee0b07c0 Removed duplicate comment 2021-04-02 22:32:52 +02:00
Laurent Destailleur
a9953fdffd
Merge pull request #17087 from dolibit-ut/patch-214
Update contact.php
2021-04-02 22:32:19 +02:00
Laurent Destailleur
e7a0e63688
Merge pull request #17088 from dolibit-ut/patch-215
Create index.html
2021-04-02 22:31:08 +02:00
Laurent Destailleur
436101b9b7
Merge pull request #17090 from dolibit-ut/patch-217
Update htmldoc_en.book
2021-04-02 22:31:00 +02:00
Laurent Destailleur
6aae8597a1
Merge pull request #17091 from dolibit-ut/patch-218
Update generate-product.php
2021-04-02 22:30:46 +02:00
Laurent Destailleur
17f6aede14
Merge pull request #17089 from dolibit-ut/patch-216
Update README
2021-04-02 22:30:02 +02:00
Laurent Destailleur
2eabe4aeb3
Merge pull request #17092 from dolibit-ut/patch-219
Update company_ids.txt
2021-04-02 22:29:49 +02:00
Laurent Destailleur
8f4c6e40f2
Merge pull request #17093 from dolibit-ut/patch-220
Update README-DE.md
2021-04-02 22:28:35 +02:00
UT from dolibit
54ae4655a4
Update README-DE.md 2021-04-02 22:08:26 +02:00
UT from dolibit
3f090a39de
Update company_ids.txt
Spain URL invalid
2021-04-02 22:05:16 +02:00
UT from dolibit
38f1ce1831
Update generate-product.php 2021-04-02 21:54:12 +02:00
Laurent Destailleur
e0cb175208 Doxygen 2021-04-02 21:49:21 +02:00
UT from dolibit
05bc027f7c
Update htmldoc_en.book 2021-04-02 21:42:02 +02:00
Laurent Destailleur
cadef101db Fix var name 2021-04-02 21:40:33 +02:00
UT from dolibit
62129c722a
Update README 2021-04-02 21:39:25 +02:00
UT from dolibit
769ce71650
Create index.html 2021-04-02 21:04:53 +02:00
UT from dolibit
828345b69f
Update contact.php
$help_url = 'EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones|DE:Modul_Lieferungen';

llxHeader('', $langs->trans('Order'), $help_url);
2021-04-02 20:58:08 +02:00
UT from dolibit
fbc0a0fce7
Create index.html 2021-04-02 20:50:04 +02:00
UT from dolibit
58dda89b7a
Create index.html 2021-04-02 20:49:00 +02:00
UT from dolibit
acdbd2d172
Create index.html 2021-04-02 20:48:23 +02:00
UT from dolibit
b988c5973f
Update workstation_agenda.php
$help_url = 'EN:Module_Workstation';
2021-04-02 20:41:49 +02:00
UT from dolibit
a745aad24b
Update workstation_note.php
$help_url = 'EN:Module_Workstation';
2021-04-02 20:40:22 +02:00
UT from dolibit
13b586f0b9
Update workstation_list.php
$help_url = 'EN:Module_Workstation';

llxHeader('', $title, $help_url);
2021-04-02 20:38:43 +02:00
UT from dolibit
8f53ca17ed
Update workstation_document.php
$help_url = 'EN:Module_Workstation';
2021-04-02 20:35:40 +02:00