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

6999 Commits

Author SHA1 Message Date
Laurent Destailleur
b381f24897 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/mrp/mo_movements.php
 2022-01-06 11:07:05 +01:00
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
Laurent Destailleur
0674a48cb5 Fix missing total and missing css 2022-01-05 19:58:08 +01:00
Laurent Destailleur
2aa3d60997 Debug v15 2022-01-05 14:04:02 +01:00
Laurent Destailleur
5b8d6e60e4 Debug v15 2022-01-05 10:43:05 +01:00
Ferran Marcet
26c6908f66 Fix: Correctly display product translations 2022-01-03 13:22:07 +01:00
Laurent Destailleur
108df3726a Fix php syntax 2021-12-30 18:46:26 +01:00
mschamp
aac0375e7f Close #19673 order categories based on count of elements 2021-12-22 10:32:50 +01:00
Laurent Destailleur
e2ee74f8e0 Clean code 2021-12-21 15:46:42 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
626cd24305 Clean code for #19639 2021-12-19 17:05:57 +01:00
Laurent Destailleur
19afcbbc40 css 2021-12-19 15:59:34 +01:00
Laurent Destailleur
e2e2e69379 Fix bad link 2021-12-19 03:54:04 +01:00
Laurent Destailleur
015bc9ebca Fix mode 2021-12-19 03:45:36 +01:00
Laurent Destailleur
771805cd83 More complete error management. 2021-12-19 03:36:25 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
 2021-12-19 00:36:22 +01:00
Laurent Destailleur
98ddfbf792 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/info.php
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/fourn/facture/list.php
	htdocs/mrp/mo_movements.php
	htdocs/product/stock/movement_card.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/replenishorders.php
	htdocs/reception/card.php
	htdocs/supplier_proposal/list.php
 2021-12-19 00:17:37 +01:00
Laurent Destailleur
e60f65db7d Trans 2021-12-17 10:00:10 +01:00
Laurent Destailleur
3895438b85 Fix responsive 2021-12-16 23:53:05 +01:00
Laurent Destailleur
39b4586957
Merge pull request #19624 from 1ocate/FIX_05_author_searching_include_first_and_last_name 
Fix author searching include first and last name
 2021-12-16 17:09:44 +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
Jay Yeo
7c1879a11a Fix author searching include first and last name 2021-12-15 16:52:57 +07:00
Jay Yeo
8e3b617671 Fix search_user in stock/movement_list.php 2021-12-15 16:21:08 +07:00
Laurent Destailleur
f9e4266007 FIX debug inventory feature (missing link to mvt, bad label of mvt) 2021-12-14 19:37:44 +01:00
Laurent Destailleur
4fe6532359 Fix phpcs 2021-12-12 02:16:09 +01:00
Laurent Destailleur
b1038e0d48 FIX wrong list of stock mvt after right/left on a warehouse 2021-12-12 00:17:14 +01:00
Laurent Destailleur
3abb3f5018 Debug inventory feature 2021-12-12 00:05:31 +01:00
Laurent Destailleur
964656c728 Fix label of status 2021-12-11 22:28:16 +01:00
Laurent Destailleur
eacc5f0f0a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/repair.php
 2021-12-09 18:03:27 +01:00
Laurent Destailleur
e3932377a6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2021-12-09 17:58:57 +01: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
de3ac77d56
Merge pull request #19533 from lainwir3d/fr19531_product_restapi_allow_stock_loading_index 
CLOSE #19531 Product REST API: allow list / search method to retrieve stock data.
 2021-12-08 21:23:53 +01:00
Laurent Destailleur
e983ba58f9
Merge pull request #19534 from Hystepik/develop#3 
Fix : php8.0  warning
 2021-12-08 18:51:51 +01:00
Laurent Destailleur
9d11d265ec Fix phpcs 2021-12-08 18:37:52 +01:00
Laurent Destailleur
72dc560ce8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-08 18:27:28 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
 2021-12-08 18:27:03 +01:00
Laurent Destailleur
c3bfd5caa4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/asset/type.php
	htdocs/categories/edit.php
	htdocs/comm/action/card.php
	htdocs/compta/bank/card.php
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/class/extrafields.class.php
	htdocs/don/card.php
	htdocs/product/stock/card.php
	htdocs/projet/card.php
	htdocs/projet/tasks/task.php
	htdocs/user/group/card.php
 2021-12-08 18:21:20 +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
