Merge lp:~vauxoo/addons-vauxoo/trunk-upfowardport-dev-moylop260 into lp:addons-vauxoo

Proposed by Moisés López - http://www.vauxoo.com
Status: Work in progress
Proposed branch: lp:~vauxoo/addons-vauxoo/trunk-upfowardport-dev-moylop260
Merge into: lp:addons-vauxoo
Diff against target: 53048 lines (+17222/-12837)
1293 files modified
account_advance_payment/__init__.py (+1/-1)
account_advance_payment/__openerp__.py (+23/-20)
account_advance_payment/model/__init__.py (+2/-2)
account_advance_payment/model/account_voucher.py (+35/-13)
account_advance_payment/model/res_partner.py (+14/-14)
account_advance_payment/view/account_voucher_advance_payment_view.xml (+2/-2)
account_advance_payment/view/res_partner_advance_payment_view.xml (+5/-3)
account_aged_partner_balance_vw/__init__.py (+2/-2)
account_aged_partner_balance_vw/__openerp__.py (+29/-26)
account_aged_partner_balance_vw/model/__init__.py (+1/-1)
account_aged_partner_balance_vw/model/account_aged_partner_balance_vw.py (+8/-13)
account_aged_partner_balance_vw/wizard/__init__.py (+1/-1)
account_aged_partner_balance_vw/wizard/wizard_open_move_line.py (+3/-1)
account_aged_partner_balance_vw/wizard/wizard_print_report.py (+11/-13)
account_amortization/__init__.py (+1/-1)
account_amortization/__openerp__.py (+25/-20)
account_amortization/model/__init__.py (+1/-1)
account_amortization/model/account_amortization.py (+12/-12)
account_analytic_active_field/__init__.py (+1/-1)
account_analytic_active_field/__openerp__.py (+24/-20)
account_analytic_active_field/account_analytic_account.py (+2/-2)
account_analytic_btree/__init__.py (+1/-1)
account_analytic_btree/__openerp__.py (+21/-13)
account_analytic_required/__init__.py (+1/-1)
account_analytic_required/__openerp__.py (+23/-19)
account_analytic_required/account.py (+11/-10)
account_anglo_saxon_cost_structure/__init__.py (+2/-2)
account_anglo_saxon_cost_structure/__openerp__.py (+25/-18)
account_anglo_saxon_cost_structure/model/__init__.py (+1/-1)
account_anglo_saxon_cost_structure/model/invoice.py (+1/-2)
account_anglo_saxon_stock_move/__init__.py (+2/-2)
account_anglo_saxon_stock_move/__openerp__.py (+21/-21)
account_anglo_saxon_stock_move/model/__init__.py (+2/-2)
account_anglo_saxon_stock_move/model/invoice.py (+1/-0)
account_anglo_saxon_stock_move/model/stock.py (+2/-1)
account_asset_analytic/__init__.py (+1/-1)
account_asset_analytic/__openerp__.py (+23/-21)
account_asset_analytic/model/__init__.py (+1/-1)
account_asset_analytic/model/account_asset.py (+8/-6)
account_asset_date/__init__.py (+1/-1)
account_asset_date/__openerp__.py (+25/-20)
account_asset_date/account_asset.py (+4/-8)
account_asset_move_check/__init__.py (+27/-0)
account_asset_move_check/__openerp__.py (+56/-0)
account_asset_move_check/model/__init__.py (+27/-0)
account_asset_move_check/model/account_asset.py (+4/-6)
account_bank_statement_vauxoo/__init__.py (+1/-1)
account_bank_statement_vauxoo/__openerp__.py (+30/-27)
account_bank_statement_vauxoo/model/__init__.py (+3/-3)
account_bank_statement_vauxoo/model/account_bank_statement.py (+28/-31)
account_bank_statement_vauxoo/model/account_invoice.py (+1/-0)
account_bank_statement_vauxoo/model/account_journal.py (+3/-6)
account_budget_imp/__init__.py (+1/-1)
account_budget_imp/__openerp__.py (+31/-32)
account_budget_imp/i18n/pt_BR.po (+137/-0)
account_budget_imp/model/__init__.py (+1/-1)
account_budget_imp/model/account_budget.py (+30/-30)
account_chart_wiz_dates/__init__.py (+1/-1)
account_chart_wiz_dates/__openerp__.py (+23/-19)
account_chart_wiz_dates/wizard/__init__.py (+1/-1)
account_chart_wiz_dates/wizard/account_chart.py (+0/-1)
account_closure_preparation/__init__.py (+1/-1)
account_closure_preparation/__openerp__.py (+22/-19)
account_closure_preparation/model/__init__.py (+1/-1)
account_closure_preparation/model/account_closure_preparation.py (+290/-290)
account_entries_report_group_by_ref/__openerp__.py (+24/-18)
account_invoice_line_currency/__init__.py (+2/-2)
account_invoice_line_currency/__openerp__.py (+24/-19)
account_invoice_line_currency/model/__init__.py (+3/-3)
account_invoice_line_currency/model/account_invoice_line.py (+2/-3)
account_invoice_line_currency/model/res_currency.py (+1/-1)
account_invoice_number/__openerp__.py (+22/-20)
account_invoice_regular_validation/__init__.py (+1/-1)
account_invoice_regular_validation/__openerp__.py (+25/-20)
account_invoice_regular_validation/account_invoice.py (+1/-1)
account_invoice_show_by_user/__openerp__.py (+21/-14)
account_invoice_tax/__init__.py (+1/-1)
account_invoice_tax/__openerp__.py (+21/-16)
account_invoice_tax/account_invoice_tax.py (+9/-8)
account_ledger_report/__init__.py (+1/-1)
account_ledger_report/__openerp__.py (+26/-21)
account_move_cancel/__init__.py (+2/-2)
account_move_cancel/__openerp__.py (+30/-26)
account_move_cancel/i18n/pt_BR.po (+98/-0)
account_move_cancel/model/__init__.py (+1/-1)
account_move_cancel/model/invoice.py (+0/-5)
account_move_cancel/wizard/__init__.py (+1/-1)
account_move_cancel/wizard/account_move_cancel.py (+1/-11)
account_move_folio/__init__.py (+2/-2)
account_move_folio/__openerp__.py (+24/-22)
account_move_folio/model/__init__.py (+1/-1)
account_move_folio/model/account_move_folio.py (+26/-25)
account_move_folio/wizard/__init__.py (+1/-1)
account_move_folio/wizard/fill_folio_gap.py (+29/-27)
account_move_group/__init__.py (+2/-2)
account_move_group/__openerp__.py (+23/-18)
account_move_group/account_move_line.py (+1/-5)
account_move_group/i18n/pt_BR.po (+91/-0)
account_move_group/wizard/__init__.py (+1/-1)
account_move_group/wizard/account_move_group.py (+1/-4)
account_move_line_address/__init__.py (+1/-1)
account_move_line_address/__openerp__.py (+23/-18)
account_move_line_address/account_move_line.py (+1/-2)
account_move_line_base_tax/__init__.py (+1/-1)
account_move_line_base_tax/__openerp__.py (+25/-25)
account_move_line_base_tax/account.py (+35/-35)
account_move_line_dp_product/__init__.py (+1/-1)
account_move_line_dp_product/__openerp__.py (+23/-17)
account_move_line_dp_product/account_move_line.py (+1/-2)
account_move_line_extended/__init__.py (+2/-2)
account_move_line_extended/__openerp__.py (+23/-22)
account_move_line_group_analytic/__init__.py (+1/-1)
account_move_line_group_analytic/__openerp__.py (+25/-21)
account_move_line_group_analytic/account_move_line.py (+9/-10)
account_move_line_group_by_asset/__openerp__.py (+23/-22)
account_move_line_group_by_extend/__init__.py (+1/-1)
account_move_line_group_by_extend/__openerp__.py (+24/-18)
account_move_line_group_by_extend/account_move_line.py (+1/-2)
account_move_line_grouping/__openerp__.py (+21/-18)
account_move_nonzero/__init__.py (+1/-1)
account_move_nonzero/__openerp__.py (+22/-20)
account_move_nonzero/account_move_line.py (+2/-1)
account_move_report/__init__.py (+1/-1)
account_move_report/__openerp__.py (+25/-21)
account_move_report/report/__init__.py (+1/-1)
account_move_report/report/account_move_html.py (+11/-11)
account_move_sum_all_credits_debits/__init__.py (+1/-1)
account_move_sum_all_credits_debits/__openerp__.py (+21/-16)
account_move_sum_all_credits_debits/account.py (+2/-3)
account_move_validate_multi_wizard/__init__.py (+1/-1)
account_move_validate_multi_wizard/__openerp__.py (+22/-18)
account_move_validate_multi_wizard/i18n/pt_BR.po (+59/-0)
account_move_validate_multi_wizard/wizard/__init__.py (+1/-1)
account_move_validate_multi_wizard/wizard/wizard.py (+0/-2)
account_name_ref_search/__openerp__.py (+24/-18)
account_order_wizard/__init__.py (+2/-2)
account_order_wizard/__openerp__.py (+26/-24)
account_order_wizard/wizard/__init__.py (+2/-2)
account_order_wizard/wizard/wizard.py (+10/-16)
account_payment_approve_invoice/__init__.py (+1/-1)
account_payment_approve_invoice/__openerp__.py (+31/-30)
account_payment_approve_invoice/i18n/pt_BR.po (+63/-0)
account_payment_approve_invoice/model/__init__.py (+1/-1)
account_payment_approve_invoice/model/account_invoice.py (+27/-27)
account_periods_initial/__init__.py (+1/-1)
account_periods_initial/__openerp__.py (+21/-16)
account_periods_initial/account.py (+1/-2)
account_reconcile_advance/__init__.py (+1/-1)
account_reconcile_advance/__openerp__.py (+32/-29)
account_reconcile_advance/model/__init__.py (+1/-1)
account_reconcile_advance/model/account_reconcile_advance.py (+145/-146)
account_reconcile_advance_tax/__init__.py (+1/-1)
account_reconcile_advance_tax/__openerp__.py (+23/-20)
account_reconcile_advance_tax/model/__init__.py (+1/-1)
account_reconcile_advance_tax/model/account_reconcile_advance_tax.py (+17/-18)
account_reconcile_grouping/__openerp__.py (+22/-19)
account_reconcile_search/__init__.py (+1/-1)
account_reconcile_search/__openerp__.py (+45/-49)
account_reconcile_search/model/__init__.py (+1/-1)
account_reconcile_search/model/account_reconcile_search.py (+11/-12)
account_relation_move/__init__.py (+1/-1)
account_relation_move/__openerp__.py (+20/-16)
account_relation_move/account.py (+2/-4)
account_remove_account_move_amount_field/__init__.py (+1/-1)
account_remove_account_move_amount_field/__openerp__.py (+21/-16)
account_report_general_ledger_no_journal/__init__.py (+1/-1)
account_report_general_ledger_no_journal/__openerp__.py (+21/-17)
account_report_general_ledger_no_journal/wizard/__init__.py (+1/-1)
account_report_general_ledger_no_journal/wizard/account_reporte_general_ledger_no_journal.py (+6/-13)
account_return_allowance/__init__.py (+2/-2)
account_return_allowance/__openerp__.py (+40/-34)
account_return_allowance/model/__init__.py (+3/-3)
account_return_allowance/model/invoice.py (+9/-10)
account_return_allowance/model/res_company.py (+1/-2)
account_smart_unreconcile/__init__.py (+2/-2)
account_smart_unreconcile/__openerp__.py (+23/-20)
account_smart_unreconcile/model/__init__.py (+2/-2)
account_smart_unreconcile/model/account_move_line.py (+2/-3)
account_smart_unreconcile/report/__init__.py (+1/-1)
account_smart_unreconcile/wizard/__init__.py (+1/-1)
account_update_amount_tax_in_move_lines/__init__.py (+1/-1)
account_update_amount_tax_in_move_lines/__openerp__.py (+24/-21)
account_update_amount_tax_in_move_lines/wizard/__init__.py (+1/-1)
account_update_amount_tax_in_move_lines/wizard/update_amount_base_tax_wizard.py (+34/-34)
account_voucher_category/__init__.py (+1/-1)
account_voucher_category/__openerp__.py (+23/-21)
account_voucher_category/model/__init__.py (+1/-1)
account_voucher_category/model/account_voucher_category.py (+26/-22)
account_voucher_department/__init__.py (+2/-2)
account_voucher_department/__openerp__.py (+25/-24)
account_voucher_department/model/__init__.py (+1/-1)
account_voucher_department/model/account_voucher.py (+1/-3)
account_voucher_draft/__init__.py (+27/-0)
account_voucher_draft/__openerp__.py (+63/-0)
account_voucher_draft/model/__init__.py (+26/-0)
account_voucher_draft/model/account_voucher.py (+42/-0)
account_voucher_draft/view/hr_expense_expense_view.xml (+20/-0)
account_voucher_draft/wizard/__init__.py (+25/-0)
account_voucher_move_id/__openerp__.py (+25/-17)
account_voucher_no_check_default/__init__.py (+1/-1)
account_voucher_no_check_default/__openerp__.py (+22/-22)
account_voucher_no_check_default/account_voucher.py (+69/-67)
account_voucher_requester/__init__.py (+2/-2)
account_voucher_requester/__openerp__.py (+24/-23)
account_voucher_requester/model/__init__.py (+1/-1)
account_voucher_requester/model/account_voucher.py (+1/-3)
account_voucher_tax/__init__.py (+3/-3)
account_voucher_tax/__openerp__.py (+36/-32)
account_voucher_tax/account_voucher.py (+260/-277)
account_voucher_tax/invoice.py (+16/-15)
account_voucher_tax_sat/__init__.py (+2/-2)
account_voucher_tax_sat/__openerp__.py (+29/-24)
account_voucher_tax_sat/model/__init__.py (+2/-2)
account_voucher_tax_sat/model/account_voucher_tax_sat.py (+80/-83)
account_voucher_tax_sat/model/partner.py (+3/-7)
account_voucher_tax_sat/wizard/__init__.py (+1/-1)
account_voucher_tax_sat/wizard/account_tax_sat.py (+7/-12)
account_wizard_vouchers_invoice/__init__.py (+2/-2)
account_wizard_vouchers_invoice/__openerp__.py (+23/-20)
account_wizard_vouchers_invoice/wizard/__init__.py (+1/-1)
active_journal_period/__init__.py (+1/-1)
active_journal_period/__openerp__.py (+21/-17)
active_journal_period/i18n/pt_BR.po (+44/-0)
active_journal_period/model/__init__.py (+2/-2)
active_journal_period/model/account_journal.py (+2/-2)
active_journal_period/model/account_period.py (+2/-2)
add_followers/__init__.py (+1/-1)
add_followers/__openerp__.py (+23/-15)
add_followers/wizard/__init__.py (+1/-1)
add_followers/wizard/add_followers.py (+29/-30)
admin_message/__init__.py (+1/-1)
admin_message/__openerp__.py (+26/-20)
admin_message/model/__init__.py (+1/-1)
admin_message/model/mail_message.py (+0/-2)
afr_webkit/__init__.py (+2/-2)
afr_webkit/__openerp__.py (+29/-19)
afr_webkit/wizard/__init__.py (+1/-1)
afr_webkit/wizard/afr_report_wizard.py (+20/-25)
aging_due_report/__init__.py (+2/-2)
aging_due_report/__openerp__.py (+31/-24)
aging_due_report/report/__init__.py (+2/-2)
aging_due_report/report/parser.py (+22/-28)
analytic_entry_line_group/__init__.py (+2/-2)
analytic_entry_line_group/__openerp__.py (+27/-26)
analytic_entry_line_group/model/__init__.py (+1/-1)
analytic_entry_line_group/model/account_analytic_plans.py (+1/-5)
analytic_entry_line_journal/__init__.py (+27/-0)
analytic_entry_line_journal/__openerp__.py (+54/-0)
analytic_entry_line_journal/model/__init__.py (+26/-0)
analytic_entry_line_journal/model/account_analytic.py (+37/-0)
analytic_entry_line_journal/view/account_analytic_view.xml (+39/-0)
analytic_entry_line_journal/wizard/__init__.py (+25/-0)
analytic_entry_line_move/__init__.py (+27/-0)
analytic_entry_line_move/__openerp__.py (+54/-0)
analytic_entry_line_move/model/__init__.py (+26/-0)
analytic_entry_line_move/model/account_analytic.py (+37/-0)
analytic_entry_line_move/view/account_analytic_view.xml (+42/-0)
analytic_entry_line_move/wizard/__init__.py (+25/-0)
analytic_entry_line_partner/__init__.py (+2/-2)
analytic_entry_line_partner/__openerp__.py (+26/-25)
analytic_entry_line_partner/model/__init__.py (+1/-1)
analytic_entry_line_partner/model/account_analytic_plans.py (+8/-10)
analytic_entry_line_partner/view/account_analytic_plans_view.xml (+3/-0)
analytic_entry_line_period/__init__.py (+27/-0)
analytic_entry_line_period/__openerp__.py (+54/-0)
analytic_entry_line_period/model/__init__.py (+26/-0)
analytic_entry_line_period/model/account_analytic.py (+37/-0)
analytic_entry_line_period/view/account_analytic_view.xml (+39/-0)
analytic_entry_line_period/wizard/__init__.py (+25/-0)
analytic_entry_line_plans/__init__.py (+2/-2)
analytic_entry_line_plans/__openerp__.py (+26/-25)
analytic_entry_line_plans/model/__init__.py (+1/-1)
analytic_entry_line_plans/model/account_analytic_plans.py (+8/-10)
analytic_entry_line_taxcode/__init__.py (+2/-2)
analytic_entry_line_taxcode/__openerp__.py (+26/-25)
analytic_entry_line_taxcode/model/__init__.py (+1/-1)
analytic_entry_line_taxcode/model/account_analytic_plans.py (+9/-11)
analytic_plans_group/__init__.py (+2/-2)
analytic_plans_group/__openerp__.py (+28/-27)
analytic_plans_group/model/__init__.py (+1/-1)
analytic_plans_group/model/account_analytic_plans.py (+5/-8)
analytic_split_quantity/__init__.py (+2/-2)
analytic_split_quantity/__openerp__.py (+27/-26)
analytic_split_quantity/model/__init__.py (+1/-1)
analytic_split_quantity/model/account_analytic_plans.py (+8/-6)
answer_survey/__init__.py (+2/-2)
answer_survey/__openerp__.py (+52/-56)
answer_survey/model/__init__.py (+1/-1)
answer_survey/model/survey.py (+4/-11)
answer_survey/wizard/__init__.py (+2/-2)
answer_survey/wizard/survey_selection.py (+143/-144)
answer_survey/wizard/survey_send_invitation.py (+34/-40)
bank_iva_report/__init__.py (+2/-2)
bank_iva_report/__openerp__.py (+26/-24)
bank_iva_report/report/__init__.py (+1/-1)
bank_iva_report/report/numero_a_texto.py (+3/-3)
bank_iva_report/report/report_voucher_amount.py (+2/-3)
bank_print_report/__init__.py (+3/-3)
bank_print_report/__openerp__.py (+26/-24)
bank_print_report/report/__init__.py (+1/-1)
bank_print_report/report/check.py (+3/-5)
bank_print_report/report/numero_a_texto.py (+3/-3)
bank_print_report/wizard/__init__.py (+1/-1)
baremo/__init__.py (+1/-1)
baremo/__openerp__.py (+27/-22)
baremo/baremo.py (+3/-3)
base_user_signature_logo/__init__.py (+1/-1)
base_user_signature_logo/__openerp__.py (+23/-20)
base_vat_principal_view/__openerp__.py (+24/-15)
bzr_to_task/__init__.py (+1/-1)
bzr_to_task/__openerp__.py (+22/-17)
bzr_to_task/bzr_to_task.py (+3/-5)
change_invoice_number/__init__.py (+2/-2)
change_invoice_number/__openerp__.py (+28/-22)
change_invoice_number/i18n/pt_BR.po (+72/-0)
change_invoice_number/wizard/__init__.py (+1/-1)
change_invoice_number/wizard/change_number.py (+0/-6)
check_unit_measure/__init__.py (+2/-2)
check_unit_measure/__openerp__.py (+29/-20)
check_unit_measure/model/__init__.py (+4/-4)
check_unit_measure/model/invoice.py (+0/-3)
check_unit_measure/model/purchase.py (+0/-3)
check_unit_measure/model/sale.py (+0/-2)
check_unit_measure/model/stock.py (+0/-4)
check_unit_measure/wizard/__init__.py (+1/-1)
check_unit_measure/wizard/stock_return_picking.py (+1/-4)
clean_user_groups/__init__.py (+1/-1)
clean_user_groups/__openerp__.py (+24/-26)
clean_user_groups/wizard/__init__.py (+1/-1)
clean_user_groups/wizard/clean_group.py (+6/-14)
commission_payment/__init__.py (+2/-2)
commission_payment/__openerp__.py (+30/-20)
commission_payment/commission.py (+48/-49)
commission_payment/report/__init__.py (+1/-1)
commission_payment/report/tiny_sxw2rml/__init__.py (+1/-1)
commission_payment/report/tiny_sxw2rml/tiny_sxw2rml.py (+8/-2)
company_description/__init__.py (+1/-1)
company_description/__openerp__.py (+23/-19)
company_description/i18n/pt_BR.po (+58/-0)
configure_account_partner/__init__.py (+1/-1)
configure_account_partner/__openerp__.py (+24/-19)
configure_account_partner/wizard/__init__.py (+1/-1)
configure_account_partner/wizard/conf_account_partner.py (+27/-27)
configure_chart_account/__init__.py (+1/-1)
configure_chart_account/__openerp__.py (+25/-20)
configure_chart_account/wizard/__init__.py (+1/-1)
configure_chart_account/wizard/set_accounting_wizard.py (+16/-16)
configure_create_journal/__init__.py (+1/-1)
configure_create_journal/__openerp__.py (+25/-20)
configure_create_journal/wizard/__init__.py (+1/-1)
configure_create_journal/wizard/set_accounting_wizard.py (+8/-8)
contract_enterprise_openerp/__init__.py (+1/-1)
contract_enterprise_openerp/__openerp__.py (+27/-22)
contract_enterprise_openerp/model/__init__.py (+1/-1)
contract_enterprise_openerp/model/account_analytic_analysis.py (+3/-8)
contract_log_term_condition/__init__.py (+1/-1)
contract_log_term_condition/__openerp__.py (+22/-28)
contract_log_term_condition/model/__init__.py (+1/-1)
contract_log_term_condition/model/analytic.py (+1/-1)
contract_log_term_condition/tests/test_contract.py (+5/-10)
cost_imex/__init__.py (+1/-1)
cost_imex/__openerp__.py (+29/-20)
cost_imex/model/__init__.py (+2/-2)
cost_imex/model/percent_imex.py (+7/-6)
cost_imex/model/purchase.py (+5/-8)
cost_structure/__init__.py (+2/-2)
cost_structure/__openerp__.py (+41/-34)
cost_structure/model/__init__.py (+3/-3)
cost_structure/model/cost_structure.py (+8/-16)
cost_structure/model/invoice.py (+0/-6)
cost_structure/model/product_product.py (+9/-16)
cost_structure/wizard/__init__.py (+3/-3)
cost_structure/wizard/account_invoice_refund.py (+1/-7)
cost_structure/wizard/compute_cost.py (+77/-85)
cost_structure/wizard/default_cost_to_report.py (+3/-11)
cost_structure/wizard/update_price_list.py (+14/-22)
crm_cost_issue/__init__.py (+1/-1)
crm_cost_issue/__openerp__.py (+28/-23)
crm_cost_issue/project.py (+11/-14)
crm_profile_reporting/__init__.py (+1/-1)
crm_profile_reporting/__openerp__.py (+26/-17)
crm_profile_reporting/report/__init__.py (+1/-1)
crm_profile_reporting/report/crm_profile_report.py (+1/-7)
db_tools/__init__.py (+1/-1)
db_tools/__openerp__.py (+23/-19)
db_tools/wizard/__init__.py (+1/-1)
db_tools/wizard/db_tools.py (+0/-7)
debit_credit_note/__init__.py (+3/-3)
debit_credit_note/__openerp__.py (+27/-31)
debit_credit_note/invoice.py (+1/-3)
debit_credit_note/wizard/__init__.py (+4/-4)
debit_credit_note/wizard/account_invoice_debit.py (+5/-10)
debit_credit_note/wizard/account_invoice_parent.py (+24/-30)
debit_credit_note/wizard/account_invoice_refund.py (+3/-4)
decimal_precision_currency/__init__.py (+1/-1)
decimal_precision_currency/__openerp__.py (+25/-19)
decimal_precision_currency/decimal_pre_currency.py (+0/-3)
decimal_precision_tax/__init__.py (+1/-1)
decimal_precision_tax/__openerp__.py (+25/-18)
decimal_precision_tax/decimal_pre_tax.py (+0/-4)
deliver_project/__init__.py (+2/-2)
deliver_project/__openerp__.py (+25/-24)
deliver_project/model/__init__.py (+1/-1)
deliver_project/model/module.py (+11/-35)
deliver_project/report/__init__.py (+3/-3)
deliver_project/report/ir_module_reference_print.py (+3/-2)
demo_button/__openerp__.py (+24/-14)
document_page_comments/__init__.py (+1/-1)
document_page_comments/__openerp__.py (+30/-27)
document_page_comments/model/__init__.py (+1/-1)
document_page_comments/model/document.py (+13/-21)
duplicated_tasks/__init__.py (+2/-2)
duplicated_tasks/__openerp__.py (+27/-31)
duplicated_tasks/model/__init__.py (+1/-1)
duplicated_tasks/model/task.py (+0/-3)
duplicated_tasks/wizard/__init__.py (+1/-1)
duplicated_tasks/wizard/search_duplicated_task.py (+6/-6)
email_template_att_dinamic/__init__.py (+1/-1)
email_template_att_dinamic/__openerp__.py (+25/-16)
email_template_att_dinamic/model/__init__.py (+1/-1)
email_template_att_dinamic/model/email_template.py (+15/-13)
email_template_comment/__init__.py (+1/-1)
email_template_comment/__openerp__.py (+25/-17)
email_template_comment/model/__init__.py (+2/-2)
email_template_comment/model/email_template.py (+3/-3)
email_template_comment/model/mail_compose_message.py (+8/-8)
email_template_followers/__init__.py (+1/-1)
email_template_followers/__openerp__.py (+26/-17)
email_template_followers/model/__init__.py (+2/-2)
email_template_followers/model/email_template.py (+4/-3)
email_template_followers/model/mail_compose_message.py (+13/-13)
expired_task_information/__init__.py (+1/-1)
expired_task_information/__openerp__.py (+28/-32)
expired_task_information/model/__init__.py (+1/-1)
expired_task_information/model/task.py (+9/-12)
fetchmail_document/__init__.py (+1/-1)
fetchmail_document/__openerp__.py (+22/-17)
fetchmail_document/crm_claim.py (+2/-2)
fetchmail_document/document.py (+2/-2)
forward_mail/__init__.py (+1/-1)
forward_mail/__openerp__.py (+24/-16)
forward_mail/wizard/__init__.py (+1/-1)
forward_mail/wizard/forward_mail.py (+10/-10)
group_button_wkf_send_rfq/__init__.py (+1/-1)
group_button_wkf_send_rfq/__openerp__.py (+25/-19)
group_configurations_account/__openerp__.py (+23/-17)
group_xml_id/__init__.py (+1/-1)
group_xml_id/__openerp__.py (+23/-15)
group_xml_id/groups.py (+2/-8)
group_xml_id/groups_view.xml (+0/-1)
hr_childrens/__init__.py (+1/-1)
hr_childrens/__openerp__.py (+24/-15)
hr_childrens/hr_children.py (+9/-7)
hr_expense_analytic/__init__.py (+1/-1)
hr_expense_analytic/__openerp__.py (+24/-16)
hr_expense_replenishment/__init__.py (+2/-2)
hr_expense_replenishment/__openerp__.py (+29/-24)
hr_expense_replenishment/model/__init__.py (+2/-2)
hr_expense_replenishment/model/account_invoice.py (+4/-3)
hr_expense_replenishment/model/hr_expense.py (+184/-176)
hr_expense_replenishment/view/hr_expense_view.xml (+19/-0)
hr_expense_replenishment/wizard/__init__.py (+1/-1)
hr_expense_replenishment/wizard/attach_invoice_to_expense_wizard.py (+3/-2)
hr_expense_replenishment_cancel/__init__.py (+1/-1)
hr_expense_replenishment_cancel/__openerp__.py (+25/-18)
hr_expense_replenishment_cancel/model/__init__.py (+1/-1)
hr_expense_replenishment_cancel/model/hr_expense_replenishment_cancel.py (+5/-8)
hr_expense_replenishment_tax/__init__.py (+1/-1)
hr_expense_replenishment_tax/__openerp__.py (+25/-21)
hr_expense_replenishment_tax/model/__init__.py (+1/-1)
hr_expense_replenishment_tax/model/hr_expense.py (+52/-56)
hr_job_positions_extended/__init__.py (+27/-0)
hr_job_positions_extended/__openerp__.py (+61/-0)
hr_job_positions_extended/i18n/es_VE.po (+108/-0)
hr_job_positions_extended/i18n/hr_job_positions_extended.pot (+108/-0)
hr_job_positions_extended/model/__init__.py (+26/-0)
hr_job_positions_extended/model/hr_job_position.py (+61/-0)
hr_job_positions_extended/view/hr_job_positions_view.xml (+41/-0)
hr_job_positions_extended/wizard/__init__.py (+25/-0)
hr_payroll_cancel/__openerp__.py (+24/-20)
hr_payslip_paid/__init__.py (+1/-1)
hr_payslip_paid/__openerp__.py (+24/-20)
hr_payslip_paid/model/__init__.py (+1/-1)
hr_payslip_paid/model/hr_payroll.py (+32/-28)
hr_payslip_validation_home_address/__init__.py (+1/-1)
hr_payslip_validation_home_address/__openerp__.py (+23/-20)
hr_payslip_validation_home_address/model/__init__.py (+1/-1)
hr_salesman_commission/__init__.py (+1/-1)
hr_salesman_commission/__openerp__.py (+25/-15)
hr_salesman_commission/hr_salesman_commission.py (+5/-14)
icecat_product_uniqueness/__init__.py (+1/-1)
icecat_product_uniqueness/__openerp__.py (+24/-12)
icecat_product_uniqueness/product.py (+3/-3)
ifrs_report/__init__.py (+4/-4)
ifrs_report/__openerp__.py (+33/-22)
ifrs_report/model/__init__.py (+2/-2)
ifrs_report/model/account.py (+2/-2)
ifrs_report/model/ifrs.py (+101/-111)
ifrs_report/wizard/__init__.py (+1/-1)
ifrs_report/wizard/ifrs_report_wizard.py (+2/-5)
inactive_account_children/__init__.py (+1/-1)
inactive_account_children/__openerp__.py (+24/-18)
inactive_account_children/wizard/__init__.py (+1/-1)
inactive_account_children/wizard/inactive_account_wizard.py (+10/-10)
incoterm_delivery_type/__init__.py (+2/-2)
incoterm_delivery_type/__openerp__.py (+25/-17)
incoterm_delivery_type/model/__init__.py (+1/-1)
incoterm_delivery_type/model/incoterm_delivery_type.py (+1/-4)
incoterm_ext/__init__.py (+1/-1)
incoterm_ext/__openerp__.py (+44/-34)
incoterm_ext/incoterm.py (+1/-1)
inventory_stock_report/__init__.py (+3/-3)
inventory_stock_report/__openerp__.py (+29/-28)
inventory_stock_report/report/__init__.py (+3/-3)
inventory_stock_report/report/reporte_stock.py (+1/-6)
inventory_stock_report/report/reporte_stock2.py (+1/-6)
inventory_stock_report/wizard/__init__.py (+3/-3)
inventory_stock_report/wizard/stock_count.py (+1/-3)
inventory_stock_report/wizard/stock_total.py (+1/-2)
invisible_aml_tax/__openerp__.py (+23/-23)
invoice_cancel_islr/__init__.py (+2/-2)
invoice_cancel_islr/__openerp__.py (+27/-21)
invoice_cancel_islr/model/__init__.py (+2/-2)
invoice_cancel_islr/model/invoice.py (+9/-14)
invoice_cancel_islr/model/islr_wh_doc.py (+0/-5)
invoice_cancel_iva/__init__.py (+2/-2)
invoice_cancel_iva/__openerp__.py (+28/-23)
invoice_cancel_iva/model/__init__.py (+2/-2)
invoice_cancel_iva/model/invoice.py (+9/-12)
invoice_cancel_iva/model/wh_iva_doc.py (+0/-5)
invoice_commission/__init__.py (+1/-1)
invoice_commission/__openerp__.py (+25/-17)
invoice_commission/invoice_commission.py (+5/-7)
invoice_date_ref/__init__.py (+1/-1)
invoice_date_ref/__openerp__.py (+21/-15)
invoice_date_time/__init__.py (+1/-1)
invoice_date_time/__openerp__.py (+21/-19)
invoice_date_time/model/__init__.py (+1/-1)
invoice_date_time/model/invoice.py (+1/-4)
invoice_datetime/__init__.py (+2/-2)
invoice_datetime/__openerp__.py (+23/-20)
invoice_datetime/invoice.py (+21/-24)
invoice_datetime/res_config.py (+6/-13)
invoice_discount/__init__.py (+26/-0)
invoice_discount/__openerp__.py (+53/-0)
invoice_discount/i18n/es.po (+68/-0)
invoice_discount/i18n/es_MX.po (+17/-0)
invoice_discount/model/__init__.py (+27/-0)
invoice_discount/model/config_settings.py (+43/-0)
invoice_discount/model/invoice.py (+158/-0)
invoice_discount/view/config_settings_action.xml (+6/-0)
invoice_discount/view/invoice_view.xml (+42/-0)
invoice_multicompany_report/__init__.py (+2/-2)
invoice_multicompany_report/__openerp__.py (+26/-18)
invoice_multicompany_report/res_company.py (+1/-2)
invoice_multicompany_report/wizard/__init__.py (+2/-2)
invoice_multicompany_report/wizard/account_invoice_multicompany.py (+1/-0)
invoice_number_view_tree/__openerp__.py (+23/-16)
invoice_print_multicompany/__init__.py (+2/-2)
invoice_print_multicompany/__openerp__.py (+25/-18)
invoice_print_multicompany/res_company.py (+1/-1)
invoice_print_multicompany/wizard/__init__.py (+2/-2)
invoice_print_multicompany/wizard/account_invoice_multicompany.py (+2/-1)
invoice_report_multicompany/__init__.py (+2/-2)
invoice_report_multicompany/__openerp__.py (+24/-19)
invoice_report_multicompany/invoice.py (+2/-5)
invoice_report_multicompany/order.py (+2/-2)
invoice_report_multicompany/report/__init__.py (+2/-2)
invoice_report_multicompany/report/account_print_invoice.py (+1/-0)
invoice_report_per_journal/__init__.py (+3/-3)
invoice_report_per_journal/__openerp__.py (+29/-24)
invoice_report_per_journal/model/__init__.py (+1/-1)
invoice_report_per_journal/report/__init__.py (+1/-1)
invoice_report_per_journal/report/invoice_report_demo.py (+1/-7)
invoice_report_per_journal/wizard/__init__.py (+1/-1)
invoice_report_per_journal/wizard/invoice_report_per_journal.py (+6/-5)
invoice_sale_ref/__init__.py (+1/-1)
invoice_sale_ref/__openerp__.py (+22/-18)
invoice_sale_ref/stock_picking.py (+4/-4)
invoice_so/__init__.py (+1/-1)
invoice_so/__openerp__.py (+25/-20)
ir_actions_report_xml_multicompany/__init__.py (+1/-1)
ir_actions_report_xml_multicompany/__openerp__.py (+23/-19)
ir_actions_report_xml_multicompany/model/__init__.py (+1/-1)
ir_actions_report_xml_multicompany/model/ir_actions_report_xml.py (+3/-3)
ir_ui_view_filter_arch/__openerp__.py (+24/-18)
ir_values_menu/__openerp__.py (+25/-21)
issue_load/__init__.py (+2/-2)
issue_load/__openerp__.py (+25/-18)
issue_load/wizard/__init__.py (+1/-1)
issue_load/wizard/load_issue.py (+0/-7)
issue_load/wizard/migrate.py (+5/-8)
issue_load/workflow/__init__.py (+2/-2)
issue_load/workflow/__openerp__.py (+26/-18)
issue_load/workflow/wizard/__init__.py (+1/-1)
issue_load/workflow/wizard/load_issue.py (+0/-7)
issue_load/workflow/wizard/migrate.py (+3/-6)
issue_view/__init__.py (+2/-2)
issue_view/__openerp__.py (+26/-19)
issue_view/model/__init__.py (+1/-1)
issue_view/model/project_issue.py (+1/-9)
l10n_ve_commerce/__init__.py (+2/-2)
l10n_ve_commerce/__openerp__.py (+36/-27)
l10n_ve_commerce/account.py (+11/-11)
l10n_ve_stock/__init__.py (+3/-3)
l10n_ve_stock/__openerp__.py (+27/-24)
l10n_ve_stock/report/__init__.py (+2/-2)
l10n_ve_stock/report/stock_guia.py (+2/-1)
l10n_ve_stock/report/stock_valued.py (+2/-1)
l10n_ve_stock/wizard/__init__.py (+1/-1)
l10n_ve_stock/wizard/wiz_picking_valued.py (+0/-3)
lang_conf/__openerp__.py (+23/-16)
late_payments_report/__init__.py (+1/-1)
late_payments_report/__openerp__.py (+26/-19)
late_payments_report/report/__init__.py (+1/-1)
late_payments_report/report/late_payments.py (+1/-1)
ledger_report_partner/__init__.py (+3/-3)
ledger_report_partner/__openerp__.py (+26/-21)
ledger_report_partner/report/__init__.py (+1/-1)
ledger_report_partner/report/request_ledger_report.py (+2/-2)
ledger_report_partner/wizard/__init__.py (+1/-1)
ledger_report_partner/wizard/ledger_report.py (+2/-9)
message_post_model/__init__.py (+1/-1)
message_post_model/__openerp__.py (+23/-15)
message_post_model/model/__init__.py (+1/-1)
message_post_model/model/message_post.py (+42/-47)
message_post_test/__init__.py (+1/-1)
message_post_test/__openerp__.py (+23/-15)
message_post_test/model/__init__.py (+1/-1)
message_post_test/model/message_post_test.py (+1/-2)
message_post_test/tests/test_message_post.py (+37/-39)
mrp_account_link/__init__.py (+1/-1)
mrp_account_link/__openerp__.py (+21/-16)
mrp_account_variation/__init__.py (+3/-3)
mrp_account_variation/__openerp__.py (+24/-18)
mrp_account_variation/mrp_account_variation.py (+33/-34)
mrp_account_variation/mrp_account_variation_price.py (+11/-12)
mrp_account_variation_cancel/__init__.py (+1/-1)
mrp_account_variation_cancel/__openerp__.py (+22/-17)
mrp_account_variation_cancel/account_variation_cancel.py (+4/-6)
mrp_account_variation_cancel/i18n/pt_BR.po (+23/-0)
mrp_advance/mrp_bom_cost/__init__.py (+2/-2)
mrp_advance/mrp_bom_cost/__openerp__.py (+29/-21)
mrp_advance/mrp_bom_cost/mrp.py (+6/-7)
mrp_advance/mrp_bom_cost/product.py (+0/-1)
mrp_advance/mrp_routing_cost/__init__.py (+1/-1)
mrp_advance/mrp_routing_cost/__openerp__.py (+24/-19)
mrp_advance/mrp_routing_cost/mrp_routing.py (+1/-4)
mrp_bom_constraint/__init__.py (+1/-1)
mrp_bom_constraint/__openerp__.py (+22/-18)
mrp_bom_constraint/mrp_bom.py (+1/-2)
mrp_bom_standard_price/__init__.py (+1/-1)
mrp_bom_standard_price/__openerp__.py (+25/-18)
mrp_bom_standard_price/mrp_bom.py (+0/-1)
mrp_bom_subproduct_cost/__init__.py (+1/-1)
mrp_bom_subproduct_cost/__openerp__.py (+24/-20)
mrp_bom_subproduct_cost/mrp_subproduct.py (+1/-3)
mrp_button_box/__init__.py (+2/-2)
mrp_button_box/__openerp__.py (+25/-17)
mrp_consume_produce/__init__.py (+3/-3)
mrp_consume_produce/__openerp__.py (+29/-22)
mrp_consume_produce/mrp.py (+0/-2)
mrp_consume_produce/mrp_config.py (+2/-5)
mrp_consume_produce/wizard/__init__.py (+1/-1)
mrp_consume_produce/wizard/mrp_consume_produce.py (+0/-3)
mrp_default_location/__init__.py (+2/-2)
mrp_default_location/__openerp__.py (+25/-13)
mrp_default_location/mrp.py (+1/-9)
mrp_default_location/product.py (+0/-8)
mrp_jit_extended/__init__.py (+1/-1)
mrp_jit_extended/__openerp__.py (+25/-19)
mrp_jit_extended/wizard/__init__.py (+1/-1)
mrp_jit_extended/wizard/mrp_jit_extended_wizard.py (+3/-4)
mrp_location_line_production/__init__.py (+1/-1)
mrp_location_line_production/__openerp__.py (+23/-20)
mrp_location_line_production/mrp.py (+1/-1)
mrp_product_capacity/__init__.py (+2/-2)
mrp_product_capacity/__openerp__.py (+26/-18)
mrp_product_capacity/model/__init__.py (+1/-1)
mrp_product_capacity/model/mrp_product_capacity.py (+2/-3)
mrp_production_analytic_acc/__init__.py (+2/-2)
mrp_production_analytic_acc/__openerp__.py (+27/-15)
mrp_production_analytic_acc/mrp.py (+5/-5)
mrp_production_analytic_acc/stock.py (+4/-4)
mrp_production_bom_related/__init__.py (+1/-1)
mrp_production_bom_related/__openerp__.py (+24/-20)
mrp_production_bom_related/mrp.py (+2/-2)
mrp_production_cancel/__init__.py (+1/-1)
mrp_production_cancel/__openerp__.py (+27/-15)
mrp_production_cancel/mrp.py (+3/-5)
mrp_production_filter/__openerp__.py (+23/-19)
mrp_production_filter_date/__openerp__.py (+24/-18)
mrp_production_filter_product/__openerp__.py (+24/-18)
mrp_production_make_wzd/__init__.py (+1/-1)
mrp_production_make_wzd/__openerp__.py (+24/-20)
mrp_production_make_wzd/wizard/__init__.py (+1/-1)
mrp_production_make_wzd/wizard/wizard_production_make.py (+6/-7)
mrp_production_procurement_order/__init__.py (+2/-2)
mrp_production_procurement_order/__openerp__.py (+20/-16)
mrp_production_procurement_order/mrp.py (+2/-4)
mrp_production_procurement_order/procurement.py (+0/-1)
mrp_production_security_force/__openerp__.py (+23/-17)
mrp_production_security_force/i18n/pt_BR.po (+23/-0)
mrp_production_wizard/__init__.py (+2/-2)
mrp_production_wizard/__openerp__.py (+22/-17)
mrp_production_wizard/mrp.py (+14/-18)
mrp_production_wizard/wizard/__init__.py (+1/-1)
mrp_production_wizard/wizard/special_order_wizard.py (+0/-2)
mrp_pt_planified/__init__.py (+1/-1)
mrp_pt_planified/__openerp__.py (+25/-20)
mrp_pt_planified/mrp.py (+2/-2)
mrp_request_add_item/__init__.py (+22/-22)
mrp_request_add_item/__openerp__.py (+48/-46)
mrp_request_add_item/model/__init__.py (+20/-20)
mrp_request_add_item/wizard/__init__.py (+21/-21)
mrp_request_add_item/wizard/mrp_request_return.py (+27/-27)
mrp_request_return/__init__.py (+2/-2)
mrp_request_return/__openerp__.py (+25/-19)
mrp_request_return/mrp.py (+6/-6)
mrp_request_return/wizard/__init__.py (+1/-1)
mrp_request_return/wizard/mrp_request_return.py (+7/-9)
mrp_request_return_cancel/__init__.py (+1/-1)
mrp_request_return_cancel/__openerp__.py (+21/-12)
mrp_request_return_cancel/i18n/pt_BR.po (+23/-0)
mrp_request_return_cancel/mrp.py (+2/-5)
mrp_scheduled_onchange_product/__init__.py (+1/-1)
mrp_scheduled_onchange_product/__openerp__.py (+21/-16)
mrp_scheduled_onchange_product/i18n/pt_BR.po (+23/-0)
mrp_scheduled_onchange_product/mrp.py (+1/-3)
mrp_subproduct_pt_planified/__init__.py (+1/-1)
mrp_subproduct_pt_planified/__openerp__.py (+23/-18)
mrp_subproduct_pt_planified/i18n/pt_BR.po (+23/-0)
mrp_subproduct_pt_planified/mrp.py (+4/-4)
mrp_subproduction/__init__.py (+1/-1)
mrp_subproduction/__openerp__.py (+21/-17)
mrp_subproduction/mrp.py (+12/-13)
mrp_variation/__init__.py (+1/-1)
mrp_variation/__openerp__.py (+26/-20)
mrp_variation/mrp_variation.py (+2/-2)
mrp_webkit_report_wizard/__init__.py (+2/-2)
mrp_webkit_report_wizard/__openerp__.py (+29/-19)
mrp_webkit_report_wizard/report/__init__.py (+3/-3)
mrp_webkit_report_wizard/report/report_webkit_html.py (+1/-0)
mrp_webkit_report_wizard/report/report_webkit_variation_group.py (+1/-0)
mrp_webkit_report_wizard/wizard/__init__.py (+1/-1)
mrp_webkit_report_wizard/wizard/wizard_report_variation.py (+3/-4)
mrp_workcenter_management/__init__.py (+1/-1)
mrp_workcenter_management/__openerp__.py (+23/-18)
mrp_workcenter_management/model/__init__.py (+1/-1)
mrp_workcenter_management/model/mrp_workcenter.py (+1/-2)
mrp_workcenter_responsible/__init__.py (+1/-1)
mrp_workcenter_responsible/__openerp__.py (+22/-15)
mrp_workcenter_responsible/model/__init__.py (+1/-1)
mrp_workcenter_responsible/model/mrp_workcenter_responsible.py (+1/-2)
mrp_workorder_lot/__init__.py (+2/-2)
mrp_workorder_lot/__openerp__.py (+31/-22)
mrp_workorder_lot/model/__init__.py (+3/-3)
mrp_workorder_lot/model/mrp_workorder_lot.py (+50/-55)
mrp_workorder_lot/model/res_company.py (+9/-11)
mrp_workorder_lot/model/res_config.py (+8/-10)
mrp_workorder_lot/wizard/__init__.py (+1/-1)
mrp_workorder_lot/wizard/mrp_consume_produce.py (+1/-4)
mrp_workorder_variation/__init__.py (+2/-2)
mrp_workorder_variation/__openerp__.py (+24/-23)
mrp_workorder_variation/model/__init__.py (+1/-1)
mrp_workorder_variation/model/mrp.py (+4/-3)
mrp_workorder_variation/wizard/__init__.py (+19/-19)
multireport_base/__init__.py (+2/-2)
multireport_base/__openerp__.py (+27/-18)
multireport_base/i18n/pt_BR.po (+23/-0)
note_to_task/__init__.py (+22/-22)
note_to_task/__openerp__.py (+46/-37)
note_to_task/model/__init__.py (+19/-19)
note_to_task/wizard/__init__.py (+20/-20)
note_to_task/wizard/convert_note.py (+44/-44)
openerp_print/__init__.py (+3/-3)
openerp_print/__openerp__.py (+30/-25)
openerp_print/cupstree.py (+4/-5)
openerp_print/print_model.py (+1/-8)
openerp_print/pyPdf/filters.py (+14/-10)
openerp_print/pyPdf/pdf.py (+20/-20)
openerp_print/pyPdf/utils.py (+1/-0)
openerp_print/pyPdf/xmp.py (+1/-2)
openerp_print/report_sxw.py (+19/-32)
openerp_print/report_sxw_ext.py (+20/-27)
openerp_print/res_company.py (+0/-4)
partner_credit_limit/__init__.py (+3/-3)
partner_credit_limit/invoice.py (+1/-5)
partner_credit_limit/partner.py (+0/-6)
partner_credit_limit/sale.py (+2/-6)
partner_effective_sale/__init__.py (+2/-2)
partner_effective_sale/__openerp__.py (+26/-25)
partner_effective_sale/model/__init__.py (+2/-2)
partner_effective_sale/model/partner.py (+52/-53)
partner_invoice_description/__init__.py (+2/-2)
partner_invoice_description/__openerp__.py (+25/-18)
partner_invoice_description/account_invoice.py (+5/-5)
partner_invoice_description/partner.py (+1/-1)
partner_products/__init__.py (+2/-2)
partner_products/__openerp__.py (+24/-23)
partner_products/model/__init__.py (+1/-1)
partner_products/model/res_partner.py (+2/-3)
partner_property_accounts/__openerp__.py (+23/-20)
partner_ref_search/__openerp__.py (+24/-18)
partner_required_in_acc_move_line/__init__.py (+1/-1)
partner_required_in_acc_move_line/__openerp__.py (+23/-23)
partner_required_in_acc_move_line/account.py (+4/-3)
partner_search_by_vat/__init__.py (+1/-1)
partner_search_by_vat/__openerp__.py (+21/-16)
partner_search_by_vat/model/__init__.py (+1/-1)
partner_search_by_vat/model/res_partner.py (+11/-12)
partner_validate_vat/__init__.py (+1/-1)
partner_validate_vat/__openerp__.py (+20/-16)
partner_validate_vat/res_partner.py (+6/-6)
payment_terms/__init__.py (+1/-1)
payment_terms/__openerp__.py (+32/-24)
payment_terms/model/__init__.py (+5/-5)
payment_terms/model/account.py (+14/-25)
payment_terms/model/partner.py (+10/-13)
payment_terms/model/purchase.py (+24/-29)
payment_terms/model/sale.py (+32/-36)
payment_terms/model/stock.py (+35/-44)
payroll_amount_residual/__init__.py (+1/-1)
payroll_amount_residual/__openerp__.py (+23/-19)
payroll_amount_residual/hr_payslip.py (+9/-9)
periodic_inventory_valuation/__init__.py (+1/-1)
periodic_inventory_valuation/__openerp__.py (+25/-20)
periodic_inventory_valuation/model/__init__.py (+1/-1)
periodic_inventory_valuation/model/periodic_inventory_valuation.py (+213/-220)
picking_from_invoice/__init__.py (+2/-2)
picking_from_invoice/__openerp__.py (+25/-19)
picking_from_invoice/wizard/__init__.py (+1/-1)
picking_from_invoice/wizard/picking_from_invoice.py (+6/-12)
picking_verification_report/__init__.py (+1/-1)
picking_verification_report/__openerp__.py (+24/-18)
picking_verification_report/report/__init__.py (+1/-1)
picking_verification_report/report/picking.py (+1/-0)
point_of_sale_by_month/__openerp__.py (+23/-19)
point_of_sale_reprint_tree/__openerp__.py (+23/-19)
portal_crm_vauxoo/__init__.py (+2/-2)
portal_crm_vauxoo/__openerp__.py (+30/-30)
portal_crm_vauxoo/contact.py (+1/-0)
portal_crm_vauxoo/controllers/main.py (+3/-20)
portal_project_kanban_fields/__init__.py (+2/-2)
portal_project_kanban_fields/__openerp__.py (+27/-20)
portal_project_kanban_fields/model/__init__.py (+1/-1)
portal_project_kanban_fields/model/project.py (+4/-5)
portal_user_story/__openerp__.py (+29/-25)
portal_user_story/tests/test_user_story.py (+10/-16)
pos_calculator/__init__.py (+22/-22)
pos_calculator/__openerp__.py (+54/-50)
pos_delivery_restaurant/__init__.py (+2/-2)
pos_delivery_restaurant/__openerp__.py (+26/-19)
pos_delivery_restaurant/model/__init__.py (+1/-1)
pos_delivery_restaurant/model/point_of_sale.py (+5/-5)
pos_product_filter/__init__.py (+2/-2)
pos_product_filter/__openerp__.py (+31/-23)
pos_product_filter/model/__init__.py (+1/-1)
pos_product_filter/model/product.py (+6/-7)
pr_line_related_po_line/__init__.py (+2/-2)
pr_line_related_po_line/__openerp__.py (+23/-22)
pr_line_related_po_line/model/__init__.py (+1/-1)
pr_line_related_po_line/model/purchase_order_line.py (+17/-18)
price_structure/__init__.py (+2/-2)
price_structure/__openerp__.py (+35/-31)
price_structure/model/__init__.py (+3/-3)
price_structure/model/product_pricelist.py (+7/-10)
price_structure/model/product_product.py (+15/-21)
price_structure/model/sale.py (+21/-26)
price_structure/wizard/__init__.py (+1/-1)
price_structure/wizard/create_list_price.py (+0/-1)
procurement_location/__init__.py (+1/-1)
procurement_location/__openerp__.py (+22/-12)
procurement_location/procurement.py (+3/-3)
procurement_order_merge/__init__.py (+2/-2)
procurement_order_merge/__openerp__.py (+24/-18)
procurement_order_merge/procurement.py (+7/-10)
procurement_order_merge/wizard/__init__.py (+1/-1)
procurement_order_merge/wizard/procurement_order_merge.py (+3/-3)
procurement_so2po_shiping_address/__init__.py (+1/-1)
procurement_so2po_shiping_address/__openerp__.py (+26/-15)
procurement_so2po_shiping_address/procurement_so2po_shiping_address.py (+17/-24)
procurement_wizard_schedulers/__init__.py (+1/-1)
procurement_wizard_schedulers/__openerp__.py (+27/-18)
procurement_wizard_schedulers/wizard/__init__.py (+1/-1)
procurement_wizard_schedulers/wizard/schedulers_all.py (+0/-3)
product_category_multicompany/__init__.py (+1/-1)
product_category_multicompany/__openerp__.py (+25/-17)
product_category_multicompany/model/__init__.py (+1/-1)
product_context_date/__init__.py (+1/-1)
product_context_date/__openerp__.py (+23/-17)
product_context_date/product.py (+2/-3)
product_customer_code/__init__.py (+2/-2)
product_customer_code/__openerp__.py (+26/-19)
product_customer_code/product.py (+6/-7)
product_customer_code/product_customer_code.py (+4/-5)
product_customs_rate/__init__.py (+2/-2)
product_customs_rate/__openerp__.py (+26/-22)
product_customs_rate/product_customs_rate.py (+2/-2)
product_do_merge/__init__.py (+2/-2)
product_do_merge/__openerp__.py (+28/-33)
product_do_merge/model/__init__.py (+1/-1)
product_do_merge/model/product.py (+1/-5)
product_do_merge/wizard/__init__.py (+1/-1)
product_do_merge/wizard/base_product_merge.py (+11/-16)
product_historical_price/__init__.py (+2/-2)
product_historical_price/__openerp__.py (+29/-18)
product_historical_price/product.py (+13/-13)
product_icecat/__init__.py (+4/-4)
product_icecat/__openerp__.py (+30/-25)
product_icecat/product_icecat.py (+4/-6)
product_icecat/product_manufacturer.py (+0/-1)
product_icecat/wizard/__init__.py (+2/-2)
product_icecat/wizard/wizard_product_icecat.py (+18/-22)
product_images_olbs/__init__.py (+2/-2)
product_images_olbs/__openerp__.py (+26/-19)
product_images_olbs/product.py (+3/-3)
product_images_olbs/product_images.py (+1/-0)
product_price_visible/__openerp__.py (+25/-19)
product_pricelist_date/__init__.py (+1/-1)
product_pricelist_date/__openerp__.py (+26/-19)
product_pricelist_date/pricelist.py (+0/-2)
product_product_multi_link/__openerp__.py (+23/-17)
product_rfq/__init__.py (+1/-1)
product_rfq/__openerp__.py (+26/-17)
product_rfq/model/__init__.py (+1/-1)
product_rfq/model/product.py (+4/-4)
product_unique_default_code/__init__.py (+1/-1)
product_unique_default_code/__openerp__.py (+22/-11)
product_unique_default_code/product.py (+1/-4)
product_uom_update/__init__.py (+1/-1)
product_uom_update/__openerp__.py (+23/-19)
product_uom_update/wizard/__init__.py (+1/-1)
product_uom_update/wizard/product_uom_update.py (+14/-15)
production_lot_group_by_name/__openerp__.py (+23/-19)
products_finished_scrap/__init__.py (+1/-1)
products_finished_scrap/__openerp__.py (+23/-19)
products_finished_scrap/mrp.py (+2/-2)
project_btree/__init__.py (+1/-1)
project_btree/__openerp__.py (+24/-17)
project_btree/project.py (+1/-7)
project_complete_name/__init__.py (+1/-1)
project_complete_name/__openerp__.py (+24/-18)
project_complete_name/project.py (+1/-6)
project_conf/__init__.py (+1/-1)
project_conf/__openerp__.py (+35/-28)
project_conf/model/__init__.py (+1/-1)
project_conf/model/project.py (+9/-9)
project_contract_validations/__openerp__.py (+25/-21)
project_followers_rule/__init__.py (+1/-1)
project_followers_rule/__openerp__.py (+28/-24)
project_followers_rule/model/__init__.py (+1/-1)
project_followers_rule/model/project.py (+3/-3)
project_image/__init__.py (+1/-1)
project_image/__openerp__.py (+25/-17)
project_image/model/__init__.py (+1/-1)
project_image/model/project_image.py (+13/-13)
project_issue_conf/__openerp__.py (+26/-22)
project_issue_fix_progress/__init__.py (+1/-1)
project_issue_fix_progress/__openerp__.py (+22/-17)
project_issue_fix_progress/project.py (+1/-1)
project_issue_report/__init__.py (+1/-1)
project_issue_report/__openerp__.py (+26/-19)
project_issue_report/report/project_issue_report.py (+1/-1)
project_issue_report2/__init__.py (+2/-2)
project_issue_report2/__openerp__.py (+24/-18)
project_issue_report2/report/__init__.py (+1/-1)
project_issue_report2/report/project_issue.py (+1/-3)
project_issue_report2/wizard/__init__.py (+1/-1)
project_issue_report2/wizard/wizard_project_issue.py (+0/-2)
project_launchpad/model/project_launchpad.py (+1/-4)
project_phase_description/__init__.py (+1/-1)
project_phase_description/__openerp__.py (+24/-16)
project_phase_description/model/__init__.py (+1/-1)
project_phase_description/model/project_phase.py (+4/-5)
project_search_create_uid/__init__.py (+1/-1)
project_search_create_uid/__openerp__.py (+24/-15)
project_search_create_uid/project.py (+8/-13)
project_task_domain/__init__.py (+1/-1)
project_task_domain/__openerp__.py (+23/-18)
project_task_domain/model/__init__.py (+1/-1)
project_task_domain/model/project_task_work.py (+7/-7)
project_task_work/__init__.py (+3/-3)
project_task_work/__openerp__.py (+29/-28)
project_task_work/model/__init__.py (+2/-2)
project_task_work/model/project_task_work.py (+3/-7)
project_task_work/report/__init__.py (+2/-2)
project_task_work/report/parser.py (+5/-5)
psm/__init__.py (+3/-3)
psm/__openerp__.py (+39/-31)
psm/model/__init__.py (+2/-2)
psm/model/product.py (+0/-3)
psm/model/stock.py (+0/-2)
psm/report/__init__.py (+1/-1)
psm/report/picking.py (+3/-2)
psm/wizard/__init__.py (+3/-3)
psm/wizard/pedigree_serialization_manager.py (+4/-6)
psm/wizard/stock_invoice_onshipping.py (+1/-5)
psm/wizard/stock_return_picking.py (+2/-7)
purchase_discount/__openerp__.py (+23/-19)
purchase_discount/purchase_discount.py (+22/-21)
purchase_multi_report/__init__.py (+2/-2)
purchase_multi_report/__openerp__.py (+25/-19)
purchase_multi_report/res_company.py (+1/-2)
purchase_multi_report/wizard/__init__.py (+2/-2)
purchase_multi_report/wizard/purchase_report_multicompany.py (+1/-0)
purchase_order_cancel/__init__.py (+1/-1)
purchase_order_cancel/__openerp__.py (+25/-20)
purchase_order_cancel/i18n/pt_BR.po (+23/-0)
purchase_order_department/__init__.py (+2/-2)
purchase_order_department/__openerp__.py (+26/-26)
purchase_order_department/model/__init__.py (+1/-1)
purchase_order_department/model/purchase_order.py (+2/-3)
purchase_order_description/__init__.py (+2/-2)
purchase_order_description/__openerp__.py (+24/-23)
purchase_order_description/model/__init__.py (+1/-1)
purchase_order_description/model/purchase_order.py (+2/-3)
purchase_order_requisitor/__init__.py (+2/-2)
purchase_order_requisitor/__openerp__.py (+24/-23)
purchase_order_requisitor/model/__init__.py (+1/-1)
purchase_order_requisitor/model/purchase_requisition.py (+5/-11)
purchase_order_type/__init__.py (+2/-2)
purchase_order_type/__openerp__.py (+25/-24)
purchase_order_type/model/__init__.py (+1/-1)
purchase_order_type/model/purchase_order.py (+8/-10)
purchase_requisition_contract_analyst/__init__.py (+2/-2)
purchase_requisition_contract_analyst/__openerp__.py (+23/-22)
purchase_requisition_contract_analyst/model/__init__.py (+1/-1)
purchase_requisition_contract_analyst/model/purchase_requisition.py (+2/-3)
purchase_requisition_currency/__init__.py (+2/-2)
purchase_requisition_currency/__openerp__.py (+24/-23)
purchase_requisition_currency/model/__init__.py (+1/-1)
purchase_requisition_currency/model/purchase_requisition.py (+4/-4)
purchase_requisition_department/__init__.py (+2/-2)
purchase_requisition_department/__openerp__.py (+24/-23)
purchase_requisition_department/model/__init__.py (+1/-1)
purchase_requisition_department/model/purchase_requisition.py (+6/-8)
purchase_requisition_for_everybody/__openerp__.py (+28/-28)
purchase_requisition_line_analytic/__init__.py (+2/-2)
purchase_requisition_line_analytic/__openerp__.py (+26/-25)
purchase_requisition_line_analytic/model/__init__.py (+1/-1)
purchase_requisition_line_analytic/model/purchase_requisition.py (+10/-18)
purchase_requisition_line_description/__init__.py (+2/-2)
purchase_requisition_line_description/__openerp__.py (+30/-27)
purchase_requisition_line_description/model/__init__.py (+1/-1)
purchase_requisition_line_description/model/purchase_requisition_line.py (+14/-22)
purchase_requisition_line_plan/__init__.py (+2/-2)
purchase_requisition_line_plan/__openerp__.py (+26/-25)
purchase_requisition_line_plan/model/__init__.py (+1/-1)
purchase_requisition_line_plan/model/purchase_requisition.py (+10/-17)
purchase_requisition_line_price_unit/__init__.py (+2/-2)
purchase_requisition_line_price_unit/__openerp__.py (+24/-23)
purchase_requisition_line_price_unit/model/__init__.py (+1/-1)
purchase_requisition_line_price_unit/model/purchase_requisition_line.py (+13/-18)
purchase_requisition_line_view/__init__.py (+2/-2)
purchase_requisition_line_view/__openerp__.py (+23/-22)
purchase_requisition_make_po/__openerp__.py (+30/-20)
purchase_requisition_priority/__init__.py (+2/-2)
purchase_requisition_priority/__openerp__.py (+23/-22)
purchase_requisition_priority/model/__init__.py (+1/-1)
purchase_requisition_priority/model/purchase_requisition.py (+4/-5)
purchase_requisition_remarks/__init__.py (+2/-2)
purchase_requisition_remarks/__openerp__.py (+23/-22)
purchase_requisition_remarks/model/__init__.py (+1/-1)
purchase_requisition_remarks/model/purchase_requisition.py (+3/-4)
purchase_requisition_supplier_list/__init__.py (+2/-2)
purchase_requisition_supplier_list/__openerp__.py (+23/-22)
purchase_requisition_supplier_list/model/__init__.py (+1/-1)
purchase_requisition_supplier_list/model/purchase_requisition.py (+4/-4)
purchase_requisition_type/__init__.py (+2/-2)
purchase_requisition_type/__openerp__.py (+23/-22)
purchase_requisition_type/model/__init__.py (+1/-1)
purchase_requisition_type/model/purchase_requisition.py (+2/-3)
purchase_supplier/__init__.py (+1/-1)
purchase_supplier/__openerp__.py (+24/-19)
purchase_supplier/purchase.py (+1/-6)
purchase_test_data_imp/__init__.py (+1/-1)
purchase_test_data_imp/__openerp__.py (+29/-23)
purchase_test_data_imp/wizard/__init__.py (+1/-1)
purchase_test_data_imp/wizard/test_yaml.py (+33/-33)
purchase_user_validation/__init__.py (+1/-1)
purchase_user_validation/__openerp__.py (+24/-13)
purchase_user_validation/purchase.py (+0/-1)
recovery_attachments_bd/__init__.py (+1/-1)
recovery_attachments_bd/__openerp__.py (+23/-19)
recovery_attachments_bd/document_storage.py (+1/-2)
ref_product/__openerp__.py (+27/-22)
report_move_voucher/__init__.py (+3/-3)
report_move_voucher/__openerp__.py (+26/-22)
report_move_voucher/report/__init__.py (+2/-2)
report_move_voucher/report/account.py (+1/-0)
report_multicompany/__init__.py (+1/-1)
report_multicompany/__openerp__.py (+23/-17)
report_multicompany/model/__init__.py (+1/-1)
report_multicompany/model/report_multicompany.py (+6/-6)
report_process_production/__init__.py (+2/-2)
report_process_production/__openerp__.py (+23/-15)
report_process_production/report/__init__.py (+1/-1)
report_process_production/report/process_production_report.py (+2/-4)
report_process_production/wizard/__init__.py (+1/-1)
report_process_production/wizard/wizard_report_process.py (+0/-3)
report_profit/__init__.py (+7/-7)
report_profit/__openerp__.py (+35/-28)
report_profit/account.py (+1/-2)
report_profit/report/__init__.py (+2/-2)
report_profit/report/trial_cost.py (+5/-12)
report_profit/wizard/__init__.py (+2/-2)
report_profit/wizard/wiz_trial_cost.py (+2/-3)
res_bank_menu_payroll/__openerp__.py (+21/-18)
res_partner_btree/__init__.py (+1/-1)
res_partner_btree/__openerp__.py (+20/-12)
res_partner_btree/model/__init__.py (+1/-1)
sale_commission/__init__.py (+1/-1)
sale_commission/__openerp__.py (+24/-17)
sale_commission/sale_commission.py (+2/-5)
sale_double_validation/__init__.py (+2/-2)
sale_double_validation/__openerp__.py (+25/-20)
sale_double_validation/model/__init__.py (+2/-2)
sale_double_validation/model/sale_double_validation_installer.py (+0/-2)
sale_line_import/__init__.py (+2/-2)
sale_line_import/__openerp__.py (+24/-20)
sale_line_import/sale.py (+4/-8)
sale_line_import/wizard/__init__.py (+1/-1)
sale_line_import/wizard/sale_line_import.py (+0/-5)
sale_margin_commision/__init__.py (+1/-1)
sale_margin_commision/__openerp__.py (+24/-18)
sale_margin_commision/sale.py (+11/-15)
sale_multicompany_report/__init__.py (+3/-3)
sale_multicompany_report/__openerp__.py (+45/-35)
sale_multicompany_report/order.py (+6/-4)
sale_multicompany_report/res_company.py (+12/-13)
sale_multicompany_report/wizard/__init__.py (+2/-2)
sale_multicompany_report/wizard/sale_order_multicompany.py (+1/-0)
sale_order_copy_line/__init__.py (+1/-1)
sale_order_copy_line/__openerp__.py (+29/-19)
sale_order_copy_line/model/__init__.py (+1/-1)
sale_order_copy_line/model/sale_order_line.py (+6/-10)
sale_order_line_seq/__init__.py (+1/-1)
sale_order_line_seq/__openerp__.py (+22/-19)
sale_order_line_seq/model/__init__.py (+1/-1)
sale_order_line_seq/model/sale_order.py (+2/-1)
sale_test_data_imp/__init__.py (+1/-1)
sale_test_data_imp/__openerp__.py (+28/-21)
sale_test_data_imp/wizard/__init__.py (+1/-1)
sale_test_data_imp/wizard/test_yaml.py (+33/-33)
sale_uncommitted_product/__init__.py (+3/-3)
sale_uncommitted_product/__openerp__.py (+32/-30)
sale_uncommitted_product/model/__init__.py (+3/-3)
sale_uncommitted_product/model/product.py (+2/-5)
sale_uncommitted_product/model/sale.py (+1/-1)
sale_uncommitted_product/wizard/__init__.py (+2/-2)
sale_uncommitted_product/wizard/sale_double_validation_installer.py (+0/-2)
sale_uom_group/__init__.py (+1/-1)
sale_uom_group/__openerp__.py (+26/-25)
sale_uom_group/model/__init__.py (+1/-1)
sale_uom_group/model/sale_uom_group.py (+0/-4)
send_author_mail/__init__.py (+1/-1)
send_author_mail/__openerp__.py (+24/-16)
send_author_mail/model/__init__.py (+2/-2)
send_author_mail/model/mail_notification.py (+7/-9)
send_author_mail/model/res_partner.py (+2/-2)
send_mail_task/__openerp__.py (+23/-15)
shortcuts_extended/__init__.py (+1/-1)
shortcuts_extended/__openerp__.py (+23/-17)
shortcuts_extended/shortcuts_extended.py (+3/-2)
split_invoice_button/__init__.py (+1/-1)
split_invoice_button/__openerp__.py (+28/-24)
split_invoice_button/invoice.py (+3/-5)
sprint_kanban/__init__.py (+3/-3)
sprint_kanban/__openerp__.py (+34/-30)
sprint_kanban/model/__init__.py (+1/-1)
sprint_kanban/model/sprint_kanban.py (+1/-6)
standard_price_acl/__init__.py (+1/-1)
standard_price_acl/__openerp__.py (+24/-26)
standard_price_acl/model/__init__.py (+1/-1)
standard_price_acl/model/product.py (+2/-3)
stock_card/__init__.py (+4/-4)
stock_card/__openerp__.py (+34/-26)
stock_card/report/__init__.py (+1/-1)
stock_card/report_profit_picking.py (+17/-31)
stock_card/stock.py (+0/-3)
stock_card/stock_card.py (+31/-40)
stock_inventory_delete/__init__.py (+1/-1)
stock_inventory_delete/__openerp__.py (+21/-17)
stock_inventory_delete/stock.py (+1/-1)
stock_invoice_state_editable/__init__.py (+1/-1)
stock_invoice_state_editable/__openerp__.py (+23/-17)
stock_invoice_state_editable/i18n/pt_BR.po (+23/-0)
stock_kardex/__init__.py (+1/-1)
stock_kardex/__openerp__.py (+26/-18)
stock_kardex/kardex.py (+24/-26)
stock_location_code/__init__.py (+1/-1)
stock_location_code/__openerp__.py (+23/-18)
stock_location_code/stock.py (+1/-2)
stock_move_entries/__init__.py (+1/-1)
stock_move_entries/__openerp__.py (+30/-23)
stock_move_entries/model/__init__.py (+1/-1)
stock_move_entries/model/stock_move_entries.py (+16/-15)
stock_picking_cancel/__init__.py (+1/-1)
stock_picking_cancel/__openerp__.py (+24/-19)
stock_picking_cancel/stock.py (+6/-3)
stock_picking_security_force/__openerp__.py (+23/-17)
stock_picking_validate_past/__init__.py (+2/-2)
stock_picking_validate_past/__openerp__.py (+23/-13)
stock_picking_validate_past/stock.py (+0/-1)
stock_picking_validate_past/stock_partial_move.py (+1/-1)
stock_purchase_analytic_plans/__init__.py (+2/-2)
stock_purchase_analytic_plans/__openerp__.py (+21/-21)
stock_purchase_analytic_plans/model/__init__.py (+1/-1)
stock_purchase_analytic_plans/model/stock.py (+3/-2)
stock_purchase_expiry/__init__.py (+2/-2)
stock_purchase_expiry/__openerp__.py (+25/-24)
stock_purchase_expiry/model/__init__.py (+2/-2)
stock_purchase_expiry/model/purchase.py (+1/-3)
stock_purchase_expiry/model/stock.py (+9/-9)
stock_purchase_expiry/wizard/__init__.py (+1/-1)
stock_purchase_expiry/wizard/stock.py (+3/-4)
stock_shipping_packaging/__init__.py (+2/-2)
stock_shipping_packaging/__openerp__.py (+26/-23)
stock_shipping_packaging/model/__init__.py (+1/-1)
stock_shipping_packaging/model/stock_shipping_packaging.py (+3/-3)
stock_view_product/__openerp__.py (+24/-18)
supplier_invoice_number_unique/__init__.py (+1/-1)
supplier_invoice_number_unique/__openerp__.py (+27/-23)
supplier_invoice_number_unique/model/__init__.py (+1/-1)
supplier_invoice_number_unique/model/account_invoice.py (+11/-11)
sync_youtube/__init__.py (+1/-1)
sync_youtube/__openerp__.py (+47/-51)
sync_youtube/model/__init__.py (+1/-1)
sync_youtube/model/sign_youtube.py (+4/-4)
transaction_type/__init__.py (+2/-2)
transaction_type/__openerp__.py (+27/-21)
transaction_type/model/__init__.py (+2/-2)
transaction_type/model/account.py (+0/-6)
transaction_type/model/transaction_type.py (+0/-6)
update_period/__init__.py (+1/-1)
update_period/__openerp__.py (+23/-16)
update_period/account.py (+1/-1)
user_story/__init__.py (+2/-2)
user_story/__openerp__.py (+42/-39)
user_story/i18n/pt_BR.po (+702/-0)
user_story/model/__init__.py (+4/-4)
user_story/model/custom_project_task.py (+2/-0)
user_story/model/timesheet.py (+5/-8)
user_story/model/timesheet_all.py (+2/-0)
user_story/model/user_story.py (+12/-9)
user_story/report/__init__.py (+1/-1)
user_story/report/parse_report.py (+2/-1)
user_story/report/user_story_report_mako.py (+6/-16)
user_story/script/load_user_story.py (+11/-14)
user_story/tests/test_user_story.py (+59/-59)
user_story_long_term/__init__.py (+1/-1)
user_story_long_term/__openerp__.py (+36/-27)
user_story_long_term/security/ir.model.access.csv (+7/-5)
user_story_long_term/user_story_long_term.py (+63/-64)
user_story_long_term/wizard/__init__.py (+2/-2)
user_story_long_term/wizard/project_compute_phases.py (+4/-3)
user_story_long_term/wizard/project_compute_tasks.py (+1/-1)
user_story_messages/__init__.py (+1/-1)
user_story_messages/__openerp__.py (+23/-20)
user_story_messages/model/__init__.py (+1/-1)
user_story_messages/model/user_story_messages.py (+5/-4)
user_wzd/__init__.py (+2/-2)
user_wzd/__openerp__.py (+22/-18)
user_wzd/i18n/pt_BR.po (+65/-0)
user_wzd/wizard/__init__.py (+1/-1)
user_wzd/wizard/res_users_wzd.py (+7/-36)
validate_stock_move_product/__init__.py (+1/-1)
validate_stock_move_product/__openerp__.py (+22/-18)
validate_stock_move_product/model/__init__.py (+1/-1)
validate_stock_move_product/model/stock_move.py (+1/-1)
validate_stock_picking/__init__.py (+2/-2)
validate_stock_picking/__openerp__.py (+24/-26)
validate_stock_picking/i18n/pt_BR.po (+82/-0)
validate_stock_picking/model/__init__.py (+1/-1)
validate_stock_picking/model/stock.py (+13/-22)
validate_stock_picking/wizard/__init__.py (+1/-1)
validate_stock_picking/wizard/validate_picking.py (+14/-14)
validate_type_line_invoice/__init__.py (+1/-1)
validate_type_line_invoice/__openerp__.py (+21/-19)
validate_type_line_invoice/account_invoice.py (+1/-1)
validate_type_line_invoice/i18n/pt_BR.po (+53/-0)
vauxoo_widgets/__openerp__.py (+31/-29)
web_captcha/__init__.py (+1/-1)
web_captcha/__openerp__.py (+29/-28)
web_captcha/i18n/pt_BR.po (+113/-0)
web_captcha/model/__init__.py (+2/-2)
web_captcha/model/res_captcha.py (+1/-0)
web_captcha/model/res_company.py (+2/-3)
web_vauxoo_cust/__openerp__.py (+24/-20)
winpdb_debugger/__init__.py (+1/-1)
winpdb_debugger/__openerp__.py (+23/-15)
winpdb_debugger/winpdb_debugger.py (+3/-4)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/trunk-upfowardport-dev-moylop260
Reviewer Review Type Date Requested Status
Nhomar - Vauxoo Pending
Vauxoo Pending
Review via email: mp+237377@code.launchpad.net

