Gery Debongnie
0c24b69db2
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140113081030-74nfutdr5le70dz4
2014-01-13 09:10:30 +01:00
Gery Debongnie
d04c788f2e
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140113081007-sw0hkl7ps5y2in9g
2014-01-13 09:10:07 +01:00
Gery Debongnie
c0c686cd15
[FIX] changes test definition to have the correct number of assertions (addon web)
...
bzr revid: ged@openerp.com-20140113080856-7h6cnlh675vgi8s2
2014-01-13 09:08:56 +01:00
fa02a0a2e7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111054551-r144q2z5chu41e2t
2014-01-11 05:45:51 +00:00
Denis Ledoux
74e0fbae83
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9752 revid:dle@openerp.com-20140110173823-lfekux2jxrj5v9gn
...
bzr revid: dle@openerp.com-20140110160158-ypr2pp63ld6j5g4l
bzr revid: dle@openerp.com-20140110174038-3yogwf6hwk7kpa8w
2014-01-10 18:40:38 +01:00
Denis Ledoux
fba491fb21
[FIX] decimal_precision: signal workers to restart their registry when decimal precision change.
...
bzr revid: dle@openerp.com-20140110173823-lfekux2jxrj5v9gn
2014-01-10 18:38:23 +01:00
Frédéric van der Essen
bf792a2fd6
[MERGE] point_of_sale: big point of sale upgrade for posbox campaign
...
bzr revid: fva@openerp.com-20140110172410-ao0le042o8h9enha
2014-01-10 18:24:10 +01:00
Frédéric van der Essen
4165921640
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140110172323-35agisgr341hzc3b
2014-01-10 18:23:23 +01:00
Frédéric van der Essen
a97a587fad
[IMP] point_of_sale: posbox automatic discovery
...
bzr revid: fva@openerp.com-20140110171746-286285ds696d5kby
2014-01-10 18:17:46 +01:00
jke-openerp
656f8241d5
[REF] Refactoring according to the first review of CHS
...
bzr revid: jke@openerp.com-20140110170912-im9p7j5wf229k4d6
2014-01-10 18:09:12 +01:00
jke-openerp
344166ba15
[IMP] Removed quick_create_instance from rng calendar, now by default quick_add is use as if set to True, and if value is not False, we use this value as quick_create_instance
...
bzr revid: jke@openerp.com-20140110170645-ubdxpga4aah8g50c
2014-01-10 18:06:45 +01:00
jke-openerp
4d728f85dc
[IMP] Improve according first review CHS
...
bzr revid: jke@openerp.com-20140110170333-vkvhw7zon9h2qw6n
2014-01-10 18:03:33 +01:00
Stephane Wirtel
ec35576af3
[IMP] Use INSERT INTO RETURNING for the creation of a record and use some tables
...
instead of a string for the generation of the SQL query.
bzr revid: stw@openerp.com-20140110162731-ma7wk61zof6h9vyr
2014-01-10 17:27:31 +01:00
Christophe Simonis
a6b947d84b
[FIX] migration: correct the verification of module version against running server
...
bzr revid: chs@openerp.com-20140110162705-6vy67xbdje507bla
2014-01-10 17:27:05 +01:00
Olivier Dony
cc5d5bb2bf
[FIX] account: restore cross-account reconciliation check, disabled by mistake in v6.1
...
Both the FY closing change and the removal of the
check occurred in v6.1 at revision 6529
revid:qdp-launchpad@openerp.com-20120209170333-8xu7r21hencjwu73 .
Also removed code specific to fiscal year closing
in the regular reconciliation operation, as the
FY closing is now using a dedication reconciliation
algorithm.
This is a forward-port of the corresponding patch in v6.1,
at revno 7295 rev-id: odo@openerp.com-20140110154023-12rqfeuwx5fqpdau .
bzr revid: odo@openerp.com-20140110161519-qsocx6xgqsmbe6dt
2014-01-10 17:15:19 +01:00
2a5a05f49d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140114064936-uengc20ppbqnn5ut
2014-01-14 06:49:36 +00:00
Martin Trigaux
cc553cc507
[FIX] format: trying to format an undefined value as the same effect as a value to false or infinity: return value_if_empty parameter
...
bzr revid: mat@openerp.com-20140113172347-00anf6lh2jxin84w
2014-01-13 18:23:47 +01:00
Denis Ledoux
fb7aefa5c3
[FIX] hr_timesheet_invoice: on_change_partner_id, do nothing if partner_id is False
...
bzr revid: dle@openerp.com-20140113165647-152dy1wqgc7m8cc8
2014-01-13 17:56:47 +01:00
Martin Trigaux
892f1d5fe5
[MERGE] [FIX] account: fixed amount in foreign currency for opening entries
...
When generating fiscal year opening entries, if the account uses a different currency, the amount_currency should contains only the entries of the current year and not the previous one. Courtesy of Matthieu Dietrich (camptocamp)
bzr revid: mat@openerp.com-20140113132209-jpva50a714xfxx30
2014-01-13 14:22:09 +01:00
c2794d0e85
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062610-ld24q55cbxo6di5q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054746-j34qg10ipyb6kj8g
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055853-5oqpffj3szw1yrpl
bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062637-m0t50cu2cr5d6yw7
bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054824-hm7ylgrauivbj7h2
bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055913-wo2i3sd1rnblragc
2014-01-13 05:59:13 +00:00
Gery Debongnie
98bd9a3fc3
[FIX] the SearchQuery.add methods now properly removes the 'at' and 'merge' keys before propagating options, so the tests should now pass (addon web)
...
bzr revid: ged@openerp.com-20140110154812-kazqirnie3kwtl4m
2014-01-10 16:48:12 +01:00
Martin Trigaux
fd9d8b9ff3
[FIX] mrp: move _prepare_order_line_procurement to module sale_mrp as mrp module does not depends from sale
...
bzr revid: mat@openerp.com-20140110153133-qozwrixyrwxjr44n
2014-01-10 16:31:33 +01:00
Xavier Morel
3f8c2d0bad
[FIX] conversion from html to values for text field
...
see html_to_text comment
bzr revid: xmo@openerp.com-20140110152024-yp2out0jg1gx1uhs
2014-01-10 16:20:24 +01:00
Gery Debongnie
bb1069ace8
[REF] removes some code duplication when creating new headers in pivot class (addon web_graph)
...
bzr revid: ged@openerp.com-20140110151524-i2usd1nyrfpgkody
2014-01-10 16:15:24 +01:00
Gery Debongnie
716d888aaf
[IMP] separates a facet test into smaller tests to have better information (addon web)
...
bzr revid: ged@openerp.com-20140110150836-xgk11tcimhmgpl9z
2014-01-10 16:08:36 +01:00
24e1e2cb6c
[IMP] use MBA resolution
...
bzr revid: ddm@openerp.com-20140110143833-d3j1n5tt0jnd25i9
2014-01-10 15:38:33 +01:00
Thibault Delavallée
5139c760d2
[FIX] mrp: added security rule to enable mrp users to compute production orders
...
bzr revid: tde@openerp.com-20140110142722-3x0zk98aajh0bgxy
2014-01-10 15:27:22 +01:00
Gery Debongnie
2b3b08160c
[REF] simplification of the way Pivot configuration is done in graph view (addon web_graph)
...
bzr revid: ged@openerp.com-20140110140837-tl3ts6za0zr46id7
2014-01-10 15:08:37 +01:00
Martin Trigaux
08e0003177
[FIX] account_voucher: in fields_view_get overwrite, also add the 'default_supplier/customer' properity in context.
...
With this the 'create and edit' menu will initiate the partner as a supplier.
bzr revid: mat@openerp.com-20140110134845-hvbob1mii4ofqjay
2014-01-10 14:48:45 +01:00
Amit Bhavsar (Open ERP)
81c8320a2f
[IMP] price computation and yml testcase.
...
bzr revid: amb@tinyerp.com-20140110132921-klxgy71bas9jjef2
2014-01-10 18:59:21 +05:30
44adcd9f2d
[FIX] ugly race condition hack
...
bzr revid: ddm@openerp.com-20140110132734-n0ip9wyinw19c76e
2014-01-10 14:27:34 +01:00
Martin Trigaux
b65cbbb0e5
[FIX] stock: when receiving an incoming shipment, the default quantity should be prefilled.
...
This fixes the issue when the picking was first confirmed and received later, stock.move have the state as confirmed (Waiting Availibility)
bzr revid: mat@openerp.com-20140110130056-gjmssgxrqgr5y67y
2014-01-10 14:00:56 +01:00
Christophe Simonis
7dd16a558e
[FIX] decimal_precision: signal workers to restart their registry when decimal precision change.
...
bzr revid: chs@openerp.com-20140110125433-soimmrpz2icvob60
2014-01-10 13:54:33 +01:00
Thibault Delavallée
f92f824b30
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140110124928-jz1ie9qyh6n99fi7
2014-01-10 13:49:28 +01:00
Gery Debongnie
dbf064e817
[REF] removes useless comments (addon web_graph)
...
bzr revid: ged@openerp.com-20140110120149-pi0h75eqlr2tl9n5
2014-01-10 13:01:49 +01:00
Gery Debongnie
f625675079
[REF] large refactoring in graph view: changes the underlying data structure of Pivot class and simplifies a lot of code (addon web_graph)
...
bzr revid: ged@openerp.com-20140110113557-6bs77dg7qcdofy40
2014-01-10 12:35:57 +01:00
Christophe Matthieu
4998764d40
[IMP] website_sale: website_sequence with push to top, push up, push down, push to bottom
...
bzr revid: chm@openerp.com-20140110112442-kmjx97tk6zz5zpwa
2014-01-10 12:24:42 +01:00
Christophe Matthieu
8749e13a75
[FIX] website_sale: delivery and payment views
...
bzr revid: chm@openerp.com-20140110102858-57v9dk3hk75c5uu3
2014-01-10 11:28:58 +01:00
Martin Trigaux
b7f393da31
[FIX] mail: do not check access rights for autosubscription after create.
...
This is required for models using message_follower_ids in their record rules (eg: note.note)
bzr revid: mat@openerp.com-20140110100133-wemcu6ou8avk6rpi
2014-01-10 11:01:33 +01:00
3ed5b49e7a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140110053216-23qk0vpm4hr5g1ig
2014-01-10 05:32:16 +00:00
ed96693541
[IMP] UI tests: more retries
...
bzr revid: ddm@openerp.com-20140109174714-489xtghuhzk90g4l
2014-01-09 18:47:14 +01:00
b657843403
[IMP] UI tests: delay retry
...
bzr revid: ddm@openerp.com-20140109171225-bl495hi6otl84ura
2014-01-09 18:12:25 +01:00
98d008cfb1
[IMP] UI tests: click only on visible buttons
...
bzr revid: ddm@openerp.com-20140109164214-3s280i00mbath8ep
2014-01-09 17:42:14 +01:00
43ff1781d6
[IMP] UI tests: click only on visible buttons
...
bzr revid: ddm@openerp.com-20140109164145-b0z9ctzqmypppiaq
2014-01-09 17:41:45 +01:00
Stephane Wirtel
a097785c67
[MERGE] Extract the base64 encoded images from the xml files lp:~openerp-dev/openobject-server/trunk-extracted_img-stw
...
bzr revid: stw@openerp.com-20140109161022-tbrcm0e0f6plj6fe
2014-01-09 17:10:22 +01:00
Stephane Wirtel
b5635f8603
[MERGE] Extract the base64 encoded images from the xml files lp:~openerp-dev/openobject-addons/trunk-extracted_img-stw
...
bzr revid: stw@openerp.com-20140109160942-zo338hdm1bg8wdr0
2014-01-09 17:09:42 +01:00
Stephane Wirtel
bea411bb98
[IMP] Backport one feature from website: this feature allows to specify a file
...
path on the field tag fetching the right file instead of using the base64
encoded file in the field.
<field name="image" type="base64" file="base/static/img/main_partner-image.png" />
bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
Stephane Wirtel
89f71281a7
[IMP] Backport one feature from website: this feature allows to specify a file
...
path on the field tag fetching the right file instead of using the base64
encoded file in the field.
<field name="image" type="base64" file="base/static/img/main_partner-image.png" />
bzr revid: stw@openerp.com-20140109154338-0spjbo109pxh75pp
2014-01-09 16:43:38 +01:00
Martin Trigaux
3fb75a44c8
[FIX] orm: add missing context (without the lang attribute to avoid setting translated values) in write call.
...
bzr revid: mat@openerp.com-20140109153601-13wo9gj5cz6ho3nm
2014-01-09 16:36:01 +01:00
Christophe Matthieu
b100726312
[FIX] product: remove data demo of product in multi_company module; fix product images storage
...
bzr revid: chm@openerp.com-20140109152621-vduwsnm2hbm9nwop
2014-01-09 16:26:21 +01:00
Gery Debongnie