Commit Graph

69547 Commits

Author SHA1 Message Date
Randhir Mayatra (OpenERP) ce17cb6d14 [MERGE][REM] List views removed in reporting menu (from membership and project_timesheet) as new graph view is now self-sufficient
bzr revid: rim@openerp.com-20140428130238-vcetovnq6lhuraoq
2014-04-28 15:02:38 +02:00
Fabien Meghazi fdaa70f319 [REM] language passed as query param for bundles controllers
'translatable' has been removed from assets templates, no need for this anymore

bzr revid: fme@openerp.com-20140428124513-vlbm1hjsv9989den
2014-04-28 14:45:13 +02:00
Fabien Meghazi e82a652a7c [DAMN] !
bzr revid: fme@openerp.com-20140428122423-pbo2pnm5ecqwibnf
2014-04-28 14:24:23 +02:00
Martin Trigaux 095d2afcda [IMP] lunch: partially revert commit 9301, people should be able to create lunch for others
bzr revid: mat@openerp.com-20140428121705-c9d0tan7rhnceg78
2014-04-28 14:17:05 +02:00
chm@openerp.com 36fc910e48 [FIX] website_sale: apply new pricelist and fiscal position after signup.
bzr revid: chm@openerp.com-20140428102857-41lfs08v1crudnco
2014-04-28 12:28:57 +02:00
Fabien Meghazi 9dc42584b8 [FIX] js admin test postinstall
Web client won't work without kanbanview, graph, ... so
we should not test the admin before they are installed

bzr revid: fme@openerp.com-20140428102756-7mus5xls5jybklo3
2014-04-28 12:27:56 +02:00
Richard Mathot (OpenERP) 9f35c683e5 [MERGE][IMP] account/account_voucher: new filters and usability minor fixes
bzr revid: rim@openerp.com-20140428101311-quxvr6d3lfa842tl
2014-04-28 12:13:11 +02:00
Simon Lejeune abf0b4feaa [FIX] l10n_in_hr_payroll: corrext xmlid of reports in test
bzr revid: sle@openerp.com-20140428100709-4css2uwquo74xe23
2014-04-28 12:07:09 +02:00
Jaydeep Barot (OpenERP) 9169be4687 [MERGE][IMP]
stock: more explicit error message for product scraping
account/mail: typos

bzr revid: rim@openerp.com-20140428100544-wpt325tw12ni1t0a
2014-04-28 12:05:44 +02:00
Frédéric van der Essen 4d54db3144 [MERGE] hw_scale: a mettler toledo scale driver for the point of sale
bzr revid: fva@openerp.com-20140428095809-gc5gs1dwwhv7m8qj
2014-04-28 11:58:09 +02:00
Jaydeep Barot (OpenERP) 7b65c104ab [MERGE][IMP] account (partner view): hide accounting settings to users that have no accounting access rights
bzr revid: rim@openerp.com-20140428095650-8exnl50iaa5m1p70
2014-04-28 11:56:50 +02:00
Frédéric van der Essen e98da6393d [MERGE] from trunk
bzr revid: fva@openerp.com-20140428095320-cm0phsplaoanv566
2014-04-28 11:53:20 +02:00
Frédéric van der Essen a57f44393d [FIX] hw_scale: don't crash if the serial connection gets broken
bzr revid: fva@openerp.com-20140428095246-w6pyo8y7rrhsvsjl
2014-04-28 11:52:46 +02:00
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
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 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
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
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
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
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
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
Sunil Sharma (OpenERP) 0b2467833a [MERGE]: Merged hr yearly salary details report.
bzr revid: atp@tinyerp.com-20140424164100-1e90drhti5595cr7
2014-04-24 22:11:00 +05:30
Olivier Dony be6bef3c59 [FIX] auth_signup: avoid losing direct query string params during when switching between signup/signin/reset
bzr revid: odo@openerp.com-20140424162401-qtnopdtfdkfa1zxa
2014-04-24 18:24:01 +02:00
Martin Trigaux 10d3dd4ec3 [FIX] update to latest version saas code with updated underscore lib
bzr revid: mat@openerp.com-20140424160833-p0uf6zzst0pnj3i7
2014-04-24 18:08:33 +02:00
Fabien Meghazi 026fce99ab [FIX?] web_tests shall depends on 'web', right ?
bzr revid: fme@openerp.com-20140424155814-1hq0z4ea38a5gee9
2014-04-24 17:58:14 +02:00
Denis Ledoux a28832dc62 [FIX] sale_stock: recreate delivery order generates only the remaining products to deliver
Like it should do, the feature was broken
Moreover, it resolves a performance issue (do with 100 lines took up to 10 minutes)

