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
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
Anthony Berton
68e46515a4 Update index.php 2021-04-13 13:54:37 +02:00
altairis-noe
14c93d14e4 whitespace correction 2021-04-13 11:39:12 +02:00
altairis-noe
a95911e096 stickler corrections 2021-04-13 11:21:41 +02:00
altairis-noe
eee40a1840 Merge branch 'develop' of github.com:altairisfr/dolibarr into batch_mask_product 2021-04-13 10:36:37 +02:00
Laurent Destailleur
0d136d6806 Enhance barcode scanner tool 2021-04-13 10:24:57 +02:00
Alexandre SPANGARO
f66ec58865 Fix travis error 2021-04-12 22:06:44 +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
stickler-ci
6724fb7ba0 Fixing style errors. 2021-04-12 17:37:21 +00:00
UT from dolibit
bae363cf0c
Update agenda.php 
$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda';

llxHeader('', $title, $help_url);
 2021-04-12 19:35:14 +02:00
altairis-noe
0965f28bf7 a pinch of jquery to display only what we need when we need it 2021-04-12 17:56:57 +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
altairis-noe
beecc6f935 Merge branch 'product_masks' of github.com:altairisfr/dolibarr into product_masks 2021-04-12 14:13:37 +02:00
altairis-noe
a61c1f8807 checkboxes for custom masks 2021-04-12 14:01:36 +02:00
Christophe Battarel
855e736d32
Merge branch 'develop' into product_masks 2021-04-12 11:42:23 +02:00
Alexandre SPANGARO
2d77b9bdf0 Work on split module fournisseur 2021-04-12 06:15:47 +02:00
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
Laurent Destailleur
0cf659eb85 Fix syntax error 2021-04-10 00:26:28 +02:00
altairis-noe
000342c2d8 custom masks : create, edit and display 2021-04-09 13:40:37 +02:00
Laurent Destailleur
a50b0e7441 Debug inventory module 2021-04-09 13:15:27 +02:00
Laurent Destailleur
06a7b8f5cb
Merge pull request #17159 from Hystepik/develop#1 
Close #17145 : add link to autofill with expected qty
 2021-04-09 12:50:33 +02:00
Laurent Destailleur
afca96a8ee Enhance barcode scanner tool 2021-04-09 12:08:56 +02:00
Laurent Destailleur
60711f415d Fix permission on external user 2021-04-08 19:52:07 +02:00
Laurent Destailleur
667481acd5 Fix #yogosha5832 - Missin test on permission for /index routes on APIs 2021-04-08 19:05:28 +02:00
altairis-noe
7c0d3d4d14 create custom masks in product cards 2021-04-08 18:03:46 +02:00
lmarcouiller
482b4e808b chnages with eldy's advices 2021-04-08 16:21:50 +02:00
altairis-noe
b7280f6524 product masks are relevant only if we are in advanced mode 2021-04-08 15:15:58 +02:00
Laurent Destailleur
59c8e70fd2 Fix #yogosha4510 2021-04-07 23:43:10 +02:00
altairis-noe
c5a0bc1f52 Merge branch 'product_masks' of github.com:altairisfr/dolibarr into product_masks 2021-04-07 16:47:47 +02:00
altairis-noe
14e5e63612 one space too much 2021-04-07 16:44:51 +02:00
Christophe Battarel
05efc85008
Merge pull request #2 from altairis-noe/product_masks 
Product masks
 2021-04-07 16:20:39 +02:00
altairis-noe
4ffc6531fe masks options are boolean 2021-04-07 16:09:27 +02:00
lmarcouiller
41db9abff8 Close #17145 : add link to autofill with expected qty 2021-04-07 12:46:28 +02:00
altairis-noe
fc76e06058 Better tooltip, better name, translation 2021-04-07 10:25:30 +02:00
Laurent Destailleur
558d595798 Debug inventory module 2021-04-07 02:46:41 +02:00
Laurent Destailleur
7cfcb7472d css 2021-04-07 02:31:13 +02:00
Laurent Destailleur
4ccb27ad40 Work on inventory module 2021-04-07 02:24:15 +02:00
altairis-noe
4015e1607f add masks to product_lot 2021-04-06 17:36:51 +02:00
Frédéric FRANCE
d44bf8be14
doxygen 2021-04-05 22:54:13 +02:00
Laurent Destailleur
37db3ffb90
Merge pull request #17065 from Hystepik/develop#1 
Debug feature to import stock movement from csv file
 2021-04-04 01:41:14 +02:00
