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

6447 Commits

Author SHA1 Message Date
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
Laurent Destailleur
dc3b5846fb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 09:24:09 +02:00
Laurent Destailleur
7390f4653a
Merge pull request #17674 from frederic34/phpcs_enable 
fix phpcs was disabled
 2021-05-20 09:18:00 +02:00
Frédéric FRANCE
c8b1eb180a
doxygen 2021-05-20 08:50:15 +02:00
Frédéric FRANCE
0d8c75268e
Update card.php 2021-05-19 23:32:14 +02:00
Frédéric FRANCE
b214fcb5e0
complete tooltip product 2021-05-19 23:29:35 +02:00
Frédéric FRANCE
83521311dc
fix phpcs was disabled 2021-05-19 15:48:08 +02:00
Laurent Destailleur
a8d36a3a55 Debug v14 2021-05-19 13:56:13 +02:00
ATM john
3bf71d456d fix doc 2021-05-19 12:01:47 +02:00
ATM john
1512abf96a Remove hpcs:disable 2021-05-19 12:00:27 +02:00
ATM john
9219dcfecb Fix price log spam 2021-05-19 11:52:34 +02:00
ATM john
5fd02992c0 Remove forgotten echo 2021-05-19 10:26:04 +02:00
Laurent Destailleur
5babd107a0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/replenish.php
 2021-05-18 12:43:52 +02:00
Laurent Destailleur
6d34c34cb5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/stock/replenish.php
 2021-05-18 12:11:33 +02:00
Laurent Destailleur
6b12dd4143 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-18 12:02:52 +02:00
Laurent Destailleur
6170b28c3b FIx #17651 2021-05-18 11:58:49 +02:00
Laurent Destailleur
2771d50ffe code comment 2021-05-18 11:55:56 +02:00
Laurent Destailleur
b6dbe45242 Fix permissions on page to move position of file 2021-05-18 01:58:54 +02:00
Laurent Destailleur
cc1f98329d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
	htdocs/ticket/card.php
	htdocs/user/class/api_users.class.php
 2021-05-17 19:50:10 +02:00
Laurent Destailleur
b2ba1f5540 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
 2021-05-17 10:47:00 +02:00
Laurent Destailleur
985301939d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 10:31:25 +02:00
Maxime Kohlhaas
acadef72c1 Fix use supplier relative discount in replenish order creation 2021-05-14 18:01:22 +02:00
Francis Appels
009588e04d fix implode on string for formproduct loadwarehouse 2021-05-14 11:02:55 +02:00
Laurent Destailleur
a9ddf2a5ad Fix phpcs 2021-05-13 19:07:47 +02:00
Laurent Destailleur
488f242e25 css 2021-05-12 22:42:10 +02:00
Laurent Destailleur
5e0f2f9781 Debug v14. Fix regression. 2021-05-12 22:35:21 +02:00
Laurent Destailleur
ce8c606132 Clean APIs 2021-05-12 11:04:22 +02:00
Laurent Destailleur
cfded75d11 Debug v14 2021-05-12 09:27:04 +02:00
Laurent Destailleur
f334f2a255 Fix inventory 2021-05-12 09:22:49 +02:00
Laurent Destailleur
b8254186ce Clean code 2021-05-12 09:07:36 +02:00
Laurent Destailleur
fac32ee913 Better performance 2021-05-12 08:54:36 +02:00
Laurent Destailleur
3ea6cd1c66 Fix missing columns 2021-05-12 08:53:29 +02:00
Laurent Destailleur
3b0f79c3e2 Clean code 2021-05-11 21:46:19 +02:00
Laurent Destailleur
670b604d24 Clean code 2021-05-11 21:45:37 +02:00
Laurent Destailleur
e2ccacd4a9
Merge pull request #17512 from altairisfr/productcard_traceability_fields 
Stock product card traceability fields
 2021-05-11 21:40:50 +02:00
