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
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
Gauthier PC portable 024
8170092cb8 Merge branch 'NEW_stockstransfers' of github.com:atm-gauthier/dolibarr into NEW_stockstransfers 2021-08-18 19:36:10 +02:00
Gauthier PC portable 024
c8ccc456b0 FIX : no need to have stock transfer ref in inventory code + need to change size of origintype field to be able to save StockTransfer@product/stock/stocktransfer 2021-08-18 19:35:06 +02:00
stickler-ci
d29aa636a5 Fixing style errors. 2021-08-18 17:19:19 +00:00
Gauthier PC portable 024
a80c30bc45 NEW : inventory code filled when movements are done 2021-08-18 19:15:47 +02:00
Laurent Destailleur
e4aafcf91e Code comment 2021-08-18 18:43:33 +02:00
Gauthier PC portable 024
c56c74bbdd Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-08-18 18:31:11 +02:00
stickler-ci
b51ac49f90 Fixing style errors. 2021-08-18 07:15:05 +00:00
vincentjdc
dc037083ae
Merge branch 'develop' into product-generate-ref-after-form 2021-08-18 09:13:01 +02:00
Laurent Destailleur
e264163ab6 Fix phpcs 2021-08-17 19:11:48 +02:00
Laurent Destailleur
ae28dad72e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 18:08:40 +02:00
Laurent Destailleur
955e9de1b7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/product.php
	htdocs/product/stock/productlot_card.php
	htdocs/reception/card.php
 2021-08-17 18:07:10 +02:00
Laurent Destailleur
c0a086fad8 Sellby always before Eatby #18361 2021-08-17 17:55:00 +02:00
Laurent Destailleur
d1858e02b5
Update card.php 2021-08-17 17:03:41 +02:00
Laurent Destailleur
352b413a17 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 02:12:22 +02:00
Laurent Destailleur
eba87ab295 FIX filter on status Draft in modulebuilder 2021-08-17 02:09:38 +02:00
Laurent Destailleur
9aab49e5c7 Fix bad closing tr 2021-08-16 23:03:33 +02:00
Laurent Destailleur
ecb673f15c Debug default BOM on product 2021-08-16 23:02:55 +02:00
Laurent Destailleur
baec6aa169 Optimize memory and perf for list of stock movements 2021-08-16 22:45:27 +02:00
Vincent Dieltiens
2aef13c3b4 Adds global variable 'PRODUCT_GENERATE_REF_AFTER_FORM' to allow product ref generation after the form validation 2021-08-13 11:38:48 +02:00
Laurent Destailleur
d7317025e9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf_other.php
 2021-08-11 22:09:05 +02:00
Laurent Destailleur
745af0f025 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-08-11 21:54:35 +02:00
Laurent Destailleur
0d2e3ece1a
Update card.php 2021-08-11 21:50:28 +02:00
Laurent Destailleur
3af8e18b3c
Create card.php 2021-08-11 21:47:28 +02:00
stickler-ci
3c0601d1f9 Fixing style errors. 2021-08-11 19:46:39 +00:00
Laurent Destailleur
5b30cf3e77
Update card.php 2021-08-11 21:44:18 +02:00
Laurent Destailleur
c36bb0fbf7
Merge branch 'develop' into patch-163 2021-08-11 21:43:42 +02:00
stickler-ci
eadfc9f4ae Fixing style errors. 2021-08-11 19:36:18 +00:00
Laurent Destailleur
80673e0efc
Update card.php 2021-08-11 21:32:39 +02:00
Laurent Destailleur
6fbd93999f css 2021-08-11 13:33:51 +02:00
Laurent Destailleur
f3dbe81df4 FIX Can't set cost price when product is not on purchase 2021-08-09 20:02:24 +02:00
Laurent Destailleur
6a9217474d FIX Can't set cost price when product is not on purchase 2021-08-09 20:01:06 +02:00
jpb
f99ba2c1e1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object 2021-08-04 17:26:23 +02:00
Gauthier PC portable 024
5364a5dddf FIX : transnoentities 2021-08-04 09:36:06 +02:00
Laurent Destailleur
ede571dcfe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-08-03 17:08:49 +02:00
Gauthier PC portable 024
6e7fa5ffeb FIX : stickler feddbacks 2021-08-03 16:53:44 +02:00
stickler-ci
2577936670 Fixing style errors. 2021-08-03 14:39:28 +00:00
Gauthier PC portable 024
ee52fc162c FIX : tms on update current timestamp + wrong links 2021-08-03 16:36:27 +02:00
Gauthier PC portable 024
1d2527b991 FIX : weight and units display 2021-08-03 16:00:32 +02:00
Laurent Destailleur
9ceab9b86b Doc 2021-08-03 15:47:00 +02:00
Florian HENRY
19f17ed114 fix: bad setEventMessages input 2021-08-03 15:30:36 +02:00
Laurent Destailleur
c40cc3a51e
Merge pull request #18194 from FHenry/fix_bad_eoordisplay 
fix: bad setEventMessages input
 2021-08-03 15:23:22 +02:00
