lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
106,225 Commits 43 Branches 150 Tags 886 MiB
994ea81ce0
Commit Graph

106225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
994ea81ce0 Fix test send email feature 2022-03-10 17:24:54 +01:00
Laurent Destailleur
f6fb406562 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-10 15:55:59 +01:00
Laurent Destailleur
72099870c0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-10 15:55:14 +01:00
Laurent Destailleur
10bfb76ae9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-03-10 15:54:39 +01:00
Laurent Destailleur
d27c0b31fc Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-03-10 15:54:08 +01:00
Laurent Destailleur
a1534955a1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2022-03-10 15:52:50 +01:00
Laurent Destailleur
79371f66b0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2022-03-10 15:52:28 +01:00
Laurent Destailleur
4569cb82b2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2022-03-10 15:52:04 +01:00
Laurent Destailleur
04d33f4594 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2022-03-10 15:51:42 +01:00
Laurent Destailleur
af6e95aa79 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2022-03-10 15:49:51 +01:00
Laurent Destailleur
5d942c9d1a Fix infinit logs 2022-03-10 15:46:00 +01:00
Laurent Destailleur
0ec5595504 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/admin/tools/export_files.php
 2022-03-10 14:12:57 +01:00
Laurent Destailleur
aa80be975e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/product/class/product.class.php
 2022-03-10 14:10:18 +01:00
Laurent Destailleur
32a68995d6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/class/product.class.php
 2022-03-10 14:08:19 +01:00
Laurent Destailleur
f6cfe0557b FIX exclusion of other backup files into backup file 
Conflicts:
	htdocs/admin/tools/export_files.php
 2022-03-10 14:04:16 +01:00
Laurent Destailleur
eadd8da3d5 FIX exclusion of other backup files into backup file 2022-03-09 23:32:59 +01:00
Laurent Destailleur
cc57d3dbc1 Fix phpcs 2022-03-09 22:25:29 +01:00
Laurent Destailleur
2279674f01 Trans 2022-03-09 15:58:23 +01:00
Laurent Destailleur
e76afe475b Fix responsive 2022-03-09 11:42:15 +01:00
Laurent Destailleur
c7bb6c3c4c FIX Upload in the filemanager use the Dolibarr methods 2022-03-08 20:46:56 +01:00
Laurent Destailleur
2d93c6b678 Fix template 2022-03-08 19:00:21 +01:00
Laurent Destailleur
70810dfbab Doc 2022-03-08 02:26:04 +01:00
Laurent Destailleur
af54274603 css 2022-03-07 20:09:14 +01:00
Laurent Destailleur
ec77b81d1a Prepare 15.0.1 2022-03-07 18:07:20 +01:00
Laurent Destailleur
fb2fb46d17 FIX Drag and drop line of files on join files tab 2022-03-07 16:04:55 +01:00
Laurent Destailleur
e9eef54b45 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 15:21:54 +01:00
Laurent Destailleur
c4a20685a4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 15:21:38 +01:00
Laurent Destailleur
fa707c6015 Fix error from v12 2022-03-07 15:20:55 +01:00
Laurent Destailleur
c0088191f1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/product/admin/product.php
	htdocs/product/class/product.class.php
 2022-03-07 15:19:51 +01:00
Laurent Destailleur
d13ae9f721 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
	htdocs/product/admin/product.php
	htdocs/product/class/product.class.php
 2022-03-07 15:13:25 +01:00
Laurent Destailleur
40b2beff2d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-03-07 15:06:37 +01:00
Laurent Destailleur
c4061e578d Fix field 2022-03-07 15:06:24 +01:00
Laurent Destailleur
028fc4f004 Fix field 2022-03-07 15:05:45 +01:00
Laurent Destailleur
df0b20aad3
Merge pull request #20241 from noec764/12.0_Product_Fournisseur_Migration 
Correction of the modification on the fly of the table llx_product_fournisseur_price
 2022-03-07 15:01:40 +01:00
Laurent Destailleur
e085c3989a
Update product.php 2022-03-07 14:59:55 +01:00
Laurent Destailleur
5a1163c9b9
Merge pull request #20257 from FHenry/14_fix_user_mo 
FIX: User name in ManufacturingOrder
 2022-03-07 14:25:20 +01:00
Laurent Destailleur
7d374dc4f6
Merge pull request #20264 from fmarcet/15.0 
Fix: #20161 Can't import thirds. Column Skype doesn't exist
 2022-03-07 14:21:42 +01:00
Laurent Destailleur
35e8e370b1
Merge pull request #20269 from atm-gauthier/14.0_fix_refund_tva 
FIX : in case of TVA refund, negative amount must be allowed
 2022-03-07 14:14:54 +01:00
Laurent Destailleur
e67c208b57
Merge pull request #20271 from rycks/12.0 
fix #20270 : use product_id in sql only if product_id is defined
 2022-03-07 14:07:27 +01:00
Laurent Destailleur
e13038dc30
Update product.class.php 2022-03-07 14:06:54 +01:00
Laurent Destailleur
c4f40fa089
Merge pull request #20276 from frederic34/patch-1 
Fix wrong upload dir
 2022-03-07 13:45:01 +01:00
Laurent Destailleur
621abfd70d Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-07 13:21:56 +01:00
Laurent Destailleur
378dab69a6 FIX #19777 #20281 2022-03-07 13:21:32 +01:00
Laurent Destailleur
d2c95c9a1a
Merge pull request #20284 from frederic34/patch-5 
clean comment
 2022-03-07 12:32:49 +01:00
Laurent Destailleur
f4cb5810a7 FIX list of visible type of event was not correctly filtered 
FIX Error management on mass action "Approve holiday"
 2022-03-07 12:01:34 +01:00
Frédéric FRANCE
543c475a71
clean comment 2022-03-06 10:56:17 +01:00
Laurent Destailleur
c45d6a3bc7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-04 19:45:02 +01:00
Laurent Destailleur
792dcc6334 FIX creation of the shipment if order contains services - 2/2 2022-03-04 19:14:57 +01:00
Frédéric FRANCE
9d1bcbe55a
Fix wrong upload dir 
introduced here https://github.com/Dolibarr/dolibarr/pull/19165
 2022-03-04 18:17:23 +01:00
Laurent Destailleur
444abbbc0e Fix regression 2022-03-04 16:44:33 +01:00