Josse Colpaert
5ced70ecac
[MERGE] Merge changes in picking order yml
...
bzr revid: jco@openerp.com-20130826163554-llxua5fua26nrgsh
2013-08-26 18:35:54 +02:00
Josse Colpaert
23488bfd36
[MERGE] Lifo price yml
...
bzr revid: jco@openerp.com-20130826160530-pnhgsiin044hoy2r
2013-08-26 18:05:30 +02:00
Josse Colpaert
ca1f4566b7
[IMP] Back order should not give traceback and destination move should take quants from original move as reserved quants into account for quantity to reserve when assigned.
...
bzr revid: jco@openerp.com-20130826153648-e7bxt0btvcsb1jun
2013-08-26 17:36:48 +02:00
niv-openerp
00d3d9a4b6
[FIX] im: multiple bugs
...
bzr revid: nicolas.vanhoren@openerp.com-20130826135135-93tmyi6a1fpju8vy
2013-08-26 15:51:35 +02:00
Martin Trigaux
98541c5827
[FIX] mrp: display Bill of Materials as a list, not as a tree
...
bzr revid: mat@openerp.com-20130826132943-mp8f331mxafb3z9z
2013-08-26 15:29:43 +02:00
niv-openerp
05a1a5ffe6
merge trunk
...
bzr revid: nicolas.vanhoren@openerp.com-20130826131051-c7aatnvew9q52iw6
2013-08-26 15:10:51 +02:00
Josse Colpaert
9b1690ac56
[IMP] Moves too many are processed, moves short go in backorder. Needs refresh of picking for backorder
...
bzr revid: jco@openerp.com-20130826130322-bbk8yxdeug7o18dl
2013-08-26 15:03:22 +02:00
niv-openerp
5e8315730b
Solved a few bugs
...
bzr revid: nicolas.vanhoren@openerp.com-20130826125254-smlkkh5m3n36cklw
2013-08-26 14:52:54 +02:00
Olivier Dony
20e5751e62
[IMP] email_template: add datetime and dateutil.relativedelta in the global rendering context for templates
...
The `dateutil` package is not included directly in the globals because
`dateutil.relativedelta.relativedelta` is an old-style class and jinja2
does not appear to support instantiating old-style classes within an
expression, so `relativedelta` support is provided using a "lambda proxy".
bzr revid: odo@openerp.com-20130826124405-bixzwyhl65c7v75b
2013-08-26 14:44:05 +02:00
niv-openerp
8ee25f9856
Refactored to avoid user duplication problem
...
bzr revid: nicolas.vanhoren@openerp.com-20130826123947-alcsov647beqge0c
2013-08-26 14:39:47 +02:00
Randhir Mayatra (OpenERP)
c14bdb4f4c
[IMP] optimize code
...
bzr revid: rma@tinyerp.com-20130826122712-9sh92a7tytw0h26i
2013-08-26 17:57:12 +05:30
Randhir Mayatra (OpenERP)
dc500465de
[IMP] optimize code
...
bzr revid: rma@tinyerp.com-20130826121505-ags8sgw4ufixc9fl
2013-08-26 17:45:05 +05:30
Josse Colpaert
56d0336f2c
[IMP] Adding price_unit on sales order line form
...
bzr revid: jco@openerp.com-20130826115117-xfdpc9h3jqokdxyp
2013-08-26 13:51:17 +02:00
Josse Colpaert
c21e07a303
[IMP] Remaining qty and store of reservation_id + do_reserve for button
...
bzr revid: jco@openerp.com-20130826103224-2k224ekqtpzx920y
2013-08-26 12:32:24 +02:00
Bharat R. Devnani (OpenERP)
30685ddffb
[IMP] overrided _run_move_create method to get standard price of a product
...
bzr revid: bde@tinyerp.com-20130826101914-24jt4eqx8zqpvvbg
2013-08-26 15:49:14 +05:30
Thibault Delavallée
3a67d7dc99
[FIX] crm: fixed a bug introduced when merging trunk
...
bzr revid: tde@openerp.com-20130826095600-bgvdzah9nwb2vu0l
2013-08-26 11:56:00 +02:00
Thibault Delavallée
21d57f5e9d
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130826085410-qngwkw6eyxol4192
2013-08-26 10:54:10 +02:00
niv-openerp
7bce27c528
Now uses im.user's images
...
bzr revid: nicolas.vanhoren@openerp.com-20130826085212-od9oxv6h4jtkd6nf
2013-08-26 10:52:12 +02:00
niv-openerp
8f33049f2f
Changed user field to user_id and added unique constraint
...
bzr revid: nicolas.vanhoren@openerp.com-20130826084554-221ts80q8c5jvqv1
2013-08-26 10:45:54 +02:00
Bharat R. Devnani (OpenERP)
b97a9da42d
[REVERT] reverted the changes in _get_orders method
...
bzr revid: bde@tinyerp.com-20130826071405-yax8hqw0esrll766
2013-08-26 12:44:05 +05:30
Randhir Mayatra (OpenERP)
457d7f278e
[IMP] change action_invoice_create method
...
bzr revid: rma@tinyerp.com-20130826061503-4r9lv7ywbhfffikj
2013-08-26 11:45:03 +05:30
dc07d21f86
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130824053459-k3vf5zjfz0sjn6t6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130825051935-7croxf3zpoo1cvwk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130824053520-dpq7ulxrh0e06fd4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130825051953-hv03d787cy2sc9l4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130825051959-4r4bun8nvl6neyi5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130826051253-70i5qzbp5ttpsmb7
2013-08-26 05:12:53 +00:00
7294b0ebfa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130824050400-vvklljkx8p2e77no
2013-08-24 05:04:00 +00:00
Christophe Simonis
f751ce30b7
[FIX] project: correct migrate_to_alias call
...
bzr revid: chs@openerp.com-20130823161810-417zchlc06mbzcb8
2013-08-23 18:18:10 +02:00
Christophe Simonis
5343c48c5f
[MERGE] forward port of branch saas-1 up to revid 8760 chs@openerp.com-20130823143114-83tdjhbsdes0kydr
...
bzr revid: chs@openerp.com-20130823154655-blm2wyfivmg8qi2z
2013-08-23 17:46:55 +02:00
Christophe Simonis
b86eee378e
[MERGE] forward port of branch saas-1 up to revid 3743 chs@openerp.com-20130823145204-xwpnlwg0gg2259f6
...
bzr revid: chs@openerp.com-20130823145527-fz58kta3qpup4sb2
2013-08-23 16:55:27 +02:00
Christophe Simonis
993bff902e
[MERGE] forward port of branch 7.0 up to revid 4067 chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv
...
bzr revid: dle@openerp.com-20131112134311-h1vsux0ge17bsqkc
bzr revid: chs@openerp.com-20131114134731-n324awyon0spq624
bzr revid: chs@openerp.com-20130823145204-xwpnlwg0gg2259f6
bzr revid: chs@openerp.com-20130906170157-e7m4pjskyi47q82o
bzr revid: dle@openerp.com-20130909170408-wxgoduzggap6o4ng
bzr revid: dle@openerp.com-20130919141212-ridtrvvfwvu6calr
bzr revid: dle@openerp.com-20131018120136-fvoq337kgx74njsy
bzr revid: dle@openerp.com-20131023103308-18pj2gqq3imrcir7
bzr revid: chs@openerp.com-20131030180528-hqsztaujjjqev8ky
bzr revid: dle@openerp.com-20131106100128-mx8mnguvp321wick
bzr revid: chs@openerp.com-20131115104909-3u3mu40g9xnler88
2013-11-15 11:49:09 +01:00
Christophe Simonis
1e4b2695d5
[MERGE][FIX] web: fix race condition in BufferedDataset.
...
Backport of saas-2 commit 3867 nicolas.vanhoren@openerp.com-20131107112017-7omd01ocvnbzx9m6
lp bug: https://launchpad.net/bugs/1248531 fixed
bzr revid: chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv
2013-11-14 15:26:39 +01:00
Thibault Delavallée
ebe580f481
[FIX] portal: mail_message override: do not check access rules for SUPERUSER_ID
...
bzr revid: tde@openerp.com-20131114123346-dbnrkh6nadl774qe
2013-11-14 13:33:46 +01:00
Christophe Simonis
079bf31706
[FIX] account_payment: avoid using non-stored function field in domains.
...
Backport of following commits from trunk branch:
8962 qdp-launchpad@openerp.com-20131030164925-c66d7jfx0x3546kt
8974 qdp-launchpad@openerp.com-20131113100713-tvl30z5oqym22jqj
bzr revid: chs@openerp.com-20131114111802-a7rp2slqyigvconz
2013-11-14 12:18:02 +01:00
Christophe Simonis
e5ca5a170c
[FIX] web: list views: bubble up failed deferreds.
...
[FIX] web: list view group: always call post_render method
lp bug: https://launchpad.net/bugs/1248531 fixed
bzr revid: chs@openerp.com-20131114110847-nn382fc60s7u7wp1
2013-11-14 12:08:47 +01:00
Denis Ledoux
e5f75b67c0
[FIX]portal_claim: change of record rule for portal group for object portal.claim, to change behaviour: portal users can now create claims in the portal, read their claims, but cant edit or delete them. They can post messages in the chatter if they want to add something
...
bzr revid: dle@openerp.com-20131114095907-ge8f97r6kxnv06fx
2013-11-14 10:59:07 +01:00
Denis Ledoux
8be0a5a8e1
[FIX]crm: several calls to _get_id for external id 'categ_phone2' which were not surrounded by try except ValueError
...
bzr revid: dle@openerp.com-20131114095721-v22dl5yc8bzhvevf
2013-11-14 10:57:21 +01:00
99ffbd28ed
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063103-0ehwa7pk99d5b4k4
2013-11-14 06:31:03 +00:00
108ccbf108
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00:00
Martin Trigaux
d26e3b8b33
[FIX] ir_fields: call selection function with context=None instead of not passing argument. Same behaviour as previsously but does not break when have default value for context (eg: _get_language for ir.translation)
...
bzr revid: mat@openerp.com-20131113094523-67547nkfkfntjelb
2013-11-13 10:45:23 +01:00
Martin Trigaux
8c3cdce539
[MERGE] view form: reduce the number of result in 'search more' view opening to 160 records (performances improvement, not filtering every possible record) (opw 593963)
...
bzr revid: mat@openerp.com-20131113082806-me6uy7cjj6holn56
2013-11-13 09:28:06 +01:00
4231970c8a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060802-i0rwt8lkgeckatjo
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060848-04a2ehku5erssgvr
2013-11-13 06:08:48 +00:00
Christophe Simonis
6cfb4a0370
[FIX] web: do not enforce width of dropdown links
...
bzr revid: chs@openerp.com-20131112143746-svdfuqvzvvis6vpy
2013-11-12 15:37:46 +01:00
Christophe Simonis
61a8a22f60
[FIX] web: match base.sass against changes made in base.css in revid 4014 mat@openerp.com-20130821080933-fiq3zvccgzop02on
...
bzr revid: chs@openerp.com-20131112143635-ek6yhfifb6ycynku
2013-11-12 15:36:35 +01:00
Cecile Tonglet
83f6778446
[FIX] Import on model ir.translation was broken because of a missing context
...
bzr revid: cto@openerp.com-20131112132747-bajrgbwlp0m3z92s
2013-11-12 14:27:47 +01:00
Denis Ledoux
6792d85b44
[FIX]report: rml2pdf raise exception if cell is too long to be printed (instead of infinite loop). Workaround for reportlab issue #15 : https://bitbucket.org/rptlab/reportlab/issue/15/infinite-pages-produced-when-splitting
...
bzr revid: dle@openerp.com-20131112130412-mbdonb9g7n63w84r
2013-11-12 14:04:12 +01:00
a283d59024
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055031-tut0ikyn2ukgc3yw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055025-9oq3zxk6003gvt9g
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062531-oo7o57h2u1gxr3q5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064337-vgxh4bfudb3xik01
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053813-4tykju0tdgvvgk8m
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062220-8edq183y73j5cxns
2013-11-12 06:22:20 +00:00
Christophe Simonis
f42ac76068
[FIX] web_test_demo: make test model a TransientModel. This avoid a warning about the lack of access rules
...
bzr revid: chs@openerp.com-20131108214255-cgx1r7x8sx1ak4ea
2013-11-08 22:42:55 +01:00
3f73f59b15
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062624-4ihw3f2dghkrup1n
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064532-3pcx6sl2w1ioizv9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053914-v4h4lfsutiem8fos
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062321-q35iebzktzu6lw8m
2013-11-12 06:23:21 +00:00
niv-openerp
ee824f3c28
[FIX] problem with pads, the demo configuration doesn't work if the server is using https. I simply changed the url for the demo version.
...
lp bug: https://launchpad.net/bugs/1227545 fixed
bzr revid: nicolas.vanhoren@openerp.com-20131105133520-5egsr4cm0hi5r0dk
2013-11-05 14:35:20 +01:00
Olivier Dony
465c241338
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9567 rev-id: odo@openerp.com-20131105103011-vkix07lsb6q3y9fd
...
bzr revid: dle@openerp.com-20131031142609-jinks18n2ju7usm4
bzr revid: dle@openerp.com-20131031162241-goga1hsvwgyqigzd
bzr revid: odo@openerp.com-20131105122634-joau6mg9jqpvbauz
2013-11-05 13:26:34 +01:00
Christophe Simonis
3213ad4ddd
[FIX] web: instance.web.DataSetSearch.get_domain() returns the domain.
...
lp bug: https://launchpad.net/bugs/1195631 fixed
bzr revid: chs@openerp.com-20131105121843-rqplhk83fczxww0t
2013-11-05 13:18:43 +01:00
Olivier Dony
0f7099bb30
[FIX] sale,sale_stock: sales analysis view using incorrect JOIN and group by clause
...
Similarly to the recent fixes in Purchase Analysis,
the Sales Analysis view must not group on the quantity
field. It is one of the columns that must be aggregated,
not used to fold PO lines into the same
result row.
The line count was also incorrect because of this, and
had to be corrected to actually count() the underlying
SO lines.
In addition, the JOINs were done in the wrong order,
which could cause problems (e.g. if an empty SO ever
landed in the database, all the SO line columns
would be empty in the JOIN, and cause errors)
bzr revid: odo@openerp.com-20131105103011-vkix07lsb6q3y9fd
2013-11-05 11:30:11 +01:00
Olivier Dony
4cf2887153
[FIX] purchase: analysis view must not group by quantity, otherwise identical PO lines are counted only once
...
The product quantity is one of the columns that must be
aggregated, not used to fold PO lines into the same
result row.
This, combined with missing aggregation operators
was causing multiple identical PO lines from the
same PO to be merged together and only counted once
in some aggregations.
bzr revid: odo@openerp.com-20131105101930-f2qbcp12luom08je
2013-11-05 11:19:30 +01:00
Josse Colpaert