stickler-ci
042e2f9893 Fixing style errors. 2021-08-02 15:31:24 +00:00
Gauthier PC portable 024
b83b77beb5 NEW : stock transfer sheet proforma + default model system like cmd invoice, etc... 2021-08-02 17:28:41 +02:00
Gauthier PC portable 024
a45bab10bd Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-08-02 10:09:18 +02:00
Gauthier PC portable 024
1c2ed1b22f FIX : column titles truncated 2021-08-02 10:00:53 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Laurent Destailleur
9f293066ab
Merge pull request #18206 from Hystepik/develop#2 
New : Inventory scanner tool implemented
 2021-07-31 13:27:18 +02:00
Gauthier PC portable 024
142f93e50c FIX : functions visibility 2021-07-30 15:35:31 +02:00
Gauthier PC portable 024
846f0366d3 FIX : travis feedbacks 2021-07-30 14:17:36 +02:00
stickler-ci
3c71784272 Fixing style errors. 2021-07-30 10:32:56 +00:00
Gauthier PC portable 024
6983da8c84 Merge branch 'NEW_stockstransfers' of github.com:atm-gauthier/dolibarr into NEW_stockstransfers 2021-07-30 12:29:49 +02:00
Gauthier PC portable 024
b7c5529685 FIX : thirdparty and project in banner 2021-07-30 12:29:22 +02:00
jpb
15578c2ec2 merge conflict 2021-07-30 10:57:04 +02:00
Florian HENRY
8ea6fc3174 fix: add hook management into product translation tab 2021-07-30 09:38:29 +02:00
stickler-ci
9805281733 Fixing style errors. 2021-07-29 14:20:50 +00:00
Gauthier PC portable 024
6d460d78ca NEW : Stocks transfers objects management 2021-07-29 16:09:07 +02:00
Laurent Destailleur
583f1ccc1a
Merge pull request #18243 from Robin-Yann/13-hook 
13 - add hook product part
 2021-07-28 22:46:20 +02:00
Francis Appels
f6d03fe28e Fix update product lot 2021-07-28 21:45:11 +02:00
Laurent Destailleur
8dca7d2b35
Merge pull request #18260 from FHenry/fix_addhook_addmoractionbutton_productprice 
fix: add hook addMoreActionButton product price
 2021-07-28 15:30:37 +02:00
Ferran Marcet
aae64eee1e Fix: Not correct redirect link on lots 2021-07-28 11:48:38 +02:00
Florian HENRY
84d221988f fix: add hook addMoreActionButton product price 2021-07-28 11:17:07 +02:00
Robin
d2dc2bfde2 add hook product composition 2021-07-27 09:13:50 +02:00
Robin
a386cf5e89 add hook product stat 2021-07-27 09:09:42 +02:00
jpb
8dc316797f move info to the left 2021-07-26 09:15:23 +02:00
Laurent Destailleur
079b014b14 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-26 00:41:35 +02:00
Laurent Destailleur
4c505619e3 FIX look and field v14 2021-07-23 00:02:14 +02:00
Florian HENRY
ee1e6c2780 fix: bad setEventMessages input 2021-07-21 14:52:37 +02:00
stickler-ci
191163c7e7 Fixing style errors. 2021-07-20 20:41:49 +00:00
jpb
d61b831737 add field in create product 2021-07-20 22:39:30 +02:00
jpb
875167d593 add escape to sql 2021-07-20 16:17:17 +02:00
jpb
953e311509 Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object 2021-07-20 16:04:54 +02:00
jpb
f16eba1811 quick fix create product 2021-07-20 16:04:12 +02:00
stickler-ci
2f0ba41a53 Fixing style errors. 2021-07-20 13:35:10 +00:00
jpb
dc90a62d90 add tooltips helper on product card 2021-07-20 15:18:14 +02:00
lmarcouiller
60f0eeaea2 update inventory to be jquerry 2021-07-20 15:06:33 +02:00
lmarcouiller
dd9eb28230 Barcode scanner tool update 2021-07-20 14:43:36 +02:00
jpb
e11afb7da0 add color on date dield and warning on line 2021-07-20 11:23:35 +02:00
jpb
97287af987 add field to object product, add sql 2021-07-19 14:03:03 +02:00
lmarcouiller
b309af0ab8 First push new scan quanty inventory 2021-07-19 13:43:48 +02:00
Laurent Destailleur
0d12f25341 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-13 13:21:50 +02:00
Laurent Destailleur
202ee8340a FIX #18091 2021-07-12 23:01:34 +02:00
Laurent Destailleur
7533c9e3a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/interventions.lang
 2021-07-12 12:01:53 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop 
