[interchange-cvs] interchange - heins modified 3 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Fri Nov 4 00:27:03 EST 2005
User: heins
Date: 2005-11-04 05:27:03 GMT
Modified: dist/standard/products mv_metadata.asc variable.txt
Modified: dist/lib/UI/pages/include/meta mv_metadata.asc
Log:
* Add setting with help for user merge feature.
* Continue "project_id" -> "po_number" rename.
Revision Changes Path
1.6 +1 -0 interchange/dist/standard/products/mv_metadata.asc
rev 1.6, prev_rev 1.5
Index: mv_metadata.asc
===================================================================
RCS file: /var/cvs/interchange/dist/standard/products/mv_metadata.asc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mv_metadata.asc 19 Oct 2005 14:49:18 -0000 1.5
+++ mv_metadata.asc 4 Nov 2005 05:27:03 -0000 1.6
@@ -373,6 +373,7 @@
variable::Variable::UI_ITEM_EXPUNGE text 60 Item expunge tables The tables that should have the SKU removed when you DELETE ITEM from the items menu.
variable::Variable::UI_META_LINK select 0=No, 1=Yes Meta edit links Determines whether enabled by default. They can be turned on in Preferences.
variable::Variable::UI_SECURE yesno Determines whether to force UI into secure mode or not.
+variable::Variable::UI_USER_MERGE_TABLES The tables that should be merged when a user merge operation is done. This would normally be "transactions orderline", and if left blank that is the default.
<br><br>The default is to merge on the <b>username</b> field, but you can specify the field name with <i>table:field</i>. For example,
if you have a table named <b>accounts</b> which has a field <i>userid</i>, and that table would be a merge target, you would want:
<blockquote>transactions orderline accounts:userid</blockquote> {}
variable::Variable::UI_WIDGET_TYPES textarea 40 40 Widget types for display in meta editor, needs to be in IC options format, i.e.
<blockquote>
VALUE=LABEL*
</blockquote>
one per line.
line2options options2line {}
variable::code text Variable name
variable::pref_group combo 20 Preferences area pref_group nullselect
1.4 +1 -0 interchange/dist/standard/products/variable.txt
rev 1.4, prev_rev 1.3
Index: variable.txt
===================================================================
RCS file: /var/cvs/interchange/dist/standard/products/variable.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- variable.txt 8 May 2005 03:50:06 -0000 1.3
+++ variable.txt 4 Nov 2005 05:27:03 -0000 1.4
@@ -88,6 +88,7 @@
UI_IMAGE_DIR_SECURE __MVC_SHAREURL__/interchange-5/ Admin Control
UI_ITEM_TABLES products pricing inventory merchandising options:sku Item display
UI_META_LINK 1 Admin Control
+UI_USER_MERGE_TABLES Admin Control
UI_ORDER_VIEWNEXT_MAX_SKIP 20 Admin Control
UI_PAGE_DIR pages Directories and Paths
UI_SECURE Admin Control
1.16 +3 -2 interchange/dist/lib/UI/pages/include/meta/mv_metadata.asc
rev 1.16, prev_rev 1.15
Index: mv_metadata.asc
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/include/meta/mv_metadata.asc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mv_metadata.asc 9 May 2004 20:56:20 -0000 1.15
+++ mv_metadata.asc 4 Nov 2005 05:27:03 -0000 1.16
@@ -322,7 +322,7 @@
ui_component::mv_metadata::ui_body textarea 80 30 Component Body digits
ui_component::mv_metadata::ui_body_text textarea 80 30 Component Body
ui_component::mv_metadata::width text 4 Width SIZE for TEXT<BR>
COLS for TEXTAREA<BR>
Label limit for SELECT digits
-userdb table username,company,lname,fname Users userdb {'tab_horiz_offset' => "",'tab_vert_offset' => "",'panel_height' => "400",'file_upload' => "",'tabbed' => "1",'left_width' => "",'table_width' => "800",'tab_height' => "",'panel_width' => "800",'tab_width' => "",'ui_data_fields' => "=Name and Contact Info
phone_day
phone_night
email
fax
fax_order
username
password
email_copy
mail_list
mod_time
inactive
=Shipping Info
company
fname
lname
address1
address2
address3
city
state
zip
country
mv_shipmode
=Billing Info
b_company
b_fname
b_lname
b_address1
b_address2
b_address3
b_city
b_state
b_zip
b_country
b_phone
=Order Info
project_id
account_id
credit_limit
dealer
price_level
order_dest
mv_credit_card_type
mv_credit_card_exp_month
mv_credit_card_exp_year
order_numbers
=Repositories
s_nickname
address_book
b_nickname
accounts
p_nickname
preferences
carts
=Permissions
owner
file_acl
db_acl
acl
",}
+userdb table username,company,lname,fname Users userdb {'tab_horiz_offset' => "",'tab_vert_offset' => "",'panel_height' => "400",'file_upload' => "",'tabbed' => "1",'left_width' => "",'table_width' => "800",'tab_height' => "",'panel_width' => "800",'tab_width' => "",'ui_data_fields' => "=Name and Contact Info
phone_day
phone_night
email
fax
fax_order
username
password
email_copy
mail_list
mod_time
inactive
=Shipping Info
company
fname
lname
address1
address2
address3
city
state
zip
country
mv_shipmode
=Billing Info
b_company
b_fname
b_lname
b_address1
b_address2
b_address3
b_city
b_state
b_zip
b_country
b_phone
=Order Info
po_number
account_id
credit_limit
dealer
price_level
order_dest
mv_credit_card_type
mv_credit_card_exp_month
mv_credit_card_exp_year
order_numbers
=Repositories
s_nickname
address_book
b_nickname
accounts
p_nickname
preferences
carts
=Permissions
owner
file_acl
db_acl
acl
",}
userdb::address1 text 40 Address
userdb::address2 text 40
userdb::b_address1 text 40 Billing Address
@@ -352,7 +352,7 @@
userdb::phone_day text 30 Daytime Phone
userdb::phone_night text 30 Home Phone
userdb::price_level select =Retail,dealer=Dealer,distributor=Distributor Price level
-userdb::project_id textarea Purchase Order No.
+userdb::po_number textarea Purchase Order No.
userdb::state text 10 State
userdb::subject text Subject
userdb::username hidden_text 16 Username no_white
@@ -392,6 +392,7 @@
variable::Variable::UI_ITEM_EXPUNGE text 60 Item expunge tables The tables that should have the SKU removed when you DELETE ITEM from the items menu.
variable::Variable::UI_META_LINK select 0=No, 1=Yes Meta edit links Determines whether enabled by default. They can be turned on in Preferences.
variable::Variable::UI_SECURE yesno Determines whether to force UI into secure mode or not.
+variable::Variable::UI_USER_MERGE_TABLES The tables that should be merged when a user merge operation is done. This would normally be "transactions orderline", and if left blank that is the default.
<br><br>The default is to merge on the <b>username</b> field, but you can specify the field name with <i>table:field</i>. For example,
if you have a table named <b>accounts</b> which has a field <i>userid</i>, and that table would be a merge target, you would want:
<blockquote>transactions orderline accounts:userid</blockquote> {}
variable::code text Variable name
variable::pref_group combo 20 variable Preferences area pref_group nullselect
variant::inventory::quantity text 8 On hand Inventory of this variant.
More information about the interchange-cvs
mailing list