Commit Graph

6419 Commits

Author SHA1 Message Date
Laurent Destailleur
db4871846e Merge pull request #19463 from code-chicken/patch-13
Better wording
2021-11-30 11:46:51 +01:00
Laurent Destailleur
198c530179 Fix syntax error 2021-11-25 21:51:07 +01:00
Laurent Destailleur
733ca28d8c css 2021-11-24 11:21:45 +01:00
Rüdiger Hahn
c97083f596 Better wording
Use "Modify" instead of "Update"
"Modify" is more like "I want to change something"
"Update" is more like "I want to confirm my changes"
2021-11-24 09:43:46 +01:00
Laurent Destailleur
bb6440af9d FIX Better label for reception status 2021-11-19 13:46:30 +01:00
Benjamin Chantalat
49d955b794 Uniformization of the table code as the line above 2021-11-02 15:53:57 +01:00
Benjamin Chantalat
0c1d4c9d51 No need of escape htmltag thanks to GETPOST before 2021-11-02 15:48:12 +01:00
Benjamin Chantalat
126fbf9f63 Change date format to be equal to mass stock transfert 2021-11-02 15:46:04 +01:00
Laurent Destailleur
ffcc6b6d69 Merge pull request #19235 from noec764/14.0_FIX_Error_in_stock_module
FIX: Replenish: SQL error when no warehouse has been created
2021-10-31 14:22:31 +01:00
Laurent Destailleur
13d3ff8ef7 Update replenish.php 2021-10-31 14:22:14 +01:00
Laurent Destailleur
7773f8f017 Update replenish.php 2021-10-31 14:20:30 +01:00
Laurent Destailleur
dfc8698422 Update replenish.php 2021-10-31 14:16:18 +01:00
Laurent Destailleur
6054e23b4d Merge pull request #19252 from hregis/fix_totalarray_is_overwritten
FIX $totalarray is overwritten, totals were lost
2021-10-31 13:56:37 +01:00
Laurent Destailleur
92f9f3179e Update list.php 2021-10-31 13:56:19 +01:00
Laurent Destailleur
dcc98b6026 Fix filter on product on statistic page 2021-10-31 12:54:08 +01:00
Regis Houssin
09621af54e FIX $totalarray is overwritten, totals were lost 2021-10-29 22:49:29 +02:00
Administrator
2a9cd21b71 FIX: Travis Sanitize SQL 2021-10-28 14:14:25 +02:00
Administrator
44eedb8c6e FIX: Replenish: SQL error when no warehouse has been created + Warning when there are no warehouses 2021-10-28 12:58:14 +02:00
Laurent Destailleur
da2ce063b3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/product/card.php
	htdocs/public/emailing/mailing-unsubscribe.php
2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:29:47 +02:00
Laurent Destailleur
d82cbf6636 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-26 13:09:15 +02:00
Laurent Destailleur
e87e354bd5 Fix: can't reset country of origin 2021-10-26 13:08:22 +02:00
Maxime Kohlhaas
0a2c950401 Fix #18916 : mass stock movements not displayed if error while adding line 2021-10-24 00:31:57 +02:00
Laurent Destailleur
fc29aa7d3b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-23 23:58:00 +02:00
Maxime Kohlhaas
604052d1a1 Fix #19070 : Api subproducts was returning false 2021-10-23 02:28:53 +02:00
Laurent Destailleur
b5929fb7c4 Fix phpcs 2021-10-22 15:42:18 +02:00
Laurent Destailleur
53244c5f45 FIX missing permission check reported by me@lainwir3d.net on product api 2021-10-20 12:38:19 +02:00
Laurent Destailleur
1c07385aba Update product.class.php 2021-10-16 21:22:53 +02:00
Benjamin Chantalat
3438a4a9f6 Add the module reception to the calcul of virtual stock 2021-10-14 09:33:26 +02:00
Benjamin Chantalat
91164951de Remove not complete order from virtual stock 2021-10-11 15:24:56 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Laurent Destailleur
ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php
2021-09-30 16:28:42 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
2021-09-30 16:21:36 +02:00
Marc de Lima Lucio
6abe6462e6 FIX: products/services card: hidden extrafields were overridden 2021-09-27 14:33:57 +02:00
Regis Houssin
144147c5d1 FIX check if greater 0 2021-09-22 14:58:03 +02:00
Laurent Destailleur
76ee014b52 Fix add a hidden solution to fix a corrupted value for AWP. 2021-09-21 16:32:32 +02:00
Laurent Destailleur
5b07be0179 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/holiday/list.php
2021-09-16 13:33:49 +02:00
Laurent Destailleur
c68687bdf6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/product/fournisseurs.php
2021-09-16 13:29:25 +02:00
Laurent Destailleur
87bb971d75 FIX autocalculation of the supplier price in main currency.
Conflicts:
	htdocs/product/fournisseurs.php
2021-09-16 13:22:22 +02:00
Laurent Destailleur
f26601e836 FIX autocalculation of the supplier price in main currency. 2021-09-16 13:17:00 +02:00
Laurent Destailleur
b1cb32c743 Fix some sql 2021-09-15 20:03:38 +02:00
Laurent Destailleur
30856d5b18 FIX Relative discount with high nb of decimals 2021-09-08 22:09:02 +02:00
Christian Foellmann
f391b11da7 fix product nature on create 2021-09-01 18:23:38 +02:00
Laurent Destailleur
ba594b20e0 Fix phpcs 2021-08-24 16:36:27 +02:00
Laurent Destailleur
15da97f1da Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/compta/facture/card.php
	htdocs/product/price.php
2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/product/price.php
2021-08-24 15:00:35 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
bdf8c3ddc6 Fix test 2021-08-20 23:26:56 +02:00
Laurent Destailleur
9d285ea232 Fix: Can delete a price when date is in future to fix corrupted data 2021-08-20 21:11:20 +02:00