lp:~zhenit/openobject-addons/zs-extra-6.1

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons/extra-trunk

OpenERP Committers: Pending requested 2012-08-18

Diff: 534 lines (+479/-0) (has conflicts)

10 files modified

.bzrignore (+4/-0)
account_invoice_merge/__init__.py (+20/-0)
account_invoice_merge/__openerp__.py (+35/-0)
account_invoice_merge/i18n/account_invoice_merge.pot (+92/-0)
account_invoice_merge/i18n/es.po (+92/-0)
account_invoice_merge/invoice.py (+100/-0)
account_invoice_merge/invoice_merge.xml (+12/-0)
account_invoice_merge/wizard/__init__.py (+19/-0)
account_invoice_merge/wizard/invoice_merge.py (+70/-0)
account_invoice_merge/wizard/invoice_merge_view.xml (+35/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4. By mikel <mikel@pcl2> on 2012-08-19

[add] Merge name,comment,origin

3. By mikel <mikel@pcl2> on 2012-08-18

[merge] i18n

2. By mikel <mikel@pcl2> on 2012-08-18

[add] i18n

1. By mikel <mikel@pcl2> on 2012-08-18

[add] Module account_invoice_merge