Merge lp://qastaging/~gisce/openobject-addons/bug1122021 into lp://qastaging/openobject-addons/extra-trunk
Proposed by
Eduard Carreras i Nadal
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~gisce/openobject-addons/bug1122021 | ||||
| Merge into: | lp://qastaging/openobject-addons/extra-trunk | ||||
| Diff against target: |
12875 lines (+0/-12422) 87 files modified
account_payment_extension/__init__.py (+0/-27) account_payment_extension/__openerp__.py (+0/-61) account_payment_extension/account_invoice.py (+0/-134) account_payment_extension/account_move_line.py (+0/-190) account_payment_extension/i18n/account_payment_extension.pot (+0/-466) account_payment_extension/i18n/bg.po (+0/-492) account_payment_extension/i18n/ca.po (+0/-617) account_payment_extension/i18n/es.po (+0/-619) account_payment_extension/i18n/fr_BE.po (+0/-321) account_payment_extension/i18n/hu.po (+0/-500) account_payment_extension/i18n/pt.po (+0/-615) account_payment_extension/i18n/pt_BR.po (+0/-507) account_payment_extension/i18n/sv.po (+0/-517) account_payment_extension/payment.py (+0/-393) account_payment_extension/payment_sequence.xml (+0/-16) account_payment_extension/payment_view.xml (+0/-385) account_payment_extension/payment_wizard.xml (+0/-7) account_payment_extension/security/ir.model.access.csv (+0/-4) account_payment_extension/wizard/__init__.py (+0/-28) account_payment_extension/wizard/wizard_payment_order.py (+0/-209) account_payment_extension/wizard/wizard_populate_statement.py (+0/-152) nan_account_bank_statement/__init__.py (+0/-30) nan_account_bank_statement/__openerp__.py (+0/-55) nan_account_bank_statement/account_statement.py (+0/-695) nan_account_bank_statement/account_statement_view.xml (+0/-155) nan_account_bank_statement/i18n/ca.po (+0/-422) nan_account_bank_statement/i18n/es.po (+0/-422) nan_account_bank_statement/i18n/nan_account_bank_statement.pot (+0/-318) nan_account_bank_statement/security/ir.model.access.csv (+0/-4) paydays/__init__.py (+0/-22) paydays/__openerp__.py (+0/-42) paydays/i18n/ca.po (+0/-54) paydays/i18n/es.po (+0/-53) paydays/i18n/fi.po (+0/-50) paydays/i18n/it.po (+0/-50) paydays/i18n/paydays.pot (+0/-42) paydays/i18n/pt.po (+0/-49) paydays/paydays.py (+0/-86) paydays/paydays_view.xml (+0/-15) purchase_payment/__init__.py (+0/-27) purchase_payment/__openerp__.py (+0/-54) purchase_payment/i18n/ca.po (+0/-141) purchase_payment/i18n/es.po (+0/-138) purchase_payment/i18n/pt.po (+0/-140) purchase_payment/i18n/purchase_payment.pot (+0/-110) purchase_payment/purchase_payment.py (+0/-197) purchase_payment/purchase_payment_view.xml (+0/-32) pxgo_bank_statement_analytic/__init__.py (+0/-29) pxgo_bank_statement_analytic/__openerp__.py (+0/-48) pxgo_bank_statement_analytic/bank_statement.py (+0/-70) pxgo_bank_statement_analytic/bank_statement_view.xml (+0/-48) pxgo_bank_statement_analytic/i18n/ca.po (+0/-58) pxgo_bank_statement_analytic/i18n/es.po (+0/-57) pxgo_bank_statement_analytic/i18n/es_ES.po (+0/-53) pxgo_bank_statement_analytic/i18n/pt.po (+0/-58) pxgo_bank_statement_analytic/i18n/pxgo_bank_statement_analytic.pot (+0/-44) pxgo_bank_statement_running_balance/__init__.py (+0/-29) pxgo_bank_statement_running_balance/__openerp__.py (+0/-43) pxgo_bank_statement_running_balance/bank_statement.py (+0/-54) pxgo_bank_statement_running_balance/bank_statement_view.xml (+0/-33) pxgo_bank_statement_running_balance/i18n/ca.po (+0/-59) pxgo_bank_statement_running_balance/i18n/es.po (+0/-59) pxgo_bank_statement_running_balance/i18n/pt.po (+0/-61) pxgo_bank_statement_running_balance/i18n/pxgo_bank_statement_running_balance.pot (+0/-49) pxgo_cash_statement/__init__.py (+0/-30) pxgo_cash_statement/__openerp__.py (+0/-51) pxgo_cash_statement/account_journal.py (+0/-44) pxgo_cash_statement/account_journal_view.xml (+0/-20) pxgo_cash_statement/cash_statement.py (+0/-187) pxgo_cash_statement/cash_statement_view.xml (+0/-149) pxgo_cash_statement/i18n/ca.po (+0/-181) pxgo_cash_statement/i18n/es.po (+0/-177) pxgo_cash_statement/i18n/es_ES.po (+0/-163) pxgo_cash_statement/i18n/pt.po (+0/-181) pxgo_cash_statement/i18n/pxgo_cash_statement.pot (+0/-153) sale_payment/__init__.py (+0/-24) sale_payment/__openerp__.py (+0/-52) sale_payment/i18n/bg.po (+0/-45) sale_payment/i18n/ca.po (+0/-46) sale_payment/i18n/es.po (+0/-47) sale_payment/i18n/fi.po (+0/-46) sale_payment/i18n/fr_BE.po (+0/-59) sale_payment/i18n/pt.po (+0/-45) sale_payment/i18n/sale_payment.pot (+0/-42) sale_payment/i18n/sv.po (+0/-44) sale_payment/sale_payment.py (+0/-100) sale_payment/sale_payment_view.xml (+0/-21) |
||||
| To merge this branch: | bzr merge lp://qastaging/~gisce/openobject-addons/bug1122021 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenERP Committers | Pending | ||
|
Review via email:
|
|||
Description of the change
This merge proposal removes some modules that are already in Account payment addons[1] and fixes bug 1122021 [2].
Please the owners of these modules have to decide in which repo the code must be, this situation is confused.
[1] https:/
[2] https:/
To post a comment you must log in.
Unmerged revisions
- 5847. By Eduard Carreras i Nadal
-
Remove duplicate modules BUG:1122021
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