lmarcouiller
c6c7abbf1d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-12-07 10:48:17 +01:00
lmarcouiller
f37d9787cd error management and addproduct 2021-12-06 16:47:56 +01:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
Laurent Destailleur
259b7dfe5a NEW: Add massaction to switch status on sale / on purchase of a product. 2021-12-06 02:48:34 +01:00
lmarcouiller
325ad45bca update scan inventory error gestion 2021-12-03 16:04:23 +01:00
lmarcouiller
4c92af9aca fix php8.0 warnings 2021-12-01 15:24:25 +01:00
lainwir3d
50d422cdf6 CLOSE #19531 Product REST API: allow list / search method to retrieve stock data. 
See feature request #19531
 2021-12-01 16:33:47 +04:00
lmarcouiller
7512305b44 add porduct inventory but qty_view bug 2021-12-01 12:10:57 +01:00
Lucas Marcouiller
1c4a7a00cb fix php8.0 warning 2021-11-30 16:35:46 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
 2021-11-30 16:24:18 +01:00
Lucas Marcouiller
f39dd30a7f fix precommit 2021-11-30 15:38:48 +01:00
Lucas Marcouiller
ae56619253 add productadd function but error on tabproduct 2021-11-30 15:38:27 +01:00
Laurent Destailleur
db4871846e
Merge pull request #19463 from code-chicken/patch-13 
Better wording
 2021-11-30 11:46:51 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
lmarcouiller
c529d1a928 update inventory add replace work 2021-11-29 15:00:23 +01:00
lmarcouiller
0d65fdad23 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-11-29 10:38:11 +01:00
Laurent Destailleur
186185267e Clean code for v15 2021-11-29 00:49:18 +01:00
Laurent Destailleur
198c530179 Fix syntax error 2021-11-25 21:51:07 +01:00
Frédéric FRANCE
38f2a2ca43
move actioncomm 2021-11-24 18:19:59 +01:00
Frédéric FRANCE
ebc54f82e6
move actioncomm 2021-11-24 18:16:48 +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
Gauthier PC portable 024
641002ae96 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-11-24 09:05:24 +01:00
Frédéric FRANCE
21a3a6cc7a
clean code 2021-11-23 23:55:01 +01:00
Frédéric FRANCE
6cbc3c6033
clean code 2021-11-23 22:55:35 +01:00
Frédéric FRANCE
99cddfa235
can merge products but experimental 2021-11-23 22:36:14 +01:00
Frédéric FRANCE
429e5cf517
can merge products but experimental 2021-11-23 22:02:55 +01:00
Frédéric FRANCE
c56f180515
can merge products but experimental 2021-11-23 21:52:40 +01:00
Frédéric FRANCE
d601f62194
can merge products but experimental 2021-11-23 21:38:29 +01:00
Laurent Destailleur
0dcbd458b8 FIX default_vat_code was not returned in some Ajax services of products 2021-11-23 13:08:00 +01:00
Frédéric FRANCE
dc3bfcfb87
can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Laurent Destailleur
48d7378282 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/action/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/ar_IQ/bills.lang
	htdocs/langs/ar_IQ/cashdesk.lang
	htdocs/langs/ar_IQ/modulebuilder.lang
	htdocs/langs/ar_IQ/partnership.lang
	htdocs/langs/ar_IQ/propal.lang
	htdocs/langs/ar_IQ/stocks.lang
	htdocs/langs/ar_IQ/ticket.lang
	htdocs/langs/en_AE/admin.lang
	htdocs/langs/en_US/receptions.lang
	htdocs/langs/en_ZA/admin.lang
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/reception/class/reception.class.php
 2021-11-19 23:14:39 +01:00
lmarcouiller
5b1028611a update inventory 19 11 2021-11-19 13:55:59 +01:00
Laurent Destailleur
bb6440af9d FIX Better label for reception status 2021-11-19 13:46:30 +01:00
Laurent Destailleur
2a39a1dc93 Keep option to enable field 2021-11-18 13:55:55 +01:00
Laurent Destailleur
2d4f971508 Fix verifCond must return false if string is '0' 
Hide a not used property.
 2021-11-18 13:10:52 +01:00
Laurent Destailleur
e652b93878 Autoswitch on inventory tab on validation of inventory 
Fix disabled button when some data are available.
 2021-11-18 12:58:31 +01:00
