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
Simon Lejeune fc915a6a46 [MERGE] hr* reports converted to QWeb 
bzr revid: sle@openerp.com-20140416141049-5pjrbaup5wjh9ey0
 2014-04-16 16:10:49 +02:00
chm@openerp.com fafeaff7db [IMP] website_crm: designer can add input type file in form view. All files create an ir.attachment linked with the created lead 
bzr revid: chm@openerp.com-20140416140610-wdox1ovzgm90ebh1
 2014-04-16 16:06:10 +02:00
Simon Lejeune a7ebd63387 [MERGE] trunk 
bzr revid: sle@openerp.com-20140416140503-cq7atc8f1mwq3ond
 2014-04-16 16:05:03 +02:00
Cedric Snauwaert 37fab3d03d [FIX]few errors 
bzr revid: csn@openerp.com-20140416134655-1e4q8e8i30qj9y7t
 2014-04-16 15:46:55 +02:00
Thibault Delavallée cbd17e3a9f [FIX] char_domain widget: better use of options to compute the model in which 
we want to select records.

bzr revid: tde@openerp.com-20140416133402-k3qjrtieevfxz743
 2014-04-16 15:34:02 +02:00
Martin Trigaux f6a75093b9 [FIX] gamification: add security rule for multicompany (avoid getting error messages on home page when displaying top 3 goals) 
bzr revid: mat@openerp.com-20140416130924-8pyuejefcu7hnzmf
 2014-04-16 15:09:24 +02:00
Thibault Delavallée d344f53a68 [FIX] crm_helpdesk: when creating a new helpdesk category 
it was not possible to re-use the category due to a missing object_id.

lp bug: https://launchpad.net/bugs/1216484 fixed

bzr revid: tde@openerp.com-20140416130804-xfgi8dr5703mr49o
 2014-04-16 15:08:04 +02:00
Thibault Delavallée fdb5200d80 [FIX] crm_todo: usability fix: the lead was not present 
in the task form view, but in the tree view, it is now present in both view when coming from 'my tasks' in crm menu.

lp bug: https://launchpad.net/bugs/1256392 fixed

bzr revid: tde@openerp.com-20140416130356-i3a5pqcib8smdx47
 2014-04-16 15:03:56 +02:00
Thibault Delavallée ade618a63e [IMP] payment: renamed env field to environment, to avoid conflicts 
with the incoming new API.

bzr revid: tde@openerp.com-20140416121055-01ygh1zer7cfv98a
 2014-04-16 14:10:55 +02:00
Cedric Snauwaert b7f3808824 [FIX]modal not correctly destroying from DOM at exit 
bzr revid: csn@openerp.com-20140416120034-sps3a7dc2mgpwfzt
 2014-04-16 14:00:34 +02:00
Thibault Delavallée fef7f9adfd [MERGE] [REF] mass_mailing refactoring. Mass mailing is refactored to be easier to use, introducing an easy-to-use way of handling recipients, mailing lists and statistics. This branch comes with a web branch that introduce the char_domain widget, that is a widget on a char field holding a domain. It allows to select and count records without having to deal with the complexity of domains. 
This branch comes with a cleaning of marketing modules :
- marketing now holds only the basic stuff for marketing related modules: mainly marketing settings + menu definition
- marketing_crm new module is a bridge between crm and marketing and holds the crm-related stuff previously present in marketing module.

This branch also holds some mail and template improvement in order to speedup the mass mailing process. The template edition in website_mail has also be improved. It is now a page that allows to edit email-like content (content with a subject, an email_from and a body), like templates, emails or mass mailing.

Misc :
- mail_compose_message: removed unnecessary fields coming from the template (partner_to, ...) because they are confusing -> composer should be easier to understand and use; also cleaned method generating the email values in the composer that was splitted in two methods
- fixed removed double body computation when using templates (one for template, then the wizard -> not necessary)
- mail_message: record_name is not a function field anymore, but a char field + a method in create, allowing to speedup mass mailing by avoiding browsing all records to get their name

bzr revid: tde@openerp.com-20140416115152-tnitidd4v6w37hyp
 2014-04-16 13:51:52 +02:00
Thibault Delavallée 4f53557311 [MERGE] [ADD] web: form: added FieldCharDomain widget. This widget works on a char field and is used to manage a domain. It allows to select records in a list view and to store the domain in the field, without having to deal with the complexity of writing domains. 
[ADD] web: form: added FieldBarChart widget. This widget works on char field and display a serialized list of values as a barchart. This is used in stat buttons, like percent pie or stat info, to display a summary of some data on form view.

[IMP] web: some fixes and improvements in the stat buttons.

[IMP] web: list view: buttons in list view can now be text button, not only icon-based buttons. Icons are so v6 and not swag.

bzr revid: tde@openerp.com-20140416114938-3qsv8b8dumw5x4pj
 2014-04-16 13:49:38 +02:00
