pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,218 Commits 1 Branch 0 Tags
77be55fcc7de35c9a9de6451fe056e94de7fe2d6
Commit Graph
103218 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Josse Colpaert 0a9bf2fe25 [MERGE] merge from perf3 until merge 
bzr revid: jco@openerp.com-20140304161944-hbb58wtdj2e4c2u7
 2014-03-04 17:19:44 +01:00
Thibault Delavallée de37ea15ac [MERGE] [FIX] website_sale: effectively send the email of a draft or confirmed quotation on the ecommerce after payment. Having the action is not sufficient, we have to trigger it manually. We do this by creating and sending a mail.compose.message, like what is done manually on a quotation when using the 'Send by email' button. 
bzr revid: tde@openerp.com-20140304161659-9ueka2y4ctfk4okv
 2014-03-04 17:16:59 +01:00
Josse Colpaert 0b41dbc41b [MERGE] Merge from loc on op 
bzr revid: jco@openerp.com-20140304161534-20ug4ioic1ik766d
 2014-03-04 17:15:34 +01:00
Martin Trigaux b5f33e7910 [FIX] hr_payroll_account: compare debit and credit values with float_compare, this avoids float rounding issues 
bzr revid: mat@openerp.com-20140304161056-45z9uuod134qd09t
 2014-03-04 17:10:56 +01:00
Richard Mathot (OpenERP) a7055b2452 [FIX] Typo 
bzr revid: rim@openerp.com-20140304160045-2sf43mffsjqn6wzp
 2014-03-04 17:00:45 +01:00
