Christophe Simonis
cf507ffc6a
[FIX] hr_evaluation: give access to the right survey menus
...
bzr revid: chs@openerp.com-20140428094143-010zuh723nr7zq2q
2014-04-28 11:41:43 +02:00
Christophe Simonis
b2fc19045b
[FIX] release.py: correct version number (wrongly forward-ported from saas-4)
...
lp bug: https://launchpad.net/bugs/1278411 fixed
bzr revid: chs@openerp.com-20140428093924-2aq3zomkbxv31iu0
2014-04-28 11:39:24 +02:00
Simon Lejeune
f9f304a781
[MERGE] l10n_in_hr_payroll reports converted to QWeb
...
bzr revid: sle@openerp.com-20140428093748-x4o2yjr6a8rje22p
2014-04-28 11:37:48 +02:00
chm@openerp.com
bb2ebf7cb9
[FIX] website_sale: apply fiscal position on change product id and update cart.
...
[IMP] sale: apply fiscal position of the partner if they are not fiscal position defined
bzr revid: chm@openerp.com-20140428093609-8z8my9vj322shcll
2014-04-28 11:36:09 +02:00
Simon Lejeune
5957efbde9
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140428093503-mhb4nd70u8ctoyok
2014-04-28 11:35:03 +02:00
Gery Debongnie
065b3c2176
[IMP] add the expand all button back to the graph view
...
It was removed a long time ago, but it looks like the 'expand all' button
is useful enough to make a comeback.
Also, this commit removes a few useless lines in graph_widget about the
grouped/stacked status of bar charts
bzr revid: ged@openerp.com-20140428090221-po3ksrd73093w3qm
2014-04-28 11:02:21 +02:00
Fabien Meghazi
18615e2493
[TRY] to get runbot green
...
bzr revid: fme@openerp.com-20140428081602-c1u8jbvjnoni7sds
2014-04-28 10:16:02 +02:00
Martin Trigaux
a77002035d
[FIX] lunch: allow other people to create lunch orders for others
...
bzr revid: mat@openerp.com-20140428075301-ah6lgb7zzkr6vb3o
2014-04-28 09:53:01 +02:00
Launchpad Translations on behalf of openerp
a2536d5e32
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140427061844-eycgmbqvphlakiz3
2014-04-27 06:18:44 +00:00
Launchpad Translations on behalf of openerp
c236ed8175
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140427055834-hxn2o38wro00v3rg
2014-04-27 05:58:34 +00:00
Launchpad Translations on behalf of openerp
2d41c2c7d5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140426065503-a38xqdyjfr1qvghz
2014-04-26 06:55:03 +00:00
Atul Patel (OpenERP)
ae858f4d68
[IMP]: Rename report name report_hryearly salary
...
bzr revid: atp@tinyerp.com-20140425175230-sctyfvvn87c6exm9
2014-04-25 23:22:30 +05:30
Atul Patel (OpenERP)
105331f12a
[FIX]: import osv file in report file. add stringin reportxml file
...
bzr revid: atp@tinyerp.com-20140425170524-fev2rr0uhycalp9h
2014-04-25 22:35:24 +05:30
Christophe Simonis
d562249278
[FIX] project: force menu name
...
bzr revid: chs@openerp.com-20140425170357-iqcqqfe71mm2z0qg
2014-04-25 19:03:57 +02:00
Olivier Dony
9706320c11
[FIX] event_sale: `seats_available` needs to be recomputed according to the value of `seats_max` that changes when tickets are updated
...
bzr revid: odo@openerp.com-20140428094449-wuvjwl4ko10l4c92
2014-04-28 11:44:49 +02:00
Atul Patel (OpenERP)
1c1d9eee50
[ADD]: Add payroll advice report
...
bzr revid: atp@tinyerp.com-20140425163022-q4fw9zcx0f7n35ox
2014-04-25 22:00:22 +05:30
Christophe Simonis
ee613ec6cd
[IMP] remove useless table/column creations in base.sql. Let the ORM do it job.
...
[FIX] force creation of workflow used columns.
bzr revid: chs@openerp.com-20140425162828-e85aut02ua8c53nv
2014-04-25 18:28:28 +02:00
Fabien Meghazi
8f90b2fcbc
[FIX] ensure_db() for /web/tests should fix tests
...
bzr revid: fme@openerp.com-20140425154529-mmo20479tkqzfnm0
2014-04-25 17:45:29 +02:00
Denis Ledoux
b54e49b291
[FIX] website_sale, website_sale_delivery, delivery: price computation on quantity change
...
bzr revid: dle@openerp.com-20140425152541-qiabb4sa7y2skgql
2014-04-25 17:25:41 +02:00
Denis Ledoux
22edf72dc1
[FIX] website_sale: fiscal_position must be passed to product_id_change in order to compute taxes correctly
...
bzr revid: dle@openerp.com-20140425145739-3s7wgsc6l0re3lhe
2014-04-25 16:57:39 +02:00
Fabien Meghazi
15ea586840
[FIX] edi missing css asset
...
bzr revid: fme@openerp.com-20140425134022-km7rbrjo9fs2l9yt
2014-04-25 15:40:22 +02:00
Fabien Meghazi
292e2a5400
[MOV] jquery.form asset from backend to common
...
bzr revid: fme@openerp.com-20140425133557-p28kkojmy7axns38
2014-04-25 15:35:57 +02:00
Denis Ledoux
986e466bf2
[FIX] multi_company: set currency of OpenERP US to USD in the demo data
...
bzr revid: dle@openerp.com-20140425133421-czisl2dpm5hletts
2014-04-25 15:34:21 +02:00
chm@openerp.com
edaed14f3f
[FIX] website_sale: apply tax
...
bzr revid: chm@openerp.com-20140425133403-g94w1yaj56k9whr5
2014-04-25 15:34:03 +02:00
Martin Trigaux
529bdd335b
[FIX] gamification: remove useless data from demo data
...
bzr revid: mat@openerp.com-20140425133126-ez6oxa4tzy8k1vc2
2014-04-25 15:31:26 +02:00
Fabien Meghazi
38e001ce2d
[FIX] missing asset in sale_crm
...
bzr revid: fme@openerp.com-20140425132927-5nslp4tyeh2eoy0r
2014-04-25 15:29:27 +02:00
Fabien Meghazi
4b3212c076
[IMP] better exception handling in case of missing asset
...
bzr revid: fme@openerp.com-20140425132804-e0dbsl5t2sod7kv5
2014-04-25 15:28:04 +02:00
chm@openerp.com
cee3cabaa8
[IMP] website_sale: create new shipping address; company_name field; fix acquierer image
...
bzr revid: chm@openerp.com-20140425132049-kg4w68qn07eof47q
2014-04-25 15:20:49 +02:00
Sunil Sharma
d75153f990
[imp]:improve title for allowances with basic
...
bzr revid: ssh@tinyerp.com-20140425130934-y3oho46frq1ss4p4
2014-04-25 18:39:34 +05:30
Martin Trigaux
b2bc761d76
[FIX] gamification: do not overwrite the mail widget as it would be called too often, the wall is enough
...
bzr revid: mat@openerp.com-20140425130740-ptkbsyyql08cx572
2014-04-25 15:07:40 +02:00
Sunil Sharma
18de18a29e
[imp]:improve hr yearly salary detail tbody code
...
bzr revid: ssh@tinyerp.com-20140425130457-rh9fxo703956eyqx
2014-04-25 18:34:57 +05:30
Fabien Meghazi
6d60aadfb8
[FIX] ace editor can't find it's assets if code is bundled
...
It's tries to find it's own <script> tag but fail to do so.
bzr revid: fme@openerp.com-20140425130229-koavz642l01txlxn
2014-04-25 15:02:29 +02:00
Denis Ledoux
2832d2ddc9
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10016 revid:dle@openerp.com-20140425125507-njfyl1r6wn11vqwx
...
bzr revid: dle@openerp.com-20140425125926-5nchz1tcq4fx18jx
2014-04-25 14:59:26 +02:00
Denis Ledoux
12eb157397
[FIX] product: price computation failed when for pricelists based on Cost price for non-employee users
...
bzr revid: dle@openerp.com-20140425125507-njfyl1r6wn11vqwx
2014-04-25 14:55:07 +02:00
Fabien Meghazi
eae846f2c8
[FIX] remove @translatable conditions and de-activate group_website_designer specifics
...
Bundlification (and later merge of editor and web client) can't work with conditional
script inclusion
bzr revid: fme@openerp.com-20140425124913-9jsfhbfhoq6j6xxl
2014-04-25 14:49:13 +02:00
Thibault Delavallée
7f236edcdd
[FIX] website_forum: fixed link of answer's author, was redirecting
...
to the current users instead of the post's author;
bzr revid: tde@openerp.com-20140425124911-z4dqhm64yabq214t
2014-04-25 14:49:11 +02:00
Frédéric van der Essen
c0d62797c9
[FIX] hw_scale: remove useless driver test script
...
bzr revid: fva@openerp.com-20140425124005-pugnyq6gsl0gw8yx
2014-04-25 14:40:05 +02:00
Frédéric van der Essen
24852d7ec9
[FIX] hw_scale: remove useless python module
...
bzr revid: fva@openerp.com-20140425123246-lexb4viqi6k7zwgq
2014-04-25 14:32:46 +02:00
Thibault Delavallée
88f7865043
[FIX] mail: unlink only sent emails, not failed emails.
...
bzr revid: tde@openerp.com-20140425122726-k5upt8tq5xp4m228
2014-04-25 14:27:26 +02:00
Frédéric van der Essen
f210babfc6
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140425122510-y60j039e3khbwwd5
2014-04-25 14:25:10 +02:00
Frédéric van der Essen
3f0a8e8931
[IMP] point_of_sale, hw_scale: various small fixes and improvements for the scale module
...
bzr revid: fva@openerp.com-20140425122220-q7rw1dve8bgs25as
2014-04-25 14:22:20 +02:00
Martin Trigaux
d1c2667262
[FIX] view: avoid propagation of context while executing an action
...
As the action could lead to unrelated model, keeping the defaults, groupby and ref do not make sense.
Backport of saas-2 revision 3872, 3891, 3892, 3893 and 3905
lp bug: https://launchpad.net/bugs/1101840 fixed
lp bug: https://launchpad.net/bugs/1263888 fixed
bzr revid: mat@openerp.com-20140425120002-g4126s9it705hwj5
2014-04-25 14:00:02 +02:00
Martin Trigaux
dd03491df9
sync with 7.0
...
bzr revid: mat@openerp.com-20140425113555-nkjxldq61io6kvdo
2014-04-25 13:35:55 +02:00
Simon Lejeune
d711fd940d
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140425113341-0aljg5e2waole2sz
2014-04-25 13:33:41 +02:00
Simon Lejeune
49fe785e64
[REM] hr_timesheet: removed xsl/models of user(s) timesheet reports as they are not available since rev 9064 revid:ged@openerp.com-20140127161718-uo6pperke86pqq5v. They are already replaced by graphviews.
...
bzr revid: sle@openerp.com-20140425113228-obzblo2nmkmo2q58
2014-04-25 13:32:28 +02:00
Gery Debongnie
a32d8cb9de
[FIX] (partially) fixes a concurrence problem in graph view
...
The graph view is asynchronous when updating data. It is not safe when
the user tries to update quickly the group bys (for example, when adding two
group bys in quick succession).
This patch partially fixes the problem: it makes sure that two concurrent updates
will be correctly serialized. However, it is not a complete fix: the crash can still happen
when three or more updates are quickly done. A complete solution require some more work in
keeping tracks of an update queue and serializing properly the updates. (will be done in trunk)
bzr revid: ged@openerp.com-20140425102501-qe7ve1ug8neq1twv
2014-04-25 12:25:01 +02:00
Fabien Meghazi
4f16d15120
[IMP] rename editor assets
...
bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
2014-04-25 12:17:53 +02:00
Chirag Dodiya (OpenERP)
775e553d5a
[IMP]Improved code for add <p> tag
...
bzr revid: cod@tinyerp.com-20140425101340-znewo5agt8vdl5mw
2014-04-25 15:43:40 +05:30
Martin Trigaux
bb85882322
[FIX] hr_timesheet_sheet: forbid to record an attendance in a submitted timesheet (opw 592632)
...
bzr revid: mat@openerp.com-20140425100856-lcpgyjdk4u632bws
2014-04-25 12:08:56 +02:00
Denis Ledoux
81aeccb3a0
[FIX] account: invoices button on partner sheet only display the customer invoices, and is visible only if the partner is a customer
...
bzr revid: dle@openerp.com-20140425095123-xvc51uiqt3g18181
2014-04-25 11:51:23 +02:00