diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 114f0a5860c..e1b9078ec3f 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -29,25 +29,23 @@ Accounting and Financial Management. Financial and accounting module that covers: -------------------------------------------- -General accountings -Cost / Analytic accounting -Third party accounting -Taxes management -Budgets -Customer and Supplier Invoices -Bank statements -Reconciliation process by partner + * General Accounting + * Cost/Analytic accounting + * Third party accounting + * Taxes management + * Budgets + * Customer and Supplier Invoices + * Bank statements + * Reconciliation process by partner Creates a dashboard for accountants that includes: -------------------------------------------------- -* List of Customer Invoice to Approve -* Company Analysis -* Graph of Aged Receivables -* Graph of Treasury + * List of Customer Invoice to Approve + * Company Analysis + * Graph of Treasury -The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or -grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a -module named account_voucher. +The processes like maintaining of general ledger is done through the defined financial Journals (entry move line orgrouping is maintained through journal) for a particular +financial year and for preparation of vouchers there is a module named account_voucher. """, 'website': 'http://www.openerp.com', 'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'], diff --git a/addons/account/account.py b/addons/account/account.py index 335822b7299..cbba0237c78 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -29,6 +29,8 @@ import pooler from osv import fields, osv import decimal_precision as dp from tools.translate import _ +from tools.float_utils import float_round + _logger = logging.getLogger(__name__) def check_cycle(self, cr, uid, ids, context=None): @@ -101,7 +103,7 @@ class account_payment_term_line(osv.osv): 'value': fields.selection([('procent', 'Percent'), ('balance', 'Balance'), ('fixed', 'Fixed Amount')], 'Valuation', - required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be threated."""), + required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be treated."""), 'value_amount': fields.float('Amount To Pay', digits_compute=dp.get_precision('Payment Term'), help="For percent enter a ratio between 0-1."), 'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \ @@ -313,8 +315,8 @@ class account_account(osv.osv): cr.execute(request, params) _logger.debug('Status: %s',(cr.statusmessage)) - for res in cr.dictfetchall(): - accounts[res['id']] = res + for row in cr.dictfetchall(): + accounts[row['id']] = row # consolidate accounts with direct children children_and_consolidated.reverse() @@ -731,7 +733,7 @@ class account_journal(osv.osv): 'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."), 'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"), 'group_invoice_lines': fields.boolean('Group Invoice Lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."), - 'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="This field contains the informatin related to the numbering of the journal entries of this journal.", required=True), + 'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="This field contains the information related to the numbering of the journal entries of this journal.", required=True), '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'), @@ -1269,7 +1271,7 @@ class account_move(osv.osv): 'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}), 'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}), 'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'Status', required=True, readonly=True, - help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'), + help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'), 'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}), 'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'), 'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True), @@ -2090,7 +2092,7 @@ class account_tax(osv.osv): tax_compute_precision = precision if taxes and taxes[0].company_id.tax_calculation_rounding_method == 'round_globally': tax_compute_precision += 5 - totalin = totalex = round(price_unit * quantity, precision) + totalin = totalex = float_round(price_unit * quantity, precision) tin = [] tex = [] for tax in taxes: diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 8f9c6ed1d6f..11bcf565260 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -173,7 +173,158 @@ class account_bank_statement(osv.osv): def button_dummy(self, cr, uid, ids, context=None): return self.write(cr, uid, ids, {}, context=context) + def _prepare_move(self, cr, uid, st_line, st_line_number, context=None): + """Prepare the dict of values to create the move from a + statement line. This method may be overridden to implement custom + move generation (making sure to call super() to establish + a clean extension chain). + + :param browse_record st_line: account.bank.statement.line record to + create the move from. + :param char st_line_number: will be used as the name of the generated account move + :return: dict of value to create() the account.move + """ + return { + 'journal_id': st_line.statement_id.journal_id.id, + 'period_id': st_line.statement_id.period_id.id, + 'date': st_line.date, + 'name': st_line_number, + 'ref': st_line.ref, + } + + def _prepare_bank_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id, + context=None): + """Compute the args to build the dict of values to create the bank move line from a + statement line by calling the _prepare_move_line_vals. This method may be + overridden to implement custom move generation (making sure to call super() to + establish a clean extension chain). + + :param browse_record st_line: account.bank.statement.line record to + create the move from. + :param int/long move_id: ID of the account.move to link the move line + :param float amount: amount of the move line + :param int/long company_currency_id: ID of currency of the concerned company + :return: dict of value to create() the bank account.move.line + """ + anl_id = st_line.analytic_account_id and st_line.analytic_account_id.id or False + debit = ((amount<0) and -amount) or 0.0 + credit = ((amount>0) and amount) or 0.0 + cur_id = False + amt_cur = False + if st_line.statement_id.currency.id <> company_currency_id: + cur_id = st_line.statement_id.currency.id + if st_line.account_id and st_line.account_id.currency_id and st_line.account_id.currency_id.id <> company_currency_id: + cur_id = st_line.account_id.currency_id.id + if cur_id: + res_currency_obj = self.pool.get('res.currency') + amt_cur = -res_currency_obj.compute(cr, uid, company_currency_id, cur_id, amount, context=context) + + res = self._prepare_move_line_vals(cr, uid, st_line, move_id, debit, credit, + amount_currency=amt_cur, currency_id=cur_id, analytic_id=anl_id, context=context) + return res + + def _get_counter_part_account(sefl, cr, uid, st_line, context=None): + """Retrieve the account to use in the counterpart move. + This method may be overridden to implement custom move generation (making sure to + call super() to establish a clean extension chain). + + :param browse_record st_line: account.bank.statement.line record to + create the move from. + :return: int/long of the account.account to use as counterpart + """ + if st_line.amount >= 0: + return st_line.statement_id.journal_id.default_credit_account_id.id + return st_line.statement_id.journal_id.default_debit_account_id.id + + def _get_counter_part_partner(sefl, cr, uid, st_line, context=None): + """Retrieve the partner to use in the counterpart move. + This method may be overridden to implement custom move generation (making sure to + call super() to establish a clean extension chain). + + :param browse_record st_line: account.bank.statement.line record to + create the move from. + :return: int/long of the res.partner to use as counterpart + """ + return st_line.partner_id and st_line.partner_id.id or False + + def _prepare_counterpart_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id, + context=None): + """Compute the args to build the dict of values to create the counter part move line from a + statement line by calling the _prepare_move_line_vals. This method may be + overridden to implement custom move generation (making sure to call super() to + establish a clean extension chain). + + :param browse_record st_line: account.bank.statement.line record to + create the move from. + :param int/long move_id: ID of the account.move to link the move line + :param float amount: amount of the move line + :param int/long account_id: ID of account to use as counter part + :param int/long company_currency_id: ID of currency of the concerned company + :return: dict of value to create() the bank account.move.line + """ + account_id = self._get_counter_part_account(cr, uid, st_line, context=context) + partner_id = self._get_counter_part_partner(cr, uid, st_line, context=context) + debit = ((amount > 0) and amount) or 0.0 + credit = ((amount < 0) and -amount) or 0.0 + cur_id = False + amt_cur = False + if st_line.statement_id.currency.id <> company_currency_id: + amt_cur = st_line.amount + cur_id = st_line.statement_id.currency.id + return self._prepare_move_line_vals(cr, uid, st_line, move_id, debit, credit, + amount_currency = amt_cur, currency_id = cur_id, account_id = account_id, + partner_id = partner_id, context=context) + + def _prepare_move_line_vals(self, cr, uid, st_line, move_id, debit, credit, currency_id = False, + amount_currency= False, account_id = False, analytic_id = False, + partner_id = False, context=None): + """Prepare the dict of values to create the move line from a + statement line. All non-mandatory args will replace the default computed one. + This method may be overridden to implement custom move generation (making sure to + call super() to establish a clean extension chain). + + :param browse_record st_line: account.bank.statement.line record to + create the move from. + :param int/long move_id: ID of the account.move to link the move line + :param float debit: debit amount of the move line + :param float credit: credit amount of the move line + :param int/long currency_id: ID of currency of the move line to create + :param float amount_currency: amount of the debit/credit expressed in the currency_id + :param int/long account_id: ID of the account to use in the move line if different + from the statement line account ID + :param int/long analytic_id: ID of analytic account to put on the move line + :param int/long partner_id: ID of the partner to put on the move line + :return: dict of value to create() the account.move.line + """ + acc_id = account_id or st_line.account_id.id + cur_id = currency_id or st_line.statement_id.currency.id + par_id = partner_id or (((st_line.partner_id) and st_line.partner_id.id) or False) + return { + 'name': st_line.name, + 'date': st_line.date, + 'ref': st_line.ref, + 'move_id': move_id, + 'partner_id': partner_id, + 'account_id': acc_id, + 'credit': credit, + 'debit': debit, + 'statement_id': st_line.statement_id.id, + 'journal_id': st_line.statement_id.journal_id.id, + 'period_id': st_line.statement_id.period_id.id, + 'currency_id': cur_id, + 'amount_currency': amount_currency, + 'analytic_account_id': analytic_id, + } + def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None): + """Create the account move from the statement line. + + :param int/long st_line_id: ID of the account.bank.statement.line to create the move from. + :param int/long company_currency_id: ID of the res.currency of the company + :param char st_line_number: will be used as the name of the generated account move + :return: ID of the account.move created + """ + if context is None: context = {} res_currency_obj = self.pool.get('res.currency') @@ -185,82 +336,28 @@ class account_bank_statement(osv.osv): context.update({'date': st_line.date}) - move_id = account_move_obj.create(cr, uid, { - 'journal_id': st.journal_id.id, - 'period_id': st.period_id.id, - 'date': st_line.date, - 'name': st_line_number, - 'ref': st_line.ref, - }, context=context) + move_vals = self._prepare_move(cr, uid, st_line, st_line_number, context=context) + move_id = account_move_obj.create(cr, uid, move_vals, context=context) account_bank_statement_line_obj.write(cr, uid, [st_line.id], { 'move_ids': [(4, move_id, False)] }) - torec = [] - if st_line.amount >= 0: - account_id = st.journal_id.default_credit_account_id.id - else: - account_id = st.journal_id.default_debit_account_id.id - acc_cur = ((st_line.amount<=0) and st.journal_id.default_debit_account_id) or st_line.account_id + context.update({ 'res.currency.compute.account': acc_cur, }) amount = res_currency_obj.compute(cr, uid, st.currency.id, company_currency_id, st_line.amount, context=context) - val = { - 'name': st_line.name, - 'date': st_line.date, - 'ref': st_line.ref, - 'move_id': move_id, - 'partner_id': ((st_line.partner_id) and st_line.partner_id.id) or False, - 'account_id': (st_line.account_id) and st_line.account_id.id, - 'credit': ((amount>0) and amount) or 0.0, - 'debit': ((amount<0) and -amount) or 0.0, - 'statement_id': st.id, - 'journal_id': st.journal_id.id, - 'period_id': st.period_id.id, - 'currency_id': st.currency.id, - 'analytic_account_id': st_line.analytic_account_id and st_line.analytic_account_id.id or False - } - - if st.currency.id <> company_currency_id: - amount_cur = res_currency_obj.compute(cr, uid, company_currency_id, - st.currency.id, amount, context=context) - val['amount_currency'] = -amount_cur - - if st_line.account_id and st_line.account_id.currency_id and st_line.account_id.currency_id.id <> company_currency_id: - val['currency_id'] = st_line.account_id.currency_id.id - amount_cur = res_currency_obj.compute(cr, uid, company_currency_id, - st_line.account_id.currency_id.id, amount, context=context) - val['amount_currency'] = -amount_cur - - move_line_id = account_move_line_obj.create(cr, uid, val, context=context) + bank_move_vals = self._prepare_bank_move_line(cr, uid, st_line, move_id, amount, + company_currency_id, context=context) + move_line_id = account_move_line_obj.create(cr, uid, bank_move_vals, context=context) torec.append(move_line_id) - # Fill the secondary amount/currency - # if currency is not the same than the company - amount_currency = False - currency_id = False - if st.currency.id <> company_currency_id: - amount_currency = st_line.amount - currency_id = st.currency.id - account_move_line_obj.create(cr, uid, { - 'name': st_line.name, - 'date': st_line.date, - 'ref': st_line.ref, - 'move_id': move_id, - 'partner_id': ((st_line.partner_id) and st_line.partner_id.id) or False, - 'account_id': account_id, - 'credit': ((amount < 0) and -amount) or 0.0, - 'debit': ((amount > 0) and amount) or 0.0, - 'statement_id': st.id, - 'journal_id': st.journal_id.id, - 'period_id': st.period_id.id, - 'amount_currency': amount_currency, - 'currency_id': currency_id, - }, context=context) + counterpart_move_vals = self._prepare_counterpart_move_line(cr, uid, st_line, move_id, + amount, company_currency_id, context=context) + account_move_line_obj.create(cr, uid, counterpart_move_vals, context=context) for line in account_move_line_obj.browse(cr, uid, [x.id for x in account_move_obj.browse(cr, uid, move_id, diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 1296d5c718a..393c468c952 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -196,7 +196,7 @@ - + @@ -344,7 +344,22 @@ - + + + + + + + + + + + + +
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 1e1f7b91851..d342dc5d3b9 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2601,7 +2601,7 @@ action = pool.get('res.config').next(cr, uid, [], context)

- + diff --git a/addons/account/company.py b/addons/account/company.py index 3bb241a42a6..1ec9b8c55da 100644 --- a/addons/account/company.py +++ b/addons/account/company.py @@ -45,7 +45,7 @@ class res_company(osv.osv): _defaults = { 'expects_chart_of_accounts': True, 'tax_calculation_rounding_method': 'round_per_line', - 'overdue_msg': '''Dear Sir, dear Madam, + 'overdue_msg': '''Dear Sir/Madam, Our records indicate that some payments on your account are still due. Please find details below. If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below. diff --git a/addons/account/wizard/account_financial_report.py b/addons/account/wizard/account_financial_report.py index 0ddc50f4859..f96127f6375 100644 --- a/addons/account/wizard/account_financial_report.py +++ b/addons/account/wizard/account_financial_report.py @@ -36,7 +36,7 @@ class accounting_report(osv.osv_memory): 'period_to_cmp': fields.many2one('account.period', 'End Period'), 'date_from_cmp': fields.date("Start Date"), 'date_to_cmp': fields.date("End Date"), - 'debit_credit': fields.boolean('Display Debit/Credit Columns', help="This option allow you to get more details about your the way your balances are computed. Because it is space consumming, we do not allow to use it while doing a comparison"), + 'debit_credit': fields.boolean('Display Debit/Credit Columns', help="This option allows you to get more details about the way your balances are computed. Because it is space consuming, we do not allow to use it while doing a comparison."), } def _get_account_report(self, cr, uid, context=None): diff --git a/addons/account/wizard/account_report_common_journal.py b/addons/account/wizard/account_report_common_journal.py index 92076cfe572..ed0f03df5b5 100644 --- a/addons/account/wizard/account_report_common_journal.py +++ b/addons/account/wizard/account_report_common_journal.py @@ -26,7 +26,7 @@ class account_common_journal_report(osv.osv_memory): _description = 'Account Common Journal Report' _inherit = "account.common.report" _columns = { - 'amount_currency': fields.boolean("With Currency", help="Print Report with the currency column if the currency is different then the company currency"), + 'amount_currency': fields.boolean("With Currency", help="Print Report with the currency column if the currency differs from the company currency."), } def _build_contexts(self, cr, uid, ids, data, context=None): diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py index d0b3c0fa3d3..8078da372ca 100644 --- a/addons/account/wizard/account_report_general_ledger.py +++ b/addons/account/wizard/account_report_general_ledger.py @@ -30,7 +30,7 @@ class account_report_general_ledger(osv.osv_memory): 'landscape': fields.boolean("Landscape Mode"), 'initial_balance': fields.boolean('Include Initial Balances', help='If you selected to filter by date or period, this field allow you to add a row to display the amount of debit/credit/balance that precedes the filter you\'ve set.'), - 'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"), + 'amount_currency': fields.boolean("With Currency", help="It adds the currency column on report if the currency differs from the company currency."), 'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort by', required=True), 'journal_ids': fields.many2many('account.journal', 'account_report_general_ledger_journal_rel', 'account_id', 'journal_id', 'Journals', required=True), } diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py index 7a3f3932f1b..60ac20a42ed 100644 --- a/addons/account/wizard/account_report_partner_ledger.py +++ b/addons/account/wizard/account_report_partner_ledger.py @@ -34,7 +34,7 @@ class account_partner_ledger(osv.osv_memory): help='If you selected to filter by date or period, this field allow you to add a row to display the amount of debit/credit/balance that precedes the filter you\'ve set.'), 'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods'), ('unreconciled', 'Unreconciled Entries')], "Filter by", required=True), 'page_split': fields.boolean('One Partner Per Page', help='Display Ledger Report with One partner per page'), - 'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"), + 'amount_currency': fields.boolean("With Currency", help="It adds the currency column on report if the currency differs from the company currency."), 'journal_ids': fields.many2many('account.journal', 'account_partner_ledger_journal_rel', 'account_id', 'journal_id', 'Journals', required=True), } _defaults = { diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py index 4bdca34e5f3..ff4e3faa3b6 100644 --- a/addons/account_accountant/__openerp__.py +++ b/addons/account_accountant/__openerp__.py @@ -29,10 +29,10 @@ Accounting Access Rights. ========================= -This module gives the admin user the access to all the accounting features +This module gives the Admin user the access to all the accounting features like the journal items and the chart of accounts. -It assigns manager and user access rights to the Administrator, and only +It assigns manager and user access rights to the Administrator and only user rights to Demo user. """, 'website': 'http://www.openerp.com', diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml index 3d665e680c3..7724dcb6774 100644 --- a/addons/account_accountant/account_accountant_data.xml +++ b/addons/account_accountant/account_accountant_data.xml @@ -1,20 +1,23 @@ - Accounting + - - + + + + + + Module Accounting and Finance has been installed + From the top menu Accounting, manage all of your accounting: + general accounting, cost/analytic accounting, third party + accounting, taxes, budgets, customer and supplier invoices, + bank statements, reconciliation process. + + diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index 4f25ece5954..e0bec840467 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/addons/account_analytic_analysis/__openerp__.py @@ -30,7 +30,7 @@ This module is for modifying account analytic view to show important data to pro Adds menu to show relevant information to each manager. You can also view the report of account analytic summary -user-wise as well as month wise. +user-wise as well as month-wise. """, "author": "Camptocamp", "website": "http://www.camptocamp.com/", diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 6e15fe1d5a5..c84b311f307 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -446,7 +446,7 @@ class account_analytic_account(osv.osv): help="Computed using the formula: Invoiced Amount - Total Costs.", digits_compute=dp.get_precision('Account')), 'theorical_margin': fields.function(_theorical_margin_calc, type='float', string='Theoretical Margin', - help="Computed using the formula: Theorial Revenue - Total Costs", + help="Computed using the formula: Theoretical Revenue - Total Costs", digits_compute=dp.get_precision('Account')), 'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)', help="Computes using the formula: (Real Margin / Total Costs) * 100.", @@ -455,7 +455,6 @@ class account_analytic_account(osv.osv): 'invoice_on_timesheets' : fields.boolean("Invoice On Timesheets"), 'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'), 'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'), - 'template_id': fields.many2one('account.analytic.account', 'Template of Contract'), 'hours_qtt_est': fields.float('Estimation of Hours to Invoice'), 'est_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Estimation"), 'invoiced_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Invoiced"), @@ -483,18 +482,15 @@ class account_analytic_account(osv.osv): def on_change_template(self, cr, uid, ids, template_id, context=None): if not template_id: return {} - res = {'value':{}} - template = self.browse(cr, uid, template_id, context=context) - res['value']['date_start'] = template.date_start - res['value']['date'] = template.date - res['value']['fix_price_invoices'] = template.fix_price_invoices - res['value']['invoice_on_timesheets'] = template.invoice_on_timesheets - res['value']['quantity_max'] = template.quantity_max - res['value']['hours_qtt_est'] = template.hours_qtt_est - res['value']['amount_max'] = template.amount_max - res['value']['to_invoice'] = template.to_invoice.id - res['value']['pricelist_id'] = template.pricelist_id.id - res['value']['description'] = template.description + res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context) + if template_id and 'value' in res: + template = self.browse(cr, uid, template_id, context=context) + res['value']['fix_price_invoices'] = template.fix_price_invoices + res['value']['invoice_on_timesheets'] = template.invoice_on_timesheets + res['value']['hours_qtt_est'] = template.hours_qtt_est + res['value']['amount_max'] = template.amount_max + res['value']['to_invoice'] = template.to_invoice.id + res['value']['pricelist_id'] = template.pricelist_id.id return res account_analytic_account() @@ -532,40 +528,25 @@ class account_analytic_account_summary_user(osv.osv): def init(self, cr): tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user') - cr.execute('CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (' \ - 'SELECT ' \ - '(u.account_id * u.max_user) + u."user" AS id, ' \ - 'u.account_id AS account_id, ' \ - 'u."user" AS "user", ' \ - 'COALESCE(SUM(l.unit_amount), 0.0) AS unit_amount ' \ - 'FROM ' \ - '(SELECT ' \ - 'a.id AS account_id, ' \ - 'u1.id AS "user", ' \ - 'MAX(u2.id) AS max_user ' \ - 'FROM ' \ - 'res_users AS u1, ' \ - 'res_users AS u2, ' \ - 'account_analytic_account AS a ' \ - 'GROUP BY u1.id, a.id ' \ - ') AS u ' \ - 'LEFT JOIN ' \ - '(SELECT ' \ - 'l.account_id AS account_id, ' \ - 'l.user_id AS "user", ' \ - 'SUM(l.unit_amount) AS unit_amount ' \ - 'FROM account_analytic_line AS l, ' \ - 'account_analytic_journal AS j ' \ - 'WHERE (j.type = \'general\') and (j.id=l.journal_id) ' \ - 'GROUP BY l.account_id, l.user_id ' \ - ') AS l ' - 'ON (' \ - 'u.account_id = l.account_id ' \ - 'AND u."user" = l."user"' \ - ') ' \ - 'GROUP BY u."user", u.account_id, u.max_user' \ - ')') - + cr.execute('''CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS ( + with mu as + (select max(id) as max_user from res_users) + , lu AS + (SELECT + l.account_id AS account_id, + coalesce(l.user_id, 0) AS user_id, + SUM(l.unit_amount) AS unit_amount + FROM account_analytic_line AS l, + account_analytic_journal AS j + WHERE (j.type = 'general' ) and (j.id=l.journal_id) + GROUP BY l.account_id, l.user_id + ) + select (lu.account_id * mu.max_user) + lu.user_id as id, + lu.account_id as account_id, + lu.user_id as "user", + unit_amount + from lu, mu)''') + account_analytic_account_summary_user() class account_analytic_account_summary_month(osv.osv): diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index ead87c176e3..32839063f02 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -20,9 +20,6 @@ - - -
- - - - diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py index 6b8e618116e..d6a6232d1a0 100644 --- a/addons/hr_timesheet/__openerp__.py +++ b/addons/hr_timesheet/__openerp__.py @@ -34,8 +34,8 @@ the analytic account. Lots of reporting on time and employee tracking are provided. -It is completely integrated with the cost accounting module. It allows you -to set up a management by affair. +It is completely integrated with the cost accounting module. It allows you to set +up a management by affair. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index 66911f25ff5..53119853c31 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -198,6 +198,13 @@ class account_analytic_account(osv.osv): _columns = { 'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"), } + + def on_change_template(self, cr, uid, ids, template_id, context=None): + res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context) + if template_id and 'value' in res: + template = self.browse(cr, uid, template_id, context=context) + res['value']['use_timesheets'] = template.use_timesheets + return res account_analytic_account() diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py index 65b8905fca0..e233158bda3 100644 --- a/addons/hr_timesheet_invoice/__openerp__.py +++ b/addons/hr_timesheet_invoice/__openerp__.py @@ -24,12 +24,14 @@ 'name': 'Invoice on Timesheets', 'version': '1.0', 'category': 'Sales Management', - 'description': """Generate your Invoices from Expenses, Timesheet Entries, ... + 'description': """ +Generate your Invoices from Expenses, Timesheet Entries. +======================================================== + Module to generate invoices based on costs (human resources, expenses, ...). -============================================================================ You can define price lists in analytic account, make some theoretical revenue -reports, etc.""", +reports.""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'images': ['images/hr_bill_task_work.jpeg','images/hr_type_of_invoicing.jpeg'], diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py index f1138d7b246..54257f5efba 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py @@ -64,7 +64,7 @@ class account_analytic_account(osv.osv): _inherit = "account.analytic.account" _columns = { 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', - help="The product to invoice is defined on the employee form, the price will be deduced by this pricelist on the product."), + help="The product to invoice is defined on the employee form, the price will be deducted by this pricelist on the product."), 'amount_max': fields.float('Max. Invoice Price', help="Keep empty if this contract is not limited to a total fixed price."), 'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount', diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py index 30edae72d9a..c9b2439596d 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py @@ -90,32 +90,28 @@ class account_analytic_line(osv.osv): context2 = context.copy() context2['lang'] = partner.lang - cr.execute("SELECT product_id, to_invoice, sum(unit_amount), product_uom_id " \ + cr.execute("SELECT product_id, to_invoice, sum(unit_amount), product_uom_id, name " \ "FROM account_analytic_line as line " \ "WHERE account_id = %s " \ "AND id IN %s AND to_invoice IS NOT NULL " \ - "GROUP BY product_id,to_invoice,product_uom_id", (account.id, tuple(ids),)) + "GROUP BY product_id, to_invoice, product_uom_id, name", (account.id, tuple(ids),)) - for product_id, factor_id, qty, uom in cr.fetchall(): - product = product_obj.browse(cr, uid, product_id, context2) + for product_id, factor_id, qty, uom, line_name in cr.fetchall(): + if data.get('product'): + product_id = data['product'][0] + product = product_obj.browse(cr, uid, product_id, context=context2) if not product: - raise osv.except_osv(_('Error'), _('At least one line has no product !')) - factor_name = '' - factor = invoice_factor_obj.browse(cr, uid, factor_id, context2) - if not data.get('product', False): - if factor.customer_name: - factor_name = product.name+' - '+factor.customer_name - else: - factor_name = product.name - else: - data['product'] = data['product'][0] - factor_name = product_obj.name_get(cr, uid, [data['product']], context=context)[0][1] + raise osv.except_osv(_('Error'), _('There is no product defined for the line %s. Please select one or force the product through the wizard.') % (line_name)) + factor = invoice_factor_obj.browse(cr, uid, factor_id, context=context2) + factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1] + if factor.customer_name: + factor_name += ' - ' + factor.customer_name ctx = context.copy() ctx.update({'uom':uom}) if account.pricelist_id: pl = account.pricelist_id.id - price = pro_price_obj.price_get(cr,uid,[pl], data.get('product', False) or product_id, qty or 1.0, account.partner_id.id, context=ctx)[pl] + price = pro_price_obj.price_get(cr,uid,[pl], product_id, qty or 1.0, account.partner_id.id, context=ctx)[pl] else: price = 0.0 @@ -131,7 +127,7 @@ class account_analytic_line(osv.osv): 'invoice_line_tax_id': [(6,0,tax )], 'invoice_id': last_invoice, 'name': factor_name, - 'product_id': data.get('product',product_id), + 'product_id': product_id, 'invoice_line_tax_id': [(6,0,tax)], 'uos_id': uom, 'account_id': account_id, @@ -179,7 +175,7 @@ class hr_timesheet_invoice_create(osv.osv_memory): 'time': fields.boolean('Time spent', help='The time of each work done will be displayed on the invoice'), 'name': fields.boolean('Description', help='The detail of each work done will be displayed on the invoice'), 'price': fields.boolean('Cost', help='The cost of each work done will be displayed on the invoice. You probably don\'t want to check this'), - 'product': fields.many2one('product.product', 'Product', help='Complete this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'), + 'product': fields.many2one('product.product', 'Force Product', help='Fill this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'), } _defaults = { diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py index 04be6045f4d..cc788d95a83 100644 --- a/addons/hr_timesheet_sheet/__openerp__.py +++ b/addons/hr_timesheet_sheet/__openerp__.py @@ -30,22 +30,22 @@ This module helps you to easily encode and validate timesheet and attendances within the same view. =================================================================================================== -The upper part of the view is for attendances and track (sign in/sign out) events. -The lower part is for timesheet. + * It will maintain attendances and track (sign in/sign out) events. + * Track the timesheet lines. Other tabs contains statistics views to help you analyse your time or the time of your team: -* Time spent by day (with attendances) -* Time spent by project + * Time spent by day (with attendances) + * Time spent by project This module also implements a complete timesheet validation process: -* Draft sheet -* Confirmation at the end of the period by the employee -* Validation by the project manager + * Draft sheet + * Confirmation at the end of the period by the employee + * Validation by the project manager The validation can be configured in the company: -* Period size (day, week, month, year) -* Maximal difference between timesheet and attendances + * Period size (day, week, month, year) + * Maximal difference between timesheet and attendances """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml index e66694223d2..c5839f886d3 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml @@ -1,6 +1,15 @@ + + + + + Module Timesheets Validation has been installed + From the top menu "Human Resources", encode and validate + timesheets and attendances. + + diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py index 3a9a44c6436..7ee4a72de05 100644 --- a/addons/idea/__openerp__.py +++ b/addons/idea/__openerp__.py @@ -25,8 +25,8 @@ 'version': '0.1', 'category': 'Tools', 'description': """ -This module allows your user to easily and efficiently participate in enterprise innovation. -============================================================================================ +This module allows user to easily and efficiently participate in enterprise innovation. +======================================================================================= It allows everybody to express ideas about different subjects. Then, other users can comment on these ideas and vote for particular ideas. diff --git a/addons/import_base/__openerp__.py b/addons/import_base/__openerp__.py index 7e4334f4a1d..294f864a0e3 100644 --- a/addons/import_base/__openerp__.py +++ b/addons/import_base/__openerp__.py @@ -20,12 +20,12 @@ ############################################################################## { - 'name': 'Framework for complex import', + 'name': 'Framework for Complex Import', 'version': '0.9', 'category': 'Hidden/Dependency', 'description': """ - This module provide a class import_framework to help importing - complex data from other software +This module provide a class import_framework to help importing complex data from +other software. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py index 5242633747f..9e47a213072 100644 --- a/addons/import_google/__openerp__.py +++ b/addons/import_google/__openerp__.py @@ -23,7 +23,7 @@ 'name': 'Google Import', 'version': '1.0', 'category': 'Customer Relationship Management', - 'description': """The module adds google contact in partner address and add google calendar events details in Meeting""", + 'description': """The module adds google contact in partner address and add google calendar events details in Meeting.""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base', 'import_base', 'google_base_account', 'base_calendar'], diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py index ea23247761d..f84b096e28a 100644 --- a/addons/import_sugarcrm/__openerp__.py +++ b/addons/import_sugarcrm/__openerp__.py @@ -23,8 +23,9 @@ 'name': 'SugarCRM Import', 'version': '1.0', 'category': 'Customer Relationship Management', - 'description': """This Module Import SugarCRM "Leads", "Opportunities", "Users", "Accounts", - "Contacts", "Employees", Meetings, Phonecalls, Emails, and Project, Project Tasks Data into OpenERP Module.""", + 'description': """ +This Module Import SugarCRM Leads, Opportunities, Users, Accounts, Contacts, Employees, +Meetings, Phonecalls, Emails, Project and Project Tasks Data into OpenERP Module.""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['import_base','crm', 'document'], diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py index dca620b0f07..f6b042f364b 100644 --- a/addons/knowledge/__openerp__.py +++ b/addons/knowledge/__openerp__.py @@ -21,7 +21,7 @@ { - "name" : "Document Management System", + "name" : "Knowledge Management System", "version" : "1.0", "depends" : ["base","base_setup"], "author" : "OpenERP SA", diff --git a/addons/l10n_ar/__init__.py b/addons/l10n_ar/__init__.py new file mode 100644 index 00000000000..92da5dbf966 --- /dev/null +++ b/addons/l10n_ar/__init__.py @@ -0,0 +1,32 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (c) 2011 Cubic ERP - Teradata SAC. (http://cubicerp.com). +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# garantees and support are strongly adviced to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## + + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ar/__openerp__.py b/addons/l10n_ar/__openerp__.py new file mode 100644 index 00000000000..8971ce94b22 --- /dev/null +++ b/addons/l10n_ar/__openerp__.py @@ -0,0 +1,51 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2011 Cubic ERP - Teradata SAC (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +{ + "name": "Argentina Localization Chart Account", + "version": "1.0", + "description": """ +Argentinian accounting chart and tax localization. + +Plan contable argentino e impuestos de acuerdo a disposiciones vigentes + + """, + "author": ["Cubic ERP"], + "website": "http://cubicERP.com", + "category": "Localization/Account Charts", + "depends": [ + "account_chart", + ], + "data":[ + "account_tax_code.xml", + "l10n_ar_chart.xml", + "account_tax.xml", + "l10n_ar_wizard.xml", + ], + "demo_xml": [ + ], + "update_xml": [ + ], + "active": False, + "installable": True, + "certificate" : "", + 'images': ['images/config_chart_l10n_ar.jpeg','images/l10n_ar_chart.jpeg'], +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ar/account_tax.xml b/addons/l10n_ar/account_tax.xml new file mode 100644 index 00000000000..8c8c648f0af --- /dev/null +++ b/addons/l10n_ar/account_tax.xml @@ -0,0 +1,101 @@ + + + + + + + IVA 21% Venta + 0.210000 + percent + sale + + + + + + + + + + IVA 21% Compra + 0.210000 + percent + purchase + + + + + + + + + + + IVA 27% Venta + 0.270000 + percent + sale + + + + + + + + + + IVA 27% Compra + 0.270000 + percent + purchase + + + + + + + + + + + IVA 10.5% Venta + 0.105000 + percent + sale + + + + + + + + + + IVA 10.5% Compra + 0.105000 + percent + purchase + + + + + + + + + + + Percepción IVA 2% + 0.02000 + percent + purchase + + + + + + + + + + diff --git a/addons/l10n_ar/account_tax_code.xml b/addons/l10n_ar/account_tax_code.xml new file mode 100644 index 00000000000..806a358f7cc --- /dev/null +++ b/addons/l10n_ar/account_tax_code.xml @@ -0,0 +1,106 @@ + + + + + + Argentina Impuestos + + + Base Imponible + + + + Base Imponible - Ventas + + + + Ventas Gravadas con IVA + + + + Ventas NO Gravadas (Exoneradas) + + + + Ventas Gravadas Fuera de Ámbito + + + + Base Imponible - Compras + + + + Compras Gravadas con IVA + + + + Compras NO Gravadas (Exoneradas) + + + + Compras Gravadas Fuera de Ámbito + + + + + Impuesto General a las Ventas (IVA) Total a Pagar + + + + Impuesto Pagado + + + + Impuesto Pagado IVA + + -1 + + + Impuesto Pagado de Exonerados al IVA + + -1 + + + Impuesto Pagado Fuera de Ámbito + + -1 + + + Impuesto Cobrado + + + + Impuesto Cobrado IVA + + + + Impuesto Cobrado de Exonerados al IVA + + + + Impuesto Cobrado Fuera de Ámbito + + + + + Impuesto Nacionales a Pagar + + + + Impuesto a las Ganancias a Pagar + + + + Impuesto a los Bienes Personales a Pagar + + + + Impuesto a la Ganancia Mínima Presunta a Pagar + + + + Monotributo a Pagar + + + + diff --git a/addons/l10n_ar/i18n/es.po b/addons/l10n_ar/i18n/es.po new file mode 100644 index 00000000000..097598864fe --- /dev/null +++ b/addons/l10n_ar/i18n/es.po @@ -0,0 +1,72 @@ +# Spanish translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-01-10 13:46+0000\n" +"Last-Translator: Yury Tello \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-01-15 05:56+0000\n" +"X-Generator: Launchpad (build 12177)\n" + +#. module: l10n_ar +#: model:ir.module.module,description:l10n_ar.module_meta_information +msgid "" +"\n" +" Argentinian Accounting : chart of Account\n" +" " +msgstr "" +"\n" +" Contabilidad Peruana : Plan de cuentas\n" +" " + +#. module: l10n_ar +#: model:ir.module.module,shortdesc:l10n_ar.module_meta_information +msgid "Argentinian Chart of Account" +msgstr "Plan de cuentas de Argentina" + +#. module: l10n_ar +#: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal +msgid "" +"Generate Chart of Accounts from a Chart Template. You will be asked to pass " +"the name of the company, the chart template to follow, the no. of digits to " +"generate the code for your accounts and Bank account, currency to create " +"Journals. Thus,the pure copy of chart Template is generated.\n" +"\tThis is the same wizard that runs from Financial " +"Management/Configuration/Financial Accounting/Financial Accounts/Generate " +"Chart of Accounts from a Chart Template." +msgstr "" +"Generar el plan contable a partir de una plantilla de plan contable. Se le " +"pedirá el nombre de la compañia, la plantilla de plan contable a utilizar, " +"el número de dígitos para generar el código de las cuentas y de la cuenta " +"bancaria, la moneda para crear los diarios. Así pues, se genere una copia " +"exacta de la plantilla de plan contable.\n" +"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / " +"Configuración / Contabilidad financiera / Cuentas financieras / Generar el " +"plan contable a partir de una plantilla de plan contable." + +#~ msgid "Liability" +#~ msgstr "Pasivo" + +#~ msgid "Asset" +#~ msgstr "Activo" + +#~ msgid "Closed" +#~ msgstr "Cerrado" + +#~ msgid "Income" +#~ msgstr "Ingreso" + +#~ msgid "Expense" +#~ msgstr "Gasto" + +#~ msgid "View" +#~ msgstr "Vista" diff --git a/addons/l10n_ar/i18n/es_AR.po b/addons/l10n_ar/i18n/es_AR.po new file mode 100644 index 00000000000..2260a43cf74 --- /dev/null +++ b/addons/l10n_ar/i18n/es_AR.po @@ -0,0 +1,54 @@ +# Spanish (Paraguay) translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-03-21 16:23+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish (Paraguay) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-03-22 04:36+0000\n" +"X-Generator: Launchpad (build 12559)\n" + +#. module: l10n_ar +#: model:ir.module.module,description:l10n_ar.module_meta_information +msgid "" +"\n" +" Argentinian Accounting : chart of Account\n" +" " +msgstr "" +"\n" +" Contabilidad Argentina : Plan de cuentas\n" +" " + +#. module: l10n_ar +#: model:ir.module.module,shortdesc:l10n_ar.module_meta_information +msgid "Argentinian Chart of Account" +msgstr "Plan de cuentas de la Argentina" + +#. module: l10n_ar +#: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal +msgid "" +"Generate Chart of Accounts from a Chart Template. You will be asked to pass " +"the name of the company, the chart template to follow, the no. of digits to " +"generate the code for your accounts and Bank account, currency to create " +"Journals. Thus,the pure copy of chart Template is generated.\n" +"\tThis is the same wizard that runs from Financial " +"Management/Configuration/Financial Accounting/Financial Accounts/Generate " +"Chart of Accounts from a Chart Template." +msgstr "" +"Generar el plan contable a partir de una plantilla de plan contable. Se le " +"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, " +"el número de dígitos para generar el código de las cuentas y de la cuenta " +"bancaria, la moneda para crear los diarios. Así pues, se genere una copia " +"exacta de la plantilla de plan contable.\n" +"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / " +"Configuración / Contabilidad financiera / Cuentas financieras / Generar el " +"plan contable a partir de una plantilla de plan contable." diff --git a/addons/l10n_ar/i18n/l10n_ar.pot b/addons/l10n_ar/i18n/l10n_ar.pot new file mode 100644 index 00000000000..8d117342eea --- /dev/null +++ b/addons/l10n_ar/i18n/l10n_ar.pot @@ -0,0 +1,35 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * l10n_ar +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.1.0-rc1\n" +"Report-Msgid-Bugs-To: soporte@cubicerp.com\n" +"POT-Creation-Date: 2011-01-11 11:15:31+0000\n" +"PO-Revision-Date: 2011-01-11 11:15:31+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: l10n_ar +#: model:ir.module.module,description:l10n_ar.module_meta_information +msgid "\n" +" Argentinian Accounting : chart of Account\n" +" " +msgstr "" + +#. module: l10n_ar +#: model:ir.module.module,shortdesc:l10n_ar.module_meta_information +msgid "Argentinian Chart of Account" +msgstr "" + +#. module: l10n_ar +#: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal +msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n" +" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template." +msgstr "" + diff --git a/addons/l10n_ar/l10n_ar_chart.xml b/addons/l10n_ar/l10n_ar_chart.xml new file mode 100644 index 00000000000..062697d5aa6 --- /dev/null +++ b/addons/l10n_ar/l10n_ar_chart.xml @@ -0,0 +1,260 @@ + + + + + + + noneviewVistanone + + balanceBG_ACC_10Caja y Bancosasset + detailBG_ACC_20Inversionesasset + unreconciledBG_ACC_30Créditos por Ventasasset + unreconciledBG_ACC_50Otros Créditosasset + balanceBG_ACC_60Bienes de Cambioasset + + detailBG_ACN_10Otros Créditos No Corrientesasset + detailBG_ACN_40Inversiones Permanentesasset + balanceBG_ACN_50Bienes de Usoasset + + unreconciledBG_PAC_10Deudas Bancarias y Financierasliability + unreconciledBG_PAC_20Cuentas por Pagarliability + unreconciledBG_PAC_35Remuneraciones y Cargas Socialesliability + unreconciledBG_PAC_40Cargas Fiscalesliability + unreconciledBG_PAC_45Otros Pasivosliability + + unreconciledBG_PAN_10Deudas Bancarias y Financieras a Largo Plazoliability + unreconciledBG_PAN_20Otros Pasivos a Largo Plazoliability + unreconciledBG_PAN_40Previsionesliability + + balanceBG_PTN_10Patrimonio Netoliability + + noneEGP_FU_010Ventas Netas de Bienes y Serviciosincome + noneEGP_FU_030Costo Mercaderías y Servicios Vendidosexpense + noneEGP_FU_040Gastos de Administraciónexpense + noneEGP_FU_050Gastos de Comercializaciónexpense + unreconciledEGP_FU_060Ingresos Financieros y por tenenciaincome + noneEGP_FU_070Gastos Financieros y por tenenciaexpense + noneEGP_FU_080Otros Ingresosincome + noneEGP_FU_090Otros Gastosexpense + noneEGP_FU_120Impuesto a las Gananciasexpense + noneEGP_FU_160Ganancia (Pérdida) Neta del Ejercicioincome + + noneEGP_NA_010Compras de Bienes de Usonone + + noneORDCuentas de Ordennone + + noneNCLASIFICADOCuentas No Clasificadasnone + + + + + Argentina + pcge + + view + + + Cuentas Patrimoniales + .1.BG + + + view + + + ACTIVO1view + Caja y Bancos11view + Caja y Bancos - Caja111view + Caja y bancos - Caja / efectivo ARS111.001liquidity + Caja y Bancos - Moneda Extranjera112view + Caja y bancos - Caja / efectivo USD112.001liquidity + Caja y Bancos - Fondos fijos113view + Caja y ...- Fondos fijos / caja chica 01 ARS113.001liquidity + Caja y Bancos - Cuentas Corrientes114view + Caja y Bancos.../ BCO. CTA CTE ARS114.001liquidity + Caja y bancos - Valores a Depositar 115other + Caja y bancos - Recaudaciones a Depositar 116other + Créditos por Ventas12view + Créditos por Ventas / Deudores por Ventas121receivable1 + Créditos por Ventas / Deudores Morosos122receivable1 + Créditos por Ventas / Deudores en Gestión Judicial123receivable + Créditos por Ventas / Deudores Varios124receivable + Créditos por Ventas / (-) Previsión para Ds. Incobrables125receivable1 + Otros Créditos13view + Otros Créditos / Préstamos otorgados131receivable + Otros Créditos / Anticipos a Proveedores132receivable + Otros Créditos / Anticipo de Impuestos133receivable + Otros Créditos / Anticipo al Personal134receivable + Otros Créditos / Alquileres Pagados por Adelantado135receivable + Otros Créditos / Intereses Pagados por Adelantado136receivable + Otros Créditos / Accionistas137receivable + Otros Créditos / (-) Previsión para Descuentos138receivable + Otros Créditos / (-) Intereses (+) a Devengar139receivable + Inversiones14view + Inversiones / Acciones Transitorias141other + Inversiones / Acciones Permanentes142other + Inversiones / Títulos Públicos143other + Inversiones / (-) Previsión para Devalorización de Acciones144other + Bienes de Cambio15view + Bienes de Cambio - Mercaderías151view + Bienes de Cambio - Mercaderías / Categoria de productos 01151.01other + Bienes de Cambio - Mercaderías en Tránsito152other + Materias primas153other + Productos en Curso de Elaboración154other + Productos Elaborados155other + Materiales Varios 156other + (-) Previsión para Desvalorización de Bienes de Cambio157other + Bienes de Uso16view + Bienes de Uso / Inmuebles161other + Bienes de Uso / Maquinaria162other + Bienes de Uso / Equipos163other + Bienes de Uso / Rodados164other + Bienes de Uso / (-) Depreciación Acumulada165other + Bienes Inmateriales17view + Bienes Inmateriales / Marcas de Fábrica171other + Bienes Inmateriales / Concesiones y Franquicias172other + Bienes Inmateriales / Patentes de Invención173other + Bienes Inmateriales / (-) Amortización Acumulada174other + PASIVO2view + Deudas Comerciales21view + Deudas Comerciales / Proveedores211payable1 + Deudas Comerciales / Anticipos de Clientes212payable1 + Deudas Comerciales / (-) Intereses a Devengar por Compras al Crédito213payable1 + Deudas Bancarias y Financieras22view + Deudas Bancarias y Financieras / Adelantos en Cuenta Corriente221payable + Deudas Bancarias y Financieras / Prestamos222payable + Deudas Bancarias y Financieras / Obligaciones a Pagar223payable + Deudas Bancarias y Financieras / Intereses a Pagar224payable + Deudas Bancarias y Financieras / Debentures Emitidos225payable + Deudas Fiscales23view + Deudas Fiscales / IVA a Pagar231other + Deudas Fiscales / Impuesto a los Débitos y Créditos Bancarios a Pagar232other + Deudas Fiscales / Impuesto a las Ganancias a Pagar233other + Deudas Fiscales / Impuesto sobre los Bienes Personales a Pagar234other + Deudas Fiscales / Impuesto a la Ganancia Mínima Presunta a Pagar235other + Deudas Fiscales / Monotributo a Pagar236other + Deudas Sociales24view + Deudas Sociales / Sueldos a Pagar241payable + Deudas Sociales / Cargas Sociales a Pagar242payable + Deudas Sociales / Provisión para Sueldo Anual Complementario243payable + Deudas Sociales / Retenciones a Depositar244payable + Otras Deudas25view + Otras Deudas / Acreedores Varios251payable + Otras Deudas / Dividendos a Pagar252payable + Otras Deudas / Cobros por Adelantado253payable + Otras Deudas / Honorarios Directores y Síndicos a Pagar254payable + Previsiones26view + Previsiones / Previsión Indemnización por Despidos261payable + Previsiones / Previsión para juicios Pendientes262payable + Previsiones / Previsión para Garantías por Service263payable + PATRIMONIO NETO3view + Capital Social31view + Capital social / Capital Suscripto311other + Capital social / Acciones en Circulación312other + Capital social / Dividendos a Distribuir en Acciones313other + Capital social / (-) Descuento de Emisión de Acciones314other + Aportes No Capitalizados32view + Aportes No Capitalizados / Primas de Emsión321other + Aportes No Capitalizados / Aportes Irrevocables Futura Suscripción de Acciones322other + Ajustes al Patrimonio33view + Ajustes al Patrimonio / Revaluo Técnico de Bienes de Uso331other + Ganancias Reservadas34view + Reserva Legal341other + Reserva Estatutaria342other + Reserva Facultativa343other + Reserva para Renovación de Bienes de Uso344other + Resultados No Asignados35view + Resultados Acumulados351other + Resultados Acumulados del Ejercicio Anterior352other + Ganancias y Pérdidas del Ejercicio353other + Resultado del Ejercicio354other + + + Cuentas de Resultado + .2.GP + + + view + + + RESULTADOS POSITIVOS4view + Resultados Positivos Ordinarios41view + Resultados Positivos Ordinarios411view + Ventas - Categoria de productos 01411.01other + Intereses gananados, obtenidos, percibidos412other + Alquileres gananados, obtenidos, percibidos413other + Comisiones gananados, obtenidos, percibidos414other + Descuentos gananados, obtenidos, percibidos415other + Renta de Títulos Públicos416other + Honorarios gananados, obtenidos, percibidos417other + Ganancia Venta de Acciones418other + Resultados Positivos Extraordinarios42view + Recupero de Rezagos421other + Recupero de Deudores Incobrables422other + Ganancia Venta de Bienes de Uso423other + Donaciones obtenidas, ganandas, percibidas424other + Ganancia Venta Inversiones Permanentes425other + RESULTADOS NEGATIVOS5view + Resultados Negativos Ordinarios51view + Costo de Mercaderías Vendidas511view + Costo de Mercaderías Vendidas - Categoria de productos 01511.01other + Gastos en Depreciación de Bienes de Uso512other + Gastos en Amortización513other + Gastos en Sueldos y Jormales514other + Gastos en Cargas Sociales515other + Gastos en Impuestos516other + Gastos Bancarios517other + Gastos en Servicios Públicos518other + Gastos de Publicidad y Propaganda519other + Resultados Negativos Extraordinarios52view + Gastos en Siniestros521other + Donaciones Cedidas, Otorgadas522other + Pérdida Venta Bienes de Uso523other + + + Cuentas de Movimiento + .3.CC + + + view + + + Compras61view + Compras - Categoria de productos 0161.01other + Costos de Producción62other + Gastos de Administración63other + Gastos de Comercialización64other + + + Cuentas de Orden + .4.CO + + + view + + + CUENTAS DE ORDEN DEUDORAS71view + Mercaderias Recibidas en Consignación711other + Depósito de Valores Recibos en Garantía712other + Garantias Otorgadas713other + Documentos Descontados714other + Documentos Endosados715other + CUENTAS DE ORDEN ACREEDORAS72view + Comitente por Mercaderias Recibidas en Consignación721other + Acreedor por Garantías Otorgadas722other + Acreedor por Documentos Descontados723other + + + Argentina - Plan de Cuentas + + + + + + + + + + + + + diff --git a/addons/l10n_ar/l10n_ar_wizard.xml b/addons/l10n_ar/l10n_ar_wizard.xml new file mode 100644 index 00000000000..1180acb46e8 --- /dev/null +++ b/addons/l10n_ar/l10n_ar_wizard.xml @@ -0,0 +1,15 @@ + + + + + + Generate Chart of Accounts from a Chart Template + Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. + This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. + + + automatic + + + + diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py index 0f70ec5ddbd..fc266e40d51 100644 --- a/addons/l10n_at/__openerp__.py +++ b/addons/l10n_at/__openerp__.py @@ -26,7 +26,10 @@ "website" : "http://www.conexus.at", "category" : "Localization/Account Charts", "depends" : ["account_chart", 'base_vat'], - "description": "This module provides the standard Accounting Chart for Austria which is based on the Template from BMF.gv.at. Please keep in mind that you should review and adapt it with your Accountant, before using it in a live Environment.", + "description": """ +This module provides the standard Accounting Chart for Austria which is based on +the Template from BMF.gv.at. Please keep in mind that you should review and adapt +it with your Accountant, before using it in a live Environment.""", "demo_xml" : [], "update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml',"l10n_chart_at_wizard.xml"], "auto_install": False, diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py index d8bf8fb88a2..1f4bcfe6284 100644 --- a/addons/l10n_be/__openerp__.py +++ b/addons/l10n_be/__openerp__.py @@ -27,17 +27,23 @@ This is the base module to manage the accounting chart for Belgium in OpenERP. After installing this module, the Configuration wizard for accounting is launched. * We have the account templates which can be helpful to generate Charts of Accounts. - * On that particular wizard, you will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate, the code for your account and bank account, currency to create journals. + * On that particular wizard, you will be asked to pass the name of the company, + the chart template to follow, the no. of digits to generate, the code for your + account and bank account, currency to create journals. Thus, the pure copy of Chart Template is generated. Wizards provided by this module: - * Partner VAT Intra: Enlist the partners with their related VAT and invoiced amounts.Prepares an XML file format. - Path to access : Accounting/Reporting//Legal Statements/Belgium Statements/Partner VAT Listing - * Periodical VAT Declaration: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in. - Path to access : Accounting/Reporting/Legal Statements/Belgium Statements/Periodical VAT Declaration - * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in.Based on Fiscal year - Path to access : Accounting/Reporting/Legal Statements/Belgium Statements/Annual Listing Of VAT-Subjected Customers + * Partner VAT Intra: Enlist the partners with their related VAT and invoiced + amounts. Prepares an XML file format. + Path to access : Invoicing/Reporting/Legal Reports/Belgium Statements/Partner VAT Intra + * Periodical VAT Declaration: Prepares an XML file for Vat Declaration of + the Main company of the User currently Logged in. + Path to access : Invoicing/Reporting/Legal Reports/Belgium Statements/Periodical VAT Declaration + * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for Vat + Declaration of the Main company of the User currently Logged in Based on + Fiscal year. + Path to access : Invoicing/Reporting/Legal Reports/Belgium Statements/Annual Listing Of VAT-Subjected Customers """, 'author': 'Noviat & OpenERP SA', diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py index eed2a537f62..95978ac52e7 100644 --- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py +++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py @@ -45,7 +45,7 @@ class l10n_be_vat_declaration(osv.osv_memory): 'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', domain=[('parent_id', '=', False)], required=True), 'msg': fields.text('File created', size=64, readonly=True), 'file_save': fields.binary('Save File'), - 'ask_restitution': fields.boolean('Ask Restitution',help='It indicates whether a resitution is to made or not?'), + 'ask_restitution': fields.boolean('Ask Restitution',help='It indicates whether a restitution is to made or not?'), 'ask_payment': fields.boolean('Ask Payment',help='It indicates whether a payment is to made or not?'), 'client_nihil': fields.boolean('Last Declaration, no clients in client listing', help='Tick this case only if it concerns only the last statement on the civil or cessation of activity: ' \ 'no clients to be included in the client listing.'), diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py index 123d235f19b..2bfc4de6bad 100644 --- a/addons/l10n_be/wizard/l10n_be_vat_intra.py +++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py @@ -60,7 +60,7 @@ class partner_vat_intra(osv.osv_memory): 'test_xml': fields.boolean('Test XML file', help="Sets the XML output as test file"), 'mand_id' : fields.char('Reference', size=14, help="Reference given by the Representative of the sending company."), 'msg': fields.text('File created', size=14, readonly=True), - 'no_vat': fields.text('Partner With No VAT', size=14, readonly=True, help="The Partner whose VAT number is not defined they doesn't include in XML File."), + 'no_vat': fields.text('Partner With No VAT', size=14, readonly=True, help="The Partner whose VAT number is not defined and they are not included in XML File."), 'file_save' : fields.binary('Save File', readonly=True), 'country_ids': fields.many2many('res.country', 'vat_country_rel', 'vat_id', 'country_id', 'European Countries'), 'comments': fields.text('Comments'), diff --git a/addons/l10n_be_hr_payroll/__openerp__.py b/addons/l10n_be_hr_payroll/__openerp__.py index ebe2c8c0743..e0d7ada059b 100644 --- a/addons/l10n_be_hr_payroll/__openerp__.py +++ b/addons/l10n_be_hr_payroll/__openerp__.py @@ -25,14 +25,14 @@ 'depends': ['hr_payroll'], 'version': '1.0', 'description': """ -Belgian Payroll Rules -===================== +Belgian Payroll Rules. +====================== * Employee Details * Employee Contracts * Passport based Contract - * Allowances / Deductions - * Allow to configure Basic / Grows / Net Salary + * Allowances/Deductions + * Allow to configure Basic/Gross/Net Salary * Employee Payslip * Monthly Payroll Register * Integrated with Holiday Management diff --git a/addons/l10n_be_hr_payroll_account/__openerp__.py b/addons/l10n_be_hr_payroll_account/__openerp__.py index ce6730df3da..81c7e243b39 100644 --- a/addons/l10n_be_hr_payroll_account/__openerp__.py +++ b/addons/l10n_be_hr_payroll_account/__openerp__.py @@ -25,7 +25,7 @@ 'depends': ['l10n_be_hr_payroll', 'hr_payroll_account', 'l10n_be'], 'version': '1.0', 'description': """ -Accounting Data for Belgian Payroll Rules +Accounting Data for Belgian Payroll Rules. """, 'auto_install': True, diff --git a/addons/l10n_be_invoice_bba/__openerp__.py b/addons/l10n_be_invoice_bba/__openerp__.py index 9cdc97d0c71..9f4efe1b31e 100644 --- a/addons/l10n_be_invoice_bba/__openerp__.py +++ b/addons/l10n_be_invoice_bba/__openerp__.py @@ -32,7 +32,9 @@ Belgian localisation for in- and outgoing invoices (prereq to account_coda): - Rename 'reference' field labels to 'Communication' - Add support for Belgian Structured Communication -A Structured Communication can be generated automatically on outgoing invoices according to the following algorithms: +A Structured Communication can be generated automatically on outgoing invoices +according to the following algorithms: + 1) Random : +++RRR/RRRR/RRRDD+++ R..R = Random Digits, DD = Check Digits 2) Date : +++DOY/YEAR/SSSDD+++ @@ -40,8 +42,9 @@ A Structured Communication can be generated automatically on outgoing invoices a 3) Customer Reference +++RRR/RRRR/SSSDDD+++ R..R = Customer Reference without non-numeric characters, SSS = Sequence Number, DD = Check Digits) -The preferred type of Structured Communication and associated Algorithm can be specified on the Partner records. -A 'random' Structured Communication will generated if no algorithm is specified on the Partner record. +The preferred type of Structured Communication and associated Algorithm can be +specified on the Partner records. A 'random' Structured Communication will +generated if no algorithm is specified on the Partner record. """, 'depends': ['account'], diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py index 909d4f53600..022fa1b6a4d 100644 --- a/addons/l10n_br/__openerp__.py +++ b/addons/l10n_br/__openerp__.py @@ -22,8 +22,8 @@ 'name': 'Brazilian - Accounting', 'category': 'Localization/Account Charts', 'description': """ -Base module for the Brazilian localization -========================================== +Base module for the Brazilian localization. +=========================================== This module consists in: @@ -41,9 +41,23 @@ This module consists in: - Tax Situation Code (CST) required for the electronic fiscal invoicing (NFe) -The field tax_discount has also been added in the account.tax.template and account.tax objects to allow the proper computation of some Brazilian VATs such as ICMS. The chart of account creation wizard has been extended to propagate those new data properly. +The field tax_discount has also been added in the account.tax.template and account.tax +objects to allow the proper computation of some Brazilian VATs such as ICMS. The +chart of account creation wizard has been extended to propagate those new data properly. -It's important to note however that this module lack many implementations to use OpenERP properly in Brazil. Those implementations (such as the electronic fiscal Invoicing which is already operational) are brought by more than 15 additional modules of the Brazilian Launchpad localization project https://launchpad.net/openerp.pt-br-localiz and their dependencies in the extra addons branch. Those modules aim at not breaking with the remarkable OpenERP modularity, this is why they are numerous but small. One of the reasons for maintaining those modules apart is that Brazilian Localization leaders need commit rights agility to complete the localization as companies fund the remaining legal requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and PAF ECF that are still missing as September 2011). Those modules are also strictly licensed under AGPL V3 and today don't come with any additional paid permission for online use of 'private modules'.""", +It's important to note however that this module lack many implementations to use +OpenERP properly in Brazil. Those implementations (such as the electronic fiscal +Invoicing which is already operational) are brought by more than 15 additional +modules of the Brazilian Launchpad localization project +https://launchpad.net/openerp.pt-br-localiz and their dependencies in the extra +addons branch. Those modules aim at not breaking with the remarkable OpenERP +modularity, this is why they are numerous but small. One of the reasons for +maintaining those modules apart is that Brazilian Localization leaders need commit +rights agility to complete the localization as companies fund the remaining legal +requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and PAF +ECF that are still missing as September 2011). Those modules are also strictly +licensed under AGPL V3 and today don't come with any additional paid permission +for online use of 'private modules'.""", 'license': 'AGPL-3', 'author': 'Akretion, OpenERP Brasil', 'website': 'http://openerpbrasil.org', diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py index ab56327573c..d3b7e796aee 100644 --- a/addons/l10n_ch/__openerp__.py +++ b/addons/l10n_ch/__openerp__.py @@ -23,8 +23,8 @@ "description" : """ Swiss localisation : - DTA generation for a lot of payment types - - BVR management (number generation, report, etc..) - - Import account move from the bank file (like v11 etc..) + - BVR management (number generation, report.) + - Import account move from the bank file (like v11) - Simplify the way you handle the bank statement for reconciliation You can also add ZIP and bank completion with: @@ -36,10 +36,11 @@ You can also add ZIP and bank completion with: ------------------------------------------------------------------------ -Module incluant la localisation Suisse de TinyERP revu et corrigé par Camptocamp. Cette nouvelle version -comprend la gestion et l'émissionde BVR, le paiement électronique via DTA (pour les banques, le système postal est en développement) -et l'import du relevé de compte depuis la banque de manière automatisée. -De plus, nous avons intégré la définition de toutes les banques Suisses(adresse, swift et clearing). +Module incluant la localisation Suisse de TinyERP revu et corrigé par Camptocamp. +Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement +électronique via DTA (pour les banques, le système postal est en développement) +et l'import du relevé de compte depuis la banque de manière automatisée. De plus, +nous avons intégré la définition de toutes les banques Suisses(adresse, swift et clearing). Par ailleurs, conjointement à ce module, nous proposons la complétion NPA: @@ -52,12 +53,11 @@ Vous pouvez ajouter la completion des banques et des NPA avec with: -------------------------------------------------------------------------- TODO : -- Implement bvr import partial reconciliation -- Replace wizard by osv_memory when possible -- Add mising HELP -- Finish code comment -- Improve demo data - + - Implement bvr import partial reconciliation + - Replace wizard by osv_memory when possible + - Add mising HELP + - Finish code comment + - Improve demo data """, "version": "6.1", diff --git a/addons/l10n_ch/report/report_webkit_html.py b/addons/l10n_ch/report/report_webkit_html.py index d930258f4a7..dffeedd0caa 100644 --- a/addons/l10n_ch/report/report_webkit_html.py +++ b/addons/l10n_ch/report/report_webkit_html.py @@ -20,22 +20,31 @@ ############################################################################## import time -from report import report_sxw -from report_webkit import webkit_report -from report_webkit import report_helper -from osv import osv -from tools import mod10r import sys import os import re + +from mako.template import Template +from mako.lookup import TemplateLookup +from mako import exceptions + + +from report import report_sxw +from report_webkit import webkit_report +from report_webkit import report_helper + +from osv import osv +from osv.osv import except_osv + +from tools import mod10r +from tools.translate import _ +from tools.config import config + import wizard import addons import pooler -from tools.config import config -from mako.template import Template -from mako import exceptions -from tools.translate import _ -from osv.osv import except_osv + + class l10n_ch_report_webkit_html(report_sxw.rml_parse): @@ -143,53 +152,26 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse): 'digits!\nPlease check your company ' 'information for the invoice:\n%s') %(invoice_name))) return '' + +def mako_template(text): + """Build a Mako template. + + This template uses UTF-8 encoding + """ + tmp_lookup = TemplateLookup() #we need it in order to allow inclusion and inheritance + return Template(text, input_encoding='utf-8', output_encoding='utf-8', lookup=tmp_lookup) class BVRWebKitParser(webkit_report.WebKitParser): - def setLang(self, lang): - if not lang: - lang = 'en_US' - self.localcontext['lang'] = lang - - def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False): - """format using the know cursor, language from localcontext""" - if digits is None: - digits = self.parser_instance.get_digits(value) - if isinstance(value, (str, unicode)) and not value: - return '' - pool_lang = self.pool.get('res.lang') - lang = self.localcontext['lang'] - - lang_ids = pool_lang.search(self.parser_instance.cr, self.parser_instance.uid, [('code','=',lang)])[0] - lang_obj = pool_lang.browse(self.parser_instance.cr, self.parser_instance.uid, lang_ids) - - if date or date_time: - if not str(value): - return '' - - date_format = lang_obj.date_format - parse_format = '%Y-%m-%d' - if date_time: - value=value.split('.')[0] - date_format = date_format + " " + lang_obj.time_format - parse_format = '%Y-%m-%d %H:%M:%S' - if not isinstance(value, time.struct_time): - return time.strftime(date_format, time.strptime(value, parse_format)) - - else: - date = datetime(*value.timetuple()[:6]) - return date.strftime(date_format) - - return lang_obj.format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary) - def create_single_pdf(self, cursor, uid, ids, data, report_xml, context=None): """generate the PDF""" - self.parser_instance = self.parser( - cursor, + context = context or {} + if report_xml.report_type != 'webkit': + return super(WebKitParser,self).create_single_pdf(cursor, uid, ids, data, report_xml, context=context) + self.parser_instance = self.parser(cursor, uid, self.name2, - context=context - ) + context=context) self.pool = pooler.get_pool(cursor.dbname) objs = self.getObjects(cursor, uid, ids, context) self.parser_instance.set_context(objs, data, ids, report_xml.report_type) @@ -201,7 +183,7 @@ class BVRWebKitParser(webkit_report.WebKitParser): if not template and report_xml.report_webkit_data : template = report_xml.report_webkit_data if not template : - raise except_osv(_('Webkit Report template not found !'), _('')) + raise except_osv(_('Error'),_('Webkit Report template not found !')) header = report_xml.webkit_header.html footer = report_xml.webkit_header.footer_html if not header and report_xml.header: @@ -210,43 +192,19 @@ class BVRWebKitParser(webkit_report.WebKitParser): _('Please set a header in company settings') ) if not report_xml.header : - #I know it could be cleaner ... - header = u""" - - - - - - - -""" - self.parser_instance.localcontext.update({'setLang':self.setLang}) - self.parser_instance.localcontext.update({'formatLang':self.formatLang}) + header = '' + default_head = addons.get_module_resource('report_webkit', 'default_header.html') + with open(default_head,'r') as f: + header = f.read() css = report_xml.webkit_header.css if not css : css = '' user = self.pool.get('res.users').browse(cursor, uid, uid) company = user.company_id - parse_template = template - #default_filters=['unicode', 'entity'] can be used to set global filter - body_mako_tpl = Template(parse_template ,input_encoding='utf-8', output_encoding='utf-8') + body_mako_tpl = mako_template(template) #BVR specific bvr_path = addons.get_module_resource(os.path.join('l10n_ch','report','bvr.mako')) - body_bvr_tpl = Template(file(bvr_path).read(), input_encoding='utf-8', output_encoding='utf-8') - + body_bvr_tpl = mako_template(file(bvr_path).read()) helper = report_helper.WebKitHelper(cursor, uid, report_xml.id, context) ##BVR Specific htmls = [] @@ -254,58 +212,48 @@ class BVRWebKitParser(webkit_report.WebKitParser): self.parser_instance.localcontext['objects'] = [obj] if not company.bvr_only: try: - html = body_mako_tpl.render( - helper=helper, + html = body_mako_tpl.render(helper=helper, css=css, _=self.translate_call, - **self.parser_instance.localcontext - ) + **self.parser_instance.localcontext) except Exception, e: raise Exception(exceptions.text_error_template().render()) htmls.append(html) if not company.invoice_only: try: - bvr = body_bvr_tpl.render( - helper=helper, - css=css, - _=self.translate_call, - **self.parser_instance.localcontext - ) + bvr = body_bvr_tpl.render(helper=helper, + css=css, + _=self.translate_call, + **self.parser_instance.localcontext) except Exception, e: raise Exception(exceptions.text_error_template().render()) htmls.append(bvr) head_mako_tpl = Template(header, input_encoding='utf-8', output_encoding='utf-8') try: - head = head_mako_tpl.render( - helper=helper, + head = head_mako_tpl.render(helper=helper, css=css, _debug=False, _=self.translate_call, - **self.parser_instance.localcontext - ) + **self.parser_instance.localcontext) except Exception, e: raise Exception(exceptions.text_error_template().render()) foot = False if footer and company.invoice_only : foot_mako_tpl = Template(footer, input_encoding='utf-8', output_encoding='utf-8') try: - foot = foot_mako_tpl.render( - helper=helper, + foot = foot_mako_tpl.render(helper=helper, css=css, _=self.translate_call, - **self.parser_instance.localcontext - ) + **self.parser_instance.localcontext) except Exception, e: raise Exception(exceptions.text_error_template().render()) if report_xml.webkit_debug : try: - deb = head_mako_tpl.render( - helper=helper, + deb = head_mako_tpl.render(helper=helper, css=css, _debug=html, _=self.translate_call, - **self.parser_instance.localcontext - ) + **self.parser_instance.localcontext) except Exception, e: raise Exception(exceptions.text_error_template().render()) return (deb, 'html') diff --git a/addons/l10n_cl/__init__.py b/addons/l10n_cl/__init__.py new file mode 100644 index 00000000000..92da5dbf966 --- /dev/null +++ b/addons/l10n_cl/__init__.py @@ -0,0 +1,32 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (c) 2011 Cubic ERP - Teradata SAC. (http://cubicerp.com). +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# garantees and support are strongly adviced to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## + + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_cl/__openerp__.py b/addons/l10n_cl/__openerp__.py new file mode 100644 index 00000000000..8c1e1e45b50 --- /dev/null +++ b/addons/l10n_cl/__openerp__.py @@ -0,0 +1,51 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2011 Cubic ERP - Teradata SAC (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +{ + "name": "Chile Localization Chart Account", + "version": "1.0", + "description": """ +Chilean accounting chart and tax localization. + +Plan contable chileno e impuestos de acuerdo a disposiciones vigentes + + """, + "author": "Cubic ERP", + "website": "http://cubicERP.com", + "category": "Localization/Account Charts", + "depends": [ + "account_chart", + ], + "data":[ + "account_tax_code.xml", + "l10n_cl_chart.xml", + "account_tax.xml", + "l10n_cl_wizard.xml", + ], + "demo_xml": [ + ], + "update_xml": [ + ], + "active": False, + "installable": True, + "certificate" : "", + 'images': ['images/config_chart_l10n_cl.jpeg','images/l10n_cl_chart.jpeg'], +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_cl/account_tax.xml b/addons/l10n_cl/account_tax.xml new file mode 100644 index 00000000000..1db0d2637f4 --- /dev/null +++ b/addons/l10n_cl/account_tax.xml @@ -0,0 +1,34 @@ + + + + + + + IVA 19% Venta + 0.190000 + percent + sale + + + + + + + + + + + IVA 19% Compra + 0.190000 + percent + purchase + + + + + + + + + + diff --git a/addons/l10n_cl/account_tax_code.xml b/addons/l10n_cl/account_tax_code.xml new file mode 100644 index 00000000000..95c91b60d78 --- /dev/null +++ b/addons/l10n_cl/account_tax_code.xml @@ -0,0 +1,94 @@ + + + + + + Chile Impuestos + + + Base Imponible + + + + Base Imponible - Ventas + + + + Ventas Gravadas con IVA + + + + Ventas NO Gravadas (Exoneradas) + + + + Ventas Gravadas Fuera de Ámbito + + + + Base Imponible - Compras + + + + Compras Gravadas con IVA + + + + Compras NO Gravadas (Exoneradas) + + + + Compras Gravadas Fuera de Ámbito + + + + + Impuesto General a las Ventas (IVA) Total a Pagar + + + + Impuesto Pagado + + + + Impuesto Pagado IVA + + -1 + + + Impuesto Pagado de Exonerados al IVA + + -1 + + + Impuesto Pagado Fuera de Ámbito + + -1 + + + Impuesto Cobrado + + + + Impuesto Cobrado IVA + + + + Impuesto Cobrado de Exonerados al IVA + + + + Impuesto Cobrado Fuera de Ámbito + + + + + Impuestos Directos a Pagar + + + + Impuesto a la Renta Primera Categoría a Pagar + + + + diff --git a/addons/l10n_cl/i18n/es.po b/addons/l10n_cl/i18n/es.po new file mode 100644 index 00000000000..f8b17197008 --- /dev/null +++ b/addons/l10n_cl/i18n/es.po @@ -0,0 +1,72 @@ +# Spanish translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-01-10 13:46+0000\n" +"Last-Translator: Yury Tello \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-01-15 05:56+0000\n" +"X-Generator: Launchpad (build 12177)\n" + +#. module: l10n_cl +#: model:ir.module.module,description:l10n_cl.module_meta_information +msgid "" +"\n" +" Chilean Accounting : chart of Account\n" +" " +msgstr "" +"\n" +" Contabilidad Peruana : Plan de cuentas\n" +" " + +#. module: l10n_cl +#: model:ir.module.module,shortdesc:l10n_cl.module_meta_information +msgid "Chilean Chart of Account" +msgstr "Plan de cuentas de Chile" + +#. module: l10n_cl +#: model:ir.actions.todo,note:l10n_cl.config_call_account_template_in_minimal +msgid "" +"Generate Chart of Accounts from a Chart Template. You will be asked to pass " +"the name of the company, the chart template to follow, the no. of digits to " +"generate the code for your accounts and Bank account, currency to create " +"Journals. Thus,the pure copy of chart Template is generated.\n" +"\tThis is the same wizard that runs from Financial " +"Management/Configuration/Financial Accounting/Financial Accounts/Generate " +"Chart of Accounts from a Chart Template." +msgstr "" +"Generar el plan contable a partir de una plantilla de plan contable. Se le " +"pedirá el nombre de la compañia, la plantilla de plan contable a utilizar, " +"el número de dígitos para generar el código de las cuentas y de la cuenta " +"bancaria, la moneda para crear los diarios. Así pues, se genere una copia " +"exacta de la plantilla de plan contable.\n" +"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / " +"Configuración / Contabilidad financiera / Cuentas financieras / Generar el " +"plan contable a partir de una plantilla de plan contable." + +#~ msgid "Liability" +#~ msgstr "Pasivo" + +#~ msgid "Asset" +#~ msgstr "Activo" + +#~ msgid "Closed" +#~ msgstr "Cerrado" + +#~ msgid "Income" +#~ msgstr "Ingreso" + +#~ msgid "Expense" +#~ msgstr "Gasto" + +#~ msgid "View" +#~ msgstr "Vista" diff --git a/addons/l10n_cl/i18n/es_CL.po b/addons/l10n_cl/i18n/es_CL.po new file mode 100644 index 00000000000..cd0a9f9c43e --- /dev/null +++ b/addons/l10n_cl/i18n/es_CL.po @@ -0,0 +1,53 @@ +# Spanish (Paraguay) translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-03-21 16:23+0000\n" +"Last-Translator: FULL NAME \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-03-22 04:36+0000\n" +"X-Generator: Launchpad (build 12559)\n" + +#. module: l10n_cl +#: model:ir.module.module,description:l10n_cl.module_meta_information +msgid "" +"\n" +" Chilean Accounting : chart of Account\n" +" " +msgstr "" +"\n" +" Contabilidad Chile : Plan de cuentas\n" +" " + +#. module: l10n_cl +#: model:ir.module.module,shortdesc:l10n_cl.module_meta_information +msgid "Chilean Chart of Account" +msgstr "Plan de cuentas de la Chile" + +#. module: l10n_cl +#: model:ir.actions.todo,note:l10n_cl.config_call_account_template_in_minimal +msgid "" +"Generate Chart of Accounts from a Chart Template. You will be asked to pass " +"the name of the company, the chart template to follow, the no. of digits to " +"generate the code for your accounts and Bank account, currency to create " +"Journals. Thus,the pure copy of chart Template is generated.\n" +"\tThis is the same wizard that runs from Financial " +"Management/Configuration/Financial Accounting/Financial Accounts/Generate " +"Chart of Accounts from a Chart Template." +msgstr "" +"Generar el plan contable a partir de una plantilla de plan contable. Se le " +"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, " +"el número de dígitos para generar el código de las cuentas y de la cuenta " +"bancaria, la moneda para crear los diarios. Así pues, se genere una copia " +"exacta de la plantilla de plan contable.\n" +"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / " +"Configuración / Contabilidad financiera / Cuentas financieras / Generar el " +"plan contable a partir de una plantilla de plan contable." diff --git a/addons/l10n_cl/i18n/l10n_cl.pot b/addons/l10n_cl/i18n/l10n_cl.pot new file mode 100644 index 00000000000..9b3704b75e1 --- /dev/null +++ b/addons/l10n_cl/i18n/l10n_cl.pot @@ -0,0 +1,35 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * l10n_cl +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.1.0-rc1\n" +"Report-Msgid-Bugs-To: soporte@cubicerp.com\n" +"POT-Creation-Date: 2011-01-11 11:15:31+0000\n" +"PO-Revision-Date: 2011-01-11 11:15:31+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: l10n_cl +#: model:ir.module.module,description:l10n_cl.module_meta_information +msgid "\n" +" Chilean Accounting : chart of Account\n" +" " +msgstr "" + +#. module: l10n_cl +#: model:ir.module.module,shortdesc:l10n_cl.module_meta_information +msgid "Chilean Chart of Account" +msgstr "" + +#. module: l10n_cl +#: model:ir.actions.todo,note:l10n_cl.config_call_account_template_in_minimal +msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n" +" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template." +msgstr "" + diff --git a/addons/l10n_cl/l10n_cl_chart.xml b/addons/l10n_cl/l10n_cl_chart.xml new file mode 100644 index 00000000000..8bc4272c2eb --- /dev/null +++ b/addons/l10n_cl/l10n_cl_chart.xml @@ -0,0 +1,256 @@ + + + + + + + noneviewVistanone + + balanceBG_ACC_10Efectivo y Equivalentes al Efectivoasset + detailBG_ACC_20Otros Activos Financieros Corrientesasset + unreconciledBG_ACC_30Deudores Comercialesasset + unreconciledBG_ACC_50Otras Cuentas por Cobrarasset + balanceBG_ACC_60Inventariosasset + + detailBG_ACN_10Derechos por Cobrar No Corrienteasset + detailBG_ACN_40Otros Activos No Financierosasset + balanceBG_ACN_50Propiedades, Planta y Equipoasset + + unreconciledBG_PAC_10Otros Pasivos Financierosliability + unreconciledBG_PAC_20Cuentas por Pagar Comercialesliability + unreconciledBG_PAC_35Otras Cuentas por Pagarliability + unreconciledBG_PAC_40Otras Provisiones Corrientesliability + unreconciledBG_PAC_45Pasivos por Impuestos Corrientesliability + + unreconciledBG_PAN_10Otros Pasivos Financieros No Corrientesliability + unreconciledBG_PAN_20Otros Cuentas por Pagar No Corrientesliability + unreconciledBG_PAN_40Otras Provisiones No Corrientesliability + + balanceBG_PTN_10Patrimonio Netoliability + + noneEGP_FU_010Ingresos por Actividades Ordinariasincome + noneEGP_FU_030Costo de Ventasexpense + noneEGP_FU_040Gastos de Administraciónexpense + noneEGP_FU_050Costos por Distribuciónexpense + unreconciledEGP_FU_060Ingresos Financierosincome + noneEGP_FU_070Costos Financierosexpense + noneEGP_FU_080Otros Ingresosincome + noneEGP_FU_090Otros Gastosexpense + noneEGP_FU_120Gasto Impuesto a las Rentaexpense + noneEGP_FU_160Ganancia (Pérdida)income + + noneEGP_NA_010Compras de Activo Fijonone + + noneORDCuentas de Ordennone + + noneNCLASIFICADOCuentas No Clasificadasnone + + + + + Chile + pcge + + view + + + inventario del Balance General + .1.BG + + + view + + + ACTIVOS1view + Activo Circulante11view + Activo Circulante - Caja111view + Activo Circulante - Caja / efectivo CLP111.001liquidity + Activo Circulante - Moneda Extranjera112view + Activo Circulante - Caja / efectivo USD112.001liquidity + Activo Circulante - Fondos fijos113view + Activo Circulante - Fondos fijos / caja chica 01 CLP113.001liquidity + Activo Circulante - Bancos114view + Activo Circulante.../ BCO. CTA CTE CLP114.001liquidity + Activo Circulante - Valores a Depositar 115other + Activo Circulante - Recaudaciones a Depositar 116other + Documentos por Cobrar12view + Documentos por Cobrar / Deudores por Ventas121receivable1 + Documentos por Cobrar / Deudores Morosos122receivable1 + Documentos por Cobrar / Deudores en Gestión Judicial123receivable + Documentos por Cobrar / Deudores Varios124receivable + Documentos por Cobrar / (-) Previsión para Incobrables125receivable1 + Cuentas por Cobrar13view + Cuentas por Cobrar / Préstamos otorgados131receivable + Cuentas por Cobrar / Anticipos a Proveedores132receivable + Cuentas por Cobrar / Anticipo de Impuestos133receivable + Cuentas por Cobrar / Anticipo al Personal134receivable + Cuentas por Cobrar / Alquileres Pagados por Adelantado135receivable + Cuentas por Cobrar / Intereses Pagados por Adelantado136receivable + Cuentas por Cobrar / Accionistas137receivable + Cuentas por Cobrar / (-) Previsión para Descuentos138receivable + Cuentas por Cobrar / (-) Intereses (+) a Devengar139receivable + Inversiones Financieras14view + Inversiones / Acciones Transitorias141other + Inversiones / Acciones Permanentes142other + Inversiones / Títulos Públicos143other + Inversiones / (-) Previsión para Devalorización de Acciones144other + Existencias15view + Existencias - Mercaderías151view + Existencias - Mercaderías / Categoria de productos 01151.01other + Existencias - Mercaderías en Tránsito152other + Materias primas153other + Productos en Curso de Elaboración154other + Productos Elaborados155other + Materiales Varios 156other + (-) Previsión para Desvalorización de Existencias157other + Activo Fijo16view + Activo Fijo / Inmuebles161other + Activo Fijo / Maquinaria162other + Activo Fijo / Equipos163other + Activo Fijo / Material Rodante Motorizado164other + Activo Fijo / (-) Depreciación Acumulada165other + Activo Intangible17view + Activo Intangible / Derecho de Llaves171other + Activo Intangible / Concesiones y Franquicias172other + Activo Intangible / Marcas y Patentes de Invención173other + Activo Intangible / (-) Amortización Acumulada174other + PASIVOS2view + Cuentas por Pagar21view + Cuentas por Pagar / Proveedores211payable1 + Cuentas por Pagar / Anticipos de Clientes212payable1 + Cuentas por Pagar / (-) Intereses a Devengar por Compras al Crédito213payable1 + Pasivo Circulante22view + Pasivo Circulante / Adelantos en Cuenta Corriente221payable + Pasivo Circulante / Prestamos222payable + Pasivo Circulante / Obligaciones a Pagar223payable + Pasivo Circulante / Intereses a Pagar224payable + Pasivo Circulante / Debentures Emitidos225payable + Impuestos por Pagar23view + Impuestos por Pagar / IVA a Pagar231other + Impuestos por Pagar / Impuesto a la Renta a Pagar232other + Remuneraciones por Pagar24view + Remuneraciones por Pagar / Sueldos a Pagar241payable + Remuneraciones por Pagar / Cargas Sociales a Pagar242payable + Remuneraciones por Pagar / Provisión para Sueldo Anual Complementario243payable + Remuneraciones por Pagar / Retenciones a Depositar244payable + Otras Cuentas por Pagar25view + Otras Cuentas por Pagar / Acreedores Varios251payable + Otras Cuentas por Pagar / Dividendos a Pagar252payable + Otras Cuentas por Pagar / Cobros por Adelantado253payable + Otras Cuentas por Pagar / Honorarios Directores y Síndicos a Pagar254payable + Provisiones26view + Provisiones / Previsión Indemnización por Despidos261payable + Provisiones / Previsión para juicios Pendientes262payable + Provisiones / Previsión para Garantías por Service263payable + PATRIMONIO3view + Capital31view + Capital / Capital Propio311other + Capital / Acciones en Circulación312other + Capital / Dividendos a Distribuir en Acciones313other + Capital / (-) Descuento de Emisión de Acciones314other + Aportes No Capitalizados32view + Aportes No Capitalizados / Primas de Emsión321other + Aportes No Capitalizados / Aportes Irrevocables Futura Suscripción de Acciones322other + Ajustes al Patrimonio33view + Ajustes al Patrimonio / Revaluo Técnico de Activo Fijo331other + Futuras Eventualidades34view + Reserva Legal341other + Reserva Estatutaria342other + Reserva Facultativa343other + Reserva para Renovación de Activo Fijo344other + Resultados No Asignados35view + Resultados Acumulados351other + Resultados Acumulados del Ejercicio Anterior352other + Utilidades y Pérdidas del Ejercicio353other + Resultado del Ejercicio354other + + + Cuentas de Resultado + .2.GP + + + view + + + RESULTADO GANANCIA4view + Ingresos de Explotación41view + Ventas411view + Ventas - Categoria de productos 01411.01other + Intereses gananados, obtenidos, percibidos412other + Alquileres gananados, obtenidos, percibidos413other + Comisiones gananados, obtenidos, percibidos414other + Descuentos gananados, obtenidos, percibidos415other + Interese sobre Inversiones416other + Honorarios gananados, obtenidos, percibidos417other + Ganancia Venta de Acciones418other + Ingresos Fuera de Explotación42view + Recupero de Rezagos421other + Recupero de Deudores Incobrables422other + Ganancia Venta de Activo Fijo423other + Donaciones obtenidas, ganandas, percibidas424other + Ganancia Venta Inversiones Permanentes425other + RESULTADO PÉRDIDA5view + Egresos de Explotación51view + Costo de Mercaderías Vendidas511view + Costo de Mercaderías Vendidas - Categoria de productos 01511.01other + Gastos en Depreciación de Activo Fijo512other + Gastos en Amortización513other + Gastos en Sueldos y Jornales514other + Gastos en Cargas Sociales515other + Gastos en Impuestos516other + Gastos Bancarios517other + Gastos en Servicios Públicos518other + Gastos de Publicidad y Propaganda519other + Egresos Fuera de Explotación52view + Gastos en Siniestros521other + Donaciones Cedidas, Otorgadas522other + Pérdida Venta Activo Fijo523other + + + Cuentas de Movimiento + .3.CC + + + view + + + Compras61view + Compras - Categoria de productos 0161.01other + Costos de Producción62other + Gastos de Administración63other + Gastos de Comercialización64other + + + Cuentas de Orden + .4.CO + + + view + + + CUENTAS DE ORDEN DEUDORAS71view + Mercaderias Recibidas en Consignación711other + Depósito de Valores Recibos en Garantía712other + Garantias Otorgadas713other + Documentos Descontados714other + Documentos Endosados715other + CUENTAS DE ORDEN ACREEDORAS72view + Comitente por Mercaderias Recibidas en Consignación721other + Acreedor por Garantías Otorgadas722other + Acreedor por Documentos Descontados723other + + + Chile - Plan de Cuentas + + + + + + + + + + + + + diff --git a/addons/l10n_cl/l10n_cl_wizard.xml b/addons/l10n_cl/l10n_cl_wizard.xml new file mode 100644 index 00000000000..191230c5010 --- /dev/null +++ b/addons/l10n_cl/l10n_cl_wizard.xml @@ -0,0 +1,15 @@ + + + + + + Generate Chart of Accounts from a Chart Template + Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. + This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. + + + automatic + + + + diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py index 6e66c77e45b..e173c5ebba2 100644 --- a/addons/l10n_cn/__openerp__.py +++ b/addons/l10n_cn/__openerp__.py @@ -26,9 +26,9 @@ "website":"http://openerp-china.org", "url":"http://code.google.com/p/openerp-china/source/browse/#svn/trunk/l10n_cn", "description": """ - 添加中文省份数据 - 科目类型\会计科目表模板\增值税\辅助核算类别\管理会计凭证簿\财务会计凭证簿 - ============================================================ +添加中文省份数据 +科目类型\会计科目表模板\增值税\辅助核算类别\管理会计凭证簿\财务会计凭证簿 +============================================================ """, "depends" : ["base","account"], 'init_xml': [ diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py index e224f22358a..562af835398 100644 --- a/addons/l10n_cr/__openerp__.py +++ b/addons/l10n_cr/__openerp__.py @@ -44,14 +44,14 @@ Chart of accounts for Costa Rica. ================================= Includes: -* account.type -* account.account.template -* account.tax.template -* account.tax.code.template -* account.chart.template + * account.type + * account.account.template + * account.tax.template + * account.tax.code.template + * account.chart.template -Everything is in English with Spanish translation. Further translations are welcome, please go to -http://translations.launchpad.net/openerp-costa-rica +Everything is in English with Spanish translation. Further translations are welcome, +please go to http://translations.launchpad.net/openerp-costa-rica. """, 'depends': ['account', 'account_chart', 'base'], 'init_xml': [], diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py index 95b8ab7b57c..b2897e07748 100644 --- a/addons/l10n_es/__openerp__.py +++ b/addons/l10n_es/__openerp__.py @@ -31,14 +31,14 @@ Spanish Charts of Accounts (PGCE 2008). ======================================= -* Defines the following chart of account templates: - * Spanish General Chart of Accounts 2008. - * Spanish General Chart of Accounts 2008 for small and medium companies. -* Defines templates for sale and purchase VAT. -* Defines tax code templates. + * Defines the following chart of account templates: + * Spanish General Chart of Accounts 2008 + * Spanish General Chart of Accounts 2008 for small and medium companies + * Defines templates for sale and purchase VAT + * Defines tax code templates -Note: You should install the l10n_ES_account_balance_report module -for yearly account reporting (balance, profit & losses). +Note: You should install the l10n_ES_account_balance_report module for yearly + account reporting (balance, profit & losses). """, "license" : "GPL-3", "depends" : ["account", "base_vat", "base_iban"], diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py index 99849d62649..ec31f71513a 100644 --- a/addons/l10n_fr/__openerp__.py +++ b/addons/l10n_fr/__openerp__.py @@ -35,11 +35,21 @@ This is the module to manage the accounting chart for France in OpenERP. ======================================================================== -This module applies to companies based in France mainland. It doesn't apply to companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, Mayotte, etc...) +This module applies to companies based in France mainland. It doesn't apply to +companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, Mayotte). -This localisation module creates the VAT taxes of type "tax included" for purchases (it is notably required when you use the module "hr_expense"). Beware that these "tax included" VAT taxes are not managed by the fiscal positions provided by this module (because it is complex to manage both "tax excluded" and "tax included" scenarios in fiscal positions). +This localisation module creates the VAT taxes of type "tax included" for purchases +(it is notably required when you use the module "hr_expense"). Beware that these +"tax included" VAT taxes are not managed by the fiscal positions provided by this +module (because it is complex to manage both "tax excluded" and "tax included" +scenarios in fiscal positions). -This localisation module doesn't properly handle the scenario when a France-mainland company sells services to a company based in the DOMs. We could manage it in the fiscal positions, but it would require to differentiate between "product" VAT taxes and "service" VAT taxes. We consider that it is too "heavy" to have this by default in l10n_fr ; companies that sell services to DOM-based companies should update the configuration of their taxes and fiscal positions manually. +This localisation module doesn't properly handle the scenario when a France-mainland +company sells services to a company based in the DOMs. We could manage it in the +fiscal positions, but it would require to differentiate between "product" VAT taxes +and "service" VAT taxes. We consider that it is too "heavy" to have this by default +in l10n_fr; companies that sell services to DOM-based companies should update the +configuration of their taxes and fiscal positions manually. Credits: Sistheo, Zeekom, CrysaLEAD, Akretion and Camptocamp. """, diff --git a/addons/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py index b9bc3b74f22..c3b2c332a46 100755 --- a/addons/l10n_fr_hr_payroll/__openerp__.py +++ b/addons/l10n_fr_hr_payroll/__openerp__.py @@ -25,19 +25,22 @@ 'depends': ['hr_payroll', 'l10n_fr'], 'version': '1.0', 'description': """ -French Payroll Rules -======================= +French Payroll Rules. +===================== - -Configuration of hr_payroll for french localization - -All main contributions rules for french payslip, for 'cadre' and 'non-cadre' - -New payslip report + - Configuration of hr_payroll for French localization + - All main contributions rules for French payslip, for 'cadre' and 'non-cadre' + - New payslip report - TODO : - -Integration with holidays module for deduction and allowance - -Integration with hr_payroll_account for the automatic account_move_line creation from the payslip - -Continue to integrate the contribution. Only the main contribution are currently implemented - -Remake the report under webkit - -The payslip.line with appears_in_payslip = False should appears in the payslip interface, but not in the payslip report +TODO : + - Integration with holidays module for deduction and allowance + - Integration with hr_payroll_account for the automatic account_move_line + creation from the payslip + - Continue to integrate the contribution. Only the main contribution are + currently implemented + - Remake the report under webkit + - The payslip.line with appears_in_payslip = False should appears in the + payslip interface, but not in the payslip report """, 'active': False, diff --git a/addons/l10n_fr_rib/__openerp__.py b/addons/l10n_fr_rib/__openerp__.py index ac1b03f4b3e..fedac46381d 100644 --- a/addons/l10n_fr_rib/__openerp__.py +++ b/addons/l10n_fr_rib/__openerp__.py @@ -25,17 +25,26 @@ "category": 'Hidden/Dependency', 'description': ''' This module lets users enter the banking details of Partners in the RIB format (French standard for bank accounts details). -RIB Bank Accounts can be entered in the "Accounting" tab of the Partner form by specifying the account type "RIB". The four standard RIB fields will then become mandatory: -- Bank Code -- Office Code -- Account number -- RIB key -As a safety measure, OpenERP will check the RIB key whenever a RIB is saved, and will refuse to record the data if the key is incorrect. Please bear in mind that this can only happen when the user presses the "save" button, for example on the Partner Form. -Since each bank account may relate to a Bank, users may enter the RIB Bank Code in the Bank form - it will the pre-fill the Bank Code on the RIB when they select the Bank. -To make this easier, this module will also let users find Banks using their RIB code. +=========================================================================================================================== -The module base_iban can be a useful addition to this module, because French banks are now progressively adopting the international IBAN format instead of the RIB format. -The RIB and IBAN codes for a single account can be entered by recording two Bank Accounts in OpenERP: the first with the type "RIB", the second with the type "IBAN". +RIB Bank Accounts can be entered in the "Accounting" tab of the Partner form by specifying +the account type "RIB". The four standard RIB fields will then become mandatory: + - Bank Code + - Office Code + - Account number + - RIB key +As a safety measure, OpenERP will check the RIB key whenever a RIB is saved, and +will refuse to record the data if the key is incorrect. Please bear in mind that +this can only happen when the user presses the "save" button, for example on the +Partner Form. Since each bank account may relate to a Bank, users may enter the +RIB Bank Code in the Bank form - it will the pre-fill the Bank Code on the RIB +when they select the Bank. To make this easier, this module will also let users +find Banks using their RIB code. + +The module base_iban can be a useful addition to this module, because French banks +are now progressively adopting the international IBAN format instead of the RIB format. +The RIB and IBAN codes for a single account can be entered by recording two Bank +Accounts in OpenERP: the first with the type "RIB", the second with the type "IBAN". ''', 'author' : u'Numérigraphe SARL', 'depends': ['account', 'base_iban'], diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py index f05bbdaaff1..44389e68439 100644 --- a/addons/l10n_gt/__openerp__.py +++ b/addons/l10n_gt/__openerp__.py @@ -40,7 +40,9 @@ This is the base module to manage the accounting chart for Guatemala. ===================================================================== -Agrega una nomenclatura contable para Guatemala. También icluye impuestos y la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also includes taxes and the Quetzal currency""", +Agrega una nomenclatura contable para Guatemala. También icluye impuestos y +la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also includes +taxes and the Quetzal currency.""", 'author': 'José Rodrigo Fernández Menegazzo', 'website': 'http://solucionesprisma.com/', 'depends': ['base', 'account', 'account_chart'], diff --git a/addons/l10n_hn/__openerp__.py b/addons/l10n_hn/__openerp__.py index af8bb4cfa1d..25655e52e70 100644 --- a/addons/l10n_hn/__openerp__.py +++ b/addons/l10n_hn/__openerp__.py @@ -36,7 +36,10 @@ 'name': 'Honduras - Accounting', 'version': '0.1', 'category': 'Localization/Account Charts', - 'description': """Agrega una nomenclatura contable para Honduras. También incluye impuestos y la moneda Lempira. -- Adds accounting chart for Honduras. It also includes taxes and the Lempira currency""", + 'description': """ +Agrega una nomenclatura contable para Honduras. También incluye impuestos y la +moneda Lempira. -- Adds accounting chart for Honduras. It also includes taxes +and the Lempira currency.""", 'author': 'Salvatore Josue Trimarchi Pinto', 'website': 'http://trimarchi.co.cc', 'depends': ['base', 'account', 'account_chart'], diff --git a/addons/l10n_in/__init__.py b/addons/l10n_in/__init__.py index 19de03b504c..49a09e5570e 100644 --- a/addons/l10n_in/__init__.py +++ b/addons/l10n_in/__init__.py @@ -1,29 +1,21 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # -# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved. -# Fabien Pinckaers +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). # -# WARNING: This program as such is intended to be used by professional -# programmers who take the whole responsability of assessing all potential -# consequences resulting from its eventual inadequacies and bugs -# End users who are looking for a ready-to-use solution with commercial -# garantees and support are strongly adviced to contract a Free Software -# Service Company +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. # -# This program is Free Software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # ############################################################################## diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py index c13139f6736..1e49509c627 100644 --- a/addons/l10n_in/__openerp__.py +++ b/addons/l10n_in/__openerp__.py @@ -1,8 +1,8 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). +# Copyright (C) 2004-2010 Tiny SPRL (). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -20,11 +20,11 @@ ############################################################################## { - "name": "India - Accounting", + "name": "Indian - Accounting", "version": "1.0", "description": """ -Indian Accounting : Chart of Account. -===================================== +Indian Accounting: Chart of Account. +==================================== Indian accounting chart and localization. """, @@ -36,7 +36,11 @@ Indian accounting chart and localization. ], "demo_xml": [], "update_xml": [ - "l10n_in_chart.xml", + "l10n_in_tax_code_template.xml", + "l10n_in_public_chart.xml", + "l10n_in_public_tax_template.xml", + "l10n_in_private_chart.xml", + "l10n_in_private_tax_template.xml", "l10n_in_wizard.xml", ], "auto_install": False, diff --git a/addons/l10n_in/account_tax.xml b/addons/l10n_in/account_tax.xml deleted file mode 100644 index 5cba82b748f..00000000000 --- a/addons/l10n_in/account_tax.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - PPn (10%)(10.0%) - 0.100000 - percent - - - - - - - - - - diff --git a/addons/l10n_in/account_tax_code.xml b/addons/l10n_in/account_tax_code.xml deleted file mode 100644 index bec870dd426..00000000000 --- a/addons/l10n_in/account_tax_code.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - Tax balance to pay - - - - Tax Due (Tax to pay) - - - - - Tax payable - - - - - Tax bases - - - - Base of taxed sales - - - - - - Base of taxed purchases - - - - - diff --git a/addons/l10n_in/l10n_in_chart.xml b/addons/l10n_in/l10n_in_chart.xml deleted file mode 100644 index d18d2b801e0..00000000000 --- a/addons/l10n_in/l10n_in_chart.xml +++ /dev/null @@ -1,447 +0,0 @@ - - - - - - - - Indian Chart of Account - 0 - view - - - - - - Balance Sheet - IA_AC0 - view - - - - - - - Assets - IA_AC01 - view - - - - - - - Current Assets - IA_AC011 - view - - - - - - - Bank Account - IA_AC0111 - liquidity - - - - - - - Cash In Hand Account - IA_AC0112 - view - - - - - - - Cash Account - IA_AC01121 - view - - - - - - - Deposit Account - IA_AC0113 - other - - - - - - - Loan & Advance(Assets) Account - IA_AC0114 - other - - - - - - - Total Sundry Debtors Account - IA_AC0116 - view - - - - - - - Sundry Debtors Account - IA_AC01161 - receivable - - - - - - - Fixed Assets - IA_AC012 - other - - - - - - - Investment - IA_AC013 - other - - - - - - - Misc. Expenses(Asset) - IA_AC014 - other - - - - - - - Liabilities - IA_AC02 - view - - - - - - - Current Liabilities - IA_AC021 - view - - - - - - - Duties & Taxes - IA_AC0211 - other - - - - - - - Provision - IA_AC0212 - other - - - - - - - Total Sundry Creditors - IA_AC0213 - view - - - - - - - Sundry Creditors Account - IA_AC02131 - payable - - - - - - - Branch/Division - IA_AC022 - other - - - - - - - Share Holder/Owner Fund - IA_AC023 - view - - - - - - - Capital Account - IA_AC0231 - other - - - - - - - Reserve and Profit/Loss Account - IA_AC0232 - other - - - - - - - Loan(Liability) Account - IA_AC024 - view - - - - - - - Bank OD Account - IA_AC0241 - other - - - - - - - Secured Loan Account - IA_AC0242 - other - - - - - - - Unsecured Loan Account - IA_AC0243 - other - - - - - - - Suspense Account - IA_AC025 - other - - - - - - - - Profit And Loss Account - IA_AC1 - view - - - - - - - Expense - IA_AC11 - view - - - - - - - Direct Expenses - IA_AC111 - other - - - - - - - Indirect Expenses - IA_AC112 - other - - - - - - - Purchase - IA_AC113 - other - - - - - - - Opening Stock - IA_AC114 - other - - - - - - Salary Expenses - IA_AC115 - other - - - - - - - - Income - IA_AC12 - view - - - - - - - Direct Incomes - IA_AC121 - other - - - - - - - Indirect Incomes - IA_AC122 - other - - - - - - - Sales Account - IA_AC123 - other - - - - - - Goods Given Account - IA_AC124 - other - - - - - - - - - Tax - - - - Tax Balance to Pay - - - - - Tax Due (Tax to pay) - - - - - Tax Payable - - - - - Tax Bases - - - - - - Base of Taxed Sales - - - - - - Base of Taxed Purchases - - - - - OPJ - Opening Journal - situation - - - - - India - Chart of Accounts - - - - - - - - - - - - - diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml new file mode 100644 index 00000000000..db11d0638c8 --- /dev/null +++ b/addons/l10n_in/l10n_in_private_chart.xml @@ -0,0 +1,523 @@ + + + + + + + + Partnership/Private Firm Chart of Account + 0 + view + + + + + + + Balance Sheet + 1 + view + + + + + + + + + Assets + 10 + view + + + + + + + Cash + 101 + liquidity + + + + Checking account balance (as shown in company records), currency, coins, checks received from customers but not yet deposited. + + + + Accounts Receivable + 120 + receivable + + + + Amounts owed to the company for services performed or products sold but not yet paid for. + + + + Merchandise Inventory + 140 + other + + + + Cost of merchandise purchased but has not yet been sold. + + + + Supplies + 150 + other + + + + Cost of supplies that have not yet been used. Supplies that have been used are recorded in Supplies Expense. + + + + Prepaid Insurance + 160 + other + + + + Cost of insurance that is paid in advance and includes a future accounting period. + + + + Land + 170 + other + + + + Cost to acquire and prepare land for use by the company. + + + + Buildings + 175 + other + + + + Cost to purchase or construct buildings for use by the company. + + + + Accumulated Depreciation - Buildings + 178 + other + + + + Amount of the buildings' cost that has been allocated to Depreciation Expense since the time the building was acquired. + + + + Equipment + 180 + other + + + + Cost to acquire and prepare equipment for use by the company. + + + + Accumulated Depreciation - Equipment + 188 + other + + + + Amount of equipment's cost that has been allocated to Depreciation Expense since the time the equipment was acquired. + + + + Tax Receivable + 189 + other + + + + + + + + Liabilities + 20 + view + + + + + + + Notes Payable + 210 + other + + + + The amount of principal due on a formal written promise to pay. Loans from banks are included in this account. + + + + Accounts Payable + 215 + payable + + + + Amount owed to suppliers who provided goods and services to the company but did not require immediate payment in cash. + + + + Wages Payable + 220 + other + + + + Amount owed to employees for hours worked but not yet paid. + + + + Interest Payable + 230 + other + + + + Amount owed for interest on Notes Payable up until the date of the balance sheet. This is computed by multiplying the amount of the note times the effective interest rate times the time period. + + + + Unearned Revenues + 240 + other + + + + Amounts received in advance of delivering goods or providing services. When the goods are delivered or services are provided, this liability amount decreases. + + + + Mortgage Loan Payable + 250 + other + + + + A formal loan that involves a lien on real estate until the loan is repaid. + + + + Reserve and Surplus Account + 260 + other + + + + A Reserve and Surplus Account. + + + + + + + Tax payable + 216 + view + + + + + + + Sales Tax Payable + 2161 + other + + + + + + + VAT Payable + 2162 + other + + + + + + + Service Tax Payable + 2163 + other + + + + + + + Exice Duty Payable + 2164 + other + + + + + + + + + Owner's Equity Accounts + 29 + view + + + + + + + + + + Profit And Loss + 3 + view + + + + + + + + + Income + 30 + view + + + + + + + + + Operating Revenue Accounts + 31 + view + + + + + + + Service Revenues + 310 + other + + + + Amounts earned from providing services to clients, either for cash or on credit. When a service is provided on credit, both this account and Accounts Receivable will increase. When a service is provided for immediate cash, both this account and Cash will increase. + + + + Product Sales + 311 + other + + + + Sales of product account + + + + Non-Operating Revenue and Gains + 80 + view + + + + + + + Interest Revenues + 810 + other + + + + Interest and dividends earned on bank accounts, investments or notes receivable. This account is increased when the interest is earned and either Cash or Interest Receivable is also increased. + + + + Gain on Sale of Assets + 811 + other + + + + Occurs when the company sells one of its assets (other than inventory) for more than the asset's book value. + + + + + + Expense + 50 + view + + + + + + + Operating Expense Accounts + 51 + view + + + + + + + Salaries Expense + 500 + other + + + + Expenses incurred for the work performed by salaried employees during the accounting period. These employees normally receive a fixed amount on a weekly, monthly, or annual basis. + + + + Wages Expense + 510 + other + + + + Expenses incurred for the work performed by non-salaried employees during the accounting period. These employees receive an hourly rate of pay. + + + + Supplies Expense + 540 + other + + + + Cost of supplies used up during the accounting period. + + + + Rent Expense + 560 + other + + + + Cost of occupying rented facilities during the accounting period. + + + + Utilities Expense + 570 + other + + + + Costs for electricity, heat, water, and sewer that were used during the accounting period. + + + + Telephone Expense + 576 + other + + + + Cost of telephone used during the current accounting period. + + + + Advertising Expense + 610 + other + + + + Costs incurred by the company during the accounting period for ads, promotions, and other selling and expenses (other than salaries). + + + + Depreciation Expense + 750 + other + + + + Cost of long-term assets allocated to expense during the current accounting period. + + + + + + Non-Operating Expenses and Losses + 90 + view + + + + + + + Loss on Sale of Assets + 960 + other + + + + Occurs when the company sells one of its assets (other than inventory) for less than the asset's book value. + + + + + + India - Chart of Accounts for Private Ltd/Partnership + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml new file mode 100644 index 00000000000..7aec30f0575 --- /dev/null +++ b/addons/l10n_in/l10n_in_private_tax_template.xml @@ -0,0 +1,270 @@ + + + + + + + Sale Tax-15% + + 0.15 + percent + sale + + + + + + + + + + + + Sale Tax-12% + + 0.12 + percent + sale + + + + + + + + + + + + Sale Tax-4% + + 0.04 + percent + sale + + + + + + + + + + + + + + Purchase Tax-15% + + + + 0.15 + percent + purchase + + + + + + + + + + + VAT-5%(4% VAT+1% Add. Tax.) + + 0.05 + percent + all + + + + 1 + + 1 + + 1 + + 1 + + + + + + VAT-15%(12.5% VAT+2.5% Add. Tax.) + + 0.15 + percent + all + + + + 1 + + 1 + + 1 + + 1 + + + + + + VAT-8% + + 0.08 + percent + all + + + + + + + + + + + + VAT-10% + + 0.10 + percent + all + + + + + + + + + + + + VAT-12.5% + + 12.5 + percent + all + + + + + + + + + + + + + + Excise Duty-10.30% + + 0.10 + percent + sale + + + + 1 + + 1 + + 1 + + 1 + + + + + + Excise Duty-2% + 0.02 + percent + sale + + + + + 1 + + 1 + + 1 + + 1 + + + + + Excise Duty-1% + 0.01 + percent + sale + + + + 1 + + 1 + + 1 + + 1 + + + + + + + + all + Service Tax-12.30% + + 0.12 + percent + + + + + + + + + + + + Service Tax-%2 + 0.02 + percent + all + + + + + + + + + + + + Service Tax-%1 + 0.01 + percent + all + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml new file mode 100644 index 00000000000..2c2dda0dd9d --- /dev/null +++ b/addons/l10n_in/l10n_in_public_chart.xml @@ -0,0 +1,676 @@ + + + + + + + + + Public Firm Chart of Account + 0 + view + + + + + + + Balance Sheet + 1 + view + + + + + + + + Assets + 10 + view + + + + + + + Current Assets + 10000 + view + + + + + + + Cash - Regular Checking + 10100 + liquidity + + + + + + + Cash - Payroll Checking + 10200 + liquidity + + + + + + + Petty Cash Fund + 10600 + liquidity + + + + + + + Accounts Receivable + 12100 + receivable + + + + + + + Allowance for Doubtful Accounts + 12500 + other + + + + + + + Inventory + 13100 + other + + + + + + + Supplies + 14100 + other + + + + + + + Prepaid Insurance + 15300 + other + + + + + + + Tax Receivable + 15400 + other + + + + + + + + + Property, Plant, and Equipment + 17000 + view + + + + + + + Land + 17200 + other + + + + + + + Buildings + 17100 + other + + + + + + + Equipment + 17300 + other + + + + + + + Vehicles + 17800 + other + + + + + + + Accumulated Depreciation - Buildings + 18100 + other + + + + + + + Accumulated Depreciation - Equipment + 18300 + other + + + + + + + Accumulated Depreciation - Vehicles + 18800 + other + + + + + + + + + Liabilities + 20 + view + + + + + + + Current Liabilities + 20000 + view + + + + + + + Notes Payable - Credit Line #1 + 20100 + other + + + + + + + Notes Payable - Credit Line #2 + 20200 + other + + + + + + + Accounts Payable + 21000 + payable + + + + + + + Wages Payable + 22100 + other + + + + + + + Interest Payable + 23100 + other + + + + + + + Unearned Revenues + 24500 + other + + + + + + + Long-term Liabilities + 25000 + view + + + + + + + Mortgage Loan Payable + 25100 + other + + + + + + + Bonds Payable + 25600 + other + + + + + + + Discount on Bonds Payable + 25650 + other + + + + + + + Stockholders' Equity + 27000 + view + + + + + + + Common Stock, No Par + 27100 + other + + + + + + + Retained Earnings + 27500 + other + + + + + + + Treasury Stock + 29500 + other + + + + + + + Reserve and Surplus Account + 24600 + other + + + + + + + + + Tax payable + 24700 + view + + + + + + + Sales Tax Payable + 24710 + other + + + + + + + VAT Payable + 24720 + other + + + + + + + Exice Duty Payable + 24730 + other + + + + + + + Service Tax Payable + 24740 + other + + + + + + + + + Profit And Loss + 3 + view + + + + + + + + + Income + 30 + view + + + + + + + + + Operating Revenues + 30000 + view + + + + + + + Sales - Division #1, Product Line 010 + 31010 + other + + + + + + + Sales - Division #1, Product Line 022 + 31022 + other + + + + + + + Sales - Division #2, Product Line 015 + 32015 + other + + + + + + + Sales - Division #3, Product Line 110 + 33110 + other + + + + + + + Non-Operating Revenue and Gains + 90000 + view + + + + + + + Gain on Sale of Assets + 91800 + other + + + + + + + + + Expense + 40 + view + + + + + + + + + + Cost of Goods Sold + 40000 + view + + + + + + + + COGS - Division #1, Product Line 010 + 41010 + other + + + + + + + COGS - Division #1, Product Line 022 + 41022 + other + + + + + + + COGS - Division #2, Product Line 015 + 42015 + other + + + + + + + COGS - Division #3, Product Line 110 + 43110 + other + + + + + + + + + Marketing Expenses + 50000 + view + + + + + + + Marketing Dept. Salaries + 50100 + other + + + + + + + Marketing Dept. Payroll Taxes + 50150 + other + + + + + + + Marketing Dept. Supplies + 50200 + other + + + + + + + Marketing Dept. Telephone + 50600 + other + + + + + + + + + Payroll Dept. Expenses + 59000 + view + + + + + + + Payroll Dept. Salaries + 59100 + other + + + + + + + Payroll Dept. Payroll Taxes + 59150 + other + + + + + + + Payroll Dept. Supplies + 59200 + other + + + + + + + Payroll Dept. Telephone + 59600 + other + + + + + + + + + Non-Operating Expenses and Losses + 96000 + view + + + + + + + Loss on Sale of Assets + 96100 + other + + + + + + + India - Chart of Accounts for Public Ltd + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml new file mode 100644 index 00000000000..03dbfa7cc75 --- /dev/null +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -0,0 +1,295 @@ + + + + + + + + Sale Tax-15% + + + + 0.15 + percent + sale + + + + + + + + + Sale Tax-12% + + + + 0.12 + percent + sale + + + + + + + + + Sale Tax-4% + + + + 0.04 + percent + sale + + + + + + + + + + + Purchase Tax-15% + + + + 0.15 + percent + purchase + + + + + + + + + + + + + VAT-5%(4% VAT+1% Add. Tax.) + + + + 0.05 + percent + all + + 1 + + 1 + + 1 + + 1 + + + + + + VAT-15% (12.5% VAT + 2.5% Add. Tax.) + + + + 0.15 + percent + all + + 1 + + 1 + + 1 + + 1 + + + + + + VAT-8% + + + + 0.08 + percent + all + + 1 + + 1 + + 1 + + 1 + + + + + + VAT-10% + + + + 0.10 + percent + all + + 1 + + 1 + + 1 + + 1 + + + + + + VAT-12.5% + + + + 12.5 + percent + all + + 1 + + 1 + + 1 + + 1 + + + + + + + + Service Tax-12.30% + + + + 0.12 + percent + all + + 1 + + 1 + + 1 + + 1 + + + + + Service Tax-%2 + + + + + 1 + + 1 + + 1 + + 1 + 0.02 + percent + all + + + + + + Service Tax-%1 + 0.01 + + + + + 1 + + 1 + + 1 + + 1 + percent + all + + + + + + + + Excise Duty-10.30% + + + + 0.10 + percent + sale + + 1 + + 1 + + 1 + + 1 + + + + + + Excise Duty-2% + 0.02 + percent + sale + + + + 1 + + 1 + + 1 + + 1 + + + + + + Excise Duty-1% + 0.01 + percent + sale + + + + 1 + + 1 + + 1 + + 1 + + + + + + \ No newline at end of file diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml new file mode 100644 index 00000000000..94217d79c3c --- /dev/null +++ b/addons/l10n_in/l10n_in_tax_code_template.xml @@ -0,0 +1,42 @@ + + + + + + + Tax + + + + Tax Balance to Pay + + + + + Tax Received + + + + + Tax Paid + + + + + Tax Bases + + + + + + Base of Taxed Sales + + + + + Base of Taxed Purchases + + + + + diff --git a/addons/l10n_in/l10n_in_wizard.xml b/addons/l10n_in/l10n_in_wizard.xml index 9c53722876b..a877b8b577e 100644 --- a/addons/l10n_in/l10n_in_wizard.xml +++ b/addons/l10n_in/l10n_in_wizard.xml @@ -1,3 +1,4 @@ + diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py index bb12abd76fc..1ade34faaca 100644 --- a/addons/l10n_lu/__openerp__.py +++ b/addons/l10n_lu/__openerp__.py @@ -28,7 +28,7 @@ This is the base module to manage the accounting chart for Luxembourg. ====================================================================== - * the KLUWER Chart of Accounts, + * the KLUWER Chart of Accounts * the Tax Code Chart for Luxembourg * the main taxes used in Luxembourg""", 'author': 'OpenERP SA', diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py index 21b7c632d6b..52f453af8bb 100644 --- a/addons/l10n_ma/__openerp__.py +++ b/addons/l10n_ma/__openerp__.py @@ -28,7 +28,11 @@ This is the base module to manage the accounting chart for Maroc. ================================================================= -Ce Module charge le modèle du plan de comptes standard Marocain et permet de générer les états comptables aux normes marocaines (Bilan, CPC (comptes de produits et charges), balance générale à 6 colonnes, Grand livre cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet d'expertise comptable Seddik au cours du troisième trimestre 2010""", +Ce Module charge le modèle du plan de comptes standard Marocain et permet de +générer les états comptables aux normes marocaines (Bilan, CPC (comptes de +produits et charges), balance générale à 6 colonnes, Grand livre cumulatif...). +L'intégration comptable a été validé avec l'aide du Cabinet d'expertise comptable +Seddik au cours du troisième trimestre 2010.""", "website": "http://www.kazacube.com", "depends" : ["base", "account"], "init_xml" : [], diff --git a/addons/l10n_multilang/__openerp__.py b/addons/l10n_multilang/__openerp__.py index 42ca20a2f8e..cf521f124f4 100644 --- a/addons/l10n_multilang/__openerp__.py +++ b/addons/l10n_multilang/__openerp__.py @@ -25,10 +25,11 @@ "author" : "OpenERP SA", "category": 'Hidden/Dependency', "description": """ - * Multi language support for Chart of Accounts, Taxes, Tax Codes , Journals, Accounting Templates, - Analytic Chart of Accounts and Analytic Journals. + * Multi language support for Chart of Accounts, Taxes, Tax Codes, Journals, + Accounting Templates, Analytic Chart of Accounts and Analytic Journals. * Setup wizard changes - - Copy translations for COA, Tax, Tax Code and Fiscal Position from templates to target objects. + - Copy translations for COA, Tax, Tax Code and Fiscal Position from + templates to target objects. """, 'website': 'http://www.openerp.com', 'init_xml': [], diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py index 562fd0ab876..8b9cc3de451 100644 --- a/addons/l10n_nl/__openerp__.py +++ b/addons/l10n_nl/__openerp__.py @@ -94,19 +94,25 @@ This is the module to manage the accounting chart for Netherlands in OpenERP. ============================================================================= Read changelog in file __openerp__.py for version information. -Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor Nederlandse bedrijven te installeren in OpenERP versie 5. +Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor +Nederlandse bedrijven te installeren in OpenERP versie 5. -De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te genereren, denk b.v. aan intracommunautaire verwervingen -waarbij u 19% BTW moet opvoeren, maar tegelijkertijd ook 19% als voorheffing weer mag aftrekken. +De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te genereren, +denk b.v. aan intracommunautaire verwervingen waarbij u 19% BTW moet opvoeren, +maar tegelijkertijd ook 19% als voorheffing weer mag aftrekken. Na installatie van deze module word de configuratie wizard voor "Accounting" aangeroepen. - * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook het Nederlandse grootboekschema bevind. + * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook het + Nederlandse grootboekschema bevind. - * Als de configuratie wizard start, wordt u gevraagd om de naam van uw bedrijf in te voeren, welke grootboekschema te installeren, uit hoeveel cijfers een grootboekrekening mag bestaan, het rekeningnummer van uw bank en de currency om Journalen te creeren. + * Als de configuratie wizard start, wordt u gevraagd om de naam van uw bedrijf + in te voeren, welke grootboekschema te installeren, uit hoeveel cijfers een + grootboekrekening mag bestaan, het rekeningnummer van uw bank en de currency + om Journalen te creeren. -Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit 4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult met "nullen" - - * Dit is dezelfe configuratie wizard welke aangeroepen kan worden via Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. +Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit 4 +cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal verhogen. +De extra cijfers worden dan achter het rekeningnummer aangevult met "nullen". """, "author" : "Veritos - Jan Verlaan", diff --git a/addons/l10n_pe/__openerp__.py b/addons/l10n_pe/__openerp__.py index fa65c1033b7..7908664ca83 100644 --- a/addons/l10n_pe/__openerp__.py +++ b/addons/l10n_pe/__openerp__.py @@ -22,9 +22,10 @@ "name": "Peru Localization Chart Account", "version": "1.0", "description": """ -Peruvian accounting chart and tax localization. Acording the PCGE 2010 +Peruvian accounting chart and tax localization. Acording the PCGE 2010. -Plan contable peruano e impuestos de acuerdo a disposiciones vigentes de la SUNAT 2011 (PCGE 2010) +Plan contable peruano e impuestos de acuerdo a disposiciones vigentes de la +SUNAT 2011 (PCGE 2010). """, "author": ["Cubic ERP"], diff --git a/addons/l10n_syscohada/__openerp__.py b/addons/l10n_syscohada/__openerp__.py index 01c1aaef96f..2fd6917ec11 100644 --- a/addons/l10n_syscohada/__openerp__.py +++ b/addons/l10n_syscohada/__openerp__.py @@ -24,12 +24,15 @@ "version" : "1.0", "author" : "Baamtu Senegal", "category" : "Localization/Account Charts", - "description": """This module implements the accounting chart for OHADA area. - It allows any company or association to manage its financial accounting. - Countries that use OHADA are the following: + "description": """ +This module implements the accounting chart for OHADA area. +=========================================================== + +It allows any company or association to manage its financial accounting. +Countries that use OHADA are the following: Benin, Burkina Faso, Cameroon, Central African Republic, Comoros, Congo, - Ivory Coast, Gabon, Guinea, Guinea Bissau, - Equatorial Guinea, Mali, Niger, Replica of Democratic Congo, Senegal, Chad, Togo. + Ivory Coast, Gabon, Guinea, Guinea Bissau, Equatorial Guinea, Mali, Niger, + Replica of Democratic Congo, Senegal, Chad, Togo. """, "website": "http://www.baamtu.com", "depends" : ["account", "base_vat"], diff --git a/addons/l10n_tr/__openerp__.py b/addons/l10n_tr/__openerp__.py index ad4621499d3..d72865a216c 100644 --- a/addons/l10n_tr/__openerp__.py +++ b/addons/l10n_tr/__openerp__.py @@ -23,10 +23,11 @@ 'category': 'Localization/Account Charts', 'description': """ Türkiye için Tek düzen hesap planı şablonu OpenERP Modülü. -============================================================================== +========================================================== Bu modül kurulduktan sonra, Muhasebe yapılandırma sihirbazı çalışır - * Sihirbaz sizden hesap planı şablonu, planın kurulacağı şirket,banka hesap bilgileriniz,ilgili para birimi gibi bilgiler isteyecek. + * Sihirbaz sizden hesap planı şablonu, planın kurulacağı şirket, banka hesap + bilgileriniz, ilgili para birimi gibi bilgiler isteyecek. """, 'author': 'Ahmet Altınışık', 'maintainer':'https://launchpad.net/~openerp-turkey', diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py index f6e8212aed0..444ea2b9dd3 100644 --- a/addons/l10n_uk/__openerp__.py +++ b/addons/l10n_uk/__openerp__.py @@ -23,7 +23,9 @@ 'name': 'UK - Accounting', 'version': '1.0', 'category': 'Localization/Account Charts', - 'description': """This is the latest UK OpenERP localisation necesary to run OpenERP accounting for UK SME's with: + 'description': """ +This is the latest UK OpenERP localisation necessary to run OpenERP accounting +for UK SME's with: - a CT600-ready chart of accounts - VAT100-ready tax structure - InfoLogic UK counties listing diff --git a/addons/l10n_us/__openerp__.py b/addons/l10n_us/__openerp__.py index 4aac9b14287..f900c3d5e99 100644 --- a/addons/l10n_us/__openerp__.py +++ b/addons/l10n_us/__openerp__.py @@ -24,7 +24,7 @@ "author": "OpenERP SA", "category": 'Localization/Account Charts', "description": """ - United States - Chart of accounts +United States - Chart of accounts. """, 'website': 'http://www.openerp.com', 'init_xml': [], diff --git a/addons/l10n_uy/__openerp__.py b/addons/l10n_uy/__openerp__.py index 4edfe22e1e8..5e4eb51ffc0 100644 --- a/addons/l10n_uy/__openerp__.py +++ b/addons/l10n_uy/__openerp__.py @@ -28,10 +28,10 @@ "category" : "Localization/Account Charts", "website" : "https://launchpad.net/openerp-uruguay", "description": """ -General Chart of Accounts -========================= +General Chart of Accounts. +========================== -Provide Templates for Chart of Accounts, Taxes for Uruguay +Provide Templates for Chart of Accounts, Taxes for Uruguay. """, "license" : "AGPL-3", diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py index 4ce4eaf3d6b..ad476588e93 100644 --- a/addons/lunch/__openerp__.py +++ b/addons/lunch/__openerp__.py @@ -22,22 +22,15 @@ { "name": "Lunch Orders", "author": "OpenERP SA", - "Description": """ - The lunch module is for keeping a record of the order placed and payment of the orders. - ======================================================================================= - - The products are defined under categories and the payment records are maintained user-wise. - Every user has a cashbox which keeps track of the amount paid for a particular order. - - """, "version": "0.1", "depends": ["base_tools"], "category" : "Tools", 'description': """ - The base module to manage lunch +The base module to manage lunch. +================================ - keep track for the Lunch Order ,Cash Moves ,CashBox ,Product. - Apply Different Category for the product. +keep track for the Lunch Order, Cash Moves, CashBox, Product. Apply Different +Category for the product. """, "init_xml": [], "update_xml": [ diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index abb290332a7..ee22b0c153f 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -29,19 +29,19 @@ A bussiness oriented Social Networking with a fully-integrated email and message management. ===================================================================== + The Social Networking module provides an unified social network abstraction layer allowing applications to display a complete -communication history on documents.It gives the users the possibility +communication history on documents. It gives the users the possibility to read and send messages and emails in an unified way. It also provides a feeds page combined to a subscription mechanism, that allows to follow documents, and to be constantly updated about recent news. -The main features of the module are : - +The main features of the module are: * a clean and renewed communication history for any OpenERP - document that can act as a discussion topic, + document that can act as a discussion topic, * a discussion mean on documents, * a subscription mechanism to be updated about new messages on interesting documents, diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index 11c259b3ee8..15928cd3e26 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -14,5 +14,16 @@ + + + + + Module Social Network has been installed + Manage all communications on your documents (emails, + notifications, comments and discussions) and keep track of + news on documents you follow. + + + diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index 634b5317d27..986bb4bef38 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -81,8 +81,7 @@ - - + , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-07-24 20:29+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Norwegian Bokmal \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-07-25 04:37+0000\n" +"X-Generator: Launchpad (build 15679)\n" + +#. module: marketing +#: model:res.groups,name:marketing.group_marketing_manager +msgid "Manager" +msgstr "Manager" + +#. module: marketing +#: model:res.groups,name:marketing.group_marketing_user +msgid "User" +msgstr "Bruker" diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py index 3544145411c..e0cf8b56439 100644 --- a/addons/marketing_campaign/__openerp__.py +++ b/addons/marketing_campaign/__openerp__.py @@ -35,15 +35,23 @@ This module provides leads automation through marketing campaigns (campaigns can ========================================================================================================================================= The campaigns are dynamic and multi-channels. The process is as follows: - * Design marketing campaigns like workflows, including email templates to send, reports to print and send by email, custom actions, etc. - * Define input segments that will select the items that should enter the campaign (e.g leads from certain countries, etc.) - * Run you campaign in simulation mode to test it real-time or accelerated, and fine-tune it - * You may also start the real campaign in manual mode, where each action requires manual validation - * Finally launch your campaign live, and watch the statistics as the campaign does everything fully automatically. + * Design marketing campaigns like workflows, including email templates to + send, reports to print and send by email, custom actions + * Define input segments that will select the items that should enter the + campaign (e.g leads from certain countries.) + * Run you campaign in simulation mode to test it real-time or accelerated, + and fine-tune it + * You may also start the real campaign in manual mode, where each action + requires manual validation + * Finally launch your campaign live, and watch the statistics as the + campaign does everything fully automatically. -While the campaign runs you can of course continue to fine-tune the parameters, input segments, workflow, etc. +While the campaign runs you can of course continue to fine-tune the parameters, +input segments, workflow. -Note: If you need demo data, you can install the marketing_campaign_crm_demo module, but this will also install the CRM application as it depends on CRM Leads. +Note: If you need demo data, you can install the marketing_campaign_crm_demo + module, but this will also install the CRM application as it depends on + CRM Leads. """, 'website': 'http://www.openerp.com', 'init_xml': [], diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py index 48a4b77cf68..a05240c08e7 100644 --- a/addons/membership/__openerp__.py +++ b/addons/membership/__openerp__.py @@ -29,10 +29,10 @@ This module allows you to manage all operations for managing memberships. ========================================================================= It supports different kind of members: -* Free member -* Associated member (eg.: a group subscribes to a membership for all subsidiaries) -* Paid members, -* Special member prices, ... + * Free member + * Associated member (e.g.: a group subscribes to a membership for all subsidiaries) + * Paid members + * Special member prices It is integrated with sales and accounting to allow you to automatically invoice and send propositions for membership renewal. diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py index d1f5625e09f..d7a14237eb0 100644 --- a/addons/mrp/__openerp__.py +++ b/addons/mrp/__openerp__.py @@ -36,11 +36,11 @@ This is the base module to manage the manufacturing process in OpenERP. Features: --------- - * Make to Stock / Make to Order (by line) + * Make to Stock/Make to Order (by line) * Multi-level BoMs, no limit * Multi-level routing, no limit * Routing and work center integrated with analytic accounting - * Scheduler computation periodically / Just In Time module + * Scheduler computation periodically/Just In Time module * Multi-pos, multi-warehouse * Different reordering policies * Cost method by product: standard price, average price @@ -59,12 +59,12 @@ Reports provided by this module: * Load forecast on Work Centers * Print a production order * Stock forecasts + * Cost Structure Dashboard provided by this module: ---------------------------------- - * List of next production orders * List of procurements in exception - * Graph of work center load + * List of next production orders * Graph of stock value variation """, 'init_xml': [], diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 56ac47095a1..ea219621ea6 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -48,14 +48,14 @@ class mrp_workcenter(osv.osv): 'time_stop': fields.float('Time after prod.', help="Time in hours for the cleaning."), 'costs_hour': fields.float('Cost per hour', help="Specify Cost of Work Center per hour."), 'costs_hour_account_id': fields.many2one('account.analytic.account', 'Hour Account', domain=[('type','<>','view')], - help="Complete this only if you want automatic analytic accounting entries on production orders."), + help="Fill this only if you want automatic analytic accounting entries on production orders."), 'costs_cycle': fields.float('Cost per cycle', help="Specify Cost of Work Center per cycle."), 'costs_cycle_account_id': fields.many2one('account.analytic.account', 'Cycle Account', domain=[('type','<>','view')], - help="Complete this only if you want automatic analytic accounting entries on production orders."), + help="Fill this only if you want automatic analytic accounting entries on production orders."), 'costs_journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'), 'costs_general_account_id': fields.many2one('account.account', 'General Account', domain=[('type','<>','view')]), 'resource_id': fields.many2one('resource.resource','Resource', ondelete='cascade', required=True), - 'product_id': fields.many2one('product.product','Work Center Product', help="Fill this product to track easily your production costs in the analytic accounting."), + 'product_id': fields.many2one('product.product','Work Center Product', help="Fill this product to easily track your production costs in the analytic accounting."), } _defaults = { 'capacity_per_cycle': 1.0, @@ -448,6 +448,14 @@ class mrp_production(osv.osv): result[prod.id] = prod.date_planned[:10] return result + def _src_id_default(self, cr, uid, ids, context=None): + src_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context) + return src_location_id.id + + def _dest_id_default(self, cr, uid, ids, context=None): + dest_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context) + return dest_location_id.id + _columns = { 'name': fields.char('Reference', size=64, required=True), 'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this production order request."), @@ -496,6 +504,8 @@ class mrp_production(osv.osv): 'product_qty': lambda *a: 1.0, 'name': lambda x, y, z, c: x.pool.get('ir.sequence').get(y, z, 'mrp.production') or '/', 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.production', context=c), + 'location_src_id': _src_id_default, + 'location_dest_id': _dest_id_default } _sql_constraints = [ ('name_uniq', 'unique(name, company_id)', 'Reference must be unique per Company!'), @@ -567,10 +577,12 @@ class mrp_production(osv.osv): if bom_id: bom_point = bom_obj.browse(cr, uid, bom_id, context=context) routing_id = bom_point.routing_id.id or False + + product_uom_id = product.uom_id and product.uom_id.id or False result = { - 'product_uom': product.uom_id and product.uom_id.id or False, + 'product_uom': product_uom_id, 'bom_id': bom_id, - 'routing_id': routing_id + 'routing_id': routing_id, } return {'value': result} diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml index 64dd9f2c9e5..7e98554a2ed 100644 --- a/addons/mrp/mrp_data.xml +++ b/addons/mrp/mrp_data.xml @@ -1,6 +1,20 @@ + + + + + Module MRP has been installed + Manage your manufacturing process in OpenERP by defining bill + of materials (BoM), routings and work centers. This module + supports complete integration and planification of stockable + goods, consumable, and services. + + From the Manufacturing Settings, you can choose to compute + production schedules periodically or just-in-time. + + Production order diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py index 3cd0f2a8774..ee00ac703cb 100644 --- a/addons/mrp_jit/__openerp__.py +++ b/addons/mrp_jit/__openerp__.py @@ -30,14 +30,13 @@ This module allows Just In Time computation of procurement orders. If you install this module, you will not have to run the regular procurement scheduler anymore (but you still need to run the minimum order point rule -scheduler, or for example let it run daily.) +scheduler, or for example let it run daily). All procurement orders will be processed immediately, which could in some cases entail a small performance impact. It may also increase your stock size because products are reserved as soon as possible and the scheduler time range is not taken into account anymore. In that case, you can not use priorities any more on the different picking. - """, 'author': 'OpenERP SA', 'depends': ['procurement'], diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py index 1361f2ec3f3..2dfb429b8e7 100644 --- a/addons/mrp_operations/__openerp__.py +++ b/addons/mrp_operations/__openerp__.py @@ -25,30 +25,30 @@ 'version': '1.0', 'category': 'Manufacturing', 'description': """ -This module adds state, date_start,date_stop in production order operation lines (in the "Work Centers" tab). -============================================================================================================= +This module adds state, date_start, date_stop in manufacturing order operation lines (in the "Work Orders" tab). +================================================================================================================ Status: draft, confirm, done, cancel -When finishing/confirming,cancelling production orders set all state lines to the according state +When finishing/confirming, cancelling manufacturing orders set all state lines +to the according state. Create menus: Manufacturing > Manufacturing > Work Orders -Which is a view on "Work Centers" lines in production order. +Which is a view on "Work Orders" lines in manufacturing order. -Add buttons in the form view of production order under workcenter tab: +Add buttons in the form view of manufacturing order under workorders tab: * start (set state to confirm), set date_start * done (set state to done), set date_stop * set to draft (set state to draft) * cancel set state to cancel -When the production order becomes "ready to produce", operations must -become 'confirmed'. When the production order is done, all operations +When the manufacturing order becomes "ready to produce", operations must +become 'confirmed'. When the manufacturing order is done, all operations must become done. -The field delay is the delay(stop date - start date). -So that we can compare the theoretic delay and real delay. - +The field 'Working Hours' is the delay(stop date - start date). +So, that we can compare the theoretic delay and real delay. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py index f5a0122eb14..c54a0c383ee 100644 --- a/addons/mrp_repair/__openerp__.py +++ b/addons/mrp_repair/__openerp__.py @@ -25,9 +25,10 @@ 'version': '1.0', 'category': 'Manufacturing', 'description': """ -The aim is to have a complete module to manage all products repairs. The following topics should be covered by this module: -=========================================================================================================================== +The aim is to have a complete module to manage all products repairs. +==================================================================== +The following topics should be covered by this module: * Add/remove products in the reparation * Impact for stocks * Invoicing (products and/or services) diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index 6f14ba22bea..fc898dbf419 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -116,7 +116,7 @@ class mrp_repair(osv.osv): _columns = { 'name': fields.char('Repair Reference',size=24, required=True), 'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='This field allow you to choose the parner that will be invoiced and delivered'), + 'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='Choose partner for whom the order will be invoiced and delivered.'), 'address_id': fields.many2one('res.partner', 'Delivery Address', domain="[('parent_id','=',partner_id)]"), 'default_address_id': fields.function(_get_default_address, type="many2one", relation="res.partner"), 'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"), @@ -141,21 +141,21 @@ class mrp_repair(osv.osv): 'move_id': fields.many2one('stock.move', 'Move',required=True, domain="[('product_id','=',product_id)]", readonly=True, states={'draft':[('readonly',False)]}), 'guarantee_limit': fields.date('Guarantee limit', help="The guarantee limit is computed as: last move date + warranty defined on selected product. If the current date is below the guarantee limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards."), 'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}), - 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='The pricelist comes from the selected partner, by default.'), + 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='Pricelist of the selected partner.'), 'partner_invoice_id':fields.many2one('res.partner', 'Invoicing Address'), 'invoice_method':fields.selection([ ("none","No Invoice"), ("b4repair","Before Repair"), ("after_repair","After Repair") ], "Invoice Method", - select=True, required=True, states={'draft':[('readonly',False)]}, readonly=True, help='This field allow you to change the workflow of the repair order. If value selected is different from \'No Invoice\', it also allow you to select the pricelist and invoicing address.'), + select=True, required=True, states={'draft':[('readonly',False)]}, readonly=True, help='Selecting \'Before Repair\' or \'After Repair\' will allow you to generate invoice before or after the repair is done respectively. \'No invoice\' means you don\'t want to generate invoice for this repair order.'), 'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True), 'picking_id': fields.many2one('stock.picking', 'Picking',readonly=True), 'fees_lines': fields.one2many('mrp.repair.fee', 'repair_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}), 'internal_notes': fields.text('Internal Notes'), 'quotation_notes': fields.text('Quotation Notes'), 'company_id': fields.many2one('res.company', 'Company'), - 'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired. If cheked, it will create a picking with selected product. Note that you can select the locations in the Info tab, if you have the extended view."), + 'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired and create a picking with selected product. Note that you can select the locations in the Info tab, if you have the extended view."), 'invoiced': fields.boolean('Invoiced', readonly=True), 'repaired': fields.boolean('Repaired', readonly=True), 'amount_untaxed': fields.function(_amount_untaxed, string='Untaxed Amount', diff --git a/addons/multi_company/i18n/nb.po b/addons/multi_company/i18n/nb.po new file mode 100644 index 00000000000..e662ff634b4 --- /dev/null +++ b/addons/multi_company/i18n/nb.po @@ -0,0 +1,83 @@ +# Norwegian Bokmal translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-07-24 20:31+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Norwegian Bokmal \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-07-25 04:36+0000\n" +"X-Generator: Launchpad (build 15679)\n" + +#. module: multi_company +#: model:res.company,overdue_msg:multi_company.res_company_odoo +#: model:res.company,overdue_msg:multi_company.res_company_oerp_be +#: model:res.company,overdue_msg:multi_company.res_company_oerp_editor +#: model:res.company,overdue_msg:multi_company.res_company_oerp_in +#: model:res.company,overdue_msg:multi_company.res_company_oerp_us +msgid "" +"\n" +"Date: %(date)s\n" +"\n" +"Dear %(partner_name)s,\n" +"\n" +"Please find in attachment a reminder of all your unpaid invoices, for a " +"total amount due of:\n" +"\n" +"%(followup_amount).2f %(company_currency)s\n" +"\n" +"Thanks,\n" +"--\n" +"%(user_signature)s\n" +"%(company_name)s\n" +" " +msgstr "" + +#. module: multi_company +#: model:product.category,name:multi_company.Odoo1 +msgid "Odoo Offers" +msgstr "" + +#. module: multi_company +#: view:multi_company.default:0 +msgid "Returning" +msgstr "" + +#. module: multi_company +#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany +msgid "Multi-Companies" +msgstr "" + +#. module: multi_company +#: view:multi_company.default:0 +msgid "Multi Company" +msgstr "Flerfirma" + +#. module: multi_company +#: model:ir.actions.act_window,name:multi_company.action_inventory_form +#: model:ir.ui.menu,name:multi_company.menu_action_inventory_form +msgid "Default Company per Object" +msgstr "Default firma pr. objekt" + +#. module: multi_company +#: view:multi_company.default:0 +msgid "Matching" +msgstr "" + +#. module: multi_company +#: view:multi_company.default:0 +msgid "Condition" +msgstr "Betingelse" + +#. module: multi_company +#: model:product.template,name:multi_company.product_product_odoo1_product_template +msgid "Odoo Offer" +msgstr "" diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py index bc4159089d7..d433f51fc82 100644 --- a/addons/pad/__openerp__.py +++ b/addons/pad/__openerp__.py @@ -7,8 +7,8 @@ Adds enhanced support for (Ether)Pad attachments in the web client. =================================================================== -Lets the company customize which Pad installation should be used to link to new pads -(by default, http://ietherpad.com/). +Lets the company customize which Pad installation should be used to link to new +pads (by default, http://ietherpad.com/). """, 'author': 'OpenERP SA', 'website': 'http://openerp.com', diff --git a/addons/pad_project/__openerp__.py b/addons/pad_project/__openerp__.py index 18c7d3191d3..3f4a279800a 100644 --- a/addons/pad_project/__openerp__.py +++ b/addons/pad_project/__openerp__.py @@ -24,8 +24,7 @@ 'version': '1.0', "category": "Project Management", 'description': """ -This module adds a PAD in all project kanban views -================================================== +This module adds a PAD in all project kanban views. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/plugin/__openerp__.py b/addons/plugin/__openerp__.py index dba41649ff6..801e0571c58 100644 --- a/addons/plugin/__openerp__.py +++ b/addons/plugin/__openerp__.py @@ -25,9 +25,7 @@ 'version': '1.0', 'category': 'Hidden/Dependency', 'description': """ -The common interface for pugin. -===================================================== - +The common interface for plug-in. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/plugin_outlook/__openerp__.py b/addons/plugin_outlook/__openerp__.py index ac6cb32cae7..077b0aa6746 100644 --- a/addons/plugin_outlook/__openerp__.py +++ b/addons/plugin_outlook/__openerp__.py @@ -30,10 +30,11 @@ 'description': ''' This module provides the Outlook Plug-in. ========================================= -Outlook plug-in allows you to select an object that you would like to add -to your email and its attachments from MS Outlook. You can select a partner, a task, -a project, an analytical account, or any other object and archive selected -mail into mail.message with attachments. + +Outlook plug-in allows you to select an object that you would like to add to +your email and its attachments from MS Outlook. You can select a partner, a task, +a project, an analytical account, or any other object and archive selected mail +into mail.message with attachments. ''', 'init_xml' : [], 'demo_xml' : [], diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py index 96d344b197b..9a39871f0c0 100644 --- a/addons/point_of_sale/__openerp__.py +++ b/addons/point_of_sale/__openerp__.py @@ -21,7 +21,7 @@ { - 'name': 'Point Of Sale', + 'name': 'Point of Sale', 'version': '1.0.1', 'category': 'Point Of Sale', "sequence": 6, @@ -30,14 +30,14 @@ This module provides a quick and easy sale process. =================================================== -Main features : ---------------- - * Fast encoding of the sale. - * Allow to choose one payment mode (the quick way) or to split the payment between several payment mode. - * Computation of the amount of money to return. - * Create and confirm picking list automatically. - * Allow the user to create invoice automatically. - * Allow to refund former sales. +Main features: +-------------- + * Fast encoding of the sale + * Allow to choose one payment mode (the quick way) or to split the payment between several payment mode + * Computation of the amount of money to return + * Create and confirm picking list automatically + * Allow the user to create invoice automatically + * Allow to refund former sales """, 'author': 'OpenERP SA', 'images': ['images/cash_registers.jpeg', 'images/pos_analysis.jpeg','images/register_analysis.jpeg','images/sale_order_pos.jpeg','images/product_pos.jpeg'], diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml index 234e61ff394..49e64569f6a 100644 --- a/addons/point_of_sale/point_of_sale_data.xml +++ b/addons/point_of_sale/point_of_sale_data.xml @@ -1,12 +1,26 @@ - - Main PoS + + + + + + + Module Point of Sale has been installed + Encode sale orders, register payments, compute money to return, + create invoices, and manage refunds of former sales through a + specific, web-based, user interface. + + Simply click on the top menu "Point of Sale" to launch its + interface. You can configure your point of sale and perform + backend operations in the menu "PoS Backend". + + diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py index aaf94526615..70791995958 100644 --- a/addons/portal/__openerp__.py +++ b/addons/portal/__openerp__.py @@ -26,13 +26,13 @@ 'author' : "OpenERP SA", 'category': 'Portal', 'description': """ -This module defines 'portals' to customize the access to your OpenERP database -for external users. +This module defines 'portals' to customize the access to your OpenERP database for external users. +================================================================================================== A portal defines customized user menu and access rights for a group of users -(the ones associated to that portal). It also associates user groups to the +(the ones associated to that portal). It also associates user groups to the portal users (adding a group in the portal automatically adds it to the portal -users, etc). That feature is very handy when used in combination with the +users). That feature is very handy when used in combination with the module 'share'. """, 'website': 'http://www.openerp.com', diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py index 1c592f3771b..657aee868b2 100644 --- a/addons/process/__openerp__.py +++ b/addons/process/__openerp__.py @@ -28,8 +28,8 @@ This module shows the basic processes involved in the selected modules and in the sequence they occur. ====================================================================================================== -Note: This applies to the modules containing modulename_process_xml -e.g product/process/product_process_xml +Note: This applies to the modules containing modulename_process.xml. +e.g product/process/product_process.xml. """, 'author': 'OpenERP SA', diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py index 6e03cb0fa20..f401b42c596 100644 --- a/addons/procurement/__openerp__.py +++ b/addons/procurement/__openerp__.py @@ -32,7 +32,7 @@ This is the module for computing Procurements. ============================================== In the MRP process, procurements orders are created to launch manufacturing -orders, purchase orders, stock allocations, etc. Procurement orders are +orders, purchase orders, stock allocations. Procurement orders are generated automatically by the system and unless there is a problem, the user will not be notified. In case of problems, the system will raise some procurement exceptions to inform the user about blocking problems that need diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index 3085eb6d672..fe2b1d0ca69 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -182,10 +182,10 @@ - + - + @@ -228,8 +228,8 @@ - - + + diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py index 9b4d2cadee1..9a50856ffaa 100644 --- a/addons/product/__openerp__.py +++ b/addons/product/__openerp__.py @@ -25,24 +25,23 @@ "version" : "1.1", "author" : "OpenERP SA", 'category': 'Sales Management', - "depends" : ["base", "process", "decimal_precision"], + "depends" : ["base", "process", "decimal_precision", "mail"], "init_xml" : [], "demo_xml" : ["product_demo.xml"], "description": """ This is the base module for managing products and pricelists in OpenERP. ======================================================================== -Products support variants, different pricing methods, suppliers -information, make to stock/order, different unit of measures, -packaging and properties. +Products support variants, different pricing methods, suppliers information, +make to stock/order, different unit of measures, packaging and properties. Pricelists support: * Multiple-level of discount (by product, category, quantities) * Compute price based on different criteria: - * Other pricelist, - * Cost price, - * List price, - * Supplier price, ... + * Other pricelist + * Cost price + * List price + * Supplier price Pricelists preferences by product and/or partners. diff --git a/addons/product/product.py b/addons/product/product.py index 3cbff880cf9..09f2f6f877a 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -258,35 +258,9 @@ class product_template(osv.osv): _name = "product.template" _description = "Product Template" - def _get_main_product_supplier(self, cr, uid, product, context=None): - """Determines the main (best) product supplier for ``product``, - returning the corresponding ``supplierinfo`` record, or False - if none were found. The default strategy is to select the - supplier with the highest priority (i.e. smallest sequence). - - :param browse_record product: product to supply - :rtype: product.supplierinfo browse_record or False - """ - sellers = [(seller_info.sequence, seller_info) - for seller_info in product.seller_ids or [] - if seller_info and isinstance(seller_info.sequence, (int, long))] - return sellers and sellers[0][1] or False - - def _calc_seller(self, cr, uid, ids, fields, arg, context=None): - result = {} - for product in self.browse(cr, uid, ids, context=context): - main_supplier = self._get_main_product_supplier(cr, uid, product, context=context) - result[product.id] = { - 'seller_info_id': main_supplier and main_supplier.id or False, - 'seller_delay': main_supplier and main_supplier.delay or 1, - 'seller_qty': main_supplier and main_supplier.qty or 0.0, - 'seller_id': main_supplier and main_supplier.name.id or False - } - return result - _columns = { 'name': fields.char('Name', size=128, required=True, translate=True, select=True), - 'product_manager': fields.many2one('res.users','Product Manager',help="This is use as task responsible"), + 'product_manager': fields.many2one('res.users','Product Manager',help="Responsible for product."), 'description': fields.text('Description',translate=True), 'description_purchase': fields.text('Purchase Description',translate=True), 'description_sale': fields.text('Sale Description',translate=True), @@ -320,10 +294,6 @@ class product_template(osv.osv): help='Coefficient to convert Unit of Measure to UOS\n' ' uos = uom * coeff'), 'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True), - 'seller_info_id': fields.function(_calc_seller, type='many2one', relation="product.supplierinfo", multi="seller_info"), - 'seller_delay': fields.function(_calc_seller, type='integer', string='Supplier Lead Time', multi="seller_info", help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."), - 'seller_qty': fields.function(_calc_seller, type='float', string='Supplier Quantity', multi="seller_info", help="This is minimum quantity to purchase from Main Supplier."), - 'seller_id': fields.function(_calc_seller, type='many2one', relation="res.partner", string='Main Supplier', help="Main Supplier who has highest priority in Supplier List.", multi="seller_info"), 'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'), 'loc_rack': fields.char('Rack', size=16), 'loc_row': fields.char('Row', size=16), @@ -491,6 +461,34 @@ class product_product(osv.osv): res[p.id] = (data['code'] and ('['+data['code']+'] ') or '') + \ (data['name'] or '') + (data['variants'] and (' - '+data['variants']) or '') return res + + + def _get_main_product_supplier(self, cr, uid, product, context=None): + """Determines the main (best) product supplier for ``product``, + returning the corresponding ``supplierinfo`` record, or False + if none were found. The default strategy is to select the + supplier with the highest priority (i.e. smallest sequence). + + :param browse_record product: product to supply + :rtype: product.supplierinfo browse_record or False + """ + sellers = [(seller_info.sequence, seller_info) + for seller_info in product.seller_ids or [] + if seller_info and isinstance(seller_info.sequence, (int, long))] + return sellers and sellers[0][1] or False + + def _calc_seller(self, cr, uid, ids, fields, arg, context=None): + result = {} + for product in self.browse(cr, uid, ids, context=context): + main_supplier = self._get_main_product_supplier(cr, uid, product, context=context) + result[product.id] = { + 'seller_info_id': main_supplier and main_supplier.id or False, + 'seller_delay': main_supplier and main_supplier.delay or 1, + 'seller_qty': main_supplier and main_supplier.qty or 0.0, + 'seller_id': main_supplier and main_supplier.name.id or False + } + return result + _defaults = { 'active': lambda *a: 1, @@ -526,6 +524,10 @@ class product_product(osv.osv): 'name_template': fields.related('product_tmpl_id', 'name', string="Name", type='char', size=128, store=True, select=True), 'color': fields.integer('Color Index'), 'product_image': fields.binary('Image'), + 'seller_info_id': fields.function(_calc_seller, type='many2one', relation="product.supplierinfo", multi="seller_info"), + 'seller_delay': fields.function(_calc_seller, type='integer', string='Supplier Lead Time', multi="seller_info", help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."), + 'seller_qty': fields.function(_calc_seller, type='float', string='Supplier Quantity', multi="seller_info", help="This is minimum quantity to purchase from Main Supplier."), + 'seller_id': fields.function(_calc_seller, type='many2one', relation="res.partner", string='Main Supplier', help="Main Supplier who has highest priority in Supplier List.", multi="seller_info"), } def create(self, cr, uid, vals, context=None): diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 4fe51dc67f6..53e57f14309 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -13,8 +13,8 @@ - - + + diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py index 5895feedf3f..4c033a4a6ca 100644 --- a/addons/product_margin/product_margin.py +++ b/addons/product_margin/product_margin.py @@ -98,7 +98,7 @@ class product_product(osv.osv): ('paid','Paid'),('open_paid','Open and Paid'),('draft_open_paid','Draft, Open and Paid') ], string='Invoice State',multi='product_margin', readonly=True), 'sale_avg_price' : fields.function(_product_margin, type='float', string='Avg. Unit Price', multi='product_margin', - help="Avg. Price in Customer Invoices)"), + help="Avg. Price in Customer Invoices."), 'purchase_avg_price' : fields.function(_product_margin, type='float', string='Avg. Unit Price', multi='product_margin', help="Avg. Price in Supplier Invoices "), 'sale_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced', multi='product_margin', @@ -110,15 +110,15 @@ class product_product(osv.osv): 'purchase_gap' : fields.function(_product_margin, type='float', string='Purchase Gap', multi='product_margin', help="Normal Cost - Total Cost"), 'turnover' : fields.function(_product_margin, type='float', string='Turnover' ,multi='product_margin', - help="Sum of Multification of Invoice price and quantity of Customer Invoices"), + help="Sum of Multiplication of Invoice price and quantity of Customer Invoices"), 'total_cost' : fields.function(_product_margin, type='float', string='Total Cost', multi='product_margin', - help="Sum of Multification of Invoice price and quantity of Supplier Invoices "), + help="Sum of Multiplication of Invoice price and quantity of Supplier Invoices "), 'sale_expected' : fields.function(_product_margin, type='float', string='Expected Sale', multi='product_margin', - help="Sum of Multification of Sale Catalog price and quantity of Customer Invoices"), + help="Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"), 'normal_cost' : fields.function(_product_margin, type='float', string='Normal Cost', multi='product_margin', - help="Sum of Multification of Cost price and quantity of Supplier Invoices"), + help="Sum of Multiplication of Cost price and quantity of Supplier Invoices"), 'total_margin' : fields.function(_product_margin, type='float', string='Total Margin', multi='product_margin', - help="Turnorder - Standard price"), + help="Turnover - Standard price"), 'expected_margin' : fields.function(_product_margin, type='float', string='Expected Margin', multi='product_margin', help="Expected Sale - Normal Cost"), 'total_margin_rate' : fields.function(_product_margin, type='float', string='Total Margin (%)', multi='product_margin', diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py index d957c6d87ed..0bba2cca4ac 100644 --- a/addons/product_visible_discount/__openerp__.py +++ b/addons/product_visible_discount/__openerp__.py @@ -29,9 +29,11 @@ This module lets you calculate discounts on Sale Order lines and Invoice lines b To this end, a new check box named "Visible Discount" is added to the pricelist form. Example: - For the product PC1 and the partner "Asustek": if listprice=450, and the price calculated using Asustek's pricelist is 225 - If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225 - If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225 + For the product PC1 and the partner "Asustek": if listprice=450, and the price + calculated using Asustek's pricelist is 225. If the check box is checked, we + will have on the sale order line: Unit price=450, Discount=50,00, Net price=225. + If the check box is unchecked, we will have on Sale Order and Invoice lines: + Unit price=225, Discount=0,00, Net price=225. """, "depends": ["sale"], "demo_xml": [], diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py index 4ba0298346e..d1055c60318 100644 --- a/addons/profile_tools/__openerp__.py +++ b/addons/profile_tools/__openerp__.py @@ -27,8 +27,8 @@ "author" : "OpenERP SA", "category" : "Hidden/Dependency", "description": """ -Installer for extra Hidden like lunch, survey, idea, share, etc. -================================================================ +Installer for extra Hidden like lunch, survey, idea, share. +=========================================================== Makes the Extra Hidden Configuration available from where you can install modules like share, lunch, pad, idea, survey and subscription. diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index b6464610711..aa523b438c7 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -31,16 +31,14 @@ "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"], "depends": ["base_setup", "base_status", "product", "analytic", "board", "mail", "resource","web_kanban"], "description": """ -Project management module tracks multi-level projects, tasks, work done on tasks, eso. -====================================================================================== +Project Management module tracks multi-level projects, tasks, work done on tasks. +================================================================================= -It is able to render planning, order tasks, eso. +It is able to render planning, order tasks. -Dashboard for project members that includes: --------------------------------------------- - * List of my open tasks - * List of my delegated tasks - * Graph of My Projects: Planned vs Total Hours +Dashboard for project management that includes: +----------------------------------------------- + * List of My Open Tasks * Graph of My Remaining Hours by Project """, "init_xml": [], diff --git a/addons/project/project.py b/addons/project/project.py index aa9316aec1b..09b260597f6 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -1089,6 +1089,7 @@ class task(base_stage, osv.osv): #raise osv.except_osv(_('Warning !'), _('Stage is not defined in the project.')) write_vals = vals_reset_kstate if t.stage_id != new_stage else vals super(task,self).write(cr, uid, [t.id], write_vals, context=context) + self.stage_set_send_note(cr, uid, [t.id], new_stage, context=context) result = True else: result = super(task,self).write(cr, uid, ids, vals, context=context) @@ -1225,6 +1226,13 @@ class account_analytic_account(osv.osv): 'use_tasks': fields.boolean('Tasks Mgmt.',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"), 'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'), } + + def on_change_template(self, cr, uid, ids, template_id, context=None): + res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context) + if template_id and 'value' in res: + template = self.browse(cr, uid, template_id, context=context) + res['value']['use_tasks'] = template.use_tasks + return res def _trigger_project_creation(self, cr, uid, vals, context=None): ''' diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml index 4c95373d91f..a905e074f7b 100644 --- a/addons/project/project_data.xml +++ b/addons/project/project_data.xml @@ -1,6 +1,10 @@ + + + + @@ -59,5 +63,21 @@ + + + + + + Module Project Management has been installed + Manage multi-level projects and tasks. You can delegate tasks, + track the work done on tasks, and review your planning based on + the entered data. + + You can manage todo lists on tasks by installing the module + "Todo Lists", which supports the methodology Getting Things + Done (GTD). You can also manage issues/bugs in projects by + installing the module "Issues Tracker." + + diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index 07951280dc7..7f96ff87198 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -274,9 +274,6 @@ - - - + + + + Module Todo Lists has been installed + + Add todo items on project tasks, to help you organize your work. + This module supports the methodology Getting Things Done (GTD), + created by David Allen, and described in the book of the same + name. + + diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index c2feb04437a..39231c5075b 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -612,6 +612,13 @@ class account_analytic_account(osv.osv): 'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"), } + def on_change_template(self, cr, uid, ids, template_id, context=None): + res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context) + if template_id and 'value' in res: + template = self.browse(cr, uid, template_id, context=context) + res['value']['use_issues'] = template.use_issues + return res + def _trigger_project_creation(self, cr, uid, vals, context=None): res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context) return res or vals.get('use_issues') diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml index 34fea22f9b9..add2ce99c19 100644 --- a/addons/project_issue/project_issue_data.xml +++ b/addons/project_issue/project_issue_data.xml @@ -31,5 +31,19 @@ v3.0 + + + + + Module Issues Tracker has been installed + Manage the issues you might face in a project, like bugs in a + system, client complaints or material breakdowns. You can + record issues, assign them to some responsible person, and keep + track of their status as they evolve over time. + + You can access issues from the top menu Project, and access the + issues of a specific project from the projects gallery view. + + diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index be3309d7175..5957ee284e8 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -56,7 +56,7 @@ class project_issue_report(osv.osv): 'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True), 'working_hours_close': fields.float('Avg. Working Hours to Close', readonly=True), 'delay_open': fields.float('Avg. Delay to Open', digits=(16,2), readonly=True, group_operator="avg", - help="Number of Days to close the project issue"), + help="Number of Days to open the project issue."), 'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg", help="Number of Days to close the project issue"), 'company_id' : fields.many2one('res.company', 'Company'), diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py index 8ed12a06e10..3882eddbdb5 100644 --- a/addons/project_long_term/__openerp__.py +++ b/addons/project_long_term/__openerp__.py @@ -31,14 +31,18 @@ Long Term Project management module that tracks planning, scheduling, resources allocation. =========================================================================================== -Features --------- - * Manage Big project. - * Define various Phases of Project. - * Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given. - If no project given then all the draft,open and pending state phases will be taken. - * Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as argument and computes all the open,draft and pending tasks. - * Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date +Features: +--------- + * Manage Big project + * Define various Phases of Project + * Compute Phase Scheduling: Compute start date and end date of the phases + which are in draft, open and pending state of the project given. If no + project given then all the draft, open and pending state phases will be taken. + * Compute Task Scheduling: This works same as the scheduler button on + project.phase. It takes the project as argument and computes all the open, + draft and pending tasks. + * Schedule Tasks: All the tasks which are in draft, pending and open state + are scheduled with taking the phase's start date. """, "init_xml": [], "demo_xml": ["project_long_term_demo.xml"], diff --git a/addons/project_long_term/i18n/es_EC.po b/addons/project_long_term/i18n/es_EC.po new file mode 100644 index 00000000000..b00191d8a44 --- /dev/null +++ b/addons/project_long_term/i18n/es_EC.po @@ -0,0 +1,533 @@ +# Spanish (Ecuador) translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:37+0000\n" +"PO-Revision-Date: 2012-07-24 16:59+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish (Ecuador) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-07-25 04:37+0000\n" +"X-Generator: Launchpad (build 15679)\n" + +#. module: project_long_term +#: model:ir.actions.act_window,name:project_long_term.act_project_phases +msgid "Phases" +msgstr "Fases" + +#. module: project_long_term +#: view:project.phase:0 +#: field:project.phase,next_phase_ids:0 +msgid "Next Phases" +msgstr "Siguientes fases" + +#. module: project_long_term +#: view:project.phase:0 +msgid "Project's Tasks" +msgstr "Tareas del proyecto" + +#. module: project_long_term +#: view:project.phase:0 +#: view:project.user.allocation:0 +msgid "Group By..." +msgstr "Agrupar por..." + +#. module: project_long_term +#: field:project.phase,user_ids:0 +msgid "Assigned Users" +msgstr "Usuarios asignados" + +#. module: project_long_term +#: field:project.phase,progress:0 +msgid "Progress" +msgstr "Progreso" + +#. module: project_long_term +#: constraint:project.project:0 +msgid "Error! project start-date must be lower then project end-date." +msgstr "" +"¡Error! La fecha de inicio del proyecto debe ser menor que la fecha final " +"del proyecto." + +#. module: project_long_term +#: view:project.phase:0 +msgid "In Progress Phases" +msgstr "Fases en progreso" + +#. module: project_long_term +#: view:project.phase:0 +msgid "Displaying Settings" +msgstr "" + +#. module: project_long_term +#: field:project.compute.phases,target_project:0 +msgid "Schedule" +msgstr "Planificar" + +#. module: project_long_term +#: constraint:project.task:0 +msgid "Error ! You cannot create recursive tasks." +msgstr "Error ! No puede crear tareas recursivas." + +#. module: project_long_term +#: constraint:project.project:0 +msgid "Error! You cannot assign escalation to the same project!" +msgstr "¡Error! No puede asignar un escalado al mismo proyecto!" + +#. module: project_long_term +#: code:addons/project_long_term/project_long_term.py:126 +#, python-format +msgid "Day" +msgstr "Día" + +#. module: project_long_term +#: model:ir.model,name:project_long_term.model_project_user_allocation +msgid "Phase User Allocation" +msgstr "Asignación Fases de Usuario" + +#. module: project_long_term +#: model:ir.model,name:project_long_term.model_project_task +msgid "Task" +msgstr "Tarea" + +#. module: project_long_term +#: model:ir.actions.act_window,help:project_long_term.act_project_phase +msgid "" +"A project can be split into the different phases. For each phase, you can " +"define your users allocation, describe different tasks and link your phase " +"to previous and next phases, add date constraints for the automated " +"scheduling. Use the long term planning in order to planify your available " +"users, convert your phases into a series of tasks when you start working on " +"the project." +msgstr "" +"Un proyecto se puede dividir en diferentes fases. Para cada fase, se puede " +"definir la asignación de usuarios, describir las diferentes tareas, vincular " +"las fases previas y posteriores de una fase y añadir restricciones de fecha " +"para la programación automática. Utilice la planificación a largo plazo con " +"el fin de Planificar sus usuarios disponibles, convertir sus fases en una " +"serie de tareas cuando se empiece a trabajar en el proyecto." + +#. module: project_long_term +#: selection:project.compute.phases,target_project:0 +msgid "Compute a Single Project" +msgstr "Calcular un sólo proyecto" + +#. module: project_long_term +#: view:project.phase:0 +#: field:project.phase,previous_phase_ids:0 +msgid "Previous Phases" +msgstr "Fases previas" + +#. module: project_long_term +#: help:project.phase,product_uom:0 +msgid "UoM (Unit of Measure) is the unit of measurement for Duration" +msgstr "UdM (Unidad de Medida) es la unidad de medida para la duración" + +#. module: project_long_term +#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation +#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation +#: view:project.phase:0 +#: view:project.user.allocation:0 +msgid "Planning of Users" +msgstr "Planificación de Usuarios" + +#. module: project_long_term +#: help:project.phase,date_end:0 +msgid "" +" It's computed by the scheduler according to the start date and the duration." +msgstr "" +" Es calculado por el planificador en función de la fecha de inicio y la " +"duración" + +#. module: project_long_term +#: model:ir.model,name:project_long_term.model_project_project +#: field:project.compute.phases,project_id:0 +#: field:project.compute.tasks,project_id:0 +#: view:project.phase:0 +#: field:project.phase,project_id:0 +#: view:project.task:0 +#: view:project.user.allocation:0 +#: field:project.user.allocation,project_id:0 +msgid "Project" +msgstr "Proyecto" + +#. module: project_long_term +#: code:addons/project_long_term/wizard/project_compute_phases.py:48 +#, python-format +msgid "Error!" +msgstr "Error!" + +#. module: project_long_term +#: selection:project.phase,state:0 +msgid "Cancelled" +msgstr "Cancelado" + +#. module: project_long_term +#: help:project.user.allocation,date_end:0 +msgid "Ending Date" +msgstr "Fecha de cierre" + +#. module: project_long_term +#: field:project.phase,constraint_date_end:0 +msgid "Deadline" +msgstr "Fecha límite" + +#. module: project_long_term +#: selection:project.compute.phases,target_project:0 +msgid "Compute All My Projects" +msgstr "Calcular todos los proyectos" + +#. module: project_long_term +#: view:project.compute.phases:0 +#: view:project.compute.tasks:0 +msgid "_Cancel" +msgstr "Cancelar" + +#. module: project_long_term +#: code:addons/project_long_term/project_long_term.py:141 +#, python-format +msgid " (copy)" +msgstr " (copiar)" + +#. module: project_long_term +#: view:project.user.allocation:0 +msgid "Project User Allocation" +msgstr "Asignación de usuarios a un proyecto" + +#. module: project_long_term +#: view:project.phase:0 +#: field:project.phase,state:0 +msgid "State" +msgstr "Estado" + +#. module: project_long_term +#: view:project.compute.phases:0 +#: view:project.compute.tasks:0 +msgid "C_ompute" +msgstr "C_alcular" + +#. module: project_long_term +#: view:project.phase:0 +#: selection:project.phase,state:0 +msgid "New" +msgstr "Nuevo" + +#. module: project_long_term +#: help:project.phase,progress:0 +msgid "Computed based on related tasks" +msgstr "Calculo basado en las tareas relacionadas" + +#. module: project_long_term +#: field:project.phase,product_uom:0 +msgid "Duration UoM" +msgstr "UdM duración" + +#. module: project_long_term +#: field:project.phase,constraint_date_start:0 +msgid "Minimum Start Date" +msgstr "Fecha de inicio mínima" + +#. module: project_long_term +#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1 +#: model:ir.ui.menu,name:project_long_term.menu_view_resource +msgid "Resources" +msgstr "Recursos" + +#. module: project_long_term +#: view:project.phase:0 +msgid "My Projects" +msgstr "Mis Proyectos" + +#. module: project_long_term +#: help:project.user.allocation,date_start:0 +msgid "Starting Date" +msgstr "Fecha de inicio" + +#. module: project_long_term +#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list +msgid "Related Tasks" +msgstr "Tareas relacionadas" + +#. module: project_long_term +#: view:project.phase:0 +msgid "New Phases" +msgstr "Nueva Fase" + +#. module: project_long_term +#: code:addons/project_long_term/wizard/project_compute_phases.py:48 +#, python-format +msgid "Please specify a project to schedule." +msgstr "Por favor, especifique un proyecto para planificar." + +#. module: project_long_term +#: help:project.phase,constraint_date_start:0 +msgid "force the phase to start after this date" +msgstr "Forzar que la fase epiece después de esta fecha" + +#. module: project_long_term +#: field:project.phase,task_ids:0 +msgid "Project Tasks" +msgstr "Tareas del proyecto" + +#. module: project_long_term +#: help:project.phase,date_start:0 +msgid "" +"It's computed by the scheduler according the project date or the end date of " +"the previous phase." +msgstr "" +"Es calculado por el planificador en función de la fecha inicio o fecha fin " +"de la fase anterior" + +#. module: project_long_term +#: view:project.phase:0 +msgid "Month" +msgstr "Mes" + +#. module: project_long_term +#: constraint:project.phase:0 +msgid "Phase start-date must be lower than phase end-date." +msgstr "La fecha-inicio de la fase debe ser menor que la fecha-fin." + +#. module: project_long_term +#: view:project.phase:0 +msgid "Start Month" +msgstr "Mes de inicio" + +#. module: project_long_term +#: field:project.phase,date_start:0 +#: field:project.user.allocation,date_start:0 +msgid "Start Date" +msgstr "Fecha inicio" + +#. module: project_long_term +#: help:project.phase,constraint_date_end:0 +msgid "force the phase to finish before this date" +msgstr "Forzar que la fase termine antes de esta fecha" + +#. module: project_long_term +#: help:project.phase,user_ids:0 +msgid "" +"The ressources on the project can be computed automatically by the scheduler" +msgstr "" +"Los Recursos del proyecto se puede calcular automáticamente por el " +"planificador" + +#. module: project_long_term +#: view:project.phase:0 +msgid "Draft" +msgstr "Borrador" + +#. module: project_long_term +#: view:project.phase:0 +msgid "Pending Phases" +msgstr "Fases pendientes" + +#. module: project_long_term +#: view:project.phase:0 +#: selection:project.phase,state:0 +msgid "Pending" +msgstr "Pendiente" + +#. module: project_long_term +#: view:project.user.allocation:0 +#: field:project.user.allocation,user_id:0 +msgid "User" +msgstr "Usuario" + +#. module: project_long_term +#: model:ir.model,name:project_long_term.model_project_compute_tasks +msgid "Project Compute Tasks" +msgstr "Calcular tareas del proyecto" + +#. module: project_long_term +#: view:project.phase:0 +msgid "Constraints" +msgstr "Restricciones" + +#. module: project_long_term +#: help:project.phase,sequence:0 +msgid "Gives the sequence order when displaying a list of phases." +msgstr "Indica el orden cuando se muestra la lista de fases" + +#. module: project_long_term +#: model:ir.actions.act_window,name:project_long_term.act_project_phase +#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list +#: model:ir.ui.menu,name:project_long_term.menu_project_phase +#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list +#: view:project.phase:0 +#: field:project.project,phase_ids:0 +msgid "Project Phases" +msgstr "Fases del proyecto" + +#. module: project_long_term +#: view:project.phase:0 +#: selection:project.phase,state:0 +msgid "Done" +msgstr "Realizado" + +#. module: project_long_term +#: view:project.phase:0 +msgid "Cancel" +msgstr "Cancelar" + +#. module: project_long_term +#: view:project.phase:0 +#: selection:project.phase,state:0 +msgid "In Progress" +msgstr "En progreso" + +#. module: project_long_term +#: view:project.phase:0 +msgid "Remaining Hours" +msgstr "Horas restantes" + +#. module: project_long_term +#: constraint:project.task:0 +msgid "Error ! Task end-date must be greater then task start-date" +msgstr "" +"Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio" + +#. module: project_long_term +#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar +msgid "Working Time" +msgstr "Horario de trabajo" + +#. module: project_long_term +#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases +#: model:ir.ui.menu,name:project_long_term.menu_compute_phase +#: view:project.compute.phases:0 +msgid "Schedule Phases" +msgstr "Planificación de fases" + +#. module: project_long_term +#: view:project.phase:0 +msgid "Start Phase" +msgstr "Iniciar fase" + +#. module: project_long_term +#: view:project.phase:0 +msgid "Total Hours" +msgstr "Total horas" + +#. module: project_long_term +#: view:project.user.allocation:0 +msgid "Users" +msgstr "Usuarios" + +#. module: project_long_term +#: view:project.user.allocation:0 +msgid "Phase" +msgstr "Fase" + +#. module: project_long_term +#: help:project.phase,state:0 +msgid "" +"If the phase is created the state 'Draft'.\n" +" If the phase is started, the state becomes 'In Progress'.\n" +" If review is needed the phase is in 'Pending' state. " +" \n" +" If the phase is over, the states is set to 'Done'." +msgstr "" +"Si la fase se crea, el estado es \"Borrador\".\n" +" Si la fase comienza, el estado cambia a \"En Proceso\".\n" +" Si se necesita revisión, la fase está en estado \"Pendiente\".\n" +" Si la fase está terminada, el estado se fija en \"z\"." + +#. module: project_long_term +#: field:project.phase,date_end:0 +#: field:project.user.allocation,date_end:0 +msgid "End Date" +msgstr "Fecha de finalización" + +#. module: project_long_term +#: field:project.phase,name:0 +msgid "Name" +msgstr "Nombre" + +#. module: project_long_term +#: view:project.phase:0 +msgid "Tasks Details" +msgstr "Detalles de tareas" + +#. module: project_long_term +#: field:project.phase,duration:0 +msgid "Duration" +msgstr "Duración" + +#. module: project_long_term +#: view:project.phase:0 +msgid "Project Users" +msgstr "Usuarios del proyecto" + +#. module: project_long_term +#: model:ir.model,name:project_long_term.model_project_phase +#: view:project.phase:0 +#: view:project.task:0 +#: field:project.task,phase_id:0 +#: field:project.user.allocation,phase_id:0 +msgid "Project Phase" +msgstr "Fase del proyecto" + +#. module: project_long_term +#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases +msgid "" +"To schedule phases of all or a specified project. It then open a gantt " +"view.\n" +" " +msgstr "" +"Para planificar las fases en su totalidad o de un proyecto específico. " +"Entonces, abra una vista de Gantt.\n" +" " + +#. module: project_long_term +#: model:ir.model,name:project_long_term.model_project_compute_phases +msgid "Project Compute Phases" +msgstr "Calcular fases del proyecto" + +#. module: project_long_term +#: constraint:project.phase:0 +msgid "Loops in phases not allowed" +msgstr "No se permiten bucles en fases" + +#. module: project_long_term +#: field:project.phase,sequence:0 +msgid "Sequence" +msgstr "Secuencia" + +#. module: project_long_term +#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves +msgid "Resource Leaves" +msgstr "Ausencia de recursos" + +#. module: project_long_term +#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks +#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks +#: view:project.compute.tasks:0 +msgid "Schedule Tasks" +msgstr "Planificar tareas" + +#. module: project_long_term +#: help:project.phase,duration:0 +msgid "By default in days" +msgstr "Por defecto en días" + +#. module: project_long_term +#: view:project.phase:0 +#: field:project.phase,user_force_ids:0 +msgid "Force Assigned Users" +msgstr "Forzar asignación de usuarios" + +#. module: project_long_term +#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule +msgid "Scheduling" +msgstr "Planificación" + +#~ msgid "Displaying settings" +#~ msgstr "Mostrando configuración" diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index a4df1eb6917..d5ac3868a5e 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -114,7 +114,7 @@ class project_phase(osv.osv): 'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'), 'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}, - help="The ressources on the project can be computed automatically by the scheduler"), + help="The resources on the project can be computed automatically by the scheduler."), 'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'Status', readonly=True, required=True, help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\ \n If the phase is over, the states is set to \'Done\'.'), @@ -275,6 +275,13 @@ class account_analytic_account(osv.osv): _columns = { 'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"), } + + def on_change_template(self, cr, uid, ids, template_id, context=None): + res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context) + if template_id and 'value' in res: + template = self.browse(cr, uid, template_id, context=context) + res['value']['use_phases'] = template.use_phases + return res def _trigger_project_creation(self, cr, uid, vals, context=None): res= super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context) diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py index 34ace79c39e..656a091d4e8 100644 --- a/addons/project_mailgate/__openerp__.py +++ b/addons/project_mailgate/__openerp__.py @@ -29,19 +29,17 @@ "images": ["images/project_mailgate_task.jpeg"], "depends": ["project", "mail"], "description": """ -This module can automatically create Project Tasks based on incoming emails -=========================================================================== +This module can automatically create Project Tasks based on incoming emails. +============================================================================ Allows creating tasks based on new emails arriving at a given mailbox, similarly to what the CRM application has for Leads/Opportunities. + There are two common alternatives to configure the mailbox integration: - - * Install the ``fetchmail`` module and configure a new mailbox, then select - ``Project Tasks`` as the target for incoming emails. - * Set it up manually on your mail server based on the 'mail gateway' script - provided in the ``mail`` module - and connect it to the `project.task` model. - - + * Install the ``fetchmail`` module and configure a new mailbox, then select + ``Project Tasks`` as the target for incoming emails. + * Set it up manually on your mail server based on the 'mail gateway' script + provided in the ``mail`` module - and connect it to the `project.task` model. """, "init_xml": [], "update_xml": [ diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py index 9992bd3b2b7..5c818a57e7a 100644 --- a/addons/project_mrp/__openerp__.py +++ b/addons/project_mrp/__openerp__.py @@ -25,27 +25,26 @@ 'version': '1.0', "category": "Project Management", 'description': """ -Automatically creates project tasks from procurement lines -========================================================== +Automatically creates project tasks from procurement lines. +=========================================================== -This module will automatically create a new task for each procurement -order line (e.g. for sale order lines), if the corresponding product -meets the following characteristics: +This module will automatically create a new task for each procurement order line +(e.g. for sale order lines), if the corresponding product meets the following +characteristics: - * Type = Service - * Procurement method (Order fulfillment) = MTO (make to order) - * Supply/Procurement method = Produce + * Product Type = Service + * Procurement Method (Order fulfillment) = MTO (Make to Order) + * Supply/Procurement Method = Manufacture If on top of that a projet is specified on the product form (in the Procurement -tab), then the new task will be created in that specific project. -Otherwise, the new task will not belong to any project, and may be added to a -project manually later. +tab), then the new task will be created in that specific project. Otherwise, the +new task will not belong to any project, and may be added to a project manually +later. When the project task is completed or cancelled, the workflow of the corresponding -procurement line is updated accordingly. For example if this procurement corresponds +procurement line is updated accordingly. For example, if this procurement corresponds to a sale order line, the sale order line will be considered delivered when the task is completed. - """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py index 9252e3bbd11..299a74f52aa 100644 --- a/addons/project_mrp/project_procurement.py +++ b/addons/project_mrp/project_procurement.py @@ -45,9 +45,9 @@ class procurement_order(osv.osv): def _convert_qty_company_hours(self, cr, uid, procurement, context=None): product_uom = self.pool.get('product.uom') - company_time_uom_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id - if procurement.product_uom.id != company_time_uom_id: - planned_hours = product_uom._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, company_time_uom_id) + company_time_uom_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id + if procurement.product_uom.id != company_time_uom_id.id and procurement.product_uom.category_id.id == company_time_uom_id.category_id.id: + planned_hours = product_uom._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, company_time_uom_id.id) else: planned_hours = procurement.product_qty return planned_hours @@ -71,7 +71,7 @@ class procurement_order(osv.osv): task_id = project_task.create(cr, uid, { 'name': '%s:%s' % (procurement.origin or '', procurement.product_id.name), 'date_deadline': procurement.date_planned, - 'planned_hours':planned_hours, + 'planned_hours': planned_hours, 'remaining_hours': planned_hours, 'user_id': procurement.product_id.product_manager.id, 'notes': procurement.note, diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py index d334a421de4..f5fa2d11d89 100644 --- a/addons/project_retro_planning/__openerp__.py +++ b/addons/project_retro_planning/__openerp__.py @@ -27,7 +27,8 @@ Changes dates according to change in project End Date. ====================================================== -If end date of project is changed then the deadline date and start date for all the tasks will change accordingly. +If end date of project is changed then the deadline date and start date for all +the tasks will change accordingly. """, 'author': 'OpenERP SA', 'depends': ['base', 'project'], diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py index f1a82867a6f..a55f67bda2c 100644 --- a/addons/project_timesheet/__openerp__.py +++ b/addons/project_timesheet/__openerp__.py @@ -27,9 +27,9 @@ Synchronization of project task work entries with timesheet entries. ==================================================================== -This module lets you transfer the entries under tasks defined for Project Management to -the Timesheet line entries for particular date and particular user with the effect of creating, editing and deleting either ways. - +This module lets you transfer the entries under tasks defined for Project +Management to the Timesheet line entries for particular date and particular user +with the effect of creating, editing and deleting either ways. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index 1f32f3a3145..cb2e8f093aa 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -27,16 +27,15 @@ "sequence": 19, "summary": "Requests for Quotation, Invoicing Control", 'description': """ -Purchase module is for generating a purchase order for purchase of goods from a supplier. -========================================================================================= +Purchase Management module is for generating a purchase order for purchase of goods from a supplier. +==================================================================================================== A supplier invoice is created for the particular purchase order. Dashboard for purchase management that includes: - * Current Purchase Orders - * Draft Purchase Orders - * Graph for quantity and amount per month - +------------------------------------------------ + * Request for Quotations + * Monthly Purchases by Category """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml index 96981db1502..5a9a731358c 100644 --- a/addons/purchase/partner_view.xml +++ b/addons/purchase/partner_view.xml @@ -11,6 +11,9 @@ + + + diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 547902b4635..afdca95f544 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -154,7 +154,7 @@ class purchase_order(osv.osv): ] _columns = { - 'name': fields.char('Order Reference', size=64, required=True, select=True, help="unique number of the purchase order,computed automatically when the purchase order is created"), + 'name': fields.char('Order Reference', size=64, required=True, select=True, help="Unique number of the purchase order, computed automatically when the purchase order is created."), 'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this purchase order request." ), @@ -175,7 +175,7 @@ class purchase_order(osv.osv): 'validator' : fields.many2one('res.users', 'Validated by', readonly=True), 'notes': fields.text('Terms and Conditions'), 'invoice_ids': fields.many2many('account.invoice', 'purchase_invoice_rel', 'purchase_id', 'invoice_id', 'Invoices', help="Invoices generated for a purchase order"), - 'picking_ids': fields.one2many('stock.picking.in', 'purchase_id', 'Picking List', readonly=True, help="This is the list of incomming shipments that have been generated for this purchase order."), + 'picking_ids': fields.one2many('stock.picking.in', 'purchase_id', 'Picking List', readonly=True, help="This is the list of incoming shipments that have been generated for this purchase order."), 'shipped':fields.boolean('Received', readonly=True, select=True, help="It indicates that a picking has been done"), 'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'), 'invoiced': fields.function(_invoiced, string='Invoice Received', type='boolean', help="It indicates that an invoice has been paid"), @@ -919,15 +919,15 @@ class purchase_order_line(osv.osv): qty = qty or 1.0 supplierinfo = False - supplierinfo_ids = product_supplierinfo.search(cr, uid, [('name','=',partner_id),('product_id','=',product.id)]) - if supplierinfo_ids: - supplierinfo = product_supplierinfo.browse(cr, uid, supplierinfo_ids[0], context=context) - if supplierinfo.product_uom.id != uom_id: - res['warning'] = {'title': _('Warning'), 'message': _('The selected supplier only sells this product by %s') % supplierinfo.product_uom.name } - min_qty = product_uom._compute_qty(cr, uid, supplierinfo.product_uom.id, supplierinfo.min_qty, to_uom_id=uom_id) - if qty < min_qty: # If the supplier quantity is greater than entered from user, set minimal. - res['warning'] = {'title': _('Warning'), 'message': _('The selected supplier has a minimal quantity set to %s %s, you should not purchase less.') % (supplierinfo.min_qty, supplierinfo.product_uom.name)} - qty = min_qty + for supplier in product.seller_ids: + if supplier.name.id == partner_id: + supplierinfo = supplier + if supplierinfo.product_uom.id != uom_id: + res['warning'] = {'title': _('Warning'), 'message': _('The selected supplier only sells this product by %s') % supplierinfo.product_uom.name } + min_qty = product_uom._compute_qty(cr, uid, supplierinfo.product_uom.id, supplierinfo.min_qty, to_uom_id=uom_id) + if qty < min_qty: # If the supplier quantity is greater than entered from user, set minimal. + res['warning'] = {'title': _('Warning'), 'message': _('The selected supplier has a minimal quantity set to %s %s, you should not purchase less.') % (supplierinfo.min_qty, supplierinfo.product_uom.name)} + qty = min_qty dt = self._get_date_planned(cr, uid, supplierinfo, date_order, context=context).strftime(DEFAULT_SERVER_DATETIME_FORMAT) diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml index 2b57a2a75bc..9d7399abab0 100644 --- a/addons/purchase/purchase_data.xml +++ b/addons/purchase/purchase_data.xml @@ -1,6 +1,19 @@ + + + + + Module Purchase Management has been installed + From the top menu Purchases, create purchase orders to buy + products from your suppliers, encode supplier invoices and + manage your payments. + + You can also manage purchase requisitions, see the Purchase + Settings. + + Purchase Order diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py index 73a222ec551..283923895d6 100644 --- a/addons/purchase_analytic_plans/__openerp__.py +++ b/addons/purchase_analytic_plans/__openerp__.py @@ -28,8 +28,8 @@ The base module to manage analytic distribution and purchase orders. ==================================================================== -Allows the user to maintain several analysis plans. These let you split -a line on a supplier purchase order into several accounts and analytic plans. +Allows the user to maintain several analysis plans. These let you split a line +on a supplier purchase order into several accounts and analytic plans. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py index 47124e689ef..970c85bc08c 100644 --- a/addons/purchase_double_validation/__openerp__.py +++ b/addons/purchase_double_validation/__openerp__.py @@ -30,8 +30,8 @@ Double-validation for purchases exceeding minimum amount. ========================================================= -This module modifies the purchase workflow in order to validate purchases -that exceeds minimum amount set by configuration wizard. +This module modifies the purchase workflow in order to validate purchases that +exceeds minimum amount set by configuration wizard. """, 'website': 'http://www.openerp.com', 'init_xml': [], diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py index e6ca746841b..6824ef5d725 100644 --- a/addons/purchase_requisition/__openerp__.py +++ b/addons/purchase_requisition/__openerp__.py @@ -28,8 +28,9 @@ This module allows you to manage your Purchase Requisition. =========================================================== -When a purchase order is created, you now have the opportunity to save the related requisition. -This new object will regroup and will allow you to easily keep track and order all your purchase orders. +When a purchase order is created, you now have the opportunity to save the +related requisition. This new object will regroup and will allow you to easily +keep track and order all your purchase orders. """, "depends" : ["purchase","mrp"], "init_xml" : [], diff --git a/addons/report_designer/i18n/nb.po b/addons/report_designer/i18n/nb.po new file mode 100644 index 00000000000..4715435a323 --- /dev/null +++ b/addons/report_designer/i18n/nb.po @@ -0,0 +1,98 @@ +# Norwegian Bokmal translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2012-07-24 20:36+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Norwegian Bokmal \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-07-25 04:37+0000\n" +"X-Generator: Launchpad (build 15679)\n" + +#. module: report_designer +#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer +#: view:report_designer.installer:0 +msgid "Reporting Tools Configuration" +msgstr "Konfigurasjon rapportverktøy" + +#. module: report_designer +#: field:report_designer.installer,base_report_creator:0 +msgid "Query Builder" +msgstr "Avansert søk" + +#. module: report_designer +#: view:report_designer.installer:0 +msgid "Configure" +msgstr "Konfigurer" + +#. module: report_designer +#: view:report_designer.installer:0 +msgid "title" +msgstr "tittel" + +#. module: report_designer +#: model:ir.model,name:report_designer.model_report_designer_installer +msgid "report_designer.installer" +msgstr "report_designer.installer" + +#. module: report_designer +#: field:report_designer.installer,config_logo:0 +msgid "Image" +msgstr "Bilde" + +#. module: report_designer +#: field:report_designer.installer,base_report_designer:0 +msgid "OpenOffice Report Designer" +msgstr "OpenOffice Rapport Designer" + +#. module: report_designer +#: model:ir.module.module,shortdesc:report_designer.module_meta_information +msgid "Reporting Tools" +msgstr "Rapport verktøy" + +#. module: report_designer +#: view:report_designer.installer:0 +msgid "" +"OpenERP's built-in reporting abilities can be improved even further with " +"some of the following applications" +msgstr "" + +#. module: report_designer +#: view:report_designer.installer:0 +msgid "Configure Reporting Tools" +msgstr "Konfigurer rapportverktøy" + +#. module: report_designer +#: help:report_designer.installer,base_report_creator:0 +msgid "" +"Allows you to create any statistic reports on several objects. It's a SQL " +"query builder and browser for end users." +msgstr "" + +#. module: report_designer +#: help:report_designer.installer,base_report_designer:0 +msgid "" +"Adds wizards to Import/Export .SXW report which you can modify in " +"OpenOffice.Once you have modified it you can upload the report using the " +"same wizard." +msgstr "" + +#. module: report_designer +#: model:ir.module.module,description:report_designer.module_meta_information +msgid "" +"Installer for reporting tools selection\n" +" " +msgstr "" + +#. module: report_designer +#: field:report_designer.installer,progress:0 +msgid "Configuration Progress" +msgstr "Konfigurasjonsprosess" diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py index 1704d436042..8d980c51f4f 100644 --- a/addons/report_intrastat/__openerp__.py +++ b/addons/report_intrastat/__openerp__.py @@ -28,7 +28,8 @@ A module that adds intrastat reports. ===================================== -This module gives the details of the goods traded between the countries of European Union """, +This module gives the details of the goods traded between the countries of +European Union.""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base', 'product', 'stock', 'sale', 'purchase'], diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py index f0bf0d1a32e..1021d129d39 100644 --- a/addons/report_webkit/__openerp__.py +++ b/addons/report_webkit/__openerp__.py @@ -38,7 +38,6 @@ This module adds a new Report Engine based on WebKit library (wkhtmltopdf) to su The module structure and some code is inspired by the report_openoffice module. The module allows: - - HTML report definition - Multi header support - Multi logo @@ -50,19 +49,17 @@ The module allows: - Margins definition - Paper size definition -... and much more - -Multiple headers and logos can be defined per company. -CSS style, header and footer body are defined per company. +Multiple headers and logos can be defined per company. CSS style, header and +footer body are defined per company. For a sample report see also the webkit_report_sample module, and this video: http://files.me.com/nbessi/06n92k.mov -Requirements and Installation +Requirements and Installation: ----------------------------- This module requires the ``wkthtmltopdf`` library to render HTML documents as -PDF. Version 0.9.9 or later is necessary, and can be found at http://code.google.com/p/wkhtmltopdf/ -for Linux, Mac OS X (i386) and Windows (32bits). +PDF. Version 0.9.9 or later is necessary, and can be found at +http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows (32bits). After installing the library on the OpenERP Server machine, you need to set the path to the ``wkthtmltopdf`` executable file on each Company. @@ -72,15 +69,13 @@ install a "static" version of the library. The default ``wkhtmltopdf`` on Ubuntu is known to have this issue. -TODO ----- - - * JavaScript support activation deactivation - * Collated and book format support - * Zip return for separated PDF - * Web client WYSIWYG - - """, +TODO: +----- + * JavaScript support activation deactivation + * Collated and book format support + * Zip return for separated PDF + * Web client WYSIWYG +""", "version": "0.9", "depends": ["base"], "author": "Camptocamp", diff --git a/addons/report_webkit_sample/__openerp__.py b/addons/report_webkit_sample/__openerp__.py index 01eed24877c..65b6a9d49e8 100644 --- a/addons/report_webkit_sample/__openerp__.py +++ b/addons/report_webkit_sample/__openerp__.py @@ -40,7 +40,7 @@ add Webkit Report entries on any Document in the system. You have to create the print buttons by calling the wizard. For more details see: http://files.me.com/nbessi/06n92k.mov - """, +""", "version": "0.9", "depends": ["base", "account", "report_webkit"], "category": "Reporting", diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py index 71afebce932..686207d8d9d 100644 --- a/addons/resource/__openerp__.py +++ b/addons/resource/__openerp__.py @@ -29,11 +29,9 @@ Module for resource management. =============================== -A resource represent something that can be scheduled -(a developer on a task or a work center on manufacturing orders). -This module manages a resource calendar associated to every resource. -It also manages the leaves of every resource. - +A resource represent something that can be scheduled (a developer on a task or a +work center on manufacturing orders). This module manages a resource calendar +associated to every resource. It also manages the leaves of every resource. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/resource/resource.py b/addons/resource/resource.py index 5fed5b96218..354e9c5b27c 100644 --- a/addons/resource/resource.py +++ b/addons/resource/resource.py @@ -292,7 +292,7 @@ class resource_resource(osv.osv): 'company_id' : fields.many2one('res.company', 'Company'), 'resource_type': fields.selection([('user','Human'),('material','Material')], 'Resource Type', required=True), 'user_id' : fields.many2one('res.users', 'User', help='Related user name for the resource to manage its access.'), - 'time_efficiency' : fields.float('Efficiency Factor', size=8, required=True, help="This field depict the efficiency of the resource to complete tasks. e.g resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."), + 'time_efficiency' : fields.float('Efficiency Factor', size=8, required=True, help="This field depict the efficiency of the resource to complete tasks. e.g resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficiency of 200%, then his load will only be 50%."), 'calendar_id' : fields.many2one("resource.calendar", "Working Time", help="Define the schedule of resource"), } _defaults = { diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index f28a0518669..f5bf1adb436 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -33,35 +33,32 @@ Workflow with validation steps: ------------------------------- * Quotation -> Sales order -> Invoice -Invoicing methods: ------------------- - * Invoice on order (before or after shipping) - * Invoice on delivery - * Invoice on timesheets - * Advance invoice +Create Invoice: +--------------- + * Invoice on Demand + * Invoice on Delivery Order + * Invoice Before Delivery Partners preferences: --------------------- - * shipping - * invoicing - * incoterm + * Incoterm + * Shipping + * Invoicing -Products stocks and prices +Products stocks and prices: -------------------------- -Delivery methods: +Delivery method: ----------------- - * all at once - * multi-parcel - * delivery costs + * The Poste + * Free Delivery Charges + * Normal Delivery Charges + * Based on the Delivery Order(if not Add to sale order) Dashboard for Sales Manager that includes: ------------------------------------------ - * Quotations - * Sales by Month - * Graph of Sales by Salesman in last 90 days - * Graph of Sales per Customer in last 90 days - * Graph of Sales by Product's Category in last 90 days + * My Quotations + * Monthly Turnover (Graph) """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index d43bc75be7a..45c01c582a0 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -69,6 +69,9 @@ class sale_configuration(osv.osv_memory): 'group_sale_delivery_address': fields.boolean("Allow Different Addresses for Delivery and Invoice", implied_group='sale.group_delivery_invoice_address', help="Allows you to specify different delivery and invoice addresses on a sale order."), + 'group_mrp_properties': fields.boolean('Properties on Lines', + implied_group='sale.group_mrp_properties', + help="Allows you to tag sale order lines with properties."), 'group_discount_per_so_line': fields.boolean("Discount per Line", implied_group='sale.group_discount_per_so_line', help="Allows you to apply some discount per sale order line."), diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index 74796bac6fc..ee05a6d2d26 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -20,6 +20,7 @@ + @@ -30,7 +31,7 @@ - + diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml index 11ac318b7a7..76f6f3ad816 100644 --- a/addons/sale/res_partner_view.xml +++ b/addons/sale/res_partner_view.xml @@ -24,12 +24,13 @@ res.partner kanban + - - + + Sales diff --git a/addons/sale/sale.py b/addons/sale/sale.py index aeede7e5533..f920b34ca42 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -483,19 +483,19 @@ class sale_order(osv.osv): return {'type': 'ir.actions.report.xml', 'report_name': 'sale.order', 'datas': datas, 'nodestroy': True} def manual_invoice(self, cr, uid, ids, context=None): + """ create invoices for the given sale orders (ids), and open the form + view of one of the newly created invoices + """ mod_obj = self.pool.get('ir.model.data') wf_service = netsvc.LocalService("workflow") - inv_ids = set() - inv_ids1 = set() - for id in ids: - for record in self.pool.get('sale.order').browse(cr, uid, id).invoice_ids: - inv_ids.add(record.id) - # inv_ids would have old invoices if any + + # create invoices through the sale orders' workflow + inv_ids0 = set(inv.id for sale in self.browse(cr, uid, ids, context) for inv in sale.invoice_ids) for id in ids: wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr) - for record in self.pool.get('sale.order').browse(cr, uid, id).invoice_ids: - inv_ids1.add(record.id) - inv_ids = list(inv_ids1.difference(inv_ids)) + inv_ids1 = set(inv.id for sale in self.browse(cr, uid, ids, context) for inv in sale.invoice_ids) + # determine newly created invoices + new_inv_ids = list(inv_ids1 - inv_ids0) res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form') res_id = res and res[1] or False, @@ -510,7 +510,7 @@ class sale_order(osv.osv): 'type': 'ir.actions.act_window', 'nodestroy': True, 'target': 'current', - 'res_id': inv_ids and inv_ids[0] or False, + 'res_id': new_inv_ids and new_inv_ids[0] or False, } def action_view_invoice(self, cr, uid, ids, context=None): diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml index 9768f606793..c93651219af 100644 --- a/addons/sale/sale_data.xml +++ b/addons/sale/sale_data.xml @@ -1,17 +1,13 @@ - + Sales Order sale.order - + @@ -26,29 +22,19 @@ - - - - - Module sale installed! - comment - text - res.users - - Welcome to OpenERP - - You can click on the top menu Sales to manage your - customers, your quotations and sales orders. - - If you need to manage your sales pipeline (leads, - opportunities, phonecalls), you can install the CRM module - from the Settings top menu. - - - - - - + + + + + Module Sales Management has been installed + From the top menu Sales, manage your customers, quotations and + sales orders. With sale orders, you can manage product + deliveries and customer invoices. + If you need to manage your sales pipeline (leads, opportunities, + phonecalls), you can install the module CRM from the top menu + Settings. + + diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 3f7f7efa43b..a73f7744e53 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -156,16 +156,18 @@