[cvs] commit: merk browse.php merk/carts edit.php index.php merk/categories edit.php merk/checkout index.php merk/invoices view.php view_print.php merk/items index.php merk/lib Categories.php Driver.php merk/lib/Block cart_content.php item.php ...

[Chuck Hagenbuch]

chuck       2005-04-24 12:18:03 PDT

  Modified files:
    .                    browse.php 
    carts                edit.php index.php 
    categories           edit.php 
    checkout             index.php 
    invoices             view.php view_print.php 
    items                index.php 
    lib                  Categories.php Driver.php 
    lib/Block            cart_content.php item.php items.php 
    lib/Driver           sql.php 
    options              edit_name.php edit_value.php 
                         list_values.php 
    scripts/sql          merk.sql 
    stocks               index.php 
    templates/checkout   index.html 
    templates/invoices   view.html view_print.html 
  Log:
  "- clean up nested spaces in the code
  - checkout and invoice templates clean up
  - stores the tax total value in the invoice table
  - correctly display tax in checkout, invoice and invoice print view
  - fix state/country mix in the invoice print view"
  
  Submitted by: duck at obala.net
  
  Revision  Changes    Path
  1.14      +2 -2      merk/browse.php
  1.25      +2 -2      merk/carts/edit.php
  1.17      +5 -5      merk/carts/index.php
  1.16      +2 -2      merk/categories/edit.php
  1.20      +5 -3      merk/checkout/index.php
  1.13      +3 -2      merk/invoices/view.php
  1.9       +36 -31    merk/invoices/view_print.php
  1.19      +2 -2      merk/items/index.php
  1.6       +2 -2      merk/lib/Block/cart_content.php
  1.10      +2 -2      merk/lib/Block/item.php
  1.11      +4 -4      merk/lib/Block/items.php
  1.32      +2 -2      merk/lib/Categories.php
  1.15      +13 -3     merk/lib/Driver.php
  1.38      +29 -27    merk/lib/Driver/sql.php
  1.14      +4 -4      merk/options/edit_name.php
  1.20      +12 -12    merk/options/edit_value.php
  1.15      +4 -4      merk/options/list_values.php
  1.4       +2 -1      merk/scripts/sql/merk.sql
  1.14      +2 -2      merk/stocks/index.php
  1.6       +1 -1      merk/templates/checkout/index.html
  1.4       +5 -4      merk/templates/invoices/view.html
  1.2       +22 -17    merk/templates/invoices/view_print.html

  Chora Links:
  http://cvs.horde.org/diff.php/merk/browse.php?r1=1.13&r2=1.14&ty=u
  http://cvs.horde.org/diff.php/merk/carts/edit.php?r1=1.24&r2=1.25&ty=u
  http://cvs.horde.org/diff.php/merk/carts/index.php?r1=1.16&r2=1.17&ty=u
  http://cvs.horde.org/diff.php/merk/categories/edit.php?r1=1.15&r2=1.16&ty=u
  http://cvs.horde.org/diff.php/merk/checkout/index.php?r1=1.19&r2=1.20&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/view.php?r1=1.12&r2=1.13&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/view_print.php?r1=1.8&r2=1.9&ty=u
  http://cvs.horde.org/diff.php/merk/items/index.php?r1=1.18&r2=1.19&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Block/cart_content.php?r1=1.5&r2=1.6&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Block/item.php?r1=1.9&r2=1.10&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Block/items.php?r1=1.10&r2=1.11&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Categories.php?r1=1.31&r2=1.32&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Driver.php?r1=1.14&r2=1.15&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Driver/sql.php?r1=1.37&r2=1.38&ty=u
  http://cvs.horde.org/diff.php/merk/options/edit_name.php?r1=1.13&r2=1.14&ty=u
  http://cvs.horde.org/diff.php/merk/options/edit_value.php?r1=1.19&r2=1.20&ty=u
  http://cvs.horde.org/diff.php/merk/options/list_values.php?r1=1.14&r2=1.15&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/sql/merk.sql?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/index.php?r1=1.13&r2=1.14&ty=u
  http://cvs.horde.org/diff.php/merk/templates/checkout/index.html?r1=1.5&r2=1.6&ty=u
  http://cvs.horde.org/diff.php/merk/templates/invoices/view.html?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/templates/invoices/view_print.html?r1=1.1&r2=1.2&ty=u