Commit Graph

1081 Commits

Author SHA1 Message Date
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