lmarcouiller
fbb3373d40 Update to match eldy's advices 2021-04-02 09:08:08 +02:00
Laurent Destailleur
ef8c6ec117 FIX #yogosha5775 2021-04-01 11:18:35 +02:00
Laurent Destailleur
5fd8612891 FIX #yogosha5758 2021-04-01 11:01:07 +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
Laurent Destailleur
66385d4ed5
Merge pull request #17059 from Hystepik/develop#3 
new mass stock transfer with an import file
 2021-03-31 14:02:17 +02:00
Laurent Destailleur
7641f7258b
Merge pull request #17044 from aspangaro/14a27 
FIX: Add a sub table to manage accountancy on product/company
 2021-03-31 13:39:17 +02:00
Laurent Destailleur
625ade1a53 Clean log 2021-03-31 12:41:44 +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
Alexandre SPANGARO
38d47c184e FIX: Add a sub table to manage accountancy on product/company 2021-03-30 22:12:57 +02:00
Alexandre SPANGARO
4e30481fa2 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-30 22:05:03 +02:00
Laurent Destailleur
38f1710b43
Merge pull request #17020 from Hystepik/develop#1 
Close #4951 : New module Inventory
 2021-03-30 20:43:52 +02:00
Laurent Destailleur
bea355fa62
Merge pull request #17025 from dolibit-ut/patch-188 
Update card.php
 2021-03-30 19:22:26 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Laurent Destailleur
fae3cca494 FIX #yogosha5746 - next step (work in progress) 2021-03-30 17:45:15 +02:00
UT from dolibit
804fbd421d
Update card.php 2021-03-30 16:44:41 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
lmarcouiller
bf42a2ad87 Close #4951 : Add TestUnit 2021-03-30 14:38:53 +02:00
lmarcouiller
55560b7d38 Inventory module working 2021-03-30 12:35:20 +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
Alexandre SPANGARO
ea6b22f06e FIX: Add a sub table to manage accountancy on product/company 2021-03-30 03:27:46 +02:00
Laurent Destailleur
9edb2fd857 Fix sql error 2021-03-30 02:13:57 +02:00
Laurent Destailleur
23afb60dc5
Merge pull request #16554 from AlexisLaurier/develop 
Add standard fields property and fetchAll method to ProductFournisseur class
 2021-03-30 00:38:25 +02:00
Laurent Destailleur
5bbfe7ed19
Merge pull request #16930 from aspangaro/14a27 
NEW: Add a sub table to manage accountancy on product/company
 2021-03-29 20:11:02 +02:00
lmarcouiller
966d3a6f30 add setrecorded and commit to db 2021-03-29 15:18:34 +02:00
lmarcouiller
cdd777ecc8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-03-29 09:02:39 +02:00
Laurent Destailleur
1d48b883a7 Look and feel v14 2021-03-27 13:17:56 +01:00
Alexandre SPANGARO
22f809c517 Move to _PERENTITY 2021-03-27 05:23:20 +01:00
Alexandre SPANGARO
6422b0a6c0 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-27 05:02:55 +01:00
Laurent Destailleur
93d4da5f41 Fix deprecated code 2021-03-26 02:43:24 +01:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Laurent Destailleur
4e05fded3a
Merge pull request #16967 from dolibit-ut/patch-166 
Update card.php
 2021-03-25 12:39:47 +01:00
Laurent Destailleur
172b615d6c Debug auto numbering of lot/serial. 2021-03-25 11:51:29 +01:00
UT from dolibit
f5ec6abc48
Update card.php 
$helpurl  =>  $help_url
 2021-03-25 11:32:15 +01:00
Laurent Destailleur
ff52b1ee41
Merge pull request #16620 from altairisfr/pr_batch_masks 
Define Masks for Batch Products Equipments
 2021-03-25 08:36:36 +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