Laurent Destailleur
5fa50afc13 Responsive 2021-11-17 12:24:13 +01:00
lmarcouiller
694ce9be17 update inventory 2021-11-15 14:23:52 +01:00
lmarcouiller
238996b351 Merge branch 'develop#2' of github.com:Hystepik/dolibarr into develop#2 2021-11-15 10:13:27 +01:00
Laurent Destailleur
e113fe468f Clean code 2021-11-12 14:57:36 +01:00
Laurent Destailleur
3b21fc2d37 Better way to report value of stock when PRODUIT_MULTIPRICES is on 2021-11-12 10:50:19 +01:00
Laurent Destailleur
d55fde4633 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-08 18:49:53 +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
d21278b0ef
Merge branch 'develop' into fix_php8 2021-10-31 17:54:32 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +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
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +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
e9ba9fc103 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:52:00 +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
Laurent Destailleur
93e11e07b4
Merge pull request #19207 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2021-10-25 23:35:19 +02:00
Laurent Destailleur
5db80efcec css 2021-10-25 22:39:19 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Laurent Destailleur
20c874d441 Fix escape sql params. 2021-10-25 18:48:44 +02:00
Florian HENRY
52a4f4869d Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8 2021-10-25 16:54:30 +02:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Laurent Destailleur
f5562177e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-25 13:06:33 +02:00
Florian HENRY
b282673f61 fix php8 warning 2021-10-25 09:01:05 +02:00
Laurent Destailleur
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +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
Laurent Destailleur
86ff951254 Fix ?: 2021-10-23 23:43:43 +02:00
Laurent Destailleur
44b030e23e
Merge branch 'develop' into NEW_stockstransfers 2021-10-23 22:57:35 +02:00
Laurent Destailleur
f5cea6d312
Merge pull request #19154 from Hystepik/develop#3 
Fix :  fix php 8.0 warnings
 2021-10-23 22:37:50 +02:00
Lucas Marcouiller
aec5e41656 Fix : fix php 8.0 warnings 2021-10-23 19:09:23 +02:00
Laurent Destailleur
757d841f15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 17:20:00 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Laurent Destailleur
07350e263f
Merge pull request #19142 from homer8173/patch-25 
FIX #18932 : search in htdocs/product/reassortlot.php
 2021-10-23 16:10:11 +02:00
Norbert Penel
750eec1936
FIX #18914 2021-10-23 16:03:20 +02:00
Lucas Marcouiller
ae78bed41d call to ajax file 2021-10-23 14:36:31 +02:00
Norbert Penel
fc1763c9e9
FIX search in htdocs/product/reassortlot.php 
FIX https://github.com/Dolibarr/dolibarr/issues/18932
 2021-10-23 14:14:30 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings 2021-10-23 07:13:08 +02:00
Maxime Kohlhaas
604052d1a1 Fix #19070 : Api subproducts was returning false 2021-10-23 02:28:53 +02:00
Florian HENRY
bb4eb2feea Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_php8 2021-10-22 23:38:44 +02:00
Florian HENRY
1f1e01aa88 fix php 8 warning 2021-10-22 23:38:35 +02:00
Laurent Destailleur
900d7512f2
Merge pull request #19121 from frederic34/fixrightswarning 
fix multiple warnings
 2021-10-22 22:47:28 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Lucas Marcouiller
56ff2412c1 start code to searchfrmbarcode 2021-10-22 16:39:42 +02:00
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
 2021-10-22 15:56:44 +02:00
Laurent Destailleur
b5929fb7c4 Fix phpcs 2021-10-22 15:42:18 +02:00
Lucas Marcouiller
daafe652b9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-10-22 14:39:18 +02:00
Frédéric FRANCE
c789b12715 fix more than one extrafield cause bug sql 2021-10-22 11:07:38 +02:00
Laurent Destailleur
459c57e370
Merge pull request #19054 from frederic34/patch-18 
fix doxygen nested comment
 2021-10-21 22:57:32 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer 
fix: scrutinizer
 2021-10-21 22:52:20 +02:00
