Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] account_budget_oca: fails automatic merge because duplicated definition #25

Merged
merged 2 commits into from
Jul 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/account_budget.pot
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/af.po
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "Teoretiese Bedrag"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "Teoretiese Bedrag"
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/am.po
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -301,10 +301,6 @@ msgstr "يجب أن تحتوي الموازنة على حساب واحد على
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "المبلغ النظرية"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "المبلغ النظرية"
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/bg.po
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "Теоритично количество"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "Теоритично количество"
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/bs.po
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "Teoretski iznos"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "Teoretski iznos"
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -294,10 +294,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "Import teòric"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "Import teòric"
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -290,10 +290,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/da.po
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,6 @@ msgstr "Budgettet skal have mindst én konto."
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "Teoretisk beløb"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "Teoretisk beløb"
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -305,10 +305,6 @@ msgstr "Das Budget muss mindestens ein Konto haben."
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "Soll-Wert"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "Soll-Wert"
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/el.po
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,6 @@ msgstr "Ο προϋπολογισμός πρέπει να έχει τουλάχ
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "Υπολογιζόμενο Ποσό"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "Υπολογιζόμενο Ποσό"
Expand Down
6 changes: 1 addition & 5 deletions account_budget_oca/i18n/en_AU.po
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
#: model:ir.ui.view,arch_db:account_budget_oca.report_budget
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""

Expand All @@ -484,11 +485,6 @@ msgstr ""
msgid "Theoretical Amt"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.account_budget_analytic_view
#: model:ir.ui.view,arch_db:account_budget_oca.account_budget_crossvered_report_view
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/en_GB.po
Original file line number Diff line number Diff line change
Expand Up @@ -283,10 +283,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,6 @@ msgstr "El presupuesto debe tener al menos de una cuenta."
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "Importe teórico"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "Importe teórico"
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/es_BO.po
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/es_CL.po
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/es_CO.po
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/es_CR.po
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/es_EC.po
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/es_PE.po
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/es_PY.po
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/es_VE.po
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/et.po
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,6 @@ msgstr "Eelarvel peab olema vähemalt üks konto."
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "Teoreetiline summa"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "Teoreetiline summa"
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/eu.po
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,6 @@ msgstr "Aurrekontuak kontu bat eduki behar du gutxienez"
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/fa.po
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,6 @@ msgstr "بودجه حداقل باید حداقل یک حساب داشته با
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "مقدار تئوری"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "مقدار تئوری"
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/fi.po
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "Teoreettinen määrä"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "Teoreettinen määrä"
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/fo.po
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,6 @@ msgstr "Le budget doit avoir au moins un compte."
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "Montant théorique"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "Montant théorique"
Expand Down
6 changes: 1 addition & 5 deletions account_budget_oca/i18n/fr_BE.po
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@ msgstr ""
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
#: model:ir.ui.view,arch_db:account_budget_oca.report_budget
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""

Expand All @@ -485,11 +486,6 @@ msgstr ""
msgid "Theoretical Amt"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.account_budget_analytic_view
#: model:ir.ui.view,arch_db:account_budget_oca.account_budget_crossvered_report_view
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/fr_CA.po
Original file line number Diff line number Diff line change
Expand Up @@ -283,10 +283,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/gl.po
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "Importe teórico"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "Importe teórico"
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/gu.po
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr ""

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr ""
Expand Down
4 changes: 0 additions & 4 deletions account_budget_oca/i18n/he.po
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,6 @@ msgstr ""
#. module: account_budget_oca
#: model:ir.model.fields,field_description:account_budget_oca.field_crossovered_budget_lines_theoretical_amount
#: model:ir.ui.view,arch_db:account_budget_oca.crossovered_budget_view_form
msgid "Theoretical Amount"
msgstr "כמות אמורה"

#. module: account_budget_oca
#: model:ir.ui.view,arch_db:account_budget_oca.view_account_analytic_account_form_inherit_budget
msgid "Theoretical Amount"
msgstr "כמות אמורה"
Expand Down
Loading