bzr revid: dle@openerp.com-20140424155141-qtp5o5nrp0whlk9t
2014-04-24 17:51:41 +02:00
Sunil Sharma (OpenERP) 1c6b63a96e [MERGE]: Merged with qweb-report branch.
bzr revid: atp@tinyerp.com-20140424154553-3yk05u7chmc94odd
2014-04-24 21:15:53 +05:30
Martin Trigaux f409aab12e [MERGE] [FIX] stock: add product_lot group on Traceability group as some parts of this group are restricted to this group and you can have production_lot without tracking_lot, courtesy of Mohammad Alhashash
lp bug: https://launchpad.net/bugs/1177076 fixed

bzr revid: mat@openerp.com-20140424152206-m4dnmee28w3yomsq
2014-04-24 17:22:06 +02:00
Denis Ledoux 3eb4fa3bac [FIX] website_sale: taxes must be taken from the product_id_change method
So they are computed with the partner, fiscal_position, etc

bzr revid: dle@openerp.com-20140424151605-81t7v9pc2rou17s3
2014-04-24 17:16:05 +02:00
Cedric Snauwaert fd986acc3d [FIX]dashboard: change layout correct use of modal object
bzr revid: csn@openerp.com-20140424150255-77emom1swsfry72h
2014-04-24 17:02:55 +02:00
Martin Trigaux 34067a1f49 [FIX] hr_timesheet_sheet: forbid to record an attendance in a submitted timesheet
lp bug: https://launchpad.net/bugs/1180769 fixed

bzr revid: mat@openerp.com-20140424142829-ramy830hwkghk1jv
2014-04-24 16:28:29 +02:00
chm@openerp.com 13469c23d8 [MERGE] from trunk
bzr revid: chm@openerp.com-20140424135841-akc01inl26fcirwy
2014-04-24 15:58:41 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
Olivier Dony 96b9d8b9d5 [FIX] mass_mailing: avoid using werkzeug API only present in 0.9+
bzr revid: odo@openerp.com-20140424131451-rhtokro13piol7ji
2014-04-24 15:14:51 +02:00
Olivier Dony 3ad6d69b21 [FIX] website: avoid using werkzeug API only present in 0.9+
bzr revid: odo@openerp.com-20140424131415-ot0r5062wndvuicr
2014-04-24 15:14:15 +02:00
chm@openerp.com 90d0139ae1 [FIX] website tour: must retry running tour because in test mode some files are added after the first running try
bzr revid: chm@openerp.com-20140424124703-qeft3n8xjmb1mvxn
2014-04-24 14:47:03 +02:00
Simon Lejeune b667f6a292 [MERGE] trunk
bzr revid: sle@openerp.com-20140422124030-gowf9zyx1d36j01g
bzr revid: sle@openerp.com-20140424124655-95ex30m25soiu4wd
2014-04-24 14:46:55 +02:00
Christophe Simonis 52cfc16c2e [MERGE] forward port of branch 7.0 up to revid 10012 launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
bzr revid: chs@openerp.com-20140424123538-rxk9got9k2on1ki1
2014-04-24 14:35:38 +02:00
Fabien Meghazi 98302fca76 [REM] Removed globs from manifest in order to automate bundlification
bzr revid: fme@openerp.com-20140424122621-1smlpr1r7izuw369
2014-04-24 14:26:21 +02:00
Kersten Jeremy 7994fe09a3 [FIX] Calendar - only try to split the virtual id if it's a string
bzr revid: jke@openerp.com-20140424121118-t5rgqssf7mnr6bax
2014-04-24 14:11:18 +02:00
Sunil Sharma (OpenERP) 1e81e20cca [IMP]: Change function condition.
bzr revid: atp@tinyerp.com-20140424120202-jqbkr72y1a43dbpf
2014-04-24 17:32:02 +05:30
Martin Trigaux f73907587b [FIX] gamification: do not set a start_date by default as the cron starts past challenges (making data challenge to start) and avoid useless write
bzr revid: mat@openerp.com-20140424110341-pnu79q44m7gzl8t0
2014-04-24 13:03:41 +02:00
Sunil Sharma e5c1bf06a2 [imp]:remove br or text-center class then improve h2 or p tag
bzr revid: ssh@tinyerp.com-20140424105005-bcg7ynx571h25w3w
2014-04-24 16:20:05 +05:30
Thibault Delavallée ca63094542 [MERGE] [FIX] email_template: effectively support 'user signature'
in the mail composer when using templates.

