Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,848 Commits 35 Branches 179 Tags 1.7 GiB
f8b0e535fa
Commit Graph

4140 Commits

Author SHA1 Message Date
Laurent Destailleur
850b939ffd FIX CVE-2018-19994 2018-12-22 17:03:50 +01:00
Laurent Destailleur
af4405c669 FIX Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE 2018-12-16 20:29:08 +01:00
Laurent Destailleur
d8b5cd4bdf Remove white lines 2018-12-16 19:31:59 +01:00
Laurent Destailleur
efb88292dd Clean code 2018-12-16 19:30:54 +01:00
Laurent Destailleur
003c463ee4 FIX Can't delete a line of minimal stock per warehouse 2018-12-16 19:23:53 +01:00
Norbert Penel
0f3a063c91 Events are not linked to products 
when created from a product card, the events are not linked to the product
 2018-12-15 15:57:15 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Inovea Conseil
0ba5fda3da
Update price.php 2018-12-01 16:11:49 +01:00
Inovea Conseil
8964ec7ea1
Fix #9572 
Fix #9572
 2018-12-01 15:58:37 +01:00
Maxime Kohlhaas
46d3bec104 Fix replenish wasn't caring about supplier price min quantity #9561 2018-10-28 10:25:56 +01:00
Laurent Destailleur
c8aa884462 Fix search all 2018-10-23 17:16:46 +02:00
Laurent Destailleur
7bb5e7c31f Fix responsive 2018-10-23 11:52:21 +02:00
Laurent Destailleur
5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php
 2018-10-19 14:27:15 +02:00
Laurent Destailleur
36ae81c749 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-19 14:17:20 +02:00
Laurent Destailleur
de4ead2558 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/product/reassort.php
 2018-10-19 14:16:53 +02:00
Ferran Marcet
ffde353441 FIX When delete a product, llx_product_association rows are not deleted 2018-10-17 10:06:06 +02:00
Ferran Marcet
bdae4e1c4d FIX When delete a product, llx_product_association rows are not deleted 2018-10-17 10:04:42 +02:00
Ferran Marcet
b462e7b217 FIX When delete a product, llx_product_association rows are not deleted 2018-10-17 10:01:02 +02:00
Maxime Kohlhaas
af813f8214 Fix missing status_batch var on product lists #9606 2018-10-14 19:55:25 +02:00
Laurent Destailleur
532e05c42e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2018-10-13 14:29:51 +02:00
atm-ph
7b17b453bf Fix sort and switch page 2018-10-12 23:29:35 +02:00
atm-ph
23e4cd57f3 Fix warnings PHP7 2018-10-12 23:27:38 +02:00
atm-ph
79420593f4 Fix display 0 (as virtual stock) instead of empty string 2018-10-11 17:14:22 +02:00
Laurent Destailleur
e6f179b6cb Fix look 2018-10-11 13:33:44 +02:00
Laurent Destailleur
df0ec95b22 Code comment and better error message 2018-10-09 21:21:10 +02:00
Laurent Destailleur
75b1cac33f FIX Pagination stats 2018-10-01 01:15:19 +02:00
Laurent Destailleur
575c63f87d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2018-09-27 12:52:10 +02:00
Laurent Destailleur
ff3f1e933a
Update replenish.php 2018-09-27 09:22:38 +02:00
gauthier
fc7c0ce521 FIX : need to filter on current entity on replenish 2018-09-24 16:23:44 +02:00
Laurent Destailleur
ed31eec5ee Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-05 20:40:19 +02:00
Laurent Destailleur
dfea391c88 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-09-05 20:39:38 +02:00
Laurent Destailleur
19431a94ba Code style 2018-09-05 14:37:44 +02:00
Laurent Destailleur
f7d5172a74
Merge pull request #9410 from frederic34/patch-10 
Create index.html
 2018-09-05 14:15:22 +02:00
Frédéric FRANCE
2015268b7e
Create index.html 2018-09-04 22:06:24 +02:00
Frédéric FRANCE
e4afd4af00
Create index.html 2018-09-04 22:05:06 +02:00
Laurent Destailleur
26cff9e11f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/blockedlog.lang
	htdocs/stripe/config.php
 2018-09-01 14:13:01 +02:00
Laurent Destailleur
123a66dc2a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/product/class/product.class.php
 2018-09-01 14:09:00 +02:00
atm-greg
f8fef61075 remove useless db begin 2018-08-30 09:19:44 +02:00
Laurent Destailleur
6ca9854a34 Fix to avoid fetch when no accounting account defined 2018-08-29 21:07:00 +02:00
Laurent Destailleur
d40e1a0d0b FIX #9258 2018-08-29 20:12:38 +02:00
Laurent Destailleur
534eadb7a2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-28 01:35:43 +02:00
Norbert Penel
f9c1dd8edd There is a begin transaction without rollback 
In this Select, there is no need of this Begin Transaction on my understanding.
Don't know why this line code is here for.
 2018-08-28 01:32:55 +02:00
Laurent Destailleur
e00d6eda7e
Update productlot_list.php 2018-08-28 01:29:33 +02:00
Frédéric FRANCE
27978ed9a0
Update productlot_list.php 
https://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/62492-dolibarr-8-erreur-sql-avec-le-menu-lots-series
 2018-08-26 07:47:33 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-08-12 20:08:20 +02:00
Laurent Destailleur
30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/product/reassort.php
	htdocs/societe/list.php
 2018-08-12 19:23:45 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
Frédéric FRANCE
7dada7ae8e
fix #8820 2018-07-29 09:15:42 +02:00
Laurent Destailleur
d871b8964f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-24 19:23:40 +02:00
Laurent Destailleur
e9eb8da61b
Update replenish.php 2018-07-24 18:09:50 +02:00