Gauthier PC portable 024
f9afe7e81a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail 2021-05-10 09:17:15 +02:00
antonin_tdj
35c8bb6b29
fix bug PMP per entity 
wrong alias in SQL query
 2021-05-07 18:28:30 +02:00
altairis-noe
61f8a03df6 commisionning_date out, we said 2021-05-07 15:41:48 +02:00
altairis-noe
6d92eb2e84 little correction 2021-05-07 15:38:46 +02:00
altairis-noe
8e61fc44fa traceability must be a choice and we’ll see later about commisioning date 2021-05-07 15:34:11 +02:00
Noé Cendrier
b608038370
Merge branch 'develop' into productcard_traceability_fields 2021-05-06 17:41:11 +02:00
Noé Cendrier
5e57a7173d
Merge branch 'develop' into productcard_traceability_fields 2021-05-06 15:21:48 +02:00
altairis-noe
2bdea3732d days in lifetime trans 2021-05-06 14:52:48 +02:00
altairis-noe
7c53e2bb18 too much td 2021-05-06 11:16:22 +02:00
altairis-noe
cce132b8da one more space 2021-05-06 10:04:54 +02:00
altairis-noe
435cbcd16c spaces after ! 2021-05-06 10:01:53 +02:00
altairis-noe
8a108ae5e8 qcstatus out of formproduct and corrections in syntax 2021-05-06 09:59:33 +02:00
altairis-noe
5be2bdd123 qcstatus is not for this branch 2021-05-05 18:01:47 +02:00
altairis-noe
b1a4031bde no qcstatus in productlot class 2021-05-05 17:47:01 +02:00
altairis-noe
94e485aa06 qc_frequency in days and qcstatus elsewhere 2021-05-05 16:56:25 +02:00
stickler-ci
60fc9f5ecd Fixing style errors. 2021-05-04 07:52:53 +00:00
kastoras
ee4288fae3 NEW Add pagination at Get Products response 
At REST API generate pagination data when getting products list using $pagination_data parameter
 2021-05-04 10:48:31 +03:00
Laurent Destailleur
d6617f82ca
Merge branch 'develop' into develop 2021-05-04 00:23:28 +02:00
Laurent Destailleur
08806a6d9a
Merge pull request #17403 from kastoras/product_variants_api_add_stock_to_response 
New/NEW Product Variants API, add variant stock to response
 2021-05-03 19:39:50 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
kastoras
127654e792 New/NEW Product Variants API, add variant stock to response 
Remove dependency inserded by mistake
 2021-05-01 22:32:08 +03:00
Laurent Destailleur
7a986b3e50 Fix colors 2021-05-01 17:44:28 +02:00
Laurent Destailleur
c848a1ce03 css 2021-05-01 16:55:49 +02:00
Laurent Destailleur
ef734aeb58 Debug module inventory 2021-05-01 16:33:05 +02:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
altairis-noe
c10b165d33 qc_status change in stock correct -> display select 2021-04-30 14:36:25 +02:00
altairis-noe
fd42979def qc_status change in stock transfer -> display select 2021-04-30 11:12:33 +02:00
altairis-noe
1224327f91 qcstatus everywhere 2021-04-29 17:50:11 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Laurent Destailleur
de8e291c7e Debug v14 2021-04-29 10:01:10 +02:00
stickler-ci
58b4074e57 Fixing style errors. 2021-04-28 21:10:06 +00:00
kastoras
eca04b675b Merge remote-tracking branch 'origin/product_variants_api_add_stock_to_response' into product_variants_api_add_stock_to_response 2021-04-29 00:10:35 +03:00
kastoras
24dec80c7e New/NEW Product Variants API, add variant stock to response by parameter 
If $includestock parameter is set to 1, the response will contain variant stock data
 2021-04-29 00:06:47 +03:00
kastoras
e5cd6f97f9 New/NEW Product Variants API, add variant stock to response 
When acessing product variants via GET API /products/{id}/variants, Include stock_warehouse data to the response
 2021-04-28 23:19:24 +03:00
