[cvs] commit: merk browse.php categories.php direct.php sellers.php merk/carts delete.php edit.php index.php quantity.php merk/categories delete.php edit.php index.php merk/checkout index.php merk/config conf.xml merk/deliveries delete.php edit.php ...

[Duck]

duck        2007-05-26 11:39:22 EDT

  Modified files:
    .                    browse.php categories.php direct.php 
                         sellers.php 
    carts                delete.php edit.php index.php 
                         quantity.php 
    categories           delete.php edit.php index.php 
    checkout             index.php 
    config               conf.xml 
    deliveries           delete.php edit.php index.php 
    invoices             delete.php index.php view.php 
    items                delete.php edit.php index.php 
    options              delete_option.php delete_value.php 
                         edit_name.php edit_value.php index.php 
                         list_values.php 
    sellers              delete.php edit.php index.php 
    stocks               delete.php index.php quantity.php 
  Added files:
    invoices             company.php 
  Log:
  Use MERK_TEMPLATES
  
  Revision  Changes    Path
  1.34      +2 -2      merk/browse.php
  1.23      +2 -2      merk/carts/delete.php
  1.48      +2 -2      merk/carts/edit.php
  1.36      +2 -2      merk/carts/index.php
  1.17      +2 -2      merk/carts/quantity.php
  1.3       +2 -2      merk/categories.php
  1.30      +2 -2      merk/categories/delete.php
  1.28      +2 -2      merk/categories/edit.php
  1.12      +2 -2      merk/categories/index.php
  1.67      +2 -2      merk/checkout/index.php
  1.33      +2 -2      merk/config/conf.xml
  1.21      +2 -2      merk/deliveries/delete.php
  1.26      +2 -2      merk/deliveries/edit.php
  1.24      +2 -2      merk/deliveries/index.php
  1.14      +2 -2      merk/direct.php
  1.1       +50 -0     merk/invoices/company.php (new)
  1.20      +2 -2      merk/invoices/delete.php
  1.24      +2 -2      merk/invoices/index.php
  1.19      +2 -2      merk/invoices/view.php
  1.25      +2 -2      merk/items/delete.php
  1.50      +2 -2      merk/items/edit.php
  1.29      +2 -2      merk/items/index.php
  1.23      +2 -2      merk/options/delete_option.php
  1.22      +2 -2      merk/options/delete_value.php
  1.23      +2 -2      merk/options/edit_name.php
  1.32      +2 -2      merk/options/edit_value.php
  1.24      +2 -2      merk/options/index.php
  1.24      +2 -2      merk/options/list_values.php
  1.4       +7 -2      merk/sellers.php
  1.4       +2 -2      merk/sellers/delete.php
  1.4       +2 -2      merk/sellers/edit.php
  1.5       +2 -2      merk/sellers/index.php
  1.22      +2 -2      merk/stocks/delete.php
  1.34      +1 -3      merk/stocks/index.php
  1.22      +2 -4      merk/stocks/quantity.php

  Chora Links:
  http://cvs.horde.org/diff.php/merk/browse.php?r1=1.33&r2=1.34&ty=u
  http://cvs.horde.org/diff.php/merk/carts/delete.php?r1=1.22&r2=1.23&ty=u
  http://cvs.horde.org/diff.php/merk/carts/edit.php?r1=1.47&r2=1.48&ty=u
  http://cvs.horde.org/diff.php/merk/carts/index.php?r1=1.35&r2=1.36&ty=u
  http://cvs.horde.org/diff.php/merk/carts/quantity.php?r1=1.16&r2=1.17&ty=u
  http://cvs.horde.org/diff.php/merk/categories.php?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/merk/categories/delete.php?r1=1.29&r2=1.30&ty=u
  http://cvs.horde.org/diff.php/merk/categories/edit.php?r1=1.27&r2=1.28&ty=u
  http://cvs.horde.org/diff.php/merk/categories/index.php?r1=1.11&r2=1.12&ty=u
  http://cvs.horde.org/diff.php/merk/checkout/index.php?r1=1.66&r2=1.67&ty=u
  http://cvs.horde.org/diff.php/merk/config/conf.xml?r1=1.32&r2=1.33&ty=u
  http://cvs.horde.org/diff.php/merk/deliveries/delete.php?r1=1.20&r2=1.21&ty=u
  http://cvs.horde.org/diff.php/merk/deliveries/edit.php?r1=1.25&r2=1.26&ty=u
  http://cvs.horde.org/diff.php/merk/deliveries/index.php?r1=1.23&r2=1.24&ty=u
  http://cvs.horde.org/diff.php/merk/direct.php?r1=1.13&r2=1.14&ty=u
  http://cvs.horde.org/co.php/merk/invoices/company.php?r=1.1
  http://cvs.horde.org/diff.php/merk/invoices/delete.php?r1=1.19&r2=1.20&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/index.php?r1=1.23&r2=1.24&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/view.php?r1=1.18&r2=1.19&ty=u
  http://cvs.horde.org/diff.php/merk/items/delete.php?r1=1.24&r2=1.25&ty=u
  http://cvs.horde.org/diff.php/merk/items/edit.php?r1=1.49&r2=1.50&ty=u
  http://cvs.horde.org/diff.php/merk/items/index.php?r1=1.28&r2=1.29&ty=u
  http://cvs.horde.org/diff.php/merk/options/delete_option.php?r1=1.22&r2=1.23&ty=u
  http://cvs.horde.org/diff.php/merk/options/delete_value.php?r1=1.21&r2=1.22&ty=u
  http://cvs.horde.org/diff.php/merk/options/edit_name.php?r1=1.22&r2=1.23&ty=u
  http://cvs.horde.org/diff.php/merk/options/edit_value.php?r1=1.31&r2=1.32&ty=u
  http://cvs.horde.org/diff.php/merk/options/index.php?r1=1.23&r2=1.24&ty=u
  http://cvs.horde.org/diff.php/merk/options/list_values.php?r1=1.23&r2=1.24&ty=u
  http://cvs.horde.org/diff.php/merk/sellers.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/sellers/delete.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/sellers/edit.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/sellers/index.php?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/delete.php?r1=1.21&r2=1.22&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/index.php?r1=1.33&r2=1.34&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/quantity.php?r1=1.21&r2=1.22&ty=u