lp:~openerp-dev/openobject-addons/trunk-today-filter-mat
- Get this branch:
- bzr branch lp:~openerp-dev/openobject-addons/trunk-today-filter-mat
Branch merges
- OpenERP Core Team: Pending requested
-
Diff: 109 lines (+10/-9)7 files modifiedevent/event_view.xml (+1/-1)
hr_attendance/hr_attendance_view.xml (+1/-1)
lunch/lunch_view.xml (+1/-1)
point_of_sale/point_of_sale_view.xml (+1/-1)
point_of_sale/report/pos_order_report.py (+3/-3)
point_of_sale/report/pos_order_report_view.xml (+2/-1)
stock/stock_view.xml (+1/-1)
Branch information
Recent revisions
- 9068. By Martin Trigaux (OpenERP)
-
[FIX] event: 'upcoming events' filter should includes today (starting at 00:00:00)
- 9066. By Martin Trigaux (OpenERP)
-
[FIX] point_of_sale: correct model and domain to have a valid today filter
- 9064. By Géry Debongnie
-
[IMP] merge all the modifications concerning the new graph view. It mainly changes the reporting views to use the pivot table as default.
- 9063. By van der Essen Frédéric (OpenERP)
-
[MERGE] point_of_sale: hardware proxy reliability improvements
- 9062. By Denis Ledoux (OpenERP)
-
[MERGE][ADD] crm: apply deduplication for mass converting leads to opps
- 9061. By Thibault Delavallée (OpenERP)
-
[MERGE] [ADD] product_
email_template new module. It allows ot send template-based emails when validating invoices. This allows to send description, user guides, technical datasheets, ... when selling products. product_template inheritance: added email_template_id field, link to an optional email.template
invoice inheritance: when validating the invoice, send an email for each product that has a linked email.template.
email_template inheritance: defined a new simplified form view with only attachment_ids and body, to ease the quick edition of email templates. This simplified form view is used for the email_template_id field on the product.template form view.
email_template: when having default_model in default_get, use it to prefetch model_id. Indeed model is a related file, we have to redirect its default to the right model_id field.
- 9060. By van der Essen Frédéric (OpenERP)
-
[MERGE] point_of_sale: further point of sale and hardware integration improvements
- 9059. By Thibault Delavallée (OpenERP)
-
[MERGE] [REF] [IMP] base_action_rule: allow using a resource.calendar to compute
day-based timing conditions.[REF] resource: cleaned, refactored and improved code for resource.calendar
module. Old API is kept for backward compatibility.
[TESTS] resource: added tests for the new implementation of the various
methods.[IMP] base_action_rule: using the resource module, added the possibility
to specify a resource.calendar to compute day-based timing conditions.[IMP] hr_contract: added an override of base action rule to add the possibility
of using an employees's resource.calendar to compute day-based timing
conditions.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:openobject-addons