Florian HENRY
d4690ddbdd fix scrutinizer 2021-10-21 18:20:07 +02:00
Lucas Marcouiller
4d2b96d029 fix inventory scan 2021-10-21 18:08:20 +02:00
Lucas Marcouiller
1f64b09430 WIP : fix inventory scan 2021-10-21 18:07:54 +02:00
Frédéric FRANCE
49d8f85ae7
fix doxygen nested comment 2021-10-21 12:33:48 +02:00
Frédéric FRANCE
3d5d2f0558
fix doxygen nested comment 2021-10-21 12:33:17 +02:00
Frédéric FRANCE
1157d7edfb
fix doxygen nested comment 2021-10-21 12:32:28 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +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
stickler-ci
daa7e56d35 Fixing style errors. 2021-10-20 07:52:24 +00:00
Gauthier PC portable 024
1135ba7116 Merge branch 'NEW_stockstransfers' of github.com:atm-gauthier/dolibarr into NEW_stockstransfers 2021-10-20 09:48:58 +02:00
Gauthier PC portable 024
738f6a90b2 FIX : $childtablesoncascade use + fix $permissiontodelete 2021-10-20 09:48:26 +02:00
stickler-ci
a8f69a2fb6 Fixing style errors. 2021-10-20 07:34:52 +00:00
Gauthier PC portable 024
210926d23a FIX : action buttons only if $permissiontoadd 2021-10-20 09:32:03 +02:00
Gauthier PC portable 024
4614b0dd65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-20 09:13:58 +02:00
Laurent Destailleur
3c9d8d0d30 Show status of MO on referring page of product. 2021-10-19 20:44:03 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
Laurent Destailleur
79177b0a11 Rename method into selectLotDataList 2021-10-17 14:38:12 +02:00
Laurent Destailleur
1c07385aba
Update product.class.php 2021-10-16 21:22:53 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
7ff3e4253f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-16 13:01:27 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
Laurent Destailleur
8bf396c0cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-14 14:56:28 +02:00
Laurent Destailleur
27e8b17aaf NEW Add STOCK_MOVEMENT_LIST_HIDE_UNIT_PRICE to hide unit price on 
movement list.
 2021-10-14 14:49:01 +02:00
Benjamin Chantalat
3438a4a9f6 Add the module reception to the calcul of virtual stock 2021-10-14 09:33:26 +02:00
Laurent Destailleur
4fc93ca7fa Fix css 2021-10-13 02:36:23 +02:00
Laurent Destailleur
6bd1bc767b doc 2021-10-12 15:17:34 +02:00
Laurent Destailleur
eb73da5abc Fix set origin. 2021-10-12 12:04:43 +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
Gauthier PC portable 024
1a11135aa4 FIX : travis and stickler 2021-10-08 14:00:47 +02:00
Gauthier PC portable 024
361ca6afff FIX : travis 2021-10-08 13:49:11 +02:00
Gauthier PC portable 024
3d5e4fb87c FIX : travis 2021-10-08 13:42:03 +02:00
Gauthier PC portable 024
ef6f7a619a FIX : object linked to stock movement + travis 2021-10-08 13:33:19 +02:00
Gauthier PC portable 024
ca3899dbf1 FIX : travis + several fixes 2021-10-07 14:00:31 +02:00
Gauthier PC portable 024
70648477a7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-07 10:37:09 +02:00
Laurent Destailleur
d5d892b263
Merge pull request #18831 from SteiniGreenwork/develop 
NEW Can select existing batch numbers for a combo list (in mrp consumtion)
 2021-10-06 15:20:52 +02:00
Laurent Destailleur
b93110e4f0
Merge pull request #18901 from xgerhard/disabled-button-zero-qty-fix 
Fix #18890 Fix disabled button if sum real qty is 0
 2021-10-06 13:49:12 +02:00
Laurent Destailleur
ba15907582
Update inventory.php 2021-10-06 13:48:42 +02:00
Laurent Destailleur
a984eb5c98
Merge branch 'develop' into 14_fix_api_priduct_warning 2021-10-06 13:43:18 +02:00
Laurent Destailleur
7b1b7c0ad6
Update api_products.class.php 2021-10-06 13:42:49 +02:00
Laurent Destailleur
5d9c87a9ea
Update api_products.class.php 2021-10-06 13:42:13 +02:00
Laurent Destailleur
65ea165721 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-06 13:27:42 +02:00
Florian HENRY
9d1915f9c2 fix php warning 2021-10-06 09:56:10 +02:00
Laurent Destailleur
36a00bc1ac Enhance selection of qty to transfer/correct stock 2021-10-05 20:42:52 +02:00
Laurent Destailleur
06eb138b47
Merge pull request #18902 from xgerhard/fix-negative-stock-correction 
Fix #18895 Fix negative stock correction
 2021-10-05 18:45:50 +02:00
