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
=== modified file 'account_advance_payment/__init__.py'
--- account_advance_payment/__init__.py 2014-05-09 21:51:34 +0000
+++ account_advance_payment/__init__.py 2014-10-07 08:56:40 +0000
@@ -23,4 +23,4 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25#25#
26import model26from . import model
2727
=== modified file 'account_advance_payment/__openerp__.py'
--- account_advance_payment/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_advance_payment/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -23,13 +23,12 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25#25#
26
27{26{
28 "name": "Account Advance Payment",27 "name": "Account Advance Payment",
29 "version": "1.0",28 "version": "1.0",
30 "author": "Vauxoo",29 "author": "Vauxoo",
31 "category": "Generic Modules",30 "category": "Generic Modules",
32 "description" : """31 "description": """
33Account Advance Payment32Account Advance Payment
34=======================33=======================
3534
@@ -40,19 +39,23 @@
4039
41Also adds the field Transaction Type in the view payments of customs and suppliers.40Also adds the field Transaction Type in the view payments of customs and suppliers.
4241
43 """,42 """,
44 "website": "http://www.vauxoo.com/",43 "website": "http://www.vauxoo.com/",
45 "license": "AGPL-3",44 "license": "AGPL-3",
46 "depends": [45 "depends": [
47 "account",46 "account",
48 "account_voucher",47 "account_voucher"
49 ],48 ],
50 "demo": [49 "demo": [],
51 ],
52 "data": [50 "data": [
53 'view/res_partner_advance_payment_view.xml',51 "view/res_partner_advance_payment_view.xml",
54 'view/account_voucher_advance_payment_view.xml',52 "view/account_voucher_advance_payment_view.xml"
55 ],53 ],
56 "installable": True,54 "test": [],
57 "active": False,55 "js": [],
58}56 "css": [],
57 "qweb": [],
58 "installable": True,
59 "auto_install": False,
60 "active": False
61}
59\ No newline at end of file62\ No newline at end of file
6063
=== modified file 'account_advance_payment/model/__init__.py'
--- account_advance_payment/model/__init__.py 2014-05-09 21:51:34 +0000
+++ account_advance_payment/model/__init__.py 2014-10-07 08:56:40 +0000
@@ -24,6 +24,6 @@
24#24#
25#25#
2626
27import res_partner27from . import res_partner
28import account_voucher28from . import account_voucher
2929
3030
=== modified file 'account_advance_payment/model/account_voucher.py'
--- account_advance_payment/model/account_voucher.py 2014-05-09 21:51:34 +0000
+++ account_advance_payment/model/account_voucher.py 2014-10-07 08:56:40 +0000
@@ -24,21 +24,43 @@
24#24#
2525
26from openerp.osv import osv, fields26from openerp.osv import osv, fields
27from openerp.tools.translate import _
2728
2829
29class account_voucher(osv.Model):30class account_voucher(osv.Model):
30 _inherit = 'account.voucher'31 _inherit = 'account.voucher'
31 _columns = {32 _columns = {
32 'trans_type': fields.selection([33 'advance_account_id': fields.many2one('account.account', 'Advance Account', required=False, readonly=True, states={'draft': [('readonly', False)]}),
33 ('normal', 'Payments'),34 }
34 ('advance', 'Advance'),35
35 ], 'Transaction Type', select=True, track_visibility='always',36 def writeoff_move_line_get(self, cr, uid, voucher_id, line_total, move_id, name, company_currency, current_currency, context=None):
36 help="""Payments.- Normal payment is made. \nAdvance.- Advance payment of custom or supplier"""),37 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)
37 }38 voucher = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context)
3839 if move_line and not voucher.payment_option == 'with_writeoff' and voucher.partner_id:
39 _defaults = {40 if voucher.type in ('sale', 'receipt'):
40 'trans_type': 'normal',41 account_id = voucher.advance_account_id and voucher.advance_account_id.id or voucher.partner_id.property_account_customer_advance.id
41 }42 else:
4243 account_id = voucher.advance_account_id and voucher.advance_account_id.id or voucher.partner_id.property_account_supplier_advance.id
43 def onchange_account_advance_payment(self, cr, uid, ids, trans_type, context=None):44 if not account_id:
44 return True45 raise osv.except_osv(_('Missing Configuration on Partner !'),
46 _('Please Fill Advance Accounts on Partner !'))
47 move_line['account_id'] = account_id
48 return move_line
49
50 def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=None):
51 res = super(account_voucher, self).onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
52 if not res:
53 return {}
54 context = context or {}
55
56 partner_pool = self.pool.get('res.partner')
57
58 partner = partner_pool.browse(cr, uid, partner_id, context=context)
59 advance_account_id = False
60 if ttype in ('sale', 'receipt'):
61 advance_account_id = partner.property_account_customer_advance.id
62 else:
63 advance_account_id = partner.property_account_supplier_advance.id
64 res['value']['advance_account_id'] = advance_account_id
65
66 return res
4567
=== modified file 'account_advance_payment/model/res_partner.py'
--- account_advance_payment/model/res_partner.py 2014-05-09 21:51:34 +0000
+++ account_advance_payment/model/res_partner.py 2014-10-07 08:56:40 +0000
@@ -42,7 +42,7 @@
42 relation='account.account',42 relation='account.account',
43 string="Account Supplier Advance",43 string="Account Supplier Advance",
44 view_load=True,44 view_load=True,
45 domain="[('type','=','receivable')]",45 domain="[('type','=','payable')]",
46 help="This account will be used for advance payment of suppliers"),46 help="This account will be used for advance payment of suppliers"),
47 'property_account_customer_advance': fields.property(47 'property_account_customer_advance': fields.property(
48 'account.account',48 'account.account',
@@ -50,18 +50,18 @@
50 relation='account.account',50 relation='account.account',
51 string="Account Customer Advance",51 string="Account Customer Advance",
52 view_load=True,52 view_load=True,
53 domain="[('type','=','payable')]",53 domain="[('type','=','receivable')]",
54 help="This account will be used for advance payment of custom"),54 help="This account will be used for advance payment of custom"),
55 'customer_advance': fields.function(55 # 'customer_advance': fields.function(
56 _supplier_customer_advance_get,56 # _supplier_customer_advance_get,
57 type='float',57 # type='float',
58 string='Total Customer Advance',58 # string='Total Customer Advance',
59 multi='sc',59 # multi='sc',
60 help="Total amount of advance payment of custom."),60 # help="Total amount of advance payment of custom."),
61 'supplier_advance': fields.function(61 # 'supplier_advance': fields.function(
62 _supplier_customer_advance_get,62 # _supplier_customer_advance_get,
63 type='float',63 # type='float',
64 string='Total Supplier Advance',64 # string='Total Supplier Advance',
65 multi='sc',65 # multi='sc',
66 help="Total amount of advance payment of suppliers."),66 # help="Total amount of advance payment of suppliers."),
67 }67 }
6868
=== modified file 'account_advance_payment/view/account_voucher_advance_payment_view.xml'
--- account_advance_payment/view/account_voucher_advance_payment_view.xml 2014-05-09 21:51:34 +0000
+++ account_advance_payment/view/account_voucher_advance_payment_view.xml 2014-10-07 08:56:40 +0000
@@ -7,7 +7,7 @@
7 <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>7 <field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
8 <field name="arch" type="xml">8 <field name="arch" type="xml">
9 <xpath expr="//field[@name='journal_id']" position="after">9 <xpath expr="//field[@name='journal_id']" position="after">
10 <field name="trans_type" on_change="onchange_account_advance_payment(trans_type)"/>10 <field name="advance_account_id"/>
11 </xpath>11 </xpath>
12 </field>12 </field>
13 </record>13 </record>
@@ -17,7 +17,7 @@
17 <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/>17 <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/>
18 <field name="arch" type="xml">18 <field name="arch" type="xml">
19 <xpath expr="//field[@name='journal_id']" position="after">19 <xpath expr="//field[@name='journal_id']" position="after">
20 <field name="trans_type" on_change="onchange_account_advance_payment(trans_type)"/>20 <field name="advance_account_id"/>
21 </xpath>21 </xpath>
22 </field>22 </field>
23 </record>23 </record>
2424
=== modified file 'account_advance_payment/view/res_partner_advance_payment_view.xml'
--- account_advance_payment/view/res_partner_advance_payment_view.xml 2014-05-09 21:51:34 +0000
+++ account_advance_payment/view/res_partner_advance_payment_view.xml 2014-10-07 08:56:40 +0000
@@ -9,15 +9,17 @@
9 <xpath expr="//field[@name='property_account_payable']" position="after" >9 <xpath expr="//field[@name='property_account_payable']" position="after" >
10 <field name="property_account_supplier_advance"/>10 <field name="property_account_supplier_advance"/>
11 </xpath>11 </xpath>
12 <xpath expr="//field[@name='property_account_receivable']" position="after" >
13 <field name="property_account_customer_advance"/>
14 </xpath>
15 <!--
12 <xpath expr="//field[@name='credit']" position="after" >16 <xpath expr="//field[@name='credit']" position="after" >
13 <field name="customer_advance"/>17 <field name="customer_advance"/>
14 </xpath>18 </xpath>
15 <xpath expr="//field[@name='property_account_receivable']" position="after" >
16 <field name="property_account_customer_advance"/>
17 </xpath>
18 <xpath expr="//field[@name='debit']" position="after" >19 <xpath expr="//field[@name='debit']" position="after" >
19 <field name="supplier_advance"/>20 <field name="supplier_advance"/>
20 </xpath>21 </xpath>
22 -->
21 </field>23 </field>
22 </record>24 </record>
23 </data>25 </data>
2426
=== modified file 'account_aged_partner_balance_vw/__init__.py'
--- account_aged_partner_balance_vw/__init__.py 2014-05-09 21:51:34 +0000
+++ account_aged_partner_balance_vw/__init__.py 2014-10-07 08:56:40 +0000
@@ -24,5 +24,5 @@
24#24#
25##############################################################################25##############################################################################
2626
27import model 27from . import model
28import wizard28from . import wizard
2929
=== modified file 'account_aged_partner_balance_vw/__openerp__.py'
--- account_aged_partner_balance_vw/__openerp__.py 2014-08-18 16:35:12 +0000
+++ account_aged_partner_balance_vw/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -23,30 +23,33 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26
27{26{
28 "name" : "Report Account Aged Partner Balance view",27 "name": "Report Account Aged Partner Balance view",
29 "version" : "2.0",28 "version": "2.0",
30 "author" : "Vauxoo",29 "author": "Vauxoo",
31 "category" : "Localization/Mexico",30 "category": "Localization/Mexico",
32 "description" : """This module creates a sql view for Account Aged Partner Balance today.""",31 "description": """This module creates a sql view for Account Aged Partner Balance today.""",
33 "website" : "http://www.vauxoo.com/",32 "website": "http://www.vauxoo.com/",
34 "license" : "AGPL-3",33 "license": "AGPL-3",
35 "depends" : [34 "depends": [
36 "account",35 "account",
37 'board',36 "board",
38 'report_webkit',37 "report_webkit"
39 ],38 ],
40 "init_xml" : [],39 "demo": [],
41 "demo_xml" : [],40 "data": [
42 "update_xml" : [41 "view/wizard.xml",
43 "view/wizard.xml",42 "view/view.xml",
44 "view/view.xml",43 "view/action_menues.xml",
45 'view/action_menues.xml',44 "view/wizard_print_report_view.xml",
46 'view/wizard_print_report_view.xml',45 "data/data.xml",
47 "data/data.xml",46 "report/report.xml"
48 'report/report.xml',47 ],
49 ],48 "test": [],
50 "installable" : True,49 "js": [],
51 'auto_install': False,50 "css": [],
52}51 "qweb": [],
52 "installable": True,
53 "auto_install": False,
54 "active": False
55}
53\ No newline at end of file56\ No newline at end of file
5457
=== modified file 'account_aged_partner_balance_vw/model/__init__.py'
--- account_aged_partner_balance_vw/model/__init__.py 2014-05-09 21:51:34 +0000
+++ account_aged_partner_balance_vw/model/__init__.py 2014-10-07 08:56:40 +0000
@@ -24,4 +24,4 @@
24#24#
25##############################################################################25##############################################################################
2626
27import account_aged_partner_balance_vw27from . import account_aged_partner_balance_vw
2828
=== modified file 'account_aged_partner_balance_vw/model/account_aged_partner_balance_vw.py'
--- account_aged_partner_balance_vw/model/account_aged_partner_balance_vw.py 2014-05-09 21:51:34 +0000
+++ account_aged_partner_balance_vw/model/account_aged_partner_balance_vw.py 2014-10-07 08:56:40 +0000
@@ -25,12 +25,8 @@
25#25#
2626
27from openerp.osv import fields, osv27from openerp.osv import fields, osv
28import openerp.tools as tools
29from openerp.tools.translate import _
3028
31import openerp.netsvc as netsvc
32import time29import time
33import os
34import mx.DateTime30import mx.DateTime
3531
3632
@@ -95,7 +91,7 @@
95 ], 'Type of Report', help='Reporte Type'),91 ], 'Type of Report', help='Reporte Type'),
96 'state': fields.selection([('draft', 'New'), ('open', 'Open'), ('done', 'Done'),92 'state': fields.selection([('draft', 'New'), ('open', 'Open'), ('done', 'Done'),
97 ], 'Status', help='Document State'),93 ], 'Status', help='Document State'),
98 'wizard_ids' : fields.one2many('wizard.report.aged.partner.balance', 'aged_trial_report_id')94 'wizard_ids': fields.one2many('wizard.report.aged.partner.balance', 'aged_trial_report_id')
99 }95 }
10096
101 _defaults = {97 _defaults = {
@@ -118,15 +114,15 @@
118 res = self.check_report(cr, uid, ids, context=context)114 res = self.check_report(cr, uid, ids, context=context)
119 data = res['datas']115 data = res['datas']
120 datas['form'] = data['form']116 datas['form'] = data['form']
121 context.update({'data' : data, 'datas' : datas})117 context.update({'data': data, 'datas': datas})
122 if wzd_brw.type == 'by_document':118 if wzd_brw.type == 'by_document':
123 return {119 return {
124 'res_model': 'wizard.report.aged.partner.balance',120 'res_model': 'wizard.report.aged.partner.balance',
125 'view_type': 'form',121 'view_type': 'form',
126 'view_mode': 'form',122 'view_mode': 'form',
127 'context': context,123 'context': context,
128 'type': 'ir.actions.act_window',124 'type': 'ir.actions.act_window',
129 'target': 'new',125 'target': 'new',
130 }126 }
131 return {127 return {
132 'type': 'ir.actions.report.xml',128 'type': 'ir.actions.report.xml',
@@ -177,7 +173,6 @@
177173
178 def _get_partners(self, cr, uid, ids, form, context=None):174 def _get_partners(self, cr, uid, ids, form, context=None):
179 context = context or {}175 context = context or {}
180 res = []
181 wzd_brw = self.browse(cr, uid, ids[0], context=context)176 wzd_brw = self.browse(cr, uid, ids[0], context=context)
182 move_state = ['draft', 'posted']177 move_state = ['draft', 'posted']
183 if self.target_move == 'posted':178 if self.target_move == 'posted':
184179
=== modified file 'account_aged_partner_balance_vw/wizard/__init__.py'
--- account_aged_partner_balance_vw/wizard/__init__.py 2014-05-09 21:51:34 +0000
+++ account_aged_partner_balance_vw/wizard/__init__.py 2014-10-07 08:56:40 +0000
@@ -25,4 +25,4 @@
25##############################################################################25##############################################################################
2626
27#import wizard_open_move_line27#import wizard_open_move_line
28import wizard_print_report28from . import wizard_print_report
2929
=== modified file 'account_aged_partner_balance_vw/wizard/wizard_open_move_line.py'
--- account_aged_partner_balance_vw/wizard/wizard_open_move_line.py 2014-09-12 21:07:09 +0000
+++ account_aged_partner_balance_vw/wizard/wizard_open_move_line.py 2014-10-07 08:56:40 +0000
@@ -26,7 +26,9 @@
2626
27import wizard27import wizard
2828
29
29class wizard_open_move_line(wizard.interface):30class wizard_open_move_line(wizard.interface):
31
30 def _open_window(self, cr, uid, data, context={}):32 def _open_window(self, cr, uid, data, context={}):
31 if not context:33 if not context:
32 context = {}34 context = {}
@@ -75,7 +77,7 @@
75 AND (l.reconcile_id IS NULL)77 AND (l.reconcile_id IS NULL)
76 AND account_move.state = 'posted'78 AND account_move.state = 'posted'
77 AND l.reconcile_id is null --and l.currency_id is null79 AND l.reconcile_id is null --and l.currency_id is null
78 """+where_query_str80 """ + where_query_str
79 cr.execute(query)81 cr.execute(query)
80 res = cr.fetchall()82 res = cr.fetchall()
81 move_ids = [r[0] for r in res]83 move_ids = [r[0] for r in res]
8284
=== modified file 'account_aged_partner_balance_vw/wizard/wizard_print_report.py'
--- account_aged_partner_balance_vw/wizard/wizard_print_report.py 2014-05-09 21:51:34 +0000
+++ account_aged_partner_balance_vw/wizard/wizard_print_report.py 2014-10-07 08:56:40 +0000
@@ -25,9 +25,10 @@
25##############################################################################25##############################################################################
26from openerp.osv import fields, osv26from openerp.osv import fields, osv
2727
28
28class wizard_report_aged_partner_balance(osv.osv_memory):29class wizard_report_aged_partner_balance(osv.osv_memory):
29 _name = 'wizard.report.aged.partner.balance'30 _name = 'wizard.report.aged.partner.balance'
30 31
31 def default_get(self, cr, uid, fields_list=None, context=None):32 def default_get(self, cr, uid, fields_list=None, context=None):
32 res = {}33 res = {}
33 acc_ag_obj = self.pool.get('account.aged.trial.balance')34 acc_ag_obj = self.pool.get('account.aged.trial.balance')
@@ -35,22 +36,21 @@
35 partners_dict = acc_ag_obj._get_partners(cr, uid, context.get('active_ids'),36 partners_dict = acc_ag_obj._get_partners(cr, uid, context.get('active_ids'),
36 context.get('data'), context=context)37 context.get('data'), context=context)
37 partner_ids = [partner.get('id') for partner in partners_dict]38 partner_ids = [partner.get('id') for partner in partners_dict]
38 res.update({'partner_ids_default' : partner_ids, 'aged_trial_report_id': context.get('active_id', False)})39 res.update({'partner_ids_default': partner_ids, 'aged_trial_report_id': context.get('active_id', False)})
39 return res40 return res
40 41
41 _columns = {42 _columns = {
42 'group_user' : fields.boolean('Group by User', help='¿Group report by user?'),43 'group_user': fields.boolean('Group by User', help='¿Group report by user?'),
43 'show_aml' : fields.boolean('Show Journal Entries', help='In the report was show the '\44 'show_aml': fields.boolean('Show Journal Entries', help='In the report was show the '
44 'journal entries'),45 'journal entries'),
45 'partner_ids' : fields.many2many('res.partner', 'partner_in_report_aged', 'wizard_id',46 'partner_ids': fields.many2many('res.partner', 'partner_in_report_aged', 'wizard_id',
46 'partner_id', 'Partners', help='Partners to show in Report'),47 'partner_id', 'Partners', help='Partners to show in Report'),
47 'partner_ids_default' : fields.many2many('res.partner', 'partner_in_report_aged_default',48 'partner_ids_default': fields.many2many('res.partner', 'partner_in_report_aged_default',
48 'wizard_id', 'partner_id', 'Partners Default', help='Partners to show in Report by default'),49 'wizard_id', 'partner_id', 'Partners Default', help='Partners to show in Report by default'),
49 'aged_trial_report_id' : fields.many2one('account.aged.trial.balance',)50 'aged_trial_report_id': fields.many2one('account.aged.trial.balance',)
50 }51 }
51 52
52 def print_report(self, cr, uid, ids, context=None):53 def print_report(self, cr, uid, ids, context=None):
53 acc_trial_obj = self.pool.get('account.aged.trial.balance')
54 datas = {'ids': ids}54 datas = {'ids': ids}
55 if context.get('datas', False):55 if context.get('datas', False):
56 datas = context.get('datas')56 datas = context.get('datas')
@@ -59,5 +59,3 @@
59 'report_name': 'account_aged_partner_balance_report',59 'report_name': 'account_aged_partner_balance_report',
60 'datas': datas,60 'datas': datas,
61 }61 }
62
63
6462
=== modified file 'account_amortization/__init__.py'
--- account_amortization/__init__.py 2014-05-09 21:51:34 +0000
+++ account_amortization/__init__.py 2014-10-07 08:56:40 +0000
@@ -24,4 +24,4 @@
24#24#
25##############################################################################25##############################################################################
2626
27import model27from . import model
2828
=== modified file 'account_amortization/__openerp__.py'
--- account_amortization/__openerp__.py 2014-06-22 20:48:35 +0000
+++ account_amortization/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -23,23 +23,15 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26
27{26{
28 "name": "Vauxoo Account Amortization",27 "name": "Vauxoo Account Amortization",
29 "version": "0.1",28 "version": "0.1",
30 "depends": [29 "author": "Vauxoo",
31 "decimal_precision",30 "category": "Accounting & Finance",
32 "account_asset",
33 "account_asset_date",
34 ],
35 "author": "Vauxoo",
36 "licence": "AGPL v3",
37 "website": "http://www.vauxoo.com",
38 "category": "Accounting & Finance",
39 "description": """31 "description": """
40Vauxoo Account Amortization.32Vauxoo Account Amortization.
41============================33============================
42This module allows to separate the expenses amortization of the assets 34This module allows to separate the expenses amortization of the assets
43depreciation.35depreciation.
4436
45This module adds:37This module adds:
@@ -52,10 +44,23 @@
52See the documentation here:44See the documentation here:
53---------------------------45---------------------------
54http://www.principlesofaccounting.com/chapter13/chapter13.html46http://www.principlesofaccounting.com/chapter13/chapter13.html
55""",47""",
56 "data":[48 "website": "http://www.vauxoo.com",
57 "view/account_amortization_view.xml",49 "license": "",
58 ],50 "depends": [
59 "installable": True,51 "decimal_precision",
60 "auto_install": False,52 "account_asset",
61}53 "account_asset_date"
54 ],
55 "demo": [],
56 "data": [
57 "view/account_amortization_view.xml"
58 ],
59 "test": [],
60 "js": [],
61 "css": [],
62 "qweb": [],
63 "installable": True,
64 "auto_install": False,
65 "active": False
66}
62\ No newline at end of file67\ No newline at end of file
6368
=== modified file 'account_amortization/model/__init__.py'
--- account_amortization/model/__init__.py 2014-05-09 21:51:34 +0000
+++ account_amortization/model/__init__.py 2014-10-07 08:56:40 +0000
@@ -24,4 +24,4 @@
24#24#
25##############################################################################25##############################################################################
2626
27import account_amortization27from . import account_amortization
2828
=== modified file 'account_amortization/model/account_amortization.py'
--- account_amortization/model/account_amortization.py 2014-05-09 21:51:34 +0000
+++ account_amortization/model/account_amortization.py 2014-10-07 08:56:40 +0000
@@ -24,21 +24,21 @@
24#24#
25##############################################################################25##############################################################################
2626
27from openerp.osv import fields,osv27from openerp.osv import fields, osv
28from openerp.tools.translate import _28
29import openerp.addons.decimal_precision as dp
3029
31class account_asset_asset(osv.Model):30class account_asset_asset(osv.Model):
32 31
33 _inherit = 'account.asset.asset'32 _inherit = 'account.asset.asset'
34 _description = 'Account Amortization'33 _description = 'Account Amortization'
3534
36 _columns = {35 _columns = {
37 'doc_type':fields.selection([('deprecation','Deprecation'),36 'doc_type': fields.selection([('deprecation', 'Deprecation'),
38 ('amortization','Amortization'),], 'Type', 37 ('amortization', 'Amortization'), ], 'Type',
39 help='''Asset type, deprecation allows you depreciate an asset, the 38 help='''Asset type, deprecation allows you depreciate an asset, the
40 amortization allows you amortize an expense.'''),39 amortization allows you amortize an expense.'''),
41 }40 }
41
4242
43class account_asset_category(osv.Model):43class account_asset_category(osv.Model):
4444
@@ -46,8 +46,8 @@
46 _description = 'Account Amortization Category'46 _description = 'Account Amortization Category'
4747
48 _columns = {48 _columns = {
49 'doc_type': fields.selection([('deprecation','Deprecation'),49 'doc_type': fields.selection([('deprecation', 'Deprecation'),
50 ('amortization','Amortization'),], 'Type',50 ('amortization', 'Amortization'), ], 'Type',
51 help='''Asset category type, deprecation allows you depreciate an asset, the 51 help='''Asset category type, deprecation allows you depreciate an asset, the
52 amortization allows you amortize an expense.'''),52 amortization allows you amortize an expense.'''),
53 }53 }
5454
=== modified file 'account_analytic_active_field/__init__.py'
--- account_analytic_active_field/__init__.py 2014-05-09 21:51:34 +0000
+++ account_analytic_active_field/__init__.py 2014-10-07 08:56:40 +0000
@@ -20,4 +20,4 @@
20# You should have received a copy of the GNU Affero General Public License20# You should have received a copy of the GNU Affero General Public License
21# along with this program. If not, see <http://www.gnu.org/licenses/>.21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22################################################################################22################################################################################
23import account_analytic_account23from . import account_analytic_account
2424
=== modified file 'account_analytic_active_field/__openerp__.py'
--- account_analytic_active_field/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_analytic_active_field/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -20,27 +20,31 @@
20# You should have received a copy of the GNU Affero General Public License20# You should have received a copy of the GNU Affero General Public License
21# along with this program. If not, see <http://www.gnu.org/licenses/>.21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22################################################################################22################################################################################
23
24{23{
25 "name" : "Field Active In Analytic Accounts",24 "name": "Field Active In Analytic Accounts",
26 "version" : "1.0",25 "version": "1.0",
27 "author" : "Vauxoo",26 "author": "Vauxoo",
28 "category" : "Accouting",27 "category": "Accouting",
29 "description" : """28 "description": """
30Field Active In Analytic Accounts29Field Active In Analytic Accounts
31=================================30=================================
3231
33Add field active to analytic accounts 32Add field active to analytic accounts
34 """,33 """,
35 "website" : "http://www.vauxoo.com/",34 "website": "http://www.vauxoo.com/",
36 "license" : "AGPL-3",35 "license": "AGPL-3",
37 "depends" : [36 "depends": [
38 "analytic",37 "analytic"
39 ],38 ],
40 "demo" : [],39 "demo": [],
41 "data" : [40 "data": [
42 "account_analytic_account_view.xml",41 "account_analytic_account_view.xml"
43 ],42 ],
44 "installable" : True,43 "test": [],
45 "active" : False,44 "js": [],
46}45 "css": [],
46 "qweb": [],
47 "installable": True,
48 "auto_install": False,
49 "active": False
50}
47\ No newline at end of file51\ No newline at end of file
4852
=== modified file 'account_analytic_active_field/account_analytic_account.py'
--- account_analytic_active_field/account_analytic_account.py 2014-05-09 21:51:34 +0000
+++ account_analytic_active_field/account_analytic_account.py 2014-10-07 08:56:40 +0000
@@ -24,13 +24,13 @@
24#24#
25##############################################################################25##############################################################################
26from openerp.osv import osv, fields26from openerp.osv import osv, fields
27from openerp.tools.translate import _27
2828
29class account_analytic_account(osv.Model):29class account_analytic_account(osv.Model):
30 _name = "account.analytic.account"30 _name = "account.analytic.account"
31 _inherit = "account.analytic.account"31 _inherit = "account.analytic.account"
32 _columns = {32 _columns = {
33 'active' : fields.boolean('Active')33 'active': fields.boolean('Active')
34 }34 }
3535
36 _defaults = {36 _defaults = {
3737
=== modified file 'account_analytic_btree/__init__.py'
--- account_analytic_btree/__init__.py 2014-05-09 21:51:34 +0000
+++ account_analytic_btree/__init__.py 2014-10-07 08:56:40 +0000
@@ -26,4 +26,4 @@
26##############################################################################26##############################################################################
2727
2828
29import account_analytic_btree29from . import account_analytic_btree
3030
=== modified file 'account_analytic_btree/__openerp__.py'
--- account_analytic_btree/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_analytic_btree/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -25,16 +25,24 @@
25#25#
26##############################################################################26##############################################################################
27{27{
28 "name" : "Creacion de parent_left y parent_right en analiticas",28 "name": "Creacion de parent_left y parent_right en analiticas",
29 "version" : "1.0",29 "version": "1.0",
30 "author" : "Vauxoo",30 "author": "Vauxoo",
31 "category" : "Localization/Mexico",31 "category": "Localization/Mexico",
32 "description":"""This module creates parent_left y paret_right en analytic's accounts""",32 "description": """This module creates parent_left y paret_right en analytic's accounts""",
33 "website" : "http://www.vauxoo.com/",33 "website": "http://www.vauxoo.com/",
34 "depends" : ["account", "project"],34 "license": "",
35 "init_xml" : [],35 "depends": [
36 "demo_xml" : [],36 "account",
37 "update_xml" : [],37 "project"
38 "installable" : True,38 ],
39 "active" : False,39 "demo": [],
40}40 "data": [],
41 "test": [],
42 "js": [],
43 "css": [],
44 "qweb": [],
45 "installable": True,
46 "auto_install": False,
47 "active": False
48}
41\ No newline at end of file49\ No newline at end of file
4250
=== modified file 'account_analytic_required/__init__.py'
--- account_analytic_required/__init__.py 2014-05-09 21:51:34 +0000
+++ account_analytic_required/__init__.py 2014-10-07 08:56:40 +0000
@@ -23,4 +23,4 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26import account26from . import account
2727
=== modified file 'account_analytic_required/__openerp__.py'
--- account_analytic_required/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_analytic_required/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -23,24 +23,28 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26
27{26{
28 "name" : "Account Analytic Required",27 "name": "Account Analytic Required",
29 "version" : "1.0",28 "version": "1.0",
30 "author" : "Vauxoo",29 "author": "Vauxoo",
31 "category" : "Generic Modules",30 "category": "Generic Modules",
32 "description" : """31 "description": """
33 Add field analytic_required, for when is select required an account analytic to the validate an account.move32 Add field analytic_required, for when is select required an account analytic to the validate an account.move
34 """,33 """,
35 "website" : "http://www.vauxoo.com/",34 "website": "http://www.vauxoo.com/",
36 "license" : "AGPL-3",35 "license": "AGPL-3",
37 "depends" : ["account",36 "depends": [
38 ],37 "account"
39 "init_xml" : [],38 ],
40 "demo_xml" : [],39 "demo": [],
41 "update_xml" : [40 "data": [
42 "account_view.xml",41 "account_view.xml"
43 ],42 ],
44 "installable" : True,43 "test": [],
45 "active" : False,44 "js": [],
46}45 "css": [],
46 "qweb": [],
47 "installable": True,
48 "auto_install": False,
49 "active": False
50}
47\ No newline at end of file51\ No newline at end of file
4852
=== modified file 'account_analytic_required/account.py'
--- account_analytic_required/account.py 2014-05-09 21:51:34 +0000
+++ account_analytic_required/account.py 2014-10-07 08:56:40 +0000
@@ -31,33 +31,34 @@
31 _inherit = 'account.account'31 _inherit = 'account.account'
3232
33 _columns = {33 _columns = {
34 'analytic_required': fields.boolean('Analytic Required', help='If '\34 'analytic_required': fields.boolean('Analytic Required', help='If '
35 'this field is active, the journal items that used this account '\35 'this field is active, the journal items that used this account '
36 'should have an analytic account'),36 'should have an analytic account'),
37 }37 }
38 38
39
39class account_invoice_line(osv.Model):40class account_invoice_line(osv.Model):
40 _inherit = 'account.invoice.line'41 _inherit = 'account.invoice.line'
41 42
42 _columns = {43 _columns = {
43 'analytic_required': fields.boolean('Analytic Required', help='If this field is active, '\44 'analytic_required': fields.boolean('Analytic Required', help='If this field is active, '
44 'be required fill the field "account analytic"'),45 'be required fill the field "account analytic"'),
45 }46 }
46 47
47 def onchange_account_id(self, cr, uid, ids, product_id=False, partner_id=False,\48 def onchange_account_id(self, cr, uid, ids, product_id=False, partner_id=False,
48 inv_type=False, fposition_id=False, account_id=False):49 inv_type=False, fposition_id=False, account_id=False):
49 ids = isinstance(ids, (int, long)) and [ids] or ids50 ids = isinstance(ids, (int, long)) and [ids] or ids
50 if not account_id:51 if not account_id:
51 return {}52 return {}
52 res = super(account_invoice_line, self).onchange_account_id(cr, uid, ids, product_id,53 res = super(account_invoice_line, self).onchange_account_id(cr, uid, ids, product_id,
53 partner_id, inv_type, fposition_id, account_id)54 partner_id, inv_type, fposition_id, account_id)
54 account_obj = self.pool.get('account.account')55 account_obj = self.pool.get('account.account')
55 invoice_line_obj = self.pool.get('account.invoice.line')
56 if account_id:56 if account_id:
57 analyt_req = account_obj.browse(cr, uid, account_id).analytic_required or False57 analyt_req = account_obj.browse(cr, uid, account_id).analytic_required or False
58 res['value'].update({'analytic_required': analyt_req})58 res['value'].update({'analytic_required': analyt_req})
59 return res59 return res
6060
61
61class account_move(osv.Model):62class account_move(osv.Model):
62 _inherit = 'account.move'63 _inherit = 'account.move'
6364
@@ -71,7 +72,7 @@
71 if not analytic_acc_move:72 if not analytic_acc_move:
72 moves_without_analytic += '\n' + line.name73 moves_without_analytic += '\n' + line.name
73 if moves_without_analytic:74 if moves_without_analytic:
74 raise osv.except_osv(_('Error'), _('Need add analytic account'\75 raise osv.except_osv(_('Error'), _('Need add analytic account'
75 ' in move with name ' + moves_without_analytic + '.'))76 ' in move with name ' + moves_without_analytic + '.'))
76 res = super(account_move, self).button_validate(77 res = super(account_move, self).button_validate(
77 cr, uid, ids, context=context)78 cr, uid, ids, context=context)
7879
=== modified file 'account_anglo_saxon_cost_structure/__init__.py'
--- account_anglo_saxon_cost_structure/__init__.py 2014-05-09 21:51:34 +0000
+++ account_anglo_saxon_cost_structure/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,2 +1,2 @@
1import model1from . import model
2import wizard2from . import wizard
33
=== modified file 'account_anglo_saxon_cost_structure/__openerp__.py'
--- account_anglo_saxon_cost_structure/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_anglo_saxon_cost_structure/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -5,7 +5,7 @@
5# Copyright (C) Vauxoo (<http://vauxoo.com>).5# Copyright (C) Vauxoo (<http://vauxoo.com>).
6# All Rights Reserved6# All Rights Reserved
7###############Credits######################################################7###############Credits######################################################
8# Coded by: Vauxoo C.A. 8# Coded by: Vauxoo C.A.
9# Planified by: Nhomar Hernandez9# Planified by: Nhomar Hernandez
10# Audited by: Vauxoo C.A.10# Audited by: Vauxoo C.A.
11#############################################################################11#############################################################################
@@ -23,20 +23,27 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24################################################################################24################################################################################
25{25{
26 "name" : "Cost assigned in the account move",26 "name": "Cost assigned in the account move",
27 "version" : "0.1",27 "version": "0.1",
28 "depends" : ["account",'account_anglo_saxon','cost_structure'],28 "author": "Vauxoo",
29 "author" : "Vauxoo",29 "category": "Generic Modules",
30 "description" : """30 "description": """
31 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 31 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
32 """,32 """,
33 "website" : "http://vauxoo.com",33 "website": "http://vauxoo.com",
34 "category" : "Generic Modules",34 "license": "",
35 "init_xml" : [],35 "depends": [
36 "demo_xml" : [],36 "account",
37 "test": [ ],37 "account_anglo_saxon",
38 "update_xml" : [38 "cost_structure"
39 ],39 ],
40 "active": False,40 "demo": [],
41 "installable": True,41 "data": [],
42}42 "test": [],
43 "js": [],
44 "css": [],
45 "qweb": [],
46 "installable": True,
47 "auto_install": False,
48 "active": False
49}
43\ No newline at end of file50\ No newline at end of file
4451
=== modified file 'account_anglo_saxon_cost_structure/model/__init__.py'
--- account_anglo_saxon_cost_structure/model/__init__.py 2014-05-09 21:51:34 +0000
+++ account_anglo_saxon_cost_structure/model/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,1 +1,1 @@
1import invoice1from . import invoice
22
=== modified file 'account_anglo_saxon_cost_structure/model/invoice.py'
--- account_anglo_saxon_cost_structure/model/invoice.py 2014-05-09 21:51:34 +0000
+++ account_anglo_saxon_cost_structure/model/invoice.py 2014-10-07 08:56:40 +0000
@@ -21,8 +21,7 @@
21#21#
22##############################################################################22##############################################################################
2323
24from openerp.tools.translate import _24from openerp.osv import osv
25from openerp.osv import fields, osv
2625
2726
28class account_invoice_line(osv.Model):27class account_invoice_line(osv.Model):
2928
=== modified file 'account_anglo_saxon_stock_move/__init__.py'
--- account_anglo_saxon_stock_move/__init__.py 2014-08-17 05:26:48 +0000
+++ account_anglo_saxon_stock_move/__init__.py 2014-10-07 08:56:40 +0000
@@ -23,5 +23,5 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24###############################################################################24###############################################################################
2525
26import model26from . import model
27import wizard27from . import wizard
2828
=== modified file 'account_anglo_saxon_stock_move/__openerp__.py'
--- account_anglo_saxon_stock_move/__openerp__.py 2014-08-17 05:26:48 +0000
+++ account_anglo_saxon_stock_move/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -22,30 +22,30 @@
22# You should have received a copy of the GNU Affero General Public License22# You should have received a copy of the GNU Affero General Public License
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24###############################################################################24###############################################################################
25
26{25{
27 'name': 'Account Anglo-Saxon Stock Move',26 "name": "Account Anglo-Saxon Stock Move",
28 'version': '1.0',27 "version": "1.0",
29 'author': 'Vauxoo',28 "author": "Vauxoo",
30 'website': 'http://www.vauxoo.com/',29 "category": "",
31 'category': '',30 "description": """
32 'description': '''
33Account Anglo-Saxon Stock Move31Account Anglo-Saxon Stock Move
34------------------------------32------------------------------
35 This module adds an attribute to the Account Invoice Line object33 This module adds an attribute to the Account Invoice Line object
36 and in the case of creating invoice from shipments attach the Stock Move34 and in the case of creating invoice from shipments attach the Stock Move
37 Record on the regarding Invoice Line35 Record on the regarding Invoice Line
38''',36""",
39 'depends': [37 "website": "http://www.vauxoo.com/",
40 'account_anglo_saxon',38 "license": "",
41 ],39 "depends": [
42 'data': [40 "account_anglo_saxon"
43 ],41 ],
44 'demo': [],42 "demo": [],
45 'test': [],43 "data": [],
46 'qweb': [],44 "test": [],
47 'js': [],45 "js": [],
48 'css': [],46 "css": [],
49 'active': False,47 "qweb": [],
50 'installable': True,48 "installable": True,
51}49 "auto_install": False,
50 "active": False
51}
52\ No newline at end of file52\ No newline at end of file
5353
=== modified file 'account_anglo_saxon_stock_move/model/__init__.py'
--- account_anglo_saxon_stock_move/model/__init__.py 2014-08-17 05:26:48 +0000
+++ account_anglo_saxon_stock_move/model/__init__.py 2014-10-07 08:56:40 +0000
@@ -23,5 +23,5 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24###############################################################################24###############################################################################
2525
26import stock26from . import stock
27import invoice27from . import invoice
2828
=== modified file 'account_anglo_saxon_stock_move/model/invoice.py'
--- account_anglo_saxon_stock_move/model/invoice.py 2014-08-17 05:26:48 +0000
+++ account_anglo_saxon_stock_move/model/invoice.py 2014-10-07 08:56:40 +0000
@@ -23,6 +23,7 @@
2323
24from openerp.osv import osv, fields24from openerp.osv import osv, fields
2525
26
26class account_invoice_line(osv.osv):27class account_invoice_line(osv.osv):
27 _inherit = "account.invoice.line"28 _inherit = "account.invoice.line"
2829
2930
=== modified file 'account_anglo_saxon_stock_move/model/stock.py'
--- account_anglo_saxon_stock_move/model/stock.py 2014-08-17 05:26:48 +0000
+++ account_anglo_saxon_stock_move/model/stock.py 2014-10-07 08:56:40 +0000
@@ -25,12 +25,13 @@
2525
26from openerp.osv import osv26from openerp.osv import osv
2727
28
28class stock_picking(osv.osv):29class stock_picking(osv.osv):
29 _inherit = "stock.picking"30 _inherit = "stock.picking"
30 _description = "Picking List"31 _description = "Picking List"
3132
32 def _prepare_invoice_line(self, cr, uid, group, picking, move_line, invoice_id,33 def _prepare_invoice_line(self, cr, uid, group, picking, move_line, invoice_id,
33 invoice_vals, context=None):34 invoice_vals, context=None):
34 """Overwrite to add move_id reference"""35 """Overwrite to add move_id reference"""
35 res = super(stock_picking, self)._prepare_invoice_line(cr, uid, group, picking, move_line, invoice_id, invoice_vals, context=context)36 res = super(stock_picking, self)._prepare_invoice_line(cr, uid, group, picking, move_line, invoice_id, invoice_vals, context=context)
36 res.update({37 res.update({
3738
=== modified file 'account_asset_analytic/__init__.py'
--- account_asset_analytic/__init__.py 2014-05-09 21:51:34 +0000
+++ account_asset_analytic/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,2 +1,2 @@
1# -*- encoding: utf-8 -*-1# -*- encoding: utf-8 -*-
2import model2from . import model
33
=== modified file 'account_asset_analytic/__openerp__.py'
--- account_asset_analytic/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_asset_analytic/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -1,29 +1,31 @@
1# -*- encoding: utf-8 -*-1# -*- encoding: utf-8 -*-
2{2{
3 "name": "Account Asset Analytic",3 "name": "Account Asset Analytic",
4 "version": "1.0",4 "version": "1.0",
5 "author": "Vauxoo",5 "author": "Vauxoo",
6 "category": "Generic Modules",6 "category": "Generic Modules",
7 "description" : """7 "description": """
8Account Asset Analytic8Account Asset Analytic
9======================9======================
1010
11A description is intended to fill this space11A description is intended to fill this space
12 """,12 """,
13 "website": "http://www.vauxoo.com/",13 "website": "http://www.vauxoo.com/",
14 "license": "AGPL-3",14 "license": "AGPL-3",
15 "depends": [15 "depends": [
16 "account",16 "account",
17 "account_asset",17 "account_asset"
18 ],18 ],
19 "demo": [19 "demo": [],
20 ],
21 "data": [20 "data": [
22 'view/view.xml',21 "view/view.xml",
23 'view/menues_and_actions.xml',22 "view/menues_and_actions.xml"
24 ],23 ],
25 "test" : [24 "test": [],
26 ],25 "js": [],
27 "installable": True,26 "css": [],
28 "active": False,27 "qweb": [],
29}28 "installable": True,
29 "auto_install": False,
30 "active": False
31}
30\ No newline at end of file32\ No newline at end of file
3133
=== modified file 'account_asset_analytic/model/__init__.py'
--- account_asset_analytic/model/__init__.py 2014-05-09 21:51:34 +0000
+++ account_asset_analytic/model/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,2 +1,2 @@
1# -*- encoding: utf-8 -*-1# -*- encoding: utf-8 -*-
2import account_asset2from . import account_asset
33
=== modified file 'account_asset_analytic/model/account_asset.py'
--- account_asset_analytic/model/account_asset.py 2014-05-09 21:51:34 +0000
+++ account_asset_analytic/model/account_asset.py 2014-10-07 08:56:40 +0000
@@ -1,13 +1,14 @@
1# -*- encoding: utf-8 -*-1# -*- encoding: utf-8 -*-
2from openerp.osv import fields, osv2from openerp.osv import fields, osv
33
4
4class account_asset_asset(osv.osv):5class account_asset_asset(osv.osv):
5 _inherit = 'account.asset.asset'6 _inherit = 'account.asset.asset'
67
7 def onchange_category_id(self, cr, uid, ids, category_id, context=None):8 def onchange_category_id(self, cr, uid, ids, category_id, context=None):
8 context = context or {}9 context = context or {}
9 val = super(account_asset_asset, self).onchange_category_id(cr, uid, ids, category_id, context=context)10 val = super(account_asset_asset, self).onchange_category_id(cr, uid, ids, category_id, context=context)
10 val = val or {'value':{}}11 val = val or {'value': {}}
11 if category_id:12 if category_id:
12 category = self.pool.get('account.asset.category').browse(cr, uid, category_id, context=context)13 category = self.pool.get('account.asset.category').browse(cr, uid, category_id, context=context)
13 if category.account_analytic_id:14 if category.account_analytic_id:
@@ -18,20 +19,21 @@
18 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),19 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'),
19 }20 }
2021
22
21class account_asset_depreciation_line(osv.osv):23class account_asset_depreciation_line(osv.osv):
22 _inherit = 'account.asset.depreciation.line'24 _inherit = 'account.asset.depreciation.line'
2325
24 def create_move(self, cr, uid, ids, context=None):26 def create_move(self, cr, uid, ids, context=None):
25 context = context or {}27 context = context or {}
26 created_move_ids = super(account_asset_depreciation_line, self).create_move(cr, uid, ids, context=None)28 created_move_ids = super(account_asset_depreciation_line, self).create_move(cr, uid, ids, context=None)
27 if not created_move_ids: return created_move_ids29 if not created_move_ids:
30 return created_move_ids
28 move_line_obj = self.pool.get('account.move.line')31 move_line_obj = self.pool.get('account.move.line')
29 for line in self.browse(cr, uid, ids, context=context):32 for line in self.browse(cr, uid, ids, context=context):
30 aml_ids = move_line_obj.search(cr,uid, [('asset_id','=',line.asset_id.id),33 aml_ids = move_line_obj.search(cr, uid, [('asset_id', '=', line.asset_id.id),
31 ('move_id','in',created_move_ids)],context=context)34 ('move_id', 'in', created_move_ids)], context=context)
32 if aml_ids and line.asset_id.account_analytic_id:35 if aml_ids and line.asset_id.account_analytic_id:
33 move_line_obj.write(cr, uid, aml_ids, {36 move_line_obj.write(cr, uid, aml_ids, {
34 'analytic_account_id': line.asset_id.account_analytic_id.id,37 'analytic_account_id': line.asset_id.account_analytic_id.id,
35 },context=context)38 }, context=context)
36 return created_move_ids39 return created_move_ids
37
3840
=== modified file 'account_asset_date/__init__.py'
--- account_asset_date/__init__.py 2014-05-09 21:51:34 +0000
+++ account_asset_date/__init__.py 2014-10-07 08:56:40 +0000
@@ -23,4 +23,4 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26import account_asset 26from . import account_asset
2727
=== modified file 'account_asset_date/__openerp__.py'
--- account_asset_date/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_asset_date/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -23,25 +23,30 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26
27{26{
28 "name" : "account_asset_date",27 "name": "account_asset_date",
29 "version" : "1.0",28 "version": "1.0",
30 "author" : "Vauxoo",29 "author": "Vauxoo",
31 "category" : "account asset",30 "category": "account asset",
32 "description" : """31 "description": """
33 This module adds a date field in assets and change the 32 This module adds a date field in assets and change the
34 translation of the purchase date field to use as the start date 33 translation of the purchase date field to use as the start date
35 for depreciation34 for depreciation
36 """,35 """,
37 "website" : "http://www.vauxoo.com/",36 "website": "http://www.vauxoo.com/",
38 "license" : "AGPL-3",37 "license": "AGPL-3",
39 "depends" : [38 "depends": [
40 "account_asset",39 "account_asset"
41 ],40 ],
42 "demo" : [],41 "demo": [],
43 "data" : ["account_asset_view.xml"],42 "data": [
44 "test": [],43 "account_asset_view.xml"
45 "installable" : True,44 ],
46 "active" : False,45 "test": [],
47}46 "js": [],
47 "css": [],
48 "qweb": [],
49 "installable": True,
50 "auto_install": False,
51 "active": False
52}
48\ No newline at end of file53\ No newline at end of file
4954
=== modified file 'account_asset_date/account_asset.py'
--- account_asset_date/account_asset.py 2014-09-12 21:07:09 +0000
+++ account_asset_date/account_asset.py 2014-10-07 08:56:40 +0000
@@ -27,15 +27,11 @@
27from openerp.osv import osv, fields27from openerp.osv import osv, fields
28from openerp.tools.translate import _28from openerp.tools.translate import _
2929
30import release
31from openerp.addons.decimal_precision import decimal_precision as dp
32
33import time
3430
35class account_asset_asset(osv.Model):31class account_asset_asset(osv.Model):
36 _inherit = 'account.asset.asset'32 _inherit = 'account.asset.asset'
37 33
38 _columns={34 _columns = {
39 'purchase_date': fields.date('Purchase Date', required=True, readonly=True, states={'draft':[('readonly',False)]}, help = _('Depreciation start date')),35 'purchase_date': fields.date('Purchase Date', required=True, readonly=True, states={'draft': [('readonly', False)]}, help=_('Depreciation start date')),
40 'date_acquisition': fields.date('Date Acquisition', help = _('Date acquisition'))36 'date_acquisition': fields.date('Date Acquisition', help=_('Date acquisition'))
41 }37 }
4238
=== added file 'account_asset_move_check/__init__.py'
--- account_asset_move_check/__init__.py 1970-01-01 00:00:00 +0000
+++ account_asset_move_check/__init__.py 2014-10-07 08:56:40 +0000
@@ -0,0 +1,27 @@
1# -*- encoding: utf-8 -*-
2###########################################################################
3# Module Writen to OpenERP, Open Source Management Solution
4#
5# Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
6# All Rights Reserved.
7# info Vauxoo (info@vauxoo.com)
8############################################################################
9# Coded by: Sabrina Romero (sabrina@vauxoo.com)
10############################################################################
11#
12# This program is free software: you can redistribute it and/or modify
13# it under the terms of the GNU Affero General Public License as
14# published by the Free Software Foundation, either version 3 of the
15# License, or (at your option) any later version.
16#
17# This program is distributed in the hope that it will be useful,
18# but WITHOUT ANY WARRANTY; without even the implied warranty of
19# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20# GNU Affero General Public License for more details.
21#
22# You should have received a copy of the GNU Affero General Public License
23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#
25##############################################################################
26
27from . import model
028
=== renamed file 'account_asset_move_check/__init__.py' => 'account_asset_move_check/__init__.py.moved'
=== added file 'account_asset_move_check/__openerp__.py'
--- account_asset_move_check/__openerp__.py 1970-01-01 00:00:00 +0000
+++ account_asset_move_check/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -0,0 +1,56 @@
1# -*- encoding: utf-8 -*-
2###########################################################################
3# Module Writen to OpenERP, Open Source Management Solution
4#
5# Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
6# All Rights Reserved.
7# info Vauxoo (info@vauxoo.com)
8############################################################################
9# Coded by: Sabrina Romero (sabrina@vauxoo.com)
10############################################################################
11#
12# This program is free software: you can redistribute it and/or modify
13# it under the terms of the GNU Affero General Public License as
14# published by the Free Software Foundation, either version 3 of the
15# License, or (at your option) any later version.
16#
17# This program is distributed in the hope that it will be useful,
18# but WITHOUT ANY WARRANTY; without even the implied warranty of
19# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20# GNU Affero General Public License for more details.
21#
22# You should have received a copy of the GNU Affero General Public License
23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#
25##############################################################################
26# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
27{
28 "name": "Account Asset Move Check",
29 "version": "0.1",
30 "author": "Vauxoo",
31 "category": "Accounting",
32 "description": """
33Account Asset Move Check
34========================
35
36This module add a field that makes posible check like posted some
37deprecations lines with an special condition using the "check_posted"
38field in the validation of "_get_move_check" function.
39
40 """,
41 "website": "http://www.vauxoo.com",
42 "license": "",
43 "depends": [
44 "account",
45 "account_asset"
46 ],
47 "demo": [],
48 "data": [],
49 "test": [],
50 "js": [],
51 "css": [],
52 "qweb": [],
53 "installable": True,
54 "auto_install": False,
55 "active": False
56}
0\ No newline at end of file57\ No newline at end of file
158
=== renamed file 'account_asset_move_check/__openerp__.py' => 'account_asset_move_check/__openerp__.py.moved'
=== added file 'account_asset_move_check/model/__init__.py'
--- account_asset_move_check/model/__init__.py 1970-01-01 00:00:00 +0000
+++ account_asset_move_check/model/__init__.py 2014-10-07 08:56:40 +0000
@@ -0,0 +1,27 @@
1# -*- encoding: utf-8 -*-
2###########################################################################
3# Module Writen to OpenERP, Open Source Management Solution
4#
5# Copyright (c) 2013 Vauxoo - http://www.vauxoo.com/
6# All Rights Reserved.
7# info Vauxoo (info@vauxoo.com)
8############################################################################
9# Coded by: Sabrina Romero (sabrina@vauxoo.com)
10############################################################################
11#
12# This program is free software: you can redistribute it and/or modify
13# it under the terms of the GNU Affero General Public License as
14# published by the Free Software Foundation, either version 3 of the
15# License, or (at your option) any later version.
16#
17# This program is distributed in the hope that it will be useful,
18# but WITHOUT ANY WARRANTY; without even the implied warranty of
19# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20# GNU Affero General Public License for more details.
21#
22# You should have received a copy of the GNU Affero General Public License
23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#
25##############################################################################
26
27from . import account_asset
028
=== renamed file 'account_asset_move_check/model/__init__.py' => 'account_asset_move_check/model/__init__.py.moved'
=== modified file 'account_asset_move_check/model/account_asset.py'
--- account_asset_move_check/model/account_asset.py 2014-05-09 21:51:34 +0000
+++ account_asset_move_check/model/account_asset.py 2014-10-07 08:56:40 +0000
@@ -25,24 +25,22 @@
25##############################################################################25##############################################################################
2626
27from openerp.osv import osv, fields27from openerp.osv import osv, fields
28from openerp.tools.translate import _
2928
30import time
3129
32class account_asset_depreciation_line(osv.Model):30class account_asset_depreciation_line(osv.Model):
33 _inherit = 'account.asset.depreciation.line'31 _inherit = 'account.asset.depreciation.line'
34 32
35 def _get_move_check(self, cr, uid, ids, name, args, context=None):33 def _get_move_check(self, cr, uid, ids, name, args, context=None):
36 res = super(account_asset_depreciation_line, self)._get_move_check(cr, uid, ids, name, args, context=context)34 res = super(account_asset_depreciation_line, self)._get_move_check(cr, uid, ids, name, args, context=context)
37 for line in self.browse(cr, uid, ids, context=context):35 for line in self.browse(cr, uid, ids, context=context):
38 res[line.id] = bool(line.move_id or line.check_posted)36 res[line.id] = bool(line.move_id or line.check_posted)
39 return res37 return res
40 38
41 _columns={39 _columns = {
42 'check_posted': fields.boolean('Posted'),40 'check_posted': fields.boolean('Posted'),
43 'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True)41 'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True)
44 }42 }
45 43
46 _defaults = {44 _defaults = {
47 'check_posted': False,45 'check_posted': False,
48 }46 }
4947
=== modified file 'account_bank_statement_vauxoo/__init__.py'
--- account_bank_statement_vauxoo/__init__.py 2014-05-09 21:51:34 +0000
+++ account_bank_statement_vauxoo/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,1 +1,1 @@
1import model1from . import model
22
=== modified file 'account_bank_statement_vauxoo/__openerp__.py'
--- account_bank_statement_vauxoo/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_bank_statement_vauxoo/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -1,7 +1,7 @@
1# -*- encoding: utf-8 -*-1# -*- encoding: utf-8 -*-
2##############################################################################2##############################################################################
3#3#
4# OpenERP, Open Source Management Solution 4# OpenERP, Open Source Management Solution
5# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved5# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
6# Coded and Planified by Nhomar Hernandez <nhomar@vauxoo.com>6# Coded and Planified by Nhomar Hernandez <nhomar@vauxoo.com>
7#7#
@@ -19,13 +19,12 @@
19# along with this program. If not, see <http://www.gnu.org/licenses/>.19# along with this program. If not, see <http://www.gnu.org/licenses/>.
20#20#
21##############################################################################21##############################################################################
22
23{22{
24 "name" : "Fixes and Imrpovements to Bank Statement management",23 "name": "Fixes and Imrpovements to Bank Statement management",
25 "version" : "0.1",24 "version": "0.1",
26 "depends" : ["account",],25 "author": "Vauxoo",
27 "author" : "Vauxoo",26 "category": "Accounting & Finance",
28 "description" : """27 "description": """
29Improve management of Bank Statement.28Improve management of Bank Statement.
30=====================================29=====================================
31 1.- Import directly from files given by banks.30 1.- Import directly from files given by banks.
@@ -35,23 +34,27 @@
35 b.- Mexican Banks.34 b.- Mexican Banks.
36 c.- Venezuelan Banks.35 c.- Venezuelan Banks.
37 Banco Exterior #TODO36 Banco Exterior #TODO
38 2.- 37 2.-
39 """,38 """,
40 "website" : "http://vauxoo.com",39 "website": "http://vauxoo.com",
41 "category" : "Accounting & Finance",40 "license": "",
42 "init_xml" : [41 "depends": [
43 ],42 "account"
44 "demo_xml" : [43 ],
45 ],44 "demo": [],
46 "update_xml" : [45 "data": [
47 "security/bank_statement_security.xml",46 "security/bank_statement_security.xml",
48 "security/ir.model.access.csv",47 "security/ir.model.access.csv",
49 "view/account_bank_statement_view.xml",48 "view/account_bank_statement_view.xml",
50 "view/account_invoice_view.xml",49 "view/account_invoice_view.xml",
51 "view/account_journal_view.xml",50 "view/account_journal_view.xml",
52 "data/data.xml",51 "data/data.xml"
53 ],52 ],
54 "active": False,53 "test": [],
55 "images": [],54 "js": [],
56 "installable": True,55 "css": [],
57}56 "qweb": [],
57 "installable": True,
58 "auto_install": False,
59 "active": False
60}
58\ No newline at end of file61\ No newline at end of file
5962
=== modified file 'account_bank_statement_vauxoo/model/__init__.py'
--- account_bank_statement_vauxoo/model/__init__.py 2014-05-09 21:51:34 +0000
+++ account_bank_statement_vauxoo/model/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,3 +1,3 @@
1import account_bank_statement1from . import account_bank_statement
2import account_invoice2from . import account_invoice
3import account_journal3from . import account_journal
44
=== modified file 'account_bank_statement_vauxoo/model/account_bank_statement.py'
--- account_bank_statement_vauxoo/model/account_bank_statement.py 2014-09-12 21:07:09 +0000
+++ account_bank_statement_vauxoo/model/account_bank_statement.py 2014-10-07 08:56:40 +0000
@@ -22,14 +22,11 @@
2222
23from openerp.osv import fields, osv23from openerp.osv import fields, osv
24from openerp.addons.decimal_precision import decimal_precision as dp24from openerp.addons.decimal_precision import decimal_precision as dp
25import openerp.netsvc as netsvc
26from openerp.tools.translate import _25from openerp.tools.translate import _
2726
28# Excel Stuff27# Excel Stuff
29import xlrd28import xlrd
30import xlwt
31import base6429import base64
32from tempfile import NamedTemporaryFile
33from datetime import date, datetime, timedelta30from datetime import date, datetime, timedelta
3431
3532
@@ -371,6 +368,7 @@
371368
372369
373class bank_statement_imported_lines(osv.Model):370class bank_statement_imported_lines(osv.Model):
371
374 """372 """
375 OpenERP Model : ClassName373 OpenERP Model : ClassName
376 """374 """
@@ -379,25 +377,25 @@
379 _description = 'Imported lines for banks files'377 _description = 'Imported lines for banks files'
380378
381 # def _balance(self, cr, uid,ids,field_name,args,context=None):379 # def _balance(self, cr, uid,ids,field_name,args,context=None):
382 # res = {}380 # res = {}
383 #381 #
384 # for i in ids:382 # for i in ids:
385 # debit = 0.0383 # debit = 0.0
386 # amt_unt = 0.0384 # amt_unt = 0.0
387 # bsil_brw = self.browse(cr,uid,i,context=context)385 # bsil_brw = self.browse(cr,uid,i,context=context)
388 # counterpart_id = bsil_brw.counterpart_id386 # counterpart_id = bsil_brw.counterpart_id
389 # for aml in bsil_brw.aml_ids:387 # for aml in bsil_brw.aml_ids:
390 # if aml.account_id == counterpart_id:388 # if aml.account_id == counterpart_id:
391 # debit += aml.debit or aml.credit389 # debit += aml.debit or aml.credit
392 # for inv in bsil_brw.invoice_ids:390 # for inv in bsil_brw.invoice_ids:
393 # if inv.account_id == counterpart_id:391 # if inv.account_id == counterpart_id:
394 # amt_unt += inv.amount_total392 # amt_unt += inv.amount_total
395 # for amls in bsil_brw.acc_move_line_ids:393 # for amls in bsil_brw.acc_move_line_ids:
396 # if amls.account_id == counterpart_id:394 # if amls.account_id == counterpart_id:
397 # amt_unt+=amls[aml.debit and 'credit' or 'debit']395 # amt_unt+=amls[aml.debit and 'credit' or 'debit']
398 #396 #
399 # res[i]=debit-amt_unt397 # res[i]=debit-amt_unt
400 # return res398 # return res
401 _columns = {399 _columns = {
402 'name': fields.char('Description', size=255, required=True,400 'name': fields.char('Description', size=255, required=True,
403 readonly=False),401 readonly=False),
@@ -457,8 +455,8 @@
457 }455 }
458456
459 # def explode_aml(self,cr,uid,ids,,context=None):457 # def explode_aml(self,cr,uid,ids,,context=None):
460 # if context is None:458 # if context is None:
461 # context={}459 # context={}
462 def change_account(self, cr, uid, ids, context=None):460 def change_account(self, cr, uid, ids, context=None):
463 if context is None:461 if context is None:
464 context = {}462 context = {}
@@ -502,7 +500,6 @@
502 context = {}500 context = {}
503 res = []501 res = []
504 aml = False502 aml = False
505 amount = {}
506 total = 0503 total = 0
507 invoice_obj = self.pool.get('account.invoice')504 invoice_obj = self.pool.get('account.invoice')
508 account_move_line_obj = self.pool.get('account.move.line')505 account_move_line_obj = self.pool.get('account.move.line')
@@ -554,14 +551,14 @@
554 (account_move_line_obj.copy(551 (account_move_line_obj.copy(
555 cr, uid, aml.id, {552 cr, uid, aml.id, {
556 'partner_id': aml_id.partner_id and553 'partner_id': aml_id.partner_id and
557 aml_id.partner_id.id,554 aml_id.partner_id.id,
558 '%s' % (aml.debit > 0 and555 '%s' % (aml.debit > 0 and
559 'debit' or aml.credit > 0 and556 'debit' or aml.credit > 0 and
560 'credit'):557 'credit'):
561 (aml_id.reconcile_partial_id and558 (aml_id.reconcile_partial_id and
562 aml_id.invoice and559 aml_id.invoice and
563 aml_id.invoice.residual or560 aml_id.invoice.residual or
564 aml_id[aml.debit and561 aml_id[aml.debit and
565 'credit' or 'debit'])}),562 'credit' or 'debit'])}),
566 aml_id.id))563 aml_id.id))
567564
@@ -573,7 +570,7 @@
573 (account_move_line_obj.copy(570 (account_move_line_obj.copy(
574 cr, uid, aml.id, {571 cr, uid, aml.id, {
575 'partner_id': aml_id.partner_id and572 'partner_id': aml_id.partner_id and
576 aml_id.partner_id.id,573 aml_id.partner_id.id,
577 '%s' % (aml.debit > 0 and574 '%s' % (aml.debit > 0 and
578 'debit' or aml.credit > 0 and575 'debit' or aml.credit > 0 and
579 'credit'): total}),576 'credit'): total}),
580577
=== modified file 'account_bank_statement_vauxoo/model/account_invoice.py'
--- account_bank_statement_vauxoo/model/account_invoice.py 2014-05-09 21:51:34 +0000
+++ account_bank_statement_vauxoo/model/account_invoice.py 2014-10-07 08:56:40 +0000
@@ -24,6 +24,7 @@
2424
2525
26class account_invoice(osv.Model):26class account_invoice(osv.Model):
27
27 """28 """
28 account_invoice29 account_invoice
29 """30 """
3031
=== modified file 'account_bank_statement_vauxoo/model/account_journal.py'
--- account_bank_statement_vauxoo/model/account_journal.py 2014-05-09 21:51:34 +0000
+++ account_bank_statement_vauxoo/model/account_journal.py 2014-10-07 08:56:40 +0000
@@ -21,10 +21,8 @@
21##############################################################################21##############################################################################
2222
23from openerp.osv import fields, osv23from openerp.osv import fields, osv
24from openerp.tools.translate import _
2524
26import openerp.netsvc as netsvc25import openerp.netsvc as netsvc
27import logging
2826
2927
30class account_journal(osv.Model):28class account_journal(osv.Model):
@@ -92,17 +90,17 @@
92 try:90 try:
93 exp_ = self.browse(cr, user, ids, context=context)[0].expresion91 exp_ = self.browse(cr, user, ids, context=context)[0].expresion
94 exp = eval(exp_)92 exp = eval(exp_)
95 self.logger.notifyChannel('Chain. '+str(exp), netsvc.LOG_DEBUG,93 self.logger.notifyChannel('Chain. ' + str(exp), netsvc.LOG_DEBUG,
96 'Succefully Validated')94 'Succefully Validated')
97 if type(exp) is list:95 if type(exp) is list:
98 return True96 return True
99 else:97 else:
100 self.logger.notifyChannel(98 self.logger.notifyChannel(
101 'Chain. '+str(exp_), netsvc.LOG_ERROR,99 'Chain. ' + str(exp_), netsvc.LOG_ERROR,
102 'Fail With You must use a list')100 'Fail With You must use a list')
103 return False101 return False
104 except Exception, var:102 except Exception, var:
105 self.logger.notifyChannel('Chain. '+str(exp_), netsvc.LOG_ERROR,103 self.logger.notifyChannel('Chain. ' + str(exp_), netsvc.LOG_ERROR,
106 'Fail With %s' % var)104 'Fail With %s' % var)
107 return False105 return False
108106
@@ -112,4 +110,3 @@
112 ["cadenaA","cadenaB","CadenaC"]110 ["cadenaA","cadenaB","CadenaC"]
113 o es inválida''', ['expresion']),111 o es inválida''', ['expresion']),
114 ]112 ]
115account_journal_bs_config
116113
=== modified file 'account_budget_imp/__init__.py'
--- account_budget_imp/__init__.py 2014-05-09 21:51:34 +0000
+++ account_budget_imp/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,1 +1,1 @@
1import model1from . import model
22
=== modified file 'account_budget_imp/__openerp__.py'
--- account_budget_imp/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_budget_imp/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -23,13 +23,12 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26
27{26{
28 "name" : "Account Budget Improvements",27 "name": "Account Budget Improvements",
29 "version" : "1.0",28 "version": "1.0",
30 "author" : "Vauxoo",29 "author": "Vauxoo",
31 'category' : 'Accounting & Finance',30 "category": "Accounting & Finance",
32 "description" : """31 "description": """
33Improvements to Account Budget32Improvements to Account Budget
34==============================33==============================
3534
@@ -55,30 +54,30 @@
5554
56The Account Budget view will be used to comply with need to show the executed55The Account Budget view will be used to comply with need to show the executed
57Budget per period.56Budget per period.
58 """,57 """,
59 "website" : "http://www.vauxoo.com/",58 "website": "http://www.vauxoo.com/",
60 "license" : "AGPL-3",59 "license": "AGPL-3",
61 "depends" : [60 "depends": [
62 "account_budget",61 "account_budget",
63 "account_accountant",62 "account_accountant",
64 "ifrs_report",63 "ifrs_report",
65 "web_kanban",64 "web_kanban"
66 ],65 ],
67 "data" : [66 "demo": [],
68 "view/account_budget_view.xml",67 "data": [
69 "security/res_groups.xml",68 "view/account_budget_view.xml",
70 "data/account_budget_data.xml",69 "security/res_groups.xml",
71 ],70 "data/account_budget_data.xml"
72 "demo" : [71 ],
73 ],72 "test": [],
73 "js": [
74 "static/src/js/account_budget_imp.js"
75 ],
74 "css": [76 "css": [
75 "static/src/css/account_budget.css",77 "static/src/css/account_budget.css"
76 ],78 ],
77 "js": [79 "qweb": [],
78 "static/src/js/account_budget_imp.js",80 "installable": True,
79 ],81 "auto_install": False,
80 "test" : [82 "active": False
81 ],83}
82 "installable" : True,
83 "active" : False,
84}
85\ No newline at end of file84\ No newline at end of file
8685
=== added file 'account_budget_imp/i18n/pt_BR.po'
--- account_budget_imp/i18n/pt_BR.po 1970-01-01 00:00:00 +0000
+++ account_budget_imp/i18n/pt_BR.po 2014-10-07 08:56:40 +0000
@@ -0,0 +1,137 @@
1# Brazilian Portuguese translation for addons-vauxoo
2# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
3# This file is distributed under the same license as the addons-vauxoo package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: addons-vauxoo\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2013-11-07 01:13+0000\n"
11"PO-Revision-Date: 2014-09-26 08:36+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-09-27 06:28+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19
20#. module: account_budget_imp
21#: view:crossovered.budget.lines:0
22msgid "THEO"
23msgstr ""
24
25#. module: account_budget_imp
26#: field:crossovered.budget.lines,ifrs_lines_id:0
27msgid "Report Line"
28msgstr ""
29
30#. module: account_budget_imp
31#: view:crossovered.budget.lines:0
32msgid "B. Plan"
33msgstr ""
34
35#. module: account_budget_imp
36#: help:crossovered.budget,fiscalyear_id:0
37#: help:crossovered.budget,period_id:0
38#: help:crossovered.budget.lines,period_id:0
39msgid "Period for this budget"
40msgstr ""
41
42#. module: account_budget_imp
43#: field:crossovered.budget,dt_approved:0
44msgid "Date Approved"
45msgstr ""
46
47#. module: account_budget_imp
48#: field:crossovered.budget,dt_done:0
49msgid "Date Done"
50msgstr ""
51
52#. module: account_budget_imp
53#: view:crossovered.budget.lines:0
54msgid "ForeCasted"
55msgstr ""
56
57#. module: account_budget_imp
58#: view:crossovered.budget.lines:0
59msgid "Real"
60msgstr ""
61
62#. module: account_budget_imp
63#: field:crossovered.budget.lines,forecasted_amount:0
64msgid "Forecasted Amount"
65msgstr ""
66
67#. module: account_budget_imp
68#: help:crossovered.budget.lines,forecasted_amount:0
69msgid ""
70"Due to your analisys what is the amopunt that\n"
71" the manager stimate will comply to be compared "
72"with\n"
73" the Planned Ammount"
74msgstr ""
75
76#. module: account_budget_imp
77#: model:ir.model,name:account_budget_imp.model_crossovered_budget_lines
78msgid "Budget Line"
79msgstr ""
80
81#. module: account_budget_imp
82#: model:res.groups,name:account_budget_imp.bugdet_multicompany
83msgid "Budget Multicompany"
84msgstr ""
85
86#. module: account_budget_imp
87#: field:crossovered.budget.lines,practical_amount_aa:0
88msgid "Caused Amount"
89msgstr ""
90
91#. module: account_budget_imp
92#: model:ir.model,name:account_budget_imp.model_crossovered_budget
93msgid "Budget"
94msgstr ""
95
96#. module: account_budget_imp
97#: field:crossovered.budget,dt_validated:0
98msgid "Date Validated"
99msgstr ""
100
101#. module: account_budget_imp
102#: field:crossovered.budget,fiscalyear_id:0
103msgid "Fiscal Year"
104msgstr ""
105
106#. module: account_budget_imp
107#: field:crossovered.budget,general_budget_id:0
108msgid "Budgetary Position"
109msgstr ""
110
111#. module: account_budget_imp
112#: help:crossovered.budget.lines,ifrs_lines_id:0
113msgid "Line on the IFRS report to analyse your budget."
114msgstr ""
115
116#. module: account_budget_imp
117#: field:crossovered.budget,period_id:0
118#: field:crossovered.budget.lines,period_id:0
119msgid "Period"
120msgstr ""
121
122#. module: account_budget_imp
123#: view:crossovered.budget:0
124msgid "Audit Information"
125msgstr ""
126
127#. module: account_budget_imp
128#: help:crossovered.budget,dt_done:0
129msgid "Date when the cicle finish."
130msgstr ""
131
132#. module: account_budget_imp
133#: help:crossovered.budget.lines,practical_amount_aa:0
134msgid ""
135"This amount comes from the computation related to the IFRS line report "
136"related"
137msgstr ""
0138
=== modified file 'account_budget_imp/model/__init__.py'
--- account_budget_imp/model/__init__.py 2014-05-09 21:51:34 +0000
+++ account_budget_imp/model/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,1 +1,1 @@
1import account_budget1from . import account_budget
22
=== modified file 'account_budget_imp/model/account_budget.py'
--- account_budget_imp/model/account_budget.py 2014-05-09 21:51:34 +0000
+++ account_budget_imp/model/account_budget.py 2014-10-07 08:56:40 +0000
@@ -24,57 +24,57 @@
24#24#
25##############################################################################25##############################################################################
2626
27import datetime
28from openerp.osv import osv, fields27from openerp.osv import osv, fields
29from openerp.tools.translate import _
30import openerp.addons.decimal_precision as dp28import openerp.addons.decimal_precision as dp
3129
30
32class crossovered_budget(osv.osv):31class crossovered_budget(osv.osv):
33 _inherit = "crossovered.budget"32 _inherit = "crossovered.budget"
34 _description = "Budget"33 _description = "Budget"
3534
36 _columns = {35 _columns = {
37 'dt_approved': fields.date('Date Approved',36 'dt_approved': fields.date('Date Approved',
38 readonly = True),37 readonly=True),
39 'dt_validated': fields.date('Date Validated',38 'dt_validated': fields.date('Date Validated',
40 readonly = True),39 readonly=True),
41 'dt_done': fields.date('Date Done',40 'dt_done': fields.date('Date Done',
42 readonly = True,41 readonly=True,
43 help = "Date when the cicle finish."),42 help="Date when the cicle finish."),
44 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year',43 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year',
45 help="Period for this budget"),44 help="Period for this budget"),
46 'period_id': fields.many2one('account.period', 'Period',45 'period_id': fields.many2one('account.period', 'Period',
47 help="Period for this budget"),46 help="Period for this budget"),
48 'date_from': fields.date('Start Date', states={'done':[('readonly',True)]}),47 'date_from': fields.date('Start Date', states={'done': [('readonly', True)]}),
49 'date_to': fields.date('End Date', states={'done':[('readonly',True)]}),48 'date_to': fields.date('End Date', states={'done': [('readonly', True)]}),
50 'company_id': fields.many2one('res.company', 'Company'),49 'company_id': fields.many2one('res.company', 'Company'),
51 'general_budget_id': fields.many2one('account.budget.post', 'Budgetary Position'),50 'general_budget_id': fields.many2one('account.budget.post', 'Budgetary Position'),
52 }51 }
5352
54 _default = {53 _default = {
55 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,54 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
56 }55 }
57 56
57
58class crossovered_budget_lines(osv.osv):58class crossovered_budget_lines(osv.osv):
59 _inherit = 'crossovered.budget.lines'59 _inherit = 'crossovered.budget.lines'
6060
61 def _prac_acc(self, cr, uid, ids, name, args, context=None):61 def _prac_acc(self, cr, uid, ids, name, args, context=None):
62 res={}62 res = {}
63 for line in self.browse(cr, uid, ids, context=context):63 for line in self.browse(cr, uid, ids, context=context):
64 res[line.id] = self._prac_amt_acc(cr, uid, [line.id], context=context)[line.id]64 res[line.id] = self._prac_amt_acc(cr, uid, [line.id], context=context)[line.id]
65 return res65 return res
6666
67 def _get_ifrs_total(self, cr, uid, ids, name, args, context=None):67 def _get_ifrs_total(self, cr, uid, ids, name, args, context=None):
68 res = {}68 res = {}
69 cbl_brws = self.browse(cr, uid, ids, context = context)69 cbl_brws = self.browse(cr, uid, ids, context=context)
70 ifrs_line_obj = self.pool.get('ifrs.lines')70 ifrs_line_obj = self.pool.get('ifrs.lines')
71 for line in cbl_brws:71 for line in cbl_brws:
72 ifrs_result = ifrs_line_obj._get_amount_value(cr, uid,72 ifrs_result = ifrs_line_obj._get_amount_value(cr, uid,
73 [line.ifrs_lines_id.id],73 [line.ifrs_lines_id.id],
74 ifrs_line = line.ifrs_lines_id,74 ifrs_line=line.ifrs_lines_id,
75 period_info = line.period_id,75 period_info=line.period_id,
76 context = context)76 context=context)
77 res[line.id] = ifrs_result 77 res[line.id] = ifrs_result
78 return res78 return res
7979
80 _columns = {80 _columns = {
@@ -94,7 +94,7 @@
94 the manager stimate will comply to be compared with94 the manager stimate will comply to be compared with
95 the Planned Ammount"""),95 the Planned Ammount"""),
96 'ifrs_lines_id': fields.many2one("ifrs.lines", "Report Line",96 'ifrs_lines_id': fields.many2one("ifrs.lines", "Report Line",
97 help= "Line on the IFRS report to analyse your budget."),97 help="Line on the IFRS report to analyse your budget."),
98 'period_id': fields.many2one('account.period', 'Period',98 'period_id': fields.many2one('account.period', 'Period',
99 domain=[('special', '<>', True)],99 domain=[('special', '<>', True)],
100 help="Period for this budget"),100 help="Period for this budget"),
@@ -103,30 +103,30 @@
103 }103 }
104104
105 _default = {105 _default = {
106 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,106 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
107 }107 }
108108
109 def write(self, cr, uid, ids, values, context = None):109 def write(self, cr, uid, ids, values, context=None):
110 period_brw = self.pool.get('account.period').browse(cr, uid, values.get('period_id'), context = context)110 period_brw = self.pool.get('account.period').browse(cr, uid, values.get('period_id'), context=context)
111 values.update({'date_from': period_brw.date_start,111 values.update({'date_from': period_brw.date_start,
112 'date_to': period_brw.date_stop})112 'date_to': period_brw.date_stop})
113 return super(crossovered_budget_lines, self).write(cr, uid, ids, values, context = context)113 return super(crossovered_budget_lines, self).write(cr, uid, ids, values, context=context)
114114
115 def create(self, cr, uid, values, context = None):115 def create(self, cr, uid, values, context=None):
116 period_brw = self.pool.get('account.period').browse(cr, uid, values.get('period_id'), context = context)116 period_brw = self.pool.get('account.period').browse(cr, uid, values.get('period_id'), context=context)
117 values.update({'date_from': period_brw.date_start,117 values.update({'date_from': period_brw.date_start,
118 'date_to': period_brw.date_stop})118 'date_to': period_brw.date_stop})
119 return super(crossovered_budget_lines, self).create(cr, uid, values, context = context)119 return super(crossovered_budget_lines, self).create(cr, uid, values, context=context)
120120
121 def _prac_amt_acc(self, cr, uid, ids, context=None):121 def _prac_amt_acc(self, cr, uid, ids, context=None):
122 '''122 '''
123 This Method should compute considering Accounts Accounts due to the 123 This Method should compute considering Accounts Accounts due to the
124 Account Analityc Account is not mandatory in the budget Line.124 Account Analityc Account is not mandatory in the budget Line.
125 If the account Analityc Account is empty 125 If the account Analityc Account is empty
126 '''126 '''
127 res = {}127 res = {}
128 result = 0.0128 result = 0.0
129 if context is None: 129 if context is None:
130 context = {}130 context = {}
131 for line in self.browse(cr, uid, ids, context=context):131 for line in self.browse(cr, uid, ids, context=context):
132 date_to = line.date_to132 date_to = line.date_to
@@ -143,10 +143,10 @@
143 if line.analytic_account_id.id:143 if line.analytic_account_id.id:
144 cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id=%s AND (date "144 cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id=%s AND (date "
145 "between to_date(%s,'yyyy-mm-dd') AND to_date(%s,'yyyy-mm-dd')) AND "145 "between to_date(%s,'yyyy-mm-dd') AND to_date(%s,'yyyy-mm-dd')) AND "
146 "general_account_id=ANY(%s)", (line.analytic_account_id.id, date_from, date_to,acc_ids,))146 "general_account_id=ANY(%s)", (line.analytic_account_id.id, date_from, date_to, acc_ids,))
147 result = cr.fetchone()[0]147 result = cr.fetchone()[0]
148 else:148 else:
149 result = sum([a.balance for a in line.general_budget_id.account_ids]) 149 result = sum([a.balance for a in line.general_budget_id.account_ids])
150 else:150 else:
151 result = 0.00151 result = 0.00
152 if result is None:152 if result is None:
153153
=== modified file 'account_chart_wiz_dates/__init__.py'
--- account_chart_wiz_dates/__init__.py 2014-05-09 21:51:34 +0000
+++ account_chart_wiz_dates/__init__.py 2014-10-07 08:56:40 +0000
@@ -24,4 +24,4 @@
24#24#
25##############################################################################25##############################################################################
26import account26import account
27import wizard27from . import wizard
2828
=== modified file 'account_chart_wiz_dates/__openerp__.py'
--- account_chart_wiz_dates/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_chart_wiz_dates/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -23,24 +23,28 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26
27{26{
28 "name" : "Wizard Account Chart Dates",27 "name": "Wizard Account Chart Dates",
29 "version" : "1.0",28 "version": "1.0",
30 "author" : "Vauxoo",29 "author": "Vauxoo",
31 "category" : "Generic Modules",30 "category": "Generic Modules",
32 "description" : """31 "description": """
33 Add fields for date initial & end32 Add fields for date initial & end
34 """,33 """,
35 "website" : "http://www.vauxoo.com/",34 "website": "http://www.vauxoo.com/",
36 "license" : "AGPL-3",35 "license": "AGPL-3",
37 "depends" : ["account",36 "depends": [
38 ],37 "account"
39 "init_xml" : [],38 ],
40 "demo_xml" : [],39 "demo": [],
41 "update_xml" : [40 "data": [
42 "wizard/account_chart_view.xml",41 "wizard/account_chart_view.xml"
43 ],42 ],
44 "installable" : True,43 "test": [],
45 "active" : False,44 "js": [],
46}45 "css": [],
46 "qweb": [],
47 "installable": True,
48 "auto_install": False,
49 "active": False
50}
47\ No newline at end of file51\ No newline at end of file
4852
=== modified file 'account_chart_wiz_dates/wizard/__init__.py'
--- account_chart_wiz_dates/wizard/__init__.py 2014-05-09 21:51:34 +0000
+++ account_chart_wiz_dates/wizard/__init__.py 2014-10-07 08:56:40 +0000
@@ -23,4 +23,4 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26import account_chart26from . import account_chart
2727
=== modified file 'account_chart_wiz_dates/wizard/account_chart.py'
--- account_chart_wiz_dates/wizard/account_chart.py 2014-05-09 21:51:34 +0000
+++ account_chart_wiz_dates/wizard/account_chart.py 2014-10-07 08:56:40 +0000
@@ -78,7 +78,6 @@
78 # date_from=str({'date_from':data.get('initial_date', False)})78 # date_from=str({'date_from':data.get('initial_date', False)})
79 # date_to=str({'date_to':data.get('end_date', False)})79 # date_to=str({'date_to':data.get('end_date', False)})
80 #~ result_get=result.get('context')80 #~ result_get=result.get('context')
81 context_str = result['context']
82 context_dict = eval(result['context'])81 context_dict = eval(result['context'])
83 context_dict.update({82 context_dict.update({
84 'date_from': data.get('initial_date', False),83 'date_from': data.get('initial_date', False),
8584
=== modified file 'account_closure_preparation/__init__.py'
--- account_closure_preparation/__init__.py 2013-06-24 21:30:57 +0000
+++ account_closure_preparation/__init__.py 2014-10-07 08:56:40 +0000
@@ -23,4 +23,4 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24###############################################################################24###############################################################################
2525
26import model26from . import model
2727
=== modified file 'account_closure_preparation/__openerp__.py'
--- account_closure_preparation/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_closure_preparation/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -22,13 +22,11 @@
22# You should have received a copy of the GNU Affero General Public License22# You should have received a copy of the GNU Affero General Public License
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24###############################################################################24###############################################################################
25
26{25{
27 "name": "Accounting Closure Preparation",26 "name": "Accounting Closure Preparation",
28 "version": "1.0",27 "version": "1.0",
29 "author": "Vauxoo",28 "author": "Vauxoo",
30 "website": "http://vauxoo.com",29 "category": "Accounting",
31 "category": 'Accounting',
32 "description": """30 "description": """
33Accounting Closure Preparation.31Accounting Closure Preparation.
34==============================32==============================
@@ -36,17 +34,22 @@
36Let accounting people do a revision of the Chart of account, in order to avoid34Let accounting people do a revision of the Chart of account, in order to avoid
37undesirable outcomes when closing a fiscalyear, i.e., transferring balance from35undesirable outcomes when closing a fiscalyear, i.e., transferring balance from
38a fiscalyear to be closed to another to be open.36a fiscalyear to be closed to another to be open.
39""",37""",
40 "depends": ['account'],38 "website": "http://vauxoo.com",
39 "license": "",
40 "depends": [
41 "account"
42 ],
43 "demo": [],
41 "data": [44 "data": [
42 'view/views.xml',45 "view/views.xml",
43 'view/menues_and_actions.xml',46 "view/menues_and_actions.xml"
44 ],47 ],
45 "js": [],48 "test": [],
46 "qweb": [],49 "js": [],
47 "css": [],50 "css": [],
48 "demo": [],51 "qweb": [],
49 "test": [],52 "installable": True,
50 "installable": True,53 "auto_install": False,
51 "active": False,54 "active": False
52}55}
53\ No newline at end of file56\ No newline at end of file
5457
=== modified file 'account_closure_preparation/model/__init__.py'
--- account_closure_preparation/model/__init__.py 2013-06-24 21:30:57 +0000
+++ account_closure_preparation/model/__init__.py 2014-10-07 08:56:40 +0000
@@ -23,4 +23,4 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24###############################################################################24###############################################################################
2525
26import account_closure_preparation26from . import account_closure_preparation
2727
=== modified file 'account_closure_preparation/model/account_closure_preparation.py'
--- account_closure_preparation/model/account_closure_preparation.py 2013-09-30 18:36:12 +0000
+++ account_closure_preparation/model/account_closure_preparation.py 2014-10-07 08:56:40 +0000
@@ -25,6 +25,7 @@
2525
26from openerp.osv import osv, fields26from openerp.osv import osv, fields
2727
28
28class account_closure_preparation(osv.TransientModel):29class account_closure_preparation(osv.TransientModel):
2930
30 '''Prepare a Chart of Account to be used properly when closing a31 '''Prepare a Chart of Account to be used properly when closing a
@@ -33,91 +34,91 @@
33 _name = 'account.closure.preparation'34 _name = 'account.closure.preparation'
3435
35 _columns = {36 _columns = {
36 'company_id':fields.many2one('res.company', 'Company', required=False,37 'company_id': fields.many2one('res.company', 'Company', required=False,
37 help=('Company to which the chart of account is going to be'38 help=('Company to which the chart of account is going to be'
38 ' prepared')),39 ' prepared')),
39 'root_id':fields.many2one('account.account', 'Root Account',40 'root_id': fields.many2one('account.account', 'Root Account',
40 domain="[('company_id','=',company_id),('type','=','view'),('parent_id','=',None)]",41 domain="[('company_id','=',company_id),('type','=','view'),('parent_id','=',None)]",
41 required=False, help=('Root Account, the account that plays as a'42 required=False, help=('Root Account, the account that plays as a'
42 'Chart of Accounts')),43 'Chart of Accounts')),
43 'view_ut_id':fields.many2one('account.account.type', 'Closure Type',44 'view_ut_id': fields.many2one('account.account.type', 'Closure Type',
44 required=False, domain="[('close_method','=','none')]",45 required=False, domain="[('close_method','=','none')]",
45 help=('Select the Account Type that will be used when fixing your'46 help=('Select the Account Type that will be used when fixing your'
46 ' chart of account')), 47 ' chart of account')),
47 'account_ids':fields.many2many('account.account', 'acp_all_acc_rel',48 'account_ids': fields.many2many('account.account', 'acp_all_acc_rel',
48 'account_id', 'acp_id', 'Balance Sheet Accounts',49 'account_id', 'acp_id', 'Balance Sheet Accounts',
49 domain="[('parent_id','=',root_id)]"),50 domain="[('parent_id','=',root_id)]"),
50 'bs_ids':fields.many2many('account.account', 'acp_bs_acc_rel',51 'bs_ids': fields.many2many('account.account', 'acp_bs_acc_rel',
51 'account_id', 'acp_id', 'Balance Sheet Accounts',52 'account_id', 'acp_id', 'Balance Sheet Accounts',
52 domain="[('parent_id','=',root_id)]", help=('Balance Sheet '53 domain="[('parent_id','=',root_id)]", help=('Balance Sheet '
53 'Accounts, Just Select the most top level in the chart of '54 'Accounts, Just Select the most top level in the chart of '
54 'account related to the Balance Sheet')),55 'account related to the Balance Sheet')),
55 'bs_ut_id':fields.many2one('account.account.type', 'BS Closure Type',56 'bs_ut_id': fields.many2one('account.account.type', 'BS Closure Type',
56 required=False, domain="[('close_method','=','balance')]",57 required=False, domain="[('close_method','=','balance')]",
57 help=('Select the Account Type that will be used when fixing your '58 help=('Select the Account Type that will be used when fixing your '
58 'chart of account')), 59 'chart of account')),
59 'is_ids':fields.many2many('account.account', 'acp_is_acc_rel',60 'is_ids': fields.many2many('account.account', 'acp_is_acc_rel',
60 'account_id', 'acp_id', 'Income Statement Accounts',61 'account_id', 'acp_id', 'Income Statement Accounts',
61 domain="[('parent_id','=',root_id),('id','not in',bs_ids[0][2])]",62 domain="[('parent_id','=',root_id),('id','not in',bs_ids[0][2])]",
62 help=('Balance Sheet Accounts, Just Select the most top level in '63 help=('Balance Sheet Accounts, Just Select the most top level in '
63 'the chart of account related to the Balance Sheet')),64 'the chart of account related to the Balance Sheet')),
64 'is_ut_id':fields.many2one('account.account.type', 'IS Closure Type',65 'is_ut_id': fields.many2one('account.account.type', 'IS Closure Type',
65 required=False, domain="[('close_method','=','none')]",66 required=False, domain="[('close_method','=','none')]",
66 help=('Select the Account Type that will be used when fixing your '67 help=('Select the Account Type that will be used when fixing your '
67 'chart of account')), 68 'chart of account')),
68 'bk_ids':fields.many2many('account.account', 'acp_bk_acc_rel',69 'bk_ids': fields.many2many('account.account', 'acp_bk_acc_rel',
69 'account_id', 'acp_id', 'Bank & Cash Accounts',70 'account_id', 'acp_id', 'Bank & Cash Accounts',
70 domain=("[('type','=','view'),"71 domain=("[('type','=','view'),"
71 "('parent_id','child_of',bs_ids[0][2])]"),72 "('parent_id','child_of',bs_ids[0][2])]"),
72 help=('Select the most top '73 help=('Select the most top '
73 'level in the chart of account related to your Bank Accounts')),74 'level in the chart of account related to your Bank Accounts')),
74 'bk_ut_id':fields.many2one('account.account.type', 'Bank Closure Type',75 'bk_ut_id': fields.many2one('account.account.type', 'Bank Closure Type',
75 required=False, domain="[('close_method','=','balance')]",76 required=False, domain="[('close_method','=','balance')]",
76 help=('Select the Account Type that will be used when fixing your '77 help=('Select the Account Type that will be used when fixing your '
77 'chart of account')), 78 'chart of account')),
78 'rec_ids':fields.many2many('account.account', 'acp_rec_acc_rel',79 'rec_ids': fields.many2many('account.account', 'acp_rec_acc_rel',
79 'account_id', 'acp_id', 'Receivable Accounts',80 'account_id', 'acp_id', 'Receivable Accounts',
80 domain=("[('type','=','view'),"81 domain=("[('type','=','view'),"
81 "('parent_id','child_of',bs_ids[0][2])]"),82 "('parent_id','child_of',bs_ids[0][2])]"),
82 help=('Select the most top '83 help=('Select the most top '
83 'level in the chart of account related to your Receivable Accounts')),84 'level in the chart of account related to your Receivable Accounts')),
84 'rec_ut_id':fields.many2one('account.account.type', 'Receivable Closure Type',85 'rec_ut_id': fields.many2one('account.account.type', 'Receivable Closure Type',
85 required=False, domain="[('close_method','=','unreconciled')]",86 required=False, domain="[('close_method','=','unreconciled')]",
86 help=('Select the Account Type that will be used when fixing your '87 help=('Select the Account Type that will be used when fixing your '
87 'chart of account')), 88 'chart of account')),
88 'pay_ids':fields.many2many('account.account', 'acp_pay_acc_rel',89 'pay_ids': fields.many2many('account.account', 'acp_pay_acc_rel',
89 'account_id', 'acp_id', 'Payable Accounts',90 'account_id', 'acp_id', 'Payable Accounts',
90 domain=("[('type','=','view'),"91 domain=("[('type','=','view'),"
91 "('parent_id','child_of',bs_ids[0][2])]"),92 "('parent_id','child_of',bs_ids[0][2])]"),
92 help=('Select the most top '93 help=('Select the most top '
93 'level in the chart of account related to your Payable Accounts')),94 'level in the chart of account related to your Payable Accounts')),
94 'pay_ut_id':fields.many2one('account.account.type', 'Payable Closure Type',95 'pay_ut_id': fields.many2one('account.account.type', 'Payable Closure Type',
95 required=False, domain="[('close_method','=','unreconciled')]",96 required=False, domain="[('close_method','=','unreconciled')]",
96 help=('Select the Account Type that will be used when fixing your '97 help=('Select the Account Type that will be used when fixing your '
97 'chart of account')), 98 'chart of account')),
98 'recon_ids':fields.many2many('account.account', 'acp_recon_acc_rel',99 'recon_ids': fields.many2many('account.account', 'acp_recon_acc_rel',
99 'account_id', 'acp_id', 'Reconcilable Accounts',100 'account_id', 'acp_id', 'Reconcilable Accounts',
100 domain=("[('type','=','other'),"101 domain=("[('type','=','other'),"
101 "('parent_id','child_of',bs_ids[0][2])]"),102 "('parent_id','child_of',bs_ids[0][2])]"),
102 help=('Select the most top '103 help=('Select the most top '
103 'you will regard as Reconcilable. Remember this Accounts are'104 'you will regard as Reconcilable. Remember this Accounts are'
104 ' different than your Receivable & Payable Accounts')),105 ' different than your Receivable & Payable Accounts')),
105 'recon_ut_id':fields.many2one('account.account.type', 'Reconcilable Closure Type',106 'recon_ut_id': fields.many2one('account.account.type', 'Reconcilable Closure Type',
106 required=False, domain="[('close_method','=','unreconciled')]",107 required=False, domain="[('close_method','=','unreconciled')]",
107 help=('Select the Account Type that will be used when fixing your '108 help=('Select the Account Type that will be used when fixing your '
108 'chart of account')), 109 'chart of account')),
109 'det_ids':fields.many2many('account.account', 'acp_det_acc_rel',110 'det_ids': fields.many2many('account.account', 'acp_det_acc_rel',
110 'account_id', 'acp_id', 'Detail Accounts',111 'account_id', 'acp_id', 'Detail Accounts',
111 domain=("[('type','=','other'),"112 domain=("[('type','=','other'),"
112 "('parent_id','child_of',bs_ids[0][2])]"),113 "('parent_id','child_of',bs_ids[0][2])]"),
113 help=('Select the most top '114 help=('Select the most top '
114 'you will regard as Detail. This kind of Account is weirdly '115 'you will regard as Detail. This kind of Account is weirdly '
115 'used. Although is could be used in Depreciation Accounts')),116 'used. Although is could be used in Depreciation Accounts')),
116 'det_ut_id':fields.many2one('account.account.type', 'Detail Closure Type',117 'det_ut_id': fields.many2one('account.account.type', 'Detail Closure Type',
117 required=False, domain="[('close_method','=','detail')]",118 required=False, domain="[('close_method','=','detail')]",
118 help=('Select the Account Type that will be used when fixing your '119 help=('Select the Account Type that will be used when fixing your '
119 'chart of account')), 120 'chart of account')),
120 'cons_id':fields.many2one('account.account', 'Consolidation Account',121 'cons_id': fields.many2one('account.account', 'Consolidation Account',
121 domain=("["122 domain=("["
122 "('company_id','=',company_id),"123 "('company_id','=',company_id),"
123 "('type','=','consolidation'),"124 "('type','=','consolidation'),"
@@ -125,342 +126,341 @@
125 required=False, help=('Consolidation Account, the account that '126 required=False, help=('Consolidation Account, the account that '
126 'plays as a the Consolidation of the Income Statement in Your '127 'plays as a the Consolidation of the Income Statement in Your '
127 'Chart of Accounts')),128 'Chart of Accounts')),
128 'cons_ids':fields.many2many('account.account', 'acp_cons_acc_rel',129 'cons_ids': fields.many2many('account.account', 'acp_cons_acc_rel',
129 'account_id', 'acp_id', 'Detail Accounts', readonly=False,130 'account_id', 'acp_id', 'Detail Accounts', readonly=False,
130 help=('Accounts to be used in the Consolidation Account')),131 help=('Accounts to be used in the Consolidation Account')),
131 'state':fields.selection([132 'state': fields.selection([
132 ('stage1','Prep Chart'),133 ('stage1', 'Prep Chart'),
133 ('stage2','Fix Chart'),134 ('stage2', 'Fix Chart'),
134 ('stage3','Prep BS'),135 ('stage3', 'Prep BS'),
135 ('stage4','Fix BS'),136 ('stage4', 'Fix BS'),
136 ('stage5','Prep IS'),137 ('stage5', 'Prep IS'),
137 ('stage6','Fix IS'),138 ('stage6', 'Fix IS'),
138 ('stage7','Prep Bank Acc'),139 ('stage7', 'Prep Bank Acc'),
139 ('stage8','Fix Bank Acc'),140 ('stage8', 'Fix Bank Acc'),
140 ('stage9','Fix not Bank Acc'),141 ('stage9', 'Fix not Bank Acc'),
141 ('stage10','Prep Rec Acc'),142 ('stage10', 'Prep Rec Acc'),
142 ('stage11','Fix Rec Acc'),143 ('stage11', 'Fix Rec Acc'),
143 ('stage12','Fix not Rec Acc'),144 ('stage12', 'Fix not Rec Acc'),
144 ('stage13','Prep Pay Acc'),145 ('stage13', 'Prep Pay Acc'),
145 ('stage14','Fix Pay Acc'),146 ('stage14', 'Fix Pay Acc'),
146 ('stage15','Fix not Pay Acc'),147 ('stage15', 'Fix not Pay Acc'),
147 ('stage16','Prep Reconcile Acc'),148 ('stage16', 'Prep Reconcile Acc'),
148 ('stage17','Fix Reconcile Acc'),149 ('stage17', 'Fix Reconcile Acc'),
149 ('stage18','Prep Detail Acc'),150 ('stage18', 'Prep Detail Acc'),
150 ('stage19','Fix Detail Acc'),151 ('stage19', 'Fix Detail Acc'),
151 ('stage20','Prep & Fix Consolation Acc'),152 ('stage20', 'Prep & Fix Consolation Acc'),
152 ('stage21','LAST STEP'),153 ('stage21', 'LAST STEP'),
153 ], help='State'), 154 ], help='State'),
154 'skip':fields.boolean('Skip This Step', help=('Some time it is Ok to '155 'skip': fields.boolean('Skip This Step', help=('Some time it is Ok to '
155 'skip a step because that configuration is not used in your company'156 'skip a step because that configuration is not used in your company'
156 )), 157 )),
157 }158 }
158159
159 _defaults = {160 _defaults = {
160 'state': 'stage1',161 'state': 'stage1',
161 'company_id': lambda s, c, u, ctx: \162 'company_id': lambda s, c, u, ctx:
162 s.pool.get('res.users').browse(c, u, u, context=ctx).company_id.id,163 s.pool.get('res.users').browse(c, u, u, context=ctx).company_id.id,
163 }164 }
164165
165 def to_start(self, cr, uid, ids, context=None):166 def to_start(self, cr, uid, ids, context=None):
166 context = context or {}167 context = context or {}
167 wzd_brw = self.browse(cr,uid,ids[0],context=context)168 wzd_brw = self.browse(cr, uid, ids[0], context=context)
168 context['company_id'] = wzd_brw.company_id.id169 context['company_id'] = wzd_brw.company_id.id
169 wzd_brw.write({'state':'stage1'})170 wzd_brw.write({'state': 'stage1'})
170 return {}171 return {}
171172
172 def backpedal(self, cr, uid, ids, context=None):173 def backpedal(self, cr, uid, ids, context=None):
173 context = context or {}174 context = context or {}
174 wzd_brw = self.browse(cr,uid,ids[0],context=context)175 wzd_brw = self.browse(cr, uid, ids[0], context=context)
175 context['company_id'] = wzd_brw.company_id.id176 context['company_id'] = wzd_brw.company_id.id
176 wzd_brw.write({'account_ids':[(6,0,[])]})177 wzd_brw.write({'account_ids': [(6, 0, [])]})
177 if wzd_brw.state == 'stage2':178 if wzd_brw.state == 'stage2':
178 wzd_brw.write({'state':'stage1'})179 wzd_brw.write({'state': 'stage1'})
179 elif wzd_brw.state == 'stage3':180 elif wzd_brw.state == 'stage3':
180 wzd_brw.write({'state':'stage2'})181 wzd_brw.write({'state': 'stage2'})
181 elif wzd_brw.state == 'stage4':182 elif wzd_brw.state == 'stage4':
182 wzd_brw.write({'state':'stage3'})183 wzd_brw.write({'state': 'stage3'})
183 elif wzd_brw.state == 'stage5':184 elif wzd_brw.state == 'stage5':
184 wzd_brw.write({'state':'stage4'})185 wzd_brw.write({'state': 'stage4'})
185 elif wzd_brw.state == 'stage6':186 elif wzd_brw.state == 'stage6':
186 wzd_brw.write({'state':'stage5'})187 wzd_brw.write({'state': 'stage5'})
187 elif wzd_brw.state == 'stage7':188 elif wzd_brw.state == 'stage7':
188 wzd_brw.write({'state':'stage6'})189 wzd_brw.write({'state': 'stage6'})
189 elif wzd_brw.state == 'stage8':190 elif wzd_brw.state == 'stage8':
190 wzd_brw.write({'state':'stage7'})191 wzd_brw.write({'state': 'stage7'})
191 elif wzd_brw.state == 'stage9':192 elif wzd_brw.state == 'stage9':
192 wzd_brw.write({'state':'stage8'})193 wzd_brw.write({'state': 'stage8'})
193 elif wzd_brw.state == 'stage10':194 elif wzd_brw.state == 'stage10':
194 wzd_brw.write({'state':'stage9'})195 wzd_brw.write({'state': 'stage9'})
195 elif wzd_brw.state == 'stage11':196 elif wzd_brw.state == 'stage11':
196 wzd_brw.write({'state':'stage10'})197 wzd_brw.write({'state': 'stage10'})
197 elif wzd_brw.state == 'stage12':198 elif wzd_brw.state == 'stage12':
198 wzd_brw.write({'state':'stage11'})199 wzd_brw.write({'state': 'stage11'})
199 elif wzd_brw.state == 'stage13':200 elif wzd_brw.state == 'stage13':
200 wzd_brw.write({'state':'stage12'})201 wzd_brw.write({'state': 'stage12'})
201 elif wzd_brw.state == 'stage14':202 elif wzd_brw.state == 'stage14':
202 wzd_brw.write({'state':'stage13'})203 wzd_brw.write({'state': 'stage13'})
203 elif wzd_brw.state == 'stage15':204 elif wzd_brw.state == 'stage15':
204 wzd_brw.write({'state':'stage14'})205 wzd_brw.write({'state': 'stage14'})
205 elif wzd_brw.state == 'stage16':206 elif wzd_brw.state == 'stage16':
206 wzd_brw.write({'state':'stage15'})207 wzd_brw.write({'state': 'stage15'})
207 elif wzd_brw.state == 'stage17':208 elif wzd_brw.state == 'stage17':
208 wzd_brw.write({'state':'stage16'})209 wzd_brw.write({'state': 'stage16'})
209 elif wzd_brw.state == 'stage18':210 elif wzd_brw.state == 'stage18':
210 wzd_brw.write({'state':'stage17'})211 wzd_brw.write({'state': 'stage17'})
211 elif wzd_brw.state == 'stage19':212 elif wzd_brw.state == 'stage19':
212 wzd_brw.write({'state':'stage18'})213 wzd_brw.write({'state': 'stage18'})
213 elif wzd_brw.state == 'stage20':214 elif wzd_brw.state == 'stage20':
214 wzd_brw.write({'state':'stage19'})215 wzd_brw.write({'state': 'stage19'})
215 elif wzd_brw.state == 'stage21':216 elif wzd_brw.state == 'stage21':
216 wzd_brw.write({'state':'stage20'})217 wzd_brw.write({'state': 'stage20'})
217 return {}218 return {}
218219
219 def prepare_chart(self, cr, uid, ids, context=None):220 def prepare_chart(self, cr, uid, ids, context=None):
220 context = context or {}221 context = context or {}
221 wzd_brw = self.browse(cr,uid,ids[0],context=context)222 wzd_brw = self.browse(cr, uid, ids[0], context=context)
222 context['company_id'] = wzd_brw.company_id.id223 context['company_id'] = wzd_brw.company_id.id
223 acc_obj = self.pool.get('account.account')224 acc_obj = self.pool.get('account.account')
224 #TODO: CHECK THAT CLOSED ACCOUNTS REMAIN CLOSED225 # TODO: CHECK THAT CLOSED ACCOUNTS REMAIN CLOSED
225 if wzd_brw.state == 'stage1':226 if wzd_brw.state == 'stage1':
226 view_ids = acc_obj.search(cr, uid,[227 view_ids = acc_obj.search(cr, uid, [
227 ('parent_id','child_of',wzd_brw.root_id.id),228 ('parent_id', 'child_of', wzd_brw.root_id.id),
228 ('type','=','view'),229 ('type', '=', 'view'),
229 ('user_type.close_method','!=','none'),230 ('user_type.close_method', '!=', 'none'),
230 ('active','=',True),231 ('active', '=', True),
231 ],context=context)232 ], context=context)
232 wzd_brw.write({'state':'stage2','account_ids':[(6,0,view_ids)]})233 wzd_brw.write({'state': 'stage2', 'account_ids': [(6, 0, view_ids)]})
233 elif wzd_brw.state == 'stage2':234 elif wzd_brw.state == 'stage2':
234 res = [i.id for i in wzd_brw.account_ids]235 res = [i.id for i in wzd_brw.account_ids]
235 acc_obj.write(cr,uid,res,236 acc_obj.write(cr, uid, res,
236 {'user_type':wzd_brw.view_ut_id.id},context=context)237 {'user_type': wzd_brw.view_ut_id.id}, context=context)
237 wzd_brw.write({'state':'stage3','account_ids':[(6,0,[])]})238 wzd_brw.write({'state': 'stage3', 'account_ids': [(6, 0, [])]})
238 elif wzd_brw.state == 'stage3':239 elif wzd_brw.state == 'stage3':
239 view_ids = acc_obj.search(cr, uid,[240 view_ids = acc_obj.search(cr, uid, [
240 ('parent_id','child_of',241 ('parent_id', 'child_of',
241 [i.id for i in wzd_brw.bs_ids]),242 [i.id for i in wzd_brw.bs_ids]),
242 ('type','!=','view'),243 ('type', '!=', 'view'),
243 ('user_type.close_method','=','none'),244 ('user_type.close_method', '=', 'none'),
244 ('active','=',True),245 ('active', '=', True),
245 ],context=context)246 ], context=context)
246 wzd_brw.write({'state':'stage4','account_ids':[(6,0,view_ids)]})247 wzd_brw.write({'state': 'stage4', 'account_ids': [(6, 0, view_ids)]})
247 elif wzd_brw.state == 'stage4':248 elif wzd_brw.state == 'stage4':
248 res = [i.id for i in wzd_brw.account_ids]249 res = [i.id for i in wzd_brw.account_ids]
249 acc_obj.write(cr,uid,res,250 acc_obj.write(cr, uid, res,
250 {'user_type':wzd_brw.bs_ut_id.id},context=context)251 {'user_type': wzd_brw.bs_ut_id.id}, context=context)
251 is_ids = acc_obj.search(cr,uid,[252 is_ids = acc_obj.search(cr, uid, [
252 ('parent_id','=',wzd_brw.root_id.id),253 ('parent_id', '=', wzd_brw.root_id.id),
253 ('id','not in',[i.id for i in wzd_brw.bs_ids]),254 ('id', 'not in', [i.id for i in wzd_brw.bs_ids]),
254 ('active','=',True),255 ('active', '=', True),
255 ],context=context)256 ], context=context)
256 wzd_brw.write({257 wzd_brw.write({
257 'state':'stage5',258 'state': 'stage5',
258 'account_ids':[(6,0,[])],259 'account_ids': [(6, 0, [])],
259 'is_ids':[(6,0,is_ids)],260 'is_ids': [(6, 0, is_ids)],
260 })261 })
261 elif wzd_brw.state == 'stage5':262 elif wzd_brw.state == 'stage5':
262 view_ids = acc_obj.search(cr, uid,[263 view_ids = acc_obj.search(cr, uid, [
263 ('parent_id','child_of',264 ('parent_id', 'child_of',
264 [i.id for i in wzd_brw.is_ids]),265 [i.id for i in wzd_brw.is_ids]),
265 ('type','!=','view'),266 ('type', '!=', 'view'),
266 '|',('type','not in',('other','closed')),267 '|', ('type', 'not in', ('other', 'closed')),
267 ('user_type.close_method','!=','none'),268 ('user_type.close_method', '!=', 'none'),
268 ('active','=',True),269 ('active', '=', True),
269 ],context=context)270 ], context=context)
270 wzd_brw.write({'state':'stage6','account_ids':[(6,0,view_ids)]})271 wzd_brw.write({'state': 'stage6', 'account_ids': [(6, 0, view_ids)]})
271 elif wzd_brw.state == 'stage6':272 elif wzd_brw.state == 'stage6':
272 res = [i.id for i in wzd_brw.account_ids]273 res = [i.id for i in wzd_brw.account_ids]
273 acc_obj.write(cr,uid,res,274 acc_obj.write(cr, uid, res,
274 {'user_type':wzd_brw.is_ut_id.id,275 {'user_type': wzd_brw.is_ut_id.id,
275 'type':'other'},context=context)276 'type': 'other'}, context=context)
276 wzd_brw.write({'state':'stage7','account_ids':[(6,0,[])]})277 wzd_brw.write({'state': 'stage7', 'account_ids': [(6, 0, [])]})
277 elif wzd_brw.state == 'stage7':278 elif wzd_brw.state == 'stage7':
278 view_ids = acc_obj.search(cr, uid,[279 view_ids = acc_obj.search(cr, uid, [
279 ('parent_id','child_of',280 ('parent_id', 'child_of',
280 [i.id for i in wzd_brw.bk_ids]),281 [i.id for i in wzd_brw.bk_ids]),
281 ('type','!=','view'),282 ('type', '!=', 'view'),
282 '|',('type','!=','liquidity'),283 '|', ('type', '!=', 'liquidity'),
283 ('user_type.close_method','!=','balance'),284 ('user_type.close_method', '!=', 'balance'),
284 ('active','=',True),285 ('active', '=', True),
285 ],context=context)286 ], context=context)
286 wzd_brw.write({'state':'stage8','account_ids':[(6,0,view_ids)]})287 wzd_brw.write({'state': 'stage8', 'account_ids': [(6, 0, view_ids)]})
287 elif wzd_brw.state == 'stage8':288 elif wzd_brw.state == 'stage8':
288 res = [i.id for i in wzd_brw.account_ids]289 res = [i.id for i in wzd_brw.account_ids]
289 acc_obj.write(cr,uid,res,{290 acc_obj.write(cr, uid, res, {
290 'user_type' : wzd_brw.bk_ut_id.id,291 'user_type': wzd_brw.bk_ut_id.id,
291 'type' : 'liquidity',292 'type': 'liquidity',
292 },context=context)293 }, context=context)
293 bank_ids1x = acc_obj.search(cr, uid,[294 bank_ids1x = acc_obj.search(cr, uid, [
294 ('parent_id','child_of',295 ('parent_id', 'child_of',
295 [i.id for i in wzd_brw.bk_ids]),296 [i.id for i in wzd_brw.bk_ids]),
296 ('type','!=','view'),297 ('type', '!=', 'view'),
297 ('active','=',True),298 ('active', '=', True),
298 ],context=context)299 ], context=context)
299 bank_ids2 = acc_obj.search(cr, uid,[300 bank_ids2 = acc_obj.search(cr, uid, [
300 ('parent_id','child_of',wzd_brw.root_id.id),301 ('parent_id', 'child_of', wzd_brw.root_id.id),
301 ('id','not in',bank_ids1x),302 ('id', 'not in', bank_ids1x),
302 ('type','!=','view'),303 ('type', '!=', 'view'),
303 ('type','=','liquidity'),304 ('type', '=', 'liquidity'),
304 ('active','=',True),305 ('active', '=', True),
305 ],context=context)306 ], context=context)
306 wzd_brw.write({'state':'stage9','account_ids':[(6,0,bank_ids2)]})307 wzd_brw.write({'state': 'stage9', 'account_ids': [(6, 0, bank_ids2)]})
307 elif wzd_brw.state == 'stage9':308 elif wzd_brw.state == 'stage9':
308 res = [i.id for i in wzd_brw.account_ids]309 res = [i.id for i in wzd_brw.account_ids]
309 acc_obj.write(cr,uid,res,310 acc_obj.write(cr, uid, res,
310 {'type':'other'},context=context)311 {'type': 'other'}, context=context)
311 wzd_brw.write({'state':'stage10','account_ids':[(6,0,[])]})312 wzd_brw.write({'state': 'stage10', 'account_ids': [(6, 0, [])]})
312 elif wzd_brw.state == 'stage10':313 elif wzd_brw.state == 'stage10':
313 view_ids = acc_obj.search(cr, uid,[314 view_ids = acc_obj.search(cr, uid, [
314 ('parent_id','child_of',315 ('parent_id', 'child_of',
315 [i.id for i in wzd_brw.rec_ids]),316 [i.id for i in wzd_brw.rec_ids]),
316 ('type','!=','view'),317 ('type', '!=', 'view'),
317 '|',('reconcile','=',False),318 '|', ('reconcile', '=', False),
318 '|',('type','not in',('receivable','closed')),319 '|', ('type', 'not in', ('receivable', 'closed')),
319 ('user_type.close_method','!=','unreconciled'),320 ('user_type.close_method', '!=', 'unreconciled'),
320 ('active','=',True),321 ('active', '=', True),
321 ],context=context)322 ], context=context)
322 wzd_brw.write({'state':'stage11','account_ids':[(6,0,view_ids)]})323 wzd_brw.write({'state': 'stage11', 'account_ids': [(6, 0, view_ids)]})
323 elif wzd_brw.state == 'stage11':324 elif wzd_brw.state == 'stage11':
324 res = [i.id for i in wzd_brw.account_ids]325 res = [i.id for i in wzd_brw.account_ids]
325 acc_obj.write(cr,uid,res,{326 acc_obj.write(cr, uid, res, {
326 'user_type' : wzd_brw.rec_ut_id.id,327 'user_type': wzd_brw.rec_ut_id.id,
327 'type' : 'receivable',328 'type': 'receivable',
328 'reconcile' : True,329 'reconcile': True,
329 },context=context)330 }, context=context)
330 rec_ids1x = acc_obj.search(cr, uid,[331 rec_ids1x = acc_obj.search(cr, uid, [
331 ('parent_id','child_of',332 ('parent_id', 'child_of',
332 [i.id for i in wzd_brw.rec_ids]),333 [i.id for i in wzd_brw.rec_ids]),
333 ('type','!=','view'),334 ('type', '!=', 'view'),
334 ('active','=',True),335 ('active', '=', True),
335 ],context=context)336 ], context=context)
336 rec_ids2 = acc_obj.search(cr, uid,[337 rec_ids2 = acc_obj.search(cr, uid, [
337 ('parent_id','child_of',wzd_brw.root_id.id),338 ('parent_id', 'child_of', wzd_brw.root_id.id),
338 ('id','not in',rec_ids1x),339 ('id', 'not in', rec_ids1x),
339 ('type','!=','view'),340 ('type', '!=', 'view'),
340 ('type','=','receivable'),341 ('type', '=', 'receivable'),
341 ('active','=',True),342 ('active', '=', True),
342 ],context=context)343 ], context=context)
343 wzd_brw.write({'state':'stage12','account_ids':[(6,0,rec_ids2)]})344 wzd_brw.write({'state': 'stage12', 'account_ids': [(6, 0, rec_ids2)]})
344 elif wzd_brw.state == 'stage12':345 elif wzd_brw.state == 'stage12':
345 res = [i.id for i in wzd_brw.account_ids]346 res = [i.id for i in wzd_brw.account_ids]
346 acc_obj.write(cr,uid,res,347 acc_obj.write(cr, uid, res,
347 {'type':'other'},context=context)348 {'type': 'other'}, context=context)
348 wzd_brw.write({'state':'stage13','account_ids':[(6,0,[])]})349 wzd_brw.write({'state': 'stage13', 'account_ids': [(6, 0, [])]})
349 elif wzd_brw.state == 'stage13':350 elif wzd_brw.state == 'stage13':
350 view_ids = acc_obj.search(cr, uid,[351 view_ids = acc_obj.search(cr, uid, [
351 ('parent_id','child_of',352 ('parent_id', 'child_of',
352 [i.id for i in wzd_brw.pay_ids]),353 [i.id for i in wzd_brw.pay_ids]),
353 ('type','!=','view'),354 ('type', '!=', 'view'),
354 '|',('reconcile','=',False),355 '|', ('reconcile', '=', False),
355 '|',('type','not in',('payable','closed')),356 '|', ('type', 'not in', ('payable', 'closed')),
356 ('user_type.close_method','!=','unreconciled'),357 ('user_type.close_method', '!=', 'unreconciled'),
357 ('active','=',True),358 ('active', '=', True),
358 ],context=context)359 ], context=context)
359 wzd_brw.write({'state':'stage14','account_ids':[(6,0,view_ids)]})360 wzd_brw.write({'state': 'stage14', 'account_ids': [(6, 0, view_ids)]})
360 elif wzd_brw.state == 'stage14':361 elif wzd_brw.state == 'stage14':
361 res = [i.id for i in wzd_brw.account_ids]362 res = [i.id for i in wzd_brw.account_ids]
362 acc_obj.write(cr,uid,res,{363 acc_obj.write(cr, uid, res, {
363 'user_type' : wzd_brw.pay_ut_id.id,364 'user_type': wzd_brw.pay_ut_id.id,
364 'type' : 'payable',365 'type': 'payable',
365 'reconcile' : True,366 'reconcile': True,
366 },context=context)367 }, context=context)
367 pay_ids1x = acc_obj.search(cr, uid,[368 pay_ids1x = acc_obj.search(cr, uid, [
368 ('parent_id','child_of',369 ('parent_id', 'child_of',
369 [i.id for i in wzd_brw.pay_ids]),370 [i.id for i in wzd_brw.pay_ids]),
370 ('type','!=','view'),371 ('type', '!=', 'view'),
371 ('active','=',True),372 ('active', '=', True),
372 ],context=context)373 ], context=context)
373 pay_ids2 = acc_obj.search(cr, uid,[374 pay_ids2 = acc_obj.search(cr, uid, [
374 ('parent_id','child_of',wzd_brw.root_id.id),375 ('parent_id', 'child_of', wzd_brw.root_id.id),
375 ('id','not in',pay_ids1x),376 ('id', 'not in', pay_ids1x),
376 ('type','!=','view'),377 ('type', '!=', 'view'),
377 ('type','=','payable'),378 ('type', '=', 'payable'),
378 ('active','=',True),379 ('active', '=', True),
379 ],context=context)380 ], context=context)
380 wzd_brw.write({'state':'stage15','account_ids':[(6,0,pay_ids2)]})381 wzd_brw.write({'state': 'stage15', 'account_ids': [(6, 0, pay_ids2)]})
381 elif wzd_brw.state == 'stage15':382 elif wzd_brw.state == 'stage15':
382 res = [i.id for i in wzd_brw.account_ids]383 res = [i.id for i in wzd_brw.account_ids]
383 acc_obj.write(cr,uid,res,384 acc_obj.write(cr, uid, res,
384 {'type':'other'},context=context)385 {'type': 'other'}, context=context)
385 wzd_brw.write({'state':'stage16','account_ids':[(6,0,[])]})386 wzd_brw.write({'state': 'stage16', 'account_ids': [(6, 0, [])]})
386 elif wzd_brw.state == 'stage16' and wzd_brw.skip:387 elif wzd_brw.state == 'stage16' and wzd_brw.skip:
387 wzd_brw.write({'state':'stage18','skip':False})388 wzd_brw.write({'state': 'stage18', 'skip': False})
388 elif wzd_brw.state == 'stage16' and not wzd_brw.skip:389 elif wzd_brw.state == 'stage16' and not wzd_brw.skip:
389 acc_obj.write(cr,uid,[i.id for i in wzd_brw.recon_ids],{390 acc_obj.write(cr, uid, [i.id for i in wzd_brw.recon_ids], {
390 'user_type' : wzd_brw.recon_ut_id.id,391 'user_type': wzd_brw.recon_ut_id.id,
391 'type' : 'other',392 'type': 'other',
392 'reconcile' : True,393 'reconcile': True,
393 },context=context)394 }, context=context)
394 view_ids = acc_obj.search(cr, uid,[395 view_ids = acc_obj.search(cr, uid, [
395 ('parent_id','child_of',396 ('parent_id', 'child_of',
396 [i.id for i in wzd_brw.bs_ids]),397 [i.id for i in wzd_brw.bs_ids]),
397 '!',('parent_id','child_of',398 '!', ('parent_id', 'child_of',
398 [i.id for i in wzd_brw.bk_ids]),399 [i.id for i in wzd_brw.bk_ids]),
399 '!',('parent_id','child_of',400 '!', ('parent_id', 'child_of',
400 [i.id for i in wzd_brw.rec_ids]),401 [i.id for i in wzd_brw.rec_ids]),
401 '!',('parent_id','child_of',402 '!', ('parent_id', 'child_of',
402 [i.id for i in wzd_brw.pay_ids]),403 [i.id for i in wzd_brw.pay_ids]),
403 '!',('id','in',404 '!', ('id', 'in',
404 [i.id for i in wzd_brw.recon_ids]),405 [i.id for i in wzd_brw.recon_ids]),
405 ('type','!=','view'),406 ('type', '!=', 'view'),
406 ('reconcile','=',True),407 ('reconcile', '=', True),
407 ('user_type.close_method','=','unreconciled'),408 ('user_type.close_method', '=', 'unreconciled'),
408 ('active','=',True),409 ('active', '=', True),
409 ],context=context)410 ], context=context)
410 wzd_brw.write({'state':'stage17','account_ids':[(6,0,view_ids)]})411 wzd_brw.write({'state': 'stage17', 'account_ids': [(6, 0, view_ids)]})
411 elif wzd_brw.state == 'stage17':412 elif wzd_brw.state == 'stage17':
412 res = [i.id for i in wzd_brw.account_ids]413 res = [i.id for i in wzd_brw.account_ids]
413 acc_obj.write(cr,uid,res,{414 acc_obj.write(cr, uid, res, {
414 'user_type' : wzd_brw.bs_ut_id.id,415 'user_type': wzd_brw.bs_ut_id.id,
415 'type' : 'other',416 'type': 'other',
416 'reconcile' : False,417 'reconcile': False,
417 },context=context)418 }, context=context)
418 wzd_brw.write({'state':'stage18','account_ids':[(6,0,[])]})419 wzd_brw.write({'state': 'stage18', 'account_ids': [(6, 0, [])]})
419 elif wzd_brw.state == 'stage18' and wzd_brw.skip:420 elif wzd_brw.state == 'stage18' and wzd_brw.skip:
420 wzd_brw.write({'state':'stage20','skip':False})421 wzd_brw.write({'state': 'stage20', 'skip': False})
421 elif wzd_brw.state == 'stage18' and not wzd_brw.skip:422 elif wzd_brw.state == 'stage18' and not wzd_brw.skip:
422 acc_obj.write(cr,uid,[i.id for i in wzd_brw.det_ids],{423 acc_obj.write(cr, uid, [i.id for i in wzd_brw.det_ids], {
423 'user_type' : wzd_brw.det_ut_id.id,424 'user_type': wzd_brw.det_ut_id.id,
424 'type' : 'other',425 'type': 'other',
425 },context=context)426 }, context=context)
426 view_ids = acc_obj.search(cr, uid,[427 view_ids = acc_obj.search(cr, uid, [
427 ('parent_id','child_of',428 ('parent_id', 'child_of',
428 [i.id for i in wzd_brw.bs_ids]),429 [i.id for i in wzd_brw.bs_ids]),
429 '!',('parent_id','child_of',430 '!', ('parent_id', 'child_of',
430 [i.id for i in wzd_brw.bk_ids]),431 [i.id for i in wzd_brw.bk_ids]),
431 '!',('parent_id','child_of',432 '!', ('parent_id', 'child_of',
432 [i.id for i in wzd_brw.rec_ids]),433 [i.id for i in wzd_brw.rec_ids]),
433 '!',('parent_id','child_of',434 '!', ('parent_id', 'child_of',
434 [i.id for i in wzd_brw.pay_ids]),435 [i.id for i in wzd_brw.pay_ids]),
435 '!',('id','in',436 '!', ('id', 'in',
436 [i.id for i in wzd_brw.recon_ids]),437 [i.id for i in wzd_brw.recon_ids]),
437 '!',('id','in',438 '!', ('id', 'in',
438 [i.id for i in wzd_brw.det_ids]),439 [i.id for i in wzd_brw.det_ids]),
439 ('type','!=','view'),440 ('type', '!=', 'view'),
440 ('user_type.close_method','=','detail'),441 ('user_type.close_method', '=', 'detail'),
441 ('active','=',True),442 ('active', '=', True),
442 ],context=context)443 ], context=context)
443 wzd_brw.write({'state':'stage19','account_ids':[(6,0,view_ids)]})444 wzd_brw.write({'state': 'stage19', 'account_ids': [(6, 0, view_ids)]})
444 elif wzd_brw.state == 'stage19':445 elif wzd_brw.state == 'stage19':
445 res = [i.id for i in wzd_brw.account_ids]446 res = [i.id for i in wzd_brw.account_ids]
446 acc_obj.write(cr,uid,res,{447 acc_obj.write(cr, uid, res, {
447 'user_type' : wzd_brw.bs_ut_id.id,448 'user_type': wzd_brw.bs_ut_id.id,
448 'type' : 'other',449 'type': 'other',
449 'reconcile' : False,450 'reconcile': False,
450 },context=context)451 }, context=context)
451 wzd_brw.write({452 wzd_brw.write({
452 'state':'stage20',453 'state': 'stage20',
453 'account_ids':[(6,0,[])],454 'account_ids': [(6, 0, [])],
454 'cons_ids':[(6,0,[i.id for i in wzd_brw.is_ids])]})455 'cons_ids': [(6, 0, [i.id for i in wzd_brw.is_ids])]})
455 elif wzd_brw.state == 'stage20' and wzd_brw.skip:456 elif wzd_brw.state == 'stage20' and wzd_brw.skip:
456 wzd_brw.write({'state':'stage21','skip':False})457 wzd_brw.write({'state': 'stage21', 'skip': False})
457 elif wzd_brw.state == 'stage20' and not wzd_brw.skip:458 elif wzd_brw.state == 'stage20' and not wzd_brw.skip:
458 acc_obj.write(cr,uid,wzd_brw.cons_id.id,{459 acc_obj.write(cr, uid, wzd_brw.cons_id.id, {
459 'child_consol_ids':[(6,0,[i.id for i in wzd_brw.cons_ids])]460 'child_consol_ids': [(6, 0, [i.id for i in wzd_brw.cons_ids])]
460 },context=context)461 }, context=context)
461 wzd_brw.write({462 wzd_brw.write({
462 'state':'stage21',463 'state': 'stage21',
463 'account_ids':[(6,0,[])]})464 'account_ids': [(6, 0, [])]})
464465
465 return {}466 return {}
466
467467
=== modified file 'account_entries_report_group_by_ref/__openerp__.py'
--- account_entries_report_group_by_ref/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_entries_report_group_by_ref/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -20,22 +20,28 @@
20# You should have received a copy of the GNU Affero General Public License20# You should have received a copy of the GNU Affero General Public License
21# along with this program. If not, see <http://www.gnu.org/licenses/>.21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22################################################################################22################################################################################
23#"license" : "AGPL-3",
23{24{
24 "name" : "Inherits the xml account_entries_report_view a button grouping by origin",25 "name": "Inherits the xml account_entries_report_view a button grouping by origin",
25 "version" : "1.0",26 "version": "1.0",
26 "depends" : ['account'],27 "author": "Vauxoo",
27 "author" : "Vauxoo",28 "category": "Generic Modules",
28 #"license" : "AGPL-3",29 "description": """This module inherits the xml account_entries_report_view a button grouping by origin
29 "description" : """This module inherits the xml account_entries_report_view a button grouping by origin30 """,
30 """,31 "website": "http://vauxoo.com",
31 "website" : "http://vauxoo.com",32 "license": "",
32 "category" : "Generic Modules",33 "depends": [
33 "init_xml" : [],34 "account"
34 "demo_xml" : [],35 ],
35 "test": [],36 "demo": [],
36 "update_xml" : ['account_entries_report_view.xml',37 "data": [
37 ],38 "account_entries_report_view.xml"
38 "active": False,39 ],
39 "installable": True,40 "test": [],
40}41 "js": [],
4142 "css": [],
43 "qweb": [],
44 "installable": True,
45 "auto_install": False,
46 "active": False
47}
42\ No newline at end of file48\ No newline at end of file
4349
=== modified file 'account_invoice_line_currency/__init__.py'
--- account_invoice_line_currency/__init__.py 2014-05-09 21:51:34 +0000
+++ account_invoice_line_currency/__init__.py 2014-10-07 08:56:40 +0000
@@ -5,7 +5,7 @@
5# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).5# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
6# All Rights Reserved6# All Rights Reserved
7###############Credits######################################################7###############Credits######################################################
8# Coded by: Vauxoo C.A. 8# Coded by: Vauxoo C.A.
9# Planified by: Humberto Arocha / Nhomar Hernandez9# Planified by: Humberto Arocha / Nhomar Hernandez
10# Audited by: Vauxoo C.A.10# Audited by: Vauxoo C.A.
11#############################################################################11#############################################################################
@@ -23,4 +23,4 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24################################################################################24################################################################################
2525
26import model26from . import model
2727
=== modified file 'account_invoice_line_currency/__openerp__.py'
--- account_invoice_line_currency/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_invoice_line_currency/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -5,7 +5,7 @@
5# Copyright (C) Vauxoo (<http://vauxoo.com>).5# Copyright (C) Vauxoo (<http://vauxoo.com>).
6# All Rights Reserved6# All Rights Reserved
7###############Credits######################################################7###############Credits######################################################
8# Coded by: Vauxoo C.A. 8# Coded by: Vauxoo C.A.
9# Planified by: Humberto Arocha / Nhomar Hernandez9# Planified by: Humberto Arocha / Nhomar Hernandez
10# Audited by: Vauxoo C.A.10# Audited by: Vauxoo C.A.
11#############################################################################11#############################################################################
@@ -22,23 +22,28 @@
22# You should have received a copy of the GNU Affero General Public License22# You should have received a copy of the GNU Affero General Public License
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24################################################################################24################################################################################
2525# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
26{26{
27 "name" : "Account Invoice Line Currency",27 "name": "Account Invoice Line Currency",
28 "version" : "1.0",28 "version": "1.0",
29 "author" : "Vauxoo",29 "author": "Vauxoo",
30 "website" : "http://vauxoo.com",30 "category": "Generic Modules/Accounting",
31 "category": 'Generic Modules/Accounting',
32 "description": """31 "description": """
33 """,32 """,
34 'init_xml': [],33 "website": "http://vauxoo.com",
35 "depends" : ["account"],34 "license": "",
36 'update_xml': ["view/account_invoice_line_view.xml"],35 "depends": [
37 'demo_xml': [],36 "account"
38 'test': [],37 ],
39 'installable': True,38 "demo": [],
40 'active': False,39 "data": [
41}40 "view/account_invoice_line_view.xml"
4241 ],
4342 "test": [],
44# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:43 "js": [],
44 "css": [],
45 "qweb": [],
46 "installable": True,
47 "auto_install": False,
48 "active": False
49}
45\ No newline at end of file50\ No newline at end of file
4651
=== modified file 'account_invoice_line_currency/model/__init__.py'
--- account_invoice_line_currency/model/__init__.py 2014-05-09 21:51:34 +0000
+++ account_invoice_line_currency/model/__init__.py 2014-10-07 08:56:40 +0000
@@ -5,7 +5,7 @@
5# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).5# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
6# All Rights Reserved6# All Rights Reserved
7###############Credits######################################################7###############Credits######################################################
8# Coded by: Vauxoo C.A. 8# Coded by: Vauxoo C.A.
9# Planified by: Humberto Arocha / Nhomar Hernandez9# Planified by: Humberto Arocha / Nhomar Hernandez
10# Audited by: Vauxoo C.A.10# Audited by: Vauxoo C.A.
11#############################################################################11#############################################################################
@@ -23,5 +23,5 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24################################################################################24################################################################################
2525
26import account_invoice_line26from . import account_invoice_line
27import res_currency27from . import res_currency
2828
=== modified file 'account_invoice_line_currency/model/account_invoice_line.py'
--- account_invoice_line_currency/model/account_invoice_line.py 2014-05-09 21:51:34 +0000
+++ account_invoice_line_currency/model/account_invoice_line.py 2014-10-07 08:56:40 +0000
@@ -29,6 +29,5 @@
29class account_invoice_line(osv.Model):29class account_invoice_line(osv.Model):
30 _inherit = "account.invoice.line"30 _inherit = "account.invoice.line"
31 _columns = {31 _columns = {
32 'currency_id':fields.related('invoice_id', 'currency_id', relation='res.currency', type='many2one', string='Currency', help='field'),32 'currency_id': fields.related('invoice_id', 'currency_id', relation='res.currency', type='many2one', string='Currency', help='field'),
33 }33 }
34
3534
=== modified file 'account_invoice_line_currency/model/res_currency.py'
--- account_invoice_line_currency/model/res_currency.py 2014-05-09 21:51:34 +0000
+++ account_invoice_line_currency/model/res_currency.py 2014-10-07 08:56:40 +0000
@@ -23,7 +23,7 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24###############################################################################24###############################################################################
2525
26from openerp.osv import osv, fields26from openerp.osv import osv
2727
2828
29class res_currency(osv.Model):29class res_currency(osv.Model):
3030
=== modified file 'account_invoice_number/__openerp__.py'
--- account_invoice_number/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_invoice_number/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -23,29 +23,31 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26
27{26{
28 "name": "Account Invoice Number v7",27 "name": "Account Invoice Number v7",
29 "version": "1.0",28 "version": "1.0",
30 "author": "Vauxoo",29 "author": "Vauxoo",
31 "category": "Localization/Mexico",30 "category": "Localization/Mexico",
32 "description" : """31 "description": """
33This module add field internal_number to invoice view.32This module add field internal_number to invoice view.
34When you cancel a customer invoice will not delete the invoice number.33When you cancel a customer invoice will not delete the invoice number.
3534
36It also adds field Supplier Invoice Number for suppliers in tree view.35It also adds field Supplier Invoice Number for suppliers in tree view.
37 """,36 """,
38 "website": "http://www.vauxoo.com/",37 "website": "http://www.vauxoo.com/",
39 "images": [],38 "license": "",
40 "depends": ["account"],39 "depends": [
41 "demo": [],40 "account"
41 ],
42 "demo": [],
42 "data": [43 "data": [
43 "account_invoice_view.xml",44 "account_invoice_view.xml"
44 ],45 ],
45 'js': [],46 "test": [],
46 'qweb': [],47 "js": [],
47 'css': [],48 "css": [],
48 'test': [],49 "qweb": [],
49 "installable": True,50 "installable": True,
50 "auto_install": False,51 "auto_install": False,
51}52 "active": False
53}
52\ No newline at end of file54\ No newline at end of file
5355
=== modified file 'account_invoice_regular_validation/__init__.py'
--- account_invoice_regular_validation/__init__.py 2014-05-09 21:51:34 +0000
+++ account_invoice_regular_validation/__init__.py 2014-10-07 08:56:40 +0000
@@ -23,4 +23,4 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26import account_invoice26from . import account_invoice
2727
=== modified file 'account_invoice_regular_validation/__openerp__.py'
--- account_invoice_regular_validation/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_invoice_regular_validation/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -23,24 +23,29 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26
27{26{
28 "name" : "Invoice Regular Validation",27 "name": "Invoice Regular Validation",
29 "version" : "1.0",28 "version": "1.0",
30 "author" : "Vauxoo",29 "author": "Vauxoo",
31 "category" : "Generic Modules",30 "category": "Generic Modules",
32 "description" : """31 "description": """
33 This module validate that the lines don't have account type different to regular 32 This module validate that the lines don't have account type different to regular
34 """,33 """,
35 "website" : "http://www.vauxoo.com/",34 "website": "http://www.vauxoo.com/",
36 "license" : "AGPL-3",35 "license": "AGPL-3",
37 "depends" : ["base","account"36 "depends": [
38 ],37 "base",
39 "init_xml" : [],38 "account"
40 "demo_xml" : [],39 ],
41 "update_xml" : [40 "demo": [],
42 "account_invoice_view.xml",41 "data": [
43 ],42 "account_invoice_view.xml"
44 "installable" : True,43 ],
45 "active" : False,44 "test": [],
46}45 "js": [],
46 "css": [],
47 "qweb": [],
48 "installable": True,
49 "auto_install": False,
50 "active": False
51}
47\ No newline at end of file52\ No newline at end of file
4853
=== modified file 'account_invoice_regular_validation/account_invoice.py'
--- account_invoice_regular_validation/account_invoice.py 2014-05-09 21:51:34 +0000
+++ account_invoice_regular_validation/account_invoice.py 2014-10-07 08:56:40 +0000
@@ -23,7 +23,7 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26from openerp.osv import osv, fields26from openerp.osv import osv
27from openerp.tools.translate import _27from openerp.tools.translate import _
2828
2929
3030
=== modified file 'account_invoice_show_by_user/__openerp__.py'
--- account_invoice_show_by_user/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_invoice_show_by_user/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -21,24 +21,31 @@
21# along with this program. If not, see <http://www.gnu.org/licenses/>.21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22################################################################################22################################################################################
23{23{
24 "name" : "Show invoice by user",24 "name": "Show invoice by user",
25 "version" : "1.0",25 "version": "1.0",
26 "author" : 'Vauxoo',26 "author": "Vauxoo",
27 "category": "Accounting",
27 "description": """28 "description": """
28This module create registration rules for invoice29This module create registration rules for invoice
29=================================================30=================================================
3031
31Only lets you see invoice created by the logged user32Only lets you see invoice created by the logged user
3233
33 """,34 """,
34 "category" : "Accounting",35 "website": "http://www.vauxoo.com",
35 "website" : "http://www.vauxoo.com",36 "license": "",
36 "depends" : [37 "depends": [
37 "account"38 "account"
38 ],39 ],
39 "data" : [40 "demo": [],
40 'security/group_show_invoice.xml',41 "data": [
41 ],42 "security/group_show_invoice.xml"
42 "active": False,43 ],
43 "installable": True,44 "test": [],
44}45 "js": [],
46 "css": [],
47 "qweb": [],
48 "installable": True,
49 "auto_install": False,
50 "active": False
51}
45\ No newline at end of file52\ No newline at end of file
4653
=== modified file 'account_invoice_tax/__init__.py'
--- account_invoice_tax/__init__.py 2014-05-09 21:51:34 +0000
+++ account_invoice_tax/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,1 +1,1 @@
1import account_invoice_tax1from . import account_invoice_tax
22
=== modified file 'account_invoice_tax/__openerp__.py'
--- account_invoice_tax/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_invoice_tax/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -23,23 +23,28 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26
27{26{
28 "name" : "account_invoice_tax",27 "name": "account_invoice_tax",
29 "version" : "1.0",28 "version": "1.0",
30 "author" : "Vauxoo",29 "author": "Vauxoo",
31 "category" : "Localization/Mexico",30 "category": "Localization/Mexico",
32 "description" : """This module add tax relation to original tax, to be able to take off all data from invoices.31 "description": """This module add tax relation to original tax, to be able to take off all data from invoices.
33Technical Warning - This module add method override32Technical Warning - This module add method override
34 def check_tax_lines from account_invoice33 def check_tax_lines from account_invoice
35 def compute from account_invoice_tax34 def compute from account_invoice_tax
36""",35""",
37 "website" : "http://www.vauxoo.com/",36 "website": "http://www.vauxoo.com/",
38 "license" : "AGPL-3",37 "license": "AGPL-3",
39 "depends" : ["account"],38 "depends": [
40 "init_xml" : [],39 "account"
41 "demo_xml" : [],40 ],
42 "update_xml" : [],#TODO Add field to view account.invoice41 "demo": [],
43 "installable" : True,42 "data": [],
44 "active" : False,43 "test": [],
45}44 "js": [],
45 "css": [],
46 "qweb": [],
47 "installable": True,
48 "auto_install": False,
49 "active": False
50}
46\ No newline at end of file51\ No newline at end of file
4752
=== modified file 'account_invoice_tax/account_invoice_tax.py'
--- account_invoice_tax/account_invoice_tax.py 2014-09-23 22:53:26 +0000
+++ account_invoice_tax/account_invoice_tax.py 2014-10-07 08:56:40 +0000
@@ -26,11 +26,11 @@
26##############################################################################26##############################################################################
2727
28from openerp import models, fields, api, _28from openerp import models, fields, api, _
29import time29
3030
31class account_invoice(models.Model):31class account_invoice(models.Model):
32 _inherit = 'account.invoice'32 _inherit = 'account.invoice'
33 33
34 @api.multi34 @api.multi
35 def check_tax_lines(self, compute_taxes):35 def check_tax_lines(self, compute_taxes):
36 account_invoice_tax = self.env['account.invoice.tax']36 account_invoice_tax = self.env['account.invoice.tax']
@@ -46,7 +46,7 @@
46 # start custom change46 # start custom change
47 #~ key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.icd, tax.account_analytic_id.id)47 #~ key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.icd, tax.account_analytic_id.id)
48 key = (tax.tax_id and tax.tax_id.id or False)48 key = (tax.tax_id and tax.tax_id.id or False)
49 #end custom change49 # end custom change
50 tax_key.append(key)50 tax_key.append(key)
51 if key not in compute_taxes:51 if key not in compute_taxes:
52 raise except_orm(_('Warning!'), _('Global taxes defined, but they are not in invoice lines !'))52 raise except_orm(_('Warning!'), _('Global taxes defined, but they are not in invoice lines !'))
@@ -56,10 +56,11 @@
56 for key in compute_taxes:56 for key in compute_taxes:
57 if key not in tax_key:57 if key not in tax_key:
58 raise except_orm(_('Warning!'), _('Taxes are missing!\nClick on compute button.'))58 raise except_orm(_('Warning!'), _('Taxes are missing!\nClick on compute button.'))
59 59
60
60class account_invoice_tax(models.Model):61class account_invoice_tax(models.Model):
61 _inherit = 'account.invoice.tax'62 _inherit = 'account.invoice.tax'
62 63
63 tax_id = fields.Many2one('account.tax', string='Tax', required=False, ondelete='set null', index=True,64 tax_id = fields.Many2one('account.tax', string='Tax', required=False, ondelete='set null', index=True,
64 help="Tax relation to original tax, to be able to take off all data from invoices.")65 help="Tax relation to original tax, to be able to take off all data from invoices.")
6566
@@ -82,7 +83,7 @@
82 'base': currency.round(tax['price_unit'] * line['quantity']),83 'base': currency.round(tax['price_unit'] * line['quantity']),
83 'tax_id': tax['id']84 'tax_id': tax['id']
84 }85 }
85 if invoice.type in ('out_invoice','in_invoice'):86 if invoice.type in ('out_invoice', 'in_invoice'):
86 val['base_code_id'] = tax['base_code_id']87 val['base_code_id'] = tax['base_code_id']
87 val['tax_code_id'] = tax['tax_code_id']88 val['tax_code_id'] = tax['tax_code_id']
88 val['base_amount'] = currency.compute(val['base'] * tax['base_sign'], company_currency, round=False)89 val['base_amount'] = currency.compute(val['base'] * tax['base_sign'], company_currency, round=False)
@@ -96,10 +97,10 @@
96 val['tax_amount'] = currency.compute(val['amount'] * tax['ref_tax_sign'], company_currency, round=False)97 val['tax_amount'] = currency.compute(val['amount'] * tax['ref_tax_sign'], company_currency, round=False)
97 val['account_id'] = tax['account_paid_id'] or line.account_id.id98 val['account_id'] = tax['account_paid_id'] or line.account_id.id
98 val['account_analytic_id'] = tax['account_analytic_paid_id']99 val['account_analytic_id'] = tax['account_analytic_paid_id']
99 #start custom change100 # start custom change
100 #key = (val['tax_code_id'], val['base_code_id'], val['account_id'], val['account_analytic_id'])101 #key = (val['tax_code_id'], val['base_code_id'], val['account_id'], val['account_analytic_id'])
101 key = (val['tax_id'])102 key = (val['tax_id'])
102 #end custom change103 # end custom change
103 if not key in tax_grouped:104 if not key in tax_grouped:
104 tax_grouped[key] = val105 tax_grouped[key] = val
105 else:106 else:
106107
=== modified file 'account_ledger_report/__init__.py'
--- account_ledger_report/__init__.py 2014-05-09 21:51:34 +0000
+++ account_ledger_report/__init__.py 2014-10-07 08:56:40 +0000
@@ -25,6 +25,6 @@
25# along with this program. If not, see <http://www.gnu.org/licenses/>.25# along with this program. If not, see <http://www.gnu.org/licenses/>.
26##############################################################################26##############################################################################
2727
28import report28from . import report
2929
30# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:30# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
3131
=== modified file 'account_ledger_report/__openerp__.py'
--- account_ledger_report/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_ledger_report/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -23,12 +23,13 @@
23# You should have received a copy of the GNU General Public License23# You should have received a copy of the GNU General Public License
24# along with this program. If not, see <http://www.gnu.org/licenses/>.24# along with this program. If not, see <http://www.gnu.org/licenses/>.
25##############################################################################25##############################################################################
26# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
26{27{
27 "name": "Account Ledger Report",28 "name": "Account Ledger Report",
28 "version": "0.1",29 "version": "0.1",
29 "depends": ["base","account"],30 "author": "Vauxoo",
30 "author": "Vauxoo",31 "category": "Generic Modules/Accounting",
31 "description" : """32 "description": """
32 Module that replace original ledger report to optimize the printing space.33 Module that replace original ledger report to optimize the printing space.
33 The reports changed are:34 The reports changed are:
34 - account_general_ledger.rml35 - account_general_ledger.rml
@@ -36,21 +37,25 @@
36 - account_partner_ledger.rml37 - account_partner_ledger.rml
37 - account_partner_ledger_other.rml38 - account_partner_ledger_other.rml
38 In these reports were eliminated:39 In these reports were eliminated:
39 - Journal (header) 40 - Journal (header)
40 - Partner field41 - Partner field
41 - Ref field42 - Ref field
42 """,43 """,
43 "website": "http://vauxoo.com",44 "website": "http://vauxoo.com",
44 "category": "Generic Modules/Accounting",45 "license": "",
45 "init_xml": [46 "depends": [
46 ],47 "base",
47 "demo_xml": [48 "account"
48 ],49 ],
49 "update_xml": [50 "demo": [],
50 'acc_ledger_report.xml',51 "data": [
51 ],52 "acc_ledger_report.xml"
52 "active": False,53 ],
53 "installable": True,54 "test": [],
54}55 "js": [],
5556 "css": [],
56# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:57 "qweb": [],
58 "installable": True,
59 "auto_install": False,
60 "active": False
61}
57\ No newline at end of file62\ No newline at end of file
5863
=== modified file 'account_move_cancel/__init__.py'
--- account_move_cancel/__init__.py 2014-05-09 21:51:34 +0000
+++ account_move_cancel/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,2 +1,2 @@
1import model1from . import model
2import wizard2from . import wizard
33
=== modified file 'account_move_cancel/__openerp__.py'
--- account_move_cancel/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_move_cancel/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -5,7 +5,7 @@
5# Copyright (C) Vauxoo (<http://vauxoo.com>).5# Copyright (C) Vauxoo (<http://vauxoo.com>).
6# All Rights Reserved6# All Rights Reserved
7###############Credits######################################################7###############Credits######################################################
8# Coded by: Vauxoo C.A. 8# Coded by: Vauxoo C.A.
9# Planified by: Nhomar Hernandez9# Planified by: Nhomar Hernandez
10# Audited by: Vauxoo C.A.10# Audited by: Vauxoo C.A.
11#############################################################################11#############################################################################
@@ -23,29 +23,33 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24################################################################################24################################################################################
25{25{
26 "name" : "Account Move Cancel",26 "name": "Account Move Cancel",
27 "version" : "0.1",27 "version": "0.1",
28 "depends" : ["account",'account_cancel'],28 "author": "Vauxoo",
29 "author" : "Vauxoo",29 "category": "Generic Modules",
30 "description" : """30 "description": """
31 Cancels multiple invoices from a wizard and is called from other modules for direct 31 Cancels multiple invoices from a wizard and is called from other modules for direct
32 billing cancellations and cancel your withholding, withholding automatically validating 32 billing cancellations and cancel your withholding, withholding automatically validating
33 and maintaining the seat number that generated in its initial stage33 and maintaining the seat number that generated in its initial stage
34 """,34 """,
35 "website" : "http://vauxoo.com",35 "website": "http://vauxoo.com",
36 "category" : "Generic Modules",36 "license": "",
37 "init_xml" : [],37 "depends": [
38 "demo_xml" : [],38 "account",
39 "test": [ ],39 "account_cancel"
40 "update_xml" : [40 ],
41 'security/invoice_cancel_security.xml',41 "demo": [],
42 'security/ir.model.access.csv',42 "data": [
43 'wizard/account_move_cancel_view.xml',43 "security/invoice_cancel_security.xml",
44 'view/invoice_view.xml', 44 "security/ir.model.access.csv",
45 45 "wizard/account_move_cancel_view.xml",
46 46 "view/invoice_view.xml"
47 47 ],
48 ],48 "test": [],
49 "active": False,49 "js": [],
50 "installable": True,50 "css": [],
51}51 "qweb": [],
52 "installable": True,
53 "auto_install": False,
54 "active": False
55}
52\ No newline at end of file56\ No newline at end of file
5357
=== added file 'account_move_cancel/i18n/pt_BR.po'
--- account_move_cancel/i18n/pt_BR.po 1970-01-01 00:00:00 +0000
+++ account_move_cancel/i18n/pt_BR.po 2014-10-07 08:56:40 +0000
@@ -0,0 +1,98 @@
1# Brazilian Portuguese translation for addons-vauxoo
2# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
3# This file is distributed under the same license as the addons-vauxoo package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: addons-vauxoo\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2013-11-07 01:13+0000\n"
11"PO-Revision-Date: 2014-09-26 08:40+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-09-27 06:28+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19
20#. module: account_move_cancel
21#: model:ir.ui.menu,name:account_move_cancel.account_cancel_wz2
22msgid "Cancel Account"
23msgstr ""
24
25#. module: account_move_cancel
26#: model:ir.ui.menu,name:account_move_cancel.cancel_account_wz
27msgid "Cancel Account"
28msgstr ""
29
30#. module: account_move_cancel
31#: code:addons/account_move_cancel/wizard/account_move_cancel.py:136
32#, python-format
33msgid "Impossible invoice(s) cancel %s because is/are paid!"
34msgstr ""
35
36#. module: account_move_cancel
37#: help:account.invoice,cancel_true:0
38msgid ""
39"Field that indicates whether the invoice was canceled earlier, "
40"to generate actions automatically"
41msgstr ""
42
43#. module: account_move_cancel
44#: view:account.move.cancel:0
45msgid "Compute Costs"
46msgstr ""
47
48#. module: account_move_cancel
49#: field:account.move.cancel,invoice_ids:0
50msgid "Invoices"
51msgstr ""
52
53#. module: account_move_cancel
54#: help:account.move.cancel,invoice_ids:0
55msgid "Select the invoices to account move cancel"
56msgstr ""
57
58#. module: account_move_cancel
59#: model:ir.actions.act_window,name:account_move_cancel.account_cancel_action
60msgid "Account Cancel"
61msgstr ""
62
63#. module: account_move_cancel
64#: code:addons/account_move_cancel/wizard/account_move_cancel.py:134
65#, python-format
66msgid "Invalid action !"
67msgstr ""
68
69#. module: account_move_cancel
70#: field:account.invoice,cancel_true:0
71#: model:res.groups,name:account_move_cancel.group_invoice_cancel
72msgid "Invoice Cancel"
73msgstr ""
74
75#. module: account_move_cancel
76#: view:account.move.cancel:0
77msgid "Exit"
78msgstr ""
79
80#. module: account_move_cancel
81#: model:ir.model,name:account_move_cancel.model_account_invoice
82msgid "Invoice"
83msgstr ""
84
85#. module: account_move_cancel
86#: model:ir.model,name:account_move_cancel.model_account_move_cancel
87msgid "account.move.cancel"
88msgstr ""
89
90#. module: account_move_cancel
91#: view:account.invoice:0
92msgid "Cancel"
93msgstr ""
94
95#. module: account_move_cancel
96#: view:account.move.cancel:0
97msgid "Cancel Account Move"
98msgstr ""
099
=== modified file 'account_move_cancel/model/__init__.py'
--- account_move_cancel/model/__init__.py 2014-05-09 21:51:34 +0000
+++ account_move_cancel/model/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,1 +1,1 @@
1import invoice1from . import invoice
22
=== modified file 'account_move_cancel/model/invoice.py'
--- account_move_cancel/model/invoice.py 2014-09-12 21:07:09 +0000
+++ account_move_cancel/model/invoice.py 2014-10-07 08:56:40 +0000
@@ -23,12 +23,7 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24##########################################################################24##########################################################################
2525
26import time
27from openerp.osv import osv, fields26from openerp.osv import osv, fields
28from openerp.addons.decimal_precision import decimal_precision as dp
29from openerp.tools.translate import _
30
31import openerp.netsvc as netsvc
3227
3328
34class account_invoice(osv.Model):29class account_invoice(osv.Model):
3530
=== modified file 'account_move_cancel/wizard/__init__.py'
--- account_move_cancel/wizard/__init__.py 2014-05-09 21:51:34 +0000
+++ account_move_cancel/wizard/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,1 +1,1 @@
1import account_move_cancel1from . import account_move_cancel
22
=== modified file 'account_move_cancel/wizard/account_move_cancel.py'
--- account_move_cancel/wizard/account_move_cancel.py 2014-09-12 21:07:09 +0000
+++ account_move_cancel/wizard/account_move_cancel.py 2014-10-07 08:56:40 +0000
@@ -24,14 +24,10 @@
24##########################################################################24##########################################################################
2525
26from openerp.osv import osv, fields26from openerp.osv import osv, fields
27import openerp.tools as tools
28from openerp.tools.translate import _27from openerp.tools.translate import _
2928
30from tools import config
31import openerp.netsvc as netsvc29import openerp.netsvc as netsvc
32from openerp.addons.decimal_precision import decimal_precision as dp
33#~ from DateTime import DateTime30#~ from DateTime import DateTime
34import time
3531
3632
37class account_move_cancel(osv.TransientModel):33class account_move_cancel(osv.TransientModel):
@@ -54,9 +50,7 @@
54 if context is None:50 if context is None:
55 context = {}51 context = {}
56 invo_obj = self.pool.get('account.invoice')52 invo_obj = self.pool.get('account.invoice')
57 iva_obj = self.pool.get('account.wh.iva')
5853
59 islr_obj = self.pool.get('islr.wh.doc')
60 journal_obj = self.pool.get('account.journal')54 journal_obj = self.pool.get('account.journal')
61 invo_ids = []55 invo_ids = []
62 iva_ids = []56 iva_ids = []
@@ -134,7 +128,7 @@
134 raise osv.except_osv(_('Invalid action !'), _(128 raise osv.except_osv(_('Invalid action !'), _(
135 "Impossible invoice(s) cancel %s because is/are paid!"129 "Impossible invoice(s) cancel %s because is/are paid!"
136 % (' '.join(names))))130 % (' '.join(names))))
137 invo_obj.action_cancel(cr, uid, invo_ids, context=context)#correccion estaba llegando tupla () al unlink131 invo_obj.action_cancel(cr, uid, invo_ids, context=context) # correccion estaba llegando tupla () al unlink
138 invo_obj.write(cr, uid, invo_ids, {132 invo_obj.write(cr, uid, invo_ids, {
139 'cancel_true': True}, context=context)133 'cancel_true': True}, context=context)
140 hasattr(journal_obj.browse(cr, uid, journal_ids[0],134 hasattr(journal_obj.browse(cr, uid, journal_ids[0],
@@ -144,10 +138,6 @@
144138
145 return True139 return True
146140
147
148
149
150
151 # nombre del modulo account_anglo_saxon_cost_structure141 # nombre del modulo account_anglo_saxon_cost_structure
152142
153#~ acttion_cancel asiento (acount_move)143#~ acttion_cancel asiento (acount_move)
154144
=== modified file 'account_move_folio/__init__.py'
--- account_move_folio/__init__.py 2014-05-09 21:51:34 +0000
+++ account_move_folio/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,3 +1,3 @@
1# -*- encoding: utf-8 -*-1# -*- encoding: utf-8 -*-
2import model2from . import model
3import wizard3from . import wizard
44
=== modified file 'account_move_folio/__openerp__.py'
--- account_move_folio/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_move_folio/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -1,32 +1,34 @@
1# -*- encoding: utf-8 -*-1# -*- encoding: utf-8 -*-
2{2{
3 "name": "Account Move Folio",3 "name": "Account Move Folio",
4 "version": "1.0",4 "version": "1.0",
5 "author": "Vauxoo",5 "author": "Vauxoo",
6 'category' : 'Accounting & Finance',6 "category": "Accounting & Finance",
7 "description" : """7 "description": """
8Account Move Folio8Account Move Folio
9==================9==================
1010
11This Module keeps a record of all the sequences that have been used in the11This Module keeps a record of all the sequences that have been used in the
12Journal Entries in OpenERP, No matter if a Journal Entry is deleted it will12Journal Entries in OpenERP, No matter if a Journal Entry is deleted it will
13stand as a way to audit all the sequences that have been used.13stand as a way to audit all the sequences that have been used.
14 """,14 """,
15 "website": "http://www.vauxoo.com/",15 "website": "http://www.vauxoo.com/",
16 "license": "AGPL-3",16 "license": "AGPL-3",
17 "depends": [17 "depends": [
18 "account",18 "account"
19 ],19 ],
20 "demo": [20 "demo": [],
21 ],
22 "data": [21 "data": [
23 "security/security.xml",22 "security/security.xml",
24 'security/ir.model.access.csv',23 "security/ir.model.access.csv",
25 'view/view.xml',24 "view/view.xml",
26 'view/menues_and_actions.xml',25 "view/menues_and_actions.xml"
27 ],26 ],
28 "test" : [27 "test": [],
29 ],28 "js": [],
30 "installable": True,29 "css": [],
31 "active": False,30 "qweb": [],
32}31 "installable": True,
32 "auto_install": False,
33 "active": False
34}
33\ No newline at end of file35\ No newline at end of file
3436
=== modified file 'account_move_folio/model/__init__.py'
--- account_move_folio/model/__init__.py 2014-05-09 21:51:34 +0000
+++ account_move_folio/model/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,2 +1,2 @@
1# -*- encoding: utf-8 -*-1# -*- encoding: utf-8 -*-
2import account_move_folio2from . import account_move_folio
33
=== modified file 'account_move_folio/model/account_move_folio.py'
--- account_move_folio/model/account_move_folio.py 2014-05-09 21:51:34 +0000
+++ account_move_folio/model/account_move_folio.py 2014-10-07 08:56:40 +0000
@@ -1,43 +1,45 @@
1# -*- encoding: utf-8 -*-1# -*- encoding: utf-8 -*-
2from openerp.osv import fields, osv2from openerp.osv import fields, osv
33
4
4class account_move_folio(osv.Model):5class account_move_folio(osv.Model):
5 _name = 'account.move.folio'6 _name = 'account.move.folio'
6 _order = 'company_id, journal_id, name'7 _order = 'company_id, journal_id, name'
7 _description = "Records of Folios in Journal Entries"8 _description = "Records of Folios in Journal Entries"
8 _columns = {9 _columns = {
9 'name':fields.char('Folio', 256, help='Folio Number', required = True), 10 'name': fields.char('Folio', 256, help='Folio Number', required=True),
10 'move_id':fields.many2one('account.move', 'Journal Entry', help='Journal Entry'), 11 'move_id': fields.many2one('account.move', 'Journal Entry', help='Journal Entry'),
11 'journal_id':fields.many2one('account.journal', 'Journal', help='Entry Journal'), 12 'journal_id': fields.many2one('account.journal', 'Journal', help='Entry Journal'),
12 'period_id':fields.many2one('account.period', 'Period', help='Entry Period'), 13 'period_id': fields.many2one('account.period', 'Period', help='Entry Period'),
13 'date':fields.date('Date', help='Entry Date'), 14 'date': fields.date('Date', help='Entry Date'),
14 'company_id':fields.many2one('res.company', 'Company', help='Entry Company'), 15 'company_id': fields.many2one('res.company', 'Company', help='Entry Company'),
15 'move_state':fields.related('move_id','state', type='selection',16 'move_state': fields.related('move_id', 'state', type='selection',
16 selection=[('draft','Unposted'), ('posted','Posted')], store=True,17 selection=[('draft', 'Unposted'), ('posted', 'Posted')], store=True,
17 string='Entry State', help='Entry State'), 18 string='Entry State', help='Entry State'),
18 'period_state':fields.related('period_id','state', type='selection',19 'period_state': fields.related('period_id', 'state', type='selection',
19 selection=[('draft','Open'), ('done','Closed')], store=True,20 selection=[('draft', 'Open'), ('done', 'Closed')], store=True,
20 string='Period State', help='Period State'), 21 string='Period State', help='Period State'),
21 }22 }
2223
23 _defaults = {24 _defaults = {
24 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,25 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
25 }26 }
2627
28
27class account_move(osv.Model):29class account_move(osv.Model):
28 _inherit = 'account.move'30 _inherit = 'account.move'
2931
30 _columns = {32 _columns = {
31 'folio_id': fields.many2one('account.move.folio', 'Folio Record'),33 'folio_id': fields.many2one('account.move.folio', 'Folio Record'),
32 }34 }
33 35
34 def _check_folio(self, cr, uid, ids, context=None):36 def _check_folio(self, cr, uid, ids, context=None):
35 for move in self.browse(cr, uid, ids, context=context):37 for move in self.browse(cr, uid, ids, context=context):
36 if move.folio_id:38 if move.folio_id:
37 move_ids = self.search(cr, uid, [39 move_ids = self.search(cr, uid, [
38 ('company_id', '=', move.company_id.id),40 ('company_id', '=', move.company_id.id),
39 ('folio_id', '=', move.folio_id.id),41 ('folio_id', '=', move.folio_id.id),
40 ])42 ])
41 if len(move_ids) > 1:43 if len(move_ids) > 1:
42 return False44 return False
43 return True45 return True
@@ -47,14 +49,14 @@
47 'You cannot have duplicate Folio Record by company.',49 'You cannot have duplicate Folio Record by company.',
48 ['folio_id']),50 ['folio_id']),
49 ]51 ]
50 52
51 def copy(self, cr, uid, id, default=None, context=None):53 def copy(self, cr, uid, id, default=None, context=None):
52 default = {} if default is None else default.copy()54 default = {} if default is None else default.copy()
53 default.update({55 default.update({
54 'folio_id': False56 'folio_id': False
55 })57 })
56 return super(account_move, self).copy(cr, uid, id, default=default, context=context)58 return super(account_move, self).copy(cr, uid, id, default=default, context=context)
57 59
58 def foliate(self, cr, uid, ids, context=None):60 def foliate(self, cr, uid, ids, context=None):
59 context = context or {}61 context = context or {}
60 folio_obj = self.pool.get('account.move.folio')62 folio_obj = self.pool.get('account.move.folio')
@@ -70,23 +72,22 @@
70 }72 }
71 if invoice:73 if invoice:
72 folio_ids = folio_obj.search(cr, uid,74 folio_ids = folio_obj.search(cr, uid,
73 [('name','=',move.name),75 [('name', '=', move.name),
74 ('journal_id','=',move.journal_id.id),76 ('journal_id', '=', move.journal_id.id),
75 ('company_id','=',move.company_id.id)],77 ('company_id', '=', move.company_id.id)],
76 context=context)78 context=context)
77 if folio_ids:79 if folio_ids:
78 folio_id = folio_ids[0]80 folio_id = folio_ids[0]
79 folio_obj.write(cr, uid, folio_id, values, context=context)81 folio_obj.write(cr, uid, folio_id, values, context=context)
80 else:82 else:
81 folio_id = folio_obj.create(cr, uid, values,context=context)83 folio_id = folio_obj.create(cr, uid, values, context=context)
82 else:84 else:
83 folio_id = folio_obj.create(cr, uid, values,context=context)85 folio_id = folio_obj.create(cr, uid, values, context=context)
84 move.write({'folio_id':folio_id},context=context)86 move.write({'folio_id': folio_id}, context=context)
85 return True87 return True
86 88
87 def post(self, cr, uid, ids, context=None):89 def post(self, cr, uid, ids, context=None):
88 context = context or {}90 context = context or {}
89 super(account_move, self).post(cr, uid, ids, context=context)91 super(account_move, self).post(cr, uid, ids, context=context)
90 self.foliate(cr, uid, ids, context=context)92 self.foliate(cr, uid, ids, context=context)
91 return True93 return True
92
9394
=== modified file 'account_move_folio/wizard/__init__.py'
--- account_move_folio/wizard/__init__.py 2014-05-09 21:51:34 +0000
+++ account_move_folio/wizard/__init__.py 2014-10-07 08:56:40 +0000
@@ -1,2 +1,2 @@
1# -*- encoding: utf-8 -*-1# -*- encoding: utf-8 -*-
2import fill_folio_gap 2from . import fill_folio_gap
33
=== modified file 'account_move_folio/wizard/fill_folio_gap.py'
--- account_move_folio/wizard/fill_folio_gap.py 2014-05-09 21:51:34 +0000
+++ account_move_folio/wizard/fill_folio_gap.py 2014-10-07 08:56:40 +0000
@@ -4,6 +4,8 @@
4import logging4import logging
55
6_logger = logging.getLogger(__name__)6_logger = logging.getLogger(__name__)
7
8
7class account_move_folio_fill_gap(osv.TransientModel):9class account_move_folio_fill_gap(osv.TransientModel):
8 _name = 'account.move.folio.fill.gap'10 _name = 'account.move.folio.fill.gap'
9 _description = "Fill Gap in Journal Entry Folios"11 _description = "Fill Gap in Journal Entry Folios"
@@ -32,38 +34,38 @@
32 return {'type': 'ir.actions.act_window_close'}34 return {'type': 'ir.actions.act_window_close'}
3335
34 for j_id in journal_ids:36 for j_id in journal_ids:
35 journal_brw = journal_obj.browse(cr, uid,j_id, context=context)37 journal_brw = journal_obj.browse(cr, uid, j_id, context=context)
36 seq_brw = journal_brw.sequence_id38 seq_brw = journal_brw.sequence_id
37 expr = ''39 expr = ''
38 if seq_brw.prefix:40 if seq_brw.prefix:
39 expr = seq_brw.prefix.split('/')41 expr = seq_brw.prefix.split('/')
40 expr = map(lambda t:t if 'year' not in t else 4*'[0-9]',expr)42 expr = map(lambda t: t if 'year' not in t else 4 * '[0-9]', expr)
41 expr = '^'+'/'.join(expr)43 expr = '^' + '/'.join(expr)
42 folio_ids = folio_obj.search(cr, uid,[('journal_id','=',j_id)],context=context)44 folio_ids = folio_obj.search(cr, uid, [('journal_id', '=', j_id)], context=context)
43 if not folio_ids:45 if not folio_ids:
44 _logger.info('NO FOLIOS FOR THIS JOURNAL %s'% j_id)46 _logger.info('NO FOLIOS FOR THIS JOURNAL %s' % j_id)
45 continue47 continue
4648
47 _logger.info('%s FOLIOS TO PROCESS IN JOURNAL %s'%(len(folio_ids),j_id))49 _logger.info('%s FOLIOS TO PROCESS IN JOURNAL %s' % (len(folio_ids), j_id))
48 folio_set = set()50 folio_set = set()
49 for f_id in folio_ids:51 for f_id in folio_ids:
50 folio_brw = folio_obj.browse(cr, uid,f_id,context=context)52 folio_brw = folio_obj.browse(cr, uid, f_id, context=context)
51 m = re.match(expr, folio_brw.name)53 m = re.match(expr, folio_brw.name)
52 if m is not None:54 if m is not None:
53 expr2 = re.compile('^' + m.group())55 expr2 = re.compile('^' + m.group())
54 expr2 = expr2.sub('', folio_brw.name) 56 expr2 = expr2.sub('', folio_brw.name)
55 folio_set.add(int(expr2))57 folio_set.add(int(expr2))
56 #_logger.info('%s <= MATCH'%folio_brw.name) 58 #_logger.info('%s <= MATCH'%folio_brw.name)
57 MATCH += 159 MATCH += 1
58 else:60 else:
59 _logger.info('%s <= WRONG'%folio_brw.name) 61 _logger.info('%s <= WRONG' % folio_brw.name)
60 WRONG += 162 WRONG += 1
61 FOLIOS += 163 FOLIOS += 1
62 actual_folio_set = set(range(1,seq_brw.number_next))64 actual_folio_set = set(range(1, seq_brw.number_next))
63 gap_folio_set = []65 gap_folio_set = []
64 if folio_set:66 if folio_set:
65 gap_folio_set = actual_folio_set - folio_set67 gap_folio_set = actual_folio_set - folio_set
66 _logger.info('GAP FOLIO SET %s'%gap_folio_set) 68 _logger.info('GAP FOLIO SET %s' % gap_folio_set)
67 for gap in gap_folio_set:69 for gap in gap_folio_set:
68 d = ir_seq_obj._interpolation_dict()70 d = ir_seq_obj._interpolation_dict()
69 try:71 try:
@@ -71,8 +73,8 @@
71 interpolated_suffix = ir_seq_obj._interpolate(seq_brw.suffix, d)73 interpolated_suffix = ir_seq_obj._interpolate(seq_brw.suffix, d)
72 except ValueError:74 except ValueError:
73 _logger.info("Invalid prefix or suffix for sequence '%s'" % seq_brw.name)75 _logger.info("Invalid prefix or suffix for sequence '%s'" % seq_brw.name)
74 gap_name = interpolated_prefix + '%%0%sd' % seq_brw.padding % gap + interpolated_suffix76 gap_name = interpolated_prefix + '%%0%sd' % seq_brw.padding % gap + interpolated_suffix
75 _logger.info('GAP NAME %s'%gap_name)77 _logger.info('GAP NAME %s' % gap_name)
76 flag = True78 flag = True
77 next_gap = gap79 next_gap = gap
78 next_gap_id = False80 next_gap_id = False
@@ -85,24 +87,24 @@
85 if next_gap >= seq_brw.number_next:87 if next_gap >= seq_brw.number_next:
86 break88 break
87 else:89 else:
88 next_gap_name = interpolated_prefix + '%%0%sd' % seq_brw.padding % next_gap + interpolated_suffix90 next_gap_name = interpolated_prefix + '%%0%sd' % seq_brw.padding % next_gap + interpolated_suffix
89 next_gap_id = folio_obj.search(cr, uid,[('name','=',next_gap_name),('journal_id','=',j_id)],context=context)91 next_gap_id = folio_obj.search(cr, uid, [('name', '=', next_gap_name), ('journal_id', '=', j_id)], context=context)
90 next_gap_id = next_gap_id and next_gap_id[0] or False92 next_gap_id = next_gap_id and next_gap_id[0] or False
91 period_id = False93 period_id = False
92 date = False94 date = False
93 if next_gap_id:95 if next_gap_id:
94 ngval_brw = folio_obj.browse(cr, uid, next_gap_id,context=context)96 ngval_brw = folio_obj.browse(cr, uid, next_gap_id, context=context)
95 date = ngval_brw.date or False97 date = ngval_brw.date or False
96 period_id = ngval_brw.period_id and ngval_brw.period_id.id or False98 period_id = ngval_brw.period_id and ngval_brw.period_id.id or False
97 folio_obj.create(cr, uid, {99 folio_obj.create(cr, uid, {
98 'name':gap_name,100 'name': gap_name,
99 'journal_id':j_id,101 'journal_id': j_id,
100 'date':date,102 'date': date,
101 'period_id':period_id,103 'period_id': period_id,
102 })104 })
103 GAPS += len(gap_folio_set) 105 GAPS += len(gap_folio_set)
104 _logger.info('MATCHES: %s'% MATCH)106 _logger.info('MATCHES: %s' % MATCH)
105 _logger.info('WRONGS: %s'% WRONG)107 _logger.info('WRONGS: %s' % WRONG)
106 _logger.info('FOLIOS: %s'% FOLIOS)108 _logger.info('FOLIOS: %s' % FOLIOS)
107 _logger.info('GAPS: %s'% GAPS)109 _logger.info('GAPS: %s' % GAPS)
108 return {'type': 'ir.actions.act_window_close'}110 return {'type': 'ir.actions.act_window_close'}
109111
=== modified file 'account_move_group/__init__.py'
--- account_move_group/__init__.py 2014-05-09 21:51:34 +0000
+++ account_move_group/__init__.py 2014-10-07 08:56:40 +0000
@@ -23,5 +23,5 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26import wizard26from . import wizard
27import account_move_line27from . import account_move_line
2828
=== modified file 'account_move_group/__openerp__.py'
--- account_move_group/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_move_group/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -23,23 +23,28 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
2626# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
27{27{
28 "name": "Account Move Group",28 "name": "Account Move Group",
29 "version": "1.1",29 "version": "1.1",
30 "author" : "Vauxoo",30 "author": "Vauxoo",
31 "category": "Generic Modules/Account",31 "category": "Generic Modules/Account",
32 "website" : "http://www.vauxoo.com/",
33 "description": """ Group Entries32 "description": """ Group Entries
34 """,33 """,
35 'depends': ['account'],34 "website": "http://www.vauxoo.com/",
36 'init_xml': [],35 "license": "",
37 'update_xml': [36 "depends": [
38 'wizard/account_move_group_view.xml',37 "account"
39 ],38 ],
40 'demo_xml': [],39 "demo": [],
41 'test': [],40 "data": [
42 'installable': True,41 "wizard/account_move_group_view.xml"
43 'active': False,42 ],
44}43 "test": [],
45# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:44 "js": [],
45 "css": [],
46 "qweb": [],
47 "installable": True,
48 "auto_install": False,
49 "active": False
50}
46\ No newline at end of file51\ No newline at end of file
4752
=== modified file 'account_move_group/account_move_line.py'
--- account_move_group/account_move_line.py 2014-05-09 21:51:34 +0000
+++ account_move_group/account_move_line.py 2014-10-07 08:56:40 +0000
@@ -23,12 +23,9 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26from openerp.osv import osv, fields26from openerp.osv import osv
27from openerp.tools.translate import _27from openerp.tools.translate import _
2828
29import openerp.netsvc as netsvc
30import time
31
3229
33class account_move_line(osv.Model):30class account_move_line(osv.Model):
34 _inherit = 'account.move.line'31 _inherit = 'account.move.line'
@@ -42,7 +39,6 @@
42 res_reference = {}39 res_reference = {}
43 moves = []40 moves = []
44 moves_line = []41 moves_line = []
45 ok = False
4642
47 for move in account_move.browse(cr, uid, ids, context=context):43 for move in account_move.browse(cr, uid, ids, context=context):
48 moves.append(move.id)44 moves.append(move.id)
4945
=== added file 'account_move_group/i18n/pt_BR.po'
--- account_move_group/i18n/pt_BR.po 1970-01-01 00:00:00 +0000
+++ account_move_group/i18n/pt_BR.po 2014-10-07 08:56:40 +0000
@@ -0,0 +1,91 @@
1# Brazilian Portuguese translation for addons-vauxoo
2# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
3# This file is distributed under the same license as the addons-vauxoo package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: addons-vauxoo\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2013-11-07 01:13+0000\n"
11"PO-Revision-Date: 2014-09-26 08:41+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2014-09-27 06:28+0000\n"
18"X-Generator: Launchpad (build 17196)\n"
19
20#. module: account_move_group
21#: view:account.move.group:0
22msgid "Are you sure you want to merge these entries ?"
23msgstr ""
24
25#. module: account_move_group
26#: model:ir.model,name:account_move_group.model_account_move_group
27msgid "account.move.group"
28msgstr ""
29
30#. module: account_move_group
31#: code:addons/account_move_group/account_move_line.py:59
32#, python-format
33msgid "You need at least two entries to merged"
34msgstr ""
35
36#. module: account_move_group
37#: code:addons/account_move_group/account_move_line.py:70
38#, python-format
39msgid "Entries to merged must have the same period"
40msgstr ""
41
42#. module: account_move_group
43#: model:ir.actions.act_window,name:account_move_group.create_group_action
44msgid "Group Move"
45msgstr ""
46
47#. module: account_move_group
48#: model:ir.model,name:account_move_group.model_account_move_line
49msgid "Journal Items"
50msgstr ""
51
52#. module: account_move_group
53#: code:addons/account_move_group/account_move_line.py:59
54#: code:addons/account_move_group/account_move_line.py:66
55#: code:addons/account_move_group/account_move_line.py:70
56#, python-format
57msgid "Error"
58msgstr ""
59
60#. module: account_move_group
61#: view:account.move.group:0
62msgid "Cancel"
63msgstr ""
64
65#. module: account_move_group
66#: view:account.move.group:0
67msgid "Merge Entries"
68msgstr ""
69
70#. module: account_move_group
71#: view:account.move.group:0
72msgid ""
73" Please note that: \n"
74" \n"
75" Entries will only be merged if not: \n"
76" * Entries with diferent period \n"
77" * Entries with diferent journal \n"
78" "
79msgstr ""
80
81#. module: account_move_group
82#: code:addons/account_move_group/account_move_line.py:66
83#, python-format
84msgid "Entries to merged must have the same journal"
85msgstr ""
86
87#. module: account_move_group
88#: view:account.move.group:0
89#: model:ir.actions.act_window,name:account_move_group.group_wizard
90msgid "Account Move Group"
91msgstr ""
092
=== modified file 'account_move_group/wizard/__init__.py'
--- account_move_group/wizard/__init__.py 2014-05-09 21:51:34 +0000
+++ account_move_group/wizard/__init__.py 2014-10-07 08:56:40 +0000
@@ -23,4 +23,4 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26import account_move_group26from . import account_move_group
2727
=== modified file 'account_move_group/wizard/account_move_group.py'
--- account_move_group/wizard/account_move_group.py 2014-09-12 21:07:09 +0000
+++ account_move_group/wizard/account_move_group.py 2014-10-07 08:56:40 +0000
@@ -23,10 +23,7 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26import time26from openerp.osv import osv
27from openerp.osv import osv, fields
28from openerp.addons.decimal_precision import decimal_precision as dp
29from openerp.tools.translate import _
3027
3128
32class account_move_group(osv.TransientModel):29class account_move_group(osv.TransientModel):
3330
=== modified file 'account_move_line_address/__init__.py'
--- account_move_line_address/__init__.py 2014-05-09 21:51:34 +0000
+++ account_move_line_address/__init__.py 2014-10-07 08:56:40 +0000
@@ -23,4 +23,4 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26import account_move_line26from . import account_move_line
2727
=== modified file 'account_move_line_address/__openerp__.py'
--- account_move_line_address/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_move_line_address/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -23,23 +23,28 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
2626# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
27{27{
28 "name": "Account Move Line Address",28 "name": "Account Move Line Address",
29 "version": "1.1",29 "version": "1.1",
30 "author" : "Vauxoo",30 "author": "Vauxoo",
31 "category": "Generic Modules/Account",31 "category": "Generic Modules/Account",
32 "website" : "http://www.vauxoo.com/",
33 "description": """ Add field address in account_move_line32 "description": """ Add field address in account_move_line
34 """,33 """,
35 'depends': ['account'],34 "website": "http://www.vauxoo.com/",
36 'init_xml': [],35 "license": "",
37 'update_xml': [36 "depends": [
38 'account_move_line_view.xml',37 "account"
39 ],38 ],
40 'demo_xml': [],39 "demo": [],
41 'test': [],40 "data": [
42 'installable': False,41 "account_move_line_view.xml"
43 'active': False,42 ],
44}43 "test": [],
45# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:44 "js": [],
45 "css": [],
46 "qweb": [],
47 "installable": False,
48 "auto_install": False,
49 "active": False
50}
46\ No newline at end of file51\ No newline at end of file
4752
=== modified file 'account_move_line_address/account_move_line.py'
--- account_move_line_address/account_move_line.py 2014-05-09 21:51:34 +0000
+++ account_move_line_address/account_move_line.py 2014-10-07 08:56:40 +0000
@@ -24,7 +24,7 @@
24#24#
25##############################################################################25##############################################################################
2626
27from openerp.osv import osv, fields, orm27from openerp.osv import osv, fields
28from lxml import etree28from lxml import etree
29import openerp.tools as tools29import openerp.tools as tools
3030
@@ -38,7 +38,6 @@
38 def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):38 def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
39 result = super(account_move_line, self).fields_view_get(39 result = super(account_move_line, self).fields_view_get(
40 cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)40 cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
41 fields_get = self.fields_get(cr, uid, ['address_id'], context)
42 xml_form = etree.fromstring(result['arch'])41 xml_form = etree.fromstring(result['arch'])
43 placeholder = xml_form.xpath("//field[@name='partner_id']")42 placeholder = xml_form.xpath("//field[@name='partner_id']")
44 placeholder[0].addnext(etree.Element('field', {'name': 'address_id'}))43 placeholder[0].addnext(etree.Element('field', {'name': 'address_id'}))
4544
=== modified file 'account_move_line_base_tax/__init__.py'
--- account_move_line_base_tax/__init__.py 2014-05-09 21:51:34 +0000
+++ account_move_line_base_tax/__init__.py 2014-10-07 08:56:40 +0000
@@ -23,5 +23,5 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26import account26from . import account
2727
2828
=== modified file 'account_move_line_base_tax/__openerp__.py'
--- account_move_line_base_tax/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_move_line_base_tax/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -23,33 +23,33 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24#24#
25##############################################################################25##############################################################################
26
27{26{
28 "name" : "Amount Base Account Move Line",27 "name": "Amount Base Account Move Line",
29 "version" : "1.0",28 "version": "1.0",
30 "author" : "Vauxoo",29 "author": "Vauxoo",
31 "category" : "Generic Modules",30 "category": "Generic Modules",
32 "description" : """31 "description": """
33 This module adds the fields:32 This module adds the fields:
34 - amount_base33 - amount_base
35 - tax_id_secondary34 - tax_id_secondary
36 in account_move_line. These fields are fill when you validate the invoice.35 in account_move_line. These fields are fill when you validate the invoice.
37 """,36 """,
38 "website" : "http://www.vauxoo.com/",37 "website": "http://www.vauxoo.com/",
39 "license" : "AGPL-3",38 "license": "AGPL-3",
40 "depends" : [39 "depends": [
41 "account",40 "account",
42 "l10n_mx_account_tax_category",41 "l10n_mx_account_tax_category",
43 "account_invoice_tax",42 "account_invoice_tax"
44 ],43 ],
45 "demo" : [],44 "demo": [],
46 "data" : [45 "data": [
47 'account_view.xml',46 "account_view.xml"
48 ],47 ],
49 'js': [],48 "test": [],
50 'qweb' : [],49 "js": [],
51 'css':[],50 "css": [],
52 'test': [],51 "qweb": [],
53 "installable" : True,52 "installable": True,
54 "active" : False,53 "auto_install": False,
55}54 "active": False
55}
56\ No newline at end of file56\ No newline at end of file
5757
=== modified file 'account_move_line_base_tax/account.py'
--- account_move_line_base_tax/account.py 2014-05-09 21:51:34 +0000
+++ account_move_line_base_tax/account.py 2014-10-07 08:56:40 +0000
@@ -24,31 +24,31 @@
24#24#
25##############################################################################25##############################################################################
26from openerp.osv import osv, fields26from openerp.osv import osv, fields
27from lxml import etree
28from openerp.tools.translate import _27from openerp.tools.translate import _
2928
29
30class account_move_line(osv.Model):30class account_move_line(osv.Model):
31 _inherit = 'account.move.line'31 _inherit = 'account.move.line'
32 32
33 _columns = {33 _columns = {
34 'amount_base' : fields.float('Amount Base', help='Amount base '\34 'amount_base': fields.float('Amount Base', help='Amount base '
35 'without amount tax'),35 'without amount tax'),
36 'tax_id_secondary' : fields.many2one('account.tax', 'Tax Secondary',36 'tax_id_secondary': fields.many2one('account.tax', 'Tax Secondary',
37 help='Tax used for this move'),37 help='Tax used for this move'),
38 'not_move_diot' : fields.boolean('Not Consider in Diot', help='If'\38 'not_move_diot': fields.boolean('Not Consider in Diot', help='If'
39 ' this field is active, although of this item have data for DIOT,'\39 ' this field is active, although of this item have data for DIOT,'
40 ' not be considered.'),40 ' not be considered.'),
41 }41 }
42 42
43 def onchange_tax_secondary(self, cr, uid, ids, account_id=False, context=None):43 def onchange_tax_secondary(self, cr, uid, ids, account_id=False, context=None):
44 acc_tax_obj = self.pool.get('account.tax')44 acc_tax_obj = self.pool.get('account.tax')
45 tax_acc = acc_tax_obj.search(cr, uid, [45 tax_acc = acc_tax_obj.search(cr, uid, [
46 ('account_paid_voucher_id', '=', account_id)], context=context)46 ('account_paid_voucher_id', '=', account_id)], context=context)
47 if tax_acc:47 if tax_acc:
48 return {'value' : {'tax_id_secondary' : tax_acc[0]}}48 return {'value': {'tax_id_secondary': tax_acc[0]}}
49 else:49 else:
50 return {'value' : {}}50 return {'value': {}}
51 51
52 def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):52 def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
53 if context is None:53 if context is None:
54 context = {}54 context = {}
@@ -56,35 +56,35 @@
56 return True56 return True
57 if isinstance(ids, (int, long)):57 if isinstance(ids, (int, long)):
58 ids = [ids]58 ids = [ids]
59 59
60 res = super(account_move_line, self).write(cr, uid, ids, vals,60 res = super(account_move_line, self).write(cr, uid, ids, vals,
61 context=context, check=check, update_check=update_check)61 context=context, check=check, update_check=update_check)
62 acc_tax_obj = self.pool.get('account.tax')
63 for line in self.browse(cr, uid, ids, context=context):62 for line in self.browse(cr, uid, ids, context=context):
64 if line.tax_id_secondary and line.tax_id_secondary.type_tax_use == 'purchase':63 if line.tax_id_secondary and line.tax_id_secondary.type_tax_use == 'purchase':
65 cat_tax = line.tax_id_secondary.tax_category_id64 cat_tax = line.tax_id_secondary.tax_category_id
66 if cat_tax and cat_tax.name in ('IVA', 'IVA-EXENTO') and line.amount_base <= 0 and\65 if cat_tax and cat_tax.name in ('IVA', 'IVA-EXENTO') and line.amount_base <= 0 and\
67 not line.not_move_diot:66 not line.not_move_diot:
68 raise osv.except_osv(_('Warning!'), _('The lines with tax of purchase, need '\67 raise osv.except_osv(_('Warning!'), _('The lines with tax of purchase, need '
69 'have a value in the amount base.'))68 'have a value in the amount base.'))
70 elif cat_tax and cat_tax == 'IVA-RET' and line.credit <= 0 and\69 elif cat_tax and cat_tax == 'IVA-RET' and line.credit <= 0 and\
71 not line.not_move_diot:70 not line.not_move_diot:
72 raise osv.except_osv(_('Warning!'), _('The lines with tax of purchase, need '\71 raise osv.except_osv(_('Warning!'), _('The lines with tax of purchase, need '
73 'have a value in the credit.'))72 'have a value in the credit.'))
74 return res73 return res
75 74
76 def onchange_account_id(self, cr, uid, ids, account_id=False, partner_id=False, context=None):75 def onchange_account_id(self, cr, uid, ids, account_id=False, partner_id=False, context=None):
77 res = super(account_move_line, self).onchange_account_id(cr, uid, ids, account_id, partner_id, context=context)76 res = super(account_move_line, self).onchange_account_id(cr, uid, ids, account_id, partner_id, context=context)
78 acc_tax_obj = self.pool.get('account.tax')77 acc_tax_obj = self.pool.get('account.tax')
79 tax_acc = acc_tax_obj.search(cr, uid, [78 tax_acc = acc_tax_obj.search(cr, uid, [
80 ('account_paid_voucher_id', '=', account_id)], context=context)79 ('account_paid_voucher_id', '=', account_id)], context=context)
81 if tax_acc:80 if tax_acc:
82 res['value'].update({'tax_id_secondary' : tax_acc[0]})81 res['value'].update({'tax_id_secondary': tax_acc[0]})
83 return res82 return res
84 83
84
85class account_invoice_tax(osv.Model):85class account_invoice_tax(osv.Model):
86 _inherit = "account.invoice.tax"86 _inherit = "account.invoice.tax"
87 87
88 def move_line_get(self, cr, uid, invoice_id, context=None):88 def move_line_get(self, cr, uid, invoice_id, context=None):
89 res = []89 res = []
90 super(account_invoice_tax, self).move_line_get(cr, uid, invoice_id)90 super(account_invoice_tax, self).move_line_get(cr, uid, invoice_id)
@@ -94,29 +94,29 @@
94 if not t.amount and not t.tax_code_id and not t.tax_amount:94 if not t.amount and not t.tax_code_id and not t.tax_amount:
95 continue95 continue
96 res.append({96 res.append({
97 'type' : 'tax',97 'type': 'tax',
98 'name' : t.name,98 'name': t.name,
99 'price_unit' : t.amount,99 'price_unit': t.amount,
100 'quantity' : 1,100 'quantity': 1,
101 'price' : t.amount or 0.0,101 'price': t.amount or 0.0,
102 'account_id' : t.account_id.id or False,102 'account_id': t.account_id.id or False,
103 'tax_code_id' : t.tax_code_id.id or False,103 'tax_code_id': t.tax_code_id.id or False,
104 'tax_amount' : t.tax_amount or False,104 'tax_amount': t.tax_amount or False,
105 'account_analytic_id' : t.account_analytic_id.id or False,105 'account_analytic_id': t.account_analytic_id.id or False,
106 'amount_base' : t.base_amount or 0.0,106 'amount_base': t.base_amount or 0.0,
107 'tax_id_secondary' : t.tax_id.id or False,107 'tax_id_secondary': t.tax_id.id or False,
108 })108 })
109 return res109 return res
110 110
111
111class account_invoice(osv.Model):112class account_invoice(osv.Model):
112 _inherit = 'account.invoice'113 _inherit = 'account.invoice'
113 114
114 def line_get_convert(self, cr, uid, x, part, date, context=None):115 def line_get_convert(self, cr, uid, x, part, date, context=None):
115 res = super(account_invoice, self).line_get_convert(cr, uid, x, part,\116 res = super(account_invoice, self).line_get_convert(cr, uid, x, part,
116 date, context=context)117 date, context=context)
117 res.update({118 res.update({
118 'amount_base': x.get('amount_base', False),119 'amount_base': x.get('amount_base', False),
119 'tax_id_secondary': x.get('tax_id_secondary', False),120 'tax_id_secondary': x.get('tax_id_secondary', False),
120 })121 })
121 return res122 return res
122
123123
=== modified file 'account_move_line_dp_product/__init__.py'
--- account_move_line_dp_product/__init__.py 2014-05-09 21:51:34 +0000
+++ account_move_line_dp_product/__init__.py 2014-10-07 08:56:40 +0000
@@ -20,4 +20,4 @@
20# You should have received a copy of the GNU Affero General Public License20# You should have received a copy of the GNU Affero General Public License
21# along with this program. If not, see <http://www.gnu.org/licenses/>.21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22################################################################################22################################################################################
23import account_move_line23from . import account_move_line
2424
=== modified file 'account_move_line_dp_product/__openerp__.py'
--- account_move_line_dp_product/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_move_line_dp_product/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -20,21 +20,27 @@
20# You should have received a copy of the GNU Affero General Public License20# You should have received a copy of the GNU Affero General Public License
21# along with this program. If not, see <http://www.gnu.org/licenses/>.21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22################################################################################22################################################################################
23#"license" : "AGPL-3",
23{24{
24 "name" : "Grouped by production and stock move in model account_move_line",25 "name": "Grouped by production and stock move in model account_move_line",
25 "version" : "1.0",26 "version": "1.0",
26 "depends" : ['product','account'],27 "author": "Vauxoo",
27 "author" : "Vauxoo",28 "category": "Generic Modules",
28 #"license" : "AGPL-3",29 "description": """Grouped by production and stock move in model account_move_line
29 "description" : """Grouped by production and stock move in model account_move_line30 """,
30 """,31 "website": "http://vauxoo.com",
31 "website" : "http://vauxoo.com",32 "license": "",
32 "category" : "Generic Modules",33 "depends": [
33 "init_xml" : [],34 "product",
34 "demo_xml" : [],35 "account"
35 "test": [],36 ],
36 "update_xml" : [],37 "demo": [],
37 "active": False,38 "data": [],
38 "installable": True,39 "test": [],
39}40 "js": [],
4041 "css": [],
42 "qweb": [],
43 "installable": True,
44 "auto_install": False,
45 "active": False
46}
41\ No newline at end of file47\ No newline at end of file
4248
=== modified file 'account_move_line_dp_product/account_move_line.py'
--- account_move_line_dp_product/account_move_line.py 2014-09-12 21:07:09 +0000
+++ account_move_line_dp_product/account_move_line.py 2014-10-07 08:56:40 +0000
@@ -20,7 +20,6 @@
20# You should have received a copy of the GNU Affero General Public License20# You should have received a copy of the GNU Affero General Public License
21# along with this program. If not, see <http://www.gnu.org/licenses/>.21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22##########################################################################22##########################################################################
23from openerp.tools.translate import _
2423
25from openerp.osv import osv, fields24from openerp.osv import osv, fields
26from openerp.addons.decimal_precision import decimal_precision as dp25from openerp.addons.decimal_precision import decimal_precision as dp
@@ -33,7 +32,7 @@
33 'quantity': fields.float('Quantity',32 'quantity': fields.float('Quantity',
34 digits_compute=dp.get_precision(33 digits_compute=dp.get_precision(
35 'Product UoM'),34 'Product UoM'),
36 help="The optional quantity expressed by this line,\35 help="The optional quantity expressed by this line,\
37 eg: number of product sold. The quantity is not a legal\36 eg: number of product sold. The quantity is not a legal\
38 requirement but is very useful for some reports."),37 requirement but is very useful for some reports."),
39 }38 }
4039
=== modified file 'account_move_line_extended/__init__.py'
--- account_move_line_extended/__init__.py 2014-08-04 17:42:41 +0000
+++ account_move_line_extended/__init__.py 2014-10-07 08:56:40 +0000
@@ -23,5 +23,5 @@
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24###############################################################################24###############################################################################
2525
26import model26from . import model
27import wizard27from . import wizard
2828
=== modified file 'account_move_line_extended/__openerp__.py'
--- account_move_line_extended/__openerp__.py 2014-08-04 20:27:30 +0000
+++ account_move_line_extended/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -22,32 +22,33 @@
22# You should have received a copy of the GNU Affero General Public License22# You should have received a copy of the GNU Affero General Public License
23# along with this program. If not, see <http://www.gnu.org/licenses/>.23# along with this program. If not, see <http://www.gnu.org/licenses/>.
24###############################################################################24###############################################################################
25
26{25{
27 'name': 'Account Move Line Extended',26 "name": "Account Move Line Extended",
28 'version': '1.0',27 "version": "1.0",
29 'author': 'Vauxoo',28 "author": "Vauxoo",
30 'website': 'http://www.vauxoo.com/',29 "category": "",
31 'category': '',30 "description": """
32 'description': '''
33Account Move Line Extended31Account Move Line Extended
34==========================32==========================
3533
36Add a new view for the account move lines at the menu ``Accounting or Invocing34Add a new view for the account move lines at the menu ``Accounting or Invocing
37> Journal Entries > Journal Items Extended``. The currency and the amount35> Journal Entries > Journal Items Extended``. The currency and the amount
38currency fields are visible.36currency fields are visible.
39''',37""",
40 'depends': [38 "website": "http://www.vauxoo.com/",
41 'account',39 "license": "",
42 ],40 "depends": [
43 'data': [41 "account"
44 'view/account_move_line_view.xml',42 ],
45 ],43 "demo": [],
46 'demo': [],44 "data": [
47 'test': [],45 "view/account_move_line_view.xml"
48 'qweb': [],46 ],
49 'js': [],47 "test": [],
50 'css': [],48 "js": [],
51 'active': False,49 "css": [],
52 'installable': True,50 "qweb": [],
53}51 "installable": True,
52 "auto_install": False,
53 "active": False
54}
54\ No newline at end of file55\ No newline at end of file
5556
=== modified file 'account_move_line_group_analytic/__init__.py'
--- account_move_line_group_analytic/__init__.py 2014-05-09 21:51:34 +0000
+++ account_move_line_group_analytic/__init__.py 2014-10-07 08:56:40 +0000
@@ -20,4 +20,4 @@
20# You should have received a copy of the GNU Affero General Public License20# You should have received a copy of the GNU Affero General Public License
21# along with this program. If not, see <http://www.gnu.org/licenses/>.21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22################################################################################22################################################################################
23import account_move_line23from . import account_move_line
2424
=== modified file 'account_move_line_group_analytic/__openerp__.py'
--- account_move_line_group_analytic/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_move_line_group_analytic/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -20,30 +20,34 @@
20# You should have received a copy of the GNU Affero General Public License20# You should have received a copy of the GNU Affero General Public License
21# along with this program. If not, see <http://www.gnu.org/licenses/>.21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22################################################################################22################################################################################
23#"license" : "AGPL-3",
23{24{
24 "name" : "Grouped by product,move_id y analytic in model account_move_line",25 "name": "Grouped by product,move_id y analytic in model account_move_line",
25 "version" : "1.0",26 "version": "1.0",
26 "depends" : [27 "author": "Vauxoo",
27 'account',28 "category": "Generic Modules",
28 'analytic'29 "description": """
29 ],
30 "author" : "Vauxoo",
31 #"license" : "AGPL-3",
32 "description" : """
33Improvements in account.move.line view:30Improvements in account.move.line view:
34=======================================31=======================================
3532
36On search view for journal items (account_move_line) we add group by product,33On search view for journal items (account_move_line) we add group by product,
37move_id and analytic_id.34move_id and analytic_id.
38 """,35 """,
39 "website" : "http://vauxoo.com",36 "website": "http://vauxoo.com",
40 "category" : "Generic Modules",37 "license": "",
41 "init_xml" : [],38 "depends": [
42 "demo_xml" : [],39 "account",
43 "test": [],40 "analytic"
44 "update_xml" : ['account_move_line.xml',41 ],
45 ],42 "demo": [],
46 "active": False,43 "data": [
47 "installable": True,44 "account_move_line.xml"
48}45 ],
4946 "test": [],
47 "js": [],
48 "css": [],
49 "qweb": [],
50 "installable": True,
51 "auto_install": False,
52 "active": False
53}
50\ No newline at end of file54\ No newline at end of file
5155
=== modified file 'account_move_line_group_analytic/account_move_line.py'
--- account_move_line_group_analytic/account_move_line.py 2014-05-09 21:51:34 +0000
+++ account_move_line_group_analytic/account_move_line.py 2014-10-07 08:56:40 +0000
@@ -21,9 +21,8 @@
21# along with this program. If not, see <http://www.gnu.org/licenses/>.21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22##########################################################################22##########################################################################
2323
24from openerp.osv import osv, fields, orm24from openerp.osv import osv
25from lxml import etree25from lxml import etree
26import openerp.tools as tools
2726
2827
29class account_move_line(osv.Model):28class account_move_line(osv.Model):
@@ -44,13 +43,13 @@
44 result['arch'] = etree.tostring(xml_form)43 result['arch'] = etree.tostring(xml_form)
45 result['fields'].update({44 result['fields'].update({
46 'product_id': {45 'product_id': {
47 'domain': [],46 'domain': [],
48 'string': u'Product',47 'string': u'Product',
49 'readonly': False,48 'readonly': False,
50 'relation': 'product.product',49 'relation': 'product.product',
51 'context': {},50 'context': {},
52 'selectable': True,51 'selectable': True,
53 'type': 'many2one',52 'type': 'many2one',
54 'select': 2}53 'select': 2}
55 })54 })
56 return result55 return result
5756
=== modified file 'account_move_line_group_by_asset/__openerp__.py'
--- account_move_line_group_by_asset/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_move_line_group_by_asset/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -24,26 +24,27 @@
24#24#
25##############################################################################25##############################################################################
26{26{
27 "name" : "Account Move Line Group By Asset",27 "name": "Account Move Line Group By Asset",
28 "version" : "1.0",28 "version": "1.0",
29 "author" : "Vauxoo",29 "author": "Vauxoo",
30 "category" : "Generic Modules",30 "category": "Generic Modules",
31 "description" : """31 "description": """
32 This module add the option by group in Journal Items by asset32 This module add the option by group in Journal Items by asset
33 """,33 """,
34 "website" : "http://www.vauxoo.com/",34 "website": "http://www.vauxoo.com/",
35 "license" : "AGPL-3",35 "license": "AGPL-3",
36 "depends" : [36 "depends": [
37 "account_asset",37 "account_asset"
38 ],38 ],
39 "demo" : [],39 "demo": [],
40 "data" : [40 "data": [
41 'account_view.xml',41 "account_view.xml"
42 ],42 ],
43 'js': [],43 "test": [],
44 'qweb' : [],44 "js": [],
45 'css':[],45 "css": [],
46 'test': [],46 "qweb": [],
47 "installable" : True,47 "installable": True,
48 "active" : False,48 "auto_install": False,
49}49 "active": False
50}
50\ No newline at end of file51\ No newline at end of file
5152
=== modified file 'account_move_line_group_by_extend/__init__.py'
--- account_move_line_group_by_extend/__init__.py 2014-05-09 21:51:34 +0000
+++ account_move_line_group_by_extend/__init__.py 2014-10-07 08:56:40 +0000
@@ -20,4 +20,4 @@
20# You should have received a copy of the GNU Affero General Public License20# You should have received a copy of the GNU Affero General Public License
21# along with this program. If not, see <http://www.gnu.org/licenses/>.21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22################################################################################22################################################################################
23import account_move_line23from . import account_move_line
2424
=== modified file 'account_move_line_group_by_extend/__openerp__.py'
--- account_move_line_group_by_extend/__openerp__.py 2014-05-09 21:51:34 +0000
+++ account_move_line_group_by_extend/__openerp__.py 2014-10-07 08:56:40 +0000
@@ -20,22 +20,28 @@
20# You should have received a copy of the GNU Affero General Public License20# You should have received a copy of the GNU Affero General Public License
21# along with this program. If not, see <http://www.gnu.org/licenses/>.21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22################################################################################22################################################################################
23#"license" : "AGPL-3",
23{24{
24 "name" : "Grouped by production and stock move in model account_move_line",25 "name": "Grouped by production and stock move in model account_move_line",
25 "version" : "1.0",26 "version": "1.0",
26 "depends" : ['account_relation_move'],27 "author": "Vauxoo",
27 "author" : "Vauxoo",28 "category": "Generic Modules",
28 #"license" : "AGPL-3",29 "description": """Grouped by production and stock move in model account_move_line
29 "description" : """Grouped by production and stock move in model account_move_line30 """,
30 """,31 "website": "http://vauxoo.com",
31 "website" : "http://vauxoo.com",32 "license": "",
32 "category" : "Generic Modules",33 "depends": [
33 "init_xml" : [],34 "account_relation_move"
34 "demo_xml" : [],35 ],
35 "test": [],
36 "update_xml" : ['account_move_line.xml',
37 ],
38 "active": False,
39 "installable": True,
40}
41
The diff has been truncated for viewing.