Richard Mathot (OpenERP) 14bd7add4b [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140304155535-2d5tpkaxh57cjjq4
 2014-03-04 16:55:35 +01:00
Richard Mathot (OpenERP) 8a60839c6e [FIX] test according to new demo data 
bzr revid: rim@openerp.com-20140304155322-19mtf11yilbin7zt
 2014-03-04 16:53:22 +01:00
Richard Mathot (OpenERP) 74e553d6c9 [REM] this test has no purpose anymore (since the data used there are always 'open') 
bzr revid: rim@openerp.com-20140304154907-7hi8h15jveiags2t
 2014-03-04 16:49:07 +01:00
Denis Ledoux 40b1ab36bb [FIX] crm: convert lead to opp wizard, on change salesman choose default salesteam if any 
bzr revid: dle@openerp.com-20140304154442-o2zvun8ehv2ro6dl
 2014-03-04 16:44:42 +01:00
Thibault Delavallée 6924171964 [FIX] website_sale: effectively send the email of a draft 
or confirmed quotation on the ecommerce. Having the action is not sufficient
we have to trigger it manually.

bzr revid: tde@openerp.com-20140304154433-t9mo6bzsesx7z613
 2014-03-04 16:44:33 +01:00
Richard Mathot (OpenERP) 19bc75bcb3 [FIX] demo data 
[FIX] tests
[REM] outdated demo data

bzr revid: rim@openerp.com-20140304154412-2iwf8v5xoxed3yeg
 2014-03-04 16:44:12 +01:00
Olivier Dony b79a33aefc [FIX] orm.read_group: improve test coverage and corner case handling: 
- allow leading spaces in orderby spec for m2o columns
- extra test for read_group on multiple columns
- proper handling of groupby on numeric column with default order

bzr revid: odo@openerp.com-20140304152927-havybom9x1jgdzae
 2014-03-04 16:29:27 +01:00
Richard Mathot (OpenERP) b3e08d83ff [FIX] tests 
bzr revid: rim@openerp.com-20140304151115-wvu072h11kmzupj1
 2014-03-04 16:11:15 +01:00
Richard Mathot (OpenERP) 46d972e6b0 [WIP][FIX] Partial fix of the tests of hr_evaluation 
bzr revid: rim@openerp.com-20140304144308-76b08pktexfklj66
 2014-03-04 15:43:08 +01:00
Thibault Delavallée 1802496c9f [FIX] website_sale: fixed wrong method name, sale_reset_order is not defined anymore 
bzr revid: tde@openerp.com-20140304143426-0eaec0sr6y4ogta9
 2014-03-04 15:34:26 +01:00
Richard Mathot (OpenERP) e8aefaddfa [FIX] Re-enabling tests for hr_evaluation 
bzr revid: rim@openerp.com-20140304142916-1jgu51t8mdmm00xz
 2014-03-04 15:29:16 +01:00
Richard Mathot (OpenERP) ef7a23ad27 [REM] bye bye vim 
bzr revid: rim@openerp.com-20140304142341-xav2selw1nmozeyf
 2014-03-04 15:23:41 +01:00
Richard Mathot (OpenERP) c6689f4a1a [REM] Outdated test 
bzr revid: rim@openerp.com-20140304135950-of0ohkn5a84xfa8h
 2014-03-04 14:59:50 +01:00
Richard Mathot (OpenERP) b8ccde9318 [FIX] Reenabling tests for hr_recruitment 
bzr revid: rim@openerp.com-20140304135923-32nr8uw1vu4vvqxt
 2014-03-04 14:59:23 +01:00
Josse Colpaert 93d8da8dca [IMP] Put move_lines remaining quantity in dictionary instead + start profiling 
bzr revid: jco@openerp.com-20140304135429-xhk5uf68xz5f23q5
 2014-03-04 14:54:29 +01:00
Xavier Morel 8ab5f3979b [ADD] deduplication of website images being uploaded 
There is a deduplication in ir.attachment, but it's only for FS-stored content
*and* it only deduplicates storage not models (as there are access rights
issues involved).
  
The goal here is to always return the same attachment when a user uploads the
exact same image multiple times (because it's simpler or whatever).
  
Initially tried to use a binary field & digest(), but search() blows up
because it tries to utf-8 encode raw binary data. So use char & hexdigest
instead.
  
_compute_checksum returns None if the provided attachment data does not look
like a website image attachment.
  
Unhandled: multiple existing matches, maybe a UNIQUE constraint on the
checksum field would be a good idea just in case.

cherrypicked from saas-3's xmo@openerp.com-20140303153855-5f2l8v0jq2mgb26f
which had to be backed out (as the patch adds a new stored field)

bzr revid: xmo@openerp.com-20140304133117-r88p9zl2tc9tsh75
 2014-03-04 14:31:17 +01:00
Martin Trigaux 3ad670c91d [IMP] Upgrade underscore.js from version 1.3.1 to 1.6.0 and underscore.string.js from version 1.2.0 to 2.3.0 
bzr revid: mat@openerp.com-20140304132825-lbzcwihkb1fkembz
 2014-03-04 14:28:25 +01:00
Paramjit Singh Sahota 2331b14f57 [UPDATE] Updated the cleditor lib from v1.3.0 to v1.4.4 to fix the INTERNET EXPLORER issues. 
bzr revid: psa@tinyerp.com-20140304132534-8dyuusqda5vsdcit
 2014-03-04 18:55:34 +05:30
Xavier Morel a0feb7c3c9 [REV] backout xmo@openerp.com-20140303153855-5f2l8v0jq2mgb26f, schemas should not be altered in saas-3 
bzr revid: xmo@openerp.com-20140304132101-qysq310wp1oo859n
 2014-03-04 14:21:01 +01:00
Richard Mathot (OpenERP) ea2fd36ba3 [FIX] Security rules for 'hr_evaluation' according to new objects in 'survey' 
bzr revid: rim@openerp.com-20140304131016-e14dyu4fszv1jls8
 2014-03-04 14:10:16 +01:00
Randhir Mayatra (OpenERP) e4cb538cf1 [IMP] remove list view from member analysis report 
bzr revid: rajmyt@gmail.com-20140304130727-heez8ub1x4jq4dxw
 2014-03-04 18:37:27 +05:30
Martin Trigaux 7bb95a4468 Update undescore.js to version 1.6 and underscore.string.js to version 2.3 
bzr revid: mat@openerp.com-20140304125528-97w5kbv3ry028kn9
 2014-03-04 13:55:28 +01:00
Turkesh Patel (Open ERP) 09c005df51 [IMP] improved code to show url instead of id use slug. 
bzr revid: tpa@tinyerp.com-20140304125350-zib1hxzvq1lr9bky
 2014-03-04 18:23:50 +05:30
Turkesh Patel (Open ERP) 5471b1ba96 [IMP] improved code to add forum from top menu 'Content', remove static id of below link, show only related questions per forum 
bzr revid: tpa@tinyerp.com-20140304124002-otl1wn10c6qcggbs
 2014-03-04 18:10:02 +05:30
Randhir Mayatra (OpenERP) 84ed653322 [IMP] remove tree view from task_hours_per_month report 
bzr revid: rajmyt@gmail.com-20140304122931-ektojfe9yvlxeiba
 2014-03-04 17:59:31 +05:30
Darshan Kalola (OpenERP) 16f358d9e2 [IMP]]hide the link add a new column,edit and delete in kanban if the user has not the right to do it. 
bzr revid: dka@tinyerp.com-20140304122148-732fgfqmbpi8cpol
 2014-03-04 17:51:48 +05:30
Denis Ledoux 179de3702c [REVERT] partial revert dle@openerp.com-20140304113407-b2kku1xolvkceqcg, distraction error, left pudb 
bzr revid: dle@openerp.com-20140304115413-tjwpni7ssqpl7yis
 2014-03-04 12:54:13 +01:00
Thibault Delavallée db93656f10 [FIX] res_users: change password wizard: fixed crash when submitting the form. 
Indeed unlinking wizard content before actually closing it seems to
cause a crash. Instead of unlinking lines with user - password data
we now write a void value on the new password. The stored content
does not contain valuable data after submitting the form.

bzr revid: tde@openerp.com-20140304115017-posdyri9y1cra4jo
 2014-03-04 12:50:17 +01:00
Denis Ledoux 5db57a21a2 [FIX]stock: in fill inventory wizard, set raise-exception to False in context to avoid having error saying that the product uom category is different: this button is just a tool to help filling the inventory. Anyway, If it should pop the error, it should be on the validation, not in the button to auto-fill the inventory. 
bzr revid: dle@openerp.com-20140304113407-b2kku1xolvkceqcg
 2014-03-04 12:34:07 +01:00
Rifakat 5d2e59e5e4 [FIX] hr_payroll_account: used float_compare() instead of direct comparing between two floats to avoid python rounding 
bzr revid: rha@tinyerp.com-20140304113117-smy5gb9e92lcuji8
 2014-03-04 17:01:17 +05:30
Thibault Delavallée db2bdee343 MERGE] [FIX] email_template: fix relative -> absolute url conversion 
Local URLs are converted into absolute URLs, notably because when using the
email designer, images are added using local URLs. Previously to this fix
the template was analyzed to find local URLs and make them absolute.
However this causes 2 issues :
- mako-based URLs are broken because a scheme is added before the mako that
generated the image src
- when changing the base url, the templates are not updated
The URLs are now converted dynamically when generating the content of the
html. This is done by passing a new parameter that enable the post processing
of the generated content.
Also fixed double body generation when using templates; fields parameter
was not propagated correctly.

