[cvs] commit: merk browse.php categories.php direct.php images.php index.php sellers.php merk/admin/categories delete.php edit.php index.php merk/carts delete.php edit.php index.php quantity.php merk/checkout index.php merk/config prefs.php.dist merk/deliveries ...

Mon Jan 7 08:16:04 UTC 2008

duck        2008-01-07 03:16:04 EST

  Modified files:
    .                    browse.php categories.php direct.php 
                         images.php index.php sellers.php 
    admin/categories     delete.php edit.php index.php 
    carts                delete.php edit.php index.php 
                         quantity.php 
    checkout             index.php 
    config               prefs.php.dist 
    deliveries           delete.php edit.php index.php 
    invoices             company.php delete.php index.php view.php 
                         view_print.php 
    items                delete.php edit.php index.php 
    lib                  base.php 
    lib/Block            item.php 
    lib/Forms            Process.php 
    options              delete_option.php delete_value.php 
                         edit_name.php edit_value.php index.php 
                         list_values.php 
    scripts              all_options.php banner.php 
                         update_stock_csv.php update_stock_sql.php 
    scripts/upgrades     2006-12-02_category.php 
                         2006-12-02_locale.php 
                         2007-01-10_images.php 
                         2007-07-25_categories.php 
    sellers              delete.php edit.php index.php 
    stocks               delete.php edit.php index.php item.php 
                         quantity.php 
    taxes                currencies.php taxes.php 
    templates/deliveries index.php 
    templates/invoices   index.php view.php view_print.php 
    templates/items      edit.php index.php 
    templates/options    index.php 
    templates/sellers    index.php 
    templates/stocks     index.php 
  Log:
  - Fix edit link name in stock options.
  - Small templates clean up.
  - @define -> define
  
  Revision  Changes    Path
  1.4       +2 -2      merk/admin/categories/delete.php
  1.2       +2 -2      merk/admin/categories/edit.php
  1.2       +2 -2      merk/admin/categories/index.php
  1.46      +2 -2      merk/browse.php
  1.32      +2 -2      merk/carts/delete.php
  1.56      +2 -2      merk/carts/edit.php
  1.44      +2 -2      merk/carts/index.php
  1.24      +2 -2      merk/carts/quantity.php
  1.9       +2 -2      merk/categories.php
  1.76      +2 -2      merk/checkout/index.php
  1.19      +2 -2      merk/config/prefs.php.dist
  1.28      +2 -2      merk/deliveries/delete.php
  1.34      +2 -2      merk/deliveries/edit.php
  1.29      +2 -2      merk/deliveries/index.php
  1.21      +2 -2      merk/direct.php
  1.13      +2 -2      merk/images.php
  1.11      +2 -2      merk/index.php
  1.5       +2 -2      merk/invoices/company.php
  1.27      +2 -2      merk/invoices/delete.php
  1.30      +2 -2      merk/invoices/index.php
  1.24      +2 -2      merk/invoices/view.php
  1.21      +2 -2      merk/invoices/view_print.php
  1.34      +2 -2      merk/items/delete.php
  1.61      +2 -2      merk/items/edit.php
  1.38      +2 -2      merk/items/index.php
  1.27      +2 -2      merk/lib/Block/item.php
  1.7       +3 -3      merk/lib/Forms/Process.php
  1.33      +6 -4      merk/lib/base.php
  1.31      +2 -2      merk/options/delete_option.php
  1.30      +2 -2      merk/options/delete_value.php
  1.31      +2 -2      merk/options/edit_name.php
  1.40      +2 -2      merk/options/edit_value.php
  1.31      +2 -2      merk/options/index.php
  1.30      +3 -3      merk/options/list_values.php
  1.5       +2 -2      merk/scripts/all_options.php
  1.3       +3 -3      merk/scripts/banner.php
  1.2       +3 -3      merk/scripts/update_stock_csv.php
  1.2       +3 -3      merk/scripts/update_stock_sql.php
  1.4       +4 -4      merk/scripts/upgrades/2006-12-02_category.php
  1.4       +4 -4      merk/scripts/upgrades/2006-12-02_locale.php
  1.5       +4 -4      merk/scripts/upgrades/2007-01-10_images.php
  1.2       +2 -2      merk/scripts/upgrades/2007-07-25_categories.php
  1.9       +2 -2      merk/sellers.php
  1.9       +2 -2      merk/sellers/delete.php
  1.9       +2 -2      merk/sellers/edit.php
  1.9       +2 -2      merk/sellers/index.php
  1.29      +2 -2      merk/stocks/delete.php
  1.30      +2 -2      merk/stocks/edit.php
  1.42      +2 -2      merk/stocks/index.php
  1.3       +2 -2      merk/stocks/item.php
  1.30      +2 -2      merk/stocks/quantity.php
  1.4       +2 -2      merk/taxes/currencies.php
  1.4       +2 -2      merk/taxes/taxes.php
  1.2       +3 -3      merk/templates/deliveries/index.php
  1.2       +4 -4      merk/templates/invoices/index.php
  1.2       +4 -4      merk/templates/invoices/view.php
  1.2       +1 -1      merk/templates/invoices/view_print.php
  1.2       +9 -9      merk/templates/items/edit.php
  1.2       +4 -4      merk/templates/items/index.php
  1.2       +4 -4      merk/templates/options/index.php
  1.2       +3 -3      merk/templates/sellers/index.php
  1.2       +5 -5      merk/templates/stocks/index.php

  Chora Links:
  http://cvs.horde.org/diff.php/merk/admin/categories/delete.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/admin/categories/edit.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/admin/categories/index.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/browse.php?r1=1.45&r2=1.46&ty=u
  http://cvs.horde.org/diff.php/merk/carts/delete.php?r1=1.31&r2=1.32&ty=u
  http://cvs.horde.org/diff.php/merk/carts/edit.php?r1=1.55&r2=1.56&ty=u
  http://cvs.horde.org/diff.php/merk/carts/index.php?r1=1.43&r2=1.44&ty=u
  http://cvs.horde.org/diff.php/merk/carts/quantity.php?r1=1.23&r2=1.24&ty=u
  http://cvs.horde.org/diff.php/merk/categories.php?r1=1.8&r2=1.9&ty=u
  http://cvs.horde.org/diff.php/merk/checkout/index.php?r1=1.75&r2=1.76&ty=u
  http://cvs.horde.org/diff.php/merk/config/prefs.php.dist?r1=1.18&r2=1.19&ty=u
  http://cvs.horde.org/diff.php/merk/deliveries/delete.php?r1=1.27&r2=1.28&ty=u
  http://cvs.horde.org/diff.php/merk/deliveries/edit.php?r1=1.33&r2=1.34&ty=u
  http://cvs.horde.org/diff.php/merk/deliveries/index.php?r1=1.28&r2=1.29&ty=u
  http://cvs.horde.org/diff.php/merk/direct.php?r1=1.20&r2=1.21&ty=u
  http://cvs.horde.org/diff.php/merk/images.php?r1=1.12&r2=1.13&ty=u
  http://cvs.horde.org/diff.php/merk/index.php?r1=1.10&r2=1.11&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/company.php?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/delete.php?r1=1.26&r2=1.27&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/index.php?r1=1.29&r2=1.30&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/view.php?r1=1.23&r2=1.24&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/view_print.php?r1=1.20&r2=1.21&ty=u
  http://cvs.horde.org/diff.php/merk/items/delete.php?r1=1.33&r2=1.34&ty=u
  http://cvs.horde.org/diff.php/merk/items/edit.php?r1=1.60&r2=1.61&ty=u
  http://cvs.horde.org/diff.php/merk/items/index.php?r1=1.37&r2=1.38&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Block/item.php?r1=1.26&r2=1.27&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Forms/Process.php?r1=1.6&r2=1.7&ty=u
  http://cvs.horde.org/diff.php/merk/lib/base.php?r1=1.32&r2=1.33&ty=u
  http://cvs.horde.org/diff.php/merk/options/delete_option.php?r1=1.30&r2=1.31&ty=u
  http://cvs.horde.org/diff.php/merk/options/delete_value.php?r1=1.29&r2=1.30&ty=u
  http://cvs.horde.org/diff.php/merk/options/edit_name.php?r1=1.30&r2=1.31&ty=u
  http://cvs.horde.org/diff.php/merk/options/edit_value.php?r1=1.39&r2=1.40&ty=u
  http://cvs.horde.org/diff.php/merk/options/index.php?r1=1.30&r2=1.31&ty=u
  http://cvs.horde.org/diff.php/merk/options/list_values.php?r1=1.29&r2=1.30&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/all_options.php?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/banner.php?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/update_stock_csv.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/update_stock_sql.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/upgrades/2006-12-02_category.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/upgrades/2006-12-02_locale.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/upgrades/2007-01-10_images.php?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/upgrades/2007-07-25_categories.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/sellers.php?r1=1.8&r2=1.9&ty=u
  http://cvs.horde.org/diff.php/merk/sellers/delete.php?r1=1.8&r2=1.9&ty=u
  http://cvs.horde.org/diff.php/merk/sellers/edit.php?r1=1.8&r2=1.9&ty=u
  http://cvs.horde.org/diff.php/merk/sellers/index.php?r1=1.8&r2=1.9&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/delete.php?r1=1.28&r2=1.29&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/edit.php?r1=1.29&r2=1.30&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/index.php?r1=1.41&r2=1.42&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/item.php?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/quantity.php?r1=1.29&r2=1.30&ty=u
  http://cvs.horde.org/diff.php/merk/taxes/currencies.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/taxes/taxes.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/templates/deliveries/index.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/templates/invoices/index.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/templates/invoices/view.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/templates/invoices/view_print.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/templates/items/edit.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/templates/items/index.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/templates/options/index.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/templates/sellers/index.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/templates/stocks/index.php?r1=1.1&r2=1.2&ty=u