Commit Graph

7764 Commits

Author SHA1 Message Date
Laurent Destailleur
85f404b1d1
Merge pull request #24231 from jyhere/jyhere-patch-5
Add missing printFieldListFrom hook in movements list
2023-03-17 21:05:44 +01:00
Laurent Destailleur
b7c242c210 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-17 20:54:18 +01:00
Laurent Destailleur
27edc8f8f4
Merge pull request #24234 from jyhere/jyhere/fix-listselect-hooks
FIX: remove obsolete preg_replace for removing commat at the beginnin…
2023-03-17 18:22:07 +01:00
Laurent Destailleur
3961fa7a97 Fix test on $resql 2023-03-17 18:05:45 +01:00
kkhelifa
2b1457c7d7 Fix Stickler CI 2023-03-16 17:17:40 +01:00
kkhelifa
a73665f83f NEW: Generate documents on product batch (Files) 2023-03-16 17:01:22 +01:00
Jyhere
ecfa7f1676 FIX: remove obsolete preg_replace for removing commat at the beginning... needed to work 2023-03-16 14:58:44 +01:00
jyhere
33324cae68
Add missing printFieldListFrom hook in movements list 2023-03-16 12:59:32 +01:00
Laurent Destailleur
293d7e8c0c
Merge pull request #24136 from OPEN-DSI/develop_new_orign_when_create_product_batch_from_movement_stock
NEW - Add origin info when create a product batch when created from a movement stock
2023-03-10 22:58:14 +01:00
Laurent Destailleur
be2597e2c3
Merge pull request #24155 from frederic34/barcodeenabled
use isModEnabled
2023-03-10 18:40:33 +01:00
Laurent Destailleur
65d17b569d Fix warning 2023-03-09 20:16:34 +01:00
Laurent Destailleur
3f264989ce
Merge pull request #23906 from FliyFly/qodanaincompatible
Fix (qodana)
2023-03-08 13:21:14 +01:00
Frédéric FRANCE
30aa377528 use isModEnabled 2023-03-08 08:50:19 +01:00
Laurent Destailleur
a92081cf43 Debug Kanban views 2023-03-07 22:04:40 +01:00
Laurent Destailleur
8bde9ce270 Look and feel v18 2023-03-07 20:03:04 +01:00
kkhelifa
de37c01bfa NEW - Add hook in loadLotStock() in html.formproduct.class.php file 2023-03-07 16:27:25 +01:00
kkhelifa
e5c9e14c0f NEW - Add origin info when create a product batch when created from a movement stock 2023-03-06 14:57:07 +01:00
Frédéric FRANCE
1692a08322 add pictos 2023-03-03 15:38:01 +01:00
Frédéric FRANCE
8ed361b917 add pictos 2023-03-03 14:36:34 +01:00
Laurent Destailleur
54bb784138 Debug v18 2023-03-02 19:40:28 +01:00
Laurent Destailleur
54fbed2142
Merge pull request #24059 from frederic34/patch-5
use hasRight and isModEnabled
2023-03-02 14:11:39 +01:00
Laurent Destailleur
12bd795afc Work on Kanban view 2023-03-01 20:13:21 +01:00
Frédéric FRANCE
2daa9b2dba user hasRight 2023-02-27 10:34:28 +01:00
Laurent Destailleur
ed5c890769 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-25 20:12:48 +01:00
Laurent Destailleur
cbb6ca071a Fix #yogosha15157 2023-02-25 19:51:05 +01:00
Laurent Destailleur
70eaa79e18 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-25 01:58:16 +01:00
Laurent Destailleur
a3a9d6e6a2 CSS 2023-02-24 13:29:08 +01:00
Laurent Destailleur
ad84346cae Fix sql error 2023-02-24 13:28:44 +01:00
Laurent Destailleur
904babed3e Fix filter on warehouse must not be visible on stock at date in future 2023-02-24 13:28:19 +01:00
Laurent Destailleur
093099ea44 NEW Can select several warehouses into the view stock at date in past 2023-02-24 12:57:15 +01:00
Laurent Destailleur
393b0e7c4c NEW Support multiselect in the warehouse selection combo box 2023-02-24 12:56:11 +01:00
Laurent Destailleur
ca6e7dcb41 Fix sql error 2023-02-24 11:31:46 +01:00
Laurent Destailleur
27c15c523d CSS 2023-02-24 11:27:14 +01:00
Laurent Destailleur
a64ed59e18 Merge 2023-02-23 22:25:56 +01:00
Laurent Destailleur
d4402aa7f5 code easier to understand 2023-02-22 01:09:23 +01:00
Laurent Destailleur
2770955620 Doc 2023-02-21 19:48:16 +01:00
Laurent Destailleur
772776075f Doc 2023-02-21 19:44:40 +01:00
FLIO
29e56ab3cf fix (qodana) edit error and merge develop to be update 2023-02-21 17:51:24 +01:00
hystepik
e75186f6bc Fix : php 8.0 warnings 2023-02-21 16:14:14 +01:00
Laurent Destailleur
04ca203ee8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-21 12:21:01 +01:00
Laurent Destailleur
d050471eb0 Debug v17 2023-02-21 10:34:21 +01:00
Laurent Destailleur
a6656d1e3e
Merge pull request #23965 from atm-gauthier/NEW/17.0_objets_referents_lots
FIX : useless code
2023-02-20 16:27:17 +01:00
Laurent Destailleur
870ac42082 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-20 16:20:49 +01:00
Gauthier PC portable 024
34625d19fd FIX : useless code 2023-02-20 12:33:44 +01:00
Laurent Destailleur
3b8794dfb6 Debug v17 2023-02-20 02:08:04 +01:00
Laurent Destailleur
eaa0e5eb3e CSS 2023-02-19 02:39:39 +01:00
Laurent Destailleur
fd3dffc892 Add kanban view for partnership object 2023-02-18 19:20:54 +01:00
Laurent Destailleur
2168578f2e Fix inline css 2023-02-18 14:00:25 +01:00
stickler-ci
bc954af404 Fixing style errors. 2023-02-17 09:32:05 +00:00
Gauthier PC portable 024
13a3075ffb Merge branch 'NEW/develop_objets_referents_lots' of github.com:atm-gauthier/dolibarr into NEW/develop_objets_referents_lots 2023-02-17 10:28:09 +01:00
Gauthier PC portable 024
7022f8217c Merge branch 'NEW/17.0_objets_referents_lots' of github.com:atm-gauthier/dolibarr into NEW/develop_objets_referents_lots 2023-02-17 10:27:11 +01:00
Gauthier PC portable 024
8534a96981 FIX : stickler feedbacks 2023-02-17 10:24:59 +01:00
Gauthier PC portable 024
8e2998a504 NEW : dev name 2023-02-17 10:12:19 +01:00
stickler-ci
40f52afb9e Fixing style errors. 2023-02-17 09:06:07 +00:00
Gauthier PC portable 024
e807b0d717 Merge branch 'NEW/17.0_objets_referents_lots' of github.com:atm-gauthier/dolibarr into NEW/develop_objets_referents_lots 2023-02-17 09:59:22 +01:00
Gauthier PC portable 024
373388ca4a FIX : total line on batch stats mo 2023-02-17 09:58:48 +01:00
Gauthier PC portable 024
ebee6ff6c2 Merge branch 'NEW/17.0_objets_referents_lots' of github.com:atm-gauthier/dolibarr into NEW/develop_objets_referents_lots 2023-02-17 09:46:25 +01:00
Gauthier PC portable 024
3b2d3dc6a6 NEW : batch referential objets 2023-02-17 09:44:38 +01:00
Frédéric FRANCE
8765e00e00 Merge remote-tracking branch 'upstream/develop' into membertooltip 2023-02-16 21:27:56 +01:00
Laurent Destailleur
c498589bac
Merge pull request #23937 from bloxera/wikilink_DE_1
New: add links to wiki pages in German language
2023-02-16 21:23:15 +01:00
Laurent Destailleur
2397fb0125
Merge pull request #23912 from frederic34/fixuserrights
use user->hasRight
2023-02-16 21:12:04 +01:00
priojk
247ba8d0c3 New: added links to wiki pages in German language 2023-02-16 17:52:41 +01:00
jyhere
87f7adf6d8
FIX : wrong context in product/agenda.php 2023-02-16 14:32:53 +01:00
Frédéric FRANCE
c1882425db fix tooltip 2023-02-15 22:26:16 +01:00
Laurent Destailleur
ebca6e5c0b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-15 20:47:45 +01:00
Laurent Destailleur
6a7c5d2715 Fix format of stock qty 2023-02-15 18:52:36 +01:00
Frédéric FRANCE
ae48571135 use user->hasRight 2023-02-14 22:56:12 +01:00
Laurent Destailleur
a0c53bc0bc Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-14 21:04:44 +01:00
FLIO
156922fc51 Fix (qodana) Incompatible return type 2023-02-14 14:09:56 +01:00
Laurent Destailleur
66369567b3
Merge pull request #23883 from frederic34/knowledgemgmt
add ajax tooltip on knowledge record
2023-02-13 18:21:09 +01:00
Laurent Destailleur
701c5b915f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-13 14:01:32 +01:00
Laurent Destailleur
239f7a1eb0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-13 13:58:03 +01:00
Laurent Destailleur
927a87851d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-13 13:57:02 +01:00
Laurent Destailleur
753ec9e384 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-13 13:55:50 +01:00
Laurent Destailleur
19bfb021e1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-13 13:51:35 +01:00
Frédéric FRANCE
0f4adbedab clean code 2023-02-12 21:15:16 +01:00
Laurent Destailleur
17ae12abfd Fix warning 2023-02-10 21:09:20 +01:00
Alexandre SPANGARO
1bc16f47c0 FIX : Missing right to edit service note when module product is disabled 2023-02-10 15:00:27 +01:00
Laurent Destailleur
73b894dca3 Fix the qty in stock when product has no lot 2023-02-09 23:19:58 +01:00
Frédéric FRANCE
1fa1d11500 Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-09 15:26:40 +01:00
Laurent Destailleur
41f651265d
Merge pull request #23825 from Easya-Solutions/new-productlot-make-sell-or-eat-by-mandatory2
NEW can stay on edit field when errors occurs
2023-02-09 15:13:41 +01:00
Laurent Destailleur
38933225d2
Merge pull request #23837 from frederic34/patch-12
error message may be overwritten by other error message
2023-02-09 14:59:51 +01:00
Laurent Destailleur
7d6db10710
Merge pull request #23658 from FliyFly/qodanaincompatiblereturn
Fix (qodana)
2023-02-08 16:06:25 +01:00
Frédéric FRANCE
28c722ef59
error message may be overwritten by other error message 2023-02-08 15:19:00 +01:00
VESSILLER
6f8c26fa47 NEW can stay on edit field when errors occurs 2023-02-07 16:18:13 +01:00
Laurent Destailleur
cd2e82f4a5 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-07 00:22:27 +01:00
Laurent Destailleur
95b306ba84 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-02-07 00:19:54 +01:00
Frédéric FRANCE
8a5e983d7e clean code 2023-02-06 22:21:54 +01:00
Frédéric FRANCE
b238830c82 keep original label 2023-02-05 23:19:56 +01:00
Frédéric FRANCE
19631fef74 fix tooltip 2023-02-05 20:41:29 +01:00
Frédéric FRANCE
9ab6c31141 fix tooltip 2023-02-05 14:13:20 +01:00
Frédéric FRANCE
661c82473e add ajax tooltip on productlot 2023-02-05 10:00:48 +01:00
Frédéric FRANCE
a501ae8961 fix tooltip 2023-02-05 09:46:29 +01:00
Frédéric FRANCE
5a33e40667 fix for double tooltip 2023-02-04 21:34:48 +01:00
Frédéric FRANCE
04610763aa Merge remote-tracking branch 'upstream/develop' into ajaxtooltip 2023-02-04 18:31:40 +01:00
Laurent Destailleur
ff4ea81429 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-04 16:11:16 +01:00
Frédéric FRANCE
9d02ff1ba9
Update editor.php 2023-02-03 11:28:14 +01:00
Frédéric FRANCE
cc2f4502fc
colspan 2023-02-03 11:10:26 +01:00
Frédéric FRANCE
dc33289a10 add ajax tooltip on actioncomm 2023-02-02 23:47:01 +01:00
Frédéric FRANCE
a32a0cc25a add ajax tooltip on warehouse 2023-02-02 23:28:09 +01:00
Frédéric FRANCE
41dd574b16 clean js 2023-02-02 22:59:54 +01:00
Mélina JOUM
e10a7de3e0 stickler-ci error 2023-02-02 17:52:07 +01:00
Mélina JOUM
f46d9f1a15 Fix GETPOST 2023-02-02 15:54:24 +01:00
Mélina JOUM
4b61ef946a Fix 2023-02-02 11:44:10 +01:00
FLIO
0080b0a80f fix (qodana) fix condlicts 2023-02-01 23:38:49 +01:00
Mélina JOUM
afa1fd3e8a Get data back on product update 2023-02-01 16:51:13 +01:00
Frédéric FRANCE
7eb0b71252 work on ajax tooltip 2023-01-31 22:47:30 +01:00
Frédéric FRANCE
993c1d28c4 work on ajax tooltip 2023-01-31 22:08:32 +01:00
Laurent Destailleur
7c1b47bf31
Merge pull request #23696 from marcusdeangabriel/MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS
Implements MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS for products
2023-01-29 20:57:31 +01:00
Laurent Destailleur
f4bfe86521 css 2023-01-28 17:48:43 +01:00
marcusdeangabriel
035ccf9261
Merge branch 'Dolibarr:develop' into MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS 2023-01-27 11:32:50 +01:00
Laurent Destailleur
31652fd732 css 2023-01-27 02:43:41 +01:00
mgabriel
35b05cfc7b Implements MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS for product refs and labels. 2023-01-26 11:00:00 +01:00
hystepik
32da192db4 fix : php 8.1 warnings 2023-01-24 14:32:20 +01:00
FLIO
c4521efa57 fix(qodana) fix function comment bad return 2023-01-23 16:31:14 +01:00
Laurent Destailleur
1d6b105503 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-01-23 11:57:28 +01:00
Laurent Destailleur
a76080b51e
Merge pull request #23125 from lamrani002/kanbanForProducts
New mode kaban for products list
2023-01-23 01:15:13 +01:00
Laurent Destailleur
35bc94095a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-19 13:50:59 +01:00
Laurent Destailleur
36fd6e6870 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-19 13:24:46 +01:00
Laurent Destailleur
6ce20e3bae
Merge pull request #23541 from FHenry/16_fix_token
fix: token for scan inventory
2023-01-18 23:33:00 +01:00
Laurent Destailleur
0f475783de Enhance method getKanbanView 2023-01-18 22:27:52 +01:00
Laurent Destailleur
80d46a22f1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-18 21:36:57 +01:00
Laurent Destailleur
c60a40f245
Merge pull request #23580 from hregis/fix_multicompany_compatibility
FIX Multicompany use "element" name and not "table_element"
2023-01-18 20:30:46 +01:00
Laurent Destailleur
50db6de309 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-18 00:20:53 +01:00
Laurent Destailleur
af7570a2cd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 00:16:03 +01:00
Laurent Destailleur
48161b8400 Debug v17. Bad param for selection of project 2023-01-17 13:50:23 +01:00
Francis Appels
9b164b907c Add warehouse modify and create triggers.
Clean and remove deprecated vars.
2023-01-16 19:46:55 +01:00
lamrani abdelwadoud
6983ef9584
Update product.class.php
fix style error
2023-01-16 15:53:57 +01:00
Regis Houssin
481215eef4 FIX Multicompany use "element" name and not "table_element" 2023-01-16 14:40:35 +01:00
Laurent Destailleur
40e956646d
Merge pull request #23523 from altairis-noe/status_for_inventory_update
FIX: do not let closed inventories reset stock with URL
2023-01-13 13:22:47 +01:00
Laurent Destailleur
ad00a17ac3 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-13 13:03:54 +01:00
Florian HENRY
534cb8f0a0 fix: token for scan inventory 2023-01-13 09:55:57 +01:00
Laurent Destailleur
efe1d913a7 Fix MAIN_CHECKBOX_LEFT_COLUMN 2023-01-12 12:06:02 +01:00
Laurent Destailleur
1e36b45791 Fix missing entity 2023-01-12 11:58:32 +01:00
Laurent Destailleur
f919229e06 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-12 11:51:33 +01:00
Laurent Destailleur
ce934a813b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-12 11:48:58 +01:00
Laurent Destailleur
684716e15b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-12 11:43:43 +01:00
Noé Cendrier
272f131b07 do not let closed inventories reset stock with URL 2023-01-12 10:18:47 +01:00
Regis Houssin
968c50d6f9 FIX wrong stock list with multicompany and without stock sharing 2023-01-12 09:49:12 +01:00
Laurent Destailleur
3769861a8a NEW VAT can be modified during add of line 2023-01-10 21:46:11 +01:00
Laurent Destailleur
9aa6e59f9b Look and feel v18 2023-01-05 04:04:16 +01:00
Laurent Destailleur
761ca8ca43 Enhance select2 component to allow onrightofpage 2023-01-05 03:24:37 +01:00
Laurent Destailleur
566fb52fb8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-04 15:38:57 +01:00
Laurent Destailleur
950b1506d1 Debug v17 2023-01-04 15:29:36 +01:00
Laurent Destailleur
2378f8067b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-04 15:18:13 +01:00
Laurent Destailleur
eed3cdd9cc Debug v17 2023-01-04 15:10:53 +01:00
Laurent Destailleur
43a0ccce2b Clean code 2023-01-04 11:37:24 +01:00
Laurent Destailleur
e58d88c62a Fix warnings 2023-01-03 13:49:05 +01:00
Laurent Destailleur
cb13069fa1 Fix warnings 2023-01-03 13:47:34 +01:00
Laurent Destailleur
3e36e9831e Fix warnings 2023-01-03 13:03:27 +01:00