← Back to branch summary

~camptocamp/sale-financial/7.0-pending-merge

~camptocamp/sale-financial/7.0-pending-merge

Viewing all changes in revision 22.

Committer: Guewen Baconnier
Date: 2014-04-09 12:57:33 UTC
mfrom: (20.2.8 7.0-port-sale_markup)
Revision ID: guewen.baconnier@camptocamp.com-20140409125733-3d8fmqkkms3n1kqj

merge from lp:~camptocamp/sale-financial/7.0-port-sale_markup

files added:
sale_markup/i18n/fr.po

sale_markup/i18n/sale_markup.pot

files modified:
sale_markup/__openerp__.py

sale_markup/product_markup.py

sale_markup/product_view.xml

sale_markup/sale_markup.py

sale_markup/sale_view.xml

Show diffs side-by-side

added added

removed removed

sale_markup/__openerp__.py

sale_markup/i18n/fr.po

sale_markup/i18n/sale_markup.pot

sale_markup/product_markup.py

sale_markup/product_view.xml

sale_markup/sale_markup.py

sale_markup/sale_view.xml

Older »