Merge lp://staging/~jpizarrom/openerp-mexico-localization/7.0-city-reset-city_id-when-change-state_id into lp://staging/openerp-mexico-localization

city/partner_address.py (+27/-8)
city/partner_address_view.xml (+3/-0)
city/res_city.py (+11/-6)
email_template_multicompany/email_template.py (+5/-4)
l10n_mx_account_invoice_tax/account_invoice_tax.py (+2/-3)
l10n_mx_account_tax_category/account_tax_category.py (+27/-21)
l10n_mx_account_tax_category/invoice.py (+23/-13)
l10n_mx_base_vat_split/base_vat.py (+9/-6)
l10n_mx_cities/tools/add_node.py (+10/-9)
l10n_mx_cities/tools/read_write_xml.py (+48/-34)
l10n_mx_company_cif/res_company.py (+5/-4)
l10n_mx_company_cif/wizard/installer.py (+14/-13)
l10n_mx_company_multi_address/account_journal.py (+11/-49)
l10n_mx_company_multi_address/invoice.py (+143/-49)
l10n_mx_company_multi_address/res_company.py (+19/-10)
l10n_mx_facturae/__openerp__.py (+2/-1)
l10n_mx_facturae/invoice.py (+620/-337)
l10n_mx_facturae/invoice_view.xml (+7/-0)
l10n_mx_facturae/ir_attachment_facturae.py (+6/-4)
l10n_mx_facturae/ir_sequence_approval.py (+6/-4)
l10n_mx_facturae/wizard/installer.py (+18/-15)
l10n_mx_facturae/wizard/wizard_create_facturae_file.py (+31/-28)
l10n_mx_facturae/wizard/wizard_invoice_facturae_txt.py (+100/-77)
l10n_mx_facturae/wizard/wizard_invoice_facturae_txt_v6.py (+87/-65)
l10n_mx_facturae/wizard/wizard_invoice_facturae_xml.py (+33/-27)
l10n_mx_facturae/wizard/wizard_invoice_facturae_xml_v6.py (+17/-15)
l10n_mx_facturae_cbb/invoice.py (+50/-33)
l10n_mx_facturae_cbb/ir_attachment_facturae.py (+6/-4)
l10n_mx_facturae_cbb/ir_sequence_approval.py (+12/-7)
l10n_mx_facturae_cbb/report/invoice_facturae_pdf.py (+90/-64)
l10n_mx_facturae_cer/invoice.py (+17/-12)
l10n_mx_facturae_cer/res_company.py (+143/-91)
l10n_mx_facturae_lib/facturae_lib.py (+85/-62)
l10n_mx_facturae_pac/invoice.py (+78/-42)
l10n_mx_facturae_pac_sf/invoice.py (+224/-139)
l10n_mx_facturae_pac_sf/ir_attachment_facturae.py (+6/-4)
l10n_mx_facturae_pac_sf/ir_sequence_approval.py (+6/-4)
l10n_mx_facturae_pac_sf/params_pac.py (+10/-9)
l10n_mx_facturae_pac_sf/report/invoice_facturae_pac_sf_pdf.py (+81/-56)
l10n_mx_facturae_pac_sf/wizard/wizard_cancel_invoice_pac_sf_v6.py (+14/-13)
l10n_mx_facturae_pac_sf/wizard/wizard_export_invoice_pac_sf_v6.py (+21/-22)
l10n_mx_facturae_report/report/invoice_facturae_html.mako (+1/-1)
l10n_mx_facturae_report/report/invoice_facturae_html.py (+56/-51)
l10n_mx_facturae_seq/invoice.py (+59/-43)
l10n_mx_facturae_seq/ir_sequence.py (+97/-55)
l10n_mx_import_info/import_info.py (+30/-33)
l10n_mx_import_info/invoice.py (+6/-5)
l10n_mx_import_info/product.py (+42/-41)
l10n_mx_import_info/report/label_report.py (+4/-5)
l10n_mx_import_info/stock.py (+111/-95)
l10n_mx_invoice_amount_to_text/amount_to_text_es_MX.py (+109/-80)
l10n_mx_invoice_amount_to_text/invoice.py (+14/-8)
l10n_mx_invoice_currency_chgdft/invoice.py (+3/-1)
l10n_mx_invoice_datetime/invoice.py (+55/-32)
l10n_mx_invoice_discount/invoice.py (+73/-42)
l10n_mx_invoice_discount/partner.py (+6/-6)
l10n_mx_invoice_ftp/wizard/wizard_facturae_ftp.py (+13/-11)
l10n_mx_ir_attachment_facturae/invoice.py (+11/-15)
l10n_mx_ir_attachment_facturae/ir_attachment_facturae.py (+68/-61)
l10n_mx_ir_attachment_facturae/res_config.py (+12/-8)
l10n_mx_notes_invoice/res_company.py (+5/-4)
l10n_mx_params_pac/params_pac.py (+19/-13)
l10n_mx_partner_address/partner_address.py (+30/-17)
l10n_mx_payment_method/invoice.py (+22/-8)
l10n_mx_payment_method/partner.py (+7/-3)
l10n_mx_payment_method/pay_method.py (+2/-3)
l10n_mx_purchase_payment_method/purchase.py (+36/-19)
l10n_mx_purchase_payment_method/stock.py (+20/-14)
l10n_mx_regimen_fiscal/partner.py (+2/-2)
l10n_mx_regimen_fiscal/regimen_fiscal.py (+3/-3)
l10n_mx_res_partner_bank/res_bank.py (+10/-9)
l10n_mx_upload_ftp/upload_ftp.py (+27/-24)