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
chm@openerp.com
f38fd98571
[FIX] website_sale: add to cart 1 item if number > 1 or set_number > 1
...
bzr revid: chm@openerp.com-20140425095051-5mxza3q2lblmy90r
2014-04-25 11:50:51 +02:00
Olivier Dony
ab1f312cbf
[FIX] hr.expense report: do not crash when expense line has no analytic account
...
bzr revid: odo@openerp.com-20140425094240-vl4gs2ru2agov3ev
2014-04-25 11:42:40 +02:00
Fabien Meghazi
9c58bd5538
[FIX] listview test shall not assume default color is black
...
bzr revid: fme@openerp.com-20140425093053-3644kvcz13481fxo
2014-04-25 11:30:53 +02:00
chm@openerp.com
46dd292c86
[FIX] website_sale: add to cart 1 item if number > 1 or set_number > 1
...
bzr revid: chm@openerp.com-20140425091232-m4j37y7ffo7o56db
2014-04-25 11:12:32 +02:00
Fabien Meghazi
bc4620d2c6
[FIX] Still trying to fix tests
...
bzr revid: fme@openerp.com-20140425090358-1ydohuemx1tk715u
2014-04-25 11:03:58 +02:00
Kersten Jeremy
36266e8bc9
[FIX] Calendar - Use date AND datetime to store the event date. If allday, we use a date, else a datetime
...
bzr revid: jke@openerp.com-20140425085737-a0zmym07ydk0fltj
2014-04-25 10:57:37 +02:00
Fabien Meghazi
0efb6fc28b
[FIX] Inverse logic for /page/website.<id> shortcut
...
bzr revid: fme@openerp.com-20140425083521-8rd1u3y4da8sf89i
2014-04-25 10:35:21 +02:00
chm@openerp.com
3b49850d1a
[FIX] website_sale: filter redirect to 404 error if a category is selected. (url: /shopcategory/?filters=...). Add slash between shop and category
...
bzr revid: chm@openerp.com-20140425075304-qnlyb6n6hpyvttv1
2014-04-25 09:53:04 +02:00
Martin Trigaux
3f869b47ce
[FIX] lunch: fix security rule, user_id being a related field he may not be set yet at the creation
...
bzr revid: mat@openerp.com-20140425074018-wnrhgsavhmp91xjv
2014-04-25 09:40:18 +02:00
Atul Patel (OpenERP)
1fadb254d5
[FIX]: Fix months count in yearly salary details
...
bzr revid: atp@tinyerp.com-20140425073719-7nlk18wuoxx3s39o
2014-04-25 13:07:19 +05:30
Chirag Dodiya (OpenERP)
616c20a0f7
[MRG]Merge lp:openerp-web
...
bzr revid: cod@tinyerp.com-20140425061936-csz156gyzu0holkw
2014-04-25 11:49:36 +05:30
Jaydeep Barot
74e8fb0674
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140425055958-asoj1wc0pmv7mzds
2014-04-25 11:29:58 +05:30
Jaydeep Barot
9a52ef48ad
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140425055310-hpkcnigeptczdadl
2014-04-25 11:23:10 +05:30
Jaydeep Barot
24e6fd332a
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140425054902-ls149dxiu4kyxkj5
2014-04-25 11:19:02 +05:30
Atul Patel (OpenERP)
be912b1d46
[FIX]: Add qweb xml into openerp.py file
...
bzr revid: atp@tinyerp.com-20140425042148-jkldr55vvxfrxnmy
2014-04-25 09:51:48 +05:30
Atul Patel (OpenERP)
e2aa0707bb
[FIX]: ADD formatLang function in date field. use h2 tag in report title.
...
bzr revid: atp@tinyerp.com-20140425041641-vk95pdxb8w3034ij
2014-04-25 09:46:41 +05:30
Antony Lesuisse
8522ae723c
[REM] remove portal_project_long_term
...
bzr revid: al@openerp.com-20140425001928-pacmyw9dfanmczvt
2014-04-25 02:19:28 +02:00
Antony Lesuisse
95a9bccb38
[REM] move project_long_term to extra
...
bzr revid: al@openerp.com-20140424235254-u2um2dsth6igvb7r
2014-04-25 01:52:54 +02:00
Antony Lesuisse
dfa56e6b54
[REM] move auditrail to extra
...
It's deprecated by _track_fields, mail.message and base_action_rules
bzr revid: al@openerp.com-20140424232348-sn1oijj604uz6aen
2014-04-25 01:23:48 +02:00
Antony Lesuisse
fb4507386d
[REM] project_gtd deprecated by notes
...
bzr revid: al@openerp.com-20140424230801-zmzp2byyk41e7uxf
2014-04-25 01:08:01 +02:00
Fabien Meghazi
403e991b2e
[FIX] Fix web test with temporary hack
...
bzr revid: fme@openerp.com-20140424212826-k8amd45orv33u8bn
2014-04-24 23:28:26 +02:00
Fabien Meghazi
aca0ad4b8f
[FIX] crm_partner_assign missing js file
...
bzr revid: fme@openerp.com-20140424212415-s843tzw826a992n9
2014-04-24 23:24:15 +02:00
Olivier Dony
95abee7579
[IMP] auth_signup: better autofocus handling
...
bzr revid: odo@openerp.com-20140424174842-5zzos30cq0jdu9w6
2014-04-24 19:48:42 +02:00
Fabien Meghazi
87d4c03ee2
[FIX] view's filename error
...
bzr revid: fme@openerp.com-20140424174135-cm61dogh9pterp77
2014-04-24 19:41:35 +02:00
Fabien Meghazi
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
Frédéric van der Essen
f3da22c067
[IMP] point_of_sale, hw_scale: first commit for the hw_scale module, which handles scale connections for the POS
...
bzr revid: fva@openerp.com-20140424171259-hi9ma6w0fkdfrqnv
2014-04-24 19:12:59 +02:00
Fabien Meghazi
560ac34295
[IMP] bundlify rest of web addons
...
bzr revid: fme@openerp.com-20140424165735-83jty3iyrslci1q0
2014-04-24 18:57:35 +02:00
Fabien Meghazi
75408134f9
[REM] Removed js and css manifest keys from base
...
bzr revid: fme@openerp.com-20140424165659-qzhryvgp8vmo1ssd
2014-04-24 18:56:59 +02:00