pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] Terminology fix

Browse Source
This commit is contained in:
Fabien Pinckaers
2015-10-02 19:09:49 -07:00
parent e7418cef22
commit 52484b0132
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/wizard/sale_make_invoice_advance.py
+11 -11
View File
@@ -24,15 +24,15 @@ class SaleAdvancePaymentInv(models.TransientModel):
return 'delivered'
advance_payment_method = fields.Selection([
('all', 'Invoiceable lines (deduct deposits)'),
('delivered', 'Invoiceable lines'),
('percentage', 'Deposit (percentage)'),
('fixed', 'Deposit (fixed amount)')
('all', 'Invoiceable lines (deduct down payments)'),
('percentage', 'Down payment (percentage)'),
('fixed', 'Down payment (fixed amount)')
], string='What do you want to invoice?', default=_get_advance_payment_method, required=True)
product_id = fields.Many2one('product.product', string='Deposit Product', domain=[('type', '=', 'service')],\
product_id = fields.Many2one('product.product', string='Down Payment Product', domain=[('type', '=', 'service')],\
default=lambda self: self.env['ir.values'].get_default('sale.config.settings', 'deposit_product_id_setting'))
count = fields.Integer(default=_count, string='# of Orders')
amount = fields.Float('Deposit Amount', digits=dp.get_precision('Account'), help="The amount to be invoiced in advance, taxes excluded.")
amount = fields.Float('Down Payment Amount', digits=dp.get_precision('Account'), help="The amount to be invoiced in advance, taxes excluded.")
deposit_account_id = fields.Many2one("account.account", string="Income Account", domain=[('deprecated', '=', False)],\
help="Account used for deposits")
deposit_taxes_id = fields.Many2many("account.tax", string="Customer Taxes", help="Taxes used for deposits")
@@ -61,13 +61,13 @@ class SaleAdvancePaymentInv(models.TransientModel):
(self.product_id.name,))
if self.amount <= 0.00:
raise UserError(_('The value of the deposit amount must be positive.'))
raise UserError(_('The value of the down payment amount must be positive.'))
if self.advance_payment_method == 'percentage':
amount = order.amount_untaxed * self.amount / 100
name = _("Deposit of %s%%") % (self.amount,)
name = _("Down payment of %s%%") % (self.amount,)
else:
amount = self.amount
name = _('Deposit')
name = _('Down Payment')
invoice = inv_obj.create({
'name': order.client_order_ref or order.name,
@@ -119,9 +119,9 @@ class SaleAdvancePaymentInv(models.TransientModel):
else:
amount = self.amount
if self.product_id.invoice_policy != 'order':
raise UserError(_('The product used to invoice a deposit should have an invoice policy set to "Ordered quantities". Please update your deposit product to be able to create a deposit invoice.'))
raise UserError(_('The product used to invoice a down payment should have an invoice policy set to "Ordered quantities". Please update your deposit product to be able to create a deposit invoice.'))
if self.product_id.type != 'service':
raise UserError(_("The product used to invoice an deposit should be of type 'Service'. Please use another product or update this product."))
raise UserError(_("The product used to invoice a down payment should be of type 'Service'. Please use another product or update this product."))
so_line = sale_line_obj.create({
'name': _('Advance: %s') % (time.strftime('%m %Y'),),
'price_unit': amount,
@@ -139,7 +139,7 @@ class SaleAdvancePaymentInv(models.TransientModel):
def _prepare_deposit_product(self):
return {
'name': 'Deposit',
'name': 'Down payment',
'type': 'service',
'invoice_policy': 'order',
'property_account_income_id': self.deposit_account_id.id,