commit: merk categories.php direct.php images.php sellers.php merk/admin tabs.php merk/deliveries delete.php edit.php index.php merk/invoices company.php delete.php index.php view.php view_print.php merk/items delete.php edit.php index.php merk/lib ...

duck        2008-12-05 13:42:22 EST

  Modified files:
    .                    categories.php direct.php images.php 
                         sellers.php 
    admin                tabs.php 
    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                  Merk.php api.php 
    lib/Sellers          sql.php 
    lib/Stock            sql.php 
    options              delete_option.php delete_value.php 
                         edit_name.php edit_value.php index.php 
                         list_values.php 
    scripts              update_stock_csv.php update_stock_sql.php 
    sellers              delete.php edit.php index.php 
    stocks               delete.php edit.php index.php item.php 
                         quantity.php 
  Log:
  Remove shopping prems as in not used anywhere.
  Add merk:admin premission like in other apps and allow administrative tasks to be done by app admins not horde admins.
  Add updateQuantity api call
  
  Revision  Changes    Path
  1.5       +2 -2      merk/admin/tabs.php
  1.11      +2 -3      merk/categories.php
  1.30      +2 -2      merk/deliveries/delete.php
  1.37      +2 -2      merk/deliveries/edit.php
  1.31      +2 -2      merk/deliveries/index.php
  1.24      +2 -3      merk/direct.php
  1.15      +2 -4      merk/images.php
  1.7       +2 -2      merk/invoices/company.php
  1.29      +2 -2      merk/invoices/delete.php
  1.32      +2 -2      merk/invoices/index.php
  1.26      +2 -2      merk/invoices/view.php
  1.23      +2 -2      merk/invoices/view_print.php
  1.36      +2 -2      merk/items/delete.php
  1.66      +3 -3      merk/items/edit.php
  1.40      +2 -2      merk/items/index.php
  1.69      +2 -2      merk/lib/Merk.php
  1.12      +2 -2      merk/lib/Sellers/sql.php
  1.34      +2 -2      merk/lib/Stock/sql.php
  1.45      +32 -4     merk/lib/api.php
  1.33      +2 -2      merk/options/delete_option.php
  1.32      +2 -2      merk/options/delete_value.php
  1.33      +2 -2      merk/options/edit_name.php
  1.42      +2 -2      merk/options/edit_value.php
  1.33      +2 -2      merk/options/index.php
  1.32      +2 -2      merk/options/list_values.php
  1.3       +2 -2      merk/scripts/update_stock_csv.php
  1.3       +2 -2      merk/scripts/update_stock_sql.php
  1.11      +2 -3      merk/sellers.php
  1.11      +2 -2      merk/sellers/delete.php
  1.11      +2 -2      merk/sellers/edit.php
  1.11      +2 -2      merk/sellers/index.php
  1.31      +2 -2      merk/stocks/delete.php
  1.32      +2 -2      merk/stocks/edit.php
  1.44      +2 -2      merk/stocks/index.php
  1.5       +2 -2      merk/stocks/item.php
  1.32      +2 -2      merk/stocks/quantity.php

  Chora Links:
  http://cvs.horde.org/diff.php/merk/admin/tabs.php?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/categories.php?r1=1.10&r2=1.11&ty=u
  http://cvs.horde.org/diff.php/merk/deliveries/delete.php?r1=1.29&r2=1.30&ty=u
  http://cvs.horde.org/diff.php/merk/deliveries/edit.php?r1=1.36&r2=1.37&ty=u
  http://cvs.horde.org/diff.php/merk/deliveries/index.php?r1=1.30&r2=1.31&ty=u
  http://cvs.horde.org/diff.php/merk/direct.php?r1=1.23&r2=1.24&ty=u
  http://cvs.horde.org/diff.php/merk/images.php?r1=1.14&r2=1.15&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/company.php?r1=1.6&r2=1.7&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/delete.php?r1=1.28&r2=1.29&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/index.php?r1=1.31&r2=1.32&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/view.php?r1=1.25&r2=1.26&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/view_print.php?r1=1.22&r2=1.23&ty=u
  http://cvs.horde.org/diff.php/merk/items/delete.php?r1=1.35&r2=1.36&ty=u
  http://cvs.horde.org/diff.php/merk/items/edit.php?r1=1.65&r2=1.66&ty=u
  http://cvs.horde.org/diff.php/merk/items/index.php?r1=1.39&r2=1.40&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Merk.php?r1=1.68&r2=1.69&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Sellers/sql.php?r1=1.11&r2=1.12&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Stock/sql.php?r1=1.33&r2=1.34&ty=u
  http://cvs.horde.org/diff.php/merk/lib/api.php?r1=1.44&r2=1.45&ty=u
  http://cvs.horde.org/diff.php/merk/options/delete_option.php?r1=1.32&r2=1.33&ty=u
  http://cvs.horde.org/diff.php/merk/options/delete_value.php?r1=1.31&r2=1.32&ty=u
  http://cvs.horde.org/diff.php/merk/options/edit_name.php?r1=1.32&r2=1.33&ty=u
  http://cvs.horde.org/diff.php/merk/options/edit_value.php?r1=1.41&r2=1.42&ty=u
  http://cvs.horde.org/diff.php/merk/options/index.php?r1=1.32&r2=1.33&ty=u
  http://cvs.horde.org/diff.php/merk/options/list_values.php?r1=1.31&r2=1.32&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/update_stock_csv.php?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/update_stock_sql.php?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/merk/sellers.php?r1=1.10&r2=1.11&ty=u
  http://cvs.horde.org/diff.php/merk/sellers/delete.php?r1=1.10&r2=1.11&ty=u
  http://cvs.horde.org/diff.php/merk/sellers/edit.php?r1=1.10&r2=1.11&ty=u
  http://cvs.horde.org/diff.php/merk/sellers/index.php?r1=1.10&r2=1.11&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/delete.php?r1=1.30&r2=1.31&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/edit.php?r1=1.31&r2=1.32&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/index.php?r1=1.43&r2=1.44&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/item.php?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/quantity.php?r1=1.31&r2=1.32&ty=u

--
To unsubscribe, mail: [email protected]