Merge lp://staging/~dr.dran/domsense-agilebg-addons/account_analytics_deferred_6_0 into lp://staging/domsense-agilebg-addons/6.1
Proposed by
Franco Tampieri
| Status: | Rejected |
|---|---|
| Rejected by: | Lorenzo Battistini |
| Proposed branch: | lp://staging/~dr.dran/domsense-agilebg-addons/account_analytics_deferred_6_0 |
| Merge into: | lp://staging/domsense-agilebg-addons/6.1 |
| Diff against target: |
2836 lines (+2445/-2) (has conflicts) 54 files modified
account_analytic_deferred_choice/AUTHORS.txt (+3/-0) account_analytic_deferred_choice/__init__.py (+23/-0) account_analytic_deferred_choice/__openerp__.py (+42/-0) account_analytic_deferred_choice/account_invoice_view.xml (+86/-0) account_analytic_deferred_choice/analytic.py (+37/-0) account_analytic_deferred_choice/i18n/it.po (+193/-0) account_analytic_deferred_choice/invoice.py (+183/-0) account_analytic_deferred_choice/project_view.xml (+21/-0) account_analytic_distribution_menu/AUTHORS.txt (+2/-0) account_analytic_distribution_menu/__init__.py (+22/-0) account_analytic_distribution_menu/__openerp__.py (+43/-0) account_analytic_distribution_menu/account_analytic_plans.py (+37/-0) account_analytic_distribution_menu/account_distribution.xml (+50/-0) account_move_template/__openerp__.py (+4/-0) account_move_template/wizard/select_template.py (+34/-2) account_move_template/wizard/select_template.xml (+9/-0) analytic_move/AUTHORS.txt (+1/-0) analytic_move/__init__.py (+22/-0) analytic_move/__openerp__.py (+40/-0) analytic_move/analytic.py (+40/-0) analytic_move/analytic_view.xml (+86/-0) analytic_move/i18n/it.po (+70/-0) analytic_move/security/ir.model.access.csv (+2/-0) hr_expense_analytic_deferred_choice/AUTHORS.txt (+1/-0) hr_expense_analytic_deferred_choice/__init__.py (+23/-0) hr_expense_analytic_deferred_choice/__openerp__.py (+42/-0) hr_expense_analytic_deferred_choice/analytic.py (+34/-0) hr_expense_analytic_deferred_choice/hr_expense.py (+116/-0) hr_expense_analytic_deferred_choice/hr_expense_view.xml (+37/-0) hr_expense_analytic_deferred_choice/i18n/it.po (+140/-0) hr_expense_analytic_deferred_choice/project_view.xml (+18/-0) project_issue_customer_view/project_issue_menu.xml (+6/-0) purchase_analytic_deferred_choice/AUTHORS.txt (+1/-0) purchase_analytic_deferred_choice/__init__.py (+23/-0) purchase_analytic_deferred_choice/__openerp__.py (+42/-0) purchase_analytic_deferred_choice/analytic.py (+34/-0) purchase_analytic_deferred_choice/i18n/it.po (+150/-0) purchase_analytic_deferred_choice/project_view.xml (+18/-0) purchase_analytic_deferred_choice/purchase_order.py (+116/-0) purchase_analytic_deferred_choice/purchase_order_view.xml (+38/-0) sale_double_validation/AUTHORS.txt (+1/-0) sale_double_validation/__init__.py (+22/-0) sale_double_validation/__openerp__.py (+41/-0) sale_double_validation/i18n/it.po (+58/-0) sale_double_validation/sale.py (+46/-0) sale_double_validation/sale_view.xml (+20/-0) sale_double_validation/sale_workflow.xml (+31/-0) super_calendar/AUTHORS.txt (+1/-0) super_calendar/__init__.py (+22/-0) super_calendar/__openerp__.py (+46/-0) super_calendar/cron_data.xml (+13/-0) super_calendar/security/ir.model.access.csv (+4/-0) super_calendar/super_calendar.py (+116/-0) super_calendar/super_calendar_view.xml (+135/-0) Conflict adding file account_analytic_deferred_choice. Moved existing file to account_analytic_deferred_choice.moved. Conflict adding file account_analytic_distribution_menu. Moved existing file to account_analytic_distribution_menu.moved. Text conflict in account_move_template/__openerp__.py Text conflict in account_move_template/wizard/select_template.py Text conflict in account_move_template/wizard/select_template.xml Conflict adding file analytic_move. Moved existing file to analytic_move.moved. Conflict adding file hr_expense_analytic_deferred_choice. Moved existing file to hr_expense_analytic_deferred_choice.moved. Conflict adding file project_issue_customer_view/data. Moved existing file to project_issue_customer_view/data.moved. Text conflict in project_issue_customer_view/project_issue_menu.xml Conflict adding file purchase_analytic_deferred_choice. Moved existing file to purchase_analytic_deferred_choice.moved. Conflict adding file sale_double_validation. Moved existing file to sale_double_validation.moved. Conflict adding file super_calendar. Moved existing file to super_calendar.moved. |
| To merge this branch: | bzr merge lp://staging/~dr.dran/domsense-agilebg-addons/account_analytics_deferred_6_0 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Lorenzo Battistini | Disapprove | ||
| Leonardo Pistone (community) | Disapprove | ||
|
Review via email:
|
|||
Description of the change
Modificato il modulo account_
To post a comment you must log in.
Revision history for this message
| Lorenzo Battistini (elbati) wrote | # |
Unmerged revisions
- 139. By Franco Tampieri
-
[Fix] A problem on the enrty lines view
[Add] The possibility to add an entry line without an account deferred_analytics_ id that didn't permit to the system to raise a exception - 138. By Franco Tampieri
-
[Fix] Corretti bugs minori di interfaccia
- 137. By Franco Tampieri
-
[ADD] Added the deferred Analytic choice to the account.move and account move.line
- 136. By Lorenzo Battistini
-
[MERGE] aggiunto il partner nel wizard di scelta del template per inserirlo nei move generati
- 135. By Franco Tampieri <email address hidden>
-
Added menu icons
- 134. By Lorenzo Battistini
-
[ADD] sale_double_
validation - 133. By Lorenzo Battistini
-
[FIX] avoiding record creation when missing required fields
- 132. By Lorenzo Battistini
-
[FIX] super_calendar constraint
- 131. By Lorenzo Battistini
-
[ADD] account_
analytic_ deferred_ choice analytic_move hr_expense_ analytic_ deferred_ choice purchase_ analytic_ deferred_ choice - 130. By Lorenzo Battistini
-
[FIX] confusing menu items
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Conflicts, let's do that again )