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

911 Commits

Author SHA1 Message Date
Alexandre SPANGARO
3a04a0115b Add data sortorder 2021-10-13 03:26:39 +02:00
Laurent Destailleur
0cf18ded80
Merge pull request #18866 from marc-dll/14.0_FIX_holiday_increments_pgsql 
FIX: postgresql compatibility with camelcase fields
 2021-10-06 13:26:57 +02:00
Marc de Lima Lucio
fdb6ebe80e FIX: postgresql: rename the oly column with uppercase characters to lowercase 2021-10-05 16:18:56 +02:00
Laurent Destailleur
5ad02ccc32 MAIN_EMAIL_ADD_TRACK_ID removed, MAIN_FIX_FOR_BUGGED_MTA 1 by defaut 2021-10-05 09:11:20 +02:00
Alexandre SPANGARO
94166cdb7e FIX Remove Isle of Man of ECC's countries 2021-10-03 05:36:53 +02:00
Laurent Destailleur
55e97784bd FIX #18880 2021-10-02 20:42:54 +02:00
Alexandre SPANGARO
b7c577b762 NEW #18814 Add legal form for Sweden 2021-09-26 05:17:03 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Laurent Destailleur
0fc51b6564 Fix email content 2021-09-16 12:10:40 +02:00
Laurent Destailleur
b18e0e3d1e Add missing translation key 2021-09-16 12:04:46 +02:00
Laurent Destailleur
3f7a75b0a3 FIX translation into email for member at membership validation. 2021-09-15 19:02:17 +02:00
Laurent Destailleur
11b6259130 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/langs/en_US/admin.lang
 2021-09-10 11:40:45 +02:00
Laurent Destailleur
7526cb3b8b Fix VAT rate label and add Mali default vat rate 2021-09-10 09:44:06 +02:00
Laurent Destailleur
8600d8d00d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 22:50:06 +02:00
Laurent Destailleur
03cfea2504 Fix const setup 2021-09-01 19:06:58 +02:00
Laurent Destailleur
b96dd7a796
Merge branch 'develop' into patch-422 2021-08-17 19:00:46 +02:00
Laurent Destailleur
21df418468 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-10 19:28:44 +02:00
Laurent Destailleur
2c5e0a595b Fix init data missing 2021-08-09 17:58:08 +02:00
Laurent Destailleur
e91c5fc1c5 Clean code 2021-08-09 17:55:26 +02:00
UT from dolibit
b801188801
Update llx_c_actioncomm.sql 2021-08-02 12:12:57 +02:00
Laurent Destailleur
7f28ad325b
Merge pull request #18208 from dolibit-ut/patch-364 
Update llx_00_c_country.sql
 2021-08-01 14:55:29 +02:00
Laurent Destailleur
b332d02d20
Merge pull request #18248 from cfoellmann/agenda-fcomm-cancel 
NEW add agenda auto creation on supplier_order cancellation
 2021-07-31 17:02:08 +02:00
Laurent Destailleur
cb2c7d1485 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 17:00:00 +02:00
Florian HENRY
6f3080c67c send mail from ConfOrBooth list to attendees or santd company 2021-07-29 19:24:12 +02:00
Christian Foellmann
8d87bdcf7e add sql data for fresh install 2021-07-29 08:18:55 +02:00
UT from dolibit
8920590e28
Update llx_00_c_country.sql 
Singapour  -->  Singapore 
Iles Aland  -->  Åland Island 
Samoa américaines  -->  American Samoa 
Antarctique  -->  Antarctica 
Antigua-et-Barbuda  -->  Antigua and Barbuda 
Azerbaïdjan  -->  Azerbaijan
 2021-07-23 12:48:25 +02:00
UT from dolibit
38b34b1f19
Update llx_20_c_departements.sql 
Panama
 2021-07-23 12:25:59 +02:00
Laurent Destailleur
c23f46af9b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-06 15:35:39 +02:00
Lenin Rivas
a2288b9039 Update unicode and name of currency 2021-07-06 15:00:19 +02:00
Florian HENRY
ca53abcef2 fix email template type 2021-07-05 15:35:05 +02:00
Laurent Destailleur
e62ed28701 Debug v14 2021-06-26 15:39:52 +02:00
UT from dolibit
e67062aea1
Update llx_00_c_country.sql 
Ouganda  ->  Uganda 
Ukraine = Ukraine 
United Arab Emirates (is yet EN) 
Iles mineures éloignées des États-Unis  ->  United States Minor Outlying Islands 
Uruguay = Uruguay 
Ouzbékistan  ->  Uzbekistan 

