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

520 Commits

Author SHA1 Message Date
Laurent Destailleur
c36bb0fbf7
Merge branch 'develop' into patch-163 2021-08-11 21:43:42 +02:00
Laurent Destailleur
80673e0efc
Update card.php 2021-08-11 21:32:39 +02:00
Laurent Destailleur
6fbd93999f css 2021-08-11 13:33:51 +02:00
jpb
8dc316797f move info to the left 2021-07-26 09:15:23 +02:00
stickler-ci
191163c7e7 Fixing style errors. 2021-07-20 20:41:49 +00:00
jpb
d61b831737 add field in create product 2021-07-20 22:39:30 +02:00
stickler-ci
2f0ba41a53 Fixing style errors. 2021-07-20 13:35:10 +00:00
jpb
dc90a62d90 add tooltips helper on product card 2021-07-20 15:18:14 +02:00
jpb
97287af987 add field to object product, add sql 2021-07-19 14:03:03 +02:00
Laurent Destailleur
202ee8340a FIX #18091 2021-07-12 23:01:34 +02:00
Laurent Destailleur
e7b3280c17 Debug v14 with nojs 2021-07-11 01:12:52 +02:00
Laurent Destailleur
2091120d77 FIX #18122 2021-07-11 00:50:57 +02:00
Laurent Destailleur
fb9d16a84a
Merge pull request #18109 from altairisfr/lot_sn_masks 
FIX : don't display custom masks if they are not used
 2021-07-08 23:42:48 +02:00
Alexandre SPANGARO
f4005cd7a7 Update product/card.php 2021-07-08 22:24:20 +02:00
altairis-noe
9983163e7a a few more getDolGlobalString 2021-07-08 17:21:36 +02:00
altairis-noe
66590ba810 getDolGlobalString instead of $conf->global 2021-07-08 17:10:03 +02:00
altairis-noe
68442a2d13 stickler corrections 2021-07-08 16:49:13 +02:00
altairis-noe
cbd8fa3572 better element id 2021-07-08 16:42:54 +02:00
altairis-noe
4e77a0d16a don't display custom masks if they are not used 2021-07-08 15:55:07 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
Laurent Destailleur
cf28fcc8cd CSS 2021-06-23 02:22:49 +02:00
stickler-ci
047b9715fb Fixing style errors. 2021-06-17 15:26:31 +00:00
Georg Meißner
3134f5be8f Make some product fields hidable 
This commit allows to hide some more fields in the product card (e.g. you can hide SIZE but not WEIGHT).
To allow the product card to be customized a bit better, following new variables can be set to hide the corresponding fields:
PRODUCT_DISABLE_PUBLIC_URL
PRODUCT_DISABLE_STOCK_LEVELS
PRODUCT_DISABLE_NATURE
PRODUCT_DISABLE_WEIGHT
PRODUCT_DISABLE_PRICES
PRODUCT_DISABLE_ACCOUNTING
The documentation has to be adapted accordingly.
 2021-06-17 17:22:37 +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
8b9af8f5ab Responsive 2021-06-13 01:27:04 +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
7e95c5ec20 Clean code 2021-06-08 11:40:50 +02:00
Laurent Destailleur
11fa523070 FIX CWE-269 2021-05-21 15:54:11 +02:00
Laurent Destailleur
a8d36a3a55 Debug v14 2021-05-19 13:56:13 +02:00
Laurent Destailleur
670b604d24 Clean code 2021-05-11 21:45:37 +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
2bdea3732d days in lifetime trans 2021-05-06 14:52:48 +02:00
altairis-noe
cce132b8da one more space 2021-05-06 10:04:54 +02:00
altairis-noe
8a108ae5e8 qcstatus out of formproduct and corrections in syntax 2021-05-06 09:59:33 +02:00
altairis-noe
82ae633617 lifetime and qc_frequency now treated in add and update 2021-04-28 17:08:17 +02:00
altairis-noe
d6b936dd6e add lifetime and qc_frequency in product card 2021-04-28 16:36:15 +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
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
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
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
0965f28bf7 a pinch of jquery to display only what we need when we need it 2021-04-12 17:56:57 +02:00
altairis-noe
000342c2d8 custom masks : create, edit and display 2021-04-09 13:40:37 +02:00
altairis-noe
7c0d3d4d14 create custom masks in product cards 2021-04-08 18:03:46 +02:00
Laurent Destailleur
9edb2fd857 Fix sql error 2021-03-30 02:13:57 +02: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
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25 
Translation "Generated documents"
 2021-03-16 10:25:31 +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
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
Christophe Battarel
83350cde8f remove hidden constant MAIN_ADVANCE_NUMLOT 2021-03-04 15:40:23 +01:00
Laurent Destailleur
84219689a6 Look and feel v14 2021-02-27 02:00:00 +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
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
a61fa2b049 differentiate serial numbers from lot management 2021-02-25 15:15:00 +01:00
Laurent Destailleur
7887d4cc8e Fix price2num on all GETPOST('remise_percent') 2021-01-31 12:48:40 +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
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
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
6da3ed1a51 Merge 2 exclusive options into 1 2021-01-07 12:39:51 +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
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
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
Laurent Destailleur
5bd6d6f388 Look and feel v13 2020-12-03 14:34:15 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
BENKE Charlene
5b40950f50 Update card.php 
add on card
 2020-11-26 12:45:06 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Laurent Destailleur
d8753ea224 Fix trans 2020-11-16 14:15:54 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
9595d56235
Merge pull request #15186 from fappels/13_fix_delete_product_ajax 
Fix delete product using ajax
 2020-10-27 20:03:00 +01:00
Francis Appels
828df6c134 Fix delete product using ajax 2020-10-27 19:45:12 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Florian HENRY
940d478aec UI and db OK 2020-10-14 15:54:48 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
a6fe03bd14 Fix doc 2020-10-04 23:30:41 +02:00
Laurent Destailleur
cab2c24e27
Merge branch 'develop' into patch-43 2020-10-03 15:51:38 +02:00
Laurent Destailleur
ce1c5c6873 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/class/stripe.class.php
	htdocs/takepos/invoice.php
 2020-10-01 19:43:23 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
stickler-ci
e558dc3f27 Fixing style errors. 2020-10-01 07:48:24 +00:00
John Botella
c16cd91d8e FIX default accountancy values and posted values 2020-10-01 09:40:11 +02:00