bzr revid: tde@openerp.com-20140304112957-l9b10gyjqphs5fgc
 2014-03-04 12:29:57 +01:00
Thibault Delavallée d6aeff2989 [FIX] res_users: fixed on_change_login that crashed 
when changing the login by a void value.

bzr revid: tde@openerp.com-20140304111452-np9537a3ja7vf1zi
 2014-03-04 12:14:52 +01:00
Xavier Morel e78a3b18cc [ADD] tentative removal of attachments 
Attachments ought be removed only if they are not used in an existing page/web
view.

Theoretically this could be set directly in unlink(), but:
* that would make a nice error message significantly harder
* the expenses of performing a text search in all view archs would be a bit expensive

Notes:
* the views set could be reduced to only "web" views
* the search is likely sensible to false negatives e.g. different order of
  query parameters. It *will* remove images still being used.

bzr revid: xmo@openerp.com-20140304110716-u14w6uo8fbkfa42i
 2014-03-04 12:07:16 +01:00
Mohammed Shekha (OpenERP) f29f1e6f04 [FIX]Fixed the issue of o2m sorting by column, m2o field does not give proper result for sorting because whole value of m2o [id, value] going to compare for sorting. 
bzr revid: msh@openerp.com-20140304110659-4uu38feetsjj0tt5
 2014-03-04 16:36:59 +05:30