bzr revid: tde@openerp.com-20140424102801-j1qbqdvbyo9wv48e
2014-04-24 12:28:01 +02:00
Jaydeep Barot (OpenERP) 9cb2b91783 [MERGE][IMP] account: allow sorting of journal items
bzr revid: rim@openerp.com-20140424101453-isbgyj5av17rssq2
2014-04-24 12:14:53 +02:00
Kersten Jeremy 1a4177d777 [FIX] Calendar - Override _name_search to convert virtual_id to real_id
bzr revid: jke@openerp.com-20140424101036-1twaii8oj70e4fx5
2014-04-24 12:10:36 +02:00
Rakesh Sindhav (OpenERP) 2949a395ba [IMP]: set the header to left side
bzr revid: rsi@tinyerp.com-20140424100150-0as1tmhipxo8tfdn
2014-04-24 15:31:50 +05:30
Fabien Meghazi c304c5a80b [REM] useless manifest declaration
bzr revid: fme@openerp.com-20140424094155-2iatlo8twy5dcb3f
2014-04-24 11:41:55 +02:00
Simon Lejeune 5c69f3470d [FIX] hr_attendance: removed useless xsl
bzr revid: sle@openerp.com-20140424093800-cn3rtga12qk4g7wx
2014-04-24 11:38:00 +02:00
Simon Lejeune 0f869fd64b [MERGE] trunk
bzr revid: sle@openerp.com-20140424093103-pekfio3gv2s721ro
2014-04-24 11:31:03 +02:00
Simon Lejeune d2765da09c [FIX] hr_attendance: menuitem wording
bzr revid: sle@openerp.com-20140424093052-eq0llqvty1s4bjf1
2014-04-24 11:30:52 +02:00
Simon Lejeune 5eb2f28bb9 [REM] hr_attendance: removed attendance by week/month reports, rml and wizards
bzr revid: sle@openerp.com-20140424092639-nlzxtx17jaa2w9p7
2014-04-24 11:26:39 +02:00
Fabien Meghazi 2541ded2c1 [IMP] bundlify web client
bzr revid: fme@openerp.com-20140424092520-xx7nocvacx4mcsyw
2014-04-24 11:25:20 +02:00
Sunil Sharma ad71e6b87c [imp]:improve th tag to td tag
bzr revid: ssh@tinyerp.com-20140424084402-gam7edp04qvyj7gu
2014-04-24 14:14:02 +05:30
Thibault Delavallée 3d78f4a17e [FIX] email_template: fixed a test not checking signature but
using a template adding signature.

