lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
100,002 Commits 43 Branches 150 Tags 886 MiB
77efbda148
Commit Graph

6282 Commits

Author SHA1 Message Date
Laurent Destailleur
77efbda148 Fix responsive 2021-06-10 20:04:21 +02:00
Laurent Destailleur
16f1210e8a Fix phpcs 2021-06-09 17:51:22 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
7e95c5ec20 Clean code 2021-06-08 11:40:50 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
Laurent Destailleur
3fb0dabae3
Merge pull request #17745 from FHenry/fix_dev_inventory_rollbac 
fix: bad syntax  "rollbac" instead of "rollback"
 2021-06-04 12:43:09 +02:00
Laurent Destailleur
3dd53f58f9
Merge pull request #17759 from Hystepik/develop#1 
Fix inventory/inventory.php
 2021-06-04 12:28:55 +02:00
Laurent Destailleur
e26f0f155f
Update inventory.php 2021-06-04 12:00:54 +02:00
Laurent Destailleur
1136e7dec5
Update inventory.php 2021-06-04 11:57:59 +02:00
Laurent Destailleur
c3ed30345e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 11:45:24 +02:00
Laurent Destailleur
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
 2021-06-04 11:20:38 +02:00
Laurent Destailleur
7608f0b383
Merge pull request #17778 from tuxgasy/fix_check_stock_with_batch 
Fix: Do a strict comparison when check if stock is enough
 2021-06-04 10:34:29 +02:00
Laurent Destailleur
174c6f8a45
Update mouvementstock.class.php 2021-06-04 10:33:13 +02:00
ATM john
38423ba260 Fix wrong hook context 2021-06-02 16:31:31 +02:00
TuxGasy
e1de510c38 Do a strict comparison when check if stock is enough 2021-05-31 11:06:52 +02:00
Florian HENRY
f33869bf1c fix: uploaddir for productlot 2021-05-28 18:08:01 +02:00
Laurent Destailleur
81a94f5642 FIX option MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE 2021-05-28 18:04:45 +02:00
lmarcouiller
e87d175041 Fix inventory/inventory.php 2021-05-28 09:57:21 +02:00
Florian HENRY
14fdd4d0c6 fix rollback to rollbac 2021-05-27 16:43:49 +02:00
Laurent Destailleur
38ef028310 Clean code. Fix check for lot that must be unique. 2021-05-26 12:44:15 +02:00
Laurent Destailleur
156279d6a1 Fix nojs 2021-05-26 00:34:52 +02:00
Laurent Destailleur
80c5aa7271
Merge pull request #17722 from frederic34/patch-10 
Update api_stockmovements.class.php
 2021-05-26 00:31:28 +02:00
Frédéric FRANCE
429ebe6662
Update api_stockmovements.class.php 2021-05-25 23:49:49 +02:00
Laurent Destailleur
94c8246f68 Debug v14 2021-05-25 23:30:06 +02:00
Laurent Destailleur
f9d6438bae Debug v14 2021-05-25 23:26:03 +02:00
Laurent Destailleur
f252748dbf
Merge pull request #17343 from atm-gauthier/develop_new_collapse_batch_detail 
NEW : collapse batch detail
 2021-05-25 23:04:50 +02:00
Laurent Destailleur
9aee8a2a0b FIX #17406 2021-05-25 21:53:44 +02:00
Laurent Destailleur
11fa523070 FIX CWE-269 2021-05-21 15:54:11 +02:00
Laurent Destailleur
625aab34d6 Fix phpcs 2021-05-20 15:30:33 +02:00
Laurent Destailleur
45bc686f7f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/product/price.php
 2021-05-20 15:05:30 +02:00
Laurent Destailleur
b71eb6b75e
Merge pull request #17668 from atm-john/13.0_fix_dirt 
FIX : Remove forgotten  echo
 2021-05-20 14:14:25 +02:00
Laurent Destailleur
c80c261db5
Merge pull request #17684 from FHenry/dev_fix_inventorylink_into_stockmvt 
add inventory link into mvt stock list
 2021-05-20 13:52:54 +02:00
Laurent Destailleur
1ada0ddcb1
Merge pull request #17682 from frederic34/patch-5 
complete tooltip product
 2021-05-20 13:52:25 +02:00
Florian HENRY
1e6f3d0624 add inventory link into mvt stock list 2021-05-20 12:30:02 +02:00
Laurent Destailleur
dc3b5846fb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 09:24:09 +02:00
Laurent Destailleur
7390f4653a
Merge pull request #17674 from frederic34/phpcs_enable 
fix phpcs was disabled
 2021-05-20 09:18:00 +02:00
Frédéric FRANCE
c8b1eb180a
doxygen 2021-05-20 08:50:15 +02:00
Frédéric FRANCE
0d8c75268e
Update card.php 2021-05-19 23:32:14 +02:00
Frédéric FRANCE
b214fcb5e0
complete tooltip product 2021-05-19 23:29:35 +02:00
Frédéric FRANCE
83521311dc
fix phpcs was disabled 2021-05-19 15:48:08 +02:00
Laurent Destailleur
a8d36a3a55 Debug v14 2021-05-19 13:56:13 +02:00
ATM john
3bf71d456d fix doc 2021-05-19 12:01:47 +02:00
ATM john
1512abf96a Remove hpcs:disable 2021-05-19 12:00:27 +02:00
ATM john
9219dcfecb Fix price log spam 2021-05-19 11:52:34 +02:00
ATM john
5fd02992c0 Remove forgotten echo 2021-05-19 10:26:04 +02:00
Laurent Destailleur
5babd107a0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/replenish.php
 2021-05-18 12:43:52 +02:00
Laurent Destailleur
6d34c34cb5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/stock/replenish.php
 2021-05-18 12:11:33 +02:00
Laurent Destailleur
6b12dd4143 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-18 12:02:52 +02:00
Laurent Destailleur
6170b28c3b FIx #17651 2021-05-18 11:58:49 +02:00