Paramjit Singh Sahota be8a180bc5 [ADD] Added a search view for the shopping_cart menu. 2014-04-16 17:09:32 +05:30
Turkesh Patel (Open ERP) 99020f41a6 [IMP] improved code to add TOC from sontents menu, improved code to show topic. 
bzr revid: tpa@tinyerp.com-20140416112707-ks3y10l0ghuunrrk
 2014-04-16 16:57:07 +05:30
Denis Ledoux 3298051016 [FIX] base: search groups by full name not working with operators 'in' nor with operand boolean 
bzr revid: dle@openerp.com-20140416112239-vl20z3xzgp61vygu
 2014-04-16 13:22:39 +02:00
Thibault Delavallée 2fdc1d1905 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140416111721-g2vw6140a3adhk6y
 2014-04-16 13:17:21 +02:00
Thibault Delavallée d264cd1640 [IMP] website_mail: make the template / mail editor work. We now have a limited 
set of fields that we try to edit (body_html and body for body, email_from and email for
email-from, name and subject for subject), because t-field is not dynamic. If the model
that should be edited does not hold those fields, the mail editor won't work.

Also fixed editor not being actiated when going into the body edition.

bzr revid: tde@openerp.com-20140416105901-vavkh9erjsq4mof9
 2014-04-16 12:59:01 +02:00
Barad Mahendra 756e2a56b8 [REV]unwanted changes 
bzr revid: mba@tinyerp.com-20140416105227-nk3q8bq15wwcsgrh
 2014-04-16 16:22:27 +05:30
Turkesh Patel (Open ERP) cd25de6989 [ADD] website_doc: modue based on website_forum to show documentatoin based on questions and best answers. 
bzr revid: tpa@tinyerp.com-20140416105122-2368jv31gy26ek32
 2014-04-16 16:21:22 +05:30
Barad Mahendra a95649e199 [REV]unwanted changes 
bzr revid: mba@tinyerp.com-20140416105120-wp2krz40g026s37n
 2014-04-16 16:21:20 +05:30
Mehul Mehta (OpenERP) 671cbe02e1 [IMP] remove unnecessary reference bcaz which id override on this modules 2014-04-16 15:58:08 +05:30
Cedric Snauwaert 20556abc08 [MERGE]clean and refactored tooltip from branch trunk-tipsy-to-boostrap 
bzr revid: csn@openerp.com-20140416102659-vft9tfuqmax0qx3q
 2014-04-16 12:26:59 +02:00
Richard Mathot (OpenERP) 598d23a4a5 [MERGE] from trunk 
bzr revid: rim@openerp.com-20140416101400-4hvdv1z59sl6zqgw
 2014-04-16 12:14:00 +02:00
Richard Mathot (OpenERP) 871bb07d65 [IMP] Highlight the right answer in MCQ correction mode 
bzr revid: rim@openerp.com-20140416101129-t33z38q7ez0358gh
 2014-04-16 12:11:29 +02:00
Paramjit Singh Sahota 79fb080c0e [REM] REmoveD the shopping cart fliter from the quotations search view bcz itz not need their. 2014-04-16 15:40:52 +05:30
Barad Mahendra 5979488e35 [IMP]imporve dropdown_selection tamplate 
bzr revid: mba@tinyerp.com-20140416095023-hh0dkh837r7team5
 2014-04-16 15:20:23 +05:30
Kersten Jeremy 73bbf079c7 [MERGE] qweb-m2o-view - Allow to use many2one for qweb template (work also with view_id) 
bzr revid: jke@openerp.com-20140416085407-krltmt3jhw802a5c
 2014-04-16 10:54:07 +02:00
Kersten Jeremy ca8b6cc703 [MERGE] Allow to use many2one for qweb template (work also with view_id) 
bzr revid: jke@openerp.com-20140416085136-xxqsqjyie5vtf6f3
 2014-04-16 10:51:36 +02:00
Josse Colpaert 2d1d25b005 [WIP] Correct stock valuation report 
bzr revid: jco@openerp.com-20140416084849-kr0c2h8xqf1bw9vn
 2014-04-16 10:48:49 +02:00
Thibault Delavallée f9b2b667a0 [FIX] email_template: back to partner_ids generation when using templates 
bzr revid: tde@openerp.com-20140416083946-2qlv0liu8doshh9q
 2014-04-16 10:39:46 +02:00
Mohammed Shekha 91930b470d [FIX]Fixed the issue of reference field throws traceback that view is undefined, the reason is that reference field passing DefaultFieldManager while creating instance of many2one widget and DefaultFieldManager is eventually extending instance.web.widget not instance.web.form.FormWidget and hence DefaultFieldmanager will nto having view attribute, instead of calling self.view.do_onchange, trigger changed_value which is going to do the same job. 
bzr revid: msh@tinyerp.com-20140416083857-sug0k4a28nkvgg27
 2014-04-16 14:08:57 +05:30