bzr revid: tde@openerp.com-20140424082622-71ratcz4xrdn8d7t
2014-04-24 10:26:22 +02:00
Jaydeep Barot e82a0ba6c3 [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140424072307-1h72tc9krcn8l2o3
2014-04-24 12:53:07 +05:30
Jaydeep Barot a55015b8eb [IMP] remove store=true and add store={} in recouncile field
bzr revid: jar@tinyerp.com-20140424065306-e6q3g48cjee1ybni
2014-04-24 12:23:06 +05:30
Rakesh Sindhav (OpenERP) 504385cbc7 [MERGE]: Merged with qwebreport-l10n_in
bzr revid: rsi@tinyerp.com-20140424064445-8tnf5sn1tjo91buq
2014-04-24 12:14:45 +05:30
Launchpad Translations on behalf of openerp c7565cd540 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
2014-04-24 06:32:49 +00:00
Launchpad Translations on behalf of openerp 5b3fcaa293 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140424060156-3rq751eej5io1y4c
bzr revid: launchpad_translations_on_behalf_of_openerp-20140424060216-3ssubkaumaln393r
2014-04-24 06:02:16 +00:00
Rakesh Sindhav (OpenERP) c61a1b679e [IMP]: Add the padding to the child level
bzr revid: rsi@tinyerp.com-20140424052118-y92vvkbam7cwlklj
2014-04-24 10:51:18 +05:30
Randhir Mayatra rma-openerp 0e12408234 [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140424050540-2ywimg1eas53vyl2
2014-04-24 10:35:40 +05:30
Sunil Sharma 45e74261e4 [imp]:improve use a text-center class
bzr revid: ssh@tinyerp.com-20140424044756-ls3g2mour8rmjtes
2014-04-24 10:17:56 +05:30
Atul Patel (OpenERP) 3446fe0695 [IMP]: Improve bootstrap class with span element.
bzr revid: atp@tinyerp.com-20140423183241-8c7442xgroxoik0s
2014-04-24 00:02:41 +05:30
Simon Lejeune 7edbd315da [FIX] Report: usability fixes + use only custom footer if set, sale_layout: usability fixes + remove constraint on deletion
bzr revid: sle@openerp.com-20140423162614-wrofm5684shscyd3
2014-04-23 18:26:14 +02:00
Simon Lejeune af30e6b5d3 [MERGE] saas-4
bzr revid: sle@openerp.com-20140423161155-im8b5j0l7avrgbts
2014-04-23 18:11:55 +02:00
Atul Patel (OpenERP) 2c042b1824 [IMP]: Renamed wrapped class
bzr revid: atp@tinyerp.com-20140423160740-qnz5k1bnjyybgk9v
2014-04-23 21:37:40 +05:30
chm@openerp.com ee7ff4bd07 [MERGE] from trunk
bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl
2014-04-23 17:48:52 +02:00
chm@openerp.com b1bc68d8eb [FIX] website: tour inject sale/event
bzr revid: chm@openerp.com-20140423154530-rfc3glnp5xk50xoc
2014-04-23 17:45:30 +02:00
Thibault Delavallée 0ae0b643d1 [REM] Removed print statement
bzr revid: tde@openerp.com-20140423153008-jngdjm0qx7cgqctu
2014-04-23 17:30:08 +02:00
Thibault Delavallée 549da11e40 [FIX] email_template: when usign the composer in mass mailing mode with
a template, display the user's signature if asked by the template. The use will
then be able to modify the generated content and to remove / update it if necessary;
Otherwise the signature is not added in mass mailing mode, because the content
of the email is based on the wizard's body, not the template one.

Some rewriting in the onchange: now using a browse instead of a read.

bzr revid: tde@openerp.com-20140423152926-sno0gk8lup9l442p
2014-04-23 17:29:26 +02:00
Simon Lejeune a17bb46b44 [FIX] Sale_layout: renamed 'layout category' as 'section', removed constraint
bzr revid: sle@openerp.com-20140423151546-rd8freqn1ljf141k
2014-04-23 17:15:46 +02:00
Martin Trigaux acc784cc99 [FIX] stock: pass the geven limit attribute in read_group call, courtesy of Guewen Baconnier
bzr revid: mat@openerp.com-20140423150621-rjiae83nxh5tqyau
2014-04-23 17:06:21 +02:00
chm@openerp.com 1657ffb8e7 [IMP] website_project: remove preprocess_request content; user can the add link with the menu editor
bzr revid: chm@openerp.com-20140423150135-ng1xkiopm2ks3v23
2014-04-23 17:01:35 +02:00
Simon Lejeune 0ed42faa61 [FIX] sale_layout: place layout category when opening order line in target new
bzr revid: sle@openerp.com-20140423145313-55tn0xqmxgzg8uyt
2014-04-23 16:53:13 +02:00
Cedric Snauwaert 8ddf7a21b7 [FIX]calendar tooltip attachment container
bzr revid: csn@openerp.com-20140423145235-ajph1xj2l492q1sy
2014-04-23 16:52:35 +02:00
Thibault Delavallée 252be1b9ab [FIX] website_forum: various fixes and usability improvements
- question title is now a link
- fixed a crash when trying to see badges in the 'new badge' notification
- improved the tags manager: manage tag at blur event (otherwise the last tag
was ften not created) + manage already-existing tags

bzr revid: tde@openerp.com-20140423142034-5si58h4jgd1jyyem
2014-04-23 16:20:34 +02:00
Simon Lejeune f340fc33ea [MERGE] saas-4
bzr revid: sle@openerp.com-20140423141323-8rlqxuovo720hbyg
2014-04-23 16:13:23 +02:00
Simon Lejeune acd3c99ddf [FIX] Sale_layout: moved the sale category inside the form and after the product, not before
bzr revid: sle@openerp.com-20140423141225-55qdtykoohb4uh06
2014-04-23 16:12:25 +02:00
Richard Mathot (OpenERP) f53ecc076a [MERGE][IMP] Usability of event and event_sale
bzr revid: rim@openerp.com-20140423140752-6hw7rjdc4k7zxvbr
2014-04-23 16:07:52 +02:00
Richard Mathot (OpenERP) 11680fd1f7 [IMP] Usability of event and event_sale
bzr revid: rim@openerp.com-20140423133917-zpulvflwflgz12sw
2014-04-23 15:39:17 +02:00
Rakesh Sindhav (OpenERP) c43d5235a5 [ADD]: add the view file of Payslip Details
bzr revid: rsi@tinyerp.com-20140423133403-60ukgyi8uy4j6g4k
2014-04-23 19:04:03 +05:30
Rakesh Sindhav (OpenERP) 7932140dd1 [IMP]: convert rml to qweb report of Payslip Details
bzr revid: rsi@tinyerp.com-20140423133032-l1wxnoyytdakdnpx
2014-04-23 19:00:32 +05:30
Simon Lejeune 85c32739d9 [FIX] report_webkit: moved configuration to the report tab of company form and moved menuitem under 'Reports' menuitem
bzr revid: sle@openerp.com-20140423132927-3n5xv62zck6nyh2m
2014-04-23 15:29:27 +02:00
Simon Lejeune d65b9c5e4c [FIX] report: correct xpath to select paper format in the company form
bzr revid: sle@openerp.com-20140423132805-a5kdtvu052hdzbrr
2014-04-23 15:28:05 +02:00
Martin Trigaux f613774606 [MERGE] [FIX] stock: fix error when executing a read_group on stock.picking.in and out, courtesy of Yannick Vaucher (Camptocamp)
bzr revid: mat@openerp.com-20140423132552-hpnr2skutqranvsj
2014-04-23 15:25:52 +02:00
Christophe Simonis 9ed196bc81 [FIX] report: set a default paperformat for companies, based on rml paperformat
bzr revid: chs@openerp.com-20140423132100-t6lmyd8qymoo4wqq
2014-04-23 15:21:00 +02:00