Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-25 10:51:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
93,485 Commits 36 Branches 191 Tags
3801dd34cdb62b94de22b8ebb934b65e63b052b1
Commit Graph

5747 Commits

Author SHA1 Message Date
Laurent Destailleur
2b59a20ce1 Merge pull request #15988 from atm-lena/13.0_FIX_Merge_Societe 
FIX Societe Merge : "unknow column fk_soc" + "Delivery" label
 2021-01-30 13:22:00 +01:00
atm-lena
cfca26a727 Fix fix 2021-01-29 16:20:43 +01:00
Laurent Destailleur
ad2f5ea7c1 Update website template 2021-01-22 12:39:59 +01:00
Laurent Destailleur
803ae91136 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-19 16:20:19 +01:00
Laurent Destailleur
a81b3a0d61 FIX #15946 2021-01-19 15:23:36 +01:00
Frederick Jost Zweig
267caf7ac8 Added 'US-BASE' and 'CA-ENG-BASE' to models list 
Added 'US-BASE' and 'CA-ENG-BASE' chart of accounts names to the 'Chart of accounts models' list.
 2021-01-18 02:22:23 +01:00
Frederick Jost Zweig
ed796cd500 Removed 'pcg_subtype' column 
The 'pcg_subtype' column of the table 'llx_accounting_account' has been removed in recent Dolibarr versions, so it has to be removed in this file also. Otherwise, the US chart of account can't be enabled.
 2021-01-18 02:22:16 +01:00
Laurent Destailleur
c6c7cbf208 Fix trans 2021-01-15 11:21:47 +01:00
atm-lena
e2696d7718 FIX Societe Merge : "unknow column fk_soc" + "Delivery" label 2021-01-15 09:58:04 +01:00
Laurent Destailleur
ea60a824ee Comment 2021-01-14 11:07:48 +01:00
UT from dolibit
a370ba1bbc Update check.php 
$arrayphpminversionwarning = array(5, 6, 0);
 2021-01-05 18:53:19 +01:00
Laurent Destailleur
601d4618d4 Missing vat rates 2021-01-02 14:52:37 +01:00
Laurent Destailleur
3cb71ef53e Code comment 2021-01-01 22:55:22 +01:00
Laurent Destailleur
5ff53691a5 Fix migration 2020-12-27 19:13:09 +01:00
Laurent Destailleur
6d1799eb25 Merge branch 'develop' into fixphpcs_2020_12 2020-12-21 18:08:20 +01:00
Laurent Destailleur
0195c11437 Add missing field required for real funnel of prospection. 2020-12-21 12:58:03 +01:00
Laurent Destailleur
d3bd709ad6 Fix phpcs 2020-12-20 18:51:17 +01:00
Frédéric FRANCE
f9ea75df3d fix phpcs 2020-12-20 10:28:06 +01:00
Laurent Destailleur
5cbdad7fa7 Fix autofill pass 2020-12-19 16:33:58 +01:00
Laurent Destailleur
9c759e91f0 Fix debug management of docs in ticket module 2020-12-16 19:01:26 +01:00
Laurent Destailleur
e4c853b162 Enable module product batch 2020-12-16 17:00:14 +01:00
Laurent Destailleur
6f75e24fd7 Fix better error management in migration 2020-12-16 15:10:11 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
5778b1f022 Merge pull request #15744 from frederic34/mycompanysocialnetworks 
my company social networks
 2020-12-13 12:54:22 +01:00
Frédéric FRANCE
4c09e14c49 fix sql error 2020-12-13 10:32:23 +01:00
Frédéric FRANCE
1b75ac9ffe add github 2020-12-12 21:17:18 +01:00
Laurent Destailleur
bfa8383bed Fix migration script 2020-12-12 12:30:13 +01:00
Laurent Destailleur
33bb1919f0 Merge branch 'develop' into develop#3 2020-12-12 12:23:33 +01:00
Laurent Destailleur
4fa1248d15 Fix avoid duplicate rows after double migration 2020-12-11 16:53:03 +01:00
lmarcouiller
a5cf177025 Close #15729 : first push 2020-12-11 15:22:29 +01:00
Laurent Destailleur
59938147b6 Prepare v13 2020-12-10 13:38:12 +01:00
Laurent Destailleur
d040f53dc2 Update web templates 2020-12-10 13:02:51 +01:00
Laurent Destailleur
a5eb2e56cb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/card.php
 2020-12-08 22:27:27 +01:00
Laurent Destailleur
75b8794d72 Fix column must be NULL 2020-12-08 22:23:24 +01:00
Laurent Destailleur
0f2a8d0262 Fix timestamp field 2020-12-08 17:20:45 +01:00
Hystepik
2ac98d06f5 Merge branch 'develop' into develop#3 2020-12-07 09:03:59 +01:00
Laurent Destailleur
4ba31ae52e Debug missing column packaging 2020-12-04 19:40:56 +01:00
Laurent Destailleur
10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php
 2020-12-04 19:24:29 +01:00
Florian HENRY
7a5a6a14f0 fix At install insert shipment mode failed 2020-12-04 09:10:36 +01:00
Laurent Destailleur
8a7f7b3551 FIX Request on purchase orders in timeout even on very small databases 2020-12-03 18:38:18 +01:00
Laurent Destailleur
210ccc4b43 FIX Missing very important performance indexes 2020-12-03 18:34:32 +01:00
Laurent Destailleur
bfe4eb7309 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/emailcollector_card.php
	htdocs/core/modules/modProduct.class.php
 2020-12-03 11:26:53 +01:00
lmarcouiller
e08f6aeb2b Fix #15383 2020-12-03 11:00:29 +01:00
Hystepik
7fc050e3ce Merge branch 'develop' into develop#3 2020-12-03 10:39:25 +01:00
Laurent Destailleur
56d5cd0402 Fix missing .php into name of boxes added into llx_boxes_def 2020-12-03 10:22:53 +01:00
Hystepik
ecb5a3b028 Merge branch 'develop' into develop#3 2020-12-03 10:12:19 +01:00
lmarcouiller
032116b235 changes to not diplay won and lost and add on migration 2020-12-03 10:11:16 +01:00
Laurent Destailleur
450aa7cbea Merge pull request #15597 from dolibit-ut/patch-51 
Update llx_accounting_abc.sql
 2020-12-02 19:47:19 +01:00
Laurent Destailleur
4c8043bd9f Merge pull request #15598 from dolibit-ut/patch-52 
Update llx_const.sql
 2020-12-02 19:17:31 +01:00
Laurent Destailleur
37b6a15dbb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-02 19:13:44 +01:00