lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
104,145 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-4
Commit Graph

6594 Commits

Author SHA1 Message Date
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
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
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
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
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