Commit message

[MERGE] upforward 7.0
-Fix unused import
-Fix relative import
-Fix full path import
-Fix trailing whitespace pylint error C0303
-Fix autopep8 ignoring E501 & E128
-Fix reimported
-Fix __openerp__.py files
-Translate update

To post a comment you must log in.

Unmerged revisions

884. By Moisés López - http://www.vauxoo.com

[[MERGE] upforward 7.0] - Lp auto-translations update.

883. By Moisés López - http://www.vauxoo.com

[MERGE] upforward 7.0
  [MERGE] Set standard in all __openerp__.py files

882. By Moisés López - http://www.vauxoo.com

[MERGE] upforward 7.0
  [MERGE] [FIX] trailing whitespace pylint error C0303 and
  [FIX] autopep8 ignoring E501 & E128 and
  [FIX] reimported

881. By Moisés López - http://www.vauxoo.com

[MERGE] upforward 7.0
   [FIX] Change import to full path example:
  before "import decimal_precision"
  now "from openerp.addons.decimal_precision import decimal_precision"

880. By Moisés López - http://www.vauxoo.com

[MERGE] upforward 7.0
   [MERGE] [FIX] Fix pylint error W0403 - relative-import

879. By Moisés López - http://www.vauxoo.com

[MERGE] upforward 7.0

