lp:~openerp-dev/openobject-addons/7.0-mail_issues-adh

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openobject-addons/7.0

OpenERP Core Team: Pending requested 2014-05-23

Diff: 59 lines (+15/-2)

4 files modified

mail/mail_followers.py (+2/-1)
mail/mail_group.py (+7/-0)
mail/mail_thread.py (+1/-1)
mail/static/src/css/mail.css (+5/-0)

api

Superseded for merging into lp:openobject-addons

OpenERP Core Team: Pending requested 2014-05-23

Diff: 9694 lines (+8020/-28) (has conflicts)

62 files modified

account/account.py (+2/-0)
account/edi/invoice.py (+2/-2)
account/i18n/zh_TW.po (+12/-0)
account_budget/i18n/it.po (+14/-0)
account_budget/i18n/mn.po (+11/-0)
account_test/i18n/de.po (+241/-0)
account_voucher/i18n/bs.po (+141/-8)
analytic/analytic.py (+1/-1)
analytic_user_function/i18n/ja.po (+11/-0)
audittrail/audittrail.py.OTHER (+543/-0)
auth_oauth/auth_oauth_data.xml (+4/-4)
auth_signup/i18n/ja.po (+320/-0)
delivery/i18n/tr.po (+14/-0)
edi/i18n/ta.po (+87/-0)
event/i18n/ja.po (+33/-1)
hr_evaluation/i18n/de.po (+19/-0)
hr_expense/i18n/ja.po (+11/-0)
hr_holidays/hr_holidays.py (+10/-0)
hr_holidays/hr_holidays_view.xml (+50/-0)
mail/i18n/lt.po (+51/-1)
mail/mail_followers.py (+55/-0)
mail/mail_group.py (+7/-0)
mail/mail_thread.py (+1/-1)
mail/static/src/css/mail.css (+7/-0)
marketing_campaign/marketing_campaign.py (+2/-4)
mrp/i18n/tr.po (+26/-0)
mrp_byproduct/i18n/tr.po (+14/-0)
mrp_operations/i18n/tr.po (+14/-0)
mrp_repair/i18n/tr.po (+14/-0)
point_of_sale/point_of_sale.py (+6/-2)
point_of_sale/static/src/js/db.js (+7/-0)
point_of_sale/static/src/js/models.js (+4/-0)
portal_event/i18n/ja.po (+59/-0)
procurement/i18n/tr.po (+20/-0)
product/i18n/tr.po (+24/-1)
product/product.py (+6/-0)
product_expiry/i18n/tr.po (+11/-0)
product_margin/i18n/tr.po (+18/-0)
project/i18n/ja.po (+11/-0)
project_issue/i18n/mn.po (+15/-0)
purchase/i18n/bs.po (+17/-0)
purchase/i18n/tr.po (+22/-0)
purchase_analytic_plans/i18n/tr.po (+14/-0)
purchase_requisition/i18n/tr.po (+19/-0)
sale/edi/sale_order.py (+2/-2)
sale/i18n/bs.po (+1171/-0)
sale/i18n/fr_CA.po (+2323/-0)
sale/i18n/ja.po (+256/-0)
sale/i18n/tr.po (+1601/-0)
sale_analytic_plans/i18n/tr.po (+18/-0)
sale_journal/i18n/tr.po (+14/-0)
sale_margin/i18n/tr.po (+11/-0)
sale_stock/i18n/nl.po (+14/-0)
sale_stock/i18n/tr.po (+22/-0)
sale_stock/sale_stock.py (+11/-0)
stock/i18n/hr.po (+18/-0)
stock/i18n/nl.po (+18/-0)
stock/i18n/tr.po (+39/-1)
stock_location/i18n/tr.po.OTHER (+404/-0)
survey/i18n/de.po (+25/-0)
warning/i18n/tr.po (+15/-0)
website_blog/wizard/document_page_create_menu.py.OTHER (+88/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

10062. By Anand Dharampuriya(OpenERP) on 2014-05-23

[FIX] Solve If you print a page from Sales Order it show chatter also in the page https://bugs.launchpad.net/openobject-addons/+bug/1089217

10061. By Anand Dharampuriya(OpenERP) on 2014-05-23

[FIX] Solve while send a message to customer from sales with multiple lines of signature it will not show space beween lines of signature https://bugs.launchpad.net/openobject-addons/+bug/1168388

10060. By Anand Dharampuriya(OpenERP) on 2014-05-23

[FIX] Solve Whole Company, Company News and Company Jobs these 3 groups should not be deleted because some other modules are depend on it https://bugs.launchpad.net/openobject-addons/+bug/1251130

10059. By Anand Dharampuriya(OpenERP) on 2014-05-23

[FIX] Solve while send a message it will show addministrator twice in the created leads where customer and salesperson is Administrator and administrator is not in follower's list https://bugs.launchpad.net/openobject-addons/+bug/1248589

10058. By Launchpad Translations on behalf of openerp on 2014-05-22

Launchpad automatic translations update.

10057. By Martin Trigaux (OpenERP) on 2014-05-20

[FIX] sale: in paypal, the encoding of the url should be done with werkzeug instead of urllib for better handeling of unicode (opw 607866)

10056. By Denis Ledoux (OpenERP) on 2014-05-19

[FIX] point_of_sale: opw-607551, mark the pos order as paid before trying to create the picking, so in case the picking could not be created for one reason or another, the pos order workflow process continue.

This commit partially reverts rev. 6036 revid:<email address hidden>, the second part of this commit already has been revert in a previous revision.

10055. By Martin Trigaux (OpenERP) on 2014-05-19

[FIX] auditrail: fix read rules to record the current state (opw 606956)

10054. By Denis Ledoux (OpenERP) on 2014-05-19

[FIX] marketing_campaign: server actions always return None or False, and the return value of method _process_wi_action should return True whatever what the server action returns

If the server actions returned None instead of False, the next activity was not triggered, while it should

10053. By Launchpad Translations on behalf of openerp on 2014-05-18

Launchpad automatic translations update.