bugfixd in pos,invoice_layout,improved reports and sxw files(ref:vra)

bzr revid: hda@hda-20090604065839-jphvl53youhrspap

diff --cc addons/point_of_sale/report/pos_invoice.py
Simple merge

diff --cc addons/point_of_sale/wizard/wizard_pos_payment.py
index 285433d,05fcfb1..283e83c
--- 1/addons/point_of_sale/wizard/wizard_pos_payment.py
--- 2/addons/point_of_sale/wizard/wizard_pos_payment.py
+++ b/addons/point_of_sale/wizard/wizard_pos_payment.py
@@@ -149,22 -150,16 +150,26 @@@ def _check(self, cr, uid, data, context
      return action
  
  
 +def _test_no_line(self, cr, uid, data, context):
 +    pool = pooler.get_pool(cr.dbname)
 +    order = pool.get('pos.order').browse(cr, uid, data['id'], context)
 +
 +    if not order.lines:
 +        raise wizard.except_wizard(_('Error'), _('No order lines defined for this sale.'))
 +
 +    return {}
 +
 +
  def create_invoice(self, cr, uid, data, context):
-     wf_service = netsvc.LocalService("workflow")
-     for i in data['ids']:
-         wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
- 
+     pool = pooler.get_pool(cr.dbname)
+     order_obj = pool.get('pos.order')
+     order = order_obj.browse(cr, uid, data['id'], context)
+     if not order.invoice_id:
+         inv_id = order_obj.action_invoice(cr,uid,[data['id']])
+         #raise wizard.except_wizard(_('Error !'), _('Please create an invoice for this sale.'))
+ #    wf_service = netsvc.LocalService("workflow")
+ #    for i in data['ids']:
+ #        wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
      return {}