6a0e0f4c06 Fix #ygosha5698 2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
stickler-ci
5af4b4673c Fixing style errors. 2021-03-21 22:12:36 +00:00
Alexandre SPANGARO
0c2ada4299 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-21 23:08:01 +01:00
Laurent Destailleur
af199189b3 NEW Add color and picto for direction of movement 2021-03-21 13:46:01 +01:00
Laurent Destailleur
7d122cf921
Merge pull request #16838 from hregis/fix_php8 
FIX php 8 warning
 2021-03-20 11:49:41 +01:00
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments 2021-03-20 10:00:24 +01:00
Alexandre SPANGARO
17d3b85ec4 Merge remote-tracking branch 'upstream/develop' into 14a27 2021-03-20 07:47:54 +01:00
Alexandre SPANGARO
00e21caa42 NEW: Add a sub table to manage accountancy on product/company 2021-03-20 07:42:16 +01:00
Alexis LAURIER
4a90584ce1 product fournisseur price - clean 2021-03-19 16:07:52 +01:00
Alexis LAURIER
60086276d9 add product fournisseur price crud class 2021-03-19 15:53:41 +01:00
Laurent Destailleur
3a9a3b2b3e FIX #yogosha5665 2021-03-19 14:41:57 +01:00
Laurent Destailleur
1540f62df0 FIX #yogosha5678 2021-03-19 14:25:59 +01:00
Laurent Destailleur
d83d005284 FIX #yogosha5674 2021-03-19 12:44:59 +01:00
Regis Houssin
b5905bb032 FIX php 8 warning 2021-03-19 09:34:40 +01:00
Laurent Destailleur
b42da41041
Merge pull request #16639 from fbosman/patch-5 
Update list.php wrong number presentation in stock
 2021-03-19 00:01:54 +01:00
Laurent Destailleur
148abf7546
Merge pull request #16775 from frederic34/patch-7 
fix php8 warning
 2021-03-18 23:12:51 +01:00
Laurent Destailleur
7cbde7f4fb
Merge pull request #16803 from dolibit-ut/patch-107 
Update card.php
 2021-03-18 22:51:49 +01:00
Laurent Destailleur
d90a739c86
Merge pull request #16802 from dolibit-ut/patch-106 
Update productlot_list.php
 2021-03-18 22:51:41 +01:00
UT from dolibit
daa8c1e00f
Update massstockmove.php 
$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks|DE:Modul_Bestände';

llxHeader('', $title, $help_url);
 2021-03-18 20:38:08 +01:00
UT from dolibit
82f16086be
Update card.php 
$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks|DE:Modul_Bestände';
 2021-03-18 20:34:38 +01:00
UT from dolibit
3aed47c1db
Update productlot_list.php 
$help_url = 'EN:Module_Lot_/_Serial|FR:Module_Lot_/_Série';
 2021-03-18 20:32:11 +01:00
Frédéric FRANCE
afafe81d8a
fix php8 warning 2021-03-17 21:36:47 +01:00
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25 
Translation "Generated documents"
 2021-03-16 10:25:31 +01:00
Laurent Destailleur
aba4af85a5
Merge pull request #16722 from aspangaro/14a26 
Uniformize translation
 2021-03-16 10:24:42 +01:00
Laurent Destailleur
a9b2eeae37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-16 10:20:30 +01:00
Laurent Destailleur
39849de96e Look and feel v14 2021-03-16 10:19:56 +01:00
Alexandre SPANGARO
6960f0dc25 Uniformize translation 2021-03-16 04:22:55 +01:00
Alexandre SPANGARO
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
Alexandre SPANGARO
4fd24c6855 Translation "Generated documents" 2021-03-16 04:04:18 +01:00
UT from dolibit
032ffc657f
Update card.php 
at  $helpurl  add -> DE:Modul_Produkte 
at  $helpurl  add -> DE:Modul_Leistungen
 2021-03-15 16:03:56 +01:00
Frans Bosman
ba4fd3d44f
Update list.php 2021-03-15 13:44:40 +01:00
Christophe Battarel
090dc4f28a
Merge branch 'develop' into pr_batch_masks 2021-03-15 11:42:33 +01:00
Laurent Destailleur
5a61d82ce8
Merge pull request #16653 from frederic34/patch-10 
fix php8 warnings
 2021-03-15 11:09:05 +01:00
