[dev] Merk patch

[Duck]

- make item delivery non-required. Make it Boolean since we have only two 
options (default and non-default). This is not used anywhere.
- added item_model field: stores product model IDs. Allows to import/sync data 
from client based items databases/categories (bridge from merk to companies 
internal ids)
- Categories: suppress errors if the current language used is not present in 
categories data (log error and return empty array)
- deleted not used /templates/deliveries/edit.html
- clean up and simplify templates: use more divs, styles, use stripe.js for 
lists

Duck
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merk.diff.gz
Type: application/x-gzip
Size: 6024 bytes
Desc: not available
Url : http://lists.horde.org/archives/dev/attachments/20060415/83ad3546/merk.diff.bin