Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
100,217 Commits 36 Branches 190 Tags
d04fe12ce9108040e80e04c52aba30a51dc31ab1
Commit Graph

4550 Commits

Author SHA1 Message Date
Laurent Destailleur
d04fe12ce9 # WARNING: head commit changed in the meantime 
Clean code
 2021-06-14 15:05:54 +02:00
UT from dolibit
c3a27b5ab9 Update llx_c_chargesociales.sql 2021-06-12 10:32:42 +02:00
Laurent Destailleur
52f0de00f6 Fix missing fields 2021-06-11 13:17:22 +02:00
UT from dolibit
2dbf9537b3 Update llx_c_chargesociales.sql 2021-06-07 08:59:47 +02:00
Laurent Destailleur
9f177a0c63 Debug v14 2021-06-06 16:36:41 +02:00
Laurent Destailleur
70af18148b Debug modulebuilder v14 2021-06-05 17:49:01 +02:00
Laurent Destailleur
2feffa8ab3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 12:48:27 +02:00
Laurent Destailleur
34955b1cf9 Fix sql 2021-06-04 12:48:18 +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
Laurent Destailleur
d8aa7a7f33 Merge pull request #17792 from Hystepik/develop#6 
Fix #17791 : Error when loading chart of accounts
 2021-06-04 09:25:24 +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
Laurent Destailleur
456356ded7 Fix migration 2021-06-02 18:45: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
4d42235670 Complete experimental module knowledge management 2021-05-18 20:46:14 +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
Laurent Destailleur
979b66177d Merge pull request #17589 from dolibit-ut/patch-321 
Update llx_00_c_country.sql
 2021-05-17 10:07:23 +02:00
Laurent Destailleur
9a8bd2c24b Add missing field 
Fix duplicate / in url
 2021-05-17 06:13:26 +02:00
Aisuko
3aa40e97cb Merge branch 'Dolibarr:develop' into develop 2021-05-16 13:56:01 +02:00
Laurent Destailleur
5e0f2f9781 Debug v14. Fix regression. 2021-05-12 22:35:21 +02:00
UT from dolibit
95a5e480a1 Update llx_00_c_country.sql 2021-05-12 21:55:31 +02:00
Laurent Destailleur
3ea6cd1c66 Fix missing columns 2021-05-12 08:53:29 +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
Laurent Destailleur
c37588025f Update 13.0.0-14.0.0.sql 2021-05-11 18:50:02 +02:00
Alexandre SPANGARO
c81b4f8c31 FIX Migration script 2021-05-09 08:31:36 +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
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
 2021-05-06 17:07:44 +02:00
Laurent Destailleur
0daab6a55a Code comment 2021-05-06 16:50:22 +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
Laurent Destailleur
475ed369ed Merge pull request #17490 from marc-dll/FIX_develop_expense_report_db_field 
FIX: expense report: column last_main_doc forgotten in v14 migration script
 2021-05-06 16:27:01 +02:00
Laurent Destailleur
9e057332f0 Merge pull request #17486 from NextGestion/dolibarr_partnership 
Dolibarr partnership
 2021-05-06 16:11:13 +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
lmarcouiller
209682e710 Fix #17361 : changes into mysql/tables of export_model 2021-05-05 11:30:13 +02:00