[MERGE] Fwd-port 8.0 up to 139d868

Author: odony

addons/account/account_invoice.py

@@ -98,7 +98,7 @@ def _get_journal_analytic(self, inv_type):
     def _compute_reconciled(self):
         self.reconciled = self.test_paid()
         if not self.reconciled and self.state == 'paid':
-            self.signal_open_test()
+            self.signal_workflow('open_test')
 
     @api.model
     def _get_reference_type(self):

addons/account/partner.py

@@ -104,7 +104,7 @@ def get_fiscal_position(self, cr, uid, company_id, partner_id, delivery_id=None,
 
         # partner manually set fiscal position always win
         if partner.property_account_position:
-            return part.property_account_position.id
+            return partner.property_account_position.id
 
         # if no delivery use invocing
         if delivery_id:

addons/hr_attendance/static/src/css/attendance.css

@@ -1,3 +1,3 @@
 .oe_systray #oe_attendance_sign_in_out_icon {
-    font-color: white;
+    color: white;
 }

addons/im_chat/static/src/css/im_chat.css

@@ -14,7 +14,6 @@
 /* button */
 .oe_systray #oe_topbar_imbutton_icon {
     color: white;
-    margin-right: 10px;
 }
 .oe_topbar_item.oe_topbar_imbutton .oe_e {
     position: relative;

addons/mrp/mrp.py

@@ -884,7 +884,7 @@ def action_produce(self, cr, uid, production_id, production_qty, production_mode
         production = self.browse(cr, uid, production_id, context=context)
         if not production.move_lines and production.state == 'ready':
             # trigger workflow if not products to consume (eg: services)
-            self.signal_button_produce(cr, uid, [production_id])
+            self.signal_workflow(cr, uid, [production_id], 'button_produce')
 
         produced_qty = self._get_produced_qty(cr, uid, production, context=context)
 
@@ -944,7 +944,7 @@ def action_produce(self, cr, uid, production_id, production_qty, production_mode
                         stock_mov_obj.action_done(cr, uid, [extra_move_id], context=context)
 
         self.message_post(cr, uid, production_id, body=_("%s produced") % self._description, context=context)
-        self.signal_button_produce_done(cr, uid, [production_id])
+        self.signal_workflow(cr, uid, [production_id], 'button_produce_done')
         return True
 
     def _costs_generate(self, cr, uid, production):

addons/mrp/procurement.py

@@ -114,7 +114,7 @@ def make_mo(self, cr, uid, ids, context=None):
                 procurement.refresh()
                 self.production_order_create_note(cr, uid, procurement, context=context)
                 production_obj.action_compute(cr, uid, [produce_id], properties=[x.id for x in procurement.property_ids])
-                production_obj.signal_button_confirm(cr, uid, [produce_id])
+                production_obj.signal_workflow(cr, uid, [produce_id], 'button_confirm')
             else:
                 res[procurement.id] = False
                 self.message_post(cr, uid, [procurement.id], body=_("No BoM exists for this product!"), context=context)

addons/mrp/stock.py

@@ -159,7 +159,7 @@ def action_consume(self, cr, uid, ids, product_qty, location_id=False, restrict_
                                                     'consumed_for': consumed_for}, context=context)
             self.action_done(cr, uid, res, context=context)
             production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
-            production_obj.signal_button_produce(cr, uid, production_ids)
+            production_obj.signal_workflow(cr, uid, production_ids, 'button_produce')
             for new_move in res:
                 if new_move != move.id:
                     #This move is not already there in move lines of production order
@@ -181,7 +181,7 @@ def action_scrap(self, cr, uid, ids, product_qty, location_id, restrict_lot_id=F
             #If we are not scrapping our whole move, tracking and lot references must not be removed
             production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
             for prod_id in production_ids:
-                production_obj.signal_button_produce(cr, uid, [prod_id])
+                production_obj.signal_workflow(cr, uid, [prod_id], 'button_produce')
             for new_move in new_moves:
                 production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
                 res.append(new_move)

addons/point_of_sale/point_of_sale.py

@@ -497,7 +497,7 @@ def _confirm_orders(self, cr, uid, ids, context=None):
                         _('Error!'),
                         _("You cannot confirm all orders of this session, because they have not the 'paid' status"))
                 else:
-                    pos_order_obj.signal_done(cr, uid, [order.id])
+                    pos_order_obj.signal_workflow(cr, uid, [order.id], 'done')
 
         return True
 
@@ -581,14 +581,14 @@ def create_from_ui(self, cr, uid, orders, context=None):
             order_ids.append(order_id)
 
             try:
-                self.signal_paid(cr, uid, [order_id])
+                self.signal_workflow(cr, uid, [order_id], 'paid')
             except Exception as e:
                 _logger.error('Could not fully process the POS Order: %s', tools.ustr(e))
 
             if to_invoice:
                 self.action_invoice(cr, uid, [order_id], context)
                 order_obj = self.browse(cr, uid, order_id, context)
-                self.pool['account.invoice'].signal_invoice_open(cr, uid, [order_obj.invoice_id.id])
+                self.pool['account.invoice'].signal_workflow(cr, uid, [order_obj.invoice_id.id], 'invoice_open')
 
         return order_ids
 
@@ -933,8 +933,8 @@ def action_invoice(self, cr, uid, ids, context=None):
                 inv_line['invoice_line_tax_id'] = [(6, 0, [x.id for x in line.product_id.taxes_id] )]
                 inv_line_ref.create(cr, uid, inv_line, context=context)
             inv_ref.button_reset_taxes(cr, uid, [inv_id], context=context)
-            self.signal_invoice(cr, uid, [order.id])
-            inv_ref.signal_validate(cr, uid, [inv_id])
+            self.signal_workflow(cr, uid, [order.id], 'invoice')
+            inv_ref.signal_workflow(cr, uid, [inv_id], 'validate')
 
         if not inv_ids: return {}
 

addons/purchase/purchase.py

@@ -328,7 +328,7 @@ def unlink(self, cr, uid, ids, context=None):
                 raise osv.except_osv(_('Invalid Action!'), _('In order to delete a purchase order, you must cancel it first.'))
 
         # automatically sending subflow.delete upon deletion
-        self.signal_purchase_cancel(cr, uid, unlink_ids)
+        self.signal_workflow(cr, uid, unlink_ids, 'purchase_cancel')
 
         return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)
 
@@ -519,7 +519,7 @@ def print_quotation(self, cr, uid, ids, context=None):
         This function prints the request for quotation and mark it as sent, so that we can see more easily the next step of the workflow
         '''
         assert len(ids) == 1, 'This option should only be used for a single id at a time'
-        self.signal_send_rfq(cr, uid, ids)
+        self.signal_workflow(cr, uid, ids, 'send_rfq')
         return self.pool['report'].get_action(cr, uid, ids, 'purchase.report_purchasequotation', context=context)
 
     def wkf_confirm_order(self, cr, uid, ids, context=None):
@@ -680,19 +680,19 @@ def action_cancel(self, cr, uid, ids, context=None):
                         _('Unable to cancel the purchase order %s.') % (purchase.name),
                         _('First cancel all receptions related to this purchase order.'))
             self.pool.get('stock.picking') \
-                .signal_button_cancel(cr, uid, map(attrgetter('id'), purchase.picking_ids))
+                .signal_workflow(cr, uid, map(attrgetter('id'), purchase.picking_ids), 'button_cancel')
             for inv in purchase.invoice_ids:
                 if inv and inv.state not in ('cancel', 'draft'):
                     raise osv.except_osv(
                         _('Unable to cancel this purchase order.'),
                         _('You must first cancel all invoices related to this purchase order.'))
             self.pool.get('account.invoice') \
-                .signal_invoice_cancel(cr, uid, map(attrgetter('id'), purchase.invoice_ids))
+                .signal_workflow(cr, uid, map(attrgetter('id'), purchase.invoice_ids), 'invoice_cancel')
             self.pool['purchase.order.line'].write(cr, uid, [l.id for l in  purchase.order_line],
                     {'state': 'cancel'})
         self.write(cr, uid, ids, {'state': 'cancel'})
         self.set_order_line_status(cr, uid, ids, 'cancel', context=context)
-        self.signal_purchase_cancel(cr, uid, ids)
+        self.signal_workflow(cr, uid, ids, 'purchase_cancel')
         return True
 
     def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, group_id, context=None):
@@ -933,7 +933,7 @@ def make_key(br, fields):
             # make triggers pointing to the old orders point to the new order
             for old_id in old_ids:
                 self.redirect_workflow(cr, uid, [(old_id, neworder_id)])
-                self.signal_purchase_cancel(cr, uid, [old_id])
+                self.signal_workflow(cr, uid, [old_id], 'purchase_cancel')
 
         return orders_info
 
@@ -1370,7 +1370,7 @@ def _postprocess_sent_message(self, cr, uid, mail, context=None, mail_sent=True)
         if mail_sent and mail.model == 'purchase.order':
             obj = self.pool.get('purchase.order').browse(cr, uid, mail.res_id, context=context)
             if obj.state == 'draft':
-                self.pool.get('purchase.order').signal_send_rfq(cr, uid, [mail.res_id])
+                self.pool.get('purchase.order').signal_workflow(cr, uid, [mail.res_id], 'send_rfq')
         return super(mail_mail, self)._postprocess_sent_message(cr, uid, mail=mail, context=context, mail_sent=mail_sent)
 
 
@@ -1423,7 +1423,7 @@ def send_mail(self, cr, uid, ids, context=None):
         context = context or {}
         if context.get('default_model') == 'purchase.order' and context.get('default_res_id'):
             context = dict(context, mail_post_autofollow=True)
-            self.pool.get('purchase.order').signal_send_rfq(cr, uid, [context['default_res_id']])
+            self.pool.get('purchase.order').signal_workflow(cr, uid, [context['default_res_id']], 'send_rfq')
         return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
 
 

addons/purchase_requisition/purchase_requisition.py

@@ -245,7 +245,7 @@ def generate_po(self, cr, uid, ids, context=None):
             for quotation in tender.purchase_ids:
                 if (self.check_valid_quotation(cr, uid, quotation, context=context)):
                     #use workflow to set PO state to confirm
-                    po.signal_purchase_confirm(cr, uid, [quotation.id])
+                    po.signal_workflow(cr, uid, [quotation.id], 'purchase_confirm')
 
             #get other confirmed lines per supplier
             for po_line in tender.po_line_ids:
@@ -268,21 +268,21 @@ def generate_po(self, cr, uid, ids, context=None):
                     vals = self._prepare_po_line_from_tender(cr, uid, tender, line, new_po, context=context)
                     poline.copy(cr, uid, line.id, default=vals, context=context)
                 #use workflow to set new PO state to confirm
-                po.signal_purchase_confirm(cr, uid, [new_po])
+                po.signal_workflow(cr, uid, [new_po], 'purchase_confirm')
 
             #cancel other orders
             self.cancel_unconfirmed_quotations(cr, uid, tender, context=context)
 
             #set tender to state done
-            self.signal_done(cr, uid, [tender.id])
+            self.signal_workflow(cr, uid, [tender.id], 'done')
         return True
 
     def cancel_unconfirmed_quotations(self, cr, uid, tender, context=None):
         #cancel other orders
         po = self.pool.get('purchase.order')
         for quotation in tender.purchase_ids:
             if quotation.state in ['draft', 'sent', 'bid']:
-                self.pool.get('purchase.order').signal_purchase_cancel(cr, uid, [quotation.id])
+                self.pool.get('purchase.order').signal_workflow(cr, uid, [quotation.id], 'purchase_cancel')
                 po.message_post(cr, uid, [quotation.id], body=_('Cancelled by the call for bids associated to this request for quotation.'), context=context)
         return True