altairis-noe
82ae633617 lifetime and qc_frequency now treated in add and update 2021-04-28 17:08:17 +02:00
Laurent Destailleur
75a8dc28ea
Merge pull request #17261 from aspangaro/14a39 
Maxi debug of societe/product per entity
 2021-04-28 17:06:45 +02:00
altairis-noe
d6b936dd6e add lifetime and qc_frequency in product card 2021-04-28 16:36:15 +02:00
Laurent Destailleur
3ecf2015b3
Merge pull request #17393 from kastoras/product_api_get_only_products_not_variants 
Close/CLOSE #17390 Products API, GET /products without variants
 2021-04-28 16:14:01 +02:00
Laurent Destailleur
b56b9aa707
Merge branch 'develop' into develop 2021-04-28 16:05:07 +02:00
Laurent Destailleur
e810118a99
Merge pull request #17408 from ibuiv/patch-7 
Fix Bug replenish + Auto Filter
 2021-04-28 15:45:57 +02:00
Laurent Destailleur
0b0d1ee832
Merge pull request #17413 from kastoras/product_api_get_product_stock 
Close/CLOSE #13739 Product API route added to get product stock
 2021-04-28 15:31:33 +02:00
antonin_tdj
dfb4a1c30a
lint (code) Apply remarks and upgrade codee 
- Sets List of all Visible Warehouses at the beginning with getEntity method (removed the call to global $mc)
- Better check for warehouse auto select (`$count == 1 && (empty($fk_entrepot) || $fk_entrepot <= 0) && ...`)
- Better SQL applying eldy's remarks
 2021-04-28 13:37:05 +02:00
stickler-ci
925c324872 Fixing style errors. 2021-04-27 21:38:03 +00:00
kastoras
2e108e1e2f Close/CLOSE #13739 Product API route added to get product stock 
Using GET /products/{id}/stock user can get product stock from all warehouses. Using warehouse id will get stock of warehouse given.
 2021-04-28 00:32:37 +03:00
kastoras
f3504e8c54 Close/CLOSE #17390 Products API, GET /products variants filter 
Added new parameter for variants filter. Using this filter you can get products without variants only, parrent products only, child products only.
 2021-04-27 23:47:00 +03:00
Laurent Destailleur
e01c5313a7 Debug v14 2021-04-27 22:36:25 +02:00
Laurent Destailleur
f5d18a0023
Update replenish.php 2021-04-27 18:00:45 +02:00
Laurent Destailleur
328e70c309
Update replenish.php 2021-04-27 17:52:57 +02:00
altairis-noe
99df144e04 edit traceability fields in productlot card 2021-04-27 15:28:39 +02:00
stickler-ci
109124fdac Fixing style errors. 2021-04-27 10:16:59 +00:00
antonin_tdj
6fd1726093
Fix Bug replenish + Auto Filter 
# Fix Replenish Calculation Bug + Auto Filter

## Environment
* Version: 13
* URL(s): product/stock/replenish.php

## Configuration 
MultiCompany needed with Stock Sharing ON, 2 entities and 1 warehouse per entity

**Entity A**
* Options: don't share stocks with other entities
* Warehouse : only 1 (WAR_A)
* Stock : 1 product (PROD) Qty : 4

**Entity B :**
* Options: don't share stocks with other entities
* Warehouse : only 1 (WAR_B)
* Stock : 1 product --the same-- (PROD) Qty : 17

**Product :**
* Desired Stock : 20
* Alert : 10

**WAR_A :**
* For the product
* Desired Stock : 16
* Alert : 6
 
## Fixed behavior :
* Entity A -> Replenish
* If WAR_A selected should show the product and fill with 12 the qty to order. Physical Stock (All) and Physical Stock (this 
warehouse) should be 4.

* If no Warehouse selected show the product and fill with 12 (because only one warehouse seen by this entity) the qty to order. Physical Stock (All) should be 4.

## Actual behavior :
* Entity A -> Replenish

* The product isn't showed.

