[MERGE] forward port of branch 7.0 up to revid 9943 launchpad_translations_on_behalf_...

bzr revid: chs@openerp.com-20140401184913-5hi2h11lnmadbozr

diff --cc addons/account/wizard/account_validate_account_move.py
Simple merge

diff --cc addons/account_voucher/account_voucher.py
Simple merge

diff --cc addons/base_calendar/base_calendar.py
Simple merge

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

diff --cc addons/procurement/procurement.py
index 5e3f8b5,f1d9bd0..1e7076d
--- 1/addons/procurement/procurement.py
--- 2/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@@ -439,10 -441,12 +439,11 @@@ class procurement_order(osv.osv)
          if len(to_cancel):
              move_obj.action_cancel(cr, uid, to_cancel)
          if len(to_assign):
-             move_obj.write(cr, uid, to_assign, {'state': 'assigned'})
+             move_obj.write(cr, uid, to_assign, {'state': 'confirmed'})
+             move_obj.action_assign(cr, uid, to_assign)
          self.write(cr, uid, ids, {'state': 'cancel'})
 -        wf_service = netsvc.LocalService("workflow")
          for id in ids:
 -            wf_service.trg_trigger(uid, 'procurement.order', id, cr)
 +            workflow.trg_trigger(uid, 'procurement.order', id, cr)
          return True
  
      def action_check_finished(self, cr, uid, ids):

diff --cc addons/project/project.py
index d5f4f89,623a080..f2f6d7a
--- 1/addons/project/project.py
--- 2/addons/project/project.py
+++ b/addons/project/project.py
@@@ -280,19 -286,11 +280,21 @@@ class project(osv.osv)
                                           "with Tasks (or optionally Issues if the Issue Tracker module is installed)."),
          'alias_model': fields.selection(_alias_models, "Alias Model", select=True, required=True,
                                          help="The kind of document created when an email is received on this project's email alias"),
 -        'privacy_visibility': fields.selection(_visibility_selection, 'Privacy / Visibility', required=True),
 +        'privacy_visibility': fields.selection(_visibility_selection, 'Privacy / Visibility', required=True,
 +            help="Holds visibility of the tasks or issues that belong to the current project:\n"
 +                    "- Public: everybody sees everything; if portal is activated, portal users\n"
 +                    "   see all tasks or issues; if anonymous portal is activated, visitors\n"
 +                    "   see all tasks or issues\n"
 +                    "- Portal (only available if Portal is installed): employees see everything;\n"
 +                    "   if portal is activated, portal users see the tasks or issues followed by\n"
 +                    "   them or by someone of their company\n"
 +                    "- Employees Only: employees see all tasks or issues\n"
 +                    "- Followers Only: employees see only the followed tasks or issues; if portal\n"
 +                    "   is activated, portal users see the followed tasks or issues."),
          'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
-         'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int')
+         'doc_count': fields.function(
+             _get_attached_docs, string="Number of documents attached", type='integer'
+         )
       }
  
      def _get_type_common(self, cr, uid, context):