Laurent Destailleur
4ca0942229 Addoption in get_arbo_each_prod for performance enhancement 2021-03-14 23:44:20 +01:00
Laurent Destailleur
45579edd43 Enhance WAF and dol_sanitizeUrl 2021-03-14 18:57:18 +01:00
Laurent Destailleur
bd838d0b8a Fix sql syntax error #yogosha5628 + 1 SQL injection 2021-03-14 18:07:53 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Frédéric FRANCE
fb43a2fa73
fix php8 warnings 2021-03-14 09:56:45 +01:00
stickler-ci
f68bbdcf45 Fixing style errors. 2021-03-13 07:46:46 +00:00
Frans Bosman
dcb7958be9
Update list.php 
Changed the presentation of the stock to show decimals and thousands separator. changes price2num to price and use MAIN_MAX_DECIMALS_STOCK
 2021-03-13 08:44:16 +01:00
Laurent Destailleur
dc5557e4f7 Fix test on precommit hook 2021-03-12 14:30:32 +01:00
Laurent Destailleur
ab9d10edd3 test 2021-03-12 13:58:18 +01:00
Laurent Destailleur
964abbee28 aaa 2021-03-12 13:52:08 +01:00
Laurent Destailleur
a282dbcb1b test 2021-03-12 13:51:55 +01:00
lmarcouiller
4a185ba063 add warehouse quabtity + fix input new quantity 2021-03-12 12:47:58 +01:00
Christophe Battarel
14ba83f81f try to fix sticker 2021-03-11 14:20:50 +01:00
Christophe Battarel
7529a5cd7c try to fix sticker 2021-03-11 11:46:12 +01:00
Christophe Battarel
229c581a25 try to fix sticker 2021-03-11 11:30:12 +01:00
Christophe Battarel
ba51c5dc70 differentiate masks for lot management and serial numbers management 2021-03-11 10:44:55 +01:00
Christophe Battarel
2c711f1a2d add masks for batch 2021-03-11 10:02:31 +01:00
Laurent Destailleur
3007141b2b Fix phpcs 2021-03-10 20:40:34 +01:00
Laurent Destailleur
9ed128c6fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/card.php
 2021-03-10 15:35:09 +01:00
Laurent Destailleur
9a13ebfdb8 Fix look and feel v13 2021-03-10 11:08:39 +01:00
Laurent Destailleur
680f6257a0 FIX warning if setup of chart of account is not yet done. 2021-03-10 11:04:28 +01:00
Laurent Destailleur
cf30e90b93 Work on inventory 2021-03-09 15:35:10 +01:00
Laurent Destailleur
14d6893c63 Complete fields of product 2021-03-08 18:56:32 +01:00
Laurent Destailleur
66e7a9b283 NEW API Add option $includeifobjectisused to get a product 2021-03-08 16:17:20 +01:00
Laurent Destailleur
e3c31aa7b3
Merge pull request #16576 from c3do/patch-19 
NEW API Get the list of product ids only
 2021-03-08 16:08:30 +01:00
Laurent Destailleur
6367b843c3
Update api_products.class.php 2021-03-08 16:08:18 +01:00
Laurent Destailleur
67211d24fb
Update api_products.class.php 2021-03-08 16:07:30 +01:00
stickler-ci
66230c3f24 Fixing style errors. 2021-03-08 12:27:24 +00:00
Cédric
01db1161b6
Update api_products.class.php 2021-03-08 13:25:31 +01:00
Cédric
15fe2a7205
indicate if the product is used 2021-03-08 13:25:01 +01:00
Cédric
5fc5d9ab48
Update api_products.class.php 2021-03-08 12:12:29 +01:00
Laurent Destailleur
13d0398bd2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/price.php
 2021-03-07 19:07:18 +01:00
Laurent Destailleur
142f878633 Fix look and feel v13 2021-03-07 18:56:16 +01:00
Laurent Destailleur
4666c7f090 Fix responsive 2021-03-07 18:41:07 +01:00
stickler-ci
7ae57fb8d0 Fixing style errors. 2021-03-06 18:48:55 +00:00
Cédric
1f55f50d19
NEW API Get the list of product ids only 2021-03-06 19:46:30 +01:00
Laurent Destailleur
315e66aa5a
Merge pull request #16537 from altairisfr/pr_sn_unicity 
Unique serial number management
 2021-03-06 11:22:44 +01:00
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
 2021-03-05 19:29:09 +01:00
