[cvs] commit: merk/carts index.php merk/checkout index.php process.php merk/lib api.php merk/lib/Driver sql.php merk/lib/Invoices minerva.php merk/scripts/sql merk.mssql.sql merk.mysql.sql merk.sql merk/scripts/upgrades 2006-12-02_category.php ...

[Duck]

duck        2006-12-02 10:27:00 PST

  Modified files:
    carts                index.php 
    checkout             index.php process.php 
    lib                  api.php 
    lib/Driver           sql.php 
    lib/Invoices         minerva.php 
    scripts/sql          merk.mssql.sql merk.mysql.sql merk.sql 
    stocks               index.php 
    templates/carts      index.html 
    templates/checkout   index.html 
    templates/invoices   view.html view_print.html 
  Added files:
    scripts/upgrades     2006-12-02_category.php 
                         2006-12-02_category.sql 
  Log:
  Move item category in parameter in the main item table.
  Clean up the mess with item category naming (c, cid and item_category, becomes cid).
  
  Revision  Changes    Path
  1.32      +2 -2      merk/carts/index.php
  1.62      +2 -2      merk/checkout/index.php
  1.13      +2 -2      merk/checkout/process.php
  1.89      +24 -50    merk/lib/Driver/sql.php
  1.17      +2 -2      merk/lib/Invoices/minerva.php
  1.28      +2 -2      merk/lib/api.php
  1.8       +4 -1      merk/scripts/sql/merk.mssql.sql
  1.8       +4 -2      merk/scripts/sql/merk.mysql.sql
  1.13      +4 -1      merk/scripts/sql/merk.sql
  1.1       +54 -0     merk/scripts/upgrades/2006-12-02_category.php (new)
  1.1       +2 -0      merk/scripts/upgrades/2006-12-02_category.sql (new)
  1.28      +2 -2      merk/stocks/index.php
  1.12      +1 -1      merk/templates/carts/index.html
  1.14      +1 -1      merk/templates/checkout/index.html
  1.10      +1 -1      merk/templates/invoices/view.html
  1.8       +1 -1      merk/templates/invoices/view_print.html

  Chora Links:
  http://cvs.horde.org/diff.php/merk/carts/index.php?r1=1.31&r2=1.32&ty=u
  http://cvs.horde.org/diff.php/merk/checkout/index.php?r1=1.61&r2=1.62&ty=u
  http://cvs.horde.org/diff.php/merk/checkout/process.php?r1=1.12&r2=1.13&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Driver/sql.php?r1=1.88&r2=1.89&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Invoices/minerva.php?r1=1.16&r2=1.17&ty=u
  http://cvs.horde.org/diff.php/merk/lib/api.php?r1=1.27&r2=1.28&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/sql/merk.mssql.sql?r1=1.7&r2=1.8&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/sql/merk.mysql.sql?r1=1.7&r2=1.8&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/sql/merk.sql?r1=1.12&r2=1.13&ty=u
  http://cvs.horde.org/co.php/merk/scripts/upgrades/2006-12-02_category.php?r=1.1
  http://cvs.horde.org/co.php/merk/scripts/upgrades/2006-12-02_category.sql?r=1.1
  http://cvs.horde.org/diff.php/merk/stocks/index.php?r1=1.27&r2=1.28&ty=u
  http://cvs.horde.org/diff.php/merk/templates/carts/index.html?r1=1.11&r2=1.12&ty=u
  http://cvs.horde.org/diff.php/merk/templates/checkout/index.html?r1=1.13&r2=1.14&ty=u
  http://cvs.horde.org/diff.php/merk/templates/invoices/view.html?r1=1.9&r2=1.10&ty=u
  http://cvs.horde.org/diff.php/merk/templates/invoices/view_print.html?r1=1.7&r2=1.8&ty=u