Merge lp://qastaging/~openerp-dev/openobject-addons/trunk-bug-1068038-jco into lp://qastaging/openobject-addons
Proposed by
Josse Colpaert (OpenERP)
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~openerp-dev/openobject-addons/trunk-bug-1068038-jco |
| Merge into: | lp://qastaging/openobject-addons |
| Diff against target: |
341 lines (+100/-44) 5 files modified
account_check_writing/account_voucher.py (+13/-7) account_voucher/account_voucher.py (+70/-21) account_voucher/voucher_payment_receipt_view.xml (+13/-12) hr_expense/hr_expense.py (+3/-3) hr_expense/hr_expense_view.xml (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~openerp-dev/openobject-addons/trunk-bug-1068038-jco |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| qdp (OpenERP) | Pending | ||
|
Review via email:
|
|||
Description of the change
Company read-only on expense and generating accounting entries checks if the companies of the user and the expense are equal. (raises an exception if not)
To post a comment you must log in.
Unmerged revisions
- 8425. By Josse Colpaert (OpenERP)
-
[MERGE] Merge from trunk
- 8424. By Josse Colpaert (OpenERP)
-
[MERGE] Merge from bug 1043857
- 8423. By Josse Colpaert (OpenERP)
-
[FIX] Expense company is made read-only and a check is put on generating accounting entries
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
