lp:~openerp-dev/openobject-server/trunk-new-graphview-ged

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openobject-server at revision 5038

OpenERP Core Team: Pending requested 2014-01-23

Diff: 175 lines (+48/-56)

3 files modified

openerp/addons/base/rng/view.rng (+1/-0)
openerp/osv/orm.py (+43/-41)
openerp/tests/test_orm.py (+4/-15)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

5040. By Géry Debongnie on 2014-02-05

[MERGE] merge from trunk into local branch

5039. By Géry Debongnie on 2014-01-30

[MERGE] merge trunk into local branch

5038. By Géry Debongnie on 2014-01-30

[IMP] improves the formatting of the dates returned by read_group in orm.py (for ex, January -> January 2014 or W4 -> W4 2014)

5037. By Géry Debongnie on 2014-01-30

[MERGE] merge trunk into local branch

5036. By Géry Debongnie on 2014-01-29

[FIX] hopefully, properly uses the user's timezone when performing a readgroup (in orm.py)

5035. By Géry Debongnie on 2014-01-28

[FIX] uses the user's timezone when performing a readgroup (in orm.py)

5034. By Géry Debongnie on 2014-01-27

[MERGE] merge trunk into local branch

5033. By Géry Debongnie on 2014-01-24

[MERGE] merge trunk into local branch

5032. By Géry Debongnie on 2014-01-24

[REF] implifies the read_group method by removing an useless dictionary (orm.py)

5031. By Géry Debongnie on 2014-01-24

[IMP] adds 'W' in front of the week number when formatting date grouped by weeks (method read_group) (orm.py)