Christophe Battarel
acb8741849 fix typo 2021-03-05 08:40:26 +01:00
Christophe Battarel
acea36acf2 better check for unicity 2021-03-05 08:39:30 +01:00
Christophe Battarel
863ba52b15 add inner join and test error 2021-03-05 07:59:55 +01:00
Christophe Battarel
64036706ed fix for sticker 2021-03-04 17:52:05 +01:00
Christophe Battarel
c4ad4a33e4 fix for sticker 2021-03-04 17:49:28 +01:00
Christophe Battarel
1d2372b9ef fix for travis and sticker 2021-03-04 17:47:43 +01:00
Christophe Battarel
83350cde8f remove hidden constant MAIN_ADVANCE_NUMLOT 2021-03-04 15:40:23 +01:00
Christophe Battarel
6a242edd8b check unicity of serial number 2021-03-04 15:29:47 +01:00
Laurent Destailleur
33c4180781 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:36:19 +01:00
Laurent Destailleur
f11a85a3e3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/compta/facture/card.php
	htdocs/contrat/card.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
 2021-03-03 11:37:34 +01:00
Laurent Destailleur
7eb3e324c7 FIX #16503 2021-03-02 23:09:55 +01:00
Laurent Destailleur
42329b10c9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/compta/facture/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/modulebuilder.lib.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/supplier_proposal/card.php
	htdocs/ticket/list.php
 2021-03-02 15:27:20 +01:00
Laurent Destailleur
b8bd5cd0ee FIX Protection to avoid #16504 2021-03-01 23:08:03 +01:00
Alexandre SPANGARO
d0ccdfafb4 FIX stats supplier proposal 2021-03-01 04:12:53 +01:00
Laurent Destailleur
5c0ea476e1 Look and feel v14 2021-02-27 12:45:07 +01:00
Laurent Destailleur
34d00e5d5e Look and feel v14 2021-02-27 02:44:52 +01:00
Laurent Destailleur
56508816d2 Look and feel v14 2021-02-27 02:02:35 +01:00
Laurent Destailleur
84219689a6 Look and feel v14 2021-02-27 02:00:00 +01:00
Laurent Destailleur
8e632d08b8 NEW Add link picto to the stock movement on the detail of production 2021-02-27 00:31:29 +01:00
Frédéric FRANCE
96b0f3a25c
code syntax directory 2021-02-26 16:19:52 +01:00
Frédéric FRANCE
8029a3317f
Merge remote-tracking branch 'upstream/develop' into product_code_syntax 2021-02-26 16:11:34 +01:00
Laurent Destailleur
b95fd1697f
Merge pull request #16434 from altairisfr/serials_pr 
differentiate serial numbers from lot management
 2021-02-26 15:06:35 +01:00
Frédéric FRANCE
fa7cd70052
code syntax product directory 2021-02-26 14:25:17 +01:00
Laurent Destailleur
618d40d1a5
Merge branch 'develop' into develop 2021-02-26 13:17:12 +01:00
Laurent Destailleur
66fba16448
Merge pull request #16424 from frederic34/patch-4 
typo
 2021-02-26 12:56:09 +01:00
Laurent Destailleur
886965be76 Show product on lot record tab document 2021-02-26 12:54:57 +01:00
Laurent Destailleur
f5406d487b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/product.lib.php
	htdocs/product/stock/productlot_card.php
	test/phpunit/SecurityTest.php
 2021-02-26 12:53:06 +01:00
Laurent Destailleur
16906abc09 FIX File attachment on lots 2021-02-26 12:47:57 +01:00
Laurent Destailleur
00d2d28d68 NEW: Can create a lot from list 
Make code like modulebuilder
 2021-02-26 12:34:41 +01:00
Laurent Destailleur
34ed5519fd
Merge pull request #16435 from altairisfr/batchevents_pr 
add event management to batch products
 2021-02-26 11:50:48 +01:00