Laurent Destailleur
e85a0c54cc
Update product.class.php 2021-10-05 18:43:35 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Alexandre SPANGARO
2e49eee106 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:52:45 +02:00
xgerhard
e44c3a46e1 Fix #18895 Fix negative stock correction 
If people use a negative number as input, I think we can assume they want to delete units. It will now set the movement to 1 if the number is negative and 'add' was selected.

For each negative number we now multiply this number by -1, to make it a positive number again.
 2021-10-05 00:25:52 +02:00
xgerhard
cbd825e526 FIX|Fix #18890 Fix disabled button if sum real qty is 0 
Instead of counting the sum of the 'real qty' input, only disable the button if no input has been given, or if all input is the same as the expected qty.

'$object->status' check seems unnecessary here since the button is only there when the status is 'STATUS_VALIDATED'.
 2021-10-05 00:03:00 +02:00
stickler-ci
4b359af0d0 Fixing style errors. 2021-10-04 09:13:05 +00:00
Gauthier PC portable 024
73e741ca74 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-10-04 11:10:38 +02:00
Stephan Steininger
3bb941f3b8
Merge branch 'Dolibarr:develop' into develop 2021-10-04 08:12:19 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
7863642daa FIX #18852 2021-10-02 19:16:42 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
7f8d5adb6c css 2021-09-30 20:32:52 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +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
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Stephan Steininger
5bb717b887 Merge branch 'develop' of https://github.com/SteiniGreenwork/dolibarr into develop 2021-09-30 15:07:37 +02:00
Stephan Steininger
2e2048f6d8 Update documentation 2021-09-30 15:06:57 +02:00
Laurent Destailleur
aaf170313f Clean code 2021-09-30 14:51:38 +02:00
Laurent Destailleur
827639f28d
Try to solve pb of unique id 2021-09-30 14:45:22 +02:00
Laurent Destailleur
63218d5d5c
Update product.class.php 2021-09-30 14:30:50 +02:00
Laurent Destailleur
3565a47954
Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop 2021-09-30 14:24:30 +02:00
stickler-ci
b069f81965 Fixing style errors. 2021-09-30 11:58:20 +00:00
Stephan Steininger
94cc75cb69 Changed input type from select to input. 
New function selectLot
 2021-09-30 13:56:43 +02:00
Norbert Penel
2205073f25
load_stats_reception is not loaded 2021-09-30 12:09:17 +02:00
Stephan Steininger
372aa6bf4c
Merge branch 'Dolibarr:develop' into develop 2021-09-30 09:05:05 +02:00
Quentin VIAL-GOUTEYRON
8de4d3d1a4 NEW incoterms 2021-09-29 16:56:57 +02:00
Laurent Destailleur
80165811e0 Clean code 2021-09-27 15:50:19 +02:00
Marc de Lima Lucio
6abe6462e6 FIX: products/services card: hidden extrafields were overridden 2021-09-27 14:33:57 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2021-09-27 11:40:47 +02:00
stickler-ci
526380a4b8 Fixing style errors. 2021-09-27 08:10:49 +00:00
Stephan Steininger
c7ff60866a load existing batch numbers for item within mrp consumtion 2021-09-27 10:04:59 +02:00
Laurent Destailleur
c39c823b66 Debug Date of line of services mandatory 2021-09-23 13:01:04 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object 
NEW : field and behavior in product object
 2021-09-23 12:14:09 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Regis Houssin
144147c5d1 FIX check if greater 0 2021-09-22 14:58:03 +02:00
Laurent Destailleur
a5566473d9 Clean code 2021-09-21 18:06:48 +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
71b5299c9f
Merge pull request #18718 from vincentjdc/product-replace-id 
FIX https://github.com/Dolibarr/dolibarr/issues/18717
 2021-09-20 11:07:21 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
96436cac3d FIX unprivileged user can attach agenda with leave. 2021-09-19 00:50:23 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
002703e724
Merge pull request #18746 from BlueGarm/patch-1 
Product name in inventory list
 2021-09-18 16:09:48 +02:00
Maksim Stojkovic
25111d47ee
New Enable PDF Regeneration in Stock List 
Enables PDF Regeneration in warehouse stock list
 2021-09-18 03:51:12 +10:00
Gauthier PC portable 024
e6c9627195 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-09-17 15:47:23 +02:00
Mikaël MARTIN
7c4fe41e84
Update inventory.php 
Add the product name after the reference for better visualization during inventories.
 2021-09-17 13:17:23 +02:00
Laurent Destailleur
9d59a574f1
Merge pull request #18712 from cfoellmann/PR/correct-cancel-redirects 
fix cancel redirects on product,warehouse cards
 2021-09-17 11:50:09 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +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
