[MERGE]sync with trunk

bzr revid: sgo@tinyerp.com-20130722064546-5algtla91hpnaanb

diff --cc addons/account/account.py
index 35b95b8,33b52b6..3e101b8
--- 1/addons/account/account.py
--- 2/addons/account/account.py
+++ b/addons/account/account.py
@@@ -719,9 -719,10 +719,9 @@@ class account_journal(osv.osv)
          'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
          'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
          'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
-         'entry_posted': fields.boolean('Skip \'Draft\' State for Manual Entries', help='Check this box if you don\'t want new journal entries to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation. \nNote that journal entries that are automatically created by the system are always skipping that state.'),
+         'entry_posted': fields.boolean('Autopost Created Moves', help='Check this box to automatically post entries of this journal. Note that legally, some entries may be automatically posted when the source document is validated (Invoices), whatever the status of this field.'),
          'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
 -        'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
 -
 +        'allow_date':fields.boolean('Check Date in Period', help= 'If checked, the entry won\'t be created if the entry date is not included into the selected period'),
          'profit_account_id' : fields.many2one('account.account', 'Profit Account'),
          'loss_account_id' : fields.many2one('account.account', 'Loss Account'),
          'internal_account_id' : fields.many2one('account.account', 'Internal Transfers Account', select=1),

diff --cc addons/account_analytic_plans/account_analytic_plans_view.xml
Simple merge

diff --cc addons/project/project_data.xml
Simple merge