Laurent Destailleur
6f449cfd6c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-31 16:33:38 +02:00
Laurent Destailleur
1e8f27975d
Merge pull request #18207 from dolibit-ut/patch-363
...
Update llx_20_c_departements.sql
2021-07-31 13:30:53 +02:00
jpb
15578c2ec2
merge conflict
2021-07-30 10:57:04 +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
Christian Foellmann
b9cb04d4b7
Merge branch 'develop' into agenda-fcomm-cancel
2021-07-29 08:14:02 +02:00
ksar
3e3751e161
Add url field
...
#18212
2021-07-27 22:13:19 +02:00
Christian Foellmann
faf50a5aaa
add agenda auto creation on supplier_order cancellation
2021-07-27 15:06:28 +02:00
Florian HENRY
f4fd4d8e7d
new: ref fourn and ref customer same size as ref product
2021-07-27 12:09:04 +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
Frédéric FRANCE
f2dc3be051
add categories tickets migration
2021-07-21 08:40:07 +02:00
jpb
367e839239
change class css and behavior js
2021-07-20 13:56:30 +02:00
jpb
97287af987
add field to object product, add sql
2021-07-19 14:03:03 +02:00
lmarcouiller
1fb99a3185
Update to match eldy changes
2021-07-16 15:47:17 +02:00
Laurent Destailleur
0ccc2d9033
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-16 15:01:11 +02:00
Laurent Destailleur
501bc853af
Fix default value
2021-07-16 12:44:15 +02:00
lmarcouiller
f68f98cbdd
New : language support for knowledgemanagement module
2021-07-16 09:59:15 +02:00
Laurent Destailleur
0d12f25341
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-13 13:21:50 +02:00
Laurent Destailleur
d1a00c26aa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/functions.lib.php
2021-07-13 13:14:27 +02:00
Laurent Destailleur
7a589921fe
Fix #18142
2021-07-13 13:10:19 +02:00
Laurent Destailleur
4c29a3ad99
Fix migration
2021-07-13 13:06:28 +02:00
Laurent Destailleur
df3d88570c
Fix missing column in migration
2021-07-13 11:39:08 +02:00
Laurent Destailleur
6f4090f567
Merge pull request #18127 from evarisk-theo/add-ticket-categories-data-model
...
add: ticket categories data model
2021-07-12 13:19:47 +02:00
Laurent Destailleur
7533c9e3a5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/fr_FR/interventions.lang
2021-07-12 12:01:53 +02:00
Laurent Destailleur
977600e3a5
v15
2021-07-12 11:55:30 +02:00
evarisk-theo
8496c9e57f
Merge branch 'Dolibarr:develop' into add-ticket-categories-data-model
2021-07-12 09:09:53 +02:00
Laurent Destailleur
41016039b6
Fix missing very old table
2021-07-11 19:39:18 +02:00
Laurent Destailleur
ab030936c3
Fix missing commit on tables
2021-07-11 19:15:16 +02:00
Laurent Destailleur
032b44996c
Debug v14
2021-07-11 19:09:51 +02:00
Laurent Destailleur
802ac58f9a
Clean v14
2021-07-11 18:56:15 +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
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