Vincent Dieltiens
6a1588e925 FIX https://github.com/Dolibarr/dolibarr/issues/18717 2021-09-14 21:41:02 +02:00
Christian Foellmann
c967c5c6d4 fix cancel redirects on product,warehouse cards 2021-09-14 08:46:07 +02:00
Laurent Destailleur
51d23250de
Update movement_list.php 2021-09-10 13:35:47 +02:00
lmarcouiller
b98f239739 Fix : Sql error on movement_list 2021-09-10 12:10:08 +02:00
Laurent Destailleur
034c5651c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/public/eventorganization/attendee_subscription.php
 2021-09-08 22:13:35 +02:00
Laurent Destailleur
30856d5b18 FIX Relative discount with high nb of decimals 2021-09-08 22:09:02 +02:00
Laurent Destailleur
bfa75e91e2 Code comment 2021-09-08 20:59:56 +02:00
Gauthier PC portable 024
d121544810 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-09-06 16:08:39 +02:00
jpb
65a2486f94 merge conflict 2021-09-06 09:43:52 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
248e68aada Code comment 2021-09-03 13:39:08 +02:00
Laurent Destailleur
3598816763 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-02 21:05:00 +02:00
Laurent Destailleur
8ea1a9602b NEW Add import / export of MO and BOMLines - Close #18499 2021-09-02 21:00:31 +02:00
Laurent Destailleur
74372a3bae
Update index.php 2021-09-02 19:17:38 +02:00
Givriz
1c99bd7c4a Compatibility phpv8 2021-09-02 18:48:46 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
c207dde5e1 Fix cancel button 2021-09-01 20:10:56 +02:00
Christian Foellmann
f391b11da7 fix product nature on create 2021-09-01 18:23:38 +02:00
Adrien Raze
58845082b1 FIX : Travis 2021-08-30 17:20:50 +02:00
Adrien Raze
f44ae62eb3 FIX : Travis 2021-08-30 16:59:09 +02:00
Adrien Raze
fb183f4f5d FIX : Travis 2021-08-30 16:13:51 +02:00
Adrien Raze
08364d2492 FIX : Travis 2021-08-30 16:08:07 +02:00
Adrien Raze
7794a01a0b FIX : Stickler-ci 2021-08-30 15:51:59 +02:00
stickler-ci
73b4f0df51 Fixing style errors. 2021-08-30 13:38:55 +00:00
Adrien Raze
709a297563 NEW : Allow drag and drop on kits 2021-08-30 14:45:42 +02:00
Christian Foellmann
38a225a035 fix product nature on create 2021-08-28 20:28:09 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
8b996627eb
Merge pull request #18462 from grandoc/new_branch_22_08_2021 
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\ht…
 2021-08-28 18:35:40 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
29abbbe2fb Clean code 2021-08-28 01:45:53 +02:00
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
90c12ae340 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-24 16:37:42 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-08-24 16:37:18 +02:00
Laurent Destailleur
ba594b20e0 Fix phpcs 2021-08-24 16:36:27 +02:00
Laurent Destailleur
96fed159ec
Merge pull request #18450 from frederic34/patch-8 
make public url more readable
 2021-08-24 15:30:08 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +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
3419e43a2c Fix phpunit 2021-08-23 21:02:07 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +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
Philippe GRAND
ba9ede39bf fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\comm\propal\card.php on line 265 2021-08-22 22:28:53 +02:00
Philippe GRAND
e439e0f14d fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\product\class\propalmergepdfproduct.class.php on line 251 2021-08-22 21:55:00 +02:00
Philippe GRAND
16f2a53fb8 fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\product\class\propalmergepdfproduct.class.php on line 236 2021-08-22 21:52:57 +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
Frédéric FRANCE
e93dbcd0c0
make public url more readable 2021-08-20 14:47:51 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
335e1ff405 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-20 12:45:37 +02:00
Florian HENRY
223637317b fix: missing tocken CRCSF 2021-08-19 09:51:09 +02:00
Laurent Destailleur
79f9b30f29
Merge pull request #18409 from vincentjdc/product-generate-ref-after-form 
NEW : Allows product ref generation after the form is validated with PRODUCT_GENERATE_REF_AFTER_FORM
 2021-08-18 21:32:35 +02:00
Laurent Destailleur
fa3ba05a23
Update card.php 2021-08-18 21:31:54 +02:00