Vanuatu = Vanuatu 
Vénézuela  ->  Venezuela 
Viêt Nam  ->  Vietnam 
Iles Vierges britanniques  ->  British Virgin Islands 
Iles Vierges américaines  ->  Virgin Islands of the United States  (also called:  American Virgin Islands) 

Wallis-et-Futuna  ->  Wallis and Futuna 
Sahara occidental  ->  Western Sahara 

Yémen  ->  Yemen 

Zambie  ->  Zambia 
Zimbabwe = Zimbabwe 

Guernesey  ->  Guernsey 
Ile de Man  ->  Isle of Man 
Jersey = Jersey 

Monténégro  ->  Montenegro 
Saint-Barthélemy   (Saint Barthélemy) 
Saint-Martin   (Saint Martin) 
Kosovo = Kosovo
 2021-06-17 09:04:41 +02:00
UT from dolibit
b8824435d2
Update llx_00_c_country.sql 
Taïwan  ->  Taiwan 
Tadjikistan  ->  Tajikistan 
Tanzanie  ->  Tanzania 
Thaïlande  ->  Thailand 
Timor Oriental  ->  East Timor /  Timor-Leste 
Tokélaou  ->  Tokelau 
Tonga = Tonga 
Trinité-et-Tobago  ->  Trinidad and Tobago 
Turquie  ->  Turkey 
Turkménistan  ->  Turkmenistan 
Iles Turks-et-Caicos  ->  Turks and Caicos Islands 
Tuvalu = Tuvalu
 2021-06-16 09:40:45 +02:00
UT from dolibit
41549af751
Update llx_00_c_country.sql 
Iles Salomon  ->  Solomon Islands 
Somalie  ->  Somalia 
South Africa 
Iles Géorgie du Sud et Sandwich du Sud  ->  South Georgia and the South Sandwich Islands 
Sri Lanka = Sri Lanka 
Soudan  ->  Sudan 
Suriname = Suriname 
Iles Svalbard et Jan Mayen  ->  Svalbard and Jan Mayen 
Swaziland = Swaziland     & new also:   Eswatini 
Syrie  ->  Syria
 2021-06-14 21:45:11 +02:00
UT from dolibit
c3a27b5ab9
Update llx_c_chargesociales.sql 2021-06-12 10:32:42 +02:00
UT from dolibit
2dbf9537b3
Update llx_c_chargesociales.sql 2021-06-07 08:59:47 +02:00
Laurent Destailleur
c29347b0f8
Merge pull request #17740 from dolibit-ut/patch-334 
Update llx_c_email_templates.sql
 2021-06-04 12:40:33 +02:00
Laurent Destailleur
a48b18aced
Merge pull request #17741 from dolibit-ut/patch-335 
Update llx_c_chargesociales.sql
 2021-06-04 12:35:37 +02:00
Laurent Destailleur
ede911361d
Merge pull request #17774 from dolibit-ut/patch-336 
Update llx_00_c_country.sql
 2021-06-04 10:36:09 +02:00
lmarcouiller
71856984a3 Fix #17791 : fix for at account 2021-06-03 09:35:31 +02:00
lmarcouiller
fa71402a9b Fix 17791 : fix for at account 2021-06-03 09:34:49 +02:00
lmarcouiller
8f7daf7f57 Fix 17791 : fix for at account 2021-06-03 09:32:58 +02:00
lmarcouiller
aa1ade5224 Fix #17791 : fix for SKR03 2021-06-03 09:13:48 +02:00
lmarcouiller
6d049f5c2e Fix #17791 : Error when loading chart of accounts 2021-06-02 09:31:04 +02:00
UT from dolibit
2c6eee2528
Update llx_00_c_country.sql 
Roumanie  ->  Romania 
Rwanda = Rwanda 
Sainte-Hélène  ->  Saint Helena 
Saint-Christophe-et-Niévès  ->  Saint Kitts and Nevis 
Sainte-Lucie  ->  Saint Lucia 
Saint-Pierre-et-Miquelon  ->  Saint Pierre and Miquelon 
Saint-Vincent-et-les-Grenadines  ->  Saint Vincent and the Grenadines 
Samoa = Samoa 
Saint-Marin  ->  San Marino  
Sao Tomé-et-Principe  ->  Saint Thomas and Prince 
Serbie  ->  Serbia 
Seychelles = Seychelles 
Sierra Leone = Sierra Leone 
Slovaquie  ->  Slovakia 
Slovénie  ->  Slovenia
 2021-05-31 10:26:05 +02:00
