[cvs] commit: merk/checkout index.php merk/deliveries edit.php merk/lib Driver.php Invoices.php merk/lib/Deliveries sql.php merk/po merk.pot merk/scripts/sql merk.mssql.sql merk.mysql.sql merk.sql

[Duck]

duck        2006-10-02 23:59:22 PDT

  Modified files:
    checkout             index.php 
    deliveries           edit.php 
    lib                  Driver.php Invoices.php 
    lib/Deliveries       sql.php 
    po                   merk.pot 
    scripts/sql          merk.mssql.sql merk.mysql.sql merk.sql 
  Log:
  Add delivery cost to the generated invoice by adding it as a additional item.
  
  Revision  Changes    Path
  1.53      +16 -1     merk/checkout/index.php
  1.22      +8 -1      merk/deliveries/edit.php
  1.9       +10 -7     merk/lib/Deliveries/sql.php
  1.31      +2 -6      merk/lib/Driver.php
  1.14      +2 -3      merk/lib/Invoices.php
  1.48      +55 -50    merk/po/merk.pot
  1.6       +3 -1      merk/scripts/sql/merk.mssql.sql
  1.5       +2 -1      merk/scripts/sql/merk.mysql.sql
  1.11      +3 -1      merk/scripts/sql/merk.sql

  Chora Links:
  http://cvs.horde.org/diff.php/merk/checkout/index.php?r1=1.52&r2=1.53&ty=u
  http://cvs.horde.org/diff.php/merk/deliveries/edit.php?r1=1.21&r2=1.22&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Deliveries/sql.php?r1=1.8&r2=1.9&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Driver.php?r1=1.30&r2=1.31&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Invoices.php?r1=1.13&r2=1.14&ty=u
  http://cvs.horde.org/diff.php/merk/po/merk.pot?r1=1.47&r2=1.48&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/sql/merk.mssql.sql?r1=1.5&r2=1.6&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/sql/merk.mysql.sql?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/sql/merk.sql?r1=1.10&r2=1.11&ty=u