Darshan Kalola (OpenERP) 48388c9ad4 [MERGE]lp:~openerp-dev/openerp-web/trunk-project-task-stage-access-rights-ima. 
bzr revid: dka@tinyerp.com-20140304104959-nssm8gbgubea03eq
 2014-03-04 16:19:59 +05:30
Turkesh Patel (Open ERP) 782b4acaf3 [IMP] improved url's and controller in order to represent forum as multi-forum 
bzr revid: tpa@tinyerp.com-20140304104930-5tk6upw78pu2egos
 2014-03-04 16:19:30 +05:30
Denis Ledoux 257df67d32 [FIX]stock: in fill inventory wizard, set raise-exception to False in context to avoid having error saying that the product uom category is different: this button is just a tool to help filling the inventory. Anyway, If it should pop the error, it should be on the validation, not in the button to auto-fill the inventory. 
bzr revid: dle@openerp.com-20140304104603-5y9rz8onsxdr43dp
 2014-03-04 11:46:03 +01:00
Darshan Kalola (OpenERP) 38cdfeea45 [MERGE]lp:~openerp-dev/openobject-addons/trunk-project-task-stage-access-rights-ima. 
bzr revid: dka@tinyerp.com-20140304104455-59i5ung1mia3v1um
 2014-03-04 16:14:55 +05:30
Randhir Mayatra (OpenERP) 9b74e8054e [IMP] remove fleet dashboard 
bzr revid: rajmyt@gmail.com-20140304095057-3i12fqxqz673z6i8
 2014-03-04 15:20:57 +05:30
Richard Mathot (OpenERP) 485d6c0092 [WIP] Temporarily disabling of tests in hr_evaluation and hr_recruitment 
bzr revid: rim@openerp.com-20140304094533-gaft7rx3581snefg
 2014-03-04 10:45:33 +01:00
Randhir Mayatra (OpenERP) d7be87bf40 [MERGE] merge with branch: trunk-remove-dashboards-tpa-sale-ssh 
bzr revid: rajmyt@gmail.com-20140304094217-rb3ii19mugbd2ul0
 2014-03-04 15:12:17 +05:30
Josse Colpaert 71ae87d5be [MERGE] Merge from trunk-wms 
bzr revid: jco@openerp.com-20140304093342-59s3t9mv2su060vh
 2014-03-04 10:33:42 +01:00
Olivier Dony 4641a23d14 [FIX] server.stop: avoid traceback during shutdown if HTTP service never started (e.g. because address was already in use) 
bzr revid: odo@openerp.com-20140304093240-0yfoe3s0xz0u0xv9
 2014-03-04 10:32:40 +01:00
Cedric Snauwaert 992408c79f [MERGE]merge with trunk-wms-loconop-jco 
bzr revid: csn@openerp.com-20140304092418-ehpfvpx3hb7uq13n
 2014-03-04 10:24:18 +01:00
Cedric Snauwaert b65690d6e1 [MERGE]merge with latest trunk-wms 
bzr revid: csn@openerp.com-20140304092153-s2gebsi21pm8ngyg
 2014-03-04 10:21:53 +01:00