Laurent Destailleur
0f44bdb90f Fix sql error 2021-02-26 11:27:03 +01:00
Laurent Destailleur
2670d4fc17 Look and feel v14 2021-02-26 11:00:58 +01:00
Christophe Battarel
75298b4ac6 fix for stickler 2021-02-25 16:00:42 +01:00
Christophe Battarel
445974a003 add event management to batch products 2021-02-25 15:47:14 +01:00
Christophe Battarel
a3a8e7c4e4 change hasBatch function 2021-02-25 15:35:45 +01:00
Christophe Battarel
a61fa2b049 differentiate serial numbers from lot management 2021-02-25 15:15:00 +01:00
Frédéric FRANCE
aa56a4f739
typo 2021-02-24 18:20:42 +01:00
dvdwalker
3b49792985
Update product.class.php 2021-02-24 10:38:11 -03:00
Frédéric FRANCE
9f6c2f3eaa
css 2021-02-23 00:14:11 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Laurent Destailleur
36e0deba3f Look and feel v14 2021-02-17 17:56:08 +01:00
Laurent Destailleur
bfe71e8509 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-17 14:28:19 +01:00
Laurent Destailleur
12aa8fe223 Fix css 2021-02-16 19:01:00 +01:00
Laurent Destailleur
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
e56635b329 Fix filter on date on movement list 2021-02-14 23:05:11 +01:00
Laurent Destailleur
5fc36ab736
Merge pull request #16139 from aspangaro/14a14 
NEW: Stock movement list - Add more complete date field
 2021-02-14 22:45:39 +01:00
Laurent Destailleur
a9e7d04536 Fix #16256 2021-02-14 22:18:59 +01:00
Laurent Destailleur
fac38e50d6 Fix #16256 2021-02-14 22:16:15 +01:00
Laurent Destailleur
40c0a0ee26
Merge pull request #16256 from Hystepik/develop#1 
Close #16248 : new column in Stock to date
 2021-02-14 22:00:44 +01:00
stickler-ci
fb7e103d65 Fixing style errors. 2021-02-14 06:29:06 +00:00
Alexandre SPANGARO
dc91dbabd1 Fix tzuserrel 2021-02-14 07:26:53 +01:00
Laurent Destailleur
cd79e3985e
Update mouvementstock.class.php 2021-02-11 18:36:17 +01:00
lmarcouiller
6077880b0f Close #16248 : new column in Stock to date 2021-02-10 15:25:27 +01:00
Norbert Penel
371819820f
Add Hook in stockmouvement 2021-02-10 11:16:11 +01:00
Laurent Destailleur
408aefd46c FIX vat value when code contains number 2021-02-10 01:10:31 +01:00
Laurent Destailleur
1b129831a9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 14:09:46 +01:00
Laurent Destailleur
48a4ed656b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/projet/element.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2021-02-09 14:08:49 +01:00
Florian HENRY
b6b736c402 NEW:add hidden option to auto load input line extrafield into new lines 2021-02-08 19:56:34 +01:00
Florian HENRY
cb152b22df fix ajax 2021-02-08 15:47:37 +01:00
Florian HENRY
c0c6047538 fix ajax product missing condigtion 2021-02-08 11:54:29 +01:00
Frédéric FRANCE
4b6d3d0020
Update dynamic_prices.php 2021-02-07 18:25:48 +01:00
Francis Appels
1b55935577 Add critical price patch from 12 to 11. 2021-02-05 10:39:46 +01:00
Florian HENRY
d3d0617996 fix: manage price min for PRODUIT_CUSTOMER_PRICES 2021-02-02 13:43:33 +01:00
Alexandre SPANGARO
335b0aebb5 NEW: Stock movement list - Add more complete date field 2021-02-02 10:17:22 +01:00
Laurent Destailleur
2e9656a5b2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/filefunc.inc.php
 2021-02-02 03:26:20 +01:00
Laurent Destailleur
9a057386aa Fix look and feel 2021-02-02 02:38:02 +01:00
Laurent Destailleur
53014486d3 Fix default fields 2021-02-02 02:24:21 +01:00
Laurent Destailleur
7887d4cc8e Fix price2num on all GETPOST('remise_percent') 2021-01-31 12:48:40 +01:00
Laurent Destailleur
452aea1d8b Fix bad test 2021-01-23 17:59:56 +01:00
Laurent Destailleur
dd69aed27b Fix error test 2021-01-23 17:49:08 +01:00
Laurent Destailleur
8e5b971c49
Merge pull request #15918 from zuiko/patch-1 
Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
 2021-01-21 13:33:47 +01:00
Frédéric FRANCE
84985c5065
add status and status_buy 2021-01-19 18:01:30 +01:00
Laurent Destailleur
4d42fa2a37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formaccounting.class.php
 2021-01-17 11:34:19 +01:00
Laurent Destailleur
ee4084ef1b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/card.php
 2021-01-16 19:09:46 +01:00