* If I intentionally incrementes the Desired Stock value. The product will be shown with the good filter (Warehouse if desired stock has been incremented on the combination ProductDesired <-> Warehouse). The qty for the order are correct and the physical stock shown is correct.

## Conclusion : 
* 1 bug and 1 improvment

**BUG** : The value of the stock taken to whether or not show the product line is wrong. It is considering the stock in warehouses not shared with the entity.

**IMPROVMENT** : If only one Warehouse, take automatically the desired and alert values for this warehouse and not the general ones.
 2021-04-27 12:14:36 +02:00
Antonin MARCHAL
5d1d6eee95 add(pmp) on Warehouse List 2021-04-27 10:51:15 +02:00
Antonin MARCHAL
00ef5b94bf lint(stickler) 2021-04-27 09:59:33 +02:00
Antonin MARCHAL
c865199a78 lint(stickler) 2021-04-27 09:58:36 +02:00
Antonin MARCHAL
5fd0c1b810 fix(code)eldy's remarks 2021-04-27 09:55:35 +02:00
Antonin MARCHAL
b573d81e45 fix(lint) eldy's remarks + other table used 2021-04-27 09:54:38 +02:00
Gauthier PC portable 024
ed8b9fda13 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail 2021-04-27 09:28:08 +02:00
Laurent Destailleur
5bd13d6daa
Merge pull request #17344 from altairis-noe/product_card_typo 
product card typo
 2021-04-27 01:31:11 +02:00
stickler-ci
1c1e111b0c Fixing style errors. 2021-04-26 22:06:11 +00:00
kastoras
8ba08552ca New/NEW Product Variants API, add variant stock to response 
When acessing product variants via GET API /products/{id}/variants, Include stock_warehouse data to the response
 2021-04-27 01:01:27 +03:00
Laurent Destailleur
615f858ecb
Merge pull request #17384 from ibuiv/patch-5 
Product Stock Card - add new standard Hooks
 2021-04-26 22:40:38 +02:00
Laurent Destailleur
8e67af8d58
Update api_products.class.php 2021-04-26 21:09:56 +02:00
Antonin MARCHAL
a296f81bc6 lint(travis) 2021-04-26 20:30:21 +02:00
Antonin MARCHAL
c0b6dd92d7 lint(stickler)4th 2021-04-26 20:15:32 +02:00
Antonin MARCHAL
57118da206 lint(stickler)3rd 2021-04-26 20:13:55 +02:00
Antonin MARCHAL
285fa4a506 lint(stickler) again 2021-04-26 20:10:57 +02:00
Antonin MARCHAL
1d162cc62c lint(stickler) 2021-04-26 20:06:45 +02:00
Antonin MARCHAL
14269ab8ee Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2021-04-26 19:30:00 +02:00
Antonin MARCHAL
9e2ee5bf57 add(pmp) PMP per entity 2021-04-26 19:29:56 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
Alexandre SPANGARO
d95be3e08b Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-26 13:53:16 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
stickler-ci
a8563de1c4 Fixing style errors. 2021-04-25 13:34:26 +00:00
kastoras
474bfdd6bc Close/CLOSE #17390 Products API, GET /products without variants 
When accessing get /products, using $without_variants parameter to true (the deault value is false), the api retur only products and no variants.
 2021-04-25 16:20:17 +03:00
Laurent Destailleur
b2c2c55214 Fix #yogosha5877 2021-04-24 21:00:26 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
stickler-ci
9fbb5087b9 Fixing style errors. 2021-04-23 16:05:24 +00:00
antonin_tdj
a28402e3a0
Product Stock Card - add new standard Hooks 2021-04-23 18:03:16 +02:00
altairis-noe
09807706f0 first try on productlot traceability fields 2021-04-23 14:51:02 +02:00
altairis-noe
81907191ca product card typo 2021-04-20 10:17:08 +02:00
Gauthier PC portable 024
70f739b332 Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail 2021-04-20 10:03:20 +02:00
Gauthier PC portable 024
72ea2a56ea NEW : help text 2021-04-20 10:02:53 +02:00
Gauthier PC portable 024
cbfb2d9b47 Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail 2021-04-20 09:44:24 +02:00
Gauthier PC portable 024
e5df10133e Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0_new_collapse_batch_detail 2021-04-20 09:06:05 +02:00
Alexandre SPANGARO
d27030df3f Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-20 04:43:14 +02:00
Laurent Destailleur
0ac380f23e
Merge pull request #17248 from altairisfr/batch_mask_product 
Batch mask product
 2021-04-19 22:16:22 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Laurent Destailleur
