lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
112,040 Commits 43 Branches 150 Tags 886 MiB
00a855bc5e
Commit Graph

962 Commits

Author SHA1 Message Date
Laurent Destailleur
ef19769249
Merge pull request #20318 from Achicken7301/develop 
Vietnam date format, VAT rates
 2022-03-16 22:22:20 +01:00
Laurent Destailleur
09a60e7ecb
Merge pull request #20338 from dolibit-ut/patch-380 
Update llx_00_c_country.sql
 2022-03-15 19:46:49 +01:00
Laurent Destailleur
306b58443c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/data/llx_20_c_departements.sql
 2022-03-15 19:44:34 +01:00
UT from dolibit
271857189c
Update llx_20_c_departements.sql 2022-03-15 13:29:34 +01:00
Miro Sertić
f22888e426 Add contributor to llx_c_forme_juridique.sql 2022-03-13 14:34:14 +01:00
Miro Sertić
fc59f49b32 Add vat for Croatia 2022-03-13 14:18:14 +01:00
Miro Sertić
339152cf68 Add departments for Croatia 2022-03-13 13:50:11 +01:00
Khang
25d31e38ea Add (llx_c_tva.sql) VIETNAM VAT 2022-03-13 19:15:25 +07:00
Miro Sertić
ba4b72e59d Add regions for Croatia 2022-03-13 13:07:42 +01:00
Miro Sertić
22b3c0ccae Add forme juridique for croatia 2022-03-13 13:04:50 +01:00
UT from dolibit
f808756c3e
Update llx_00_c_country.sql 
Bahreïn  -->  Bahrain
Barbade -->  Barbados
Bénin  -->  Benin
Bermudes  -->  Bermuda 
Bhoutan  -->  Bhutan
Bolivie  -->  Bolivia 
Bosnie-Herzégovine  -->  Bosnia and Herzegovina 
Ile Bouvet  -->  Bouvet Island   (Population: 0 ;-))
Territoire britannique de l''Océan Indien  -->  British Indian Ocean Territory 
Bulgarie  -->  Bulgaria
 2022-03-12 16:34:15 +01:00
Quentin VIAL-GOUTEYRON
7ae96b9839 convert number into qty 2022-03-09 10:34:23 +01:00
Marc de Lima Lucio
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
Quentin VIAL-GOUTEYRON
771fa0b6ed Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Availibility_dictionary_field 2022-03-08 08:50:22 +01:00
Laurent Destailleur
fc139ba9e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-07 17:22:53 +01:00
Laurent Destailleur
fa46966b81 Fix insert must not include the rowid. 2022-03-07 17:22:29 +01:00
priojk
db12fe9225 CLOSE #20292 Include German public holidays 
Definition of German public holidays (those which are
only relevant in some areas are marked with --TLW).
The values are configured during the first initial set-up of
Dolibarr.
 2022-03-07 16:38:56 +01:00
Quentin VIAL-GOUTEYRON
af8ecd1a38 NEW Availibility dictionnary column unit and number 2022-03-07 16:02:49 +01:00
Laurent Destailleur
19389ca018
Merge pull request #20200 from ymollard/default-type4tickets 
Set default ticket type to OTHER if no default exists
 2022-02-28 21:03:59 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Laurent Destailleur
40d67d70d2 Fix module partnership 2022-02-28 12:37:56 +01:00
Yoan Mollard
4082de422f Set default ticket type to OTHER if no default exists 2022-02-25 16:27:55 +01:00
UT from dolibit
8a0ee772d3
add GitHub 
INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'github', 'GitHub', 'https://www.github.com/{socialid}', '', 0);
 2022-02-18 13:10:38 +01:00
Alfredo Altamirano
88a33c730a
FIX #20042 Update Mexican legal entities 2022-02-11 02:01:25 -06:00
Laurent Destailleur
16e4e736fd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-10 16:28:29 +01:00
Laurent Destailleur
535c04e86e Fix region of LIVORNO 2022-02-10 14:18:13 +01:00
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-02-07 15:51:01 +01:00
Laurent Destailleur
fafe41294a Clean install 2022-02-07 14:29:59 +01:00
Laurent Destailleur
7cc06a0ef9 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-02-04 15:40:28 +01:00
Laurent Destailleur
f99e19e729 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-04 13:19:55 +01:00
Laurent Destailleur
95833135f4 FIX #19974 2022-02-04 10:44:19 +01:00
Laurent Destailleur
2fea78c90a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_c_action_trigger.sql
 2022-01-29 16:48:40 +01:00
Anthony Berton
dcb7e39bd2
Update llx_c_action_trigger.sql 2022-01-28 02:27:09 +01:00
Anthony Berton
b64856807b
Update llx_c_action_trigger.sql 2022-01-25 00:09:41 +01:00
Anthony Berton
16ca2d68b6
Update llx_c_action_trigger.sql 2022-01-18 19:31:51 +01:00
Laurent Destailleur
60b2479389 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
 2022-01-07 16:00: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
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2021-12-30 19:03:46 +01:00
Maxime Kohlhaas
4b3289ed84 Fix #19666 : missing quotes in SQL statement 2021-12-28 16:20:01 +01:00
Laurent Destailleur
9789ae23d7
Update llx_c_paiement.sql 2021-11-18 20:12:46 +01:00
ptibogxiv
d3c7ab5a82
Update llx_c_paiement.sql 2021-11-15 20:38:46 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Laurent Destailleur
bbd3293c3c Data ref 2021-11-08 01:42:38 +01:00
Marc de Lima Lucio
7e059c0a22 NEW: deposit payment terms: futureproof evolutions by storing field as a string 2021-10-28 16:53:28 +02:00
Marc de Lima Lucio
668088a63f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-28 15:54:18 +02:00
Marc de Lima Lucio
29768a1c6e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2021-10-13 11:33:04 +02:00
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
Marc de Lima Lucio
b173832d54 NEW: deposit payment terms: add a 30% deposit example payment term at install/migration 2021-10-05 15:42:40 +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