Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
102,849 Commits 36 Branches 190 Tags
a94e39f0f47cd3e7fa8a6496bd023df1b81eec1f
Commit Graph

846 Commits

Author SHA1 Message Date
Laurent Destailleur
95833135f4 FIX #19974 2022-02-04 10:44:19 +01:00
Laurent Destailleur
7618966f81 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/core/class/utils.class.php
	htdocs/install/mysql/data/llx_20_c_departements.sql
 2022-01-07 15:56:21 +01:00
Laurent Destailleur
451fa396aa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2022-01-07 15:50:30 +01:00
Laurent Destailleur
b23b82bd6f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-01-07 15:49:09 +01:00
daraelmin
1f6e9a1a9e Fix install - Belgium provinces incorrect mapping 2022-01-04 18:46:29 +01:00
Maxime Kohlhaas
4b3289ed84 Fix #19666 : missing quotes in SQL statement 2021-12-28 16:20:01 +01: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
7526cb3b8b Fix VAT rate label and add Mali default vat rate 2021-09-10 09:44:06 +02:00
Laurent Destailleur
03cfea2504 Fix const setup 2021-09-01 19:06:58 +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
Florian HENRY
6f3080c67c send mail from ConfOrBooth list to attendees or santd company 2021-07-29 19:24:12 +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