Frédéric FRANCE
11100b3017
missing default value 2021-01-13 15:16:43 +01:00
Marc de Lima Lucio
82b0f18378 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-12 15:10:15 +01:00
stickler-ci
e012ce242d Fixing style errors. 2021-01-11 16:17:43 +00:00
Laurent Destailleur
df3034d13a
Merge branch 'develop' into patch-1 2021-01-11 17:15:46 +01:00
zuiko
50461931b0
Update card.php 
$type replaced by $fk_barcode_type in
$tmpcode = $modBarCodeProduct->getNextValue($object, $type);
in order to set it
 2021-01-09 01:13:02 +01:00
Laurent Destailleur
b91bca7022 Fix the source object may have been modified with corrupted data. 2021-01-08 01:56:23 +01:00
Laurent Destailleur
6da3ed1a51 Merge 2 exclusive options into 1 2021-01-07 12:39:51 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product 
NEW: preload product description on selection for customer propal/order/invoice
 2021-01-07 11:19:53 +01:00
Laurent Destailleur
b553dbb9d2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 20:23:07 +01:00
Laurent Destailleur
3d96c5a454 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/bom/tpl/objectline_edit.tpl.php
	htdocs/bom/tpl/objectline_view.tpl.php
	htdocs/core/boxes/box_shipments.php
	htdocs/societe/class/societe.class.php
 2021-01-06 20:20:37 +01:00
jpb
2be2cdaadf fix style errors 2021-01-06 16:06:03 +01:00
jpb
99b977a08e add categories params on llxHeader filter 2021-01-06 15:38:30 +01:00
Laurent Destailleur
ba68c958e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 19:12:57 +01:00
Laurent Destailleur
01062c5940 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/list.php
 2021-01-05 19:12:22 +01:00
Laurent Destailleur
58e33c59f4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/product/list.php
 2021-01-05 19:07:53 +01:00
lvessiller
ca6899c138 FIX right to show VAT rate in product list 2021-01-05 16:11:46 +01:00
Marc de Lima Lucio
f03f5701f6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-05 16:01:31 +01:00
Florian HENRY
dfaf77b03f merge develop 2021-01-03 15:14:34 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction 
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
 2021-01-01 21:36:15 +01:00
Laurent Destailleur
9e8c6eb0a1 FIX #15849 2020-12-31 15:05:17 +01:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction 2020-12-30 13:10:02 +01:00
Florian HENRY
af860a32bc fix product right 2020-12-28 21:19:25 +01:00
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Laurent Destailleur
eac711f96c Debug v13 2020-12-27 21:41:39 +01:00
Laurent Destailleur
e89a410e59 Fix warning 2020-12-27 20:33:07 +01:00
Laurent Destailleur
81ab33ff12 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/product/list.php
 2020-12-27 19:40:03 +01:00
Laurent Destailleur
199b46cfaf Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/en_US/modulebuilder.lang
 2020-12-27 16:53:15 +01:00
Laurent Destailleur
d2af03856c
Merge pull request #15808 from FHenry/12.0 
fix: colspan balance accountanty
 2020-12-27 13:56:07 +01:00
Florian HENRY
f03574d061 bank ok 2020-12-24 14:56:26 +01:00
Florian HENRY
e4bd4ce78e stock done 2020-12-24 00:58:21 +01:00
Florian HENRY
720539ff46 on goung 2020-12-23 23:52:43 +01:00
Florian HENRY
f8ef2a352f Merge branch '12.0' into 13.0 2020-12-23 23:51:02 +01:00
Florian HENRY
7d1d588225 fix service right problem for mass action 2020-12-23 23:48:45 +01:00
Florian HENRY
055a2b6fec on goung 2020-12-23 23:44:38 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Laurent Destailleur
70df6130b5 Fix SQL to export categories of contact 
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

Conflicts:
	htdocs/product/class/product.class.php
 2020-12-23 15:45:33 +01:00
Laurent Destailleur
8658f903fa FIX Must delete extrafields before main table on product deletion. 2020-12-23 15:00:25 +01:00
Laurent Destailleur
373ef45af5
Merge pull request #15793 from fappels/13_fix-reception_movement_list 
FIX missing reception link in stock movement list.
 2020-12-21 18:10:21 +01:00
ptibogxiv
4ca6e38f5f
FIX variant api code v13+ 
Better clean code
 2020-12-21 16:07:46 +01:00
