From af4549528142fb90d85f8e05475b47fa13072942 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Thu, 13 Oct 2016 12:23:23 +0200 Subject: [PATCH] Take into account the remarks of Pedro: Use triple double quotes for docstring Replace by in XML Remove tags in XML Remove POT files --- .../i18n/account_cutoff_base.pot | 444 ------------------ account_cutoff_base/models/account_cutoff.py | 10 +- .../security/account_cutoff_base_security.xml | 4 +- account_cutoff_base/views/account_cutoff.xml | 4 +- account_cutoff_base/views/company.xml | 4 +- .../i18n/account_cutoff_prepaid.pot | 279 ----------- .../views/account_cutoff.xml | 3 +- account_cutoff_prepaid/views/company.xml | 2 - .../demo/product_demo.xml | 5 +- .../models/account_invoice.py | 12 +- .../views/account_invoice.xml | 2 - .../views/account_move.xml | 2 - .../views/product.xml | 2 - 13 files changed, 19 insertions(+), 754 deletions(-) delete mode 100644 account_cutoff_base/i18n/account_cutoff_base.pot delete mode 100644 account_cutoff_prepaid/i18n/account_cutoff_prepaid.pot diff --git a/account_cutoff_base/i18n/account_cutoff_base.pot b/account_cutoff_base/i18n/account_cutoff_base.pot deleted file mode 100644 index f95c3fb7ac0..00000000000 --- a/account_cutoff_base/i18n/account_cutoff_base.pot +++ /dev/null @@ -1,444 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_cutoff_base -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-24 15:25+0000\n" -"PO-Revision-Date: 2013-12-24 15:25+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: account_cutoff_base -#: field:account.cutoff,line_ids:0 -#: view:account.cutoff.line:0 -msgid "Cut-off Lines" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,move_id:0 -msgid "Cut-off Journal Entry" -msgstr "" - -#. module: account_cutoff_base -#: help:account.cutoff,move_label:0 -msgid "This label will be written in the 'Name' field of the Cut-off Account Move Lines and in the 'Reference' field of the Cut-off Account Move." -msgstr "" - -#. module: account_cutoff_base -#: view:account.cutoff:0 -msgid "Search Cut-offs" -msgstr "" - -#. module: account_cutoff_base -#: help:account.cutoff,state:0 -msgid "State of the cutoff. When the Journal Entry is created, the state is set to 'Done' and the fields become read-only." -msgstr "" - -#. module: account_cutoff_base -#: model:mail.message.subtype,description:account_cutoff_base.cutoff_done -#: model:mail.message.subtype,name:account_cutoff_base.cutoff_done -msgid "Cut-off Journal Entry Created" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.mapping,cutoff_type:0 -msgid "Cut-off Type" -msgstr "" - -#. module: account_cutoff_base -#: code:addons/account_cutoff_base/account_cutoff.py:241 -#, python-format -msgid "The Cut-off Journal Entry already exists. You should delete it before running this function." -msgstr "" - -#. module: account_cutoff_base -#: view:account.cutoff.line:0 -msgid "Source" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,message_follower_ids:0 -msgid "Followers" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.line,cutoff_account_code:0 -msgid "Cut-off Account Code" -msgstr "" - -#. module: account_cutoff_base -#: selection:account.cutoff,type:0 -#: selection:account.cutoff.mapping,cutoff_type:0 -msgid "Prepaid Expense" -msgstr "" - -#. module: account_cutoff_base -#: code:addons/account_cutoff_base/account_cutoff.py:246 -#, python-format -msgid "There are no lines on this Cut-off, so we can't create a Journal Entry." -msgstr "" - -#. module: account_cutoff_base -#: view:account.cutoff.mapping:0 -#: model:ir.model,name:account_cutoff_base.model_account_cutoff_mapping -msgid "Account Cut-off Mapping" -msgstr "" - -#. module: account_cutoff_base -#: help:account.cutoff.tax.line,amount:0 -msgid "Tax Amount in the currency of the PO." -msgstr "" - -#. module: account_cutoff_base -#: help:account.cutoff.tax.line,cutoff_amount:0 -msgid "Tax Cut-off Amount in the company currency." -msgstr "" - -#. module: account_cutoff_base -#: selection:account.cutoff,type:0 -#: selection:account.cutoff.mapping,cutoff_type:0 -msgid "Accrued Revenue" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.line,partner_id:0 -msgid "Partner" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,cutoff_date:0 -msgid "Cut-off Date" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.line,name:0 -msgid "Description" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,message_unread:0 -msgid "Unread Messages" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,type:0 -msgid "Type" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,company_id:0 -#: field:account.cutoff.mapping,company_id:0 -msgid "Company" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,cutoff_journal_id:0 -msgid "Cut-off Account Journal" -msgstr "" - -#. module: account_cutoff_base -#: model:ir.model,name:account_cutoff_base.model_account_cutoff_tax_line -msgid "Account Cut-off Tax Line" -msgstr "" - -#. module: account_cutoff_base -#: model:ir.actions.act_window,help:account_cutoff_base.account_cutoff_mapping_action -msgid "