46ea1084f5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/cibles.php
	htdocs/core/extrafieldsinexport.inc.php
	htdocs/product/stock/card.php
 2021-04-19 20:59:10 +02:00
Laurent Destailleur
28f0c6c7cf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/stock/card.php
 2021-04-19 20:55:09 +02:00
atm-greg
74345c4f21 fix warehouse label field edition 2021-04-19 16:03:22 +02:00
Gauthier PC portable 024
b87773d5a0 Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into 13.0_new_collapse_batch_detail 2021-04-19 14:47:29 +02:00
Gauthier PC portable 024
2236d1b07f FIX : Hide all and check all links always available 2021-04-19 14:46:28 +02:00
stickler-ci
a79823742f Fixing style errors. 2021-04-19 12:41:17 +00:00
Gauthier PC portable 024
894eb1e5a4 NEW : "+" and "-" to show / hide batch details on product "stock" tab 2021-04-19 14:34:11 +02:00
Laurent Destailleur
94005f17a5
Merge pull request #17274 from altairisfr/project_warehouse 
Project warehouse
 2021-04-16 20:45:49 +02:00
Laurent Destailleur
ce9d707040
Merge pull request #17269 from bb2a/picto_massactions 
Next picto mass actions
 2021-04-16 20:40:19 +02:00
Laurent Destailleur
9eaf836c8e
Merge pull request #17281 from altairisfr/warehouses_in_project 
Warehouses in project
 2021-04-16 20:29:21 +02:00
stickler-ci
f76d540451 Fixing style errors. 2021-04-15 15:49:42 +00:00
Ferran Marcet
512b54d049 New: Streamline data loading on replenishment 2021-04-15 17:44:35 +02:00
altairis-noe
2e340c61cc preselect project when warehouse created from there 2021-04-15 10:31:18 +02:00
altairis-noe
658e1de45d stickler adjust 2021-04-14 16:08:28 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
altairis-noe
4c8d37ce28 warehouse can now be linked to a project with 
fk_project
 2021-04-14 13:45:25 +02:00
Laurent Destailleur
9154e07689 Fix picto for tags 2021-04-14 12:33:53 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +02:00
altairis-noe
7040330914 project select in edit or create warehouse 2021-04-14 10:13:31 +02:00
Christophe Battarel
ccc05a0a43
Merge branch 'develop' into batch_mask_product 2021-04-14 08:30:19 +02:00
stickler-ci
69fd2cf24c Fixing style errors. 2021-04-14 02:50:23 +00:00
Alexandre SPANGARO
2f31720896 Maxi debug of societe/product per entity 2021-04-14 04:45:17 +02:00
Laurent Destailleur
033a243372
Merge pull request #17166 from altairisfr/product_masks 
Product masks
 2021-04-13 23:06:09 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
altairis-noe
2e297b5753 one more print 2021-04-13 17:02:58 +02:00
altairis-noe
ee1693edf0 colspans and inconditional GETPOST 2021-04-13 16:13:57 +02:00
Laurent Destailleur
8c9cacba4d
Merge branch 'develop' into 14a36 2021-04-13 16:05:57 +02:00
Laurent Destailleur
add6853581
Merge branch 'develop' into filter_warehouse 2021-04-13 15:58:13 +02:00
Laurent Destailleur
302dd3e43d
Merge pull request #17238 from dolibit-ut/patch-275 
Update agenda.php
 2021-04-13 15:41:35 +02:00
Anthony Berton
5fec4c346e Update index.php 2021-04-13 15:28:16 +02:00