Commit Graph

3758 Commits

Author SHA1 Message Date
Laurent Destailleur
d1dba53f61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/admin/modules.php
	htdocs/install/mysql/migration/repair.sql
2020-06-07 19:40:17 +02:00
Laurent Destailleur
941362e683 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture.class.php
2020-06-07 18:59:49 +02:00
Laurent Destailleur
180a0a4557 Info for debug 2020-06-07 18:30:46 +02:00
Laurent Destailleur
a305c43901 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/societe/card.php
	htdocs/ticket/card.php
2020-06-06 11:51:39 +02:00
Laurent Destailleur
5dd9f4e4c4 Fix travis false positive 2020-06-06 11:36:24 +02:00
Laurent Destailleur
ca3f62e4ac Doc repair Row size too large 2020-06-05 17:47:52 +02:00
Laurent Destailleur
c7a614bd50 Fix clean data 2020-06-04 17:07:22 +02:00
Laurent Destailleur
2324834b73 Debug modulebuilder for doc generation
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/modulebuilder/template/admin/setup.php
2020-06-01 16:47:50 +02:00
Laurent Destailleur
67f007ea40 Fix length of field. Make some module die. 2020-05-31 23:12:26 +02:00
Laurent Destailleur
5a9d968a75 Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting 2020-05-29 00:02:03 +02:00
Laurent Destailleur
9d7a4cae00 Fix default value 2020-05-28 17:49:56 +02:00
Laurent Destailleur
15f2165c12 Fix work on payment by bank transfer (avoid confusion between record) 2020-05-27 20:14:11 +02:00
Laurent Destailleur
02b9ce5901 Fix length of title 2020-05-25 18:16:36 +02:00
Laurent Destailleur
0041bca82f Fix ambiguous param 2020-05-24 23:49:33 +02:00
Francis Appels
875230ed13 Fix missing batch update to varchar(128) 2020-05-23 10:23:26 +02:00
Laurent Destailleur
662970f232 Clean sql file 2020-05-20 23:42:28 +02:00
Laurent Destailleur
92cbff7749 Clean code 2020-05-20 23:40:04 +02:00
Laurent Destailleur
cce72ad8d6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/bills.lang
	htdocs/projet/class/project.class.php
2020-05-20 20:10:48 +02:00
Laurent Destailleur
6f52c62f2a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/bills.lang
2020-05-20 19:53:28 +02:00
Laurent Destailleur
434341316b suggest some fix to debug situation invoices 2020-05-20 19:51:04 +02:00
Laurent Destailleur
51ed77fbf7 Fix 2020-05-20 09:59:01 +02:00
Laurent Destailleur
a796122f7b Fix to solve feedbacks of
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
2020-05-14 14:30:32 +02:00
Laurent Destailleur
310c5f9eb6 Fix size of field 2020-05-09 21:56:51 +02:00
Laurent Destailleur
bba8ab657e Fix add missing migration 2020-05-08 18:57:15 +02:00
Laurent Destailleur
c98663be4a Fix sql 2020-05-08 14:05:04 +02:00
Laurent Destailleur
94d47c2acd Fix sql 2020-05-08 14:04:17 +02:00
Laurent Destailleur
206b16410e Revert the option to avoid to introduce a feature that is duplicate with
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
2020-05-07 22:52:32 +02:00
Laurent Destailleur
c2c0e6517f Fix init data of units D and H. 2020-05-01 22:44:46 +02:00
Laurent Destailleur
3957b74d9a Revert "FIX: add auto incrementation to llx_c_typent.sql"
This reverts commit 14a3aa2165.
2020-05-01 22:17:33 +02:00
Laurent Destailleur
994b60b1d8 Revert use of autoincrement not possible with value 0 2020-05-01 22:17:13 +02:00
Laurent Destailleur
efb79a4008 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-01 22:16:21 +02:00
Laurent Destailleur
10af669719 Fix missing autoincrement 2020-05-01 22:14:09 +02:00
Maxime Lecoq
14a3aa2165 FIX: add auto incrementation to llx_c_typent.sql 2020-04-30 18:21:25 +02:00
Laurent Destailleur
a40c2fdbfc Debug v12 2020-04-28 02:58:33 +02:00
Laurent Destailleur
fb8bdefbaa Look and feel v12 2020-04-28 02:10:26 +02:00
Laurent Destailleur
da02863242 Code comment 2020-04-23 12:19:51 +02:00
Laurent Destailleur
69f4a3e7b0 Doc 2020-04-23 11:41:03 +02:00
Laurent Destailleur
39c454d07b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modFournisseur.class.php
2020-04-22 18:28:52 +02:00
Laurent Destailleur
8598fd99c2 if not exists not required 2020-04-22 18:08:02 +02:00
Frédéric FRANCE
63186a60ae
Update 11.0.0-12.0.0.sql 2020-04-22 14:23:38 +02:00
Laurent Destailleur
22162ac57e Fix rounding of quantities 2020-04-22 13:14:50 +02:00
Laurent Destailleur
292d93405d
Merge pull request #13667 from frederic34/patch-4
Update 11.0.0-12.0.0.sql
2020-04-22 01:04:24 +02:00
Laurent Destailleur
11e9cc68b7
Merge pull request #13666 from frederic34/patch-1
Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql
2020-04-22 00:37:19 +02:00
Laurent Destailleur
042fb4641f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
2020-04-21 18:33:11 +02:00
Laurent Destailleur
f670a68b04 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/mails.php
2020-04-21 18:29:50 +02:00
Laurent Destailleur
f6735ce8f2 Update repair.sql script 2020-04-21 14:28:52 +02:00
Frédéric FRANCE
b0069f4fed
Update 11.0.0-12.0.0.sql 2020-04-20 18:46:11 +02:00
Frédéric FRANCE
f09fa5226a
Rename llx_c_shipment_package_type to llx_c_shipment_package_type.sql 2020-04-20 18:43:05 +02:00
Laurent Destailleur
f816fae86c Fix a duplicated index 2020-04-20 12:21:13 +02:00
Laurent Destailleur
16806da9b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-18 15:49:56 +02:00