\n" -" Click to start a new cutoff account mapping.\n" -"

\n" -" These account mappings allow you to have an cutoff account for expense/revenue that is not the same as the original expense/revenue account, using the same concept as the fiscal positions.\n" -"

\n" -" " -msgstr "" - -#. module: account_cutoff_base -#: help:account.cutoff.line,currency_id:0 -msgid "Currency of the 'Amount' field." -msgstr "" - -#. module: account_cutoff_base -#: help:account.cutoff,message_unread:0 -msgid "If checked new messages require your attention." -msgstr "" - -#. module: account_cutoff_base -#: selection:account.cutoff,type:0 -#: selection:account.cutoff.mapping,cutoff_type:0 -msgid "Accrued Expense" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,total_cutoff_amount:0 -msgid "Total Cut-off Amount" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,company_currency_id:0 -#: field:account.cutoff.line,company_currency_id:0 -#: field:account.cutoff.tax.line,company_currency_id:0 -msgid "Company Currency" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.tax.line,base:0 -msgid "Base" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,message_is_follower:0 -msgid "Is a Follower" -msgstr "" - -#. module: account_cutoff_base -#: field:res.company,default_cutoff_journal_id:0 -msgid "Default Cut-off Journal" -msgstr "" - -#. module: account_cutoff_base -#: view:account.cutoff:0 -#: selection:account.cutoff,state:0 -msgid "Done" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.line,parent_id:0 -msgid "Cut-off" -msgstr "" - -#. module: account_cutoff_base -#: view:account.cutoff:0 -msgid "Back to Draft" -msgstr "" - -#. module: account_cutoff_base -#: code:addons/account_cutoff_base/account_cutoff.py:240 -#: code:addons/account_cutoff_base/account_cutoff.py:245 -#, python-format -msgid "Error:" -msgstr "" - -#. module: account_cutoff_base -#: sql_constraint:account.cutoff:0 -msgid "A cutoff of the same type already exists with this cut-off date !" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.tax.line,parent_id:0 -#: model:ir.model,name:account_cutoff_base.model_account_cutoff_line -msgid "Account Cut-off Line" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.line,account_id:0 -msgid "Account" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.line,tax_line_ids:0 -#: view:account.cutoff.tax.line:0 -msgid "Cut-off Tax Lines" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.tax.line,cutoff_amount:0 -msgid "Cut-off Tax Amount" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,message_ids:0 -msgid "Messages" -msgstr "" - -#. module: account_cutoff_base -#: model:ir.model,name:account_cutoff_base.model_account_cutoff -msgid "Account Cut-off" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.tax.line,amount:0 -msgid "Tax Amount" -msgstr "" - -#. module: account_cutoff_base -#: model:ir.model,name:account_cutoff_base.model_res_company -msgid "Companies" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.line,tax_ids:0 -msgid "Taxes" -msgstr "" - -#. module: account_cutoff_base -#: view:account.cutoff:0 -#: model:ir.ui.menu,name:account_cutoff_base.cutoff_menu -#: view:res.company:0 -msgid "Cut-offs" -msgstr "" - -#. module: account_cutoff_base -#: view:account.cutoff:0 -msgid "Create Journal Entry" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.line,amount:0 -msgid "Amount" -msgstr "" - -#. module: account_cutoff_base -#: help:account.cutoff,message_ids:0 -msgid "Messages and communication history" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.mapping,account_id:0 -msgid "Regular Account" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,move_label:0 -msgid "Label of the Cut-off Journal Entry" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,message_summary:0 -msgid "Summary" -msgstr "" - -#. module: account_cutoff_base -#: view:account.cutoff.line:0 -msgid "Cut-off Taxes Lines" -msgstr "" - -#. module: account_cutoff_base -#: selection:account.cutoff,type:0 -#: selection:account.cutoff.mapping,cutoff_type:0 -msgid "Prepaid Revenue" -msgstr "" - -#. module: account_cutoff_base -#: code:addons/account_cutoff_base/account_cutoff.py:133 -#, python-format -msgid "Prepaid Expense%s" -msgstr "" - -#. module: account_cutoff_base -#: view:account.cutoff.line:0 -#: view:account.cutoff.tax.line:0 -msgid "Cut-off Computation" -msgstr "" - -#. module: account_cutoff_base -#: selection:account.cutoff.mapping,cutoff_type:0 -msgid "All Cut-off Types" -msgstr "" - -#. module: account_cutoff_base -#: help:account.cutoff,message_summary:0 -msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views." -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,state:0 -msgid "State" -msgstr "" - -#. module: account_cutoff_base -#: help:account.cutoff.tax.line,base:0 -msgid "Base Amount in the currency of the PO." -msgstr "" - -#. module: account_cutoff_base -#: code:addons/account_cutoff_base/account_cutoff.py:129 -#, python-format -msgid "Accrued Revenue%s" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.tax.line,sequence:0 -msgid "Sequence" -msgstr "" - -#. module: account_cutoff_base -#: view:account.cutoff.tax.line:0 -#: field:account.cutoff.tax.line,tax_id:0 -msgid "Tax" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.line,currency_id:0 -msgid "Amount Currency" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff,cutoff_account_id:0 -#: field:account.cutoff.line,cutoff_account_id:0 -#: field:account.cutoff.mapping,cutoff_account_id:0 -#: field:account.cutoff.tax.line,cutoff_account_id:0 -msgid "Cut-off Account" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.line,analytic_account_id:0 -#: field:account.cutoff.tax.line,analytic_account_id:0 -msgid "Analytic Account" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.tax.line,currency_id:0 -msgid "Currency" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.line,analytic_account_code:0 -msgid "Analytic Account Code" -msgstr "" - -#. module: account_cutoff_base -#: model:ir.actions.act_window,name:account_cutoff_base.account_cutoff_mapping_action -#: model:ir.ui.menu,name:account_cutoff_base.account_cutoff_mapping_menu -#: field:res.company,cutoff_account_mapping_ids:0 -msgid "Cut-off Account Mapping" -msgstr "" - -#. module: account_cutoff_base -#: code:addons/account_cutoff_base/account_cutoff.py:131 -#, python-format -msgid "Prepaid Revenue%s" -msgstr "" - -#. module: account_cutoff_base -#: help:account.cutoff.line,amount:0 -msgid "Amount that is used as base to compute the Cut-off Amount. This Amount is in the 'Amount Currency', which may be different from the 'Company Currency'." -msgstr "" - -#. module: account_cutoff_base -#: view:account.cutoff:0 -#: selection:account.cutoff,state:0 -msgid "Draft" -msgstr "" - -#. module: account_cutoff_base -#: help:account.cutoff.line,cutoff_amount:0 -msgid "Cut-off Amount without taxes in the Company Currency." -msgstr "" - -#. module: account_cutoff_base -#: code:addons/account_cutoff_base/account_cutoff.py:127 -#, python-format -msgid "Accrued Expense%s" -msgstr "" - -#. module: account_cutoff_base -#: field:account.cutoff.line,cutoff_amount:0 -msgid "Cut-off Amount" -msgstr "" - diff --git a/account_cutoff_base/models/account_cutoff.py b/account_cutoff_base/models/account_cutoff.py index 55a68fefab5..0e1be6f8014 100644 --- a/account_cutoff_base/models/account_cutoff.py +++ b/account_cutoff_base/models/account_cutoff.py @@ -38,12 +38,12 @@ def _default_move_label(self): @api.model def _inherit_default_cutoff_account_id(self): - '''Function designed to be inherited by other cutoff modules''' + """Function designed to be inherited by other cutoff modules""" return None @api.model def _default_cutoff_account_id(self): - '''This function can't be inherited, so we use a second function''' + """This function can't be inherited, so we use a second function""" return self._inherit_default_cutoff_account_id() cutoff_date = fields.Date( @@ -141,7 +141,7 @@ def _prepare_move(self, to_provision): movelines_to_create.append((0, 0, vals)) amount_total += amount - # add contre-partie + # add counter-part counterpart_amount = amount_total * -1 movelines_to_create.append((0, 0, { 'account_id': self.cutoff_account_id.id, @@ -342,9 +342,9 @@ class AccountCutoffMapping(models.Model): @api.model def _get_mapping_dict(self, company_id, cutoff_type='all'): - '''return a dict with: + """return a dict with: key = ID of account, - value = ID of cutoff_account''' + value = ID of cutoff_account""" if cutoff_type == 'all': cutoff_type_filter = ('all') else: diff --git a/account_cutoff_base/security/account_cutoff_base_security.xml b/account_cutoff_base/security/account_cutoff_base_security.xml index d0bdd8abefc..6c30a12ae01 100644 --- a/account_cutoff_base/security/account_cutoff_base_security.xml +++ b/account_cutoff_base/security/account_cutoff_base_security.xml @@ -1,6 +1,5 @@ - - + @@ -16,5 +15,4 @@ - diff --git a/account_cutoff_base/views/account_cutoff.xml b/account_cutoff_base/views/account_cutoff.xml index f1f6d15b666..1049bed3664 100644 --- a/account_cutoff_base/views/account_cutoff.xml +++ b/account_cutoff_base/views/account_cutoff.xml @@ -5,7 +5,7 @@ --> - + - + diff --git a/account_cutoff_base/views/company.xml b/account_cutoff_base/views/company.xml index fd5067cbf92..96193ccee2a 100644 --- a/account_cutoff_base/views/company.xml +++ b/account_cutoff_base/views/company.xml @@ -5,7 +5,7 @@ --> - + cutoff.company.form @@ -20,5 +20,5 @@ - + diff --git a/account_cutoff_prepaid/i18n/account_cutoff_prepaid.pot b/account_cutoff_prepaid/i18n/account_cutoff_prepaid.pot deleted file mode 100644 index dd5b4b0e474..00000000000 --- a/account_cutoff_prepaid/i18n/account_cutoff_prepaid.pot +++ /dev/null @@ -1,279 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_cutoff_prepaid -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-09 00:05+0000\n" -"PO-Revision-Date: 2014-03-09 00:05+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: account_cutoff_prepaid -#: field:account.cutoff.line,move_line_id:0 -msgid "Accout Move Line" -msgstr "" - -#. module: account_cutoff_prepaid -#: field:account.cutoff,end_date:0 -#: field:account.cutoff.line,end_date:0 -#: field:account.invoice.line,end_date:0 -#: field:account.move.line,end_date:0 -msgid "End Date" -msgstr "" - -#. module: account_cutoff_prepaid -#: help:product.template,must_have_dates:0 -msgid "If this option is active, the user will have to enter a Start Date and an End Date on the invoice lines that have this product." -msgstr "" - -#. module: account_cutoff_prepaid -#: field:product.template,must_have_dates:0 -msgid "Must Have Start and End Dates" -msgstr "" - -#. module: account_cutoff_prepaid -#: field:account.cutoff,forecast:0 -msgid "Forecast" -msgstr "" - -#. module: account_cutoff_prepaid -#: view:account.cutoff:0 -msgid "{'invisible': [('forecast', '=', True)], 'required': [('forecast', '=', False)]}" -msgstr "" - -#. module: account_cutoff_prepaid -#: field:res.company,default_prepaid_expense_account_id:0 -msgid "Default Account for Prepaid Expense" -msgstr "" - -#. module: account_cutoff_prepaid -#: field:account.cutoff,source_journal_ids:0 -msgid "Source Journals" -msgstr "" - -#. module: account_cutoff_prepaid -#: field:account.cutoff.line,move_date:0 -msgid "Account Move Date" -msgstr "" - -#. module: account_cutoff_prepaid -#: code:addons/account_cutoff_prepaid/account.py:95 -#, python-format -msgid "Missing Start Date for move line with Name '%s'." -msgstr "" - -#. module: account_cutoff_prepaid -#: code:addons/account_cutoff_prepaid/account.py:47 -#, python-format -msgid "Missing Start Date for invoice line with Description '%s'." -msgstr "" - -#. module: account_cutoff_prepaid -#: view:account.cutoff:0 -msgid "{'invisible': [('forecast', '=', True)]}" -msgstr "" - -#. module: account_cutoff_prepaid -#: field:account.cutoff.line,total_days:0 -msgid "Total Number of Days" -msgstr "" - -#. module: account_cutoff_prepaid -#: constraint:account.invoice.line:0 -#: constraint:account.move.line:0 -msgid "Error msg in raise" -msgstr "" - -#. module: account_cutoff_prepaid -#: model:ir.actions.act_window,name:account_cutoff_prepaid.account_cutoff_prepaid_expense_action -#: model:ir.ui.menu,name:account_cutoff_prepaid.account_cutoff_prepaid_expense_menu -msgid "Prepaid Expense" -msgstr "" - -#. module: account_cutoff_prepaid -#: model:ir.actions.act_window,name:account_cutoff_prepaid.account_cutoff_prepaid_revenue_action -#: model:ir.ui.menu,name:account_cutoff_prepaid.account_cutoff_prepaid_revenue_menu -msgid "Prepaid Revenue" -msgstr "" - -#. module: account_cutoff_prepaid -#: code:addons/account_cutoff_prepaid/account.py:101 -#, python-format -msgid "Start Date should be before End Date for move line with Name '%s'." -msgstr "" - -#. module: account_cutoff_prepaid -#: model:ir.model,name:account_cutoff_prepaid.model_account_move_line -msgid "Journal Items" -msgstr "" - -#. module: account_cutoff_prepaid -#: view:account.cutoff:0 -msgid "Re-Generate Lines" -msgstr "" - -#. module: account_cutoff_prepaid -#: help:account.cutoff,forecast:0 -msgid "The Forecast mode allows the user to compute the prepaid revenue/expense between 2 dates in the future." -msgstr "" - -#. module: account_cutoff_prepaid -#: model:ir.model,name:account_cutoff_prepaid.model_account_cutoff -msgid "Account Cut-off" -msgstr "" - -#. module: account_cutoff_prepaid -#: field:res.company,default_prepaid_revenue_account_id:0 -msgid "Default Account for Prepaid Revenue" -msgstr "" - -#. module: account_cutoff_prepaid -#: model:ir.model,name:account_cutoff_prepaid.model_account_cutoff_line -msgid "Account Cut-off Line" -msgstr "" - -#. module: account_cutoff_prepaid -#: model:product.template,name:account_cutoff_prepaid.product_insurance_contrat_product_template -msgid "Car Insurance" -msgstr "" - -#. module: account_cutoff_prepaid -#: code:addons/account_cutoff_prepaid/account.py:40 -#: code:addons/account_cutoff_prepaid/account.py:46 -#: code:addons/account_cutoff_prepaid/account.py:53 -#: code:addons/account_cutoff_prepaid/account.py:89 -#: code:addons/account_cutoff_prepaid/account.py:94 -#: code:addons/account_cutoff_prepaid/account.py:100 -#: code:addons/account_cutoff_prepaid/account.py:144 -#: code:addons/account_cutoff_prepaid/account_cutoff.py:132 -#: code:addons/account_cutoff_prepaid/account_cutoff.py:177 -#, python-format -msgid "Error:" -msgstr "" - -#. module: account_cutoff_prepaid -#: model:ir.model,name:account_cutoff_prepaid.model_res_company -msgid "Companies" -msgstr "" - -#. module: account_cutoff_prepaid -#: view:account.cutoff.line:0 -msgid "Days Total" -msgstr "" - -#. module: account_cutoff_prepaid -#: code:addons/account_cutoff_prepaid/account.py:54 -#, python-format -msgid "Start Date should be before or be the same as End Date for invoice line with Description '%s'." -msgstr "" - -#. module: account_cutoff_prepaid -#: code:addons/account_cutoff_prepaid/account.py:145 -#, python-format -msgid "Missing Start Date and End Date for invoice line with Product '%s' which has the property 'Must Have Start and End Dates'." -msgstr "" - -#. module: account_cutoff_prepaid -#: code:addons/account_cutoff_prepaid/account_cutoff.py:177 -#, python-format -msgid "You should set at least one Source Journal." -msgstr "" - -#. module: account_cutoff_prepaid -#: code:addons/account_cutoff_prepaid/account.py:41 -#, python-format -msgid "Missing End Date for invoice line with Description '%s'." -msgstr "" - -#. module: account_cutoff_prepaid -#: constraint:account.cutoff:0 -msgid "The start date is after the end date!" -msgstr "" - -#. module: account_cutoff_prepaid -#: code:addons/account_cutoff_prepaid/account.py:90 -#, python-format -msgid "Missing End Date for move line with Name '%s'." -msgstr "" - -#. module: account_cutoff_prepaid -#: help:account.cutoff.line,prepaid_days:0 -msgid "In regular mode, this is the number of days after the cut-off date. In forecast mode, this is the number of days between the start date and the end date." -msgstr "" - -#. module: account_cutoff_prepaid -#: model:ir.model,name:account_cutoff_prepaid.model_product_template -msgid "Product Template" -msgstr "" - -#. module: account_cutoff_prepaid -#: view:account.cutoff:0 -msgid "{'required': [('forecast', '=', False)]}" -msgstr "" - -#. module: account_cutoff_prepaid -#: model:ir.model,name:account_cutoff_prepaid.model_account_invoice_line -msgid "Invoice Line" -msgstr "" - -#. module: account_cutoff_prepaid -#: model:ir.actions.act_window,help:account_cutoff_prepaid.account_cutoff_prepaid_expense_action -msgid "