UT from dolibit
d0a8dc9df9
Update llx_c_chargesociales.sql 
idea:  fk_pays at first  - id as second (based on fk_pays)
 2021-05-27 13:25:00 +02:00
UT from dolibit
ca7e52d861
Update llx_c_email_templates.sql 
- formatting
- removed *tms* at eventorganization
 2021-05-27 13:09:03 +02:00
Laurent Destailleur
2b8e1cb46b
Merge pull request #17697 from dolibit-ut/patch-333 
Update llx_00_c_country.sql
 2021-05-25 19:48:35 +02:00
Laurent Destailleur
a840afa72a Fix missing entry into table 2021-05-25 15:24:28 +02:00
UT from dolibit
a5001899eb
Update llx_00_c_country.sql 
Nouvelle-Calédonie  ->  New Caledonia 
Nouvelle-Zélande  ->  New Zealand 
Nicaragua = Nicaragua 
Niger = Niger 
Nigeria = Nigeria 
Nioué  ->  Niue 
Ile Norfolk  ->  Norfolk Island 
Mariannes du Nord  ->  Northern Mariana Islands 
Norvège  ->  Norway 
Oman = Oman 
Pakistan = Pakistan 
Palaos  ->  Palau 
Territoire Palestinien Occupé  ->  Palestinian territories 
Panama = Panama 
Papouasie-Nouvelle-Guinée  ->  Papua New Guinea 
Paraguay = Paraguay 
Peru = Peru 
Philippines = Philippines 
Iles Pitcairn  ->  Pitcairn Islands 
Pologne  ->  Poland 
Porto Rico  ->  Puerto Rico 
Qatar = Qatar
 2021-05-21 13:32:09 +02:00
Laurent Destailleur
a0dc991fb1
Merge pull request #17672 from dolibit-ut/patch-331 
Update llx_00_c_country.sql
 2021-05-20 14:13:58 +02:00
UT from dolibit
f9fb296ea6
Update llx_00_c_country.sql 
République Tchèque  ->  Czech Republic 
Danemark  ->  Denmark 
Djibouti = Djibouti 
Dominique  ->  Dominica 
République Dominicaine  ->  Dominican Republic
Equateur  ->  Republic of Ecuador 
Egypte  ->  Egypt 
Salvador  ->  El Salvador 
Guinée Equatoriale  ->  Equatorial Guinea 
Erythrée  ->  Eritrea
 2021-05-19 13:59:36 +02:00
UT from dolibit
82e819d059
Update llx_20_c_departements.sql 
USA
 2021-05-19 13:43:13 +02:00
Laurent Destailleur
296c1c2978
Merge pull request #17583 from AisukoWasTaken/develop 
Fix SQL error for Panama Provinces
 2021-05-17 10:09:15 +02:00
UT from dolibit
95a5e480a1
Update llx_00_c_country.sql 2021-05-12 21:55:31 +02:00
Aisuko Hakumei
8a4fd56b23 Fix SQL error for Panama Provinces 2021-05-11 22:54:26 +02:00
Laurent Destailleur
5a81395ffa
Merge pull request #17474 from dolibit-ut/patch-318 
Update llx_20_c_departements.sql
 2021-05-11 20:51:35 +02:00
UT from dolibit
c64fec53e2
Update llx_20_c_departements.sql 
so now fixed
 2021-05-08 15:26:52 +02:00
Laurent Destailleur
48a1e5c75e
Merge pull request #17499 from bb2a/trigger_update_thirpartie 
Add events trigger update Thirparty and Contact
 2021-05-06 19:14:02 +02:00
Laurent Destailleur
6019df2dfc Merge branch 'batch_status_dict' of 
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict

