Commit Graph

2112 Commits

Author SHA1 Message Date
Gauthier PC portable 024
e6c9627195 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-09-17 15:47:23 +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
Gauthier PC portable 024
d121544810 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-09-06 16:08:39 +02:00
Laurent Destailleur
248e68aada Code comment 2021-09-03 13:39:08 +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
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
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
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
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function
improve forms - buttonsSaveCreate()
2021-08-24 15:26:03 +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
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +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
Gauthier PC portable 024
c56c74bbdd Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-08-18 18:31:11 +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
baec6aa169 Optimize memory and perf for list of stock movements 2021-08-16 22:45:27 +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
Gauthier PC portable 024
5364a5dddf FIX : transnoentities 2021-08-04 09:36:06 +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
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
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
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
Francis Appels
f6d03fe28e Fix update product lot 2021-07-28 21:45:11 +02:00
Ferran Marcet
aae64eee1e Fix: Not correct redirect link on lots 2021-07-28 11:48:38 +02:00
Florian HENRY
ee1e6c2780 fix: bad setEventMessages input 2021-07-21 14:52:37 +02:00
Laurent Destailleur
97ac547fe2 Fix/debug the numbering module to autocalculate a new lot. 2021-07-11 00:44:36 +02:00
Francis Appels
1333ca3660 Fix php 8 warning on not set field keys 2021-07-05 14:51:34 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +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
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
Juanjo Menent
eeef78760a fix: Bad position of the printFieldListWhere hook 2021-06-17 10:29:43 +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
abfc87c1de Fix separator extrafields must not appear as selected fields 2021-06-13 13:32:41 +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
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
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +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
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
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
11fa523070 FIX CWE-269 2021-05-21 15:54:11 +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
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
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
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
5e0f2f9781 Debug v14. Fix regression. 2021-05-12 22:35:21 +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
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
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
5e57a7173d
Merge branch 'develop' into productcard_traceability_fields 2021-05-06 15:21:48 +02:00
altairis-noe
7c53e2bb18 too much td 2021-05-06 11:16:22 +02:00
altairis-noe
435cbcd16c spaces after ! 2021-05-06 10:01:53 +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
Laurent Destailleur
d6617f82ca
Merge branch 'develop' into develop 2021-05-04 00:23:28 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +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
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
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
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
5fd0c1b810 fix(code)eldy's remarks 2021-04-27 09:55:35 +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
615f858ecb
Merge pull request #17384 from ibuiv/patch-5
Product Stock Card - add new standard Hooks
2021-04-26 22:40:38 +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
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +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
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
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
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
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
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
81487d76b2 Clean code of ol deprecated option 2021-04-12 15:37:26 +02:00
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
Frédéric FRANCE
d44bf8be14
doxygen 2021-04-05 22:54:13 +02:00
lmarcouiller
fbb3373d40 Update to match eldy's advices 2021-04-02 09:08:08 +02:00
lmarcouiller
fd6822b202 Debug feature to import stock movement 2021-04-01 09:34:14 +02:00
Laurent Destailleur
05d9140f8f Look and feel 2021-03-31 15:28:12 +02:00
Laurent Destailleur
3face8b1c4 Debug feature to import stock movements from a file. 2021-03-31 15:15:07 +02:00
Laurent Destailleur
fafff6d9a4 Debug feature to import stock movements from a file. 2021-03-31 15:07:18 +02:00
Hystepik
69c47f1d39
Merge branch 'develop' into develop#3 2021-03-31 12:21:28 +02:00
lmarcouiller
633b8f1431 Close #16761 : Info template import 2021-03-31 12:18:31 +02:00
lmarcouiller
bd092cc84d Close #16761 : new mass stock transfer 2021-03-31 12:04:37 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
d61f61ab45 Clean $_GET 2021-03-30 03:55:17 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Laurent Destailleur
1d48b883a7 Look and feel v14 2021-03-27 13:17:56 +01:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Laurent Destailleur
00630478ea Look and feel v14 2021-03-24 02:25:54 +01:00
Laurent Destailleur
537e979e5a Debug v13 2021-03-24 02:06:16 +01:00
Laurent Destailleur
367ff3c9f0 Look and feel v14 2021-03-24 01:53:08 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00