[TYPO]changes in typo
bzr revid: vja@tinyerp.com-20130430072547-7gyl7nivdc8717ua
This commit is contained in:
parent
d9bb82230b
commit
1b08798b52
|
@ -2307,7 +2307,7 @@ class account_model(osv.osv):
|
||||||
try:
|
try:
|
||||||
entry['name'] = model.name%{'year': move_date.strftime('%Y'), 'month': move_date.strftime('%m'), 'date': move_date.strftime('%Y-%m')}
|
entry['name'] = model.name%{'year': move_date.strftime('%Y'), 'month': move_date.strftime('%m'), 'date': move_date.strftime('%Y-%m')}
|
||||||
except:
|
except:
|
||||||
raise osv.except_osv(_('Wrong model!'), _('You have a wrong expression "%(...)s" in your model !'))
|
raise osv.except_osv(_('Wrong Model!'), _('You have a wrong expression "%(...)s" in your model!'))
|
||||||
move_id = account_move_obj.create(cr, uid, {
|
move_id = account_move_obj.create(cr, uid, {
|
||||||
'ref': entry['name'],
|
'ref': entry['name'],
|
||||||
'period_id': period_id,
|
'period_id': period_id,
|
||||||
|
|
|
@ -882,7 +882,7 @@ class account_invoice(osv.osv):
|
||||||
group_check_total = self.pool.get('res.groups').browse(cr, uid, group_check_total_id, context=context)
|
group_check_total = self.pool.get('res.groups').browse(cr, uid, group_check_total_id, context=context)
|
||||||
if group_check_total and uid in [x.id for x in group_check_total.users]:
|
if group_check_total and uid in [x.id for x in group_check_total.users]:
|
||||||
if (inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0)):
|
if (inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0)):
|
||||||
raise osv.except_osv(_('Bad total!'), _('Please verify the price of the invoice!\nThe encoded total does not match the computed total.'))
|
raise osv.except_osv(_('Bad Total!'), _('Please verify the price of the invoice!\nThe encoded total does not match the computed total.'))
|
||||||
|
|
||||||
if inv.payment_term:
|
if inv.payment_term:
|
||||||
total_fixed = total_percent = 0
|
total_fixed = total_percent = 0
|
||||||
|
|
|
@ -1181,7 +1181,7 @@ class account_move_line(osv.osv):
|
||||||
move_id = move_obj.create(cr, uid, v, context)
|
move_id = move_obj.create(cr, uid, v, context)
|
||||||
vals['move_id'] = move_id
|
vals['move_id'] = move_id
|
||||||
else:
|
else:
|
||||||
raise osv.except_osv(_('No piece number!'), _('Cannot create an automatic sequence for this piece.\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
|
raise osv.except_osv(_('No Piece Number!'), _('Cannot create an automatic sequence for this piece.\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
|
||||||
ok = not (journal.type_control_ids or journal.account_control_ids)
|
ok = not (journal.type_control_ids or journal.account_control_ids)
|
||||||
if ('account_id' in vals):
|
if ('account_id' in vals):
|
||||||
account = account_obj.browse(cr, uid, vals['account_id'], context=context)
|
account = account_obj.browse(cr, uid, vals['account_id'], context=context)
|
||||||
|
|
|
@ -111,7 +111,7 @@ class account_installer(osv.osv_memory):
|
||||||
def check_unconfigured_cmp(self, cr, uid, context=None):
|
def check_unconfigured_cmp(self, cr, uid, context=None):
|
||||||
""" check if there are still unconfigured companies """
|
""" check if there are still unconfigured companies """
|
||||||
if not self.get_unconfigured_cmp(cr, uid, context=context):
|
if not self.get_unconfigured_cmp(cr, uid, context=context):
|
||||||
raise osv.except_osv(_('No unconfigured company!'), _("There is currently no company without chart of account. The wizard will therefore not be executed."))
|
raise osv.except_osv(_('No Unconfigured Company!'), _("There is currently no company without chart of account. The wizard will therefore not be executed."))
|
||||||
|
|
||||||
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
|
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
|
||||||
if context is None: context = {}
|
if context is None: context = {}
|
||||||
|
|
|
@ -1535,7 +1535,7 @@ class account_bank_statement(osv.osv):
|
||||||
for bk_st in self.browse(cr, uid, ids, context=context):
|
for bk_st in self.browse(cr, uid, ids, context=context):
|
||||||
if vals.get('journal_id') and bk_st.line_ids:
|
if vals.get('journal_id') and bk_st.line_ids:
|
||||||
if any([x.voucher_id and True or False for x in bk_st.line_ids]):
|
if any([x.voucher_id and True or False for x in bk_st.line_ids]):
|
||||||
raise osv.except_osv(_('Unable To Change Journal!'), _('You can not change the journal as you already reconciled some statement lines!'))
|
raise osv.except_osv(_('Unable to Change Journal!'), _('You can not change the journal as you already reconciled some statement lines!'))
|
||||||
return super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
|
return super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ class sale_order(osv.osv):
|
||||||
raise osv.except_osv(_('No Grid Available!'), _('No grid matching for this carrier!'))
|
raise osv.except_osv(_('No Grid Available!'), _('No grid matching for this carrier!'))
|
||||||
|
|
||||||
if not order.state in ('draft'):
|
if not order.state in ('draft'):
|
||||||
raise osv.except_osv(_('Order Not In Draft State!'), _('The order state have to be draft to add delivery lines.'))
|
raise osv.except_osv(_('Order not in Draft State!'), _('The order state have to be draft to add delivery lines.'))
|
||||||
|
|
||||||
grid = grid_obj.browse(cr, uid, grid_id, context=context)
|
grid = grid_obj.browse(cr, uid, grid_id, context=context)
|
||||||
|
|
||||||
|
|
|
@ -87,7 +87,7 @@ class crm_make_sale(osv.osv_memory):
|
||||||
['default', 'invoice', 'delivery', 'contact'])
|
['default', 'invoice', 'delivery', 'contact'])
|
||||||
pricelist = partner.property_product_pricelist.id
|
pricelist = partner.property_product_pricelist.id
|
||||||
if False in partner_addr.values():
|
if False in partner_addr.values():
|
||||||
raise osv.except_osv(_('Insufficient Data!'), _('No addresse(es) defined for this customer.'))
|
raise osv.except_osv(_('Insufficient Data!'), _('No address(es) defined for this customer.'))
|
||||||
|
|
||||||
vals = {
|
vals = {
|
||||||
'origin': _('Opportunity: %s') % str(case.id),
|
'origin': _('Opportunity: %s') % str(case.id),
|
||||||
|
|
Loading…
Reference in New Issue