Merge branch 'master' into sicepat

1 files changed, 12 insertions, 12 deletions

diff --git a/catalog.cfg b/catalog.cfg
index 3dde12d..c368116 100644
--- a/catalog.cfg
+++ b/catalog.cfg
@@ -144,7 +144,7 @@ ImageDir          __IMAGE_DIR__/
 ## Here we pick up the region variables like LEFTONLY_TOP and LEFTONLY_BOTTOM.
 ##
 ## Commenting; new variables TOP and BOTTOM will be defined in variable directory.
-## No longer going to need multiple leftright_top, leftonly_top, etc; will be 
+## No longer going to need multiple leftright_top, leftonly_top, etc; will be
 ## defined in "display_class" in each page.
 
 #DirConfig Variable templates/regions
@@ -227,7 +227,7 @@ UserTrack no
 # during your testing.
 RobotLimit  100
 
-# We also count the number of accesses from the same IP address. More than 
+# We also count the number of accesses from the same IP address. More than
 # RobotLimit accesses within a one hour period will cause a Forbidden result.
 # Uncomment the following line to change the 1 hour period to 30 minutes.
 # Limit  ip_session_expire  30
@@ -278,7 +278,7 @@ UserDB    default    from_plain    1
 UserDB    default    bcrypt_pepper  __BCRYPT_PEPPER__
 
 # Set to 1 to make the username and password case-insensitive
-UserDB    default    ignore_case   0
+UserDB    default    ignore_case   1
 
 # Change a field to something that doesn't conflict in MySQL
 UserDB    default    time_field    mod_time
@@ -426,11 +426,11 @@ FormIgnore   mv_handling
 #
 #
 
-# Along these lines further, for better integrity and less chance of a 
+# Along these lines further, for better integrity and less chance of a
 # user screwing up your order routes:
 # Note that __ORDER_ROUTES__ is empty by default, default Route "default"
 # is used with cascades
-FormIgnore      mv_order_route 
+FormIgnore      mv_order_route
 
 ## This route places the order entry in the database. If you don't
 ## have an inventory table (or a userdb table for that matter) make
@@ -538,7 +538,7 @@ Profiles        include/profiles/*.*
 ## Sets the default as to whether items are aggregated or ordered
 ## on separate lines. Can be overridden with mv_separate_items=0 in
 ## URL or form.
-SeparateItems   no
+SeparateItems   No
 
 #==========================================================================#
 
@@ -572,14 +572,14 @@ EOR
 
 AutoModifier pricing:price_group
 
-# 
+#
 # If the user is not a dealer (or not logged in) then pricing just comes
 # from "price". Any quantity discounts will be set in the qN fields in the
 # database, and are separate from dealer quantity discounts.
-# 
+#
 
 Profile dealer <<EOR
-{ 
+{
 	CommonAdjust => <<EOF,
 
 		pricing:w5,w10:,
@@ -593,7 +593,7 @@ EOF
 EOR
 
 Profile distributor <<EOR
-{ 
+{
 	CommonAdjust => <<EOF,
 
 		pricing:w5,w10:,
@@ -609,7 +609,7 @@ EOR
 
 ## This should match the default direct setting below this paragraph
 Profile default CommonAdjust   "pricing:q5,q10 ;:sale_price, ;:price, ;$, :related, ==:options"
-Profile default NonTaxableField 
+Profile default NonTaxableField
 Profile default PriceField 0
 
 CommonAdjust   pricing:q5,q10 ;:sale_price, ;:price, ;$, :related, ==:options
@@ -758,4 +758,4 @@ Jobs  log    __LOGDIR__/jobs.log
 Jobs  base_directory  etc/jobs
 
 Variable PIKUL_ANTERAJA 0
-Variable PIKUL_ANTERAJA 1
+Variable PIKUL_SICEPAT 1