Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
99,661 Commits 36 Branches 190 Tags
6d049f5c2e018603ec04219fa4586f544952ce60
Commit Graph

3258 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
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +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
ptibogxiv
319710d6aa Update 12.0.0-13.0.0.sql 2020-06-04 16:50:24 +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
58e76947ac Debug modulebuilder for doc generation 2020-06-01 16:44:22 +02:00
Laurent Destailleur
f63aa7f527 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
 2020-05-31 23:27:20 +02:00
Laurent Destailleur
67f007ea40 Fix length of field. Make some module die. 2020-05-31 23:12:26 +02:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
 2020-05-31 00:31:14 +02:00
Laurent Destailleur
c2a9819daa Debug establishment management 2020-05-29 21:45:50 +02:00
Laurent Destailleur
5a9d968a75 Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting 2020-05-29 00:02:03 +02:00
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
 2020-05-28 20:20:39 +02:00
Laurent Destailleur
9d7a4cae00 Fix default value 2020-05-28 17:49:56 +02:00
Christian Foellmann
50bac41399 fix #13988 - missing batch field extension 2020-05-28 15:19:48 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
 2020-05-27 23:07:18 +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
17382051c2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 22:19:50 +02:00
Laurent Destailleur
02b9ce5901 Fix length of title 2020-05-25 18:16:36 +02:00
Laurent Destailleur
0b9e1e6ec6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 13:01:49 +02:00
Laurent Destailleur
0041bca82f Fix ambiguous param 2020-05-24 23:49:33 +02:00
Laurent Destailleur
bf0327952b Merge pull request #13875 from ptibogxiv/patch-339 
NEW Date shipment from order accepts hours
 2020-05-23 15:42:24 +02:00
Laurent Destailleur
aec5200a98 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/variants/class/ProductCombination.class.php
 2020-05-23 15:37:00 +02:00
Laurent Destailleur
4913d10724 Merge branch 'develop' into patch-339 2020-05-23 15:14:06 +02:00
Francis Appels
875230ed13 Fix missing batch update to varchar(128) 2020-05-23 10:23:26 +02:00
Laurent Destailleur
15f3c97fff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 23:59:11 +02:00
Laurent Destailleur
662970f232 Clean sql file 2020-05-20 23:42:28 +02:00
Laurent Destailleur
954d928467 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 20:11:13 +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
2f7786f50f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 10:37:43 +02:00
Laurent Destailleur
51ed77fbf7 Fix 2020-05-20 09:59:01 +02:00
Anthony Berton
702627155c Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-05-19 15:20:18 +02:00
Laurent Destailleur
514009ca6d Add field position in llx_website 2020-05-18 15:47:21 +02:00
Anthony Berton
ceb3ba0e33 Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-05-16 16:42:20 +02:00
Anthony Berton
e1f8b50961 Delete 11.0.0-12.0.0.sql 2020-05-16 15:39:49 +02:00
Anthony Berton
ddb413c025 Create 12.0.0-13.0.0.sql 2020-05-16 15:37:13 +02:00
ptibogxiv
8d242cacae Update 12.0.0-13.0.0.sql 
update sql
 2020-05-15 16:04:36 +02:00
ptibogxiv
e00152a845 Rename 12.0.0.-13.0.0.sql to 12.0.0-13.0.0.sql 2020-05-15 16:03:38 +02:00
ptibogxiv
6a0bc86ea6 Create 12.0.0.-13.0.0.sql 2020-05-15 16:03:03 +02:00
ptibogxiv
1453b8469e Update 11.0.0-12.0.0.sql 2020-05-15 15:56:16 +02:00
Laurent Destailleur
b26c1757e6 Prepare v13 2020-05-14 16:07:23 +02:00
Anthony Berton
06c08ad045 Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-05-14 15:26:58 +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
1bd00b0e8c Fix to solve feedbacks of 
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
 2020-05-14 12:28:17 +02:00