Commit Graph

6378 Commits

Author SHA1 Message Date
Laurent Destailleur
da36ed5dfe Merge pull request #17297 from dolibit-ut/patch-278
Update llx_20_c_departements.sql
2021-04-19 21:30:49 +02:00
NextGestion
7cab4dd19d Manage partnership for members & code optimisation 2021-04-19 15:17:57 +01:00
UT from dolibit
0f0bd34d29 Update llx_10_c_regions.sql
-- Mauritius
-- Venezuela
-- United Arab Emirates
-- Portugal
-- Slovenia (correction fk_pays)
2021-04-19 15:38:44 +02:00
Laurent Destailleur
0c53198495 Easier to click 2021-04-18 20:18:38 +02:00
Laurent Destailleur
2b894e8ab3 css 2021-04-18 20:13:18 +02: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
f7b1ee9aba Add property "website" on the member card 2021-04-17 13:15:16 +01:00
NextGestion
87bcb212df Merge branch 'develop' into dolibarr_partnership 2021-04-17 13:51:21 +01:00
UT from dolibit
b9f0bc454b Update llx_20_c_departements.sql
Tunisia
2021-04-16 17:00:10 +02:00
UT from dolibit
4b0e846e25 Update llx_10_c_regions.sql
Tunesia
Luxembourg
Morocco
2021-04-16 16:50:08 +02:00
NextGestion
f784114176 Add email template for accepted partnership 2021-04-16 13:53:12 +01: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
Laurent Destailleur
8e2cc43eb1 Clean code 2021-04-15 19:19:58 +02:00
Laurent Destailleur
f2bd030f91 Clean code 2021-04-15 19:14:43 +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
Gauthier PC portable 024
9ca67b81f8 FIX : correction migration queries for postgres 2021-04-14 18:49:21 +02:00
Gauthier PC portable 024
4d643db4e6 FIX : travis 2021-04-14 16:14:03 +02:00
Gauthier PC portable 024
a596424328 FIX : Rebuild sequence for postgres only after query "INSERT INTO llx_salary(rowid 2021-04-14 16:01:48 +02:00
Anthony Berton
7137b3ddcc Update llx_societe.sql 2021-04-14 11:49:37 +02:00
Laurent Destailleur
192fcb89d2 Merge pull request #17097 from NextGestion/dolibarr_partnership
Create Partnership Module
2021-04-13 16:33:54 +02:00
Laurent Destailleur
4edf710594 Merge pull request #17220 from dolibit-ut/patch-263
Update llx_10_c_regions.sql
2021-04-13 15:58:43 +02:00
Laurent Destailleur
4bbe02c209 Merge pull request #17223 from atm-gauthier/fix_migration_script
FIX : UPDATE query must not use alias for postgres compatibility
2021-04-13 15:37:42 +02:00
Laurent Destailleur
1bae707246 Prepare table for future enhancement 2021-04-13 11:38:37 +02:00
Laurent Destailleur
9e491ad30c Add comment 2021-04-13 10:18:23 +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
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Gauthier PC portable 024
aff07ac13c FIX : UPDATE query must not use alias for postgres compatibility 2021-04-12 14:43:28 +02:00
UT from dolibit
8faaebb05f Update llx_10_c_regions.sql
add new: Denmark
2021-04-11 18:10:33 +02:00
Laurent Destailleur
c0b8aac12d Merge pull request #17218 from dolibit-ut/patch-262
Update llx_10_c_regions.sql
2021-04-11 14:34:18 +02:00
UT from dolibit
ec9efd8018 Update llx_10_c_regions.sql
USA
Honduras
India
Indonesia
Panama
Mexique
Romania
2021-04-11 12:49:08 +02:00
UT from dolibit
051b3cf9ad Update llx_20_c_departements.sql
Hungary - new sorting
2021-04-11 12:37:23 +02:00
Laurent Destailleur
421a515f75 Merge pull request #17214 from dolibit-ut/patch-260
Update llx_20_c_departements.sql
2021-04-10 15:29:05 +02:00
UT from dolibit
cb08151473 Update llx_20_c_departements.sql
Romania
2021-04-10 13:47:35 +02:00
UT from dolibit
260f39a4d2 Update llx_10_c_regions.sql
Switzerland/Suisse
San Salvador
Netherlands
United Kingdom
2021-04-10 13:18:57 +02:00
Laurent Destailleur
5dfebcf351 Merge pull request #17203 from dolibit-ut/patch-256
Update llx_20_c_departements.sql
2021-04-10 12:58:31 +02:00
Laurent Destailleur
4e6436c1bb Merge pull request #17202 from dolibit-ut/patch-255
Update llx_10_c_regions.sql
2021-04-10 12:34:51 +02:00
Laurent Destailleur
19b223c484 Merge pull request #17209 from dolibit-ut/patch-258
Update llx_c_type_contact.sql
2021-04-10 12:34:37 +02:00
Laurent Destailleur
c86b100477 Update llx_c_type_contact.sql 2021-04-10 12:34:30 +02:00
NextGestion
2035b956a6 Fix Sql & translate files 2021-04-10 10:57:23 +01:00
UT from dolibit
0c343f1f0f Update llx_c_type_contact.sql 2021-04-09 21:18:42 +02:00
UT from dolibit
d269e8da15 Update llx_c_socialnetworks.sql 2021-04-09 20:55:28 +02:00
Dorian Vabre
b3415f9031 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-09 16:23:42 +02:00
Dorian Vabre
a99dd2be35 new: add attendees public registration page 2021-04-09 16:20:12 +02:00
Dorian Vabre
a590f945e9 thirdparty creation OK, wip on conforboothattendee creation 2021-04-09 16:12:25 +02:00
UT from dolibit
cf83963e5f Update llx_20_c_departements.sql
Netherlands/Nederland
2021-04-09 15:07:32 +02:00
UT from dolibit
4d243ae072 Update llx_10_c_regions.sql
Italy
Spain
2021-04-09 14:56:52 +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
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
NextGestion
d6e4cb7d0b Merge branch 'develop' into dolibarr_partnership 2021-04-09 12:01:44 +01:00