Francis Appels
abbe340723 FIX missing reception link in stock movement list. 2020-12-21 12:24:45 +01:00
Laurent Destailleur
7871a41c5c Fix css 2020-12-19 16:24:32 +01:00
Laurent Destailleur
ef4a816c56 CSS 2020-12-19 15:56:21 +01:00
Laurent Destailleur
b41b528f33 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/sms.php
 2020-12-19 15:28:58 +01:00
Laurent Destailleur
31790e255c
Merge pull request #15756 from zuiko/patch-1 
Update V12 fournisseurs.php to Fix #15755 Product: purchase price tab, supplier price table with list of products not "responsive"
 2020-12-19 14:56:16 +01:00
Laurent Destailleur
3b8947dadd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
 2020-12-17 21:50:05 +01:00
Laurent Destailleur
a67068ab7b Fix warnings 2020-12-17 18:08:56 +01:00
Laurent Destailleur
73dfa7d44a Try a better fix for #15770 2020-12-17 14:37:02 +01:00
Laurent Destailleur
663d52fef1 Fix warning 2020-12-17 12:31:53 +01:00
Laurent Destailleur
b0d524beed Debug v13 2020-12-17 11:57:12 +01:00
Laurent Destailleur
371a460905 More PHPUnit for movements 2020-12-16 12:26:01 +01:00
Laurent Destailleur
5facd49a6c Fix warnings 2020-12-16 11:33:31 +01:00
Laurent Destailleur
37fe5bb3ef Solve blocking feature. Can increase stock of a Kit without changing 
subproduct stock.
 2020-12-15 15:18:01 +01:00
Laurent Destailleur
a2bd920371 Fix translation of units 2020-12-15 11:39:18 +01:00
Laurent Destailleur
2ae1aac5a4 Fix setup 2020-12-15 11:18:29 +01:00
Laurent Destailleur
31693eed21 Fix setup was not clear 2020-12-15 11:10:35 +01:00
zuiko
943f1022c0
Update fournisseurs.php 
Product: purchase price tab, the supplier price table with its list of products is not "responsive", as a result, the right-clickable areas, including the "Add purchase price" button, disappear to the right of the screens that are not full HD which forces the user to drag his window with the mouse.
The solution is to change the CSS class of the table to adopt the CSS class of the equivalent table of the selling price tab, which is "responsive" to it.
We therefore replace :
print '<table class="centpercent list">';
by :
print '<table class="noborder centpercent">';

Knowing that the class is used in 24 files, there might be other places where this class poses the same ergonomic problem. I don't know enough Dolibarr to generalize the correction ...
 2020-12-15 09:26:27 +01:00
Laurent Destailleur
8a0c065163 Debug v13 2020-12-11 16:30:45 +01:00
Laurent Destailleur
7ac3bb1b67 Debug v13 2020-12-11 02:40:48 +01:00
Laurent Destailleur
a5eb2e56cb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/card.php
 2020-12-08 22:27:27 +01:00
Laurent Destailleur
51128c1d55
Merge pull request #15692 from ATM-Consulting/FIX/12.0_regression_basic_html_tags_no_longer_allowed_in_product_label 
FIX 12.0 - XSS protection too stringent -> replace 'alphanohtml' with 'restricthtml'
 2020-12-08 22:09:27 +01:00
Laurent Destailleur
70b772cf74 Kit must show details on PDF. 2020-12-08 21:56:48 +01:00
Laurent Destailleur
a0b1bd3eca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/card.php
	htdocs/product/class/product.class.php
 2020-12-08 18:03:01 +01:00
Florian Mortgat
617c9f7ea9 FIX: enable HTML in product labels depending on conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML 2020-12-08 09:30:31 +01:00
Laurent Destailleur
6beba9e351
Merge pull request #15674 from frederic34/patch-14 
fix undefined variable
 2020-12-07 22:34:10 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element 
doxygen
 2020-12-07 22:31:08 +01:00
Laurent Destailleur
669205af1c
Update product.class.php 2020-12-07 19:02:49 +01:00
Florian Mortgat
f871ade545 FIX 12.0 - the stringent XSS prodection provided by 'alphanohtml' causes problems with some clients who used basic tags (bold, italic, underline) in product labels. Using 'restricthtml' instead could be a good compromise. 2020-12-07 15:15:41 +01:00