[cvs] commit: merk/carts edit.php index.php merk/lib Merk.php merk/lib/Driver sql.php merk/lib/Stock null.php merk/locale/sl_SI/LC_MESSAGES merk.mo merk/po merk.pot sl_SI.po

[Duck]

duck        2006-09-27 08:49:31 PDT

  Modified files:
    carts                edit.php index.php 
    lib                  Merk.php 
    lib/Driver           sql.php 
    lib/Stock            null.php 
    locale/sl_SI/LC_MESSAGES merk.mo 
    po                   merk.pot sl_SI.po 
  Log:
  The null stock driver don't support item options. So when adding an article into cart add its item_id not stock_id.
  
  Revision  Changes    Path
  1.41      +4 -3      merk/carts/edit.php
  1.30      +2 -2      merk/carts/index.php
  1.78      +39 -15    merk/lib/Driver/sql.php
  1.35      +7 -4      merk/lib/Merk.php
  1.5       +5 -13     merk/lib/Stock/null.php
  1.19      +13 -13    merk/locale/sl_SI/LC_MESSAGES/merk.mo
  1.45      +26 -26    merk/po/merk.pot
  1.21      +28 -28    merk/po/sl_SI.po

  Chora Links:
  http://cvs.horde.org/diff.php/merk/carts/edit.php?r1=1.40&r2=1.41&ty=u
  http://cvs.horde.org/diff.php/merk/carts/index.php?r1=1.29&r2=1.30&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Driver/sql.php?r1=1.77&r2=1.78&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Merk.php?r1=1.34&r2=1.35&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Stock/null.php?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/locale/sl_SI/LC_MESSAGES/merk.mo?r1=1.18&r2=1.19&ty=u
  http://cvs.horde.org/diff.php/merk/po/merk.pot?r1=1.44&r2=1.45&ty=u
  http://cvs.horde.org/diff.php/merk/po/sl_SI.po?r1=1.20&r2=1.21&ty=u