Merge lp:~openerp-dev/openobject-addons/stable-pos_fix-uco into lp:openobject-addons/6.0

[Ujjvala Collins]

[FIX] point_of_sale:
-----------------------------
* Fixed problem of accounting entries for pos order when invoice is not created.
* Applied changes from xrg-branch related to workflow. (Thanks to P. Christeas <email address hidden> !)

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Thanks Ujjawala for fix.

review: Approve

Unmerged revisions

4795. By Ujjvala Collins on 2011-09-02

[ADD] point_of_sale: Added date and partner_id for account moves.

4794. By Ujjvala Collins on 2011-09-02

[FIX,IMP] point_of_sale: Fixed error if account is not given on taxes. Improved string for move lines.

4793. By Ujjvala Collins on 2011-09-02

[IMP] point_of_sale: Small improvement.

4792. By xrg on 2011-09-02

[FIX] point_of_sale: Fix the problem of accounting entries when invoice is not created.

=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py	2011-06-02 05:14:55 +0000
+++ point_of_sale/point_of_sale.py	2011-09-02 11:37:26 +0000
@@ -699,11 +699,14 @@
             account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context).id
 
             order_account = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
+            partner_id = order.partner_id and order.partner_id.id or False
 
             # Create an entry for the sale
             move_id = account_move_obj.create(cr, uid, {
                 'journal_id': order.sale_journal.id,
                 'period_id': period,
+                'ref': order.name,
+                'date': order.date_order,
                 }, context=context)
 
             # Create an move for each order line
@@ -722,6 +725,8 @@
                     group_key = (tax['tax_code_id'],
                                 tax['base_code_id'],
                                 tax['account_collected_id'])
+                    if not tax['account_collected_id']:
+                        raise osv.except_osv(_('No Account !'),_("You have to configure Invoice Tax Account on the '%s' tax!") % (tax['name']))
 
                     if group_key in group_tax:
                         group_tax[group_key] += round(tax['amount'], 2)
@@ -762,7 +767,7 @@
 
                 # Create a move for the line
                 account_move_line_obj.create(cr, uid, {
-                    'name': "aa"+order.name,
+                    'name': _("From sales of : %s") % order.name,
                     'date': order.date_order[:10],
                     'ref': order.contract_number or order.name,
                     'quantity': line.qty,
@@ -776,7 +781,7 @@
                     'period_id': period,
                     'tax_code_id': tax_code_id,
                     'tax_amount': tax_amount,
-                    'partner_id': order.partner_id and order.partner_id.id or False
+                    'partner_id': partner_id
                 }, context=context)
 
                 # For each remaining tax with a code, whe create a move line
@@ -791,7 +796,7 @@
                         continue
 
                     account_move_line_obj.create(cr, uid, {
-                        'name': "bb" + order.name,
+                        'name': _('Tax for : %s') % order.name,
                         'date': order.date_order[:10],
                         'ref': order.contract_number or order.name,
                         'product_id':line.product_id.id,
@@ -805,6 +810,7 @@
                         'period_id': period,
                         'tax_code_id': tax_code_id,
                         'tax_amount': tax_amount,
+                        'partner_id': partner_id
                     }, context=context)
 
 
@@ -812,7 +818,7 @@
             (tax_code_pos, base_code_pos, account_pos)= (0, 1, 2)
             for key, amount in group_tax.items():
                 account_move_line_obj.create(cr, uid, {
-                    'name': "cc" + order.name,
+                    'name': _("Tax for : %s") % order.name,
                     'date': order.date_order[:10],
                     'ref': order.contract_number or order.name,
                     'move_id': move_id,
@@ -826,11 +832,12 @@
                     'period_id': period,
                     'tax_code_id': key[tax_code_pos],
                     'tax_amount': amount,
+                    'partner_id': partner_id
                 }, context=context)
 
             # counterpart
             to_reconcile.append(account_move_line_obj.create(cr, uid, {
-                'name': "dd" + order.name,
+                'name': _("Sale of %s") % order.name,
                 'date': order.date_order[:10],
                 'ref': order.contract_number or order.name,
                 'move_id': move_id,
@@ -842,7 +849,7 @@
                     or 0.0,
                 'journal_id': order.sale_journal.id,
                 'period_id': period,
-                'partner_id': order.partner_id and order.partner_id.id or False
+                'partner_id': partner_id
             }, context=context))
 
 
