dd03491df9
sync with 7.0
...
bzr revid: mat@openerp.com-20140425113555-nkjxldq61io6kvdo
2014-04-25 13:35:55 +02:00
d711fd940d
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140425113341-0aljg5e2waole2sz
2014-04-25 13:33:41 +02:00
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
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
4f16d15120
[IMP] rename editor assets
...
bzr revid: fme@openerp.com-20140425101753-gz6c8q9huw9c04yp
2014-04-25 12:17:53 +02:00
775e553d5a
[IMP]Improved code for add <p> tag
...
bzr revid: cod@tinyerp.com-20140425101340-znewo5agt8vdl5mw
2014-04-25 15:43:40 +05:30
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
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
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
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
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
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
bc4620d2c6
[FIX] Still trying to fix tests
...
bzr revid: fme@openerp.com-20140425090358-1ydohuemx1tk715u
2014-04-25 11:03:58 +02:00
0efb6fc28b
[FIX] Inverse logic for /page/website.<id> shortcut
...
bzr revid: fme@openerp.com-20140425083521-8rd1u3y4da8sf89i
2014-04-25 10:35:21 +02:00
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
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
1fadb254d5
[FIX]: Fix months count in yearly salary details
...
bzr revid: atp@tinyerp.com-20140425073719-7nlk18wuoxx3s39o
2014-04-25 13:07:19 +05:30
616c20a0f7
[MRG]Merge lp:openerp-web
...
bzr revid: cod@tinyerp.com-20140425061936-csz156gyzu0holkw
2014-04-25 11:49:36 +05:30
74e8fb0674
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140425055958-asoj1wc0pmv7mzds
2014-04-25 11:29:58 +05:30
9a52ef48ad
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140425055310-hpkcnigeptczdadl
2014-04-25 11:23:10 +05:30
24e6fd332a
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140425054902-ls149dxiu4kyxkj5
2014-04-25 11:19:02 +05:30
be912b1d46
[FIX]: Add qweb xml into openerp.py file
...
bzr revid: atp@tinyerp.com-20140425042148-jkldr55vvxfrxnmy
2014-04-25 09:51:48 +05:30
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
8522ae723c
[REM] remove portal_project_long_term
...
bzr revid: al@openerp.com-20140425001928-pacmyw9dfanmczvt
2014-04-25 02:19:28 +02:00
95a9bccb38
[REM] move project_long_term to extra
...
bzr revid: al@openerp.com-20140424235254-u2um2dsth6igvb7r
2014-04-25 01:52:54 +02:00
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
fb4507386d
[REM] project_gtd deprecated by notes
...
bzr revid: al@openerp.com-20140424230801-zmzp2byyk41e7uxf
2014-04-25 01:08:01 +02:00
403e991b2e
[FIX] Fix web test with temporary hack
...
bzr revid: fme@openerp.com-20140424212826-k8amd45orv33u8bn
2014-04-24 23:28:26 +02:00
aca0ad4b8f
[FIX] crm_partner_assign missing js file
...
bzr revid: fme@openerp.com-20140424212415-s843tzw826a992n9
2014-04-24 23:24:15 +02:00
95abee7579
[IMP] auth_signup: better autofocus handling
...
bzr revid: odo@openerp.com-20140424174842-5zzos30cq0jdu9w6
2014-04-24 19:48:42 +02:00
87d4c03ee2
[FIX] view's filename error
...
bzr revid: fme@openerp.com-20140424174135-cm61dogh9pterp77
2014-04-24 19:41:35 +02:00
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
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
560ac34295
[IMP] bundlify rest of web addons
...
bzr revid: fme@openerp.com-20140424165735-83jty3iyrslci1q0
2014-04-24 18:57:35 +02:00
0b2467833a
[MERGE]: Merged hr yearly salary details report.
...
bzr revid: atp@tinyerp.com-20140424164100-1e90drhti5595cr7
2014-04-24 22:11:00 +05:30
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
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
026fce99ab
[FIX?] web_tests shall depends on 'web', right ?
...
bzr revid: fme@openerp.com-20140424155814-1hq0z4ea38a5gee9
2014-04-24 17:58:14 +02:00
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
1c6b63a96e
[MERGE]: Merged with qweb-report branch.
...
bzr revid: atp@tinyerp.com-20140424154553-3yk05u7chmc94odd
2014-04-24 21:15:53 +05:30
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
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
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
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
13469c23d8
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140424135841-akc01inl26fcirwy
2014-04-24 15:58:41 +02:00
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
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
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
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
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
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
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
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
1e81e20cca
[IMP]: Change function condition.
...
bzr revid: atp@tinyerp.com-20140424120202-jqbkr72y1a43dbpf
2014-04-24 17:32:02 +05:30
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
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
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
9cb2b91783
[MERGE][IMP] account: allow sorting of journal items
...
bzr revid: rim@openerp.com-20140424101453-isbgyj5av17rssq2
2014-04-24 12:14:53 +02:00
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
2949a395ba
[IMP]: set the header to left side
...
bzr revid: rsi@tinyerp.com-20140424100150-0as1tmhipxo8tfdn
2014-04-24 15:31:50 +05:30
c304c5a80b
[REM] useless manifest declaration
...
bzr revid: fme@openerp.com-20140424094155-2iatlo8twy5dcb3f
2014-04-24 11:41:55 +02:00
5c69f3470d
[FIX] hr_attendance: removed useless xsl
...
bzr revid: sle@openerp.com-20140424093800-cn3rtga12qk4g7wx
2014-04-24 11:38:00 +02:00
0f869fd64b
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140424093103-pekfio3gv2s721ro
2014-04-24 11:31:03 +02:00
d2765da09c
[FIX] hr_attendance: menuitem wording
...
bzr revid: sle@openerp.com-20140424093052-eq0llqvty1s4bjf1
2014-04-24 11:30:52 +02:00
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
2541ded2c1
[IMP] bundlify web client
...
bzr revid: fme@openerp.com-20140424092520-xx7nocvacx4mcsyw
2014-04-24 11:25:20 +02:00
ad71e6b87c
[imp]:improve th tag to td tag
...
bzr revid: ssh@tinyerp.com-20140424084402-gam7edp04qvyj7gu
2014-04-24 14:14:02 +05:30
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
e82a0ba6c3
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140424072307-1h72tc9krcn8l2o3
2014-04-24 12:53:07 +05:30
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
504385cbc7
[MERGE]: Merged with qwebreport-l10n_in
...
bzr revid: rsi@tinyerp.com-20140424064445-8tnf5sn1tjo91buq
2014-04-24 12:14:45 +05:30
c7565cd540
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
2014-04-24 06:32:49 +00:00
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
c61a1b679e
[IMP]: Add the padding to the child level
...
bzr revid: rsi@tinyerp.com-20140424052118-y92vvkbam7cwlklj
2014-04-24 10:51:18 +05:30
0e12408234
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140424050540-2ywimg1eas53vyl2
2014-04-24 10:35:40 +05:30
45e74261e4
[imp]:improve use a text-center class
...
bzr revid: ssh@tinyerp.com-20140424044756-ls3g2mour8rmjtes
2014-04-24 10:17:56 +05:30
3446fe0695
[IMP]: Improve bootstrap class with span element.
...
bzr revid: atp@tinyerp.com-20140423183241-8c7442xgroxoik0s
2014-04-24 00:02:41 +05:30
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
af30e6b5d3
[MERGE] saas-4
...
bzr revid: sle@openerp.com-20140423161155-im8b5j0l7avrgbts
2014-04-23 18:11:55 +02:00
2c042b1824
[IMP]: Renamed wrapped class
...
bzr revid: atp@tinyerp.com-20140423160740-qnz5k1bnjyybgk9v
2014-04-23 21:37:40 +05:30
ee7ff4bd07
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl
2014-04-23 17:48:52 +02:00
b1bc68d8eb
[FIX] website: tour inject sale/event
...
bzr revid: chm@openerp.com-20140423154530-rfc3glnp5xk50xoc
2014-04-23 17:45:30 +02:00
0ae0b643d1
[REM] Removed print statement
...
bzr revid: tde@openerp.com-20140423153008-jngdjm0qx7cgqctu
2014-04-23 17:30:08 +02:00
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
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
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
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
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
8ddf7a21b7
[FIX]calendar tooltip attachment container
...
bzr revid: csn@openerp.com-20140423145235-ajph1xj2l492q1sy
2014-04-23 16:52:35 +02:00
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
f340fc33ea
[MERGE] saas-4
...
bzr revid: sle@openerp.com-20140423141323-8rlqxuovo720hbyg
2014-04-23 16:13:23 +02:00
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
f53ecc076a
[MERGE][IMP] Usability of event and event_sale
...
bzr revid: rim@openerp.com-20140423140752-6hw7rjdc4k7zxvbr
2014-04-23 16:07:52 +02:00
11680fd1f7
[IMP] Usability of event and event_sale
...
bzr revid: rim@openerp.com-20140423133917-zpulvflwflgz12sw
2014-04-23 15:39:17 +02:00
c43d5235a5
[ADD]: add the view file of Payslip Details
...
bzr revid: rsi@tinyerp.com-20140423133403-60ukgyi8uy4j6g4k
2014-04-23 19:04:03 +05:30
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
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
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
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
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
1b594f5cce
[FIX]while everything is not adaptative, leave overflow-y on modal body
...
bzr revid: csn@openerp.com-20140423131548-7hyo9eei2d2z99zc
2014-04-23 15:15:48 +02:00
3d226bf50f
[IMP] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140423125905-yw05utqtg8q4r0kv
2014-04-23 18:29:05 +05:30
d3ee65eed6
[MERGE] [IMP] mail: slightly improved doc links in notification emails (shorter, clearer)
...
bzr revid: tde@openerp.com-20140423125319-kegutder49zzqmri
2014-04-23 14:53:19 +02:00
7088ddc3be
[FIX] report footer: hide footer from external layout if a custom footer is set; use company.website instead of request.website.name
...
bzr revid: sle@openerp.com-20140423125104-38mrhuov0snti7js
2014-04-23 14:51:04 +02:00
1d8400418e
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123744-zfz7k8drn2t624zu
2014-04-23 14:37:44 +02:00
d4b534e7be
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140423123735-fc38fzp3mtai8xnb
2014-04-23 14:37:35 +02:00
a1b682b341
[MERGE] remove double groupbys in columns in two reporting graph views (addons crm/hr_recruitment)
...
bzr revid: ged@openerp.com-20140423123624-7ls3sajlrdhmaklb
2014-04-23 14:36:24 +02:00
dc34d310ff
[typo] improve typo for _check_currency_amount constraint
...
bzr revid: jar@tinyerp.com-20140423121117-xitriiv7mfwvsn35
2014-04-23 17:41:17 +05:30
4c455f222c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140423120919-7zzobx76hma0v74z
2014-04-23 14:09:19 +02:00
0dee9129b7
[MERGE]l10n_in_hr_payroll: Merged hr employee salary by month.
...
bzr revid: atp@tinyerp.com-20140423120740-q3eo9jwnuinr9a7x
2014-04-23 17:37:40 +05:30
19e4d1d6e2
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140422102821-hj5y7o835y80xx2e
bzr revid: jar@tinyerp.com-20140423114744-umaxpodiv3xlvh5s
2014-04-23 17:17:44 +05:30
7258e428b9
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140423114210-dr026gp4321ll88n
2014-04-23 17:12:10 +05:30
d59d90449c
[IMP] add res remove return in if condition
...
bzr revid: jar@tinyerp.com-20140423114053-wnjqd7408w8sva77
2014-04-23 17:10:53 +05:30
966a818aa6
[FIX] hr_timesheet_sheet: allow writing attendance line not according to the date order, and check that the attendances satisfy the alternance constraint, even for delete operations
...
lp bug: https://launchpad.net/bugs/1180773 fixed
bzr revid: dle@openerp.com-20140423112554-75bpk5k3viroqbh5
2014-04-23 13:25:54 +02:00
a6797e68e6
[MERGE] [FIX] account_voucher: in recompute_voucher_lines, ensure the price value is not modified when computing the writeoff_amount.
...
Using the remaining amount for writeoff does not make sense as the amount is already in credit or debit lines.
This issue could be observed in the payment wizard where the execution of _compute_writeoff_amount (through onchange) would be a negative value at the first execution.
bzr revid: mat@openerp.com-20140423101847-s0efihzqe7jcdcps
2014-04-23 12:18:47 +02:00
679d278d25
[FIX] /web/login restore request.uid in case of authentication failure
...
bzr revid: fme@openerp.com-20140423100749-t4y4oi01tszn3z5a
2014-04-23 12:07:49 +02:00
f43f406355
[MERGE] [FIX] procurement: default_get in orderpoint make a search instead of hardcoding a warehouse as it's possible te user do not have access to it (e.g. multicompany), courtesy of Romain Deheele(Camptocamp)
...
bzr revid: mat@openerp.com-20140423100324-6stypg5uapnl1s5f
2014-04-23 12:03:24 +02:00
ff9ae691d5
[FIX] website: snippet editor: speed up save view (construct only option with clean_for_save method); fix carousel arrow
...
bzr revid: chm@openerp.com-20140423095901-q945d4593uet41xy
2014-04-23 11:59:01 +02:00
fc2dd8983d
[WIP] hr_attendance graphview: moved graph declaration inside hr_attendance_view.xml, removed the useless day field on hr.attendance model, fixed the groupby so that se graphview allows to group by day, week, etc.
...
bzr revid: sle@openerp.com-20140423095409-wab11nwouwnz43og
2014-04-23 11:54:09 +02:00
f15123df69
[imp]:improve code firsr first call layout then foreach loop
...
bzr revid: ssh@tinyerp.com-20140423095339-lkswkyqyhw1cm6oj
2014-04-23 15:23:39 +05:30
b6d83483b2
[REV] event: partial revert of commit 9310. Icons on list/tree views removed
...
in event are back. The purpose of commit 9310 was to remove icons on filters
and in searches, not in other views.
bzr revid: tde@openerp.com-20140423094244-cphuvy93uv020vgw
2014-04-23 11:42:44 +02:00
48e9d255ae
[FIX] web: list view: fixed button behavior
...
- icon-like behavior is the default behavior
- text-based buttons (using btn_txt class) are used whenever no icon is given to the
button in a list view.
This way the previous behavior is always the default behavior, and the css modifications are
done only for the text-based buttons, avoiding side-effects.
bzr revid: tde@openerp.com-20140423094124-8zq3yysy616aowu2
2014-04-23 11:41:24 +02:00
92e3455565
[IMP] removes double groupby in row dimension, in hr recruitment reporting view (addon hr_recruitment)
...
bzr revid: ged@openerp.com-20140423092955-cong5772cxpvks3m
2014-04-23 11:29:55 +02:00
2558b7ec01
[IMP] removes double groupby in row dimension, in opportunities analysis
...
bzr revid: ged@openerp.com-20140423091726-kgnqfqtqjqxvul45
2014-04-23 11:17:26 +02:00
8ee8b7bde6
[FIX]problem with header dropdown buttons css
...
bzr revid: csn@openerp.com-20140423091414-llv3t70gi59orbh0
2014-04-23 11:14:14 +02:00
99f19ba562
[MERGE][FIX] survey: incorrect route + security rules
...
bzr revid: rim@openerp.com-20140423085703-kyv4z4dc35mmiama
2014-04-23 10:57:03 +02:00
e53b07b12b
[FIX]
...
bzr revid: rim@openerp.com-20140423085404-rleqt5f9rznpbj0k
2014-04-23 10:54:04 +02:00
35d50a7139
[FIX] add noupdate to survey security rules
...
bzr revid: rim@openerp.com-20140423085037-7wgp3hekne7hwnrl
2014-04-23 10:50:37 +02:00
447fa873df
[FIX] Force zindex for elements which should be at top of a modal window.
...
bzr revid: jke@openerp.com-20140423081914-anmpeae40z7dav4a
2014-04-23 10:19:14 +02:00
7c02150c97
[FIX]tooltip on kanban should be bind to element itself instead of body to prevent tooltip to stay visible
...
bzr revid: csn@openerp.com-20140423073840-m85t30lwgt8uf465
2014-04-23 09:38:40 +02:00
d64b172b3b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140423065826-x7fmgc85ckhi9s8u
bzr revid: launchpad_translations_on_behalf_of_openerp-20140423070300-k249yxs2ghd1vaof
2014-04-23 07:03:00 +00:00
210adf77cb
[FIX] account_voucher: Fixed wrong writeoff(Payment Difference) calculation by recompute_voucher_lines(...). (Maintenance Case: 605632)
...
bzr revid: rgo@tinyerp.com-20140423070139-ielwafap3zcupglx
2014-04-23 12:31:39 +05:30
17213b034a
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140422101543-wkoatwvwzkb730ya
bzr revid: jar@tinyerp.com-20140423065938-iyevq3vfe8qmj1v3
2014-04-23 12:29:38 +05:30
be542630e8
[IMP]: Code optimization in the view file
...
bzr revid: rsi@tinyerp.com-20140423065755-83tyantoitle2ow4
2014-04-23 12:27:55 +05:30
8ec6803d68
[MRG]:lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in
...
bzr revid: ssh@tinyerp.com-20140423053228-5dv91bodygh87f8e
2014-04-23 11:02:28 +05:30
06ca6d2540
[imp]:improve code
...
bzr revid: ssh@tinyerp.com-20140423052910-486im2lmzpqev14n
2014-04-23 10:59:10 +05:30
7fd1613f67
[MERGE] graph view: multiple minor/usability fixes
...
bzr revid: odo@openerp.com-20140422174258-9mo8qbuniaxjw0oe
2014-04-22 19:42:58 +02:00
748062b248
[WIP] hr_attendance: replace the attendance by week/month rml report by a graph view
...
bzr revid: sle@openerp.com-20140422163049-kgq5hwnk66svrmb1
2014-04-22 18:30:49 +02:00
b6255eb55d
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10005 revid:dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
...
bzr revid: dle@openerp.com-20140422162028-2icoebrb5q4tg3t3
2014-04-22 18:20:28 +02:00
5ff7146e15
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 4179 revid:dle@openerp.com-20140422150918-nxv2v4bcvi6u3v6g
...
bzr revid: dle@openerp.com-20140417101315-2pjn31wb7ald3qe4
bzr revid: dle@openerp.com-20140417161003-g3mchwrucp6ab8tu
bzr revid: dle@openerp.com-20140422160712-iq4yur3jmw5n01ar
2014-04-22 18:07:12 +02:00
058427d88b
[FIX] website_forum: correct view xml (introduce by previous commit)
...
bzr revid: chs@openerp.com-20140422151111-2yfs704yk2qbiy89
2014-04-22 17:11:11 +02:00
6083ed4b46
[FIX] web: abitility to do exact id matching with child_of operator for searchs on many2one fields
...
bzr revid: dle@openerp.com-20140422150918-nxv2v4bcvi6u3v6g
2014-04-22 17:09:18 +02:00
b981f3f8ef
[FIX] *: in search views, use operator=child_of instead of filter_domain with a child_of domain
...
operator child_of has the advantage to do exact ID matching for many2one, and not just matching on the name
bzr revid: dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
2014-04-22 17:07:10 +02:00
0241b762b2
[FIX] fix line chart x-axis labels: it now correctly uses the name of the row, and not a number (addon web_graph)
...
bzr revid: ged@openerp.com-20140422150441-3vll2jw69z319yza
2014-04-22 17:04:41 +02:00
394897383f
[FIX] correct the scaling problem of graph bar charts: nvd3 needs a numeric value and was given a [value]. Also, improves the margin of bar/line/pie charts (addon web_graph)
...
bzr revid: ged@openerp.com-20140422150401-p0t9xmittp73j7hx
2014-04-22 17:04:01 +02:00
f584b030bc
[FIX] correct fix for the scrolling problem in graph view: the view now saves its scrolling position before redrawing itself (addon web_graph)
...
bzr revid: ged@openerp.com-20140422150316-m51u750732re8qib
2014-04-22 17:03:16 +02:00
8c001acda0
[FIX] in graph view, save the scrolling position and use it when redrawing the table (addon web_graph)
...
bzr revid: ged@openerp.com-20140422150209-f06ffxry1h46cpfh
2014-04-22 17:02:09 +02:00
c3c56bb2b1
[FIX] disable export to xls button in graph view when there are no data to export, this prevent a crash (addon web)
...
bzr revid: ged@openerp.com-20140422145955-vfls1hxktnq8m67b
2014-04-22 16:59:55 +02:00
00cb732ea0
[FIX] only hide the export button (and not all the config buttons) in graph view when the module xlwt is not installed (addon web)
...
bzr revid: ged@openerp.com-20140422145918-s20n3qla1nfte5dj
2014-04-22 16:59:18 +02:00
618fbde36f
[MERGE] forward port of branch saas-4 up to revid 9365 chs@openerp.com-20140422143249-3cfh18tenn3a5ry1
...
bzr revid: chs@openerp.com-20140422144651-840zze7p5549k88s
bzr revid: chs@openerp.com-20140422144933-0su8g7pgrcloijco
2014-04-22 16:49:33 +02:00
bc1878e3e2
[IMP] raise not found if bundle not found
...
bzr revid: fme@openerp.com-20140422144132-thk3x58eqjvjzacu
2014-04-22 16:41:32 +02:00
7a04b9ca90
[REM] Remove useless auth='public' for js and css bundle controllers (now defined in web client)
...
bzr revid: fme@openerp.com-20140422143428-iggemicd37wzcd2d
2014-04-22 16:34:28 +02:00
169ecc2b01
[FIX] js and css bundle controllers set as auth='public'
...
bzr revid: fme@openerp.com-20140422143401-1jtxvd58mcw4kelw
2014-04-22 16:34:01 +02:00
12beacda08
[MERGE] backport of trunk revisions:
...
9362 fp@tinyerp.com-20140421205739-rki3bctinjy3amzy [MERGE] new module: website_forum_doc + small fixes (close) in forum
9363 fp@tinyerp.com-20140421213850-19gk3hfz8qxa6fw3 [IMP] improved form view for posts
bzr revid: chs@openerp.com-20140422143249-3cfh18tenn3a5ry1
2014-04-22 16:32:49 +02:00
0ec498371e
[FIX] translatable condition on *.editor.js assets
...
bzr revid: fme@openerp.com-20140422141656-r9cx0z7mkwhe51hp
2014-04-22 16:16:56 +02:00
b97ac5b559
[MERGE] [IMP] Search views: consistency of some filters labels
...
bzr revid: rim@openerp.com-20140422140624-3st99rbiyl9kcpqb
2014-04-22 16:06:24 +02:00
aac1a81999
[MERGE] [FIX] stock: when duplicating a stock.move, remove serial number and tracking information in every cases instead of specific to duplication of invocies, courtesy of Guewen Baconnier
...
bzr revid: mat@openerp.com-20140422140337-ymq7x133eicy6rpa
2014-04-22 16:03:37 +02:00
f44148ba22
[IMP]: Optimize the code
...
bzr revid: rsi@tinyerp.com-20140422135308-ixhpb0d4lbbecl2z
2014-04-22 19:23:08 +05:30
7f29d7e371
[FIX] website: pass `lang` to js and css bundle controllers
...
bzr revid: fme@openerp.com-20140422135022-u9p7zofv5sbeqo30
2014-04-22 15:50:22 +02:00
23268ad677
[FIX] account: avoid tax on name search to execute request with empty journal (if context == {'journal_id': False}) (opw 606875)
...
bzr revid: mat@openerp.com-20140422135012-6faelx7cf0p8cvab
2014-04-22 15:50:12 +02:00
c117c3e10f
[MOV] website: translatable context var from website#preprocess_request to ir.ui.view#render
...
bzr revid: fme@openerp.com-20140422134748-9niep8iyzx9ldq1l
2014-04-22 15:47:48 +02:00
f917b1f998
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140422133650-bi5lri33o5f0g3yj
2014-04-22 15:36:50 +02:00
5184a7aceb
[FIX] l10n_fr tests: render the reports with their new xmlid
...
bzr revid: sle@openerp.com-20140422131333-dbgt9lp8oa6us1zs
2014-04-22 15:13:33 +02:00
df85f3baf6
[FIX] note: typo in manifest
...
bzr revid: dle@openerp.com-20140422130506-934g9o433kdhmwnp
2014-04-22 15:05:06 +02:00
1306bd11ad
[MERGE][FIX] *: typos fixes in modules manifest
...
bzr revid: dle@openerp.com-20140422130348-137yvk356pkv25im
2014-04-22 15:03:48 +02:00
5fdb6292b1
[imp]:add qweb report and remove rml report
...
bzr revid: ssh@tinyerp.com-20140422123757-6wskvlwyltlyjvp0
2014-04-22 18:07:57 +05:30
60cafe4da2
[FIX] website_event_sale: hide event tickets that are not for sale anymore
...
This should ideally be based on an extra timezone
field on each event, pending fix later in trunk.
bzr revid: odo@openerp.com-20140422123153-m6za55oqkiqysalx
2014-04-22 14:31:53 +02:00
3a0c820dfd
[MERGE][IMP] More explicit error messages (in delivery, hr_timesheet_sheet, purchase, purchase_requisition, sale_stock, stock)
...
bzr revid: rim@openerp.com-20140422123022-22zef462lts0qyqi
2014-04-22 14:30:22 +02:00
fafe368331
[FIX] report explicitly import tests
...
bzr revid: al@openerp.com-20140422122155-jw89nc4g0m12mhvo
2014-04-22 14:21:55 +02:00
7e8dcc5600
[IMP] l10n_be and l1n_fr reports converted to QWeb
...
bzr revid: sle@openerp.com-20140422121105-osvy8ji5v40t70jf
2014-04-22 14:11:05 +02:00
166f735ce5
[IMP]: Remove the inline CSS
...
bzr revid: rsi@tinyerp.com-20140422120915-wpkrw1v1zmjugx5d
2014-04-22 17:39:15 +05:30
8f00758d51
[FIX] js and css route should be auth='user'
...
bzr revid: fme@openerp.com-20140422111631-zpc46gzcn0s0jv6v
2014-04-22 13:16:31 +02:00
70dc4456d7
[FIX] account: Advance search on 'Tax' from journal items leads to traceback if we do not select any journal. (Maintenance Case: 606875)
...
bzr revid: rgo@tinyerp.com-20140422111115-17e6juruftp3oj2r
2014-04-22 16:41:15 +05:30
da09f830eb
[MERGE][IMP] account_followup: direct link to followups on the Accounting config page
...
bzr revid: rim@openerp.com-20140422110432-t9jcxt13u1t00qxh
2014-04-22 13:04:32 +02:00
322eebf3f7
[FIX] sale: move demo data from sale to sale_stock
...
A better fix would be to create a sale_procurement module (sale_stock has sale, procurement and stock as dependecies) but a bit overkill for simple demo data
bzr revid: mat@openerp.com-20140422105039-vqvxejd123cmtc0s
2014-04-22 12:50:39 +02:00
7d428b6430
[MERGE] [FIX] account unreconciliation and voucher cancelation (opw 605498)
...
When canceling a voucher or unreconciling move lines, make sure the linked invoice is still correct and has valid payment lines (if cancel one of two payments, should have the other one left).
Forward-port from 6.0 addons revision:5094
Oh, by the way, revision 10000 !
bzr revid: mat@openerp.com-20140422104545-900yfw8gckse1iay
2014-04-22 12:45:45 +02:00
afd6aa2472
[IMP] Added context.
...
bzr revid: mka@tinyerp.com-20140422103802-jhcwotzhh6chcmqu
2014-04-22 16:08:02 +05:30
63a920e372
[MERGE][IMP] Form views usability (account, delivery, hr_expense, hr_payroll, l10n_fr_rib, lunch, product, purchase_requisition, resource, stock)
...
bzr revid: rim@openerp.com-20140422102759-es2o329hu3hu3ak3
2014-04-22 12:27:59 +02:00
281f94ca83
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140422101757-d0rwuxj4wm25f1ae
2014-04-22 15:47:57 +05:30
0fa0c6aa78
[IMP] change add groups on groupby company and change icon on groupby company
...
bzr revid: jar@tinyerp.com-20140422101338-mb7m97rjr48t8gyz
2014-04-22 15:43:38 +05:30
e270940c5f
[FIX] account_voucher & account_move_line: while we have partial payment and we cancel one payment it also unlink the reconcile/partial reconcile tag from other payment entries also
...
bzr revid: ado@tinyerp.com-20140422101128-ugudle2s7ysc6n1p
2014-04-22 15:41:28 +05:30
8a9ca4641f
[FIX] do not use bootstrap wildly in form views
...
bzr revid: rim@openerp.com-20140422100306-bj8jxlatjmko4oi5
2014-04-22 12:03:06 +02:00
60b6ac6669
[IMP] used osv.TransientModel instead of osv.osv_memory in account_followup and removed rml report reference
...
bzr revid: mka@tinyerp.com-20140422094926-gqc3s87t7ha517q2
2014-04-22 15:19:26 +05:30
43ffc66f7c
[FIX] purchase_requisition: views
...
bzr revid: rim@openerp.com-20140422094852-b9kds2wmmyjb2p3h
2014-04-22 11:48:52 +02:00
8a1b43be67
[MERGE] forward port of branch saas-4 up to revid 3981 dle@openerp.com-20140418151400-1g98vljq3cjv0czs
...
bzr revid: chs@openerp.com-20140422094727-7hi9bv3wm1bi0ov9
2014-04-22 11:47:27 +02:00
71560225a9
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140422093002-5mset34e3o1jkadr
2014-04-22 11:30:02 +02:00
56038a3cf9
[IMP] views
...
bzr revid: rim@openerp.com-20140422092529-b2ked8791lqkumb0
2014-04-22 11:25:29 +02:00
f756fa671e
[FIX] gamification: remove wrong double quote in xml
...
website_forum: restrict granting rights on forum badges
bzr revid: mat@openerp.com-20140422090937-l2mxc828hof9u8pi
2014-04-22 11:09:37 +02:00
e3ecf7f4d4
[FIX] en_US typos - opw 606919
...
bzr revid: acl@openerp.com-20140422085837-9flv9ksh54ymvv7i
2014-04-22 10:58:37 +02:00
301f4803e2
[MERGE][IMP] mrp: correct colors for components of manufacturing orders (reflecting their states)
...
bzr revid: rim@openerp.com-20140422084404-wj3lovadhj0opb04
2014-04-22 10:44:04 +02:00
bb91b146dd
[MERGE] [FIX] gamification and website_forum
...
- add noupdate tag
- domain are evaluated at loading
- better user subscription and computation of domain
- batch creation of users
bzr revid: mat@openerp.com-20140422083856-3dffeml5qt0w0dt4
2014-04-22 10:38:56 +02:00
89fd1bede4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140419063533-z6kswp5wkioh5jlv
bzr revid: launchpad_translations_on_behalf_of_openerp-20140420055842-traoy17xi60ufook
bzr revid: launchpad_translations_on_behalf_of_openerp-20140421050815-44ydlitvsaj3xdd9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422082459-bfjqgpt2bpgll64p
2014-04-22 08:24:59 +00:00
a64ff2696c
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140422075452-cr8vy4u45l3tcj1u
2014-04-22 09:54:52 +02:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
6022f890cb
[FIX] gamification: convert calls to private method and don't forget to create missing goals
...
bzr revid: mat@openerp.com-20140422075247-5rddurvr6ymt80mo
2014-04-22 09:52:47 +02:00
69f13188d9
[FIX] en_US typos - opw 606933
...
bzr revid: acl@openerp.com-20140422074039-oobrzrgpnf42v8au
2014-04-22 09:40:39 +02:00
1ddeaa57a6
[FIX] en_US typos - opw 606933
...
bzr revid: acl@openerp.com-20140422073826-0w9ne38ub8nh7p4v
2014-04-22 09:38:26 +02:00
8e6b7fd2c9
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20140422061547-fzhxdeik757g3hfy
2014-04-22 11:45:47 +05:30
2e67cf77de
[IMP]: Change the file attribute value in report
...
bzr revid: rsi@tinyerp.com-20140422053121-e146c69xlxbl3lum
2014-04-22 11:01:21 +05:30
c1b9748947
[IMP] improved form view for posts
...
bzr revid: fp@tinyerp.com-20140421213850-19gk3hfz8qxa6fw3
2014-04-21 23:38:50 +02:00
Martin Trigaux
Simon Lejeune
Gery Debongnie
Fabien Meghazi
Chirag Dodiya (OpenERP)
Denis Ledoux
chm@openerp.com
Olivier Dony
Atul Patel (OpenERP)
Jaydeep Barot
Antony Lesuisse
Frédéric van der Essen
Sunil Sharma (OpenERP)
Cedric Snauwaert
Christophe Simonis
Kersten Jeremy
Thibault Delavallée
Rakesh Sindhav (OpenERP)
Randhir Mayatra rma-openerp
Richard Mathot (OpenERP)
Ravi Gohil (OpenERP)
Géry Debongnie
Divyesh Makwana (OpenERP)
Bharat Devnani (Open ERP)
Mansi Kariya (OpenERP)
Amit Dodiya
Anael Closson
Fabien Pinckaers