NEW add hookmanager on note pages
 2021-07-11 20:25:16 +02:00
stickler-ci
c6fb975d51 Fixing style errors. 2021-07-11 07:50:38 +00:00
fr69400
1b2f0fc155
Update note.php 2021-07-11 09:50:24 +02:00
Laurent Destailleur
e7b3280c17 Debug v14 with nojs 2021-07-11 01:12:52 +02:00
Laurent Destailleur
2091120d77 FIX #18122 2021-07-11 00:50:57 +02:00
Laurent Destailleur
97ac547fe2 Fix/debug the numbering module to autocalculate a new lot. 2021-07-11 00:44:36 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
Laurent Destailleur
d9475b8b2b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 23:46:35 +02:00
Laurent Destailleur
fb9d16a84a
Merge pull request #18109 from altairisfr/lot_sn_masks 
FIX : don't display custom masks if they are not used
 2021-07-08 23:42:48 +02:00
Laurent Destailleur
7d6b70f679 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 22:26:58 +02:00
Alexandre SPANGARO
f4005cd7a7 Update product/card.php 2021-07-08 22:24:20 +02:00
Laurent Destailleur
797797d38b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 20:59:48 +02:00
altairis-noe
9983163e7a a few more getDolGlobalString 2021-07-08 17:21:36 +02:00
altairis-noe
66590ba810 getDolGlobalString instead of $conf->global 2021-07-08 17:10:03 +02:00
altairis-noe
68442a2d13 stickler corrections 2021-07-08 16:49:13 +02:00
altairis-noe
cbd8fa3572 better element id 2021-07-08 16:42:54 +02:00
altairis-noe
4e77a0d16a don't display custom masks if they are not used 2021-07-08 15:55:07 +02:00
Francis Appels
d6c327ed85 Remove duplicate code 2021-07-08 13:17:07 +02:00
Laurent Destailleur
34f1cfe575 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/index.php
 2021-07-07 02:09:53 +02:00
Laurent Destailleur
9d010f6d10 Look and feel v14 2021-07-07 01:24:40 +02:00
Laurent Destailleur
f286017cab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 19:03:55 +02:00
Laurent Destailleur
82e96016cd
Merge pull request #18092 from fappels/14_fix_php8_part3 
Fix php8 warning
 2021-07-06 18:52:05 +02:00
Francis Appels
874bf8ed44 backtopageforcancel can be set but empty 2021-07-06 16:39:58 +02:00
Laurent Destailleur
fe5c4f4a0e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 17:04:38 +02:00
Francis Appels
1333ca3660 Fix php 8 warning on not set field keys 2021-07-05 14:51:34 +02:00
Francis Appels
df5878b3d6 Fix php 8 warning in inventory module 2021-07-05 14:45:00 +02:00
Laurent Destailleur
383c678200 Trans 2021-07-05 14:09:01 +02:00
Laurent Destailleur
d43e043b48 Fix regression when adding a product with multicompany 2021-07-05 12:49:10 +02:00
Laurent Destailleur
2eddc02deb Fix selection of Autofill description 2021-07-05 11:59:30 +02:00
Laurent Destailleur
5779a56ae0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-04 21:23:53 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
Laurent Destailleur
5e37c2ef74 CSS 2021-06-30 01:36:49 +02:00
Francis Appels
1b7b45d72a Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2 2021-06-29 16:56:48 +02:00
Francis Appels
b534fbae77 Fix warning php 8 in product ajax. 2021-06-28 19:12:19 +02:00
Frédéric FRANCE
58701bef5d
remove unused code 2021-06-26 21:10:59 +02:00
Laurent Destailleur
61761876a4
Merge pull request #18027 from frederic34/patch-14 
fix warning
 2021-06-26 12:02:11 +02:00
Frédéric FRANCE
438e37ed59
fix warnings 2021-06-24 21:12:32 +02:00
Frédéric FRANCE
06522d5b2e
fix warning 2021-06-24 21:01:23 +02:00
Laurent Destailleur
2c4fd9e409 Debug ENTREPOT_EXTRA_STATUS 2021-06-24 11:51:10 +02:00
Laurent Destailleur
594f7c8e9e Fix code for v14 2021-06-24 09:54:30 +02:00
Laurent Destailleur
c03958a867 Fix look and feel v14 2021-06-23 19:02:14 +02:00
Laurent Destailleur
293b67a693 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/cashcontrol/report.php
 2021-06-23 13:08:05 +02:00
