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

106201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Seigne
744b84cb09 fix #20270 : use product_id in sql only if product_id is defined 2022-03-04 15:20:50 +01:00
Gauthier PC portable 024
7701ae2d19 FIX : in case of TVA refund, negative amount must be allowed 2022-03-04 13:55:52 +01:00
Laurent Destailleur
82e2f8706a Doc 2022-03-04 11:22:34 +01:00
Ferran Marcet
8c2c3bf3fb Fix: Can't import thirds. Column Skype doesn't exist 2022-03-04 10:06:24 +01:00
Ferran Marcet
da772676de Merge branch '15.0up' into 15.0 2022-03-04 09:58:30 +01:00
Florian HENRY
3b06a08aa0 FIX: User name in ManufacturingOrder 2022-03-03 13:56:10 +01:00
Laurent Destailleur
2837c938e6 Fix help easier to understand to avoid lethal situations. 
Fix reponsive
 2022-03-03 09:41:15 +01:00
Laurent Destailleur
246474b39b Fix phpunit 2022-03-03 02:15:52 +01:00
Laurent Destailleur
3c3d6ab0da Fix regression. Add unit test to detect it. 2022-03-03 01:17:44 +01:00
Laurent Destailleur
a9a2928e63 Responsive 2022-03-03 00:13:35 +01:00
Laurent Destailleur
c452428d12 Fix label of menu 2022-03-02 22:20:05 +01:00
Laurent Destailleur
9c7e1df622 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-02 22:06:06 +01:00
Laurent Destailleur
f0e95a2d20 Fix a default value is creating a letal blocking situation 2022-03-02 22:05:35 +01:00
Laurent Destailleur
987b32ef19 Fix a default value is creating a letal blocking situation 2022-03-02 22:04:44 +01:00
Laurent Destailleur
940417efe2 FIX payment not completed when using Paypal. 2022-03-02 15:13:17 +01:00
Laurent Destailleur
66b0f253b6 Clean code 2022-03-02 12:41:21 +01:00
Laurent Destailleur
d15c303590 Fix missing button 2022-03-02 11:57:19 +01:00
Laurent Destailleur
5ffac5f3ee Fix typo 2022-03-02 11:38:32 +01:00
Laurent Destailleur
8051128665 Split section experimental and stable 2022-03-02 11:37:19 +01:00
Laurent Destailleur
0ee858a9a2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-01 19:06:01 +01:00
Laurent Destailleur
3e1580475c Fix phpunit 2022-03-01 19:05:33 +01:00
Laurent Destailleur
2e38caa950 phpunit 2022-03-01 18:22:09 +01:00
Laurent Destailleur
883f13b388 Fix regression verifCond 2022-03-01 18:14:24 +01:00
Laurent Destailleur
b79ad197ec FIX Missing the field date start/end in export supplier invoice/order 2022-03-01 17:29:22 +01:00