Commit Graph

1742 Commits

Author SHA1 Message Date
Laurent Destailleur
518b163066 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/product/stock/movement_list.php
2022-01-06 11:01:27 +01:00
Ferran Marcet
26c6908f66 Fix: Correctly display product translations 2022-01-03 13:22:07 +01:00
Jay Yeo
e8eaf986fe Fix author searching include first and last name 2021-12-16 16:55:47 +07:00
Jay Yeo
41e4e70c6e Fix author searching include first and last name 2021-12-16 16:28:45 +07:00
Laurent Destailleur
37fd2e05b9
Merge pull request #19582 from atm-florianm/FIX_13.0_duplicate_hook_printFieldListWhere_in_replenish
FIX 13.0: printFieldListWhere called twice on same query
2021-12-09 17:40:50 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
2021-12-08 17:56:05 +01:00
atm-florian
74ecb07925 FIX: printFieldListWhere called twice (at different locations) for the same SQL query, can result in syntax errors 2021-12-08 16:03:21 +01:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
Laurent Destailleur
c0a086fad8 Sellby always before Eatby #18361 2021-08-17 17:55:00 +02:00
Laurent Destailleur
5063f29532 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/comm/mailing/class/mailing.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/product/stock/replenish.php
2021-06-17 21:35:31 +02:00
Laurent Destailleur
e4056b8a1d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-17 21:30:50 +02:00
Juanjo Menent
eeef78760a fix: Bad position of the printFieldListWhere hook 2021-06-17 10:29:43 +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
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
Laurent Destailleur
b2ba1f5540 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
2021-05-17 10:47:00 +02:00
Laurent Destailleur
985301939d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 10:31:25 +02:00
Maxime Kohlhaas
acadef72c1 Fix use supplier relative discount in replenish order creation 2021-05-14 18:01:22 +02:00
Laurent Destailleur
28f0c6c7cf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/product/stock/card.php
2021-04-19 20:55:09 +02:00
atm-greg
74345c4f21 fix warehouse label field edition 2021-04-19 16:03:22 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
Laurent Destailleur
33c4180781 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:36:19 +01:00
Laurent Destailleur
16906abc09 FIX File attachment on lots 2021-02-26 12:47:57 +01:00
Laurent Destailleur
9a057386aa Fix look and feel 2021-02-02 02:38:02 +01:00
Laurent Destailleur
53014486d3 Fix default fields 2021-02-02 02:24:21 +01:00
Francis Appels
abbe340723 FIX missing reception link in stock movement list. 2020-12-21 12:24:45 +01:00
Laurent Destailleur
371a460905 More PHPUnit for movements 2020-12-16 12:26:01 +01:00
Laurent Destailleur
5facd49a6c Fix warnings 2020-12-16 11:33:31 +01:00
Laurent Destailleur
37fe5bb3ef Solve blocking feature. Can increase stock of a Kit without changing
subproduct stock.
2020-12-15 15:18:01 +01:00
Laurent Destailleur
7ac3bb1b67 Debug v13 2020-12-11 02:40:48 +01:00
Laurent Destailleur
5bd6d6f388 Look and feel v13 2020-12-03 14:34:15 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
5ed2bbb204 Fix error message 2020-11-27 16:13:27 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Damien BENOIT
ebd64d5e57
Merge pull request #5 from Dolibarr/develop
Update fork
2020-11-20 13:53:43 +01:00
Frédéric FRANCE
19a64a8350
add filters 2020-11-19 21:19:54 +01:00
Givriz
c48129e279 Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Laurent Destailleur
5c15162c40 Fix warning 2020-11-15 15:10:15 +01:00
Laurent Destailleur
8aaee7fa5e Fix replenishment must exclude parent of variants. 2020-11-13 11:28:02 +01:00
Laurent Destailleur
a98d025f5a Clean option for replenishment on real stock. 2020-11-13 11:06:51 +01:00
Laurent Destailleur
ed8a0093ff Debug v13 2020-11-05 22:25:14 +01:00
Laurent Destailleur
2668c07e5a Clean code 2020-11-03 01:25:58 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
8190711342
doxygen 2020-10-30 18:01:01 +01:00