Laurent Destailleur
3a30d41fbf Fix missing properties 2021-06-23 11:44:10 +02:00
Laurent Destailleur
eb9be15c4c Fix php8 2021-06-23 10:52:05 +02:00
Laurent Destailleur
3bc1f90589 Fix rounding 2021-06-23 02:51:31 +02:00
Laurent Destailleur
cf28fcc8cd CSS 2021-06-23 02:22:49 +02:00
Laurent Destailleur
23c0edf854
Merge pull request #17784 from atm-john/new_expedition_warehouse_auto_picking 
NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list
 2021-06-20 12:55:30 +02:00
Laurent Destailleur
ceaa2a9c5e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/ticket/class/actions_ticket.class.php
 2021-06-17 22:06:26 +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
stickler-ci
047b9715fb Fixing style errors. 2021-06-17 15:26:31 +00:00
Georg Meißner
3134f5be8f Make some product fields hidable 
This commit allows to hide some more fields in the product card (e.g. you can hide SIZE but not WEIGHT).
To allow the product card to be customized a bit better, following new variables can be set to hide the corresponding fields:
PRODUCT_DISABLE_PUBLIC_URL
PRODUCT_DISABLE_STOCK_LEVELS
PRODUCT_DISABLE_NATURE
PRODUCT_DISABLE_WEIGHT
PRODUCT_DISABLE_PRICES
PRODUCT_DISABLE_ACCOUNTING
The documentation has to be adapted accordingly.
 2021-06-17 17:22:37 +02:00
Juanjo Menent
eeef78760a fix: Bad position of the printFieldListWhere hook 2021-06-17 10:29:43 +02:00
Laurent Destailleur
ac1e6c9966 FIX sql error on strict mysql 2021-06-16 20:17:21 +02:00
Frédéric FRANCE
fca75a5842
fix php warning 2021-06-16 11:54:33 +02:00
Laurent Destailleur
87a19af86d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/contacts.tpl.php
 2021-06-15 22:17:53 +02:00
Laurent Destailleur
2a3b330e1e Fix newToken() 2021-06-15 22:10:59 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-06-14 13:37:02 +00:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
34cebe6aa3 Look and feel v14 2021-06-14 01:11:39 +02:00
Laurent Destailleur
0cbcba7bc4
Merge pull request #17916 from frederic34/patch-16 
fix warnings
 2021-06-13 16:21:44 +02:00
Laurent Destailleur
1c7f141f06
Merge pull request #17901 from frederic34/patch-8 
fix warning
 2021-06-13 16:16:06 +02:00
Laurent Destailleur
026d919a03
Merge pull request #17900 from frederic34/patch-7 
fix warnings
 2021-06-13 16:15:58 +02:00
Frédéric FRANCE
20f6a34249
Update list.php 2021-06-13 16:12:46 +02:00
Laurent Destailleur
abfc87c1de Fix separator extrafields must not appear as selected fields 2021-06-13 13:32:41 +02:00
Frédéric FRANCE
e9913fa9d0
Merge remote-tracking branch 'upstream/develop' into patch-8 2021-06-13 08:53:44 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00
Frédéric FRANCE
3ca8de8fab
fix warning 2021-06-12 07:20:41 +02:00
Frédéric FRANCE
56afefd6ad
fix warnings 2021-06-12 07:12:45 +02:00
Laurent Destailleur
1933072712
Merge pull request #17893 from atm-john/develop_fix_missing_hooks_for_stock_mvm 
New :  Missing hook for stock movements list
 2021-06-11 19:58:21 +02:00
Laurent Destailleur
d3815cbb93 css 2021-06-11 19:42:36 +02:00
Laurent Destailleur
c4d0086b8a Fix hook context names 2021-06-11 19:24:26 +02:00
Laurent Destailleur
663cf28eba Fix lost code during previous merge 2021-06-11 19:05:33 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
4fd9d36eb9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/price.php
 2021-06-11 18:46:51 +02:00
Laurent Destailleur
4e66e134bd
Update price.php 2021-06-11 18:21:00 +02:00
Laurent Destailleur
bdded2af17
Update movement_list.php 2021-06-11 18:09:17 +02:00
John BOTELLA
99cada2d43 Fix missing hooks 2021-06-11 14:42:51 +02:00
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
atm-greg
37433ffee7 verify vat change to update multiprice 2021-06-08 11:39:04 +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
ATM john
f13388122c Add fetch stock order 2021-06-01 21:43:05 +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