878. By Moisés López - http://www.vauxoo.com

[MERGE] upforward 7.0

877. By Moisés López - http://www.vauxoo.com

[MERGE] upforward 7.0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_advance_payment/__init__.py'
2--- account_advance_payment/__init__.py 2014-05-09 21:51:34 +0000
3+++ account_advance_payment/__init__.py 2014-10-07 08:56:40 +0000
4@@ -23,4 +23,4 @@
5 # along with this program. If not, see <http://www.gnu.org/licenses/>.
6 #
7 #
8-import model
9+from . import model
10
11=== modified file 'account_advance_payment/__openerp__.py'
12--- account_advance_payment/__openerp__.py 2014-05-09 21:51:34 +0000
13+++ account_advance_payment/__openerp__.py 2014-10-07 08:56:40 +0000
14@@ -23,13 +23,12 @@
15 # along with this program. If not, see <http://www.gnu.org/licenses/>.
16 #
17 #
18-
19 {
20- "name": "Account Advance Payment",
21- "version": "1.0",
22- "author": "Vauxoo",
23- "category": "Generic Modules",
24- "description" : """
25+ "name": "Account Advance Payment",
26+ "version": "1.0",
27+ "author": "Vauxoo",
28+ "category": "Generic Modules",
29+ "description": """
30 Account Advance Payment
31 =======================
32
33@@ -40,19 +39,23 @@
34
35 Also adds the field Transaction Type in the view payments of customs and suppliers.
36
37- """,
38- "website": "http://www.vauxoo.com/",
39- "license": "AGPL-3",
40+ """,
41+ "website": "http://www.vauxoo.com/",
42+ "license": "AGPL-3",
43 "depends": [
44- "account",
45- "account_voucher",
46- ],
47- "demo": [
48- ],
49+ "account",
50+ "account_voucher"
51+ ],
52+ "demo": [],
53 "data": [
54- 'view/res_partner_advance_payment_view.xml',
55- 'view/account_voucher_advance_payment_view.xml',
56- ],
57- "installable": True,
58- "active": False,
59-}
60+ "view/res_partner_advance_payment_view.xml",
61+ "view/account_voucher_advance_payment_view.xml"
62+ ],
63+ "test": [],
64+ "js": [],
65+ "css": [],
66+ "qweb": [],
67+ "installable": True,
68+ "auto_install": False,
69+ "active": False
70+}
71\ No newline at end of file
72
73=== modified file 'account_advance_payment/model/__init__.py'
74--- account_advance_payment/model/__init__.py 2014-05-09 21:51:34 +0000
75+++ account_advance_payment/model/__init__.py 2014-10-07 08:56:40 +0000
76@@ -24,6 +24,6 @@
77 #
78 #
79
80-import res_partner
81-import account_voucher
82+from . import res_partner
83+from . import account_voucher
84
85
86=== modified file 'account_advance_payment/model/account_voucher.py'
87--- account_advance_payment/model/account_voucher.py 2014-05-09 21:51:34 +0000
88+++ account_advance_payment/model/account_voucher.py 2014-10-07 08:56:40 +0000
89@@ -24,21 +24,43 @@
90 #
91
92 from openerp.osv import osv, fields
93+from openerp.tools.translate import _
94
95
96 class account_voucher(osv.Model):
97 _inherit = 'account.voucher'
98 _columns = {
99- 'trans_type': fields.selection([
100- ('normal', 'Payments'),
101- ('advance', 'Advance'),
102- ], 'Transaction Type', select=True, track_visibility='always',
103- help="""Payments.- Normal payment is made. \nAdvance.- Advance payment of custom or supplier"""),
104- }
105-
106- _defaults = {
107- 'trans_type': 'normal',
108- }
109-
110- def onchange_account_advance_payment(self, cr, uid, ids, trans_type, context=None):
111- return True
112+ 'advance_account_id': fields.many2one('account.account', 'Advance Account', required=False, readonly=True, states={'draft': [('readonly', False)]}),
113+ }
114+
115+ def writeoff_move_line_get(self, cr, uid, voucher_id, line_total, move_id, name, company_currency, current_currency, context=None):
116+ move_line = super(account_voucher, self).writeoff_move_line_get(cr, uid, voucher_id, line_total, move_id, name, company_currency, current_currency, context=context)
117+ voucher = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context)
118+ if move_line and not voucher.payment_option == 'with_writeoff' and voucher.partner_id:
119+ if voucher.type in ('sale', 'receipt'):
120+ account_id = voucher.advance_account_id and voucher.advance_account_id.id or voucher.partner_id.property_account_customer_advance.id
121+ else:
122+ account_id = voucher.advance_account_id and voucher.advance_account_id.id or voucher.partner_id.property_account_supplier_advance.id
123+ if not account_id:
124+ raise osv.except_osv(_('Missing Configuration on Partner !'),
125+ _('Please Fill Advance Accounts on Partner !'))
126+ move_line['account_id'] = account_id
127+ return move_line
128+
129+ def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=None):
130+ res = super(account_voucher, self).onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
131+ if not res:
132+ return {}
133+ context = context or {}
134+
135+ partner_pool = self.pool.get('res.partner')
136+
137+ partner = partner_pool.browse(cr, uid, partner_id, context=context)
138+ advance_account_id = False
139+ if ttype in ('sale', 'receipt'):
140+ advance_account_id = partner.property_account_customer_advance.id
141+ else:
142+ advance_account_id = partner.property_account_supplier_advance.id
143+ res['value']['advance_account_id'] = advance_account_id
144+
145+ return res
146
147=== modified file 'account_advance_payment/model/res_partner.py'
148--- account_advance_payment/model/res_partner.py 2014-05-09 21:51:34 +0000
149+++ account_advance_payment/model/res_partner.py 2014-10-07 08:56:40 +0000
150@@ -42,7 +42,7 @@
151 relation='account.account',
152 string="Account Supplier Advance",
153 view_load=True,
154- domain="[('type','=','receivable')]",
155+ domain="[('type','=','payable')]",
156 help="This account will be used for advance payment of suppliers"),
157 'property_account_customer_advance': fields.property(
158 'account.account',
159@@ -50,18 +50,18 @@
160 relation='account.account',
161 string="Account Customer Advance",
162 view_load=True,
163- domain="[('type','=','payable')]",
164+ domain="[('type','=','receivable')]",
165 help="This account will be used for advance payment of custom"),
166- 'customer_advance': fields.function(
167- _supplier_customer_advance_get,
168- type='float',
169- string='Total Customer Advance',
170- multi='sc',
171- help="Total amount of advance payment of custom."),
172- 'supplier_advance': fields.function(
173- _supplier_customer_advance_get,
174- type='float',
175- string='Total Supplier Advance',
176- multi='sc',
177- help="Total amount of advance payment of suppliers."),
178+ # 'customer_advance': fields.function(
179+ # _supplier_customer_advance_get,
180+ # type='float',
181+ # string='Total Customer Advance',
182+ # multi='sc',
183+ # help="Total amount of advance payment of custom."),
184+ # 'supplier_advance': fields.function(
185+ # _supplier_customer_advance_get,
186+ # type='float',
187+ # string='Total Supplier Advance',
188+ # multi='sc',
189+ # help="Total amount of advance payment of suppliers."),
190 }
191
192=== modified file 'account_advance_payment/view/account_voucher_advance_payment_view.xml'
193--- account_advance_payment/view/account_voucher_advance_payment_view.xml 2014-05-09 21:51:34 +0000
194+++ account_advance_payment/view/account_voucher_advance_payment_view.xml 2014-10-07 08:56:40 +0000
195@@ -7,7 +7,7 @@
196 <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
197 <field name="arch" type="xml">
198 <xpath expr="//field[@name='journal_id']" position="after">
199- <field name="trans_type" on_change="onchange_account_advance_payment(trans_type)"/>
200+ <field name="advance_account_id"/>
201 </xpath>
202 </field>
203 </record>
204@@ -17,7 +17,7 @@
205 <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/>
206 <field name="arch" type="xml">
207 <xpath expr="//field[@name='journal_id']" position="after">
208- <field name="trans_type" on_change="onchange_account_advance_payment(trans_type)"/>
209+ <field name="advance_account_id"/>
210 </xpath>
211 </field>
212 </record>
213
214=== modified file 'account_advance_payment/view/res_partner_advance_payment_view.xml'
215--- account_advance_payment/view/res_partner_advance_payment_view.xml 2014-05-09 21:51:34 +0000
216+++ account_advance_payment/view/res_partner_advance_payment_view.xml 2014-10-07 08:56:40 +0000
217@@ -9,15 +9,17 @@
218 <xpath expr="//field[@name='property_account_payable']" position="after" >
219 <field name="property_account_supplier_advance"/>
220 </xpath>
221+ <xpath expr="//field[@name='property_account_receivable']" position="after" >
222+ <field name="property_account_customer_advance"/>
223+ </xpath>
224+ <!--
225 <xpath expr="//field[@name='credit']" position="after" >
226 <field name="customer_advance"/>
227 </xpath>
228- <xpath expr="//field[@name='property_account_receivable']" position="after" >
229- <field name="property_account_customer_advance"/>
230- </xpath>
231 <xpath expr="//field[@name='debit']" position="after" >
232 <field name="supplier_advance"/>
233 </xpath>
234+ -->
235 </field>
236 </record>
237 </data>
238
239=== modified file 'account_aged_partner_balance_vw/__init__.py'
240--- account_aged_partner_balance_vw/__init__.py 2014-05-09 21:51:34 +0000
241+++ account_aged_partner_balance_vw/__init__.py 2014-10-07 08:56:40 +0000
242@@ -24,5 +24,5 @@
243 #
244 ##############################################################################
245
246-import model
247-import wizard
248+from . import model
249+from . import wizard
250
251=== modified file 'account_aged_partner_balance_vw/__openerp__.py'
252--- account_aged_partner_balance_vw/__openerp__.py 2014-08-18 16:35:12 +0000
253+++ account_aged_partner_balance_vw/__openerp__.py 2014-10-07 08:56:40 +0000
254@@ -23,30 +23,33 @@
255 # along with this program. If not, see <http://www.gnu.org/licenses/>.
256 #
257 ##############################################################################
258-
259 {
260- "name" : "Report Account Aged Partner Balance view",
261- "version" : "2.0",
262- "author" : "Vauxoo",
263- "category" : "Localization/Mexico",
264- "description" : """This module creates a sql view for Account Aged Partner Balance today.""",
265- "website" : "http://www.vauxoo.com/",
266- "license" : "AGPL-3",
267- "depends" : [
268- "account",
269- 'board',
270- 'report_webkit',
271- ],
272- "init_xml" : [],
273- "demo_xml" : [],
274- "update_xml" : [
275- "view/wizard.xml",
276- "view/view.xml",
277- 'view/action_menues.xml',
278- 'view/wizard_print_report_view.xml',
279- "data/data.xml",
280- 'report/report.xml',
281- ],
282- "installable" : True,
283- 'auto_install': False,
284-}
285+ "name": "Report Account Aged Partner Balance view",
286+ "version": "2.0",
287+ "author": "Vauxoo",
288+ "category": "Localization/Mexico",
289+ "description": """This module creates a sql view for Account Aged Partner Balance today.""",
290+ "website": "http://www.vauxoo.com/",
291+ "license": "AGPL-3",
292+ "depends": [
293+ "account",
294+ "board",
295+ "report_webkit"
296+ ],
297+ "demo": [],
298+ "data": [
299+ "view/wizard.xml",
300+ "view/view.xml",
301+ "view/action_menues.xml",
302+ "view/wizard_print_report_view.xml",
303+ "data/data.xml",
304+ "report/report.xml"
305+ ],
306+ "test": [],
307+ "js": [],
308+ "css": [],
309+ "qweb": [],
310+ "installable": True,
311+ "auto_install": False,
312+ "active": False
313+}
314\ No newline at end of file
315
316=== modified file 'account_aged_partner_balance_vw/model/__init__.py'
317--- account_aged_partner_balance_vw/model/__init__.py 2014-05-09 21:51:34 +0000
318+++ account_aged_partner_balance_vw/model/__init__.py 2014-10-07 08:56:40 +0000
319@@ -24,4 +24,4 @@
320 #
321 ##############################################################################
322
323-import account_aged_partner_balance_vw
324+from . import account_aged_partner_balance_vw
325
326=== modified file 'account_aged_partner_balance_vw/model/account_aged_partner_balance_vw.py'
327--- account_aged_partner_balance_vw/model/account_aged_partner_balance_vw.py 2014-05-09 21:51:34 +0000
328+++ account_aged_partner_balance_vw/model/account_aged_partner_balance_vw.py 2014-10-07 08:56:40 +0000
329@@ -25,12 +25,8 @@
330 #
331
332 from openerp.osv import fields, osv
333-import openerp.tools as tools
334-from openerp.tools.translate import _
335
336-import openerp.netsvc as netsvc
337 import time
338-import os
339 import mx.DateTime
340
341
342@@ -95,7 +91,7 @@
343 ], 'Type of Report', help='Reporte Type'),
344 'state': fields.selection([('draft', 'New'), ('open', 'Open'), ('done', 'Done'),
345 ], 'Status', help='Document State'),
346- 'wizard_ids' : fields.one2many('wizard.report.aged.partner.balance', 'aged_trial_report_id')
347+ 'wizard_ids': fields.one2many('wizard.report.aged.partner.balance', 'aged_trial_report_id')
348 }
349
350 _defaults = {
351@@ -118,15 +114,15 @@
352 res = self.check_report(cr, uid, ids, context=context)
353 data = res['datas']
354 datas['form'] = data['form']
355- context.update({'data' : data, 'datas' : datas})
356+ context.update({'data': data, 'datas': datas})
357 if wzd_brw.type == 'by_document':
358 return {
359- 'res_model': 'wizard.report.aged.partner.balance',
360- 'view_type': 'form',
361- 'view_mode': 'form',
362- 'context': context,
363- 'type': 'ir.actions.act_window',
364- 'target': 'new',
365+ 'res_model': 'wizard.report.aged.partner.balance',
366+ 'view_type': 'form',
367+ 'view_mode': 'form',
368+ 'context': context,
369+ 'type': 'ir.actions.act_window',
370+ 'target': 'new',
371 }
372 return {
373 'type': 'ir.actions.report.xml',
374@@ -177,7 +173,6 @@
375
376 def _get_partners(self, cr, uid, ids, form, context=None):
377 context = context or {}
378- res = []
379 wzd_brw = self.browse(cr, uid, ids[0], context=context)
380 move_state = ['draft', 'posted']
381 if self.target_move == 'posted':
382
383=== modified file 'account_aged_partner_balance_vw/wizard/__init__.py'
384--- account_aged_partner_balance_vw/wizard/__init__.py 2014-05-09 21:51:34 +0000
385+++ account_aged_partner_balance_vw/wizard/__init__.py 2014-10-07 08:56:40 +0000
386@@ -25,4 +25,4 @@
387 ##############################################################################
388
389 #import wizard_open_move_line
390-import wizard_print_report
391+from . import wizard_print_report
392
393=== modified file 'account_aged_partner_balance_vw/wizard/wizard_open_move_line.py'
394--- account_aged_partner_balance_vw/wizard/wizard_open_move_line.py 2014-09-12 21:07:09 +0000
395+++ account_aged_partner_balance_vw/wizard/wizard_open_move_line.py 2014-10-07 08:56:40 +0000
396@@ -26,7 +26,9 @@
397
398 import wizard
399
400+
401 class wizard_open_move_line(wizard.interface):
402+
403 def _open_window(self, cr, uid, data, context={}):
404 if not context:
405 context = {}
406@@ -75,7 +77,7 @@
407 AND (l.reconcile_id IS NULL)
408 AND account_move.state = 'posted'
409 AND l.reconcile_id is null --and l.currency_id is null
410- """+where_query_str
411+ """ + where_query_str
412 cr.execute(query)
413 res = cr.fetchall()
414 move_ids = [r[0] for r in res]
415
416=== modified file 'account_aged_partner_balance_vw/wizard/wizard_print_report.py'
417--- account_aged_partner_balance_vw/wizard/wizard_print_report.py 2014-05-09 21:51:34 +0000
418+++ account_aged_partner_balance_vw/wizard/wizard_print_report.py 2014-10-07 08:56:40 +0000
419@@ -25,9 +25,10 @@
420 ##############################################################################
421 from openerp.osv import fields, osv
422
423+
424 class wizard_report_aged_partner_balance(osv.osv_memory):
425 _name = 'wizard.report.aged.partner.balance'
426-
427+
428 def default_get(self, cr, uid, fields_list=None, context=None):
429 res = {}
430 acc_ag_obj = self.pool.get('account.aged.trial.balance')
431@@ -35,22 +36,21 @@
432 partners_dict = acc_ag_obj._get_partners(cr, uid, context.get('active_ids'),
433 context.get('data'), context=context)
434 partner_ids = [partner.get('id') for partner in partners_dict]
435- res.update({'partner_ids_default' : partner_ids, 'aged_trial_report_id': context.get('active_id', False)})
436+ res.update({'partner_ids_default': partner_ids, 'aged_trial_report_id': context.get('active_id', False)})
437 return res
438-
439+
440 _columns = {
441- 'group_user' : fields.boolean('Group by User', help='¿Group report by user?'),
442- 'show_aml' : fields.boolean('Show Journal Entries', help='In the report was show the '\
443+ 'group_user': fields.boolean('Group by User', help='¿Group report by user?'),
444+ 'show_aml': fields.boolean('Show Journal Entries', help='In the report was show the '
445 'journal entries'),
446- 'partner_ids' : fields.many2many('res.partner', 'partner_in_report_aged', 'wizard_id',
447+ 'partner_ids': fields.many2many('res.partner', 'partner_in_report_aged', 'wizard_id',
448 'partner_id', 'Partners', help='Partners to show in Report'),
449- 'partner_ids_default' : fields.many2many('res.partner', 'partner_in_report_aged_default',
450+ 'partner_ids_default': fields.many2many('res.partner', 'partner_in_report_aged_default',
451 'wizard_id', 'partner_id', 'Partners Default', help='Partners to show in Report by default'),
452- 'aged_trial_report_id' : fields.many2one('account.aged.trial.balance',)
453- }
454-
455+ 'aged_trial_report_id': fields.many2one('account.aged.trial.balance',)
456+ }
457+
458 def print_report(self, cr, uid, ids, context=None):
459- acc_trial_obj = self.pool.get('account.aged.trial.balance')
460 datas = {'ids': ids}
461 if context.get('datas', False):
462 datas = context.get('datas')
463@@ -59,5 +59,3 @@
464 'report_name': 'account_aged_partner_balance_report',
465 'datas': datas,
466 }
467-
468-
469
470=== modified file 'account_amortization/__init__.py'
471--- account_amortization/__init__.py 2014-05-09 21:51:34 +0000
472+++ account_amortization/__init__.py 2014-10-07 08:56:40 +0000
473@@ -24,4 +24,4 @@
474 #
475 ##############################################################################
476
477-import model
478+from . import model
479
480=== modified file 'account_amortization/__openerp__.py'
481--- account_amortization/__openerp__.py 2014-06-22 20:48:35 +0000
482+++ account_amortization/__openerp__.py 2014-10-07 08:56:40 +0000
483@@ -23,23 +23,15 @@
484 # along with this program. If not, see <http://www.gnu.org/licenses/>.
485 #
486 ##############################################################################
487-
488 {
489- "name": "Vauxoo Account Amortization",
490- "version": "0.1",
491- "depends": [
492- "decimal_precision",
493- "account_asset",
494- "account_asset_date",
495- ],
496- "author": "Vauxoo",
497- "licence": "AGPL v3",
498- "website": "http://www.vauxoo.com",
499- "category": "Accounting & Finance",
500+ "name": "Vauxoo Account Amortization",
501+ "version": "0.1",
502+ "author": "Vauxoo",
503+ "category": "Accounting & Finance",
504 "description": """
505 Vauxoo Account Amortization.
506 ============================
507-This module allows to separate the expenses amortization of the assets
508+This module allows to separate the expenses amortization of the assets
509 depreciation.
510
511 This module adds:
512@@ -52,10 +44,23 @@
513 See the documentation here:
514 ---------------------------
515 http://www.principlesofaccounting.com/chapter13/chapter13.html
516-""",
517- "data":[
518- "view/account_amortization_view.xml",
519- ],
520- "installable": True,
521- "auto_install": False,
522-}
523+""",
524+ "website": "http://www.vauxoo.com",
525+ "license": "",
526+ "depends": [
527+ "decimal_precision",
528+ "account_asset",
529+ "account_asset_date"
530+ ],
531+ "demo": [],
532+ "data": [
533+ "view/account_amortization_view.xml"
534+ ],
535+ "test": [],
536+ "js": [],
537+ "css": [],
538+ "qweb": [],
539+ "installable": True,
540+ "auto_install": False,
541+ "active": False
542+}
543\ No newline at end of file
544
545=== modified file 'account_amortization/model/__init__.py'
546--- account_amortization/model/__init__.py 2014-05-09 21:51:34 +0000
547+++ account_amortization/model/__init__.py 2014-10-07 08:56:40 +0000
548@@ -24,4 +24,4 @@
549 #
550 ##############################################################################
551
552-import account_amortization
553+from . import account_amortization
554
555=== modified file 'account_amortization/model/account_amortization.py'
556--- account_amortization/model/account_amortization.py 2014-05-09 21:51:34 +0000
557+++ account_amortization/model/account_amortization.py 2014-10-07 08:56:40 +0000
558@@ -24,21 +24,21 @@
559 #
560 ##############################################################################
561
562-from openerp.osv import fields,osv
563-from openerp.tools.translate import _
564-import openerp.addons.decimal_precision as dp
565+from openerp.osv import fields, osv
566+
567
568 class account_asset_asset(osv.Model):
569-
570+
571 _inherit = 'account.asset.asset'
572 _description = 'Account Amortization'
573
574 _columns = {
575- 'doc_type':fields.selection([('deprecation','Deprecation'),
576- ('amortization','Amortization'),], 'Type',
577- help='''Asset type, deprecation allows you depreciate an asset, the
578+ 'doc_type': fields.selection([('deprecation', 'Deprecation'),
579+ ('amortization', 'Amortization'), ], 'Type',
580+ help='''Asset type, deprecation allows you depreciate an asset, the
581 amortization allows you amortize an expense.'''),
582- }
583+ }
584+
585
586 class account_asset_category(osv.Model):
587
588@@ -46,8 +46,8 @@
589 _description = 'Account Amortization Category'
590
591 _columns = {
592- 'doc_type': fields.selection([('deprecation','Deprecation'),
593- ('amortization','Amortization'),], 'Type',
594- help='''Asset category type, deprecation allows you depreciate an asset, the
595+ 'doc_type': fields.selection([('deprecation', 'Deprecation'),
596+ ('amortization', 'Amortization'), ], 'Type',
597+ help='''Asset category type, deprecation allows you depreciate an asset, the
598 amortization allows you amortize an expense.'''),
599- }
600+ }
601
602=== modified file 'account_analytic_active_field/__init__.py'
603--- account_analytic_active_field/__init__.py 2014-05-09 21:51:34 +0000
604+++ account_analytic_active_field/__init__.py 2014-10-07 08:56:40 +0000
605@@ -20,4 +20,4 @@
606 # You should have received a copy of the GNU Affero General Public License
607 # along with this program. If not, see <http://www.gnu.org/licenses/>.
608 ################################################################################
609-import account_analytic_account
610+from . import account_analytic_account
611
612=== modified file 'account_analytic_active_field/__openerp__.py'
613--- account_analytic_active_field/__openerp__.py 2014-05-09 21:51:34 +0000
614+++ account_analytic_active_field/__openerp__.py 2014-10-07 08:56:40 +0000
615@@ -20,27 +20,31 @@
616 # You should have received a copy of the GNU Affero General Public License
617 # along with this program. If not, see <http://www.gnu.org/licenses/>.
618 ################################################################################
619-
620 {
621- "name" : "Field Active In Analytic Accounts",
622- "version" : "1.0",
623- "author" : "Vauxoo",
624- "category" : "Accouting",
625- "description" : """
626+ "name": "Field Active In Analytic Accounts",
627+ "version": "1.0",
628+ "author": "Vauxoo",
629+ "category": "Accouting",
630+ "description": """
631 Field Active In Analytic Accounts
632 =================================
633
634-Add field active to analytic accounts
635- """,
636- "website" : "http://www.vauxoo.com/",
637- "license" : "AGPL-3",
638- "depends" : [
639- "analytic",
640- ],
641- "demo" : [],
642- "data" : [
643- "account_analytic_account_view.xml",
644- ],
645- "installable" : True,
646- "active" : False,
647-}
648+Add field active to analytic accounts
649+ """,
650+ "website": "http://www.vauxoo.com/",
651+ "license": "AGPL-3",
652+ "depends": [
653+ "analytic"
654+ ],
655+ "demo": [],
656+ "data": [
657+ "account_analytic_account_view.xml"
658+ ],
659+ "test": [],
660+ "js": [],
661+ "css": [],
662+ "qweb": [],
663+ "installable": True,
664+ "auto_install": False,
665+ "active": False
666+}
667\ No newline at end of file
668
669=== modified file 'account_analytic_active_field/account_analytic_account.py'
670--- account_analytic_active_field/account_analytic_account.py 2014-05-09 21:51:34 +0000
671+++ account_analytic_active_field/account_analytic_account.py 2014-10-07 08:56:40 +0000
672@@ -24,13 +24,13 @@
673 #
674 ##############################################################################
675 from openerp.osv import osv, fields
676-from openerp.tools.translate import _
677+
678
679 class account_analytic_account(osv.Model):
680 _name = "account.analytic.account"
681 _inherit = "account.analytic.account"
682 _columns = {
683- 'active' : fields.boolean('Active')
684+ 'active': fields.boolean('Active')
685 }
686
687 _defaults = {
688
689=== modified file 'account_analytic_btree/__init__.py'
690--- account_analytic_btree/__init__.py 2014-05-09 21:51:34 +0000
691+++ account_analytic_btree/__init__.py 2014-10-07 08:56:40 +0000
692@@ -26,4 +26,4 @@
693 ##############################################################################
694
695
696-import account_analytic_btree
697+from . import account_analytic_btree
698
699=== modified file 'account_analytic_btree/__openerp__.py'
700--- account_analytic_btree/__openerp__.py 2014-05-09 21:51:34 +0000
701+++ account_analytic_btree/__openerp__.py 2014-10-07 08:56:40 +0000
702@@ -25,16 +25,24 @@
703 #
704 ##############################################################################
705 {
706- "name" : "Creacion de parent_left y parent_right en analiticas",
707- "version" : "1.0",
708- "author" : "Vauxoo",
709- "category" : "Localization/Mexico",
710- "description":"""This module creates parent_left y paret_right en analytic's accounts""",
711- "website" : "http://www.vauxoo.com/",
712- "depends" : ["account", "project"],
713- "init_xml" : [],
714- "demo_xml" : [],
715- "update_xml" : [],
716- "installable" : True,
717- "active" : False,
718-}
719+ "name": "Creacion de parent_left y parent_right en analiticas",
720+ "version": "1.0",
721+ "author": "Vauxoo",
722+ "category": "Localization/Mexico",
723+ "description": """This module creates parent_left y paret_right en analytic's accounts""",
724+ "website": "http://www.vauxoo.com/",
725+ "license": "",
726+ "depends": [
727+ "account",
728+ "project"
729+ ],
730+ "demo": [],
731+ "data": [],
732+ "test": [],
733+ "js": [],
734+ "css": [],
735+ "qweb": [],
736+ "installable": True,
737+ "auto_install": False,
738+ "active": False
739+}
740\ No newline at end of file
741
742=== modified file 'account_analytic_required/__init__.py'
743--- account_analytic_required/__init__.py 2014-05-09 21:51:34 +0000
744+++ account_analytic_required/__init__.py 2014-10-07 08:56:40 +0000
745@@ -23,4 +23,4 @@
746 # along with this program. If not, see <http://www.gnu.org/licenses/>.
747 #
748 ##############################################################################
749-import account
750+from . import account
751
752=== modified file 'account_analytic_required/__openerp__.py'
753--- account_analytic_required/__openerp__.py 2014-05-09 21:51:34 +0000
754+++ account_analytic_required/__openerp__.py 2014-10-07 08:56:40 +0000
755@@ -23,24 +23,28 @@
756 # along with this program. If not, see <http://www.gnu.org/licenses/>.
757 #
758 ##############################################################################
759-
760 {
761- "name" : "Account Analytic Required",
762- "version" : "1.0",
763- "author" : "Vauxoo",
764- "category" : "Generic Modules",
765- "description" : """
766+ "name": "Account Analytic Required",
767+ "version": "1.0",
768+ "author": "Vauxoo",
769+ "category": "Generic Modules",
770+ "description": """
771 Add field analytic_required, for when is select required an account analytic to the validate an account.move
772- """,
773- "website" : "http://www.vauxoo.com/",
774- "license" : "AGPL-3",
775- "depends" : ["account",
776- ],
777- "init_xml" : [],
778- "demo_xml" : [],
779- "update_xml" : [
780- "account_view.xml",
781- ],
782- "installable" : True,
783- "active" : False,
784-}
785+ """,
786+ "website": "http://www.vauxoo.com/",
787+ "license": "AGPL-3",
788+ "depends": [
789+ "account"
790+ ],
791+ "demo": [],
792+ "data": [
793+ "account_view.xml"
794+ ],
795+ "test": [],
796+ "js": [],
797+ "css": [],
798+ "qweb": [],
799+ "installable": True,
800+ "auto_install": False,
801+ "active": False
802+}
803\ No newline at end of file
804
805=== modified file 'account_analytic_required/account.py'
806--- account_analytic_required/account.py 2014-05-09 21:51:34 +0000
807+++ account_analytic_required/account.py 2014-10-07 08:56:40 +0000
808@@ -31,33 +31,34 @@
809 _inherit = 'account.account'
810
811 _columns = {
812- 'analytic_required': fields.boolean('Analytic Required', help='If '\
813- 'this field is active, the journal items that used this account '\
814+ 'analytic_required': fields.boolean('Analytic Required', help='If '
815+ 'this field is active, the journal items that used this account '
816 'should have an analytic account'),
817 }
818-
819+
820+
821 class account_invoice_line(osv.Model):
822 _inherit = 'account.invoice.line'
823-
824+
825 _columns = {
826- 'analytic_required': fields.boolean('Analytic Required', help='If this field is active, '\
827+ 'analytic_required': fields.boolean('Analytic Required', help='If this field is active, '
828 'be required fill the field "account analytic"'),
829 }
830-
831- def onchange_account_id(self, cr, uid, ids, product_id=False, partner_id=False,\
832- inv_type=False, fposition_id=False, account_id=False):
833+
834+ def onchange_account_id(self, cr, uid, ids, product_id=False, partner_id=False,
835+ inv_type=False, fposition_id=False, account_id=False):
836 ids = isinstance(ids, (int, long)) and [ids] or ids
837 if not account_id:
838 return {}
839 res = super(account_invoice_line, self).onchange_account_id(cr, uid, ids, product_id,
840 partner_id, inv_type, fposition_id, account_id)
841 account_obj = self.pool.get('account.account')
842- invoice_line_obj = self.pool.get('account.invoice.line')
843 if account_id:
844 analyt_req = account_obj.browse(cr, uid, account_id).analytic_required or False
845 res['value'].update({'analytic_required': analyt_req})
846 return res
847
848+
849 class account_move(osv.Model):
850 _inherit = 'account.move'
851
852@@ -71,7 +72,7 @@
853 if not analytic_acc_move:
854 moves_without_analytic += '\n' + line.name
855 if moves_without_analytic:
856- raise osv.except_osv(_('Error'), _('Need add analytic account'\
857+ raise osv.except_osv(_('Error'), _('Need add analytic account'
858 ' in move with name ' + moves_without_analytic + '.'))
859 res = super(account_move, self).button_validate(
860 cr, uid, ids, context=context)
861
862=== modified file 'account_anglo_saxon_cost_structure/__init__.py'
863--- account_anglo_saxon_cost_structure/__init__.py 2014-05-09 21:51:34 +0000
864+++ account_anglo_saxon_cost_structure/__init__.py 2014-10-07 08:56:40 +0000
865@@ -1,2 +1,2 @@
866-import model
867-import wizard
868+from . import model
869+from . import wizard
870
871=== modified file 'account_anglo_saxon_cost_structure/__openerp__.py'
872--- account_anglo_saxon_cost_structure/__openerp__.py 2014-05-09 21:51:34 +0000
873+++ account_anglo_saxon_cost_structure/__openerp__.py 2014-10-07 08:56:40 +0000
874@@ -5,7 +5,7 @@
875 # Copyright (C) Vauxoo (<http://vauxoo.com>).
876 # All Rights Reserved
877 ###############Credits######################################################
878-# Coded by: Vauxoo C.A.
879+# Coded by: Vauxoo C.A.
880 # Planified by: Nhomar Hernandez
881 # Audited by: Vauxoo C.A.
882 #############################################################################
883@@ -23,20 +23,27 @@
884 # along with this program. If not, see <http://www.gnu.org/licenses/>.
885 ################################################################################
886 {
887- "name" : "Cost assigned in the account move",
888- "version" : "0.1",
889- "depends" : ["account",'account_anglo_saxon','cost_structure'],
890- "author" : "Vauxoo",
891- "description" : """
892- This module was created to build upon the seat by movement of a product, it will take as cost thereof, calculated by the module cost_structure
893- """,
894- "website" : "http://vauxoo.com",
895- "category" : "Generic Modules",
896- "init_xml" : [],
897- "demo_xml" : [],
898- "test": [ ],
899- "update_xml" : [
900- ],
901- "active": False,
902- "installable": True,
903-}
904+ "name": "Cost assigned in the account move",
905+ "version": "0.1",
906+ "author": "Vauxoo",
907+ "category": "Generic Modules",
908+ "description": """
909+ This module was created to build upon the seat by movement of a product, it will take as cost thereof, calculated by the module cost_structure
910+ """,
911+ "website": "http://vauxoo.com",
912+ "license": "",
913+ "depends": [
914+ "account",
915+ "account_anglo_saxon",
916+ "cost_structure"
917+ ],
918+ "demo": [],
919+ "data": [],
920+ "test": [],
921+ "js": [],
922+ "css": [],
923+ "qweb": [],
924+ "installable": True,
925+ "auto_install": False,
926+ "active": False
927+}
928\ No newline at end of file
929
930=== modified file 'account_anglo_saxon_cost_structure/model/__init__.py'
931--- account_anglo_saxon_cost_structure/model/__init__.py 2014-05-09 21:51:34 +0000
932+++ account_anglo_saxon_cost_structure/model/__init__.py 2014-10-07 08:56:40 +0000
933@@ -1,1 +1,1 @@
934-import invoice
935+from . import invoice
936
937=== modified file 'account_anglo_saxon_cost_structure/model/invoice.py'
938--- account_anglo_saxon_cost_structure/model/invoice.py 2014-05-09 21:51:34 +0000
939+++ account_anglo_saxon_cost_structure/model/invoice.py 2014-10-07 08:56:40 +0000
940@@ -21,8 +21,7 @@
941 #
942 ##############################################################################
943
944-from openerp.tools.translate import _
945-from openerp.osv import fields, osv
946+from openerp.osv import osv
947
948
949 class account_invoice_line(osv.Model):
950
951=== modified file 'account_anglo_saxon_stock_move/__init__.py'
952--- account_anglo_saxon_stock_move/__init__.py 2014-08-17 05:26:48 +0000
953+++ account_anglo_saxon_stock_move/__init__.py 2014-10-07 08:56:40 +0000
954@@ -23,5 +23,5 @@
955 # along with this program. If not, see <http://www.gnu.org/licenses/>.
956 ###############################################################################
957
958-import model
959-import wizard
960+from . import model
961+from . import wizard
962
963=== modified file 'account_anglo_saxon_stock_move/__openerp__.py'
964--- account_anglo_saxon_stock_move/__openerp__.py 2014-08-17 05:26:48 +0000
965+++ account_anglo_saxon_stock_move/__openerp__.py 2014-10-07 08:56:40 +0000
966@@ -22,30 +22,30 @@
967 # You should have received a copy of the GNU Affero General Public License
968 # along with this program. If not, see <http://www.gnu.org/licenses/>.
969 ###############################################################################
970-
971 {
972- 'name': 'Account Anglo-Saxon Stock Move',
973- 'version': '1.0',
974- 'author': 'Vauxoo',
975- 'website': 'http://www.vauxoo.com/',
976- 'category': '',
977- 'description': '''
978+ "name": "Account Anglo-Saxon Stock Move",
979+ "version": "1.0",
980+ "author": "Vauxoo",
981+ "category": "",
982+ "description": """
983 Account Anglo-Saxon Stock Move
984 ------------------------------
985 This module adds an attribute to the Account Invoice Line object
986 and in the case of creating invoice from shipments attach the Stock Move
987 Record on the regarding Invoice Line
988-''',
989- 'depends': [
990- 'account_anglo_saxon',
991- ],
992- 'data': [
993- ],
994- 'demo': [],
995- 'test': [],
996- 'qweb': [],
997- 'js': [],
998- 'css': [],
999- 'active': False,
1000- 'installable': True,
1001-}
1002+""",
1003+ "website": "http://www.vauxoo.com/",
1004+ "license": "",
1005+ "depends": [
1006+ "account_anglo_saxon"
1007+ ],
1008+ "demo": [],
1009+ "data": [],
1010+ "test": [],
1011+ "js": [],
1012+ "css": [],
1013+ "qweb": [],
1014+ "installable": True,
1015+ "auto_install": False,
1016+ "active": False
1017+}
1018\ No newline at end of file
1019
1020=== modified file 'account_anglo_saxon_stock_move/model/__init__.py'
1021--- account_anglo_saxon_stock_move/model/__init__.py 2014-08-17 05:26:48 +0000
1022+++ account_anglo_saxon_stock_move/model/__init__.py 2014-10-07 08:56:40 +0000
1023@@ -23,5 +23,5 @@
1024 # along with this program. If not, see <http://www.gnu.org/licenses/>.
1025 ###############################################################################
1026
1027-import stock
1028-import invoice
1029+from . import stock
1030+from . import invoice
1031
1032=== modified file 'account_anglo_saxon_stock_move/model/invoice.py'
1033--- account_anglo_saxon_stock_move/model/invoice.py 2014-08-17 05:26:48 +0000
1034+++ account_anglo_saxon_stock_move/model/invoice.py 2014-10-07 08:56:40 +0000
1035@@ -23,6 +23,7 @@
1036
1037 from openerp.osv import osv, fields
1038
1039+
1040 class account_invoice_line(osv.osv):
1041 _inherit = "account.invoice.line"
1042
1043
1044=== modified file 'account_anglo_saxon_stock_move/model/stock.py'
1045--- account_anglo_saxon_stock_move/model/stock.py 2014-08-17 05:26:48 +0000
1046+++ account_anglo_saxon_stock_move/model/stock.py 2014-10-07 08:56:40 +0000
1047@@ -25,12 +25,13 @@
1048
1049 from openerp.osv import osv
1050
1051+
1052 class stock_picking(osv.osv):
1053 _inherit = "stock.picking"
1054 _description = "Picking List"
1055
1056 def _prepare_invoice_line(self, cr, uid, group, picking, move_line, invoice_id,
1057- invoice_vals, context=None):
1058+ invoice_vals, context=None):
1059 """Overwrite to add move_id reference"""
1060 res = super(stock_picking, self)._prepare_invoice_line(cr, uid, group, picking, move_line, invoice_id, invoice_vals, context=context)
1061 res.update({
1062
1063=== modified file 'account_asset_analytic/__init__.py'
1064--- account_asset_analytic/__init__.py 2014-05-09 21:51:34 +0000
1065+++ account_asset_analytic/__init__.py 2014-10-07 08:56:40 +0000
1066@@ -1,2 +1,2 @@
1067 # -*- encoding: utf-8 -*-
1068-import model
1069+from . import model
1070
1071=== modified file 'account_asset_analytic/__openerp__.py'
1072--- account_asset_analytic/__openerp__.py 2014-05-09 21:51:34 +0000
1073+++ account_asset_analytic/__openerp__.py 2014-10-07 08:56:40 +0000
1074@@ -1,29 +1,31 @@
1075 # -*- encoding: utf-8 -*-
1076 {
1077- "name": "Account Asset Analytic",
1078- "version": "1.0",
1079- "author": "Vauxoo",
1080- "category": "Generic Modules",
1081- "description" : """
1082+ "name": "Account Asset Analytic",
1083+ "version": "1.0",
1084+ "author": "Vauxoo",
1085+ "category": "Generic Modules",
1086+ "description": """
1087 Account Asset Analytic
1088 ======================
1089
1090 A description is intended to fill this space
1091- """,
1092- "website": "http://www.vauxoo.com/",
1093- "license": "AGPL-3",
1094+ """,
1095+ "website": "http://www.vauxoo.com/",
1096+ "license": "AGPL-3",
1097 "depends": [
1098- "account",
1099- "account_asset",
1100- ],
1101- "demo": [
1102- ],
1103+ "account",
1104+ "account_asset"
1105+ ],
1106+ "demo": [],
1107 "data": [
1108- 'view/view.xml',
1109- 'view/menues_and_actions.xml',
1110- ],
1111- "test" : [
1112- ],
1113- "installable": True,
1114- "active": False,
1115-}
1116+ "view/view.xml",
1117+ "view/menues_and_actions.xml"
1118+ ],
1119+ "test": [],
1120+ "js": [],
1121+ "css": [],
1122+ "qweb": [],
1123+ "installable": True,
1124+ "auto_install": False,
1125+ "active": False
1126+}
1127\ No newline at end of file
1128
1129=== modified file 'account_asset_analytic/model/__init__.py'
1130--- account_asset_analytic/model/__init__.py 2014-05-09 21:51:34 +0000
1131+++ account_asset_analytic/model/__init__.py 2014-10-07 08:56:40 +0000
1132@@ -1,2 +1,2 @@
1133 # -*- encoding: utf-8 -*-
1134-import account_asset
1135+from . import account_asset
1136
1137=== modified file 'account_asset_analytic/model/account_asset.py'
1138--- account_asset_analytic/model/account_asset.py 2014-05-09 21:51:34 +0000
1139+++ account_asset_analytic/model/account_asset.py 2014-10-07 08:56:40 +0000
1140@@ -1,13 +1,14 @@
1141 # -*- encoding: utf-8 -*-
1142 from openerp.osv import fields, osv
1143
1144+
1145 class account_asset_asset(osv.osv):
1146 _inherit = 'account.asset.asset'
1147
1148 def onchange_category_id(self, cr, uid, ids, category_id, context=None):
1149 context = context or {}
1150 val = super(account_asset_asset, self).onchange_category_id(cr, uid, ids, category_id, context=context)
1151- val = val or {'value':{}}
1152+ val = val or {'value': {}}
1153 if category_id:
1154 category = self.pool.get('account.asset.category').browse(cr, uid, category_id, context=context)
1155 if category.account_analytic_id:
1156@@ -18,20 +19,21 @@
1157 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
1158 }
1159
1160+
1161 class account_asset_depreciation_line(osv.osv):
1162 _inherit = 'account.asset.depreciation.line'
1163
1164 def create_move(self, cr, uid, ids, context=None):
1165 context = context or {}
1166 created_move_ids = super(account_asset_depreciation_line, self).create_move(cr, uid, ids, context=None)
1167- if not created_move_ids: return created_move_ids
1168+ if not created_move_ids:
1169+ return created_move_ids
1170 move_line_obj = self.pool.get('account.move.line')
1171 for line in self.browse(cr, uid, ids, context=context):
1172- aml_ids = move_line_obj.search(cr,uid, [('asset_id','=',line.asset_id.id),
1173- ('move_id','in',created_move_ids)],context=context)
1174+ aml_ids = move_line_obj.search(cr, uid, [('asset_id', '=', line.asset_id.id),
1175+ ('move_id', 'in', created_move_ids)], context=context)
1176 if aml_ids and line.asset_id.account_analytic_id:
1177 move_line_obj.write(cr, uid, aml_ids, {
1178 'analytic_account_id': line.asset_id.account_analytic_id.id,
1179- },context=context)
1180+ }, context=context)
1181 return created_move_ids
1182-
1183
1184=== modified file 'account_asset_date/__init__.py'
1185--- account_asset_date/__init__.py 2014-05-09 21:51:34 +0000
1186+++ account_asset_date/__init__.py 2014-10-07 08:56:40 +0000
1187@@ -23,4 +23,4 @@
1188 # along with this program. If not, see <http://www.gnu.org/licenses/>.
1189 #
1190 ##############################################################################
1191-import account_asset
1192+from . import account_asset
1193
1194=== modified file 'account_asset_date/__openerp__.py'
1195--- account_asset_date/__openerp__.py 2014-05-09 21:51:34 +0000
1196+++ account_asset_date/__openerp__.py 2014-10-07 08:56:40 +0000
1197@@ -23,25 +23,30 @@
1198 # along with this program. If not, see <http://www.gnu.org/licenses/>.
1199 #
1200 ##############################################################################
1201-
1202 {
1203- "name" : "account_asset_date",
1204- "version" : "1.0",
1205- "author" : "Vauxoo",
1206- "category" : "account asset",
1207- "description" : """
1208- This module adds a date field in assets and change the
1209- translation of the purchase date field to use as the start date
1210+ "name": "account_asset_date",
1211+ "version": "1.0",
1212+ "author": "Vauxoo",
1213+ "category": "account asset",
1214+ "description": """
1215+ This module adds a date field in assets and change the
1216+ translation of the purchase date field to use as the start date
1217 for depreciation
1218- """,
1219- "website" : "http://www.vauxoo.com/",
1220- "license" : "AGPL-3",
1221- "depends" : [
1222- "account_asset",
1223- ],
1224- "demo" : [],
1225- "data" : ["account_asset_view.xml"],
1226- "test": [],
1227- "installable" : True,
1228- "active" : False,
1229-}
1230+ """,
1231+ "website": "http://www.vauxoo.com/",
1232+ "license": "AGPL-3",
1233+ "depends": [
1234+ "account_asset"
1235+ ],
1236+ "demo": [],
1237+ "data": [
1238+ "account_asset_view.xml"
1239+ ],
1240+ "test": [],
1241+ "js": [],
1242+ "css": [],
1243+ "qweb": [],
1244+ "installable": True,
1245+ "auto_install": False,
1246+ "active": False
1247+}
1248\ No newline at end of file
1249
1250=== modified file 'account_asset_date/account_asset.py'
1251--- account_asset_date/account_asset.py 2014-09-12 21:07:09 +0000
1252+++ account_asset_date/account_asset.py 2014-10-07 08:56:40 +0000
1253@@ -27,15 +27,11 @@
1254 from openerp.osv import osv, fields
1255 from openerp.tools.translate import _
1256
1257-import release
1258-from openerp.addons.decimal_precision import decimal_precision as dp
1259-
1260-import time
1261
1262 class account_asset_asset(osv.Model):
1263 _inherit = 'account.asset.asset'
1264-
1265- _columns={
1266- 'purchase_date': fields.date('Purchase Date', required=True, readonly=True, states={'draft':[('readonly',False)]}, help = _('Depreciation start date')),
1267- 'date_acquisition': fields.date('Date Acquisition', help = _('Date acquisition'))
1268+
1269+ _columns = {
1270+ 'purchase_date': fields.date('Purchase Date', required=True, readonly=True, states={'draft': [('readonly', False)]}, help=_('Depreciation start date')),
1271+ 'date_acquisition': fields.date('Date Acquisition', help=_('Date acquisition'))
1272 }
1273
1274=== added file 'account_asset_move_check/__init__.py'
1275--- account_asset_move_check/__init__.py 1970-01-01 00:00:00 +0000
1276+++ account_asset_move_check/__init__.py 2014-10-07 08:56:40 +0000
1277@@ -0,0 +1,27 @@
1278+# -*- encoding: utf-8 -*-
1279+###########################################################################
1280+# Module Writen to OpenERP, Open Source Management Solution
1281+#
1282+# Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
1283+# All Rights Reserved.
1284+# info Vauxoo (info@vauxoo.com)
1285+############################################################################
1286+# Coded by: Sabrina Romero (sabrina@vauxoo.com)
1287+############################################################################
1288+#
1289+# This program is free software: you can redistribute it and/or modify
1290+# it under the terms of the GNU Affero General Public License as
1291+# published by the Free Software Foundation, either version 3 of the
1292+# License, or (at your option) any later version.
1293+#
1294+# This program is distributed in the hope that it will be useful,
1295+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1296+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1297+# GNU Affero General Public License for more details.
1298+#
1299+# You should have received a copy of the GNU Affero General Public License
1300+# along with this program. If not, see <http://www.gnu.org/licenses/>.
1301+#
1302+##############################################################################
1303+
1304+from . import model
1305
1306=== renamed file 'account_asset_move_check/__init__.py' => 'account_asset_move_check/__init__.py.moved'
1307=== added file 'account_asset_move_check/__openerp__.py'
1308--- account_asset_move_check/__openerp__.py 1970-01-01 00:00:00 +0000
1309+++ account_asset_move_check/__openerp__.py 2014-10-07 08:56:40 +0000
1310@@ -0,0 +1,56 @@
1311+# -*- encoding: utf-8 -*-
1312+###########################################################################
1313+# Module Writen to OpenERP, Open Source Management Solution
1314+#
1315+# Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
1316+# All Rights Reserved.
1317+# info Vauxoo (info@vauxoo.com)
1318+############################################################################
1319+# Coded by: Sabrina Romero (sabrina@vauxoo.com)
1320+############################################################################
1321+#
1322+# This program is free software: you can redistribute it and/or modify
1323+# it under the terms of the GNU Affero General Public License as
1324+# published by the Free Software Foundation, either version 3 of the
1325+# License, or (at your option) any later version.
1326+#
1327+# This program is distributed in the hope that it will be useful,
1328+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1329+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1330+# GNU Affero General Public License for more details.
1331+#
1332+# You should have received a copy of the GNU Affero General Public License
1333+# along with this program. If not, see <http://www.gnu.org/licenses/>.
1334+#
1335+##############################################################################
1336+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1337+{
1338+ "name": "Account Asset Move Check",
1339+ "version": "0.1",
1340+ "author": "Vauxoo",
1341+ "category": "Accounting",
1342+ "description": """
1343+Account Asset Move Check
1344+========================
1345+
1346+This module add a field that makes posible check like posted some
1347+deprecations lines with an special condition using the "check_posted"
1348+field in the validation of "_get_move_check" function.
1349+
1350+ """,
1351+ "website": "http://www.vauxoo.com",
1352+ "license": "",
1353+ "depends": [
1354+ "account",
1355+ "account_asset"
1356+ ],
1357+ "demo": [],
1358+ "data": [],
1359+ "test": [],
1360+ "js": [],
1361+ "css": [],
1362+ "qweb": [],
1363+ "installable": True,
1364+ "auto_install": False,
1365+ "active": False
1366+}
1367\ No newline at end of file
1368
1369=== renamed file 'account_asset_move_check/__openerp__.py' => 'account_asset_move_check/__openerp__.py.moved'
1370=== added file 'account_asset_move_check/model/__init__.py'
1371--- account_asset_move_check/model/__init__.py 1970-01-01 00:00:00 +0000
1372+++ account_asset_move_check/model/__init__.py 2014-10-07 08:56:40 +0000
1373@@ -0,0 +1,27 @@
1374+# -*- encoding: utf-8 -*-
1375+###########################################################################
1376+# Module Writen to OpenERP, Open Source Management Solution
1377+#
1378+# Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
1379+# All Rights Reserved.
1380+# info Vauxoo (info@vauxoo.com)
1381+############################################################################
1382+# Coded by: Sabrina Romero (sabrina@vauxoo.com)
1383+############################################################################
1384+#
1385+# This program is free software: you can redistribute it and/or modify
1386+# it under the terms of the GNU Affero General Public License as
1387+# published by the Free Software Foundation, either version 3 of the
1388+# License, or (at your option) any later version.
1389+#
1390+# This program is distributed in the hope that it will be useful,
1391+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1392+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1393+# GNU Affero General Public License for more details.
1394+#
1395+# You should have received a copy of the GNU Affero General Public License
1396+# along with this program. If not, see <http://www.gnu.org/licenses/>.
1397+#
1398+##############################################################################
1399+
1400+from . import account_asset
1401
1402=== renamed file 'account_asset_move_check/model/__init__.py' => 'account_asset_move_check/model/__init__.py.moved'
1403=== modified file 'account_asset_move_check/model/account_asset.py'
1404--- account_asset_move_check/model/account_asset.py 2014-05-09 21:51:34 +0000
1405+++ account_asset_move_check/model/account_asset.py 2014-10-07 08:56:40 +0000
1406@@ -25,24 +25,22 @@
1407 ##############################################################################
1408
1409 from openerp.osv import osv, fields
1410-from openerp.tools.translate import _
1411
1412-import time
1413
1414 class account_asset_depreciation_line(osv.Model):
1415 _inherit = 'account.asset.depreciation.line'
1416-
1417+
1418 def _get_move_check(self, cr, uid, ids, name, args, context=None):
1419 res = super(account_asset_depreciation_line, self)._get_move_check(cr, uid, ids, name, args, context=context)
1420 for line in self.browse(cr, uid, ids, context=context):
1421 res[line.id] = bool(line.move_id or line.check_posted)
1422 return res
1423-
1424- _columns={
1425+
1426+ _columns = {
1427 'check_posted': fields.boolean('Posted'),
1428 'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True)
1429 }
1430-
1431+
1432 _defaults = {
1433 'check_posted': False,
1434 }
1435
1436=== modified file 'account_bank_statement_vauxoo/__init__.py'
1437--- account_bank_statement_vauxoo/__init__.py 2014-05-09 21:51:34 +0000
1438+++ account_bank_statement_vauxoo/__init__.py 2014-10-07 08:56:40 +0000
1439@@ -1,1 +1,1 @@
1440-import model
1441+from . import model
1442
1443=== modified file 'account_bank_statement_vauxoo/__openerp__.py'
1444--- account_bank_statement_vauxoo/__openerp__.py 2014-05-09 21:51:34 +0000
1445+++ account_bank_statement_vauxoo/__openerp__.py 2014-10-07 08:56:40 +0000
1446@@ -1,7 +1,7 @@
1447 # -*- encoding: utf-8 -*-
1448 ##############################################################################
1449 #
1450-# OpenERP, Open Source Management Solution
1451+# OpenERP, Open Source Management Solution
1452 # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
1453 # Coded and Planified by Nhomar Hernandez <nhomar@vauxoo.com>
1454 #
1455@@ -19,13 +19,12 @@
1456 # along with this program. If not, see <http://www.gnu.org/licenses/>.
1457 #
1458 ##############################################################################
1459-
1460 {
1461- "name" : "Fixes and Imrpovements to Bank Statement management",
1462- "version" : "0.1",
1463- "depends" : ["account",],
1464- "author" : "Vauxoo",
1465- "description" : """
1466+ "name": "Fixes and Imrpovements to Bank Statement management",
1467+ "version": "0.1",
1468+ "author": "Vauxoo",
1469+ "category": "Accounting & Finance",
1470+ "description": """
1471 Improve management of Bank Statement.
1472 =====================================
1473 1.- Import directly from files given by banks.
1474@@ -35,23 +34,27 @@
1475 b.- Mexican Banks.
1476 c.- Venezuelan Banks.
1477 Banco Exterior #TODO
1478- 2.-
1479- """,
1480- "website" : "http://vauxoo.com",
1481- "category" : "Accounting & Finance",
1482- "init_xml" : [
1483- ],
1484- "demo_xml" : [
1485- ],
1486- "update_xml" : [
1487- "security/bank_statement_security.xml",
1488- "security/ir.model.access.csv",
1489- "view/account_bank_statement_view.xml",
1490- "view/account_invoice_view.xml",
1491- "view/account_journal_view.xml",
1492- "data/data.xml",
1493- ],
1494- "active": False,
1495- "images": [],
1496- "installable": True,
1497-}
1498+ 2.-
1499+ """,
1500+ "website": "http://vauxoo.com",
1501+ "license": "",
1502+ "depends": [
1503+ "account"
1504+ ],
1505+ "demo": [],
1506+ "data": [
1507+ "security/bank_statement_security.xml",
1508+ "security/ir.model.access.csv",
1509+ "view/account_bank_statement_view.xml",
1510+ "view/account_invoice_view.xml",
1511+ "view/account_journal_view.xml",
1512+ "data/data.xml"
1513+ ],
1514+ "test": [],
1515+ "js": [],
1516+ "css": [],
1517+ "qweb": [],
1518+ "installable": True,
1519+ "auto_install": False,
1520+ "active": False
1521+}
1522\ No newline at end of file
1523
1524=== modified file 'account_bank_statement_vauxoo/model/__init__.py'
1525--- account_bank_statement_vauxoo/model/__init__.py 2014-05-09 21:51:34 +0000
1526+++ account_bank_statement_vauxoo/model/__init__.py 2014-10-07 08:56:40 +0000
1527@@ -1,3 +1,3 @@
1528-import account_bank_statement
1529-import account_invoice
1530-import account_journal
1531+from . import account_bank_statement
1532+from . import account_invoice
1533+from . import account_journal
1534
1535=== modified file 'account_bank_statement_vauxoo/model/account_bank_statement.py'
1536--- account_bank_statement_vauxoo/model/account_bank_statement.py 2014-09-12 21:07:09 +0000
1537+++ account_bank_statement_vauxoo/model/account_bank_statement.py 2014-10-07 08:56:40 +0000
1538@@ -22,14 +22,11 @@
1539
1540 from openerp.osv import fields, osv
1541 from openerp.addons.decimal_precision import decimal_precision as dp
1542-import openerp.netsvc as netsvc
1543 from openerp.tools.translate import _
1544
1545 # Excel Stuff
1546 import xlrd
1547-import xlwt
1548 import base64
1549-from tempfile import NamedTemporaryFile
1550 from datetime import date, datetime, timedelta
1551
1552
1553@@ -371,6 +368,7 @@
1554
1555
1556 class bank_statement_imported_lines(osv.Model):
1557+
1558 """
1559 OpenERP Model : ClassName
1560 """
1561@@ -379,25 +377,25 @@
1562 _description = 'Imported lines for banks files'
1563
1564 # def _balance(self, cr, uid,ids,field_name,args,context=None):
1565- # res = {}
1566- #
1567- # for i in ids:
1568- # debit = 0.0
1569- # amt_unt = 0.0
1570- # bsil_brw = self.browse(cr,uid,i,context=context)
1571- # counterpart_id = bsil_brw.counterpart_id
1572- # for aml in bsil_brw.aml_ids:
1573- # if aml.account_id == counterpart_id:
1574- # debit += aml.debit or aml.credit
1575- # for inv in bsil_brw.invoice_ids:
1576- # if inv.account_id == counterpart_id:
1577- # amt_unt += inv.amount_total
1578- # for amls in bsil_brw.acc_move_line_ids:
1579- # if amls.account_id == counterpart_id:
1580- # amt_unt+=amls[aml.debit and 'credit' or 'debit']
1581- #
1582- # res[i]=debit-amt_unt
1583- # return res
1584+ # res = {}
1585+ #
1586+ # for i in ids:
1587+ # debit = 0.0
1588+ # amt_unt = 0.0
1589+ # bsil_brw = self.browse(cr,uid,i,context=context)
1590+ # counterpart_id = bsil_brw.counterpart_id
1591+ # for aml in bsil_brw.aml_ids:
1592+ # if aml.account_id == counterpart_id:
1593+ # debit += aml.debit or aml.credit
1594+ # for inv in bsil_brw.invoice_ids:
1595+ # if inv.account_id == counterpart_id:
1596+ # amt_unt += inv.amount_total
1597+ # for amls in bsil_brw.acc_move_line_ids:
1598+ # if amls.account_id == counterpart_id:
1599+ # amt_unt+=amls[aml.debit and 'credit' or 'debit']
1600+ #
1601+ # res[i]=debit-amt_unt
1602+ # return res
1603 _columns = {
1604 'name': fields.char('Description', size=255, required=True,
1605 readonly=False),
1606@@ -457,8 +455,8 @@
1607 }
1608
1609 # def explode_aml(self,cr,uid,ids,,context=None):
1610- # if context is None:
1611- # context={}
1612+ # if context is None:
1613+ # context={}
1614 def change_account(self, cr, uid, ids, context=None):
1615 if context is None:
1616 context = {}
1617@@ -502,7 +500,6 @@
1618 context = {}
1619 res = []
1620 aml = False
1621- amount = {}
1622 total = 0
1623 invoice_obj = self.pool.get('account.invoice')
1624 account_move_line_obj = self.pool.get('account.move.line')
1625@@ -554,14 +551,14 @@
1626 (account_move_line_obj.copy(
1627 cr, uid, aml.id, {
1628 'partner_id': aml_id.partner_id and
1629- aml_id.partner_id.id,
1630+ aml_id.partner_id.id,
1631 '%s' % (aml.debit > 0 and
1632 'debit' or aml.credit > 0 and
1633 'credit'):
1634- (aml_id.reconcile_partial_id and
1635- aml_id.invoice and
1636- aml_id.invoice.residual or
1637- aml_id[aml.debit and
1638+ (aml_id.reconcile_partial_id and
1639+ aml_id.invoice and
1640+ aml_id.invoice.residual or
1641+ aml_id[aml.debit and
1642 'credit' or 'debit'])}),
1643 aml_id.id))
1644
1645@@ -573,7 +570,7 @@
1646 (account_move_line_obj.copy(
1647 cr, uid, aml.id, {
1648 'partner_id': aml_id.partner_id and
1649- aml_id.partner_id.id,
1650+ aml_id.partner_id.id,
1651 '%s' % (aml.debit > 0 and
1652 'debit' or aml.credit > 0 and
1653 'credit'): total}),
1654
1655=== modified file 'account_bank_statement_vauxoo/model/account_invoice.py'
1656--- account_bank_statement_vauxoo/model/account_invoice.py 2014-05-09 21:51:34 +0000
1657+++ account_bank_statement_vauxoo/model/account_invoice.py 2014-10-07 08:56:40 +0000
1658@@ -24,6 +24,7 @@
1659
1660
1661 class account_invoice(osv.Model):
1662+
1663 """
1664 account_invoice
1665 """
1666
1667=== modified file 'account_bank_statement_vauxoo/model/account_journal.py'
1668--- account_bank_statement_vauxoo/model/account_journal.py 2014-05-09 21:51:34 +0000
1669+++ account_bank_statement_vauxoo/model/account_journal.py 2014-10-07 08:56:40 +0000
1670@@ -21,10 +21,8 @@
1671 ##############################################################################
1672
1673 from openerp.osv import fields, osv
1674-from openerp.tools.translate import _
1675
1676 import openerp.netsvc as netsvc
1677-import logging
1678
1679
1680 class account_journal(osv.Model):
1681@@ -92,17 +90,17 @@
1682 try:
1683 exp_ = self.browse(cr, user, ids, context=context)[0].expresion
1684 exp = eval(exp_)
1685- self.logger.notifyChannel('Chain. '+str(exp), netsvc.LOG_DEBUG,
1686+ self.logger.notifyChannel('Chain. ' + str(exp), netsvc.LOG_DEBUG,
1687 'Succefully Validated')
1688 if type(exp) is list:
1689 return True
1690 else:
1691 self.logger.notifyChannel(
1692- 'Chain. '+str(exp_), netsvc.LOG_ERROR,
1693+ 'Chain. ' + str(exp_), netsvc.LOG_ERROR,
1694 'Fail With You must use a list')
1695 return False
1696 except Exception, var:
1697- self.logger.notifyChannel('Chain. '+str(exp_), netsvc.LOG_ERROR,
1698+ self.logger.notifyChannel('Chain. ' + str(exp_), netsvc.LOG_ERROR,
1699 'Fail With %s' % var)
1700 return False
1701
1702@@ -112,4 +110,3 @@
1703 ["cadenaA","cadenaB","CadenaC"]
1704 o es inválida''', ['expresion']),
1705 ]
1706-account_journal_bs_config
1707
1708=== modified file 'account_budget_imp/__init__.py'
1709--- account_budget_imp/__init__.py 2014-05-09 21:51:34 +0000
1710+++ account_budget_imp/__init__.py 2014-10-07 08:56:40 +0000
1711@@ -1,1 +1,1 @@
1712-import model
1713+from . import model
1714
1715=== modified file 'account_budget_imp/__openerp__.py'
1716--- account_budget_imp/__openerp__.py 2014-05-09 21:51:34 +0000
1717+++ account_budget_imp/__openerp__.py 2014-10-07 08:56:40 +0000
1718@@ -23,13 +23,12 @@
1719 # along with this program. If not, see <http://www.gnu.org/licenses/>.
1720 #
1721 ##############################################################################
1722-
1723 {
1724- "name" : "Account Budget Improvements",
1725- "version" : "1.0",
1726- "author" : "Vauxoo",
1727- 'category' : 'Accounting & Finance',
1728- "description" : """
1729+ "name": "Account Budget Improvements",
1730+ "version": "1.0",
1731+ "author": "Vauxoo",
1732+ "category": "Accounting & Finance",
1733+ "description": """
1734 Improvements to Account Budget
1735 ==============================
1736
1737@@ -55,30 +54,30 @@
1738
1739 The Account Budget view will be used to comply with need to show the executed
1740 Budget per period.
1741- """,
1742- "website" : "http://www.vauxoo.com/",
1743- "license" : "AGPL-3",
1744- "depends" : [
1745- "account_budget",
1746- "account_accountant",
1747- "ifrs_report",
1748- "web_kanban",
1749- ],
1750- "data" : [
1751- "view/account_budget_view.xml",
1752- "security/res_groups.xml",
1753- "data/account_budget_data.xml",
1754- ],
1755- "demo" : [
1756- ],
1757+ """,
1758+ "website": "http://www.vauxoo.com/",
1759+ "license": "AGPL-3",
1760+ "depends": [
1761+ "account_budget",
1762+ "account_accountant",
1763+ "ifrs_report",
1764+ "web_kanban"
1765+ ],
1766+ "demo": [],
1767+ "data": [
1768+ "view/account_budget_view.xml",
1769+ "security/res_groups.xml",
1770+ "data/account_budget_data.xml"
1771+ ],
1772+ "test": [],
1773+ "js": [
1774+ "static/src/js/account_budget_imp.js"
1775+ ],
1776 "css": [
1777- "static/src/css/account_budget.css",
1778- ],
1779- "js": [
1780- "static/src/js/account_budget_imp.js",
1781- ],
1782- "test" : [
1783- ],
1784- "installable" : True,
1785- "active" : False,
1786-}
1787+ "static/src/css/account_budget.css"
1788+ ],
1789+ "qweb": [],
1790+ "installable": True,
1791+ "auto_install": False,
1792+ "active": False
1793+}
1794\ No newline at end of file
1795
1796=== added file 'account_budget_imp/i18n/pt_BR.po'
1797--- account_budget_imp/i18n/pt_BR.po 1970-01-01 00:00:00 +0000
1798+++ account_budget_imp/i18n/pt_BR.po 2014-10-07 08:56:40 +0000
1799@@ -0,0 +1,137 @@
1800+# Brazilian Portuguese translation for addons-vauxoo
1801+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
1802+# This file is distributed under the same license as the addons-vauxoo package.
1803+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
1804+#
1805+msgid ""
1806+msgstr ""
1807+"Project-Id-Version: addons-vauxoo\n"
1808+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1809+"POT-Creation-Date: 2013-11-07 01:13+0000\n"
1810+"PO-Revision-Date: 2014-09-26 08:36+0000\n"
1811+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1812+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
1813+"MIME-Version: 1.0\n"
1814+"Content-Type: text/plain; charset=UTF-8\n"
1815+"Content-Transfer-Encoding: 8bit\n"
1816+"X-Launchpad-Export-Date: 2014-09-27 06:28+0000\n"
1817+"X-Generator: Launchpad (build 17196)\n"
1818+
1819+#. module: account_budget_imp
1820+#: view:crossovered.budget.lines:0
1821+msgid "THEO"
1822+msgstr ""
1823+
1824+#. module: account_budget_imp
1825+#: field:crossovered.budget.lines,ifrs_lines_id:0
1826+msgid "Report Line"
1827+msgstr ""
1828+
1829+#. module: account_budget_imp
1830+#: view:crossovered.budget.lines:0
1831+msgid "B. Plan"
1832+msgstr ""
1833+
1834+#. module: account_budget_imp
1835+#: help:crossovered.budget,fiscalyear_id:0
1836+#: help:crossovered.budget,period_id:0
1837+#: help:crossovered.budget.lines,period_id:0
1838+msgid "Period for this budget"
1839+msgstr ""
1840+
1841+#. module: account_budget_imp
1842+#: field:crossovered.budget,dt_approved:0
1843+msgid "Date Approved"
1844+msgstr ""
1845+
1846+#. module: account_budget_imp
1847+#: field:crossovered.budget,dt_done:0
1848+msgid "Date Done"
1849+msgstr ""
1850+
1851+#. module: account_budget_imp
1852+#: view:crossovered.budget.lines:0
1853+msgid "ForeCasted"
1854+msgstr ""
1855+
1856+#. module: account_budget_imp
1857+#: view:crossovered.budget.lines:0
1858+msgid "Real"
1859+msgstr ""
1860+
1861+#. module: account_budget_imp
1862+#: field:crossovered.budget.lines,forecasted_amount:0
1863+msgid "Forecasted Amount"
1864+msgstr ""
1865+
1866+#. module: account_budget_imp
1867+#: help:crossovered.budget.lines,forecasted_amount:0
1868+msgid ""
1869+"Due to your analisys what is the amopunt that\n"
1870+" the manager stimate will comply to be compared "
1871+"with\n"
1872+" the Planned Ammount"
1873+msgstr ""
1874+
1875+#. module: account_budget_imp
1876+#: model:ir.model,name:account_budget_imp.model_crossovered_budget_lines
1877+msgid "Budget Line"
1878+msgstr ""
1879+
1880+#. module: account_budget_imp
1881+#: model:res.groups,name:account_budget_imp.bugdet_multicompany
1882+msgid "Budget Multicompany"
1883+msgstr ""
1884+
1885+#. module: account_budget_imp
1886+#: field:crossovered.budget.lines,practical_amount_aa:0
1887+msgid "Caused Amount"
1888+msgstr ""
1889+
1890+#. module: account_budget_imp
1891+#: model:ir.model,name:account_budget_imp.model_crossovered_budget
1892+msgid "Budget"
1893+msgstr ""
1894+
1895+#. module: account_budget_imp
1896+#: field:crossovered.budget,dt_validated:0
1897+msgid "Date Validated"
1898+msgstr ""
1899+
1900+#. module: account_budget_imp
1901+#: field:crossovered.budget,fiscalyear_id:0
1902+msgid "Fiscal Year"
1903+msgstr ""
1904+
1905+#. module: account_budget_imp
1906+#: field:crossovered.budget,general_budget_id:0
1907+msgid "Budgetary Position"
1908+msgstr ""
1909+
1910+#. module: account_budget_imp
1911+#: help:crossovered.budget.lines,ifrs_lines_id:0
1912+msgid "Line on the IFRS report to analyse your budget."
1913+msgstr ""
1914+
1915+#. module: account_budget_imp
1916+#: field:crossovered.budget,period_id:0
1917+#: field:crossovered.budget.lines,period_id:0
1918+msgid "Period"
1919+msgstr ""
1920+
1921+#. module: account_budget_imp
1922+#: view:crossovered.budget:0
1923+msgid "Audit Information"
1924+msgstr ""
1925+
1926+#. module: account_budget_imp
1927+#: help:crossovered.budget,dt_done:0
1928+msgid "Date when the cicle finish."
1929+msgstr ""
1930+
1931+#. module: account_budget_imp
1932+#: help:crossovered.budget.lines,practical_amount_aa:0
1933+msgid ""
1934+"This amount comes from the computation related to the IFRS line report "
1935+"related"
1936+msgstr ""
1937
1938=== modified file 'account_budget_imp/model/__init__.py'
1939--- account_budget_imp/model/__init__.py 2014-05-09 21:51:34 +0000
1940+++ account_budget_imp/model/__init__.py 2014-10-07 08:56:40 +0000
1941@@ -1,1 +1,1 @@
1942-import account_budget
1943+from . import account_budget
1944
1945=== modified file 'account_budget_imp/model/account_budget.py'
1946--- account_budget_imp/model/account_budget.py 2014-05-09 21:51:34 +0000
1947+++ account_budget_imp/model/account_budget.py 2014-10-07 08:56:40 +0000
1948@@ -24,57 +24,57 @@
1949 #
1950 ##############################################################################
1951
1952-import datetime
1953 from openerp.osv import osv, fields
1954-from openerp.tools.translate import _
1955 import openerp.addons.decimal_precision as dp
1956
1957+
1958 class crossovered_budget(osv.osv):
1959 _inherit = "crossovered.budget"
1960 _description = "Budget"
1961
1962 _columns = {
1963 'dt_approved': fields.date('Date Approved',
1964- readonly = True),
1965+ readonly=True),
1966 'dt_validated': fields.date('Date Validated',
1967- readonly = True),
1968+ readonly=True),
1969 'dt_done': fields.date('Date Done',
1970- readonly = True,
1971- help = "Date when the cicle finish."),
1972+ readonly=True,
1973+ help="Date when the cicle finish."),
1974 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year',
1975 help="Period for this budget"),
1976 'period_id': fields.many2one('account.period', 'Period',
1977 help="Period for this budget"),
1978- 'date_from': fields.date('Start Date', states={'done':[('readonly',True)]}),
1979- 'date_to': fields.date('End Date', states={'done':[('readonly',True)]}),
1980+ 'date_from': fields.date('Start Date', states={'done': [('readonly', True)]}),
1981+ 'date_to': fields.date('End Date', states={'done': [('readonly', True)]}),
1982 'company_id': fields.many2one('res.company', 'Company'),
1983 'general_budget_id': fields.many2one('account.budget.post', 'Budgetary Position'),
1984- }
1985+ }
1986
1987 _default = {
1988- 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
1989+ 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
1990 }
1991-
1992+
1993+
1994 class crossovered_budget_lines(osv.osv):
1995 _inherit = 'crossovered.budget.lines'
1996
1997 def _prac_acc(self, cr, uid, ids, name, args, context=None):
1998- res={}
1999+ res = {}
2000 for line in self.browse(cr, uid, ids, context=context):
2001 res[line.id] = self._prac_amt_acc(cr, uid, [line.id], context=context)[line.id]
2002 return res
2003
2004 def _get_ifrs_total(self, cr, uid, ids, name, args, context=None):
2005 res = {}
2006- cbl_brws = self.browse(cr, uid, ids, context = context)
2007+ cbl_brws = self.browse(cr, uid, ids, context=context)
2008 ifrs_line_obj = self.pool.get('ifrs.lines')
2009 for line in cbl_brws:
2010 ifrs_result = ifrs_line_obj._get_amount_value(cr, uid,
2011 [line.ifrs_lines_id.id],
2012- ifrs_line = line.ifrs_lines_id,
2013- period_info = line.period_id,
2014- context = context)
2015- res[line.id] = ifrs_result
2016+ ifrs_line=line.ifrs_lines_id,
2017+ period_info=line.period_id,
2018+ context=context)
2019+ res[line.id] = ifrs_result
2020 return res
2021
2022 _columns = {
2023@@ -94,7 +94,7 @@
2024 the manager stimate will comply to be compared with
2025 the Planned Ammount"""),
2026 'ifrs_lines_id': fields.many2one("ifrs.lines", "Report Line",
2027- help= "Line on the IFRS report to analyse your budget."),
2028+ help="Line on the IFRS report to analyse your budget."),
2029 'period_id': fields.many2one('account.period', 'Period',
2030 domain=[('special', '<>', True)],
2031 help="Period for this budget"),
2032@@ -103,30 +103,30 @@
2033 }
2034
2035 _default = {
2036- 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
2037+ 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
2038 }
2039
2040- def write(self, cr, uid, ids, values, context = None):
2041- period_brw = self.pool.get('account.period').browse(cr, uid, values.get('period_id'), context = context)
2042+ def write(self, cr, uid, ids, values, context=None):
2043+ period_brw = self.pool.get('account.period').browse(cr, uid, values.get('period_id'), context=context)
2044 values.update({'date_from': period_brw.date_start,
2045 'date_to': period_brw.date_stop})
2046- return super(crossovered_budget_lines, self).write(cr, uid, ids, values, context = context)
2047+ return super(crossovered_budget_lines, self).write(cr, uid, ids, values, context=context)
2048
2049- def create(self, cr, uid, values, context = None):
2050- period_brw = self.pool.get('account.period').browse(cr, uid, values.get('period_id'), context = context)
2051+ def create(self, cr, uid, values, context=None):
2052+ period_brw = self.pool.get('account.period').browse(cr, uid, values.get('period_id'), context=context)
2053 values.update({'date_from': period_brw.date_start,
2054 'date_to': period_brw.date_stop})
2055- return super(crossovered_budget_lines, self).create(cr, uid, values, context = context)
2056+ return super(crossovered_budget_lines, self).create(cr, uid, values, context=context)
2057
2058 def _prac_amt_acc(self, cr, uid, ids, context=None):
2059 '''
2060- This Method should compute considering Accounts Accounts due to the
2061+ This Method should compute considering Accounts Accounts due to the
2062 Account Analityc Account is not mandatory in the budget Line.
2063- If the account Analityc Account is empty
2064+ If the account Analityc Account is empty
2065 '''
2066 res = {}
2067 result = 0.0
2068- if context is None:
2069+ if context is None:
2070 context = {}
2071 for line in self.browse(cr, uid, ids, context=context):
2072 date_to = line.date_to
2073@@ -143,10 +143,10 @@
2074 if line.analytic_account_id.id:
2075 cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id=%s AND (date "
2076 "between to_date(%s,'yyyy-mm-dd') AND to_date(%s,'yyyy-mm-dd')) AND "
2077- "general_account_id=ANY(%s)", (line.analytic_account_id.id, date_from, date_to,acc_ids,))
2078+ "general_account_id=ANY(%s)", (line.analytic_account_id.id, date_from, date_to, acc_ids,))
2079 result = cr.fetchone()[0]
2080 else:
2081- result = sum([a.balance for a in line.general_budget_id.account_ids])
2082+ result = sum([a.balance for a in line.general_budget_id.account_ids])
2083 else:
2084 result = 0.00
2085 if result is None:
2086
2087=== modified file 'account_chart_wiz_dates/__init__.py'
2088--- account_chart_wiz_dates/__init__.py 2014-05-09 21:51:34 +0000
2089+++ account_chart_wiz_dates/__init__.py 2014-10-07 08:56:40 +0000
2090@@ -24,4 +24,4 @@
2091 #
2092 ##############################################################################
2093 import account
2094-import wizard
2095+from . import wizard
2096
2097=== modified file 'account_chart_wiz_dates/__openerp__.py'
2098--- account_chart_wiz_dates/__openerp__.py 2014-05-09 21:51:34 +0000
2099+++ account_chart_wiz_dates/__openerp__.py 2014-10-07 08:56:40 +0000
2100@@ -23,24 +23,28 @@
2101 # along with this program. If not, see <http://www.gnu.org/licenses/>.
2102 #
2103 ##############################################################################
2104-
2105 {
2106- "name" : "Wizard Account Chart Dates",
2107- "version" : "1.0",
2108- "author" : "Vauxoo",
2109- "category" : "Generic Modules",
2110- "description" : """
2111+ "name": "Wizard Account Chart Dates",
2112+ "version": "1.0",
2113+ "author": "Vauxoo",
2114+ "category": "Generic Modules",
2115+ "description": """
2116 Add fields for date initial & end
2117- """,
2118- "website" : "http://www.vauxoo.com/",
2119- "license" : "AGPL-3",
2120- "depends" : ["account",
2121- ],
2122- "init_xml" : [],
2123- "demo_xml" : [],
2124- "update_xml" : [
2125- "wizard/account_chart_view.xml",
2126- ],
2127- "installable" : True,
2128- "active" : False,
2129-}
2130+ """,
2131+ "website": "http://www.vauxoo.com/",
2132+ "license": "AGPL-3",
2133+ "depends": [
2134+ "account"
2135+ ],
2136+ "demo": [],
2137+ "data": [
2138+ "wizard/account_chart_view.xml"
2139+ ],
2140+ "test": [],
2141+ "js": [],
2142+ "css": [],
2143+ "qweb": [],
2144+ "installable": True,
2145+ "auto_install": False,
2146+ "active": False
2147+}
2148\ No newline at end of file
2149
2150=== modified file 'account_chart_wiz_dates/wizard/__init__.py'
2151--- account_chart_wiz_dates/wizard/__init__.py 2014-05-09 21:51:34 +0000
2152+++ account_chart_wiz_dates/wizard/__init__.py 2014-10-07 08:56:40 +0000
2153@@ -23,4 +23,4 @@
2154 # along with this program. If not, see <http://www.gnu.org/licenses/>.
2155 #
2156 ##############################################################################
2157-import account_chart
2158+from . import account_chart
2159
2160=== modified file 'account_chart_wiz_dates/wizard/account_chart.py'
2161--- account_chart_wiz_dates/wizard/account_chart.py 2014-05-09 21:51:34 +0000
2162+++ account_chart_wiz_dates/wizard/account_chart.py 2014-10-07 08:56:40 +0000
2163@@ -78,7 +78,6 @@
2164 # date_from=str({'date_from':data.get('initial_date', False)})
2165 # date_to=str({'date_to':data.get('end_date', False)})
2166 #~ result_get=result.get('context')
2167- context_str = result['context']
2168 context_dict = eval(result['context'])
2169 context_dict.update({
2170 'date_from': data.get('initial_date', False),
2171
2172=== modified file 'account_closure_preparation/__init__.py'
2173--- account_closure_preparation/__init__.py 2013-06-24 21:30:57 +0000
2174+++ account_closure_preparation/__init__.py 2014-10-07 08:56:40 +0000
2175@@ -23,4 +23,4 @@
2176 # along with this program. If not, see <http://www.gnu.org/licenses/>.
2177 ###############################################################################
2178
2179-import model
2180+from . import model
2181
2182=== modified file 'account_closure_preparation/__openerp__.py'
2183--- account_closure_preparation/__openerp__.py 2014-05-09 21:51:34 +0000
2184+++ account_closure_preparation/__openerp__.py 2014-10-07 08:56:40 +0000
2185@@ -22,13 +22,11 @@
2186 # You should have received a copy of the GNU Affero General Public License
2187 # along with this program. If not, see <http://www.gnu.org/licenses/>.
2188 ###############################################################################
2189-
2190 {
2191- "name": "Accounting Closure Preparation",
2192- "version": "1.0",
2193- "author": "Vauxoo",
2194- "website": "http://vauxoo.com",
2195- "category": 'Accounting',
2196+ "name": "Accounting Closure Preparation",
2197+ "version": "1.0",
2198+ "author": "Vauxoo",
2199+ "category": "Accounting",
2200 "description": """
2201 Accounting Closure Preparation.
2202 ==============================
2203@@ -36,17 +34,22 @@
2204 Let accounting people do a revision of the Chart of account, in order to avoid
2205 undesirable outcomes when closing a fiscalyear, i.e., transferring balance from
2206 a fiscalyear to be closed to another to be open.
2207-""",
2208- "depends": ['account'],
2209+""",
2210+ "website": "http://vauxoo.com",
2211+ "license": "",
2212+ "depends": [
2213+ "account"
2214+ ],
2215+ "demo": [],
2216 "data": [
2217- 'view/views.xml',
2218- 'view/menues_and_actions.xml',
2219- ],
2220- "js": [],
2221- "qweb": [],
2222- "css": [],
2223- "demo": [],
2224- "test": [],
2225- "installable": True,
2226- "active": False,
2227-}
2228+ "view/views.xml",
2229+ "view/menues_and_actions.xml"
2230+ ],
2231+ "test": [],
2232+ "js": [],
2233+ "css": [],
2234+ "qweb": [],
2235+ "installable": True,
2236+ "auto_install": False,
2237+ "active": False
2238+}
2239\ No newline at end of file
2240
2241=== modified file 'account_closure_preparation/model/__init__.py'
2242--- account_closure_preparation/model/__init__.py 2013-06-24 21:30:57 +0000
2243+++ account_closure_preparation/model/__init__.py 2014-10-07 08:56:40 +0000
2244@@ -23,4 +23,4 @@
2245 # along with this program. If not, see <http://www.gnu.org/licenses/>.
2246 ###############################################################################
2247
2248-import account_closure_preparation
2249+from . import account_closure_preparation
2250
2251=== modified file 'account_closure_preparation/model/account_closure_preparation.py'
2252--- account_closure_preparation/model/account_closure_preparation.py 2013-09-30 18:36:12 +0000
2253+++ account_closure_preparation/model/account_closure_preparation.py 2014-10-07 08:56:40 +0000
2254@@ -25,6 +25,7 @@
2255
2256 from openerp.osv import osv, fields
2257
2258+
2259 class account_closure_preparation(osv.TransientModel):
2260
2261 '''Prepare a Chart of Account to be used properly when closing a
2262@@ -33,91 +34,91 @@
2263 _name = 'account.closure.preparation'
2264
2265 _columns = {
2266- 'company_id':fields.many2one('res.company', 'Company', required=False,
2267+ 'company_id': fields.many2one('res.company', 'Company', required=False,
2268 help=('Company to which the chart of account is going to be'
2269 ' prepared')),
2270- 'root_id':fields.many2one('account.account', 'Root Account',
2271+ 'root_id': fields.many2one('account.account', 'Root Account',
2272 domain="[('company_id','=',company_id),('type','=','view'),('parent_id','=',None)]",
2273 required=False, help=('Root Account, the account that plays as a'
2274 'Chart of Accounts')),
2275- 'view_ut_id':fields.many2one('account.account.type', 'Closure Type',
2276+ 'view_ut_id': fields.many2one('account.account.type', 'Closure Type',
2277 required=False, domain="[('close_method','=','none')]",
2278 help=('Select the Account Type that will be used when fixing your'
2279- ' chart of account')),
2280- 'account_ids':fields.many2many('account.account', 'acp_all_acc_rel',
2281+ ' chart of account')),
2282+ 'account_ids': fields.many2many('account.account', 'acp_all_acc_rel',
2283 'account_id', 'acp_id', 'Balance Sheet Accounts',
2284 domain="[('parent_id','=',root_id)]"),
2285- 'bs_ids':fields.many2many('account.account', 'acp_bs_acc_rel',
2286+ 'bs_ids': fields.many2many('account.account', 'acp_bs_acc_rel',
2287 'account_id', 'acp_id', 'Balance Sheet Accounts',
2288 domain="[('parent_id','=',root_id)]", help=('Balance Sheet '
2289 'Accounts, Just Select the most top level in the chart of '
2290 'account related to the Balance Sheet')),
2291- 'bs_ut_id':fields.many2one('account.account.type', 'BS Closure Type',
2292+ 'bs_ut_id': fields.many2one('account.account.type', 'BS Closure Type',
2293 required=False, domain="[('close_method','=','balance')]",
2294 help=('Select the Account Type that will be used when fixing your '
2295- 'chart of account')),
2296- 'is_ids':fields.many2many('account.account', 'acp_is_acc_rel',
2297+ 'chart of account')),
2298+ 'is_ids': fields.many2many('account.account', 'acp_is_acc_rel',
2299 'account_id', 'acp_id', 'Income Statement Accounts',
2300 domain="[('parent_id','=',root_id),('id','not in',bs_ids[0][2])]",
2301 help=('Balance Sheet Accounts, Just Select the most top level in '
2302 'the chart of account related to the Balance Sheet')),
2303- 'is_ut_id':fields.many2one('account.account.type', 'IS Closure Type',
2304+ 'is_ut_id': fields.many2one('account.account.type', 'IS Closure Type',
2305 required=False, domain="[('close_method','=','none')]",
2306 help=('Select the Account Type that will be used when fixing your '
2307- 'chart of account')),
2308- 'bk_ids':fields.many2many('account.account', 'acp_bk_acc_rel',
2309+ 'chart of account')),
2310+ 'bk_ids': fields.many2many('account.account', 'acp_bk_acc_rel',
2311 'account_id', 'acp_id', 'Bank & Cash Accounts',
2312 domain=("[('type','=','view'),"
2313 "('parent_id','child_of',bs_ids[0][2])]"),
2314- help=('Select the most top '
2315+ help=('Select the most top '
2316 'level in the chart of account related to your Bank Accounts')),
2317- 'bk_ut_id':fields.many2one('account.account.type', 'Bank Closure Type',
2318+ 'bk_ut_id': fields.many2one('account.account.type', 'Bank Closure Type',
2319 required=False, domain="[('close_method','=','balance')]",
2320 help=('Select the Account Type that will be used when fixing your '
2321- 'chart of account')),
2322- 'rec_ids':fields.many2many('account.account', 'acp_rec_acc_rel',
2323+ 'chart of account')),
2324+ 'rec_ids': fields.many2many('account.account', 'acp_rec_acc_rel',
2325 'account_id', 'acp_id', 'Receivable Accounts',
2326 domain=("[('type','=','view'),"
2327 "('parent_id','child_of',bs_ids[0][2])]"),
2328- help=('Select the most top '
2329+ help=('Select the most top '
2330 'level in the chart of account related to your Receivable Accounts')),
2331- 'rec_ut_id':fields.many2one('account.account.type', 'Receivable Closure Type',
2332+ 'rec_ut_id': fields.many2one('account.account.type', 'Receivable Closure Type',
2333 required=False, domain="[('close_method','=','unreconciled')]",
2334 help=('Select the Account Type that will be used when fixing your '
2335- 'chart of account')),
2336- 'pay_ids':fields.many2many('account.account', 'acp_pay_acc_rel',
2337+ 'chart of account')),
2338+ 'pay_ids': fields.many2many('account.account', 'acp_pay_acc_rel',
2339 'account_id', 'acp_id', 'Payable Accounts',
2340 domain=("[('type','=','view'),"
2341 "('parent_id','child_of',bs_ids[0][2])]"),
2342- help=('Select the most top '
2343+ help=('Select the most top '
2344 'level in the chart of account related to your Payable Accounts')),
2345- 'pay_ut_id':fields.many2one('account.account.type', 'Payable Closure Type',
2346+ 'pay_ut_id': fields.many2one('account.account.type', 'Payable Closure Type',
2347 required=False, domain="[('close_method','=','unreconciled')]",
2348 help=('Select the Account Type that will be used when fixing your '
2349- 'chart of account')),
2350- 'recon_ids':fields.many2many('account.account', 'acp_recon_acc_rel',
2351+ 'chart of account')),
2352+ 'recon_ids': fields.many2many('account.account', 'acp_recon_acc_rel',
2353 'account_id', 'acp_id', 'Reconcilable Accounts',
2354 domain=("[('type','=','other'),"
2355 "('parent_id','child_of',bs_ids[0][2])]"),
2356- help=('Select the most top '
2357+ help=('Select the most top '
2358 'you will regard as Reconcilable. Remember this Accounts are'
2359 ' different than your Receivable & Payable Accounts')),
2360- 'recon_ut_id':fields.many2one('account.account.type', 'Reconcilable Closure Type',
2361+ 'recon_ut_id': fields.many2one('account.account.type', 'Reconcilable Closure Type',
2362 required=False, domain="[('close_method','=','unreconciled')]",
2363 help=('Select the Account Type that will be used when fixing your '
2364- 'chart of account')),
2365- 'det_ids':fields.many2many('account.account', 'acp_det_acc_rel',
2366+ 'chart of account')),
2367+ 'det_ids': fields.many2many('account.account', 'acp_det_acc_rel',
2368 'account_id', 'acp_id', 'Detail Accounts',
2369 domain=("[('type','=','other'),"
2370 "('parent_id','child_of',bs_ids[0][2])]"),
2371- help=('Select the most top '
2372+ help=('Select the most top '
2373 'you will regard as Detail. This kind of Account is weirdly '
2374 'used. Although is could be used in Depreciation Accounts')),
2375- 'det_ut_id':fields.many2one('account.account.type', 'Detail Closure Type',
2376+ 'det_ut_id': fields.many2one('account.account.type', 'Detail Closure Type',
2377 required=False, domain="[('close_method','=','detail')]",
2378 help=('Select the Account Type that will be used when fixing your '
2379- 'chart of account')),
2380- 'cons_id':fields.many2one('account.account', 'Consolidation Account',
2381+ 'chart of account')),
2382+ 'cons_id': fields.many2one('account.account', 'Consolidation Account',
2383 domain=("["
2384 "('company_id','=',company_id),"
2385 "('type','=','consolidation'),"
2386@@ -125,342 +126,341 @@
2387 required=False, help=('Consolidation Account, the account that '
2388 'plays as a the Consolidation of the Income Statement in Your '
2389 'Chart of Accounts')),
2390- 'cons_ids':fields.many2many('account.account', 'acp_cons_acc_rel',
2391+ 'cons_ids': fields.many2many('account.account', 'acp_cons_acc_rel',
2392 'account_id', 'acp_id', 'Detail Accounts', readonly=False,
2393 help=('Accounts to be used in the Consolidation Account')),
2394- 'state':fields.selection([
2395- ('stage1','Prep Chart'),
2396- ('stage2','Fix Chart'),
2397- ('stage3','Prep BS'),
2398- ('stage4','Fix BS'),
2399- ('stage5','Prep IS'),
2400- ('stage6','Fix IS'),
2401- ('stage7','Prep Bank Acc'),
2402- ('stage8','Fix Bank Acc'),
2403- ('stage9','Fix not Bank Acc'),
2404- ('stage10','Prep Rec Acc'),
2405- ('stage11','Fix Rec Acc'),
2406- ('stage12','Fix not Rec Acc'),
2407- ('stage13','Prep Pay Acc'),
2408- ('stage14','Fix Pay Acc'),
2409- ('stage15','Fix not Pay Acc'),
2410- ('stage16','Prep Reconcile Acc'),
2411- ('stage17','Fix Reconcile Acc'),
2412- ('stage18','Prep Detail Acc'),
2413- ('stage19','Fix Detail Acc'),
2414- ('stage20','Prep & Fix Consolation Acc'),
2415- ('stage21','LAST STEP'),
2416- ], help='State'),
2417- 'skip':fields.boolean('Skip This Step', help=('Some time it is Ok to '
2418+ 'state': fields.selection([
2419+ ('stage1', 'Prep Chart'),
2420+ ('stage2', 'Fix Chart'),
2421+ ('stage3', 'Prep BS'),
2422+ ('stage4', 'Fix BS'),
2423+ ('stage5', 'Prep IS'),
2424+ ('stage6', 'Fix IS'),
2425+ ('stage7', 'Prep Bank Acc'),
2426+ ('stage8', 'Fix Bank Acc'),
2427+ ('stage9', 'Fix not Bank Acc'),
2428+ ('stage10', 'Prep Rec Acc'),
2429+ ('stage11', 'Fix Rec Acc'),
2430+ ('stage12', 'Fix not Rec Acc'),
2431+ ('stage13', 'Prep Pay Acc'),
2432+ ('stage14', 'Fix Pay Acc'),
2433+ ('stage15', 'Fix not Pay Acc'),
2434+ ('stage16', 'Prep Reconcile Acc'),
2435+ ('stage17', 'Fix Reconcile Acc'),
2436+ ('stage18', 'Prep Detail Acc'),
2437+ ('stage19', 'Fix Detail Acc'),
2438+ ('stage20', 'Prep & Fix Consolation Acc'),
2439+ ('stage21', 'LAST STEP'),
2440+ ], help='State'),
2441+ 'skip': fields.boolean('Skip This Step', help=('Some time it is Ok to '
2442 'skip a step because that configuration is not used in your company'
2443- )),
2444- }
2445+ )),
2446+ }
2447
2448 _defaults = {
2449 'state': 'stage1',
2450- 'company_id': lambda s, c, u, ctx: \
2451- s.pool.get('res.users').browse(c, u, u, context=ctx).company_id.id,
2452- }
2453+ 'company_id': lambda s, c, u, ctx:
2454+ s.pool.get('res.users').browse(c, u, u, context=ctx).company_id.id,
2455+ }
2456
2457 def to_start(self, cr, uid, ids, context=None):
2458 context = context or {}
2459- wzd_brw = self.browse(cr,uid,ids[0],context=context)
2460+ wzd_brw = self.browse(cr, uid, ids[0], context=context)
2461 context['company_id'] = wzd_brw.company_id.id
2462- wzd_brw.write({'state':'stage1'})
2463+ wzd_brw.write({'state': 'stage1'})
2464 return {}
2465
2466 def backpedal(self, cr, uid, ids, context=None):
2467 context = context or {}
2468- wzd_brw = self.browse(cr,uid,ids[0],context=context)
2469+ wzd_brw = self.browse(cr, uid, ids[0], context=context)
2470 context['company_id'] = wzd_brw.company_id.id
2471- wzd_brw.write({'account_ids':[(6,0,[])]})
2472+ wzd_brw.write({'account_ids': [(6, 0, [])]})
2473 if wzd_brw.state == 'stage2':
2474- wzd_brw.write({'state':'stage1'})
2475+ wzd_brw.write({'state': 'stage1'})
2476 elif wzd_brw.state == 'stage3':
2477- wzd_brw.write({'state':'stage2'})
2478+ wzd_brw.write({'state': 'stage2'})
2479 elif wzd_brw.state == 'stage4':
2480- wzd_brw.write({'state':'stage3'})
2481+ wzd_brw.write({'state': 'stage3'})
2482 elif wzd_brw.state == 'stage5':
2483- wzd_brw.write({'state':'stage4'})
2484+ wzd_brw.write({'state': 'stage4'})
2485 elif wzd_brw.state == 'stage6':
2486- wzd_brw.write({'state':'stage5'})
2487+ wzd_brw.write({'state': 'stage5'})
2488 elif wzd_brw.state == 'stage7':
2489- wzd_brw.write({'state':'stage6'})
2490+ wzd_brw.write({'state': 'stage6'})
2491 elif wzd_brw.state == 'stage8':
2492- wzd_brw.write({'state':'stage7'})
2493+ wzd_brw.write({'state': 'stage7'})
2494 elif wzd_brw.state == 'stage9':
2495- wzd_brw.write({'state':'stage8'})
2496+ wzd_brw.write({'state': 'stage8'})
2497 elif wzd_brw.state == 'stage10':
2498- wzd_brw.write({'state':'stage9'})
2499+ wzd_brw.write({'state': 'stage9'})
2500 elif wzd_brw.state == 'stage11':
2501- wzd_brw.write({'state':'stage10'})
2502+ wzd_brw.write({'state': 'stage10'})
2503 elif wzd_brw.state == 'stage12':
2504- wzd_brw.write({'state':'stage11'})
2505+ wzd_brw.write({'state': 'stage11'})
2506 elif wzd_brw.state == 'stage13':
2507- wzd_brw.write({'state':'stage12'})
2508+ wzd_brw.write({'state': 'stage12'})
2509 elif wzd_brw.state == 'stage14':
2510- wzd_brw.write({'state':'stage13'})
2511+ wzd_brw.write({'state': 'stage13'})
2512 elif wzd_brw.state == 'stage15':
2513- wzd_brw.write({'state':'stage14'})
2514+ wzd_brw.write({'state': 'stage14'})
2515 elif wzd_brw.state == 'stage16':
2516- wzd_brw.write({'state':'stage15'})
2517+ wzd_brw.write({'state': 'stage15'})
2518 elif wzd_brw.state == 'stage17':
2519- wzd_brw.write({'state':'stage16'})
2520+ wzd_brw.write({'state': 'stage16'})
2521 elif wzd_brw.state == 'stage18':
2522- wzd_brw.write({'state':'stage17'})
2523+ wzd_brw.write({'state': 'stage17'})
2524 elif wzd_brw.state == 'stage19':
2525- wzd_brw.write({'state':'stage18'})
2526+ wzd_brw.write({'state': 'stage18'})
2527 elif wzd_brw.state == 'stage20':
2528- wzd_brw.write({'state':'stage19'})
2529+ wzd_brw.write({'state': 'stage19'})
2530 elif wzd_brw.state == 'stage21':
2531- wzd_brw.write({'state':'stage20'})
2532+ wzd_brw.write({'state': 'stage20'})
2533 return {}
2534
2535 def prepare_chart(self, cr, uid, ids, context=None):
2536 context = context or {}
2537- wzd_brw = self.browse(cr,uid,ids[0],context=context)
2538+ wzd_brw = self.browse(cr, uid, ids[0], context=context)
2539 context['company_id'] = wzd_brw.company_id.id
2540 acc_obj = self.pool.get('account.account')
2541- #TODO: CHECK THAT CLOSED ACCOUNTS REMAIN CLOSED
2542+ # TODO: CHECK THAT CLOSED ACCOUNTS REMAIN CLOSED
2543 if wzd_brw.state == 'stage1':
2544- view_ids = acc_obj.search(cr, uid,[
2545- ('parent_id','child_of',wzd_brw.root_id.id),
2546- ('type','=','view'),
2547- ('user_type.close_method','!=','none'),
2548- ('active','=',True),
2549- ],context=context)
2550- wzd_brw.write({'state':'stage2','account_ids':[(6,0,view_ids)]})
2551+ view_ids = acc_obj.search(cr, uid, [
2552+ ('parent_id', 'child_of', wzd_brw.root_id.id),
2553+ ('type', '=', 'view'),
2554+ ('user_type.close_method', '!=', 'none'),
2555+ ('active', '=', True),
2556+ ], context=context)
2557+ wzd_brw.write({'state': 'stage2', 'account_ids': [(6, 0, view_ids)]})
2558 elif wzd_brw.state == 'stage2':
2559 res = [i.id for i in wzd_brw.account_ids]
2560- acc_obj.write(cr,uid,res,
2561- {'user_type':wzd_brw.view_ut_id.id},context=context)
2562- wzd_brw.write({'state':'stage3','account_ids':[(6,0,[])]})
2563+ acc_obj.write(cr, uid, res,
2564+ {'user_type': wzd_brw.view_ut_id.id}, context=context)
2565+ wzd_brw.write({'state': 'stage3', 'account_ids': [(6, 0, [])]})
2566 elif wzd_brw.state == 'stage3':
2567- view_ids = acc_obj.search(cr, uid,[
2568- ('parent_id','child_of',
2569- [i.id for i in wzd_brw.bs_ids]),
2570- ('type','!=','view'),
2571- ('user_type.close_method','=','none'),
2572- ('active','=',True),
2573- ],context=context)
2574- wzd_brw.write({'state':'stage4','account_ids':[(6,0,view_ids)]})
2575+ view_ids = acc_obj.search(cr, uid, [
2576+ ('parent_id', 'child_of',
2577+ [i.id for i in wzd_brw.bs_ids]),
2578+ ('type', '!=', 'view'),
2579+ ('user_type.close_method', '=', 'none'),
2580+ ('active', '=', True),
2581+ ], context=context)
2582+ wzd_brw.write({'state': 'stage4', 'account_ids': [(6, 0, view_ids)]})
2583 elif wzd_brw.state == 'stage4':
2584 res = [i.id for i in wzd_brw.account_ids]
2585- acc_obj.write(cr,uid,res,
2586- {'user_type':wzd_brw.bs_ut_id.id},context=context)
2587- is_ids = acc_obj.search(cr,uid,[
2588- ('parent_id','=',wzd_brw.root_id.id),
2589- ('id','not in',[i.id for i in wzd_brw.bs_ids]),
2590- ('active','=',True),
2591- ],context=context)
2592+ acc_obj.write(cr, uid, res,
2593+ {'user_type': wzd_brw.bs_ut_id.id}, context=context)
2594+ is_ids = acc_obj.search(cr, uid, [
2595+ ('parent_id', '=', wzd_brw.root_id.id),
2596+ ('id', 'not in', [i.id for i in wzd_brw.bs_ids]),
2597+ ('active', '=', True),
2598+ ], context=context)
2599 wzd_brw.write({
2600- 'state':'stage5',
2601- 'account_ids':[(6,0,[])],
2602- 'is_ids':[(6,0,is_ids)],
2603- })
2604+ 'state': 'stage5',
2605+ 'account_ids': [(6, 0, [])],
2606+ 'is_ids': [(6, 0, is_ids)],
2607+ })
2608 elif wzd_brw.state == 'stage5':
2609- view_ids = acc_obj.search(cr, uid,[
2610- ('parent_id','child_of',
2611- [i.id for i in wzd_brw.is_ids]),
2612- ('type','!=','view'),
2613- '|',('type','not in',('other','closed')),
2614- ('user_type.close_method','!=','none'),
2615- ('active','=',True),
2616- ],context=context)
2617- wzd_brw.write({'state':'stage6','account_ids':[(6,0,view_ids)]})
2618+ view_ids = acc_obj.search(cr, uid, [
2619+ ('parent_id', 'child_of',
2620+ [i.id for i in wzd_brw.is_ids]),
2621+ ('type', '!=', 'view'),
2622+ '|', ('type', 'not in', ('other', 'closed')),
2623+ ('user_type.close_method', '!=', 'none'),
2624+ ('active', '=', True),
2625+ ], context=context)
2626+ wzd_brw.write({'state': 'stage6', 'account_ids': [(6, 0, view_ids)]})
2627 elif wzd_brw.state == 'stage6':
2628 res = [i.id for i in wzd_brw.account_ids]
2629- acc_obj.write(cr,uid,res,
2630- {'user_type':wzd_brw.is_ut_id.id,
2631- 'type':'other'},context=context)
2632- wzd_brw.write({'state':'stage7','account_ids':[(6,0,[])]})
2633+ acc_obj.write(cr, uid, res,
2634+ {'user_type': wzd_brw.is_ut_id.id,
2635+ 'type': 'other'}, context=context)
2636+ wzd_brw.write({'state': 'stage7', 'account_ids': [(6, 0, [])]})
2637 elif wzd_brw.state == 'stage7':
2638- view_ids = acc_obj.search(cr, uid,[
2639- ('parent_id','child_of',
2640- [i.id for i in wzd_brw.bk_ids]),
2641- ('type','!=','view'),
2642- '|',('type','!=','liquidity'),
2643- ('user_type.close_method','!=','balance'),
2644- ('active','=',True),
2645- ],context=context)
2646- wzd_brw.write({'state':'stage8','account_ids':[(6,0,view_ids)]})
2647+ view_ids = acc_obj.search(cr, uid, [
2648+ ('parent_id', 'child_of',
2649+ [i.id for i in wzd_brw.bk_ids]),
2650+ ('type', '!=', 'view'),
2651+ '|', ('type', '!=', 'liquidity'),
2652+ ('user_type.close_method', '!=', 'balance'),
2653+ ('active', '=', True),
2654+ ], context=context)
2655+ wzd_brw.write({'state': 'stage8', 'account_ids': [(6, 0, view_ids)]})
2656 elif wzd_brw.state == 'stage8':
2657 res = [i.id for i in wzd_brw.account_ids]
2658- acc_obj.write(cr,uid,res,{
2659- 'user_type' : wzd_brw.bk_ut_id.id,
2660- 'type' : 'liquidity',
2661- },context=context)
2662- bank_ids1x = acc_obj.search(cr, uid,[
2663- ('parent_id','child_of',
2664+ acc_obj.write(cr, uid, res, {
2665+ 'user_type': wzd_brw.bk_ut_id.id,
2666+ 'type': 'liquidity',
2667+ }, context=context)
2668+ bank_ids1x = acc_obj.search(cr, uid, [
2669+ ('parent_id', 'child_of',
2670 [i.id for i in wzd_brw.bk_ids]),
2671- ('type','!=','view'),
2672- ('active','=',True),
2673- ],context=context)
2674- bank_ids2 = acc_obj.search(cr, uid,[
2675- ('parent_id','child_of',wzd_brw.root_id.id),
2676- ('id','not in',bank_ids1x),
2677- ('type','!=','view'),
2678- ('type','=','liquidity'),
2679- ('active','=',True),
2680- ],context=context)
2681- wzd_brw.write({'state':'stage9','account_ids':[(6,0,bank_ids2)]})
2682+ ('type', '!=', 'view'),
2683+ ('active', '=', True),
2684+ ], context=context)
2685+ bank_ids2 = acc_obj.search(cr, uid, [
2686+ ('parent_id', 'child_of', wzd_brw.root_id.id),
2687+ ('id', 'not in', bank_ids1x),
2688+ ('type', '!=', 'view'),
2689+ ('type', '=', 'liquidity'),
2690+ ('active', '=', True),
2691+ ], context=context)
2692+ wzd_brw.write({'state': 'stage9', 'account_ids': [(6, 0, bank_ids2)]})
2693 elif wzd_brw.state == 'stage9':
2694 res = [i.id for i in wzd_brw.account_ids]
2695- acc_obj.write(cr,uid,res,
2696- {'type':'other'},context=context)
2697- wzd_brw.write({'state':'stage10','account_ids':[(6,0,[])]})
2698+ acc_obj.write(cr, uid, res,
2699+ {'type': 'other'}, context=context)
2700+ wzd_brw.write({'state': 'stage10', 'account_ids': [(6, 0, [])]})
2701 elif wzd_brw.state == 'stage10':
2702- view_ids = acc_obj.search(cr, uid,[
2703- ('parent_id','child_of',
2704- [i.id for i in wzd_brw.rec_ids]),
2705- ('type','!=','view'),
2706- '|',('reconcile','=',False),
2707- '|',('type','not in',('receivable','closed')),
2708- ('user_type.close_method','!=','unreconciled'),
2709- ('active','=',True),
2710- ],context=context)
2711- wzd_brw.write({'state':'stage11','account_ids':[(6,0,view_ids)]})
2712+ view_ids = acc_obj.search(cr, uid, [
2713+ ('parent_id', 'child_of',
2714+ [i.id for i in wzd_brw.rec_ids]),
2715+ ('type', '!=', 'view'),
2716+ '|', ('reconcile', '=', False),
2717+ '|', ('type', 'not in', ('receivable', 'closed')),
2718+ ('user_type.close_method', '!=', 'unreconciled'),
2719+ ('active', '=', True),
2720+ ], context=context)
2721+ wzd_brw.write({'state': 'stage11', 'account_ids': [(6, 0, view_ids)]})
2722 elif wzd_brw.state == 'stage11':
2723 res = [i.id for i in wzd_brw.account_ids]
2724- acc_obj.write(cr,uid,res,{
2725- 'user_type' : wzd_brw.rec_ut_id.id,
2726- 'type' : 'receivable',
2727- 'reconcile' : True,
2728- },context=context)
2729- rec_ids1x = acc_obj.search(cr, uid,[
2730- ('parent_id','child_of',
2731- [i.id for i in wzd_brw.rec_ids]),
2732- ('type','!=','view'),
2733- ('active','=',True),
2734- ],context=context)
2735- rec_ids2 = acc_obj.search(cr, uid,[
2736- ('parent_id','child_of',wzd_brw.root_id.id),
2737- ('id','not in',rec_ids1x),
2738- ('type','!=','view'),
2739- ('type','=','receivable'),
2740- ('active','=',True),
2741- ],context=context)
2742- wzd_brw.write({'state':'stage12','account_ids':[(6,0,rec_ids2)]})
2743+ acc_obj.write(cr, uid, res, {
2744+ 'user_type': wzd_brw.rec_ut_id.id,
2745+ 'type': 'receivable',
2746+ 'reconcile': True,
2747+ }, context=context)
2748+ rec_ids1x = acc_obj.search(cr, uid, [
2749+ ('parent_id', 'child_of',
2750+ [i.id for i in wzd_brw.rec_ids]),
2751+ ('type', '!=', 'view'),
2752+ ('active', '=', True),
2753+ ], context=context)
2754+ rec_ids2 = acc_obj.search(cr, uid, [
2755+ ('parent_id', 'child_of', wzd_brw.root_id.id),
2756+ ('id', 'not in', rec_ids1x),
2757+ ('type', '!=', 'view'),
2758+ ('type', '=', 'receivable'),
2759+ ('active', '=', True),
2760+ ], context=context)
2761+ wzd_brw.write({'state': 'stage12', 'account_ids': [(6, 0, rec_ids2)]})
2762 elif wzd_brw.state == 'stage12':
2763 res = [i.id for i in wzd_brw.account_ids]
2764- acc_obj.write(cr,uid,res,
2765- {'type':'other'},context=context)
2766- wzd_brw.write({'state':'stage13','account_ids':[(6,0,[])]})
2767+ acc_obj.write(cr, uid, res,
2768+ {'type': 'other'}, context=context)
2769+ wzd_brw.write({'state': 'stage13', 'account_ids': [(6, 0, [])]})
2770 elif wzd_brw.state == 'stage13':
2771- view_ids = acc_obj.search(cr, uid,[
2772- ('parent_id','child_of',
2773- [i.id for i in wzd_brw.pay_ids]),
2774- ('type','!=','view'),
2775- '|',('reconcile','=',False),
2776- '|',('type','not in',('payable','closed')),
2777- ('user_type.close_method','!=','unreconciled'),
2778- ('active','=',True),
2779- ],context=context)
2780- wzd_brw.write({'state':'stage14','account_ids':[(6,0,view_ids)]})
2781+ view_ids = acc_obj.search(cr, uid, [
2782+ ('parent_id', 'child_of',
2783+ [i.id for i in wzd_brw.pay_ids]),
2784+ ('type', '!=', 'view'),
2785+ '|', ('reconcile', '=', False),
2786+ '|', ('type', 'not in', ('payable', 'closed')),
2787+ ('user_type.close_method', '!=', 'unreconciled'),
2788+ ('active', '=', True),
2789+ ], context=context)
2790+ wzd_brw.write({'state': 'stage14', 'account_ids': [(6, 0, view_ids)]})
2791 elif wzd_brw.state == 'stage14':
2792 res = [i.id for i in wzd_brw.account_ids]
2793- acc_obj.write(cr,uid,res,{
2794- 'user_type' : wzd_brw.pay_ut_id.id,
2795- 'type' : 'payable',
2796- 'reconcile' : True,
2797- },context=context)
2798- pay_ids1x = acc_obj.search(cr, uid,[
2799- ('parent_id','child_of',
2800- [i.id for i in wzd_brw.pay_ids]),
2801- ('type','!=','view'),
2802- ('active','=',True),
2803- ],context=context)
2804- pay_ids2 = acc_obj.search(cr, uid,[
2805- ('parent_id','child_of',wzd_brw.root_id.id),
2806- ('id','not in',pay_ids1x),
2807- ('type','!=','view'),
2808- ('type','=','payable'),
2809- ('active','=',True),
2810- ],context=context)
2811- wzd_brw.write({'state':'stage15','account_ids':[(6,0,pay_ids2)]})
2812+ acc_obj.write(cr, uid, res, {
2813+ 'user_type': wzd_brw.pay_ut_id.id,
2814+ 'type': 'payable',
2815+ 'reconcile': True,
2816+ }, context=context)
2817+ pay_ids1x = acc_obj.search(cr, uid, [
2818+ ('parent_id', 'child_of',
2819+ [i.id for i in wzd_brw.pay_ids]),
2820+ ('type', '!=', 'view'),
2821+ ('active', '=', True),
2822+ ], context=context)
2823+ pay_ids2 = acc_obj.search(cr, uid, [
2824+ ('parent_id', 'child_of', wzd_brw.root_id.id),
2825+ ('id', 'not in', pay_ids1x),
2826+ ('type', '!=', 'view'),
2827+ ('type', '=', 'payable'),
2828+ ('active', '=', True),
2829+ ], context=context)
2830+ wzd_brw.write({'state': 'stage15', 'account_ids': [(6, 0, pay_ids2)]})
2831 elif wzd_brw.state == 'stage15':
2832 res = [i.id for i in wzd_brw.account_ids]
2833- acc_obj.write(cr,uid,res,
2834- {'type':'other'},context=context)
2835- wzd_brw.write({'state':'stage16','account_ids':[(6,0,[])]})
2836+ acc_obj.write(cr, uid, res,
2837+ {'type': 'other'}, context=context)
2838+ wzd_brw.write({'state': 'stage16', 'account_ids': [(6, 0, [])]})
2839 elif wzd_brw.state == 'stage16' and wzd_brw.skip:
2840- wzd_brw.write({'state':'stage18','skip':False})
2841+ wzd_brw.write({'state': 'stage18', 'skip': False})
2842 elif wzd_brw.state == 'stage16' and not wzd_brw.skip:
2843- acc_obj.write(cr,uid,[i.id for i in wzd_brw.recon_ids],{
2844- 'user_type' : wzd_brw.recon_ut_id.id,
2845- 'type' : 'other',
2846- 'reconcile' : True,
2847- },context=context)
2848- view_ids = acc_obj.search(cr, uid,[
2849- ('parent_id','child_of',
2850- [i.id for i in wzd_brw.bs_ids]),
2851- '!',('parent_id','child_of',
2852- [i.id for i in wzd_brw.bk_ids]),
2853- '!',('parent_id','child_of',
2854- [i.id for i in wzd_brw.rec_ids]),
2855- '!',('parent_id','child_of',
2856- [i.id for i in wzd_brw.pay_ids]),
2857- '!',('id','in',
2858- [i.id for i in wzd_brw.recon_ids]),
2859- ('type','!=','view'),
2860- ('reconcile','=',True),
2861- ('user_type.close_method','=','unreconciled'),
2862- ('active','=',True),
2863- ],context=context)
2864- wzd_brw.write({'state':'stage17','account_ids':[(6,0,view_ids)]})
2865+ acc_obj.write(cr, uid, [i.id for i in wzd_brw.recon_ids], {
2866+ 'user_type': wzd_brw.recon_ut_id.id,
2867+ 'type': 'other',
2868+ 'reconcile': True,
2869+ }, context=context)
2870+ view_ids = acc_obj.search(cr, uid, [
2871+ ('parent_id', 'child_of',
2872+ [i.id for i in wzd_brw.bs_ids]),
2873+ '!', ('parent_id', 'child_of',
2874+ [i.id for i in wzd_brw.bk_ids]),
2875+ '!', ('parent_id', 'child_of',
2876+ [i.id for i in wzd_brw.rec_ids]),
2877+ '!', ('parent_id', 'child_of',
2878+ [i.id for i in wzd_brw.pay_ids]),
2879+ '!', ('id', 'in',
2880+ [i.id for i in wzd_brw.recon_ids]),
2881+ ('type', '!=', 'view'),
2882+ ('reconcile', '=', True),
2883+ ('user_type.close_method', '=', 'unreconciled'),
2884+ ('active', '=', True),
2885+ ], context=context)
2886+ wzd_brw.write({'state': 'stage17', 'account_ids': [(6, 0, view_ids)]})
2887 elif wzd_brw.state == 'stage17':
2888 res = [i.id for i in wzd_brw.account_ids]
2889- acc_obj.write(cr,uid,res,{
2890- 'user_type' : wzd_brw.bs_ut_id.id,
2891- 'type' : 'other',
2892- 'reconcile' : False,
2893- },context=context)
2894- wzd_brw.write({'state':'stage18','account_ids':[(6,0,[])]})
2895+ acc_obj.write(cr, uid, res, {
2896+ 'user_type': wzd_brw.bs_ut_id.id,
2897+ 'type': 'other',
2898+ 'reconcile': False,
2899+ }, context=context)
2900+ wzd_brw.write({'state': 'stage18', 'account_ids': [(6, 0, [])]})
2901 elif wzd_brw.state == 'stage18' and wzd_brw.skip:
2902- wzd_brw.write({'state':'stage20','skip':False})
2903+ wzd_brw.write({'state': 'stage20', 'skip': False})
2904 elif wzd_brw.state == 'stage18' and not wzd_brw.skip:
2905- acc_obj.write(cr,uid,[i.id for i in wzd_brw.det_ids],{
2906- 'user_type' : wzd_brw.det_ut_id.id,
2907- 'type' : 'other',
2908- },context=context)
2909- view_ids = acc_obj.search(cr, uid,[
2910- ('parent_id','child_of',
2911- [i.id for i in wzd_brw.bs_ids]),
2912- '!',('parent_id','child_of',
2913- [i.id for i in wzd_brw.bk_ids]),
2914- '!',('parent_id','child_of',
2915- [i.id for i in wzd_brw.rec_ids]),
2916- '!',('parent_id','child_of',
2917- [i.id for i in wzd_brw.pay_ids]),
2918- '!',('id','in',
2919- [i.id for i in wzd_brw.recon_ids]),
2920- '!',('id','in',
2921- [i.id for i in wzd_brw.det_ids]),
2922- ('type','!=','view'),
2923- ('user_type.close_method','=','detail'),
2924- ('active','=',True),
2925- ],context=context)
2926- wzd_brw.write({'state':'stage19','account_ids':[(6,0,view_ids)]})
2927+ acc_obj.write(cr, uid, [i.id for i in wzd_brw.det_ids], {
2928+ 'user_type': wzd_brw.det_ut_id.id,
2929+ 'type': 'other',
2930+ }, context=context)
2931+ view_ids = acc_obj.search(cr, uid, [
2932+ ('parent_id', 'child_of',
2933+ [i.id for i in wzd_brw.bs_ids]),
2934+ '!', ('parent_id', 'child_of',
2935+ [i.id for i in wzd_brw.bk_ids]),
2936+ '!', ('parent_id', 'child_of',
2937+ [i.id for i in wzd_brw.rec_ids]),
2938+ '!', ('parent_id', 'child_of',
2939+ [i.id for i in wzd_brw.pay_ids]),
2940+ '!', ('id', 'in',
2941+ [i.id for i in wzd_brw.recon_ids]),
2942+ '!', ('id', 'in',
2943+ [i.id for i in wzd_brw.det_ids]),
2944+ ('type', '!=', 'view'),
2945+ ('user_type.close_method', '=', 'detail'),
2946+ ('active', '=', True),
2947+ ], context=context)
2948+ wzd_brw.write({'state': 'stage19', 'account_ids': [(6, 0, view_ids)]})
2949 elif wzd_brw.state == 'stage19':
2950 res = [i.id for i in wzd_brw.account_ids]
2951- acc_obj.write(cr,uid,res,{
2952- 'user_type' : wzd_brw.bs_ut_id.id,
2953- 'type' : 'other',
2954- 'reconcile' : False,
2955- },context=context)
2956+ acc_obj.write(cr, uid, res, {
2957+ 'user_type': wzd_brw.bs_ut_id.id,
2958+ 'type': 'other',
2959+ 'reconcile': False,
2960+ }, context=context)
2961 wzd_brw.write({
2962- 'state':'stage20',
2963- 'account_ids':[(6,0,[])],
2964- 'cons_ids':[(6,0,[i.id for i in wzd_brw.is_ids])]})
2965+ 'state': 'stage20',
2966+ 'account_ids': [(6, 0, [])],
2967+ 'cons_ids': [(6, 0, [i.id for i in wzd_brw.is_ids])]})
2968 elif wzd_brw.state == 'stage20' and wzd_brw.skip:
2969- wzd_brw.write({'state':'stage21','skip':False})
2970+ wzd_brw.write({'state': 'stage21', 'skip': False})
2971 elif wzd_brw.state == 'stage20' and not wzd_brw.skip:
2972- acc_obj.write(cr,uid,wzd_brw.cons_id.id,{
2973- 'child_consol_ids':[(6,0,[i.id for i in wzd_brw.cons_ids])]
2974- },context=context)
2975+ acc_obj.write(cr, uid, wzd_brw.cons_id.id, {
2976+ 'child_consol_ids': [(6, 0, [i.id for i in wzd_brw.cons_ids])]
2977+ }, context=context)
2978 wzd_brw.write({
2979- 'state':'stage21',
2980- 'account_ids':[(6,0,[])]})
2981+ 'state': 'stage21',
2982+ 'account_ids': [(6, 0, [])]})
2983
2984 return {}
2985-
2986
2987=== modified file 'account_entries_report_group_by_ref/__openerp__.py'
2988--- account_entries_report_group_by_ref/__openerp__.py 2014-05-09 21:51:34 +0000
2989+++ account_entries_report_group_by_ref/__openerp__.py 2014-10-07 08:56:40 +0000
2990@@ -20,22 +20,28 @@
2991 # You should have received a copy of the GNU Affero General Public License
2992 # along with this program. If not, see <http://www.gnu.org/licenses/>.
2993 ################################################################################
2994+#"license" : "AGPL-3",
2995 {
2996- "name" : "Inherits the xml account_entries_report_view a button grouping by origin",
2997- "version" : "1.0",
2998- "depends" : ['account'],
2999- "author" : "Vauxoo",
3000- #"license" : "AGPL-3",
3001- "description" : """This module inherits the xml account_entries_report_view a button grouping by origin
3002- """,
3003- "website" : "http://vauxoo.com",
3004- "category" : "Generic Modules",
3005- "init_xml" : [],
3006- "demo_xml" : [],
3007- "test": [],
3008- "update_xml" : ['account_entries_report_view.xml',
3009- ],
3010- "active": False,
3011- "installable": True,
3012-}
3013-
3014+ "name": "Inherits the xml account_entries_report_view a button grouping by origin",
3015+ "version": "1.0",
3016+ "author": "Vauxoo",
3017+ "category": "Generic Modules",
3018+ "description": """This module inherits the xml account_entries_report_view a button grouping by origin
3019+ """,
3020+ "website": "http://vauxoo.com",
3021+ "license": "",
3022+ "depends": [
3023+ "account"
3024+ ],
3025+ "demo": [],
3026+ "data": [
3027+ "account_entries_report_view.xml"
3028+ ],
3029+ "test": [],
3030+ "js": [],
3031+ "css": [],
3032+ "qweb": [],
3033+ "installable": True,
3034+ "auto_install": False,
3035+ "active": False
3036+}
3037\ No newline at end of file
3038
3039=== modified file 'account_invoice_line_currency/__init__.py'
3040--- account_invoice_line_currency/__init__.py 2014-05-09 21:51:34 +0000
3041+++ account_invoice_line_currency/__init__.py 2014-10-07 08:56:40 +0000
3042@@ -5,7 +5,7 @@
3043 # Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
3044 # All Rights Reserved
3045 ###############Credits######################################################
3046-# Coded by: Vauxoo C.A.
3047+# Coded by: Vauxoo C.A.
3048 # Planified by: Humberto Arocha / Nhomar Hernandez
3049 # Audited by: Vauxoo C.A.
3050 #############################################################################
3051@@ -23,4 +23,4 @@
3052 # along with this program. If not, see <http://www.gnu.org/licenses/>.
3053 ################################################################################
3054
3055-import model
3056+from . import model
3057
3058=== modified file 'account_invoice_line_currency/__openerp__.py'
3059--- account_invoice_line_currency/__openerp__.py 2014-05-09 21:51:34 +0000
3060+++ account_invoice_line_currency/__openerp__.py 2014-10-07 08:56:40 +0000
3061@@ -5,7 +5,7 @@
3062 # Copyright (C) Vauxoo (<http://vauxoo.com>).
3063 # All Rights Reserved
3064 ###############Credits######################################################
3065-# Coded by: Vauxoo C.A.
3066+# Coded by: Vauxoo C.A.
3067 # Planified by: Humberto Arocha / Nhomar Hernandez
3068 # Audited by: Vauxoo C.A.
3069 #############################################################################
3070@@ -22,23 +22,28 @@
3071 # You should have received a copy of the GNU Affero General Public License
3072 # along with this program. If not, see <http://www.gnu.org/licenses/>.
3073 ################################################################################
3074-
3075+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
3076 {
3077- "name" : "Account Invoice Line Currency",
3078- "version" : "1.0",
3079- "author" : "Vauxoo",
3080- "website" : "http://vauxoo.com",
3081- "category": 'Generic Modules/Accounting',
3082+ "name": "Account Invoice Line Currency",
3083+ "version": "1.0",
3084+ "author": "Vauxoo",
3085+ "category": "Generic Modules/Accounting",
3086 "description": """
3087- """,
3088- 'init_xml': [],
3089- "depends" : ["account"],
3090- 'update_xml': ["view/account_invoice_line_view.xml"],
3091- 'demo_xml': [],
3092- 'test': [],
3093- 'installable': True,
3094- 'active': False,
3095-}
3096-
3097-
3098-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
3099+ """,
3100+ "website": "http://vauxoo.com",
3101+ "license": "",
3102+ "depends": [
3103+ "account"
3104+ ],
3105+ "demo": [],
3106+ "data": [
3107+ "view/account_invoice_line_view.xml"
3108+ ],
3109+ "test": [],
3110+ "js": [],
3111+ "css": [],
3112+ "qweb": [],
3113+ "installable": True,
3114+ "auto_install": False,
3115+ "active": False
3116+}
3117\ No newline at end of file
3118
3119=== modified file 'account_invoice_line_currency/model/__init__.py'
3120--- account_invoice_line_currency/model/__init__.py 2014-05-09 21:51:34 +0000
3121+++ account_invoice_line_currency/model/__init__.py 2014-10-07 08:56:40 +0000
3122@@ -5,7 +5,7 @@
3123 # Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
3124 # All Rights Reserved
3125 ###############Credits######################################################
3126-# Coded by: Vauxoo C.A.
3127+# Coded by: Vauxoo C.A.
3128 # Planified by: Humberto Arocha / Nhomar Hernandez
3129 # Audited by: Vauxoo C.A.
3130 #############################################################################
3131@@ -23,5 +23,5 @@
3132 # along with this program. If not, see <http://www.gnu.org/licenses/>.
3133 ################################################################################
3134
3135-import account_invoice_line
3136-import res_currency
3137+from . import account_invoice_line
3138+from . import res_currency
3139
3140=== modified file 'account_invoice_line_currency/model/account_invoice_line.py'
3141--- account_invoice_line_currency/model/account_invoice_line.py 2014-05-09 21:51:34 +0000
3142+++ account_invoice_line_currency/model/account_invoice_line.py 2014-10-07 08:56:40 +0000
3143@@ -29,6 +29,5 @@
3144 class account_invoice_line(osv.Model):
3145 _inherit = "account.invoice.line"
3146 _columns = {
3147- 'currency_id':fields.related('invoice_id', 'currency_id', relation='res.currency', type='many2one', string='Currency', help='field'),
3148- }
3149-
3150+ 'currency_id': fields.related('invoice_id', 'currency_id', relation='res.currency', type='many2one', string='Currency', help='field'),
3151+ }
3152
3153=== modified file 'account_invoice_line_currency/model/res_currency.py'
3154--- account_invoice_line_currency/model/res_currency.py 2014-05-09 21:51:34 +0000
3155+++ account_invoice_line_currency/model/res_currency.py 2014-10-07 08:56:40 +0000
3156@@ -23,7 +23,7 @@
3157 # along with this program. If not, see <http://www.gnu.org/licenses/>.
3158 ###############################################################################
3159
3160-from openerp.osv import osv, fields
3161+from openerp.osv import osv
3162
3163
3164 class res_currency(osv.Model):
3165
3166=== modified file 'account_invoice_number/__openerp__.py'
3167--- account_invoice_number/__openerp__.py 2014-05-09 21:51:34 +0000
3168+++ account_invoice_number/__openerp__.py 2014-10-07 08:56:40 +0000
3169@@ -23,29 +23,31 @@
3170 # along with this program. If not, see <http://www.gnu.org/licenses/>.
3171 #
3172 ##############################################################################
3173-
3174 {
3175- "name": "Account Invoice Number v7",
3176- "version": "1.0",
3177- "author": "Vauxoo",
3178- "category": "Localization/Mexico",
3179- "description" : """
3180+ "name": "Account Invoice Number v7",
3181+ "version": "1.0",
3182+ "author": "Vauxoo",
3183+ "category": "Localization/Mexico",
3184+ "description": """
3185 This module add field internal_number to invoice view.
3186 When you cancel a customer invoice will not delete the invoice number.
3187
3188 It also adds field Supplier Invoice Number for suppliers in tree view.
3189- """,
3190- "website": "http://www.vauxoo.com/",
3191- "images": [],
3192- "depends": ["account"],
3193- "demo": [],
3194+ """,
3195+ "website": "http://www.vauxoo.com/",
3196+ "license": "",
3197+ "depends": [
3198+ "account"
3199+ ],
3200+ "demo": [],
3201 "data": [
3202- "account_invoice_view.xml",
3203- ],
3204- 'js': [],
3205- 'qweb': [],
3206- 'css': [],
3207- 'test': [],
3208- "installable": True,
3209- "auto_install": False,
3210-}
3211+ "account_invoice_view.xml"
3212+ ],
3213+ "test": [],
3214+ "js": [],
3215+ "css": [],
3216+ "qweb": [],
3217+ "installable": True,
3218+ "auto_install": False,
3219+ "active": False
3220+}
3221\ No newline at end of file
3222
3223=== modified file 'account_invoice_regular_validation/__init__.py'
3224--- account_invoice_regular_validation/__init__.py 2014-05-09 21:51:34 +0000
3225+++ account_invoice_regular_validation/__init__.py 2014-10-07 08:56:40 +0000
3226@@ -23,4 +23,4 @@
3227 # along with this program. If not, see <http://www.gnu.org/licenses/>.
3228 #
3229 ##############################################################################
3230-import account_invoice
3231+from . import account_invoice
3232
3233=== modified file 'account_invoice_regular_validation/__openerp__.py'
3234--- account_invoice_regular_validation/__openerp__.py 2014-05-09 21:51:34 +0000
3235+++ account_invoice_regular_validation/__openerp__.py 2014-10-07 08:56:40 +0000
3236@@ -23,24 +23,29 @@
3237 # along with this program. If not, see <http://www.gnu.org/licenses/>.
3238 #
3239 ##############################################################################
3240-
3241 {
3242- "name" : "Invoice Regular Validation",
3243- "version" : "1.0",
3244- "author" : "Vauxoo",
3245- "category" : "Generic Modules",
3246- "description" : """
3247- This module validate that the lines don't have account type different to regular
3248- """,
3249- "website" : "http://www.vauxoo.com/",
3250- "license" : "AGPL-3",
3251- "depends" : ["base","account"
3252- ],
3253- "init_xml" : [],
3254- "demo_xml" : [],
3255- "update_xml" : [
3256- "account_invoice_view.xml",
3257- ],
3258- "installable" : True,
3259- "active" : False,
3260-}
3261+ "name": "Invoice Regular Validation",
3262+ "version": "1.0",
3263+ "author": "Vauxoo",
3264+ "category": "Generic Modules",
3265+ "description": """
3266+ This module validate that the lines don't have account type different to regular
3267+ """,
3268+ "website": "http://www.vauxoo.com/",
3269+ "license": "AGPL-3",
3270+ "depends": [
3271+ "base",
3272+ "account"
3273+ ],
3274+ "demo": [],
3275+ "data": [
3276+ "account_invoice_view.xml"
3277+ ],
3278+ "test": [],
3279+ "js": [],
3280+ "css": [],
3281+ "qweb": [],
3282+ "installable": True,
3283+ "auto_install": False,
3284+ "active": False
3285+}
3286\ No newline at end of file
3287
3288=== modified file 'account_invoice_regular_validation/account_invoice.py'
3289--- account_invoice_regular_validation/account_invoice.py 2014-05-09 21:51:34 +0000
3290+++ account_invoice_regular_validation/account_invoice.py 2014-10-07 08:56:40 +0000
3291@@ -23,7 +23,7 @@
3292 # along with this program. If not, see <http://www.gnu.org/licenses/>.
3293 #
3294 ##############################################################################
3295-from openerp.osv import osv, fields
3296+from openerp.osv import osv
3297 from openerp.tools.translate import _
3298
3299
3300
3301=== modified file 'account_invoice_show_by_user/__openerp__.py'
3302--- account_invoice_show_by_user/__openerp__.py 2014-05-09 21:51:34 +0000
3303+++ account_invoice_show_by_user/__openerp__.py 2014-10-07 08:56:40 +0000
3304@@ -21,24 +21,31 @@
3305 # along with this program. If not, see <http://www.gnu.org/licenses/>.
3306 ################################################################################
3307 {
3308- "name" : "Show invoice by user",
3309- "version" : "1.0",
3310- "author" : 'Vauxoo',
3311+ "name": "Show invoice by user",
3312+ "version": "1.0",
3313+ "author": "Vauxoo",
3314+ "category": "Accounting",
3315 "description": """
3316 This module create registration rules for invoice
3317 =================================================
3318
3319 Only lets you see invoice created by the logged user
3320
3321- """,
3322- "category" : "Accounting",
3323- "website" : "http://www.vauxoo.com",
3324- "depends" : [
3325+ """,
3326+ "website": "http://www.vauxoo.com",
3327+ "license": "",
3328+ "depends": [
3329 "account"
3330- ],
3331- "data" : [
3332- 'security/group_show_invoice.xml',
3333- ],
3334- "active": False,
3335- "installable": True,
3336-}
3337+ ],
3338+ "demo": [],
3339+ "data": [
3340+ "security/group_show_invoice.xml"
3341+ ],
3342+ "test": [],
3343+ "js": [],
3344+ "css": [],
3345+ "qweb": [],
3346+ "installable": True,
3347+ "auto_install": False,
3348+ "active": False
3349+}
3350\ No newline at end of file
3351
3352=== modified file 'account_invoice_tax/__init__.py'
3353--- account_invoice_tax/__init__.py 2014-05-09 21:51:34 +0000
3354+++ account_invoice_tax/__init__.py 2014-10-07 08:56:40 +0000
3355@@ -1,1 +1,1 @@
3356-import account_invoice_tax
3357+from . import account_invoice_tax
3358
3359=== modified file 'account_invoice_tax/__openerp__.py'
3360--- account_invoice_tax/__openerp__.py 2014-05-09 21:51:34 +0000
3361+++ account_invoice_tax/__openerp__.py 2014-10-07 08:56:40 +0000
3362@@ -23,23 +23,28 @@
3363 # along with this program. If not, see <http://www.gnu.org/licenses/>.
3364 #
3365 ##############################################################################
3366-
3367 {
3368- "name" : "account_invoice_tax",
3369- "version" : "1.0",
3370- "author" : "Vauxoo",
3371- "category" : "Localization/Mexico",
3372- "description" : """This module add tax relation to original tax, to be able to take off all data from invoices.
3373+ "name": "account_invoice_tax",
3374+ "version": "1.0",
3375+ "author": "Vauxoo",
3376+ "category": "Localization/Mexico",
3377+ "description": """This module add tax relation to original tax, to be able to take off all data from invoices.
3378 Technical Warning - This module add method override
3379 def check_tax_lines from account_invoice
3380 def compute from account_invoice_tax
3381-""",
3382- "website" : "http://www.vauxoo.com/",
3383- "license" : "AGPL-3",
3384- "depends" : ["account"],
3385- "init_xml" : [],
3386- "demo_xml" : [],
3387- "update_xml" : [],#TODO Add field to view account.invoice
3388- "installable" : True,
3389- "active" : False,
3390-}
3391+""",
3392+ "website": "http://www.vauxoo.com/",
3393+ "license": "AGPL-3",
3394+ "depends": [
3395+ "account"
3396+ ],
3397+ "demo": [],
3398+ "data": [],
3399+ "test": [],
3400+ "js": [],
3401+ "css": [],
3402+ "qweb": [],
3403+ "installable": True,
3404+ "auto_install": False,
3405+ "active": False
3406+}
3407\ No newline at end of file
3408
3409=== modified file 'account_invoice_tax/account_invoice_tax.py'
3410--- account_invoice_tax/account_invoice_tax.py 2014-09-23 22:53:26 +0000
3411+++ account_invoice_tax/account_invoice_tax.py 2014-10-07 08:56:40 +0000
3412@@ -26,11 +26,11 @@
3413 ##############################################################################
3414
3415 from openerp import models, fields, api, _
3416-import time
3417+
3418
3419 class account_invoice(models.Model):
3420 _inherit = 'account.invoice'
3421-
3422+
3423 @api.multi
3424 def check_tax_lines(self, compute_taxes):
3425 account_invoice_tax = self.env['account.invoice.tax']
3426@@ -46,7 +46,7 @@
3427 # start custom change
3428 #~ key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.icd, tax.account_analytic_id.id)
3429 key = (tax.tax_id and tax.tax_id.id or False)
3430- #end custom change
3431+ # end custom change
3432 tax_key.append(key)
3433 if key not in compute_taxes:
3434 raise except_orm(_('Warning!'), _('Global taxes defined, but they are not in invoice lines !'))
3435@@ -56,10 +56,11 @@
3436 for key in compute_taxes:
3437 if key not in tax_key:
3438 raise except_orm(_('Warning!'), _('Taxes are missing!\nClick on compute button.'))
3439-
3440+
3441+
3442 class account_invoice_tax(models.Model):
3443 _inherit = 'account.invoice.tax'
3444-
3445+
3446 tax_id = fields.Many2one('account.tax', string='Tax', required=False, ondelete='set null', index=True,
3447 help="Tax relation to original tax, to be able to take off all data from invoices.")
3448
3449@@ -82,7 +83,7 @@
3450 'base': currency.round(tax['price_unit'] * line['quantity']),
3451 'tax_id': tax['id']
3452 }
3453- if invoice.type in ('out_invoice','in_invoice'):
3454+ if invoice.type in ('out_invoice', 'in_invoice'):
3455 val['base_code_id'] = tax['base_code_id']
3456 val['tax_code_id'] = tax['tax_code_id']
3457 val['base_amount'] = currency.compute(val['base'] * tax['base_sign'], company_currency, round=False)
3458@@ -96,10 +97,10 @@
3459 val['tax_amount'] = currency.compute(val['amount'] * tax['ref_tax_sign'], company_currency, round=False)
3460 val['account_id'] = tax['account_paid_id'] or line.account_id.id
3461 val['account_analytic_id'] = tax['account_analytic_paid_id']
3462- #start custom change
3463+ # start custom change
3464 #key = (val['tax_code_id'], val['base_code_id'], val['account_id'], val['account_analytic_id'])
3465 key = (val['tax_id'])
3466- #end custom change
3467+ # end custom change
3468 if not key in tax_grouped:
3469 tax_grouped[key] = val
3470 else:
3471
3472=== modified file 'account_ledger_report/__init__.py'
3473--- account_ledger_report/__init__.py 2014-05-09 21:51:34 +0000
3474+++ account_ledger_report/__init__.py 2014-10-07 08:56:40 +0000
3475@@ -25,6 +25,6 @@
3476 # along with this program. If not, see <http://www.gnu.org/licenses/>.
3477 ##############################################################################
3478
3479-import report
3480+from . import report
3481
3482 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
3483
3484=== modified file 'account_ledger_report/__openerp__.py'
3485--- account_ledger_report/__openerp__.py 2014-05-09 21:51:34 +0000
3486+++ account_ledger_report/__openerp__.py 2014-10-07 08:56:40 +0000
3487@@ -23,12 +23,13 @@
3488 # You should have received a copy of the GNU General Public License
3489 # along with this program. If not, see <http://www.gnu.org/licenses/>.
3490 ##############################################################################
3491+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
3492 {
3493- "name": "Account Ledger Report",
3494- "version": "0.1",
3495- "depends": ["base","account"],
3496- "author": "Vauxoo",
3497- "description" : """
3498+ "name": "Account Ledger Report",
3499+ "version": "0.1",
3500+ "author": "Vauxoo",
3501+ "category": "Generic Modules/Accounting",
3502+ "description": """
3503 Module that replace original ledger report to optimize the printing space.
3504 The reports changed are:
3505 - account_general_ledger.rml
3506@@ -36,21 +37,25 @@
3507 - account_partner_ledger.rml
3508 - account_partner_ledger_other.rml
3509 In these reports were eliminated:
3510- - Journal (header)
3511+ - Journal (header)
3512 - Partner field
3513 - Ref field
3514- """,
3515- "website": "http://vauxoo.com",
3516- "category": "Generic Modules/Accounting",
3517- "init_xml": [
3518- ],
3519- "demo_xml": [
3520- ],
3521- "update_xml": [
3522- 'acc_ledger_report.xml',
3523- ],
3524- "active": False,
3525- "installable": True,
3526-}
3527-
3528-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
3529+ """,
3530+ "website": "http://vauxoo.com",
3531+ "license": "",
3532+ "depends": [
3533+ "base",
3534+ "account"
3535+ ],
3536+ "demo": [],
3537+ "data": [
3538+ "acc_ledger_report.xml"
3539+ ],
3540+ "test": [],
3541+ "js": [],
3542+ "css": [],
3543+ "qweb": [],
3544+ "installable": True,
3545+ "auto_install": False,
3546+ "active": False
3547+}
3548\ No newline at end of file
3549
3550=== modified file 'account_move_cancel/__init__.py'
3551--- account_move_cancel/__init__.py 2014-05-09 21:51:34 +0000
3552+++ account_move_cancel/__init__.py 2014-10-07 08:56:40 +0000
3553@@ -1,2 +1,2 @@
3554-import model
3555-import wizard
3556+from . import model
3557+from . import wizard
3558
3559=== modified file 'account_move_cancel/__openerp__.py'
3560--- account_move_cancel/__openerp__.py 2014-05-09 21:51:34 +0000
3561+++ account_move_cancel/__openerp__.py 2014-10-07 08:56:40 +0000
3562@@ -5,7 +5,7 @@
3563 # Copyright (C) Vauxoo (<http://vauxoo.com>).
3564 # All Rights Reserved
3565 ###############Credits######################################################
3566-# Coded by: Vauxoo C.A.
3567+# Coded by: Vauxoo C.A.
3568 # Planified by: Nhomar Hernandez
3569 # Audited by: Vauxoo C.A.
3570 #############################################################################
3571@@ -23,29 +23,33 @@
3572 # along with this program. If not, see <http://www.gnu.org/licenses/>.
3573 ################################################################################
3574 {
3575- "name" : "Account Move Cancel",
3576- "version" : "0.1",
3577- "depends" : ["account",'account_cancel'],
3578- "author" : "Vauxoo",
3579- "description" : """
3580- Cancels multiple invoices from a wizard and is called from other modules for direct
3581- billing cancellations and cancel your withholding, withholding automatically validating
3582+ "name": "Account Move Cancel",
3583+ "version": "0.1",
3584+ "author": "Vauxoo",
3585+ "category": "Generic Modules",
3586+ "description": """
3587+ Cancels multiple invoices from a wizard and is called from other modules for direct
3588+ billing cancellations and cancel your withholding, withholding automatically validating
3589 and maintaining the seat number that generated in its initial stage
3590- """,
3591- "website" : "http://vauxoo.com",
3592- "category" : "Generic Modules",
3593- "init_xml" : [],
3594- "demo_xml" : [],
3595- "test": [ ],
3596- "update_xml" : [
3597- 'security/invoice_cancel_security.xml',
3598- 'security/ir.model.access.csv',
3599- 'wizard/account_move_cancel_view.xml',
3600- 'view/invoice_view.xml',
3601-
3602-
3603-
3604- ],
3605- "active": False,
3606- "installable": True,
3607-}
3608+ """,
3609+ "website": "http://vauxoo.com",
3610+ "license": "",
3611+ "depends": [
3612+ "account",
3613+ "account_cancel"
3614+ ],
3615+ "demo": [],
3616+ "data": [
3617+ "security/invoice_cancel_security.xml",
3618+ "security/ir.model.access.csv",
3619+ "wizard/account_move_cancel_view.xml",
3620+ "view/invoice_view.xml"
3621+ ],
3622+ "test": [],
3623+ "js": [],
3624+ "css": [],
3625+ "qweb": [],
3626+ "installable": True,
3627+ "auto_install": False,
3628+ "active": False
3629+}
3630\ No newline at end of file
3631
3632=== added file 'account_move_cancel/i18n/pt_BR.po'
3633--- account_move_cancel/i18n/pt_BR.po 1970-01-01 00:00:00 +0000
3634+++ account_move_cancel/i18n/pt_BR.po 2014-10-07 08:56:40 +0000
3635@@ -0,0 +1,98 @@
3636+# Brazilian Portuguese translation for addons-vauxoo
3637+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
3638+# This file is distributed under the same license as the addons-vauxoo package.
3639+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
3640+#
3641+msgid ""
3642+msgstr ""
3643+"Project-Id-Version: addons-vauxoo\n"
3644+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3645+"POT-Creation-Date: 2013-11-07 01:13+0000\n"
3646+"PO-Revision-Date: 2014-09-26 08:40+0000\n"
3647+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
3648+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
3649+"MIME-Version: 1.0\n"
3650+"Content-Type: text/plain; charset=UTF-8\n"
3651+"Content-Transfer-Encoding: 8bit\n"
3652+"X-Launchpad-Export-Date: 2014-09-27 06:28+0000\n"
3653+"X-Generator: Launchpad (build 17196)\n"
3654+
3655+#. module: account_move_cancel
3656+#: model:ir.ui.menu,name:account_move_cancel.account_cancel_wz2
3657+msgid "Cancel Account"
3658+msgstr ""
3659+
3660+#. module: account_move_cancel
3661+#: model:ir.ui.menu,name:account_move_cancel.cancel_account_wz
3662+msgid "Cancel Account"
3663+msgstr ""
3664+
3665+#. module: account_move_cancel
3666+#: code:addons/account_move_cancel/wizard/account_move_cancel.py:136
3667+#, python-format
3668+msgid "Impossible invoice(s) cancel %s because is/are paid!"
3669+msgstr ""
3670+
3671+#. module: account_move_cancel
3672+#: help:account.invoice,cancel_true:0
3673+msgid ""
3674+"Field that indicates whether the invoice was canceled earlier, "
3675+"to generate actions automatically"
3676+msgstr ""
3677+
3678+#. module: account_move_cancel
3679+#: view:account.move.cancel:0
3680+msgid "Compute Costs"
3681+msgstr ""
3682+
3683+#. module: account_move_cancel
3684+#: field:account.move.cancel,invoice_ids:0
3685+msgid "Invoices"
3686+msgstr ""
3687+
3688+#. module: account_move_cancel
3689+#: help:account.move.cancel,invoice_ids:0
3690+msgid "Select the invoices to account move cancel"
3691+msgstr ""
3692+
3693+#. module: account_move_cancel
3694+#: model:ir.actions.act_window,name:account_move_cancel.account_cancel_action
3695+msgid "Account Cancel"
3696+msgstr ""
3697+
3698+#. module: account_move_cancel
3699+#: code:addons/account_move_cancel/wizard/account_move_cancel.py:134
3700+#, python-format
3701+msgid "Invalid action !"
3702+msgstr ""
3703+
3704+#. module: account_move_cancel
3705+#: field:account.invoice,cancel_true:0
3706+#: model:res.groups,name:account_move_cancel.group_invoice_cancel
3707+msgid "Invoice Cancel"
3708+msgstr ""
3709+
3710+#. module: account_move_cancel
3711+#: view:account.move.cancel:0
3712+msgid "Exit"
3713+msgstr ""
3714+
3715+#. module: account_move_cancel
3716+#: model:ir.model,name:account_move_cancel.model_account_invoice
3717+msgid "Invoice"
3718+msgstr ""
3719+
3720+#. module: account_move_cancel
3721+#: model:ir.model,name:account_move_cancel.model_account_move_cancel
3722+msgid "account.move.cancel"
3723+msgstr ""
3724+
3725+#. module: account_move_cancel
3726+#: view:account.invoice:0
3727+msgid "Cancel"
3728+msgstr ""
3729+
3730+#. module: account_move_cancel
3731+#: view:account.move.cancel:0
3732+msgid "Cancel Account Move"
3733+msgstr ""
3734
3735=== modified file 'account_move_cancel/model/__init__.py'
3736--- account_move_cancel/model/__init__.py 2014-05-09 21:51:34 +0000
3737+++ account_move_cancel/model/__init__.py 2014-10-07 08:56:40 +0000
3738@@ -1,1 +1,1 @@
3739-import invoice
3740+from . import invoice
3741
3742=== modified file 'account_move_cancel/model/invoice.py'
3743--- account_move_cancel/model/invoice.py 2014-09-12 21:07:09 +0000
3744+++ account_move_cancel/model/invoice.py 2014-10-07 08:56:40 +0000
3745@@ -23,12 +23,7 @@
3746 # along with this program. If not, see <http://www.gnu.org/licenses/>.
3747 ##########################################################################
3748
3749-import time
3750 from openerp.osv import osv, fields
3751-from openerp.addons.decimal_precision import decimal_precision as dp
3752-from openerp.tools.translate import _
3753-
3754-import openerp.netsvc as netsvc
3755
3756
3757 class account_invoice(osv.Model):
3758
3759=== modified file 'account_move_cancel/wizard/__init__.py'
3760--- account_move_cancel/wizard/__init__.py 2014-05-09 21:51:34 +0000
3761+++ account_move_cancel/wizard/__init__.py 2014-10-07 08:56:40 +0000
3762@@ -1,1 +1,1 @@
3763-import account_move_cancel
3764+from . import account_move_cancel
3765
3766=== modified file 'account_move_cancel/wizard/account_move_cancel.py'
3767--- account_move_cancel/wizard/account_move_cancel.py 2014-09-12 21:07:09 +0000
3768+++ account_move_cancel/wizard/account_move_cancel.py 2014-10-07 08:56:40 +0000
3769@@ -24,14 +24,10 @@
3770 ##########################################################################
3771
3772 from openerp.osv import osv, fields
3773-import openerp.tools as tools
3774 from openerp.tools.translate import _
3775
3776-from tools import config
3777 import openerp.netsvc as netsvc
3778-from openerp.addons.decimal_precision import decimal_precision as dp
3779 #~ from DateTime import DateTime
3780-import time
3781
3782
3783 class account_move_cancel(osv.TransientModel):
3784@@ -54,9 +50,7 @@
3785 if context is None:
3786 context = {}
3787 invo_obj = self.pool.get('account.invoice')
3788- iva_obj = self.pool.get('account.wh.iva')
3789
3790- islr_obj = self.pool.get('islr.wh.doc')
3791 journal_obj = self.pool.get('account.journal')
3792 invo_ids = []
3793 iva_ids = []
3794@@ -134,7 +128,7 @@
3795 raise osv.except_osv(_('Invalid action !'), _(
3796 "Impossible invoice(s) cancel %s because is/are paid!"
3797 % (' '.join(names))))
3798- invo_obj.action_cancel(cr, uid, invo_ids, context=context)#correccion estaba llegando tupla () al unlink
3799+ invo_obj.action_cancel(cr, uid, invo_ids, context=context) # correccion estaba llegando tupla () al unlink
3800 invo_obj.write(cr, uid, invo_ids, {
3801 'cancel_true': True}, context=context)
3802 hasattr(journal_obj.browse(cr, uid, journal_ids[0],
3803@@ -144,10 +138,6 @@
3804
3805 return True
3806
3807-
3808-
3809-
3810-
3811 # nombre del modulo account_anglo_saxon_cost_structure
3812
3813 #~ acttion_cancel asiento (acount_move)
3814
3815=== modified file 'account_move_folio/__init__.py'
3816--- account_move_folio/__init__.py 2014-05-09 21:51:34 +0000
3817+++ account_move_folio/__init__.py 2014-10-07 08:56:40 +0000
3818@@ -1,3 +1,3 @@
3819 # -*- encoding: utf-8 -*-
3820-import model
3821-import wizard
3822+from . import model
3823+from . import wizard
3824
3825=== modified file 'account_move_folio/__openerp__.py'
3826--- account_move_folio/__openerp__.py 2014-05-09 21:51:34 +0000
3827+++ account_move_folio/__openerp__.py 2014-10-07 08:56:40 +0000
3828@@ -1,32 +1,34 @@
3829 # -*- encoding: utf-8 -*-
3830 {
3831- "name": "Account Move Folio",
3832- "version": "1.0",
3833- "author": "Vauxoo",
3834- 'category' : 'Accounting & Finance',
3835- "description" : """
3836+ "name": "Account Move Folio",
3837+ "version": "1.0",
3838+ "author": "Vauxoo",
3839+ "category": "Accounting & Finance",
3840+ "description": """
3841 Account Move Folio
3842 ==================
3843
3844 This Module keeps a record of all the sequences that have been used in the
3845 Journal Entries in OpenERP, No matter if a Journal Entry is deleted it will
3846 stand as a way to audit all the sequences that have been used.
3847- """,
3848- "website": "http://www.vauxoo.com/",
3849- "license": "AGPL-3",
3850+ """,
3851+ "website": "http://www.vauxoo.com/",
3852+ "license": "AGPL-3",
3853 "depends": [
3854- "account",
3855- ],
3856- "demo": [
3857- ],
3858+ "account"
3859+ ],
3860+ "demo": [],
3861 "data": [
3862- "security/security.xml",
3863- 'security/ir.model.access.csv',
3864- 'view/view.xml',
3865- 'view/menues_and_actions.xml',
3866- ],
3867- "test" : [
3868- ],
3869- "installable": True,
3870- "active": False,
3871-}
3872+ "security/security.xml",
3873+ "security/ir.model.access.csv",
3874+ "view/view.xml",
3875+ "view/menues_and_actions.xml"
3876+ ],
3877+ "test": [],
3878+ "js": [],
3879+ "css": [],
3880+ "qweb": [],
3881+ "installable": True,
3882+ "auto_install": False,
3883+ "active": False
3884+}
3885\ No newline at end of file
3886
3887=== modified file 'account_move_folio/model/__init__.py'
3888--- account_move_folio/model/__init__.py 2014-05-09 21:51:34 +0000
3889+++ account_move_folio/model/__init__.py 2014-10-07 08:56:40 +0000
3890@@ -1,2 +1,2 @@
3891 # -*- encoding: utf-8 -*-
3892-import account_move_folio
3893+from . import account_move_folio
3894
3895=== modified file 'account_move_folio/model/account_move_folio.py'
3896--- account_move_folio/model/account_move_folio.py 2014-05-09 21:51:34 +0000
3897+++ account_move_folio/model/account_move_folio.py 2014-10-07 08:56:40 +0000
3898@@ -1,43 +1,45 @@
3899 # -*- encoding: utf-8 -*-
3900 from openerp.osv import fields, osv
3901
3902+
3903 class account_move_folio(osv.Model):
3904 _name = 'account.move.folio'
3905 _order = 'company_id, journal_id, name'
3906 _description = "Records of Folios in Journal Entries"
3907 _columns = {
3908- 'name':fields.char('Folio', 256, help='Folio Number', required = True),
3909- 'move_id':fields.many2one('account.move', 'Journal Entry', help='Journal Entry'),
3910- 'journal_id':fields.many2one('account.journal', 'Journal', help='Entry Journal'),
3911- 'period_id':fields.many2one('account.period', 'Period', help='Entry Period'),
3912- 'date':fields.date('Date', help='Entry Date'),
3913- 'company_id':fields.many2one('res.company', 'Company', help='Entry Company'),
3914- 'move_state':fields.related('move_id','state', type='selection',
3915- selection=[('draft','Unposted'), ('posted','Posted')], store=True,
3916- string='Entry State', help='Entry State'),
3917- 'period_state':fields.related('period_id','state', type='selection',
3918- selection=[('draft','Open'), ('done','Closed')], store=True,
3919- string='Period State', help='Period State'),
3920+ 'name': fields.char('Folio', 256, help='Folio Number', required=True),
3921+ 'move_id': fields.many2one('account.move', 'Journal Entry', help='Journal Entry'),
3922+ 'journal_id': fields.many2one('account.journal', 'Journal', help='Entry Journal'),
3923+ 'period_id': fields.many2one('account.period', 'Period', help='Entry Period'),
3924+ 'date': fields.date('Date', help='Entry Date'),
3925+ 'company_id': fields.many2one('res.company', 'Company', help='Entry Company'),
3926+ 'move_state': fields.related('move_id', 'state', type='selection',
3927+ selection=[('draft', 'Unposted'), ('posted', 'Posted')], store=True,
3928+ string='Entry State', help='Entry State'),
3929+ 'period_state': fields.related('period_id', 'state', type='selection',
3930+ selection=[('draft', 'Open'), ('done', 'Closed')], store=True,
3931+ string='Period State', help='Period State'),
3932 }
3933
3934 _defaults = {
3935 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
3936 }
3937
3938+
3939 class account_move(osv.Model):
3940 _inherit = 'account.move'
3941
3942 _columns = {
3943 'folio_id': fields.many2one('account.move.folio', 'Folio Record'),
3944 }
3945-
3946+
3947 def _check_folio(self, cr, uid, ids, context=None):
3948 for move in self.browse(cr, uid, ids, context=context):
3949 if move.folio_id:
3950 move_ids = self.search(cr, uid, [
3951 ('company_id', '=', move.company_id.id),
3952 ('folio_id', '=', move.folio_id.id),
3953- ])
3954+ ])
3955 if len(move_ids) > 1:
3956 return False
3957 return True
3958@@ -47,14 +49,14 @@
3959 'You cannot have duplicate Folio Record by company.',
3960 ['folio_id']),
3961 ]
3962-
3963+
3964 def copy(self, cr, uid, id, default=None, context=None):
3965 default = {} if default is None else default.copy()
3966 default.update({
3967 'folio_id': False
3968 })
3969 return super(account_move, self).copy(cr, uid, id, default=default, context=context)
3970-
3971+
3972 def foliate(self, cr, uid, ids, context=None):
3973 context = context or {}
3974 folio_obj = self.pool.get('account.move.folio')
3975@@ -70,23 +72,22 @@
3976 }
3977 if invoice:
3978 folio_ids = folio_obj.search(cr, uid,
3979- [('name','=',move.name),
3980- ('journal_id','=',move.journal_id.id),
3981- ('company_id','=',move.company_id.id)],
3982- context=context)
3983+ [('name', '=', move.name),
3984+ ('journal_id', '=', move.journal_id.id),
3985+ ('company_id', '=', move.company_id.id)],
3986+ context=context)
3987 if folio_ids:
3988 folio_id = folio_ids[0]
3989 folio_obj.write(cr, uid, folio_id, values, context=context)
3990 else:
3991- folio_id = folio_obj.create(cr, uid, values,context=context)
3992+ folio_id = folio_obj.create(cr, uid, values, context=context)
3993 else:
3994- folio_id = folio_obj.create(cr, uid, values,context=context)
3995- move.write({'folio_id':folio_id},context=context)
3996+ folio_id = folio_obj.create(cr, uid, values, context=context)
3997+ move.write({'folio_id': folio_id}, context=context)
3998 return True
3999-
4000+
4001 def post(self, cr, uid, ids, context=None):
4002 context = context or {}
4003 super(account_move, self).post(cr, uid, ids, context=context)
4004 self.foliate(cr, uid, ids, context=context)
4005 return True
4006-
4007
4008=== modified file 'account_move_folio/wizard/__init__.py'
4009--- account_move_folio/wizard/__init__.py 2014-05-09 21:51:34 +0000
4010+++ account_move_folio/wizard/__init__.py 2014-10-07 08:56:40 +0000
4011@@ -1,2 +1,2 @@
4012 # -*- encoding: utf-8 -*-
4013-import fill_folio_gap
4014+from . import fill_folio_gap
4015
4016=== modified file 'account_move_folio/wizard/fill_folio_gap.py'
4017--- account_move_folio/wizard/fill_folio_gap.py 2014-05-09 21:51:34 +0000
4018+++ account_move_folio/wizard/fill_folio_gap.py 2014-10-07 08:56:40 +0000
4019@@ -4,6 +4,8 @@
4020 import logging
4021
4022 _logger = logging.getLogger(__name__)
4023+
4024+
4025 class account_move_folio_fill_gap(osv.TransientModel):
4026 _name = 'account.move.folio.fill.gap'
4027 _description = "Fill Gap in Journal Entry Folios"
4028@@ -32,38 +34,38 @@
4029 return {'type': 'ir.actions.act_window_close'}
4030
4031 for j_id in journal_ids:
4032- journal_brw = journal_obj.browse(cr, uid,j_id, context=context)
4033+ journal_brw = journal_obj.browse(cr, uid, j_id, context=context)
4034 seq_brw = journal_brw.sequence_id
4035 expr = ''
4036 if seq_brw.prefix:
4037 expr = seq_brw.prefix.split('/')
4038- expr = map(lambda t:t if 'year' not in t else 4*'[0-9]',expr)
4039- expr = '^'+'/'.join(expr)
4040- folio_ids = folio_obj.search(cr, uid,[('journal_id','=',j_id)],context=context)
4041+ expr = map(lambda t: t if 'year' not in t else 4 * '[0-9]', expr)
4042+ expr = '^' + '/'.join(expr)
4043+ folio_ids = folio_obj.search(cr, uid, [('journal_id', '=', j_id)], context=context)
4044 if not folio_ids:
4045- _logger.info('NO FOLIOS FOR THIS JOURNAL %s'% j_id)
4046+ _logger.info('NO FOLIOS FOR THIS JOURNAL %s' % j_id)
4047 continue
4048
4049- _logger.info('%s FOLIOS TO PROCESS IN JOURNAL %s'%(len(folio_ids),j_id))
4050+ _logger.info('%s FOLIOS TO PROCESS IN JOURNAL %s' % (len(folio_ids), j_id))
4051 folio_set = set()
4052 for f_id in folio_ids:
4053- folio_brw = folio_obj.browse(cr, uid,f_id,context=context)
4054+ folio_brw = folio_obj.browse(cr, uid, f_id, context=context)
4055 m = re.match(expr, folio_brw.name)
4056 if m is not None:
4057 expr2 = re.compile('^' + m.group())
4058- expr2 = expr2.sub('', folio_brw.name)
4059+ expr2 = expr2.sub('', folio_brw.name)
4060 folio_set.add(int(expr2))
4061- #_logger.info('%s <= MATCH'%folio_brw.name)
4062+ #_logger.info('%s <= MATCH'%folio_brw.name)
4063 MATCH += 1
4064 else:
4065- _logger.info('%s <= WRONG'%folio_brw.name)
4066+ _logger.info('%s <= WRONG' % folio_brw.name)
4067 WRONG += 1
4068 FOLIOS += 1
4069- actual_folio_set = set(range(1,seq_brw.number_next))
4070+ actual_folio_set = set(range(1, seq_brw.number_next))
4071 gap_folio_set = []
4072 if folio_set:
4073 gap_folio_set = actual_folio_set - folio_set
4074- _logger.info('GAP FOLIO SET %s'%gap_folio_set)
4075+ _logger.info('GAP FOLIO SET %s' % gap_folio_set)
4076 for gap in gap_folio_set:
4077 d = ir_seq_obj._interpolation_dict()
4078 try:
4079@@ -71,8 +73,8 @@
4080 interpolated_suffix = ir_seq_obj._interpolate(seq_brw.suffix, d)
4081 except ValueError:
4082 _logger.info("Invalid prefix or suffix for sequence '%s'" % seq_brw.name)
4083- gap_name = interpolated_prefix + '%%0%sd' % seq_brw.padding % gap + interpolated_suffix
4084- _logger.info('GAP NAME %s'%gap_name)
4085+ gap_name = interpolated_prefix + '%%0%sd' % seq_brw.padding % gap + interpolated_suffix
4086+ _logger.info('GAP NAME %s' % gap_name)
4087 flag = True
4088 next_gap = gap
4089 next_gap_id = False
4090@@ -85,24 +87,24 @@
4091 if next_gap >= seq_brw.number_next:
4092 break
4093 else:
4094- next_gap_name = interpolated_prefix + '%%0%sd' % seq_brw.padding % next_gap + interpolated_suffix
4095- next_gap_id = folio_obj.search(cr, uid,[('name','=',next_gap_name),('journal_id','=',j_id)],context=context)
4096+ next_gap_name = interpolated_prefix + '%%0%sd' % seq_brw.padding % next_gap + interpolated_suffix
4097+ next_gap_id = folio_obj.search(cr, uid, [('name', '=', next_gap_name), ('journal_id', '=', j_id)], context=context)
4098 next_gap_id = next_gap_id and next_gap_id[0] or False
4099 period_id = False
4100 date = False
4101 if next_gap_id:
4102- ngval_brw = folio_obj.browse(cr, uid, next_gap_id,context=context)
4103+ ngval_brw = folio_obj.browse(cr, uid, next_gap_id, context=context)
4104 date = ngval_brw.date or False
4105 period_id = ngval_brw.period_id and ngval_brw.period_id.id or False
4106 folio_obj.create(cr, uid, {
4107- 'name':gap_name,
4108- 'journal_id':j_id,
4109- 'date':date,
4110- 'period_id':period_id,
4111- })
4112- GAPS += len(gap_folio_set)
4113- _logger.info('MATCHES: %s'% MATCH)
4114- _logger.info('WRONGS: %s'% WRONG)
4115- _logger.info('FOLIOS: %s'% FOLIOS)
4116- _logger.info('GAPS: %s'% GAPS)
4117+ 'name': gap_name,
4118+ 'journal_id': j_id,
4119+ 'date': date,
4120+ 'period_id': period_id,
4121+ })
4122+ GAPS += len(gap_folio_set)
4123+ _logger.info('MATCHES: %s' % MATCH)
4124+ _logger.info('WRONGS: %s' % WRONG)
4125+ _logger.info('FOLIOS: %s' % FOLIOS)
4126+ _logger.info('GAPS: %s' % GAPS)
4127 return {'type': 'ir.actions.act_window_close'}
4128
4129=== modified file 'account_move_group/__init__.py'
4130--- account_move_group/__init__.py 2014-05-09 21:51:34 +0000
4131+++ account_move_group/__init__.py 2014-10-07 08:56:40 +0000
4132@@ -23,5 +23,5 @@
4133 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4134 #
4135 ##############################################################################
4136-import wizard
4137-import account_move_line
4138+from . import wizard
4139+from . import account_move_line
4140
4141=== modified file 'account_move_group/__openerp__.py'
4142--- account_move_group/__openerp__.py 2014-05-09 21:51:34 +0000
4143+++ account_move_group/__openerp__.py 2014-10-07 08:56:40 +0000
4144@@ -23,23 +23,28 @@
4145 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4146 #
4147 ##############################################################################
4148-
4149+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
4150 {
4151- "name": "Account Move Group",
4152- "version": "1.1",
4153- "author" : "Vauxoo",
4154- "category": "Generic Modules/Account",
4155- "website" : "http://www.vauxoo.com/",
4156+ "name": "Account Move Group",
4157+ "version": "1.1",
4158+ "author": "Vauxoo",
4159+ "category": "Generic Modules/Account",
4160 "description": """ Group Entries
4161- """,
4162- 'depends': ['account'],
4163- 'init_xml': [],
4164- 'update_xml': [
4165- 'wizard/account_move_group_view.xml',
4166- ],
4167- 'demo_xml': [],
4168- 'test': [],
4169- 'installable': True,
4170- 'active': False,
4171-}
4172-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
4173+ """,
4174+ "website": "http://www.vauxoo.com/",
4175+ "license": "",
4176+ "depends": [
4177+ "account"
4178+ ],
4179+ "demo": [],
4180+ "data": [
4181+ "wizard/account_move_group_view.xml"
4182+ ],
4183+ "test": [],
4184+ "js": [],
4185+ "css": [],
4186+ "qweb": [],
4187+ "installable": True,
4188+ "auto_install": False,
4189+ "active": False
4190+}
4191\ No newline at end of file
4192
4193=== modified file 'account_move_group/account_move_line.py'
4194--- account_move_group/account_move_line.py 2014-05-09 21:51:34 +0000
4195+++ account_move_group/account_move_line.py 2014-10-07 08:56:40 +0000
4196@@ -23,12 +23,9 @@
4197 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4198 #
4199 ##############################################################################
4200-from openerp.osv import osv, fields
4201+from openerp.osv import osv
4202 from openerp.tools.translate import _
4203
4204-import openerp.netsvc as netsvc
4205-import time
4206-
4207
4208 class account_move_line(osv.Model):
4209 _inherit = 'account.move.line'
4210@@ -42,7 +39,6 @@
4211 res_reference = {}
4212 moves = []
4213 moves_line = []
4214- ok = False
4215
4216 for move in account_move.browse(cr, uid, ids, context=context):
4217 moves.append(move.id)
4218
4219=== added file 'account_move_group/i18n/pt_BR.po'
4220--- account_move_group/i18n/pt_BR.po 1970-01-01 00:00:00 +0000
4221+++ account_move_group/i18n/pt_BR.po 2014-10-07 08:56:40 +0000
4222@@ -0,0 +1,91 @@
4223+# Brazilian Portuguese translation for addons-vauxoo
4224+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
4225+# This file is distributed under the same license as the addons-vauxoo package.
4226+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
4227+#
4228+msgid ""
4229+msgstr ""
4230+"Project-Id-Version: addons-vauxoo\n"
4231+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
4232+"POT-Creation-Date: 2013-11-07 01:13+0000\n"
4233+"PO-Revision-Date: 2014-09-26 08:41+0000\n"
4234+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
4235+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
4236+"MIME-Version: 1.0\n"
4237+"Content-Type: text/plain; charset=UTF-8\n"
4238+"Content-Transfer-Encoding: 8bit\n"
4239+"X-Launchpad-Export-Date: 2014-09-27 06:28+0000\n"
4240+"X-Generator: Launchpad (build 17196)\n"
4241+
4242+#. module: account_move_group
4243+#: view:account.move.group:0
4244+msgid "Are you sure you want to merge these entries ?"
4245+msgstr ""
4246+
4247+#. module: account_move_group
4248+#: model:ir.model,name:account_move_group.model_account_move_group
4249+msgid "account.move.group"
4250+msgstr ""
4251+
4252+#. module: account_move_group
4253+#: code:addons/account_move_group/account_move_line.py:59
4254+#, python-format
4255+msgid "You need at least two entries to merged"
4256+msgstr ""
4257+
4258+#. module: account_move_group
4259+#: code:addons/account_move_group/account_move_line.py:70
4260+#, python-format
4261+msgid "Entries to merged must have the same period"
4262+msgstr ""
4263+
4264+#. module: account_move_group
4265+#: model:ir.actions.act_window,name:account_move_group.create_group_action
4266+msgid "Group Move"
4267+msgstr ""
4268+
4269+#. module: account_move_group
4270+#: model:ir.model,name:account_move_group.model_account_move_line
4271+msgid "Journal Items"
4272+msgstr ""
4273+
4274+#. module: account_move_group
4275+#: code:addons/account_move_group/account_move_line.py:59
4276+#: code:addons/account_move_group/account_move_line.py:66
4277+#: code:addons/account_move_group/account_move_line.py:70
4278+#, python-format
4279+msgid "Error"
4280+msgstr ""
4281+
4282+#. module: account_move_group
4283+#: view:account.move.group:0
4284+msgid "Cancel"
4285+msgstr ""
4286+
4287+#. module: account_move_group
4288+#: view:account.move.group:0
4289+msgid "Merge Entries"
4290+msgstr ""
4291+
4292+#. module: account_move_group
4293+#: view:account.move.group:0
4294+msgid ""
4295+" Please note that: \n"
4296+" \n"
4297+" Entries will only be merged if not: \n"
4298+" * Entries with diferent period \n"
4299+" * Entries with diferent journal \n"
4300+" "
4301+msgstr ""
4302+
4303+#. module: account_move_group
4304+#: code:addons/account_move_group/account_move_line.py:66
4305+#, python-format
4306+msgid "Entries to merged must have the same journal"
4307+msgstr ""
4308+
4309+#. module: account_move_group
4310+#: view:account.move.group:0
4311+#: model:ir.actions.act_window,name:account_move_group.group_wizard
4312+msgid "Account Move Group"
4313+msgstr ""
4314
4315=== modified file 'account_move_group/wizard/__init__.py'
4316--- account_move_group/wizard/__init__.py 2014-05-09 21:51:34 +0000
4317+++ account_move_group/wizard/__init__.py 2014-10-07 08:56:40 +0000
4318@@ -23,4 +23,4 @@
4319 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4320 #
4321 ##############################################################################
4322-import account_move_group
4323+from . import account_move_group
4324
4325=== modified file 'account_move_group/wizard/account_move_group.py'
4326--- account_move_group/wizard/account_move_group.py 2014-09-12 21:07:09 +0000
4327+++ account_move_group/wizard/account_move_group.py 2014-10-07 08:56:40 +0000
4328@@ -23,10 +23,7 @@
4329 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4330 #
4331 ##############################################################################
4332-import time
4333-from openerp.osv import osv, fields
4334-from openerp.addons.decimal_precision import decimal_precision as dp
4335-from openerp.tools.translate import _
4336+from openerp.osv import osv
4337
4338
4339 class account_move_group(osv.TransientModel):
4340
4341=== modified file 'account_move_line_address/__init__.py'
4342--- account_move_line_address/__init__.py 2014-05-09 21:51:34 +0000
4343+++ account_move_line_address/__init__.py 2014-10-07 08:56:40 +0000
4344@@ -23,4 +23,4 @@
4345 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4346 #
4347 ##############################################################################
4348-import account_move_line
4349+from . import account_move_line
4350
4351=== modified file 'account_move_line_address/__openerp__.py'
4352--- account_move_line_address/__openerp__.py 2014-05-09 21:51:34 +0000
4353+++ account_move_line_address/__openerp__.py 2014-10-07 08:56:40 +0000
4354@@ -23,23 +23,28 @@
4355 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4356 #
4357 ##############################################################################
4358-
4359+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
4360 {
4361- "name": "Account Move Line Address",
4362- "version": "1.1",
4363- "author" : "Vauxoo",
4364- "category": "Generic Modules/Account",
4365- "website" : "http://www.vauxoo.com/",
4366+ "name": "Account Move Line Address",
4367+ "version": "1.1",
4368+ "author": "Vauxoo",
4369+ "category": "Generic Modules/Account",
4370 "description": """ Add field address in account_move_line
4371- """,
4372- 'depends': ['account'],
4373- 'init_xml': [],
4374- 'update_xml': [
4375- 'account_move_line_view.xml',
4376- ],
4377- 'demo_xml': [],
4378- 'test': [],
4379- 'installable': False,
4380- 'active': False,
4381-}
4382-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
4383+ """,
4384+ "website": "http://www.vauxoo.com/",
4385+ "license": "",
4386+ "depends": [
4387+ "account"
4388+ ],
4389+ "demo": [],
4390+ "data": [
4391+ "account_move_line_view.xml"
4392+ ],
4393+ "test": [],
4394+ "js": [],
4395+ "css": [],
4396+ "qweb": [],
4397+ "installable": False,
4398+ "auto_install": False,
4399+ "active": False
4400+}
4401\ No newline at end of file
4402
4403=== modified file 'account_move_line_address/account_move_line.py'
4404--- account_move_line_address/account_move_line.py 2014-05-09 21:51:34 +0000
4405+++ account_move_line_address/account_move_line.py 2014-10-07 08:56:40 +0000
4406@@ -24,7 +24,7 @@
4407 #
4408 ##############################################################################
4409
4410-from openerp.osv import osv, fields, orm
4411+from openerp.osv import osv, fields
4412 from lxml import etree
4413 import openerp.tools as tools
4414
4415@@ -38,7 +38,6 @@
4416 def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
4417 result = super(account_move_line, self).fields_view_get(
4418 cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
4419- fields_get = self.fields_get(cr, uid, ['address_id'], context)
4420 xml_form = etree.fromstring(result['arch'])
4421 placeholder = xml_form.xpath("//field[@name='partner_id']")
4422 placeholder[0].addnext(etree.Element('field', {'name': 'address_id'}))
4423
4424=== modified file 'account_move_line_base_tax/__init__.py'
4425--- account_move_line_base_tax/__init__.py 2014-05-09 21:51:34 +0000
4426+++ account_move_line_base_tax/__init__.py 2014-10-07 08:56:40 +0000
4427@@ -23,5 +23,5 @@
4428 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4429 #
4430 ##############################################################################
4431-import account
4432+from . import account
4433
4434
4435=== modified file 'account_move_line_base_tax/__openerp__.py'
4436--- account_move_line_base_tax/__openerp__.py 2014-05-09 21:51:34 +0000
4437+++ account_move_line_base_tax/__openerp__.py 2014-10-07 08:56:40 +0000
4438@@ -23,33 +23,33 @@
4439 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4440 #
4441 ##############################################################################
4442-
4443 {
4444- "name" : "Amount Base Account Move Line",
4445- "version" : "1.0",
4446- "author" : "Vauxoo",
4447- "category" : "Generic Modules",
4448- "description" : """
4449+ "name": "Amount Base Account Move Line",
4450+ "version": "1.0",
4451+ "author": "Vauxoo",
4452+ "category": "Generic Modules",
4453+ "description": """
4454 This module adds the fields:
4455 - amount_base
4456 - tax_id_secondary
4457 in account_move_line. These fields are fill when you validate the invoice.
4458- """,
4459- "website" : "http://www.vauxoo.com/",
4460- "license" : "AGPL-3",
4461- "depends" : [
4462- "account",
4463- "l10n_mx_account_tax_category",
4464- "account_invoice_tax",
4465- ],
4466- "demo" : [],
4467- "data" : [
4468- 'account_view.xml',
4469- ],
4470- 'js': [],
4471- 'qweb' : [],
4472- 'css':[],
4473- 'test': [],
4474- "installable" : True,
4475- "active" : False,
4476-}
4477+ """,
4478+ "website": "http://www.vauxoo.com/",
4479+ "license": "AGPL-3",
4480+ "depends": [
4481+ "account",
4482+ "l10n_mx_account_tax_category",
4483+ "account_invoice_tax"
4484+ ],
4485+ "demo": [],
4486+ "data": [
4487+ "account_view.xml"
4488+ ],
4489+ "test": [],
4490+ "js": [],
4491+ "css": [],
4492+ "qweb": [],
4493+ "installable": True,
4494+ "auto_install": False,
4495+ "active": False
4496+}
4497\ No newline at end of file
4498
4499=== modified file 'account_move_line_base_tax/account.py'
4500--- account_move_line_base_tax/account.py 2014-05-09 21:51:34 +0000
4501+++ account_move_line_base_tax/account.py 2014-10-07 08:56:40 +0000
4502@@ -24,31 +24,31 @@
4503 #
4504 ##############################################################################
4505 from openerp.osv import osv, fields
4506-from lxml import etree
4507 from openerp.tools.translate import _
4508
4509+
4510 class account_move_line(osv.Model):
4511 _inherit = 'account.move.line'
4512-
4513+
4514 _columns = {
4515- 'amount_base' : fields.float('Amount Base', help='Amount base '\
4516+ 'amount_base': fields.float('Amount Base', help='Amount base '
4517 'without amount tax'),
4518- 'tax_id_secondary' : fields.many2one('account.tax', 'Tax Secondary',
4519+ 'tax_id_secondary': fields.many2one('account.tax', 'Tax Secondary',
4520 help='Tax used for this move'),
4521- 'not_move_diot' : fields.boolean('Not Consider in Diot', help='If'\
4522- ' this field is active, although of this item have data for DIOT,'\
4523+ 'not_move_diot': fields.boolean('Not Consider in Diot', help='If'
4524+ ' this field is active, although of this item have data for DIOT,'
4525 ' not be considered.'),
4526 }
4527-
4528+
4529 def onchange_tax_secondary(self, cr, uid, ids, account_id=False, context=None):
4530 acc_tax_obj = self.pool.get('account.tax')
4531 tax_acc = acc_tax_obj.search(cr, uid, [
4532 ('account_paid_voucher_id', '=', account_id)], context=context)
4533 if tax_acc:
4534- return {'value' : {'tax_id_secondary' : tax_acc[0]}}
4535+ return {'value': {'tax_id_secondary': tax_acc[0]}}
4536 else:
4537- return {'value' : {}}
4538-
4539+ return {'value': {}}
4540+
4541 def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
4542 if context is None:
4543 context = {}
4544@@ -56,35 +56,35 @@
4545 return True
4546 if isinstance(ids, (int, long)):
4547 ids = [ids]
4548-
4549+
4550 res = super(account_move_line, self).write(cr, uid, ids, vals,
4551 context=context, check=check, update_check=update_check)
4552- acc_tax_obj = self.pool.get('account.tax')
4553 for line in self.browse(cr, uid, ids, context=context):
4554 if line.tax_id_secondary and line.tax_id_secondary.type_tax_use == 'purchase':
4555 cat_tax = line.tax_id_secondary.tax_category_id
4556 if cat_tax and cat_tax.name in ('IVA', 'IVA-EXENTO') and line.amount_base <= 0 and\
4557- not line.not_move_diot:
4558- raise osv.except_osv(_('Warning!'), _('The lines with tax of purchase, need '\
4559+ not line.not_move_diot:
4560+ raise osv.except_osv(_('Warning!'), _('The lines with tax of purchase, need '
4561 'have a value in the amount base.'))
4562 elif cat_tax and cat_tax == 'IVA-RET' and line.credit <= 0 and\
4563- not line.not_move_diot:
4564- raise osv.except_osv(_('Warning!'), _('The lines with tax of purchase, need '\
4565+ not line.not_move_diot:
4566+ raise osv.except_osv(_('Warning!'), _('The lines with tax of purchase, need '
4567 'have a value in the credit.'))
4568 return res
4569-
4570+
4571 def onchange_account_id(self, cr, uid, ids, account_id=False, partner_id=False, context=None):
4572 res = super(account_move_line, self).onchange_account_id(cr, uid, ids, account_id, partner_id, context=context)
4573 acc_tax_obj = self.pool.get('account.tax')
4574 tax_acc = acc_tax_obj.search(cr, uid, [
4575 ('account_paid_voucher_id', '=', account_id)], context=context)
4576 if tax_acc:
4577- res['value'].update({'tax_id_secondary' : tax_acc[0]})
4578+ res['value'].update({'tax_id_secondary': tax_acc[0]})
4579 return res
4580-
4581+
4582+
4583 class account_invoice_tax(osv.Model):
4584 _inherit = "account.invoice.tax"
4585-
4586+
4587 def move_line_get(self, cr, uid, invoice_id, context=None):
4588 res = []
4589 super(account_invoice_tax, self).move_line_get(cr, uid, invoice_id)
4590@@ -94,29 +94,29 @@
4591 if not t.amount and not t.tax_code_id and not t.tax_amount:
4592 continue
4593 res.append({
4594- 'type' : 'tax',
4595- 'name' : t.name,
4596- 'price_unit' : t.amount,
4597- 'quantity' : 1,
4598- 'price' : t.amount or 0.0,
4599- 'account_id' : t.account_id.id or False,
4600- 'tax_code_id' : t.tax_code_id.id or False,
4601- 'tax_amount' : t.tax_amount or False,
4602- 'account_analytic_id' : t.account_analytic_id.id or False,
4603- 'amount_base' : t.base_amount or 0.0,
4604- 'tax_id_secondary' : t.tax_id.id or False,
4605+ 'type': 'tax',
4606+ 'name': t.name,
4607+ 'price_unit': t.amount,
4608+ 'quantity': 1,
4609+ 'price': t.amount or 0.0,
4610+ 'account_id': t.account_id.id or False,
4611+ 'tax_code_id': t.tax_code_id.id or False,
4612+ 'tax_amount': t.tax_amount or False,
4613+ 'account_analytic_id': t.account_analytic_id.id or False,
4614+ 'amount_base': t.base_amount or 0.0,
4615+ 'tax_id_secondary': t.tax_id.id or False,
4616 })
4617 return res
4618-
4619+
4620+
4621 class account_invoice(osv.Model):
4622 _inherit = 'account.invoice'
4623-
4624+
4625 def line_get_convert(self, cr, uid, x, part, date, context=None):
4626- res = super(account_invoice, self).line_get_convert(cr, uid, x, part,\
4627+ res = super(account_invoice, self).line_get_convert(cr, uid, x, part,
4628 date, context=context)
4629 res.update({
4630 'amount_base': x.get('amount_base', False),
4631 'tax_id_secondary': x.get('tax_id_secondary', False),
4632 })
4633 return res
4634-
4635
4636=== modified file 'account_move_line_dp_product/__init__.py'
4637--- account_move_line_dp_product/__init__.py 2014-05-09 21:51:34 +0000
4638+++ account_move_line_dp_product/__init__.py 2014-10-07 08:56:40 +0000
4639@@ -20,4 +20,4 @@
4640 # You should have received a copy of the GNU Affero General Public License
4641 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4642 ################################################################################
4643-import account_move_line
4644+from . import account_move_line
4645
4646=== modified file 'account_move_line_dp_product/__openerp__.py'
4647--- account_move_line_dp_product/__openerp__.py 2014-05-09 21:51:34 +0000
4648+++ account_move_line_dp_product/__openerp__.py 2014-10-07 08:56:40 +0000
4649@@ -20,21 +20,27 @@
4650 # You should have received a copy of the GNU Affero General Public License
4651 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4652 ################################################################################
4653+#"license" : "AGPL-3",
4654 {
4655- "name" : "Grouped by production and stock move in model account_move_line",
4656- "version" : "1.0",
4657- "depends" : ['product','account'],
4658- "author" : "Vauxoo",
4659- #"license" : "AGPL-3",
4660- "description" : """Grouped by production and stock move in model account_move_line
4661- """,
4662- "website" : "http://vauxoo.com",
4663- "category" : "Generic Modules",
4664- "init_xml" : [],
4665- "demo_xml" : [],
4666- "test": [],
4667- "update_xml" : [],
4668- "active": False,
4669- "installable": True,
4670-}
4671-
4672+ "name": "Grouped by production and stock move in model account_move_line",
4673+ "version": "1.0",
4674+ "author": "Vauxoo",
4675+ "category": "Generic Modules",
4676+ "description": """Grouped by production and stock move in model account_move_line
4677+ """,
4678+ "website": "http://vauxoo.com",
4679+ "license": "",
4680+ "depends": [
4681+ "product",
4682+ "account"
4683+ ],
4684+ "demo": [],
4685+ "data": [],
4686+ "test": [],
4687+ "js": [],
4688+ "css": [],
4689+ "qweb": [],
4690+ "installable": True,
4691+ "auto_install": False,
4692+ "active": False
4693+}
4694\ No newline at end of file
4695
4696=== modified file 'account_move_line_dp_product/account_move_line.py'
4697--- account_move_line_dp_product/account_move_line.py 2014-09-12 21:07:09 +0000
4698+++ account_move_line_dp_product/account_move_line.py 2014-10-07 08:56:40 +0000
4699@@ -20,7 +20,6 @@
4700 # You should have received a copy of the GNU Affero General Public License
4701 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4702 ##########################################################################
4703-from openerp.tools.translate import _
4704
4705 from openerp.osv import osv, fields
4706 from openerp.addons.decimal_precision import decimal_precision as dp
4707@@ -33,7 +32,7 @@
4708 'quantity': fields.float('Quantity',
4709 digits_compute=dp.get_precision(
4710 'Product UoM'),
4711- help="The optional quantity expressed by this line,\
4712+ help="The optional quantity expressed by this line,\
4713 eg: number of product sold. The quantity is not a legal\
4714 requirement but is very useful for some reports."),
4715 }
4716
4717=== modified file 'account_move_line_extended/__init__.py'
4718--- account_move_line_extended/__init__.py 2014-08-04 17:42:41 +0000
4719+++ account_move_line_extended/__init__.py 2014-10-07 08:56:40 +0000
4720@@ -23,5 +23,5 @@
4721 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4722 ###############################################################################
4723
4724-import model
4725-import wizard
4726+from . import model
4727+from . import wizard
4728
4729=== modified file 'account_move_line_extended/__openerp__.py'
4730--- account_move_line_extended/__openerp__.py 2014-08-04 20:27:30 +0000
4731+++ account_move_line_extended/__openerp__.py 2014-10-07 08:56:40 +0000
4732@@ -22,32 +22,33 @@
4733 # You should have received a copy of the GNU Affero General Public License
4734 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4735 ###############################################################################
4736-
4737 {
4738- 'name': 'Account Move Line Extended',
4739- 'version': '1.0',
4740- 'author': 'Vauxoo',
4741- 'website': 'http://www.vauxoo.com/',
4742- 'category': '',
4743- 'description': '''
4744+ "name": "Account Move Line Extended",
4745+ "version": "1.0",
4746+ "author": "Vauxoo",
4747+ "category": "",
4748+ "description": """
4749 Account Move Line Extended
4750 ==========================
4751
4752 Add a new view for the account move lines at the menu ``Accounting or Invocing
4753 > Journal Entries > Journal Items Extended``. The currency and the amount
4754 currency fields are visible.
4755-''',
4756- 'depends': [
4757- 'account',
4758- ],
4759- 'data': [
4760- 'view/account_move_line_view.xml',
4761- ],
4762- 'demo': [],
4763- 'test': [],
4764- 'qweb': [],
4765- 'js': [],
4766- 'css': [],
4767- 'active': False,
4768- 'installable': True,
4769-}
4770+""",
4771+ "website": "http://www.vauxoo.com/",
4772+ "license": "",
4773+ "depends": [
4774+ "account"
4775+ ],
4776+ "demo": [],
4777+ "data": [
4778+ "view/account_move_line_view.xml"
4779+ ],
4780+ "test": [],
4781+ "js": [],
4782+ "css": [],
4783+ "qweb": [],
4784+ "installable": True,
4785+ "auto_install": False,
4786+ "active": False
4787+}
4788\ No newline at end of file
4789
4790=== modified file 'account_move_line_group_analytic/__init__.py'
4791--- account_move_line_group_analytic/__init__.py 2014-05-09 21:51:34 +0000
4792+++ account_move_line_group_analytic/__init__.py 2014-10-07 08:56:40 +0000
4793@@ -20,4 +20,4 @@
4794 # You should have received a copy of the GNU Affero General Public License
4795 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4796 ################################################################################
4797-import account_move_line
4798+from . import account_move_line
4799
4800=== modified file 'account_move_line_group_analytic/__openerp__.py'
4801--- account_move_line_group_analytic/__openerp__.py 2014-05-09 21:51:34 +0000
4802+++ account_move_line_group_analytic/__openerp__.py 2014-10-07 08:56:40 +0000
4803@@ -20,30 +20,34 @@
4804 # You should have received a copy of the GNU Affero General Public License
4805 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4806 ################################################################################
4807+#"license" : "AGPL-3",
4808 {
4809- "name" : "Grouped by product,move_id y analytic in model account_move_line",
4810- "version" : "1.0",
4811- "depends" : [
4812- 'account',
4813- 'analytic'
4814- ],
4815- "author" : "Vauxoo",
4816- #"license" : "AGPL-3",
4817- "description" : """
4818+ "name": "Grouped by product,move_id y analytic in model account_move_line",
4819+ "version": "1.0",
4820+ "author": "Vauxoo",
4821+ "category": "Generic Modules",
4822+ "description": """
4823 Improvements in account.move.line view:
4824 =======================================
4825
4826 On search view for journal items (account_move_line) we add group by product,
4827 move_id and analytic_id.
4828- """,
4829- "website" : "http://vauxoo.com",
4830- "category" : "Generic Modules",
4831- "init_xml" : [],
4832- "demo_xml" : [],
4833- "test": [],
4834- "update_xml" : ['account_move_line.xml',
4835- ],
4836- "active": False,
4837- "installable": True,
4838-}
4839-
4840+ """,
4841+ "website": "http://vauxoo.com",
4842+ "license": "",
4843+ "depends": [
4844+ "account",
4845+ "analytic"
4846+ ],
4847+ "demo": [],
4848+ "data": [
4849+ "account_move_line.xml"
4850+ ],
4851+ "test": [],
4852+ "js": [],
4853+ "css": [],
4854+ "qweb": [],
4855+ "installable": True,
4856+ "auto_install": False,
4857+ "active": False
4858+}
4859\ No newline at end of file
4860
4861=== modified file 'account_move_line_group_analytic/account_move_line.py'
4862--- account_move_line_group_analytic/account_move_line.py 2014-05-09 21:51:34 +0000
4863+++ account_move_line_group_analytic/account_move_line.py 2014-10-07 08:56:40 +0000
4864@@ -21,9 +21,8 @@
4865 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4866 ##########################################################################
4867
4868-from openerp.osv import osv, fields, orm
4869+from openerp.osv import osv
4870 from lxml import etree
4871-import openerp.tools as tools
4872
4873
4874 class account_move_line(osv.Model):
4875@@ -44,13 +43,13 @@
4876 result['arch'] = etree.tostring(xml_form)
4877 result['fields'].update({
4878 'product_id': {
4879- 'domain': [],
4880- 'string': u'Product',
4881- 'readonly': False,
4882- 'relation': 'product.product',
4883- 'context': {},
4884- 'selectable': True,
4885- 'type': 'many2one',
4886- 'select': 2}
4887+ 'domain': [],
4888+ 'string': u'Product',
4889+ 'readonly': False,
4890+ 'relation': 'product.product',
4891+ 'context': {},
4892+ 'selectable': True,
4893+ 'type': 'many2one',
4894+ 'select': 2}
4895 })
4896 return result
4897
4898=== modified file 'account_move_line_group_by_asset/__openerp__.py'
4899--- account_move_line_group_by_asset/__openerp__.py 2014-05-09 21:51:34 +0000
4900+++ account_move_line_group_by_asset/__openerp__.py 2014-10-07 08:56:40 +0000
4901@@ -24,26 +24,27 @@
4902 #
4903 ##############################################################################
4904 {
4905- "name" : "Account Move Line Group By Asset",
4906- "version" : "1.0",
4907- "author" : "Vauxoo",
4908- "category" : "Generic Modules",
4909- "description" : """
4910+ "name": "Account Move Line Group By Asset",
4911+ "version": "1.0",
4912+ "author": "Vauxoo",
4913+ "category": "Generic Modules",
4914+ "description": """
4915 This module add the option by group in Journal Items by asset
4916- """,
4917- "website" : "http://www.vauxoo.com/",
4918- "license" : "AGPL-3",
4919- "depends" : [
4920- "account_asset",
4921- ],
4922- "demo" : [],
4923- "data" : [
4924- 'account_view.xml',
4925- ],
4926- 'js': [],
4927- 'qweb' : [],
4928- 'css':[],
4929- 'test': [],
4930- "installable" : True,
4931- "active" : False,
4932-}
4933+ """,
4934+ "website": "http://www.vauxoo.com/",
4935+ "license": "AGPL-3",
4936+ "depends": [
4937+ "account_asset"
4938+ ],
4939+ "demo": [],
4940+ "data": [
4941+ "account_view.xml"
4942+ ],
4943+ "test": [],
4944+ "js": [],
4945+ "css": [],
4946+ "qweb": [],
4947+ "installable": True,
4948+ "auto_install": False,
4949+ "active": False
4950+}
4951\ No newline at end of file
4952
4953=== modified file 'account_move_line_group_by_extend/__init__.py'
4954--- account_move_line_group_by_extend/__init__.py 2014-05-09 21:51:34 +0000
4955+++ account_move_line_group_by_extend/__init__.py 2014-10-07 08:56:40 +0000
4956@@ -20,4 +20,4 @@
4957 # You should have received a copy of the GNU Affero General Public License
4958 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4959 ################################################################################
4960-import account_move_line
4961+from . import account_move_line
4962
4963=== modified file 'account_move_line_group_by_extend/__openerp__.py'
4964--- account_move_line_group_by_extend/__openerp__.py 2014-05-09 21:51:34 +0000
4965+++ account_move_line_group_by_extend/__openerp__.py 2014-10-07 08:56:40 +0000
4966@@ -20,22 +20,28 @@
4967 # You should have received a copy of the GNU Affero General Public License
4968 # along with this program. If not, see <http://www.gnu.org/licenses/>.
4969 ################################################################################
4970+#"license" : "AGPL-3",
4971 {
4972- "name" : "Grouped by production and stock move in model account_move_line",
4973- "version" : "1.0",
4974- "depends" : ['account_relation_move'],
4975- "author" : "Vauxoo",
4976- #"license" : "AGPL-3",
4977- "description" : """Grouped by production and stock move in model account_move_line
4978- """,
4979- "website" : "http://vauxoo.com",
4980- "category" : "Generic Modules",
4981- "init_xml" : [],
4982- "demo_xml" : [],
4983- "test": [],
4984- "update_xml" : ['account_move_line.xml',
4985- ],
4986- "active": False,
4987- "installable": True,
4988-}
4989-
4990+ "name": "Grouped by production and stock move in model account_move_line",
4991+ "version": "1.0",
4992+ "author": "Vauxoo",
4993+ "category": "Generic Modules",
4994+ "description": """Grouped by production and stock move in model account_move_line
4995+ """,
4996+ "website": "http://vauxoo.com",
4997+ "license": "",
4998+ "depends": [
4999+ "account_relation_move"
5000+ ],
The diff has been truncated for viewing.