Jitendra Prajapati (OpenERP)
59a9d91558
[MERGE]sync main branch
...
bzr revid: jpr@tinyerp.com-20140505095247-gv9je300z9j98sk0
2014-05-05 15:22:47 +05:30
Jacques-Etienne Baudoux
a918e89995
[FIX] mail: change copy call to copy_data to avoid resending email during duplication (opw 607295)
...
bzr revid: mat@openerp.com-20140505094329-vr7h4c92i43ezob4
2014-05-05 11:43:29 +02:00
chm@openerp.com
06c63594be
[FIX] website_sale: message confirmation
...
bzr revid: chm@openerp.com-20140505093423-nrmou02ov1txod3k
2014-05-05 11:34:23 +02:00
chm@openerp.com
5b839bea89
[IMP] website_sale: attribute's filters template unactive by default
...
bzr revid: chm@openerp.com-20140505092730-pxsdxlhxwuxoc3fr
2014-05-05 11:27:30 +02:00
chm@openerp.com
9e176a977e
[FIX] website_sale: apply tax position on checkout signup
...
bzr revid: chm@openerp.com-20140505092300-l29tc4pum31nqd1h
2014-05-05 11:23:00 +02:00
chm@openerp.com
1a9f3165ce
[FIX] sale: change fiscal_position don't change order line taxes; Add onchange_fiscal_position method on sale.order
...
bzr revid: chm@openerp.com-20140505085755-wewn9xm8bp08ywnd
2014-05-05 10:57:55 +02:00
Raphael Collet
1d0a6e20a4
[FIX] event: move definition of fields track_ids and count_tracks to the right module
...
bzr revid: rco@openerp.com-20140505085739-z2asr1vrx6yyjtlh
2014-05-05 10:57:39 +02:00
Josse Colpaert
f6593c49a5
[MERGE] Merge from trunk-wms
...
bzr revid: jco@openerp.com-20140505080320-ity6lx0dtgq5g1n7
2014-05-05 10:03:20 +02:00
Olivier Dony
2f7ac6838d
[MERGE] mail: avoid resetting purposefully empty catchall domain setting, courtesy of Stefan Rijnhart (Therp)
...
bzr revid: odo@openerp.com-20140505075129-hv4evrdw5v7crtmw
2014-05-05 09:51:29 +02:00
Josse Colpaert
d763f43878
[IMP] Correct js assets for barcode scanner
...
bzr revid: jco@openerp.com-20140505073931-mwikrhmngq1ju402
2014-05-05 09:39:31 +02:00
Vidhin Mehta (OpenERP)
e41508cb8d
[MERGE]Trunk.
...
bzr revid: vme@tinyerp.com-20140505043233-2t2e2vb1yv86hyxp
2014-05-05 10:02:33 +05:30
Fabien Pinckaers
f55dfdc40e
[IMP] Certification Template
...
bzr revid: fp@tinyerp.com-20140504113847-4xmjg30m5leaqz2c
2014-05-04 13:38:47 +02:00
Launchpad Translations on behalf of openerp
f426972e37
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140430070138-uuemdpfseyysxlvs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064550-9r0c2t3tr8dp1hwu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140501063929-ta3t6lhed5dpdz9a
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064608-1zwt52snc5pg5kfi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062721-dgb7m6o6ge2btumg
2014-05-04 06:27:21 +00:00
chm@openerp.com
e09a8934b4
[FIX] website_event: access right for portal user
...
bzr revid: chm@openerp.com-20140502162138-qp2kci9i1bncsj1i
2014-05-02 18:21:38 +02:00
chm@openerp.com
1fd1114c69
[FIX] website_sale: access to the webite partner_id
...
bzr revid: chm@openerp.com-20140502160628-nbwzx28j4daj1ua8
2014-05-02 18:06:28 +02:00
chm@openerp.com
939b2f2d44
[FIX] website_sale & tour
...
bzr revid: chm@openerp.com-20140502155124-98xz2b4gd2zzzrkx
2014-05-02 17:51:24 +02:00
chm@openerp.com
bbfdc57ad9
[FIX] website_sale: add to cart product => quantity + 1
...
bzr revid: chm@openerp.com-20140502150842-nitu8tsxd02e6dnh
2014-05-02 17:08:42 +02:00
Josse Colpaert
830a4af3e5
[IMP] Picking type instead of warehouse in PoS
...
bzr revid: jco@openerp.com-20140502145852-th5tc9tsdwm9l9z8
2014-05-02 16:58:52 +02:00
Denis Ledoux
ce88158381
[FIX] crm: typo, interrests to interest
...
bzr revid: dle@openerp.com-20140502145823-vtkqkd7njqf31682
2014-05-02 16:58:23 +02:00
Gery Debongnie
8fbebfd752
[MERGE] merge the last changes to improve the 'stat buttons' support in web
...
Many small tweaks/css changes to correctly display the stat buttons in
various situations (with/without icons, with/without strings, with sub
widgets, ...)
bzr revid: ged@openerp.com-20140502145211-ehnb1v66szw7nl01
2014-05-02 16:52:11 +02:00
Josse Colpaert
fa355176d5
[IMP] Add read access for contact creation user on routes
...
bzr revid: jco@openerp.com-20140502144809-vkt5qufxn93u89ob
2014-05-02 16:48:09 +02:00
Gery Debongnie
c9e7635859
[MERGE] converts buttons in form views into 'stat buttons'
...
This branch converts pretty much every buttons in 'stat buttons',
which means buttons that can display any kind of information. Right
now, it is mostly used to display a numerical information (such as a
number, for example 9 Calls). Also, look at the invoices button in
Customers form view for an example of a functional field, displaying
the total amount invoiced.
The stat buttons also supports sub widgets, for example a mini pie chart
or a mini bar chart. Examples of such sub widgets can be found in
marketing/mass mailings form views (not ready yet)
bzr revid: ged@openerp.com-20140502144544-c5j7bzlm9i4clv4l
2014-05-02 16:45:44 +02:00
Olivier Dony
61d2122987
[FIX] mail.mail: avoid prefetching attachment data in memory while processing mail queue, could fail due to memory limit
...
Specifically when there are many emails in the queue, prefetching
all their attachments at once when processing the first one
could fail, so not even one mail would be sent.
Added explicit logging when an email triggers a MemoryError,
as well as logging when each email is successfully sent.
bzr revid: odo@openerp.com-20140502144431-r3brgagl4gel4wmt
2014-05-02 16:44:31 +02:00
Kersten Jeremy
1aff5f6bf8
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20140502142126-408hej7jdb9bnrzm
2014-05-02 16:21:26 +02:00
chm@openerp.com
c10800f2f1
[FIX] website_event_sale: multi tickets
...
bzr revid: chm@openerp.com-20140502140152-hx7ktaf0cg2m7ija
2014-05-02 16:01:52 +02:00
Josse Colpaert
c60c1d1a72
[DEL] Delete boards
...
bzr revid: jco@openerp.com-20140502134701-lnoowskaqj9nsaof
2014-05-02 15:47:01 +02:00
Denis Ledoux
deb091ea64
[FIX] website: missing acl for manage website menu
...
bzr revid: dle@openerp.com-20140502134135-zp05ecbpcj8inftc
2014-05-02 15:41:35 +02:00
Mohammed Shekha
5600a79007
[IMP]Improved the database manager, instead of calling html_template, created separate html file which is rendered using jinja2, so that we don't need html_template once pos and edit support render_bootstrap_template.
...
bzr revid: msh@tinyerp.com-20140502132349-bw9zdyaou4yf8o7q
2014-05-02 18:53:49 +05:30
Gery Debongnie
a8e1fbcbd3
[FIX] correct a small typo in previous merge (addon crm)
...
bzr revid: ged@openerp.com-20140502132258-88x9mam35o3k5ndm
2014-05-02 15:22:58 +02:00
Simon Lejeune
139c35800f
[FIX] account report_invoice: display the unit of measure in the same cell as the quantity
...
bzr revid: sle@openerp.com-20140502131706-cepyft5y0essj0zr
2014-05-02 15:17:06 +02:00
Gery Debongnie
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Josse Colpaert
8b84615de1
[MERGE] Merge from trunk test
...
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
Simon Lejeune
66f5bbcf67
[FIX] account report_invoice: more space to display the taxes, right field to display the fiscal position
...
bzr revid: sle@openerp.com-20140502130340-22dyefrmj4kqrzdb
2014-05-02 15:03:40 +02:00
Simon Lejeune
7ad6d7a150
[FIX] Report: usage of ids in get_action more consistent: only pass them when they are useful, else pass an empty list
...
bzr revid: sle@openerp.com-20140502130310-106au0jsza0b3nwe
2014-05-02 15:03:10 +02:00
Kersten Jeremy
df80f78393
[FIX] Webiste google Map - don't force http
...
bzr revid: jke@openerp.com-20140502123407-ojyzpf2dynewo7u0
2014-05-02 14:34:07 +02:00
Gery Debongnie
132ccb7180
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502123355-9dqpwq1g9rrpisxj
2014-05-02 14:33:55 +02:00
Kersten Jeremy
ed6bc9f198
[MERGE] Merge with trunk
...
bzr revid: jke@openerp.com-20140502123149-4g7d7xh07i5z9dct
2014-05-02 14:31:49 +02:00
Denis Ledoux
03b03d0476
[FIX] crm: in order the mark as lost action to work, the dead stage has to be folded
...
bzr revid: dle@openerp.com-20140502101525-bzyjpz7jbr1njobl
2014-05-02 12:15:25 +02:00
chm@openerp.com
ee16b014b1
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +02:00
chm@openerp.com
f299180399
[FIX] website_mail: request.website.user_id.id
...
bzr revid: chm@openerp.com-20140502092659-1gwsx6lmgmtcf80q
2014-05-02 11:26:59 +02:00
Fabien Meghazi
a22d0ce78a
[FIX] edi, calendar webclient bootstrap
...
bzr revid: fme@openerp.com-20140501210507-cbl9no3o92zkdq5h
2014-05-01 23:05:07 +02:00
Fabien Meghazi
db48dbef3e
[FIX] database manager
...
bzr revid: fme@openerp.com-20140501210436-osyrvlue41w63i6f
2014-05-01 23:04:36 +02:00
Antony Lesuisse
aa943fae18
[FIX] qweb loading concat mode only, increase cache age to one day
...
bzr revid: al@openerp.com-20140501204242-jngte754yqyj4nb0
2014-05-01 22:42:42 +02:00
Antony Lesuisse
eb44c37dd9
[FIX] website_event missing javascript asset
...
bzr revid: al@openerp.com-20140501200150-5u3lfdqls3t3oeih
2014-05-01 22:01:50 +02:00
Antony Lesuisse
9e81c5aa07
[FIX] web_kanban_gauge needs raphaeljs temporarly back in assets_backend
...
bzr revid: al@openerp.com-20140501191831-mhsrpgza1x00ysy4
2014-05-01 21:18:31 +02:00
Antony Lesuisse
5e21a4235d
[MERGE] saas-4 up to dle@openerp.com-20140501121915-q88k37nd25ietw8c
...
bzr revid: al@openerp.com-20140501172508-tjennzht30ktw3nz
2014-05-01 19:25:08 +02:00
Antony Lesuisse
2998bec0e0
[FIX] website controller, correctly resolve last merge about images
...
fix fp commit to use debian compatible werkzeug api data instead of set_data
bzr revid: al@openerp.com-20140501165004-0e6xp8e9hdpifofj
2014-05-01 18:50:04 +02:00
Fabien Pinckaers
b5209451cd
[IMP] Lossless PNG compression. Reduced size by 3 with pngquant
...
bzr revid: fp@tinyerp.com-20140501161452-0pw17e2v0cjjlupm
2014-05-01 18:14:52 +02:00
Antony Lesuisse
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
Antony Lesuisse
9efc4c4db2
[FIX] report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501161108-50yidx30rm6z7d10
2014-05-01 18:11:08 +02:00
Denis Ledoux
b88755c431
[REVERT] 2 previous revision, as it looks like that the fix causes more troubles than it resolve a problem
...
bzr revid: dle@openerp.com-20140501121633-6umc2sxwi0h0lhay
2014-05-01 14:16:33 +02:00
Fabien Pinckaers
1dd63bce78
[IMP] website images: allow no max_width (default), faster loading if no resize
...
bzr revid: fp@tinyerp.com-20140501114003-5xs31o0lzpp8ru2s
2014-05-01 13:40:03 +02:00
Josse Colpaert
67afb31970
[IMP] When changing number of steps, it will also change the resupply rules of the warehouses that are resupplied from this warehouse and the associated mto rules
...
bzr revid: jco@openerp.com-20140430164526-jiq8zh1lt3x9c3mc
2014-04-30 18:45:26 +02:00
Fabien Meghazi
8474a2ed6f
[MERGE] Web assets moved from manifests to ir.ui.view bundles
...
bzr revid: fme@openerp.com-20140430151509-mme5st89o1hj4zcs
2014-04-30 17:15:09 +02:00
Fabien Meghazi
acf2123123
[MERGE] Web assets moved from manifests to ir.ui.view bundles
...
bzr revid: fme@openerp.com-20140430151302-e42monb4klz4udw5
2014-04-30 17:13:02 +02:00
Fabien Meghazi
79ce95638d
[IMP] async require of raphael.js
...
bzr revid: fme@openerp.com-20140430142025-nbvwk5ggzo1bro0q
2014-04-30 16:20:25 +02:00
Gery Debongnie
1cb131d3fb
[MERGE] some optimizations on graph view pivot table rendering
...
bzr revid: ged@openerp.com-20140430140625-83w6v1oql62r5jly
2014-04-30 16:06:25 +02:00
Gery Debongnie
a6b25061ba
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140430085942-umusyhp4cs2ffezj
bzr revid: ged@openerp.com-20140430140423-kq0vdboq1mux4zfn
2014-04-30 16:04:23 +02:00
Olivier Dony
52480275c3
[IMP] purchase: invoice creation more modular/extensible through the introduction of a _prepare_invoice method()
...
This is similar to what was previously done for Sales Orders.
bzr revid: odo@openerp.com-20140430140103-hfumie3ndvlodgeh
2014-04-30 16:01:03 +02:00
Kersten Jeremy
5d6f8bf45c
[FIX] Calendar - Fix unlink which can try to unlink a numeric string without cast it in integer
...
bzr revid: jke@openerp.com-20140430133623-l6iynwdp0ampy23s
2014-04-30 07:36:23 -06:00
Fabien Meghazi
556c1404c2
[FIX] backward compatibility for html_template
...
bzr revid: fme@openerp.com-20140430132636-p42ehcb0dnc1d3jx
2014-04-30 15:26:36 +02:00
Fabien Meghazi
877503143d
[REM] html_template from hw_*
...
bzr revid: fme@openerp.com-20140430132510-smhi39h9oyi8p4nt
2014-04-30 15:25:10 +02:00
Denis Ledoux
d59cb1eda2
[FIX] web: missing ; from previous revision
...
bzr revid: dle@openerp.com-20140430131739-ywyqb1gh68xbxid1
2014-04-30 15:17:39 +02:00
Fabien Meghazi
d00d092e18
[FIX] bootstrap - jquery.ui conflicts
...
bzr revid: fme@openerp.com-20140430131730-du7hem15of8spau1
2014-04-30 15:17:30 +02:00
Denis Ledoux
b7c125869f
[FIX] account: remove partial fix for forcing right active_ids
...
This has been fixed in the web client 3991 revid:dle@openerp.com-20140430123818-zzdxmat4c5yg9gg7
bzr revid: dle@openerp.com-20140430125033-44vbf00spawm9mbg
2014-04-30 14:50:33 +02:00
Denis Ledoux
8d49639933
[FIX] web: reset active_model, id, ids on executing button of type object
...
bzr revid: dle@openerp.com-20140430123727-cnz6k8is2sqe65w0
2014-04-30 14:37:27 +02:00
Fabien Meghazi
ef85e3de80
[FIX] point of sale loading
...
bzr revid: fme@openerp.com-20140430121632-llnwhirjl3ii6m93
2014-04-30 14:16:32 +02:00
Josse Colpaert
bd88fcd759
[IMP] Bar code scanning check if packing or lot needed, should work through has_group instead of settings
...
bzr revid: jco@openerp.com-20140430121241-wo78a9odt4bamru2
2014-04-30 14:12:41 +02:00
Cédric Snauwaert
af03a3e4e0
[FIX] export: make the 'Close' button works fine with modal
...
bzr revid: mat@openerp.com-20140430115650-334th9boorlb80aw
2014-04-30 13:56:50 +02:00
Josse Colpaert
0ecc81b22c
[IMP] Create MTO pull rule for resupply with delivery one step
...
bzr revid: jco@openerp.com-20140430115455-1fhssek8z7s28nck
2014-04-30 13:54:55 +02:00
Yannick Vaucher
c1601e75d3
[FIX] sign in and sign out were broken in rev 10019 as it doesn't provide a date to conversion of attendance time to employee timezone
...
lp bug: https://launchpad.net/bugs/1314589 fixed
bzr revid: yannick.vaucher@camptocamp.com-20140430113730-cn3xw66fbik8p32n
2014-04-30 13:37:30 +02:00
Olivier Dony
c3e812f34a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10025 rev-id odo@openerp.com-20140430102552-qkwv20b20nve64th
...
bzr revid: odo@openerp.com-20140430110048-6971xplq8k073tto
2014-04-30 13:00:48 +02:00
chm@openerp.com
c4d91f3b39
[FIX] website: can't drop share button when website_event is installed because the selector snippet_options overwrite a selector
...
bzr revid: chm@openerp.com-20140430103029-z89tu4hp14gvs31k
2014-04-30 12:30:29 +02:00
Martin Trigaux
c16d0fc456
[FIX] stock: when delivering a product in average cost, make sure the price_unit on the stock.move is up to date (opw 607272)
...
The price mentioned on the stock move from the delivery order is the one at the time of the sale order confirmation. On average price, the price can be different when the delivery is actually done. The price will then be refreshed with the one specified on the product.
bzr revid: mat@openerp.com-20140430102847-o1fzo318rpmq9n1j
2014-04-30 12:28:47 +02:00
Olivier Dony
c43fdfe32b
[FIX] mail: avoid catching (transient) MemoryErrors when sending outgoing mail
...
This would permanently mark the mail as failed while
there is a good chance it will be sent properly next
time it is retried (provided the memory situation
improves or the server/worker has restarted).
bzr revid: odo@openerp.com-20140430102552-qkwv20b20nve64th
2014-04-30 12:25:52 +02:00
Denis Ledoux
8da3bb66ca
[FIX] crm: get_forwview_id, variable referenced before assignment
...
bzr revid: dle@openerp.com-20140430094601-4chke4890s55eb92
2014-04-30 11:46:01 +02:00
Kersten Jeremy
d9c3c175bd
[REF] Calendar refactoring - Manage allday in date field and not datetime.
...
bzr revid: jke@openerp.com-20140430093613-3tdn2tfiwshcahbz
2014-04-30 11:36:13 +02:00
Chirag Dodiya (OpenERP)
7dedde91ef
[MERGE][IMP] Quick add wizard (form view): usability
...
bzr revid: rim@openerp.com-20140430093101-t5b1v42zuaq1nyye
2014-04-30 11:31:01 +02:00
Gery Debongnie
1f693aaed6
[FIX] fix a crash in graphview when user clicked rapidly twice on menu item
...
The issue was that the get_search_fields method tried to get the view's
corresponding searchview after a rpc (fields_get). Sadly, if the user
had meanwhile clicked again on the menu item, the first view would be
detached from the view manager and would be unable to reach the search
view. The solution is to move the lookup for the search view in the start
method, where it is guaranteed to exist.
bzr revid: ged@openerp.com-20140430084927-m11dxqg9ko0dnu08
2014-04-30 10:49:27 +02:00
Olivier Dony
162fff3bfe
[I18N] remove i18n files for deleted modules after disabled translation templates
...
bzr revid: odo@openerp.com-20140430082629-7fec4u317j79crug
2014-04-30 10:26:29 +02:00
Cedric Snauwaert
7c6c5f281f
[FIX]barcode interface: also reconnect scanner when dialog is closed
...
bzr revid: csn@openerp.com-20140430081033-quuudobu7g1516ar
2014-04-30 10:10:33 +02:00
Richard Mathot (OpenERP)
03cfbf0f46
[MERGE] from lp:openerp-web
...
bzr revid: rim@openerp.com-20140430080103-tc4a9ow7rwp3b5nk
2014-04-30 10:01:03 +02:00
Josse Colpaert
c25cd043f3
[IMP] If no company_id given in procurement rules, you should use locations or even the company of the procurement
...
bzr revid: jco@openerp.com-20140430080037-nqyfrsrtxul839sp
2014-04-30 10:00:37 +02:00
Gery Debongnie
36e3aac85e
[IMP] large optimizations to the graph view rendering (pivot table)
...
The pivot table rendering was slow with large tables : it appended to the
table each line, so the browser had to rerender each time the page. This
was solved by rendering the table to a document fragment, then only add
the fragment to the main document. This speeds up considerably the process
(from 2600ms to 420ms in one test)
Also, uses basic loops instead of underscore maps in the build_rows method
bzr revid: ged@openerp.com-20140430074733-quhfkzz33rlpahps
2014-04-30 09:47:33 +02:00
Fabien Meghazi
f0bdc2f9f4
[FIX] phantomjs's console.log does not support string formatting
...
(version used 1.9.2)
bzr revid: fme@openerp.com-20140430074101-91z0854pqwz5u1ek
2014-04-30 09:41:01 +02:00
Josse Colpaert
a49dca23de
[IMP] Put partner_id from rule on move when necessary
...
bzr revid: jco@openerp.com-20140430074022-cekktpwoucv1rhcd
2014-04-30 09:40:22 +02:00
Fabien Meghazi
f144f3a7c7
[REM] useless load_script
...
bzr revid: fme@openerp.com-20140430073342-nyjdb88soxggzkvr
2014-04-30 09:33:42 +02:00
Fabien Meghazi
46b422def0
[REM] useless id's in script and links
...
bzr revid: fme@openerp.com-20140430073104-qwb0opveyx5hnplg
2014-04-30 09:31:04 +02:00
Fabien Meghazi
a1d3b7d9ad
[REM] duplicates in assets
...
bzr revid: fme@openerp.com-20140430072102-2nzi1lcm95exb6v4
2014-04-30 09:21:02 +02:00
Fabien Meghazi
3998225317
[MOV] select2 from common to backend assets
...
bzr revid: fme@openerp.com-20140430072044-24camfdauw6xxczk
2014-04-30 09:20:44 +02:00
Fabien Meghazi
72a194ff30
[IMP] uncomment test
...
bzr revid: fme@openerp.com-20140430071541-bsqxgo6r51ruoccm
2014-04-30 09:15:41 +02:00
Launchpad Translations on behalf of openerp
2d32d9e89c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140430070150-8jkf4uv0z6lbfjik
2014-04-30 07:01:50 +00:00
Launchpad Translations on behalf of openerp
2f29745e5f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140430054014-n37cra0t19pbw3ae
2014-04-30 05:40:14 +00:00
Antony Lesuisse
0ad1789736
[FIX] crm report revert the split of opportunity and leads
...
Partialy revert 9007 tde@openerp.com-20131205160029-1tljp52ovcavwxel , restoring
the default_search context instead of domain, restoring the analysis
encompassing both leads and opportunities lifecycle.
bzr revid: al@openerp.com-20140429233909-fy9y85tsnjs262tl
2014-04-30 01:39:09 +02:00
Simon Lejeune
5a4b57c9db
[MERGE][IMP] l10n_* reports converted to QWeb
...
bzr revid: sle@openerp.com-20140429172915-d8fhrkcxlmu6uydl
2014-04-29 19:29:15 +02:00
Simon Lejeune
437bf4e04f
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140429170245-y02h8z7elx7pu5km
2014-04-29 19:02:45 +02:00
Christophe Simonis
f38387820d
[TYPO] mass_mailing: rename wrongly named function field (dayly -> daily).
...
[FIX] mass_mailing: add `oldname` attribute to some renamed fields.
[FIX] mass_mailing: replace int field with many2one field to enforce fkey
bzr revid: chs@openerp.com-20140429165430-6w4xplwr4c5ymi1j
2014-04-29 18:54:30 +02:00
Simon Lejeune
0f0eef7965
[MERGE][IMP] Point of Sales: reports converted to QWeb (but removed useless ones); removed dead code in wizard folder; folder; Adapted /report/download route to serialize and return osv_exception in order to be handled in core.js get_file
...
bzr revid: sle@openerp.com-20140429163810-s6i8gwjq07ei3830
2014-04-29 18:38:10 +02:00
Fabien Meghazi
45aba13ed5
[FIX] bootstrap-tour removed
...
bzr revid: fme@openerp.com-20140429161604-dq0ny7bjioe6bjg3
2014-04-29 18:16:04 +02:00
Fabien Meghazi
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
Kersten Jeremy
0853de32fb
[FIX] Allow to use attendee_people without use_contact. Allow to use an avatar in each event distinct from sidebar. Allow False to hide avatar in sidebar.
...
bzr revid: jke@openerp.com-20140429150038-zkf2dwxu15tp04qd
2014-04-29 17:00:38 +02:00
Fabien Meghazi
c92e1b6bcb
[IMP] Rename assets_frontend
...
bzr revid: fme@openerp.com-20140429145745-t3u41tzv6qnndlla
2014-04-29 16:57:45 +02:00
Martin Trigaux
37c41f9c78
[FIX] stock: when delivering a product in average cost, make sure the price_unit on the stock.move is up to date (opw 607272)
...
bzr revid: mat@openerp.com-20140429145332-s3c22w47aihdsfub
2014-04-29 16:53:32 +02:00
Randhir Mayatra (OpenERP)
adef80714d
[MERGE][REM] Configurable menu action for users -- was broken (web part)
...
bzr revid: rim@openerp.com-20140429143923-1340bi40th1w57du
2014-04-29 16:39:23 +02:00
Fabien Meghazi
b29c87dd45
[REM] remaining tests folder
...
bzr revid: fme@openerp.com-20140429143312-7noplht9i1d3442g
2014-04-29 16:33:12 +02:00
Fabien Meghazi
78be910192
[MERGE] trunk-js-httpcase-al
...
bzr revid: fme@openerp.com-20140429142822-ytw2oiljapi1t4q0
2014-04-29 16:28:22 +02:00
Fabien Meghazi
22725bd29f
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429142729-y4kfuohn4lsklnud
2014-04-29 16:27:29 +02:00
Richard Mathot (OpenERP)
6e8ba284a5
[FIX][REM] hr_timesheet: removed reports mistakenly reintroduced
...
bzr revid: rim@openerp.com-20140429141127-hskvdl652ei55ypf
2014-04-29 16:11:27 +02:00
Richard Mathot (OpenERP)
dfe236fe82
[REM] removing menu_di
...
bzr revid: rim@openerp.com-20140429135640-84ycqhsdlhmdj268
2014-04-29 15:56:40 +02:00
Darshan Kalola (OpenERP)
2680f382ad
[MERGE][REM] Removal of "process" module and its avatars in others modules
...
bzr revid: rim@openerp.com-20140429133137-srcttmqxhwo6u295
2014-04-29 15:31:37 +02:00
Simon Lejeune
393c87120d
[FIX] core.js get_file method: correctly extract exception from body
...
bzr revid: sle@openerp.com-20140429132319-gfp2hlaj1qlatt50
2014-04-29 15:23:19 +02:00
Olivier Dony
23f36f03ce
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev 9440 odo@openerp.com-20140429123517-wtjcw6xl8qgtnkeg
...
bzr revid: odo@openerp.com-20140429125514-sv92pxfmhjmhplnu
2014-04-29 14:55:14 +02:00
Simon Lejeune
bc23005658
[MERGE][IMP] hr_timesheet: remove unattainable reports; hr_attendance: replace reports by a graphview
...
bzr revid: sle@openerp.com-20140429125300-s6ce4vlua357itdq
2014-04-29 14:53:00 +02:00
Richard Mathot (OpenERP)
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
Simon Lejeune
6d5218363f
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140429124349-hletwekgkdamacw1
2014-04-29 14:43:49 +02:00
Olivier Dony
4755fb1a76
[FIX] website_twitter: grant rights to website manager on tweets
...
bzr revid: odo@openerp.com-20140429124303-0uiprqq472h2i7g5
2014-04-29 14:43:03 +02:00
Martin Trigaux
9cf14197ac
[FIX] stock: recompute the qty_available based on the location instead of using the one in the result of the browse (opw 606423)
...
The qty_available field is a function field that uses the information of the context (eg: location) to compute the value. Using the global browse record would return the same qty_available value for each location (and then produce way too many account.move)
bzr revid: mat@openerp.com-20140429124256-ljph37kijosg5dqb
2014-04-29 14:42:56 +02:00
Simon Lejeune
6bef64f513
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140422123804-dnjnwfyfrpxjgrlo
bzr revid: sle@openerp.com-20140424124720-ihcrqojmnmj0k66q
bzr revid: sle@openerp.com-20140428162227-sbvq5ogtshpz0vw6
bzr revid: sle@openerp.com-20140429124237-dhk3378fvche068v
2014-04-29 14:42:37 +02:00
Simon Lejeune
80f68fe4bb
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140429124215-92f645c16v9j1dyi
2014-04-29 14:42:15 +02:00
Olivier Dony
81c251836d
[FIX] website: grant edit rights to website manager
...
bzr revid: odo@openerp.com-20140429123517-wtjcw6xl8qgtnkeg
2014-04-29 14:35:17 +02:00
Simon Lejeune
0d2a0e8109
[FIX] point of sale: payment report bad behaviour when printing multiple documents
...
bzr revid: sle@openerp.com-20140429122400-s2ey704e8qfifzzj
2014-04-29 14:24:00 +02:00
Frédéric van der Essen
18c4c8436d
[MERGE] point_of_sale: make the kg unit precise up to grams, and use the unit's rounding factor on the scale screen
...
bzr revid: fva@openerp.com-20140429122107-1s1vwm90484fo7pl
2014-04-29 14:21:07 +02:00
Simon Lejeune
ba6e63d690
[IMP] point of sale: better check before printing a potential invoice from a pos order
...
bzr revid: sle@openerp.com-20140429121329-lxgwpbuccdy67r4v
2014-04-29 14:13:29 +02:00
Simon Lejeune
8db594758e
[REM] point_of_sale: removed closed cashbox report that is nearly the session resume report
...
bzr revid: sle@openerp.com-20140429114045-kaj86qq00dovj75o
2014-04-29 13:40:45 +02:00
Denis Ledoux
79d4c57877
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7
...
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
2014-04-29 13:27:38 +02:00
Kunal Chavda (OpenERP)
6f51331d52
[MERGE][FIX] Position of m2o autocompletion on too small and non scrollable screens
...
bzr revid: rim@openerp.com-20140429112237-jdnd04gr1t2qot5r
2014-04-29 13:22:37 +02:00
Denis Ledoux
b2e56a0128
[FIX] account_analytic_analysis: recurring invoice line, use the name passed in the product_id_change method
...
In addition, do not set the line description as the product name + product description, only the product description: same behavior than in invoices and sale orders
bzr revid: dle@openerp.com-20140429112147-hqfqd0y487s817n7
2014-04-29 13:21:47 +02:00
Olivier Dony
3891e0f2aa
[FIX] event_sale: call to parent store trigger resolver fails due to class mismatch for <unbound_method>
...
bzr revid: odo@openerp.com-20140429105020-0itp8j0oa4im3bj7
2014-04-29 12:50:20 +02:00
Frédéric van der Essen
0059d7b1cd
[FIX] product: the declaration of decimal precision was done after
...
the declaration of uom precision, preventing uom precision from going above
the default decimal precision. + made the Kg unit precise up to grams by default.
bzr revid: fva@openerp.com-20140429101932-k6s827csz6i1za51
2014-04-29 12:19:32 +02:00
Simon Lejeune
fe90837cb2
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140429100840-jewue6bhz6euhd4p
2014-04-29 12:08:40 +02:00
Simon Lejeune
58233749ef
[FIX] point of sale session summary report: better display, divide the tables
...
bzr revid: sle@openerp.com-20140429100738-t5tvsucuu7ss42v8
2014-04-29 12:07:38 +02:00
Denis Ledoux
1b45edab23
[FIX] account_analytic_analysis: recurring invoices lines, use the passed price_unit in product_id_change
...
bzr revid: dle@openerp.com-20140429100137-4jvs37e1j4lqeioe
2014-04-29 12:01:37 +02:00
Fabien Meghazi
048c4c284b
[FIX] Url mismatch redirection should only be done for GET and HEAD http verbs
...
bzr revid: fme@openerp.com-20140429095643-hmq1t45tgv3opyh8
2014-04-29 11:56:43 +02:00
Josse Colpaert
63986a8d02
[FIX] outgoing error in claim + receptions should be incoming
...
bzr revid: jco@openerp.com-20140429092307-q1ug4hng4kevcswm
2014-04-29 11:23:07 +02:00
Randhir Mayatra (OpenERP)
cdb626a7b8
[MERGE] [REM] Removal of every pre-made dashboard. Only "My Dashboard" has been kept.
...
Modules descriptions have been updated accordingly and some screenshots have been removed.
(affects: account, crm, event, fleet, hr, hr_evaluation, hr_expense, hr_holidays, hr_recruitment, hr_timesheet_sheet, mrp, procurement, project, purchase, sale, stock)
bzr revid: rim@openerp.com-20140429091032-5gp5klbkvldl9msn
2014-04-29 11:10:32 +02:00
Richard Mathot (OpenERP)
d7d6833965
[FIX] sale: layout of description page
...
bzr revid: rim@openerp.com-20140429090502-32u7vf7zntxnoruk
2014-04-29 11:05:02 +02:00
Martin Trigaux
9806fd4225
[MERGE] [FIX] mail: make the detection of Content-Type based on filename instead of only offering 'application/octet-stream'. This allows to have a better detection of the software to use by the browser. opw 606233
...
bzr revid: mat@openerp.com-20140429090446-6691y6h9vdkbbnuu
2014-04-29 11:04:46 +02:00
Richard Mathot (OpenERP)
f9b97239f6
[FIX] mrp: missing dependency to report
...
bzr revid: rim@openerp.com-20140429085836-7goilzvlolal79bp
2014-04-29 10:58:36 +02:00
Anaël Closson (openerp)
25f88efb98
[FIX] stock: destination location should not be limited to internal as this wizard is also used for incoming and outgoing pickings (opw 606213)
...
bzr revid: mat@openerp.com-20140429083108-njr9ixk1faj8hv3r
2014-04-29 18:31:08 +10:00
Richard Mathot (OpenERP)
c9e5d0e6a1
[IMP] crm: manifest layout
...
bzr revid: rim@openerp.com-20140429083104-i1amazz4o0cy6xkk
2014-04-29 10:31:04 +02:00
Richard Mathot (OpenERP)
822393dc04
[REM] Dashboard from manifest
...
bzr revid: rim@openerp.com-20140429082859-p2nl9ye2f6kd47iz
2014-04-29 10:28:59 +02:00
Olivier Dony
d5534d7c42
[IMP] website_blog: spellcheck/grammar for module description, courtesy of Ray Carnes (Ursa Information Systems)
...
bzr revid: odo@openerp.com-20140429082329-m3q74wr7fgyr3bbu
2014-04-29 10:23:29 +02:00
Richard Mathot (OpenERP)
65f2db5c21
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
Richard Mathot (OpenERP)
2c3ec2c7e4
[REM] mrp/stock: remmove ACLs related to removed dashboards
...
bzr revid: rim@openerp.com-20140429081808-hytvlkp461zm2l4o
2014-04-29 10:18:08 +02:00
Launchpad Translations on behalf of openerp
fdfcb6bf47
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140429064121-xnusb4mb3r8vgtzh
2014-04-29 06:41:21 +00:00
Fabien Meghazi
dde0c9324b
[IMP] Convered qunit test suite to template
...
bzr revid: fme@openerp.com-20140428182451-u4mgen9669gnldva
2014-04-28 20:24:51 +02:00
Olivier Dony
ca65a8e624
[IMP] product: simplify legacy useless code
...
bzr revid: odo@openerp.com-20140428173842-7u83jyr1rrexf3uy
2014-04-28 19:38:42 +02:00
Simon Lejeune
003b3fd41e
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140428162055-9t72vke2kdkhqcwr
2014-04-28 18:20:55 +02:00
Simon Lejeune
0d6ea88e57
[FIX] pos test reports: typo
...
bzr revid: sle@openerp.com-20140428162032-9s1s0wwxkboqeo2z
2014-04-28 18:20:32 +02:00
Simon Lejeune
8ac834748d
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140428161922-phoj5oghmx85rtem
2014-04-28 18:19:22 +02:00
Simon Lejeune
62759aeb52
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140428161742-dynv04fthze2h49v
2014-04-28 18:17:42 +02:00
Simon Lejeune
a59df10de0
[IMP] l10n_fr_hr_payroll: payslip report converted to qweb
...
bzr revid: sle@openerp.com-20140428161506-1n30zusiv42evpbl
2014-04-28 18:15:06 +02:00
Quentin (OpenERP)
7ed26f1e07
[REF] product refactoring: prices.history model renamed into product.price.history + passed 'date' as real parameter instead of contextual one in get_history_price() because it makes more sense.
...
bzr revid: qdp-launchpad@openerp.com-20140428153355-vbuam1hfnah7m4wp
2014-04-28 17:33:55 +02:00
Frédéric van der Essen
10046d854c
[IMP] point_of_sale: use the product unit's precision for rounding the weight
...
bzr revid: fva@openerp.com-20140428153326-klgddc93ud9t0uqr
2014-04-28 17:33:26 +02:00
Martin Trigaux
c393fbcddd
[MERGE] [FIX] hr_timesheet_sheet: make it timezone tolerant and avoid errors when comparing datetime and dates, courtesy of Yannick Vaucher (Camptocamp)
...
The attendance date recieved by the server is in UTC while the user sees it in his timezone. This means that an attendance could be in a timesheet (bounded by dates) for a user but not for the server which would not accept a valid attendance.
The fix will make the check in the user's timezone.
Only the date part of the attendance is kept for comparison as the boundaries are dates objects.
bzr revid: mat@openerp.com-20140428153216-4s6r5hu1ov0p0ofm
2014-04-29 01:32:16 +10:00
Frédéric van der Essen
1aaed44874
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20140428152938-ib1yl6f7lgat51vm
2014-04-28 17:29:38 +02:00
Antony Lesuisse
d9eec7345b
convert js tests to HttpCase
...
bzr revid: al@openerp.com-20140428152857-h7z61vdw5crezv2u
2014-04-28 17:28:57 +02:00
Antony Lesuisse
a8e833b44f
[FIX] base_import remove useless test
...
bzr revid: al@openerp.com-20140428151946-0g54ne4yintws4cu
2014-04-28 17:19:46 +02:00
Quentin (OpenERP)
a4890f1fe2
[REF] stock: small code refactoring
...
bzr revid: qdp-launchpad@openerp.com-20140428145536-gt88h37nayf62fm3
2014-04-28 16:55:36 +02:00
chm@openerp.com
4107998dcc
Tour Re-factoring.
...
Only one tour running; remove bootstrap tour; Simplify creation of tour; can choose test or tutorial mode with run method; can work without qweb and without EditorBar
bzr revid: chm@openerp.com-20140428143002-73l45msl8l4gfdq3
2014-04-28 16:30:02 +02:00
Yannick Vaucher
22d1c0956f
[UPD] resolve conflicts with main branch and fix bug introduced in rev 10015 lp:1313622
...
lp bug: https://launchpad.net/bugs/1313622 fixed
bzr revid: yannick.vaucher@camptocamp.com-20140428142017-3warx1ai72cfetj1
2014-04-28 16:20:17 +02:00
Yannick Vaucher
886c827458
[UPD]
...
bzr revid: yannick.vaucher@camptocamp.com-20140428135535-o9512996d18cudgq
2014-04-28 15:55:35 +02:00
chm@openerp.com
baf327a5d0
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140428134806-s9i9vc37uyjcoi75
2014-04-28 15:48:06 +02:00
chm@openerp.com
1199b60d70
[IMP] website_sale: use street 2 to set company_name
...
bzr revid: chm@openerp.com-20140428134632-v3w7imtz7j3u3tp0
2014-04-28 15:46:32 +02:00
Fabien Meghazi
d60af567ad
[FIX] web test suite: manually fetch registry
...
bzr revid: fme@openerp.com-20140428132846-k8ofnlsse4s28jpr
2014-04-28 15:28:46 +02:00
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
Cedric Snauwaert
40549064c6
[FIX]barcode interface: allow user to choose name of lot when creating a lot
...
bzr revid: csn@openerp.com-20140428101226-4d7kcaq29d3ofgqm
2014-04-28 12:12:26 +02:00
Quentin (OpenERP)
606050aae3
[FIX] stock: fixed wrongly removed line from previous commit
...
bzr revid: qdp-launchpad@openerp.com-20140428100949-se3xpeix06udq1k2
2014-04-28 12:09:49 +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
Quentin (OpenERP)
9790132189
[REF] stock: small code refactoring
...
bzr revid: qdp-launchpad@openerp.com-20140428092726-1vo51if06q2o2b8y
2014-04-28 11:27:26 +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
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
Quentin (OpenERP)
8b24726b33
[REF] stock_account: removal of TODO statements
...
bzr revid: qdp-launchpad@openerp.com-20140425143936-yiyg7y1km29978ox
2014-04-25 16:39:36 +02:00
Quentin (OpenERP)
599355ea69
[REF] stock: removal of TODO statements
...
bzr revid: qdp-launchpad@openerp.com-20140425142939-atjre88c9zvl5r93
2014-04-25 16:29: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
Quentin (OpenERP)
cba2365d95
[MERGE] branch of jco fixing shipping exception in mrp + cancellation in chained moves
...
bzr revid: qdp-launchpad@openerp.com-20140425132449-s7e8duh884rirrqz
2014-04-25 15:24:49 +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
Vidhin Mehta (OpenERP)
4312b921f3
[MERGE]Trunk.
...
bzr revid: vme@tinyerp.com-20140425130739-ug3n26htiqrky5j3
2014-04-25 18:37:39 +05:30
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
Quentin (OpenERP)
f36b470c1b
[MERGE] stock_landed_costs: better usability
...
bzr revid: qdp-launchpad@openerp.com-20140425124634-9bxzm92hx0di5ogy
2014-04-25 14:46:34 +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
Quentin (OpenERP)
b96b904b2c
[REF] stock_account: refactoring of do_change_standard_price() + removal of TODO statements
...
bzr revid: qdp-launchpad@openerp.com-20140425121810-tp2caagu1rnzpgcg
2014-04-25 14:18:10 +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
Amit Vora
c6732c1ba9
[MRG] merge with main barnch
...
bzr revid: avo@tinyerp.com-20140423054749-ubsch2zyr0e0617l
bzr revid: avo@tinyerp.com-20140425115239-w1j8zg1dp0ibzn0a
2014-04-25 17:22:39 +05:30
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
Mansi Kariya (OpenERP)
440ddae7f8
[ADD] Added sequence on Stock Landed Cost and added Landed Cost type Configuration view and improved product view
...
bzr revid: mka@tinyerp.com-20140425104945-1vfv217uy1xhbnmx
2014-04-25 16:19:45 +05:30
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
Quentin (OpenERP)
e077a96cdd
[REF] purchase: cleaning the TODO messages
...
bzr revid: qdp-launchpad@openerp.com-20140425091128-13uuwk7txzjoos6z
2014-04-25 11:11:28 +02:00
Quentin (OpenERP)
7a6b00b651
[MERGE] merged with trunk up to revision 9381
...
bzr revid: qdp-launchpad@openerp.com-20140425090414-vpg4szws9y4fgznc
2014-04-25 11:04:14 +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
Quentin (OpenERP)
5237343263
[FIX] stock_landed_costs: accounting entries
...
bzr revid: qdp-launchpad@openerp.com-20140425084006-qwqv4qk4zpm86dgy
2014-04-25 10:40:06 +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