Merge lp:~savoirfairelinux-openerp/openobject-addons/fix_l10n_ca into lp:openobject-addons/6.0

Proposed by Jonatan Cloutier
Status: Superseded
Proposed branch: lp:~savoirfairelinux-openerp/openobject-addons/fix_l10n_ca
Merge into: lp:openobject-addons/6.0
Diff against target: 4136083 lines (has conflicts)
Text conflict in account/account.py
Text conflict in account/account_bank_statement.py
Text conflict in account/account_invoice.py
Text conflict in account/account_invoice_view.xml
Text conflict in account/account_move_line.py
Text conflict in account/account_report.xml
Text conflict in account/account_view.xml
Text conflict in account/board_account_view.xml
Text conflict in account/configurable_account_chart.xml
Text conflict in account/demo/account_minimal.xml
Text conflict in account/i18n/account.pot
Text conflict in account/i18n/ar.po
Text conflict in account/i18n/bg.po
Text conflict in account/i18n/br.po
Text conflict in account/i18n/bs.po
Text conflict in account/i18n/ca.po
Text conflict in account/i18n/cs.po
Text conflict in account/i18n/da.po
Text conflict in account/i18n/de.po
Text conflict in account/i18n/el.po
Conflict adding file account/i18n/en_GB.po.  Moved existing file to account/i18n/en_GB.po.moved.
Text conflict in account/i18n/en_US.po
Text conflict in account/i18n/es.po
Text conflict in account/i18n/es_AR.po
Conflict adding file account/i18n/es_CL.po.  Moved existing file to account/i18n/es_CL.po.moved.
Conflict adding file account/i18n/es_CR.po.  Moved existing file to account/i18n/es_CR.po.moved.
Conflict adding file account/i18n/es_DO.po.  Moved existing file to account/i18n/es_DO.po.moved.
Text conflict in account/i18n/es_EC.po
Conflict adding file account/i18n/es_MX.po.  Moved existing file to account/i18n/es_MX.po.moved.
Conflict adding file account/i18n/es_MX.po.moved.  Moved existing file to account/i18n/es_MX.po.moved.moved.
Conflict adding file account/i18n/es_PY.po.  Moved existing file to account/i18n/es_PY.po.moved.
Conflict adding file account/i18n/es_UY.po.  Moved existing file to account/i18n/es_UY.po.moved.
Conflict adding file account/i18n/es_VE.po.  Moved existing file to account/i18n/es_VE.po.moved.
Text conflict in account/i18n/et.po
Text conflict in account/i18n/eu.po
Text conflict in account/i18n/fa.po
Conflict adding file account/i18n/fa_AF.po.  Moved existing file to account/i18n/fa_AF.po.moved.
Text conflict in account/i18n/fi.po
Text conflict in account/i18n/fr.po
Text conflict in account/i18n/fr_BE.po
Text conflict in account/i18n/gl.po
Text conflict in account/i18n/gu.po
Text conflict in account/i18n/he.po
Text conflict in account/i18n/hi.po
Text conflict in account/i18n/hr.po
Text conflict in account/i18n/hu.po
Text conflict in account/i18n/id.po
Text conflict in account/i18n/it.po
Conflict adding file account/i18n/ja.po.  Moved existing file to account/i18n/ja.po.moved.
Text conflict in account/i18n/kab.po
Conflict adding file account/i18n/kk.po.  Moved existing file to account/i18n/kk.po.moved.
Text conflict in account/i18n/ko.po
Text conflict in account/i18n/lo.po
Text conflict in account/i18n/lt.po
Text conflict in account/i18n/lv.po
Conflict adding file account/i18n/mk.po.  Moved existing file to account/i18n/mk.po.moved.
Text conflict in account/i18n/mn.po
Text conflict in account/i18n/nb.po
Text conflict in account/i18n/nl.po
Text conflict in account/i18n/nl_BE.po
Text conflict in account/i18n/oc.po
Text conflict in account/i18n/pl.po
Text conflict in account/i18n/pt.po
Text conflict in account/i18n/pt_BR.po
Text conflict in account/i18n/ro.po
Text conflict in account/i18n/ru.po
Text conflict in account/i18n/si.po
Text conflict in account/i18n/sk.po
Text conflict in account/i18n/sl.po
Text conflict in account/i18n/sq.po
Text conflict in account/i18n/sr.po
Text conflict in account/i18n/sr@latin.po
Text conflict in account/i18n/sv.po
Text conflict in account/i18n/ta.po
Text conflict in account/i18n/te.po
Text conflict in account/i18n/th.po
Text conflict in account/i18n/tlh.po
Text conflict in account/i18n/tr.po
Text conflict in account/i18n/ug.po
Text conflict in account/i18n/uk.po
Text conflict in account/i18n/ur.po
Text conflict in account/i18n/vi.po
Text conflict in account/i18n/zh_CN.po
Text conflict in account/i18n/zh_HK.po
Text conflict in account/i18n/zh_TW.po
Text conflict in account/installer.py
Contents conflict in account/report/account_aged_partner_balance.sxw
Contents conflict in account/report/account_balance_sheet.py
Contents conflict in account/report/account_balance_sheet.rml
Contents conflict in account/report/account_balance_sheet.sxw
Contents conflict in account/report/account_balance_sheet_horizontal.rml
Contents conflict in account/report/account_balance_sheet_horizontal.sxw
Text conflict in account/report/account_invoice_report.py
Text conflict in account/report/account_journal.rml
Contents conflict in account/report/account_profit_horizontal.rml
Contents conflict in account/report/account_profit_horizontal.sxw
Contents conflict in account/report/account_profit_loss.py
Contents conflict in account/report/account_profit_loss.rml
Contents conflict in account/report/account_profit_loss.sxw
Text conflict in account/report/account_tax_report.rml
Text conflict in account/security/account_security.xml
Text conflict in account/wizard/account_fiscalyear_close.py
Contents conflict in account/wizard/account_report_profit_loss.py
Contents conflict in account/wizard/account_report_profit_loss_view.xml
Text conflict in account/wizard/account_vat_view.xml
Text conflict in account_accountant/i18n/ar.po
Conflict adding file account_accountant/i18n/az.po.  Moved existing file to account_accountant/i18n/az.po.moved.
Conflict adding file account_accountant/i18n/bg.po.  Moved existing file to account_accountant/i18n/bg.po.moved.
Conflict adding file account_accountant/i18n/bn.po.  Moved existing file to account_accountant/i18n/bn.po.moved.
Conflict adding file account_accountant/i18n/bs.po.  Moved existing file to account_accountant/i18n/bs.po.moved.
Conflict adding file account_accountant/i18n/ca.po.  Moved existing file to account_accountant/i18n/ca.po.moved.
Conflict adding file account_accountant/i18n/cs.po.  Moved existing file to account_accountant/i18n/cs.po.moved.
Text conflict in account_accountant/i18n/da.po
Text conflict in account_accountant/i18n/de.po
Text conflict in account_accountant/i18n/el.po
Conflict adding file account_accountant/i18n/en_GB.po.  Moved existing file to account_accountant/i18n/en_GB.po.moved.
Text conflict in account_accountant/i18n/es.po
Conflict adding file account_accountant/i18n/es_CO.po.  Moved existing file to account_accountant/i18n/es_CO.po.moved.
Conflict adding file account_accountant/i18n/es_CR.po.  Moved existing file to account_accountant/i18n/es_CR.po.moved.
Conflict adding file account_accountant/i18n/es_DO.po.  Moved existing file to account_accountant/i18n/es_DO.po.moved.
Text conflict in account_accountant/i18n/es_EC.po
Conflict adding file account_accountant/i18n/es_MX.po.  Moved existing file to account_accountant/i18n/es_MX.po.moved.
Conflict adding file account_accountant/i18n/es_PY.po.  Moved existing file to account_accountant/i18n/es_PY.po.moved.
Conflict adding file account_accountant/i18n/et.po.  Moved existing file to account_accountant/i18n/et.po.moved.
Text conflict in account_accountant/i18n/fa.po
Conflict adding file account_accountant/i18n/fi.po.  Moved existing file to account_accountant/i18n/fi.po.moved.
Text conflict in account_accountant/i18n/fr.po
Conflict adding file account_accountant/i18n/gl.po.  Moved existing file to account_accountant/i18n/gl.po.moved.
Conflict adding file account_accountant/i18n/he.po.  Moved existing file to account_accountant/i18n/he.po.moved.
Text conflict in account_accountant/i18n/hi.po
Text conflict in account_accountant/i18n/hr.po
Text conflict in account_accountant/i18n/hu.po
Conflict adding file account_accountant/i18n/id.po.  Moved existing file to account_accountant/i18n/id.po.moved.
Text conflict in account_accountant/i18n/it.po
Conflict adding file account_accountant/i18n/ja.po.  Moved existing file to account_accountant/i18n/ja.po.moved.
Conflict adding file account_accountant/i18n/ko.po.  Moved existing file to account_accountant/i18n/ko.po.moved.
Text conflict in account_accountant/i18n/lo.po
Conflict adding file account_accountant/i18n/lt.po.  Moved existing file to account_accountant/i18n/lt.po.moved.
Text conflict in account_accountant/i18n/lv.po
Conflict adding file account_accountant/i18n/mk.po.  Moved existing file to account_accountant/i18n/mk.po.moved.
Text conflict in account_accountant/i18n/mn.po
Conflict adding file account_accountant/i18n/nb.po.  Moved existing file to account_accountant/i18n/nb.po.moved.
Text conflict in account_accountant/i18n/nl.po
Text conflict in account_accountant/i18n/nl_BE.po
Conflict adding file account_accountant/i18n/oc.po.  Moved existing file to account_accountant/i18n/oc.po.moved.
Text conflict in account_accountant/i18n/pl.po
Text conflict in account_accountant/i18n/pt.po
Text conflict in account_accountant/i18n/pt_BR.po
Text conflict in account_accountant/i18n/ro.po
Text conflict in account_accountant/i18n/ru.po
Text conflict in account_accountant/i18n/sk.po
Text conflict in account_accountant/i18n/sl.po
Conflict adding file account_accountant/i18n/sq.po.  Moved existing file to account_accountant/i18n/sq.po.moved.
Text conflict in account_accountant/i18n/sr.po
Text conflict in account_accountant/i18n/sr@latin.po
Text conflict in account_accountant/i18n/sv.po
Text conflict in account_accountant/i18n/ta.po
Text conflict in account_accountant/i18n/th.po
Text conflict in account_accountant/i18n/tr.po
Text conflict in account_accountant/i18n/uk.po
Text conflict in account_accountant/i18n/vi.po
Text conflict in account_accountant/i18n/zh_CN.po
Conflict adding file account_accountant/i18n/zh_TW.po.  Moved existing file to account_accountant/i18n/zh_TW.po.moved.
Text conflict in account_analytic_analysis/i18n/ar.po
Text conflict in account_analytic_analysis/i18n/bg.po
Text conflict in account_analytic_analysis/i18n/bs.po
Text conflict in account_analytic_analysis/i18n/ca.po
Text conflict in account_analytic_analysis/i18n/cs.po
Text conflict in account_analytic_analysis/i18n/da.po
Text conflict in account_analytic_analysis/i18n/de.po
Text conflict in account_analytic_analysis/i18n/el.po
Conflict adding file account_analytic_analysis/i18n/en_GB.po.  Moved existing file to account_analytic_analysis/i18n/en_GB.po.moved.
Text conflict in account_analytic_analysis/i18n/es.po
Text conflict in account_analytic_analysis/i18n/es_AR.po
Conflict adding file account_analytic_analysis/i18n/es_CR.po.  Moved existing file to account_analytic_analysis/i18n/es_CR.po.moved.
Text conflict in account_analytic_analysis/i18n/es_EC.po
Conflict adding file account_analytic_analysis/i18n/es_MX.po.  Moved existing file to account_analytic_analysis/i18n/es_MX.po.moved.
Conflict adding file account_analytic_analysis/i18n/es_PY.po.  Moved existing file to account_analytic_analysis/i18n/es_PY.po.moved.
Text conflict in account_analytic_analysis/i18n/et.po
Conflict adding file account_analytic_analysis/i18n/fa.po.  Moved existing file to account_analytic_analysis/i18n/fa.po.moved.
Text conflict in account_analytic_analysis/i18n/fi.po
Text conflict in account_analytic_analysis/i18n/fr.po
Text conflict in account_analytic_analysis/i18n/gl.po
Conflict adding file account_analytic_analysis/i18n/gu.po.  Moved existing file to account_analytic_analysis/i18n/gu.po.moved.
Text conflict in account_analytic_analysis/i18n/hr.po
Text conflict in account_analytic_analysis/i18n/hu.po
Text conflict in account_analytic_analysis/i18n/id.po
Text conflict in account_analytic_analysis/i18n/it.po
Conflict adding file account_analytic_analysis/i18n/ja.po.  Moved existing file to account_analytic_analysis/i18n/ja.po.moved.
Text conflict in account_analytic_analysis/i18n/ko.po
Text conflict in account_analytic_analysis/i18n/lt.po
Text conflict in account_analytic_analysis/i18n/lv.po
Conflict adding file account_analytic_analysis/i18n/mk.po.  Moved existing file to account_analytic_analysis/i18n/mk.po.moved.
Text conflict in account_analytic_analysis/i18n/mn.po
Text conflict in account_analytic_analysis/i18n/nb.po
Text conflict in account_analytic_analysis/i18n/nl.po
Text conflict in account_analytic_analysis/i18n/nl_BE.po
Text conflict in account_analytic_analysis/i18n/oc.po
Text conflict in account_analytic_analysis/i18n/pl.po
Text conflict in account_analytic_analysis/i18n/pt.po
Text conflict in account_analytic_analysis/i18n/pt_BR.po
Text conflict in account_analytic_analysis/i18n/ro.po
Text conflict in account_analytic_analysis/i18n/ru.po
Text conflict in account_analytic_analysis/i18n/sl.po
Text conflict in account_analytic_analysis/i18n/sq.po
Text conflict in account_analytic_analysis/i18n/sr.po
Text conflict in account_analytic_analysis/i18n/sr@latin.po
Text conflict in account_analytic_analysis/i18n/sv.po
Text conflict in account_analytic_analysis/i18n/tlh.po
Text conflict in account_analytic_analysis/i18n/tr.po
Text conflict in account_analytic_analysis/i18n/uk.po
Text conflict in account_analytic_analysis/i18n/vi.po
Text conflict in account_analytic_analysis/i18n/zh_CN.po
Text conflict in account_analytic_analysis/i18n/zh_TW.po
Text conflict in account_analytic_default/i18n/ar.po
Text conflict in account_analytic_default/i18n/bg.po
Text conflict in account_analytic_default/i18n/bs.po
Text conflict in account_analytic_default/i18n/ca.po
Text conflict in account_analytic_default/i18n/cs.po
Conflict adding file account_analytic_default/i18n/da.po.  Moved existing file to account_analytic_default/i18n/da.po.moved.
Text conflict in account_analytic_default/i18n/de.po
Text conflict in account_analytic_default/i18n/el.po
Conflict adding file account_analytic_default/i18n/en_GB.po.  Moved existing file to account_analytic_default/i18n/en_GB.po.moved.
Text conflict in account_analytic_default/i18n/es.po
Text conflict in account_analytic_default/i18n/es_AR.po
Conflict adding file account_analytic_default/i18n/es_CR.po.  Moved existing file to account_analytic_default/i18n/es_CR.po.moved.
Text conflict in account_analytic_default/i18n/es_EC.po
Conflict adding file account_analytic_default/i18n/es_MX.po.  Moved existing file to account_analytic_default/i18n/es_MX.po.moved.
Conflict adding file account_analytic_default/i18n/es_PY.po.  Moved existing file to account_analytic_default/i18n/es_PY.po.moved.
Text conflict in account_analytic_default/i18n/et.po
Conflict adding file account_analytic_default/i18n/fa.po.  Moved existing file to account_analytic_default/i18n/fa.po.moved.
Text conflict in account_analytic_default/i18n/fi.po
Text conflict in account_analytic_default/i18n/fr.po
Text conflict in account_analytic_default/i18n/gl.po
Conflict adding file account_analytic_default/i18n/gu.po.  Moved existing file to account_analytic_default/i18n/gu.po.moved.
Text conflict in account_analytic_default/i18n/hr.po
Text conflict in account_analytic_default/i18n/hu.po
Text conflict in account_analytic_default/i18n/id.po
Text conflict in account_analytic_default/i18n/it.po
Conflict adding file account_analytic_default/i18n/ja.po.  Moved existing file to account_analytic_default/i18n/ja.po.moved.
Text conflict in account_analytic_default/i18n/ko.po
Text conflict in account_analytic_default/i18n/lt.po
Text conflict in account_analytic_default/i18n/lv.po
Conflict adding file account_analytic_default/i18n/mk.po.  Moved existing file to account_analytic_default/i18n/mk.po.moved.
Text conflict in account_analytic_default/i18n/mn.po
Text conflict in account_analytic_default/i18n/nb.po
Text conflict in account_analytic_default/i18n/nl.po
Text conflict in account_analytic_default/i18n/nl_BE.po
Text conflict in account_analytic_default/i18n/oc.po
Text conflict in account_analytic_default/i18n/pl.po
Text conflict in account_analytic_default/i18n/pt.po
Text conflict in account_analytic_default/i18n/pt_BR.po
Text conflict in account_analytic_default/i18n/ro.po
Text conflict in account_analytic_default/i18n/ru.po
Text conflict in account_analytic_default/i18n/sk.po
Text conflict in account_analytic_default/i18n/sl.po
Text conflict in account_analytic_default/i18n/sq.po
Text conflict in account_analytic_default/i18n/sr.po
Text conflict in account_analytic_default/i18n/sr@latin.po
Text conflict in account_analytic_default/i18n/sv.po
Text conflict in account_analytic_default/i18n/tlh.po
Text conflict in account_analytic_default/i18n/tr.po
Text conflict in account_analytic_default/i18n/uk.po
Text conflict in account_analytic_default/i18n/vi.po
Text conflict in account_analytic_default/i18n/zh_CN.po
Text conflict in account_analytic_default/i18n/zh_TW.po
Text conflict in account_analytic_plans/account_analytic_plans.py
Text conflict in account_analytic_plans/i18n/account_analytic_plans.pot
Text conflict in account_analytic_plans/i18n/ar.po
Text conflict in account_analytic_plans/i18n/bg.po
Text conflict in account_analytic_plans/i18n/bs.po
Text conflict in account_analytic_plans/i18n/ca.po
Text conflict in account_analytic_plans/i18n/cs.po
Conflict adding file account_analytic_plans/i18n/da.po.  Moved existing file to account_analytic_plans/i18n/da.po.moved.
Text conflict in account_analytic_plans/i18n/de.po
Text conflict in account_analytic_plans/i18n/el.po
Conflict adding file account_analytic_plans/i18n/en_GB.po.  Moved existing file to account_analytic_plans/i18n/en_GB.po.moved.
Text conflict in account_analytic_plans/i18n/es.po
Text conflict in account_analytic_plans/i18n/es_AR.po
Conflict adding file account_analytic_plans/i18n/es_CR.po.  Moved existing file to account_analytic_plans/i18n/es_CR.po.moved.
Text conflict in account_analytic_plans/i18n/es_EC.po
Conflict adding file account_analytic_plans/i18n/es_MX.po.  Moved existing file to account_analytic_plans/i18n/es_MX.po.moved.
Conflict adding file account_analytic_plans/i18n/es_PY.po.  Moved existing file to account_analytic_plans/i18n/es_PY.po.moved.
Text conflict in account_analytic_plans/i18n/et.po
Conflict adding file account_analytic_plans/i18n/fa.po.  Moved existing file to account_analytic_plans/i18n/fa.po.moved.
Text conflict in account_analytic_plans/i18n/fi.po
Text conflict in account_analytic_plans/i18n/fr.po
Text conflict in account_analytic_plans/i18n/gl.po
Conflict adding file account_analytic_plans/i18n/gu.po.  Moved existing file to account_analytic_plans/i18n/gu.po.moved.
Text conflict in account_analytic_plans/i18n/hr.po
Text conflict in account_analytic_plans/i18n/hu.po
Text conflict in account_analytic_plans/i18n/id.po
Text conflict in account_analytic_plans/i18n/it.po
Conflict adding file account_analytic_plans/i18n/ja.po.  Moved existing file to account_analytic_plans/i18n/ja.po.moved.
Text conflict in account_analytic_plans/i18n/ko.po
Text conflict in account_analytic_plans/i18n/lt.po
Conflict adding file account_analytic_plans/i18n/lv.po.  Moved existing file to account_analytic_plans/i18n/lv.po.moved.
Conflict adding file account_analytic_plans/i18n/mk.po.  Moved existing file to account_analytic_plans/i18n/mk.po.moved.
Text conflict in account_analytic_plans/i18n/mn.po
Conflict adding file account_analytic_plans/i18n/nb.po.  Moved existing file to account_analytic_plans/i18n/nb.po.moved.
Text conflict in account_analytic_plans/i18n/nl.po
Text conflict in account_analytic_plans/i18n/nl_BE.po
Text conflict in account_analytic_plans/i18n/oc.po
Text conflict in account_analytic_plans/i18n/pl.po
Text conflict in account_analytic_plans/i18n/pt.po
Text conflict in account_analytic_plans/i18n/pt_BR.po
Text conflict in account_analytic_plans/i18n/ro.po
Text conflict in account_analytic_plans/i18n/ru.po
Text conflict in account_analytic_plans/i18n/sl.po
Text conflict in account_analytic_plans/i18n/sq.po
Text conflict in account_analytic_plans/i18n/sr.po
Text conflict in account_analytic_plans/i18n/sr@latin.po
Text conflict in account_analytic_plans/i18n/sv.po
Text conflict in account_analytic_plans/i18n/tlh.po
Text conflict in account_analytic_plans/i18n/tr.po
Text conflict in account_analytic_plans/i18n/uk.po
Text conflict in account_analytic_plans/i18n/vi.po
Text conflict in account_analytic_plans/i18n/zh_CN.po
Text conflict in account_analytic_plans/i18n/zh_TW.po
Text conflict in account_anglo_saxon/i18n/ar.po
Text conflict in account_anglo_saxon/i18n/bg.po
Conflict adding file account_anglo_saxon/i18n/ca.po.  Moved existing file to account_anglo_saxon/i18n/ca.po.moved.
Conflict adding file account_anglo_saxon/i18n/cs.po.  Moved existing file to account_anglo_saxon/i18n/cs.po.moved.
Conflict adding file account_anglo_saxon/i18n/da.po.  Moved existing file to account_anglo_saxon/i18n/da.po.moved.
Text conflict in account_anglo_saxon/i18n/de.po
Text conflict in account_anglo_saxon/i18n/el.po
Conflict adding file account_anglo_saxon/i18n/en_GB.po.  Moved existing file to account_anglo_saxon/i18n/en_GB.po.moved.
Text conflict in account_anglo_saxon/i18n/es.po
Conflict adding file account_anglo_saxon/i18n/es_CR.po.  Moved existing file to account_anglo_saxon/i18n/es_CR.po.moved.
Text conflict in account_anglo_saxon/i18n/es_EC.po
Conflict adding file account_anglo_saxon/i18n/es_MX.po.  Moved existing file to account_anglo_saxon/i18n/es_MX.po.moved.
Conflict adding file account_anglo_saxon/i18n/es_PY.po.  Moved existing file to account_anglo_saxon/i18n/es_PY.po.moved.
Text conflict in account_anglo_saxon/i18n/et.po
Conflict adding file account_anglo_saxon/i18n/fa.po.  Moved existing file to account_anglo_saxon/i18n/fa.po.moved.
Conflict adding file account_anglo_saxon/i18n/fi.po.  Moved existing file to account_anglo_saxon/i18n/fi.po.moved.
Text conflict in account_anglo_saxon/i18n/fr.po
Conflict adding file account_anglo_saxon/i18n/gl.po.  Moved existing file to account_anglo_saxon/i18n/gl.po.moved.
Conflict adding file account_anglo_saxon/i18n/gu.po.  Moved existing file to account_anglo_saxon/i18n/gu.po.moved.
Text conflict in account_anglo_saxon/i18n/hi.po
Conflict adding file account_anglo_saxon/i18n/hr.po.  Moved existing file to account_anglo_saxon/i18n/hr.po.moved.
Text conflict in account_anglo_saxon/i18n/hu.po
Text conflict in account_anglo_saxon/i18n/id.po
Text conflict in account_anglo_saxon/i18n/it.po
Conflict adding file account_anglo_saxon/i18n/ja.po.  Moved existing file to account_anglo_saxon/i18n/ja.po.moved.
Conflict adding file account_anglo_saxon/i18n/lv.po.  Moved existing file to account_anglo_saxon/i18n/lv.po.moved.
Conflict adding file account_anglo_saxon/i18n/mk.po.  Moved existing file to account_anglo_saxon/i18n/mk.po.moved.
Text conflict in account_anglo_saxon/i18n/mn.po
Conflict adding file account_anglo_saxon/i18n/nb.po.  Moved existing file to account_anglo_saxon/i18n/nb.po.moved.
Text conflict in account_anglo_saxon/i18n/nl.po
Conflict adding file account_anglo_saxon/i18n/nl_BE.po.  Moved existing file to account_anglo_saxon/i18n/nl_BE.po.moved.
Text conflict in account_anglo_saxon/i18n/oc.po
Text conflict in account_anglo_saxon/i18n/pl.po
Text conflict in account_anglo_saxon/i18n/pt.po
Text conflict in account_anglo_saxon/i18n/pt_BR.po
Text conflict in account_anglo_saxon/i18n/ro.po
Text conflict in account_anglo_saxon/i18n/ru.po
Text conflict in account_anglo_saxon/i18n/sl.po
Conflict adding file account_anglo_saxon/i18n/sq.po.  Moved existing file to account_anglo_saxon/i18n/sq.po.moved.
Text conflict in account_anglo_saxon/i18n/sr@latin.po
Text conflict in account_anglo_saxon/i18n/sv.po
Text conflict in account_anglo_saxon/i18n/ta.po
Conflict adding file account_anglo_saxon/i18n/tr.po.  Moved existing file to account_anglo_saxon/i18n/tr.po.moved.
Text conflict in account_anglo_saxon/i18n/zh_CN.po
Conflict adding file account_anglo_saxon/i18n/zh_TW.po.  Moved existing file to account_anglo_saxon/i18n/zh_TW.po.moved.
Text conflict in account_budget/account_budget_view.xml
Text conflict in account_budget/i18n/account_budget.pot
Text conflict in account_budget/i18n/ar.po
Text conflict in account_budget/i18n/bg.po
Text conflict in account_budget/i18n/bs.po
Text conflict in account_budget/i18n/ca.po
Text conflict in account_budget/i18n/cs.po
Conflict adding file account_budget/i18n/da.po.  Moved existing file to account_budget/i18n/da.po.moved.
Text conflict in account_budget/i18n/de.po
Text conflict in account_budget/i18n/el.po
Conflict adding file account_budget/i18n/en_GB.po.  Moved existing file to account_budget/i18n/en_GB.po.moved.
Text conflict in account_budget/i18n/es.po
Text conflict in account_budget/i18n/es_AR.po
Conflict adding file account_budget/i18n/es_CR.po.  Moved existing file to account_budget/i18n/es_CR.po.moved.
Text conflict in account_budget/i18n/es_EC.po
Conflict adding file account_budget/i18n/es_MX.po.  Moved existing file to account_budget/i18n/es_MX.po.moved.
Conflict adding file account_budget/i18n/es_PY.po.  Moved existing file to account_budget/i18n/es_PY.po.moved.
Text conflict in account_budget/i18n/et.po
Conflict adding file account_budget/i18n/fa.po.  Moved existing file to account_budget/i18n/fa.po.moved.
Text conflict in account_budget/i18n/fi.po
Text conflict in account_budget/i18n/fr.po
Text conflict in account_budget/i18n/gl.po
Conflict adding file account_budget/i18n/gu.po.  Moved existing file to account_budget/i18n/gu.po.moved.
Conflict adding file account_budget/i18n/he.po.  Moved existing file to account_budget/i18n/he.po.moved.
Text conflict in account_budget/i18n/hi.po
Text conflict in account_budget/i18n/hr.po
Text conflict in account_budget/i18n/hu.po
Text conflict in account_budget/i18n/id.po
Text conflict in account_budget/i18n/it.po
Conflict adding file account_budget/i18n/ja.po.  Moved existing file to account_budget/i18n/ja.po.moved.
Text conflict in account_budget/i18n/ko.po
Text conflict in account_budget/i18n/lo.po
Text conflict in account_budget/i18n/lt.po
Conflict adding file account_budget/i18n/lv.po.  Moved existing file to account_budget/i18n/lv.po.moved.
Conflict adding file account_budget/i18n/mk.po.  Moved existing file to account_budget/i18n/mk.po.moved.
Text conflict in account_budget/i18n/mn.po
Conflict adding file account_budget/i18n/nb.po.  Moved existing file to account_budget/i18n/nb.po.moved.
Text conflict in account_budget/i18n/nl.po
Text conflict in account_budget/i18n/nl_BE.po
Text conflict in account_budget/i18n/oc.po
Text conflict in account_budget/i18n/pl.po
Text conflict in account_budget/i18n/pt.po
Text conflict in account_budget/i18n/pt_BR.po
Text conflict in account_budget/i18n/ro.po
Text conflict in account_budget/i18n/ru.po
Text conflict in account_budget/i18n/sl.po
Text conflict in account_budget/i18n/sq.po
Text conflict in account_budget/i18n/sr.po
Text conflict in account_budget/i18n/sr@latin.po
Text conflict in account_budget/i18n/sv.po
Text conflict in account_budget/i18n/tlh.po
Text conflict in account_budget/i18n/tr.po
Text conflict in account_budget/i18n/uk.po
Text conflict in account_budget/i18n/vi.po
Text conflict in account_budget/i18n/zh_CN.po
Text conflict in account_budget/i18n/zh_TW.po
Text conflict in account_cancel/account_cancel_view.xml
Text conflict in account_cancel/i18n/ar.po
Conflict adding file account_cancel/i18n/bg.po.  Moved existing file to account_cancel/i18n/bg.po.moved.
Conflict adding file account_cancel/i18n/bn.po.  Moved existing file to account_cancel/i18n/bn.po.moved.
Text conflict in account_cancel/i18n/br.po
Text conflict in account_cancel/i18n/bs.po
Conflict adding file account_cancel/i18n/ca.po.  Moved existing file to account_cancel/i18n/ca.po.moved.
Conflict adding file account_cancel/i18n/cs.po.  Moved existing file to account_cancel/i18n/cs.po.moved.
Text conflict in account_cancel/i18n/da.po
Text conflict in account_cancel/i18n/de.po
Text conflict in account_cancel/i18n/el.po
Conflict adding file account_cancel/i18n/en_GB.po.  Moved existing file to account_cancel/i18n/en_GB.po.moved.
Text conflict in account_cancel/i18n/es.po
Conflict adding file account_cancel/i18n/es_CL.po.  Moved existing file to account_cancel/i18n/es_CL.po.moved.
Conflict adding file account_cancel/i18n/es_CR.po.  Moved existing file to account_cancel/i18n/es_CR.po.moved.
Text conflict in account_cancel/i18n/es_EC.po
Conflict adding file account_cancel/i18n/es_MX.po.  Moved existing file to account_cancel/i18n/es_MX.po.moved.
Conflict adding file account_cancel/i18n/es_PY.po.  Moved existing file to account_cancel/i18n/es_PY.po.moved.
Conflict adding file account_cancel/i18n/fa.po.  Moved existing file to account_cancel/i18n/fa.po.moved.
Conflict adding file account_cancel/i18n/fi.po.  Moved existing file to account_cancel/i18n/fi.po.moved.
Text conflict in account_cancel/i18n/fr.po
Conflict adding file account_cancel/i18n/gl.po.  Moved existing file to account_cancel/i18n/gl.po.moved.
Conflict adding file account_cancel/i18n/gu.po.  Moved existing file to account_cancel/i18n/gu.po.moved.
Text conflict in account_cancel/i18n/hi.po
Text conflict in account_cancel/i18n/hr.po
Text conflict in account_cancel/i18n/hu.po
Conflict adding file account_cancel/i18n/id.po.  Moved existing file to account_cancel/i18n/id.po.moved.
Text conflict in account_cancel/i18n/it.po
Conflict adding file account_cancel/i18n/ja.po.  Moved existing file to account_cancel/i18n/ja.po.moved.
Conflict adding file account_cancel/i18n/kk.po.  Moved existing file to account_cancel/i18n/kk.po.moved.
Text conflict in account_cancel/i18n/lo.po
Conflict adding file account_cancel/i18n/lt.po.  Moved existing file to account_cancel/i18n/lt.po.moved.
Conflict adding file account_cancel/i18n/lv.po.  Moved existing file to account_cancel/i18n/lv.po.moved.
Conflict adding file account_cancel/i18n/mk.po.  Moved existing file to account_cancel/i18n/mk.po.moved.
Text conflict in account_cancel/i18n/mn.po
Conflict adding file account_cancel/i18n/nb.po.  Moved existing file to account_cancel/i18n/nb.po.moved.
Text conflict in account_cancel/i18n/nl.po
Conflict adding file account_cancel/i18n/nl_BE.po.  Moved existing file to account_cancel/i18n/nl_BE.po.moved.
Conflict adding file account_cancel/i18n/oc.po.  Moved existing file to account_cancel/i18n/oc.po.moved.
Text conflict in account_cancel/i18n/pl.po
Text conflict in account_cancel/i18n/pt.po
Text conflict in account_cancel/i18n/pt_BR.po
Text conflict in account_cancel/i18n/ro.po
Text conflict in account_cancel/i18n/ru.po
Text conflict in account_cancel/i18n/sl.po
Conflict adding file account_cancel/i18n/sq.po.  Moved existing file to account_cancel/i18n/sq.po.moved.
Text conflict in account_cancel/i18n/sr.po
Text conflict in account_cancel/i18n/sr@latin.po
Text conflict in account_cancel/i18n/sv.po
Text conflict in account_cancel/i18n/ta.po
Text conflict in account_cancel/i18n/tr.po
Text conflict in account_cancel/i18n/vi.po
Conflict adding file account_cancel/i18n/zh_CN.po.  Moved existing file to account_cancel/i18n/zh_CN.po.moved.
Conflict adding file account_cancel/i18n/zh_TW.po.  Moved existing file to account_cancel/i18n/zh_TW.po.moved.
Text conflict in account_chart/i18n/ar.po
Text conflict in account_chart/i18n/bg.po
Text conflict in account_chart/i18n/bs.po
Text conflict in account_chart/i18n/ca.po
Text conflict in account_chart/i18n/cs.po
Text conflict in account_chart/i18n/da.po
Text conflict in account_chart/i18n/de.po
Text conflict in account_chart/i18n/el.po
Conflict adding file account_chart/i18n/en_GB.po.  Moved existing file to account_chart/i18n/en_GB.po.moved.
Text conflict in account_chart/i18n/es.po
Text conflict in account_chart/i18n/es_AR.po
Text conflict in account_chart/i18n/es_CL.po
Conflict adding file account_chart/i18n/es_CR.po.  Moved existing file to account_chart/i18n/es_CR.po.moved.
Text conflict in account_chart/i18n/es_EC.po
Conflict adding file account_chart/i18n/es_MX.po.  Moved existing file to account_chart/i18n/es_MX.po.moved.
Conflict adding file account_chart/i18n/es_PY.po.  Moved existing file to account_chart/i18n/es_PY.po.moved.
Text conflict in account_chart/i18n/et.po
Text conflict in account_chart/i18n/eu.po
Conflict adding file account_chart/i18n/fa.po.  Moved existing file to account_chart/i18n/fa.po.moved.
Text conflict in account_chart/i18n/fi.po
Text conflict in account_chart/i18n/fr.po
Text conflict in account_chart/i18n/gl.po
Conflict adding file account_chart/i18n/gu.po.  Moved existing file to account_chart/i18n/gu.po.moved.
Text conflict in account_chart/i18n/hi.po
Text conflict in account_chart/i18n/hr.po
Text conflict in account_chart/i18n/hu.po
Text conflict in account_chart/i18n/id.po
Text conflict in account_chart/i18n/it.po
Conflict adding file account_chart/i18n/ja.po.  Moved existing file to account_chart/i18n/ja.po.moved.
Text conflict in account_chart/i18n/ko.po
Text conflict in account_chart/i18n/lo.po
Text conflict in account_chart/i18n/lt.po
Text conflict in account_chart/i18n/lv.po
Conflict adding file account_chart/i18n/mk.po.  Moved existing file to account_chart/i18n/mk.po.moved.
Text conflict in account_chart/i18n/mn.po
Text conflict in account_chart/i18n/nb.po
Text conflict in account_chart/i18n/nl.po
Text conflict in account_chart/i18n/nl_BE.po
Text conflict in account_chart/i18n/oc.po
Text conflict in account_chart/i18n/pl.po
Text conflict in account_chart/i18n/pt.po
Text conflict in account_chart/i18n/pt_BR.po
Text conflict in account_chart/i18n/ro.po
Text conflict in account_chart/i18n/ru.po
Text conflict in account_chart/i18n/sk.po
Text conflict in account_chart/i18n/sl.po
Text conflict in account_chart/i18n/sq.po
Text conflict in account_chart/i18n/sr.po
Text conflict in account_chart/i18n/sr@latin.po
Text conflict in account_chart/i18n/sv.po
Text conflict in account_chart/i18n/ta.po
Text conflict in account_chart/i18n/th.po
Text conflict in account_chart/i18n/tr.po
Text conflict in account_chart/i18n/uk.po
Text conflict in account_chart/i18n/vi.po
Text conflict in account_chart/i18n/zh_CN.po
Text conflict in account_chart/i18n/zh_TW.po
Text conflict in account_coda/i18n/ar.po
Conflict adding file account_coda/i18n/bg.po.  Moved existing file to account_coda/i18n/bg.po.moved.
Conflict adding file account_coda/i18n/ca.po.  Moved existing file to account_coda/i18n/ca.po.moved.
Conflict adding file account_coda/i18n/da.po.  Moved existing file to account_coda/i18n/da.po.moved.
Text conflict in account_coda/i18n/de.po
Text conflict in account_coda/i18n/el.po
Conflict adding file account_coda/i18n/en_AU.po.  Moved existing file to account_coda/i18n/en_AU.po.moved.
Conflict adding file account_coda/i18n/en_GB.po.  Moved existing file to account_coda/i18n/en_GB.po.moved.
Text conflict in account_coda/i18n/es.po
Conflict adding file account_coda/i18n/es_CR.po.  Moved existing file to account_coda/i18n/es_CR.po.moved.
Text conflict in account_coda/i18n/es_EC.po
Conflict adding file account_coda/i18n/es_PY.po.  Moved existing file to account_coda/i18n/es_PY.po.moved.
Text conflict in account_coda/i18n/et.po
Conflict adding file account_coda/i18n/fa.po.  Moved existing file to account_coda/i18n/fa.po.moved.
Conflict adding file account_coda/i18n/fi.po.  Moved existing file to account_coda/i18n/fi.po.moved.
Text conflict in account_coda/i18n/fr.po
Conflict adding file account_coda/i18n/gl.po.  Moved existing file to account_coda/i18n/gl.po.moved.
Text conflict in account_coda/i18n/hr.po
Text conflict in account_coda/i18n/hu.po
Text conflict in account_coda/i18n/it.po
Conflict adding file account_coda/i18n/ja.po.  Moved existing file to account_coda/i18n/ja.po.moved.
Conflict adding file account_coda/i18n/lv.po.  Moved existing file to account_coda/i18n/lv.po.moved.
Conflict adding file account_coda/i18n/mn.po.  Moved existing file to account_coda/i18n/mn.po.moved.
Conflict adding file account_coda/i18n/nb.po.  Moved existing file to account_coda/i18n/nb.po.moved.
Text conflict in account_coda/i18n/nl.po
Conflict adding file account_coda/i18n/nl_BE.po.  Moved existing file to account_coda/i18n/nl_BE.po.moved.
Conflict adding file account_coda/i18n/pl.po.  Moved existing file to account_coda/i18n/pl.po.moved.
Text conflict in account_coda/i18n/pt.po
Text conflict in account_coda/i18n/pt_BR.po
Conflict adding file account_coda/i18n/ro.po.  Moved existing file to account_coda/i18n/ro.po.moved.
Text conflict in account_coda/i18n/ru.po
Conflict adding file account_coda/i18n/sl.po.  Moved existing file to account_coda/i18n/sl.po.moved.
Conflict adding file account_coda/i18n/sq.po.  Moved existing file to account_coda/i18n/sq.po.moved.
Text conflict in account_coda/i18n/sr.po
Text conflict in account_coda/i18n/sr@latin.po
Text conflict in account_coda/i18n/sv.po
Conflict adding file account_coda/i18n/tr.po.  Moved existing file to account_coda/i18n/tr.po.moved.
Conflict adding file account_coda/i18n/vi.po.  Moved existing file to account_coda/i18n/vi.po.moved.
Text conflict in account_coda/i18n/zh_CN.po
Conflict adding file account_coda/i18n/zh_TW.po.  Moved existing file to account_coda/i18n/zh_TW.po.moved.
Text conflict in account_followup/__openerp__.py
Text conflict in account_followup/i18n/account_followup.pot
Text conflict in account_followup/i18n/ar.po
Text conflict in account_followup/i18n/bg.po
Text conflict in account_followup/i18n/bs.po
Text conflict in account_followup/i18n/ca.po
Text conflict in account_followup/i18n/cs.po
Conflict adding file account_followup/i18n/da.po.  Moved existing file to account_followup/i18n/da.po.moved.
Text conflict in account_followup/i18n/de.po
Text conflict in account_followup/i18n/el.po
Conflict adding file account_followup/i18n/en_GB.po.  Moved existing file to account_followup/i18n/en_GB.po.moved.
Text conflict in account_followup/i18n/es.po
Text conflict in account_followup/i18n/es_AR.po
Conflict adding file account_followup/i18n/es_CR.po.  Moved existing file to account_followup/i18n/es_CR.po.moved.
Text conflict in account_followup/i18n/es_EC.po
Conflict adding file account_followup/i18n/es_PY.po.  Moved existing file to account_followup/i18n/es_PY.po.moved.
Text conflict in account_followup/i18n/et.po
Conflict adding file account_followup/i18n/fa.po.  Moved existing file to account_followup/i18n/fa.po.moved.
Text conflict in account_followup/i18n/fi.po
Text conflict in account_followup/i18n/fr.po
Conflict adding file account_followup/i18n/gl.po.  Moved existing file to account_followup/i18n/gl.po.moved.
Text conflict in account_followup/i18n/hr.po
Text conflict in account_followup/i18n/hu.po
Text conflict in account_followup/i18n/id.po
Text conflict in account_followup/i18n/it.po
Conflict adding file account_followup/i18n/ja.po.  Moved existing file to account_followup/i18n/ja.po.moved.
Text conflict in account_followup/i18n/ko.po
Text conflict in account_followup/i18n/lt.po
Conflict adding file account_followup/i18n/mk.po.  Moved existing file to account_followup/i18n/mk.po.moved.
Text conflict in account_followup/i18n/mn.po
Conflict adding file account_followup/i18n/nb.po.  Moved existing file to account_followup/i18n/nb.po.moved.
Text conflict in account_followup/i18n/nl.po
Text conflict in account_followup/i18n/nl_BE.po
Text conflict in account_followup/i18n/oc.po
Text conflict in account_followup/i18n/pl.po
Text conflict in account_followup/i18n/pt.po
Text conflict in account_followup/i18n/pt_BR.po
Text conflict in account_followup/i18n/ro.po
Text conflict in account_followup/i18n/ru.po
Text conflict in account_followup/i18n/sl.po
Text conflict in account_followup/i18n/sq.po
Text conflict in account_followup/i18n/sr.po
Text conflict in account_followup/i18n/sr@latin.po
Text conflict in account_followup/i18n/sv.po
Text conflict in account_followup/i18n/tlh.po
Text conflict in account_followup/i18n/tr.po
Text conflict in account_followup/i18n/uk.po
Text conflict in account_followup/i18n/vi.po
Text conflict in account_followup/i18n/zh_CN.po
Text conflict in account_followup/i18n/zh_TW.po
Text conflict in account_followup/report/account_followup_report.py
Conflict adding file account_followup/security/account_followup_security.xml.  Moved existing file to account_followup/security/account_followup_security.xml.moved.
Text conflict in account_followup/wizard/account_followup_print.py
Text conflict in account_invoice_layout/account_invoice_layout_view.xml
Text conflict in account_invoice_layout/i18n/ar.po
Text conflict in account_invoice_layout/i18n/bg.po
Text conflict in account_invoice_layout/i18n/bs.po
Text conflict in account_invoice_layout/i18n/ca.po
Text conflict in account_invoice_layout/i18n/cs.po
Conflict adding file account_invoice_layout/i18n/da.po.  Moved existing file to account_invoice_layout/i18n/da.po.moved.
Text conflict in account_invoice_layout/i18n/de.po
Text conflict in account_invoice_layout/i18n/el.po
Conflict adding file account_invoice_layout/i18n/en_GB.po.  Moved existing file to account_invoice_layout/i18n/en_GB.po.moved.
Text conflict in account_invoice_layout/i18n/es.po
Text conflict in account_invoice_layout/i18n/es_AR.po
Conflict adding file account_invoice_layout/i18n/es_CR.po.  Moved existing file to account_invoice_layout/i18n/es_CR.po.moved.
Text conflict in account_invoice_layout/i18n/es_EC.po
Conflict adding file account_invoice_layout/i18n/es_PY.po.  Moved existing file to account_invoice_layout/i18n/es_PY.po.moved.
Text conflict in account_invoice_layout/i18n/et.po
Text conflict in account_invoice_layout/i18n/eu.po
Conflict adding file account_invoice_layout/i18n/fa.po.  Moved existing file to account_invoice_layout/i18n/fa.po.moved.
Text conflict in account_invoice_layout/i18n/fi.po
Text conflict in account_invoice_layout/i18n/fr.po
Conflict adding file account_invoice_layout/i18n/gl.po.  Moved existing file to account_invoice_layout/i18n/gl.po.moved.
Conflict adding file account_invoice_layout/i18n/gu.po.  Moved existing file to account_invoice_layout/i18n/gu.po.moved.
Text conflict in account_invoice_layout/i18n/hi.po
Text conflict in account_invoice_layout/i18n/hr.po
Text conflict in account_invoice_layout/i18n/hu.po
Text conflict in account_invoice_layout/i18n/id.po
Text conflict in account_invoice_layout/i18n/it.po
Text conflict in account_invoice_layout/i18n/iu.po
Conflict adding file account_invoice_layout/i18n/ja.po.  Moved existing file to account_invoice_layout/i18n/ja.po.moved.
Text conflict in account_invoice_layout/i18n/ko.po
Text conflict in account_invoice_layout/i18n/lt.po
Text conflict in account_invoice_layout/i18n/nb.po
Text conflict in account_invoice_layout/i18n/nl.po
Text conflict in account_invoice_layout/i18n/nl_BE.po
Text conflict in account_invoice_layout/i18n/oc.po
Text conflict in account_invoice_layout/i18n/pl.po
Text conflict in account_invoice_layout/i18n/pt.po
Text conflict in account_invoice_layout/i18n/pt_BR.po
Text conflict in account_invoice_layout/i18n/ro.po
Text conflict in account_invoice_layout/i18n/ru.po
Conflict adding file account_invoice_layout/i18n/sk.po.  Moved existing file to account_invoice_layout/i18n/sk.po.moved.
Text conflict in account_invoice_layout/i18n/sl.po
Text conflict in account_invoice_layout/i18n/sq.po
Text conflict in account_invoice_layout/i18n/sr.po
Text conflict in account_invoice_layout/i18n/sr@latin.po
Text conflict in account_invoice_layout/i18n/sv.po
Conflict adding file account_invoice_layout/i18n/th.po.  Moved existing file to account_invoice_layout/i18n/th.po.moved.
Text conflict in account_invoice_layout/i18n/tlh.po
Text conflict in account_invoice_layout/i18n/tr.po
Text conflict in account_invoice_layout/i18n/uk.po
Text conflict in account_invoice_layout/i18n/vi.po
Text conflict in account_invoice_layout/i18n/zh_CN.po
Text conflict in account_invoice_layout/i18n/zh_TW.po
Text conflict in account_payment/i18n/account_payment.pot
Conflict adding file account_payment/i18n/am.po.  Moved existing file to account_payment/i18n/am.po.moved.
Text conflict in account_payment/i18n/ar.po
Text conflict in account_payment/i18n/bg.po
Text conflict in account_payment/i18n/bs.po
Text conflict in account_payment/i18n/ca.po
Text conflict in account_payment/i18n/cs.po
Conflict adding file account_payment/i18n/da.po.  Moved existing file to account_payment/i18n/da.po.moved.
Text conflict in account_payment/i18n/de.po
Text conflict in account_payment/i18n/el.po
Conflict adding file account_payment/i18n/en_GB.po.  Moved existing file to account_payment/i18n/en_GB.po.moved.
Text conflict in account_payment/i18n/es.po
Text conflict in account_payment/i18n/es_AR.po
Conflict adding file account_payment/i18n/es_CL.po.  Moved existing file to account_payment/i18n/es_CL.po.moved.
Conflict adding file account_payment/i18n/es_CR.po.  Moved existing file to account_payment/i18n/es_CR.po.moved.
Text conflict in account_payment/i18n/es_EC.po
Conflict adding file account_payment/i18n/es_PY.po.  Moved existing file to account_payment/i18n/es_PY.po.moved.
Text conflict in account_payment/i18n/et.po
Conflict adding file account_payment/i18n/fa.po.  Moved existing file to account_payment/i18n/fa.po.moved.
Text conflict in account_payment/i18n/fi.po
Text conflict in account_payment/i18n/fr.po
Conflict adding file account_payment/i18n/gl.po.  Moved existing file to account_payment/i18n/gl.po.moved.
Text conflict in account_payment/i18n/hi.po
Text conflict in account_payment/i18n/hr.po
Text conflict in account_payment/i18n/hu.po
Text conflict in account_payment/i18n/id.po
Text conflict in account_payment/i18n/it.po
Conflict adding file account_payment/i18n/ja.po.  Moved existing file to account_payment/i18n/ja.po.moved.
Text conflict in account_payment/i18n/ko.po
Text conflict in account_payment/i18n/lt.po
Conflict adding file account_payment/i18n/lv.po.  Moved existing file to account_payment/i18n/lv.po.moved.
Conflict adding file account_payment/i18n/mk.po.  Moved existing file to account_payment/i18n/mk.po.moved.
Text conflict in account_payment/i18n/mn.po
Conflict adding file account_payment/i18n/nb.po.  Moved existing file to account_payment/i18n/nb.po.moved.
Text conflict in account_payment/i18n/nl.po
Text conflict in account_payment/i18n/nl_BE.po
Text conflict in account_payment/i18n/oc.po
Text conflict in account_payment/i18n/pl.po
Text conflict in account_payment/i18n/pt.po
Text conflict in account_payment/i18n/pt_BR.po
Text conflict in account_payment/i18n/ro.po
Text conflict in account_payment/i18n/ru.po
Text conflict in account_payment/i18n/sl.po
Text conflict in account_payment/i18n/sq.po
Text conflict in account_payment/i18n/sr.po
Text conflict in account_payment/i18n/sr@latin.po
Text conflict in account_payment/i18n/sv.po
Text conflict in account_payment/i18n/tlh.po
Text conflict in account_payment/i18n/tr.po
Text conflict in account_payment/i18n/uk.po
Text conflict in account_payment/i18n/vi.po
Text conflict in account_payment/i18n/zh_CN.po
Text conflict in account_payment/i18n/zh_TW.po
Text conflict in account_payment/wizard/account_payment_create_order_view.xml
Text conflict in account_payment/wizard/account_payment_order.py
Text conflict in account_payment/wizard/account_payment_populate_statement.py
Text conflict in account_sequence/i18n/account_sequence.pot
Conflict adding file account_sequence/i18n/ar.po.  Moved existing file to account_sequence/i18n/ar.po.moved.
Conflict adding file account_sequence/i18n/bg.po.  Moved existing file to account_sequence/i18n/bg.po.moved.
Conflict adding file account_sequence/i18n/ca.po.  Moved existing file to account_sequence/i18n/ca.po.moved.
Conflict adding file account_sequence/i18n/cs.po.  Moved existing file to account_sequence/i18n/cs.po.moved.
Conflict adding file account_sequence/i18n/da.po.  Moved existing file to account_sequence/i18n/da.po.moved.
Conflict adding file account_sequence/i18n/de.po.  Moved existing file to account_sequence/i18n/de.po.moved.
Conflict adding file account_sequence/i18n/el.po.  Moved existing file to account_sequence/i18n/el.po.moved.
Conflict adding file account_sequence/i18n/en_GB.po.  Moved existing file to account_sequence/i18n/en_GB.po.moved.
Conflict adding file account_sequence/i18n/es.po.  Moved existing file to account_sequence/i18n/es.po.moved.
Conflict adding file account_sequence/i18n/es_CR.po.  Moved existing file to account_sequence/i18n/es_CR.po.moved.
Conflict adding file account_sequence/i18n/es_EC.po.  Moved existing file to account_sequence/i18n/es_EC.po.moved.
Conflict adding file account_sequence/i18n/es_PY.po.  Moved existing file to account_sequence/i18n/es_PY.po.moved.
Conflict adding file account_sequence/i18n/fa.po.  Moved existing file to account_sequence/i18n/fa.po.moved.
Text conflict in account_sequence/i18n/fr.po
Conflict adding file account_sequence/i18n/gl.po.  Moved existing file to account_sequence/i18n/gl.po.moved.
Conflict adding file account_sequence/i18n/hr.po.  Moved existing file to account_sequence/i18n/hr.po.moved.
Conflict adding file account_sequence/i18n/hu.po.  Moved existing file to account_sequence/i18n/hu.po.moved.
Conflict adding file account_sequence/i18n/id.po.  Moved existing file to account_sequence/i18n/id.po.moved.
Conflict adding file account_sequence/i18n/it.po.  Moved existing file to account_sequence/i18n/it.po.moved.
Conflict adding file account_sequence/i18n/ja.po.  Moved existing file to account_sequence/i18n/ja.po.moved.
Conflict adding file account_sequence/i18n/lv.po.  Moved existing file to account_sequence/i18n/lv.po.moved.
Conflict adding file account_sequence/i18n/mk.po.  Moved existing file to account_sequence/i18n/mk.po.moved.
Conflict adding file account_sequence/i18n/mn.po.  Moved existing file to account_sequence/i18n/mn.po.moved.
Conflict adding file account_sequence/i18n/nb.po.  Moved existing file to account_sequence/i18n/nb.po.moved.
Conflict adding file account_sequence/i18n/nl.po.  Moved existing file to account_sequence/i18n/nl.po.moved.
Conflict adding file account_sequence/i18n/nl_BE.po.  Moved existing file to account_sequence/i18n/nl_BE.po.moved.
Conflict adding file account_sequence/i18n/pl.po.  Moved existing file to account_sequence/i18n/pl.po.moved.
Conflict adding file account_sequence/i18n/pt.po.  Moved existing file to account_sequence/i18n/pt.po.moved.
Conflict adding file account_sequence/i18n/pt_BR.po.  Moved existing file to account_sequence/i18n/pt_BR.po.moved.
Conflict adding file account_sequence/i18n/ro.po.  Moved existing file to account_sequence/i18n/ro.po.moved.
Conflict adding file account_sequence/i18n/ru.po.  Moved existing file to account_sequence/i18n/ru.po.moved.
Conflict adding file account_sequence/i18n/sl.po.  Moved existing file to account_sequence/i18n/sl.po.moved.
Conflict adding file account_sequence/i18n/sq.po.  Moved existing file to account_sequence/i18n/sq.po.moved.
Conflict adding file account_sequence/i18n/sr@latin.po.  Moved existing file to account_sequence/i18n/sr@latin.po.moved.
Conflict adding file account_sequence/i18n/sv.po.  Moved existing file to account_sequence/i18n/sv.po.moved.
Conflict adding file account_sequence/i18n/tr.po.  Moved existing file to account_sequence/i18n/tr.po.moved.
Conflict adding file account_sequence/i18n/vi.po.  Moved existing file to account_sequence/i18n/vi.po.moved.
Conflict adding file account_sequence/i18n/zh_CN.po.  Moved existing file to account_sequence/i18n/zh_CN.po.moved.
Conflict adding file account_sequence/i18n/zh_TW.po.  Moved existing file to account_sequence/i18n/zh_TW.po.moved.
Text conflict in account_voucher/account_voucher.py
Text conflict in account_voucher/i18n/account_voucher.pot
Text conflict in account_voucher/i18n/ar.po
Text conflict in account_voucher/i18n/bg.po
Text conflict in account_voucher/i18n/bs.po
Text conflict in account_voucher/i18n/ca.po
Text conflict in account_voucher/i18n/cs.po
Conflict adding file account_voucher/i18n/da.po.  Moved existing file to account_voucher/i18n/da.po.moved.
Text conflict in account_voucher/i18n/de.po
Text conflict in account_voucher/i18n/el.po
Conflict adding file account_voucher/i18n/en_GB.po.  Moved existing file to account_voucher/i18n/en_GB.po.moved.
Text conflict in account_voucher/i18n/es.po
Text conflict in account_voucher/i18n/es_AR.po
Conflict adding file account_voucher/i18n/es_CR.po.  Moved existing file to account_voucher/i18n/es_CR.po.moved.
Text conflict in account_voucher/i18n/es_EC.po
Conflict adding file account_voucher/i18n/es_PY.po.  Moved existing file to account_voucher/i18n/es_PY.po.moved.
Text conflict in account_voucher/i18n/et.po
Conflict adding file account_voucher/i18n/fa.po.  Moved existing file to account_voucher/i18n/fa.po.moved.
Text conflict in account_voucher/i18n/fr.po
Conflict adding file account_voucher/i18n/gl.po.  Moved existing file to account_voucher/i18n/gl.po.moved.
Conflict adding file account_voucher/i18n/gu.po.  Moved existing file to account_voucher/i18n/gu.po.moved.
Text conflict in account_voucher/i18n/hi.po
Text conflict in account_voucher/i18n/hr.po
Text conflict in account_voucher/i18n/hu.po
Text conflict in account_voucher/i18n/id.po
Text conflict in account_voucher/i18n/it.po
Conflict adding file account_voucher/i18n/ja.po.  Moved existing file to account_voucher/i18n/ja.po.moved.
Text conflict in account_voucher/i18n/ko.po
Text conflict in account_voucher/i18n/lt.po
Conflict adding file account_voucher/i18n/mk.po.  Moved existing file to account_voucher/i18n/mk.po.moved.
Text conflict in account_voucher/i18n/mn.po
Conflict adding file account_voucher/i18n/nb.po.  Moved existing file to account_voucher/i18n/nb.po.moved.
Text conflict in account_voucher/i18n/nl.po
Text conflict in account_voucher/i18n/nl_BE.po
Text conflict in account_voucher/i18n/oc.po
Text conflict in account_voucher/i18n/pl.po
Text conflict in account_voucher/i18n/pt.po
Text conflict in account_voucher/i18n/pt_BR.po
Text conflict in account_voucher/i18n/ro.po
Text conflict in account_voucher/i18n/ru.po
Text conflict in account_voucher/i18n/sl.po
Text conflict in account_voucher/i18n/sq.po
Text conflict in account_voucher/i18n/sr.po
Text conflict in account_voucher/i18n/sr@latin.po
Text conflict in account_voucher/i18n/sv.po
Text conflict in account_voucher/i18n/tlh.po
Text conflict in account_voucher/i18n/tr.po
Text conflict in account_voucher/i18n/uk.po
Text conflict in account_voucher/i18n/vi.po
Text conflict in account_voucher/i18n/zh_CN.po
Text conflict in account_voucher/i18n/zh_TW.po
Text conflict in account_voucher/voucher_payment_receipt_view.xml
Text conflict in account_voucher/voucher_sales_purchase_view.xml
Text conflict in account_voucher/wizard/account_statement_from_invoice.py
Text conflict in analytic/analytic.py
Text conflict in analytic/i18n/analytic.pot
Conflict adding file analytic/i18n/ar.po.  Moved existing file to analytic/i18n/ar.po.moved.
Conflict adding file analytic/i18n/bg.po.  Moved existing file to analytic/i18n/bg.po.moved.
Text conflict in analytic/i18n/bs.po
Conflict adding file analytic/i18n/ca.po.  Moved existing file to analytic/i18n/ca.po.moved.
Conflict adding file analytic/i18n/cs.po.  Moved existing file to analytic/i18n/cs.po.moved.
Conflict adding file analytic/i18n/da.po.  Moved existing file to analytic/i18n/da.po.moved.
Text conflict in analytic/i18n/de.po
Text conflict in analytic/i18n/el.po
Conflict adding file analytic/i18n/en_GB.po.  Moved existing file to analytic/i18n/en_GB.po.moved.
Text conflict in analytic/i18n/es.po
Conflict adding file analytic/i18n/es_CR.po.  Moved existing file to analytic/i18n/es_CR.po.moved.
Text conflict in analytic/i18n/es_EC.po
Conflict adding file analytic/i18n/es_PY.po.  Moved existing file to analytic/i18n/es_PY.po.moved.
Text conflict in analytic/i18n/et.po
Conflict adding file analytic/i18n/fa.po.  Moved existing file to analytic/i18n/fa.po.moved.
Conflict adding file analytic/i18n/fi.po.  Moved existing file to analytic/i18n/fi.po.moved.
Text conflict in analytic/i18n/fr.po
Conflict adding file analytic/i18n/gl.po.  Moved existing file to analytic/i18n/gl.po.moved.
Conflict adding file analytic/i18n/hr.po.  Moved existing file to analytic/i18n/hr.po.moved.
Text conflict in analytic/i18n/hu.po
Text conflict in analytic/i18n/it.po
Conflict adding file analytic/i18n/ja.po.  Moved existing file to analytic/i18n/ja.po.moved.
Conflict adding file analytic/i18n/lt.po.  Moved existing file to analytic/i18n/lt.po.moved.
Conflict adding file analytic/i18n/lv.po.  Moved existing file to analytic/i18n/lv.po.moved.
Conflict adding file analytic/i18n/mk.po.  Moved existing file to analytic/i18n/mk.po.moved.
Text conflict in analytic/i18n/mn.po
Conflict adding file analytic/i18n/nb.po.  Moved existing file to analytic/i18n/nb.po.moved.
Text conflict in analytic/i18n/nl.po
Conflict adding file analytic/i18n/nl_BE.po.  Moved existing file to analytic/i18n/nl_BE.po.moved.
Text conflict in analytic/i18n/pl.po
Text conflict in analytic/i18n/pt.po
Text conflict in analytic/i18n/pt_BR.po
Conflict adding file analytic/i18n/ro.po.  Moved existing file to analytic/i18n/ro.po.moved.
Conflict adding file analytic/i18n/ru.po.  Moved existing file to analytic/i18n/ru.po.moved.
Text conflict in analytic/i18n/sl.po
Conflict adding file analytic/i18n/sq.po.  Moved existing file to analytic/i18n/sq.po.moved.
Text conflict in analytic/i18n/sr.po
Text conflict in analytic/i18n/sr@latin.po
Text conflict in analytic/i18n/sv.po
Conflict adding file analytic/i18n/tr.po.  Moved existing file to analytic/i18n/tr.po.moved.
Text conflict in analytic/i18n/vi.po
Text conflict in analytic/i18n/zh_CN.po
Conflict adding file analytic/i18n/zh_TW.po.  Moved existing file to analytic/i18n/zh_TW.po.moved.
Text conflict in analytic/security/analytic_security.xml
Text conflict in analytic_journal_billing_rate/i18n/ar.po
Text conflict in analytic_journal_billing_rate/i18n/bg.po
Text conflict in analytic_journal_billing_rate/i18n/bs.po
Text conflict in analytic_journal_billing_rate/i18n/ca.po
Text conflict in analytic_journal_billing_rate/i18n/cs.po
Conflict adding file analytic_journal_billing_rate/i18n/da.po.  Moved existing file to analytic_journal_billing_rate/i18n/da.po.moved.
Text conflict in analytic_journal_billing_rate/i18n/de.po
Text conflict in analytic_journal_billing_rate/i18n/el.po
Conflict adding file analytic_journal_billing_rate/i18n/en_GB.po.  Moved existing file to analytic_journal_billing_rate/i18n/en_GB.po.moved.
Text conflict in analytic_journal_billing_rate/i18n/es.po
Text conflict in analytic_journal_billing_rate/i18n/es_AR.po
Conflict adding file analytic_journal_billing_rate/i18n/es_CR.po.  Moved existing file to analytic_journal_billing_rate/i18n/es_CR.po.moved.
Text conflict in analytic_journal_billing_rate/i18n/es_EC.po
Conflict adding file analytic_journal_billing_rate/i18n/es_PY.po.  Moved existing file to analytic_journal_billing_rate/i18n/es_PY.po.moved.
Text conflict in analytic_journal_billing_rate/i18n/et.po
Conflict adding file analytic_journal_billing_rate/i18n/fa.po.  Moved existing file to analytic_journal_billing_rate/i18n/fa.po.moved.
Conflict adding file analytic_journal_billing_rate/i18n/fi.po.  Moved existing file to analytic_journal_billing_rate/i18n/fi.po.moved.
Text conflict in analytic_journal_billing_rate/i18n/fr.po
Text conflict in analytic_journal_billing_rate/i18n/gl.po
Conflict adding file analytic_journal_billing_rate/i18n/gu.po.  Moved existing file to analytic_journal_billing_rate/i18n/gu.po.moved.
Text conflict in analytic_journal_billing_rate/i18n/hr.po
Text conflict in analytic_journal_billing_rate/i18n/hu.po
Text conflict in analytic_journal_billing_rate/i18n/id.po
Text conflict in analytic_journal_billing_rate/i18n/it.po
Conflict adding file analytic_journal_billing_rate/i18n/ja.po.  Moved existing file to analytic_journal_billing_rate/i18n/ja.po.moved.
Text conflict in analytic_journal_billing_rate/i18n/ko.po
Text conflict in analytic_journal_billing_rate/i18n/lt.po
Conflict adding file analytic_journal_billing_rate/i18n/lv.po.  Moved existing file to analytic_journal_billing_rate/i18n/lv.po.moved.
Text conflict in analytic_journal_billing_rate/i18n/mn.po
Conflict adding file analytic_journal_billing_rate/i18n/nb.po.  Moved existing file to analytic_journal_billing_rate/i18n/nb.po.moved.
Text conflict in analytic_journal_billing_rate/i18n/nl.po
Text conflict in analytic_journal_billing_rate/i18n/nl_BE.po
Text conflict in analytic_journal_billing_rate/i18n/oc.po
Text conflict in analytic_journal_billing_rate/i18n/pl.po
Text conflict in analytic_journal_billing_rate/i18n/pt.po
Text conflict in analytic_journal_billing_rate/i18n/pt_BR.po
Text conflict in analytic_journal_billing_rate/i18n/ro.po
Text conflict in analytic_journal_billing_rate/i18n/ru.po
Text conflict in analytic_journal_billing_rate/i18n/sl.po
Text conflict in analytic_journal_billing_rate/i18n/sq.po
Text conflict in analytic_journal_billing_rate/i18n/sr.po
Text conflict in analytic_journal_billing_rate/i18n/sr@latin.po
Text conflict in analytic_journal_billing_rate/i18n/sv.po
Text conflict in analytic_journal_billing_rate/i18n/tlh.po
Text conflict in analytic_journal_billing_rate/i18n/tr.po
Text conflict in analytic_journal_billing_rate/i18n/uk.po
Text conflict in analytic_journal_billing_rate/i18n/vi.po
Text conflict in analytic_journal_billing_rate/i18n/zh_CN.po
Text conflict in analytic_journal_billing_rate/i18n/zh_TW.po
Text conflict in analytic_user_function/analytic_user_function.py
Text conflict in analytic_user_function/i18n/ar.po
Text conflict in analytic_user_function/i18n/bg.po
Text conflict in analytic_user_function/i18n/bs.po
Text conflict in analytic_user_function/i18n/ca.po
Text conflict in analytic_user_function/i18n/cs.po
Conflict adding file analytic_user_function/i18n/da.po.  Moved existing file to analytic_user_function/i18n/da.po.moved.
Text conflict in analytic_user_function/i18n/de.po
Text conflict in analytic_user_function/i18n/el.po
Conflict adding file analytic_user_function/i18n/en_GB.po.  Moved existing file to analytic_user_function/i18n/en_GB.po.moved.
Text conflict in analytic_user_function/i18n/es.po
Text conflict in analytic_user_function/i18n/es_AR.po
Conflict adding file analytic_user_function/i18n/es_CR.po.  Moved existing file to analytic_user_function/i18n/es_CR.po.moved.
Text conflict in analytic_user_function/i18n/es_EC.po
Conflict adding file analytic_user_function/i18n/es_PY.po.  Moved existing file to analytic_user_function/i18n/es_PY.po.moved.
Text conflict in analytic_user_function/i18n/et.po
Conflict adding file analytic_user_function/i18n/fa.po.  Moved existing file to analytic_user_function/i18n/fa.po.moved.
Conflict adding file analytic_user_function/i18n/fi.po.  Moved existing file to analytic_user_function/i18n/fi.po.moved.
Text conflict in analytic_user_function/i18n/fr.po
Text conflict in analytic_user_function/i18n/gl.po
Conflict adding file analytic_user_function/i18n/gu.po.  Moved existing file to analytic_user_function/i18n/gu.po.moved.
Text conflict in analytic_user_function/i18n/hr.po
Text conflict in analytic_user_function/i18n/hu.po
Text conflict in analytic_user_function/i18n/id.po
Text conflict in analytic_user_function/i18n/it.po
Conflict adding file analytic_user_function/i18n/ja.po.  Moved existing file to analytic_user_function/i18n/ja.po.moved.
Text conflict in analytic_user_function/i18n/ko.po
Text conflict in analytic_user_function/i18n/lt.po
Conflict adding file analytic_user_function/i18n/mk.po.  Moved existing file to analytic_user_function/i18n/mk.po.moved.
Text conflict in analytic_user_function/i18n/mn.po
Conflict adding file analytic_user_function/i18n/nb.po.  Moved existing file to analytic_user_function/i18n/nb.po.moved.
Text conflict in analytic_user_function/i18n/nl.po
Text conflict in analytic_user_function/i18n/nl_BE.po
Text conflict in analytic_user_function/i18n/oc.po
Text conflict in analytic_user_function/i18n/pl.po
Text conflict in analytic_user_function/i18n/pt.po
Text conflict in analytic_user_function/i18n/pt_BR.po
Text conflict in analytic_user_function/i18n/ro.po
Text conflict in analytic_user_function/i18n/ru.po
Text conflict in analytic_user_function/i18n/sk.po
Text conflict in analytic_user_function/i18n/sl.po
Text conflict in analytic_user_function/i18n/sq.po
Text conflict in analytic_user_function/i18n/sr.po
Text conflict in analytic_user_function/i18n/sr@latin.po
Text conflict in analytic_user_function/i18n/sv.po
Text conflict in analytic_user_function/i18n/tlh.po
Text conflict in analytic_user_function/i18n/tr.po
Text conflict in analytic_user_function/i18n/uk.po
Text conflict in analytic_user_function/i18n/vi.po
Text conflict in analytic_user_function/i18n/zh_CN.po
Text conflict in analytic_user_function/i18n/zh_TW.po
Conflict adding file anonymization/i18n/ar.po.  Moved existing file to anonymization/i18n/ar.po.moved.
Conflict adding file anonymization/i18n/bg.po.  Moved existing file to anonymization/i18n/bg.po.moved.
Conflict adding file anonymization/i18n/ca.po.  Moved existing file to anonymization/i18n/ca.po.moved.
Conflict adding file anonymization/i18n/cs.po.  Moved existing file to anonymization/i18n/cs.po.moved.
Conflict adding file anonymization/i18n/da.po.  Moved existing file to anonymization/i18n/da.po.moved.
Conflict adding file anonymization/i18n/de.po.  Moved existing file to anonymization/i18n/de.po.moved.
Conflict adding file anonymization/i18n/en_GB.po.  Moved existing file to anonymization/i18n/en_GB.po.moved.
Conflict adding file anonymization/i18n/es.po.  Moved existing file to anonymization/i18n/es.po.moved.
Conflict adding file anonymization/i18n/es_CR.po.  Moved existing file to anonymization/i18n/es_CR.po.moved.
Conflict adding file anonymization/i18n/es_EC.po.  Moved existing file to anonymization/i18n/es_EC.po.moved.
Conflict adding file anonymization/i18n/es_PY.po.  Moved existing file to anonymization/i18n/es_PY.po.moved.
Conflict adding file anonymization/i18n/et.po.  Moved existing file to anonymization/i18n/et.po.moved.
Conflict adding file anonymization/i18n/fa.po.  Moved existing file to anonymization/i18n/fa.po.moved.
Conflict adding file anonymization/i18n/fi.po.  Moved existing file to anonymization/i18n/fi.po.moved.
Text conflict in anonymization/i18n/fr.po
Conflict adding file anonymization/i18n/gl.po.  Moved existing file to anonymization/i18n/gl.po.moved.
Conflict adding file anonymization/i18n/hr.po.  Moved existing file to anonymization/i18n/hr.po.moved.
Conflict adding file anonymization/i18n/hu.po.  Moved existing file to anonymization/i18n/hu.po.moved.
Conflict adding file anonymization/i18n/it.po.  Moved existing file to anonymization/i18n/it.po.moved.
Conflict adding file anonymization/i18n/ja.po.  Moved existing file to anonymization/i18n/ja.po.moved.
Conflict adding file anonymization/i18n/lv.po.  Moved existing file to anonymization/i18n/lv.po.moved.
Conflict adding file anonymization/i18n/mk.po.  Moved existing file to anonymization/i18n/mk.po.moved.
Conflict adding file anonymization/i18n/mn.po.  Moved existing file to anonymization/i18n/mn.po.moved.
Conflict adding file anonymization/i18n/nb.po.  Moved existing file to anonymization/i18n/nb.po.moved.
Conflict adding file anonymization/i18n/nl.po.  Moved existing file to anonymization/i18n/nl.po.moved.
Conflict adding file anonymization/i18n/pl.po.  Moved existing file to anonymization/i18n/pl.po.moved.
Conflict adding file anonymization/i18n/pt.po.  Moved existing file to anonymization/i18n/pt.po.moved.
Conflict adding file anonymization/i18n/pt_BR.po.  Moved existing file to anonymization/i18n/pt_BR.po.moved.
Conflict adding file anonymization/i18n/ro.po.  Moved existing file to anonymization/i18n/ro.po.moved.
Conflict adding file anonymization/i18n/ru.po.  Moved existing file to anonymization/i18n/ru.po.moved.
Conflict adding file anonymization/i18n/sl.po.  Moved existing file to anonymization/i18n/sl.po.moved.
Conflict adding file anonymization/i18n/sq.po.  Moved existing file to anonymization/i18n/sq.po.moved.
Conflict adding file anonymization/i18n/sr@latin.po.  Moved existing file to anonymization/i18n/sr@latin.po.moved.
Conflict adding file anonymization/i18n/sv.po.  Moved existing file to anonymization/i18n/sv.po.moved.
Conflict adding file anonymization/i18n/tr.po.  Moved existing file to anonymization/i18n/tr.po.moved.
Conflict adding file anonymization/i18n/zh_CN.po.  Moved existing file to anonymization/i18n/zh_CN.po.moved.
Conflict adding file anonymization/i18n/zh_TW.po.  Moved existing file to anonymization/i18n/zh_TW.po.moved.
Text conflict in association/i18n/ar.po
Text conflict in association/i18n/bg.po
Text conflict in association/i18n/bs.po
Text conflict in association/i18n/ca.po
Text conflict in association/i18n/cs.po
Conflict adding file association/i18n/da.po.  Moved existing file to association/i18n/da.po.moved.
Text conflict in association/i18n/de.po
Text conflict in association/i18n/el.po
Conflict adding file association/i18n/en_GB.po.  Moved existing file to association/i18n/en_GB.po.moved.
Text conflict in association/i18n/es.po
Conflict adding file association/i18n/es_CR.po.  Moved existing file to association/i18n/es_CR.po.moved.
Text conflict in association/i18n/es_EC.po
Conflict adding file association/i18n/es_PY.po.  Moved existing file to association/i18n/es_PY.po.moved.
Text conflict in association/i18n/et.po
Conflict adding file association/i18n/fa.po.  Moved existing file to association/i18n/fa.po.moved.
Conflict adding file association/i18n/fi.po.  Moved existing file to association/i18n/fi.po.moved.
Text conflict in association/i18n/fr.po
Conflict adding file association/i18n/gl.po.  Moved existing file to association/i18n/gl.po.moved.
Conflict adding file association/i18n/gu.po.  Moved existing file to association/i18n/gu.po.moved.
Text conflict in association/i18n/hr.po
Text conflict in association/i18n/hu.po
Text conflict in association/i18n/id.po
Text conflict in association/i18n/it.po
Conflict adding file association/i18n/ja.po.  Moved existing file to association/i18n/ja.po.moved.
Text conflict in association/i18n/ko.po
Text conflict in association/i18n/lo.po
Text conflict in association/i18n/lt.po
Text conflict in association/i18n/lv.po
Conflict adding file association/i18n/mk.po.  Moved existing file to association/i18n/mk.po.moved.
Conflict adding file association/i18n/mn.po.  Moved existing file to association/i18n/mn.po.moved.
Conflict adding file association/i18n/nb.po.  Moved existing file to association/i18n/nb.po.moved.
Text conflict in association/i18n/nl.po
Text conflict in association/i18n/pl.po
Text conflict in association/i18n/pt.po
Text conflict in association/i18n/pt_BR.po
Text conflict in association/i18n/ro.po
Text conflict in association/i18n/ru.po
Text conflict in association/i18n/sl.po
Text conflict in association/i18n/sq.po
Text conflict in association/i18n/sr.po
Text conflict in association/i18n/sr@latin.po
Text conflict in association/i18n/sv.po
Text conflict in association/i18n/tlh.po
Text conflict in association/i18n/tr.po
Text conflict in association/i18n/uk.po
Text conflict in association/i18n/vi.po
Text conflict in association/i18n/zh_CN.po
Text conflict in association/i18n/zh_TW.po
Text conflict in auction/i18n/ar.po
Text conflict in auction/i18n/bg.po
Text conflict in auction/i18n/bs.po
Text conflict in auction/i18n/ca.po
Text conflict in auction/i18n/cs.po
Conflict adding file auction/i18n/da.po.  Moved existing file to auction/i18n/da.po.moved.
Text conflict in auction/i18n/de.po
Text conflict in auction/i18n/el.po
Text conflict in auction/i18n/es.po
Text conflict in auction/i18n/es_AR.po
Conflict adding file auction/i18n/es_CR.po.  Moved existing file to auction/i18n/es_CR.po.moved.
Text conflict in auction/i18n/es_EC.po
Conflict adding file auction/i18n/es_MX.po.  Moved existing file to auction/i18n/es_MX.po.moved.
Conflict adding file auction/i18n/es_PY.po.  Moved existing file to auction/i18n/es_PY.po.moved.
Text conflict in auction/i18n/et.po
Conflict adding file auction/i18n/fa.po.  Moved existing file to auction/i18n/fa.po.moved.
Text conflict in auction/i18n/fi.po
Text conflict in auction/i18n/fr.po
Conflict adding file auction/i18n/gl.po.  Moved existing file to auction/i18n/gl.po.moved.
Conflict adding file auction/i18n/gu.po.  Moved existing file to auction/i18n/gu.po.moved.
Text conflict in auction/i18n/hi.po
Text conflict in auction/i18n/hr.po
Text conflict in auction/i18n/hu.po
Text conflict in auction/i18n/id.po
Text conflict in auction/i18n/it.po
Conflict adding file auction/i18n/ja.po.  Moved existing file to auction/i18n/ja.po.moved.
Text conflict in auction/i18n/ko.po
Text conflict in auction/i18n/lt.po
Conflict adding file auction/i18n/mn.po.  Moved existing file to auction/i18n/mn.po.moved.
Conflict adding file auction/i18n/nb.po.  Moved existing file to auction/i18n/nb.po.moved.
Text conflict in auction/i18n/nl.po
Text conflict in auction/i18n/nl_BE.po
Text conflict in auction/i18n/pl.po
Text conflict in auction/i18n/pt.po
Text conflict in auction/i18n/pt_BR.po
Text conflict in auction/i18n/ro.po
Text conflict in auction/i18n/ru.po
Text conflict in auction/i18n/sl.po
Text conflict in auction/i18n/sq.po
Text conflict in auction/i18n/sr.po
Text conflict in auction/i18n/sr@latin.po
Text conflict in auction/i18n/sv.po
Text conflict in auction/i18n/tlh.po
Text conflict in auction/i18n/tr.po
Text conflict in auction/i18n/uk.po
Text conflict in auction/i18n/vi.po
Text conflict in auction/i18n/zh_CN.po
Text conflict in auction/i18n/zh_TW.po
Text conflict in audittrail/audittrail.py
Text conflict in audittrail/i18n/ar.po
Text conflict in audittrail/i18n/bg.po
Text conflict in audittrail/i18n/bs.po
Text conflict in audittrail/i18n/ca.po
Text conflict in audittrail/i18n/cs.po
Conflict adding file audittrail/i18n/da.po.  Moved existing file to audittrail/i18n/da.po.moved.
Text conflict in audittrail/i18n/de.po
Text conflict in audittrail/i18n/el.po
Text conflict in audittrail/i18n/es.po
Text conflict in audittrail/i18n/es_AR.po
Conflict adding file audittrail/i18n/es_CR.po.  Moved existing file to audittrail/i18n/es_CR.po.moved.
Text conflict in audittrail/i18n/es_EC.po
Conflict adding file audittrail/i18n/es_PY.po.  Moved existing file to audittrail/i18n/es_PY.po.moved.
Text conflict in audittrail/i18n/et.po
Conflict adding file audittrail/i18n/fa.po.  Moved existing file to audittrail/i18n/fa.po.moved.
Conflict adding file audittrail/i18n/fa_AF.po.  Moved existing file to audittrail/i18n/fa_AF.po.moved.
Conflict adding file audittrail/i18n/fi.po.  Moved existing file to audittrail/i18n/fi.po.moved.
Text conflict in audittrail/i18n/fr.po
Conflict adding file audittrail/i18n/gl.po.  Moved existing file to audittrail/i18n/gl.po.moved.
Conflict adding file audittrail/i18n/gu.po.  Moved existing file to audittrail/i18n/gu.po.moved.
Text conflict in audittrail/i18n/hr.po
Text conflict in audittrail/i18n/hu.po
Text conflict in audittrail/i18n/id.po
Text conflict in audittrail/i18n/it.po
Conflict adding file audittrail/i18n/ja.po.  Moved existing file to audittrail/i18n/ja.po.moved.
Text conflict in audittrail/i18n/ko.po
Text conflict in audittrail/i18n/lt.po
Text conflict in audittrail/i18n/lv.po
Conflict adding file audittrail/i18n/mk.po.  Moved existing file to audittrail/i18n/mk.po.moved.
Text conflict in audittrail/i18n/mn.po
Conflict adding file audittrail/i18n/nb.po.  Moved existing file to audittrail/i18n/nb.po.moved.
Text conflict in audittrail/i18n/nl.po
Text conflict in audittrail/i18n/nl_BE.po
Text conflict in audittrail/i18n/oc.po
Text conflict in audittrail/i18n/pl.po
Text conflict in audittrail/i18n/pt.po
Text conflict in audittrail/i18n/pt_BR.po
Text conflict in audittrail/i18n/ro.po
Text conflict in audittrail/i18n/ru.po
Text conflict in audittrail/i18n/sl.po
Text conflict in audittrail/i18n/sq.po
Text conflict in audittrail/i18n/sr@latin.po
Text conflict in audittrail/i18n/sv.po
Text conflict in audittrail/i18n/tlh.po
Text conflict in audittrail/i18n/tr.po
Text conflict in audittrail/i18n/uk.po
Text conflict in audittrail/i18n/vi.po
Text conflict in audittrail/i18n/zh_CN.po
Text conflict in audittrail/i18n/zh_TW.po
Text conflict in base_action_rule/base_action_rule.py
Conflict adding file base_action_rule/i18n/ar.po.  Moved existing file to base_action_rule/i18n/ar.po.moved.
Conflict adding file base_action_rule/i18n/bg.po.  Moved existing file to base_action_rule/i18n/bg.po.moved.
Text conflict in base_action_rule/i18n/bs.po
Conflict adding file base_action_rule/i18n/ca.po.  Moved existing file to base_action_rule/i18n/ca.po.moved.
Conflict adding file base_action_rule/i18n/cs.po.  Moved existing file to base_action_rule/i18n/cs.po.moved.
Conflict adding file base_action_rule/i18n/da.po.  Moved existing file to base_action_rule/i18n/da.po.moved.
Text conflict in base_action_rule/i18n/de.po
Text conflict in base_action_rule/i18n/el.po
Text conflict in base_action_rule/i18n/es.po
Conflict adding file base_action_rule/i18n/es_CR.po.  Moved existing file to base_action_rule/i18n/es_CR.po.moved.
Text conflict in base_action_rule/i18n/es_EC.po
Conflict adding file base_action_rule/i18n/es_PY.po.  Moved existing file to base_action_rule/i18n/es_PY.po.moved.
Conflict adding file base_action_rule/i18n/fa.po.  Moved existing file to base_action_rule/i18n/fa.po.moved.
Text conflict in base_action_rule/i18n/fi.po
Text conflict in base_action_rule/i18n/fr.po
Conflict adding file base_action_rule/i18n/gl.po.  Moved existing file to base_action_rule/i18n/gl.po.moved.
Conflict adding file base_action_rule/i18n/gu.po.  Moved existing file to base_action_rule/i18n/gu.po.moved.
Conflict adding file base_action_rule/i18n/hr.po.  Moved existing file to base_action_rule/i18n/hr.po.moved.
Text conflict in base_action_rule/i18n/hu.po
Text conflict in base_action_rule/i18n/it.po
Conflict adding file base_action_rule/i18n/ja.po.  Moved existing file to base_action_rule/i18n/ja.po.moved.
Text conflict in base_action_rule/i18n/lt.po
Text conflict in base_action_rule/i18n/lv.po
Conflict adding file base_action_rule/i18n/mk.po.  Moved existing file to base_action_rule/i18n/mk.po.moved.
Text conflict in base_action_rule/i18n/mn.po
Conflict adding file base_action_rule/i18n/nb.po.  Moved existing file to base_action_rule/i18n/nb.po.moved.
Text conflict in base_action_rule/i18n/nl.po
Conflict adding file base_action_rule/i18n/pl.po.  Moved existing file to base_action_rule/i18n/pl.po.moved.
Text conflict in base_action_rule/i18n/pt.po
Text conflict in base_action_rule/i18n/pt_BR.po
Text conflict in base_action_rule/i18n/ro.po
Text conflict in base_action_rule/i18n/ru.po
Conflict adding file base_action_rule/i18n/sl.po.  Moved existing file to base_action_rule/i18n/sl.po.moved.
Conflict adding file base_action_rule/i18n/sq.po.  Moved existing file to base_action_rule/i18n/sq.po.moved.
Text conflict in base_action_rule/i18n/sr.po
Text conflict in base_action_rule/i18n/sr@latin.po
Text conflict in base_action_rule/i18n/sv.po
Conflict adding file base_action_rule/i18n/tr.po.  Moved existing file to base_action_rule/i18n/tr.po.moved.
Text conflict in base_action_rule/i18n/zh_CN.po
Conflict adding file base_action_rule/i18n/zh_TW.po.  Moved existing file to base_action_rule/i18n/zh_TW.po.moved.
Text conflict in base_calendar/base_calendar.py
Text conflict in base_calendar/i18n/af.po
Conflict adding file base_calendar/i18n/ar.po.  Moved existing file to base_calendar/i18n/ar.po.moved.
Text conflict in base_calendar/i18n/base_calendar.pot
Conflict adding file base_calendar/i18n/bg.po.  Moved existing file to base_calendar/i18n/bg.po.moved.
Conflict adding file base_calendar/i18n/bn.po.  Moved existing file to base_calendar/i18n/bn.po.moved.
Text conflict in base_calendar/i18n/bs.po
Conflict adding file base_calendar/i18n/ca.po.  Moved existing file to base_calendar/i18n/ca.po.moved.
Conflict adding file base_calendar/i18n/cs.po.  Moved existing file to base_calendar/i18n/cs.po.moved.
Conflict adding file base_calendar/i18n/da.po.  Moved existing file to base_calendar/i18n/da.po.moved.
Text conflict in base_calendar/i18n/de.po
Text conflict in base_calendar/i18n/el.po
Text conflict in base_calendar/i18n/es.po
Conflict adding file base_calendar/i18n/es_CR.po.  Moved existing file to base_calendar/i18n/es_CR.po.moved.
Conflict adding file base_calendar/i18n/es_EC.po.  Moved existing file to base_calendar/i18n/es_EC.po.moved.
Conflict adding file base_calendar/i18n/es_MX.po.  Moved existing file to base_calendar/i18n/es_MX.po.moved.
Conflict adding file base_calendar/i18n/es_PY.po.  Moved existing file to base_calendar/i18n/es_PY.po.moved.
Conflict adding file base_calendar/i18n/et.po.  Moved existing file to base_calendar/i18n/et.po.moved.
Conflict adding file base_calendar/i18n/fa.po.  Moved existing file to base_calendar/i18n/fa.po.moved.
Text conflict in base_calendar/i18n/fi.po
Text conflict in base_calendar/i18n/fr.po
Conflict adding file base_calendar/i18n/gl.po.  Moved existing file to base_calendar/i18n/gl.po.moved.
Text conflict in base_calendar/i18n/hr.po
Text conflict in base_calendar/i18n/hu.po
Conflict adding file base_calendar/i18n/id.po.  Moved existing file to base_calendar/i18n/id.po.moved.
Text conflict in base_calendar/i18n/it.po
Conflict adding file base_calendar/i18n/ja.po.  Moved existing file to base_calendar/i18n/ja.po.moved.
Conflict adding file base_calendar/i18n/ln.po.  Moved existing file to base_calendar/i18n/ln.po.moved.
Text conflict in base_calendar/i18n/lt.po
Text conflict in base_calendar/i18n/lv.po
Conflict adding file base_calendar/i18n/mk.po.  Moved existing file to base_calendar/i18n/mk.po.moved.
Text conflict in base_calendar/i18n/mn.po
Conflict adding file base_calendar/i18n/nb.po.  Moved existing file to base_calendar/i18n/nb.po.moved.
Text conflict in base_calendar/i18n/nl.po
Text conflict in base_calendar/i18n/pl.po
Text conflict in base_calendar/i18n/pt.po
Text conflict in base_calendar/i18n/pt_BR.po
Text conflict in base_calendar/i18n/ro.po
Conflict adding file base_calendar/i18n/ru.po.  Moved existing file to base_calendar/i18n/ru.po.moved.
Text conflict in base_calendar/i18n/sk.po
Conflict adding file base_calendar/i18n/sl.po.  Moved existing file to base_calendar/i18n/sl.po.moved.
Conflict adding file base_calendar/i18n/sq.po.  Moved existing file to base_calendar/i18n/sq.po.moved.
Text conflict in base_calendar/i18n/sr.po
Text conflict in base_calendar/i18n/sr@latin.po
Text conflict in base_calendar/i18n/sv.po
Text conflict in base_calendar/i18n/th.po
Conflict adding file base_calendar/i18n/tr.po.  Moved existing file to base_calendar/i18n/tr.po.moved.
Conflict adding file base_calendar/i18n/zh_CN.po.  Moved existing file to base_calendar/i18n/zh_CN.po.moved.
Conflict adding file base_calendar/i18n/zh_TW.po.  Moved existing file to base_calendar/i18n/zh_TW.po.moved.
Text conflict in base_contact/base_contact.py
Text conflict in base_contact/base_contact_view.xml
Text conflict in base_contact/i18n/ar.po
Text conflict in base_contact/i18n/bg.po
Text conflict in base_contact/i18n/bs.po
Text conflict in base_contact/i18n/ca.po
Text conflict in base_contact/i18n/cs.po
Conflict adding file base_contact/i18n/da.po.  Moved existing file to base_contact/i18n/da.po.moved.
Text conflict in base_contact/i18n/de.po
Text conflict in base_contact/i18n/el.po
Text conflict in base_contact/i18n/es.po
Text conflict in base_contact/i18n/es_AR.po
Conflict adding file base_contact/i18n/es_CR.po.  Moved existing file to base_contact/i18n/es_CR.po.moved.
Text conflict in base_contact/i18n/es_EC.po
Conflict adding file base_contact/i18n/es_PY.po.  Moved existing file to base_contact/i18n/es_PY.po.moved.
Text conflict in base_contact/i18n/et.po
Conflict adding file base_contact/i18n/fa.po.  Moved existing file to base_contact/i18n/fa.po.moved.
Text conflict in base_contact/i18n/fi.po
Text conflict in base_contact/i18n/fr.po
Conflict adding file base_contact/i18n/gl.po.  Moved existing file to base_contact/i18n/gl.po.moved.
Conflict adding file base_contact/i18n/gu.po.  Moved existing file to base_contact/i18n/gu.po.moved.
Text conflict in base_contact/i18n/hr.po
Text conflict in base_contact/i18n/hu.po
Text conflict in base_contact/i18n/id.po
Text conflict in base_contact/i18n/it.po
Conflict adding file base_contact/i18n/ja.po.  Moved existing file to base_contact/i18n/ja.po.moved.
Text conflict in base_contact/i18n/ko.po
Text conflict in base_contact/i18n/lo.po
Text conflict in base_contact/i18n/lt.po
Text conflict in base_contact/i18n/lv.po
Text conflict in base_contact/i18n/mn.po
Conflict adding file base_contact/i18n/nb.po.  Moved existing file to base_contact/i18n/nb.po.moved.
Text conflict in base_contact/i18n/nl.po
Text conflict in base_contact/i18n/nl_BE.po
Text conflict in base_contact/i18n/oc.po
Text conflict in base_contact/i18n/pl.po
Text conflict in base_contact/i18n/pt.po
Text conflict in base_contact/i18n/pt_BR.po
Text conflict in base_contact/i18n/ro.po
Text conflict in base_contact/i18n/ru.po
Text conflict in base_contact/i18n/sk.po
Text conflict in base_contact/i18n/sl.po
Text conflict in base_contact/i18n/sq.po
Text conflict in base_contact/i18n/sr.po
Text conflict in base_contact/i18n/sr@latin.po
Text conflict in base_contact/i18n/sv.po
Text conflict in base_contact/i18n/th.po
Text conflict in base_contact/i18n/tlh.po
Text conflict in base_contact/i18n/tr.po
Text conflict in base_contact/i18n/uk.po
Text conflict in base_contact/i18n/vi.po
Text conflict in base_contact/i18n/zh_CN.po
Text conflict in base_contact/i18n/zh_TW.po
Conflict adding file base_crypt/i18n/ar.po.  Moved existing file to base_crypt/i18n/ar.po.moved.
Conflict adding file base_crypt/i18n/bg.po.  Moved existing file to base_crypt/i18n/bg.po.moved.
Conflict adding file base_crypt/i18n/ca.po.  Moved existing file to base_crypt/i18n/ca.po.moved.
Conflict adding file base_crypt/i18n/cs.po.  Moved existing file to base_crypt/i18n/cs.po.moved.
Conflict adding file base_crypt/i18n/da.po.  Moved existing file to base_crypt/i18n/da.po.moved.
Conflict adding file base_crypt/i18n/de.po.  Moved existing file to base_crypt/i18n/de.po.moved.
Text conflict in base_crypt/i18n/el.po
Conflict adding file base_crypt/i18n/en_GB.po.  Moved existing file to base_crypt/i18n/en_GB.po.moved.
Conflict adding file base_crypt/i18n/es.po.  Moved existing file to base_crypt/i18n/es.po.moved.
Conflict adding file base_crypt/i18n/es_CL.po.  Moved existing file to base_crypt/i18n/es_CL.po.moved.
Conflict adding file base_crypt/i18n/es_CR.po.  Moved existing file to base_crypt/i18n/es_CR.po.moved.
Conflict adding file base_crypt/i18n/es_PY.po.  Moved existing file to base_crypt/i18n/es_PY.po.moved.
Conflict adding file base_crypt/i18n/et.po.  Moved existing file to base_crypt/i18n/et.po.moved.
Conflict adding file base_crypt/i18n/fa.po.  Moved existing file to base_crypt/i18n/fa.po.moved.
Conflict adding file base_crypt/i18n/fi.po.  Moved existing file to base_crypt/i18n/fi.po.moved.
Conflict adding file base_crypt/i18n/fr.po.  Moved existing file to base_crypt/i18n/fr.po.moved.
Conflict adding file base_crypt/i18n/gl.po.  Moved existing file to base_crypt/i18n/gl.po.moved.
Conflict adding file base_crypt/i18n/gu.po.  Moved existing file to base_crypt/i18n/gu.po.moved.
Conflict adding file base_crypt/i18n/hr.po.  Moved existing file to base_crypt/i18n/hr.po.moved.
Conflict adding file base_crypt/i18n/hu.po.  Moved existing file to base_crypt/i18n/hu.po.moved.
Conflict adding file base_crypt/i18n/id.po.  Moved existing file to base_crypt/i18n/id.po.moved.
Conflict adding file base_crypt/i18n/it.po.  Moved existing file to base_crypt/i18n/it.po.moved.
Conflict adding file base_crypt/i18n/ja.po.  Moved existing file to base_crypt/i18n/ja.po.moved.
Conflict adding file base_crypt/i18n/lv.po.  Moved existing file to base_crypt/i18n/lv.po.moved.
Conflict adding file base_crypt/i18n/mn.po.  Moved existing file to base_crypt/i18n/mn.po.moved.
Conflict adding file base_crypt/i18n/nb.po.  Moved existing file to base_crypt/i18n/nb.po.moved.
Conflict adding file base_crypt/i18n/nl.po.  Moved existing file to base_crypt/i18n/nl.po.moved.
Conflict adding file base_crypt/i18n/nl_BE.po.  Moved existing file to base_crypt/i18n/nl_BE.po.moved.
Conflict adding file base_crypt/i18n/oc.po.  Moved existing file to base_crypt/i18n/oc.po.moved.
Conflict adding file base_crypt/i18n/pl.po.  Moved existing file to base_crypt/i18n/pl.po.moved.
Conflict adding file base_crypt/i18n/pt.po.  Moved existing file to base_crypt/i18n/pt.po.moved.
Conflict adding file base_crypt/i18n/pt_BR.po.  Moved existing file to base_crypt/i18n/pt_BR.po.moved.
Conflict adding file base_crypt/i18n/ro.po.  Moved existing file to base_crypt/i18n/ro.po.moved.
Conflict adding file base_crypt/i18n/ru.po.  Moved existing file to base_crypt/i18n/ru.po.moved.
Conflict adding file base_crypt/i18n/sk.po.  Moved existing file to base_crypt/i18n/sk.po.moved.
Conflict adding file base_crypt/i18n/sl.po.  Moved existing file to base_crypt/i18n/sl.po.moved.
Conflict adding file base_crypt/i18n/sq.po.  Moved existing file to base_crypt/i18n/sq.po.moved.
Conflict adding file base_crypt/i18n/sr@latin.po.  Moved existing file to base_crypt/i18n/sr@latin.po.moved.
Text conflict in base_crypt/i18n/sv.po
Conflict adding file base_crypt/i18n/tr.po.  Moved existing file to base_crypt/i18n/tr.po.moved.
Conflict adding file base_crypt/i18n/vi.po.  Moved existing file to base_crypt/i18n/vi.po.moved.
Conflict adding file base_crypt/i18n/zh_CN.po.  Moved existing file to base_crypt/i18n/zh_CN.po.moved.
Conflict adding file base_crypt/i18n/zh_TW.po.  Moved existing file to base_crypt/i18n/zh_TW.po.moved.
Text conflict in base_iban/i18n/ar.po
Text conflict in base_iban/i18n/bg.po
Text conflict in base_iban/i18n/bs.po
Text conflict in base_iban/i18n/ca.po
Text conflict in base_iban/i18n/cs.po
Conflict adding file base_iban/i18n/da.po.  Moved existing file to base_iban/i18n/da.po.moved.
Text conflict in base_iban/i18n/de.po
Text conflict in base_iban/i18n/el.po
Conflict adding file base_iban/i18n/en_GB.po.  Moved existing file to base_iban/i18n/en_GB.po.moved.
Text conflict in base_iban/i18n/es.po
Text conflict in base_iban/i18n/es_AR.po
Conflict adding file base_iban/i18n/es_CR.po.  Moved existing file to base_iban/i18n/es_CR.po.moved.
Text conflict in base_iban/i18n/es_EC.po
Conflict adding file base_iban/i18n/es_PY.po.  Moved existing file to base_iban/i18n/es_PY.po.moved.
Text conflict in base_iban/i18n/et.po
Text conflict in base_iban/i18n/eu.po
Conflict adding file base_iban/i18n/fa.po.  Moved existing file to base_iban/i18n/fa.po.moved.
Text conflict in base_iban/i18n/fi.po
Text conflict in base_iban/i18n/fr.po
Text conflict in base_iban/i18n/gl.po
Conflict adding file base_iban/i18n/gu.po.  Moved existing file to base_iban/i18n/gu.po.moved.
Text conflict in base_iban/i18n/hr.po
Text conflict in base_iban/i18n/hu.po
Text conflict in base_iban/i18n/id.po
Text conflict in base_iban/i18n/it.po
Conflict adding file base_iban/i18n/ja.po.  Moved existing file to base_iban/i18n/ja.po.moved.
Text conflict in base_iban/i18n/ko.po
Text conflict in base_iban/i18n/lt.po
Text conflict in base_iban/i18n/lv.po
Conflict adding file base_iban/i18n/mk.po.  Moved existing file to base_iban/i18n/mk.po.moved.
Text conflict in base_iban/i18n/mn.po
Conflict adding file base_iban/i18n/nb.po.  Moved existing file to base_iban/i18n/nb.po.moved.
Text conflict in base_iban/i18n/nl.po
Text conflict in base_iban/i18n/nl_BE.po
Text conflict in base_iban/i18n/oc.po
Text conflict in base_iban/i18n/pl.po
Text conflict in base_iban/i18n/pt.po
Text conflict in base_iban/i18n/pt_BR.po
Text conflict in base_iban/i18n/ro.po
Text conflict in base_iban/i18n/ru.po
Text conflict in base_iban/i18n/sk.po
Text conflict in base_iban/i18n/sl.po
Text conflict in base_iban/i18n/sq.po
Text conflict in base_iban/i18n/sr.po
Text conflict in base_iban/i18n/sr@latin.po
Text conflict in base_iban/i18n/sv.po
Text conflict in base_iban/i18n/ta.po
Text conflict in base_iban/i18n/tlh.po
Text conflict in base_iban/i18n/tr.po
Text conflict in base_iban/i18n/uk.po
Text conflict in base_iban/i18n/vi.po
Text conflict in base_iban/i18n/zh_CN.po
Text conflict in base_iban/i18n/zh_TW.po
Text conflict in base_module_doc_rst/i18n/ar.po
Text conflict in base_module_doc_rst/i18n/bg.po
Text conflict in base_module_doc_rst/i18n/bs.po
Text conflict in base_module_doc_rst/i18n/ca.po
Text conflict in base_module_doc_rst/i18n/cs.po
Conflict adding file base_module_doc_rst/i18n/da.po.  Moved existing file to base_module_doc_rst/i18n/da.po.moved.
Text conflict in base_module_doc_rst/i18n/de.po
Text conflict in base_module_doc_rst/i18n/el.po
Conflict adding file base_module_doc_rst/i18n/en_GB.po.  Moved existing file to base_module_doc_rst/i18n/en_GB.po.moved.
Text conflict in base_module_doc_rst/i18n/es.po
Text conflict in base_module_doc_rst/i18n/es_AR.po
Text conflict in base_module_doc_rst/i18n/es_PY.po
Text conflict in base_module_doc_rst/i18n/et.po
Conflict adding file base_module_doc_rst/i18n/fa.po.  Moved existing file to base_module_doc_rst/i18n/fa.po.moved.
Text conflict in base_module_doc_rst/i18n/fi.po
Text conflict in base_module_doc_rst/i18n/fr.po
Text conflict in base_module_doc_rst/i18n/gl.po
Conflict adding file base_module_doc_rst/i18n/gu.po.  Moved existing file to base_module_doc_rst/i18n/gu.po.moved.
Text conflict in base_module_doc_rst/i18n/hr.po
Text conflict in base_module_doc_rst/i18n/hu.po
Text conflict in base_module_doc_rst/i18n/it.po
Text conflict in base_module_doc_rst/i18n/ko.po
Text conflict in base_module_doc_rst/i18n/lt.po
Conflict adding file base_module_doc_rst/i18n/mn.po.  Moved existing file to base_module_doc_rst/i18n/mn.po.moved.
Conflict adding file base_module_doc_rst/i18n/nb.po.  Moved existing file to base_module_doc_rst/i18n/nb.po.moved.
Text conflict in base_module_doc_rst/i18n/nl.po
Text conflict in base_module_doc_rst/i18n/nl_BE.po
Text conflict in base_module_doc_rst/i18n/pl.po
Text conflict in base_module_doc_rst/i18n/pt.po
Text conflict in base_module_doc_rst/i18n/pt_BR.po
Text conflict in base_module_doc_rst/i18n/ro.po
Text conflict in base_module_doc_rst/i18n/ru.po
Text conflict in base_module_doc_rst/i18n/sk.po
Text conflict in base_module_doc_rst/i18n/sl.po
Text conflict in base_module_doc_rst/i18n/sq.po
Text conflict in base_module_doc_rst/i18n/sr.po
Text conflict in base_module_doc_rst/i18n/sr@latin.po
Text conflict in base_module_doc_rst/i18n/sv.po
Text conflict in base_module_doc_rst/i18n/tlh.po
Text conflict in base_module_doc_rst/i18n/tr.po
Text conflict in base_module_doc_rst/i18n/uk.po
Text conflict in base_module_doc_rst/i18n/ur.po
Text conflict in base_module_doc_rst/i18n/zh_CN.po
Text conflict in base_module_doc_rst/i18n/zh_TW.po
Text conflict in base_module_quality/i18n/ab.po
Text conflict in base_module_quality/i18n/ar.po
Text conflict in base_module_quality/i18n/bg.po
Text conflict in base_module_quality/i18n/bs.po
Text conflict in base_module_quality/i18n/ca.po
Text conflict in base_module_quality/i18n/cs.po
Conflict adding file base_module_quality/i18n/da.po.  Moved existing file to base_module_quality/i18n/da.po.moved.
Text conflict in base_module_quality/i18n/de.po
Text conflict in base_module_quality/i18n/el.po
Text conflict in base_module_quality/i18n/es.po
Text conflict in base_module_quality/i18n/es_AR.po
Conflict adding file base_module_quality/i18n/es_CR.po.  Moved existing file to base_module_quality/i18n/es_CR.po.moved.
Text conflict in base_module_quality/i18n/es_EC.po
Conflict adding file base_module_quality/i18n/es_PY.po.  Moved existing file to base_module_quality/i18n/es_PY.po.moved.
Text conflict in base_module_quality/i18n/et.po
Conflict adding file base_module_quality/i18n/fa.po.  Moved existing file to base_module_quality/i18n/fa.po.moved.
Text conflict in base_module_quality/i18n/fi.po
Text conflict in base_module_quality/i18n/fr.po
Text conflict in base_module_quality/i18n/gl.po
Text conflict in base_module_quality/i18n/hr.po
Text conflict in base_module_quality/i18n/hu.po
Text conflict in base_module_quality/i18n/id.po
Text conflict in base_module_quality/i18n/it.po
Text conflict in base_module_quality/i18n/iu.po
Conflict adding file base_module_quality/i18n/ja.po.  Moved existing file to base_module_quality/i18n/ja.po.moved.
Text conflict in base_module_quality/i18n/ko.po
Text conflict in base_module_quality/i18n/lt.po
Text conflict in base_module_quality/i18n/mn.po
Conflict adding file base_module_quality/i18n/nb.po.  Moved existing file to base_module_quality/i18n/nb.po.moved.
Text conflict in base_module_quality/i18n/nl.po
Text conflict in base_module_quality/i18n/pl.po
Text conflict in base_module_quality/i18n/pt.po
Text conflict in base_module_quality/i18n/pt_BR.po
Text conflict in base_module_quality/i18n/ro.po
Text conflict in base_module_quality/i18n/ru.po
Text conflict in base_module_quality/i18n/sk.po
Text conflict in base_module_quality/i18n/sl.po
Text conflict in base_module_quality/i18n/sq.po
Text conflict in base_module_quality/i18n/sr.po
Text conflict in base_module_quality/i18n/sr@latin.po
Text conflict in base_module_quality/i18n/sv.po
Text conflict in base_module_quality/i18n/tr.po
Text conflict in base_module_quality/i18n/uk.po
Text conflict in base_module_quality/i18n/vi.po
Text conflict in base_module_quality/i18n/zh_CN.po
Text conflict in base_module_quality/i18n/zh_TW.po
Text conflict in base_module_record/i18n/ar.po
Text conflict in base_module_record/i18n/bg.po
Text conflict in base_module_record/i18n/bs.po
Text conflict in base_module_record/i18n/ca.po
Text conflict in base_module_record/i18n/cs.po
Conflict adding file base_module_record/i18n/da.po.  Moved existing file to base_module_record/i18n/da.po.moved.
Text conflict in base_module_record/i18n/de.po
Text conflict in base_module_record/i18n/el.po
Text conflict in base_module_record/i18n/es.po
Text conflict in base_module_record/i18n/es_AR.po
Conflict adding file base_module_record/i18n/es_CR.po.  Moved existing file to base_module_record/i18n/es_CR.po.moved.
Text conflict in base_module_record/i18n/es_EC.po
Conflict adding file base_module_record/i18n/es_PY.po.  Moved existing file to base_module_record/i18n/es_PY.po.moved.
Text conflict in base_module_record/i18n/et.po
Conflict adding file base_module_record/i18n/fa.po.  Moved existing file to base_module_record/i18n/fa.po.moved.
Text conflict in base_module_record/i18n/fi.po
Text conflict in base_module_record/i18n/fr.po
Text conflict in base_module_record/i18n/gl.po
Text conflict in base_module_record/i18n/hr.po
Text conflict in base_module_record/i18n/hu.po
Text conflict in base_module_record/i18n/id.po
Text conflict in base_module_record/i18n/it.po
Conflict adding file base_module_record/i18n/ja.po.  Moved existing file to base_module_record/i18n/ja.po.moved.
Text conflict in base_module_record/i18n/ko.po
Text conflict in base_module_record/i18n/lt.po
Conflict adding file base_module_record/i18n/nb.po.  Moved existing file to base_module_record/i18n/nb.po.moved.
Text conflict in base_module_record/i18n/nl.po
Text conflict in base_module_record/i18n/nl_BE.po
Text conflict in base_module_record/i18n/pl.po
Text conflict in base_module_record/i18n/pt.po
Text conflict in base_module_record/i18n/pt_BR.po
Text conflict in base_module_record/i18n/ro.po
Text conflict in base_module_record/i18n/ru.po
Text conflict in base_module_record/i18n/sk.po
Text conflict in base_module_record/i18n/sl.po
Text conflict in base_module_record/i18n/sq.po
Text conflict in base_module_record/i18n/sr.po
Text conflict in base_module_record/i18n/sr@latin.po
Text conflict in base_module_record/i18n/sv.po
Text conflict in base_module_record/i18n/tlh.po
Text conflict in base_module_record/i18n/tr.po
Text conflict in base_module_record/i18n/uk.po
Text conflict in base_module_record/i18n/vi.po
Text conflict in base_module_record/i18n/zh_CN.po
Text conflict in base_module_record/i18n/zh_TW.po
Conflict: can't delete base_report_creator because it is not empty.  Not deleting.
Conflict because base_report_creator is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_report_creator/base_report_creator.py
Conflict: can't delete base_report_creator/i18n because it is not empty.  Not deleting.
Conflict because base_report_creator/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in base_report_creator/i18n/ar.po
Contents conflict in base_report_creator/i18n/base_report_creator.pot
Contents conflict in base_report_creator/i18n/bg.po
Contents conflict in base_report_creator/i18n/bs.po
Contents conflict in base_report_creator/i18n/ca.po
Contents conflict in base_report_creator/i18n/cs.po
Contents conflict in base_report_creator/i18n/de.po
Contents conflict in base_report_creator/i18n/el.po
Contents conflict in base_report_creator/i18n/es.po
Contents conflict in base_report_creator/i18n/es_AR.po
Contents conflict in base_report_creator/i18n/es_EC.po
Contents conflict in base_report_creator/i18n/es_PY.po
Contents conflict in base_report_creator/i18n/et.po
Contents conflict in base_report_creator/i18n/fi.po
Contents conflict in base_report_creator/i18n/fr.po
Contents conflict in base_report_creator/i18n/gl.po
Contents conflict in base_report_creator/i18n/hr.po
Contents conflict in base_report_creator/i18n/hu.po
Contents conflict in base_report_creator/i18n/id.po
Contents conflict in base_report_creator/i18n/it.po
Contents conflict in base_report_creator/i18n/ko.po
Contents conflict in base_report_creator/i18n/lt.po
Contents conflict in base_report_creator/i18n/nb.po
Contents conflict in base_report_creator/i18n/nl.po
Contents conflict in base_report_creator/i18n/nl_BE.po
Contents conflict in base_report_creator/i18n/pl.po
Contents conflict in base_report_creator/i18n/pt.po
Contents conflict in base_report_creator/i18n/pt_BR.po
Contents conflict in base_report_creator/i18n/ro.po
Contents conflict in base_report_creator/i18n/ru.po
Contents conflict in base_report_creator/i18n/sk.po
Contents conflict in base_report_creator/i18n/sl.po
Contents conflict in base_report_creator/i18n/sq.po
Contents conflict in base_report_creator/i18n/sr.po
Contents conflict in base_report_creator/i18n/sr@latin.po
Contents conflict in base_report_creator/i18n/sv.po
Contents conflict in base_report_creator/i18n/tlh.po
Contents conflict in base_report_creator/i18n/tr.po
Contents conflict in base_report_creator/i18n/uk.po
Contents conflict in base_report_creator/i18n/vi.po
Contents conflict in base_report_creator/i18n/zh_CN.po
Contents conflict in base_report_creator/i18n/zh_TW.po
Text conflict in base_report_designer/i18n/ar.po
Text conflict in base_report_designer/i18n/bg.po
Text conflict in base_report_designer/i18n/bs.po
Text conflict in base_report_designer/i18n/ca.po
Text conflict in base_report_designer/i18n/cs.po
Conflict adding file base_report_designer/i18n/da.po.  Moved existing file to base_report_designer/i18n/da.po.moved.
Text conflict in base_report_designer/i18n/de.po
Text conflict in base_report_designer/i18n/el.po
Conflict adding file base_report_designer/i18n/en_GB.po.  Moved existing file to base_report_designer/i18n/en_GB.po.moved.
Text conflict in base_report_designer/i18n/es.po
Text conflict in base_report_designer/i18n/es_AR.po
Conflict adding file base_report_designer/i18n/es_CR.po.  Moved existing file to base_report_designer/i18n/es_CR.po.moved.
Text conflict in base_report_designer/i18n/es_EC.po
Conflict adding file base_report_designer/i18n/es_PY.po.  Moved existing file to base_report_designer/i18n/es_PY.po.moved.
Text conflict in base_report_designer/i18n/et.po
Conflict adding file base_report_designer/i18n/fa.po.  Moved existing file to base_report_designer/i18n/fa.po.moved.
Text conflict in base_report_designer/i18n/fi.po
Text conflict in base_report_designer/i18n/fr.po
Text conflict in base_report_designer/i18n/gl.po
Text conflict in base_report_designer/i18n/hr.po
Text conflict in base_report_designer/i18n/hu.po
Text conflict in base_report_designer/i18n/id.po
Text conflict in base_report_designer/i18n/it.po
Conflict adding file base_report_designer/i18n/ja.po.  Moved existing file to base_report_designer/i18n/ja.po.moved.
Text conflict in base_report_designer/i18n/ko.po
Text conflict in base_report_designer/i18n/lt.po
Conflict adding file base_report_designer/i18n/mk.po.  Moved existing file to base_report_designer/i18n/mk.po.moved.
Text conflict in base_report_designer/i18n/mn.po
Conflict adding file base_report_designer/i18n/nb.po.  Moved existing file to base_report_designer/i18n/nb.po.moved.
Text conflict in base_report_designer/i18n/nl.po
Text conflict in base_report_designer/i18n/nl_BE.po
Text conflict in base_report_designer/i18n/pl.po
Text conflict in base_report_designer/i18n/pt.po
Text conflict in base_report_designer/i18n/pt_BR.po
Text conflict in base_report_designer/i18n/ro.po
Text conflict in base_report_designer/i18n/ru.po
Text conflict in base_report_designer/i18n/sk.po
Text conflict in base_report_designer/i18n/sl.po
Text conflict in base_report_designer/i18n/sq.po
Text conflict in base_report_designer/i18n/sr.po
Text conflict in base_report_designer/i18n/sr@latin.po
Text conflict in base_report_designer/i18n/sv.po
Text conflict in base_report_designer/i18n/tlh.po
Text conflict in base_report_designer/i18n/tr.po
Text conflict in base_report_designer/i18n/uk.po
Text conflict in base_report_designer/i18n/vi.po
Text conflict in base_report_designer/i18n/zh_CN.po
Text conflict in base_report_designer/i18n/zh_TW.po
Contents conflict in base_report_designer/plugin/openerp_report_designer.zip
Text conflict in base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
Text conflict in base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py
Text conflict in base_setup/__init__.py
Contents conflict in base_setup/base_setup_data.xml
Text conflict in base_setup/i18n/ar.po
Text conflict in base_setup/i18n/base_setup.pot
Text conflict in base_setup/i18n/bg.po
Text conflict in base_setup/i18n/bs.po
Text conflict in base_setup/i18n/ca.po
Text conflict in base_setup/i18n/cs.po
Conflict adding file base_setup/i18n/da.po.  Moved existing file to base_setup/i18n/da.po.moved.
Text conflict in base_setup/i18n/de.po
Text conflict in base_setup/i18n/el.po
Conflict adding file base_setup/i18n/en_GB.po.  Moved existing file to base_setup/i18n/en_GB.po.moved.
Text conflict in base_setup/i18n/es.po
Text conflict in base_setup/i18n/es_AR.po
Text conflict in base_setup/i18n/es_CL.po
Conflict adding file base_setup/i18n/es_CR.po.  Moved existing file to base_setup/i18n/es_CR.po.moved.
Text conflict in base_setup/i18n/es_EC.po
Conflict adding file base_setup/i18n/es_MX.po.  Moved existing file to base_setup/i18n/es_MX.po.moved.
Conflict adding file base_setup/i18n/es_PY.po.  Moved existing file to base_setup/i18n/es_PY.po.moved.
Text conflict in base_setup/i18n/et.po
Text conflict in base_setup/i18n/fa.po
Text conflict in base_setup/i18n/fi.po
Text conflict in base_setup/i18n/fr.po
Text conflict in base_setup/i18n/gl.po
Conflict adding file base_setup/i18n/gu.po.  Moved existing file to base_setup/i18n/gu.po.moved.
Text conflict in base_setup/i18n/hr.po
Text conflict in base_setup/i18n/hu.po
Text conflict in base_setup/i18n/id.po
Text conflict in base_setup/i18n/it.po
Conflict adding file base_setup/i18n/ja.po.  Moved existing file to base_setup/i18n/ja.po.moved.
Text conflict in base_setup/i18n/ko.po
Text conflict in base_setup/i18n/lt.po
Text conflict in base_setup/i18n/lv.po
Conflict adding file base_setup/i18n/mk.po.  Moved existing file to base_setup/i18n/mk.po.moved.
Text conflict in base_setup/i18n/mn.po
Conflict adding file base_setup/i18n/nb.po.  Moved existing file to base_setup/i18n/nb.po.moved.
Text conflict in base_setup/i18n/nl.po
Text conflict in base_setup/i18n/nl_BE.po
Text conflict in base_setup/i18n/pl.po
Text conflict in base_setup/i18n/pt.po
Text conflict in base_setup/i18n/pt_BR.po
Text conflict in base_setup/i18n/ro.po
Text conflict in base_setup/i18n/ru.po
Text conflict in base_setup/i18n/sk.po
Text conflict in base_setup/i18n/sl.po
Text conflict in base_setup/i18n/sq.po
Text conflict in base_setup/i18n/sr.po
Text conflict in base_setup/i18n/sr@latin.po
Text conflict in base_setup/i18n/sv.po
Text conflict in base_setup/i18n/th.po
Text conflict in base_setup/i18n/tlh.po
Text conflict in base_setup/i18n/tr.po
Text conflict in base_setup/i18n/uk.po
Text conflict in base_setup/i18n/vi.po
Text conflict in base_setup/i18n/zh_CN.po
Text conflict in base_setup/i18n/zh_TW.po
Conflict adding file base_synchro/i18n/ar.po.  Moved existing file to base_synchro/i18n/ar.po.moved.
Conflict adding file base_synchro/i18n/bg.po.  Moved existing file to base_synchro/i18n/bg.po.moved.
Conflict adding file base_synchro/i18n/ca.po.  Moved existing file to base_synchro/i18n/ca.po.moved.
Conflict adding file base_synchro/i18n/da.po.  Moved existing file to base_synchro/i18n/da.po.moved.
Text conflict in base_synchro/i18n/de.po
Text conflict in base_synchro/i18n/el.po
Text conflict in base_synchro/i18n/es.po
Conflict adding file base_synchro/i18n/es_CR.po.  Moved existing file to base_synchro/i18n/es_CR.po.moved.
Conflict adding file base_synchro/i18n/es_PY.po.  Moved existing file to base_synchro/i18n/es_PY.po.moved.
Conflict adding file base_synchro/i18n/et.po.  Moved existing file to base_synchro/i18n/et.po.moved.
Conflict adding file base_synchro/i18n/fa.po.  Moved existing file to base_synchro/i18n/fa.po.moved.
Conflict adding file base_synchro/i18n/fi.po.  Moved existing file to base_synchro/i18n/fi.po.moved.
Text conflict in base_synchro/i18n/fr.po
Conflict adding file base_synchro/i18n/gl.po.  Moved existing file to base_synchro/i18n/gl.po.moved.
Conflict adding file base_synchro/i18n/hi.po.  Moved existing file to base_synchro/i18n/hi.po.moved.
Conflict adding file base_synchro/i18n/hr.po.  Moved existing file to base_synchro/i18n/hr.po.moved.
Text conflict in base_synchro/i18n/hu.po
Conflict adding file base_synchro/i18n/id.po.  Moved existing file to base_synchro/i18n/id.po.moved.
Text conflict in base_synchro/i18n/it.po
Conflict adding file base_synchro/i18n/ja.po.  Moved existing file to base_synchro/i18n/ja.po.moved.
Conflict adding file base_synchro/i18n/mn.po.  Moved existing file to base_synchro/i18n/mn.po.moved.
Conflict adding file base_synchro/i18n/nb.po.  Moved existing file to base_synchro/i18n/nb.po.moved.
Text conflict in base_synchro/i18n/nl.po
Conflict adding file base_synchro/i18n/pl.po.  Moved existing file to base_synchro/i18n/pl.po.moved.
Text conflict in base_synchro/i18n/pt.po
Text conflict in base_synchro/i18n/pt_BR.po
Text conflict in base_synchro/i18n/ro.po
Text conflict in base_synchro/i18n/ru.po
Conflict adding file base_synchro/i18n/sq.po.  Moved existing file to base_synchro/i18n/sq.po.moved.
Text conflict in base_synchro/i18n/sr.po
Text conflict in base_synchro/i18n/sr@latin.po
Text conflict in base_synchro/i18n/sv.po
Conflict adding file base_synchro/i18n/tr.po.  Moved existing file to base_synchro/i18n/tr.po.moved.
Conflict adding file base_synchro/i18n/vi.po.  Moved existing file to base_synchro/i18n/vi.po.moved.
Text conflict in base_synchro/i18n/zh_CN.po
Conflict adding file base_synchro/i18n/zh_TW.po.  Moved existing file to base_synchro/i18n/zh_TW.po.moved.
Conflict adding file base_tools/i18n/ar.po.  Moved existing file to base_tools/i18n/ar.po.moved.
Conflict adding file base_tools/i18n/bg.po.  Moved existing file to base_tools/i18n/bg.po.moved.
Conflict adding file base_tools/i18n/ca.po.  Moved existing file to base_tools/i18n/ca.po.moved.
Conflict adding file base_tools/i18n/cs.po.  Moved existing file to base_tools/i18n/cs.po.moved.
Conflict adding file base_tools/i18n/da.po.  Moved existing file to base_tools/i18n/da.po.moved.
Conflict adding file base_tools/i18n/de.po.  Moved existing file to base_tools/i18n/de.po.moved.
Conflict adding file base_tools/i18n/en_GB.po.  Moved existing file to base_tools/i18n/en_GB.po.moved.
Conflict adding file base_tools/i18n/es.po.  Moved existing file to base_tools/i18n/es.po.moved.
Conflict adding file base_tools/i18n/es_AR.po.  Moved existing file to base_tools/i18n/es_AR.po.moved.
Conflict adding file base_tools/i18n/es_CL.po.  Moved existing file to base_tools/i18n/es_CL.po.moved.
Conflict adding file base_tools/i18n/es_CR.po.  Moved existing file to base_tools/i18n/es_CR.po.moved.
Conflict adding file base_tools/i18n/es_EC.po.  Moved existing file to base_tools/i18n/es_EC.po.moved.
Conflict adding file base_tools/i18n/es_PY.po.  Moved existing file to base_tools/i18n/es_PY.po.moved.
Conflict adding file base_tools/i18n/fa.po.  Moved existing file to base_tools/i18n/fa.po.moved.
Conflict adding file base_tools/i18n/fi.po.  Moved existing file to base_tools/i18n/fi.po.moved.
Conflict adding file base_tools/i18n/fr.po.  Moved existing file to base_tools/i18n/fr.po.moved.
Conflict adding file base_tools/i18n/gl.po.  Moved existing file to base_tools/i18n/gl.po.moved.
Conflict adding file base_tools/i18n/gu.po.  Moved existing file to base_tools/i18n/gu.po.moved.
Conflict adding file base_tools/i18n/hi.po.  Moved existing file to base_tools/i18n/hi.po.moved.
Conflict adding file base_tools/i18n/hr.po.  Moved existing file to base_tools/i18n/hr.po.moved.
Conflict adding file base_tools/i18n/hu.po.  Moved existing file to base_tools/i18n/hu.po.moved.
Conflict adding file base_tools/i18n/id.po.  Moved existing file to base_tools/i18n/id.po.moved.
Conflict adding file base_tools/i18n/it.po.  Moved existing file to base_tools/i18n/it.po.moved.
Conflict adding file base_tools/i18n/ja.po.  Moved existing file to base_tools/i18n/ja.po.moved.
Conflict adding file base_tools/i18n/lt.po.  Moved existing file to base_tools/i18n/lt.po.moved.
Conflict adding file base_tools/i18n/mn.po.  Moved existing file to base_tools/i18n/mn.po.moved.
Conflict adding file base_tools/i18n/nb.po.  Moved existing file to base_tools/i18n/nb.po.moved.
Conflict adding file base_tools/i18n/nl.po.  Moved existing file to base_tools/i18n/nl.po.moved.
Conflict adding file base_tools/i18n/nl_BE.po.  Moved existing file to base_tools/i18n/nl_BE.po.moved.
Conflict adding file base_tools/i18n/oc.po.  Moved existing file to base_tools/i18n/oc.po.moved.
Conflict adding file base_tools/i18n/pt.po.  Moved existing file to base_tools/i18n/pt.po.moved.
Conflict adding file base_tools/i18n/pt_BR.po.  Moved existing file to base_tools/i18n/pt_BR.po.moved.
Conflict adding file base_tools/i18n/ro.po.  Moved existing file to base_tools/i18n/ro.po.moved.
Conflict adding file base_tools/i18n/ru.po.  Moved existing file to base_tools/i18n/ru.po.moved.
Conflict adding file base_tools/i18n/sk.po.  Moved existing file to base_tools/i18n/sk.po.moved.
Conflict adding file base_tools/i18n/sl.po.  Moved existing file to base_tools/i18n/sl.po.moved.
Conflict adding file base_tools/i18n/sq.po.  Moved existing file to base_tools/i18n/sq.po.moved.
Conflict adding file base_tools/i18n/sr@latin.po.  Moved existing file to base_tools/i18n/sr@latin.po.moved.
Conflict adding file base_tools/i18n/sv.po.  Moved existing file to base_tools/i18n/sv.po.moved.
Conflict adding file base_tools/i18n/tr.po.  Moved existing file to base_tools/i18n/tr.po.moved.
Conflict adding file base_tools/i18n/vi.po.  Moved existing file to base_tools/i18n/vi.po.moved.
Conflict adding file base_tools/i18n/zh_CN.po.  Moved existing file to base_tools/i18n/zh_CN.po.moved.
Conflict adding file base_tools/i18n/zh_TW.po.  Moved existing file to base_tools/i18n/zh_TW.po.moved.
Text conflict in base_vat/base_vat.py
Text conflict in base_vat/i18n/ar.po
Text conflict in base_vat/i18n/bg.po
Text conflict in base_vat/i18n/bs.po
Text conflict in base_vat/i18n/ca.po
Text conflict in base_vat/i18n/cs.po
Text conflict in base_vat/i18n/da.po
Text conflict in base_vat/i18n/de.po
Text conflict in base_vat/i18n/el.po
Text conflict in base_vat/i18n/en_AU.po
Conflict adding file base_vat/i18n/en_GB.po.  Moved existing file to base_vat/i18n/en_GB.po.moved.
Text conflict in base_vat/i18n/es.po
Text conflict in base_vat/i18n/es_AR.po
Conflict adding file base_vat/i18n/es_CL.po.  Moved existing file to base_vat/i18n/es_CL.po.moved.
Conflict adding file base_vat/i18n/es_CR.po.  Moved existing file to base_vat/i18n/es_CR.po.moved.
Text conflict in base_vat/i18n/es_EC.po
Conflict adding file base_vat/i18n/es_MX.po.  Moved existing file to base_vat/i18n/es_MX.po.moved.
Conflict adding file base_vat/i18n/es_PY.po.  Moved existing file to base_vat/i18n/es_PY.po.moved.
Text conflict in base_vat/i18n/et.po
Text conflict in base_vat/i18n/eu.po
Conflict adding file base_vat/i18n/fa.po.  Moved existing file to base_vat/i18n/fa.po.moved.
Text conflict in base_vat/i18n/fi.po
Text conflict in base_vat/i18n/fr.po
Text conflict in base_vat/i18n/gl.po
Conflict adding file base_vat/i18n/gu.po.  Moved existing file to base_vat/i18n/gu.po.moved.
Text conflict in base_vat/i18n/hr.po
Text conflict in base_vat/i18n/hu.po
Text conflict in base_vat/i18n/id.po
Text conflict in base_vat/i18n/it.po
Conflict adding file base_vat/i18n/ja.po.  Moved existing file to base_vat/i18n/ja.po.moved.
Text conflict in base_vat/i18n/ko.po
Text conflict in base_vat/i18n/lt.po
Conflict adding file base_vat/i18n/lv.po.  Moved existing file to base_vat/i18n/lv.po.moved.
Conflict adding file base_vat/i18n/mk.po.  Moved existing file to base_vat/i18n/mk.po.moved.
Text conflict in base_vat/i18n/mn.po
Text conflict in base_vat/i18n/nb.po
Text conflict in base_vat/i18n/nl.po
Text conflict in base_vat/i18n/nl_BE.po
Text conflict in base_vat/i18n/oc.po
Text conflict in base_vat/i18n/pl.po
Text conflict in base_vat/i18n/pt.po
Text conflict in base_vat/i18n/pt_BR.po
Text conflict in base_vat/i18n/ro.po
Text conflict in base_vat/i18n/ru.po
Text conflict in base_vat/i18n/sk.po
Text conflict in base_vat/i18n/sl.po
Text conflict in base_vat/i18n/sq.po
Text conflict in base_vat/i18n/sr.po
Text conflict in base_vat/i18n/sr@latin.po
Text conflict in base_vat/i18n/sv.po
Text conflict in base_vat/i18n/th.po
Text conflict in base_vat/i18n/tlh.po
Text conflict in base_vat/i18n/tr.po
Text conflict in base_vat/i18n/uk.po
Text conflict in base_vat/i18n/vi.po
Text conflict in base_vat/i18n/zh_CN.po
Text conflict in base_vat/i18n/zh_TW.po
Text conflict in board/i18n/ar.po
Text conflict in board/i18n/bg.po
Text conflict in board/i18n/br.po
Text conflict in board/i18n/bs.po
Text conflict in board/i18n/ca.po
Text conflict in board/i18n/cs.po
Conflict adding file board/i18n/da.po.  Moved existing file to board/i18n/da.po.moved.
Text conflict in board/i18n/de.po
Text conflict in board/i18n/el.po
Conflict adding file board/i18n/en_GB.po.  Moved existing file to board/i18n/en_GB.po.moved.
Text conflict in board/i18n/es.po
Text conflict in board/i18n/es_AR.po
Conflict adding file board/i18n/es_CL.po.  Moved existing file to board/i18n/es_CL.po.moved.
Conflict adding file board/i18n/es_CR.po.  Moved existing file to board/i18n/es_CR.po.moved.
Text conflict in board/i18n/es_EC.po
Conflict adding file board/i18n/es_PY.po.  Moved existing file to board/i18n/es_PY.po.moved.
Text conflict in board/i18n/et.po
Conflict adding file board/i18n/fa.po.  Moved existing file to board/i18n/fa.po.moved.
Text conflict in board/i18n/fi.po
Text conflict in board/i18n/fr.po
Text conflict in board/i18n/gl.po
Conflict adding file board/i18n/gu.po.  Moved existing file to board/i18n/gu.po.moved.
Text conflict in board/i18n/hr.po
Text conflict in board/i18n/hu.po
Text conflict in board/i18n/id.po
Text conflict in board/i18n/it.po
Conflict adding file board/i18n/ja.po.  Moved existing file to board/i18n/ja.po.moved.
Text conflict in board/i18n/ko.po
Conflict adding file board/i18n/ln.po.  Moved existing file to board/i18n/ln.po.moved.
Text conflict in board/i18n/lt.po
Text conflict in board/i18n/lv.po
Conflict adding file board/i18n/mk.po.  Moved existing file to board/i18n/mk.po.moved.
Text conflict in board/i18n/mn.po
Conflict adding file board/i18n/nb.po.  Moved existing file to board/i18n/nb.po.moved.
Text conflict in board/i18n/nl.po
Text conflict in board/i18n/nl_BE.po
Text conflict in board/i18n/pl.po
Text conflict in board/i18n/pt.po
Text conflict in board/i18n/pt_BR.po
Text conflict in board/i18n/ro.po
Text conflict in board/i18n/ru.po
Text conflict in board/i18n/sk.po
Text conflict in board/i18n/sl.po
Text conflict in board/i18n/sq.po
Text conflict in board/i18n/sr.po
Text conflict in board/i18n/sr@latin.po
Text conflict in board/i18n/sv.po
Text conflict in board/i18n/th.po
Text conflict in board/i18n/tlh.po
Text conflict in board/i18n/tr.po
Text conflict in board/i18n/uk.po
Text conflict in board/i18n/vi.po
Text conflict in board/i18n/zh_CN.po
Text conflict in board/i18n/zh_TW.po
Conflict adding file caldav/i18n/ar.po.  Moved existing file to caldav/i18n/ar.po.moved.
Conflict adding file caldav/i18n/bg.po.  Moved existing file to caldav/i18n/bg.po.moved.
Conflict adding file caldav/i18n/bn.po.  Moved existing file to caldav/i18n/bn.po.moved.
Conflict adding file caldav/i18n/ca.po.  Moved existing file to caldav/i18n/ca.po.moved.
Text conflict in caldav/i18n/caldav.pot
Conflict adding file caldav/i18n/da.po.  Moved existing file to caldav/i18n/da.po.moved.
Text conflict in caldav/i18n/de.po
Text conflict in caldav/i18n/el.po
Text conflict in caldav/i18n/es.po
Conflict adding file caldav/i18n/es_CR.po.  Moved existing file to caldav/i18n/es_CR.po.moved.
Conflict adding file caldav/i18n/es_EC.po.  Moved existing file to caldav/i18n/es_EC.po.moved.
Conflict adding file caldav/i18n/es_PY.po.  Moved existing file to caldav/i18n/es_PY.po.moved.
Conflict adding file caldav/i18n/fa.po.  Moved existing file to caldav/i18n/fa.po.moved.
Conflict adding file caldav/i18n/fi.po.  Moved existing file to caldav/i18n/fi.po.moved.
Text conflict in caldav/i18n/fr.po
Conflict adding file caldav/i18n/gl.po.  Moved existing file to caldav/i18n/gl.po.moved.
Conflict adding file caldav/i18n/hr.po.  Moved existing file to caldav/i18n/hr.po.moved.
Text conflict in caldav/i18n/hu.po
Text conflict in caldav/i18n/it.po
Conflict adding file caldav/i18n/ja.po.  Moved existing file to caldav/i18n/ja.po.moved.
Text conflict in caldav/i18n/lv.po
Conflict adding file caldav/i18n/mn.po.  Moved existing file to caldav/i18n/mn.po.moved.
Text conflict in caldav/i18n/nl.po
Text conflict in caldav/i18n/pl.po
Text conflict in caldav/i18n/pt.po
Text conflict in caldav/i18n/pt_BR.po
Conflict adding file caldav/i18n/ro.po.  Moved existing file to caldav/i18n/ro.po.moved.
Text conflict in caldav/i18n/ru.po
Conflict adding file caldav/i18n/sq.po.  Moved existing file to caldav/i18n/sq.po.moved.
Text conflict in caldav/i18n/sr.po
Text conflict in caldav/i18n/sr@latin.po
Text conflict in caldav/i18n/sv.po
Conflict adding file caldav/i18n/tr.po.  Moved existing file to caldav/i18n/tr.po.moved.
Conflict adding file caldav/i18n/zh_CN.po.  Moved existing file to caldav/i18n/zh_CN.po.moved.
Conflict adding file caldav/i18n/zh_TW.po.  Moved existing file to caldav/i18n/zh_TW.po.moved.
Conflict adding file claim_from_delivery/i18n/ar.po.  Moved existing file to claim_from_delivery/i18n/ar.po.moved.
Conflict adding file claim_from_delivery/i18n/bg.po.  Moved existing file to claim_from_delivery/i18n/bg.po.moved.
Conflict adding file claim_from_delivery/i18n/ca.po.  Moved existing file to claim_from_delivery/i18n/ca.po.moved.
Conflict adding file claim_from_delivery/i18n/cs.po.  Moved existing file to claim_from_delivery/i18n/cs.po.moved.
Conflict adding file claim_from_delivery/i18n/da.po.  Moved existing file to claim_from_delivery/i18n/da.po.moved.
Text conflict in claim_from_delivery/i18n/de.po
Conflict adding file claim_from_delivery/i18n/en_GB.po.  Moved existing file to claim_from_delivery/i18n/en_GB.po.moved.
Text conflict in claim_from_delivery/i18n/es.po
Conflict adding file claim_from_delivery/i18n/es_AR.po.  Moved existing file to claim_from_delivery/i18n/es_AR.po.moved.
Conflict adding file claim_from_delivery/i18n/es_CL.po.  Moved existing file to claim_from_delivery/i18n/es_CL.po.moved.
Conflict adding file claim_from_delivery/i18n/es_CR.po.  Moved existing file to claim_from_delivery/i18n/es_CR.po.moved.
Text conflict in claim_from_delivery/i18n/es_EC.po
Conflict adding file claim_from_delivery/i18n/es_PY.po.  Moved existing file to claim_from_delivery/i18n/es_PY.po.moved.
Conflict adding file claim_from_delivery/i18n/fa.po.  Moved existing file to claim_from_delivery/i18n/fa.po.moved.
Conflict adding file claim_from_delivery/i18n/fi.po.  Moved existing file to claim_from_delivery/i18n/fi.po.moved.
Text conflict in claim_from_delivery/i18n/fr.po
Conflict adding file claim_from_delivery/i18n/gl.po.  Moved existing file to claim_from_delivery/i18n/gl.po.moved.
Conflict adding file claim_from_delivery/i18n/gu.po.  Moved existing file to claim_from_delivery/i18n/gu.po.moved.
Conflict adding file claim_from_delivery/i18n/hr.po.  Moved existing file to claim_from_delivery/i18n/hr.po.moved.
Text conflict in claim_from_delivery/i18n/hu.po
Conflict adding file claim_from_delivery/i18n/id.po.  Moved existing file to claim_from_delivery/i18n/id.po.moved.
Text conflict in claim_from_delivery/i18n/it.po
Conflict adding file claim_from_delivery/i18n/ja.po.  Moved existing file to claim_from_delivery/i18n/ja.po.moved.
Conflict adding file claim_from_delivery/i18n/lo.po.  Moved existing file to claim_from_delivery/i18n/lo.po.moved.
Conflict adding file claim_from_delivery/i18n/lt.po.  Moved existing file to claim_from_delivery/i18n/lt.po.moved.
Conflict adding file claim_from_delivery/i18n/mk.po.  Moved existing file to claim_from_delivery/i18n/mk.po.moved.
Text conflict in claim_from_delivery/i18n/mn.po
Conflict adding file claim_from_delivery/i18n/nb.po.  Moved existing file to claim_from_delivery/i18n/nb.po.moved.
Text conflict in claim_from_delivery/i18n/nl.po
Conflict adding file claim_from_delivery/i18n/nl_BE.po.  Moved existing file to claim_from_delivery/i18n/nl_BE.po.moved.
Conflict adding file claim_from_delivery/i18n/oc.po.  Moved existing file to claim_from_delivery/i18n/oc.po.moved.
Conflict adding file claim_from_delivery/i18n/pl.po.  Moved existing file to claim_from_delivery/i18n/pl.po.moved.
Text conflict in claim_from_delivery/i18n/pt.po
Text conflict in claim_from_delivery/i18n/pt_BR.po
Conflict adding file claim_from_delivery/i18n/ro.po.  Moved existing file to claim_from_delivery/i18n/ro.po.moved.
Text conflict in claim_from_delivery/i18n/ru.po
Text conflict in claim_from_delivery/i18n/sl.po
Conflict adding file claim_from_delivery/i18n/sq.po.  Moved existing file to claim_from_delivery/i18n/sq.po.moved.
Text conflict in claim_from_delivery/i18n/sr.po
Text conflict in claim_from_delivery/i18n/sr@latin.po
Text conflict in claim_from_delivery/i18n/sv.po
Text conflict in claim_from_delivery/i18n/ta.po
Text conflict in claim_from_delivery/i18n/tr.po
Conflict adding file claim_from_delivery/i18n/zh_CN.po.  Moved existing file to claim_from_delivery/i18n/zh_CN.po.moved.
Conflict adding file claim_from_delivery/i18n/zh_TW.po.  Moved existing file to claim_from_delivery/i18n/zh_TW.po.moved.
Text conflict in crm/__openerp__.py
Text conflict in crm/board_crm_view.xml
Text conflict in crm/crm.py
Text conflict in crm/crm_action_rule.py
Text conflict in crm/crm_lead.py
Text conflict in crm/crm_lead_view.xml
Contents conflict in crm/crm_opportunity_view.xml
Text conflict in crm/i18n/ar.po
Text conflict in crm/i18n/bg.po
Text conflict in crm/i18n/bs.po
Text conflict in crm/i18n/ca.po
Text conflict in crm/i18n/crm.pot
Text conflict in crm/i18n/cs.po
Conflict adding file crm/i18n/da.po.  Moved existing file to crm/i18n/da.po.moved.
Text conflict in crm/i18n/de.po
Text conflict in crm/i18n/el.po
Text conflict in crm/i18n/es.po
Text conflict in crm/i18n/es_AR.po
Conflict adding file crm/i18n/es_CR.po.  Moved existing file to crm/i18n/es_CR.po.moved.
Text conflict in crm/i18n/es_EC.po
Conflict adding file crm/i18n/es_MX.po.  Moved existing file to crm/i18n/es_MX.po.moved.moved.
Conflict adding file crm/i18n/es_MX.po.moved.  Moved existing file to crm/i18n/es_MX.po.moved.moved.
Conflict adding file crm/i18n/es_PY.po.  Moved existing file to crm/i18n/es_PY.po.moved.
Text conflict in crm/i18n/et.po
Text conflict in crm/i18n/fi.po
Text conflict in crm/i18n/fr.po
Text conflict in crm/i18n/gl.po
Conflict adding file crm/i18n/gu.po.  Moved existing file to crm/i18n/gu.po.moved.
Text conflict in crm/i18n/hr.po
Text conflict in crm/i18n/hu.po
Text conflict in crm/i18n/id.po
Text conflict in crm/i18n/it.po
Text conflict in crm/i18n/ja.po
Text conflict in crm/i18n/ko.po
Text conflict in crm/i18n/lo.po
Text conflict in crm/i18n/lt.po
Text conflict in crm/i18n/lv.po
Conflict adding file crm/i18n/mk.po.  Moved existing file to crm/i18n/mk.po.moved.
Text conflict in crm/i18n/mn.po
Conflict adding file crm/i18n/nb.po.  Moved existing file to crm/i18n/nb.po.moved.
Text conflict in crm/i18n/nl.po
Text conflict in crm/i18n/nl_BE.po
Text conflict in crm/i18n/pl.po
Text conflict in crm/i18n/pt.po
Text conflict in crm/i18n/pt_BR.po
Text conflict in crm/i18n/ro.po
Text conflict in crm/i18n/ru.po
Text conflict in crm/i18n/sk.po
Text conflict in crm/i18n/sl.po
Text conflict in crm/i18n/sq.po
Text conflict in crm/i18n/sr.po
Text conflict in crm/i18n/sr@latin.po
Text conflict in crm/i18n/sv.po
Text conflict in crm/i18n/th.po
Text conflict in crm/i18n/tlh.po
Text conflict in crm/i18n/tr.po
Text conflict in crm/i18n/uk.po
Text conflict in crm/i18n/vi.po
Text conflict in crm/i18n/zh_CN.po
Text conflict in crm/i18n/zh_TW.po
Text conflict in crm/report/crm_lead_report.py
Contents conflict in crm/test/test_crm_meeting.yml
Contents conflict in crm/test/test_crm_opportunity.yml
Contents conflict in crm/test/test_crm_phonecall.yml
Contents conflict in crm/wizard/crm_send_email.py
Conflict adding file crm_caldav/i18n/ar.po.  Moved existing file to crm_caldav/i18n/ar.po.moved.
Conflict adding file crm_caldav/i18n/bg.po.  Moved existing file to crm_caldav/i18n/bg.po.moved.
Conflict adding file crm_caldav/i18n/ca.po.  Moved existing file to crm_caldav/i18n/ca.po.moved.
Conflict adding file crm_caldav/i18n/cs.po.  Moved existing file to crm_caldav/i18n/cs.po.moved.
Text conflict in crm_caldav/i18n/da.po
Text conflict in crm_caldav/i18n/de.po
Text conflict in crm_caldav/i18n/el.po
Conflict adding file crm_caldav/i18n/en_GB.po.  Moved existing file to crm_caldav/i18n/en_GB.po.moved.
Text conflict in crm_caldav/i18n/es.po
Conflict adding file crm_caldav/i18n/es_CR.po.  Moved existing file to crm_caldav/i18n/es_CR.po.moved.
Text conflict in crm_caldav/i18n/es_EC.po
Conflict adding file crm_caldav/i18n/es_PY.po.  Moved existing file to crm_caldav/i18n/es_PY.po.moved.
Text conflict in crm_caldav/i18n/fi.po
Text conflict in crm_caldav/i18n/fr.po
Conflict adding file crm_caldav/i18n/gl.po.  Moved existing file to crm_caldav/i18n/gl.po.moved.
Conflict adding file crm_caldav/i18n/gu.po.  Moved existing file to crm_caldav/i18n/gu.po.moved.
Text conflict in crm_caldav/i18n/hi.po
Conflict adding file crm_caldav/i18n/hr.po.  Moved existing file to crm_caldav/i18n/hr.po.moved.
Text conflict in crm_caldav/i18n/hu.po
Conflict adding file crm_caldav/i18n/id.po.  Moved existing file to crm_caldav/i18n/id.po.moved.
Text conflict in crm_caldav/i18n/it.po
Conflict adding file crm_caldav/i18n/ja.po.  Moved existing file to crm_caldav/i18n/ja.po.moved.
Conflict adding file crm_caldav/i18n/ko.po.  Moved existing file to crm_caldav/i18n/ko.po.moved.
Text conflict in crm_caldav/i18n/lo.po
Conflict adding file crm_caldav/i18n/lt.po.  Moved existing file to crm_caldav/i18n/lt.po.moved.
Text conflict in crm_caldav/i18n/mn.po
Conflict adding file crm_caldav/i18n/nb.po.  Moved existing file to crm_caldav/i18n/nb.po.moved.
Text conflict in crm_caldav/i18n/nl.po
Conflict adding file crm_caldav/i18n/nl_BE.po.  Moved existing file to crm_caldav/i18n/nl_BE.po.moved.
Conflict adding file crm_caldav/i18n/oc.po.  Moved existing file to crm_caldav/i18n/oc.po.moved.
Conflict adding file crm_caldav/i18n/pl.po.  Moved existing file to crm_caldav/i18n/pl.po.moved.
Text conflict in crm_caldav/i18n/pt.po
Text conflict in crm_caldav/i18n/pt_BR.po
Text conflict in crm_caldav/i18n/ro.po
Text conflict in crm_caldav/i18n/ru.po
Conflict adding file crm_caldav/i18n/sk.po.  Moved existing file to crm_caldav/i18n/sk.po.moved.
Text conflict in crm_caldav/i18n/sl.po
Conflict adding file crm_caldav/i18n/sq.po.  Moved existing file to crm_caldav/i18n/sq.po.moved.
Text conflict in crm_caldav/i18n/sr.po
Text conflict in crm_caldav/i18n/sr@latin.po
Text conflict in crm_caldav/i18n/sv.po
Text conflict in crm_caldav/i18n/ta.po
Conflict adding file crm_caldav/i18n/tr.po.  Moved existing file to crm_caldav/i18n/tr.po.moved.
Conflict adding file crm_caldav/i18n/zh_CN.po.  Moved existing file to crm_caldav/i18n/zh_CN.po.moved.
Conflict adding file crm_caldav/i18n/zh_TW.po.  Moved existing file to crm_caldav/i18n/zh_TW.po.moved.
Text conflict in crm_claim/crm_claim.py
Text conflict in crm_claim/crm_claim_view.xml
Conflict adding file crm_claim/i18n/ar.po.  Moved existing file to crm_claim/i18n/ar.po.moved.
Conflict adding file crm_claim/i18n/bg.po.  Moved existing file to crm_claim/i18n/bg.po.moved.
Conflict adding file crm_claim/i18n/ca.po.  Moved existing file to crm_claim/i18n/ca.po.moved.
Text conflict in crm_claim/i18n/crm_claim.pot
Conflict adding file crm_claim/i18n/cs.po.  Moved existing file to crm_claim/i18n/cs.po.moved.
Conflict adding file crm_claim/i18n/da.po.  Moved existing file to crm_claim/i18n/da.po.moved.
Text conflict in crm_claim/i18n/de.po
Text conflict in crm_claim/i18n/el.po
Text conflict in crm_claim/i18n/es.po
Conflict adding file crm_claim/i18n/es_CR.po.  Moved existing file to crm_claim/i18n/es_CR.po.moved.
Conflict adding file crm_claim/i18n/es_EC.po.  Moved existing file to crm_claim/i18n/es_EC.po.moved.
Conflict adding file crm_claim/i18n/es_PY.po.  Moved existing file to crm_claim/i18n/es_PY.po.moved.
Text conflict in crm_claim/i18n/fi.po
Text conflict in crm_claim/i18n/fr.po
Conflict adding file crm_claim/i18n/gl.po.  Moved existing file to crm_claim/i18n/gl.po.moved.
Conflict adding file crm_claim/i18n/gu.po.  Moved existing file to crm_claim/i18n/gu.po.moved.
Text conflict in crm_claim/i18n/hr.po
Text conflict in crm_claim/i18n/hu.po
Text conflict in crm_claim/i18n/it.po
Conflict adding file crm_claim/i18n/ja.po.  Moved existing file to crm_claim/i18n/ja.po.moved.
Conflict adding file crm_claim/i18n/ko.po.  Moved existing file to crm_claim/i18n/ko.po.moved.
Conflict adding file crm_claim/i18n/lt.po.  Moved existing file to crm_claim/i18n/lt.po.moved.
Conflict adding file crm_claim/i18n/mk.po.  Moved existing file to crm_claim/i18n/mk.po.moved.
Conflict adding file crm_claim/i18n/mn.po.  Moved existing file to crm_claim/i18n/mn.po.moved.
Conflict adding file crm_claim/i18n/nb.po.  Moved existing file to crm_claim/i18n/nb.po.moved.
Text conflict in crm_claim/i18n/nl.po
Text conflict in crm_claim/i18n/pl.po
Text conflict in crm_claim/i18n/pt.po
Text conflict in crm_claim/i18n/pt_BR.po
Conflict adding file crm_claim/i18n/ro.po.  Moved existing file to crm_claim/i18n/ro.po.moved.
Conflict adding file crm_claim/i18n/ru.po.  Moved existing file to crm_claim/i18n/ru.po.moved.
Conflict adding file crm_claim/i18n/sl.po.  Moved existing file to crm_claim/i18n/sl.po.moved.
Conflict adding file crm_claim/i18n/sq.po.  Moved existing file to crm_claim/i18n/sq.po.moved.
Text conflict in crm_claim/i18n/sr.po
Text conflict in crm_claim/i18n/sr@latin.po
Text conflict in crm_claim/i18n/sv.po
Conflict adding file crm_claim/i18n/tr.po.  Moved existing file to crm_claim/i18n/tr.po.moved.
Conflict adding file crm_claim/i18n/zh_CN.po.  Moved existing file to crm_claim/i18n/zh_CN.po.moved.
Conflict adding file crm_claim/i18n/zh_TW.po.  Moved existing file to crm_claim/i18n/zh_TW.po.moved.
Text conflict in crm_fundraising/crm_fundraising_view.xml
Conflict adding file crm_fundraising/i18n/ar.po.  Moved existing file to crm_fundraising/i18n/ar.po.moved.
Conflict adding file crm_fundraising/i18n/bg.po.  Moved existing file to crm_fundraising/i18n/bg.po.moved.
Conflict adding file crm_fundraising/i18n/ca.po.  Moved existing file to crm_fundraising/i18n/ca.po.moved.
Text conflict in crm_fundraising/i18n/crm_fundraising.pot
Conflict adding file crm_fundraising/i18n/da.po.  Moved existing file to crm_fundraising/i18n/da.po.moved.
Text conflict in crm_fundraising/i18n/de.po
Conflict adding file crm_fundraising/i18n/el.po.  Moved existing file to crm_fundraising/i18n/el.po.moved.
Text conflict in crm_fundraising/i18n/es.po
Conflict adding file crm_fundraising/i18n/es_CR.po.  Moved existing file to crm_fundraising/i18n/es_CR.po.moved.
Conflict adding file crm_fundraising/i18n/es_EC.po.  Moved existing file to crm_fundraising/i18n/es_EC.po.moved.
Conflict adding file crm_fundraising/i18n/es_PY.po.  Moved existing file to crm_fundraising/i18n/es_PY.po.moved.
Conflict adding file crm_fundraising/i18n/fi.po.  Moved existing file to crm_fundraising/i18n/fi.po.moved.
Text conflict in crm_fundraising/i18n/fr.po
Conflict adding file crm_fundraising/i18n/gl.po.  Moved existing file to crm_fundraising/i18n/gl.po.moved.
Conflict adding file crm_fundraising/i18n/hr.po.  Moved existing file to crm_fundraising/i18n/hr.po.moved.
Text conflict in crm_fundraising/i18n/hu.po
Text conflict in crm_fundraising/i18n/it.po
Conflict adding file crm_fundraising/i18n/ja.po.  Moved existing file to crm_fundraising/i18n/ja.po.moved.
Conflict adding file crm_fundraising/i18n/lt.po.  Moved existing file to crm_fundraising/i18n/lt.po.moved.
Text conflict in crm_fundraising/i18n/nl.po
Text conflict in crm_fundraising/i18n/pt.po
Conflict adding file crm_fundraising/i18n/pt_BR.po.  Moved existing file to crm_fundraising/i18n/pt_BR.po.moved.
Conflict adding file crm_fundraising/i18n/ro.po.  Moved existing file to crm_fundraising/i18n/ro.po.moved.
Conflict adding file crm_fundraising/i18n/ru.po.  Moved existing file to crm_fundraising/i18n/ru.po.moved.
Conflict adding file crm_fundraising/i18n/sq.po.  Moved existing file to crm_fundraising/i18n/sq.po.moved.
Text conflict in crm_fundraising/i18n/sr.po
Text conflict in crm_fundraising/i18n/sr@latin.po
Text conflict in crm_fundraising/i18n/sv.po
Conflict adding file crm_fundraising/i18n/tr.po.  Moved existing file to crm_fundraising/i18n/tr.po.moved.
Conflict adding file crm_fundraising/i18n/zh_CN.po.  Moved existing file to crm_fundraising/i18n/zh_CN.po.moved.
Text conflict in crm_helpdesk/crm_helpdesk.py
Text conflict in crm_helpdesk/crm_helpdesk_view.xml
Conflict adding file crm_helpdesk/i18n/ar.po.  Moved existing file to crm_helpdesk/i18n/ar.po.moved.
Conflict adding file crm_helpdesk/i18n/bg.po.  Moved existing file to crm_helpdesk/i18n/bg.po.moved.
Conflict adding file crm_helpdesk/i18n/ca.po.  Moved existing file to crm_helpdesk/i18n/ca.po.moved.
Text conflict in crm_helpdesk/i18n/crm_helpdesk.pot
Conflict adding file crm_helpdesk/i18n/cs.po.  Moved existing file to crm_helpdesk/i18n/cs.po.moved.
Conflict adding file crm_helpdesk/i18n/da.po.  Moved existing file to crm_helpdesk/i18n/da.po.moved.
Text conflict in crm_helpdesk/i18n/de.po
Text conflict in crm_helpdesk/i18n/el.po
Text conflict in crm_helpdesk/i18n/es.po
Conflict adding file crm_helpdesk/i18n/es_CR.po.  Moved existing file to crm_helpdesk/i18n/es_CR.po.moved.
Conflict adding file crm_helpdesk/i18n/es_PY.po.  Moved existing file to crm_helpdesk/i18n/es_PY.po.moved.
Conflict adding file crm_helpdesk/i18n/fi.po.  Moved existing file to crm_helpdesk/i18n/fi.po.moved.
Text conflict in crm_helpdesk/i18n/fr.po
Conflict adding file crm_helpdesk/i18n/gl.po.  Moved existing file to crm_helpdesk/i18n/gl.po.moved.
Conflict adding file crm_helpdesk/i18n/gu.po.  Moved existing file to crm_helpdesk/i18n/gu.po.moved.
Conflict adding file crm_helpdesk/i18n/hr.po.  Moved existing file to crm_helpdesk/i18n/hr.po.moved.
Text conflict in crm_helpdesk/i18n/hu.po
Text conflict in crm_helpdesk/i18n/it.po
Conflict adding file crm_helpdesk/i18n/ja.po.  Moved existing file to crm_helpdesk/i18n/ja.po.moved.
Conflict adding file crm_helpdesk/i18n/ko.po.  Moved existing file to crm_helpdesk/i18n/ko.po.moved.
Conflict adding file crm_helpdesk/i18n/lt.po.  Moved existing file to crm_helpdesk/i18n/lt.po.moved.
Conflict adding file crm_helpdesk/i18n/lv.po.  Moved existing file to crm_helpdesk/i18n/lv.po.moved.
Conflict adding file crm_helpdesk/i18n/mk.po.  Moved existing file to crm_helpdesk/i18n/mk.po.moved.
Conflict adding file crm_helpdesk/i18n/mn.po.  Moved existing file to crm_helpdesk/i18n/mn.po.moved.
Conflict adding file crm_helpdesk/i18n/nb.po.  Moved existing file to crm_helpdesk/i18n/nb.po.moved.
Text conflict in crm_helpdesk/i18n/nl.po
Text conflict in crm_helpdesk/i18n/pl.po
Text conflict in crm_helpdesk/i18n/pt.po
Text conflict in crm_helpdesk/i18n/pt_BR.po
Conflict adding file crm_helpdesk/i18n/ro.po.  Moved existing file to crm_helpdesk/i18n/ro.po.moved.
Text conflict in crm_helpdesk/i18n/ru.po
Conflict adding file crm_helpdesk/i18n/sl.po.  Moved existing file to crm_helpdesk/i18n/sl.po.moved.
Conflict adding file crm_helpdesk/i18n/sq.po.  Moved existing file to crm_helpdesk/i18n/sq.po.moved.
Text conflict in crm_helpdesk/i18n/sr.po
Text conflict in crm_helpdesk/i18n/sr@latin.po
Text conflict in crm_helpdesk/i18n/sv.po
Conflict adding file crm_helpdesk/i18n/tr.po.  Moved existing file to crm_helpdesk/i18n/tr.po.moved.
Conflict adding file crm_helpdesk/i18n/zh_CN.po.  Moved existing file to crm_helpdesk/i18n/zh_CN.po.moved.
Conflict adding file crm_helpdesk/i18n/zh_TW.po.  Moved existing file to crm_helpdesk/i18n/zh_TW.po.moved.
Conflict adding file crm_partner_assign/i18n/ar.po.  Moved existing file to crm_partner_assign/i18n/ar.po.moved.
Conflict adding file crm_partner_assign/i18n/bg.po.  Moved existing file to crm_partner_assign/i18n/bg.po.moved.
Conflict adding file crm_partner_assign/i18n/ca.po.  Moved existing file to crm_partner_assign/i18n/ca.po.moved.
Conflict adding file crm_partner_assign/i18n/cs.po.  Moved existing file to crm_partner_assign/i18n/cs.po.moved.
Conflict adding file crm_partner_assign/i18n/da.po.  Moved existing file to crm_partner_assign/i18n/da.po.moved.
Text conflict in crm_partner_assign/i18n/de.po
Text conflict in crm_partner_assign/i18n/el.po
Text conflict in crm_partner_assign/i18n/es.po
Conflict adding file crm_partner_assign/i18n/es_CR.po.  Moved existing file to crm_partner_assign/i18n/es_CR.po.moved.
Conflict adding file crm_partner_assign/i18n/es_PY.po.  Moved existing file to crm_partner_assign/i18n/es_PY.po.moved.
Text conflict in crm_partner_assign/i18n/fi.po
Text conflict in crm_partner_assign/i18n/fr.po
Conflict adding file crm_partner_assign/i18n/gl.po.  Moved existing file to crm_partner_assign/i18n/gl.po.moved.
Conflict adding file crm_partner_assign/i18n/hr.po.  Moved existing file to crm_partner_assign/i18n/hr.po.moved.
Text conflict in crm_partner_assign/i18n/hu.po
Text conflict in crm_partner_assign/i18n/it.po
Conflict adding file crm_partner_assign/i18n/ja.po.  Moved existing file to crm_partner_assign/i18n/ja.po.moved.
Conflict adding file crm_partner_assign/i18n/ko.po.  Moved existing file to crm_partner_assign/i18n/ko.po.moved.
Conflict adding file crm_partner_assign/i18n/lt.po.  Moved existing file to crm_partner_assign/i18n/lt.po.moved.
Text conflict in crm_partner_assign/i18n/lv.po
Conflict adding file crm_partner_assign/i18n/mk.po.  Moved existing file to crm_partner_assign/i18n/mk.po.moved.
Conflict adding file crm_partner_assign/i18n/mn.po.  Moved existing file to crm_partner_assign/i18n/mn.po.moved.
Conflict adding file crm_partner_assign/i18n/nb.po.  Moved existing file to crm_partner_assign/i18n/nb.po.moved.
Text conflict in crm_partner_assign/i18n/nl.po
Text conflict in crm_partner_assign/i18n/pl.po
Text conflict in crm_partner_assign/i18n/pt.po
Conflict adding file crm_partner_assign/i18n/pt_BR.po.  Moved existing file to crm_partner_assign/i18n/pt_BR.po.moved.
Text conflict in crm_partner_assign/i18n/ro.po
Text conflict in crm_partner_assign/i18n/ru.po
Conflict adding file crm_partner_assign/i18n/sl.po.  Moved existing file to crm_partner_assign/i18n/sl.po.moved.
Conflict adding file crm_partner_assign/i18n/sq.po.  Moved existing file to crm_partner_assign/i18n/sq.po.moved.
Text conflict in crm_partner_assign/i18n/sr@latin.po
Conflict adding file crm_partner_assign/i18n/sv.po.  Moved existing file to crm_partner_assign/i18n/sv.po.moved.
Conflict adding file crm_partner_assign/i18n/tr.po.  Moved existing file to crm_partner_assign/i18n/tr.po.moved.
Conflict adding file crm_partner_assign/i18n/zh_CN.po.  Moved existing file to crm_partner_assign/i18n/zh_CN.po.moved.
Conflict adding file crm_partner_assign/i18n/zh_TW.po.  Moved existing file to crm_partner_assign/i18n/zh_TW.po.moved.
Text conflict in crm_profiling/i18n/ar.po
Text conflict in crm_profiling/i18n/bg.po
Text conflict in crm_profiling/i18n/bs.po
Text conflict in crm_profiling/i18n/ca.po
Text conflict in crm_profiling/i18n/cs.po
Conflict adding file crm_profiling/i18n/da.po.  Moved existing file to crm_profiling/i18n/da.po.moved.
Text conflict in crm_profiling/i18n/de.po
Text conflict in crm_profiling/i18n/el.po
Conflict adding file crm_profiling/i18n/en_GB.po.  Moved existing file to crm_profiling/i18n/en_GB.po.moved.
Text conflict in crm_profiling/i18n/es.po
Text conflict in crm_profiling/i18n/es_AR.po
Conflict adding file crm_profiling/i18n/es_CR.po.  Moved existing file to crm_profiling/i18n/es_CR.po.moved.
Text conflict in crm_profiling/i18n/es_EC.po
Conflict adding file crm_profiling/i18n/es_PY.po.  Moved existing file to crm_profiling/i18n/es_PY.po.moved.
Text conflict in crm_profiling/i18n/et.po
Text conflict in crm_profiling/i18n/fi.po
Text conflict in crm_profiling/i18n/fr.po
Conflict adding file crm_profiling/i18n/gl.po.  Moved existing file to crm_profiling/i18n/gl.po.moved.
Conflict adding file crm_profiling/i18n/gu.po.  Moved existing file to crm_profiling/i18n/gu.po.moved.
Text conflict in crm_profiling/i18n/hr.po
Text conflict in crm_profiling/i18n/hu.po
Text conflict in crm_profiling/i18n/id.po
Text conflict in crm_profiling/i18n/it.po
Conflict adding file crm_profiling/i18n/ja.po.  Moved existing file to crm_profiling/i18n/ja.po.moved.
Text conflict in crm_profiling/i18n/ko.po
Text conflict in crm_profiling/i18n/lt.po
Text conflict in crm_profiling/i18n/lv.po
Conflict adding file crm_profiling/i18n/mk.po.  Moved existing file to crm_profiling/i18n/mk.po.moved.
Text conflict in crm_profiling/i18n/mn.po
Conflict adding file crm_profiling/i18n/nb.po.  Moved existing file to crm_profiling/i18n/nb.po.moved.
Text conflict in crm_profiling/i18n/nl.po
Text conflict in crm_profiling/i18n/nl_BE.po
Text conflict in crm_profiling/i18n/pl.po
Text conflict in crm_profiling/i18n/pt.po
Text conflict in crm_profiling/i18n/pt_BR.po
Text conflict in crm_profiling/i18n/ro.po
Text conflict in crm_profiling/i18n/ru.po
Text conflict in crm_profiling/i18n/sk.po
Text conflict in crm_profiling/i18n/sl.po
Text conflict in crm_profiling/i18n/sq.po
Text conflict in crm_profiling/i18n/sr.po
Text conflict in crm_profiling/i18n/sr@latin.po
Text conflict in crm_profiling/i18n/sv.po
Text conflict in crm_profiling/i18n/tlh.po
Text conflict in crm_profiling/i18n/tr.po
Text conflict in crm_profiling/i18n/uk.po
Text conflict in crm_profiling/i18n/vi.po
Text conflict in crm_profiling/i18n/zh_CN.po
Text conflict in crm_profiling/i18n/zh_TW.po
Conflict adding file decimal_precision/i18n/ar.po.  Moved existing file to decimal_precision/i18n/ar.po.moved.
Conflict adding file decimal_precision/i18n/bg.po.  Moved existing file to decimal_precision/i18n/bg.po.moved.
Conflict adding file decimal_precision/i18n/ca.po.  Moved existing file to decimal_precision/i18n/ca.po.moved.
Conflict adding file decimal_precision/i18n/cs.po.  Moved existing file to decimal_precision/i18n/cs.po.moved.
Conflict adding file decimal_precision/i18n/da.po.  Moved existing file to decimal_precision/i18n/da.po.moved.
Text conflict in decimal_precision/i18n/de.po
Text conflict in decimal_precision/i18n/decimal_precision.pot
Text conflict in decimal_precision/i18n/el.po
Conflict adding file decimal_precision/i18n/en_GB.po.  Moved existing file to decimal_precision/i18n/en_GB.po.moved.
Text conflict in decimal_precision/i18n/es.po
Conflict adding file decimal_precision/i18n/es_CR.po.  Moved existing file to decimal_precision/i18n/es_CR.po.moved.
Text conflict in decimal_precision/i18n/es_EC.po
Conflict adding file decimal_precision/i18n/es_MX.po.  Moved existing file to decimal_precision/i18n/es_MX.po.moved.
Conflict adding file decimal_precision/i18n/es_PY.po.  Moved existing file to decimal_precision/i18n/es_PY.po.moved.
Text conflict in decimal_precision/i18n/fi.po
Text conflict in decimal_precision/i18n/fr.po
Conflict adding file decimal_precision/i18n/gl.po.  Moved existing file to decimal_precision/i18n/gl.po.moved.
Conflict adding file decimal_precision/i18n/gu.po.  Moved existing file to decimal_precision/i18n/gu.po.moved.
Conflict adding file decimal_precision/i18n/hr.po.  Moved existing file to decimal_precision/i18n/hr.po.moved.
Text conflict in decimal_precision/i18n/hu.po
Conflict adding file decimal_precision/i18n/id.po.  Moved existing file to decimal_precision/i18n/id.po.moved.
Text conflict in decimal_precision/i18n/it.po
Conflict adding file decimal_precision/i18n/ja.po.  Moved existing file to decimal_precision/i18n/ja.po.moved.
Conflict adding file decimal_precision/i18n/lt.po.  Moved existing file to decimal_precision/i18n/lt.po.moved.
Text conflict in decimal_precision/i18n/lv.po
Conflict adding file decimal_precision/i18n/mk.po.  Moved existing file to decimal_precision/i18n/mk.po.moved.
Text conflict in decimal_precision/i18n/mn.po
Conflict adding file decimal_precision/i18n/nb.po.  Moved existing file to decimal_precision/i18n/nb.po.moved.
Text conflict in decimal_precision/i18n/nl.po
Conflict adding file decimal_precision/i18n/nl_BE.po.  Moved existing file to decimal_precision/i18n/nl_BE.po.moved.
Conflict adding file decimal_precision/i18n/pl.po.  Moved existing file to decimal_precision/i18n/pl.po.moved.
Text conflict in decimal_precision/i18n/pt.po
Text conflict in decimal_precision/i18n/pt_BR.po
Text conflict in decimal_precision/i18n/ro.po
Text conflict in decimal_precision/i18n/ru.po
Text conflict in decimal_precision/i18n/sk.po
Conflict adding file decimal_precision/i18n/sl.po.  Moved existing file to decimal_precision/i18n/sl.po.moved.
Text conflict in decimal_precision/i18n/sr.po
Text conflict in decimal_precision/i18n/sr@latin.po
Text conflict in decimal_precision/i18n/sv.po
Conflict adding file decimal_precision/i18n/tr.po.  Moved existing file to decimal_precision/i18n/tr.po.moved.
Text conflict in decimal_precision/i18n/vi.po
Text conflict in decimal_precision/i18n/zh_CN.po
Conflict adding file decimal_precision/i18n/zh_TW.po.  Moved existing file to decimal_precision/i18n/zh_TW.po.moved.
Text conflict in delivery/delivery.py
Text conflict in delivery/i18n/ar.po
Text conflict in delivery/i18n/bg.po
Text conflict in delivery/i18n/bs.po
Text conflict in delivery/i18n/ca.po
Text conflict in delivery/i18n/cs.po
Conflict adding file delivery/i18n/da.po.  Moved existing file to delivery/i18n/da.po.moved.
Text conflict in delivery/i18n/de.po
Text conflict in delivery/i18n/el.po
Text conflict in delivery/i18n/es.po
Text conflict in delivery/i18n/es_AR.po
Conflict adding file delivery/i18n/es_CR.po.  Moved existing file to delivery/i18n/es_CR.po.moved.
Text conflict in delivery/i18n/es_EC.po
Conflict adding file delivery/i18n/es_MX.po.  Moved existing file to delivery/i18n/es_MX.po.moved.
Conflict adding file delivery/i18n/es_PY.po.  Moved existing file to delivery/i18n/es_PY.po.moved.
Text conflict in delivery/i18n/et.po
Text conflict in delivery/i18n/fi.po
Text conflict in delivery/i18n/fr.po
Conflict adding file delivery/i18n/gl.po.  Moved existing file to delivery/i18n/gl.po.moved.
Conflict adding file delivery/i18n/hi.po.  Moved existing file to delivery/i18n/hi.po.moved.
Text conflict in delivery/i18n/hr.po
Text conflict in delivery/i18n/hu.po
Text conflict in delivery/i18n/id.po
Text conflict in delivery/i18n/it.po
Conflict adding file delivery/i18n/ja.po.  Moved existing file to delivery/i18n/ja.po.moved.
Text conflict in delivery/i18n/ko.po
Text conflict in delivery/i18n/lt.po
Conflict adding file delivery/i18n/lv.po.  Moved existing file to delivery/i18n/lv.po.moved.
Conflict adding file delivery/i18n/mk.po.  Moved existing file to delivery/i18n/mk.po.moved.
Text conflict in delivery/i18n/mn.po
Conflict adding file delivery/i18n/nb.po.  Moved existing file to delivery/i18n/nb.po.moved.
Text conflict in delivery/i18n/nl.po
Text conflict in delivery/i18n/nl_BE.po
Text conflict in delivery/i18n/pl.po
Text conflict in delivery/i18n/pt.po
Text conflict in delivery/i18n/pt_BR.po
Text conflict in delivery/i18n/ro.po
Text conflict in delivery/i18n/ru.po
Text conflict in delivery/i18n/sl.po
Text conflict in delivery/i18n/sq.po
Text conflict in delivery/i18n/sr.po
Text conflict in delivery/i18n/sr@latin.po
Text conflict in delivery/i18n/sv.po
Text conflict in delivery/i18n/th.po
Text conflict in delivery/i18n/tlh.po
Text conflict in delivery/i18n/tr.po
Text conflict in delivery/i18n/uk.po
Text conflict in delivery/i18n/vi.po
Text conflict in delivery/i18n/zh_CN.po
Text conflict in delivery/i18n/zh_TW.po
Text conflict in delivery/stock.py
Text conflict in document/document.py
Text conflict in document/i18n/ar.po
Text conflict in document/i18n/bg.po
Text conflict in document/i18n/bs.po
Text conflict in document/i18n/ca.po
Text conflict in document/i18n/cs.po
Conflict adding file document/i18n/da.po.  Moved existing file to document/i18n/da.po.moved.
Text conflict in document/i18n/de.po
Text conflict in document/i18n/document.pot
Text conflict in document/i18n/el.po
Text conflict in document/i18n/es.po
Text conflict in document/i18n/es_AR.po
Conflict adding file document/i18n/es_CR.po.  Moved existing file to document/i18n/es_CR.po.moved.
Text conflict in document/i18n/es_EC.po
Conflict adding file document/i18n/es_PY.po.  Moved existing file to document/i18n/es_PY.po.moved.
Text conflict in document/i18n/et.po
Text conflict in document/i18n/fi.po
Text conflict in document/i18n/fr.po
Conflict adding file document/i18n/gl.po.  Moved existing file to document/i18n/gl.po.moved.
Conflict adding file document/i18n/gu.po.  Moved existing file to document/i18n/gu.po.moved.
Text conflict in document/i18n/hi.po
Text conflict in document/i18n/hr.po
Text conflict in document/i18n/hu.po
Text conflict in document/i18n/id.po
Text conflict in document/i18n/it.po
Conflict adding file document/i18n/ja.po.  Moved existing file to document/i18n/ja.po.moved.
Text conflict in document/i18n/ko.po
Text conflict in document/i18n/lt.po
Text conflict in document/i18n/lv.po
Conflict adding file document/i18n/mk.po.  Moved existing file to document/i18n/mk.po.moved.
Text conflict in document/i18n/mn.po
Conflict adding file document/i18n/nb.po.  Moved existing file to document/i18n/nb.po.moved.
Text conflict in document/i18n/nl.po
Text conflict in document/i18n/nl_BE.po
Text conflict in document/i18n/pl.po
Text conflict in document/i18n/pt.po
Text conflict in document/i18n/pt_BR.po
Text conflict in document/i18n/ro.po
Text conflict in document/i18n/ru.po
Conflict adding file document/i18n/sk.po.  Moved existing file to document/i18n/sk.po.moved.
Text conflict in document/i18n/sl.po
Text conflict in document/i18n/sq.po
Text conflict in document/i18n/sr.po
Text conflict in document/i18n/sr@latin.po
Text conflict in document/i18n/sv.po
Text conflict in document/i18n/tlh.po
Text conflict in document/i18n/tr.po
Text conflict in document/i18n/uk.po
Text conflict in document/i18n/vi.po
Text conflict in document/i18n/zh_CN.po
Conflict adding file document/i18n/zh_HK.po.  Moved existing file to document/i18n/zh_HK.po.moved.
Text conflict in document/i18n/zh_TW.po
Conflict adding file document_ftp/i18n/ar.po.  Moved existing file to document_ftp/i18n/ar.po.moved.
Conflict adding file document_ftp/i18n/bg.po.  Moved existing file to document_ftp/i18n/bg.po.moved.
Conflict adding file document_ftp/i18n/ca.po.  Moved existing file to document_ftp/i18n/ca.po.moved.
Conflict adding file document_ftp/i18n/cs.po.  Moved existing file to document_ftp/i18n/cs.po.moved.
Conflict adding file document_ftp/i18n/da.po.  Moved existing file to document_ftp/i18n/da.po.moved.
Text conflict in document_ftp/i18n/de.po
Text conflict in document_ftp/i18n/el.po
Conflict adding file document_ftp/i18n/en_GB.po.  Moved existing file to document_ftp/i18n/en_GB.po.moved.
Text conflict in document_ftp/i18n/es.po
Conflict adding file document_ftp/i18n/es_CR.po.  Moved existing file to document_ftp/i18n/es_CR.po.moved.
Text conflict in document_ftp/i18n/es_EC.po
Conflict adding file document_ftp/i18n/es_PY.po.  Moved existing file to document_ftp/i18n/es_PY.po.moved.
Conflict adding file document_ftp/i18n/et.po.  Moved existing file to document_ftp/i18n/et.po.moved.
Conflict adding file document_ftp/i18n/fi.po.  Moved existing file to document_ftp/i18n/fi.po.moved.
Text conflict in document_ftp/i18n/fr.po
Conflict adding file document_ftp/i18n/gl.po.  Moved existing file to document_ftp/i18n/gl.po.moved.
Conflict adding file document_ftp/i18n/hr.po.  Moved existing file to document_ftp/i18n/hr.po.moved.
Text conflict in document_ftp/i18n/hu.po
Text conflict in document_ftp/i18n/it.po
Conflict adding file document_ftp/i18n/ja.po.  Moved existing file to document_ftp/i18n/ja.po.moved.
Conflict adding file document_ftp/i18n/mk.po.  Moved existing file to document_ftp/i18n/mk.po.moved.
Conflict adding file document_ftp/i18n/mn.po.  Moved existing file to document_ftp/i18n/mn.po.moved.
Conflict adding file document_ftp/i18n/nb.po.  Moved existing file to document_ftp/i18n/nb.po.moved.
Text conflict in document_ftp/i18n/nl.po
Text conflict in document_ftp/i18n/pl.po
Text conflict in document_ftp/i18n/pt.po
Text conflict in document_ftp/i18n/pt_BR.po
Conflict adding file document_ftp/i18n/ro.po.  Moved existing file to document_ftp/i18n/ro.po.moved.
Conflict adding file document_ftp/i18n/ru.po.  Moved existing file to document_ftp/i18n/ru.po.moved.
Conflict adding file document_ftp/i18n/sk.po.  Moved existing file to document_ftp/i18n/sk.po.moved.
Conflict adding file document_ftp/i18n/sl.po.  Moved existing file to document_ftp/i18n/sl.po.moved.
Text conflict in document_ftp/i18n/sr.po
Text conflict in document_ftp/i18n/sr@latin.po
Text conflict in document_ftp/i18n/sv.po
Conflict adding file document_ftp/i18n/tr.po.  Moved existing file to document_ftp/i18n/tr.po.moved.
Conflict adding file document_ftp/i18n/vi.po.  Moved existing file to document_ftp/i18n/vi.po.moved.
Text conflict in document_ftp/i18n/zh_CN.po
Conflict adding file document_ftp/i18n/zh_TW.po.  Moved existing file to document_ftp/i18n/zh_TW.po.moved.
Conflict: can't delete document_ics because it is not empty.  Not deleting.
Conflict because document_ics is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_ics/document_data.xml
Conflict: can't delete document_ics/i18n because it is not empty.  Not deleting.
Conflict because document_ics/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in document_ics/i18n/ar.po
Contents conflict in document_ics/i18n/bg.po
Contents conflict in document_ics/i18n/bs.po
Contents conflict in document_ics/i18n/ca.po
Contents conflict in document_ics/i18n/cs.po
Contents conflict in document_ics/i18n/de.po
Contents conflict in document_ics/i18n/el.po
Contents conflict in document_ics/i18n/es.po
Contents conflict in document_ics/i18n/es_AR.po
Contents conflict in document_ics/i18n/es_EC.po
Contents conflict in document_ics/i18n/es_PY.po
Contents conflict in document_ics/i18n/et.po
Contents conflict in document_ics/i18n/fi.po
Contents conflict in document_ics/i18n/fr.po
Contents conflict in document_ics/i18n/gl.po
Contents conflict in document_ics/i18n/hr.po
Contents conflict in document_ics/i18n/hu.po
Contents conflict in document_ics/i18n/id.po
Contents conflict in document_ics/i18n/it.po
Contents conflict in document_ics/i18n/ko.po
Contents conflict in document_ics/i18n/lt.po
Contents conflict in document_ics/i18n/mn.po
Contents conflict in document_ics/i18n/nl.po
Contents conflict in document_ics/i18n/nl_BE.po
Contents conflict in document_ics/i18n/pl.po
Contents conflict in document_ics/i18n/pt.po
Contents conflict in document_ics/i18n/pt_BR.po
Contents conflict in document_ics/i18n/ro.po
Contents conflict in document_ics/i18n/ru.po
Contents conflict in document_ics/i18n/sl.po
Contents conflict in document_ics/i18n/sq.po
Contents conflict in document_ics/i18n/sr.po
Contents conflict in document_ics/i18n/sr@latin.po
Contents conflict in document_ics/i18n/sv.po
Contents conflict in document_ics/i18n/tlh.po
Contents conflict in document_ics/i18n/tr.po
Contents conflict in document_ics/i18n/uk.po
Contents conflict in document_ics/i18n/vi.po
Contents conflict in document_ics/i18n/zh_CN.po
Contents conflict in document_ics/i18n/zh_TW.po
Conflict adding file document_webdav/i18n/ar.po.  Moved existing file to document_webdav/i18n/ar.po.moved.
Text conflict in document_webdav/i18n/bg.po
Conflict adding file document_webdav/i18n/ca.po.  Moved existing file to document_webdav/i18n/ca.po.moved.
Text conflict in document_webdav/i18n/cs.po
Text conflict in document_webdav/i18n/da.po
Text conflict in document_webdav/i18n/de.po
Text conflict in document_webdav/i18n/document_webdav.pot
Text conflict in document_webdav/i18n/el.po
Conflict adding file document_webdav/i18n/en_GB.po.  Moved existing file to document_webdav/i18n/en_GB.po.moved.
Text conflict in document_webdav/i18n/es.po
Conflict adding file document_webdav/i18n/es_CR.po.  Moved existing file to document_webdav/i18n/es_CR.po.moved.
Text conflict in document_webdav/i18n/es_EC.po
Conflict adding file document_webdav/i18n/es_PY.po.  Moved existing file to document_webdav/i18n/es_PY.po.moved.
Text conflict in document_webdav/i18n/et.po
Text conflict in document_webdav/i18n/eu.po
Conflict adding file document_webdav/i18n/fi.po.  Moved existing file to document_webdav/i18n/fi.po.moved.
Text conflict in document_webdav/i18n/fr.po
Conflict adding file document_webdav/i18n/gl.po.  Moved existing file to document_webdav/i18n/gl.po.moved.
Conflict adding file document_webdav/i18n/gu.po.  Moved existing file to document_webdav/i18n/gu.po.moved.
Text conflict in document_webdav/i18n/hr.po
Text conflict in document_webdav/i18n/hu.po
Text conflict in document_webdav/i18n/id.po
Text conflict in document_webdav/i18n/it.po
Conflict adding file document_webdav/i18n/ja.po.  Moved existing file to document_webdav/i18n/ja.po.moved.
Conflict adding file document_webdav/i18n/mk.po.  Moved existing file to document_webdav/i18n/mk.po.moved.
Text conflict in document_webdav/i18n/mn.po
Conflict adding file document_webdav/i18n/nb.po.  Moved existing file to document_webdav/i18n/nb.po.moved.
Text conflict in document_webdav/i18n/nl.po
Text conflict in document_webdav/i18n/pl.po
Text conflict in document_webdav/i18n/pt.po
Text conflict in document_webdav/i18n/pt_BR.po
Conflict adding file document_webdav/i18n/ro.po.  Moved existing file to document_webdav/i18n/ro.po.moved.
Conflict adding file document_webdav/i18n/ru.po.  Moved existing file to document_webdav/i18n/ru.po.moved.
Text conflict in document_webdav/i18n/sl.po
Text conflict in document_webdav/i18n/sr.po
Text conflict in document_webdav/i18n/sr@latin.po
Text conflict in document_webdav/i18n/sv.po
Conflict adding file document_webdav/i18n/tr.po.  Moved existing file to document_webdav/i18n/tr.po.moved.
Text conflict in document_webdav/i18n/zh_CN.po
Conflict adding file document_webdav/i18n/zh_TW.po.  Moved existing file to document_webdav/i18n/zh_TW.po.moved.
Conflict adding file email_template/i18n/ar.po.  Moved existing file to email_template/i18n/ar.po.moved.
Conflict adding file email_template/i18n/bg.po.  Moved existing file to email_template/i18n/bg.po.moved.
Conflict adding file email_template/i18n/ca.po.  Moved existing file to email_template/i18n/ca.po.moved.
Conflict adding file email_template/i18n/cs.po.  Moved existing file to email_template/i18n/cs.po.moved.
Conflict adding file email_template/i18n/da.po.  Moved existing file to email_template/i18n/da.po.moved.
Text conflict in email_template/i18n/de.po
Text conflict in email_template/i18n/email_template.pot
Text conflict in email_template/i18n/es.po
Conflict adding file email_template/i18n/es_CL.po.  Moved existing file to email_template/i18n/es_CL.po.moved.
Conflict adding file email_template/i18n/es_CR.po.  Moved existing file to email_template/i18n/es_CR.po.moved.
Conflict adding file email_template/i18n/es_EC.po.  Moved existing file to email_template/i18n/es_EC.po.moved.
Conflict adding file email_template/i18n/et.po.  Moved existing file to email_template/i18n/et.po.moved.
Conflict adding file email_template/i18n/fa_AF.po.  Moved existing file to email_template/i18n/fa_AF.po.moved.
Conflict adding file email_template/i18n/fi.po.  Moved existing file to email_template/i18n/fi.po.moved.
Text conflict in email_template/i18n/fr.po
Conflict adding file email_template/i18n/hr.po.  Moved existing file to email_template/i18n/hr.po.moved.
Text conflict in email_template/i18n/hu.po
Text conflict in email_template/i18n/it.po
Conflict adding file email_template/i18n/ja.po.  Moved existing file to email_template/i18n/ja.po.moved.
Conflict adding file email_template/i18n/lt.po.  Moved existing file to email_template/i18n/lt.po.moved.
Conflict adding file email_template/i18n/mk.po.  Moved existing file to email_template/i18n/mk.po.moved.
Text conflict in email_template/i18n/mn.po
Conflict adding file email_template/i18n/nb.po.  Moved existing file to email_template/i18n/nb.po.moved.
Text conflict in email_template/i18n/nl.po
Conflict adding file email_template/i18n/nl_BE.po.  Moved existing file to email_template/i18n/nl_BE.po.moved.
Text conflict in email_template/i18n/pl.po
Text conflict in email_template/i18n/pt.po
Conflict adding file email_template/i18n/pt_BR.po.  Moved existing file to email_template/i18n/pt_BR.po.moved.
Conflict adding file email_template/i18n/ro.po.  Moved existing file to email_template/i18n/ro.po.moved.
Text conflict in email_template/i18n/ru.po
Conflict adding file email_template/i18n/sl.po.  Moved existing file to email_template/i18n/sl.po.moved.
Text conflict in email_template/i18n/sr.po
Text conflict in email_template/i18n/sr@latin.po
Text conflict in email_template/i18n/sv.po
Text conflict in email_template/i18n/tr.po
Conflict adding file email_template/i18n/zh_CN.po.  Moved existing file to email_template/i18n/zh_CN.po.moved.
Conflict adding file email_template/i18n/zh_TW.po.  Moved existing file to email_template/i18n/zh_TW.po.moved.
Text conflict in event/event_view.xml
Text conflict in event/i18n/ar.po
Text conflict in event/i18n/bg.po
Text conflict in event/i18n/bs.po
Text conflict in event/i18n/ca.po
Text conflict in event/i18n/cs.po
Conflict adding file event/i18n/da.po.  Moved existing file to event/i18n/da.po.moved.
Text conflict in event/i18n/de.po
Conflict adding file event/i18n/el.po.  Moved existing file to event/i18n/el.po.moved.
Text conflict in event/i18n/es.po
Text conflict in event/i18n/es_AR.po
Conflict adding file event/i18n/es_CR.po.  Moved existing file to event/i18n/es_CR.po.moved.
Text conflict in event/i18n/es_EC.po
Text conflict in event/i18n/et.po
Text conflict in event/i18n/fi.po
Text conflict in event/i18n/fr.po
Conflict adding file event/i18n/gu.po.  Moved existing file to event/i18n/gu.po.moved.
Text conflict in event/i18n/hi.po
Text conflict in event/i18n/hr.po
Text conflict in event/i18n/hu.po
Text conflict in event/i18n/id.po
Text conflict in event/i18n/it.po
Conflict adding file event/i18n/ja.po.  Moved existing file to event/i18n/ja.po.moved.
Text conflict in event/i18n/ko.po
Text conflict in event/i18n/lt.po
Conflict adding file event/i18n/mk.po.  Moved existing file to event/i18n/mk.po.moved.
Conflict adding file event/i18n/mn.po.  Moved existing file to event/i18n/mn.po.moved.
Conflict adding file event/i18n/nb.po.  Moved existing file to event/i18n/nb.po.moved.
Text conflict in event/i18n/nl.po
Text conflict in event/i18n/nl_BE.po
Text conflict in event/i18n/pl.po
Text conflict in event/i18n/pt.po
Text conflict in event/i18n/pt_BR.po
Text conflict in event/i18n/ro.po
Text conflict in event/i18n/ru.po
Text conflict in event/i18n/sk.po
Text conflict in event/i18n/sl.po
Text conflict in event/i18n/sq.po
Text conflict in event/i18n/sr.po
Text conflict in event/i18n/sr@latin.po
Text conflict in event/i18n/sv.po
Text conflict in event/i18n/tlh.po
Text conflict in event/i18n/tr.po
Text conflict in event/i18n/uk.po
Text conflict in event/i18n/vi.po
Text conflict in event/i18n/zh_CN.po
Text conflict in event/i18n/zh_TW.po
Text conflict in event_project/i18n/ar.po
Text conflict in event_project/i18n/bg.po
Text conflict in event_project/i18n/bs.po
Text conflict in event_project/i18n/ca.po
Text conflict in event_project/i18n/cs.po
Conflict adding file event_project/i18n/da.po.  Moved existing file to event_project/i18n/da.po.moved.
Text conflict in event_project/i18n/de.po
Text conflict in event_project/i18n/el.po
Conflict adding file event_project/i18n/en_GB.po.  Moved existing file to event_project/i18n/en_GB.po.moved.
Text conflict in event_project/i18n/es.po
Text conflict in event_project/i18n/es_AR.po
Conflict adding file event_project/i18n/es_CR.po.  Moved existing file to event_project/i18n/es_CR.po.moved.
Text conflict in event_project/i18n/es_EC.po
Conflict adding file event_project/i18n/es_PY.po.  Moved existing file to event_project/i18n/es_PY.po.moved.
Text conflict in event_project/i18n/et.po
Conflict adding file event_project/i18n/fi.po.  Moved existing file to event_project/i18n/fi.po.moved.
Text conflict in event_project/i18n/fr.po
Text conflict in event_project/i18n/gl.po
Text conflict in event_project/i18n/hi.po
Text conflict in event_project/i18n/hr.po
Text conflict in event_project/i18n/hu.po
Text conflict in event_project/i18n/id.po
Text conflict in event_project/i18n/it.po
Conflict adding file event_project/i18n/ja.po.  Moved existing file to event_project/i18n/ja.po.moved.
Text conflict in event_project/i18n/ko.po
Text conflict in event_project/i18n/lt.po
Text conflict in event_project/i18n/lv.po
Conflict adding file event_project/i18n/mn.po.  Moved existing file to event_project/i18n/mn.po.moved.
Conflict adding file event_project/i18n/nb.po.  Moved existing file to event_project/i18n/nb.po.moved.
Text conflict in event_project/i18n/nl.po
Text conflict in event_project/i18n/nl_BE.po
Text conflict in event_project/i18n/pl.po
Text conflict in event_project/i18n/pt.po
Text conflict in event_project/i18n/pt_BR.po
Text conflict in event_project/i18n/ro.po
Text conflict in event_project/i18n/ru.po
Text conflict in event_project/i18n/sl.po
Text conflict in event_project/i18n/sq.po
Text conflict in event_project/i18n/sr.po
Text conflict in event_project/i18n/sr@latin.po
Text conflict in event_project/i18n/sv.po
Text conflict in event_project/i18n/tlh.po
Text conflict in event_project/i18n/tr.po
Text conflict in event_project/i18n/uk.po
Text conflict in event_project/i18n/vi.po
Text conflict in event_project/i18n/zh_CN.po
Text conflict in event_project/i18n/zh_TW.po
Text conflict in fetchmail/fetchmail_view.xml
Conflict adding file fetchmail/i18n/ar.po.  Moved existing file to fetchmail/i18n/ar.po.moved.
Conflict adding file fetchmail/i18n/bg.po.  Moved existing file to fetchmail/i18n/bg.po.moved.
Conflict adding file fetchmail/i18n/ca.po.  Moved existing file to fetchmail/i18n/ca.po.moved.
Conflict adding file fetchmail/i18n/cs.po.  Moved existing file to fetchmail/i18n/cs.po.moved.
Conflict adding file fetchmail/i18n/da.po.  Moved existing file to fetchmail/i18n/da.po.moved.
Text conflict in fetchmail/i18n/de.po
Text conflict in fetchmail/i18n/el.po
Conflict adding file fetchmail/i18n/en_GB.po.  Moved existing file to fetchmail/i18n/en_GB.po.moved.
Text conflict in fetchmail/i18n/es.po
Conflict adding file fetchmail/i18n/es_CR.po.  Moved existing file to fetchmail/i18n/es_CR.po.moved.
Conflict adding file fetchmail/i18n/et.po.  Moved existing file to fetchmail/i18n/et.po.moved.
Text conflict in fetchmail/i18n/fetchmail.pot
Conflict adding file fetchmail/i18n/fi.po.  Moved existing file to fetchmail/i18n/fi.po.moved.
Text conflict in fetchmail/i18n/fr.po
Conflict adding file fetchmail/i18n/gl.po.  Moved existing file to fetchmail/i18n/gl.po.moved.
Conflict adding file fetchmail/i18n/hr.po.  Moved existing file to fetchmail/i18n/hr.po.moved.
Text conflict in fetchmail/i18n/hu.po
Text conflict in fetchmail/i18n/it.po
Conflict adding file fetchmail/i18n/ja.po.  Moved existing file to fetchmail/i18n/ja.po.moved.
Text conflict in fetchmail/i18n/lt.po
Text conflict in fetchmail/i18n/lv.po
Conflict adding file fetchmail/i18n/mk.po.  Moved existing file to fetchmail/i18n/mk.po.moved.
Text conflict in fetchmail/i18n/mn.po
Conflict adding file fetchmail/i18n/nb.po.  Moved existing file to fetchmail/i18n/nb.po.moved.
Text conflict in fetchmail/i18n/nl.po
Text conflict in fetchmail/i18n/pl.po
Text conflict in fetchmail/i18n/pt.po
Conflict adding file fetchmail/i18n/pt_BR.po.  Moved existing file to fetchmail/i18n/pt_BR.po.moved.
Conflict adding file fetchmail/i18n/ro.po.  Moved existing file to fetchmail/i18n/ro.po.moved.
Text conflict in fetchmail/i18n/ru.po
Conflict adding file fetchmail/i18n/sl.po.  Moved existing file to fetchmail/i18n/sl.po.moved.
Text conflict in fetchmail/i18n/sr.po
Text conflict in fetchmail/i18n/sr@latin.po
Text conflict in fetchmail/i18n/sv.po
Conflict adding file fetchmail/i18n/tr.po.  Moved existing file to fetchmail/i18n/tr.po.moved.
Text conflict in fetchmail/i18n/vi.po
Text conflict in fetchmail/i18n/zh_CN.po
Text conflict in google_map/i18n/ar.po
Text conflict in google_map/i18n/bg.po
Text conflict in google_map/i18n/br.po
Text conflict in google_map/i18n/bs.po
Text conflict in google_map/i18n/ca.po
Text conflict in google_map/i18n/cs.po
Text conflict in google_map/i18n/da.po
Text conflict in google_map/i18n/de.po
Text conflict in google_map/i18n/el.po
Conflict adding file google_map/i18n/en_GB.po.  Moved existing file to google_map/i18n/en_GB.po.moved.
Text conflict in google_map/i18n/es.po
Text conflict in google_map/i18n/es_AR.po
Conflict adding file google_map/i18n/es_CR.po.  Moved existing file to google_map/i18n/es_CR.po.moved.
Text conflict in google_map/i18n/es_EC.po
Conflict adding file google_map/i18n/es_PY.po.  Moved existing file to google_map/i18n/es_PY.po.moved.
Text conflict in google_map/i18n/et.po
Text conflict in google_map/i18n/eu.po
Text conflict in google_map/i18n/fi.po
Text conflict in google_map/i18n/fr.po
Text conflict in google_map/i18n/gl.po
Conflict adding file google_map/i18n/gu.po.  Moved existing file to google_map/i18n/gu.po.moved.
Text conflict in google_map/i18n/hi.po
Text conflict in google_map/i18n/hr.po
Text conflict in google_map/i18n/hu.po
Text conflict in google_map/i18n/id.po
Conflict adding file google_map/i18n/is.po.  Moved existing file to google_map/i18n/is.po.moved.
Text conflict in google_map/i18n/it.po
Conflict adding file google_map/i18n/ja.po.  Moved existing file to google_map/i18n/ja.po.moved.
Text conflict in google_map/i18n/ko.po
Text conflict in google_map/i18n/lo.po
Text conflict in google_map/i18n/lt.po
Text conflict in google_map/i18n/lv.po
Conflict adding file google_map/i18n/mk.po.  Moved existing file to google_map/i18n/mk.po.moved.
Text conflict in google_map/i18n/mn.po
Conflict adding file google_map/i18n/nb.po.  Moved existing file to google_map/i18n/nb.po.moved.
Text conflict in google_map/i18n/nl.po
Text conflict in google_map/i18n/nl_BE.po
Text conflict in google_map/i18n/oc.po
Text conflict in google_map/i18n/pl.po
Text conflict in google_map/i18n/pt.po
Text conflict in google_map/i18n/pt_BR.po
Text conflict in google_map/i18n/ro.po
Text conflict in google_map/i18n/ru.po
Text conflict in google_map/i18n/sk.po
Text conflict in google_map/i18n/sl.po
Text conflict in google_map/i18n/sq.po
Text conflict in google_map/i18n/sr.po
Text conflict in google_map/i18n/sr@latin.po
Text conflict in google_map/i18n/sv.po
Text conflict in google_map/i18n/tlh.po
Text conflict in google_map/i18n/tr.po
Text conflict in google_map/i18n/uk.po
Text conflict in google_map/i18n/vi.po
Text conflict in google_map/i18n/zh_CN.po
Text conflict in google_map/i18n/zh_TW.po
Text conflict in hr/i18n/ar.po
Text conflict in hr/i18n/bg.po
Conflict adding file hr/i18n/bn.po.  Moved existing file to hr/i18n/bn.po.moved.
Text conflict in hr/i18n/bs.po
Text conflict in hr/i18n/ca.po
Text conflict in hr/i18n/cs.po
Conflict adding file hr/i18n/da.po.  Moved existing file to hr/i18n/da.po.moved.
Text conflict in hr/i18n/de.po
Text conflict in hr/i18n/el.po
Conflict adding file hr/i18n/en_AU.po.  Moved existing file to hr/i18n/en_AU.po.moved.
Conflict adding file hr/i18n/en_GB.po.  Moved existing file to hr/i18n/en_GB.po.moved.
Text conflict in hr/i18n/es.po
Text conflict in hr/i18n/es_AR.po
Text conflict in hr/i18n/es_CL.po
Conflict adding file hr/i18n/es_CR.po.  Moved existing file to hr/i18n/es_CR.po.moved.
Text conflict in hr/i18n/et.po
Text conflict in hr/i18n/fi.po
Text conflict in hr/i18n/fr.po
Text conflict in hr/i18n/fr_BE.po
Conflict adding file hr/i18n/gl.po.  Moved existing file to hr/i18n/gl.po.moved.
Conflict adding file hr/i18n/gu.po.  Moved existing file to hr/i18n/gu.po.moved.
Text conflict in hr/i18n/hi.po
Text conflict in hr/i18n/hr.po
Text conflict in hr/i18n/hr.pot
Text conflict in hr/i18n/hu.po
Text conflict in hr/i18n/id.po
Text conflict in hr/i18n/it.po
Conflict adding file hr/i18n/ja.po.  Moved existing file to hr/i18n/ja.po.moved.
Text conflict in hr/i18n/ko.po
Text conflict in hr/i18n/lo.po
Text conflict in hr/i18n/lt.po
Text conflict in hr/i18n/lv.po
Conflict adding file hr/i18n/mk.po.  Moved existing file to hr/i18n/mk.po.moved.
Text conflict in hr/i18n/mn.po
Conflict adding file hr/i18n/nb.po.  Moved existing file to hr/i18n/nb.po.moved.
Text conflict in hr/i18n/nl.po
Text conflict in hr/i18n/nl_BE.po
Text conflict in hr/i18n/pl.po
Text conflict in hr/i18n/pt.po
Text conflict in hr/i18n/pt_BR.po
Text conflict in hr/i18n/ro.po
Text conflict in hr/i18n/ru.po
Text conflict in hr/i18n/sk.po
Text conflict in hr/i18n/sl.po
Text conflict in hr/i18n/sq.po
Text conflict in hr/i18n/sr.po
Text conflict in hr/i18n/sr@latin.po
Text conflict in hr/i18n/sv.po
Text conflict in hr/i18n/th.po
Text conflict in hr/i18n/tlh.po
Text conflict in hr/i18n/tr.po
Text conflict in hr/i18n/uk.po
Text conflict in hr/i18n/vi.po
Text conflict in hr/i18n/zh_CN.po
Text conflict in hr/i18n/zh_TW.po
Text conflict in hr_attendance/i18n/ar.po
Text conflict in hr_attendance/i18n/bg.po
Text conflict in hr_attendance/i18n/bs.po
Text conflict in hr_attendance/i18n/ca.po
Text conflict in hr_attendance/i18n/cs.po
Conflict adding file hr_attendance/i18n/da.po.  Moved existing file to hr_attendance/i18n/da.po.moved.
Text conflict in hr_attendance/i18n/de.po
Text conflict in hr_attendance/i18n/el.po
Conflict adding file hr_attendance/i18n/en_GB.po.  Moved existing file to hr_attendance/i18n/en_GB.po.moved.
Text conflict in hr_attendance/i18n/es.po
Text conflict in hr_attendance/i18n/es_AR.po
Conflict adding file hr_attendance/i18n/es_CL.po.  Moved existing file to hr_attendance/i18n/es_CL.po.moved.
Conflict adding file hr_attendance/i18n/es_CR.po.  Moved existing file to hr_attendance/i18n/es_CR.po.moved.
Text conflict in hr_attendance/i18n/es_EC.po
Conflict adding file hr_attendance/i18n/es_PY.po.  Moved existing file to hr_attendance/i18n/es_PY.po.moved.
Text conflict in hr_attendance/i18n/et.po
Text conflict in hr_attendance/i18n/fi.po
Text conflict in hr_attendance/i18n/fr.po
Conflict adding file hr_attendance/i18n/gl.po.  Moved existing file to hr_attendance/i18n/gl.po.moved.
Conflict adding file hr_attendance/i18n/he.po.  Moved existing file to hr_attendance/i18n/he.po.moved.
Text conflict in hr_attendance/i18n/hr.po
Text conflict in hr_attendance/i18n/hu.po
Text conflict in hr_attendance/i18n/id.po
Text conflict in hr_attendance/i18n/it.po
Conflict adding file hr_attendance/i18n/ja.po.  Moved existing file to hr_attendance/i18n/ja.po.moved.
Text conflict in hr_attendance/i18n/ko.po
Text conflict in hr_attendance/i18n/lt.po
Text conflict in hr_attendance/i18n/lv.po
Conflict adding file hr_attendance/i18n/mk.po.  Moved existing file to hr_attendance/i18n/mk.po.moved.
Text conflict in hr_attendance/i18n/mn.po
Conflict adding file hr_attendance/i18n/nb.po.  Moved existing file to hr_attendance/i18n/nb.po.moved.
Text conflict in hr_attendance/i18n/nl.po
Text conflict in hr_attendance/i18n/nl_BE.po
Text conflict in hr_attendance/i18n/pl.po
Text conflict in hr_attendance/i18n/pt.po
Text conflict in hr_attendance/i18n/pt_BR.po
Text conflict in hr_attendance/i18n/ro.po
Text conflict in hr_attendance/i18n/ru.po
Text conflict in hr_attendance/i18n/sl.po
Text conflict in hr_attendance/i18n/sq.po
Text conflict in hr_attendance/i18n/sr.po
Text conflict in hr_attendance/i18n/sr@latin.po
Text conflict in hr_attendance/i18n/sv.po
Text conflict in hr_attendance/i18n/tlh.po
Text conflict in hr_attendance/i18n/tr.po
Text conflict in hr_attendance/i18n/uk.po
Text conflict in hr_attendance/i18n/vi.po
Text conflict in hr_attendance/i18n/zh_CN.po
Text conflict in hr_attendance/i18n/zh_TW.po
Text conflict in hr_contract/hr_contract_view.xml
Text conflict in hr_contract/i18n/ar.po
Text conflict in hr_contract/i18n/bg.po
Text conflict in hr_contract/i18n/bs.po
Text conflict in hr_contract/i18n/ca.po
Text conflict in hr_contract/i18n/cs.po
Conflict adding file hr_contract/i18n/da.po.  Moved existing file to hr_contract/i18n/da.po.moved.
Text conflict in hr_contract/i18n/de.po
Text conflict in hr_contract/i18n/el.po
Conflict adding file hr_contract/i18n/en_GB.po.  Moved existing file to hr_contract/i18n/en_GB.po.moved.
Text conflict in hr_contract/i18n/es.po
Text conflict in hr_contract/i18n/es_AR.po
Conflict adding file hr_contract/i18n/es_CR.po.  Moved existing file to hr_contract/i18n/es_CR.po.moved.
Text conflict in hr_contract/i18n/es_EC.po
Conflict adding file hr_contract/i18n/es_PY.po.  Moved existing file to hr_contract/i18n/es_PY.po.moved.
Text conflict in hr_contract/i18n/et.po
Text conflict in hr_contract/i18n/fi.po
Text conflict in hr_contract/i18n/fr.po
Conflict adding file hr_contract/i18n/gl.po.  Moved existing file to hr_contract/i18n/gl.po.moved.
Conflict adding file hr_contract/i18n/gu.po.  Moved existing file to hr_contract/i18n/gu.po.moved.
Text conflict in hr_contract/i18n/hi.po
Text conflict in hr_contract/i18n/hr.po
Text conflict in hr_contract/i18n/hu.po
Text conflict in hr_contract/i18n/id.po
Text conflict in hr_contract/i18n/it.po
Conflict adding file hr_contract/i18n/ja.po.  Moved existing file to hr_contract/i18n/ja.po.moved.
Text conflict in hr_contract/i18n/ko.po
Text conflict in hr_contract/i18n/lo.po
Text conflict in hr_contract/i18n/lt.po
Text conflict in hr_contract/i18n/lv.po
Conflict adding file hr_contract/i18n/mk.po.  Moved existing file to hr_contract/i18n/mk.po.moved.
Text conflict in hr_contract/i18n/mn.po
Conflict adding file hr_contract/i18n/nb.po.  Moved existing file to hr_contract/i18n/nb.po.moved.
Text conflict in hr_contract/i18n/nl.po
Text conflict in hr_contract/i18n/nl_BE.po
Text conflict in hr_contract/i18n/pl.po
Text conflict in hr_contract/i18n/pt.po
Text conflict in hr_contract/i18n/pt_BR.po
Text conflict in hr_contract/i18n/ro.po
Text conflict in hr_contract/i18n/ru.po
Text conflict in hr_contract/i18n/sl.po
Text conflict in hr_contract/i18n/sq.po
Text conflict in hr_contract/i18n/sr.po
Text conflict in hr_contract/i18n/sr@latin.po
Text conflict in hr_contract/i18n/sv.po
Text conflict in hr_contract/i18n/tlh.po
Text conflict in hr_contract/i18n/tr.po
Text conflict in hr_contract/i18n/uk.po
Text conflict in hr_contract/i18n/vi.po
Text conflict in hr_contract/i18n/zh_CN.po
Text conflict in hr_contract/i18n/zh_TW.po
Text conflict in hr_evaluation/hr_evaluation_view.xml
Conflict adding file hr_evaluation/i18n/ar.po.  Moved existing file to hr_evaluation/i18n/ar.po.moved.
Conflict adding file hr_evaluation/i18n/bg.po.  Moved existing file to hr_evaluation/i18n/bg.po.moved.
Conflict adding file hr_evaluation/i18n/ca.po.  Moved existing file to hr_evaluation/i18n/ca.po.moved.
Conflict adding file hr_evaluation/i18n/cs.po.  Moved existing file to hr_evaluation/i18n/cs.po.moved.
Conflict adding file hr_evaluation/i18n/da.po.  Moved existing file to hr_evaluation/i18n/da.po.moved.
Text conflict in hr_evaluation/i18n/de.po
Text conflict in hr_evaluation/i18n/es.po
Conflict adding file hr_evaluation/i18n/es_CR.po.  Moved existing file to hr_evaluation/i18n/es_CR.po.moved.
Text conflict in hr_evaluation/i18n/es_EC.po
Text conflict in hr_evaluation/i18n/et.po
Text conflict in hr_evaluation/i18n/fi.po
Text conflict in hr_evaluation/i18n/fr.po
Conflict adding file hr_evaluation/i18n/gl.po.  Moved existing file to hr_evaluation/i18n/gl.po.moved.
Text conflict in hr_evaluation/i18n/hr.po
Text conflict in hr_evaluation/i18n/hu.po
Text conflict in hr_evaluation/i18n/id.po
Text conflict in hr_evaluation/i18n/it.po
Conflict adding file hr_evaluation/i18n/ja.po.  Moved existing file to hr_evaluation/i18n/ja.po.moved.
Conflict adding file hr_evaluation/i18n/mk.po.  Moved existing file to hr_evaluation/i18n/mk.po.moved.
Text conflict in hr_evaluation/i18n/mn.po
Text conflict in hr_evaluation/i18n/nl.po
Text conflict in hr_evaluation/i18n/pt.po
Conflict adding file hr_evaluation/i18n/pt_BR.po.  Moved existing file to hr_evaluation/i18n/pt_BR.po.moved.
Conflict adding file hr_evaluation/i18n/ro.po.  Moved existing file to hr_evaluation/i18n/ro.po.moved.
Text conflict in hr_evaluation/i18n/ru.po
Conflict adding file hr_evaluation/i18n/sl.po.  Moved existing file to hr_evaluation/i18n/sl.po.moved.
Text conflict in hr_evaluation/i18n/sr.po
Text conflict in hr_evaluation/i18n/sr@latin.po
Text conflict in hr_evaluation/i18n/sv.po
Conflict adding file hr_evaluation/i18n/tr.po.  Moved existing file to hr_evaluation/i18n/tr.po.moved.
Text conflict in hr_evaluation/i18n/zh_CN.po
Text conflict in hr_evaluation/wizard/hr_evaluation_mail.py
Text conflict in hr_expense/i18n/ar.po
Text conflict in hr_expense/i18n/bg.po
Text conflict in hr_expense/i18n/bs.po
Text conflict in hr_expense/i18n/ca.po
Text conflict in hr_expense/i18n/cs.po
Conflict adding file hr_expense/i18n/da.po.  Moved existing file to hr_expense/i18n/da.po.moved.
Text conflict in hr_expense/i18n/de.po
Text conflict in hr_expense/i18n/el.po
Text conflict in hr_expense/i18n/es.po
Text conflict in hr_expense/i18n/es_AR.po
Conflict adding file hr_expense/i18n/es_CR.po.  Moved existing file to hr_expense/i18n/es_CR.po.moved.
Text conflict in hr_expense/i18n/es_EC.po
Text conflict in hr_expense/i18n/et.po
Text conflict in hr_expense/i18n/fi.po
Text conflict in hr_expense/i18n/fr.po
Text conflict in hr_expense/i18n/hr.po
Text conflict in hr_expense/i18n/hr_expense.pot
Text conflict in hr_expense/i18n/hu.po
Text conflict in hr_expense/i18n/id.po
Text conflict in hr_expense/i18n/it.po
Conflict adding file hr_expense/i18n/ja.po.  Moved existing file to hr_expense/i18n/ja.po.moved.
Text conflict in hr_expense/i18n/ko.po
Text conflict in hr_expense/i18n/lt.po
Text conflict in hr_expense/i18n/lv.po
Conflict adding file hr_expense/i18n/mk.po.  Moved existing file to hr_expense/i18n/mk.po.moved.
Text conflict in hr_expense/i18n/mn.po
Conflict adding file hr_expense/i18n/nb.po.  Moved existing file to hr_expense/i18n/nb.po.moved.
Text conflict in hr_expense/i18n/nl.po
Text conflict in hr_expense/i18n/nl_BE.po
Text conflict in hr_expense/i18n/pl.po
Text conflict in hr_expense/i18n/pt.po
Text conflict in hr_expense/i18n/pt_BR.po
Text conflict in hr_expense/i18n/ro.po
Text conflict in hr_expense/i18n/ru.po
Text conflict in hr_expense/i18n/sl.po
Text conflict in hr_expense/i18n/sq.po
Text conflict in hr_expense/i18n/sr.po
Text conflict in hr_expense/i18n/sr@latin.po
Text conflict in hr_expense/i18n/sv.po
Text conflict in hr_expense/i18n/tlh.po
Text conflict in hr_expense/i18n/tr.po
Text conflict in hr_expense/i18n/uk.po
Text conflict in hr_expense/i18n/vi.po
Text conflict in hr_expense/i18n/zh_CN.po
Text conflict in hr_expense/i18n/zh_TW.po
Text conflict in hr_expense/security/ir_rule.xml
Text conflict in hr_holidays/hr_holidays.py
Text conflict in hr_holidays/hr_holidays_view.xml
Text conflict in hr_holidays/i18n/ar.po
Text conflict in hr_holidays/i18n/bg.po
Text conflict in hr_holidays/i18n/bs.po
Text conflict in hr_holidays/i18n/ca.po
Text conflict in hr_holidays/i18n/cs.po
Conflict adding file hr_holidays/i18n/da.po.  Moved existing file to hr_holidays/i18n/da.po.moved.
Text conflict in hr_holidays/i18n/de.po
Text conflict in hr_holidays/i18n/el.po
Text conflict in hr_holidays/i18n/es.po
Text conflict in hr_holidays/i18n/es_AR.po
Conflict adding file hr_holidays/i18n/es_CR.po.  Moved existing file to hr_holidays/i18n/es_CR.po.moved.
Text conflict in hr_holidays/i18n/es_EC.po
Text conflict in hr_holidays/i18n/et.po
Text conflict in hr_holidays/i18n/fi.po
Text conflict in hr_holidays/i18n/fr.po
Conflict adding file hr_holidays/i18n/gu.po.  Moved existing file to hr_holidays/i18n/gu.po.moved.
Text conflict in hr_holidays/i18n/hi.po
Text conflict in hr_holidays/i18n/hr.po
Text conflict in hr_holidays/i18n/hu.po
Text conflict in hr_holidays/i18n/id.po
Text conflict in hr_holidays/i18n/it.po
Conflict adding file hr_holidays/i18n/ja.po.  Moved existing file to hr_holidays/i18n/ja.po.moved.
Text conflict in hr_holidays/i18n/ko.po
Text conflict in hr_holidays/i18n/lt.po
Text conflict in hr_holidays/i18n/lv.po
Conflict adding file hr_holidays/i18n/mk.po.  Moved existing file to hr_holidays/i18n/mk.po.moved.
Text conflict in hr_holidays/i18n/mn.po
Conflict adding file hr_holidays/i18n/nb.po.  Moved existing file to hr_holidays/i18n/nb.po.moved.
Text conflict in hr_holidays/i18n/nl.po
Text conflict in hr_holidays/i18n/nl_BE.po
Text conflict in hr_holidays/i18n/pl.po
Text conflict in hr_holidays/i18n/pt.po
Text conflict in hr_holidays/i18n/pt_BR.po
Text conflict in hr_holidays/i18n/ro.po
Text conflict in hr_holidays/i18n/ru.po
Text conflict in hr_holidays/i18n/sl.po
Text conflict in hr_holidays/i18n/sq.po
Text conflict in hr_holidays/i18n/sr.po
Text conflict in hr_holidays/i18n/sr@latin.po
Text conflict in hr_holidays/i18n/sv.po
Text conflict in hr_holidays/i18n/th.po
Text conflict in hr_holidays/i18n/tlh.po
Text conflict in hr_holidays/i18n/tr.po
Text conflict in hr_holidays/i18n/uk.po
Text conflict in hr_holidays/i18n/vi.po
Text conflict in hr_holidays/i18n/zh_CN.po
Text conflict in hr_holidays/i18n/zh_TW.po
Text conflict in hr_holidays/report/holidays_summary_report.py
Text conflict in hr_holidays/security/ir_rule.xml
Text conflict in hr_payroll/hr_payroll.py
Conflict adding file hr_payroll/i18n/ar.po.  Moved existing file to hr_payroll/i18n/ar.po.moved.
Conflict adding file hr_payroll/i18n/bg.po.  Moved existing file to hr_payroll/i18n/bg.po.moved.
Conflict adding file hr_payroll/i18n/ca.po.  Moved existing file to hr_payroll/i18n/ca.po.moved.
Conflict adding file hr_payroll/i18n/cs.po.  Moved existing file to hr_payroll/i18n/cs.po.moved.
Conflict adding file hr_payroll/i18n/da.po.  Moved existing file to hr_payroll/i18n/da.po.moved.
Text conflict in hr_payroll/i18n/de.po
Conflict adding file hr_payroll/i18n/en_GB.po.  Moved existing file to hr_payroll/i18n/en_GB.po.moved.
Text conflict in hr_payroll/i18n/es.po
Conflict adding file hr_payroll/i18n/es_CR.po.  Moved existing file to hr_payroll/i18n/es_CR.po.moved.
Text conflict in hr_payroll/i18n/es_EC.po
Conflict adding file hr_payroll/i18n/es_MX.po.  Moved existing file to hr_payroll/i18n/es_MX.po.moved.
Text conflict in hr_payroll/i18n/et.po
Conflict adding file hr_payroll/i18n/fi.po.  Moved existing file to hr_payroll/i18n/fi.po.moved.
Text conflict in hr_payroll/i18n/fr.po
Conflict adding file hr_payroll/i18n/gl.po.  Moved existing file to hr_payroll/i18n/gl.po.moved.
Conflict adding file hr_payroll/i18n/gu.po.  Moved existing file to hr_payroll/i18n/gu.po.moved.
Conflict adding file hr_payroll/i18n/he.po.  Moved existing file to hr_payroll/i18n/he.po.moved.
Text conflict in hr_payroll/i18n/hr.po
Text conflict in hr_payroll/i18n/hr_payroll.pot
Text conflict in hr_payroll/i18n/hu.po
Conflict adding file hr_payroll/i18n/id.po.  Moved existing file to hr_payroll/i18n/id.po.moved.
Text conflict in hr_payroll/i18n/it.po
Conflict adding file hr_payroll/i18n/ja.po.  Moved existing file to hr_payroll/i18n/ja.po.moved.
Text conflict in hr_payroll/i18n/lo.po
Conflict adding file hr_payroll/i18n/lt.po.  Moved existing file to hr_payroll/i18n/lt.po.moved.
Conflict adding file hr_payroll/i18n/lv.po.  Moved existing file to hr_payroll/i18n/lv.po.moved.
Conflict adding file hr_payroll/i18n/mk.po.  Moved existing file to hr_payroll/i18n/mk.po.moved.
Text conflict in hr_payroll/i18n/mn.po
Conflict adding file hr_payroll/i18n/nb.po.  Moved existing file to hr_payroll/i18n/nb.po.moved.
Text conflict in hr_payroll/i18n/nl.po
Text conflict in hr_payroll/i18n/pl.po
Text conflict in hr_payroll/i18n/pt.po
Conflict adding file hr_payroll/i18n/pt_BR.po.  Moved existing file to hr_payroll/i18n/pt_BR.po.moved.
Conflict adding file hr_payroll/i18n/ro.po.  Moved existing file to hr_payroll/i18n/ro.po.moved.
Text conflict in hr_payroll/i18n/ru.po
Conflict adding file hr_payroll/i18n/sl.po.  Moved existing file to hr_payroll/i18n/sl.po.moved.
Text conflict in hr_payroll/i18n/sr.po
Text conflict in hr_payroll/i18n/sr@latin.po
Text conflict in hr_payroll/i18n/sv.po
Conflict adding file hr_payroll/i18n/tr.po.  Moved existing file to hr_payroll/i18n/tr.po.moved.
Conflict adding file hr_payroll/i18n/vi.po.  Moved existing file to hr_payroll/i18n/vi.po.moved.
Text conflict in hr_payroll/i18n/zh_CN.po
Contents conflict in hr_payroll/test/payment_advice.yml
Contents conflict in hr_payroll/test/payroll_register.yml
Text conflict in hr_payroll/test/payslip.yml
Text conflict in hr_payroll_account/hr_payroll_account.py
Text conflict in hr_payroll_account/hr_payroll_account_view.xml
Conflict adding file hr_payroll_account/i18n/ar.po.  Moved existing file to hr_payroll_account/i18n/ar.po.moved.
Conflict adding file hr_payroll_account/i18n/bg.po.  Moved existing file to hr_payroll_account/i18n/bg.po.moved.
Conflict adding file hr_payroll_account/i18n/ca.po.  Moved existing file to hr_payroll_account/i18n/ca.po.moved.
Conflict adding file hr_payroll_account/i18n/cs.po.  Moved existing file to hr_payroll_account/i18n/cs.po.moved.
Conflict adding file hr_payroll_account/i18n/da.po.  Moved existing file to hr_payroll_account/i18n/da.po.moved.
Text conflict in hr_payroll_account/i18n/de.po
Conflict adding file hr_payroll_account/i18n/en_GB.po.  Moved existing file to hr_payroll_account/i18n/en_GB.po.moved.
Text conflict in hr_payroll_account/i18n/es.po
Conflict adding file hr_payroll_account/i18n/es_CR.po.  Moved existing file to hr_payroll_account/i18n/es_CR.po.moved.
Conflict adding file hr_payroll_account/i18n/es_EC.po.  Moved existing file to hr_payroll_account/i18n/es_EC.po.moved.
Conflict adding file hr_payroll_account/i18n/es_PY.po.  Moved existing file to hr_payroll_account/i18n/es_PY.po.moved.
Text conflict in hr_payroll_account/i18n/fr.po
Conflict adding file hr_payroll_account/i18n/gl.po.  Moved existing file to hr_payroll_account/i18n/gl.po.moved.
Conflict adding file hr_payroll_account/i18n/gu.po.  Moved existing file to hr_payroll_account/i18n/gu.po.moved.
Conflict adding file hr_payroll_account/i18n/hr.po.  Moved existing file to hr_payroll_account/i18n/hr.po.moved.
Text conflict in hr_payroll_account/i18n/hr_payroll_account.pot
Text conflict in hr_payroll_account/i18n/hu.po
Conflict adding file hr_payroll_account/i18n/id.po.  Moved existing file to hr_payroll_account/i18n/id.po.moved.
Text conflict in hr_payroll_account/i18n/it.po
Conflict adding file hr_payroll_account/i18n/ja.po.  Moved existing file to hr_payroll_account/i18n/ja.po.moved.
Conflict adding file hr_payroll_account/i18n/lt.po.  Moved existing file to hr_payroll_account/i18n/lt.po.moved.
Conflict adding file hr_payroll_account/i18n/lv.po.  Moved existing file to hr_payroll_account/i18n/lv.po.moved.
Conflict adding file hr_payroll_account/i18n/mk.po.  Moved existing file to hr_payroll_account/i18n/mk.po.moved.
Text conflict in hr_payroll_account/i18n/mn.po
Conflict adding file hr_payroll_account/i18n/nb.po.  Moved existing file to hr_payroll_account/i18n/nb.po.moved.
Conflict adding file hr_payroll_account/i18n/nl.po.  Moved existing file to hr_payroll_account/i18n/nl.po.moved.
Text conflict in hr_payroll_account/i18n/pl.po
Text conflict in hr_payroll_account/i18n/pt.po
Conflict adding file hr_payroll_account/i18n/pt_BR.po.  Moved existing file to hr_payroll_account/i18n/pt_BR.po.moved.
Conflict adding file hr_payroll_account/i18n/ro.po.  Moved existing file to hr_payroll_account/i18n/ro.po.moved.
Conflict adding file hr_payroll_account/i18n/ru.po.  Moved existing file to hr_payroll_account/i18n/ru.po.moved.
Conflict adding file hr_payroll_account/i18n/sl.po.  Moved existing file to hr_payroll_account/i18n/sl.po.moved.
Text conflict in hr_payroll_account/i18n/sr@latin.po
Text conflict in hr_payroll_account/i18n/sv.po
Conflict adding file hr_payroll_account/i18n/tr.po.  Moved existing file to hr_payroll_account/i18n/tr.po.moved.
Conflict adding file hr_payroll_account/i18n/zh_CN.po.  Moved existing file to hr_payroll_account/i18n/zh_CN.po.moved.
Text conflict in hr_recruitment/hr_recruitment.py
Text conflict in hr_recruitment/hr_recruitment_view.xml
Conflict adding file hr_recruitment/i18n/ar.po.  Moved existing file to hr_recruitment/i18n/ar.po.moved.
Conflict adding file hr_recruitment/i18n/bg.po.  Moved existing file to hr_recruitment/i18n/bg.po.moved.
Conflict adding file hr_recruitment/i18n/ca.po.  Moved existing file to hr_recruitment/i18n/ca.po.moved.
Conflict adding file hr_recruitment/i18n/cs.po.  Moved existing file to hr_recruitment/i18n/cs.po.moved.
Conflict adding file hr_recruitment/i18n/da.po.  Moved existing file to hr_recruitment/i18n/da.po.moved.
Text conflict in hr_recruitment/i18n/de.po
Text conflict in hr_recruitment/i18n/es.po
Conflict adding file hr_recruitment/i18n/es_CR.po.  Moved existing file to hr_recruitment/i18n/es_CR.po.moved.
Text conflict in hr_recruitment/i18n/fr.po
Text conflict in hr_recruitment/i18n/hi.po
Conflict adding file hr_recruitment/i18n/hr.po.  Moved existing file to hr_recruitment/i18n/hr.po.moved.
Text conflict in hr_recruitment/i18n/hr_recruitment.pot
Text conflict in hr_recruitment/i18n/hu.po
Conflict adding file hr_recruitment/i18n/id.po.  Moved existing file to hr_recruitment/i18n/id.po.moved.
Text conflict in hr_recruitment/i18n/it.po
Conflict adding file hr_recruitment/i18n/ja.po.  Moved existing file to hr_recruitment/i18n/ja.po.moved.
Conflict adding file hr_recruitment/i18n/mk.po.  Moved existing file to hr_recruitment/i18n/mk.po.moved.
Text conflict in hr_recruitment/i18n/mn.po
Conflict adding file hr_recruitment/i18n/nb.po.  Moved existing file to hr_recruitment/i18n/nb.po.moved.
Text conflict in hr_recruitment/i18n/nl.po
Conflict adding file hr_recruitment/i18n/pl.po.  Moved existing file to hr_recruitment/i18n/pl.po.moved.
Text conflict in hr_recruitment/i18n/pt.po
Conflict adding file hr_recruitment/i18n/pt_BR.po.  Moved existing file to hr_recruitment/i18n/pt_BR.po.moved.
Conflict adding file hr_recruitment/i18n/ro.po.  Moved existing file to hr_recruitment/i18n/ro.po.moved.
Text conflict in hr_recruitment/i18n/ru.po
Conflict adding file hr_recruitment/i18n/sl.po.  Moved existing file to hr_recruitment/i18n/sl.po.moved.
Text conflict in hr_recruitment/i18n/sr.po
Text conflict in hr_recruitment/i18n/sr@latin.po
Text conflict in hr_recruitment/i18n/sv.po
Conflict adding file hr_recruitment/i18n/tr.po.  Moved existing file to hr_recruitment/i18n/tr.po.moved.
Conflict adding file hr_recruitment/i18n/vi.po.  Moved existing file to hr_recruitment/i18n/vi.po.moved.
Text conflict in hr_recruitment/i18n/zh_CN.po
Contents conflict in hr_recruitment/test/test_hr_recruitment.yml
Text conflict in hr_timesheet/hr_timesheet_data.xml
Text conflict in hr_timesheet/i18n/ar.po
Text conflict in hr_timesheet/i18n/bg.po
Text conflict in hr_timesheet/i18n/bs.po
Text conflict in hr_timesheet/i18n/ca.po
Text conflict in hr_timesheet/i18n/cs.po
Conflict adding file hr_timesheet/i18n/da.po.  Moved existing file to hr_timesheet/i18n/da.po.moved.
Text conflict in hr_timesheet/i18n/de.po
Text conflict in hr_timesheet/i18n/el.po
Conflict adding file hr_timesheet/i18n/en_GB.po.  Moved existing file to hr_timesheet/i18n/en_GB.po.moved.
Text conflict in hr_timesheet/i18n/es.po
Text conflict in hr_timesheet/i18n/es_AR.po
Conflict adding file hr_timesheet/i18n/es_CR.po.  Moved existing file to hr_timesheet/i18n/es_CR.po.moved.
Conflict adding file hr_timesheet/i18n/es_EC.po.  Moved existing file to hr_timesheet/i18n/es_EC.po.moved.
Text conflict in hr_timesheet/i18n/et.po
Text conflict in hr_timesheet/i18n/fi.po
Text conflict in hr_timesheet/i18n/fr.po
Conflict adding file hr_timesheet/i18n/gl.po.  Moved existing file to hr_timesheet/i18n/gl.po.moved.
Text conflict in hr_timesheet/i18n/hr.po
Text conflict in hr_timesheet/i18n/hr_timesheet.pot
Text conflict in hr_timesheet/i18n/hu.po
Text conflict in hr_timesheet/i18n/id.po
Text conflict in hr_timesheet/i18n/it.po
Conflict adding file hr_timesheet/i18n/ja.po.  Moved existing file to hr_timesheet/i18n/ja.po.moved.
Text conflict in hr_timesheet/i18n/ko.po
Text conflict in hr_timesheet/i18n/lt.po
Text conflict in hr_timesheet/i18n/lv.po
Conflict adding file hr_timesheet/i18n/mk.po.  Moved existing file to hr_timesheet/i18n/mk.po.moved.
Text conflict in hr_timesheet/i18n/mn.po
Conflict adding file hr_timesheet/i18n/nb.po.  Moved existing file to hr_timesheet/i18n/nb.po.moved.
Text conflict in hr_timesheet/i18n/nl.po
Text conflict in hr_timesheet/i18n/pl.po
Text conflict in hr_timesheet/i18n/pt.po
Text conflict in hr_timesheet/i18n/pt_BR.po
Text conflict in hr_timesheet/i18n/ro.po
Text conflict in hr_timesheet/i18n/ru.po
Text conflict in hr_timesheet/i18n/sl.po
Text conflict in hr_timesheet/i18n/sq.po
Text conflict in hr_timesheet/i18n/sr@latin.po
Text conflict in hr_timesheet/i18n/sv.po
Text conflict in hr_timesheet/i18n/tlh.po
Text conflict in hr_timesheet/i18n/tr.po
Text conflict in hr_timesheet/i18n/uk.po
Text conflict in hr_timesheet/i18n/vi.po
Text conflict in hr_timesheet/i18n/zh_CN.po
Text conflict in hr_timesheet/i18n/zh_TW.po
Text conflict in hr_timesheet/test/test_hr_timesheet.yml
Text conflict in hr_timesheet_invoice/i18n/ar.po
Text conflict in hr_timesheet_invoice/i18n/bg.po
Text conflict in hr_timesheet_invoice/i18n/bs.po
Text conflict in hr_timesheet_invoice/i18n/ca.po
Text conflict in hr_timesheet_invoice/i18n/cs.po
Conflict adding file hr_timesheet_invoice/i18n/da.po.  Moved existing file to hr_timesheet_invoice/i18n/da.po.moved.
Text conflict in hr_timesheet_invoice/i18n/de.po
Text conflict in hr_timesheet_invoice/i18n/el.po
Text conflict in hr_timesheet_invoice/i18n/es.po
Text conflict in hr_timesheet_invoice/i18n/es_AR.po
Conflict adding file hr_timesheet_invoice/i18n/es_CR.po.  Moved existing file to hr_timesheet_invoice/i18n/es_CR.po.moved.
Conflict adding file hr_timesheet_invoice/i18n/es_EC.po.  Moved existing file to hr_timesheet_invoice/i18n/es_EC.po.moved.
Text conflict in hr_timesheet_invoice/i18n/et.po
Text conflict in hr_timesheet_invoice/i18n/fi.po
Text conflict in hr_timesheet_invoice/i18n/fr.po
Text conflict in hr_timesheet_invoice/i18n/hr.po
Text conflict in hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
Text conflict in hr_timesheet_invoice/i18n/hu.po
Text conflict in hr_timesheet_invoice/i18n/id.po
Text conflict in hr_timesheet_invoice/i18n/it.po
Conflict adding file hr_timesheet_invoice/i18n/ja.po.  Moved existing file to hr_timesheet_invoice/i18n/ja.po.moved.
Text conflict in hr_timesheet_invoice/i18n/ko.po
Text conflict in hr_timesheet_invoice/i18n/lt.po
Text conflict in hr_timesheet_invoice/i18n/lv.po
Conflict adding file hr_timesheet_invoice/i18n/mk.po.  Moved existing file to hr_timesheet_invoice/i18n/mk.po.moved.
Text conflict in hr_timesheet_invoice/i18n/mn.po
Text conflict in hr_timesheet_invoice/i18n/nl.po
Text conflict in hr_timesheet_invoice/i18n/nl_BE.po
Text conflict in hr_timesheet_invoice/i18n/pl.po
Text conflict in hr_timesheet_invoice/i18n/pt.po
Text conflict in hr_timesheet_invoice/i18n/pt_BR.po
Text conflict in hr_timesheet_invoice/i18n/ro.po
Text conflict in hr_timesheet_invoice/i18n/ru.po
Text conflict in hr_timesheet_invoice/i18n/sl.po
Text conflict in hr_timesheet_invoice/i18n/sq.po
Text conflict in hr_timesheet_invoice/i18n/sr@latin.po
Text conflict in hr_timesheet_invoice/i18n/sv.po
Text conflict in hr_timesheet_invoice/i18n/tlh.po
Text conflict in hr_timesheet_invoice/i18n/tr.po
Text conflict in hr_timesheet_invoice/i18n/uk.po
Text conflict in hr_timesheet_invoice/i18n/vi.po
Text conflict in hr_timesheet_invoice/i18n/zh_CN.po
Text conflict in hr_timesheet_invoice/i18n/zh_TW.po
Text conflict in hr_timesheet_sheet/hr_timesheet_sheet.py
Text conflict in hr_timesheet_sheet/hr_timesheet_sheet_view.xml
Text conflict in hr_timesheet_sheet/i18n/ar.po
Text conflict in hr_timesheet_sheet/i18n/bg.po
Text conflict in hr_timesheet_sheet/i18n/bs.po
Text conflict in hr_timesheet_sheet/i18n/ca.po
Text conflict in hr_timesheet_sheet/i18n/cs.po
Conflict adding file hr_timesheet_sheet/i18n/da.po.  Moved existing file to hr_timesheet_sheet/i18n/da.po.moved.
Text conflict in hr_timesheet_sheet/i18n/de.po
Text conflict in hr_timesheet_sheet/i18n/el.po
Text conflict in hr_timesheet_sheet/i18n/es.po
Text conflict in hr_timesheet_sheet/i18n/es_AR.po
Conflict adding file hr_timesheet_sheet/i18n/es_CR.po.  Moved existing file to hr_timesheet_sheet/i18n/es_CR.po.moved.
Conflict adding file hr_timesheet_sheet/i18n/es_EC.po.  Moved existing file to hr_timesheet_sheet/i18n/es_EC.po.moved.
Text conflict in hr_timesheet_sheet/i18n/et.po
Text conflict in hr_timesheet_sheet/i18n/fi.po
Text conflict in hr_timesheet_sheet/i18n/fr.po
Text conflict in hr_timesheet_sheet/i18n/hr.po
Text conflict in hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
Text conflict in hr_timesheet_sheet/i18n/hu.po
Text conflict in hr_timesheet_sheet/i18n/id.po
Text conflict in hr_timesheet_sheet/i18n/it.po
Conflict adding file hr_timesheet_sheet/i18n/ja.po.  Moved existing file to hr_timesheet_sheet/i18n/ja.po.moved.
Text conflict in hr_timesheet_sheet/i18n/ko.po
Text conflict in hr_timesheet_sheet/i18n/lt.po
Text conflict in hr_timesheet_sheet/i18n/lv.po
Conflict adding file hr_timesheet_sheet/i18n/mk.po.  Moved existing file to hr_timesheet_sheet/i18n/mk.po.moved.
Text conflict in hr_timesheet_sheet/i18n/mn.po
Text conflict in hr_timesheet_sheet/i18n/nl.po
Text conflict in hr_timesheet_sheet/i18n/nl_BE.po
Text conflict in hr_timesheet_sheet/i18n/pl.po
Text conflict in hr_timesheet_sheet/i18n/pt.po
Text conflict in hr_timesheet_sheet/i18n/pt_BR.po
Text conflict in hr_timesheet_sheet/i18n/ro.po
Text conflict in hr_timesheet_sheet/i18n/ru.po
Conflict adding file hr_timesheet_sheet/i18n/sk.po.  Moved existing file to hr_timesheet_sheet/i18n/sk.po.moved.
Text conflict in hr_timesheet_sheet/i18n/sl.po
Text conflict in hr_timesheet_sheet/i18n/sq.po
Text conflict in hr_timesheet_sheet/i18n/sv.po
Text conflict in hr_timesheet_sheet/i18n/tlh.po
Text conflict in hr_timesheet_sheet/i18n/tr.po
Text conflict in hr_timesheet_sheet/i18n/uk.po
Text conflict in hr_timesheet_sheet/i18n/vi.po
Text conflict in hr_timesheet_sheet/i18n/zh_CN.po
Text conflict in hr_timesheet_sheet/i18n/zh_TW.po
Text conflict in hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
Conflict adding file html_view/i18n/ar.po.  Moved existing file to html_view/i18n/ar.po.moved.
Conflict adding file html_view/i18n/bg.po.  Moved existing file to html_view/i18n/bg.po.moved.
Conflict adding file html_view/i18n/ca.po.  Moved existing file to html_view/i18n/ca.po.moved.
Conflict adding file html_view/i18n/cs.po.  Moved existing file to html_view/i18n/cs.po.moved.
Conflict adding file html_view/i18n/da.po.  Moved existing file to html_view/i18n/da.po.moved.
Text conflict in html_view/i18n/de.po
Conflict adding file html_view/i18n/el.po.  Moved existing file to html_view/i18n/el.po.moved.
Conflict adding file html_view/i18n/en_GB.po.  Moved existing file to html_view/i18n/en_GB.po.moved.
Text conflict in html_view/i18n/es.po
Conflict adding file html_view/i18n/es_AR.po.  Moved existing file to html_view/i18n/es_AR.po.moved.
Conflict adding file html_view/i18n/es_CR.po.  Moved existing file to html_view/i18n/es_CR.po.moved.
Conflict adding file html_view/i18n/es_PY.po.  Moved existing file to html_view/i18n/es_PY.po.moved.
Conflict adding file html_view/i18n/et.po.  Moved existing file to html_view/i18n/et.po.moved.
Conflict adding file html_view/i18n/fi.po.  Moved existing file to html_view/i18n/fi.po.moved.
Text conflict in html_view/i18n/fr.po
Conflict adding file html_view/i18n/gl.po.  Moved existing file to html_view/i18n/gl.po.moved.
Conflict adding file html_view/i18n/hi.po.  Moved existing file to html_view/i18n/hi.po.moved.
Conflict adding file html_view/i18n/hr.po.  Moved existing file to html_view/i18n/hr.po.moved.
Text conflict in html_view/i18n/hu.po
Text conflict in html_view/i18n/it.po
Conflict adding file html_view/i18n/ja.po.  Moved existing file to html_view/i18n/ja.po.moved.
Conflict adding file html_view/i18n/lt.po.  Moved existing file to html_view/i18n/lt.po.moved.
Conflict adding file html_view/i18n/mk.po.  Moved existing file to html_view/i18n/mk.po.moved.
Text conflict in html_view/i18n/mn.po
Text conflict in html_view/i18n/nb.po
Text conflict in html_view/i18n/nl.po
Conflict adding file html_view/i18n/pl.po.  Moved existing file to html_view/i18n/pl.po.moved.
Text conflict in html_view/i18n/pt.po
Text conflict in html_view/i18n/pt_BR.po
Text conflict in html_view/i18n/ro.po
Text conflict in html_view/i18n/ru.po
Conflict adding file html_view/i18n/sk.po.  Moved existing file to html_view/i18n/sk.po.moved.
Conflict adding file html_view/i18n/sl.po.  Moved existing file to html_view/i18n/sl.po.moved.
Text conflict in html_view/i18n/sr.po
Text conflict in html_view/i18n/sr@latin.po
Text conflict in html_view/i18n/sv.po
Text conflict in html_view/i18n/tr.po
Conflict adding file html_view/i18n/vi.po.  Moved existing file to html_view/i18n/vi.po.moved.
Text conflict in html_view/i18n/zh_CN.po
Text conflict in idea/i18n/ar.po
Text conflict in idea/i18n/bg.po
Text conflict in idea/i18n/bs.po
Text conflict in idea/i18n/ca.po
Text conflict in idea/i18n/cs.po
Text conflict in idea/i18n/da.po
Text conflict in idea/i18n/de.po
Text conflict in idea/i18n/el.po
Conflict adding file idea/i18n/en_GB.po.  Moved existing file to idea/i18n/en_GB.po.moved.
Text conflict in idea/i18n/es.po
Text conflict in idea/i18n/es_AR.po
Conflict adding file idea/i18n/es_CR.po.  Moved existing file to idea/i18n/es_CR.po.moved.
Text conflict in idea/i18n/et.po
Text conflict in idea/i18n/fi.po
Text conflict in idea/i18n/fr.po
Conflict adding file idea/i18n/gl.po.  Moved existing file to idea/i18n/gl.po.moved.
Conflict adding file idea/i18n/gu.po.  Moved existing file to idea/i18n/gu.po.moved.
Text conflict in idea/i18n/hi.po
Text conflict in idea/i18n/hr.po
Text conflict in idea/i18n/hu.po
Text conflict in idea/i18n/id.po
Text conflict in idea/i18n/it.po
Conflict adding file idea/i18n/ja.po.  Moved existing file to idea/i18n/ja.po.moved.
Text conflict in idea/i18n/ko.po
Text conflict in idea/i18n/lt.po
Conflict adding file idea/i18n/lv.po.  Moved existing file to idea/i18n/lv.po.moved.
Conflict adding file idea/i18n/mk.po.  Moved existing file to idea/i18n/mk.po.moved.
Text conflict in idea/i18n/mn.po
Text conflict in idea/i18n/nl.po
Text conflict in idea/i18n/pl.po
Text conflict in idea/i18n/pt.po
Text conflict in idea/i18n/pt_BR.po
Text conflict in idea/i18n/ro.po
Text conflict in idea/i18n/ru.po
Text conflict in idea/i18n/sk.po
Text conflict in idea/i18n/sl.po
Text conflict in idea/i18n/sq.po
Text conflict in idea/i18n/sr@latin.po
Text conflict in idea/i18n/sv.po
Text conflict in idea/i18n/tlh.po
Text conflict in idea/i18n/tr.po
Text conflict in idea/i18n/uk.po
Text conflict in idea/i18n/vi.po
Text conflict in idea/i18n/zh_CN.po
Text conflict in idea/i18n/zh_TW.po
Conflict adding file knowledge/i18n/ar.po.  Moved existing file to knowledge/i18n/ar.po.moved.
Conflict adding file knowledge/i18n/bg.po.  Moved existing file to knowledge/i18n/bg.po.moved.
Conflict adding file knowledge/i18n/ca.po.  Moved existing file to knowledge/i18n/ca.po.moved.
Conflict adding file knowledge/i18n/cs.po.  Moved existing file to knowledge/i18n/cs.po.moved.
Conflict adding file knowledge/i18n/da.po.  Moved existing file to knowledge/i18n/da.po.moved.
Text conflict in knowledge/i18n/de.po
Conflict adding file knowledge/i18n/en_GB.po.  Moved existing file to knowledge/i18n/en_GB.po.moved.
Text conflict in knowledge/i18n/es.po
Conflict adding file knowledge/i18n/es_AR.po.  Moved existing file to knowledge/i18n/es_AR.po.moved.
Conflict adding file knowledge/i18n/es_CR.po.  Moved existing file to knowledge/i18n/es_CR.po.moved.
Text conflict in knowledge/i18n/et.po
Text conflict in knowledge/i18n/fi.po
Text conflict in knowledge/i18n/fr.po
Conflict adding file knowledge/i18n/gl.po.  Moved existing file to knowledge/i18n/gl.po.moved.
Text conflict in knowledge/i18n/hi.po
Text conflict in knowledge/i18n/hr.po
Text conflict in knowledge/i18n/hu.po
Text conflict in knowledge/i18n/it.po
Conflict adding file knowledge/i18n/ja.po.  Moved existing file to knowledge/i18n/ja.po.moved.
Text conflict in knowledge/i18n/knowledge.pot
Conflict adding file knowledge/i18n/lo.po.  Moved existing file to knowledge/i18n/lo.po.moved.
Conflict adding file knowledge/i18n/lv.po.  Moved existing file to knowledge/i18n/lv.po.moved.
Conflict adding file knowledge/i18n/mk.po.  Moved existing file to knowledge/i18n/mk.po.moved.
Text conflict in knowledge/i18n/mn.po
Conflict adding file knowledge/i18n/nb.po.  Moved existing file to knowledge/i18n/nb.po.moved.
Text conflict in knowledge/i18n/nl.po
Conflict adding file knowledge/i18n/nl_BE.po.  Moved existing file to knowledge/i18n/nl_BE.po.moved.
Text conflict in knowledge/i18n/pl.po
Text conflict in knowledge/i18n/pt.po
Text conflict in knowledge/i18n/pt_BR.po
Conflict adding file knowledge/i18n/ro.po.  Moved existing file to knowledge/i18n/ro.po.moved.
Text conflict in knowledge/i18n/ru.po
Conflict adding file knowledge/i18n/sk.po.  Moved existing file to knowledge/i18n/sk.po.moved.
Conflict adding file knowledge/i18n/sl.po.  Moved existing file to knowledge/i18n/sl.po.moved.
Text conflict in knowledge/i18n/sr.po
Text conflict in knowledge/i18n/sr@latin.po
Text conflict in knowledge/i18n/sv.po
Conflict adding file knowledge/i18n/tr.po.  Moved existing file to knowledge/i18n/tr.po.moved.
Text conflict in knowledge/i18n/zh_CN.po
Conflict adding file knowledge/i18n/zh_TW.po.  Moved existing file to knowledge/i18n/zh_TW.po.moved.
Conflict adding file l10n_at.  Moved existing file to l10n_at.moved.
Text conflict in l10n_be/i18n/ar.po
Text conflict in l10n_be/i18n/bg.po
Text conflict in l10n_be/i18n/bs.po
Text conflict in l10n_be/i18n/ca.po
Text conflict in l10n_be/i18n/cs.po
Conflict adding file l10n_be/i18n/da.po.  Moved existing file to l10n_be/i18n/da.po.moved.
Text conflict in l10n_be/i18n/de.po
Conflict adding file l10n_be/i18n/en_GB.po.  Moved existing file to l10n_be/i18n/en_GB.po.moved.
Text conflict in l10n_be/i18n/es.po
Text conflict in l10n_be/i18n/es_AR.po
Conflict adding file l10n_be/i18n/es_CR.po.  Moved existing file to l10n_be/i18n/es_CR.po.moved.
Text conflict in l10n_be/i18n/et.po
Text conflict in l10n_be/i18n/fi.po
Text conflict in l10n_be/i18n/fr.po
Conflict adding file l10n_be/i18n/gl.po.  Moved existing file to l10n_be/i18n/gl.po.moved.
Text conflict in l10n_be/i18n/hr.po
Text conflict in l10n_be/i18n/hu.po
Text conflict in l10n_be/i18n/id.po
Text conflict in l10n_be/i18n/it.po
Conflict adding file l10n_be/i18n/ja.po.  Moved existing file to l10n_be/i18n/ja.po.moved.
Text conflict in l10n_be/i18n/ko.po
Text conflict in l10n_be/i18n/lt.po
Conflict adding file l10n_be/i18n/mk.po.  Moved existing file to l10n_be/i18n/mk.po.moved.
Text conflict in l10n_be/i18n/nl.po
Text conflict in l10n_be/i18n/nl_BE.po
Text conflict in l10n_be/i18n/pl.po
Text conflict in l10n_be/i18n/pt.po
Text conflict in l10n_be/i18n/pt_BR.po
Text conflict in l10n_be/i18n/ro.po
Text conflict in l10n_be/i18n/ru.po
Text conflict in l10n_be/i18n/sl.po
Text conflict in l10n_be/i18n/sq.po
Text conflict in l10n_be/i18n/sr@latin.po
Text conflict in l10n_be/i18n/sv.po
Text conflict in l10n_be/i18n/tlh.po
Text conflict in l10n_be/i18n/tr.po
Text conflict in l10n_be/i18n/uk.po
Text conflict in l10n_be/i18n/vi.po
Text conflict in l10n_be/i18n/zh_CN.po
Text conflict in l10n_be/i18n/zh_TW.po
Text conflict in l10n_be/wizard/l10n_be_account_vat_declaration.py
Text conflict in l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
Text conflict in l10n_be/wizard/l10n_be_partner_vat_listing.py
Text conflict in l10n_be/wizard/l10n_be_partner_vat_listing.xml
Text conflict in l10n_be/wizard/l10n_be_vat_intra.py
Conflict adding file l10n_br/i18n/ar.po.  Moved existing file to l10n_br/i18n/ar.po.moved.
Conflict adding file l10n_br/i18n/bg.po.  Moved existing file to l10n_br/i18n/bg.po.moved.
Conflict adding file l10n_br/i18n/ca.po.  Moved existing file to l10n_br/i18n/ca.po.moved.
Conflict adding file l10n_br/i18n/da.po.  Moved existing file to l10n_br/i18n/da.po.moved.
Conflict adding file l10n_br/i18n/en_GB.po.  Moved existing file to l10n_br/i18n/en_GB.po.moved.
Conflict adding file l10n_br/i18n/es.po.  Moved existing file to l10n_br/i18n/es.po.moved.
Conflict adding file l10n_br/i18n/es_CR.po.  Moved existing file to l10n_br/i18n/es_CR.po.moved.
Conflict adding file l10n_br/i18n/es_PY.po.  Moved existing file to l10n_br/i18n/es_PY.po.moved.
Conflict adding file l10n_br/i18n/fr.po.  Moved existing file to l10n_br/i18n/fr.po.moved.
Conflict adding file l10n_br/i18n/gl.po.  Moved existing file to l10n_br/i18n/gl.po.moved.
Conflict adding file l10n_br/i18n/hi.po.  Moved existing file to l10n_br/i18n/hi.po.moved.
Conflict adding file l10n_br/i18n/it.po.  Moved existing file to l10n_br/i18n/it.po.moved.
Conflict adding file l10n_br/i18n/nb.po.  Moved existing file to l10n_br/i18n/nb.po.moved.
Conflict adding file l10n_br/i18n/oc.po.  Moved existing file to l10n_br/i18n/oc.po.moved.
Conflict adding file l10n_br/i18n/pt.po.  Moved existing file to l10n_br/i18n/pt.po.moved.
Conflict adding file l10n_br/i18n/pt_BR.po.  Moved existing file to l10n_br/i18n/pt_BR.po.moved.
Conflict adding file l10n_br/i18n/ru.po.  Moved existing file to l10n_br/i18n/ru.po.moved.
Conflict adding file l10n_br/i18n/sl.po.  Moved existing file to l10n_br/i18n/sl.po.moved.
Conflict adding file l10n_br/i18n/sq.po.  Moved existing file to l10n_br/i18n/sq.po.moved.
Conflict adding file l10n_br/i18n/sr@latin.po.  Moved existing file to l10n_br/i18n/sr@latin.po.moved.
Conflict adding file l10n_br/i18n/tr.po.  Moved existing file to l10n_br/i18n/tr.po.moved.
Contents conflict in l10n_ca/account_types_en.xml
Conflict adding file l10n_ca/i18n/ar.po.  Moved existing file to l10n_ca/i18n/ar.po.moved.
Conflict adding file l10n_ca/i18n/ca.po.  Moved existing file to l10n_ca/i18n/ca.po.moved.
Conflict adding file l10n_ca/i18n/da.po.  Moved existing file to l10n_ca/i18n/da.po.moved.
Text conflict in l10n_ca/i18n/de.po
Conflict adding file l10n_ca/i18n/en_GB.po.  Moved existing file to l10n_ca/i18n/en_GB.po.moved.
Text conflict in l10n_ca/i18n/es.po
Conflict adding file l10n_ca/i18n/es_CR.po.  Moved existing file to l10n_ca/i18n/es_CR.po.moved.
Conflict adding file l10n_ca/i18n/es_PY.po.  Moved existing file to l10n_ca/i18n/es_PY.po.moved.
Text conflict in l10n_ca/i18n/fr.po
Conflict adding file l10n_ca/i18n/gl.po.  Moved existing file to l10n_ca/i18n/gl.po.moved.
Text conflict in l10n_ca/i18n/hu.po
Text conflict in l10n_ca/i18n/it.po
Conflict adding file l10n_ca/i18n/nb.po.  Moved existing file to l10n_ca/i18n/nb.po.moved.
Text conflict in l10n_ca/i18n/pt.po
Conflict adding file l10n_ca/i18n/pt_BR.po.  Moved existing file to l10n_ca/i18n/pt_BR.po.moved.
Conflict adding file l10n_ca/i18n/sl.po.  Moved existing file to l10n_ca/i18n/sl.po.moved.
Text conflict in l10n_ca/i18n/sr@latin.po
Conflict adding file l10n_ca/i18n/tr.po.  Moved existing file to l10n_ca/i18n/tr.po.moved.
Conflict adding file l10n_ca/i18n/zh_CN.po.  Moved existing file to l10n_ca/i18n/zh_CN.po.moved.
Text conflict in l10n_ch/i18n/ar.po
Text conflict in l10n_ch/i18n/bg.po
Text conflict in l10n_ch/i18n/bs.po
Text conflict in l10n_ch/i18n/ca.po
Text conflict in l10n_ch/i18n/cs.po
Conflict adding file l10n_ch/i18n/da.po.  Moved existing file to l10n_ch/i18n/da.po.moved.
Text conflict in l10n_ch/i18n/de.po
Text conflict in l10n_ch/i18n/es.po
Text conflict in l10n_ch/i18n/es_AR.po
Conflict adding file l10n_ch/i18n/es_CR.po.  Moved existing file to l10n_ch/i18n/es_CR.po.moved.
Text conflict in l10n_ch/i18n/et.po
Text conflict in l10n_ch/i18n/fr.po
Text conflict in l10n_ch/i18n/hr.po
Text conflict in l10n_ch/i18n/hu.po
Text conflict in l10n_ch/i18n/id.po
Text conflict in l10n_ch/i18n/it.po
Text conflict in l10n_ch/i18n/ko.po
Text conflict in l10n_ch/i18n/lt.po
Text conflict in l10n_ch/i18n/nl.po
Text conflict in l10n_ch/i18n/nl_BE.po
Text conflict in l10n_ch/i18n/pl.po
Text conflict in l10n_ch/i18n/pt.po
Text conflict in l10n_ch/i18n/pt_BR.po
Text conflict in l10n_ch/i18n/ro.po
Text conflict in l10n_ch/i18n/ru.po
Text conflict in l10n_ch/i18n/sl.po
Text conflict in l10n_ch/i18n/sq.po
Text conflict in l10n_ch/i18n/sr@latin.po
Text conflict in l10n_ch/i18n/sv.po
Text conflict in l10n_ch/i18n/tr.po
Text conflict in l10n_ch/i18n/uk.po
Text conflict in l10n_ch/i18n/vi.po
Text conflict in l10n_ch/i18n/zh_CN.po
Text conflict in l10n_ch/i18n/zh_TW.po
Text conflict in l10n_ch/wizard/bvr_import.py
Text conflict in l10n_ch/wizard/create_dta.py
Conflict adding file l10n_cn/i18n/ar.po.  Moved existing file to l10n_cn/i18n/ar.po.moved.
Conflict adding file l10n_cn/i18n/ca.po.  Moved existing file to l10n_cn/i18n/ca.po.moved.
Conflict adding file l10n_cn/i18n/da.po.  Moved existing file to l10n_cn/i18n/da.po.moved.
Conflict adding file l10n_cn/i18n/es.po.  Moved existing file to l10n_cn/i18n/es.po.moved.
Conflict adding file l10n_cn/i18n/es_CR.po.  Moved existing file to l10n_cn/i18n/es_CR.po.moved.
Conflict adding file l10n_cn/i18n/es_PY.po.  Moved existing file to l10n_cn/i18n/es_PY.po.moved.
Conflict adding file l10n_cn/i18n/gl.po.  Moved existing file to l10n_cn/i18n/gl.po.moved.
Conflict adding file l10n_cn/i18n/it.po.  Moved existing file to l10n_cn/i18n/it.po.moved.
Conflict adding file l10n_cn/i18n/nb.po.  Moved existing file to l10n_cn/i18n/nb.po.moved.
Conflict adding file l10n_cn/i18n/pt_BR.po.  Moved existing file to l10n_cn/i18n/pt_BR.po.moved.
Conflict adding file l10n_cn/i18n/sl.po.  Moved existing file to l10n_cn/i18n/sl.po.moved.
Conflict adding file l10n_cn/i18n/sr@latin.po.  Moved existing file to l10n_cn/i18n/sr@latin.po.moved.
Conflict adding file l10n_cn/i18n/tr.po.  Moved existing file to l10n_cn/i18n/tr.po.moved.
Conflict adding file l10n_cn/i18n/zh_CN.po.  Moved existing file to l10n_cn/i18n/zh_CN.po.moved.
Conflict adding file l10n_cn/i18n/zh_TW.po.  Moved existing file to l10n_cn/i18n/zh_TW.po.moved.
Text conflict in l10n_cr/data/account_account_type.xml
Conflict adding file l10n_cr/i18n/ar.po.  Moved existing file to l10n_cr/i18n/ar.po.moved.
Conflict adding file l10n_cr/i18n/ca.po.  Moved existing file to l10n_cr/i18n/ca.po.moved.
Conflict adding file l10n_cr/i18n/da.po.  Moved existing file to l10n_cr/i18n/da.po.moved.
Conflict adding file l10n_cr/i18n/es.po.  Moved existing file to l10n_cr/i18n/es.po.moved.
Conflict adding file l10n_cr/i18n/es_CR.po.  Moved existing file to l10n_cr/i18n/es_CR.po.moved.
Conflict adding file l10n_cr/i18n/es_PY.po.  Moved existing file to l10n_cr/i18n/es_PY.po.moved.
Conflict adding file l10n_cr/i18n/fr.po.  Moved existing file to l10n_cr/i18n/fr.po.moved.
Conflict adding file l10n_cr/i18n/gl.po.  Moved existing file to l10n_cr/i18n/gl.po.moved.
Conflict adding file l10n_cr/i18n/it.po.  Moved existing file to l10n_cr/i18n/it.po.moved.
Conflict adding file l10n_cr/i18n/mn.po.  Moved existing file to l10n_cr/i18n/mn.po.moved.
Conflict adding file l10n_cr/i18n/pt.po.  Moved existing file to l10n_cr/i18n/pt.po.moved.
Conflict adding file l10n_cr/i18n/pt_BR.po.  Moved existing file to l10n_cr/i18n/pt_BR.po.moved.
Conflict adding file l10n_cr/i18n/sl.po.  Moved existing file to l10n_cr/i18n/sl.po.moved.
Conflict adding file l10n_cr/i18n/tr.po.  Moved existing file to l10n_cr/i18n/tr.po.moved.
Text conflict in l10n_de/i18n/ar.po
Text conflict in l10n_de/i18n/bg.po
Text conflict in l10n_de/i18n/bs.po
Text conflict in l10n_de/i18n/ca.po
Text conflict in l10n_de/i18n/cs.po
Conflict adding file l10n_de/i18n/da.po.  Moved existing file to l10n_de/i18n/da.po.moved.
Text conflict in l10n_de/i18n/de.po
Text conflict in l10n_de/i18n/es.po
Conflict adding file l10n_de/i18n/es_CR.po.  Moved existing file to l10n_de/i18n/es_CR.po.moved.
Conflict adding file l10n_de/i18n/es_PY.po.  Moved existing file to l10n_de/i18n/es_PY.po.moved.
Text conflict in l10n_de/i18n/et.po
Text conflict in l10n_de/i18n/fr.po
Conflict adding file l10n_de/i18n/gl.po.  Moved existing file to l10n_de/i18n/gl.po.moved.
Text conflict in l10n_de/i18n/hr.po
Text conflict in l10n_de/i18n/hu.po
Text conflict in l10n_de/i18n/id.po
Text conflict in l10n_de/i18n/it.po
Text conflict in l10n_de/i18n/ko.po
Text conflict in l10n_de/i18n/lt.po
Conflict adding file l10n_de/i18n/nb.po.  Moved existing file to l10n_de/i18n/nb.po.moved.
Text conflict in l10n_de/i18n/nl.po
Text conflict in l10n_de/i18n/pl.po
Text conflict in l10n_de/i18n/pt.po
Text conflict in l10n_de/i18n/pt_BR.po
Text conflict in l10n_de/i18n/ro.po
Text conflict in l10n_de/i18n/ru.po
Text conflict in l10n_de/i18n/sl.po
Text conflict in l10n_de/i18n/sr@latin.po
Text conflict in l10n_de/i18n/sv.po
Text conflict in l10n_de/i18n/tr.po
Text conflict in l10n_de/i18n/vi.po
Text conflict in l10n_de/i18n/zh_CN.po
Text conflict in l10n_de/i18n/zh_TW.po
Conflict adding file l10n_ec/i18n/ar.po.  Moved existing file to l10n_ec/i18n/ar.po.moved.
Conflict adding file l10n_ec/i18n/ca.po.  Moved existing file to l10n_ec/i18n/ca.po.moved.
Conflict adding file l10n_ec/i18n/da.po.  Moved existing file to l10n_ec/i18n/da.po.moved.
Conflict adding file l10n_ec/i18n/es.po.  Moved existing file to l10n_ec/i18n/es.po.moved.
Conflict adding file l10n_ec/i18n/es_CR.po.  Moved existing file to l10n_ec/i18n/es_CR.po.moved.
Conflict adding file l10n_ec/i18n/es_EC.po.  Moved existing file to l10n_ec/i18n/es_EC.po.moved.
Conflict adding file l10n_ec/i18n/es_PY.po.  Moved existing file to l10n_ec/i18n/es_PY.po.moved.
Conflict adding file l10n_ec/i18n/fr.po.  Moved existing file to l10n_ec/i18n/fr.po.moved.
Conflict adding file l10n_ec/i18n/gl.po.  Moved existing file to l10n_ec/i18n/gl.po.moved.
Conflict adding file l10n_ec/i18n/it.po.  Moved existing file to l10n_ec/i18n/it.po.moved.
Conflict adding file l10n_ec/i18n/pt.po.  Moved existing file to l10n_ec/i18n/pt.po.moved.
Conflict adding file l10n_ec/i18n/pt_BR.po.  Moved existing file to l10n_ec/i18n/pt_BR.po.moved.
Conflict adding file l10n_ec/i18n/sl.po.  Moved existing file to l10n_ec/i18n/sl.po.moved.
Conflict adding file l10n_ec/i18n/tr.po.  Moved existing file to l10n_ec/i18n/tr.po.moved.
Conflict adding file l10n_es/i18n/ar.po.  Moved existing file to l10n_es/i18n/ar.po.moved.
Text conflict in l10n_es/i18n/ca.po
Conflict adding file l10n_es/i18n/da.po.  Moved existing file to l10n_es/i18n/da.po.moved.
Text conflict in l10n_es/i18n/de.po
Text conflict in l10n_es/i18n/es.po
Conflict adding file l10n_es/i18n/es_CR.po.  Moved existing file to l10n_es/i18n/es_CR.po.moved.
Conflict adding file l10n_es/i18n/es_PY.po.  Moved existing file to l10n_es/i18n/es_PY.po.moved.
Text conflict in l10n_es/i18n/fr.po
Conflict adding file l10n_es/i18n/gl.po.  Moved existing file to l10n_es/i18n/gl.po.moved.
Text conflict in l10n_es/i18n/hu.po
Text conflict in l10n_es/i18n/it.po
Conflict adding file l10n_es/i18n/oc.po.  Moved existing file to l10n_es/i18n/oc.po.moved.
Text conflict in l10n_es/i18n/pt.po
Conflict adding file l10n_es/i18n/pt_BR.po.  Moved existing file to l10n_es/i18n/pt_BR.po.moved.
Conflict adding file l10n_es/i18n/sl.po.  Moved existing file to l10n_es/i18n/sl.po.moved.
Text conflict in l10n_es/i18n/sr@latin.po
Conflict adding file l10n_es/i18n/tr.po.  Moved existing file to l10n_es/i18n/tr.po.moved.
Text conflict in l10n_fr/fr_pcg_taxes.xml
Text conflict in l10n_fr/fr_tax.xml
Text conflict in l10n_fr/i18n/ar.po
Text conflict in l10n_fr/i18n/bg.po
Text conflict in l10n_fr/i18n/bs.po
Text conflict in l10n_fr/i18n/ca.po
Text conflict in l10n_fr/i18n/cs.po
Conflict adding file l10n_fr/i18n/da.po.  Moved existing file to l10n_fr/i18n/da.po.moved.
Text conflict in l10n_fr/i18n/de.po
Text conflict in l10n_fr/i18n/es.po
Text conflict in l10n_fr/i18n/es_AR.po
Conflict adding file l10n_fr/i18n/es_CR.po.  Moved existing file to l10n_fr/i18n/es_CR.po.moved.
Conflict adding file l10n_fr/i18n/es_PY.po.  Moved existing file to l10n_fr/i18n/es_PY.po.moved.
Text conflict in l10n_fr/i18n/et.po
Text conflict in l10n_fr/i18n/fr.po
Conflict adding file l10n_fr/i18n/gl.po.  Moved existing file to l10n_fr/i18n/gl.po.moved.
Text conflict in l10n_fr/i18n/hr.po
Text conflict in l10n_fr/i18n/hu.po
Text conflict in l10n_fr/i18n/id.po
Text conflict in l10n_fr/i18n/it.po
Text conflict in l10n_fr/i18n/ko.po
Text conflict in l10n_fr/i18n/lt.po
Text conflict in l10n_fr/i18n/nl.po
Text conflict in l10n_fr/i18n/nl_BE.po
Text conflict in l10n_fr/i18n/oc.po
Text conflict in l10n_fr/i18n/pl.po
Text conflict in l10n_fr/i18n/pt.po
Text conflict in l10n_fr/i18n/pt_BR.po
Text conflict in l10n_fr/i18n/ro.po
Text conflict in l10n_fr/i18n/ru.po
Text conflict in l10n_fr/i18n/sl.po
Text conflict in l10n_fr/i18n/sq.po
Text conflict in l10n_fr/i18n/sr@latin.po
Text conflict in l10n_fr/i18n/sv.po
Text conflict in l10n_fr/i18n/tlh.po
Text conflict in l10n_fr/i18n/tr.po
Text conflict in l10n_fr/i18n/uk.po
Text conflict in l10n_fr/i18n/vi.po
Text conflict in l10n_fr/i18n/zh_CN.po
Text conflict in l10n_fr/i18n/zh_TW.po
Text conflict in l10n_fr/plan_comptable_general.xml
Conflict adding file l10n_gr/i18n/ar.po.  Moved existing file to l10n_gr/i18n/ar.po.moved.
Conflict adding file l10n_gr/i18n/ca.po.  Moved existing file to l10n_gr/i18n/ca.po.moved.
Conflict adding file l10n_gr/i18n/da.po.  Moved existing file to l10n_gr/i18n/da.po.moved.
Text conflict in l10n_gr/i18n/de.po
Text conflict in l10n_gr/i18n/el.po
Text conflict in l10n_gr/i18n/es.po
Conflict adding file l10n_gr/i18n/es_CR.po.  Moved existing file to l10n_gr/i18n/es_CR.po.moved.
Conflict adding file l10n_gr/i18n/es_PY.po.  Moved existing file to l10n_gr/i18n/es_PY.po.moved.
Text conflict in l10n_gr/i18n/fr.po
Conflict adding file l10n_gr/i18n/gl.po.  Moved existing file to l10n_gr/i18n/gl.po.moved.
Text conflict in l10n_gr/i18n/hu.po
Text conflict in l10n_gr/i18n/it.po
Text conflict in l10n_gr/i18n/l10n_gr.pot
Text conflict in l10n_gr/i18n/nl.po
Text conflict in l10n_gr/i18n/pt.po
Conflict adding file l10n_gr/i18n/pt_BR.po.  Moved existing file to l10n_gr/i18n/pt_BR.po.moved.
Conflict adding file l10n_gr/i18n/sl.po.  Moved existing file to l10n_gr/i18n/sl.po.moved.
Text conflict in l10n_gr/i18n/sr@latin.po
Conflict adding file l10n_gr/i18n/tr.po.  Moved existing file to l10n_gr/i18n/tr.po.moved.
Conflict adding file l10n_gt/i18n/ar.po.  Moved existing file to l10n_gt/i18n/ar.po.moved.
Conflict adding file l10n_gt/i18n/ca.po.  Moved existing file to l10n_gt/i18n/ca.po.moved.
Conflict adding file l10n_gt/i18n/da.po.  Moved existing file to l10n_gt/i18n/da.po.moved.
Text conflict in l10n_gt/i18n/es.po
Conflict adding file l10n_gt/i18n/es_CR.po.  Moved existing file to l10n_gt/i18n/es_CR.po.moved.
Conflict adding file l10n_gt/i18n/es_PY.po.  Moved existing file to l10n_gt/i18n/es_PY.po.moved.
Text conflict in l10n_gt/i18n/fr.po
Conflict adding file l10n_gt/i18n/gl.po.  Moved existing file to l10n_gt/i18n/gl.po.moved.
Text conflict in l10n_gt/i18n/hu.po
Text conflict in l10n_gt/i18n/it.po
Conflict adding file l10n_gt/i18n/oc.po.  Moved existing file to l10n_gt/i18n/oc.po.moved.
Conflict adding file l10n_gt/i18n/pt.po.  Moved existing file to l10n_gt/i18n/pt.po.moved.
Conflict adding file l10n_gt/i18n/pt_BR.po.  Moved existing file to l10n_gt/i18n/pt_BR.po.moved.
Conflict adding file l10n_gt/i18n/sl.po.  Moved existing file to l10n_gt/i18n/sl.po.moved.
Text conflict in l10n_gt/i18n/sr@latin.po
Conflict adding file l10n_gt/i18n/tr.po.  Moved existing file to l10n_gt/i18n/tr.po.moved.
Conflict adding file l10n_in/i18n/ar.po.  Moved existing file to l10n_in/i18n/ar.po.moved.
Text conflict in l10n_in/i18n/br.po
Conflict adding file l10n_in/i18n/ca.po.  Moved existing file to l10n_in/i18n/ca.po.moved.
Conflict adding file l10n_in/i18n/da.po.  Moved existing file to l10n_in/i18n/da.po.moved.
Text conflict in l10n_in/i18n/de.po
Text conflict in l10n_in/i18n/es.po
Conflict adding file l10n_in/i18n/es_CR.po.  Moved existing file to l10n_in/i18n/es_CR.po.moved.
Conflict adding file l10n_in/i18n/es_PY.po.  Moved existing file to l10n_in/i18n/es_PY.po.moved.
Text conflict in l10n_in/i18n/et.po
Text conflict in l10n_in/i18n/fr.po
Conflict adding file l10n_in/i18n/gl.po.  Moved existing file to l10n_in/i18n/gl.po.moved.
Text conflict in l10n_in/i18n/hu.po
Text conflict in l10n_in/i18n/it.po
Conflict adding file l10n_in/i18n/oc.po.  Moved existing file to l10n_in/i18n/oc.po.moved.
Text conflict in l10n_in/i18n/pt.po
Conflict adding file l10n_in/i18n/pt_BR.po.  Moved existing file to l10n_in/i18n/pt_BR.po.moved.
Text conflict in l10n_in/i18n/ru.po
Conflict adding file l10n_in/i18n/sl.po.  Moved existing file to l10n_in/i18n/sl.po.moved.
Text conflict in l10n_in/i18n/sr@latin.po
Text conflict in l10n_in/i18n/sv.po
Conflict adding file l10n_in/i18n/tr.po.  Moved existing file to l10n_in/i18n/tr.po.moved.
Contents conflict in l10n_it/data/account.account.type.csv
Conflict adding file l10n_it/i18n/ar.po.  Moved existing file to l10n_it/i18n/ar.po.moved.
Conflict adding file l10n_it/i18n/ca.po.  Moved existing file to l10n_it/i18n/ca.po.moved.
Conflict adding file l10n_it/i18n/da.po.  Moved existing file to l10n_it/i18n/da.po.moved.
Conflict adding file l10n_it/i18n/es.po.  Moved existing file to l10n_it/i18n/es.po.moved.
Conflict adding file l10n_it/i18n/es_CR.po.  Moved existing file to l10n_it/i18n/es_CR.po.moved.
Conflict adding file l10n_it/i18n/es_PY.po.  Moved existing file to l10n_it/i18n/es_PY.po.moved.
Conflict adding file l10n_it/i18n/fr.po.  Moved existing file to l10n_it/i18n/fr.po.moved.
Conflict adding file l10n_it/i18n/gl.po.  Moved existing file to l10n_it/i18n/gl.po.moved.
Conflict adding file l10n_it/i18n/it.po.  Moved existing file to l10n_it/i18n/it.po.moved.
Text conflict in l10n_it/i18n/l10n_it.pot
Conflict adding file l10n_it/i18n/pt_BR.po.  Moved existing file to l10n_it/i18n/pt_BR.po.moved.
Conflict adding file l10n_it/i18n/sl.po.  Moved existing file to l10n_it/i18n/sl.po.moved.
Conflict adding file l10n_it/i18n/tr.po.  Moved existing file to l10n_it/i18n/tr.po.moved.
Text conflict in l10n_lu/i18n/ar.po
Text conflict in l10n_lu/i18n/bg.po
Text conflict in l10n_lu/i18n/bs.po
Text conflict in l10n_lu/i18n/ca.po
Text conflict in l10n_lu/i18n/cs.po
Conflict adding file l10n_lu/i18n/da.po.  Moved existing file to l10n_lu/i18n/da.po.moved.
Text conflict in l10n_lu/i18n/de.po
Text conflict in l10n_lu/i18n/es.po
Text conflict in l10n_lu/i18n/es_AR.po
Conflict adding file l10n_lu/i18n/es_CR.po.  Moved existing file to l10n_lu/i18n/es_CR.po.moved.
Conflict adding file l10n_lu/i18n/es_PY.po.  Moved existing file to l10n_lu/i18n/es_PY.po.moved.
Text conflict in l10n_lu/i18n/et.po
Text conflict in l10n_lu/i18n/fr.po
Conflict adding file l10n_lu/i18n/gl.po.  Moved existing file to l10n_lu/i18n/gl.po.moved.
Text conflict in l10n_lu/i18n/hr.po
Text conflict in l10n_lu/i18n/hu.po
Text conflict in l10n_lu/i18n/id.po
Text conflict in l10n_lu/i18n/it.po
Text conflict in l10n_lu/i18n/ko.po
Text conflict in l10n_lu/i18n/lt.po
Text conflict in l10n_lu/i18n/nl.po
Text conflict in l10n_lu/i18n/nl_BE.po
Text conflict in l10n_lu/i18n/oc.po
Text conflict in l10n_lu/i18n/pl.po
Text conflict in l10n_lu/i18n/pt.po
Text conflict in l10n_lu/i18n/pt_BR.po
Text conflict in l10n_lu/i18n/ro.po
Text conflict in l10n_lu/i18n/ru.po
Text conflict in l10n_lu/i18n/sl.po
Text conflict in l10n_lu/i18n/sq.po
Text conflict in l10n_lu/i18n/sr@latin.po
Text conflict in l10n_lu/i18n/sv.po
Text conflict in l10n_lu/i18n/tlh.po
Text conflict in l10n_lu/i18n/tr.po
Text conflict in l10n_lu/i18n/uk.po
Text conflict in l10n_lu/i18n/vi.po
Text conflict in l10n_lu/i18n/zh_CN.po
Text conflict in l10n_lu/i18n/zh_TW.po
Contents conflict in l10n_lu/l10n_lu_data.xml
Text conflict in l10n_lu/wizard/print_vat.py
Text conflict in l10n_ma/i18n/ar.po
Conflict adding file l10n_ma/i18n/ca.po.  Moved existing file to l10n_ma/i18n/ca.po.moved.
Conflict adding file l10n_ma/i18n/da.po.  Moved existing file to l10n_ma/i18n/da.po.moved.
Text conflict in l10n_ma/i18n/de.po
Text conflict in l10n_ma/i18n/es.po
Conflict adding file l10n_ma/i18n/es_CR.po.  Moved existing file to l10n_ma/i18n/es_CR.po.moved.
Conflict adding file l10n_ma/i18n/es_PY.po.  Moved existing file to l10n_ma/i18n/es_PY.po.moved.
Text conflict in l10n_ma/i18n/fr.po
Conflict adding file l10n_ma/i18n/gl.po.  Moved existing file to l10n_ma/i18n/gl.po.moved.
Text conflict in l10n_ma/i18n/hu.po
Text conflict in l10n_ma/i18n/it.po
Conflict adding file l10n_ma/i18n/pt.po.  Moved existing file to l10n_ma/i18n/pt.po.moved.
Conflict adding file l10n_ma/i18n/pt_BR.po.  Moved existing file to l10n_ma/i18n/pt_BR.po.moved.
Conflict adding file l10n_ma/i18n/sl.po.  Moved existing file to l10n_ma/i18n/sl.po.moved.
Text conflict in l10n_ma/i18n/sr@latin.po
Conflict adding file l10n_ma/i18n/tr.po.  Moved existing file to l10n_ma/i18n/tr.po.moved.
Conflict adding file l10n_mx/i18n/ar.po.  Moved existing file to l10n_mx/i18n/ar.po.moved.
Conflict adding file l10n_mx/i18n/bg.po.  Moved existing file to l10n_mx/i18n/bg.po.moved.
Conflict adding file l10n_mx/i18n/ca.po.  Moved existing file to l10n_mx/i18n/ca.po.moved.
Conflict adding file l10n_mx/i18n/da.po.  Moved existing file to l10n_mx/i18n/da.po.moved.
Conflict adding file l10n_mx/i18n/es.po.  Moved existing file to l10n_mx/i18n/es.po.moved.
Conflict adding file l10n_mx/i18n/es_CR.po.  Moved existing file to l10n_mx/i18n/es_CR.po.moved.
Conflict adding file l10n_mx/i18n/es_MX.po.  Moved existing file to l10n_mx/i18n/es_MX.po.moved.
Conflict adding file l10n_mx/i18n/es_PY.po.  Moved existing file to l10n_mx/i18n/es_PY.po.moved.
Conflict adding file l10n_mx/i18n/gl.po.  Moved existing file to l10n_mx/i18n/gl.po.moved.
Conflict adding file l10n_mx/i18n/it.po.  Moved existing file to l10n_mx/i18n/it.po.moved.
Conflict adding file l10n_mx/i18n/pt.po.  Moved existing file to l10n_mx/i18n/pt.po.moved.
Conflict adding file l10n_mx/i18n/pt_BR.po.  Moved existing file to l10n_mx/i18n/pt_BR.po.moved.
Conflict adding file l10n_mx/i18n/sr@latin.po.  Moved existing file to l10n_mx/i18n/sr@latin.po.moved.
Conflict adding file l10n_mx/i18n/tr.po.  Moved existing file to l10n_mx/i18n/tr.po.moved.
Conflict adding file l10n_nl/i18n/ar.po.  Moved existing file to l10n_nl/i18n/ar.po.moved.
Conflict adding file l10n_nl/i18n/ca.po.  Moved existing file to l10n_nl/i18n/ca.po.moved.
Conflict adding file l10n_nl/i18n/da.po.  Moved existing file to l10n_nl/i18n/da.po.moved.
Conflict adding file l10n_nl/i18n/es.po.  Moved existing file to l10n_nl/i18n/es.po.moved.
Conflict adding file l10n_nl/i18n/es_CR.po.  Moved existing file to l10n_nl/i18n/es_CR.po.moved.
Conflict adding file l10n_nl/i18n/es_PY.po.  Moved existing file to l10n_nl/i18n/es_PY.po.moved.
Conflict adding file l10n_nl/i18n/gl.po.  Moved existing file to l10n_nl/i18n/gl.po.moved.
Conflict adding file l10n_nl/i18n/it.po.  Moved existing file to l10n_nl/i18n/it.po.moved.
Conflict adding file l10n_nl/i18n/mn.po.  Moved existing file to l10n_nl/i18n/mn.po.moved.
Conflict adding file l10n_nl/i18n/nl.po.  Moved existing file to l10n_nl/i18n/nl.po.moved.
Conflict adding file l10n_nl/i18n/pt_BR.po.  Moved existing file to l10n_nl/i18n/pt_BR.po.moved.
Conflict adding file l10n_nl/i18n/sl.po.  Moved existing file to l10n_nl/i18n/sl.po.moved.
Conflict adding file l10n_nl/i18n/sr@latin.po.  Moved existing file to l10n_nl/i18n/sr@latin.po.moved.
Conflict adding file l10n_nl/i18n/tr.po.  Moved existing file to l10n_nl/i18n/tr.po.moved.
Conflict adding file l10n_pl/i18n/ar.po.  Moved existing file to l10n_pl/i18n/ar.po.moved.
Conflict adding file l10n_pl/i18n/ca.po.  Moved existing file to l10n_pl/i18n/ca.po.moved.
Conflict adding file l10n_pl/i18n/da.po.  Moved existing file to l10n_pl/i18n/da.po.moved.
Conflict adding file l10n_pl/i18n/es.po.  Moved existing file to l10n_pl/i18n/es.po.moved.
Conflict adding file l10n_pl/i18n/es_CR.po.  Moved existing file to l10n_pl/i18n/es_CR.po.moved.
Conflict adding file l10n_pl/i18n/es_PY.po.  Moved existing file to l10n_pl/i18n/es_PY.po.moved.
Conflict adding file l10n_pl/i18n/gl.po.  Moved existing file to l10n_pl/i18n/gl.po.moved.
Conflict adding file l10n_pl/i18n/it.po.  Moved existing file to l10n_pl/i18n/it.po.moved.
Conflict adding file l10n_pl/i18n/pt_BR.po.  Moved existing file to l10n_pl/i18n/pt_BR.po.moved.
Conflict adding file l10n_pl/i18n/sl.po.  Moved existing file to l10n_pl/i18n/sl.po.moved.
Conflict adding file l10n_pl/i18n/sr@latin.po.  Moved existing file to l10n_pl/i18n/sr@latin.po.moved.
Conflict adding file l10n_pl/i18n/tr.po.  Moved existing file to l10n_pl/i18n/tr.po.moved.
Conflict adding file l10n_ro/i18n/ar.po.  Moved existing file to l10n_ro/i18n/ar.po.moved.
Conflict adding file l10n_ro/i18n/ca.po.  Moved existing file to l10n_ro/i18n/ca.po.moved.
Conflict adding file l10n_ro/i18n/da.po.  Moved existing file to l10n_ro/i18n/da.po.moved.
Conflict adding file l10n_ro/i18n/es.po.  Moved existing file to l10n_ro/i18n/es.po.moved.
Conflict adding file l10n_ro/i18n/es_CR.po.  Moved existing file to l10n_ro/i18n/es_CR.po.moved.
Conflict adding file l10n_ro/i18n/es_PY.po.  Moved existing file to l10n_ro/i18n/es_PY.po.moved.
Conflict adding file l10n_ro/i18n/gl.po.  Moved existing file to l10n_ro/i18n/gl.po.moved.
Conflict adding file l10n_ro/i18n/it.po.  Moved existing file to l10n_ro/i18n/it.po.moved.
Text conflict in l10n_ro/i18n/l10n_ro.pot
Conflict adding file l10n_ro/i18n/pt.po.  Moved existing file to l10n_ro/i18n/pt.po.moved.
Conflict adding file l10n_ro/i18n/pt_BR.po.  Moved existing file to l10n_ro/i18n/pt_BR.po.moved.
Conflict adding file l10n_ro/i18n/ro.po.  Moved existing file to l10n_ro/i18n/ro.po.moved.
Conflict adding file l10n_ro/i18n/sr@latin.po.  Moved existing file to l10n_ro/i18n/sr@latin.po.moved.
Conflict adding file l10n_ro/i18n/tr.po.  Moved existing file to l10n_ro/i18n/tr.po.moved.
Conflict adding file l10n_th/i18n/ar.po.  Moved existing file to l10n_th/i18n/ar.po.moved.
Conflict adding file l10n_th/i18n/ca.po.  Moved existing file to l10n_th/i18n/ca.po.moved.
Conflict adding file l10n_th/i18n/da.po.  Moved existing file to l10n_th/i18n/da.po.moved.
Conflict adding file l10n_th/i18n/es.po.  Moved existing file to l10n_th/i18n/es.po.moved.
Conflict adding file l10n_th/i18n/es_CR.po.  Moved existing file to l10n_th/i18n/es_CR.po.moved.
Conflict adding file l10n_th/i18n/es_PY.po.  Moved existing file to l10n_th/i18n/es_PY.po.moved.
Conflict adding file l10n_th/i18n/gl.po.  Moved existing file to l10n_th/i18n/gl.po.moved.
Conflict adding file l10n_th/i18n/it.po.  Moved existing file to l10n_th/i18n/it.po.moved.
Conflict adding file l10n_th/i18n/nb.po.  Moved existing file to l10n_th/i18n/nb.po.moved.
Conflict adding file l10n_th/i18n/pt.po.  Moved existing file to l10n_th/i18n/pt.po.moved.
Conflict adding file l10n_th/i18n/pt_BR.po.  Moved existing file to l10n_th/i18n/pt_BR.po.moved.
Conflict adding file l10n_th/i18n/sl.po.  Moved existing file to l10n_th/i18n/sl.po.moved.
Conflict adding file l10n_th/i18n/sr@latin.po.  Moved existing file to l10n_th/i18n/sr@latin.po.moved.
Conflict adding file l10n_th/i18n/th.po.  Moved existing file to l10n_th/i18n/th.po.moved.
Conflict adding file l10n_th/i18n/tr.po.  Moved existing file to l10n_th/i18n/tr.po.moved.
Text conflict in l10n_uk/i18n/ar.po
Text conflict in l10n_uk/i18n/bg.po
Text conflict in l10n_uk/i18n/bs.po
Text conflict in l10n_uk/i18n/ca.po
Text conflict in l10n_uk/i18n/cs.po
Conflict adding file l10n_uk/i18n/da.po.  Moved existing file to l10n_uk/i18n/da.po.moved.
Text conflict in l10n_uk/i18n/de.po
Text conflict in l10n_uk/i18n/es.po
Conflict adding file l10n_uk/i18n/es_CR.po.  Moved existing file to l10n_uk/i18n/es_CR.po.moved.
Conflict adding file l10n_uk/i18n/es_PY.po.  Moved existing file to l10n_uk/i18n/es_PY.po.moved.
Text conflict in l10n_uk/i18n/et.po
Text conflict in l10n_uk/i18n/fr.po
Conflict adding file l10n_uk/i18n/gl.po.  Moved existing file to l10n_uk/i18n/gl.po.moved.
Text conflict in l10n_uk/i18n/hr.po
Text conflict in l10n_uk/i18n/hu.po
Text conflict in l10n_uk/i18n/id.po
Text conflict in l10n_uk/i18n/it.po
Text conflict in l10n_uk/i18n/ko.po
Text conflict in l10n_uk/i18n/lt.po
Text conflict in l10n_uk/i18n/nl.po
Text conflict in l10n_uk/i18n/oc.po
Text conflict in l10n_uk/i18n/pl.po
Text conflict in l10n_uk/i18n/pt.po
Text conflict in l10n_uk/i18n/pt_BR.po
Text conflict in l10n_uk/i18n/ro.po
Text conflict in l10n_uk/i18n/ru.po
Text conflict in l10n_uk/i18n/sl.po
Text conflict in l10n_uk/i18n/sq.po
Text conflict in l10n_uk/i18n/sr@latin.po
Text conflict in l10n_uk/i18n/sv.po
Text conflict in l10n_uk/i18n/tlh.po
Text conflict in l10n_uk/i18n/tr.po
Text conflict in l10n_uk/i18n/uk.po
Text conflict in l10n_uk/i18n/vi.po
Text conflict in l10n_uk/i18n/zh_CN.po
Text conflict in l10n_uk/i18n/zh_TW.po
Contents conflict in l10n_uk/l10n_uk_chart.xml
Contents conflict in l10n_uk/l10n_uk_types.xml
Conflict adding file l10n_ve/i18n/ar.po.  Moved existing file to l10n_ve/i18n/ar.po.moved.
Conflict adding file l10n_ve/i18n/ca.po.  Moved existing file to l10n_ve/i18n/ca.po.moved.
Conflict adding file l10n_ve/i18n/da.po.  Moved existing file to l10n_ve/i18n/da.po.moved.
Conflict adding file l10n_ve/i18n/de.po.  Moved existing file to l10n_ve/i18n/de.po.moved.
Conflict adding file l10n_ve/i18n/es.po.  Moved existing file to l10n_ve/i18n/es.po.moved.
Conflict adding file l10n_ve/i18n/es_CR.po.  Moved existing file to l10n_ve/i18n/es_CR.po.moved.
Conflict adding file l10n_ve/i18n/es_PY.po.  Moved existing file to l10n_ve/i18n/es_PY.po.moved.
Conflict adding file l10n_ve/i18n/gl.po.  Moved existing file to l10n_ve/i18n/gl.po.moved.
Conflict adding file l10n_ve/i18n/it.po.  Moved existing file to l10n_ve/i18n/it.po.moved.
Conflict adding file l10n_ve/i18n/pt.po.  Moved existing file to l10n_ve/i18n/pt.po.moved.
Conflict adding file l10n_ve/i18n/pt_BR.po.  Moved existing file to l10n_ve/i18n/pt_BR.po.moved.
Conflict adding file l10n_ve/i18n/ro.po.  Moved existing file to l10n_ve/i18n/ro.po.moved.
Conflict adding file l10n_ve/i18n/sl.po.  Moved existing file to l10n_ve/i18n/sl.po.moved.
Conflict adding file l10n_ve/i18n/sr@latin.po.  Moved existing file to l10n_ve/i18n/sr@latin.po.moved.
Conflict adding file l10n_ve/i18n/tr.po.  Moved existing file to l10n_ve/i18n/tr.po.moved.
Conflict adding file lunch/i18n/ar.po.  Moved existing file to lunch/i18n/ar.po.moved.
Conflict adding file lunch/i18n/bg.po.  Moved existing file to lunch/i18n/bg.po.moved.
Conflict adding file lunch/i18n/ca.po.  Moved existing file to lunch/i18n/ca.po.moved.
Conflict adding file lunch/i18n/cs.po.  Moved existing file to lunch/i18n/cs.po.moved.
Conflict adding file lunch/i18n/da.po.  Moved existing file to lunch/i18n/da.po.moved.
Text conflict in lunch/i18n/de.po
Text conflict in lunch/i18n/es.po
Conflict adding file lunch/i18n/es_CR.po.  Moved existing file to lunch/i18n/es_CR.po.moved.
Conflict adding file lunch/i18n/es_PY.po.  Moved existing file to lunch/i18n/es_PY.po.moved.
Text conflict in lunch/i18n/fi.po
Text conflict in lunch/i18n/fr.po
Conflict adding file lunch/i18n/gl.po.  Moved existing file to lunch/i18n/gl.po.moved.
Conflict adding file lunch/i18n/hr.po.  Moved existing file to lunch/i18n/hr.po.moved.
Text conflict in lunch/i18n/hu.po
Text conflict in lunch/i18n/it.po
Conflict adding file lunch/i18n/ja.po.  Moved existing file to lunch/i18n/ja.po.moved.
Conflict adding file lunch/i18n/mk.po.  Moved existing file to lunch/i18n/mk.po.moved.
Conflict adding file lunch/i18n/mn.po.  Moved existing file to lunch/i18n/mn.po.moved.
Conflict adding file lunch/i18n/nl.po.  Moved existing file to lunch/i18n/nl.po.moved.
Text conflict in lunch/i18n/pt.po
Conflict adding file lunch/i18n/pt_BR.po.  Moved existing file to lunch/i18n/pt_BR.po.moved.
Conflict adding file lunch/i18n/ro.po.  Moved existing file to lunch/i18n/ro.po.moved.
Conflict adding file lunch/i18n/ru.po.  Moved existing file to lunch/i18n/ru.po.moved.
Conflict adding file lunch/i18n/sl.po.  Moved existing file to lunch/i18n/sl.po.moved.
Text conflict in lunch/i18n/sr@latin.po
Conflict adding file lunch/i18n/sv.po.  Moved existing file to lunch/i18n/sv.po.moved.
Conflict adding file lunch/i18n/tr.po.  Moved existing file to lunch/i18n/tr.po.moved.
Text conflict in lunch/i18n/zh_CN.po
Conflict adding file lunch/i18n/zh_TW.po.  Moved existing file to lunch/i18n/zh_TW.po.moved.
Conflict adding file mail/i18n/ar.po.  Moved existing file to mail/i18n/ar.po.moved.
Contents conflict in mail/i18n/bg.po
Contents conflict in mail/i18n/ca.po
Conflict adding file mail/i18n/da.po.  Moved existing file to mail/i18n/da.po.moved.
Text conflict in mail/i18n/de.po
Text conflict in mail/i18n/es.po
Contents conflict in mail/i18n/es_PY.po
Conflict adding file mail/i18n/fi.po.  Moved existing file to mail/i18n/fi.po.moved.
Text conflict in mail/i18n/fr.po
Contents conflict in mail/i18n/gl.po
Conflict adding file mail/i18n/hr.po.  Moved existing file to mail/i18n/hr.po.moved.
Text conflict in mail/i18n/hu.po
Text conflict in mail/i18n/it.po
Text conflict in mail/i18n/lt.po
Text conflict in mail/i18n/lv.po
Text conflict in mail/i18n/nl.po
Text conflict in mail/i18n/pl.po
Text conflict in mail/i18n/pt.po
Text conflict in mail/i18n/pt_BR.po
Contents conflict in mail/i18n/ro.po
Contents conflict in mail/i18n/ru.po
Text conflict in mail/i18n/sl.po
Text conflict in mail/i18n/sr@latin.po
Text conflict in mail/i18n/sv.po
Conflict adding file mail/i18n/tr.po.  Moved existing file to mail/i18n/tr.po.moved.
Text conflict in mail/i18n/zh_CN.po
Text conflict in mail/mail_message.py
Conflict adding file marketing/i18n/ar.po.  Moved existing file to marketing/i18n/ar.po.moved.
Conflict adding file marketing/i18n/bg.po.  Moved existing file to marketing/i18n/bg.po.moved.
Text conflict in marketing/i18n/ca.po
Conflict adding file marketing/i18n/cs.po.  Moved existing file to marketing/i18n/cs.po.moved.
Conflict adding file marketing/i18n/da.po.  Moved existing file to marketing/i18n/da.po.moved.
Text conflict in marketing/i18n/de.po
Text conflict in marketing/i18n/el.po
Text conflict in marketing/i18n/es.po
Conflict adding file marketing/i18n/es_CR.po.  Moved existing file to marketing/i18n/es_CR.po.moved.
Text conflict in marketing/i18n/fi.po
Text conflict in marketing/i18n/fr.po
Conflict adding file marketing/i18n/gl.po.  Moved existing file to marketing/i18n/gl.po.moved.
Conflict adding file marketing/i18n/hr.po.  Moved existing file to marketing/i18n/hr.po.moved.
Text conflict in marketing/i18n/hu.po
Conflict adding file marketing/i18n/id.po.  Moved existing file to marketing/i18n/id.po.moved.
Text conflict in marketing/i18n/it.po
Conflict adding file marketing/i18n/ja.po.  Moved existing file to marketing/i18n/ja.po.moved.
Conflict adding file marketing/i18n/lt.po.  Moved existing file to marketing/i18n/lt.po.moved.
Text conflict in marketing/i18n/lv.po
Text conflict in marketing/i18n/marketing.pot
Conflict adding file marketing/i18n/mk.po.  Moved existing file to marketing/i18n/mk.po.moved.
Text conflict in marketing/i18n/mn.po
Conflict adding file marketing/i18n/nb.po.  Moved existing file to marketing/i18n/nb.po.moved.
Text conflict in marketing/i18n/nl.po
Text conflict in marketing/i18n/pl.po
Text conflict in marketing/i18n/pt.po
Text conflict in marketing/i18n/pt_BR.po
Conflict adding file marketing/i18n/ro.po.  Moved existing file to marketing/i18n/ro.po.moved.
Text conflict in marketing/i18n/ru.po
Text conflict in marketing/i18n/sk.po
Conflict adding file marketing/i18n/sl.po.  Moved existing file to marketing/i18n/sl.po.moved.
Text conflict in marketing/i18n/sr.po
Text conflict in marketing/i18n/sr@latin.po
Text conflict in marketing/i18n/sv.po
Text conflict in marketing/i18n/th.po
Conflict adding file marketing/i18n/tr.po.  Moved existing file to marketing/i18n/tr.po.moved.
Text conflict in marketing/i18n/zh_CN.po
Conflict adding file marketing/i18n/zh_TW.po.  Moved existing file to marketing/i18n/zh_TW.po.moved.
Conflict adding file marketing_campaign/i18n/ar.po.  Moved existing file to marketing_campaign/i18n/ar.po.moved.
Conflict adding file marketing_campaign/i18n/bg.po.  Moved existing file to marketing_campaign/i18n/bg.po.moved.
Conflict adding file marketing_campaign/i18n/ca.po.  Moved existing file to marketing_campaign/i18n/ca.po.moved.
Conflict adding file marketing_campaign/i18n/cs.po.  Moved existing file to marketing_campaign/i18n/cs.po.moved.
Conflict adding file marketing_campaign/i18n/da.po.  Moved existing file to marketing_campaign/i18n/da.po.moved.
Text conflict in marketing_campaign/i18n/de.po
Text conflict in marketing_campaign/i18n/el.po
Text conflict in marketing_campaign/i18n/es.po
Conflict adding file marketing_campaign/i18n/es_CR.po.  Moved existing file to marketing_campaign/i18n/es_CR.po.moved.
Conflict adding file marketing_campaign/i18n/fi.po.  Moved existing file to marketing_campaign/i18n/fi.po.moved.
Text conflict in marketing_campaign/i18n/fr.po
Conflict adding file marketing_campaign/i18n/hi.po.  Moved existing file to marketing_campaign/i18n/hi.po.moved.
Conflict adding file marketing_campaign/i18n/hr.po.  Moved existing file to marketing_campaign/i18n/hr.po.moved.
Text conflict in marketing_campaign/i18n/hu.po
Text conflict in marketing_campaign/i18n/it.po
Conflict adding file marketing_campaign/i18n/ja.po.  Moved existing file to marketing_campaign/i18n/ja.po.moved.
Text conflict in marketing_campaign/i18n/lv.po
Conflict adding file marketing_campaign/i18n/mk.po.  Moved existing file to marketing_campaign/i18n/mk.po.moved.
Text conflict in marketing_campaign/i18n/mn.po
Text conflict in marketing_campaign/i18n/nl.po
Text conflict in marketing_campaign/i18n/pl.po
Text conflict in marketing_campaign/i18n/pt.po
Conflict adding file marketing_campaign/i18n/pt_BR.po.  Moved existing file to marketing_campaign/i18n/pt_BR.po.moved.
Conflict adding file marketing_campaign/i18n/ro.po.  Moved existing file to marketing_campaign/i18n/ro.po.moved.
Text conflict in marketing_campaign/i18n/ru.po
Conflict adding file marketing_campaign/i18n/sl.po.  Moved existing file to marketing_campaign/i18n/sl.po.moved.
Text conflict in marketing_campaign/i18n/sr@latin.po
Text conflict in marketing_campaign/i18n/sv.po
Conflict adding file marketing_campaign/i18n/tr.po.  Moved existing file to marketing_campaign/i18n/tr.po.moved.
Conflict adding file marketing_campaign/i18n/zh_CN.po.  Moved existing file to marketing_campaign/i18n/zh_CN.po.moved.
Conflict adding file marketing_campaign_crm_demo/i18n/ar.po.  Moved existing file to marketing_campaign_crm_demo/i18n/ar.po.moved.
Conflict adding file marketing_campaign_crm_demo/i18n/bg.po.  Moved existing file to marketing_campaign_crm_demo/i18n/bg.po.moved.
Conflict adding file marketing_campaign_crm_demo/i18n/ca.po.  Moved existing file to marketing_campaign_crm_demo/i18n/ca.po.moved.
Conflict adding file marketing_campaign_crm_demo/i18n/da.po.  Moved existing file to marketing_campaign_crm_demo/i18n/da.po.moved.
Text conflict in marketing_campaign_crm_demo/i18n/de.po
Text conflict in marketing_campaign_crm_demo/i18n/es.po
Conflict adding file marketing_campaign_crm_demo/i18n/es_CR.po.  Moved existing file to marketing_campaign_crm_demo/i18n/es_CR.po.moved.
Text conflict in marketing_campaign_crm_demo/i18n/fr.po
Conflict adding file marketing_campaign_crm_demo/i18n/gl.po.  Moved existing file to marketing_campaign_crm_demo/i18n/gl.po.moved.
Conflict adding file marketing_campaign_crm_demo/i18n/hr.po.  Moved existing file to marketing_campaign_crm_demo/i18n/hr.po.moved.
Text conflict in marketing_campaign_crm_demo/i18n/hu.po
Text conflict in marketing_campaign_crm_demo/i18n/it.po
Conflict adding file marketing_campaign_crm_demo/i18n/ja.po.  Moved existing file to marketing_campaign_crm_demo/i18n/ja.po.moved.
Conflict adding file marketing_campaign_crm_demo/i18n/mk.po.  Moved existing file to marketing_campaign_crm_demo/i18n/mk.po.moved.
Conflict adding file marketing_campaign_crm_demo/i18n/nb.po.  Moved existing file to marketing_campaign_crm_demo/i18n/nb.po.moved.
Text conflict in marketing_campaign_crm_demo/i18n/nl.po
Text conflict in marketing_campaign_crm_demo/i18n/pt.po
Conflict adding file marketing_campaign_crm_demo/i18n/pt_BR.po.  Moved existing file to marketing_campaign_crm_demo/i18n/pt_BR.po.moved.
Conflict adding file marketing_campaign_crm_demo/i18n/ro.po.  Moved existing file to marketing_campaign_crm_demo/i18n/ro.po.moved.
Text conflict in marketing_campaign_crm_demo/i18n/ru.po
Conflict adding file marketing_campaign_crm_demo/i18n/sl.po.  Moved existing file to marketing_campaign_crm_demo/i18n/sl.po.moved.
Text conflict in marketing_campaign_crm_demo/i18n/sr.po
Text conflict in marketing_campaign_crm_demo/i18n/sr@latin.po
Conflict adding file marketing_campaign_crm_demo/i18n/tr.po.  Moved existing file to marketing_campaign_crm_demo/i18n/tr.po.moved.
Conflict adding file marketing_campaign_crm_demo/i18n/zh_CN.po.  Moved existing file to marketing_campaign_crm_demo/i18n/zh_CN.po.moved.
Text conflict in membership/i18n/ar.po
Text conflict in membership/i18n/bg.po
Text conflict in membership/i18n/bs.po
Text conflict in membership/i18n/ca.po
Text conflict in membership/i18n/cs.po
Conflict adding file membership/i18n/da.po.  Moved existing file to membership/i18n/da.po.moved.
Text conflict in membership/i18n/de.po
Text conflict in membership/i18n/es.po
Text conflict in membership/i18n/es_AR.po
Conflict adding file membership/i18n/es_CR.po.  Moved existing file to membership/i18n/es_CR.po.moved.
Text conflict in membership/i18n/et.po
Text conflict in membership/i18n/fi.po
Text conflict in membership/i18n/fr.po
Text conflict in membership/i18n/gl.po
Text conflict in membership/i18n/hr.po
Text conflict in membership/i18n/hu.po
Text conflict in membership/i18n/id.po
Text conflict in membership/i18n/it.po
Conflict adding file membership/i18n/ja.po.  Moved existing file to membership/i18n/ja.po.moved.
Text conflict in membership/i18n/ko.po
Text conflict in membership/i18n/lt.po
Conflict adding file membership/i18n/mk.po.  Moved existing file to membership/i18n/mk.po.moved.
Text conflict in membership/i18n/mn.po
Text conflict in membership/i18n/nl.po
Text conflict in membership/i18n/nl_BE.po
Text conflict in membership/i18n/pl.po
Text conflict in membership/i18n/pt.po
Text conflict in membership/i18n/pt_BR.po
Text conflict in membership/i18n/ro.po
Text conflict in membership/i18n/ru.po
Text conflict in membership/i18n/sk.po
Text conflict in membership/i18n/sl.po
Text conflict in membership/i18n/sq.po
Text conflict in membership/i18n/sr@latin.po
Text conflict in membership/i18n/sv.po
Text conflict in membership/i18n/tlh.po
Text conflict in membership/i18n/tr.po
Text conflict in membership/i18n/uk.po
Text conflict in membership/i18n/vi.po
Text conflict in membership/i18n/zh_CN.po
Text conflict in membership/i18n/zh_TW.po
Text conflict in membership/test/test_membership.yml
Text conflict in mrp/board_manufacturing_view.xml
Text conflict in mrp/i18n/ar.po
Text conflict in mrp/i18n/bg.po
Text conflict in mrp/i18n/bs.po
Text conflict in mrp/i18n/ca.po
Text conflict in mrp/i18n/cs.po
Conflict adding file mrp/i18n/da.po.  Moved existing file to mrp/i18n/da.po.moved.
Text conflict in mrp/i18n/de.po
Text conflict in mrp/i18n/el.po
Text conflict in mrp/i18n/es.po
Text conflict in mrp/i18n/es_AR.po
Text conflict in mrp/i18n/es_CL.po
Conflict adding file mrp/i18n/es_CR.po.  Moved existing file to mrp/i18n/es_CR.po.moved.
Text conflict in mrp/i18n/es_EC.po
Conflict adding file mrp/i18n/es_MX.po.  Moved existing file to mrp/i18n/es_MX.po.moved.
Text conflict in mrp/i18n/et.po
Text conflict in mrp/i18n/fi.po
Text conflict in mrp/i18n/fr.po
Conflict adding file mrp/i18n/gl.po.  Moved existing file to mrp/i18n/gl.po.moved.
Text conflict in mrp/i18n/hi.po
Text conflict in mrp/i18n/hr.po
Text conflict in mrp/i18n/hu.po
Text conflict in mrp/i18n/id.po
Text conflict in mrp/i18n/it.po
Conflict adding file mrp/i18n/ja.po.  Moved existing file to mrp/i18n/ja.po.moved.
Text conflict in mrp/i18n/ko.po
Text conflict in mrp/i18n/lt.po
Conflict adding file mrp/i18n/lv.po.  Moved existing file to mrp/i18n/lv.po.moved.
Conflict adding file mrp/i18n/mk.po.  Moved existing file to mrp/i18n/mk.po.moved.
Conflict adding file mrp/i18n/mn.po.  Moved existing file to mrp/i18n/mn.po.moved.
Text conflict in mrp/i18n/mrp.pot
Conflict adding file mrp/i18n/nb.po.  Moved existing file to mrp/i18n/nb.po.moved.
Text conflict in mrp/i18n/nl.po
Text conflict in mrp/i18n/nl_BE.po
Text conflict in mrp/i18n/pl.po
Text conflict in mrp/i18n/pt.po
Text conflict in mrp/i18n/pt_BR.po
Text conflict in mrp/i18n/ro.po
Text conflict in mrp/i18n/ru.po
Text conflict in mrp/i18n/sk.po
Text conflict in mrp/i18n/sl.po
Text conflict in mrp/i18n/sq.po
Text conflict in mrp/i18n/sr@latin.po
Text conflict in mrp/i18n/sv.po
Text conflict in mrp/i18n/tlh.po
Text conflict in mrp/i18n/tr.po
Text conflict in mrp/i18n/uk.po
Text conflict in mrp/i18n/vi.po
Text conflict in mrp/i18n/zh_CN.po
Text conflict in mrp/i18n/zh_HK.po
Text conflict in mrp/i18n/zh_TW.po
Text conflict in mrp/mrp.py
Text conflict in mrp/report/price.py
Text conflict in mrp/report/price.xsl
Text conflict in mrp/wizard/mrp_product_produce.py
Text conflict in mrp_jit/i18n/ar.po
Text conflict in mrp_jit/i18n/bg.po
Text conflict in mrp_jit/i18n/bs.po
Text conflict in mrp_jit/i18n/ca.po
Text conflict in mrp_jit/i18n/cs.po
Text conflict in mrp_jit/i18n/da.po
Text conflict in mrp_jit/i18n/de.po
Text conflict in mrp_jit/i18n/el.po
Text conflict in mrp_jit/i18n/es.po
Text conflict in mrp_jit/i18n/es_AR.po
Conflict adding file mrp_jit/i18n/es_CR.po.  Moved existing file to mrp_jit/i18n/es_CR.po.moved.
Text conflict in mrp_jit/i18n/es_EC.po
Text conflict in mrp_jit/i18n/et.po
Text conflict in mrp_jit/i18n/fi.po
Text conflict in mrp_jit/i18n/fr.po
Text conflict in mrp_jit/i18n/gl.po
Text conflict in mrp_jit/i18n/hr.po
Text conflict in mrp_jit/i18n/hu.po
Text conflict in mrp_jit/i18n/id.po
Text conflict in mrp_jit/i18n/it.po
Conflict adding file mrp_jit/i18n/ja.po.  Moved existing file to mrp_jit/i18n/ja.po.moved.
Text conflict in mrp_jit/i18n/kab.po
Text conflict in mrp_jit/i18n/ko.po
Text conflict in mrp_jit/i18n/lt.po
Conflict adding file mrp_jit/i18n/mk.po.  Moved existing file to mrp_jit/i18n/mk.po.moved.
Text conflict in mrp_jit/i18n/ml.po
Text conflict in mrp_jit/i18n/mn.po
Conflict adding file mrp_jit/i18n/nb.po.  Moved existing file to mrp_jit/i18n/nb.po.moved.
Text conflict in mrp_jit/i18n/nl.po
Text conflict in mrp_jit/i18n/nl_BE.po
Text conflict in mrp_jit/i18n/oc.po
Text conflict in mrp_jit/i18n/pl.po
Text conflict in mrp_jit/i18n/pt.po
Text conflict in mrp_jit/i18n/pt_BR.po
Text conflict in mrp_jit/i18n/ro.po
Text conflict in mrp_jit/i18n/ru.po
Text conflict in mrp_jit/i18n/sk.po
Text conflict in mrp_jit/i18n/sl.po
Text conflict in mrp_jit/i18n/sq.po
Text conflict in mrp_jit/i18n/sr.po
Text conflict in mrp_jit/i18n/sr@latin.po
Text conflict in mrp_jit/i18n/sv.po
Text conflict in mrp_jit/i18n/ta.po
Text conflict in mrp_jit/i18n/tr.po
Text conflict in mrp_jit/i18n/uk.po
Text conflict in mrp_jit/i18n/vi.po
Text conflict in mrp_jit/i18n/zh_CN.po
Text conflict in mrp_jit/i18n/zh_TW.po
Text conflict in mrp_operations/i18n/ar.po
Text conflict in mrp_operations/i18n/bg.po
Text conflict in mrp_operations/i18n/bs.po
Text conflict in mrp_operations/i18n/ca.po
Text conflict in mrp_operations/i18n/cs.po
Conflict adding file mrp_operations/i18n/da.po.  Moved existing file to mrp_operations/i18n/da.po.moved.
Text conflict in mrp_operations/i18n/de.po
Text conflict in mrp_operations/i18n/es.po
Text conflict in mrp_operations/i18n/es_AR.po
Conflict adding file mrp_operations/i18n/es_CR.po.  Moved existing file to mrp_operations/i18n/es_CR.po.moved.
Text conflict in mrp_operations/i18n/es_EC.po
Text conflict in mrp_operations/i18n/et.po
Text conflict in mrp_operations/i18n/fi.po
Text conflict in mrp_operations/i18n/fr.po
Text conflict in mrp_operations/i18n/hi.po
Text conflict in mrp_operations/i18n/hr.po
Text conflict in mrp_operations/i18n/hu.po
Text conflict in mrp_operations/i18n/id.po
Text conflict in mrp_operations/i18n/it.po
Conflict adding file mrp_operations/i18n/ja.po.  Moved existing file to mrp_operations/i18n/ja.po.moved.
Text conflict in mrp_operations/i18n/ko.po
Text conflict in mrp_operations/i18n/lt.po
Conflict adding file mrp_operations/i18n/lv.po.  Moved existing file to mrp_operations/i18n/lv.po.moved.
Conflict adding file mrp_operations/i18n/mk.po.  Moved existing file to mrp_operations/i18n/mk.po.moved.
Conflict adding file mrp_operations/i18n/mn.po.  Moved existing file to mrp_operations/i18n/mn.po.moved.
Text conflict in mrp_operations/i18n/mrp_operations.pot
Text conflict in mrp_operations/i18n/nl.po
Text conflict in mrp_operations/i18n/nl_BE.po
Text conflict in mrp_operations/i18n/pl.po
Text conflict in mrp_operations/i18n/pt.po
Text conflict in mrp_operations/i18n/pt_BR.po
Text conflict in mrp_operations/i18n/ro.po
Text conflict in mrp_operations/i18n/ru.po
Text conflict in mrp_operations/i18n/sl.po
Text conflict in mrp_operations/i18n/sq.po
Text conflict in mrp_operations/i18n/sr.po
Text conflict in mrp_operations/i18n/sr@latin.po
Text conflict in mrp_operations/i18n/sv.po
Text conflict in mrp_operations/i18n/tlh.po
Text conflict in mrp_operations/i18n/tr.po
Text conflict in mrp_operations/i18n/uk.po
Text conflict in mrp_operations/i18n/vi.po
Text conflict in mrp_operations/i18n/zh_CN.po
Text conflict in mrp_operations/i18n/zh_TW.po
Text conflict in mrp_operations/mrp_operations_view.xml
Text conflict in mrp_repair/i18n/ar.po
Text conflict in mrp_repair/i18n/bg.po
Text conflict in mrp_repair/i18n/bs.po
Text conflict in mrp_repair/i18n/ca.po
Text conflict in mrp_repair/i18n/cs.po
Conflict adding file mrp_repair/i18n/da.po.  Moved existing file to mrp_repair/i18n/da.po.moved.
Text conflict in mrp_repair/i18n/de.po
Text conflict in mrp_repair/i18n/es.po
Text conflict in mrp_repair/i18n/es_AR.po
Conflict adding file mrp_repair/i18n/es_CR.po.  Moved existing file to mrp_repair/i18n/es_CR.po.moved.
Text conflict in mrp_repair/i18n/es_EC.po
Text conflict in mrp_repair/i18n/et.po
Text conflict in mrp_repair/i18n/fi.po
Text conflict in mrp_repair/i18n/fr.po
Text conflict in mrp_repair/i18n/hi.po
Text conflict in mrp_repair/i18n/hr.po
Text conflict in mrp_repair/i18n/hu.po
Text conflict in mrp_repair/i18n/id.po
Text conflict in mrp_repair/i18n/it.po
Conflict adding file mrp_repair/i18n/ja.po.  Moved existing file to mrp_repair/i18n/ja.po.moved.
Text conflict in mrp_repair/i18n/ko.po
Text conflict in mrp_repair/i18n/lt.po
Conflict adding file mrp_repair/i18n/lv.po.  Moved existing file to mrp_repair/i18n/lv.po.moved.
Conflict adding file mrp_repair/i18n/mk.po.  Moved existing file to mrp_repair/i18n/mk.po.moved.
Conflict adding file mrp_repair/i18n/mn.po.  Moved existing file to mrp_repair/i18n/mn.po.moved.
Text conflict in mrp_repair/i18n/mrp_repair.pot
Text conflict in mrp_repair/i18n/nl.po
Text conflict in mrp_repair/i18n/nl_BE.po
Text conflict in mrp_repair/i18n/pl.po
Text conflict in mrp_repair/i18n/pt.po
Text conflict in mrp_repair/i18n/pt_BR.po
Text conflict in mrp_repair/i18n/ro.po
Text conflict in mrp_repair/i18n/ru.po
Text conflict in mrp_repair/i18n/sl.po
Text conflict in mrp_repair/i18n/sq.po
Text conflict in mrp_repair/i18n/sr.po
Text conflict in mrp_repair/i18n/sr@latin.po
Text conflict in mrp_repair/i18n/sv.po
Text conflict in mrp_repair/i18n/tlh.po
Text conflict in mrp_repair/i18n/tr.po
Text conflict in mrp_repair/i18n/uk.po
Text conflict in mrp_repair/i18n/vi.po
Text conflict in mrp_repair/i18n/zh_CN.po
Text conflict in mrp_repair/i18n/zh_TW.po
Text conflict in mrp_repair/mrp_repair.py
Text conflict in mrp_subproduct/i18n/ab.po
Text conflict in mrp_subproduct/i18n/ar.po
Text conflict in mrp_subproduct/i18n/bg.po
Text conflict in mrp_subproduct/i18n/bs.po
Text conflict in mrp_subproduct/i18n/ca.po
Text conflict in mrp_subproduct/i18n/cs.po
Conflict adding file mrp_subproduct/i18n/da.po.  Moved existing file to mrp_subproduct/i18n/da.po.moved.
Text conflict in mrp_subproduct/i18n/de.po
Text conflict in mrp_subproduct/i18n/es.po
Text conflict in mrp_subproduct/i18n/es_AR.po
Conflict adding file mrp_subproduct/i18n/es_CR.po.  Moved existing file to mrp_subproduct/i18n/es_CR.po.moved.
Text conflict in mrp_subproduct/i18n/es_EC.po
Text conflict in mrp_subproduct/i18n/et.po
Text conflict in mrp_subproduct/i18n/fi.po
Text conflict in mrp_subproduct/i18n/fr.po
Conflict adding file mrp_subproduct/i18n/gl.po.  Moved existing file to mrp_subproduct/i18n/gl.po.moved.
Text conflict in mrp_subproduct/i18n/hr.po
Text conflict in mrp_subproduct/i18n/hu.po
Text conflict in mrp_subproduct/i18n/id.po
Text conflict in mrp_subproduct/i18n/it.po
Conflict adding file mrp_subproduct/i18n/ja.po.  Moved existing file to mrp_subproduct/i18n/ja.po.moved.
Text conflict in mrp_subproduct/i18n/ko.po
Text conflict in mrp_subproduct/i18n/lt.po
Text conflict in mrp_subproduct/i18n/mn.po
Conflict adding file mrp_subproduct/i18n/nb.po.  Moved existing file to mrp_subproduct/i18n/nb.po.moved.
Text conflict in mrp_subproduct/i18n/nl.po
Text conflict in mrp_subproduct/i18n/nl_BE.po
Text conflict in mrp_subproduct/i18n/oc.po
Text conflict in mrp_subproduct/i18n/pl.po
Text conflict in mrp_subproduct/i18n/pt.po
Text conflict in mrp_subproduct/i18n/pt_BR.po
Text conflict in mrp_subproduct/i18n/ro.po
Text conflict in mrp_subproduct/i18n/ru.po
Text conflict in mrp_subproduct/i18n/sk.po
Text conflict in mrp_subproduct/i18n/sl.po
Text conflict in mrp_subproduct/i18n/sq.po
Text conflict in mrp_subproduct/i18n/sr.po
Text conflict in mrp_subproduct/i18n/sr@latin.po
Text conflict in mrp_subproduct/i18n/sv.po
Text conflict in mrp_subproduct/i18n/tlh.po
Text conflict in mrp_subproduct/i18n/tr.po
Text conflict in mrp_subproduct/i18n/uk.po
Text conflict in mrp_subproduct/i18n/vi.po
Text conflict in mrp_subproduct/i18n/zh_CN.po
Text conflict in mrp_subproduct/i18n/zh_TW.po
Text conflict in multi_company/i18n/ar.po
Text conflict in multi_company/i18n/bg.po
Text conflict in multi_company/i18n/bs.po
Text conflict in multi_company/i18n/ca.po
Text conflict in multi_company/i18n/cs.po
Conflict adding file multi_company/i18n/da.po.  Moved existing file to multi_company/i18n/da.po.moved.
Text conflict in multi_company/i18n/de.po
Text conflict in multi_company/i18n/es.po
Conflict adding file multi_company/i18n/es_CR.po.  Moved existing file to multi_company/i18n/es_CR.po.moved.
Text conflict in multi_company/i18n/es_EC.po
Text conflict in multi_company/i18n/et.po
Text conflict in multi_company/i18n/fi.po
Text conflict in multi_company/i18n/fr.po
Conflict adding file multi_company/i18n/gl.po.  Moved existing file to multi_company/i18n/gl.po.moved.
Text conflict in multi_company/i18n/hr.po
Text conflict in multi_company/i18n/hu.po
Text conflict in multi_company/i18n/id.po
Text conflict in multi_company/i18n/it.po
Conflict adding file multi_company/i18n/ja.po.  Moved existing file to multi_company/i18n/ja.po.moved.
Conflict adding file multi_company/i18n/lo.po.  Moved existing file to multi_company/i18n/lo.po.moved.
Text conflict in multi_company/i18n/lt.po
Conflict adding file multi_company/i18n/lv.po.  Moved existing file to multi_company/i18n/lv.po.moved.
Conflict adding file multi_company/i18n/mk.po.  Moved existing file to multi_company/i18n/mk.po.moved.
Text conflict in multi_company/i18n/mn.po
Conflict adding file multi_company/i18n/nb.po.  Moved existing file to multi_company/i18n/nb.po.moved.
Text conflict in multi_company/i18n/nl.po
Text conflict in multi_company/i18n/oc.po
Text conflict in multi_company/i18n/pl.po
Text conflict in multi_company/i18n/pt.po
Text conflict in multi_company/i18n/pt_BR.po
Text conflict in multi_company/i18n/ro.po
Text conflict in multi_company/i18n/ru.po
Text conflict in multi_company/i18n/sl.po
Text conflict in multi_company/i18n/sr.po
Text conflict in multi_company/i18n/sr@latin.po
Text conflict in multi_company/i18n/sv.po
Text conflict in multi_company/i18n/tr.po
Text conflict in multi_company/i18n/uk.po
Conflict adding file multi_company/i18n/vi.po.  Moved existing file to multi_company/i18n/vi.po.moved.
Text conflict in multi_company/i18n/zh_CN.po
Text conflict in multi_company/i18n/zh_TW.po
Conflict adding file pad/i18n/ar.po.  Moved existing file to pad/i18n/ar.po.moved.
Conflict adding file pad/i18n/bg.po.  Moved existing file to pad/i18n/bg.po.moved.
Conflict adding file pad/i18n/ca.po.  Moved existing file to pad/i18n/ca.po.moved.
Conflict adding file pad/i18n/cs.po.  Moved existing file to pad/i18n/cs.po.moved.
Conflict adding file pad/i18n/da.po.  Moved existing file to pad/i18n/da.po.moved.
Text conflict in pad/i18n/de.po
Text conflict in pad/i18n/es.po
Conflict adding file pad/i18n/es_CR.po.  Moved existing file to pad/i18n/es_CR.po.moved.
Conflict adding file pad/i18n/fi.po.  Moved existing file to pad/i18n/fi.po.moved.
Text conflict in pad/i18n/fr.po
Conflict adding file pad/i18n/gl.po.  Moved existing file to pad/i18n/gl.po.moved.
Conflict adding file pad/i18n/hr.po.  Moved existing file to pad/i18n/hr.po.moved.
Text conflict in pad/i18n/hu.po
Text conflict in pad/i18n/it.po
Conflict adding file pad/i18n/ja.po.  Moved existing file to pad/i18n/ja.po.moved.
Conflict adding file pad/i18n/mk.po.  Moved existing file to pad/i18n/mk.po.moved.
Text conflict in pad/i18n/mn.po
Conflict adding file pad/i18n/nb.po.  Moved existing file to pad/i18n/nb.po.moved.
Text conflict in pad/i18n/nl.po
Conflict adding file pad/i18n/pl.po.  Moved existing file to pad/i18n/pl.po.moved.
Text conflict in pad/i18n/pt.po
Text conflict in pad/i18n/pt_BR.po
Conflict adding file pad/i18n/ro.po.  Moved existing file to pad/i18n/ro.po.moved.
Conflict adding file pad/i18n/ru.po.  Moved existing file to pad/i18n/ru.po.moved.
Text conflict in pad/i18n/sl.po
Text conflict in pad/i18n/sr@latin.po
Conflict adding file pad/i18n/sv.po.  Moved existing file to pad/i18n/sv.po.moved.
Conflict adding file pad/i18n/tr.po.  Moved existing file to pad/i18n/tr.po.moved.
Conflict adding file pad/i18n/zh_CN.po.  Moved existing file to pad/i18n/zh_CN.po.moved.
Conflict adding file plugin_outlook/i18n/ar.po.  Moved existing file to plugin_outlook/i18n/ar.po.moved.
Contents conflict in plugin_outlook/i18n/bg.po
Contents conflict in plugin_outlook/i18n/ca.po
Conflict adding file plugin_outlook/i18n/da.po.  Moved existing file to plugin_outlook/i18n/da.po.moved.
Text conflict in plugin_outlook/i18n/de.po
Contents conflict in plugin_outlook/i18n/el.po
Text conflict in plugin_outlook/i18n/es.po
Text conflict in plugin_outlook/i18n/et.po
Conflict adding file plugin_outlook/i18n/fi.po.  Moved existing file to plugin_outlook/i18n/fi.po.moved.
Text conflict in plugin_outlook/i18n/fr.po
Contents conflict in plugin_outlook/i18n/gl.po
Conflict adding file plugin_outlook/i18n/hr.po.  Moved existing file to plugin_outlook/i18n/hr.po.moved.
Text conflict in plugin_outlook/i18n/hu.po
Text conflict in plugin_outlook/i18n/it.po
Text conflict in plugin_outlook/i18n/mn.po
Text conflict in plugin_outlook/i18n/nl.po
Text conflict in plugin_outlook/i18n/pl.po
Text conflict in plugin_outlook/i18n/pt.po
Contents conflict in plugin_outlook/i18n/pt_BR.po
Conflict adding file plugin_outlook/i18n/ro.po.  Moved existing file to plugin_outlook/i18n/ro.po.moved.
Contents conflict in plugin_outlook/i18n/ru.po
Text conflict in plugin_outlook/i18n/sl.po
Text conflict in plugin_outlook/i18n/sr@latin.po
Text conflict in plugin_outlook/i18n/sv.po
Text conflict in plugin_outlook/i18n/tr.po
Text conflict in plugin_outlook/i18n/zh_CN.po
Text conflict in plugin_outlook/plugin_outlook.py
Text conflict in point_of_sale/i18n/ar.po
Text conflict in point_of_sale/i18n/bg.po
Text conflict in point_of_sale/i18n/bs.po
Text conflict in point_of_sale/i18n/ca.po
Text conflict in point_of_sale/i18n/cs.po
Text conflict in point_of_sale/i18n/da.po
Text conflict in point_of_sale/i18n/de.po
Text conflict in point_of_sale/i18n/el.po
Text conflict in point_of_sale/i18n/es.po
Text conflict in point_of_sale/i18n/es_AR.po
Conflict adding file point_of_sale/i18n/es_CR.po.  Moved existing file to point_of_sale/i18n/es_CR.po.moved.
Text conflict in point_of_sale/i18n/es_EC.po
Text conflict in point_of_sale/i18n/et.po
Text conflict in point_of_sale/i18n/fi.po
Text conflict in point_of_sale/i18n/fr.po
Text conflict in point_of_sale/i18n/hi.po
Text conflict in point_of_sale/i18n/hr.po
Text conflict in point_of_sale/i18n/hu.po
Text conflict in point_of_sale/i18n/id.po
Text conflict in point_of_sale/i18n/it.po
Conflict adding file point_of_sale/i18n/ja.po.  Moved existing file to point_of_sale/i18n/ja.po.moved.
Text conflict in point_of_sale/i18n/ko.po
Text conflict in point_of_sale/i18n/lt.po
Conflict adding file point_of_sale/i18n/lv.po.  Moved existing file to point_of_sale/i18n/lv.po.moved.
Conflict adding file point_of_sale/i18n/mk.po.  Moved existing file to point_of_sale/i18n/mk.po.moved.
Text conflict in point_of_sale/i18n/mn.po
Conflict adding file point_of_sale/i18n/nb.po.  Moved existing file to point_of_sale/i18n/nb.po.moved.
Text conflict in point_of_sale/i18n/nl.po
Text conflict in point_of_sale/i18n/nl_BE.po
Text conflict in point_of_sale/i18n/pl.po
Text conflict in point_of_sale/i18n/point_of_sale.pot
Text conflict in point_of_sale/i18n/pt.po
Text conflict in point_of_sale/i18n/pt_BR.po
Text conflict in point_of_sale/i18n/ro.po
Text conflict in point_of_sale/i18n/ru.po
Text conflict in point_of_sale/i18n/sl.po
Text conflict in point_of_sale/i18n/sq.po
Text conflict in point_of_sale/i18n/sr.po
Text conflict in point_of_sale/i18n/sr@latin.po
Text conflict in point_of_sale/i18n/sv.po
Text conflict in point_of_sale/i18n/tlh.po
Text conflict in point_of_sale/i18n/tr.po
Text conflict in point_of_sale/i18n/uk.po
Text conflict in point_of_sale/i18n/vi.po
Text conflict in point_of_sale/i18n/zh_CN.po
Text conflict in point_of_sale/i18n/zh_HK.po
Text conflict in point_of_sale/i18n/zh_TW.po
Text conflict in point_of_sale/point_of_sale.py
Text conflict in point_of_sale/point_of_sale_view.xml
Text conflict in point_of_sale/report/pos_order_report_view.xml
Text conflict in point_of_sale/test/point_of_sale_report.yml
Contents conflict in point_of_sale/test/point_of_sale_test.yml
Text conflict in point_of_sale/wizard/pos_box_out.py
Text conflict in process/i18n/ar.po
Text conflict in process/i18n/bg.po
Text conflict in process/i18n/bs.po
Text conflict in process/i18n/ca.po
Text conflict in process/i18n/cs.po
Conflict adding file process/i18n/da.po.  Moved existing file to process/i18n/da.po.moved.
Text conflict in process/i18n/de.po
Text conflict in process/i18n/el.po
Text conflict in process/i18n/es.po
Text conflict in process/i18n/es_AR.po
Text conflict in process/i18n/es_CL.po
Conflict adding file process/i18n/es_CR.po.  Moved existing file to process/i18n/es_CR.po.moved.
Text conflict in process/i18n/et.po
Text conflict in process/i18n/fi.po
Text conflict in process/i18n/fr.po
Text conflict in process/i18n/gl.po
Text conflict in process/i18n/hi.po
Text conflict in process/i18n/hr.po
Text conflict in process/i18n/hu.po
Text conflict in process/i18n/id.po
Text conflict in process/i18n/it.po
Conflict adding file process/i18n/ja.po.  Moved existing file to process/i18n/ja.po.moved.
Text conflict in process/i18n/ko.po
Text conflict in process/i18n/lt.po
Conflict adding file process/i18n/mk.po.  Moved existing file to process/i18n/mk.po.moved.
Text conflict in process/i18n/mn.po
Text conflict in process/i18n/nl.po
Text conflict in process/i18n/nl_BE.po
Text conflict in process/i18n/pl.po
Text conflict in process/i18n/pt.po
Text conflict in process/i18n/pt_BR.po
Text conflict in process/i18n/ro.po
Text conflict in process/i18n/ru.po
Text conflict in process/i18n/sk.po
Text conflict in process/i18n/sl.po
Text conflict in process/i18n/sq.po
Text conflict in process/i18n/sr.po
Text conflict in process/i18n/sr@latin.po
Text conflict in process/i18n/sv.po
Text conflict in process/i18n/tlh.po
Text conflict in process/i18n/tr.po
Text conflict in process/i18n/uk.po
Text conflict in process/i18n/vi.po
Text conflict in process/i18n/zh_CN.po
Text conflict in process/i18n/zh_TW.po
Text conflict in process/process.py
Conflict adding file procurement/i18n/ar.po.  Moved existing file to procurement/i18n/ar.po.moved.
Conflict adding file procurement/i18n/bg.po.  Moved existing file to procurement/i18n/bg.po.moved.
Conflict adding file procurement/i18n/ca.po.  Moved existing file to procurement/i18n/ca.po.moved.
Conflict adding file procurement/i18n/cs.po.  Moved existing file to procurement/i18n/cs.po.moved.
Conflict adding file procurement/i18n/da.po.  Moved existing file to procurement/i18n/da.po.moved.
Text conflict in procurement/i18n/de.po
Text conflict in procurement/i18n/es.po
Conflict adding file procurement/i18n/es_CL.po.  Moved existing file to procurement/i18n/es_CL.po.moved.
Conflict adding file procurement/i18n/es_CR.po.  Moved existing file to procurement/i18n/es_CR.po.moved.
Conflict adding file procurement/i18n/es_EC.po.  Moved existing file to procurement/i18n/es_EC.po.moved.
Conflict adding file procurement/i18n/et.po.  Moved existing file to procurement/i18n/et.po.moved.
Conflict adding file procurement/i18n/fi.po.  Moved existing file to procurement/i18n/fi.po.moved.
Text conflict in procurement/i18n/fr.po
Conflict adding file procurement/i18n/gl.po.  Moved existing file to procurement/i18n/gl.po.moved.
Conflict adding file procurement/i18n/hr.po.  Moved existing file to procurement/i18n/hr.po.moved.
Text conflict in procurement/i18n/hu.po
Conflict adding file procurement/i18n/id.po.  Moved existing file to procurement/i18n/id.po.moved.
Text conflict in procurement/i18n/it.po
Conflict adding file procurement/i18n/ja.po.  Moved existing file to procurement/i18n/ja.po.moved.
Conflict adding file procurement/i18n/lt.po.  Moved existing file to procurement/i18n/lt.po.moved.
Conflict adding file procurement/i18n/mk.po.  Moved existing file to procurement/i18n/mk.po.moved.
Text conflict in procurement/i18n/mn.po
Conflict adding file procurement/i18n/nb.po.  Moved existing file to procurement/i18n/nb.po.moved.
Text conflict in procurement/i18n/nl.po
Text conflict in procurement/i18n/pl.po
Text conflict in procurement/i18n/procurement.pot
Text conflict in procurement/i18n/pt.po
Text conflict in procurement/i18n/pt_BR.po
Conflict adding file procurement/i18n/ro.po.  Moved existing file to procurement/i18n/ro.po.moved.
Text conflict in procurement/i18n/ru.po
Conflict adding file procurement/i18n/sl.po.  Moved existing file to procurement/i18n/sl.po.moved.
Text conflict in procurement/i18n/sr.po
Text conflict in procurement/i18n/sr@latin.po
Text conflict in procurement/i18n/sv.po
Conflict adding file procurement/i18n/tr.po.  Moved existing file to procurement/i18n/tr.po.moved.
Text conflict in procurement/i18n/vi.po
Text conflict in procurement/i18n/zh_CN.po
Text conflict in procurement/schedulers.py
Text conflict in product/i18n/ar.po
Text conflict in product/i18n/bg.po
Text conflict in product/i18n/bs.po
Text conflict in product/i18n/ca.po
Text conflict in product/i18n/cs.po
Conflict adding file product/i18n/da.po.  Moved existing file to product/i18n/da.po.moved.
Text conflict in product/i18n/de.po
Text conflict in product/i18n/el.po
Text conflict in product/i18n/es.po
Text conflict in product/i18n/es_AR.po
Text conflict in product/i18n/es_CL.po
Conflict adding file product/i18n/es_CR.po.  Moved existing file to product/i18n/es_CR.po.moved.
Text conflict in product/i18n/es_EC.po
Conflict adding file product/i18n/es_PY.po.  Moved existing file to product/i18n/es_PY.po.moved.
Text conflict in product/i18n/et.po
Text conflict in product/i18n/eu.po
Text conflict in product/i18n/fi.po
Text conflict in product/i18n/fr.po
Text conflict in product/i18n/gl.po
Text conflict in product/i18n/hr.po
Text conflict in product/i18n/hu.po
Text conflict in product/i18n/id.po
Text conflict in product/i18n/it.po
Conflict adding file product/i18n/ja.po.  Moved existing file to product/i18n/ja.po.moved.
Text conflict in product/i18n/ko.po
Conflict adding file product/i18n/lo.po.  Moved existing file to product/i18n/lo.po.moved.
Text conflict in product/i18n/lt.po
Text conflict in product/i18n/lv.po
Conflict adding file product/i18n/mk.po.  Moved existing file to product/i18n/mk.po.moved.
Text conflict in product/i18n/mn.po
Text conflict in product/i18n/nb.po
Text conflict in product/i18n/nl.po
Text conflict in product/i18n/nl_BE.po
Text conflict in product/i18n/pl.po
Text conflict in product/i18n/product.pot
Text conflict in product/i18n/pt.po
Text conflict in product/i18n/pt_BR.po
Text conflict in product/i18n/ro.po
Text conflict in product/i18n/ru.po
Text conflict in product/i18n/sk.po
Text conflict in product/i18n/sl.po
Text conflict in product/i18n/sq.po
Text conflict in product/i18n/sr.po
Text conflict in product/i18n/sr@latin.po
Text conflict in product/i18n/sv.po
Text conflict in product/i18n/th.po
Text conflict in product/i18n/tlh.po
Text conflict in product/i18n/tr.po
Text conflict in product/i18n/uk.po
Text conflict in product/i18n/vi.po
Text conflict in product/i18n/zh_CN.po
Text conflict in product/i18n/zh_TW.po
Text conflict in product/product.py
Conflict adding file product_expiry/i18n/ar.po.  Moved existing file to product_expiry/i18n/ar.po.moved.
Text conflict in product_expiry/i18n/ca.po
Conflict adding file product_expiry/i18n/cs.po.  Moved existing file to product_expiry/i18n/cs.po.moved.
Conflict adding file product_expiry/i18n/da.po.  Moved existing file to product_expiry/i18n/da.po.moved.
Text conflict in product_expiry/i18n/de.po
Text conflict in product_expiry/i18n/el.po
Text conflict in product_expiry/i18n/es.po
Conflict adding file product_expiry/i18n/es_CR.po.  Moved existing file to product_expiry/i18n/es_CR.po.moved.
Text conflict in product_expiry/i18n/es_EC.po
Text conflict in product_expiry/i18n/et.po
Conflict adding file product_expiry/i18n/fi.po.  Moved existing file to product_expiry/i18n/fi.po.moved.
Text conflict in product_expiry/i18n/fr.po
Conflict adding file product_expiry/i18n/gl.po.  Moved existing file to product_expiry/i18n/gl.po.moved.
Text conflict in product_expiry/i18n/hr.po
Text conflict in product_expiry/i18n/hu.po
Text conflict in product_expiry/i18n/it.po
Conflict adding file product_expiry/i18n/ja.po.  Moved existing file to product_expiry/i18n/ja.po.moved.
Conflict adding file product_expiry/i18n/mk.po.  Moved existing file to product_expiry/i18n/mk.po.moved.
Text conflict in product_expiry/i18n/mn.po
Text conflict in product_expiry/i18n/nl.po
Text conflict in product_expiry/i18n/pl.po
Text conflict in product_expiry/i18n/pt.po
Text conflict in product_expiry/i18n/pt_BR.po
Conflict adding file product_expiry/i18n/ro.po.  Moved existing file to product_expiry/i18n/ro.po.moved.
Text conflict in product_expiry/i18n/ru.po
Text conflict in product_expiry/i18n/sl.po
Text conflict in product_expiry/i18n/sr.po
Text conflict in product_expiry/i18n/sr@latin.po
Text conflict in product_expiry/i18n/sv.po
Conflict adding file product_expiry/i18n/tr.po.  Moved existing file to product_expiry/i18n/tr.po.moved.
Text conflict in product_expiry/i18n/vi.po
Conflict adding file product_expiry/i18n/zh_CN.po.  Moved existing file to product_expiry/i18n/zh_CN.po.moved.
Conflict adding file product_expiry/i18n/zh_TW.po.  Moved existing file to product_expiry/i18n/zh_TW.po.moved.
Conflict adding file product_manufacturer/i18n/ar.po.  Moved existing file to product_manufacturer/i18n/ar.po.moved.
Conflict adding file product_manufacturer/i18n/bg.po.  Moved existing file to product_manufacturer/i18n/bg.po.moved.
Conflict adding file product_manufacturer/i18n/ca.po.  Moved existing file to product_manufacturer/i18n/ca.po.moved.
Conflict adding file product_manufacturer/i18n/cs.po.  Moved existing file to product_manufacturer/i18n/cs.po.moved.
Conflict adding file product_manufacturer/i18n/da.po.  Moved existing file to product_manufacturer/i18n/da.po.moved.
Text conflict in product_manufacturer/i18n/de.po
Text conflict in product_manufacturer/i18n/el.po
Text conflict in product_manufacturer/i18n/es.po
Conflict adding file product_manufacturer/i18n/es_CR.po.  Moved existing file to product_manufacturer/i18n/es_CR.po.moved.
Text conflict in product_manufacturer/i18n/es_EC.po
Text conflict in product_manufacturer/i18n/et.po
Conflict adding file product_manufacturer/i18n/fi.po.  Moved existing file to product_manufacturer/i18n/fi.po.moved.
Text conflict in product_manufacturer/i18n/fr.po
Conflict adding file product_manufacturer/i18n/gl.po.  Moved existing file to product_manufacturer/i18n/gl.po.moved.
Text conflict in product_manufacturer/i18n/hr.po
Text conflict in product_manufacturer/i18n/hu.po
Text conflict in product_manufacturer/i18n/it.po
Conflict adding file product_manufacturer/i18n/ja.po.  Moved existing file to product_manufacturer/i18n/ja.po.moved.
Conflict adding file product_manufacturer/i18n/lt.po.  Moved existing file to product_manufacturer/i18n/lt.po.moved.
Conflict adding file product_manufacturer/i18n/mk.po.  Moved existing file to product_manufacturer/i18n/mk.po.moved.
Text conflict in product_manufacturer/i18n/mn.po
Conflict adding file product_manufacturer/i18n/nb.po.  Moved existing file to product_manufacturer/i18n/nb.po.moved.
Text conflict in product_manufacturer/i18n/nl.po
Text conflict in product_manufacturer/i18n/pl.po
Text conflict in product_manufacturer/i18n/pt.po
Text conflict in product_manufacturer/i18n/pt_BR.po
Conflict adding file product_manufacturer/i18n/ro.po.  Moved existing file to product_manufacturer/i18n/ro.po.moved.
Text conflict in product_manufacturer/i18n/ru.po
Text conflict in product_manufacturer/i18n/sl.po
Text conflict in product_manufacturer/i18n/sr.po
Text conflict in product_manufacturer/i18n/sr@latin.po
Text conflict in product_manufacturer/i18n/sv.po
Text conflict in product_manufacturer/i18n/tr.po
Text conflict in product_manufacturer/i18n/zh_CN.po
Conflict adding file product_manufacturer/i18n/zh_TW.po.  Moved existing file to product_manufacturer/i18n/zh_TW.po.moved.
Text conflict in product_margin/i18n/ar.po
Text conflict in product_margin/i18n/bg.po
Text conflict in product_margin/i18n/bs.po
Text conflict in product_margin/i18n/ca.po
Text conflict in product_margin/i18n/cs.po
Conflict adding file product_margin/i18n/da.po.  Moved existing file to product_margin/i18n/da.po.moved.
Text conflict in product_margin/i18n/de.po
Text conflict in product_margin/i18n/el.po
Text conflict in product_margin/i18n/es.po
Text conflict in product_margin/i18n/es_AR.po
Conflict adding file product_margin/i18n/es_CR.po.  Moved existing file to product_margin/i18n/es_CR.po.moved.
Text conflict in product_margin/i18n/es_EC.po
Text conflict in product_margin/i18n/et.po
Text conflict in product_margin/i18n/fi.po
Text conflict in product_margin/i18n/fr.po
Conflict adding file product_margin/i18n/gl.po.  Moved existing file to product_margin/i18n/gl.po.moved.
Conflict adding file product_margin/i18n/gu.po.  Moved existing file to product_margin/i18n/gu.po.moved.
Text conflict in product_margin/i18n/hr.po
Text conflict in product_margin/i18n/hu.po
Text conflict in product_margin/i18n/id.po
Text conflict in product_margin/i18n/it.po
Conflict adding file product_margin/i18n/ja.po.  Moved existing file to product_margin/i18n/ja.po.moved.
Text conflict in product_margin/i18n/ko.po
Text conflict in product_margin/i18n/lt.po
Conflict adding file product_margin/i18n/mk.po.  Moved existing file to product_margin/i18n/mk.po.moved.
Text conflict in product_margin/i18n/nl.po
Text conflict in product_margin/i18n/nl_BE.po
Text conflict in product_margin/i18n/pl.po
Text conflict in product_margin/i18n/pt.po
Text conflict in product_margin/i18n/pt_BR.po
Text conflict in product_margin/i18n/ro.po
Text conflict in product_margin/i18n/ru.po
Text conflict in product_margin/i18n/sl.po
Text conflict in product_margin/i18n/sq.po
Text conflict in product_margin/i18n/sr.po
Text conflict in product_margin/i18n/sr@latin.po
Text conflict in product_margin/i18n/sv.po
Text conflict in product_margin/i18n/tlh.po
Text conflict in product_margin/i18n/tr.po
Text conflict in product_margin/i18n/uk.po
Text conflict in product_margin/i18n/vi.po
Text conflict in product_margin/i18n/zh_CN.po
Text conflict in product_margin/i18n/zh_TW.po
Text conflict in product_margin/product_margin.py
Conflict adding file product_visible_discount/i18n/ar.po.  Moved existing file to product_visible_discount/i18n/ar.po.moved.
Conflict adding file product_visible_discount/i18n/bg.po.  Moved existing file to product_visible_discount/i18n/bg.po.moved.
Text conflict in product_visible_discount/i18n/ca.po
Conflict adding file product_visible_discount/i18n/cs.po.  Moved existing file to product_visible_discount/i18n/cs.po.moved.
Conflict adding file product_visible_discount/i18n/da.po.  Moved existing file to product_visible_discount/i18n/da.po.moved.
Text conflict in product_visible_discount/i18n/de.po
Text conflict in product_visible_discount/i18n/el.po
Text conflict in product_visible_discount/i18n/es.po
Conflict adding file product_visible_discount/i18n/es_CR.po.  Moved existing file to product_visible_discount/i18n/es_CR.po.moved.
Text conflict in product_visible_discount/i18n/es_EC.po
Text conflict in product_visible_discount/i18n/et.po
Conflict adding file product_visible_discount/i18n/fi.po.  Moved existing file to product_visible_discount/i18n/fi.po.moved.
Text conflict in product_visible_discount/i18n/fr.po
Conflict adding file product_visible_discount/i18n/gl.po.  Moved existing file to product_visible_discount/i18n/gl.po.moved.
Text conflict in product_visible_discount/i18n/hr.po
Text conflict in product_visible_discount/i18n/hu.po
Text conflict in product_visible_discount/i18n/it.po
Conflict adding file product_visible_discount/i18n/ja.po.  Moved existing file to product_visible_discount/i18n/ja.po.moved.
Conflict adding file product_visible_discount/i18n/lt.po.  Moved existing file to product_visible_discount/i18n/lt.po.moved.
Conflict adding file product_visible_discount/i18n/mk.po.  Moved existing file to product_visible_discount/i18n/mk.po.moved.
Text conflict in product_visible_discount/i18n/mn.po
Text conflict in product_visible_discount/i18n/nl.po
Text conflict in product_visible_discount/i18n/pl.po
Text conflict in product_visible_discount/i18n/pt.po
Text conflict in product_visible_discount/i18n/pt_BR.po
Conflict adding file product_visible_discount/i18n/ro.po.  Moved existing file to product_visible_discount/i18n/ro.po.moved.
Text conflict in product_visible_discount/i18n/ru.po
Text conflict in product_visible_discount/i18n/sl.po
Text conflict in product_visible_discount/i18n/sr.po
Text conflict in product_visible_discount/i18n/sr@latin.po
Conflict adding file product_visible_discount/i18n/sv.po.  Moved existing file to product_visible_discount/i18n/sv.po.moved.
Text conflict in product_visible_discount/i18n/tr.po
Conflict adding file product_visible_discount/i18n/vi.po.  Moved existing file to product_visible_discount/i18n/vi.po.moved.
Conflict adding file product_visible_discount/i18n/zh_CN.po.  Moved existing file to product_visible_discount/i18n/zh_CN.po.moved.
Conflict adding file profile_tools/i18n/ar.po.  Moved existing file to profile_tools/i18n/ar.po.moved.
Conflict adding file profile_tools/i18n/bg.po.  Moved existing file to profile_tools/i18n/bg.po.moved.
Conflict adding file profile_tools/i18n/ca.po.  Moved existing file to profile_tools/i18n/ca.po.moved.
Conflict adding file profile_tools/i18n/da.po.  Moved existing file to profile_tools/i18n/da.po.moved.
Text conflict in profile_tools/i18n/de.po
Text conflict in profile_tools/i18n/es.po
Conflict adding file profile_tools/i18n/es_CR.po.  Moved existing file to profile_tools/i18n/es_CR.po.moved.
Conflict adding file profile_tools/i18n/fi.po.  Moved existing file to profile_tools/i18n/fi.po.moved.
Text conflict in profile_tools/i18n/fr.po
Conflict adding file profile_tools/i18n/gl.po.  Moved existing file to profile_tools/i18n/gl.po.moved.
Conflict adding file profile_tools/i18n/hr.po.  Moved existing file to profile_tools/i18n/hr.po.moved.
Text conflict in profile_tools/i18n/hu.po
Text conflict in profile_tools/i18n/it.po
Text conflict in profile_tools/i18n/mn.po
Conflict adding file profile_tools/i18n/nl.po.  Moved existing file to profile_tools/i18n/nl.po.moved.
Text conflict in profile_tools/i18n/pt.po
Conflict adding file profile_tools/i18n/pt_BR.po.  Moved existing file to profile_tools/i18n/pt_BR.po.moved.
Conflict adding file profile_tools/i18n/ro.po.  Moved existing file to profile_tools/i18n/ro.po.moved.
Conflict adding file profile_tools/i18n/ru.po.  Moved existing file to profile_tools/i18n/ru.po.moved.
Conflict adding file profile_tools/i18n/tr.po.  Moved existing file to profile_tools/i18n/tr.po.moved.
Conflict adding file profile_tools/i18n/zh_CN.po.  Moved existing file to profile_tools/i18n/zh_CN.po.moved.
Text conflict in project/i18n/ar.po
Text conflict in project/i18n/bg.po
Text conflict in project/i18n/bs.po
Text conflict in project/i18n/ca.po
Text conflict in project/i18n/cs.po
Conflict adding file project/i18n/da.po.  Moved existing file to project/i18n/da.po.moved.
Text conflict in project/i18n/de.po
Text conflict in project/i18n/el.po
Text conflict in project/i18n/es.po
Text conflict in project/i18n/es_AR.po
Conflict adding file project/i18n/es_CO.po.  Moved existing file to project/i18n/es_CO.po.moved.
Conflict adding file project/i18n/es_CR.po.  Moved existing file to project/i18n/es_CR.po.moved.
Conflict adding file project/i18n/es_MX.po.  Moved existing file to project/i18n/es_MX.po.moved.
Conflict adding file project/i18n/es_PY.po.  Moved existing file to project/i18n/es_PY.po.moved.
Text conflict in project/i18n/et.po
Text conflict in project/i18n/eu.po
Text conflict in project/i18n/fi.po
Text conflict in project/i18n/fr.po
Text conflict in project/i18n/gl.po
Conflict adding file project/i18n/gu.po.  Moved existing file to project/i18n/gu.po.moved.
Text conflict in project/i18n/hr.po
Text conflict in project/i18n/hu.po
Text conflict in project/i18n/id.po
Text conflict in project/i18n/it.po
Conflict adding file project/i18n/ja.po.  Moved existing file to project/i18n/ja.po.moved.
Text conflict in project/i18n/ko.po
Text conflict in project/i18n/lt.po
Text conflict in project/i18n/lv.po
Conflict adding file project/i18n/mk.po.  Moved existing file to project/i18n/mk.po.moved.
Text conflict in project/i18n/mn.po
Conflict adding file project/i18n/nb.po.  Moved existing file to project/i18n/nb.po.moved.
Text conflict in project/i18n/nl.po
Text conflict in project/i18n/nl_BE.po
Text conflict in project/i18n/pl.po
Text conflict in project/i18n/project.pot
Text conflict in project/i18n/pt.po
Text conflict in project/i18n/pt_BR.po
Text conflict in project/i18n/ro.po
Text conflict in project/i18n/ru.po
Text conflict in project/i18n/sk.po
Text conflict in project/i18n/sl.po
Text conflict in project/i18n/sq.po
Text conflict in project/i18n/sv.po
Text conflict in project/i18n/tlh.po
Text conflict in project/i18n/tr.po
Text conflict in project/i18n/uk.po
Text conflict in project/i18n/vi.po
Text conflict in project/i18n/zh_CN.po
Text conflict in project/i18n/zh_TW.po
Text conflict in project/project.py
Text conflict in project/project_demo.xml
Text conflict in project/project_view.xml
Contents conflict in project/wizard/project_task_close.py
Text conflict in project/wizard/project_task_delegate.py
Conflict: can't delete project_caldav because it is not empty.  Not deleting.
Conflict because project_caldav is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete project_caldav/i18n because it is not empty.  Not deleting.
Conflict because project_caldav/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in project_caldav/i18n/bg.po
Contents conflict in project_caldav/i18n/ca.po
Contents conflict in project_caldav/i18n/de.po
Contents conflict in project_caldav/i18n/el.po
Contents conflict in project_caldav/i18n/es.po
Contents conflict in project_caldav/i18n/fr.po
Contents conflict in project_caldav/i18n/gl.po
Contents conflict in project_caldav/i18n/hu.po
Contents conflict in project_caldav/i18n/it.po
Contents conflict in project_caldav/i18n/lv.po
Contents conflict in project_caldav/i18n/nl.po
Contents conflict in project_caldav/i18n/pl.po
Contents conflict in project_caldav/i18n/project_caldav.pot
Contents conflict in project_caldav/i18n/pt.po
Contents conflict in project_caldav/i18n/pt_BR.po
Contents conflict in project_caldav/i18n/ru.po
Contents conflict in project_caldav/i18n/sv.po
Contents conflict in project_caldav/project_caldav.py
Text conflict in project_gtd/i18n/ar.po
Text conflict in project_gtd/i18n/bg.po
Text conflict in project_gtd/i18n/bs.po
Text conflict in project_gtd/i18n/ca.po
Text conflict in project_gtd/i18n/cs.po
Conflict adding file project_gtd/i18n/da.po.  Moved existing file to project_gtd/i18n/da.po.moved.
Text conflict in project_gtd/i18n/de.po
Text conflict in project_gtd/i18n/el.po
Text conflict in project_gtd/i18n/es.po
Text conflict in project_gtd/i18n/es_AR.po
Conflict adding file project_gtd/i18n/es_CR.po.  Moved existing file to project_gtd/i18n/es_CR.po.moved.
Text conflict in project_gtd/i18n/es_EC.po
Text conflict in project_gtd/i18n/et.po
Text conflict in project_gtd/i18n/fi.po
Text conflict in project_gtd/i18n/fr.po
Conflict adding file project_gtd/i18n/gl.po.  Moved existing file to project_gtd/i18n/gl.po.moved.
Text conflict in project_gtd/i18n/hr.po
Text conflict in project_gtd/i18n/hu.po
Text conflict in project_gtd/i18n/id.po
Text conflict in project_gtd/i18n/it.po
Conflict adding file project_gtd/i18n/ja.po.  Moved existing file to project_gtd/i18n/ja.po.moved.
Text conflict in project_gtd/i18n/ko.po
Text conflict in project_gtd/i18n/lt.po
Text conflict in project_gtd/i18n/lv.po
Conflict adding file project_gtd/i18n/mk.po.  Moved existing file to project_gtd/i18n/mk.po.moved.
Conflict adding file project_gtd/i18n/mn.po.  Moved existing file to project_gtd/i18n/mn.po.moved.
Text conflict in project_gtd/i18n/nl.po
Text conflict in project_gtd/i18n/nl_BE.po
Text conflict in project_gtd/i18n/pl.po
Text conflict in project_gtd/i18n/project_gtd.pot
Text conflict in project_gtd/i18n/pt.po
Text conflict in project_gtd/i18n/pt_BR.po
Text conflict in project_gtd/i18n/ro.po
Text conflict in project_gtd/i18n/ru.po
Text conflict in project_gtd/i18n/sl.po
Text conflict in project_gtd/i18n/sq.po
Text conflict in project_gtd/i18n/sv.po
Text conflict in project_gtd/i18n/tlh.po
Text conflict in project_gtd/i18n/tr.po
Text conflict in project_gtd/i18n/uk.po
Text conflict in project_gtd/i18n/vi.po
Text conflict in project_gtd/i18n/zh_CN.po
Text conflict in project_gtd/i18n/zh_TW.po
Conflict adding file project_issue/i18n/ar.po.  Moved existing file to project_issue/i18n/ar.po.moved.
Conflict adding file project_issue/i18n/ca.po.  Moved existing file to project_issue/i18n/ca.po.moved.
Conflict adding file project_issue/i18n/cs.po.  Moved existing file to project_issue/i18n/cs.po.moved.
Conflict adding file project_issue/i18n/da.po.  Moved existing file to project_issue/i18n/da.po.moved.
Text conflict in project_issue/i18n/de.po
Text conflict in project_issue/i18n/es.po
Conflict adding file project_issue/i18n/es_CR.po.  Moved existing file to project_issue/i18n/es_CR.po.moved.
Conflict adding file project_issue/i18n/fi.po.  Moved existing file to project_issue/i18n/fi.po.moved.
Text conflict in project_issue/i18n/fr.po
Conflict adding file project_issue/i18n/hr.po.  Moved existing file to project_issue/i18n/hr.po.moved.
Text conflict in project_issue/i18n/hu.po
Text conflict in project_issue/i18n/it.po
Conflict adding file project_issue/i18n/ja.po.  Moved existing file to project_issue/i18n/ja.po.moved.
Conflict adding file project_issue/i18n/lt.po.  Moved existing file to project_issue/i18n/lt.po.moved.
Text conflict in project_issue/i18n/lv.po
Conflict adding file project_issue/i18n/mk.po.  Moved existing file to project_issue/i18n/mk.po.moved.
Conflict adding file project_issue/i18n/mn.po.  Moved existing file to project_issue/i18n/mn.po.moved.
Conflict adding file project_issue/i18n/nb.po.  Moved existing file to project_issue/i18n/nb.po.moved.
Text conflict in project_issue/i18n/nl.po
Conflict adding file project_issue/i18n/nl_BE.po.  Moved existing file to project_issue/i18n/nl_BE.po.moved.
Text conflict in project_issue/i18n/pl.po
Text conflict in project_issue/i18n/project_issue.pot
Text conflict in project_issue/i18n/pt.po
Conflict adding file project_issue/i18n/pt_BR.po.  Moved existing file to project_issue/i18n/pt_BR.po.moved.
Conflict adding file project_issue/i18n/ro.po.  Moved existing file to project_issue/i18n/ro.po.moved.
Conflict adding file project_issue/i18n/ru.po.  Moved existing file to project_issue/i18n/ru.po.moved.
Conflict adding file project_issue/i18n/sk.po.  Moved existing file to project_issue/i18n/sk.po.moved.
Conflict adding file project_issue/i18n/sl.po.  Moved existing file to project_issue/i18n/sl.po.moved.
Conflict adding file project_issue/i18n/sv.po.  Moved existing file to project_issue/i18n/sv.po.moved.
Conflict adding file project_issue/i18n/tr.po.  Moved existing file to project_issue/i18n/tr.po.moved.
Conflict adding file project_issue/i18n/zh_CN.po.  Moved existing file to project_issue/i18n/zh_CN.po.moved.
Conflict adding file project_issue/i18n/zh_TW.po.  Moved existing file to project_issue/i18n/zh_TW.po.moved.
Text conflict in project_issue/project_issue.py
Text conflict in project_issue/project_issue_menu.xml
Text conflict in project_issue/project_issue_view.xml
Conflict adding file project_issue_sheet/i18n/ar.po.  Moved existing file to project_issue_sheet/i18n/ar.po.moved.
Conflict adding file project_issue_sheet/i18n/ca.po.  Moved existing file to project_issue_sheet/i18n/ca.po.moved.
Conflict adding file project_issue_sheet/i18n/cs.po.  Moved existing file to project_issue_sheet/i18n/cs.po.moved.
Conflict adding file project_issue_sheet/i18n/da.po.  Moved existing file to project_issue_sheet/i18n/da.po.moved.
Text conflict in project_issue_sheet/i18n/de.po
Text conflict in project_issue_sheet/i18n/es.po
Conflict adding file project_issue_sheet/i18n/es_CR.po.  Moved existing file to project_issue_sheet/i18n/es_CR.po.moved.
Conflict adding file project_issue_sheet/i18n/fi.po.  Moved existing file to project_issue_sheet/i18n/fi.po.moved.
Text conflict in project_issue_sheet/i18n/fr.po
Conflict adding file project_issue_sheet/i18n/gl.po.  Moved existing file to project_issue_sheet/i18n/gl.po.moved.
Conflict adding file project_issue_sheet/i18n/hr.po.  Moved existing file to project_issue_sheet/i18n/hr.po.moved.
Text conflict in project_issue_sheet/i18n/hu.po
Text conflict in project_issue_sheet/i18n/it.po
Conflict adding file project_issue_sheet/i18n/ja.po.  Moved existing file to project_issue_sheet/i18n/ja.po.moved.
Text conflict in project_issue_sheet/i18n/lv.po
Conflict adding file project_issue_sheet/i18n/mk.po.  Moved existing file to project_issue_sheet/i18n/mk.po.moved.
Text conflict in project_issue_sheet/i18n/mn.po
Text conflict in project_issue_sheet/i18n/nl.po
Text conflict in project_issue_sheet/i18n/pl.po
Text conflict in project_issue_sheet/i18n/pt.po
Conflict adding file project_issue_sheet/i18n/pt_BR.po.  Moved existing file to project_issue_sheet/i18n/pt_BR.po.moved.
Conflict adding file project_issue_sheet/i18n/ro.po.  Moved existing file to project_issue_sheet/i18n/ro.po.moved.
Conflict adding file project_issue_sheet/i18n/ru.po.  Moved existing file to project_issue_sheet/i18n/ru.po.moved.
Conflict adding file project_issue_sheet/i18n/sv.po.  Moved existing file to project_issue_sheet/i18n/sv.po.moved.
Conflict adding file project_issue_sheet/i18n/tr.po.  Moved existing file to project_issue_sheet/i18n/tr.po.moved.
Conflict adding file project_issue_sheet/i18n/zh_CN.po.  Moved existing file to project_issue_sheet/i18n/zh_CN.po.moved.
Conflict adding file project_long_term/i18n/ar.po.  Moved existing file to project_long_term/i18n/ar.po.moved.
Conflict adding file project_long_term/i18n/ca.po.  Moved existing file to project_long_term/i18n/ca.po.moved.
Conflict adding file project_long_term/i18n/cs.po.  Moved existing file to project_long_term/i18n/cs.po.moved.
Conflict adding file project_long_term/i18n/da.po.  Moved existing file to project_long_term/i18n/da.po.moved.
Text conflict in project_long_term/i18n/de.po
Text conflict in project_long_term/i18n/es.po
Conflict adding file project_long_term/i18n/es_CR.po.  Moved existing file to project_long_term/i18n/es_CR.po.moved.
Conflict adding file project_long_term/i18n/es_EC.po.  Moved existing file to project_long_term/i18n/es_EC.po.moved.
Text conflict in project_long_term/i18n/fi.po
Text conflict in project_long_term/i18n/fr.po
Conflict adding file project_long_term/i18n/hr.po.  Moved existing file to project_long_term/i18n/hr.po.moved.
Text conflict in project_long_term/i18n/hu.po
Text conflict in project_long_term/i18n/it.po
Conflict adding file project_long_term/i18n/ja.po.  Moved existing file to project_long_term/i18n/ja.po.moved.
Text conflict in project_long_term/i18n/lv.po
Conflict adding file project_long_term/i18n/mk.po.  Moved existing file to project_long_term/i18n/mk.po.moved.
Conflict adding file project_long_term/i18n/mn.po.  Moved existing file to project_long_term/i18n/mn.po.moved.
Conflict adding file project_long_term/i18n/nl.po.  Moved existing file to project_long_term/i18n/nl.po.moved.
Text conflict in project_long_term/i18n/pl.po
Text conflict in project_long_term/i18n/project_long_term.pot
Text conflict in project_long_term/i18n/pt.po
Conflict adding file project_long_term/i18n/pt_BR.po.  Moved existing file to project_long_term/i18n/pt_BR.po.moved.
Conflict adding file project_long_term/i18n/ro.po.  Moved existing file to project_long_term/i18n/ro.po.moved.
Conflict adding file project_long_term/i18n/ru.po.  Moved existing file to project_long_term/i18n/ru.po.moved.
Conflict adding file project_long_term/i18n/sl.po.  Moved existing file to project_long_term/i18n/sl.po.moved.
Conflict adding file project_long_term/i18n/sv.po.  Moved existing file to project_long_term/i18n/sv.po.moved.
Conflict adding file project_long_term/i18n/tr.po.  Moved existing file to project_long_term/i18n/tr.po.moved.
Conflict adding file project_long_term/i18n/zh_CN.po.  Moved existing file to project_long_term/i18n/zh_CN.po.moved.
Text conflict in project_long_term/project_long_term.py
Conflict adding file project_mailgate/i18n/ar.po.  Moved existing file to project_mailgate/i18n/ar.po.moved.
Conflict adding file project_mailgate/i18n/ca.po.  Moved existing file to project_mailgate/i18n/ca.po.moved.
Conflict adding file project_mailgate/i18n/cs.po.  Moved existing file to project_mailgate/i18n/cs.po.moved.
Conflict adding file project_mailgate/i18n/da.po.  Moved existing file to project_mailgate/i18n/da.po.moved.
Text conflict in project_mailgate/i18n/de.po
Text conflict in project_mailgate/i18n/es.po
Conflict adding file project_mailgate/i18n/es_CR.po.  Moved existing file to project_mailgate/i18n/es_CR.po.moved.
Conflict adding file project_mailgate/i18n/fi.po.  Moved existing file to project_mailgate/i18n/fi.po.moved.
Text conflict in project_mailgate/i18n/fr.po
Conflict adding file project_mailgate/i18n/gl.po.  Moved existing file to project_mailgate/i18n/gl.po.moved.
Conflict adding file project_mailgate/i18n/hr.po.  Moved existing file to project_mailgate/i18n/hr.po.moved.
Text conflict in project_mailgate/i18n/hu.po
Text conflict in project_mailgate/i18n/it.po
Conflict adding file project_mailgate/i18n/ja.po.  Moved existing file to project_mailgate/i18n/ja.po.moved.
Text conflict in project_mailgate/i18n/lv.po
Text conflict in project_mailgate/i18n/mn.po
Text conflict in project_mailgate/i18n/nl.po
Conflict adding file project_mailgate/i18n/nl_BE.po.  Moved existing file to project_mailgate/i18n/nl_BE.po.moved.
Text conflict in project_mailgate/i18n/pl.po
Text conflict in project_mailgate/i18n/project_mailgate.pot
Text conflict in project_mailgate/i18n/pt.po
Text conflict in project_mailgate/i18n/pt_BR.po
Conflict adding file project_mailgate/i18n/ro.po.  Moved existing file to project_mailgate/i18n/ro.po.moved.
Conflict adding file project_mailgate/i18n/sv.po.  Moved existing file to project_mailgate/i18n/sv.po.moved.
Conflict adding file project_mailgate/i18n/tr.po.  Moved existing file to project_mailgate/i18n/tr.po.moved.
Conflict adding file project_mailgate/i18n/zh_CN.po.  Moved existing file to project_mailgate/i18n/zh_CN.po.moved.
Text conflict in project_mailgate/project_mailgate.py
Text conflict in project_mailgate/project_mailgate_view.xml
Conflict adding file project_messages/i18n/ar.po.  Moved existing file to project_messages/i18n/ar.po.moved.
Conflict adding file project_messages/i18n/bg.po.  Moved existing file to project_messages/i18n/bg.po.moved.
Conflict adding file project_messages/i18n/ca.po.  Moved existing file to project_messages/i18n/ca.po.moved.
Conflict adding file project_messages/i18n/da.po.  Moved existing file to project_messages/i18n/da.po.moved.
Text conflict in project_messages/i18n/de.po
Text conflict in project_messages/i18n/es.po
Conflict adding file project_messages/i18n/es_CR.po.  Moved existing file to project_messages/i18n/es_CR.po.moved.
Conflict adding file project_messages/i18n/fi.po.  Moved existing file to project_messages/i18n/fi.po.moved.
Text conflict in project_messages/i18n/fr.po
Conflict adding file project_messages/i18n/gl.po.  Moved existing file to project_messages/i18n/gl.po.moved.
Conflict adding file project_messages/i18n/hr.po.  Moved existing file to project_messages/i18n/hr.po.moved.
Text conflict in project_messages/i18n/hu.po
Text conflict in project_messages/i18n/it.po
Conflict adding file project_messages/i18n/ja.po.  Moved existing file to project_messages/i18n/ja.po.moved.
Text conflict in project_messages/i18n/lv.po
Text conflict in project_messages/i18n/mn.po
Text conflict in project_messages/i18n/nl.po
Text conflict in project_messages/i18n/pl.po
Text conflict in project_messages/i18n/project_messages.pot
Text conflict in project_messages/i18n/pt.po
Text conflict in project_messages/i18n/pt_BR.po
Conflict adding file project_messages/i18n/ro.po.  Moved existing file to project_messages/i18n/ro.po.moved.
Text conflict in project_messages/i18n/sr.po
Text conflict in project_messages/i18n/sr@latin.po
Conflict adding file project_messages/i18n/sv.po.  Moved existing file to project_messages/i18n/sv.po.moved.
Conflict adding file project_messages/i18n/tr.po.  Moved existing file to project_messages/i18n/tr.po.moved.
Conflict adding file project_messages/i18n/zh_CN.po.  Moved existing file to project_messages/i18n/zh_CN.po.moved.
Text conflict in project_mrp/i18n/ar.po
Text conflict in project_mrp/i18n/bg.po
Text conflict in project_mrp/i18n/bs.po
Text conflict in project_mrp/i18n/ca.po
Text conflict in project_mrp/i18n/cs.po
Conflict adding file project_mrp/i18n/da.po.  Moved existing file to project_mrp/i18n/da.po.moved.
Text conflict in project_mrp/i18n/de.po
Text conflict in project_mrp/i18n/el.po
Text conflict in project_mrp/i18n/es.po
Text conflict in project_mrp/i18n/es_AR.po
Conflict adding file project_mrp/i18n/es_CR.po.  Moved existing file to project_mrp/i18n/es_CR.po.moved.
Text conflict in project_mrp/i18n/es_EC.po
Text conflict in project_mrp/i18n/et.po
Conflict adding file project_mrp/i18n/fi.po.  Moved existing file to project_mrp/i18n/fi.po.moved.
Text conflict in project_mrp/i18n/fr.po
Conflict adding file project_mrp/i18n/gl.po.  Moved existing file to project_mrp/i18n/gl.po.moved.
Conflict adding file project_mrp/i18n/gu.po.  Moved existing file to project_mrp/i18n/gu.po.moved.
Text conflict in project_mrp/i18n/hr.po
Text conflict in project_mrp/i18n/hu.po
Text conflict in project_mrp/i18n/id.po
Text conflict in project_mrp/i18n/it.po
Conflict adding file project_mrp/i18n/ja.po.  Moved existing file to project_mrp/i18n/ja.po.moved.
Text conflict in project_mrp/i18n/ko.po
Text conflict in project_mrp/i18n/lt.po
Text conflict in project_mrp/i18n/lv.po
Conflict adding file project_mrp/i18n/mk.po.  Moved existing file to project_mrp/i18n/mk.po.moved.
Conflict adding file project_mrp/i18n/mn.po.  Moved existing file to project_mrp/i18n/mn.po.moved.
Conflict adding file project_mrp/i18n/nb.po.  Moved existing file to project_mrp/i18n/nb.po.moved.
Text conflict in project_mrp/i18n/nl.po
Text conflict in project_mrp/i18n/nl_BE.po
Text conflict in project_mrp/i18n/pl.po
Text conflict in project_mrp/i18n/project_mrp.pot
Text conflict in project_mrp/i18n/pt.po
Text conflict in project_mrp/i18n/pt_BR.po
Text conflict in project_mrp/i18n/ro.po
Text conflict in project_mrp/i18n/ru.po
Text conflict in project_mrp/i18n/sl.po
Text conflict in project_mrp/i18n/sq.po
Text conflict in project_mrp/i18n/sv.po
Text conflict in project_mrp/i18n/tlh.po
Text conflict in project_mrp/i18n/tr.po
Text conflict in project_mrp/i18n/uk.po
Text conflict in project_mrp/i18n/vi.po
Text conflict in project_mrp/i18n/zh_CN.po
Text conflict in project_mrp/i18n/zh_TW.po
Text conflict in project_mrp/project_procurement.py
Text conflict in project_planning/board_project_planning_view.xml
Text conflict in project_planning/i18n/ar.po
Text conflict in project_planning/i18n/bg.po
Text conflict in project_planning/i18n/bs.po
Text conflict in project_planning/i18n/ca.po
Text conflict in project_planning/i18n/cs.po
Conflict adding file project_planning/i18n/da.po.  Moved existing file to project_planning/i18n/da.po.moved.
Text conflict in project_planning/i18n/de.po
Text conflict in project_planning/i18n/el.po
Text conflict in project_planning/i18n/es.po
Conflict adding file project_planning/i18n/es_CR.po.  Moved existing file to project_planning/i18n/es_CR.po.moved.
Text conflict in project_planning/i18n/et.po
Conflict adding file project_planning/i18n/fi.po.  Moved existing file to project_planning/i18n/fi.po.moved.
Text conflict in project_planning/i18n/fr.po
Conflict adding file project_planning/i18n/gl.po.  Moved existing file to project_planning/i18n/gl.po.moved.
Text conflict in project_planning/i18n/hr.po
Text conflict in project_planning/i18n/hu.po
Text conflict in project_planning/i18n/id.po
Text conflict in project_planning/i18n/it.po
Conflict adding file project_planning/i18n/ja.po.  Moved existing file to project_planning/i18n/ja.po.moved.
Text conflict in project_planning/i18n/ko.po
Text conflict in project_planning/i18n/lt.po
Text conflict in project_planning/i18n/lv.po
Conflict adding file project_planning/i18n/mn.po.  Moved existing file to project_planning/i18n/mn.po.moved.
Text conflict in project_planning/i18n/nl.po
Text conflict in project_planning/i18n/pl.po
Text conflict in project_planning/i18n/project_planning.pot
Text conflict in project_planning/i18n/pt.po
Text conflict in project_planning/i18n/pt_BR.po
Text conflict in project_planning/i18n/ro.po
Text conflict in project_planning/i18n/ru.po
Text conflict in project_planning/i18n/sl.po
Text conflict in project_planning/i18n/sq.po
Text conflict in project_planning/i18n/sv.po
Text conflict in project_planning/i18n/tlh.po
Text conflict in project_planning/i18n/tr.po
Text conflict in project_planning/i18n/uk.po
Text conflict in project_planning/i18n/vi.po
Text conflict in project_planning/i18n/zh_CN.po
Text conflict in project_planning/i18n/zh_TW.po
Text conflict in project_planning/test/planning_states.yml
Text conflict in project_retro_planning/i18n/ar.po
Text conflict in project_retro_planning/i18n/bg.po
Text conflict in project_retro_planning/i18n/bs.po
Text conflict in project_retro_planning/i18n/ca.po
Text conflict in project_retro_planning/i18n/cs.po
Conflict adding file project_retro_planning/i18n/da.po.  Moved existing file to project_retro_planning/i18n/da.po.moved.
Text conflict in project_retro_planning/i18n/de.po
Text conflict in project_retro_planning/i18n/es.po
Text conflict in project_retro_planning/i18n/es_AR.po
Conflict adding file project_retro_planning/i18n/es_CR.po.  Moved existing file to project_retro_planning/i18n/es_CR.po.moved.
Text conflict in project_retro_planning/i18n/es_EC.po
Text conflict in project_retro_planning/i18n/et.po
Conflict adding file project_retro_planning/i18n/fi.po.  Moved existing file to project_retro_planning/i18n/fi.po.moved.
Text conflict in project_retro_planning/i18n/fr.po
Text conflict in project_retro_planning/i18n/gl.po
Text conflict in project_retro_planning/i18n/hr.po
Text conflict in project_retro_planning/i18n/hu.po
Text conflict in project_retro_planning/i18n/id.po
Text conflict in project_retro_planning/i18n/it.po
Conflict adding file project_retro_planning/i18n/ja.po.  Moved existing file to project_retro_planning/i18n/ja.po.moved.
Text conflict in project_retro_planning/i18n/kab.po
Text conflict in project_retro_planning/i18n/ko.po
Text conflict in project_retro_planning/i18n/lt.po
Text conflict in project_retro_planning/i18n/mn.po
Text conflict in project_retro_planning/i18n/nl.po
Text conflict in project_retro_planning/i18n/nl_BE.po
Conflict adding file project_retro_planning/i18n/oc.po.  Moved existing file to project_retro_planning/i18n/oc.po.moved.
Text conflict in project_retro_planning/i18n/pl.po
Text conflict in project_retro_planning/i18n/pt.po
Text conflict in project_retro_planning/i18n/pt_BR.po
Text conflict in project_retro_planning/i18n/ro.po
Text conflict in project_retro_planning/i18n/ru.po
Text conflict in project_retro_planning/i18n/sl.po
Text conflict in project_retro_planning/i18n/sq.po
Text conflict in project_retro_planning/i18n/sr.po
Text conflict in project_retro_planning/i18n/sr@latin.po
Text conflict in project_retro_planning/i18n/sv.po
Text conflict in project_retro_planning/i18n/tlh.po
Text conflict in project_retro_planning/i18n/tr.po
Text conflict in project_retro_planning/i18n/uk.po
Text conflict in project_retro_planning/i18n/ur.po
Text conflict in project_retro_planning/i18n/vi.po
Text conflict in project_retro_planning/i18n/zh_CN.po
Text conflict in project_retro_planning/i18n/zh_TW.po
Text conflict in project_scrum/i18n/ar.po
Text conflict in project_scrum/i18n/bg.po
Text conflict in project_scrum/i18n/bs.po
Text conflict in project_scrum/i18n/ca.po
Text conflict in project_scrum/i18n/cs.po
Conflict adding file project_scrum/i18n/da.po.  Moved existing file to project_scrum/i18n/da.po.moved.
Text conflict in project_scrum/i18n/de.po
Text conflict in project_scrum/i18n/el.po
Text conflict in project_scrum/i18n/es.po
Text conflict in project_scrum/i18n/et.po
Conflict adding file project_scrum/i18n/fi.po.  Moved existing file to project_scrum/i18n/fi.po.moved.
Text conflict in project_scrum/i18n/fr.po
Text conflict in project_scrum/i18n/gu.po
Text conflict in project_scrum/i18n/hr.po
Text conflict in project_scrum/i18n/hu.po
Text conflict in project_scrum/i18n/id.po
Text conflict in project_scrum/i18n/it.po
Text conflict in project_scrum/i18n/ko.po
Text conflict in project_scrum/i18n/lt.po
Conflict adding file project_scrum/i18n/mn.po.  Moved existing file to project_scrum/i18n/mn.po.moved.
Text conflict in project_scrum/i18n/nl.po
Text conflict in project_scrum/i18n/pl.po
Text conflict in project_scrum/i18n/project_scrum.pot
Text conflict in project_scrum/i18n/pt.po
Text conflict in project_scrum/i18n/pt_BR.po
Text conflict in project_scrum/i18n/ro.po
Text conflict in project_scrum/i18n/ru.po
Text conflict in project_scrum/i18n/sl.po
Text conflict in project_scrum/i18n/sq.po
Text conflict in project_scrum/i18n/sv.po
Text conflict in project_scrum/i18n/tlh.po
Text conflict in project_scrum/i18n/tr.po
Text conflict in project_scrum/i18n/uk.po
Text conflict in project_scrum/i18n/vi.po
Text conflict in project_scrum/i18n/zh_CN.po
Text conflict in project_scrum/i18n/zh_TW.po
Text conflict in project_scrum/project_scrum_view.xml
Text conflict in project_timesheet/i18n/ar.po
Text conflict in project_timesheet/i18n/bg.po
Text conflict in project_timesheet/i18n/bs.po
Text conflict in project_timesheet/i18n/ca.po
Text conflict in project_timesheet/i18n/cs.po
Conflict adding file project_timesheet/i18n/da.po.  Moved existing file to project_timesheet/i18n/da.po.moved.
Text conflict in project_timesheet/i18n/de.po
Text conflict in project_timesheet/i18n/el.po
Text conflict in project_timesheet/i18n/es.po
Text conflict in project_timesheet/i18n/es_AR.po
Conflict adding file project_timesheet/i18n/es_CR.po.  Moved existing file to project_timesheet/i18n/es_CR.po.moved.
Text conflict in project_timesheet/i18n/et.po
Text conflict in project_timesheet/i18n/fi.po
Text conflict in project_timesheet/i18n/fr.po
Text conflict in project_timesheet/i18n/gl.po
Text conflict in project_timesheet/i18n/hr.po
Text conflict in project_timesheet/i18n/hu.po
Text conflict in project_timesheet/i18n/id.po
Text conflict in project_timesheet/i18n/it.po
Conflict adding file project_timesheet/i18n/ja.po.  Moved existing file to project_timesheet/i18n/ja.po.moved.
Text conflict in project_timesheet/i18n/ko.po
Text conflict in project_timesheet/i18n/lt.po
Text conflict in project_timesheet/i18n/lv.po
Conflict adding file project_timesheet/i18n/mk.po.  Moved existing file to project_timesheet/i18n/mk.po.moved.
Conflict adding file project_timesheet/i18n/mn.po.  Moved existing file to project_timesheet/i18n/mn.po.moved.
Text conflict in project_timesheet/i18n/nl.po
Text conflict in project_timesheet/i18n/nl_BE.po
Text conflict in project_timesheet/i18n/pl.po
Text conflict in project_timesheet/i18n/project_timesheet.pot
Text conflict in project_timesheet/i18n/pt.po
Text conflict in project_timesheet/i18n/pt_BR.po
Text conflict in project_timesheet/i18n/ro.po
Text conflict in project_timesheet/i18n/ru.po
Text conflict in project_timesheet/i18n/sl.po
Text conflict in project_timesheet/i18n/sq.po
Text conflict in project_timesheet/i18n/sv.po
Text conflict in project_timesheet/i18n/tlh.po
Text conflict in project_timesheet/i18n/tr.po
Text conflict in project_timesheet/i18n/uk.po
Text conflict in project_timesheet/i18n/vi.po
Text conflict in project_timesheet/i18n/zh_CN.po
Text conflict in project_timesheet/i18n/zh_TW.po
Text conflict in project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
Text conflict in purchase/i18n/ar.po
Text conflict in purchase/i18n/bg.po
Text conflict in purchase/i18n/bs.po
Text conflict in purchase/i18n/ca.po
Text conflict in purchase/i18n/cs.po
Conflict adding file purchase/i18n/da.po.  Moved existing file to purchase/i18n/da.po.moved.
Text conflict in purchase/i18n/de.po
Text conflict in purchase/i18n/el.po
Conflict adding file purchase/i18n/en_GB.po.  Moved existing file to purchase/i18n/en_GB.po.moved.
Text conflict in purchase/i18n/es.po
Text conflict in purchase/i18n/es_AR.po
Text conflict in purchase/i18n/es_CL.po
Conflict adding file purchase/i18n/es_CO.po.  Moved existing file to purchase/i18n/es_CO.po.moved.
Conflict adding file purchase/i18n/es_CR.po.  Moved existing file to purchase/i18n/es_CR.po.moved.
Text conflict in purchase/i18n/es_EC.po
Conflict adding file purchase/i18n/es_MX.po.moved.  Moved existing file to purchase/i18n/es_MX.po.moved.moved.
Conflict adding file purchase/i18n/es_MX.po.  Moved existing file to purchase/i18n/es_MX.po.moved.moved.
Text conflict in purchase/i18n/et.po
Text conflict in purchase/i18n/fi.po
Text conflict in purchase/i18n/fr.po
Text conflict in purchase/i18n/gl.po
Text conflict in purchase/i18n/hr.po
Text conflict in purchase/i18n/hu.po
Text conflict in purchase/i18n/id.po
Text conflict in purchase/i18n/it.po
Conflict adding file purchase/i18n/ja.po.  Moved existing file to purchase/i18n/ja.po.moved.
Text conflict in purchase/i18n/ko.po
Text conflict in purchase/i18n/lt.po
Conflict adding file purchase/i18n/lv.po.  Moved existing file to purchase/i18n/lv.po.moved.
Conflict adding file purchase/i18n/mk.po.  Moved existing file to purchase/i18n/mk.po.moved.
Text conflict in purchase/i18n/mn.po
Conflict adding file purchase/i18n/nb.po.  Moved existing file to purchase/i18n/nb.po.moved.
Text conflict in purchase/i18n/nl.po
Text conflict in purchase/i18n/nl_BE.po
Text conflict in purchase/i18n/pl.po
Text conflict in purchase/i18n/pt.po
Text conflict in purchase/i18n/pt_BR.po
Text conflict in purchase/i18n/purchase.pot
Text conflict in purchase/i18n/ro.po
Text conflict in purchase/i18n/ru.po
Conflict adding file purchase/i18n/sk.po.  Moved existing file to purchase/i18n/sk.po.moved.
Text conflict in purchase/i18n/sl.po
Text conflict in purchase/i18n/sq.po
Text conflict in purchase/i18n/sr.po
Text conflict in purchase/i18n/sr@latin.po
Text conflict in purchase/i18n/sv.po
Text conflict in purchase/i18n/th.po
Text conflict in purchase/i18n/tlh.po
Text conflict in purchase/i18n/tr.po
Text conflict in purchase/i18n/uk.po
Text conflict in purchase/i18n/vi.po
Text conflict in purchase/i18n/zh_CN.po
Text conflict in purchase/i18n/zh_TW.po
Text conflict in purchase/purchase.py
Text conflict in purchase/purchase_view.xml
Contents conflict in purchase/report/order.sxw
Text conflict in purchase/report/purchase_report.py
Text conflict in purchase/report/request_quotation.rml
Text conflict in purchase/stock.py
Text conflict in purchase_analytic_plans/i18n/ar.po
Text conflict in purchase_analytic_plans/i18n/bg.po
Text conflict in purchase_analytic_plans/i18n/bs.po
Text conflict in purchase_analytic_plans/i18n/ca.po
Text conflict in purchase_analytic_plans/i18n/cs.po
Conflict adding file purchase_analytic_plans/i18n/da.po.  Moved existing file to purchase_analytic_plans/i18n/da.po.moved.
Text conflict in purchase_analytic_plans/i18n/de.po
Text conflict in purchase_analytic_plans/i18n/el.po
Text conflict in purchase_analytic_plans/i18n/es.po
Text conflict in purchase_analytic_plans/i18n/es_AR.po
Conflict adding file purchase_analytic_plans/i18n/es_CR.po.  Moved existing file to purchase_analytic_plans/i18n/es_CR.po.moved.
Text conflict in purchase_analytic_plans/i18n/et.po
Conflict adding file purchase_analytic_plans/i18n/fi.po.  Moved existing file to purchase_analytic_plans/i18n/fi.po.moved.
Text conflict in purchase_analytic_plans/i18n/fr.po
Text conflict in purchase_analytic_plans/i18n/gl.po
Text conflict in purchase_analytic_plans/i18n/hr.po
Text conflict in purchase_analytic_plans/i18n/hu.po
Text conflict in purchase_analytic_plans/i18n/id.po
Text conflict in purchase_analytic_plans/i18n/it.po
Conflict adding file purchase_analytic_plans/i18n/ja.po.  Moved existing file to purchase_analytic_plans/i18n/ja.po.moved.
Text conflict in purchase_analytic_plans/i18n/ko.po
Text conflict in purchase_analytic_plans/i18n/lt.po
Conflict adding file purchase_analytic_plans/i18n/mk.po.  Moved existing file to purchase_analytic_plans/i18n/mk.po.moved.
Text conflict in purchase_analytic_plans/i18n/mn.po
Text conflict in purchase_analytic_plans/i18n/nl.po
Text conflict in purchase_analytic_plans/i18n/nl_BE.po
Text conflict in purchase_analytic_plans/i18n/pl.po
Text conflict in purchase_analytic_plans/i18n/pt.po
Text conflict in purchase_analytic_plans/i18n/pt_BR.po
Text conflict in purchase_analytic_plans/i18n/ro.po
Text conflict in purchase_analytic_plans/i18n/ru.po
Text conflict in purchase_analytic_plans/i18n/sl.po
Text conflict in purchase_analytic_plans/i18n/sq.po
Text conflict in purchase_analytic_plans/i18n/sr.po
Text conflict in purchase_analytic_plans/i18n/sr@latin.po
Text conflict in purchase_analytic_plans/i18n/sv.po
Text conflict in purchase_analytic_plans/i18n/tlh.po
Text conflict in purchase_analytic_plans/i18n/tr.po
Text conflict in purchase_analytic_plans/i18n/uk.po
Text conflict in purchase_analytic_plans/i18n/ur.po
Text conflict in purchase_analytic_plans/i18n/vi.po
Text conflict in purchase_analytic_plans/i18n/zh_CN.po
Text conflict in purchase_analytic_plans/i18n/zh_TW.po
Conflict adding file purchase_double_validation/i18n/ar.po.  Moved existing file to purchase_double_validation/i18n/ar.po.moved.
Conflict adding file purchase_double_validation/i18n/bg.po.  Moved existing file to purchase_double_validation/i18n/bg.po.moved.
Conflict adding file purchase_double_validation/i18n/ca.po.  Moved existing file to purchase_double_validation/i18n/ca.po.moved.
Conflict adding file purchase_double_validation/i18n/cs.po.  Moved existing file to purchase_double_validation/i18n/cs.po.moved.
Conflict adding file purchase_double_validation/i18n/da.po.  Moved existing file to purchase_double_validation/i18n/da.po.moved.
Conflict adding file purchase_double_validation/i18n/de.po.  Moved existing file to purchase_double_validation/i18n/de.po.moved.
Conflict adding file purchase_double_validation/i18n/es.po.  Moved existing file to purchase_double_validation/i18n/es.po.moved.
Conflict adding file purchase_double_validation/i18n/es_CR.po.  Moved existing file to purchase_double_validation/i18n/es_CR.po.moved.
Conflict adding file purchase_double_validation/i18n/es_EC.po.  Moved existing file to purchase_double_validation/i18n/es_EC.po.moved.
Conflict adding file purchase_double_validation/i18n/fi.po.  Moved existing file to purchase_double_validation/i18n/fi.po.moved.
Conflict adding file purchase_double_validation/i18n/fr.po.  Moved existing file to purchase_double_validation/i18n/fr.po.moved.
Conflict adding file purchase_double_validation/i18n/gl.po.  Moved existing file to purchase_double_validation/i18n/gl.po.moved.
Conflict adding file purchase_double_validation/i18n/hr.po.  Moved existing file to purchase_double_validation/i18n/hr.po.moved.
Conflict adding file purchase_double_validation/i18n/hu.po.  Moved existing file to purchase_double_validation/i18n/hu.po.moved.
Conflict adding file purchase_double_validation/i18n/it.po.  Moved existing file to purchase_double_validation/i18n/it.po.moved.
Conflict adding file purchase_double_validation/i18n/ja.po.  Moved existing file to purchase_double_validation/i18n/ja.po.moved.
Conflict adding file purchase_double_validation/i18n/lt.po.  Moved existing file to purchase_double_validation/i18n/lt.po.moved.
Conflict adding file purchase_double_validation/i18n/mk.po.  Moved existing file to purchase_double_validation/i18n/mk.po.moved.
Conflict adding file purchase_double_validation/i18n/mn.po.  Moved existing file to purchase_double_validation/i18n/mn.po.moved.
Conflict adding file purchase_double_validation/i18n/nl.po.  Moved existing file to purchase_double_validation/i18n/nl.po.moved.
Conflict adding file purchase_double_validation/i18n/pl.po.  Moved existing file to purchase_double_validation/i18n/pl.po.moved.
Conflict adding file purchase_double_validation/i18n/pt.po.  Moved existing file to purchase_double_validation/i18n/pt.po.moved.
Conflict adding file purchase_double_validation/i18n/pt_BR.po.  Moved existing file to purchase_double_validation/i18n/pt_BR.po.moved.
Conflict adding file purchase_double_validation/i18n/ro.po.  Moved existing file to purchase_double_validation/i18n/ro.po.moved.
Conflict adding file purchase_double_validation/i18n/ru.po.  Moved existing file to purchase_double_validation/i18n/ru.po.moved.
Conflict adding file purchase_double_validation/i18n/sl.po.  Moved existing file to purchase_double_validation/i18n/sl.po.moved.
Conflict adding file purchase_double_validation/i18n/sv.po.  Moved existing file to purchase_double_validation/i18n/sv.po.moved.
Conflict adding file purchase_double_validation/i18n/tr.po.  Moved existing file to purchase_double_validation/i18n/tr.po.moved.
Conflict adding file purchase_double_validation/i18n/zh_CN.po.  Moved existing file to purchase_double_validation/i18n/zh_CN.po.moved.
Conflict adding file purchase_requisition/i18n/ar.po.  Moved existing file to purchase_requisition/i18n/ar.po.moved.
Conflict adding file purchase_requisition/i18n/bg.po.  Moved existing file to purchase_requisition/i18n/bg.po.moved.
Conflict adding file purchase_requisition/i18n/ca.po.  Moved existing file to purchase_requisition/i18n/ca.po.moved.
Conflict adding file purchase_requisition/i18n/cs.po.  Moved existing file to purchase_requisition/i18n/cs.po.moved.
Conflict adding file purchase_requisition/i18n/da.po.  Moved existing file to purchase_requisition/i18n/da.po.moved.
Text conflict in purchase_requisition/i18n/de.po
Text conflict in purchase_requisition/i18n/es.po
Conflict adding file purchase_requisition/i18n/es_CR.po.  Moved existing file to purchase_requisition/i18n/es_CR.po.moved.
Conflict adding file purchase_requisition/i18n/fi.po.  Moved existing file to purchase_requisition/i18n/fi.po.moved.
Text conflict in purchase_requisition/i18n/fr.po
Conflict adding file purchase_requisition/i18n/hr.po.  Moved existing file to purchase_requisition/i18n/hr.po.moved.
Text conflict in purchase_requisition/i18n/hu.po
Conflict adding file purchase_requisition/i18n/id.po.  Moved existing file to purchase_requisition/i18n/id.po.moved.
Text conflict in purchase_requisition/i18n/it.po
Conflict adding file purchase_requisition/i18n/ja.po.  Moved existing file to purchase_requisition/i18n/ja.po.moved.
Conflict adding file purchase_requisition/i18n/mk.po.  Moved existing file to purchase_requisition/i18n/mk.po.moved.
Conflict adding file purchase_requisition/i18n/mn.po.  Moved existing file to purchase_requisition/i18n/mn.po.moved.
Conflict adding file purchase_requisition/i18n/nb.po.  Moved existing file to purchase_requisition/i18n/nb.po.moved.
Text conflict in purchase_requisition/i18n/nl.po
Text conflict in purchase_requisition/i18n/pl.po
Text conflict in purchase_requisition/i18n/pt.po
Text conflict in purchase_requisition/i18n/pt_BR.po
Text conflict in purchase_requisition/i18n/ro.po
Text conflict in purchase_requisition/i18n/ru.po
Conflict adding file purchase_requisition/i18n/sl.po.  Moved existing file to purchase_requisition/i18n/sl.po.moved.
Conflict adding file purchase_requisition/i18n/sv.po.  Moved existing file to purchase_requisition/i18n/sv.po.moved.
Conflict adding file purchase_requisition/i18n/tr.po.  Moved existing file to purchase_requisition/i18n/tr.po.moved.
Conflict adding file purchase_requisition/i18n/zh_CN.po.  Moved existing file to purchase_requisition/i18n/zh_CN.po.moved.
Text conflict in purchase_requisition/purchase_requisition.py
Text conflict in purchase_requisition/purchase_requisition_view.xml
Conflict adding file report_designer/i18n/ar.po.  Moved existing file to report_designer/i18n/ar.po.moved.
Conflict adding file report_designer/i18n/bg.po.  Moved existing file to report_designer/i18n/bg.po.moved.
Conflict adding file report_designer/i18n/ca.po.  Moved existing file to report_designer/i18n/ca.po.moved.
Conflict adding file report_designer/i18n/da.po.  Moved existing file to report_designer/i18n/da.po.moved.
Text conflict in report_designer/i18n/de.po
Text conflict in report_designer/i18n/el.po
Text conflict in report_designer/i18n/es.po
Conflict adding file report_designer/i18n/es_CR.po.  Moved existing file to report_designer/i18n/es_CR.po.moved.
Conflict adding file report_designer/i18n/fi.po.  Moved existing file to report_designer/i18n/fi.po.moved.
Text conflict in report_designer/i18n/fr.po
Conflict adding file report_designer/i18n/gl.po.  Moved existing file to report_designer/i18n/gl.po.moved.
Conflict adding file report_designer/i18n/hr.po.  Moved existing file to report_designer/i18n/hr.po.moved.
Text conflict in report_designer/i18n/hu.po
Text conflict in report_designer/i18n/it.po
Conflict adding file report_designer/i18n/ja.po.  Moved existing file to report_designer/i18n/ja.po.moved.
Text conflict in report_designer/i18n/mn.po
Conflict adding file report_designer/i18n/nb.po.  Moved existing file to report_designer/i18n/nb.po.moved.
Conflict adding file report_designer/i18n/nl.po.  Moved existing file to report_designer/i18n/nl.po.moved.
Text conflict in report_designer/i18n/pt.po
Text conflict in report_designer/i18n/pt_BR.po
Conflict adding file report_designer/i18n/ro.po.  Moved existing file to report_designer/i18n/ro.po.moved.
Text conflict in report_designer/i18n/ru.po
Text conflict in report_designer/i18n/sv.po
Conflict adding file report_designer/i18n/th.po.  Moved existing file to report_designer/i18n/th.po.moved.
Conflict adding file report_designer/i18n/tr.po.  Moved existing file to report_designer/i18n/tr.po.moved.
Conflict adding file report_designer/i18n/zh_CN.po.  Moved existing file to report_designer/i18n/zh_CN.po.moved.
Text conflict in report_intrastat/i18n/ar.po
Text conflict in report_intrastat/i18n/bg.po
Text conflict in report_intrastat/i18n/bs.po
Text conflict in report_intrastat/i18n/ca.po
Text conflict in report_intrastat/i18n/cs.po
Conflict adding file report_intrastat/i18n/da.po.  Moved existing file to report_intrastat/i18n/da.po.moved.
Text conflict in report_intrastat/i18n/de.po
Text conflict in report_intrastat/i18n/es.po
Text conflict in report_intrastat/i18n/es_AR.po
Conflict adding file report_intrastat/i18n/es_CR.po.  Moved existing file to report_intrastat/i18n/es_CR.po.moved.
Text conflict in report_intrastat/i18n/et.po
Text conflict in report_intrastat/i18n/fi.po
Text conflict in report_intrastat/i18n/fr.po
Text conflict in report_intrastat/i18n/hr.po
Text conflict in report_intrastat/i18n/hu.po
Text conflict in report_intrastat/i18n/id.po
Text conflict in report_intrastat/i18n/it.po
Conflict adding file report_intrastat/i18n/ja.po.  Moved existing file to report_intrastat/i18n/ja.po.moved.
Text conflict in report_intrastat/i18n/ko.po
Text conflict in report_intrastat/i18n/lt.po
Conflict adding file report_intrastat/i18n/mk.po.  Moved existing file to report_intrastat/i18n/mk.po.moved.
Conflict adding file report_intrastat/i18n/mn.po.  Moved existing file to report_intrastat/i18n/mn.po.moved.
Text conflict in report_intrastat/i18n/nl.po
Text conflict in report_intrastat/i18n/nl_BE.po
Text conflict in report_intrastat/i18n/pl.po
Text conflict in report_intrastat/i18n/pt.po
Text conflict in report_intrastat/i18n/pt_BR.po
Text conflict in report_intrastat/i18n/ro.po
Text conflict in report_intrastat/i18n/ru.po
Text conflict in report_intrastat/i18n/sl.po
Text conflict in report_intrastat/i18n/sq.po
Text conflict in report_intrastat/i18n/sv.po
Text conflict in report_intrastat/i18n/tlh.po
Text conflict in report_intrastat/i18n/tr.po
Text conflict in report_intrastat/i18n/uk.po
Text conflict in report_intrastat/i18n/vi.po
Text conflict in report_intrastat/i18n/zh_CN.po
Text conflict in report_intrastat/i18n/zh_TW.po
Conflict adding file report_webkit/i18n/ar.po.  Moved existing file to report_webkit/i18n/ar.po.moved.
Conflict adding file report_webkit/i18n/bg.po.  Moved existing file to report_webkit/i18n/bg.po.moved.
Conflict adding file report_webkit/i18n/ca.po.  Moved existing file to report_webkit/i18n/ca.po.moved.
Conflict adding file report_webkit/i18n/cs.po.  Moved existing file to report_webkit/i18n/cs.po.moved.
Conflict adding file report_webkit/i18n/da.po.  Moved existing file to report_webkit/i18n/da.po.moved.
Text conflict in report_webkit/i18n/de.po
Text conflict in report_webkit/i18n/es.po
Conflict adding file report_webkit/i18n/es_CR.po.  Moved existing file to report_webkit/i18n/es_CR.po.moved.
Conflict adding file report_webkit/i18n/fi.po.  Moved existing file to report_webkit/i18n/fi.po.moved.
Text conflict in report_webkit/i18n/fr.po
Conflict adding file report_webkit/i18n/hr.po.  Moved existing file to report_webkit/i18n/hr.po.moved.
Text conflict in report_webkit/i18n/hu.po
Text conflict in report_webkit/i18n/it.po
Conflict adding file report_webkit/i18n/ja.po.  Moved existing file to report_webkit/i18n/ja.po.moved.
Conflict adding file report_webkit/i18n/mk.po.  Moved existing file to report_webkit/i18n/mk.po.moved.
Conflict adding file report_webkit/i18n/mn.po.  Moved existing file to report_webkit/i18n/mn.po.moved.
Conflict adding file report_webkit/i18n/nl.po.  Moved existing file to report_webkit/i18n/nl.po.moved.
Text conflict in report_webkit/i18n/pl.po
Text conflict in report_webkit/i18n/pt.po
Conflict adding file report_webkit/i18n/pt_BR.po.  Moved existing file to report_webkit/i18n/pt_BR.po.moved.
Text conflict in report_webkit/i18n/report_webkit.pot
Conflict adding file report_webkit/i18n/ro.po.  Moved existing file to report_webkit/i18n/ro.po.moved.
Text conflict in report_webkit/i18n/ru.po
Conflict adding file report_webkit/i18n/sl.po.  Moved existing file to report_webkit/i18n/sl.po.moved.
Conflict adding file report_webkit/i18n/sv.po.  Moved existing file to report_webkit/i18n/sv.po.moved.
Conflict adding file report_webkit/i18n/tr.po.  Moved existing file to report_webkit/i18n/tr.po.moved.
Conflict adding file report_webkit/i18n/zh_CN.po.  Moved existing file to report_webkit/i18n/zh_CN.po.moved.
Text conflict in report_webkit/security/ir.model.access.csv
Text conflict in report_webkit/webkit_report.py
Conflict adding file report_webkit_sample/i18n/ar.po.  Moved existing file to report_webkit_sample/i18n/ar.po.moved.
Conflict adding file report_webkit_sample/i18n/bg.po.  Moved existing file to report_webkit_sample/i18n/bg.po.moved.
Conflict adding file report_webkit_sample/i18n/ca.po.  Moved existing file to report_webkit_sample/i18n/ca.po.moved.
Conflict adding file report_webkit_sample/i18n/da.po.  Moved existing file to report_webkit_sample/i18n/da.po.moved.
Text conflict in report_webkit_sample/i18n/de.po
Text conflict in report_webkit_sample/i18n/es.po
Conflict adding file report_webkit_sample/i18n/es_CR.po.  Moved existing file to report_webkit_sample/i18n/es_CR.po.moved.
Conflict adding file report_webkit_sample/i18n/fi.po.  Moved existing file to report_webkit_sample/i18n/fi.po.moved.
Text conflict in report_webkit_sample/i18n/fr.po
Conflict adding file report_webkit_sample/i18n/gl.po.  Moved existing file to report_webkit_sample/i18n/gl.po.moved.
Conflict adding file report_webkit_sample/i18n/hr.po.  Moved existing file to report_webkit_sample/i18n/hr.po.moved.
Text conflict in report_webkit_sample/i18n/hu.po
Text conflict in report_webkit_sample/i18n/it.po
Conflict adding file report_webkit_sample/i18n/ja.po.  Moved existing file to report_webkit_sample/i18n/ja.po.moved.
Conflict adding file report_webkit_sample/i18n/nl.po.  Moved existing file to report_webkit_sample/i18n/nl.po.moved.
Text conflict in report_webkit_sample/i18n/pt.po
Conflict adding file report_webkit_sample/i18n/pt_BR.po.  Moved existing file to report_webkit_sample/i18n/pt_BR.po.moved.
Text conflict in report_webkit_sample/i18n/report_webkit_sample.pot
Conflict adding file report_webkit_sample/i18n/ro.po.  Moved existing file to report_webkit_sample/i18n/ro.po.moved.
Conflict adding file report_webkit_sample/i18n/ru.po.  Moved existing file to report_webkit_sample/i18n/ru.po.moved.
Conflict adding file report_webkit_sample/i18n/sv.po.  Moved existing file to report_webkit_sample/i18n/sv.po.moved.
Conflict adding file report_webkit_sample/i18n/tr.po.  Moved existing file to report_webkit_sample/i18n/tr.po.moved.
Conflict adding file report_webkit_sample/i18n/zh_CN.po.  Moved existing file to report_webkit_sample/i18n/zh_CN.po.moved.
Conflict adding file resource/i18n/ar.po.  Moved existing file to resource/i18n/ar.po.moved.
Conflict adding file resource/i18n/bg.po.  Moved existing file to resource/i18n/bg.po.moved.
Conflict adding file resource/i18n/ca.po.  Moved existing file to resource/i18n/ca.po.moved.
Conflict adding file resource/i18n/cs.po.  Moved existing file to resource/i18n/cs.po.moved.
Conflict adding file resource/i18n/da.po.  Moved existing file to resource/i18n/da.po.moved.
Text conflict in resource/i18n/de.po
Text conflict in resource/i18n/es.po
Conflict adding file resource/i18n/es_CR.po.  Moved existing file to resource/i18n/es_CR.po.moved.
Conflict adding file resource/i18n/es_EC.po.  Moved existing file to resource/i18n/es_EC.po.moved.
Text conflict in resource/i18n/et.po
Conflict adding file resource/i18n/fi.po.  Moved existing file to resource/i18n/fi.po.moved.
Text conflict in resource/i18n/fr.po
Conflict adding file resource/i18n/gl.po.  Moved existing file to resource/i18n/gl.po.moved.
Text conflict in resource/i18n/hr.po
Text conflict in resource/i18n/hu.po
Text conflict in resource/i18n/it.po
Conflict adding file resource/i18n/ja.po.  Moved existing file to resource/i18n/ja.po.moved.
Text conflict in resource/i18n/lt.po
Conflict adding file resource/i18n/mk.po.  Moved existing file to resource/i18n/mk.po.moved.
Text conflict in resource/i18n/mn.po
Text conflict in resource/i18n/nl.po
Text conflict in resource/i18n/pl.po
Text conflict in resource/i18n/pt.po
Text conflict in resource/i18n/pt_BR.po
Text conflict in resource/i18n/resource.pot
Conflict adding file resource/i18n/ro.po.  Moved existing file to resource/i18n/ro.po.moved.
Text conflict in resource/i18n/ru.po
Conflict adding file resource/i18n/sl.po.  Moved existing file to resource/i18n/sl.po.moved.
Text conflict in resource/i18n/sv.po
Conflict adding file resource/i18n/tr.po.  Moved existing file to resource/i18n/tr.po.moved.
Text conflict in resource/i18n/vi.po
Text conflict in resource/i18n/zh_CN.po
Text conflict in sale/company.py
Text conflict in sale/i18n/ar.po
Text conflict in sale/i18n/bg.po
Text conflict in sale/i18n/bs.po
Text conflict in sale/i18n/ca.po
Text conflict in sale/i18n/cs.po
Conflict adding file sale/i18n/da.po.  Moved existing file to sale/i18n/da.po.moved.
Text conflict in sale/i18n/de.po
Text conflict in sale/i18n/el.po
Text conflict in sale/i18n/es.po
Text conflict in sale/i18n/es_AR.po
Text conflict in sale/i18n/es_CL.po
Conflict adding file sale/i18n/es_CR.po.  Moved existing file to sale/i18n/es_CR.po.moved.
Text conflict in sale/i18n/es_EC.po
Conflict adding file sale/i18n/es_MX.po.  Moved existing file to sale/i18n/es_MX.po.moved.moved.
Conflict adding file sale/i18n/es_MX.po.moved.  Moved existing file to sale/i18n/es_MX.po.moved.moved.
Text conflict in sale/i18n/et.po
Conflict adding file sale/i18n/eu.po.  Moved existing file to sale/i18n/eu.po.moved.
Text conflict in sale/i18n/fi.po
Text conflict in sale/i18n/fr.po
Conflict adding file sale/i18n/gl.po.  Moved existing file to sale/i18n/gl.po.moved.
Text conflict in sale/i18n/hr.po
Text conflict in sale/i18n/hu.po
Text conflict in sale/i18n/id.po
Conflict adding file sale/i18n/is.po.  Moved existing file to sale/i18n/is.po.moved.
Text conflict in sale/i18n/it.po
Conflict adding file sale/i18n/ja.po.  Moved existing file to sale/i18n/ja.po.moved.
Text conflict in sale/i18n/ko.po
Conflict adding file sale/i18n/lo.po.  Moved existing file to sale/i18n/lo.po.moved.
Text conflict in sale/i18n/lt.po
Text conflict in sale/i18n/lv.po
Conflict adding file sale/i18n/mk.po.  Moved existing file to sale/i18n/mk.po.moved.
Text conflict in sale/i18n/mn.po
Conflict adding file sale/i18n/nb.po.  Moved existing file to sale/i18n/nb.po.moved.
Text conflict in sale/i18n/nl.po
Text conflict in sale/i18n/nl_BE.po
Conflict adding file sale/i18n/oc.po.  Moved existing file to sale/i18n/oc.po.moved.
Text conflict in sale/i18n/pl.po
Text conflict in sale/i18n/pt.po
Text conflict in sale/i18n/pt_BR.po
Text conflict in sale/i18n/ro.po
Text conflict in sale/i18n/ru.po
Text conflict in sale/i18n/sale.pot
Text conflict in sale/i18n/sk.po
Text conflict in sale/i18n/sl.po
Text conflict in sale/i18n/sq.po
Text conflict in sale/i18n/sr.po
Text conflict in sale/i18n/sr@latin.po
Text conflict in sale/i18n/sv.po
Text conflict in sale/i18n/th.po
Text conflict in sale/i18n/tlh.po
Text conflict in sale/i18n/tr.po
Text conflict in sale/i18n/uk.po
Text conflict in sale/i18n/vi.po
Text conflict in sale/i18n/zh_CN.po
Text conflict in sale/i18n/zh_TW.po
Text conflict in sale/report/sale_order.rml
Contents conflict in sale/report/sale_order.sxw
Text conflict in sale/report/sale_report.py
Text conflict in sale/report/sale_report_view.xml
Text conflict in sale/sale.py
Text conflict in sale/sale_view.xml
Text conflict in sale/stock.py
Text conflict in sale_analytic_plans/i18n/ar.po
Text conflict in sale_analytic_plans/i18n/bg.po
Text conflict in sale_analytic_plans/i18n/bs.po
Text conflict in sale_analytic_plans/i18n/ca.po
Text conflict in sale_analytic_plans/i18n/cs.po
Text conflict in sale_analytic_plans/i18n/da.po
Text conflict in sale_analytic_plans/i18n/de.po
Text conflict in sale_analytic_plans/i18n/el.po
Text conflict in sale_analytic_plans/i18n/es.po
Text conflict in sale_analytic_plans/i18n/es_AR.po
Conflict adding file sale_analytic_plans/i18n/es_CL.po.  Moved existing file to sale_analytic_plans/i18n/es_CL.po.moved.
Conflict adding file sale_analytic_plans/i18n/es_CO.po.  Moved existing file to sale_analytic_plans/i18n/es_CO.po.moved.
Conflict adding file sale_analytic_plans/i18n/es_CR.po.  Moved existing file to sale_analytic_plans/i18n/es_CR.po.moved.
Text conflict in sale_analytic_plans/i18n/et.po
Conflict adding file sale_analytic_plans/i18n/fi.po.  Moved existing file to sale_analytic_plans/i18n/fi.po.moved.
Text conflict in sale_analytic_plans/i18n/fr.po
Text conflict in sale_analytic_plans/i18n/gl.po
Text conflict in sale_analytic_plans/i18n/hr.po
Text conflict in sale_analytic_plans/i18n/hu.po
Text conflict in sale_analytic_plans/i18n/id.po
Text conflict in sale_analytic_plans/i18n/it.po
Conflict adding file sale_analytic_plans/i18n/ja.po.  Moved existing file to sale_analytic_plans/i18n/ja.po.moved.
Text conflict in sale_analytic_plans/i18n/ko.po
Text conflict in sale_analytic_plans/i18n/lt.po
Conflict adding file sale_analytic_plans/i18n/mk.po.  Moved existing file to sale_analytic_plans/i18n/mk.po.moved.
Text conflict in sale_analytic_plans/i18n/mn.po
Conflict adding file sale_analytic_plans/i18n/nb.po.  Moved existing file to sale_analytic_plans/i18n/nb.po.moved.
Text conflict in sale_analytic_plans/i18n/nl.po
Text conflict in sale_analytic_plans/i18n/nl_BE.po
Conflict adding file sale_analytic_plans/i18n/oc.po.  Moved existing file to sale_analytic_plans/i18n/oc.po.moved.
Text conflict in sale_analytic_plans/i18n/pl.po
Text conflict in sale_analytic_plans/i18n/pt.po
Text conflict in sale_analytic_plans/i18n/pt_BR.po
Text conflict in sale_analytic_plans/i18n/ro.po
Text conflict in sale_analytic_plans/i18n/ru.po
Text conflict in sale_analytic_plans/i18n/sk.po
Text conflict in sale_analytic_plans/i18n/sl.po
Text conflict in sale_analytic_plans/i18n/sq.po
Text conflict in sale_analytic_plans/i18n/sr.po
Text conflict in sale_analytic_plans/i18n/sr@latin.po
Text conflict in sale_analytic_plans/i18n/sv.po
Text conflict in sale_analytic_plans/i18n/tlh.po
Text conflict in sale_analytic_plans/i18n/tr.po
Text conflict in sale_analytic_plans/i18n/uk.po
Text conflict in sale_analytic_plans/i18n/vi.po
Text conflict in sale_analytic_plans/i18n/zh_CN.po
Text conflict in sale_analytic_plans/i18n/zh_TW.po
Text conflict in sale_crm/i18n/ar.po
Text conflict in sale_crm/i18n/bg.po
Text conflict in sale_crm/i18n/bs.po
Text conflict in sale_crm/i18n/ca.po
Text conflict in sale_crm/i18n/cs.po
Text conflict in sale_crm/i18n/da.po
Text conflict in sale_crm/i18n/de.po
Text conflict in sale_crm/i18n/el.po
Text conflict in sale_crm/i18n/es.po
Text conflict in sale_crm/i18n/es_AR.po
Conflict adding file sale_crm/i18n/es_CL.po.  Moved existing file to sale_crm/i18n/es_CL.po.moved.
Conflict adding file sale_crm/i18n/es_CR.po.  Moved existing file to sale_crm/i18n/es_CR.po.moved.
Text conflict in sale_crm/i18n/et.po
Conflict adding file sale_crm/i18n/fi.po.  Moved existing file to sale_crm/i18n/fi.po.moved.
Text conflict in sale_crm/i18n/fr.po
Conflict adding file sale_crm/i18n/gl.po.  Moved existing file to sale_crm/i18n/gl.po.moved.
Text conflict in sale_crm/i18n/hr.po
Text conflict in sale_crm/i18n/hu.po
Text conflict in sale_crm/i18n/id.po
Text conflict in sale_crm/i18n/it.po
Conflict adding file sale_crm/i18n/ja.po.  Moved existing file to sale_crm/i18n/ja.po.moved.
Text conflict in sale_crm/i18n/ko.po
Text conflict in sale_crm/i18n/lt.po
Conflict adding file sale_crm/i18n/lv.po.  Moved existing file to sale_crm/i18n/lv.po.moved.
Conflict adding file sale_crm/i18n/mk.po.  Moved existing file to sale_crm/i18n/mk.po.moved.
Conflict adding file sale_crm/i18n/mn.po.  Moved existing file to sale_crm/i18n/mn.po.moved.
Conflict adding file sale_crm/i18n/nb.po.  Moved existing file to sale_crm/i18n/nb.po.moved.
Text conflict in sale_crm/i18n/nl.po
Text conflict in sale_crm/i18n/nl_BE.po
Text conflict in sale_crm/i18n/pl.po
Text conflict in sale_crm/i18n/pt.po
Text conflict in sale_crm/i18n/pt_BR.po
Text conflict in sale_crm/i18n/ro.po
Text conflict in sale_crm/i18n/ru.po
Conflict adding file sale_crm/i18n/sk.po.  Moved existing file to sale_crm/i18n/sk.po.moved.
Text conflict in sale_crm/i18n/sl.po
Text conflict in sale_crm/i18n/sq.po
Text conflict in sale_crm/i18n/sv.po
Text conflict in sale_crm/i18n/tlh.po
Text conflict in sale_crm/i18n/tr.po
Text conflict in sale_crm/i18n/uk.po
Text conflict in sale_crm/i18n/vi.po
Text conflict in sale_crm/i18n/zh_CN.po
Text conflict in sale_crm/i18n/zh_TW.po
Text conflict in sale_journal/i18n/ar.po
Text conflict in sale_journal/i18n/bg.po
Text conflict in sale_journal/i18n/bs.po
Text conflict in sale_journal/i18n/ca.po
Text conflict in sale_journal/i18n/cs.po
Conflict adding file sale_journal/i18n/da.po.  Moved existing file to sale_journal/i18n/da.po.moved.
Text conflict in sale_journal/i18n/de.po
Text conflict in sale_journal/i18n/el.po
Text conflict in sale_journal/i18n/es.po
Text conflict in sale_journal/i18n/es_AR.po
Conflict adding file sale_journal/i18n/es_CL.po.  Moved existing file to sale_journal/i18n/es_CL.po.moved.
Conflict adding file sale_journal/i18n/es_CR.po.  Moved existing file to sale_journal/i18n/es_CR.po.moved.
Text conflict in sale_journal/i18n/et.po
Conflict adding file sale_journal/i18n/fi.po.  Moved existing file to sale_journal/i18n/fi.po.moved.
Text conflict in sale_journal/i18n/fr.po
Conflict adding file sale_journal/i18n/gl.po.  Moved existing file to sale_journal/i18n/gl.po.moved.
Text conflict in sale_journal/i18n/hr.po
Text conflict in sale_journal/i18n/hu.po
Text conflict in sale_journal/i18n/id.po
Text conflict in sale_journal/i18n/it.po
Conflict adding file sale_journal/i18n/ja.po.  Moved existing file to sale_journal/i18n/ja.po.moved.
Text conflict in sale_journal/i18n/ko.po
Text conflict in sale_journal/i18n/lt.po
Conflict adding file sale_journal/i18n/lv.po.  Moved existing file to sale_journal/i18n/lv.po.moved.
Conflict adding file sale_journal/i18n/mk.po.  Moved existing file to sale_journal/i18n/mk.po.moved.
Text conflict in sale_journal/i18n/mn.po
Conflict adding file sale_journal/i18n/nb.po.  Moved existing file to sale_journal/i18n/nb.po.moved.
Text conflict in sale_journal/i18n/nl.po
Text conflict in sale_journal/i18n/nl_BE.po
Text conflict in sale_journal/i18n/pl.po
Text conflict in sale_journal/i18n/pt.po
Text conflict in sale_journal/i18n/pt_BR.po
Text conflict in sale_journal/i18n/ro.po
Text conflict in sale_journal/i18n/ru.po
Conflict adding file sale_journal/i18n/sk.po.  Moved existing file to sale_journal/i18n/sk.po.moved.
Text conflict in sale_journal/i18n/sl.po
Text conflict in sale_journal/i18n/sq.po
Text conflict in sale_journal/i18n/sv.po
Text conflict in sale_journal/i18n/tlh.po
Text conflict in sale_journal/i18n/tr.po
Text conflict in sale_journal/i18n/uk.po
Text conflict in sale_journal/i18n/vi.po
Text conflict in sale_journal/i18n/zh_CN.po
Text conflict in sale_journal/i18n/zh_TW.po
Conflict adding file sale_layout/i18n/ar.po.  Moved existing file to sale_layout/i18n/ar.po.moved.
Conflict adding file sale_layout/i18n/bg.po.  Moved existing file to sale_layout/i18n/bg.po.moved.
Conflict adding file sale_layout/i18n/ca.po.  Moved existing file to sale_layout/i18n/ca.po.moved.
Conflict adding file sale_layout/i18n/da.po.  Moved existing file to sale_layout/i18n/da.po.moved.
Text conflict in sale_layout/i18n/de.po
Text conflict in sale_layout/i18n/el.po
Text conflict in sale_layout/i18n/es.po
Conflict adding file sale_layout/i18n/es_CL.po.  Moved existing file to sale_layout/i18n/es_CL.po.moved.
Conflict adding file sale_layout/i18n/es_CR.po.  Moved existing file to sale_layout/i18n/es_CR.po.moved.
Text conflict in sale_layout/i18n/et.po
Conflict adding file sale_layout/i18n/fi.po.  Moved existing file to sale_layout/i18n/fi.po.moved.
Text conflict in sale_layout/i18n/fr.po
Conflict adding file sale_layout/i18n/gl.po.  Moved existing file to sale_layout/i18n/gl.po.moved.
Conflict adding file sale_layout/i18n/hr.po.  Moved existing file to sale_layout/i18n/hr.po.moved.
Text conflict in sale_layout/i18n/hu.po
Conflict adding file sale_layout/i18n/id.po.  Moved existing file to sale_layout/i18n/id.po.moved.
Text conflict in sale_layout/i18n/it.po
Conflict adding file sale_layout/i18n/ja.po.  Moved existing file to sale_layout/i18n/ja.po.moved.
Conflict adding file sale_layout/i18n/lv.po.  Moved existing file to sale_layout/i18n/lv.po.moved.
Conflict adding file sale_layout/i18n/mn.po.  Moved existing file to sale_layout/i18n/mn.po.moved.
Conflict adding file sale_layout/i18n/nb.po.  Moved existing file to sale_layout/i18n/nb.po.moved.
Text conflict in sale_layout/i18n/nl.po
Text conflict in sale_layout/i18n/pl.po
Text conflict in sale_layout/i18n/pt.po
Text conflict in sale_layout/i18n/pt_BR.po
Conflict adding file sale_layout/i18n/ro.po.  Moved existing file to sale_layout/i18n/ro.po.moved.
Text conflict in sale_layout/i18n/ru.po
Conflict adding file sale_layout/i18n/sk.po.  Moved existing file to sale_layout/i18n/sk.po.moved.
Conflict adding file sale_layout/i18n/sl.po.  Moved existing file to sale_layout/i18n/sl.po.moved.
Text conflict in sale_layout/i18n/sv.po
Conflict adding file sale_layout/i18n/tr.po.  Moved existing file to sale_layout/i18n/tr.po.moved.
Text conflict in sale_layout/i18n/zh_CN.po
Text conflict in sale_layout/report/report_sale_layout.rml
Contents conflict in sale_layout/report/report_sale_layout.sxw
Text conflict in sale_layout/sale_layout.py
Conflict adding file sale_margin/i18n/ar.po.  Moved existing file to sale_margin/i18n/ar.po.moved.
Conflict adding file sale_margin/i18n/bg.po.  Moved existing file to sale_margin/i18n/bg.po.moved.
Text conflict in sale_margin/i18n/ca.po
Conflict adding file sale_margin/i18n/cs.po.  Moved existing file to sale_margin/i18n/cs.po.moved.
Conflict adding file sale_margin/i18n/da.po.  Moved existing file to sale_margin/i18n/da.po.moved.
Text conflict in sale_margin/i18n/de.po
Text conflict in sale_margin/i18n/el.po
Text conflict in sale_margin/i18n/es.po
Conflict adding file sale_margin/i18n/es_CL.po.  Moved existing file to sale_margin/i18n/es_CL.po.moved.
Conflict adding file sale_margin/i18n/es_CR.po.  Moved existing file to sale_margin/i18n/es_CR.po.moved.
Text conflict in sale_margin/i18n/et.po
Conflict adding file sale_margin/i18n/fi.po.  Moved existing file to sale_margin/i18n/fi.po.moved.
Text conflict in sale_margin/i18n/fr.po
Conflict adding file sale_margin/i18n/hr.po.  Moved existing file to sale_margin/i18n/hr.po.moved.
Text conflict in sale_margin/i18n/hu.po
Text conflict in sale_margin/i18n/it.po
Conflict adding file sale_margin/i18n/ja.po.  Moved existing file to sale_margin/i18n/ja.po.moved.
Conflict adding file sale_margin/i18n/mk.po.  Moved existing file to sale_margin/i18n/mk.po.moved.
Conflict adding file sale_margin/i18n/mn.po.  Moved existing file to sale_margin/i18n/mn.po.moved.
Conflict adding file sale_margin/i18n/nb.po.  Moved existing file to sale_margin/i18n/nb.po.moved.
Text conflict in sale_margin/i18n/nl.po
Text conflict in sale_margin/i18n/pl.po
Text conflict in sale_margin/i18n/pt.po
Text conflict in sale_margin/i18n/pt_BR.po
Conflict adding file sale_margin/i18n/ro.po.  Moved existing file to sale_margin/i18n/ro.po.moved.
Text conflict in sale_margin/i18n/ru.po
Conflict adding file sale_margin/i18n/sk.po.  Moved existing file to sale_margin/i18n/sk.po.moved.
Text conflict in sale_margin/i18n/sl.po
Conflict adding file sale_margin/i18n/sv.po.  Moved existing file to sale_margin/i18n/sv.po.moved.
Conflict adding file sale_margin/i18n/tr.po.  Moved existing file to sale_margin/i18n/tr.po.moved.
Conflict adding file sale_margin/i18n/zh_CN.po.  Moved existing file to sale_margin/i18n/zh_CN.po.moved.
Text conflict in sale_margin/sale_margin.py
Conflict adding file sale_mrp/i18n/ar.po.  Moved existing file to sale_mrp/i18n/ar.po.moved.
Conflict adding file sale_mrp/i18n/bg.po.  Moved existing file to sale_mrp/i18n/bg.po.moved.
Conflict adding file sale_mrp/i18n/ca.po.  Moved existing file to sale_mrp/i18n/ca.po.moved.
Conflict adding file sale_mrp/i18n/cs.po.  Moved existing file to sale_mrp/i18n/cs.po.moved.
Conflict adding file sale_mrp/i18n/da.po.  Moved existing file to sale_mrp/i18n/da.po.moved.
Text conflict in sale_mrp/i18n/de.po
Text conflict in sale_mrp/i18n/es.po
Conflict adding file sale_mrp/i18n/es_CL.po.  Moved existing file to sale_mrp/i18n/es_CL.po.moved.
Conflict adding file sale_mrp/i18n/es_CR.po.  Moved existing file to sale_mrp/i18n/es_CR.po.moved.
Text conflict in sale_mrp/i18n/et.po
Conflict adding file sale_mrp/i18n/fi.po.  Moved existing file to sale_mrp/i18n/fi.po.moved.
Text conflict in sale_mrp/i18n/fr.po
Conflict adding file sale_mrp/i18n/gl.po.  Moved existing file to sale_mrp/i18n/gl.po.moved.
Conflict adding file sale_mrp/i18n/hr.po.  Moved existing file to sale_mrp/i18n/hr.po.moved.
Text conflict in sale_mrp/i18n/hu.po
Text conflict in sale_mrp/i18n/it.po
Conflict adding file sale_mrp/i18n/ja.po.  Moved existing file to sale_mrp/i18n/ja.po.moved.
Conflict adding file sale_mrp/i18n/lt.po.  Moved existing file to sale_mrp/i18n/lt.po.moved.
Conflict adding file sale_mrp/i18n/mk.po.  Moved existing file to sale_mrp/i18n/mk.po.moved.
Text conflict in sale_mrp/i18n/mn.po
Conflict adding file sale_mrp/i18n/nb.po.  Moved existing file to sale_mrp/i18n/nb.po.moved.
Text conflict in sale_mrp/i18n/nl.po
Conflict adding file sale_mrp/i18n/nl_BE.po.  Moved existing file to sale_mrp/i18n/nl_BE.po.moved.
Text conflict in sale_mrp/i18n/pl.po
Text conflict in sale_mrp/i18n/pt.po
Text conflict in sale_mrp/i18n/pt_BR.po
Conflict adding file sale_mrp/i18n/ro.po.  Moved existing file to sale_mrp/i18n/ro.po.moved.
Text conflict in sale_mrp/i18n/ru.po
Text conflict in sale_mrp/i18n/sl.po
Conflict adding file sale_mrp/i18n/sr@latin.po.  Moved existing file to sale_mrp/i18n/sr@latin.po.moved.
Conflict adding file sale_mrp/i18n/sv.po.  Moved existing file to sale_mrp/i18n/sv.po.moved.
Conflict adding file sale_mrp/i18n/tr.po.  Moved existing file to sale_mrp/i18n/tr.po.moved.
Conflict adding file sale_mrp/i18n/zh_CN.po.  Moved existing file to sale_mrp/i18n/zh_CN.po.moved.
Conflict adding file sale_order_dates/i18n/ar.po.  Moved existing file to sale_order_dates/i18n/ar.po.moved.
Conflict adding file sale_order_dates/i18n/bg.po.  Moved existing file to sale_order_dates/i18n/bg.po.moved.
Conflict adding file sale_order_dates/i18n/ca.po.  Moved existing file to sale_order_dates/i18n/ca.po.moved.
Conflict adding file sale_order_dates/i18n/cs.po.  Moved existing file to sale_order_dates/i18n/cs.po.moved.
Conflict adding file sale_order_dates/i18n/da.po.  Moved existing file to sale_order_dates/i18n/da.po.moved.
Text conflict in sale_order_dates/i18n/de.po
Text conflict in sale_order_dates/i18n/el.po
Text conflict in sale_order_dates/i18n/es.po
Conflict adding file sale_order_dates/i18n/es_CL.po.  Moved existing file to sale_order_dates/i18n/es_CL.po.moved.
Conflict adding file sale_order_dates/i18n/es_CR.po.  Moved existing file to sale_order_dates/i18n/es_CR.po.moved.
Conflict adding file sale_order_dates/i18n/fi.po.  Moved existing file to sale_order_dates/i18n/fi.po.moved.
Text conflict in sale_order_dates/i18n/fr.po
Conflict adding file sale_order_dates/i18n/gl.po.  Moved existing file to sale_order_dates/i18n/gl.po.moved.
Conflict adding file sale_order_dates/i18n/hr.po.  Moved existing file to sale_order_dates/i18n/hr.po.moved.
Text conflict in sale_order_dates/i18n/hu.po
Conflict adding file sale_order_dates/i18n/id.po.  Moved existing file to sale_order_dates/i18n/id.po.moved.
Text conflict in sale_order_dates/i18n/it.po
Conflict adding file sale_order_dates/i18n/ja.po.  Moved existing file to sale_order_dates/i18n/ja.po.moved.
Conflict adding file sale_order_dates/i18n/mk.po.  Moved existing file to sale_order_dates/i18n/mk.po.moved.
Text conflict in sale_order_dates/i18n/mn.po
Conflict adding file sale_order_dates/i18n/nb.po.  Moved existing file to sale_order_dates/i18n/nb.po.moved.
Text conflict in sale_order_dates/i18n/nl.po
Text conflict in sale_order_dates/i18n/pl.po
Text conflict in sale_order_dates/i18n/pt.po
Text conflict in sale_order_dates/i18n/pt_BR.po
Conflict adding file sale_order_dates/i18n/ro.po.  Moved existing file to sale_order_dates/i18n/ro.po.moved.
Text conflict in sale_order_dates/i18n/ru.po
Conflict adding file sale_order_dates/i18n/sk.po.  Moved existing file to sale_order_dates/i18n/sk.po.moved.
Conflict adding file sale_order_dates/i18n/sl.po.  Moved existing file to sale_order_dates/i18n/sl.po.moved.
Conflict adding file sale_order_dates/i18n/sr@latin.po.  Moved existing file to sale_order_dates/i18n/sr@latin.po.moved.
Conflict adding file sale_order_dates/i18n/sv.po.  Moved existing file to sale_order_dates/i18n/sv.po.moved.
Conflict adding file sale_order_dates/i18n/tr.po.  Moved existing file to sale_order_dates/i18n/tr.po.moved.
Conflict adding file sale_order_dates/i18n/zh_CN.po.  Moved existing file to sale_order_dates/i18n/zh_CN.po.moved.
Text conflict in share/__openerp__.py
Conflict adding file share/i18n/ar.po.  Moved existing file to share/i18n/ar.po.moved.
Conflict adding file share/i18n/bg.po.  Moved existing file to share/i18n/bg.po.moved.
Conflict adding file share/i18n/ca.po.  Moved existing file to share/i18n/ca.po.moved.
Conflict adding file share/i18n/cs.po.  Moved existing file to share/i18n/cs.po.moved.
Conflict adding file share/i18n/da.po.  Moved existing file to share/i18n/da.po.moved.
Text conflict in share/i18n/de.po
Text conflict in share/i18n/es.po
Conflict adding file share/i18n/es_CR.po.  Moved existing file to share/i18n/es_CR.po.moved.
Conflict adding file share/i18n/et.po.  Moved existing file to share/i18n/et.po.moved.
Conflict adding file share/i18n/fi.po.  Moved existing file to share/i18n/fi.po.moved.
Text conflict in share/i18n/fr.po
Conflict adding file share/i18n/gl.po.  Moved existing file to share/i18n/gl.po.moved.
Text conflict in share/i18n/hr.po
Text conflict in share/i18n/hu.po
Text conflict in share/i18n/it.po
Conflict adding file share/i18n/ja.po.  Moved existing file to share/i18n/ja.po.moved.
Conflict adding file share/i18n/lt.po.  Moved existing file to share/i18n/lt.po.moved.
Conflict adding file share/i18n/mk.po.  Moved existing file to share/i18n/mk.po.moved.
Text conflict in share/i18n/mn.po
Conflict adding file share/i18n/nl.po.  Moved existing file to share/i18n/nl.po.moved.
Text conflict in share/i18n/pl.po
Text conflict in share/i18n/pt.po
Text conflict in share/i18n/pt_BR.po
Conflict adding file share/i18n/ro.po.  Moved existing file to share/i18n/ro.po.moved.
Conflict adding file share/i18n/ru.po.  Moved existing file to share/i18n/ru.po.moved.
Text conflict in share/i18n/share.pot
Conflict adding file share/i18n/sl.po.  Moved existing file to share/i18n/sl.po.moved.
Conflict adding file share/i18n/sv.po.  Moved existing file to share/i18n/sv.po.moved.
Conflict adding file share/i18n/tr.po.  Moved existing file to share/i18n/tr.po.moved.
Conflict adding file share/i18n/zh_CN.po.  Moved existing file to share/i18n/zh_CN.po.moved.
Conflict: can't delete share/web because it is not empty.  Not deleting.
Conflict because share/web is not versioned, but has versioned children.  Versioned directory.
Contents conflict in share/web/controllers.py
Contents conflict in share/web/editors.py
Text conflict in share/wizard/share_wizard.py
Text conflict in stock/i18n/ar.po
Text conflict in stock/i18n/bg.po
Text conflict in stock/i18n/bs.po
Text conflict in stock/i18n/ca.po
Text conflict in stock/i18n/cs.po
Conflict adding file stock/i18n/da.po.  Moved existing file to stock/i18n/da.po.moved.
Text conflict in stock/i18n/de.po
Text conflict in stock/i18n/el.po
Text conflict in stock/i18n/es.po
Text conflict in stock/i18n/es_AR.po
Text conflict in stock/i18n/es_CL.po
Conflict adding file stock/i18n/es_CR.po.  Moved existing file to stock/i18n/es_CR.po.moved.
Conflict adding file stock/i18n/es_DO.po.  Moved existing file to stock/i18n/es_DO.po.moved.
Text conflict in stock/i18n/es_EC.po
Conflict adding file stock/i18n/es_MX.po.moved.  Moved existing file to stock/i18n/es_MX.po.moved.moved.
Conflict adding file stock/i18n/es_MX.po.  Moved existing file to stock/i18n/es_MX.po.moved.moved.
Conflict adding file stock/i18n/es_VE.po.  Moved existing file to stock/i18n/es_VE.po.moved.
Text conflict in stock/i18n/et.po
Text conflict in stock/i18n/fi.po
Text conflict in stock/i18n/fr.po
Text conflict in stock/i18n/gl.po
Text conflict in stock/i18n/hr.po
Text conflict in stock/i18n/hu.po
Text conflict in stock/i18n/id.po
Text conflict in stock/i18n/it.po
Conflict adding file stock/i18n/ja.po.  Moved existing file to stock/i18n/ja.po.moved.
Text conflict in stock/i18n/ko.po
Text conflict in stock/i18n/lt.po
Text conflict in stock/i18n/lv.po
Conflict adding file stock/i18n/mk.po.  Moved existing file to stock/i18n/mk.po.moved.
Text conflict in stock/i18n/mn.po
Conflict adding file stock/i18n/nb.po.  Moved existing file to stock/i18n/nb.po.moved.
Text conflict in stock/i18n/nl.po
Text conflict in stock/i18n/nl_BE.po
Text conflict in stock/i18n/pl.po
Text conflict in stock/i18n/pt.po
Text conflict in stock/i18n/pt_BR.po
Text conflict in stock/i18n/ro.po
Text conflict in stock/i18n/ru.po
Text conflict in stock/i18n/sl.po
Text conflict in stock/i18n/sq.po
Text conflict in stock/i18n/sr.po
Text conflict in stock/i18n/sr@latin.po
Text conflict in stock/i18n/stock.pot
Text conflict in stock/i18n/sv.po
Text conflict in stock/i18n/th.po
Text conflict in stock/i18n/tlh.po
Text conflict in stock/i18n/tr.po
Text conflict in stock/i18n/uk.po
Text conflict in stock/i18n/vi.po
Text conflict in stock/i18n/zh_CN.po
Text conflict in stock/i18n/zh_TW.po
Text conflict in stock/product.py
Text conflict in stock/report/picking.rml
Contents conflict in stock/report/picking.sxw
Text conflict in stock/report/report_stock_move.py
Text conflict in stock/stock.py
Text conflict in stock/stock_view.xml
Text conflict in stock/test/opening_stock.yml
Text conflict in stock/wizard/stock_fill_inventory.py
Text conflict in stock/wizard/stock_invoice_onshipping.py
Text conflict in stock/wizard/stock_move.py
Text conflict in stock/wizard/stock_partial_move.py
Text conflict in stock/wizard/stock_partial_picking.py
Text conflict in stock_invoice_directly/i18n/ar.po
Text conflict in stock_invoice_directly/i18n/bg.po
Text conflict in stock_invoice_directly/i18n/bs.po
Text conflict in stock_invoice_directly/i18n/ca.po
Text conflict in stock_invoice_directly/i18n/cs.po
Text conflict in stock_invoice_directly/i18n/da.po
Text conflict in stock_invoice_directly/i18n/de.po
Text conflict in stock_invoice_directly/i18n/el.po
Text conflict in stock_invoice_directly/i18n/es.po
Text conflict in stock_invoice_directly/i18n/es_AR.po
Conflict adding file stock_invoice_directly/i18n/es_CL.po.  Moved existing file to stock_invoice_directly/i18n/es_CL.po.moved.
Conflict adding file stock_invoice_directly/i18n/es_CR.po.  Moved existing file to stock_invoice_directly/i18n/es_CR.po.moved.
Text conflict in stock_invoice_directly/i18n/et.po
Text conflict in stock_invoice_directly/i18n/fi.po
Text conflict in stock_invoice_directly/i18n/fr.po
Text conflict in stock_invoice_directly/i18n/gl.po
Text conflict in stock_invoice_directly/i18n/hr.po
Text conflict in stock_invoice_directly/i18n/hu.po
Text conflict in stock_invoice_directly/i18n/id.po
Text conflict in stock_invoice_directly/i18n/it.po
Conflict adding file stock_invoice_directly/i18n/ja.po.  Moved existing file to stock_invoice_directly/i18n/ja.po.moved.
Text conflict in stock_invoice_directly/i18n/ko.po
Text conflict in stock_invoice_directly/i18n/lt.po
Conflict adding file stock_invoice_directly/i18n/lv.po.  Moved existing file to stock_invoice_directly/i18n/lv.po.moved.
Conflict adding file stock_invoice_directly/i18n/mk.po.  Moved existing file to stock_invoice_directly/i18n/mk.po.moved.
Text conflict in stock_invoice_directly/i18n/mn.po
Conflict adding file stock_invoice_directly/i18n/nb.po.  Moved existing file to stock_invoice_directly/i18n/nb.po.moved.
Text conflict in stock_invoice_directly/i18n/nl.po
Text conflict in stock_invoice_directly/i18n/nl_BE.po
Conflict adding file stock_invoice_directly/i18n/oc.po.  Moved existing file to stock_invoice_directly/i18n/oc.po.moved.
Text conflict in stock_invoice_directly/i18n/pl.po
Text conflict in stock_invoice_directly/i18n/pt.po
Text conflict in stock_invoice_directly/i18n/pt_BR.po
Text conflict in stock_invoice_directly/i18n/ro.po
Text conflict in stock_invoice_directly/i18n/ru.po
Text conflict in stock_invoice_directly/i18n/sl.po
Text conflict in stock_invoice_directly/i18n/sq.po
Text conflict in stock_invoice_directly/i18n/sr.po
Text conflict in stock_invoice_directly/i18n/sr@latin.po
Text conflict in stock_invoice_directly/i18n/sv.po
Text conflict in stock_invoice_directly/i18n/tr.po
Text conflict in stock_invoice_directly/i18n/uk.po
Text conflict in stock_invoice_directly/i18n/vi.po
Text conflict in stock_invoice_directly/i18n/zh_CN.po
Text conflict in stock_invoice_directly/i18n/zh_TW.po
Text conflict in stock_invoice_directly/test/stock_invoice_directly.yml
Text conflict in stock_location/i18n/ar.po
Text conflict in stock_location/i18n/bg.po
Text conflict in stock_location/i18n/bs.po
Text conflict in stock_location/i18n/ca.po
Text conflict in stock_location/i18n/cs.po
Conflict adding file stock_location/i18n/da.po.  Moved existing file to stock_location/i18n/da.po.moved.
Text conflict in stock_location/i18n/de.po
Text conflict in stock_location/i18n/el.po
Text conflict in stock_location/i18n/es.po
Text conflict in stock_location/i18n/es_AR.po
Conflict adding file stock_location/i18n/es_CL.po.  Moved existing file to stock_location/i18n/es_CL.po.moved.
Conflict adding file stock_location/i18n/es_CR.po.  Moved existing file to stock_location/i18n/es_CR.po.moved.
Text conflict in stock_location/i18n/et.po
Text conflict in stock_location/i18n/fi.po
Text conflict in stock_location/i18n/fr.po
Conflict adding file stock_location/i18n/gl.po.  Moved existing file to stock_location/i18n/gl.po.moved.
Text conflict in stock_location/i18n/hr.po
Text conflict in stock_location/i18n/hu.po
Text conflict in stock_location/i18n/id.po
Text conflict in stock_location/i18n/it.po
Conflict adding file stock_location/i18n/ja.po.  Moved existing file to stock_location/i18n/ja.po.moved.
Text conflict in stock_location/i18n/ko.po
Text conflict in stock_location/i18n/lt.po
Conflict adding file stock_location/i18n/lv.po.  Moved existing file to stock_location/i18n/lv.po.moved.
Conflict adding file stock_location/i18n/mk.po.  Moved existing file to stock_location/i18n/mk.po.moved.
Text conflict in stock_location/i18n/mn.po
Conflict adding file stock_location/i18n/nb.po.  Moved existing file to stock_location/i18n/nb.po.moved.
Text conflict in stock_location/i18n/nl.po
Text conflict in stock_location/i18n/nl_BE.po
Text conflict in stock_location/i18n/pl.po
Text conflict in stock_location/i18n/pt.po
Text conflict in stock_location/i18n/pt_BR.po
Text conflict in stock_location/i18n/ro.po
Text conflict in stock_location/i18n/ru.po
Text conflict in stock_location/i18n/sl.po
Text conflict in stock_location/i18n/sq.po
Text conflict in stock_location/i18n/sv.po
Text conflict in stock_location/i18n/tlh.po
Text conflict in stock_location/i18n/tr.po
Text conflict in stock_location/i18n/uk.po
Text conflict in stock_location/i18n/vi.po
Text conflict in stock_location/i18n/zh_CN.po
Text conflict in stock_location/i18n/zh_TW.po
Text conflict in stock_no_autopicking/i18n/ar.po
Text conflict in stock_no_autopicking/i18n/bg.po
Text conflict in stock_no_autopicking/i18n/bs.po
Text conflict in stock_no_autopicking/i18n/ca.po
Text conflict in stock_no_autopicking/i18n/cs.po
Text conflict in stock_no_autopicking/i18n/da.po
Text conflict in stock_no_autopicking/i18n/de.po
Text conflict in stock_no_autopicking/i18n/el.po
Text conflict in stock_no_autopicking/i18n/es.po
Text conflict in stock_no_autopicking/i18n/es_AR.po
Conflict adding file stock_no_autopicking/i18n/es_CL.po.  Moved existing file to stock_no_autopicking/i18n/es_CL.po.moved.
Conflict adding file stock_no_autopicking/i18n/es_CR.po.  Moved existing file to stock_no_autopicking/i18n/es_CR.po.moved.
Text conflict in stock_no_autopicking/i18n/et.po
Conflict adding file stock_no_autopicking/i18n/fi.po.  Moved existing file to stock_no_autopicking/i18n/fi.po.moved.
Text conflict in stock_no_autopicking/i18n/fr.po
Text conflict in stock_no_autopicking/i18n/gl.po
Text conflict in stock_no_autopicking/i18n/hr.po
Text conflict in stock_no_autopicking/i18n/hu.po
Text conflict in stock_no_autopicking/i18n/id.po
Text conflict in stock_no_autopicking/i18n/it.po
Conflict adding file stock_no_autopicking/i18n/ja.po.  Moved existing file to stock_no_autopicking/i18n/ja.po.moved.
Text conflict in stock_no_autopicking/i18n/ko.po
Text conflict in stock_no_autopicking/i18n/lt.po
Conflict adding file stock_no_autopicking/i18n/lv.po.  Moved existing file to stock_no_autopicking/i18n/lv.po.moved.
Conflict adding file stock_no_autopicking/i18n/mk.po.  Moved existing file to stock_no_autopicking/i18n/mk.po.moved.
Text conflict in stock_no_autopicking/i18n/mn.po
Text conflict in stock_no_autopicking/i18n/nl.po
Text conflict in stock_no_autopicking/i18n/nl_BE.po
Conflict adding file stock_no_autopicking/i18n/oc.po.  Moved existing file to stock_no_autopicking/i18n/oc.po.moved.
Text conflict in stock_no_autopicking/i18n/pl.po
Text conflict in stock_no_autopicking/i18n/pt.po
Text conflict in stock_no_autopicking/i18n/pt_BR.po
Text conflict in stock_no_autopicking/i18n/ro.po
Text conflict in stock_no_autopicking/i18n/ru.po
Text conflict in stock_no_autopicking/i18n/sl.po
Text conflict in stock_no_autopicking/i18n/sq.po
Conflict adding file stock_no_autopicking/i18n/sr@latin.po.  Moved existing file to stock_no_autopicking/i18n/sr@latin.po.moved.
Text conflict in stock_no_autopicking/i18n/sv.po
Text conflict in stock_no_autopicking/i18n/tlh.po
Text conflict in stock_no_autopicking/i18n/tr.po
Text conflict in stock_no_autopicking/i18n/uk.po
Text conflict in stock_no_autopicking/i18n/vi.po
Text conflict in stock_no_autopicking/i18n/zh_CN.po
Text conflict in stock_no_autopicking/i18n/zh_TW.po
Conflict adding file stock_planning/i18n/ar.po.  Moved existing file to stock_planning/i18n/ar.po.moved.
Conflict adding file stock_planning/i18n/bg.po.  Moved existing file to stock_planning/i18n/bg.po.moved.
Conflict adding file stock_planning/i18n/ca.po.  Moved existing file to stock_planning/i18n/ca.po.moved.
Conflict adding file stock_planning/i18n/da.po.  Moved existing file to stock_planning/i18n/da.po.moved.
Text conflict in stock_planning/i18n/de.po
Conflict adding file stock_planning/i18n/el.po.  Moved existing file to stock_planning/i18n/el.po.moved.
Text conflict in stock_planning/i18n/es.po
Conflict adding file stock_planning/i18n/es_CL.po.  Moved existing file to stock_planning/i18n/es_CL.po.moved.
Conflict adding file stock_planning/i18n/es_CR.po.  Moved existing file to stock_planning/i18n/es_CR.po.moved.
Conflict adding file stock_planning/i18n/fi.po.  Moved existing file to stock_planning/i18n/fi.po.moved.
Text conflict in stock_planning/i18n/fr.po
Conflict adding file stock_planning/i18n/gl.po.  Moved existing file to stock_planning/i18n/gl.po.moved.
Text conflict in stock_planning/i18n/hr.po
Text conflict in stock_planning/i18n/hu.po
Text conflict in stock_planning/i18n/it.po
Conflict adding file stock_planning/i18n/ja.po.  Moved existing file to stock_planning/i18n/ja.po.moved.
Conflict adding file stock_planning/i18n/lv.po.  Moved existing file to stock_planning/i18n/lv.po.moved.
Text conflict in stock_planning/i18n/mn.po
Conflict adding file stock_planning/i18n/nb.po.  Moved existing file to stock_planning/i18n/nb.po.moved.
Conflict adding file stock_planning/i18n/nl.po.  Moved existing file to stock_planning/i18n/nl.po.moved.
Text conflict in stock_planning/i18n/pl.po
Text conflict in stock_planning/i18n/pt.po
Text conflict in stock_planning/i18n/pt_BR.po
Conflict adding file stock_planning/i18n/ro.po.  Moved existing file to stock_planning/i18n/ro.po.moved.
Text conflict in stock_planning/i18n/ru.po
Text conflict in stock_planning/i18n/stock_planning.pot
Conflict adding file stock_planning/i18n/sv.po.  Moved existing file to stock_planning/i18n/sv.po.moved.
Conflict adding file stock_planning/i18n/tr.po.  Moved existing file to stock_planning/i18n/tr.po.moved.
Conflict adding file stock_planning/i18n/zh_CN.po.  Moved existing file to stock_planning/i18n/zh_CN.po.moved.
Text conflict in subscription/i18n/ar.po
Text conflict in subscription/i18n/bg.po
Text conflict in subscription/i18n/bs.po
Text conflict in subscription/i18n/ca.po
Text conflict in subscription/i18n/cs.po
Conflict adding file subscription/i18n/da.po.  Moved existing file to subscription/i18n/da.po.moved.
Text conflict in subscription/i18n/de.po
Text conflict in subscription/i18n/es.po
Text conflict in subscription/i18n/es_AR.po
Conflict adding file subscription/i18n/es_CR.po.  Moved existing file to subscription/i18n/es_CR.po.moved.
Text conflict in subscription/i18n/et.po
Conflict adding file subscription/i18n/fi.po.  Moved existing file to subscription/i18n/fi.po.moved.
Text conflict in subscription/i18n/fr.po
Conflict adding file subscription/i18n/gl.po.  Moved existing file to subscription/i18n/gl.po.moved.
Text conflict in subscription/i18n/hr.po
Text conflict in subscription/i18n/hu.po
Text conflict in subscription/i18n/id.po
Text conflict in subscription/i18n/it.po
Conflict adding file subscription/i18n/ja.po.  Moved existing file to subscription/i18n/ja.po.moved.
Text conflict in subscription/i18n/ko.po
Text conflict in subscription/i18n/lt.po
Conflict adding file subscription/i18n/mk.po.  Moved existing file to subscription/i18n/mk.po.moved.
Text conflict in subscription/i18n/nl.po
Text conflict in subscription/i18n/nl_BE.po
Text conflict in subscription/i18n/pl.po
Text conflict in subscription/i18n/pt.po
Text conflict in subscription/i18n/pt_BR.po
Text conflict in subscription/i18n/ro.po
Text conflict in subscription/i18n/ru.po
Text conflict in subscription/i18n/sl.po
Text conflict in subscription/i18n/sq.po
Text conflict in subscription/i18n/sv.po
Text conflict in subscription/i18n/tlh.po
Text conflict in subscription/i18n/tr.po
Text conflict in subscription/i18n/uk.po
Text conflict in subscription/i18n/vi.po
Text conflict in subscription/i18n/zh_CN.po
Text conflict in subscription/i18n/zh_TW.po
Conflict adding file survey/i18n/ar.po.  Moved existing file to survey/i18n/ar.po.moved.
Text conflict in survey/i18n/bg.po
Conflict adding file survey/i18n/ca.po.  Moved existing file to survey/i18n/ca.po.moved.
Text conflict in survey/i18n/cs.po
Conflict adding file survey/i18n/da.po.  Moved existing file to survey/i18n/da.po.moved.
Text conflict in survey/i18n/de.po
Text conflict in survey/i18n/es.po
Conflict adding file survey/i18n/es_CR.po.  Moved existing file to survey/i18n/es_CR.po.moved.
Text conflict in survey/i18n/et.po
Conflict adding file survey/i18n/fi.po.  Moved existing file to survey/i18n/fi.po.moved.
Text conflict in survey/i18n/fr.po
Conflict adding file survey/i18n/gl.po.  Moved existing file to survey/i18n/gl.po.moved.
Text conflict in survey/i18n/hr.po
Text conflict in survey/i18n/hu.po
Text conflict in survey/i18n/it.po
Conflict adding file survey/i18n/ja.po.  Moved existing file to survey/i18n/ja.po.moved.
Conflict adding file survey/i18n/mk.po.  Moved existing file to survey/i18n/mk.po.moved.
Text conflict in survey/i18n/mn.po
Text conflict in survey/i18n/nl.po
Text conflict in survey/i18n/pl.po
Text conflict in survey/i18n/pt.po
Conflict adding file survey/i18n/pt_BR.po.  Moved existing file to survey/i18n/pt_BR.po.moved.
Conflict adding file survey/i18n/ro.po.  Moved existing file to survey/i18n/ro.po.moved.
Text conflict in survey/i18n/ru.po
Text conflict in survey/i18n/sl.po
Text conflict in survey/i18n/sr.po
Text conflict in survey/i18n/sr@latin.po
Text conflict in survey/i18n/survey.pot
Text conflict in survey/i18n/sv.po
Conflict adding file survey/i18n/tr.po.  Moved existing file to survey/i18n/tr.po.moved.
Text conflict in survey/i18n/zh_CN.po
Text conflict in survey/survey.py
Text conflict in survey/survey_data.xml
Text conflict in survey/survey_view.xml
Conflict: can't delete thunderbird because it is not empty.  Not deleting.
Conflict because thunderbird is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete thunderbird/i18n because it is not empty.  Not deleting.
Conflict because thunderbird/i18n is not versioned, but has versioned children.  Versioned directory.
Contents conflict in thunderbird/i18n/bg.po
Contents conflict in thunderbird/i18n/ca.po
Contents conflict in thunderbird/i18n/cs.po
Contents conflict in thunderbird/i18n/de.po
Contents conflict in thunderbird/i18n/en_GB.po
Contents conflict in thunderbird/i18n/en_US.po
Contents conflict in thunderbird/i18n/es.po
Contents conflict in thunderbird/i18n/et.po
Contents conflict in thunderbird/i18n/eu.po
Contents conflict in thunderbird/i18n/fr.po
Contents conflict in thunderbird/i18n/hr.po
Contents conflict in thunderbird/i18n/hu.po
Contents conflict in thunderbird/i18n/it.po
Contents conflict in thunderbird/i18n/mn.po
Contents conflict in thunderbird/i18n/nl.po
Contents conflict in thunderbird/i18n/pl.po
Contents conflict in thunderbird/i18n/pt.po
Contents conflict in thunderbird/i18n/pt_BR.po
Contents conflict in thunderbird/i18n/ru.po
Contents conflict in thunderbird/i18n/sk.po
Contents conflict in thunderbird/i18n/sl.po
Contents conflict in thunderbird/i18n/sr.po
Contents conflict in thunderbird/i18n/sr@latin.po
Contents conflict in thunderbird/i18n/thunderbird.pot
Contents conflict in thunderbird/i18n/tr.po
Contents conflict in thunderbird/i18n/zh_CN.po
Contents conflict in thunderbird/installer.py
Conflict: can't delete thunderbird/partner because it is not empty.  Not deleting.
Conflict because thunderbird/partner is not versioned, but has versioned children.  Versioned directory.
Contents conflict in thunderbird/partner/partner.py
Conflict: can't delete thunderbird/plugin because it is not empty.  Not deleting.
Conflict because thunderbird/plugin is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete thunderbird/plugin/openerp_plugin because it is not empty.  Not deleting.
Conflict because thunderbird/plugin/openerp_plugin is not versioned, but has versioned children.  Versioned directory.
Contents conflict in thunderbird/plugin/openerp_plugin.xpi
Conflict: can't delete thunderbird/plugin/openerp_plugin/chrome because it is not empty.  Not deleting.
Conflict because thunderbird/plugin/openerp_plugin/chrome is not versioned, but has versioned children.  Versioned directory.
Contents conflict in thunderbird/plugin/openerp_plugin/chrome.manifest
Conflict: can't delete thunderbird/plugin/openerp_plugin/chrome/openerp_plugin because it is not empty.  Not deleting.
Conflict because thunderbird/plugin/openerp_plugin/chrome/openerp_plugin is not versioned, but has versioned children.  Versioned directory.
Contents conflict in thunderbird/plugin/openerp_plugin/chrome/openerp_plugin.jar
Conflict: can't delete thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content because it is not empty.  Not deleting.
Conflict because thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content is not versioned, but has versioned children.  Versioned directory.
Contents conflict in thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/exportTools.js
Contents conflict in thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/overlay.js
Contents conflict in thunderbird/plugin/openerp_plugin/chrome/openerp_plugin/content/tiny_xmlrpc.js
Conflict: can't delete thunderbird/plugin/openerp_plugin/components because it is not empty.  Not deleting.
Conflict because thunderbird/plugin/openerp_plugin/components is not versioned, but has versioned children.  Versioned directory.
Contents conflict in thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js
Contents conflict in thunderbird/plugin/openerp_plugin/install.rdf
Conflict adding file users_ldap/i18n/ar.po.  Moved existing file to users_ldap/i18n/ar.po.moved.
Conflict adding file users_ldap/i18n/bg.po.  Moved existing file to users_ldap/i18n/bg.po.moved.
Conflict adding file users_ldap/i18n/ca.po.  Moved existing file to users_ldap/i18n/ca.po.moved.
Conflict adding file users_ldap/i18n/da.po.  Moved existing file to users_ldap/i18n/da.po.moved.
Text conflict in users_ldap/i18n/de.po
Text conflict in users_ldap/i18n/es.po
Conflict adding file users_ldap/i18n/es_CR.po.  Moved existing file to users_ldap/i18n/es_CR.po.moved.
Conflict adding file users_ldap/i18n/fi.po.  Moved existing file to users_ldap/i18n/fi.po.moved.
Text conflict in users_ldap/i18n/fr.po
Conflict adding file users_ldap/i18n/gl.po.  Moved existing file to users_ldap/i18n/gl.po.moved.
Conflict adding file users_ldap/i18n/hr.po.  Moved existing file to users_ldap/i18n/hr.po.moved.
Text conflict in users_ldap/i18n/hu.po
Text conflict in users_ldap/i18n/it.po
Conflict adding file users_ldap/i18n/ja.po.  Moved existing file to users_ldap/i18n/ja.po.moved.
Text conflict in users_ldap/i18n/mn.po
Text conflict in users_ldap/i18n/nl.po
Text conflict in users_ldap/i18n/pl.po
Text conflict in users_ldap/i18n/pt.po
Text conflict in users_ldap/i18n/pt_BR.po
Conflict adding file users_ldap/i18n/ro.po.  Moved existing file to users_ldap/i18n/ro.po.moved.
Conflict adding file users_ldap/i18n/ru.po.  Moved existing file to users_ldap/i18n/ru.po.moved.
Conflict adding file users_ldap/i18n/sv.po.  Moved existing file to users_ldap/i18n/sv.po.moved.
Conflict adding file users_ldap/i18n/tr.po.  Moved existing file to users_ldap/i18n/tr.po.moved.
Text conflict in users_ldap/i18n/users_ldap.pot
Text conflict in users_ldap/i18n/zh_CN.po
Text conflict in users_ldap/users_ldap.py
Text conflict in warning/i18n/ar.po
Text conflict in warning/i18n/bg.po
Text conflict in warning/i18n/bs.po
Text conflict in warning/i18n/ca.po
Text conflict in warning/i18n/cs.po
Conflict adding file warning/i18n/da.po.  Moved existing file to warning/i18n/da.po.moved.
Text conflict in warning/i18n/de.po
Text conflict in warning/i18n/el.po
Text conflict in warning/i18n/es.po
Text conflict in warning/i18n/es_AR.po
Conflict adding file warning/i18n/es_CR.po.  Moved existing file to warning/i18n/es_CR.po.moved.
Text conflict in warning/i18n/et.po
Conflict adding file warning/i18n/fi.po.  Moved existing file to warning/i18n/fi.po.moved.
Text conflict in warning/i18n/fr.po
Conflict adding file warning/i18n/gl.po.  Moved existing file to warning/i18n/gl.po.moved.
Text conflict in warning/i18n/hr.po
Text conflict in warning/i18n/hu.po
Text conflict in warning/i18n/id.po
Text conflict in warning/i18n/it.po
Conflict adding file warning/i18n/ja.po.  Moved existing file to warning/i18n/ja.po.moved.
Text conflict in warning/i18n/ko.po
Text conflict in warning/i18n/lt.po
Conflict adding file warning/i18n/mk.po.  Moved existing file to warning/i18n/mk.po.moved.
Text conflict in warning/i18n/mn.po
Conflict adding file warning/i18n/nb.po.  Moved existing file to warning/i18n/nb.po.moved.
Text conflict in warning/i18n/nl.po
Text conflict in warning/i18n/nl_BE.po
Text conflict in warning/i18n/pl.po
Text conflict in warning/i18n/pt.po
Text conflict in warning/i18n/pt_BR.po
Text conflict in warning/i18n/ro.po
Text conflict in warning/i18n/ru.po
Text conflict in warning/i18n/sl.po
Text conflict in warning/i18n/sq.po
Text conflict in warning/i18n/sr.po
Text conflict in warning/i18n/sr@latin.po
Text conflict in warning/i18n/sv.po
Text conflict in warning/i18n/tlh.po
Text conflict in warning/i18n/tr.po
Text conflict in warning/i18n/uk.po
Text conflict in warning/i18n/vi.po
Text conflict in warning/i18n/zh_CN.po
Text conflict in warning/i18n/zh_TW.po
Conflict adding file web_livechat/i18n/ar.po.  Moved existing file to web_livechat/i18n/ar.po.moved.
Conflict adding file web_livechat/i18n/bg.po.  Moved existing file to web_livechat/i18n/bg.po.moved.
Conflict adding file web_livechat/i18n/ca.po.  Moved existing file to web_livechat/i18n/ca.po.moved.
Conflict adding file web_livechat/i18n/cs.po.  Moved existing file to web_livechat/i18n/cs.po.moved.
Conflict adding file web_livechat/i18n/da.po.  Moved existing file to web_livechat/i18n/da.po.moved.
Conflict adding file web_livechat/i18n/de.po.  Moved existing file to web_livechat/i18n/de.po.moved.
Conflict adding file web_livechat/i18n/es.po.  Moved existing file to web_livechat/i18n/es.po.moved.
Conflict adding file web_livechat/i18n/es_CR.po.  Moved existing file to web_livechat/i18n/es_CR.po.moved.
Conflict adding file web_livechat/i18n/fi.po.  Moved existing file to web_livechat/i18n/fi.po.moved.
Conflict adding file web_livechat/i18n/fr.po.  Moved existing file to web_livechat/i18n/fr.po.moved.
Conflict adding file web_livechat/i18n/gl.po.  Moved existing file to web_livechat/i18n/gl.po.moved.
Conflict adding file web_livechat/i18n/hr.po.  Moved existing file to web_livechat/i18n/hr.po.moved.
Conflict adding file web_livechat/i18n/it.po.  Moved existing file to web_livechat/i18n/it.po.moved.
Conflict adding file web_livechat/i18n/ja.po.  Moved existing file to web_livechat/i18n/ja.po.moved.
Conflict adding file web_livechat/i18n/mn.po.  Moved existing file to web_livechat/i18n/mn.po.moved.
Conflict adding file web_livechat/i18n/nl.po.  Moved existing file to web_livechat/i18n/nl.po.moved.
Conflict adding file web_livechat/i18n/oc.po.  Moved existing file to web_livechat/i18n/oc.po.moved.
Conflict adding file web_livechat/i18n/pt.po.  Moved existing file to web_livechat/i18n/pt.po.moved.
Conflict adding file web_livechat/i18n/pt_BR.po.  Moved existing file to web_livechat/i18n/pt_BR.po.moved.
Conflict adding file web_livechat/i18n/ro.po.  Moved existing file to web_livechat/i18n/ro.po.moved.
Conflict adding file web_livechat/i18n/ru.po.  Moved existing file to web_livechat/i18n/ru.po.moved.
Conflict adding file web_livechat/i18n/sk.po.  Moved existing file to web_livechat/i18n/sk.po.moved.
Conflict adding file web_livechat/i18n/sl.po.  Moved existing file to web_livechat/i18n/sl.po.moved.
Conflict adding file web_livechat/i18n/sr@latin.po.  Moved existing file to web_livechat/i18n/sr@latin.po.moved.
Conflict adding file web_livechat/i18n/sv.po.  Moved existing file to web_livechat/i18n/sv.po.moved.
Conflict adding file web_livechat/i18n/tr.po.  Moved existing file to web_livechat/i18n/tr.po.moved.
Text conflict in web_livechat/i18n/web_livechat.pot
Conflict adding file web_livechat/i18n/zh_CN.po.  Moved existing file to web_livechat/i18n/zh_CN.po.moved.
Conflict adding file web_uservoice/i18n/ar.po.  Moved existing file to web_uservoice/i18n/ar.po.moved.
Conflict adding file web_uservoice/i18n/bg.po.  Moved existing file to web_uservoice/i18n/bg.po.moved.
Conflict adding file web_uservoice/i18n/ca.po.  Moved existing file to web_uservoice/i18n/ca.po.moved.
Conflict adding file web_uservoice/i18n/cs.po.  Moved existing file to web_uservoice/i18n/cs.po.moved.
Conflict adding file web_uservoice/i18n/da.po.  Moved existing file to web_uservoice/i18n/da.po.moved.
Conflict adding file web_uservoice/i18n/de.po.  Moved existing file to web_uservoice/i18n/de.po.moved.
Conflict adding file web_uservoice/i18n/es.po.  Moved existing file to web_uservoice/i18n/es.po.moved.
Conflict adding file web_uservoice/i18n/es_CR.po.  Moved existing file to web_uservoice/i18n/es_CR.po.moved.
Conflict adding file web_uservoice/i18n/fi.po.  Moved existing file to web_uservoice/i18n/fi.po.moved.
Conflict adding file web_uservoice/i18n/fr.po.  Moved existing file to web_uservoice/i18n/fr.po.moved.
Conflict adding file web_uservoice/i18n/gl.po.  Moved existing file to web_uservoice/i18n/gl.po.moved.
Conflict adding file web_uservoice/i18n/hr.po.  Moved existing file to web_uservoice/i18n/hr.po.moved.
Conflict adding file web_uservoice/i18n/it.po.  Moved existing file to web_uservoice/i18n/it.po.moved.
Conflict adding file web_uservoice/i18n/ja.po.  Moved existing file to web_uservoice/i18n/ja.po.moved.
Conflict adding file web_uservoice/i18n/lt.po.  Moved existing file to web_uservoice/i18n/lt.po.moved.
Conflict adding file web_uservoice/i18n/mn.po.  Moved existing file to web_uservoice/i18n/mn.po.moved.
Conflict adding file web_uservoice/i18n/nl.po.  Moved existing file to web_uservoice/i18n/nl.po.moved.
Conflict adding file web_uservoice/i18n/oc.po.  Moved existing file to web_uservoice/i18n/oc.po.moved.
Conflict adding file web_uservoice/i18n/pt.po.  Moved existing file to web_uservoice/i18n/pt.po.moved.
Conflict adding file web_uservoice/i18n/pt_BR.po.  Moved existing file to web_uservoice/i18n/pt_BR.po.moved.
Conflict adding file web_uservoice/i18n/ro.po.  Moved existing file to web_uservoice/i18n/ro.po.moved.
Conflict adding file web_uservoice/i18n/ru.po.  Moved existing file to web_uservoice/i18n/ru.po.moved.
Conflict adding file web_uservoice/i18n/sk.po.  Moved existing file to web_uservoice/i18n/sk.po.moved.
Conflict adding file web_uservoice/i18n/sl.po.  Moved existing file to web_uservoice/i18n/sl.po.moved.
Conflict adding file web_uservoice/i18n/sr@latin.po.  Moved existing file to web_uservoice/i18n/sr@latin.po.moved.
Conflict adding file web_uservoice/i18n/sv.po.  Moved existing file to web_uservoice/i18n/sv.po.moved.
Conflict adding file web_uservoice/i18n/tr.po.  Moved existing file to web_uservoice/i18n/tr.po.moved.
Conflict adding file web_uservoice/i18n/zh_CN.po.  Moved existing file to web_uservoice/i18n/zh_CN.po.moved.
Text conflict in wiki/i18n/ar.po
Text conflict in wiki/i18n/bg.po
Text conflict in wiki/i18n/bs.po
Text conflict in wiki/i18n/ca.po
Text conflict in wiki/i18n/cs.po
Conflict adding file wiki/i18n/da.po.  Moved existing file to wiki/i18n/da.po.moved.
Text conflict in wiki/i18n/de.po
Text conflict in wiki/i18n/el.po
Text conflict in wiki/i18n/es.po
Text conflict in wiki/i18n/es_AR.po
Conflict adding file wiki/i18n/es_CR.po.  Moved existing file to wiki/i18n/es_CR.po.moved.
Text conflict in wiki/i18n/et.po
Conflict adding file wiki/i18n/fi.po.  Moved existing file to wiki/i18n/fi.po.moved.
Text conflict in wiki/i18n/fr.po
Text conflict in wiki/i18n/gl.po
Text conflict in wiki/i18n/hr.po
Text conflict in wiki/i18n/hu.po
Text conflict in wiki/i18n/id.po
Text conflict in wiki/i18n/it.po
Conflict adding file wiki/i18n/ja.po.  Moved existing file to wiki/i18n/ja.po.moved.
Text conflict in wiki/i18n/ko.po
Text conflict in wiki/i18n/lt.po
Text conflict in wiki/i18n/lv.po
Text conflict in wiki/i18n/mn.po
Conflict adding file wiki/i18n/nb.po.  Moved existing file to wiki/i18n/nb.po.moved.
Text conflict in wiki/i18n/nl.po
Text conflict in wiki/i18n/nl_BE.po
Text conflict in wiki/i18n/pl.po
Text conflict in wiki/i18n/pt.po
Text conflict in wiki/i18n/pt_BR.po
Text conflict in wiki/i18n/ro.po
Text conflict in wiki/i18n/ru.po
Text conflict in wiki/i18n/sk.po
Text conflict in wiki/i18n/sl.po
Text conflict in wiki/i18n/sq.po
Text conflict in wiki/i18n/sr.po
Text conflict in wiki/i18n/sr@latin.po
Text conflict in wiki/i18n/sv.po
Text conflict in wiki/i18n/tlh.po
Text conflict in wiki/i18n/tr.po
Text conflict in wiki/i18n/uk.po
Text conflict in wiki/i18n/vi.po
Text conflict in wiki/i18n/zh_CN.po
Text conflict in wiki/i18n/zh_TW.po
Conflict: can't delete wiki/web because it is not empty.  Not deleting.
Conflict because wiki/web is not versioned, but has versioned children.  Versioned directory.
Conflict: can't delete wiki/web/locales because it is not empty.  Not deleting.
Conflict because wiki/web/locales is not versioned, but has versioned children.  Versioned directory.
Contents conflict in wiki/web/locales/bg.po
Contents conflict in wiki/web/locales/ca.po
Contents conflict in wiki/web/locales/da.po
Contents conflict in wiki/web/locales/de.po
Contents conflict in wiki/web/locales/es.po
Contents conflict in wiki/web/locales/es_PY.po
Contents conflict in wiki/web/locales/fr.po
Contents conflict in wiki/web/locales/gl.po
Contents conflict in wiki/web/locales/it.po
Contents conflict in wiki/web/locales/nb.po
Contents conflict in wiki/web/locales/ru.po
Contents conflict in wiki/web/locales/sk.po
Contents conflict in wiki/web/locales/tr.po
Contents conflict in wiki/web/locales/vi.po
Text conflict in wiki/wiki_view.xml
Conflict adding file wiki_faq/i18n/ar.po.  Moved existing file to wiki_faq/i18n/ar.po.moved.
Conflict adding file wiki_faq/i18n/bg.po.  Moved existing file to wiki_faq/i18n/bg.po.moved.
Conflict adding file wiki_faq/i18n/ca.po.  Moved existing file to wiki_faq/i18n/ca.po.moved.
Conflict adding file wiki_faq/i18n/cs.po.  Moved existing file to wiki_faq/i18n/cs.po.moved.
Text conflict in wiki_faq/i18n/da.po
Text conflict in wiki_faq/i18n/de.po
Text conflict in wiki_faq/i18n/el.po
Text conflict in wiki_faq/i18n/es.po
Conflict adding file wiki_faq/i18n/es_CR.po.  Moved existing file to wiki_faq/i18n/es_CR.po.moved.
Conflict adding file wiki_faq/i18n/fi.po.  Moved existing file to wiki_faq/i18n/fi.po.moved.
Text conflict in wiki_faq/i18n/fr.po
Conflict adding file wiki_faq/i18n/gl.po.  Moved existing file to wiki_faq/i18n/gl.po.moved.
Conflict adding file wiki_faq/i18n/hr.po.  Moved existing file to wiki_faq/i18n/hr.po.moved.
Text conflict in wiki_faq/i18n/hu.po
Text conflict in wiki_faq/i18n/it.po
Conflict adding file wiki_faq/i18n/ja.po.  Moved existing file to wiki_faq/i18n/ja.po.moved.
Conflict adding file wiki_faq/i18n/lt.po.  Moved existing file to wiki_faq/i18n/lt.po.moved.
Conflict adding file wiki_faq/i18n/lv.po.  Moved existing file to wiki_faq/i18n/lv.po.moved.
Text conflict in wiki_faq/i18n/mn.po
Text conflict in wiki_faq/i18n/nl.po
Conflict adding file wiki_faq/i18n/oc.po.  Moved existing file to wiki_faq/i18n/oc.po.moved.
Text conflict in wiki_faq/i18n/pt.po
Text conflict in wiki_faq/i18n/pt_BR.po
Conflict adding file wiki_faq/i18n/ro.po.  Moved existing file to wiki_faq/i18n/ro.po.moved.
Text conflict in wiki_faq/i18n/ru.po
Conflict adding file wiki_faq/i18n/sk.po.  Moved existing file to wiki_faq/i18n/sk.po.moved.
Text conflict in wiki_faq/i18n/sl.po
Conflict adding file wiki_faq/i18n/sr@latin.po.  Moved existing file to wiki_faq/i18n/sr@latin.po.moved.
Text conflict in wiki_faq/i18n/sv.po
Conflict adding file wiki_faq/i18n/tr.po.  Moved existing file to wiki_faq/i18n/tr.po.moved.
Text conflict in wiki_faq/i18n/zh_CN.po
Conflict adding file wiki_quality_manual/i18n/ar.po.  Moved existing file to wiki_quality_manual/i18n/ar.po.moved.
Conflict adding file wiki_quality_manual/i18n/bg.po.  Moved existing file to wiki_quality_manual/i18n/bg.po.moved.
Conflict adding file wiki_quality_manual/i18n/ca.po.  Moved existing file to wiki_quality_manual/i18n/ca.po.moved.
Conflict adding file wiki_quality_manual/i18n/cs.po.  Moved existing file to wiki_quality_manual/i18n/cs.po.moved.
Text conflict in wiki_quality_manual/i18n/da.po
Text conflict in wiki_quality_manual/i18n/de.po
Text conflict in wiki_quality_manual/i18n/es.po
Conflict adding file wiki_quality_manual/i18n/es_CR.po.  Moved existing file to wiki_quality_manual/i18n/es_CR.po.moved.
Conflict adding file wiki_quality_manual/i18n/fi.po.  Moved existing file to wiki_quality_manual/i18n/fi.po.moved.
Text conflict in wiki_quality_manual/i18n/fr.po
Conflict adding file wiki_quality_manual/i18n/gl.po.  Moved existing file to wiki_quality_manual/i18n/gl.po.moved.
Conflict adding file wiki_quality_manual/i18n/hr.po.  Moved existing file to wiki_quality_manual/i18n/hr.po.moved.
Text conflict in wiki_quality_manual/i18n/hu.po
Text conflict in wiki_quality_manual/i18n/it.po
Conflict adding file wiki_quality_manual/i18n/ja.po.  Moved existing file to wiki_quality_manual/i18n/ja.po.moved.
Conflict adding file wiki_quality_manual/i18n/lv.po.  Moved existing file to wiki_quality_manual/i18n/lv.po.moved.
Text conflict in wiki_quality_manual/i18n/mn.po
Text conflict in wiki_quality_manual/i18n/nl.po
Conflict adding file wiki_quality_manual/i18n/oc.po.  Moved existing file to wiki_quality_manual/i18n/oc.po.moved.
Text conflict in wiki_quality_manual/i18n/pt.po
Text conflict in wiki_quality_manual/i18n/pt_BR.po
Conflict adding file wiki_quality_manual/i18n/ro.po.  Moved existing file to wiki_quality_manual/i18n/ro.po.moved.
Conflict adding file wiki_quality_manual/i18n/ru.po.  Moved existing file to wiki_quality_manual/i18n/ru.po.moved.
Conflict adding file wiki_quality_manual/i18n/sk.po.  Moved existing file to wiki_quality_manual/i18n/sk.po.moved.
Text conflict in wiki_quality_manual/i18n/sl.po
Conflict adding file wiki_quality_manual/i18n/sr@latin.po.  Moved existing file to wiki_quality_manual/i18n/sr@latin.po.moved.
Text conflict in wiki_quality_manual/i18n/sv.po
Conflict adding file wiki_quality_manual/i18n/tr.po.  Moved existing file to wiki_quality_manual/i18n/tr.po.moved.
Text conflict in wiki_quality_manual/i18n/zh_CN.po
Conflict adding file wiki_sale_faq/i18n/ar.po.  Moved existing file to wiki_sale_faq/i18n/ar.po.moved.
Conflict adding file wiki_sale_faq/i18n/bg.po.  Moved existing file to wiki_sale_faq/i18n/bg.po.moved.
Conflict adding file wiki_sale_faq/i18n/ca.po.  Moved existing file to wiki_sale_faq/i18n/ca.po.moved.
Conflict adding file wiki_sale_faq/i18n/da.po.  Moved existing file to wiki_sale_faq/i18n/da.po.moved.
Text conflict in wiki_sale_faq/i18n/de.po
Text conflict in wiki_sale_faq/i18n/es.po
Conflict adding file wiki_sale_faq/i18n/es_CR.po.  Moved existing file to wiki_sale_faq/i18n/es_CR.po.moved.
Conflict adding file wiki_sale_faq/i18n/fi.po.  Moved existing file to wiki_sale_faq/i18n/fi.po.moved.
Text conflict in wiki_sale_faq/i18n/fr.po
Conflict adding file wiki_sale_faq/i18n/gl.po.  Moved existing file to wiki_sale_faq/i18n/gl.po.moved.
Conflict adding file wiki_sale_faq/i18n/hr.po.  Moved existing file to wiki_sale_faq/i18n/hr.po.moved.
Text conflict in wiki_sale_faq/i18n/hu.po
Text conflict in wiki_sale_faq/i18n/it.po
Conflict adding file wiki_sale_faq/i18n/ja.po.  Moved existing file to wiki_sale_faq/i18n/ja.po.moved.
Conflict adding file wiki_sale_faq/i18n/lv.po.  Moved existing file to wiki_sale_faq/i18n/lv.po.moved.
Text conflict in wiki_sale_faq/i18n/mn.po
Text conflict in wiki_sale_faq/i18n/nl.po
Conflict adding file wiki_sale_faq/i18n/oc.po.  Moved existing file to wiki_sale_faq/i18n/oc.po.moved.
Text conflict in wiki_sale_faq/i18n/pl.po
Text conflict in wiki_sale_faq/i18n/pt.po
Text conflict in wiki_sale_faq/i18n/pt_BR.po
Conflict adding file wiki_sale_faq/i18n/ro.po.  Moved existing file to wiki_sale_faq/i18n/ro.po.moved.
Text conflict in wiki_sale_faq/i18n/ru.po
Conflict adding file wiki_sale_faq/i18n/sk.po.  Moved existing file to wiki_sale_faq/i18n/sk.po.moved.
Text conflict in wiki_sale_faq/i18n/sl.po
Conflict adding file wiki_sale_faq/i18n/sr@latin.po.  Moved existing file to wiki_sale_faq/i18n/sr@latin.po.moved.
Text conflict in wiki_sale_faq/i18n/sv.po
Conflict adding file wiki_sale_faq/i18n/tr.po.  Moved existing file to wiki_sale_faq/i18n/tr.po.moved.
Text conflict in wiki_sale_faq/i18n/zh_CN.po
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openobject-addons/fix_l10n_ca
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+150851@code.launchpad.net

This proposal has been superseded by a proposal from 2013-05-08.

Description of the change

Change are all in for the l10n_ca localisation:
Fix tax calculation for Manitoba, Saskatchewan and Quebec.
Change fiscal position label to have common element between French and English translation.

To post a comment you must log in.
7154. By Jonatan Cloutier

fix quebec, canada tax calculation

7155. By Jonatan Cloutier

Merge from trunk

Unmerged revisions

7155. By Jonatan Cloutier

Merge from trunk

7154. By Jonatan Cloutier

fix quebec, canada tax calculation

7153. By Jonatan Cloutier

fix quebec taxes calculations

7152. By Jonatan Cloutier

fix SK and MB tax calculation

7151. By Jonatan Cloutier

Add common pattern to fiscal_template

7150. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7149. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7148. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7147. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

7146. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
<
1=== modified file 'account/__init__.py'
2--- account/__init__.py 2011-01-14 00:11:01 +0000
3+++ account/__init__.py 2013-05-08 15:45:41 +0000
4@@ -23,16 +23,18 @@
5 import installer
6 import project
7 import partner
8-import invoice
9+import account_invoice
10 import account_bank_statement
11+import account_bank
12 import account_cash_statement
13 import account_move_line
14 import account_analytic_line
15+import account_financial_report
16 import wizard
17 import report
18 import product
19-import sequence
20+import ir_sequence
21 import company
22 import res_currency
23-
24+import edi
25 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
26
27=== modified file 'account/__openerp__.py'
28--- account/__openerp__.py 2011-01-14 00:11:01 +0000
29+++ account/__openerp__.py 2013-05-08 15:45:41 +0000
30@@ -19,37 +19,48 @@
31 #
32 ##############################################################################
33 {
34- "name" : "Accounting and Financial Management",
35+ "name" : "eInvoicing",
36 "version" : "1.1",
37 "author" : "OpenERP SA",
38- "category": 'Generic Modules/Accounting',
39- "description": """Financial and accounting module that covers:
40- General accountings
41- Cost / Analytic accounting
42- Third party accounting
43- Taxes management
44- Budgets
45- Customer and Supplier Invoices
46- Bank statements
47- Reconciliation process by partner
48- Creates a dashboard for accountants that includes:
49- * List of uninvoiced quotations
50- * Graph of aged receivables
51- * Graph of aged incomes
52+ "category": 'Accounting & Finance',
53+ 'complexity': "easy",
54+ "description": """
55+Accounting and Financial Management.
56+====================================
57+
58+Financial and accounting module that covers:
59+--------------------------------------------
60+General accountings
61+Cost / Analytic accounting
62+Third party accounting
63+Taxes management
64+Budgets
65+Customer and Supplier Invoices
66+Bank statements
67+Reconciliation process by partner
68+
69+Creates a dashboard for accountants that includes:
70+--------------------------------------------------
71+* List of Customer Invoice to Approve
72+* Company Analysis
73+* Graph of Aged Receivables
74+* Graph of Treasury
75
76 The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or
77 grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a
78 module named account_voucher.
79 """,
80 'website': 'http://www.openerp.com',
81+ 'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
82 'init_xml': [],
83- "depends" : ["product", "analytic", "process","board"],
84+ "depends" : ["base_setup", "product", "analytic", "process", "board", "edi"],
85 'update_xml': [
86 'security/account_security.xml',
87 'security/ir.model.access.csv',
88 'account_menuitem.xml',
89 'report/account_invoice_report_view.xml',
90 'report/account_entries_report_view.xml',
91+ 'report/account_treasury_report_view.xml',
92 'report/account_report_view.xml',
93 'report/account_analytic_entries_report_view.xml',
94 'wizard/account_move_bank_reconcile_view.xml',
95@@ -58,6 +69,7 @@
96 'wizard/account_period_close_view.xml',
97 'account_view.xml',
98 'account_report.xml',
99+ 'account_financial_report_data.xml',
100 'wizard/account_report_common_view.xml',
101 'wizard/account_invoice_refund_view.xml',
102 'wizard/account_fiscalyear_close_state.xml',
103@@ -87,12 +99,13 @@
104 'wizard/account_reconcile_view.xml',
105 'wizard/account_reconcile_partner_process_view.xml',
106 'wizard/account_automatic_reconcile_view.xml',
107+ 'wizard/account_financial_report_view.xml',
108 'project/wizard/project_account_analytic_line_view.xml',
109 'account_end_fy.xml',
110 'account_invoice_view.xml',
111 'partner_view.xml',
112- 'data/account_invoice.xml',
113- 'data/account_data2.xml',
114+ 'data/account_data.xml',
115+ 'data/data_account_type.xml',
116 'account_invoice_workflow.xml',
117 'project/project_view.xml',
118 'project/project_report.xml',
119@@ -107,18 +120,20 @@
120 'process/statement_process.xml',
121 'process/customer_invoice_process.xml',
122 'process/supplier_invoice_process.xml',
123- 'sequence_view.xml',
124+ 'ir_sequence_view.xml',
125 'company_view.xml',
126 'board_account_view.xml',
127- "wizard/account_report_profit_loss_view.xml",
128- "wizard/account_report_balance_sheet_view.xml"
129+ "edi/invoice_action_data.xml",
130+ "account_bank_view.xml",
131+ "account_pre_install.yml"
132 ],
133 'demo_xml': [
134- 'account_demo.xml',
135+ 'demo/account_demo.xml',
136 'project/project_demo.xml',
137 'project/analytic_account_demo.xml',
138 'demo/account_minimal.xml',
139-# 'account_unit_test.xml',
140+ 'demo/account_invoice_demo.xml',
141+ #'account_unit_test.xml',
142 ],
143 'test': [
144 'test/account_customer_invoice.yml',
145@@ -126,18 +141,17 @@
146 'test/account_change_currency.yml',
147 'test/chart_of_account.yml',
148 'test/account_period_close.yml',
149- 'test/account_fiscalyear_close_state.yml',
150 'test/account_use_model.yml',
151 'test/account_validate_account_move.yml',
152 'test/account_fiscalyear_close.yml',
153 'test/account_bank_statement.yml',
154 'test/account_cash_statement.yml',
155+ 'test/test_edi_invoice.yml',
156 'test/account_report.yml',
157-
158-
159- ],
160+ 'test/account_fiscalyear_close_state.yml', #last test, as it will definitively close the demo fiscalyear
161+ ],
162 'installable': True,
163- 'active': False,
164+ 'auto_install': False,
165 'certificate': '0080331923549',
166 }
167 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
168
169=== modified file 'account/account.py'
170--- account/account.py 2013-03-26 10:12:44 +0000
171+++ account/account.py 2013-05-08 15:45:41 +0000
172@@ -102,7 +102,7 @@
173 ('fixed', 'Fixed Amount')], 'Valuation',
174 required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be threated."""),
175
176- 'value_amount': fields.float('Value Amount', help="For Value percent enter % ratio between 0-1."),
177+ 'value_amount': fields.float('Amount To Pay', digits_compute=dp.get_precision('Payment Term'), help="For percent enter a ratio between 0-1."),
178 'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
179 "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
180 'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
181@@ -130,28 +130,62 @@
182 class account_account_type(osv.osv):
183 _name = "account.account.type"
184 _description = "Account Type"
185+
186+ def _get_current_report_type(self, cr, uid, ids, name, arg, context=None):
187+ obj_data = self.pool.get('ir.model.data')
188+ obj_financial_report = self.pool.get('account.financial.report')
189+ res = {}
190+ financial_report_ref = {
191+ 'asset': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_assets0')[1], context=context),
192+ 'liability': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_liability0')[1], context=context),
193+ 'income': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_income0')[1], context=context),
194+ 'expense': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_expense0')[1], context=context),
195+ }
196+ for record in self.browse(cr, uid, ids, context=context):
197+ res[record.id] = 'none'
198+ for key, financial_report in financial_report_ref.items():
199+ list_ids = [x.id for x in financial_report.account_type_ids]
200+ if record.id in list_ids:
201+ res[record.id] = key
202+ return res
203+
204+ def _save_report_type(self, cr, uid, account_type_id, field_name, field_value, arg, context=None):
205+ obj_data = self.pool.get('ir.model.data')
206+ obj_financial_report = self.pool.get('account.financial.report')
207+ #unlink if it exists somewhere in the financial reports related to BS or PL
208+ financial_report_ref = {
209+ 'asset': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_assets0')[1], context=context),
210+ 'liability': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_liability0')[1], context=context),
211+ 'income': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_income0')[1], context=context),
212+ 'expense': obj_financial_report.browse(cr, uid, obj_data.get_object_reference(cr, uid, 'account','account_financial_report_expense0')[1], context=context),
213+ }
214+ for key, financial_report in financial_report_ref.items():
215+ list_ids = [x.id for x in financial_report.account_type_ids]
216+ if account_type_id in list_ids:
217+ obj_financial_report.write(cr, uid, [financial_report.id], {'account_type_ids': [(3, account_type_id)]})
218+ #write it in the good place
219+ if field_value != 'none':
220+ return obj_financial_report.write(cr, uid, [financial_report_ref[field_value].id], {'account_type_ids': [(4, account_type_id)]})
221+
222 _columns = {
223- 'name': fields.char('Acc. Type Name', size=64, required=True),
224- 'code': fields.char('Code', size=32, required=True),
225+ 'name': fields.char('Account Type', size=64, required=True, translate=True),
226+ 'code': fields.char('Code', size=32, required=True, select=True),
227 'close_method': fields.selection([('none', 'None'), ('balance', 'Balance'), ('detail', 'Detail'), ('unreconciled', 'Unreconciled')], 'Deferral Method', required=True, help="""Set here the method that will be used to generate the end of year journal entries for all the accounts of this type.
228
229 'None' means that nothing will be done.
230 'Balance' will generally be used for cash accounts.
231 'Detail' will copy each existing journal item of the previous year, even the reconciled ones.
232 'Unreconciled' will copy only the journal items that were unreconciled on the first day of the new fiscal year."""),
233- 'sign': fields.selection([(-1, 'Negative'), (1, 'Positive')], 'Sign on Reports', required=True, help='Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts.'),
234- 'report_type':fields.selection([
235- ('none','/'),
236- ('income','Profit & Loss (Income Accounts)'),
237- ('expense','Profit & Loss (Expense Accounts)'),
238- ('asset','Balance Sheet (Assets Accounts)'),
239- ('liability','Balance Sheet (Liability Accounts)')
240- ],'P&L / BS Category', select=True, readonly=False, help="According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)", required=True),
241+ 'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category',
242+ selection= [('none','/'),
243+ ('income', _('Profit & Loss (Income account)')),
244+ ('expense', _('Profit & Loss (Expense account)')),
245+ ('asset', _('Balance Sheet (Asset account)')),
246+ ('liability', _('Balance Sheet (Liability account)'))], help="This field is used to generate legal reports: profit and loss, balance sheet.", required=True),
247 'note': fields.text('Description'),
248 }
249 _defaults = {
250 'close_method': 'none',
251- 'sign': 1,
252 'report_type': 'none',
253 }
254 _order = "code"
255@@ -240,16 +274,22 @@
256 tuple
257 """
258 mapping = {
259- 'balance': "COALESCE(SUM(l.debit),0) " \
260- "- COALESCE(SUM(l.credit), 0) as balance",
261+ 'balance': "COALESCE(SUM(l.debit),0) - COALESCE(SUM(l.credit), 0) as balance",
262 'debit': "COALESCE(SUM(l.debit), 0) as debit",
263- 'credit': "COALESCE(SUM(l.credit), 0) as credit"
264+ 'credit': "COALESCE(SUM(l.credit), 0) as credit",
265+ # by convention, foreign_balance is 0 when the account has no secondary currency, because the amounts may be in different currencies
266+ 'foreign_balance': "(SELECT CASE WHEN currency_id IS NULL THEN 0 ELSE COALESCE(SUM(l.amount_currency), 0) END FROM account_account WHERE id IN (l.account_id)) as foreign_balance",
267 }
268 #get all the necessary accounts
269 children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
270 #compute for each account the balance/debit/credit from the move lines
271 accounts = {}
272+<<<<<<< TREE
273 sums = {}
274+=======
275+ res = {}
276+ null_result = dict((fn, 0.0) for fn in field_names)
277+>>>>>>> MERGE-SOURCE
278 if children_and_consolidated:
279 aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
280
281@@ -269,7 +309,7 @@
282 # ON l.account_id = tmp.id
283 # or make _get_children_and_consol return a query and join on that
284 request = ("SELECT l.account_id as id, " +\
285- ', '.join(map(mapping.__getitem__, field_names)) +
286+ ', '.join(mapping.values()) +
287 " FROM account_move_line l" \
288 " WHERE l.account_id IN %s " \
289 + filters +
290@@ -287,7 +327,7 @@
291 brs = list(self.browse(cr, uid, children_and_consolidated, context=context))
292 currency_obj = self.pool.get('res.currency')
293 while brs:
294- current = brs[0]
295+ current = brs.pop(0)
296 # can_compute = True
297 # for child in current.child_id:
298 # if child.id not in sums:
299@@ -297,7 +337,6 @@
300 # except ValueError:
301 # brs.insert(0, child)
302 # if can_compute:
303- brs.pop(0)
304 for fn in field_names:
305 sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
306 for child in current.child_id:
307@@ -305,11 +344,30 @@
308 sums[current.id][fn] += sums[child.id][fn]
309 else:
310 sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
311+<<<<<<< TREE
312 res = {}
313 null_result = dict((fn, 0.0) for fn in field_names)
314 for id in ids:
315 res[id] = sums.get(id, null_result)
316 return res
317+=======
318+
319+ # as we have to relay on values computed before this is calculated separately than previous fields
320+ if current.currency_id and current.exchange_rate and \
321+ ('adjusted_balance' in field_names or 'unrealized_gain_loss' in field_names):
322+ # Computing Adjusted Balance and Unrealized Gains and losses
323+ # Adjusted Balance = Foreign Balance / Exchange Rate
324+ # Unrealized Gains and losses = Adjusted Balance - Balance
325+ adj_bal = sums[current.id].get('foreign_balance', 0.0) / current.exchange_rate
326+ sums[current.id].update({'adjusted_balance': adj_bal, 'unrealized_gain_loss': adj_bal - sums[current.id].get('balance', 0.0)})
327+
328+ for id in ids:
329+ res[id] = sums.get(id, null_result)
330+ else:
331+ for id in ids:
332+ res[id] = null_result
333+ return res
334+>>>>>>> MERGE-SOURCE
335
336 def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
337 result = {}
338@@ -333,9 +391,10 @@
339 return result
340
341 def _get_level(self, cr, uid, ids, field_name, arg, context=None):
342- res={}
343- accounts = self.browse(cr, uid, ids, context=context)
344- for account in accounts:
345+ res = {}
346+ for account in self.browse(cr, uid, ids, context=context):
347+ #we may not know the level of the parent at the time of computation, so we
348+ # can't simply do res[account.id] = account.parent_id.level + 1
349 level = 0
350 parent = account.parent_id
351 while parent:
352@@ -344,8 +403,54 @@
353 res[account.id] = level
354 return res
355
356+ def _set_credit_debit(self, cr, uid, account_id, name, value, arg, context=None):
357+ if context.get('config_invisible', True):
358+ return True
359+
360+ account = self.browse(cr, uid, account_id, context=context)
361+ diff = value - getattr(account,name)
362+ if not diff:
363+ return True
364+
365+ journal_obj = self.pool.get('account.journal')
366+ jids = journal_obj.search(cr, uid, [('type','=','situation'),('centralisation','=',1),('company_id','=',account.company_id.id)], context=context)
367+ if not jids:
368+ raise osv.except_osv(_('Error!'),_("You need an Opening journal with centralisation checked to set the initial balance!"))
369+
370+ period_obj = self.pool.get('account.period')
371+ pids = period_obj.search(cr, uid, [('special','=',True),('company_id','=',account.company_id.id)], context=context)
372+ if not pids:
373+ raise osv.except_osv(_('Error!'),_("No opening/closing period defined, please create one to set the initial balance!"))
374+
375+ move_obj = self.pool.get('account.move.line')
376+ move_id = move_obj.search(cr, uid, [
377+ ('journal_id','=',jids[0]),
378+ ('period_id','=',pids[0]),
379+ ('account_id','=', account_id),
380+ (name,'>', 0.0),
381+ ('name','=', _('Opening Balance'))
382+ ], context=context)
383+ if move_id:
384+ move = move_obj.browse(cr, uid, move_id[0], context=context)
385+ move_obj.write(cr, uid, move_id[0], {
386+ name: diff+getattr(move,name)
387+ }, context=context)
388+ else:
389+ if diff<0.0:
390+ raise osv.except_osv(_('Error!'),_("Unable to adapt the initial balance (negative value)!"))
391+ nameinv = (name=='credit' and 'debit') or 'credit'
392+ move_id = move_obj.create(cr, uid, {
393+ 'name': _('Opening Balance'),
394+ 'account_id': account_id,
395+ 'journal_id': jids[0],
396+ 'period_id': pids[0],
397+ name: diff,
398+ nameinv: 0.0
399+ }, context=context)
400+ return True
401+
402 _columns = {
403- 'name': fields.char('Name', size=128, required=True, select=True),
404+ 'name': fields.char('Name', size=256, required=True, select=True),
405 'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
406 'code': fields.char('Code', size=64, required=True, select=1),
407 'type': fields.selection([
408@@ -356,26 +461,34 @@
409 ('liquidity','Liquidity'),
410 ('consolidation', 'Consolidation'),
411 ('closed', 'Closed'),
412- ], 'Internal Type', required=True, help="This type is used to differentiate types with "\
413- "special effects in OpenERP: view can not have entries, consolidation are accounts that "\
414+ ], 'Internal Type', required=True, help="The 'Internal Type' is used for features available on "\
415+ "different types of accounts: view can not have journal items, consolidation are accounts that "\
416 "can have children accounts for multi-company consolidations, payable/receivable are for "\
417 "partners accounts (for debit/credit computations), closed for depreciated accounts."),
418 'user_type': fields.many2one('account.account.type', 'Account Type', required=True,
419- help="These types are defined according to your country. The type contains more information "\
420- "about the account and its specificities."),
421+ help="Account Type is used for information purpose, to generate "
422+ "country-specific legal reports, and set the rules to close a fiscal year and generate opening entries."),
423+ 'financial_report_ids': fields.many2many('account.financial.report', 'account_account_financial_report', 'account_id', 'report_line_id', 'Financial Reports'),
424 'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade', domain=[('type','=','view')]),
425 'child_parent_ids': fields.one2many('account.account','parent_id','Children'),
426 'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
427- 'child_id': fields.function(_get_child_ids, method=True, type='many2many', relation="account.account", string="Child Accounts"),
428- 'balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), method=True, string='Balance', multi='balance'),
429- 'credit': fields.function(__compute, digits_compute=dp.get_precision('Account'), method=True, string='Credit', multi='balance'),
430- 'debit': fields.function(__compute, digits_compute=dp.get_precision('Account'), method=True, string='Debit', multi='balance'),
431- 'reconcile': fields.boolean('Reconcile', help="Check this if the user is allowed to reconcile entries in this account."),
432+ 'child_id': fields.function(_get_child_ids, type='many2many', relation="account.account", string="Child Accounts"),
433+ 'balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Balance', multi='balance'),
434+ 'credit': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Credit', multi='balance'),
435+ 'debit': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
436+ 'foreign_balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Foreign Balance', multi='balance',
437+ help="Total amount (in Secondary currency) for transactions held in secondary currency for this account."),
438+ 'adjusted_balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Adjusted Balance', multi='balance',
439+ help="Total amount (in Company currency) for transactions held in secondary currency for this account."),
440+ 'unrealized_gain_loss': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Unrealized Gain or Loss', multi='balance',
441+ help="Value of Loss or Gain due to changes in exchange rate when doing multi-currency transactions."),
442+ 'reconcile': fields.boolean('Allow Reconciliation', help="Check this box if this account allows reconciliation of journal items."),
443+ 'exchange_rate': fields.related('currency_id', 'rate', type='float', string='Exchange Rate', digits=(12,6)),
444 'shortcut': fields.char('Shortcut', size=12),
445 'tax_ids': fields.many2many('account.tax', 'account_account_tax_default_rel',
446 'account_id', 'tax_id', 'Default Taxes'),
447 'note': fields.text('Note'),
448- 'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Company Currency'),
449+ 'company_currency_id': fields.function(_get_company_currency, type='many2one', relation='res.currency', string='Company Currency'),
450 'company_id': fields.many2one('res.company', 'Company', required=True),
451 'active': fields.boolean('Active', select=2, help="If the active field is set to False, it will allow you to hide the account without removing it."),
452
453@@ -388,19 +501,26 @@
454 'manage this. So if you import from another software system you may have to use the rate at date. ' \
455 'Incoming transactions always use the rate at date.', \
456 required=True),
457+<<<<<<< TREE
458 'level': fields.function(_get_level, string='Level', method=True, type='integer',
459 store={
460 'account.account': (_get_children_and_consol, ['level', 'parent_id'], 10),
461 }),
462
463+=======
464+ 'level': fields.function(_get_level, string='Level', method=True, type='integer',
465+ store={
466+ 'account.account': (_get_children_and_consol, ['level', 'parent_id'], 10),
467+ }),
468+>>>>>>> MERGE-SOURCE
469 }
470
471 _defaults = {
472- 'type': 'view',
473+ 'type': 'other',
474 'reconcile': False,
475 'active': True,
476 'currency_mode': 'current',
477- 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
478+ 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
479 }
480
481 def _check_recursion(self, cr, uid, ids, context=None):
482@@ -433,9 +553,16 @@
483 return False
484 return True
485
486+ def _check_account_type(self, cr, uid, ids, context=None):
487+ for account in self.browse(cr, uid, ids, context=context):
488+ if account.type in ('receivable', 'payable') and account.user_type.close_method != 'unreconciled':
489+ return False
490+ return True
491+
492 _constraints = [
493 (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id']),
494- (_check_type, 'Configuration Error! \nYou cannot define children to an account with internal type different of "View"! ', ['type']),
495+ (_check_type, 'Configuration Error! \nYou can not define children to an account with internal type different of "View"! ', ['type']),
496+ (_check_account_type, 'Configuration Error! \nYou can not select an account type with a deferral method different of "Unreconciled" for accounts with internal type "Payable/Receivable"! ', ['user_type','type']),
497 ]
498 _sql_constraints = [
499 ('code_company_uniq', 'unique (code,company_id)', 'The code of the account must be unique per company !')
500@@ -479,7 +606,7 @@
501 for record in reads:
502 name = record['name']
503 if record['code']:
504- name = record['code'] + ' '+name
505+ name = record['code'] + ' ' + name
506 res.append((record['id'], name))
507 return res
508
509@@ -511,14 +638,14 @@
510
511 if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
512 if method == 'write':
513- raise osv.except_osv(_('Error !'), _('You cannot deactivate an account that contains account moves.'))
514+ raise osv.except_osv(_('Error !'), _('You can not desactivate an account that contains some journal items.'))
515 elif method == 'unlink':
516- raise osv.except_osv(_('Error !'), _('You cannot remove an account which has account entries!. '))
517+ raise osv.except_osv(_('Error !'), _('You can not remove an account containing journal items.'))
518 #Checking whether the account is set as a property to any Partner or not
519 value = 'account.account,' + str(ids[0])
520 partner_prop_acc = self.pool.get('ir.property').search(cr, uid, [('value_reference','=',value)], context=context)
521 if partner_prop_acc:
522- raise osv.except_osv(_('Warning !'), _('You cannot remove/deactivate an account which is set as a property to any Partner.'))
523+ raise osv.except_osv(_('Warning !'), _('You can not remove/desactivate an account which is set on a customer or supplier.'))
524 return True
525
526 def _check_allow_type_change(self, cr, uid, ids, new_type, context=None):
527@@ -531,15 +658,20 @@
528 if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
529 #Check for 'Closed' type
530 if old_type == 'closed' and new_type !='closed':
531- raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from 'Closed' to any other type which contains account entries!"))
532+ raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from 'Closed' to any other type which contains journal items!"))
533 #Check for change From group1 to group2 and vice versa
534 if (old_type in group1 and new_type in group2) or (old_type in group2 and new_type in group1):
535- raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from '%s' to '%s' type as it contains account entries!") % (old_type,new_type,))
536+ raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from '%s' to '%s' type as it contains journal items!") % (old_type,new_type,))
537 return True
538
539 def write(self, cr, uid, ids, vals, context=None):
540+
541 if context is None:
542 context = {}
543+ if not ids:
544+ return True
545+ if isinstance(ids, (int, long)):
546+ ids = [ids]
547
548 # Dont allow changing the company_id when account_move_line already exist
549 if 'company_id' in vals:
550@@ -548,7 +680,7 @@
551 # Allow the write if the value is the same
552 for i in [i['company_id'][0] for i in self.read(cr,uid,ids,['company_id'])]:
553 if vals['company_id']!=i:
554- raise osv.except_osv(_('Warning !'), _('You cannot modify Company of account as its related record exist in Entry Lines'))
555+ raise osv.except_osv(_('Warning !'), _('You cannot change the owner company of an account that already contains journal items.'))
556 if 'active' in vals and not vals['active']:
557 self._check_moves(cr, uid, ids, "write", context=context)
558 if 'type' in vals.keys():
559@@ -589,7 +721,7 @@
560 _description = "Journal Column"
561 _columns = {
562 'name': fields.char('Column Name', size=64, required=True),
563- 'field': fields.selection(_col_get, 'Field Name', method=True, required=True, size=32),
564+ 'field': fields.selection(_col_get, 'Field Name', required=True, size=32),
565 'view_id': fields.many2one('account.journal.view', 'Journal View', select=True),
566 'sequence': fields.integer('Sequence', help="Gives the sequence order to journal column.", readonly=True),
567 'required': fields.boolean('Required'),
568@@ -604,14 +736,13 @@
569 _description = "Journal"
570 _columns = {
571 'name': fields.char('Journal Name', size=64, required=True),
572- 'code': fields.char('Code', size=5, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."),
573+ 'code': fields.char('Code', size=5, required=True, help="The code will be displayed on reports."),
574 'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
575- help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
576- " Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\
577- " Select 'Cash' to be used at the time of making payment."\
578- " Select 'General' for miscellaneous operations."\
579- " Select 'Opening/Closing Situation' to be used at the time of new fiscal year creation or end of year entries generation."),
580- 'refund_journal': fields.boolean('Refund Journal', help='Fill this if the journal is to be used for refunds of invoices.'),
581+ help="Select 'Sale' for customer invoices journals."\
582+ " Select 'Purchase' for supplier invoices journals."\
583+ " Select 'Cash' or 'Bank' for journals that are used in customer or supplier payments."\
584+ " Select 'General' for miscellaneous operations journals."\
585+ " Select 'Opening/Closing Situation' for entries generated for new fiscal years."),
586 'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]),
587 'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
588 'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells OpenERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
589@@ -626,7 +757,7 @@
590 'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
591 'entry_posted': fields.boolean('Skip \'Draft\' State for Manual Entries', help='Check this box if you don\'t want new journal entries to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation. \nNote that journal entries that are automatically created by the system are always skipping that state.'),
592 'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
593- 'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
594+ 'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
595 }
596
597 _defaults = {
598@@ -640,6 +771,19 @@
599
600 _order = 'code'
601
602+ def _check_currency(self, cr, uid, ids, context=None):
603+ for journal in self.browse(cr, uid, ids, context=context):
604+ if journal.currency:
605+ if journal.default_credit_account_id and not journal.default_credit_account_id.currency_id.id == journal.currency.id:
606+ return False
607+ if journal.default_debit_account_id and not journal.default_debit_account_id.currency_id.id == journal.currency.id:
608+ return False
609+ return True
610+
611+ _constraints = [
612+ (_check_currency, 'Configuration error! The currency chosen should be shared by the default accounts too.', ['currency','default_debit_account_id','default_credit_account_id']),
613+ ]
614+
615 def copy(self, cr, uid, id, default={}, context=None, done_list=[], local=False):
616 journal = self.browse(cr, uid, id, context=context)
617 if not default:
618@@ -647,19 +791,23 @@
619 default = default.copy()
620 default['code'] = (journal['code'] or '') + '(copy)'
621 default['name'] = (journal['name'] or '') + '(copy)'
622+ default['sequence_id'] = False
623 return super(account_journal, self).copy(cr, uid, id, default, context=context)
624
625 def write(self, cr, uid, ids, vals, context=None):
626 if context is None:
627 context = {}
628+ if isinstance(ids, (int, long)):
629+ ids = [ids]
630 for journal in self.browse(cr, uid, ids, context=context):
631 if 'company_id' in vals and journal.company_id.id != vals['company_id']:
632 move_lines = self.pool.get('account.move.line').search(cr, uid, [('journal_id', 'in', ids)])
633 if move_lines:
634- raise osv.except_osv(_('Warning !'), _('You cannot modify company of this journal as its related record exist in Entry Lines'))
635+ raise osv.except_osv(_('Warning !'), _('You can not modify the company of this journal as its related record exist in journal items'))
636 return super(account_journal, self).write(cr, uid, ids, vals, context=context)
637
638 def create_sequence(self, cr, uid, vals, context=None):
639+<<<<<<< TREE
640 """
641 Create new entry sequence for every new Joural
642 """
643@@ -674,22 +822,40 @@
644 'code': code
645 }
646 seq_typ_pool.create(cr, uid, types)
647+=======
648+ """ Create new no_gap entry sequence for every new Joural
649+ """
650+ # in account.journal code is actually the prefix of the sequence
651+ # whereas ir.sequence code is a key to lookup global sequences.
652+ prefix = vals['code'].upper()
653+>>>>>>> MERGE-SOURCE
654
655 seq = {
656- 'name': name,
657- 'code': code,
658- 'active': True,
659- 'prefix': code + "/%(year)s/",
660+ 'name': vals['name'],
661+ 'implementation':'no_gap',
662+ 'prefix': prefix + "/%(year)s/",
663 'padding': 4,
664 'number_increment': 1
665 }
666+<<<<<<< TREE
667 if 'company_id' in vals:
668 seq['company_id'] = vals['company_id']
669 return seq_pool.create(cr, uid, seq)
670+=======
671+ if 'company_id' in vals:
672+ seq['company_id'] = vals['company_id']
673+ return self.pool.get('ir.sequence').create(cr, uid, seq)
674+>>>>>>> MERGE-SOURCE
675
676 def create(self, cr, uid, vals, context=None):
677 if not 'sequence_id' in vals or not vals['sequence_id']:
678- vals.update({'sequence_id': self.create_sequence(cr, 1, vals, context)})
679+<<<<<<< TREE
680+ vals.update({'sequence_id': self.create_sequence(cr, 1, vals, context)})
681+=======
682+ # if we have the right to create a journal, we should be able to
683+ # create it's sequence.
684+ vals.update({'sequence_id': self.create_sequence(cr, 1, vals, context)})
685+>>>>>>> MERGE-SOURCE
686 return super(account_journal, self).create(cr, uid, vals, context)
687
688 def name_get(self, cr, user, ids, context=None):
689@@ -707,9 +873,11 @@
690 result = self.browse(cr, user, ids, context=context)
691 res = []
692 for rs in result:
693- name = rs.name
694 if rs.currency:
695- name = "%s (%s)" % (rs.name, rs.currency.name)
696+ currency = rs.currency
697+ else:
698+ currency = rs.company_id.currency_id
699+ name = "%s (%s)" % (rs.name, currency.name)
700 res += [(rs.id, name)]
701 return res
702
703@@ -744,9 +912,7 @@
704 }
705
706 res = {}
707-
708 view_id = type_map.get(type, 'account_journal_view')
709-
710 user = user_pool.browse(cr, uid, uid)
711 if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
712 view_id = 'account_journal_bank_view_multi'
713@@ -757,7 +923,6 @@
714 'centralisation':type == 'situation',
715 'view_id':data.res_id,
716 })
717-
718 return {
719 'value':res
720 }
721@@ -780,21 +945,8 @@
722 'state': 'draft',
723 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
724 }
725- _order = "date_start"
726-
727- def _check_fiscal_year(self, cr, uid, ids, context=None):
728- current_fiscal_yr = self.browse(cr, uid, ids, context=context)[0]
729- obj_fiscal_ids = self.search(cr, uid, [('company_id', '=', current_fiscal_yr.company_id.id)], context=context)
730- obj_fiscal_ids.remove(ids[0])
731- data_fiscal_yr = self.browse(cr, uid, obj_fiscal_ids, context=context)
732-
733- for old_fy in data_fiscal_yr:
734- if old_fy.company_id.id == current_fiscal_yr['company_id'].id:
735- # Condition to check if the current fiscal year falls in between any previously defined fiscal year
736- if old_fy.date_start <= current_fiscal_yr['date_start'] <= old_fy.date_stop or \
737- old_fy.date_start <= current_fiscal_yr['date_stop'] <= old_fy.date_stop:
738- return False
739- return True
740+ _order = "date_start, id"
741+
742
743 def _check_duration(self, cr, uid, ids, context=None):
744 obj_fy = self.browse(cr, uid, ids[0], context=context)
745@@ -803,23 +955,31 @@
746 return True
747
748 _constraints = [
749- (_check_duration, 'Error! The duration of the Fiscal Year is invalid. ', ['date_stop']),
750- (_check_fiscal_year, 'Error! You cannot define overlapping fiscal years',['date_start', 'date_stop'])
751+ (_check_duration, 'Error! The start date of the fiscal year must be before his end date.', ['date_start','date_stop'])
752 ]
753
754- def create_period3(self,cr, uid, ids, context=None):
755+ def create_period3(self, cr, uid, ids, context=None):
756 return self.create_period(cr, uid, ids, context, 3)
757
758- def create_period(self,cr, uid, ids, context=None, interval=1):
759+ def create_period(self, cr, uid, ids, context=None, interval=1):
760+ period_obj = self.pool.get('account.period')
761 for fy in self.browse(cr, uid, ids, context=context):
762 ds = datetime.strptime(fy.date_start, '%Y-%m-%d')
763- while ds.strftime('%Y-%m-%d')<fy.date_stop:
764+ period_obj.create(cr, uid, {
765+ 'name': "%s %s" % (_('Opening Period'), ds.strftime('%Y')),
766+ 'code': ds.strftime('00/%Y'),
767+ 'date_start': ds,
768+ 'date_stop': ds,
769+ 'special': True,
770+ 'fiscalyear_id': fy.id,
771+ })
772+ while ds.strftime('%Y-%m-%d') < fy.date_stop:
773 de = ds + relativedelta(months=interval, days=-1)
774
775- if de.strftime('%Y-%m-%d')>fy.date_stop:
776+ if de.strftime('%Y-%m-%d') > fy.date_stop:
777 de = datetime.strptime(fy.date_stop, '%Y-%m-%d')
778
779- self.pool.get('account.period').create(cr, uid, {
780+ period_obj.create(cr, uid, {
781 'name': ds.strftime('%m/%Y'),
782 'code': ds.strftime('%m/%Y'),
783 'date_start': ds.strftime('%Y-%m-%d'),
784@@ -830,15 +990,26 @@
785 return True
786
787 def find(self, cr, uid, dt=None, exception=True, context=None):
788+ res = self.finds(cr, uid, dt, exception, context=context)
789+ return res and res[0] or False
790+
791+ def finds(self, cr, uid, dt=None, exception=True, context=None):
792+ if context is None: context = {}
793 if not dt:
794- dt = time.strftime('%Y-%m-%d')
795- ids = self.search(cr, uid, [('date_start', '<=', dt), ('date_stop', '>=', dt)])
796+ dt = fields.date.context_today(self,cr,uid,context=context)
797+ args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
798+ if context.get('company_id', False):
799+ company_id = context['company_id']
800+ else:
801+ company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
802+ args.append(('company_id', '=', company_id))
803+ ids = self.search(cr, uid, args, context=context)
804 if not ids:
805 if exception:
806- raise osv.except_osv(_('Error !'), _('No fiscal year defined for this date !\nPlease create one.'))
807+ raise osv.except_osv(_('Error !'), _('No fiscal year defined for this date !\nPlease create one from the configuration of the accounting menu.'))
808 else:
809- return False
810- return ids[0]
811+ return []
812+ return ids
813
814 def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
815 if args is None:
816@@ -872,7 +1043,10 @@
817 _defaults = {
818 'state': 'draft',
819 }
820- _order = "date_start"
821+ _order = "date_start, special desc"
822+ _sql_constraints = [
823+ ('name_company_uniq', 'unique(name, company_id)', 'The name of the period must be unique per company!'),
824+ ]
825
826 def _check_duration(self,cr,uid,ids,context=None):
827 obj_period = self.browse(cr, uid, ids[0], context=context)
828@@ -911,8 +1085,9 @@
829 def find(self, cr, uid, dt=None, context=None):
830 if context is None: context = {}
831 if not dt:
832- dt = time.strftime('%Y-%m-%d')
833+ dt = fields.date.context_today(self,cr,uid,context=context)
834 #CHECKME: shouldn't we check the state of the period?
835+<<<<<<< TREE
836 args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
837 if context.get('company_id', False):
838 args.append(('company_id', '=', context['company_id']))
839@@ -923,14 +1098,39 @@
840 if not ids:
841 raise osv.except_osv(_('Error !'), _('No period defined for this date: %s !\nPlease create a fiscal year.')%dt)
842 return ids
843+=======
844+ args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
845+ if context.get('company_id', False):
846+ args.append(('company_id', '=', context['company_id']))
847+ else:
848+ company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
849+ args.append(('company_id', '=', company_id))
850+ result = []
851+ if context.get('account_period_prefer_normal'):
852+ # look for non-special periods first, and fallback to all if no result is found
853+ result = self.search(cr, uid, args + [('special', '=', False)], context=context)
854+ if not result:
855+ result = self.search(cr, uid, args, context=context)
856+ if not result:
857+ raise osv.except_osv(_('Error !'), _('No period defined for this date: %s !\nPlease create one.')%dt)
858+ return result
859+>>>>>>> MERGE-SOURCE
860
861 def action_draft(self, cr, uid, ids, *args):
862 mode = 'draft'
863+<<<<<<< TREE
864 for period in self.browse(cr, uid, ids):
865 if period.fiscalyear_id.state == 'done':
866 raise osv.except_osv(_('Warning !'), _('You can not re-open a period which belongs to closed fiscal year'))
867 cr.execute('update account_journal_period set state=%s where period_id in %s', (mode, tuple(ids)))
868 cr.execute('update account_period set state=%s where id in %s', (mode, tuple(ids)))
869+=======
870+ for period in self.browse(cr, uid, ids):
871+ if period.fiscalyear_id.state == 'done':
872+ raise osv.except_osv(_('Warning !'), _('You can not re-open a period which belongs to closed fiscal year'))
873+ cr.execute('update account_journal_period set state=%s where period_id in %s', (mode, tuple(ids),))
874+ cr.execute('update account_period set state=%s where id in %s', (mode, tuple(ids),))
875+>>>>>>> MERGE-SOURCE
876 return True
877
878 def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
879@@ -949,7 +1149,7 @@
880 if 'company_id' in vals:
881 move_lines = self.pool.get('account.move.line').search(cr, uid, [('period_id', 'in', ids)])
882 if move_lines:
883- raise osv.except_osv(_('Warning !'), _('You cannot modify company of this period as its related record exist in Entry Lines'))
884+ raise osv.except_osv(_('Warning !'), _('You can not modify company of this period as some journal items exists.'))
885 return super(account_period, self).write(cr, uid, ids, vals, context=context)
886
887 def build_ctx_periods(self, cr, uid, period_from_id, period_to_id):
888@@ -965,7 +1165,10 @@
889 raise osv.except_osv(_('Error'), _('You should have chosen periods that belongs to the same company'))
890 if period_date_start > period_date_stop:
891 raise osv.except_osv(_('Error'), _('Start period should be smaller then End period'))
892- return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)])
893+ #for period from = january, we want to exclude the opening period (but it has same date_from, so we have to check if period_from is special or not to include that clause or not in the search).
894+ if period_from.special:
895+ return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)])
896+ return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id), ('special', '=', False)])
897
898 account_period()
899
900@@ -987,7 +1190,7 @@
901 'name': fields.char('Journal-Period Name', size=64, required=True),
902 'journal_id': fields.many2one('account.journal', 'Journal', required=True, ondelete="cascade"),
903 'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"),
904- 'icon': fields.function(_icon_get, method=True, string='Icon', type='char', size=32),
905+ 'icon': fields.function(_icon_get, string='Icon', type='char', size=32),
906 'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."),
907 'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
908 help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
909@@ -1008,7 +1211,7 @@
910 return super(account_journal_period, self).write(cr, uid, ids, vals, context=context)
911
912 def create(self, cr, uid, vals, context=None):
913- period_id=vals.get('period_id',False)
914+ period_id = vals.get('period_id',False)
915 if period_id:
916 period = self.pool.get('account.period').browse(cr, uid, period_id, context=context)
917 vals['state']=period.state
918@@ -1095,10 +1298,9 @@
919 return res
920
921 def _get_period(self, cr, uid, context=None):
922- periods = self.pool.get('account.period').find(cr, uid)
923- if periods:
924- return periods[0]
925- return False
926+ ctx = dict(context or {}, account_period_prefer_normal=True)
927+ period_ids = self.pool.get('account.period').find(cr, uid, context=ctx)
928+ return period_ids[0]
929
930 def _amount_compute(self, cr, uid, ids, name, args, context, where =''):
931 if not ids: return {}
932@@ -1128,9 +1330,8 @@
933 res_ids = set(id[0] for id in cr.fetchall())
934 ids = ids and (ids & res_ids) or res_ids
935 if ids:
936- return [('id','in',tuple(ids))]
937- else:
938- return [('id', '=', '0')]
939+ return [('id', 'in', tuple(ids))]
940+ return [('id', '=', '0')]
941
942 _columns = {
943 'name': fields.char('Number', size=64, required=True),
944@@ -1138,20 +1339,22 @@
945 'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
946 'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
947 'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', required=True, readonly=True,
948- help='All manually created new journal entry are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
949+ help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
950 'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
951 'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
952 'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
953- 'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
954+ 'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
955 'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}, select=True),
956- 'narration':fields.text('Narration'),
957+ 'narration':fields.text('Internal Note'),
958 'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
959+ 'balance': fields.float('balance', digits_compute=dp.get_precision('Account'), help="This is a field only used for internal purpose and shouldn't be displayed"),
960 }
961+
962 _defaults = {
963 'name': '/',
964 'state': 'draft',
965 'period_id': _get_period,
966- 'date': lambda *a: time.strftime('%Y-%m-%d'),
967+ 'date': fields.date.context_today,
968 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
969 }
970
971@@ -1166,6 +1369,7 @@
972 return False
973 return True
974
975+<<<<<<< TREE
976 def _check_period_journal(self, cursor, user, ids, context=None):
977 for move in self.browse(cursor, user, ids, context=context):
978 for line in move.line_id:
979@@ -1182,16 +1386,21 @@
980 return False
981 return True
982
983+=======
984+>>>>>>> MERGE-SOURCE
985 _constraints = [
986 (_check_centralisation,
987- 'You cannot create more than one move per period on centralized journal',
988+ 'You can not create more than one move per period on centralized journal',
989 ['journal_id']),
990+<<<<<<< TREE
991 (_check_period_journal,
992 'You cannot create entries on different periods/journals in the same move',
993 ['line_id']),
994 (_check_date,
995 'The date of your Journal Entry is not in the defined period!',
996 ['journal_id'])
997+=======
998+>>>>>>> MERGE-SOURCE
999 ]
1000
1001 def post(self, cr, uid, ids, context=None):
1002@@ -1201,7 +1410,7 @@
1003 valid_moves = self.validate(cr, uid, ids, context)
1004
1005 if not valid_moves:
1006- raise osv.except_osv(_('Integrity Error !'), _('You cannot validate a non-balanced entry !\nMake sure you have configured Payment Term properly !\nIt should contain atleast one Payment Term Line with type "Balance" !'))
1007+ raise osv.except_osv(_('Integrity Error !'), _('You can not validate a non-balanced entry !\nMake sure you have configured payment terms properly !\nThe latest payment term line should be of the type "Balance" !'))
1008 obj_sequence = self.pool.get('ir.sequence')
1009 for move in self.browse(cr, uid, valid_moves, context=context):
1010 if move.name =='/':
1011@@ -1213,7 +1422,7 @@
1012 else:
1013 if journal.sequence_id:
1014 c = {'fiscalyear_id': move.period_id.fiscalyear_id.id}
1015- new_name = obj_sequence.get_id(cr, uid, journal.sequence_id.id, context=c)
1016+ new_name = obj_sequence.next_by_id(cr, uid, journal.sequence_id.id, c)
1017 else:
1018 raise osv.except_osv(_('Error'), _('No sequence defined on the journal !'))
1019
1020@@ -1224,21 +1433,22 @@
1021 'SET state=%s '\
1022 'WHERE id IN %s',
1023 ('posted', tuple(valid_moves),))
1024-
1025 return True
1026
1027 def button_validate(self, cursor, user, ids, context=None):
1028 for move in self.browse(cursor, user, ids, context=context):
1029- top = None
1030+ # check that all accounts have the same topmost ancestor
1031+ top_common = None
1032 for line in move.line_id:
1033 account = line.account_id
1034- while account:
1035- account2 = account
1036- account = account.parent_id
1037- if not top:
1038- top = account2.id
1039- elif top<>account2.id:
1040- raise osv.except_osv(_('Error !'), _('You cannot validate a Journal Entry unless all journal items are in same chart of accounts !'))
1041+ top_account = account
1042+ while top_account.parent_id:
1043+ top_account = top_account.parent_id
1044+ if not top_common:
1045+ top_common = top_account
1046+ elif top_account.id != top_common.id:
1047+ raise osv.except_osv(_('Error !'),
1048+ _('You cannot validate this journal entry because account "%s" does not belong to chart of accounts "%s"!') % (account.name, top_common.name))
1049 return self.post(cursor, user, ids, context=context)
1050
1051 def button_cancel(self, cr, uid, ids, context=None):
1052@@ -1253,12 +1463,20 @@
1053 'WHERE id IN %s', ('draft', tuple(ids),))
1054 return True
1055
1056+ def onchange_line_id(self, cr, uid, ids, line_ids, context=None):
1057+ balance = 0.0
1058+ line_ids = [ line for line in line_ids if not (isinstance(line, (tuple, list)) and line and line[0] == 2) ]
1059+ line_ids = self.resolve_o2m_commands_to_record_dicts(cr, uid, 'line_id', line_ids, context=context)
1060+ for line in line_ids:
1061+ balance += (line['debit'] or 0.00)- (line['credit'] or 0.00)
1062+ return {'value': {'balance': balance}}
1063+
1064 def write(self, cr, uid, ids, vals, context=None):
1065 if context is None:
1066 context = {}
1067 c = context.copy()
1068 c['novalidate'] = True
1069- result = super(osv.osv, self).write(cr, uid, ids, vals, c)
1070+ result = super(account_move, self).write(cr, uid, ids, vals, c)
1071 self.validate(cr, uid, ids, context=context)
1072 return result
1073
1074@@ -1326,7 +1544,7 @@
1075 for move in self.browse(cr, uid, ids, context=context):
1076 if move['state'] != 'draft':
1077 raise osv.except_osv(_('UserError'),
1078- _('You can not delete posted movement: "%s"!') % \
1079+ _('You can not delete a posted journal entry "%s"!') % \
1080 move['name'])
1081 line_ids = map(lambda x: x.id, move.line_id)
1082 context['journal_id'] = move.journal_id.id
1083@@ -1346,8 +1564,12 @@
1084
1085 def _centralise(self, cr, uid, move, mode, context=None):
1086 assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
1087+<<<<<<< TREE
1088 currency_obj = self.pool.get('res.currency')
1089 move_line_obj = self.pool.get('account.move.line')
1090+=======
1091+ currency_obj = self.pool.get('res.currency')
1092+>>>>>>> MERGE-SOURCE
1093 if context is None:
1094 context = {}
1095
1096@@ -1399,6 +1621,7 @@
1097 cr.execute('SELECT SUM(%s) FROM account_move_line WHERE move_id=%%s AND id!=%%s' % (mode,), (move.id, line_id2))
1098 result = cr.fetchone()[0] or 0.0
1099 cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
1100+<<<<<<< TREE
1101
1102 #adjust also the amount in currency if needed
1103 cr.execute("select currency_id, COALESCE(sum(amount_currency),0.0) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
1104@@ -1427,6 +1650,36 @@
1105 'amount_currency': amount_currency,
1106 }, context)
1107
1108+=======
1109+
1110+ #adjust also the amount in currency if needed
1111+ cr.execute("select currency_id, sum(amount_currency) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
1112+ for row in cr.dictfetchall():
1113+ currency_id = currency_obj.browse(cr, uid, row['currency_id'], context=context)
1114+ if not currency_obj.is_zero(cr, uid, currency_id, row['amount_currency']):
1115+ amount_currency = row['amount_currency'] * -1
1116+ account_id = amount_currency > 0 and move.journal_id.default_debit_account_id.id or move.journal_id.default_credit_account_id.id
1117+ cr.execute('select id from account_move_line where move_id=%s and centralisation=\'currency\' and currency_id = %slimit 1', (move.id, row['currency_id']))
1118+ res = cr.fetchone()
1119+ if res:
1120+ cr.execute('update account_move_line set amount_currency=%s , account_id=%s where id=%s', (amount_currency, account_id, res[0]))
1121+ else:
1122+ context.update({'journal_id': move.journal_id.id, 'period_id': move.period_id.id})
1123+ line_id = self.pool.get('account.move.line').create(cr, uid, {
1124+ 'name': _('Currency Adjustment'),
1125+ 'centralisation': 'currency',
1126+ 'account_id': account_id,
1127+ 'move_id': move.id,
1128+ 'journal_id': move.journal_id.id,
1129+ 'period_id': move.period_id.id,
1130+ 'date': move.period_id.date_stop,
1131+ 'debit': 0.0,
1132+ 'credit': 0.0,
1133+ 'currency_id': row['currency_id'],
1134+ 'amount_currency': amount_currency,
1135+ }, context)
1136+
1137+>>>>>>> MERGE-SOURCE
1138 return True
1139
1140 #
1141@@ -1483,8 +1736,6 @@
1142 # Update the move lines (set them as valid)
1143
1144 obj_move_line.write(cr, uid, line_draft_ids, {
1145- 'journal_id': move.journal_id.id,
1146- 'period_id': move.period_id.id,
1147 'state': 'valid'
1148 }, context, check=False)
1149
1150@@ -1525,8 +1776,6 @@
1151 # We can't validate it (it's unbalanced)
1152 # Setting the lines as draft
1153 obj_move_line.write(cr, uid, line_ids, {
1154- 'journal_id': move.journal_id.id,
1155- 'period_id': move.period_id.id,
1156 'state': 'draft'
1157 }, context, check=False)
1158 # Create analytic lines for the valid moves
1159@@ -1549,13 +1798,17 @@
1160 'create_date': fields.date('Creation date', readonly=True),
1161 }
1162 _defaults = {
1163- 'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/',
1164+ 'name': lambda self,cr,uid,ctx=None: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile', context=ctx) or '/',
1165 }
1166+
1167 def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None):
1168 total = 0.0
1169 for rec in self.browse(cr, uid, ids, context=context):
1170 for line in rec.line_partial_ids:
1171- total += (line.debit or 0.0) - (line.credit or 0.0)
1172+ if line.account_id.currency_id:
1173+ total += line.amount_currency
1174+ else:
1175+ total += (line.debit or 0.0) - (line.credit or 0.0)
1176 if not total:
1177 self.pool.get('account.move.line').write(cr, uid,
1178 map(lambda x: x.id, rec.line_partial_ids),
1179@@ -1576,7 +1829,6 @@
1180 result.append((r.id,r.name))
1181 return result
1182
1183-
1184 account_move_reconcile()
1185
1186 #----------------------------------------------------------
1187@@ -1617,6 +1869,7 @@
1188 res = dict(cr.fetchall())
1189 res2 = {}
1190 obj_precision = self.pool.get('decimal.precision')
1191+ res2 = {}
1192 for record in self.browse(cr, uid, ids, context=context):
1193 def _rec_get(record):
1194 amount = res.get(record.id, 0.0)
1195@@ -1633,13 +1886,15 @@
1196 if context.get('state', 'all') == 'all':
1197 move_state = ('draft', 'posted', )
1198 if context.get('fiscalyear_id', False):
1199- fiscalyear_id = context['fiscalyear_id']
1200+ fiscalyear_id = [context['fiscalyear_id']]
1201 else:
1202- fiscalyear_id = self.pool.get('account.fiscalyear').find(cr, uid, exception=False)
1203+ fiscalyear_id = self.pool.get('account.fiscalyear').finds(cr, uid, exception=False)
1204 where = ''
1205 where_params = ()
1206 if fiscalyear_id:
1207- pids = map(lambda x: str(x.id), self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_id).period_ids)
1208+ pids = []
1209+ for fy in fiscalyear_id:
1210+ pids += map(lambda x: str(x.id), self.pool.get('account.fiscalyear').browse(cr, uid, fy).period_ids)
1211 if pids:
1212 where = ' AND line.period_id IN %s AND move.state IN %s '
1213 where_params = (tuple(pids), move_state)
1214@@ -1669,14 +1924,15 @@
1215 'name': fields.char('Tax Case Name', size=64, required=True, translate=True),
1216 'code': fields.char('Case Code', size=64),
1217 'info': fields.text('Description'),
1218- 'sum': fields.function(_sum_year, method=True, string="Year Sum"),
1219- 'sum_period': fields.function(_sum_period, method=True, string="Period Sum"),
1220+ 'sum': fields.function(_sum_year, string="Year Sum"),
1221+ 'sum_period': fields.function(_sum_period, string="Period Sum"),
1222 'parent_id': fields.many2one('account.tax.code', 'Parent Code', select=True),
1223 'child_ids': fields.one2many('account.tax.code', 'parent_id', 'Child Codes'),
1224 'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
1225 'company_id': fields.many2one('res.company', 'Company', required=True),
1226 'sign': fields.float('Coefficent for parent', required=True, help='You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it.'),
1227 'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"),
1228+ 'sequence': fields.integer('Sequence', help="Determine the display order in the report 'Accounting \ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"),
1229 }
1230
1231 def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
1232@@ -1785,6 +2041,9 @@
1233 'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
1234
1235 }
1236+ _sql_constraints = [
1237+ ('name_company_uniq', 'unique(name, company_id)', 'Tax Name must be unique per company!'),
1238+ ]
1239
1240 def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
1241 """
1242@@ -1889,7 +2148,6 @@
1243 obj_partener_address = self.pool.get('res.partner.address')
1244 for tax in taxes:
1245 # we compute the amount for the current tax object and append it to the result
1246-
1247 data = {'id':tax.id,
1248 'name':tax.description and tax.description + " - " + tax.name or tax.name,
1249 'account_collected_id':tax.account_collected_id.id,
1250@@ -1949,8 +2207,11 @@
1251 cur_price_unit+=amount2
1252 return res
1253
1254- def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
1255+ def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None, force_excluded=False):
1256 """
1257+ :param force_excluded: boolean used to say that we don't want to consider the value of field price_include of
1258+ tax. It's used in encoding by line where you don't matter if you encoded a tax with that boolean to True or
1259+ False
1260 RETURN: {
1261 'total': 0.0, # Total without taxes
1262 'total_included: 0.0, # Total with taxes
1263@@ -1962,16 +2223,16 @@
1264 tin = []
1265 tex = []
1266 for tax in taxes:
1267- if tax.price_include:
1268+ if not tax.price_include or force_excluded:
1269+ tex.append(tax)
1270+ else:
1271 tin.append(tax)
1272- else:
1273- tex.append(tax)
1274 tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
1275 for r in tin:
1276 totalex -= r.get('amount', 0.0)
1277 totlex_qty = 0.0
1278 try:
1279- totlex_qty=totalex/quantity
1280+ totlex_qty = totalex/quantity
1281 except:
1282 pass
1283 tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner)
1284@@ -2105,6 +2366,7 @@
1285 r['amount'] = round(r['amount'] * quantity, prec)
1286 total += r['amount']
1287 return res
1288+
1289 account_tax()
1290
1291 # ---------------------------------------------------------
1292@@ -2131,6 +2393,7 @@
1293 account_move_obj = self.pool.get('account.move')
1294 account_move_line_obj = self.pool.get('account.move.line')
1295 pt_obj = self.pool.get('account.payment.term')
1296+ period_obj = self.pool.get('account.period')
1297
1298 if context is None:
1299 context = {}
1300@@ -2138,18 +2401,23 @@
1301 if datas.get('date', False):
1302 context.update({'date': datas['date']})
1303
1304- period_id = self.pool.get('account.period').find(cr, uid, dt=context.get('date', False))
1305- if not period_id:
1306- raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
1307- period_id = period_id[0]
1308-
1309+ move_date = context.get('date', time.strftime('%Y-%m-%d'))
1310+ move_date = datetime.strptime(move_date,"%Y-%m-%d")
1311 for model in self.browse(cr, uid, ids, context=context):
1312- entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%Y-%m')}
1313+ ctx = context.copy()
1314+ ctx.update({'company_id': model.company_id.id})
1315+ period_ids = period_obj.find(cr, uid, dt=context.get('date', False), context=ctx)
1316+ period_id = period_ids and period_ids[0] or False
1317+ ctx.update({'journal_id': model.journal_id.id,'period_id': period_id})
1318+ try:
1319+ entry['name'] = model.name%{'year': move_date.strftime('%Y'), 'month': move_date.strftime('%m'), 'date': move_date.strftime('%Y-%m')}
1320+ except:
1321+ raise osv.except_osv(_('Wrong model !'), _('You have a wrong expression "%(...)s" in your model !'))
1322 move_id = account_move_obj.create(cr, uid, {
1323 'ref': entry['name'],
1324 'period_id': period_id,
1325 'journal_id': model.journal_id.id,
1326- 'date': context.get('date',time.strftime('%Y-%m-%d'))
1327+ 'date': context.get('date', fields.date.context_today(self,cr,uid,context=context))
1328 })
1329 move_ids.append(move_id)
1330 for line in model.lines_id:
1331@@ -2165,7 +2433,7 @@
1332 'analytic_account_id': analytic_account_id
1333 }
1334
1335- date_maturity = time.strftime('%Y-%m-%d')
1336+ date_maturity = context.get('date',time.strftime('%Y-%m-%d'))
1337 if line.date_maturity == 'partner':
1338 if not line.partner_id:
1339 raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!" \
1340@@ -2186,12 +2454,10 @@
1341 'account_id': line.account_id.id,
1342 'move_id': move_id,
1343 'partner_id': line.partner_id.id,
1344- 'date': context.get('date',time.strftime('%Y-%m-%d')),
1345+ 'date': context.get('date', fields.date.context_today(self,cr,uid,context=context)),
1346 'date_maturity': date_maturity
1347 })
1348- c = context.copy()
1349- c.update({'journal_id': model.journal_id.id,'period_id': period_id})
1350- account_move_line_obj.create(cr, uid, val, context=c)
1351+ account_move_line_obj.create(cr, uid, val, context=ctx)
1352
1353 return move_ids
1354
1355@@ -2202,8 +2468,8 @@
1356 _description = "Account Model Entries"
1357 _columns = {
1358 'name': fields.char('Name', size=64, required=True),
1359- 'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones"),
1360- 'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries"),
1361+ 'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones."),
1362+ 'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries."),
1363 'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
1364 'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
1365 'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade"),
1366@@ -2212,12 +2478,12 @@
1367 'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency."),
1368 'currency_id': fields.many2one('res.currency', 'Currency'),
1369 'partner_id': fields.many2one('res.partner', 'Partner'),
1370- 'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity date', help="The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."),
1371+ 'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity Date', help="The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."),
1372 }
1373 _order = 'sequence'
1374 _sql_constraints = [
1375- ('credit_debit1', 'CHECK (credit*debit=0)', 'Wrong credit or debit value in model (Credit Or Debit Must Be "0")!'),
1376- ('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in model (Credit + Debit Must Be greater "0")!'),
1377+ ('credit_debit1', 'CHECK (credit*debit=0)', 'Wrong credit or debit value in model, they must be positive!'),
1378+ ('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in model, they must be positive!'),
1379 ]
1380 account_model_line()
1381
1382@@ -2233,17 +2499,15 @@
1383 'name': fields.char('Name', size=64, required=True),
1384 'ref': fields.char('Reference', size=16),
1385 'model_id': fields.many2one('account.model', 'Model', required=True),
1386-
1387 'date_start': fields.date('Start Date', required=True),
1388 'period_total': fields.integer('Number of Periods', required=True),
1389 'period_nbr': fields.integer('Period', required=True),
1390 'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
1391 'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State', required=True, readonly=True),
1392-
1393 'lines_id': fields.one2many('account.subscription.line', 'subscription_id', 'Subscription Lines')
1394 }
1395 _defaults = {
1396- 'date_start': lambda *a: time.strftime('%Y-%m-%d'),
1397+ 'date_start': fields.date.context_today,
1398 'period_type': 'month',
1399 'period_total': 12,
1400 'period_nbr': 1,
1401@@ -2294,6 +2558,7 @@
1402 ds = (datetime.strptime(ds, '%Y-%m-%d') + relativedelta(years=sub.period_nbr)).strftime('%Y-%m-%d')
1403 self.write(cr, uid, ids, {'state':'running'})
1404 return True
1405+
1406 account_subscription()
1407
1408 class account_subscription_line(osv.osv):
1409@@ -2322,6 +2587,7 @@
1410 return all_moves
1411
1412 _rec_name = 'date'
1413+
1414 account_subscription_line()
1415
1416 # ---------------------------------------------------------------
1417@@ -2338,9 +2604,9 @@
1418 _description ='Templates for Accounts'
1419
1420 _columns = {
1421- 'name': fields.char('Name', size=128, required=True, select=True),
1422+ 'name': fields.char('Name', size=256, required=True, select=True),
1423 'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
1424- 'code': fields.char('Code', size=64, select=1),
1425+ 'code': fields.char('Code', size=64, required=True, select=1),
1426 'type': fields.selection([
1427 ('receivable','Receivable'),
1428 ('payable','Payable'),
1429@@ -2356,6 +2622,7 @@
1430 'user_type': fields.many2one('account.account.type', 'Account Type', required=True,
1431 help="These types are defined according to your country. The type contains more information "\
1432 "about the account and its specificities."),
1433+ 'financial_report_ids': fields.many2many('account.financial.report', 'account_template_financial_report', 'account_template_id', 'report_line_id', 'Financial Reports'),
1434 'reconcile': fields.boolean('Allow Reconciliation', help="Check this option if you want the user to reconcile entries in this account."),
1435 'shortcut': fields.char('Shortcut', size=12),
1436 'note': fields.text('Note'),
1437@@ -2363,6 +2630,7 @@
1438 'child_parent_ids':fields.one2many('account.account.template', 'parent_id', 'Children'),
1439 'tax_ids': fields.many2many('account.tax.template', 'account_account_template_tax_rel', 'account_id', 'tax_id', 'Default Taxes'),
1440 'nocreate': fields.boolean('Optional create', help="If checked, the new chart of accounts will not contain this by default."),
1441+ 'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', help="This optional field allow you to link an account template to a specific chart template that may differ from the one its root parent belongs to. This allow you to define chart templates that extend another and complete it with few new accounts (You don't need to define the whole structure that is common to both several times)."),
1442 }
1443
1444 _defaults = {
1445@@ -2383,7 +2651,7 @@
1446 _check_recursion = check_cycle
1447 _constraints = [
1448 (_check_recursion, 'Error ! You can not create recursive account templates.', ['parent_id']),
1449- (_check_type, 'Configuration Error! \nYou cannot define children to an account with internal type different of "View"! ', ['type']),
1450+ (_check_type, 'Configuration Error!\nYou can not define children to an account with internal type different of "View"! ', ['type']),
1451
1452 ]
1453
1454@@ -2399,6 +2667,74 @@
1455 res.append((record['id'],name ))
1456 return res
1457
1458+ def generate_account(self, cr, uid, chart_template_id, tax_template_ref, acc_template_ref, code_digits, company_id, context=None):
1459+ """
1460+ This method for generating accounts from templates.
1461+
1462+ :param chart_template_id: id of the chart template chosen in the wizard
1463+ :param tax_template_ref: Taxes templates reference for write taxes_id in account_account.
1464+ :paramacc_template_ref: dictionary with the mappping between the account templates and the real accounts.
1465+ :param code_digits: number of digits got from wizard.multi.charts.accounts, this is use for account code.
1466+ :param company_id: company_id selected from wizard.multi.charts.accounts.
1467+ :returns: return acc_template_ref for reference purpose.
1468+ :rtype: dict
1469+ """
1470+ if context is None:
1471+ context = {}
1472+ obj_acc = self.pool.get('account.account')
1473+ company_name = self.pool.get('res.company').browse(cr, uid, company_id, context=context).name
1474+ template = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
1475+ #deactivate the parent_store functionnality on account_account for rapidity purpose
1476+ ctx = context.copy()
1477+ ctx.update({'defer_parent_store_computation': True})
1478+ level_ref = {}
1479+ children_acc_criteria = [('chart_template_id','=', chart_template_id)]
1480+ if template.account_root_id.id:
1481+ children_acc_criteria = ['|'] + children_acc_criteria + ['&',('parent_id','child_of', [template.account_root_id.id]),('chart_template_id','=', False)]
1482+ children_acc_template = self.search(cr, uid, [('nocreate','!=',True)] + children_acc_criteria, order='id')
1483+ for account_template in self.browse(cr, uid, children_acc_template, context=context):
1484+ # skip the root of COA if it's not the main one
1485+ if (template.account_root_id.id == account_template.id) and template.parent_id:
1486+ continue
1487+ tax_ids = []
1488+ for tax in account_template.tax_ids:
1489+ tax_ids.append(tax_template_ref[tax.id])
1490+
1491+ code_main = account_template.code and len(account_template.code) or 0
1492+ code_acc = account_template.code or ''
1493+ if code_main > 0 and code_main <= code_digits and account_template.type != 'view':
1494+ code_acc = str(code_acc) + (str('0'*(code_digits-code_main)))
1495+ parent_id = account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False
1496+ #the level as to be given as well at the creation time, because of the defer_parent_store_computation in
1497+ #context. Indeed because of this, the parent_left and parent_right are not computed and thus the child_of
1498+ #operator does not return the expected values, with result of having the level field not computed at all.
1499+ if parent_id:
1500+ level = parent_id in level_ref and level_ref[parent_id] + 1 or obj_acc._get_level(cr, uid, [parent_id], 'level', None, context=context)[parent_id] + 1
1501+ else:
1502+ level = 0
1503+ vals={
1504+ 'name': (template.account_root_id.id == account_template.id) and company_name or account_template.name,
1505+ 'currency_id': account_template.currency_id and account_template.currency_id.id or False,
1506+ 'code': code_acc,
1507+ 'type': account_template.type,
1508+ 'user_type': account_template.user_type and account_template.user_type.id or False,
1509+ 'reconcile': account_template.reconcile,
1510+ 'shortcut': account_template.shortcut,
1511+ 'note': account_template.note,
1512+ 'financial_report_ids': account_template.financial_report_ids and [(6,0,[x.id for x in account_template.financial_report_ids])] or False,
1513+ 'parent_id': parent_id,
1514+ 'tax_ids': [(6,0,tax_ids)],
1515+ 'company_id': company_id,
1516+ 'level': level,
1517+ }
1518+ new_account = obj_acc.create(cr, uid, vals, context=ctx)
1519+ acc_template_ref[account_template.id] = new_account
1520+ level_ref[new_account] = level
1521+
1522+ #reactivate the parent_store functionnality on account_account
1523+ obj_acc._parent_store_compute(cr)
1524+ return acc_template_ref
1525+
1526 account_account_template()
1527
1528 class account_add_tmpl_wizard(osv.osv_memory):
1529@@ -2408,17 +2744,16 @@
1530 _name = 'account.addtmpl.wizard'
1531
1532 def _get_def_cparent(self, cr, uid, context=None):
1533- acc_obj=self.pool.get('account.account')
1534- tmpl_obj=self.pool.get('account.account.template')
1535- tids=tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id'])
1536+ acc_obj = self.pool.get('account.account')
1537+ tmpl_obj = self.pool.get('account.account.template')
1538+ tids = tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id'])
1539 if not tids or not tids[0]['parent_id']:
1540 return False
1541 ptids = tmpl_obj.read(cr, uid, [tids[0]['parent_id'][0]], ['code'])
1542 res = None
1543 if not ptids or not ptids[0]['code']:
1544- raise osv.except_osv(_('Error !'), _('Cannot locate parent code for template account!'))
1545+ raise osv.except_osv(_('Error !'), _('I can not locate a parent code for the template account!'))
1546 res = acc_obj.search(cr, uid, [('code','=',ptids[0]['code'])])
1547-
1548 return res and res[0] or False
1549
1550 _columns = {
1551@@ -2433,8 +2768,8 @@
1552 context = {}
1553 acc_obj = self.pool.get('account.account')
1554 tmpl_obj = self.pool.get('account.account.template')
1555- data = self.read(cr, uid, ids)
1556- company_id = acc_obj.read(cr, uid, [data[0]['cparent_id']], ['company_id'])[0]['company_id'][0]
1557+ data = self.read(cr, uid, ids)[0]
1558+ company_id = acc_obj.read(cr, uid, [data['cparent_id'][0]], ['company_id'])[0]['company_id'][0]
1559 account_template = tmpl_obj.browse(cr, uid, context['tmpl_ids'])
1560 vals = {
1561 'name': account_template.name,
1562@@ -2445,7 +2780,7 @@
1563 'reconcile': account_template.reconcile,
1564 'shortcut': account_template.shortcut,
1565 'note': account_template.note,
1566- 'parent_id': data[0]['cparent_id'],
1567+ 'parent_id': data['cparent_id'][0],
1568 'company_id': company_id,
1569 }
1570 acc_obj.create(cr, uid, vals)
1571@@ -2477,6 +2812,41 @@
1572 'notprintable': False,
1573 }
1574
1575+ def generate_tax_code(self, cr, uid, tax_code_root_id, company_id, context=None):
1576+ '''
1577+ This function generates the tax codes from the templates of tax code that are children of the given one passed
1578+ in argument. Then it returns a dictionary with the mappping between the templates and the real objects.
1579+
1580+ :param tax_code_root_id: id of the root of all the tax code templates to process
1581+ :param company_id: id of the company the wizard is running for
1582+ :returns: dictionary with the mappping between the templates and the real objects.
1583+ :rtype: dict
1584+ '''
1585+ obj_tax_code_template = self.pool.get('account.tax.code.template')
1586+ obj_tax_code = self.pool.get('account.tax.code')
1587+ tax_code_template_ref = {}
1588+ company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
1589+
1590+ #find all the children of the tax_code_root_id
1591+ children_tax_code_template = tax_code_root_id and obj_tax_code_template.search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id') or []
1592+ for tax_code_template in obj_tax_code_template.browse(cr, uid, children_tax_code_template, context=context):
1593+ vals = {
1594+ 'name': (tax_code_root_id == tax_code_template.id) and company.name or tax_code_template.name,
1595+ 'code': tax_code_template.code,
1596+ 'info': tax_code_template.info,
1597+ 'parent_id': tax_code_template.parent_id and ((tax_code_template.parent_id.id in tax_code_template_ref) and tax_code_template_ref[tax_code_template.parent_id.id]) or False,
1598+ 'company_id': company_id,
1599+ 'sign': tax_code_template.sign,
1600+ }
1601+ #check if this tax code already exists
1602+ rec_list = obj_tax_code.search(cr, uid, [('name', '=', vals['name']),('code', '=', vals['code']),('company_id', '=', vals['company_id'])], context=context)
1603+ if not rec_list:
1604+ #if not yet, create it
1605+ new_tax_code = obj_tax_code.create(cr, uid, vals)
1606+ #recording the new tax code to do the mapping
1607+ tax_code_template_ref[tax_code_template.id] = new_tax_code
1608+ return tax_code_template_ref
1609+
1610 def name_get(self, cr, uid, ids, context=None):
1611 if not ids:
1612 return []
1613@@ -2500,17 +2870,29 @@
1614
1615 _columns={
1616 'name': fields.char('Name', size=64, required=True),
1617- 'account_root_id': fields.many2one('account.account.template','Root Account',required=True,domain=[('parent_id','=',False)]),
1618- 'tax_code_root_id': fields.many2one('account.tax.code.template','Root Tax Code',required=True,domain=[('parent_id','=',False)]),
1619+ 'parent_id': fields.many2one('account.chart.template', 'Parent Chart Template'),
1620+ 'code_digits': fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
1621+ 'visible': fields.boolean('Can be Visible?', help="Set this to False if you don't want this template to be used actively in the wizard that generate Chart of Accounts from templates, this is useful when you want to generate accounts of this template only when loading its child template."),
1622+ 'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sale and purchase rates or choose from list of taxes. This last choice assumes that the set of tax defined on this template is complete'),
1623+ 'account_root_id': fields.many2one('account.account.template', 'Root Account', domain=[('parent_id','=',False)]),
1624+ 'tax_code_root_id': fields.many2one('account.tax.code.template', 'Root Tax Code', domain=[('parent_id','=',False)]),
1625 'tax_template_ids': fields.one2many('account.tax.template', 'chart_template_id', 'Tax Template List', help='List of all the taxes that have to be installed by the wizard'),
1626- 'bank_account_view_id': fields.many2one('account.account.template','Bank Account',required=True),
1627- 'property_account_receivable': fields.many2one('account.account.template','Receivable Account'),
1628- 'property_account_payable': fields.many2one('account.account.template','Payable Account'),
1629- 'property_account_expense_categ': fields.many2one('account.account.template','Expense Category Account'),
1630- 'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'),
1631- 'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
1632- 'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
1633+ 'bank_account_view_id': fields.many2one('account.account.template', 'Bank Account'),
1634+ 'property_account_receivable': fields.many2one('account.account.template', 'Receivable Account'),
1635+ 'property_account_payable': fields.many2one('account.account.template', 'Payable Account'),
1636+ 'property_account_expense_categ': fields.many2one('account.account.template', 'Expense Category Account'),
1637+ 'property_account_income_categ': fields.many2one('account.account.template', 'Income Category Account'),
1638+ 'property_account_expense': fields.many2one('account.account.template', 'Expense Account on Product Template'),
1639+ 'property_account_income': fields.many2one('account.account.template', 'Income Account on Product Template'),
1640 'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
1641+ 'property_account_income_opening': fields.many2one('account.account.template', 'Opening Entries Income Account'),
1642+ 'property_account_expense_opening': fields.many2one('account.account.template', 'Opening Entries Expense Account'),
1643+ }
1644+
1645+ _defaults = {
1646+ 'visible': True,
1647+ 'code_digits': 6,
1648+ 'complete_tax_set': True,
1649 }
1650
1651 account_chart_template()
1652@@ -2588,6 +2970,60 @@
1653 }
1654 _order = 'sequence'
1655
1656+ def _generate_tax(self, cr, uid, tax_templates, tax_code_template_ref, company_id, context=None):
1657+ """
1658+ This method generate taxes from templates.
1659+
1660+ :param tax_templates: list of browse record of the tax templates to process
1661+ :param tax_code_template_ref: Taxcode templates reference.
1662+ :param company_id: id of the company the wizard is running for
1663+ :returns:
1664+ {
1665+ 'tax_template_to_tax': mapping between tax template and the newly generated taxes corresponding,
1666+ 'account_dict': dictionary containing a to-do list with all the accounts to assign on new taxes
1667+ }
1668+ """
1669+ if context is None:
1670+ context = {}
1671+ res = {}
1672+ todo_dict = {}
1673+ tax_template_to_tax = {}
1674+ for tax in tax_templates:
1675+ vals_tax = {
1676+ 'name':tax.name,
1677+ 'sequence': tax.sequence,
1678+ 'amount': tax.amount,
1679+ 'type': tax.type,
1680+ 'applicable_type': tax.applicable_type,
1681+ 'domain': tax.domain,
1682+ 'parent_id': tax.parent_id and ((tax.parent_id.id in tax_template_to_tax) and tax_template_to_tax[tax.parent_id.id]) or False,
1683+ 'child_depend': tax.child_depend,
1684+ 'python_compute': tax.python_compute,
1685+ 'python_compute_inv': tax.python_compute_inv,
1686+ 'python_applicable': tax.python_applicable,
1687+ 'base_code_id': tax.base_code_id and ((tax.base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.base_code_id.id]) or False,
1688+ 'tax_code_id': tax.tax_code_id and ((tax.tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.tax_code_id.id]) or False,
1689+ 'base_sign': tax.base_sign,
1690+ 'tax_sign': tax.tax_sign,
1691+ 'ref_base_code_id': tax.ref_base_code_id and ((tax.ref_base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_base_code_id.id]) or False,
1692+ 'ref_tax_code_id': tax.ref_tax_code_id and ((tax.ref_tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_tax_code_id.id]) or False,
1693+ 'ref_base_sign': tax.ref_base_sign,
1694+ 'ref_tax_sign': tax.ref_tax_sign,
1695+ 'include_base_amount': tax.include_base_amount,
1696+ 'description': tax.description,
1697+ 'company_id': company_id,
1698+ 'type_tax_use': tax.type_tax_use,
1699+ 'price_include': tax.price_include
1700+ }
1701+ new_tax = self.pool.get('account.tax').create(cr, uid, vals_tax)
1702+ tax_template_to_tax[tax.id] = new_tax
1703+ #as the accounts have not been created yet, we have to wait before filling these fields
1704+ todo_dict[new_tax] = {
1705+ 'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False,
1706+ 'account_paid_id': tax.account_paid_id and tax.account_paid_id.id or False,
1707+ }
1708+ res.update({'tax_template_to_tax': tax_template_to_tax, 'account_dict': todo_dict})
1709+ return res
1710
1711 account_tax_template()
1712
1713@@ -2601,9 +3037,42 @@
1714 'name': fields.char('Fiscal Position Template', size=64, required=True),
1715 'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
1716 'account_ids': fields.one2many('account.fiscal.position.account.template', 'position_id', 'Account Mapping'),
1717- 'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping')
1718+ 'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping'),
1719+ 'note': fields.text('Notes', translate=True),
1720 }
1721
1722+ def generate_fiscal_position(self, cr, uid, chart_temp_id, tax_template_ref, acc_template_ref, company_id, context=None):
1723+ """
1724+ This method generate Fiscal Position, Fiscal Position Accounts and Fiscal Position Taxes from templates.
1725+
1726+ :param chart_temp_id: Chart Template Id.
1727+ :param taxes_ids: Taxes templates reference for generating account.fiscal.position.tax.
1728+ :param acc_template_ref: Account templates reference for generating account.fiscal.position.account.
1729+ :param company_id: company_id selected from wizard.multi.charts.accounts.
1730+ :returns: True
1731+ """
1732+ if context is None:
1733+ context = {}
1734+ obj_tax_fp = self.pool.get('account.fiscal.position.tax')
1735+ obj_ac_fp = self.pool.get('account.fiscal.position.account')
1736+ obj_fiscal_position = self.pool.get('account.fiscal.position')
1737+ fp_ids = self.search(cr, uid, [('chart_template_id', '=', chart_temp_id)])
1738+ for position in self.browse(cr, uid, fp_ids, context=context):
1739+ new_fp = obj_fiscal_position.create(cr, uid, {'company_id': company_id, 'name': position.name, 'note': position.note})
1740+ for tax in position.tax_ids:
1741+ obj_tax_fp.create(cr, uid, {
1742+ 'tax_src_id': tax_template_ref[tax.tax_src_id.id],
1743+ 'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
1744+ 'position_id': new_fp
1745+ })
1746+ for acc in position.account_ids:
1747+ obj_ac_fp.create(cr, uid, {
1748+ 'account_src_id': acc_template_ref[acc.account_src_id.id],
1749+ 'account_dest_id': acc_template_ref[acc.account_dest_id.id],
1750+ 'position_id': new_fp
1751+ })
1752+ return True
1753+
1754 account_fiscal_position_template()
1755
1756 class account_fiscal_position_tax_template(osv.osv):
1757@@ -2631,7 +3100,9 @@
1758
1759 account_fiscal_position_account_template()
1760
1761- # Multi charts of Accounts wizard
1762+# ---------------------------------------------------------
1763+# Account generation from template wizards
1764+# ---------------------------------------------------------
1765
1766 class wizard_multi_charts_accounts(osv.osv_memory):
1767 """
1768@@ -2652,349 +3123,190 @@
1769 _columns = {
1770 'company_id':fields.many2one('res.company', 'Company', required=True),
1771 'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
1772- 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True),
1773+ 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Cash and Banks', required=True),
1774 'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
1775 'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
1776 "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"),
1777 "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"),
1778+ 'sale_tax_rate': fields.float('Sales Tax(%)'),
1779+ 'purchase_tax_rate': fields.float('Purchase Tax(%)'),
1780+ 'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'),
1781 }
1782+ def onchange_tax_rate(self, cr, uid, ids, rate=False, context=None):
1783+ return {'value': {'purchase_tax_rate': rate or False}}
1784+
1785 def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None):
1786 res = {}
1787- res['value'] = {}
1788- res['value']["sale_tax"] = False
1789- res['value']["purchase_tax"] = False
1790+ tax_templ_obj = self.pool.get('account.tax.template')
1791+ res['value'] = {'complete_tax_set': False, 'sale_tax': False, 'purchase_tax': False}
1792 if chart_template_id:
1793- sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
1794- , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
1795- purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
1796- , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence")
1797- res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False
1798- res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False
1799- return res
1800-
1801- def _get_purchase_tax(self, cr, uid, context=None):
1802- ids = self.pool.get('account.chart.template').search(cr, uid, [], context=context)
1803- if ids:
1804- chart_template_id = ids[0]
1805- purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
1806- , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence")
1807- return purchase_tax_ids and purchase_tax_ids[0] or False
1808- return False
1809-
1810- def _get_sale_tax(self, cr, uid, context=None):
1811- ids = self.pool.get('account.chart.template').search(cr, uid, [], context=context)
1812- if ids:
1813- chart_template_id = ids[0]
1814- sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id"
1815- , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
1816- return sale_tax_ids and sale_tax_ids[0] or False
1817- return False
1818-
1819- def _get_chart(self, cr, uid, context=None):
1820- ids = self.pool.get('account.chart.template').search(cr, uid, [], context=context)
1821- if ids:
1822- return ids[0]
1823- return False
1824-
1825- def _get_default_accounts(self, cr, uid, context=None):
1826- accounts = [{'acc_name':'Current','account_type':'bank'},
1827- {'acc_name':'Deposit','account_type':'bank'},
1828- {'acc_name':'Cash','account_type':'cash'}]
1829- return accounts
1830-
1831- _defaults = {
1832- 'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, [uid], c)[0].company_id.id,
1833- 'chart_template_id': _get_chart,
1834- 'bank_accounts_id': _get_default_accounts,
1835- 'sale_tax': _get_sale_tax,
1836- 'purchase_tax': _get_purchase_tax,
1837- 'code_digits': 6,
1838- 'seq_journal': True
1839- }
1840+ data = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
1841+ res['value'].update({'complete_tax_set': data.complete_tax_set})
1842+ if data.complete_tax_set:
1843+ # default tax is given by the lowest sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account
1844+ sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
1845+ , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence, id desc")
1846+ purchase_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
1847+ , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence, id desc")
1848+ res['value'].update({'sale_tax': sale_tax_ids and sale_tax_ids[0] or False, 'purchase_tax': purchase_tax_ids and purchase_tax_ids[0] or False})
1849+
1850+ if data.code_digits:
1851+ res['value'].update({'code_digits': data.code_digits})
1852+ return res
1853+
1854+ def default_get(self, cr, uid, fields, context=None):
1855+ res = super(wizard_multi_charts_accounts, self).default_get(cr, uid, fields, context=context)
1856+ tax_templ_obj = self.pool.get('account.tax.template')
1857+
1858+ if 'bank_accounts_id' in fields:
1859+ res.update({'bank_accounts_id': [{'acc_name': _('Cash'), 'account_type': 'cash'},{'acc_name': _('Bank'), 'account_type': 'bank'}]})
1860+ if 'company_id' in fields:
1861+ res.update({'company_id': self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0].company_id.id})
1862+ if 'seq_journal' in fields:
1863+ res.update({'seq_journal': True})
1864+
1865+ ids = self.pool.get('account.chart.template').search(cr, uid, [('visible', '=', True)], context=context)
1866+ if ids:
1867+ if 'chart_template_id' in fields:
1868+ res.update({'chart_template_id': ids[0]})
1869+ if 'sale_tax' in fields:
1870+ sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
1871+ , "=", ids[0]), ('type_tax_use', 'in', ('sale','all'))], order="sequence")
1872+ res.update({'sale_tax': sale_tax_ids and sale_tax_ids[0] or False})
1873+ if 'purchase_tax' in fields:
1874+ purchase_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id"
1875+ , "=", ids[0]), ('type_tax_use', 'in', ('purchase','all'))], order="sequence")
1876+ res.update({'purchase_tax': purchase_tax_ids and purchase_tax_ids[0] or False})
1877+ res.update({
1878+ 'purchase_tax_rate': 15.0,
1879+ 'sale_tax_rate': 15.0,
1880+ })
1881+ return res
1882
1883 def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
1884 res = super(wizard_multi_charts_accounts, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
1885- configured_cmp = []
1886- unconfigured_cmp = []
1887 cmp_select = []
1888- company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
1889+ acc_template_obj = self.pool.get('account.chart.template')
1890+ company_obj = self.pool.get('res.company')
1891+
1892+ company_ids = company_obj.search(cr, uid, [], context=context)
1893 #display in the widget selection of companies, only the companies that haven't been configured yet (but don't care about the demo chart of accounts)
1894 cr.execute("SELECT company_id FROM account_account WHERE active = 't' AND account_account.parent_id IS NULL AND name != %s", ("Chart For Automated Tests",))
1895 configured_cmp = [r[0] for r in cr.fetchall()]
1896 unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
1897 for field in res['fields']:
1898+<<<<<<< TREE
1899 if field == 'company_id':
1900 res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
1901 res['fields'][field]['selection'] = [('', '')]
1902 if unconfigured_cmp:
1903 cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
1904 res['fields'][field]['selection'] = cmp_select
1905+=======
1906+ if field == 'company_id':
1907+ res['fields'][field]['domain'] = [('id','in',unconfigured_cmp)]
1908+ res['fields'][field]['selection'] = [('', '')]
1909+ if unconfigured_cmp:
1910+ cmp_select = [(line.id, line.name) for line in company_obj.browse(cr, uid, unconfigured_cmp)]
1911+ res['fields'][field]['selection'] = cmp_select
1912+>>>>>>> MERGE-SOURCE
1913 return res
1914
1915- def execute(self, cr, uid, ids, context=None):
1916- obj_multi = self.browse(cr, uid, ids[0])
1917- obj_acc = self.pool.get('account.account')
1918- obj_acc_tax = self.pool.get('account.tax')
1919+ def check_created_journals(self, cr, uid, vals_journal, company_id, context=None):
1920+ """
1921+ This method used for checking journals already created or not. If not then create new journal.
1922+ """
1923 obj_journal = self.pool.get('account.journal')
1924- obj_sequence = self.pool.get('ir.sequence')
1925- obj_acc_template = self.pool.get('account.account.template')
1926- obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
1927- obj_fiscal_position = self.pool.get('account.fiscal.position')
1928+ rec_list = obj_journal.search(cr, uid, [('name','=', vals_journal['name']),('company_id', '=', company_id)], context=context)
1929+ if not rec_list:
1930+ obj_journal.create(cr, uid, vals_journal, context=context)
1931+ return True
1932+
1933+ def generate_journals(self, cr, uid, chart_template_id, acc_template_ref, company_id, context=None):
1934+ """
1935+ This method is used for creating journals.
1936+
1937+ :param chart_temp_id: Chart Template Id.
1938+ :param acc_template_ref: Account templates reference.
1939+ :param company_id: company_id selected from wizard.multi.charts.accounts.
1940+ :returns: True
1941+ """
1942+ journal_data = self._prepare_all_journals(cr, uid, chart_template_id, acc_template_ref, company_id, context=context)
1943+ for vals_journal in journal_data:
1944+ self.check_created_journals(cr, uid, vals_journal, company_id, context=context)
1945+ return True
1946+
1947+ def _prepare_all_journals(self, cr, uid, chart_template_id, acc_template_ref, company_id, context=None):
1948+ def _get_analytic_journal(journal_type):
1949+ # Get the analytic journal
1950+ data = False
1951+ if journal_type in ('sale', 'sale_refund'):
1952+ data = obj_data.get_object_reference(cr, uid, 'account', 'analytic_journal_sale')
1953+ elif journal_type in ('purchase', 'purchase_refund'):
1954+ pass
1955+ elif journal_type == 'general':
1956+ pass
1957+ return data and data[1] or False
1958+
1959+ def _get_default_account(journal_type, type='debit'):
1960+ # Get the default accounts
1961+ default_account = False
1962+ if journal_type in ('sale', 'sale_refund'):
1963+ default_account = acc_template_ref.get(template.property_account_income_categ.id)
1964+ elif journal_type in ('purchase', 'purchase_refund'):
1965+ default_account = acc_template_ref.get(template.property_account_expense_categ.id)
1966+ elif journal_type == 'situation':
1967+ if type == 'debit':
1968+ default_account = acc_template_ref.get(template.property_account_expense_opening.id)
1969+ else:
1970+ default_account = acc_template_ref.get(template.property_account_income_opening.id)
1971+ return default_account
1972+
1973+ def _get_view_id(journal_type):
1974+ # Get the journal views
1975+ if journal_type in ('general', 'situation'):
1976+ data = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_view')
1977+ elif journal_type in ('sale_refund', 'purchase_refund'):
1978+ data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_refund_journal_view')
1979+ else:
1980+ data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_journal_view')
1981+ return data and data[1] or False
1982+
1983+ journal_names = {
1984+ 'sale': _('Sales Journal'),
1985+ 'purchase': _('Purchase Journal'),
1986+ 'sale_refund': _('Sales Refund Journal'),
1987+ 'purchase_refund': _('Purchase Refund Journal'),
1988+ 'general': _('Miscellaneous Journal'),
1989+ 'situation': _('Opening Entries Journal'),
1990+ }
1991+ journal_codes = {
1992+ 'sale': _('SAJ'),
1993+ 'purchase': _('EXJ'),
1994+ 'sale_refund': _('SCNJ'),
1995+ 'purchase_refund': _('ECNJ'),
1996+ 'general': _('MISC'),
1997+ 'situation': _('OPEJ'),
1998+ }
1999+
2000 obj_data = self.pool.get('ir.model.data')
2001 analytic_journal_obj = self.pool.get('account.analytic.journal')
2002- obj_tax_code = self.pool.get('account.tax.code')
2003- # Creating Account
2004- obj_acc_root = obj_multi.chart_template_id.account_root_id
2005- tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
2006- company_id = obj_multi.company_id.id
2007-
2008- #new code
2009- acc_template_ref = {}
2010- tax_template_ref = {}
2011- tax_code_template_ref = {}
2012- todo_dict = {}
2013-
2014- #create all the tax code
2015- children_tax_code_template = self.pool.get('account.tax.code.template').search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
2016- children_tax_code_template.sort()
2017- for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template, context=context):
2018- vals={
2019- 'name': (tax_code_root_id == tax_code_template.id) and obj_multi.company_id.name or tax_code_template.name,
2020- 'code': tax_code_template.code,
2021- 'info': tax_code_template.info,
2022- 'parent_id': tax_code_template.parent_id and ((tax_code_template.parent_id.id in tax_code_template_ref) and tax_code_template_ref[tax_code_template.parent_id.id]) or False,
2023- 'company_id': company_id,
2024- 'sign': tax_code_template.sign,
2025- }
2026- new_tax_code = obj_tax_code.create(cr, uid, vals)
2027- #recording the new tax code to do the mapping
2028- tax_code_template_ref[tax_code_template.id] = new_tax_code
2029-
2030- #create all the tax
2031- tax_template_to_tax = {}
2032- for tax in obj_multi.chart_template_id.tax_template_ids:
2033- #create it
2034- vals_tax = {
2035- 'name':tax.name,
2036- 'sequence': tax.sequence,
2037- 'amount':tax.amount,
2038- 'type':tax.type,
2039- 'applicable_type': tax.applicable_type,
2040- 'domain':tax.domain,
2041- 'parent_id': tax.parent_id and ((tax.parent_id.id in tax_template_ref) and tax_template_ref[tax.parent_id.id]) or False,
2042- 'child_depend': tax.child_depend,
2043- 'python_compute': tax.python_compute,
2044- 'python_compute_inv': tax.python_compute_inv,
2045- 'python_applicable': tax.python_applicable,
2046- 'base_code_id': tax.base_code_id and ((tax.base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.base_code_id.id]) or False,
2047- 'tax_code_id': tax.tax_code_id and ((tax.tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.tax_code_id.id]) or False,
2048- 'base_sign': tax.base_sign,
2049- 'tax_sign': tax.tax_sign,
2050- 'ref_base_code_id': tax.ref_base_code_id and ((tax.ref_base_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_base_code_id.id]) or False,
2051- 'ref_tax_code_id': tax.ref_tax_code_id and ((tax.ref_tax_code_id.id in tax_code_template_ref) and tax_code_template_ref[tax.ref_tax_code_id.id]) or False,
2052- 'ref_base_sign': tax.ref_base_sign,
2053- 'ref_tax_sign': tax.ref_tax_sign,
2054- 'include_base_amount': tax.include_base_amount,
2055- 'description':tax.description,
2056- 'company_id': company_id,
2057- 'type_tax_use': tax.type_tax_use,
2058- 'price_include': tax.price_include
2059- }
2060- new_tax = obj_acc_tax.create(cr, uid, vals_tax)
2061- tax_template_to_tax[tax.id] = new_tax
2062- #as the accounts have not been created yet, we have to wait before filling these fields
2063- todo_dict[new_tax] = {
2064- 'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False,
2065- 'account_paid_id': tax.account_paid_id and tax.account_paid_id.id or False,
2066- }
2067- tax_template_ref[tax.id] = new_tax
2068-
2069- #deactivate the parent_store functionnality on account_account for rapidity purpose
2070- ctx = context and context.copy() or {}
2071- ctx['defer_parent_store_computation'] = True
2072-
2073- children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)])
2074- children_acc_template.sort()
2075- for account_template in obj_acc_template.browse(cr, uid, children_acc_template,context=context):
2076- tax_ids = []
2077- for tax in account_template.tax_ids:
2078- tax_ids.append(tax_template_ref[tax.id])
2079- #create the account_account
2080-
2081- dig = obj_multi.code_digits
2082- code_main = account_template.code and len(account_template.code) or 0
2083- code_acc = account_template.code or ''
2084- if code_main>0 and code_main<=dig and account_template.type != 'view':
2085- code_acc=str(code_acc) + (str('0'*(dig-code_main)))
2086- vals={
2087- 'name': (obj_acc_root.id == account_template.id) and obj_multi.company_id.name or account_template.name,
2088- 'currency_id': account_template.currency_id and account_template.currency_id.id or False,
2089- 'code': code_acc,
2090- 'type': account_template.type,
2091- 'user_type': account_template.user_type and account_template.user_type.id or False,
2092- 'reconcile': account_template.reconcile,
2093- 'shortcut': account_template.shortcut,
2094- 'note': account_template.note,
2095- 'parent_id': account_template.parent_id and ((account_template.parent_id.id in acc_template_ref) and acc_template_ref[account_template.parent_id.id]) or False,
2096- 'tax_ids': [(6,0,tax_ids)],
2097- 'company_id': company_id,
2098- }
2099- new_account = obj_acc.create(cr, uid, vals, context=ctx)
2100- acc_template_ref[account_template.id] = new_account
2101- #reactivate the parent_store functionnality on account_account
2102- self.pool.get('account.account')._parent_store_compute(cr)
2103-
2104- for key,value in todo_dict.items():
2105- if value['account_collected_id'] or value['account_paid_id']:
2106- obj_acc_tax.write(cr, uid, [key], {
2107- 'account_collected_id': acc_template_ref.get(value['account_collected_id'], False),
2108- 'account_paid_id': acc_template_ref.get(value['account_paid_id'], False),
2109- })
2110-
2111- # Creating Journals Sales and Purchase
2112- vals_journal={}
2113- data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
2114- data = obj_data.browse(cr, uid, data_id[0], context=context)
2115- view_id = data.res_id
2116-
2117- seq_id = obj_sequence.search(cr, uid, [('name','=','Account Journal')])[0]
2118-
2119- if obj_multi.seq_journal:
2120- seq_id_sale = obj_sequence.search(cr, uid, [('name','=','Sale Journal')])[0]
2121- seq_id_purchase = obj_sequence.search(cr, uid, [('name','=','Purchase Journal')])[0]
2122- seq_id_sale_refund = obj_sequence.search(cr, uid, [('name','=','Sales Refund Journal')])
2123- if seq_id_sale_refund:
2124- seq_id_sale_refund = seq_id_sale_refund[0]
2125- seq_id_purchase_refund = obj_sequence.search(cr, uid, [('name','=','Purchase Refund Journal')])
2126- if seq_id_purchase_refund:
2127- seq_id_purchase_refund = seq_id_purchase_refund[0]
2128- else:
2129- seq_id_sale = seq_id
2130- seq_id_purchase = seq_id
2131- seq_id_sale_refund = seq_id
2132- seq_id_purchase_refund = seq_id
2133-
2134- vals_journal['view_id'] = view_id
2135-
2136- #Sales Journal
2137- analitical_sale_ids = analytic_journal_obj.search(cr,uid,[('type','=','sale')])
2138- analitical_journal_sale = analitical_sale_ids and analitical_sale_ids[0] or False
2139-
2140- vals_journal['name'] = _('Sales Journal')
2141- vals_journal['type'] = 'sale'
2142- vals_journal['code'] = _('SAJ')
2143- vals_journal['sequence_id'] = seq_id_sale
2144- vals_journal['company_id'] = company_id
2145- vals_journal['analytic_journal_id'] = analitical_journal_sale
2146-
2147- if obj_multi.chart_template_id.property_account_receivable:
2148- vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
2149- vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
2150-
2151- obj_journal.create(cr,uid,vals_journal)
2152-
2153- # Purchase Journal
2154- analitical_purchase_ids = analytic_journal_obj.search(cr,uid,[('type','=','purchase')])
2155- analitical_journal_purchase = analitical_purchase_ids and analitical_purchase_ids[0] or False
2156-
2157- vals_journal['name'] = _('Purchase Journal')
2158- vals_journal['type'] = 'purchase'
2159- vals_journal['code'] = _('EXJ')
2160- vals_journal['sequence_id'] = seq_id_purchase
2161- vals_journal['view_id'] = view_id
2162- vals_journal['company_id'] = company_id
2163- vals_journal['analytic_journal_id'] = analitical_journal_purchase
2164-
2165- if obj_multi.chart_template_id.property_account_payable:
2166- vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
2167- vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
2168-
2169- obj_journal.create(cr,uid,vals_journal)
2170-
2171- # Creating Journals Sales Refund and Purchase Refund
2172- vals_journal = {}
2173- data_id = obj_data.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_refund_journal_view')], context=context)
2174- data = obj_data.browse(cr, uid, data_id[0], context=context)
2175- view_id = data.res_id
2176-
2177- #Sales Refund Journal
2178- vals_journal = {
2179- 'view_id': view_id,
2180- 'name': _('Sales Refund Journal'),
2181- 'type': 'sale_refund',
2182- 'refund_journal': True,
2183- 'code': _('SCNJ'),
2184- 'sequence_id': seq_id_sale_refund,
2185- 'analytic_journal_id': analitical_journal_sale,
2186- 'company_id': company_id
2187- }
2188-
2189- if obj_multi.chart_template_id.property_account_receivable:
2190- vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
2191- vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
2192-
2193-
2194-# if obj_multi.property_account_receivable:
2195-# vals_journal.update({
2196-# 'default_credit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id],
2197-# 'default_debit_account_id': acc_template_ref[obj_multi.chart_template_id.property_account_income_categ.id]
2198-# })
2199- obj_journal.create(cr, uid, vals_journal, context=context)
2200-
2201- # Purchase Refund Journal
2202- vals_journal = {
2203- 'view_id': view_id,
2204- 'name': _('Purchase Refund Journal'),
2205- 'type': 'purchase_refund',
2206- 'refund_journal': True,
2207- 'code': _('ECNJ'),
2208- 'sequence_id': seq_id_purchase_refund,
2209- 'analytic_journal_id': analitical_journal_purchase,
2210- 'company_id': company_id
2211- }
2212-
2213- if obj_multi.chart_template_id.property_account_payable:
2214- vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
2215- vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
2216-
2217-
2218-# if obj_multi.property_account_payable:
2219-# vals_journal.update({
2220-# 'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id],
2221-# 'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id]
2222-# })
2223- obj_journal.create(cr, uid, vals_journal, context=context)
2224-
2225- # Bank Journals
2226- data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
2227- data = obj_data.browse(cr, uid, data_id[0], context=context)
2228- view_id_cash = data.res_id
2229-
2230- data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
2231- data = obj_data.browse(cr, uid, data_id[0], context=context)
2232- view_id_cur = data.res_id
2233- ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
2234-
2235- current_num = 1
2236- for line in obj_multi.bank_accounts_id:
2237- #create the account_account for this bank journal
2238- tmp = line.acc_name
2239- dig = obj_multi.code_digits
2240- if ref_acc_bank.code:
2241- try:
2242- new_code = str(int(ref_acc_bank.code.ljust(dig,'0')) + current_num)
2243- except:
2244- new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)),'0')) + str(current_num)
2245+ template = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
2246+
2247+ journal_data = []
2248+ for journal_type in ['sale', 'purchase', 'sale_refund', 'purchase_refund', 'general', 'situation']:
2249 vals = {
2250- 'name': tmp,
2251- 'currency_id': line.currency_id and line.currency_id.id or False,
2252- 'code': new_code,
2253- 'type': 'liquidity',
2254- 'user_type': account_template.user_type and account_template.user_type.id or False,
2255- 'reconcile': True,
2256- 'parent_id': acc_template_ref[ref_acc_bank.id] or False,
2257+ 'type': journal_type,
2258+ 'name': journal_names[journal_type],
2259+ 'code': journal_codes[journal_type],
2260 'company_id': company_id,
2261+ 'centralisation': journal_type == 'situation',
2262+ 'view_id': _get_view_id(journal_type),
2263+ 'analytic_journal_id': _get_analytic_journal(journal_type),
2264+ 'default_credit_account_id': _get_default_account(journal_type, 'credit'),
2265+ 'default_debit_account_id': _get_default_account(journal_type, 'debit'),
2266 }
2267+<<<<<<< TREE
2268 acc_cash_id = obj_acc.create(cr,uid,vals)
2269
2270 if obj_multi.seq_journal:
2271@@ -3027,9 +3339,22 @@
2272 current_num += 1
2273
2274 #create the properties
2275+=======
2276+ journal_data.append(vals)
2277+ return journal_data
2278+
2279+ def generate_properties(self, cr, uid, chart_template_id, acc_template_ref, company_id, context=None):
2280+ """
2281+ This method used for creating properties.
2282+
2283+ :param chart_template_id: id of the current chart template for which we need to create properties
2284+ :param acc_template_ref: Mapping between ids of account templates and real accounts created from them
2285+ :param company_id: company_id selected from wizard.multi.charts.accounts.
2286+ :returns: True
2287+ """
2288+>>>>>>> MERGE-SOURCE
2289 property_obj = self.pool.get('ir.property')
2290- fields_obj = self.pool.get('ir.model.fields')
2291-
2292+ field_obj = self.pool.get('ir.model.fields')
2293 todo_list = [
2294 ('property_account_receivable','res.partner','account.account'),
2295 ('property_account_payable','res.partner','account.account'),
2296@@ -3039,77 +3364,320 @@
2297 ('property_account_income','product.template','account.account'),
2298 ('property_reserve_and_surplus_account','res.company','account.account')
2299 ]
2300+ template = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
2301 for record in todo_list:
2302- r = []
2303- r = property_obj.search(cr, uid, [('name','=', record[0] ),('company_id','=',company_id)])
2304- account = getattr(obj_multi.chart_template_id, record[0])
2305- field = fields_obj.search(cr, uid, [('name','=',record[0]),('model','=',record[1]),('relation','=',record[2])])
2306- vals = {
2307- 'name': record[0],
2308- 'company_id': company_id,
2309- 'fields_id': field[0],
2310- 'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False,
2311- }
2312-
2313- if r:
2314- #the property exist: modify it
2315- property_obj.write(cr, uid, r, vals)
2316- else:
2317- #create the property
2318- property_obj.create(cr, uid, vals)
2319-
2320- fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.chart_template_id.id)])
2321-
2322- if fp_ids:
2323-
2324- obj_tax_fp = self.pool.get('account.fiscal.position.tax')
2325- obj_ac_fp = self.pool.get('account.fiscal.position.account')
2326-
2327- for position in obj_fiscal_position_template.browse(cr, uid, fp_ids, context=context):
2328-
2329- vals_fp = {
2330+ account = getattr(template, record[0])
2331+ value = account and 'account.account,' + str(acc_template_ref[account.id]) or False
2332+ if value:
2333+ field = field_obj.search(cr, uid, [('name', '=', record[0]),('model', '=', record[1]),('relation', '=', record[2])], context=context)
2334+ vals = {
2335+ 'name': record[0],
2336 'company_id': company_id,
2337- 'name': position.name,
2338- }
2339- new_fp = obj_fiscal_position.create(cr, uid, vals_fp)
2340-
2341- for tax in position.tax_ids:
2342- vals_tax = {
2343- 'tax_src_id': tax_template_ref[tax.tax_src_id.id],
2344- 'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
2345- 'position_id': new_fp,
2346- }
2347- obj_tax_fp.create(cr, uid, vals_tax)
2348-
2349- for acc in position.account_ids:
2350- vals_acc = {
2351- 'account_src_id': acc_template_ref[acc.account_src_id.id],
2352- 'account_dest_id': acc_template_ref[acc.account_dest_id.id],
2353- 'position_id': new_fp,
2354- }
2355- obj_ac_fp.create(cr, uid, vals_acc)
2356-
2357- ir_values = self.pool.get('ir.values')
2358- if obj_multi.sale_tax:
2359- ir_values.set(cr, uid, key='default', key2=False, name="taxes_id", company=obj_multi.company_id.id,
2360- models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.sale_tax.id]])
2361- if obj_multi.purchase_tax:
2362- ir_values.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=obj_multi.company_id.id,
2363- models =[('product.product',False)], value=[tax_template_to_tax[obj_multi.purchase_tax.id]])
2364+ 'fields_id': field[0],
2365+ 'value': value,
2366+ }
2367+ property_ids = property_obj.search(cr, uid, [('name','=', record[0]),('company_id', '=', company_id)], context=context)
2368+ if property_ids:
2369+ #the property exist: modify it
2370+ property_obj.write(cr, uid, property_ids, vals, context=context)
2371+ else:
2372+ #create the property
2373+ property_obj.create(cr, uid, vals, context=context)
2374+ return True
2375+
2376+ def _install_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, acc_ref={}, taxes_ref={}, tax_code_ref={}, context=None):
2377+ '''
2378+ This function recursively loads the template objects and create the real objects from them.
2379+
2380+ :param template_id: id of the chart template to load
2381+ :param company_id: id of the company the wizard is running for
2382+ :param code_digits: integer that depicts the number of digits the accounts code should have in the COA
2383+ :param obj_wizard: the current wizard for generating the COA from the templates
2384+ :param acc_ref: Mapping between ids of account templates and real accounts created from them
2385+ :param taxes_ref: Mapping between ids of tax templates and real taxes created from them
2386+ :param tax_code_ref: Mapping between ids of tax code templates and real tax codes created from them
2387+ :returns: return a tuple with a dictionary containing
2388+ * the mapping between the account template ids and the ids of the real accounts that have been generated
2389+ from them, as first item,
2390+ * a similar dictionary for mapping the tax templates and taxes, as second item,
2391+ * a last identical containing the mapping of tax code templates and tax codes
2392+ :rtype: tuple(dict, dict, dict)
2393+ '''
2394+ template = self.pool.get('account.chart.template').browse(cr, uid, template_id, context=context)
2395+ if template.parent_id:
2396+ tmp1, tmp2, tmp3 = self._install_template(cr, uid, template.parent_id.id, company_id, code_digits=code_digits, acc_ref=acc_ref, taxes_ref=taxes_ref, tax_code_ref=tax_code_ref, context=context)
2397+ acc_ref.update(tmp1)
2398+ taxes_ref.update(tmp2)
2399+ tax_code_ref.update(tmp3)
2400+ tmp1, tmp2, tmp3 = self._load_template(cr, uid, template_id, company_id, code_digits=code_digits, obj_wizard=obj_wizard, account_ref=acc_ref, taxes_ref=taxes_ref, tax_code_ref=tax_code_ref, context=context)
2401+ acc_ref.update(tmp1)
2402+ taxes_ref.update(tmp2)
2403+ tax_code_ref.update(tmp3)
2404+ return acc_ref, taxes_ref, tax_code_ref
2405+
2406+ def _load_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, account_ref={}, taxes_ref={}, tax_code_ref={}, context=None):
2407+ '''
2408+ This function generates all the objects from the templates
2409+
2410+ :param template_id: id of the chart template to load
2411+ :param company_id: id of the company the wizard is running for
2412+ :param code_digits: integer that depicts the number of digits the accounts code should have in the COA
2413+ :param obj_wizard: the current wizard for generating the COA from the templates
2414+ :param acc_ref: Mapping between ids of account templates and real accounts created from them
2415+ :param taxes_ref: Mapping between ids of tax templates and real taxes created from them
2416+ :param tax_code_ref: Mapping between ids of tax code templates and real tax codes created from them
2417+ :returns: return a tuple with a dictionary containing
2418+ * the mapping between the account template ids and the ids of the real accounts that have been generated
2419+ from them, as first item,
2420+ * a similar dictionary for mapping the tax templates and taxes, as second item,
2421+ * a last identical containing the mapping of tax code templates and tax codes
2422+ :rtype: tuple(dict, dict, dict)
2423+ '''
2424+ template = self.pool.get('account.chart.template').browse(cr, uid, template_id, context=context)
2425+ obj_tax_code_template = self.pool.get('account.tax.code.template')
2426+ obj_acc_tax = self.pool.get('account.tax')
2427+ obj_tax_temp = self.pool.get('account.tax.template')
2428+ obj_acc_template = self.pool.get('account.account.template')
2429+ obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
2430+
2431+ # create all the tax code.
2432+ tax_code_ref.update(obj_tax_code_template.generate_tax_code(cr, uid, template.tax_code_root_id.id, company_id, context=context))
2433+
2434+ # Generate taxes from templates.
2435+ tax_templates = [x for x in template.tax_template_ids]
2436+ generated_tax_res = obj_tax_temp._generate_tax(cr, uid, tax_templates, tax_code_ref, company_id, context=context)
2437+ taxes_ref.update(generated_tax_res['tax_template_to_tax'])
2438+
2439+ # Generating Accounts from templates.
2440+ account_template_ref = obj_acc_template.generate_account(cr, uid, template_id, taxes_ref, account_ref, code_digits, company_id, context=context)
2441+ account_ref.update(account_template_ref)
2442+
2443+ # writing account values on tax after creation of accounts
2444+ for key,value in generated_tax_res['account_dict'].items():
2445+ if value['account_collected_id'] or value['account_paid_id']:
2446+ obj_acc_tax.write(cr, uid, [key], {
2447+ 'account_collected_id': account_ref.get(value['account_collected_id'], False),
2448+ 'account_paid_id': account_ref.get(value['account_paid_id'], False),
2449+ })
2450+
2451+ # Create Journals
2452+ self.generate_journals(cr, uid, template_id, account_ref, company_id, context=context)
2453+
2454+ # generate properties function
2455+ self.generate_properties(cr, uid, template_id, account_ref, company_id, context=context)
2456+
2457+ # Generate Fiscal Position , Fiscal Position Accounts and Fiscal Position Taxes from templates
2458+ obj_fiscal_position_template.generate_fiscal_position(cr, uid, template_id, taxes_ref, account_ref, company_id, context=context)
2459+
2460+ return account_ref, taxes_ref, tax_code_ref
2461+
2462+ def _create_tax_templates_from_rates(self, cr, uid, obj_wizard, company_id, context=None):
2463+ '''
2464+ This function checks if the chosen chart template is configured as containing a full set of taxes, and if
2465+ it's not the case, it creates the templates for account.tax.code and for account.account.tax objects accordingly
2466+ to the provided sale/purchase rates. Then it saves the new tax templates as default taxes to use for this chart
2467+ template.
2468+
2469+ :param obj_wizard: browse record of wizard to generate COA from templates
2470+ :param company_id: id of the company for wich the wizard is running
2471+ :return: True
2472+ '''
2473+ obj_tax_code_template = self.pool.get('account.tax.code.template')
2474+ obj_tax_temp = self.pool.get('account.tax.template')
2475+ chart_template = obj_wizard.chart_template_id
2476+ vals = {}
2477+ # get the ids of all the parents of the selected account chart template
2478+ current_chart_template = chart_template
2479+ all_parents = [current_chart_template.id]
2480+ while current_chart_template.parent_id:
2481+ current_chart_template = current_chart_template.parent_id
2482+ all_parents.append(current_chart_template.id)
2483+ # create tax templates and tax code templates from purchase_tax_rate and sale_tax_rate fields
2484+ if not chart_template.complete_tax_set:
2485+ value = obj_wizard.sale_tax_rate
2486+ ref_tax_ids = obj_tax_temp.search(cr, uid, [('type_tax_use','in', ('sale','all')), ('chart_template_id', 'in', all_parents)], context=context, order="sequence, id desc", limit=1)
2487+ obj_tax_temp.write(cr, uid, ref_tax_ids, {'amount': value/100.0, 'name': _('Tax %.2f%%') % value})
2488+ value = obj_wizard.purchase_tax_rate
2489+ ref_tax_ids = obj_tax_temp.search(cr, uid, [('type_tax_use','in', ('purchase','all')), ('chart_template_id', 'in', all_parents)], context=context, order="sequence, id desc", limit=1)
2490+ obj_tax_temp.write(cr, uid, ref_tax_ids, {'amount': value/100.0, 'name': _('Purchase Tax %.2f%%') % value})
2491+ return True
2492+
2493+ def execute(self, cr, uid, ids, context=None):
2494+ '''
2495+ This function is called at the confirmation of the wizard to generate the COA from the templates. It will read
2496+ all the provided information to create the accounts, the banks, the journals, the taxes, the tax codes, the
2497+ accounting properties... accordingly for the chosen company.
2498+ '''
2499+ ir_values_obj = self.pool.get('ir.values')
2500+ obj_wizard = self.browse(cr, uid, ids[0])
2501+ company_id = obj_wizard.company_id.id
2502+ # If the floats for sale/purchase rates have been filled, create templates from them
2503+ self._create_tax_templates_from_rates(cr, uid, obj_wizard, company_id, context=context)
2504+
2505+ # Install all the templates objects and generate the real objects
2506+ acc_template_ref, taxes_ref, tax_code_ref = self._install_template(cr, uid, obj_wizard.chart_template_id.id, company_id, code_digits=obj_wizard.code_digits, obj_wizard=obj_wizard, context=context)
2507+
2508+ # write values of default taxes for product
2509+ if obj_wizard.sale_tax and taxes_ref:
2510+ ir_values_obj.set(cr, 1, key='default', key2=False, name="taxes_id", company=company_id,
2511+ models =[('product.product',False)], value=[taxes_ref[obj_wizard.sale_tax.id]])
2512+ if obj_wizard.purchase_tax and taxes_ref:
2513+ ir_values_obj.set(cr, 1, key='default', key2=False, name="supplier_taxes_id", company=company_id,
2514+ models =[('product.product',False)], value=[taxes_ref[obj_wizard.purchase_tax.id]])
2515+
2516+ # Create Bank journals
2517+ self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)
2518+ action = {
2519+ 'type': 'ir.actions.act_window',
2520+ 'view_type': 'form',
2521+ 'view_mode': 'form',
2522+ 'res_model': 'board.board',
2523+ 'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'board_account_form')[1],
2524+ 'menu_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'menu_finance')[1]
2525+ }
2526+ return action
2527+
2528+ def _prepare_bank_journal(self, cr, uid, line, current_num, default_account_id, company_id, context=None):
2529+ '''
2530+ This function prepares the value to use for the creation of a bank journal created through the wizard of
2531+ generating COA from templates.
2532+
2533+ :param line: dictionary containing the values encoded by the user related to his bank account
2534+ :param current_num: integer corresponding to a counter of the already created bank journals through this wizard.
2535+ :param default_account_id: id of the default debit.credit account created before for this journal.
2536+ :param company_id: id of the company for which the wizard is running
2537+ :return: mapping of field names and values
2538+ :rtype: dict
2539+ '''
2540+ obj_data = self.pool.get('ir.model.data')
2541+ obj_journal = self.pool.get('account.journal')
2542+ # Get the id of journal views
2543+ tmp = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_bank_view_multi')
2544+ view_id_cur = tmp and tmp[1] or False
2545+ tmp = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_bank_view')
2546+ view_id_cash = tmp and tmp[1] or False
2547+
2548+ # we need to loop again to find next number for journal code
2549+ # because we can't rely on the value current_num as,
2550+ # its possible that we already have bank journals created (e.g. by the creation of res.partner.bank)
2551+ # and the next number for account code might have been already used before for journal
2552+ for num in xrange(current_num, 100):
2553+ # journal_code has a maximal size of 5, hence we can enforce the boundary num < 100
2554+ journal_code = _('BNK')[:3] + str(num)
2555+ ids = obj_journal.search(cr, uid, [('code', '=', journal_code), ('company_id', '=', company_id)], context=context)
2556+ if not ids:
2557+ break
2558+ else:
2559+ raise osv.except_osv(_('Error'), _('Cannot generate an unused journal code.'))
2560+
2561+ vals = {
2562+ 'name': line['acc_name'],
2563+ 'code': journal_code,
2564+ 'type': line['account_type'] == 'cash' and 'cash' or 'bank',
2565+ 'company_id': company_id,
2566+ 'analytic_journal_id': False,
2567+ 'currency': False,
2568+ 'default_credit_account_id': default_account_id,
2569+ 'default_debit_account_id': default_account_id,
2570+ }
2571+ if line['currency_id']:
2572+ vals['view_id'] = view_id_cur
2573+ vals['currency'] = line['currency_id']
2574+ else:
2575+ vals['view_id'] = view_id_cash
2576+ return vals
2577+
2578+ def _prepare_bank_account(self, cr, uid, line, new_code, acc_template_ref, ref_acc_bank, company_id, context=None):
2579+ '''
2580+ This function prepares the value to use for the creation of the default debit and credit accounts of a
2581+ bank journal created through the wizard of generating COA from templates.
2582+
2583+ :param line: dictionary containing the values encoded by the user related to his bank account
2584+ :param new_code: integer corresponding to the next available number to use as account code
2585+ :param acc_template_ref: the dictionary containing the mapping between the ids of account templates and the ids
2586+ of the accounts that have been generated from them.
2587+ :param ref_acc_bank: browse record of the account template set as root of all bank accounts for the chosen
2588+ template
2589+ :param company_id: id of the company for which the wizard is running
2590+ :return: mapping of field names and values
2591+ :rtype: dict
2592+ '''
2593+ obj_data = self.pool.get('ir.model.data')
2594+
2595+ # Get the id of the user types fr-or cash and bank
2596+ tmp = obj_data.get_object_reference(cr, uid, 'account', 'data_account_type_cash')
2597+ cash_type = tmp and tmp[1] or False
2598+ tmp = obj_data.get_object_reference(cr, uid, 'account', 'data_account_type_bank')
2599+ bank_type = tmp and tmp[1] or False
2600+ return {
2601+ 'name': line['acc_name'],
2602+ 'currency_id': line['currency_id'],
2603+ 'code': new_code,
2604+ 'type': 'liquidity',
2605+ 'user_type': line['account_type'] == 'cash' and cash_type or bank_type,
2606+ 'parent_id': acc_template_ref[ref_acc_bank.id] or False,
2607+ 'company_id': company_id,
2608+ }
2609+
2610+ def _create_bank_journals_from_o2m(self, cr, uid, obj_wizard, company_id, acc_template_ref, context=None):
2611+ '''
2612+ This function creates bank journals and its accounts for each line encoded in the field bank_accounts_id of the
2613+ wizard.
2614+
2615+ :param obj_wizard: the current wizard that generates the COA from the templates.
2616+ :param company_id: the id of the company for which the wizard is running.
2617+ :param acc_template_ref: the dictionary containing the mapping between the ids of account templates and the ids
2618+ of the accounts that have been generated from them.
2619+ :return: True
2620+ '''
2621+ obj_acc = self.pool.get('account.account')
2622+ obj_journal = self.pool.get('account.journal')
2623+ code_digits = obj_wizard.code_digits
2624+
2625+ # Build a list with all the data to process
2626+ journal_data = []
2627+ if obj_wizard.bank_accounts_id:
2628+ for acc in obj_wizard.bank_accounts_id:
2629+ vals = {
2630+ 'acc_name': acc.acc_name,
2631+ 'account_type': acc.account_type,
2632+ 'currency_id': acc.currency_id.id,
2633+ }
2634+ journal_data.append(vals)
2635+ ref_acc_bank = obj_wizard.chart_template_id.bank_account_view_id
2636+ if journal_data and not ref_acc_bank.code:
2637+ raise osv.except_osv(_('Configuration Error !'), _('The bank account defined on the selected chart of accounts hasn\'t a code.'))
2638+
2639+ current_num = 1
2640+ for line in journal_data:
2641+ # Seek the next available number for the account code
2642+ while True:
2643+ new_code = str(ref_acc_bank.code.ljust(code_digits-len(str(current_num)), '0')) + str(current_num)
2644+ ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', company_id)])
2645+ if not ids:
2646+ break
2647+ else:
2648+ current_num += 1
2649+ # Create the default debit/credit accounts for this bank journal
2650+ vals = self._prepare_bank_account(cr, uid, line, new_code, acc_template_ref, ref_acc_bank, company_id, context=context)
2651+ default_account_id = obj_acc.create(cr, uid, vals, context=context)
2652+
2653+ #create the bank journal
2654+ vals_journal = self._prepare_bank_journal(cr, uid, line, current_num, default_account_id, company_id, context=context)
2655+ obj_journal.create(cr, uid, vals_journal)
2656+ current_num += 1
2657+ return True
2658
2659 wizard_multi_charts_accounts()
2660
2661 class account_bank_accounts_wizard(osv.osv_memory):
2662- _name = 'account.bank.accounts.wizard'
2663+ _name='account.bank.accounts.wizard'
2664
2665 _columns = {
2666 'acc_name': fields.char('Account Name.', size=64, required=True),
2667 'bank_account_id': fields.many2one('wizard.multi.charts.accounts', 'Bank Account', required=True),
2668- 'currency_id': fields.many2one('res.currency', 'Currency'),
2669- 'account_type': fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Type', size=32),
2670- }
2671- _defaults = {
2672- 'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
2673+ 'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
2674+ 'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32),
2675 }
2676
2677 account_bank_accounts_wizard()
2678
2679=== modified file 'account/account_analytic_line.py'
2680--- account/account_analytic_line.py 2012-03-20 09:47:23 +0000
2681+++ account/account_analytic_line.py 2013-05-08 15:45:41 +0000
2682@@ -19,8 +19,6 @@
2683 #
2684 ##############################################################################
2685
2686-import time
2687-
2688 from osv import fields
2689 from osv import osv
2690 from tools.translate import _
2691@@ -41,7 +39,7 @@
2692 }
2693
2694 _defaults = {
2695- 'date': lambda *a: time.strftime('%Y-%m-%d'),
2696+ 'date': fields.date.context_today,
2697 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
2698 }
2699 _order = 'date desc'
2700@@ -80,7 +78,10 @@
2701 j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
2702 prod = product_obj.browse(cr, uid, prod_id, context=context)
2703 result = 0.0
2704-
2705+ if prod_id:
2706+ unit = prod.uom_id.id
2707+ if j_id.type == 'purchase':
2708+ unit = prod.uom_po_id.id
2709 if j_id.type <> 'sale':
2710 a = prod.product_tmpl_id.property_account_expense.id
2711 if not a:
2712@@ -120,13 +121,14 @@
2713 ctx['uom'] = unit
2714 amount_unit = prod.price_get(pricetype.field, context=ctx)[prod.id]
2715 prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
2716- amount = amount_unit * quantity or 1.0
2717+ amount = amount_unit * quantity or 0.0
2718 result = round(amount, prec)
2719 if not flag:
2720 result *= -1
2721 return {'value': {
2722 'amount': result,
2723 'general_account_id': a,
2724+ 'product_uom_id': unit
2725 }
2726 }
2727
2728@@ -155,4 +157,4 @@
2729
2730 res_partner()
2731
2732-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
2733\ No newline at end of file
2734+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
2735
2736=== added file 'account/account_bank.py'
2737--- account/account_bank.py 1970-01-01 00:00:00 +0000
2738+++ account/account_bank.py 2013-05-08 15:45:41 +0000
2739@@ -0,0 +1,112 @@
2740+# -*- coding: utf-8 -*-
2741+##############################################################################
2742+#
2743+# OpenERP, Open Source Management Solution
2744+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
2745+#
2746+# This program is free software: you can redistribute it and/or modify
2747+# it under the terms of the GNU Affero General Public License as
2748+# published by the Free Software Foundation, either version 3 of the
2749+# License, or (at your option) any later version.
2750+#
2751+# This program is distributed in the hope that it will be useful,
2752+# but WITHOUT ANY WARRANTY; without even the implied warranty of
2753+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2754+# GNU Affero General Public License for more details.
2755+#
2756+# You should have received a copy of the GNU Affero General Public License
2757+# along with this program. If not, see <http://www.gnu.org/licenses/>.
2758+#
2759+##############################################################################
2760+
2761+from tools.translate import _
2762+from osv import fields, osv
2763+
2764+class bank(osv.osv):
2765+ _inherit = "res.partner.bank"
2766+ _columns = {
2767+ 'journal_id': fields.many2one('account.journal', 'Account Journal', help="This journal will be created automatically for this bank account when you save the record"),
2768+ 'currency_id': fields.related('journal_id', 'currency', type="many2one", relation='res.currency', readonly=True,
2769+ string="Currency", help="Currency of the related account journal."),
2770+ }
2771+ def create(self, cr, uid, data, context={}):
2772+ result = super(bank, self).create(cr, uid, data, context=context)
2773+ self.post_write(cr, uid, [result], context=context)
2774+ return result
2775+
2776+ def write(self, cr, uid, ids, data, context={}):
2777+ result = super(bank, self).write(cr, uid, ids, data, context=context)
2778+ self.post_write(cr, uid, ids, context=context)
2779+ return result
2780+
2781+ def _prepare_name(self, bank):
2782+ "Return the name to use when creating a bank journal"
2783+ return (bank.bank_name or '') + ' ' + bank.acc_number
2784+
2785+ def post_write(self, cr, uid, ids, context={}):
2786+ if isinstance(ids, (int, long)):
2787+ ids = [ids]
2788+
2789+ obj_acc = self.pool.get('account.account')
2790+ obj_data = self.pool.get('ir.model.data')
2791+
2792+ for bank in self.browse(cr, uid, ids, context):
2793+ if bank.company_id and not bank.journal_id:
2794+ # Find the code and parent of the bank account to create
2795+ dig = 6
2796+ current_num = 1
2797+ ids = obj_acc.search(cr, uid, [('type','=','liquidity'), ('company_id', '=', bank.company_id.id)], context=context)
2798+ # No liquidity account exists, no template available
2799+ if not ids: continue
2800+
2801+ ref_acc_bank_temp = obj_acc.browse(cr, uid, ids[0], context=context)
2802+ ref_acc_bank = ref_acc_bank_temp.parent_id
2803+ while True:
2804+ new_code = str(ref_acc_bank.code.ljust(dig-len(str(current_num)), '0')) + str(current_num)
2805+ ids = obj_acc.search(cr, uid, [('code', '=', new_code), ('company_id', '=', bank.company_id.id)])
2806+ if not ids:
2807+ break
2808+ current_num += 1
2809+ name = self._prepare_name(bank)
2810+ acc = {
2811+ 'name': name,
2812+ 'code': new_code,
2813+ 'type': 'liquidity',
2814+ 'user_type': ref_acc_bank_temp.user_type.id,
2815+ 'reconcile': False,
2816+ 'parent_id': ref_acc_bank.id,
2817+ 'company_id': bank.company_id.id,
2818+ }
2819+ acc_bank_id = obj_acc.create(cr,uid,acc,context=context)
2820+
2821+ # Get the journal view id
2822+ data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
2823+ data = obj_data.browse(cr, uid, data_id[0], context=context)
2824+ view_id_cash = data.res_id
2825+
2826+ jour_obj = self.pool.get('account.journal')
2827+ new_code = 1
2828+ while True:
2829+ code = _('BNK')+str(new_code)
2830+ ids = jour_obj.search(cr, uid, [('code','=',code)], context=context)
2831+ if not ids:
2832+ break
2833+ new_code += 1
2834+
2835+ #create the bank journal
2836+ vals_journal = {
2837+ 'name': name,
2838+ 'code': code,
2839+ 'type': 'bank',
2840+ 'company_id': bank.company_id.id,
2841+ 'analytic_journal_id': False,
2842+ 'default_credit_account_id': acc_bank_id,
2843+ 'default_debit_account_id': acc_bank_id,
2844+ 'view_id': view_id_cash
2845+ }
2846+ journal_id = jour_obj.create(cr, uid, vals_journal, context=context)
2847+
2848+ self.write(cr, uid, [bank.id], {'journal_id': journal_id}, context=context)
2849+ return True
2850+
2851+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
2852
2853=== modified file 'account/account_bank_statement.py'
2854--- account/account_bank_statement.py 2012-03-15 13:47:26 +0000
2855+++ account/account_bank_statement.py 2013-05-08 15:45:41 +0000
2856@@ -30,10 +30,10 @@
2857 def create(self, cr, uid, vals, context=None):
2858 seq = 0
2859 if 'line_ids' in vals:
2860+ new_line_ids = []
2861 for line in vals['line_ids']:
2862 seq += 1
2863 line[2]['sequence'] = seq
2864- vals[seq - 1] = line
2865 return super(account_bank_statement, self).create(cr, uid, vals, context=context)
2866
2867 def write(self, cr, uid, ids, vals, context=None):
2868@@ -52,19 +52,13 @@
2869 journal_pool = self.pool.get('account.journal')
2870 journal_type = context.get('journal_type', False)
2871 journal_id = False
2872+ company_id = self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=context)
2873 if journal_type:
2874- ids = journal_pool.search(cr, uid, [('type', '=', journal_type)])
2875+ ids = journal_pool.search(cr, uid, [('type', '=', journal_type),('company_id','=',company_id)])
2876 if ids:
2877 journal_id = ids[0]
2878 return journal_id
2879
2880- def _default_balance_start(self, cr, uid, context=None):
2881- cr.execute('select id from account_bank_statement where journal_id=%s order by date desc limit 1', (1,))
2882- res = cr.fetchone()
2883- if res:
2884- return self.browse(cr, uid, res[0], context=context).balance_end
2885- return 0.0
2886-
2887 def _end_balance(self, cursor, user, ids, name, attr, context=None):
2888 res_currency_obj = self.pool.get('res.currency')
2889 res_users_obj = self.pool.get('res.users')
2890@@ -90,7 +84,8 @@
2891 res[statement.id] -= res_currency_obj.compute(cursor,
2892 user, company_currency_id, currency_id,
2893 line.credit, context=context)
2894- if statement.state == 'draft':
2895+
2896+ if statement.state in ('draft', 'open'):
2897 for line in statement.line_ids:
2898 res[statement.id] += line.amount
2899 for r in res:
2900@@ -123,12 +118,18 @@
2901 res[statement_id] = (currency_id, currency_names[currency_id])
2902 return res
2903
2904+ def _get_statement(self, cr, uid, ids, context=None):
2905+ result = {}
2906+ for line in self.pool.get('account.bank.statement.line').browse(cr, uid, ids, context=context):
2907+ result[line.statement_id.id] = True
2908+ return result.keys()
2909+
2910 _order = "date desc, id desc"
2911 _name = "account.bank.statement"
2912 _description = "Bank Statement"
2913 _columns = {
2914- 'name': fields.char('Name', size=64, required=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself', states={'confirm': [('readonly', True)]}),
2915- 'date': fields.date('Date', required=True, states={'confirm': [('readonly', True)]}),
2916+ 'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'), # readonly for account_cash_statement
2917+ 'date': fields.date('Date', required=True, states={'confirm': [('readonly', True)]}, select=True),
2918 'journal_id': fields.many2one('account.journal', 'Journal', required=True,
2919 readonly=True, states={'draft':[('readonly',False)]}),
2920 'period_id': fields.many2one('account.period', 'Period', required=True,
2921@@ -136,57 +137,64 @@
2922 'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'),
2923 states={'confirm':[('readonly',True)]}),
2924 'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'),
2925- states={'confirm':[('readonly', True)]}),
2926- 'balance_end': fields.function(_end_balance, method=True, string='Balance'),
2927+ states={'confirm': [('readonly', True)]}),
2928+ 'balance_end': fields.function(_end_balance,
2929+ store = {
2930+ 'account.bank.statement': (lambda self, cr, uid, ids, c={}: ids, ['line_ids','move_line_ids'], 10),
2931+ 'account.bank.statement.line': (_get_statement, ['amount'], 10),
2932+ },
2933+ string="Computed Balance", help='Balance as calculated based on Starting Balance and transaction lines'),
2934 'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
2935 'line_ids': fields.one2many('account.bank.statement.line',
2936 'statement_id', 'Statement lines',
2937 states={'confirm':[('readonly', True)]}),
2938 'move_line_ids': fields.one2many('account.move.line', 'statement_id',
2939 'Entry lines', states={'confirm':[('readonly',True)]}),
2940- 'state': fields.selection([('draft', 'Draft'),('confirm', 'Confirmed')],
2941- 'State', required=True,
2942- states={'confirm': [('readonly', True)]}, readonly="1",
2943- help='When new statement is created the state will be \'Draft\'. \
2944- \n* And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
2945- 'currency': fields.function(_currency, method=True, string='Currency',
2946+ 'state': fields.selection([('draft', 'New'),
2947+ ('open','Open'), # used by cash statements
2948+ ('confirm', 'Closed')],
2949+ 'State', required=True, readonly="1",
2950+ help='When new statement is created the state will be \'Draft\'.\n'
2951+ 'And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
2952+ 'currency': fields.function(_currency, string='Currency',
2953 type='many2one', relation='res.currency'),
2954 'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'),
2955 }
2956
2957 _defaults = {
2958 'name': "/",
2959- 'date': lambda *a: time.strftime('%Y-%m-%d'),
2960+ 'date': fields.date.context_today,
2961 'state': 'draft',
2962- 'balance_start': _default_balance_start,
2963 'journal_id': _default_journal_id,
2964 'period_id': _get_period,
2965+ 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=c),
2966 }
2967
2968- def onchange_date(self, cr, user, ids, date, context=None):
2969+ def _check_company_id(self, cr, uid, ids, context=None):
2970+ for statement in self.browse(cr, uid, ids, context=context):
2971+ if statement.company_id.id != statement.period_id.company_id.id:
2972+ return False
2973+ return True
2974+
2975+ _constraints = [
2976+ (_check_company_id, 'The journal and period chosen have to belong to the same company.', ['journal_id','period_id']),
2977+ ]
2978+
2979+ def onchange_date(self, cr, uid, ids, date, company_id, context=None):
2980 """
2981- Returns a dict that contains new values and context
2982- @param cr: A database cursor
2983- @param user: ID of the user currently logged in
2984- @param date: latest value from user input for field date
2985- @param args: other arguments
2986- @param context: context arguments, like lang, time zone
2987- @return: Returns a dict which contains new values, and context
2988+ Find the correct period to use for the given date and company_id, return it and set it in the context
2989 """
2990 res = {}
2991 period_pool = self.pool.get('account.period')
2992
2993 if context is None:
2994 context = {}
2995-
2996- pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)])
2997+ ctx = context.copy()
2998+ ctx.update({'company_id': company_id})
2999+ pids = period_pool.find(cr, uid, dt=date, context=ctx)
3000 if pids:
3001- res.update({
3002- 'period_id':pids[0]
3003- })
3004- context.update({
3005- 'period_id':pids[0]
3006- })
3007+ res.update({'period_id': pids[0]})
3008+ context.update({'period_id': pids[0]})
3009
3010 return {
3011 'value':res,
3012@@ -213,6 +221,7 @@
3013 'period_id': st.period_id.id,
3014 'date': st_line.date,
3015 'name': st_line_number,
3016+ 'ref': st_line.ref,
3017 }, context=context)
3018 account_bank_statement_line_obj.write(cr, uid, [st_line.id], {
3019 'move_ids': [(4, move_id, False)]
3020@@ -290,7 +299,7 @@
3021 context=context):
3022 if line.state <> 'valid':
3023 raise osv.except_osv(_('Error !'),
3024- _('Journal Item "%s" is not valid') % line.name)
3025+ _('Journal item "%s" is not valid.') % line.name)
3026
3027 if st.journal_id.entry_posted:
3028 account_move_obj.post(cr, uid, [move_id], context=context)
3029@@ -301,20 +310,18 @@
3030
3031 def balance_check(self, cr, uid, st_id, journal_type='bank', context=None):
3032 st = self.browse(cr, uid, st_id, context=context)
3033- if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
3034+ if not ((abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001) or (abs((st.balance_end or 0.0) - st.balance_end_cash) < 0.0001)):
3035 raise osv.except_osv(_('Error !'),
3036- _('The statement balance is incorrect !\n') +
3037- _('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
3038+ _('The statement balance is incorrect !\nThe expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
3039 return True
3040
3041 def statement_close(self, cr, uid, ids, journal_type='bank', context=None):
3042 return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
3043
3044 def check_status_condition(self, cr, uid, state, journal_type='bank'):
3045- return state=='draft'
3046+ return state in ('draft','open')
3047
3048 def button_confirm_bank(self, cr, uid, ids, context=None):
3049- done = []
3050 obj_seq = self.pool.get('ir.sequence')
3051 if context is None:
3052 context = {}
3053@@ -334,11 +341,11 @@
3054 if not st.name == '/':
3055 st_number = st.name
3056 else:
3057+ c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
3058 if st.journal_id.sequence_id:
3059- c = {'fiscalyear_id': st.period_id.fiscalyear_id.id}
3060- st_number = obj_seq.get_id(cr, uid, st.journal_id.sequence_id.id, context=c)
3061+ st_number = obj_seq.next_by_id(cr, uid, st.journal_id.sequence_id.id, context=c)
3062 else:
3063- st_number = obj_seq.get(cr, uid, 'account.bank.statement')
3064+ st_number = obj_seq.next_by_code(cr, uid, 'account.bank.statement', context=c)
3065
3066 for line in st.move_line_ids:
3067 if line.state <> 'valid':
3068@@ -347,15 +354,17 @@
3069 for st_line in st.line_ids:
3070 if st_line.analytic_account_id:
3071 if not st.journal_id.analytic_journal_id:
3072- raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,))
3073+ raise osv.except_osv(_('No Analytic Journal !'),_("You have to assign an analytic journal on the '%s' journal!") % (st.journal_id.name,))
3074 if not st_line.amount:
3075 continue
3076 st_line_number = self.get_next_st_line_number(cr, uid, st_number, st_line, context)
3077 self.create_move_from_st_line(cr, uid, st_line.id, company_currency_id, st_line_number, context)
3078
3079- self.write(cr, uid, [st.id], {'name': st_number}, context=context)
3080+ self.write(cr, uid, [st.id], {
3081+ 'name': st_number,
3082+ 'balance_end_real': st.balance_end
3083+ }, context=context)
3084 self.log(cr, uid, st.id, _('Statement %s is confirmed, journal items are created.') % (st_number,))
3085- done.append(st.id)
3086 return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
3087
3088 def button_cancel(self, cr, uid, ids, context=None):
3089@@ -364,10 +373,11 @@
3090 for st in self.browse(cr, uid, ids, context=context):
3091 if st.state=='draft':
3092 continue
3093- ids = []
3094+ move_ids = []
3095 for line in st.line_ids:
3096- ids += [x.id for x in line.move_ids]
3097- account_move_obj.unlink(cr, uid, ids, context)
3098+ move_ids += [x.id for x in line.move_ids]
3099+ account_move_obj.button_cancel(cr, uid, move_ids, context=context)
3100+ account_move_obj.unlink(cr, uid, move_ids, context)
3101 done.append(st.id)
3102 return self.write(cr, uid, done, {'state':'draft'}, context=context)
3103
3104@@ -378,8 +388,10 @@
3105 ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
3106 res = cr.fetchone()
3107 balance_start = res and res[0] or 0.0
3108- account_id = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id'], context=context)['default_debit_account_id']
3109- return {'value': {'balance_start': balance_start, 'account_id': account_id}}
3110+ journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id', 'company_id'], context=context)
3111+ account_id = journal_data['default_debit_account_id']
3112+ company_id = journal_data['company_id']
3113+ return {'value': {'balance_start': balance_start, 'account_id': account_id, 'company_id': company_id}}
3114
3115 def unlink(self, cr, uid, ids, context=None):
3116 stat = self.read(cr, uid, ids, ['state'], context=context)
3117@@ -388,7 +400,7 @@
3118 if t['state'] in ('draft'):
3119 unlink_ids.append(t['id'])
3120 else:
3121- raise osv.except_osv(_('Invalid action !'), _('Cannot delete bank statement(s) which are already confirmed !'))
3122+ raise osv.except_osv(_('Invalid action !'), _('In order to delete a bank statement, you must first cancel it to delete related journal items.'))
3123 osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
3124 return True
3125
3126@@ -463,16 +475,20 @@
3127 select=True, required=True, ondelete='cascade'),
3128 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'),
3129 'move_ids': fields.many2many('account.move',
3130- 'account_bank_statement_line_move_rel', 'move_id','statement_id',
3131+ 'account_bank_statement_line_move_rel', 'statement_line_id','move_id',
3132 'Moves'),
3133 'ref': fields.char('Reference', size=32),
3134 'note': fields.text('Notes'),
3135- 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of bank statement lines."),
3136+ 'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of bank statement lines."),
3137 'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
3138 }
3139 _defaults = {
3140 'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),
3141+<<<<<<< TREE
3142 'date': lambda self, cr, uid, context, *a: context.get('date') or time.strftime('%Y-%m-%d'),
3143+=======
3144+ 'date': lambda self,cr,uid,context={}: context.get('date', fields.date.context_today(self,cr,uid,context=context)),
3145+>>>>>>> MERGE-SOURCE
3146 'type': 'general',
3147 }
3148
3149
3150=== added file 'account/account_bank_view.xml'
3151--- account/account_bank_view.xml 1970-01-01 00:00:00 +0000
3152+++ account/account_bank_view.xml 2013-05-08 15:45:41 +0000
3153@@ -0,0 +1,62 @@
3154+<?xml version="1.0" encoding="utf-8"?>
3155+<openerp>
3156+<data>
3157+
3158+ <!--
3159+ Bank Accounts
3160+ -->
3161+
3162+ <record id="view_partner_bank_form_inherit" model="ir.ui.view">
3163+ <field name="name">Partner Bank Accounts - Journal</field>
3164+ <field name="model">res.partner.bank</field>
3165+ <field name="type">form</field>
3166+ <field name="inherit_id" ref="base.view_partner_bank_form"/>
3167+ <field name="arch" type="xml">
3168+ <group name="bank" position="after">
3169+ <group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}" groups="base.group_extended">
3170+ <separator string="Accounting Information" colspan="2"/>
3171+ <field name="journal_id"/>
3172+ <field name="currency_id"/>
3173+ </group>
3174+ </group>
3175+ </field>
3176+ </record>
3177+
3178+
3179+ <record id="view_partner_bank_tree_add_currency" model="ir.ui.view">
3180+ <field name="name">Partner Bank Accounts - Add currency on tree</field>
3181+ <field name="model">res.partner.bank</field>
3182+ <field name="type">tree</field>
3183+ <field name="inherit_id" ref="base.view_partner_bank_tree"/>
3184+ <field name="arch" type="xml">
3185+ <field name="acc_number" position="after">
3186+ <field name="currency_id"/>
3187+ </field>
3188+ </field>
3189+ </record>
3190+
3191+
3192+ <record id="action_bank_tree" model="ir.actions.act_window">
3193+ <field name="name">Setup your Bank Accounts</field>
3194+ <field name="res_model">res.partner.bank</field>
3195+ <field name="view_type">form</field>
3196+ <field name="view_mode">tree,form</field>
3197+ <field name="context" eval="{'default_partner_id':ref('base.main_partner'), 'company_hide':False, 'default_company_id':ref('base.main_company'), 'search_default_my_bank':1}"/>
3198+ <field name="help">Configure your company's bank account and select those that must appear on the report footer. You can reorder banks in the list view. If you use the accounting application of OpenERP, journals and accounts will be created automatically based on these data.</field>
3199+ </record>
3200+ <menuitem
3201+ sequence="0"
3202+ parent="account.account_account_menu"
3203+ id="menu_action_bank_tree"
3204+ action="action_bank_tree"/>
3205+
3206+
3207+ <record id="account_configuration_bank_todo" model="ir.actions.todo">
3208+ <field name="action_id" ref="action_bank_tree"/>
3209+ <field name="category_id" ref="category_accounting_configuration"/>
3210+ <field name="sequence">4</field>
3211+ </record>
3212+
3213+
3214+</data>
3215+</openerp>
3216
3217=== modified file 'account/account_cash_statement.py'
3218--- account/account_cash_statement.py 2011-03-03 08:39:43 +0000
3219+++ account/account_cash_statement.py 2013-05-08 15:45:41 +0000
3220@@ -58,7 +58,7 @@
3221 _columns = {
3222 'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')),
3223 'number': fields.integer('Number'),
3224- 'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')),
3225+ 'subtotal': fields.function(_sub_total, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')),
3226 'starting_id': fields.many2one('account.bank.statement', ondelete='cascade'),
3227 'ending_id': fields.many2one('account.bank.statement', ondelete='cascade'),
3228 }
3229@@ -119,39 +119,6 @@
3230 res2[statement.id] = encoding_total
3231 return res2
3232
3233- def _end_balance(self, cursor, user, ids, name, attr, context=None):
3234- res_currency_obj = self.pool.get('res.currency')
3235- res_users_obj = self.pool.get('res.users')
3236- res = {}
3237-
3238- company_currency_id = res_users_obj.browse(cursor, user, user,
3239- context=context).company_id.currency_id.id
3240-
3241- statements = self.browse(cursor, user, ids, context=context)
3242- for statement in statements:
3243- res[statement.id] = statement.balance_start
3244- currency_id = statement.currency.id
3245- for line in statement.move_line_ids:
3246- if line.debit > 0:
3247- if line.account_id.id == \
3248- statement.journal_id.default_debit_account_id.id:
3249- res[statement.id] += res_currency_obj.compute(cursor,
3250- user, company_currency_id, currency_id,
3251- line.debit, context=context)
3252- else:
3253- if line.account_id.id == \
3254- statement.journal_id.default_credit_account_id.id:
3255- res[statement.id] -= res_currency_obj.compute(cursor,
3256- user, company_currency_id, currency_id,
3257- line.credit, context=context)
3258-
3259- if statement.state in ('draft', 'open'):
3260- for line in statement.line_ids:
3261- res[statement.id] += line.amount
3262- for r in res:
3263- res[r] = round(res[r], 2)
3264- return res
3265-
3266 def _get_company(self, cr, uid, context=None):
3267 user_pool = self.pool.get('res.users')
3268 company_pool = self.pool.get('res.company')
3269@@ -217,46 +184,42 @@
3270 res['end'] = end_l
3271 return res
3272
3273+ def _get_statement(self, cr, uid, ids, context=None):
3274+ result = {}
3275+ for line in self.pool.get('account.bank.statement.line').browse(cr, uid, ids, context=context):
3276+ result[line.statement_id.id] = True
3277+ return result.keys()
3278+
3279 _columns = {
3280- 'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm': [('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
3281- 'state': fields.selection(
3282- [('draft', 'Draft'),
3283- ('confirm', 'Closed'),
3284- ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
3285- 'total_entry_encoding': fields.function(_get_sum_entry_encoding, method=True, store=True, string="Cash Transaction", help="Total cash transactions"),
3286+ 'total_entry_encoding': fields.function(_get_sum_entry_encoding, string="Cash Transaction", help="Total cash transactions",
3287+ store = {
3288+ 'account.bank.statement': (lambda self, cr, uid, ids, c={}: ids, ['line_ids','move_line_ids'], 10),
3289+ 'account.bank.statement.line': (_get_statement, ['amount'], 10),
3290+ }),
3291 'closing_date': fields.datetime("Closed On"),
3292- 'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance', help="Closing balance based on Starting Balance and Cash Transactions"),
3293- 'balance_end_cash': fields.function(_balance_end_cash, method=True, store=True, string='Balance', help="Closing balance based on cashBox"),
3294+ 'balance_end_cash': fields.function(_balance_end_cash, store=True, string='Closing Balance', help="Closing balance based on cashBox"),
3295 'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'),
3296 'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'),
3297- 'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'),
3298 'user_id': fields.many2one('res.users', 'Responsible', required=False),
3299 }
3300 _defaults = {
3301 'state': 'draft',
3302- 'date': lambda *a: time.strftime("%Y-%m-%d %H:%M:%S"),
3303+ 'date': lambda self,cr,uid,context={}: context.get('date', time.strftime("%Y-%m-%d %H:%M:%S")),
3304 'user_id': lambda self, cr, uid, context=None: uid,
3305 'starting_details_ids': _get_cash_open_box_lines,
3306 'ending_details_ids': _get_default_cash_close_box_lines
3307 }
3308
3309 def create(self, cr, uid, vals, context=None):
3310- sql = [
3311- ('journal_id', '=', vals.get('journal_id', False)),
3312- ('state', '=', 'open')
3313- ]
3314- open_jrnl = self.search(cr, uid, sql)
3315- if open_jrnl:
3316- raise osv.except_osv(_('Error'), _('You can not have two open register for the same journal'))
3317-
3318 if self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context).type == 'cash':
3319 open_close = self._get_cash_open_close_box_lines(cr, uid, context)
3320 if vals.get('starting_details_ids', False):
3321- for start in vals.get('starting_details_ids'):
3322- dict_val = start[2]
3323+ starting_details_ids = vals.get('starting_details_ids')
3324+ for start in starting_details_ids:
3325+ dict_val = start[2] or {}
3326 for end in open_close['end']:
3327- if end[2]['pieces'] == dict_val['pieces']:
3328- end[2]['number'] += dict_val['number']
3329+ if end[2]['pieces'] == dict_val.get('pieces', 0.0):
3330+ end[2]['number'] += dict_val.get('number', 0.0)
3331 vals.update({
3332 # 'ending_details_ids': open_close['start'],
3333 'starting_details_ids': open_close['end']
3334@@ -320,6 +283,7 @@
3335 """ Changes statement state to Running.
3336 @return: True
3337 """
3338+ obj_seq = self.pool.get('ir.sequence')
3339 if context is None:
3340 context = {}
3341 statement_pool = self.pool.get('account.bank.statement')
3342@@ -329,15 +293,17 @@
3343 raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name)))
3344
3345 if statement.name and statement.name == '/':
3346- number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement')
3347+ c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
3348+ if statement.journal_id.sequence_id:
3349+ st_number = obj_seq.next_by_id(cr, uid, statement.journal_id.sequence_id.id, context=c)
3350+ else:
3351+ st_number = obj_seq.next_by_code(cr, uid, 'account.cash.statement', context=c)
3352 vals.update({
3353- 'name': number
3354+ 'name': st_number
3355 })
3356
3357 vals.update({
3358- 'date': time.strftime("%Y-%m-%d %H:%M:%S"),
3359 'state': 'open',
3360-
3361 })
3362 self.write(cr, uid, [statement.id], vals, context=context)
3363 return True
3364@@ -346,7 +312,7 @@
3365 if journal_type == 'bank':
3366 return super(account_cash_statement, self).balance_check(cr, uid, cash_id, journal_type, context)
3367 if not self._equal_balance(cr, uid, cash_id, context):
3368- raise osv.except_osv(_('Error !'), _('CashBox Balance is not matching with Calculated Balance !'))
3369+ raise osv.except_osv(_('Error !'), _('The closing balance should be the same than the computed balance!'))
3370 return True
3371
3372 def statement_close(self, cr, uid, ids, journal_type='bank', context=None):
3373
3374=== added file 'account/account_financial_report.py'
3375--- account/account_financial_report.py 1970-01-01 00:00:00 +0000
3376+++ account/account_financial_report.py 2013-05-08 15:45:41 +0000
3377@@ -0,0 +1,135 @@
3378+# -*- coding: utf-8 -*-
3379+##############################################################################
3380+#
3381+# OpenERP, Open Source Management Solution
3382+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
3383+#
3384+# This program is free software: you can redistribute it and/or modify
3385+# it under the terms of the GNU Affero General Public License as
3386+# published by the Free Software Foundation, either version 3 of the
3387+# License, or (at your option) any later version.
3388+#
3389+# This program is distributed in the hope that it will be useful,
3390+# but WITHOUT ANY WARRANTY; without even the implied warranty of
3391+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3392+# GNU Affero General Public License for more details.
3393+#
3394+# You should have received a copy of the GNU Affero General Public License
3395+# along with this program. If not, see <http://www.gnu.org/licenses/>.
3396+#
3397+##############################################################################
3398+
3399+import time
3400+from datetime import datetime
3401+from dateutil.relativedelta import relativedelta
3402+from operator import itemgetter
3403+
3404+import netsvc
3405+import pooler
3406+from osv import fields, osv
3407+import decimal_precision as dp
3408+from tools.translate import _
3409+
3410+# ---------------------------------------------------------
3411+# Account Financial Report
3412+# ---------------------------------------------------------
3413+
3414+class account_financial_report(osv.osv):
3415+ _name = "account.financial.report"
3416+ _description = "Account Report"
3417+
3418+ def _get_level(self, cr, uid, ids, field_name, arg, context=None):
3419+ res = {}
3420+ for report in self.browse(cr, uid, ids, context=context):
3421+ level = 0
3422+ if report.parent_id:
3423+ level = report.parent_id.level + 1
3424+ res[report.id] = level
3425+ return res
3426+
3427+ def _get_children_by_order(self, cr, uid, ids, context=None):
3428+ res = []
3429+ for id in ids:
3430+ res.append(id)
3431+ ids2 = self.search(cr, uid, [('parent_id', '=', id)], order='sequence ASC', context=context)
3432+ res += self._get_children_by_order(cr, uid, ids2, context=context)
3433+ return res
3434+
3435+ def _get_balance(self, cr, uid, ids, field_names, args, context=None):
3436+ account_obj = self.pool.get('account.account')
3437+ res = {}
3438+ for report in self.browse(cr, uid, ids, context=context):
3439+ if report.id in res:
3440+ continue
3441+ res[report.id] = dict((fn, 0.0) for fn in field_names)
3442+ if report.type == 'accounts':
3443+ # it's the sum of the linked accounts
3444+ for a in report.account_ids:
3445+ for field in field_names:
3446+ res[report.id][field] += getattr(a, field)
3447+ elif report.type == 'account_type':
3448+ # it's the sum the leaf accounts with such an account type
3449+ report_types = [x.id for x in report.account_type_ids]
3450+ account_ids = account_obj.search(cr, uid, [('user_type','in', report_types), ('type','!=','view')], context=context)
3451+ for a in account_obj.browse(cr, uid, account_ids, context=context):
3452+ for field in field_names:
3453+ res[report.id][field] += getattr(a, field)
3454+ elif report.type == 'account_report' and report.account_report_id:
3455+ # it's the amount of the linked report
3456+ res2 = self._get_balance(cr, uid, [report.account_report_id.id], field_names, False, context=context)
3457+ for key, value in res2.items():
3458+ for field in field_names:
3459+ res[report.id][field] += value[field]
3460+ elif report.type == 'sum':
3461+ # it's the sum of the children of this account.report
3462+ res2 = self._get_balance(cr, uid, [rec.id for rec in report.children_ids], field_names, False, context=context)
3463+ for key, value in res2.items():
3464+ for field in field_names:
3465+ res[report.id][field] += value[field]
3466+ return res
3467+
3468+ _columns = {
3469+ 'name': fields.char('Report Name', size=128, required=True, translate=True),
3470+ 'parent_id': fields.many2one('account.financial.report', 'Parent'),
3471+ 'children_ids': fields.one2many('account.financial.report', 'parent_id', 'Account Report'),
3472+ 'sequence': fields.integer('Sequence'),
3473+ 'balance': fields.function(_get_balance, 'Balance', multi='balance'),
3474+ 'debit': fields.function(_get_balance, 'Debit', multi='balance'),
3475+ 'credit': fields.function(_get_balance, 'Credit', multi="balance"),
3476+ 'level': fields.function(_get_level, string='Level', store=True, type='integer'),
3477+ 'type': fields.selection([
3478+ ('sum','View'),
3479+ ('accounts','Accounts'),
3480+ ('account_type','Account Type'),
3481+ ('account_report','Report Value'),
3482+ ],'Type'),
3483+ 'account_ids': fields.many2many('account.account', 'account_account_financial_report', 'report_line_id', 'account_id', 'Accounts'),
3484+ 'account_report_id': fields.many2one('account.financial.report', 'Report Value'),
3485+ 'account_type_ids': fields.many2many('account.account.type', 'account_account_financial_report_type', 'report_id', 'account_type_id', 'Account Types'),
3486+ 'sign': fields.selection([(-1, 'Reverse balance sign'), (1, 'Preserve balance sign')], 'Sign on Reports', required=True, help='For accounts that are typically more debited than credited and that you would like to print as negative amounts in your reports, you should reverse the sign of the balance; e.g.: Expense account. The same applies for accounts that are typically more credited than debited and that you would like to print as positive amounts in your reports; e.g.: Income account.'),
3487+ 'display_detail': fields.selection([
3488+ ('no_detail','No detail'),
3489+ ('detail_flat','Display children flat'),
3490+ ('detail_with_hierarchy','Display children with hierarchy')
3491+ ], 'Display details'),
3492+ 'style_overwrite': fields.selection([
3493+ (0, 'Automatic formatting'),
3494+ (1,'Main Title 1 (bold, underlined)'),
3495+ (2,'Title 2 (bold)'),
3496+ (3,'Title 3 (bold, smaller)'),
3497+ (4,'Normal Text'),
3498+ (5,'Italic Text (smaller)'),
3499+ (6,'Smallest Text'),
3500+ ],'Financial Report Style', help="You can set up here the format you want this record to be displayed. If you leave the automatic formatting, it will be computed based on the financial reports hierarchy (auto-computed field 'level')."),
3501+ }
3502+
3503+ _defaults = {
3504+ 'type': 'sum',
3505+ 'display_detail': 'detail_flat',
3506+ 'sign': 1,
3507+ 'style_overwrite': 0,
3508+ }
3509+
3510+account_financial_report()
3511+
3512+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
3513
3514=== added file 'account/account_financial_report_data.xml'
3515--- account/account_financial_report_data.xml 1970-01-01 00:00:00 +0000
3516+++ account/account_financial_report_data.xml 2013-05-08 15:45:41 +0000
3517@@ -0,0 +1,55 @@
3518+<?xml version="1.0" encoding="utf-8"?>
3519+<openerp>
3520+ <data noupdate="1">
3521+ <!--
3522+ Financial Reports
3523+ -->
3524+ <record id="account_financial_report_profitandloss0" model="account.financial.report">
3525+ <field name="name">Profit and Loss</field>
3526+ <field name="type">sum</field>
3527+ </record>
3528+ <record id="account_financial_report_income0" model="account.financial.report">
3529+ <field name="name">Income</field>
3530+ <field name="parent_id" ref="account_financial_report_profitandloss0"/>
3531+ <field name="display_detail">detail_with_hierarchy</field>
3532+ <field name="type">account_type</field>
3533+ </record>
3534+ <record id="account_financial_report_expense0" model="account.financial.report">
3535+ <field name="name">Expense</field>
3536+ <field name="parent_id" ref="account_financial_report_profitandloss0"/>
3537+ <field name="display_detail">detail_with_hierarchy</field>
3538+ <field name="type">account_type</field>
3539+ </record>
3540+
3541+ <record id="account_financial_report_balancesheet0" model="account.financial.report">
3542+ <field name="name">Balance Sheet</field>
3543+ <field name="type">sum</field>
3544+ </record>
3545+ <record id="account_financial_report_assets0" model="account.financial.report">
3546+ <field name="name">Assets</field>
3547+ <field name="parent_id" ref="account_financial_report_balancesheet0"/>
3548+ <field name="display_detail">detail_with_hierarchy</field>
3549+ <field name="type">account_type</field>
3550+ </record>
3551+ <record id="account_financial_report_liabilitysum0" model="account.financial.report">
3552+ <field name="name">Liability</field>
3553+ <field name="parent_id" ref="account_financial_report_balancesheet0"/>
3554+ <field name="display_detail">no_detail</field>
3555+ <field name="type">sum</field>
3556+ </record>
3557+ <record id="account_financial_report_liability0" model="account.financial.report">
3558+ <field name="name">Liability</field>
3559+ <field name="parent_id" ref="account_financial_report_liabilitysum0"/>
3560+ <field name="display_detail">detail_with_hierarchy</field>
3561+ <field name="type">account_type</field>
3562+ </record>
3563+ <record id="account_financial_report_profitloss_toreport0" model="account.financial.report">
3564+ <field name="name">Profit (Loss) to report</field>
3565+ <field name="parent_id" ref="account_financial_report_liabilitysum0"/>
3566+ <field name="display_detail">no_detail</field>
3567+ <field name="type">account_report</field>
3568+ <field name="account_report_id" ref="account_financial_report_profitandloss0"/>
3569+ </record>
3570+ </data>
3571+</openerp>
3572+
3573
3574=== modified file 'account/account_installer.xml'
3575--- account/account_installer.xml 2011-01-14 00:11:01 +0000
3576+++ account/account_installer.xml 2013-05-08 15:45:41 +0000
3577@@ -11,7 +11,7 @@
3578 <attribute name="string">Accounting Application Configuration</attribute>
3579 </form>
3580 <separator string="title" position="attributes">
3581- <attribute name="string">Configure Your Accounting Chart</attribute>
3582+ <attribute name="string">Configure Your Chart of Accounts</attribute>
3583 </separator>
3584 <xpath expr="//label[@string='description']" position="attributes">
3585 <attribute name="string">The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default.</attribute>
3586@@ -19,82 +19,29 @@
3587 <xpath expr="//button[@string='Install Modules']" position="attributes">
3588 <attribute name="string">Configure</attribute>
3589 </xpath>
3590- <xpath expr='//separator[@string="vsep"]' position='attributes'>
3591- <attribute name='rowspan'>23</attribute>
3592- <attribute name='string'></attribute>
3593+ <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">
3594+ <attribute name="rowspan">23</attribute>
3595+ <attribute name="string"/>
3596 </xpath>
3597- <group colspan="8">
3598+ <group colspan="8" position="inside">
3599 <group colspan="4" width="600">
3600- <field name="charts"/>
3601- <group colspan="4" groups="base.group_extended">
3602+ <field name="charts"/>
3603+ <group colspan="4" groups="account.group_account_user">
3604 <separator col="4" colspan="4" string="Configure Fiscal Year"/>
3605- <field name="company_id" colspan="4" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
3606+ <field name="has_default_company" invisible="1" />
3607+ <field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
3608 <field name="date_start" on_change="on_change_start_date(date_start)"/>
3609 <field name="date_stop"/>
3610 <field name="period" colspan="4"/>
3611 </group>
3612- <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
3613- <field name="sale_tax" on_change="on_change_tax(sale_tax)" attrs="{'required':[('charts','=','configurable')]}"/>
3614- <field name="purchase_tax" groups="base.group_extended"/>
3615- </group>
3616- <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
3617- <separator col="4" colspan="4" string="Bank and Cash Accounts"/>
3618- <field colspan="4" mode="tree" height="200" name="bank_accounts_id" nolabel="1" widget="one2many_list">
3619- <form string="">
3620- <field name="acc_name"/>
3621- <field name="account_type"/>
3622- <field name="currency_id" widget="selection" groups="base.group_extended"/>
3623- </form>
3624- <tree editable="bottom" string="Your bank and cash accounts">
3625- <field name="acc_name"/>
3626- <field name="account_type"/>
3627- <field name="currency_id" widget="selection" groups="base.group_extended"/>
3628- </tree>
3629- </field>
3630- </group>
3631 </group>
3632 </group>
3633 </data>
3634 </field>
3635 </record>
3636
3637- <record id="view_account_modules_installer" model="ir.ui.view">
3638- <field name="name">account.installer.modules.form</field>
3639- <field name="model">account.installer.modules</field>
3640- <field name="type">form</field>
3641- <field name="inherit_id" ref="base.res_config_installer"/>
3642- <field name="arch" type="xml">
3643- <data>
3644- <form position="attributes">
3645- <attribute name="string">Accounting Application Configuration</attribute>
3646- </form>
3647- <separator string="title" position="attributes">
3648- <attribute name="string">Configure Your Accounting Application</attribute>
3649-
3650- </separator>
3651- <xpath expr="//label[@string='description']" position="attributes">
3652- <attribute name="string">Add extra Accounting functionalities to the ones already installed.</attribute>
3653- </xpath>
3654- <xpath expr="//button[@string='Install Modules']" position="attributes">
3655- <attribute name="string">Configure</attribute>
3656- </xpath>
3657- <xpath expr='//separator[@string="vsep"]' position='attributes'>
3658- <attribute name='string'></attribute>
3659- </xpath>
3660- <group colspan="8">
3661- <field name="account_voucher"/>
3662- <field name="account_followup"/>
3663- <field name="account_payment"/>
3664- <field name="account_analytic_plans"/>
3665- <field name="account_anglo_saxon"/>
3666-<!-- <field name="account_voucher_payment"/>-->
3667- </group>
3668- </data>
3669- </field>
3670- </record>
3671-
3672 <record id="action_account_configuration_installer" model="ir.actions.act_window">
3673- <field name="name">Accounting Chart Configuration</field>
3674+ <field name="name">Install your Chart of Accounts</field>
3675 <field name="type">ir.actions.act_window</field>
3676 <field name="res_model">account.installer</field>
3677 <field name="view_id" ref="view_account_configuration_installer"/>
3678@@ -103,28 +50,60 @@
3679 <field name="target">new</field>
3680 </record>
3681
3682- <record id="action_account_installer" model="ir.actions.act_window">
3683- <field name="name">Accounting Application Configuration</field>
3684- <field name="type">ir.actions.act_window</field>
3685- <field name="res_model">account.installer.modules</field>
3686- <field name="view_id" ref="view_account_modules_installer"/>
3687- <field name="view_type">form</field>
3688- <field name="view_mode">form</field>
3689- <field name="target">new</field>
3690+ <record id="category_accounting_configuration" model="ir.actions.todo.category">
3691+ <field name="name">Accounting</field>
3692+ <field name="sequence">5</field>
3693 </record>
3694
3695 <record id="account_configuration_installer_todo" model="ir.actions.todo">
3696 <field name="action_id" ref="action_account_configuration_installer"/>
3697+ <field name="category_id" ref="category_accounting_configuration"/>
3698 <field name="sequence">3</field>
3699- <field name="restart">onskip</field>
3700- </record>
3701-
3702- <record id="account_installer_todo" model="ir.actions.todo">
3703- <field name="action_id" ref="action_account_installer"/>
3704- <field name="sequence">5</field>
3705- <field name="restart">always</field>
3706- <field eval="[(6,0,[ref('base.group_extended')])]" name="groups_id"/>
3707- </record>
3708-
3709+ <field name="type">automatic</field>
3710+ </record>
3711+
3712+ <record id="action_view_financial_accounts_installer" model="ir.actions.act_window">
3713+ <field name="name">Review your Financial Accounts</field>
3714+ <field name="type">ir.actions.act_window</field>
3715+ <field name="res_model">account.account</field>
3716+ <field name="view_type">form</field>
3717+ <field name="view_mode">tree,form</field>
3718+ <field name="context">{'config_invisible': False}</field>
3719+ </record>
3720+
3721+ <record id="view_financial_accounts_todo" model="ir.actions.todo">