Merge lp://qastaging/~serpent-consulting-services/openerp-usa/openerp-usa-6.1-SerpentCS into lp://qastaging/openerp-usa/6.1.x
Proposed by
Serpent Consulting Services
| Status: | Merged |
|---|---|
| Merged at revision: | 75 |
| Proposed branch: | lp://qastaging/~serpent-consulting-services/openerp-usa/openerp-usa-6.1-SerpentCS |
| Merge into: | lp://qastaging/openerp-usa/6.1.x |
| Diff against target: |
1215 lines (+211/-297) 14 files modified
account_payment_ccapi_authdotnet/__init__.py (+2/-0) account_payment_ccapi_authdotnet/account_voucher.py (+1/-1) account_payment_ccapi_authdotnet/account_voucher.xml (+0/-12) account_payment_ccapi_authdotnet/cc_auth_api.py (+67/-62) account_payment_ccapi_authdotnet/stock_return_picking.py (+34/-131) account_payment_ccapi_authdotnet/stock_view.xml (+2/-2) account_payment_creditcard/account_voucher.py (+4/-5) account_payment_creditcard/account_voucher_view.xml (+0/-7) account_payment_creditcard/sale.py (+4/-1) account_payment_creditcard/stock_picking.py (+8/-1) account_voucher_credits_us/__openerp__.py (+1/-1) account_voucher_credits_us/voucher.py (+85/-43) account_voucher_credits_us/voucher_payment_receipt_view.xml (+0/-25) account_voucher_credits_us/wizard/account_post_voucher.py (+3/-6) |
| To merge this branch: | bzr merge lp://qastaging/~serpent-consulting-services/openerp-usa/openerp-usa-6.1-SerpentCS |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| npg | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Serpent Consulting Services (serpent-consulting-services) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks for the merge.