# Conflicts:
#	htdocs/langs/fr_FR/productbatch.lang
 2021-05-06 17:29:41 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment 
new: working on conference or booth object and event type #FoundationFunding
 2021-05-06 16:31:30 +02:00
UT from dolibit
6b89b99dfd
Update llx_00_c_country.sql 2021-05-05 23:07:52 +02:00
Anthony Berton
ed26e75c0b init 2021-05-05 11:54:16 +02:00
UT from dolibit
9bf10c50a2
Update llx_20_c_departements.sql 
Peru
 2021-05-03 15:29:49 +02:00
Laurent Destailleur
cc0739d531
Merge pull request #17456 from dolibit-ut/patch-309 
Update llx_20_c_departements.sql
 2021-05-03 13:17:24 +02:00
Laurent Destailleur
a9da0ec93f
Merge pull request #17432 from dolibit-ut/patch-307 
Update llx_00_c_country.sql
 2021-05-03 13:17:03 +02:00
UT from dolibit
5408671f8e
Update llx_10_c_regions.sql 
Morocco - changed its regions in 2015 
insert at first only a comment

check how to change for migration of old user datasets
 2021-05-02 13:44:06 +02:00
UT from dolibit
9e2a987ee3
Update llx_20_c_departements.sql 
Morocco / Maroc Provinces (have to check before/after year 2015)
 2021-05-02 13:17:05 +02:00
Laurent Destailleur
baef062295
Merge pull request #17431 from dolibit-ut/patch-306 
Update llx_20_c_departements.sql
 2021-04-30 12:01:46 +02:00
UT from dolibit
5f7a3571cd
Update llx_00_c_country.sql 
countries in english
 2021-04-29 16:08:27 +02:00
UT from dolibit
2c8ab51dac
Update llx_20_c_departements.sql 
Portugal (remove '' at fk_region)
 2021-04-29 15:55:38 +02:00
UT from dolibit
54ab2e523d
Update llx_10_c_regions.sql 
Hungary - sorting & regions in hungarian
 2021-04-29 15:40:45 +02:00
altairis-noe
38bba5dddc Merge branch 'develop' into batch_status_dict 2021-04-29 13:13:41 +02:00
altairis-noe
f7182d43fd add entity in c_productbatch_qcstatus key 2021-04-29 13:00:47 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment 2021-04-29 10:31:43 +02:00
Laurent Destailleur
4ca4c5a0fc
Merge pull request #17417 from dolibit-ut/patch-304 
Update llx_20_c_departements.sql
 2021-04-28 15:08:36 +02:00
UT from dolibit
26a7c2613a
Update llx_20_c_departements.sql 
Taiwan
Slovenia (need to check SI-Id)
Panama
 2021-04-28 10:03:02 +02:00
UT from dolibit
29cb154028
Update llx_10_c_regions.sql 
China
Taiwan

sorting completed
 2021-04-28 09:38:19 +02:00
altairis-noe
9fc67275fd llx_c_productbatch_status to migration and translatable strings 2021-04-27 15:55:51 +02:00
Laurent Destailleur
890c053deb
Merge pull request #17353 from dolibit-ut/patch-301 
Update llx_20_c_departements.sql
 2021-04-27 01:30:17 +02:00
Laurent Destailleur
fa1ad82663 Fix id in comment 2021-04-26 23:42:49 +02:00
Dorian Vabre
e9b35cf36b mail template modified to add company name and remove useless payment link 2021-04-23 16:53:34 +02:00
UT from dolibit
c43863c2a8
Update llx_10_c_regions.sql 
Peru
Hungary
 2021-04-22 11:22:40 +02:00
altairis-noe
86812c13ee no double quote 2021-04-21 09:18:40 +02:00
altairis-noe
d340e21cb3 No translation for dictionary labels 2021-04-20 16:13:36 +02:00
altairis-noe
07cd751c59 batch status dictionnary 2021-04-20 15:51:02 +02:00
UT from dolibit
771afbc195
Update llx_20_c_departements.sql 
Italy new
 2021-04-20 13:10:29 +02:00
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
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
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
Laurent Destailleur
f2bd030f91 Clean code 2021-04-15 19:14:43 +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
9e491ad30c Add comment 2021-04-13 10:18:23 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +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