[cvs] commit: merk test.php merk/config .cvsignore company.php.dist merk/lib Company.php Crud.php Invoices.php Merk.php Table.php merk/lib/Invoices sql.php merk/locale/sl_SI/LC_MESSAGES merk.mo merk/po merk.pot sl_SI.po merk/scripts/sql horde_company.sql ...
Duck
duck at obala.net
Wed May 16 15:23:39 UTC 2007
duck 2007-05-16 11:23:39 EDT
Modified files:
. test.php
config .cvsignore
lib Invoices.php Merk.php
lib/Invoices sql.php
locale/sl_SI/LC_MESSAGES merk.mo
po merk.pot sl_SI.po
templates/invoices view.html view_print.html
Added files:
config company.php.dist
lib Company.php Crud.php Table.php
scripts/sql horde_company.sql
taxes currencies.php taxes.php
Log:
Remove delivery option form invoice since now the delivery is only another item in invoice.
Add direct print link to invoice view page.
Add possibility to add taxes and currencies directly from Merk.
Marge company data code form Minerva and Gulliver.
Revision Changes Path
1.5 +1 -0 merk/config/.cvsignore
1.1 +112 -0 merk/config/company.php.dist (new)
1.1 +55 -0 merk/lib/Company.php (new)
1.1 +74 -0 merk/lib/Crud.php (new)
1.17 +2 -2 merk/lib/Invoices.php
1.19 +18 -11 merk/lib/Invoices/sql.php
1.51 +4 -1 merk/lib/Merk.php
1.1 +189 -0 merk/lib/Table.php (new)
1.43 +29 -25 merk/locale/sl_SI/LC_MESSAGES/merk.mo
1.79 +126 -40 merk/po/merk.pot
1.48 +130 -44 merk/po/sl_SI.po
1.1 +32 -0 merk/scripts/sql/horde_company.sql (new)
1.1 +46 -0 merk/taxes/currencies.php (new)
1.1 +46 -0 merk/taxes/taxes.php (new)
1.11 +56 -18 merk/templates/invoices/view.html
1.9 +82 -30 merk/templates/invoices/view_print.html
1.6 +8 -3 merk/test.php
Chora Links:
http://cvs.horde.org/diff.php/merk/config/.cvsignore?r1=1.4&r2=1.5&ty=u
http://cvs.horde.org/co.php/merk/config/company.php.dist?r=1.1
http://cvs.horde.org/co.php/merk/lib/Company.php?r=1.1
http://cvs.horde.org/co.php/merk/lib/Crud.php?r=1.1
http://cvs.horde.org/diff.php/merk/lib/Invoices.php?r1=1.16&r2=1.17&ty=u
http://cvs.horde.org/diff.php/merk/lib/Invoices/sql.php?r1=1.18&r2=1.19&ty=u
http://cvs.horde.org/diff.php/merk/lib/Merk.php?r1=1.50&r2=1.51&ty=u
http://cvs.horde.org/co.php/merk/lib/Table.php?r=1.1
http://cvs.horde.org/diff.php/merk/locale/sl_SI/LC_MESSAGES/merk.mo?r1=1.42&r2=1.43&ty=u
http://cvs.horde.org/diff.php/merk/po/merk.pot?r1=1.78&r2=1.79&ty=u
http://cvs.horde.org/diff.php/merk/po/sl_SI.po?r1=1.47&r2=1.48&ty=u
http://cvs.horde.org/co.php/merk/scripts/sql/horde_company.sql?r=1.1
http://cvs.horde.org/co.php/merk/taxes/currencies.php?r=1.1
http://cvs.horde.org/co.php/merk/taxes/taxes.php?r=1.1
http://cvs.horde.org/diff.php/merk/templates/invoices/view.html?r1=1.10&r2=1.11&ty=u
http://cvs.horde.org/diff.php/merk/templates/invoices/view_print.html?r1=1.8&r2=1.9&ty=u
http://cvs.horde.org/diff.php/merk/test.php?r1=1.5&r2=1.6&ty=u
More information about the cvs
mailing list