Kersten Jeremy c4164204b5 [FIX] Website - fix path of script watch.js 
bzr revid: jke@openerp.com-20140416083411-a06k9sbiyda7zmrd
 2014-04-16 10:34:11 +02:00
Thibault Delavallée fe8a745b02 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140416082925-eph1x8vnwj6o31rt
 2014-04-16 10:29:25 +02:00
Kersten Jeremy 40d3ae1e0f [FIX] Record id are not always an integer. It could be a virtual id (str) as in calendar. 
bzr revid: jke@openerp.com-20140416082924-t52pvja4617zpkce
 2014-04-16 10:29:24 +02:00
Thibault Delavallée 482638ab27 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140416082917-lnqc60vm3cid3gl6
 2014-04-16 10:29:17 +02:00
Martin Trigaux 8c8631b233 [FIX] account_anglo_saxon: avoid incorrect conversion while creating invoice in different currency than the one of the company (opw 606408). 
Without this patch the generated entries would use incorrect currencies. The expected result from move_line_get are prices in the currency of the invoice.

bzr revid: mat@openerp.com-20140416082915-555nhsvi8l0mmyxi
 2014-04-16 10:29:15 +02:00
Thibault Delavallée 4336c64a7c [IMP] mail, mass_mailing: using a _mail_mass_mailing class attribute 
it is now possible to compute models allowing mass mailing using mass_mailing_campaign
module. This allows to completely remove the bridges modules, using a more generic
controller for unsubscription.

bzr revid: tde@openerp.com-20140416082851-8duo6yrwr5hwd8c2
 2014-04-16 10:28:51 +02:00
chm@openerp.com 9284bd4817 [FIX] website: tour test inject javascript 
bzr revid: chm@openerp.com-20140416082138-rhwo2tl9l6jrko78
 2014-04-16 10:21:38 +02:00
chm@openerp.com dbe1b81d15 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140416074634-jkcn3ae30q9uqnsi
 2014-04-16 09:46:34 +02:00
Launchpad Translations on behalf of openerp 31a8dfaf43 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140416070627-eneildfcgmfpyjxy
 2014-04-16 07:06:27 +00:00
Mehul Mehta (OpenERP) 7927f34339 [IMP] remove quotation domain in shopping cart state 2014-04-16 11:21:14 +05:30
DJ Patel 7d5b66c526 [REM] stock_landed_costs : Removed the unnecessary code. 
bzr revid: mdi@tinyerp.com-20140416054045-3kyrasl4ixtwcpzi
 2014-04-16 11:10:45 +05:30
Mehul Mehta (OpenERP) 3ef529f1a1 [MERGE] merged with lp:openobject-addons 2014-04-16 10:34:53 +05:30
DJ Patel 4c1a345ad4 [Merge] Merged with trunk. 
bzr revid: mdi@tinyerp.com-20140416043234-ygtv29jxhiq1io0e
 2014-04-16 10:02:34 +05:30
Simon Lejeune 2717e16174 [MERGE] trunk 
bzr revid: sle@openerp.com-20140415112106-6z5u7armjiy72wd5
bzr revid: sle@openerp.com-20140415192321-abzrgi7b757v0lc3
 2014-04-15 21:23:21 +02:00
Simon Lejeune babfb0f78d [IMP] hr* reports converted to qweb 
bzr revid: sle@openerp.com-20140415191911-0rttsd7ayk6exm6u
 2014-04-15 21:19:11 +02:00
Martin Trigaux 09e6d4e7f3 [FIX] mail: mail: convert attachments to binary as it is the expected format of message_post opw 604205 
The double convertion (render_message and send_mail) is done to keep the API but should be changed in next version.

bzr revid: mat@openerp.com-20140415162911-fe3306wn9w258ii7
 2014-04-15 18:29:11 +02:00
Martin Trigaux 3755fa19a5 [IMP] gamification and website_forum improvements 
gamification:
- fix batch mode when grouping by id
- fix subquery in batch mode when a ending date is set
- serialisation method can exclude categories of challenge
- view improvements

website_forum:
- enabling bages in batch mode
- fix karma computation when creating a new post
- changing previous vote affects the user karma
- do not display forum challenges on user home page

bzr revid: mat@openerp.com-20140415162400-78cklbdw0bmn94zr
 2014-04-15 18:24:00 +02:00
Christophe Simonis 15e151dca7 [IMP] orm: postprocess function field values in batch 
bzr revid: chs@openerp.com-20140415162321-l8hgeh6s48252zhl
 2014-04-15 18:23:21 +02:00
Martin Trigaux 0443680952 [FIX] gamification: the subquery domain should use less than for ending dates 
bzr revid: mat@openerp.com-20140415161538-mdfadjjih90wuj3d
 2014-04-15 18:15:38 +02:00