@@ -854,7 +861,7 @@
                     ' "%s" (id:%d)') % (order.sale_journal.name, order.sale_journal.id, ))
             for payment in order.statement_ids:
                 # Create one entry for the payment
-                if payment.is_acc:
+                if payment.is_acc or move_id:
                     continue
                 account_move_obj.create(cr, uid, {
                     'journal_id': payment.statement_id.journal_id.id,
@@ -875,7 +882,7 @@
                                                         'statement_id': False,
                                                         'account_id': order_account
                                                      })
-
+            account_move_obj.post(cr, uid, [move_id], context=context)
             self.write(cr, uid, order.id, {'state':'done'}, context=context)
         return True
 

=== modified file 'point_of_sale/point_of_sale_workflow.xml'
--- point_of_sale/point_of_sale_workflow.xml	2011-01-14 00:11:01 +0000
+++ point_of_sale/point_of_sale_workflow.xml	2011-09-02 11:37:26 +0000
@@ -22,22 +22,36 @@
       <field name="kind">function</field>
     </record>
 
-    <record model="workflow.activity" id="act_done">
+    <record model="workflow.activity" id="act_picked">
       <field name="wkf_id" ref="wkf_pos"/>
-      <field name="name">done</field>
-      <field name="flow_stop">True</field>
-      <field name="action">action_done()</field>
+      <field name="name">picked</field>
+      <field name="action">create_picking()</field>
       <field name="kind">function</field>
     </record>
 
     <record model="workflow.activity" id="act_invoiced">
       <field name="wkf_id" ref="wkf_pos"/>
       <field name="name">invoiced</field>
-      <field name="flow_stop">True</field>
       <field name="action">action_invoice()</field>
       <field name="kind">function</field>
     </record>
 
+    <record model="workflow.activity" id="act_ticketed">
+      <field name="wkf_id" ref="wkf_pos"/>
+      <field name="name">ticketed</field>
+      <field name="action">create_account_move()</field>
+      <field name="kind">function</field>
+    </record>
+
+    <record model="workflow.activity" id="act_done">
+      <field name="wkf_id" ref="wkf_pos"/>
+      <field name="name">done</field>
+      <field name="flow_stop">True</field>
+      <field name="action"></field>
+      <!--<field name="action">action_done()</field>-->
+      <field name="kind">dummy</field>
+    </record>
+
     <record model="workflow.activity" id="act_cancel">
       <field name="wkf_id" ref="wkf_pos"/>
       <field name="name">cancel</field>
@@ -56,24 +70,44 @@
       <field name="signal">paid</field>
     </record>
 
-    <record model="workflow.transition" id="trans_paid_done">
-        <field name="act_from" ref="act_paid"/>
-        <field name="act_to" ref="act_done"/>
-        <field name="signal">done</field>
-    </record>
-
-    <record model="workflow.transition" id="trans_paid_invoice">
-      <field name="act_from" ref="act_paid"/>
+    <record model="workflow.transition" id="trans_paid_cancel">
+      <field name="act_from" ref="act_paid"/>
+      <field name="act_to" ref="act_cancel"/>
+      <field name="signal">cancel</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_paid_picked">
+      <field name="act_from" ref="act_paid"/>
+      <field name="act_to" ref="act_picked"/>
+    </record>
+
+    <record model="workflow.transition" id="trans_picked_cancel">
+      <field name="act_from" ref="act_picked"/>
+      <field name="act_to" ref="act_cancel"/>
+      <field name="signal">cancel</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_picked_ticketed">
+        <field name="act_from" ref="act_picked"/>
+        <field name="act_to" ref="act_ticketed"/>
+        <field name="condition">not invoice_wanted</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_picked_invoice">
+      <field name="act_from" ref="act_picked"/>
       <field name="act_to" ref="act_invoiced"/>
-      <field name="signal">invoice</field>
-    </record>
-
-    <record model="workflow.transition" id="trans_paid_cancel">
-      <field name="act_from" ref="act_paid"/>
-      <field name="act_to" ref="act_cancel"/>
-      <field name="signal">cancel</field>
-    </record>
-
+      <field name="condition">invoice_wanted</field>
+    </record>
+
+    <record model="workflow.transition" id="trans_ticketed_done">
+      <field name="act_from" ref="act_ticketed"/>
+      <field name="act_to" ref="act_done"/>
+    </record>
+
+    <record model="workflow.transition" id="trans_invoiced_done">
+      <field name="act_from" ref="act_invoiced"/>
+      <field name="act_to" ref="act_done"/>
+    </record>
 
   </data>
 </openerp>