\n" -" Click to start preparing a new prepaid expense.\n" -"

\n" -" This view can be used by accountants in order to collect information about prepaid expenses based on start date and end date. It then allows to generate the corresponding cutoff journal entry in one click.\n" -"

\n" -" " -msgstr "" - -#. module: account_cutoff_prepaid -#: model:ir.actions.act_window,help:account_cutoff_prepaid.account_cutoff_prepaid_revenue_action -msgid "

\n" -" Click to start preparing a new prepaid revenue.\n" -"

\n" -" This view can be used by accountants in order to collect information about prepaid revenues based on start date and end date. It then allows to generate the corresponding cutoff journal entry in one click.\n" -"

\n" -" " -msgstr "" - -#. module: account_cutoff_prepaid -#: field:account.cutoff.line,invoice_id:0 -#: model:ir.model,name:account_cutoff_prepaid.model_account_invoice -msgid "Invoice" -msgstr "" - -#. module: account_cutoff_prepaid -#: sql_constraint:account.cutoff:0 -msgid "A cut-off of the same type already exists with the same date(s) !" -msgstr "" - -#. module: account_cutoff_prepaid -#: field:account.cutoff,start_date:0 -#: field:account.cutoff.line,start_date:0 -#: field:account.invoice.line,start_date:0 -#: field:account.move.line,start_date:0 -msgid "Start Date" -msgstr "" - -#. module: account_cutoff_prepaid -#: view:account.cutoff.line:0 -msgid "Days after Cut-off" -msgstr "" - -#. module: account_cutoff_prepaid -#: field:account.cutoff.line,prepaid_days:0 -msgid "Prepaid Days" -msgstr "" - -#. module: account_cutoff_prepaid -#: view:product.template:0 -msgid "Sales Properties" -msgstr "" - diff --git a/account_cutoff_prepaid/views/account_cutoff.xml b/account_cutoff_prepaid/views/account_cutoff.xml index 33bc204ba54..ca9b8158e41 100644 --- a/account_cutoff_prepaid/views/account_cutoff.xml +++ b/account_cutoff_prepaid/views/account_cutoff.xml @@ -5,7 +5,7 @@ --> - + @@ -163,5 +163,4 @@ sequence="20"/> - diff --git a/account_cutoff_prepaid/views/company.xml b/account_cutoff_prepaid/views/company.xml index 712cf6696c6..9ce7711f0ae 100644 --- a/account_cutoff_prepaid/views/company.xml +++ b/account_cutoff_prepaid/views/company.xml @@ -5,7 +5,6 @@ --> - @@ -21,5 +20,4 @@ - diff --git a/account_invoice_start_end_dates/demo/product_demo.xml b/account_invoice_start_end_dates/demo/product_demo.xml index 348d2114bd7..24df64c6850 100644 --- a/account_invoice_start_end_dates/demo/product_demo.xml +++ b/account_invoice_start_end_dates/demo/product_demo.xml @@ -4,8 +4,8 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> - - + + Car Insurance @@ -30,5 +30,4 @@ - diff --git a/account_invoice_start_end_dates/models/account_invoice.py b/account_invoice_start_end_dates/models/account_invoice.py index 11125710a80..514ca007938 100644 --- a/account_invoice_start_end_dates/models/account_invoice.py +++ b/account_invoice_start_end_dates/models/account_invoice.py @@ -45,8 +45,8 @@ class AccountInvoice(models.Model): _inherit = 'account.invoice' def inv_line_characteristic_hashcode(self, invoice_line): - '''Add start and end dates to hashcode used when the option "Group - Invoice Lines" is active on the Account Journal''' + """Add start and end dates to hashcode used when the option "Group + Invoice Lines" is active on the Account Journal""" code = super(AccountInvoice, self).inv_line_characteristic_hashcode( invoice_line) hashcode = '%s-%s-%s' % ( @@ -58,7 +58,7 @@ def inv_line_characteristic_hashcode(self, invoice_line): @api.model def line_get_convert(self, line, part): - '''Copy from invoice to move lines''' + """Copy from invoice to move lines""" res = super(AccountInvoice, self).line_get_convert(line, part) res['start_date'] = line.get('start_date', False) res['end_date'] = line.get('end_date', False) @@ -66,7 +66,7 @@ def line_get_convert(self, line, part): @api.model def invoice_line_move_line_get(self): - '''Copy from invoice line to move lines''' + """Copy from invoice line to move lines""" res = super(AccountInvoice, self).invoice_line_move_line_get() ailo = self.env['account.invoice.line'] for move_line_dict in res: @@ -77,8 +77,8 @@ def invoice_line_move_line_get(self): @api.multi def action_move_create(self): - '''Check that products with must_have_dates=True have - Start and End Dates''' + """Check that products with must_have_dates=True have + Start and End Dates""" for invoice in self: for iline in invoice.invoice_line_ids: if iline.product_id and iline.product_id.must_have_dates: diff --git a/account_invoice_start_end_dates/views/account_invoice.xml b/account_invoice_start_end_dates/views/account_invoice.xml index 95882a4e1cc..c1d40bf71ec 100644 --- a/account_invoice_start_end_dates/views/account_invoice.xml +++ b/account_invoice_start_end_dates/views/account_invoice.xml @@ -5,7 +5,6 @@ --> - @@ -71,5 +70,4 @@ - diff --git a/account_invoice_start_end_dates/views/account_move.xml b/account_invoice_start_end_dates/views/account_move.xml index 43b306d3abc..ceeaa467136 100644 --- a/account_invoice_start_end_dates/views/account_move.xml +++ b/account_invoice_start_end_dates/views/account_move.xml @@ -5,7 +5,6 @@ --> - @@ -45,5 +44,4 @@ - diff --git a/account_invoice_start_end_dates/views/product.xml b/account_invoice_start_end_dates/views/product.xml index b9dc9b1847e..5b14525146a 100644 --- a/account_invoice_start_end_dates/views/product.xml +++ b/account_invoice_start_end_dates/views/product.xml @@ -5,7 +5,6 @@ --> - @@ -22,5 +21,4 @@ -