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
Laurent Destailleur
ed71888501
Merge pull request #18093 from FHenry/14_deveventorg
...
new: working on conference or booth object and event type #FoundationFunding
2021-07-06 15:05:09 +02:00
Lenin Rivas
a2288b9039
Update unicode and name of currency
2021-07-06 15:00:19 +02:00
damien clochard
4c5bb786ba
FIX #18085 : Migration 13 to 14 : Explicit cast when changing the type of llx_c_ticket_category.pos
2021-07-06 14:51:53 +02:00
Florian HENRY
ca53abcef2
fix email template type
2021-07-05 15:35:05 +02:00
Laurent Destailleur
87241c94a3
Code comment
2021-07-05 14:41:40 +02:00
Théo David
de847250b1
NEW #18046 Add ticket categories data model
2021-07-01 17:55:54 +02:00
Laurent Destailleur
bda36337cd
Prepare fix #yogosha6443
2021-06-30 17:22:36 +02:00
Laurent Destailleur
25c6b64b1e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/modules/delivery/doc/pdf_storm.modules.php
htdocs/core/modules/reception/doc/pdf_squille.modules.php
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
2021-06-29 15:58:26 +02:00
Laurent Destailleur
1cf3408f5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/class/contact.class.php
2021-06-29 15:52:39 +02:00
Laurent Destailleur
e62ed28701
Debug v14
2021-06-26 15:39:52 +02:00
Laurent Destailleur
a4e6eb12a8
Fix migration pgsql
2021-06-24 12:46:50 +02:00
Laurent Destailleur
b47fa50d05
Try postgresl migration fix
2021-06-24 12:46:04 +02:00
atm-lena
7eddf43aef
FIX List and Create Companies Left Menus
2021-06-23 17:33:02 +02:00
Laurent Destailleur
5697e86c09
Fix columns for export/import profile
2021-06-21 14:12:33 +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
Laurent Destailleur
3754c2c3c9
Fix name of field
2021-06-17 00:59:11 +02:00
Laurent Destailleur
8db0ecd4db
Add fix of corrupted data
2021-06-16 19:40:43 +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
Laurent Destailleur
5cccf901c8
Merge pull request #17931 from dolibit-ut/patch-350
...
Update llx_00_c_country.sql
2021-06-15 22:12:56 +02:00
Laurent Destailleur
5f7dddbdcb
Fix permissions
2021-06-15 14:49:08 +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
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
