Merge lp:~openerp-dev/openobject-addons/6.1-opw-575523-han into lp:openobject-addons/6.1

Proposed by Hardik Ansodariya (OpenERP)
Status: Approved
Approved by: Vinay Rana (OpenERP)
Approved revision: 6809
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-575523-han
Merge into: lp:openobject-addons/6.1
Diff against target: 17 lines (+0/-1)
1 file modified
stock/__openerp__.py (+0/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-575523-han
Reviewer Review Type Date Requested Status
Vinay Rana (OpenERP) (community) Approve
Naresh(OpenERP) Pending
Review via email: mp+109595@code.launchpad.net

Description of the change

Hello,

I have added missing sxw files for report in account_ckeck_writing module.

Referencing Maintenance case: 575523

Thanks

To post a comment you must log in.
Revision history for this message
Vinay Rana (OpenERP) (vra-openerp) :
review: Approve
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible) for the missing .sxw's where as the description was already improved in 7. A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-575523-port-mma/+merge/132457 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6809. By Hardik Ansodariya (OpenERP)

[ADD] account_check_writing: Added missing sxw file for report (Maintanence case:575523)

6808. By Hardik Ansodariya (OpenERP)

[IMP] Removed the string [Different inventory methods (FIFO, LIFO, ...)] from description as FIFO and LIFO methos is not available in current version of OpenERP

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'account_check_writing/report/check_print_bottom.sxw'
2Binary files account_check_writing/report/check_print_bottom.sxw 1970-01-01 00:00:00 +0000 and account_check_writing/report/check_print_bottom.sxw 2012-06-11 10:00:30 +0000 differ
3=== added file 'account_check_writing/report/check_print_middle.sxw'
4Binary files account_check_writing/report/check_print_middle.sxw 1970-01-01 00:00:00 +0000 and account_check_writing/report/check_print_middle.sxw 2012-06-11 10:00:30 +0000 differ
5=== added file 'account_check_writing/report/check_print_top.sxw'
6Binary files account_check_writing/report/check_print_top.sxw 1970-01-01 00:00:00 +0000 and account_check_writing/report/check_print_top.sxw 2012-06-11 10:00:30 +0000 differ
7=== modified file 'stock/__openerp__.py'
8--- stock/__openerp__.py 2012-01-31 13:36:57 +0000
9+++ stock/__openerp__.py 2012-06-11 10:00:30 +0000
10@@ -30,7 +30,6 @@
11
12 Thanks to the double entry management, the inventory controlling is powerful and flexible:
13 * Moves history and planning,
14- * Different inventory methods (FIFO, LIFO, ...)
15 * Stock valuation (standard or average price, ...)
16 * Robustness faced with Inventory differences
17 * Automatic reordering rules (stock level, JIT, ...)