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
Kersten Jeremy 4ec292eae9 [MERGE] Fix bug in send_mail_to_attendee of calendar where we passed browse_list and not dict(ids), typo controller calendarr PEP8 
bzr revid: jke@openerp.com-20140225173808-60stzxubljuambd4
 2014-02-25 18:38:08 +01:00
Kersten Jeremy 27380e6f3a [MERGE] Merge with saas-3-calendar-jke. - Fix filters 
bzr revid: jke@openerp.com-20140225173055-01uouh0prhyni3i0
 2014-02-25 18:30:55 +01:00
Kersten Jeremy 8b927d7d1c [FIX] fix bug in send_mail_to_attendee of calendar where we passed browse_list and not dict(ids), typo controller calendarr PEP8 
bzr revid: jke@openerp.com-20140225165859-1vyjtirgjmbhoij4
 2014-02-25 17:58:59 +01:00
Christophe Matthieu a22379520c [FIX] website: error managment in ace editor for ie9 
bzr revid: chm@openerp.com-20140225165720-c451gumsd5mce5ya
 2014-02-25 17:57:20 +01:00
Xavier Morel cdc83a0763 [FIX] dataset.read_ids should always return records in the order of the parameter ids 
BufferedDataSet.read_ids assumes the input and output orders are the same, and
returns wonky results when not the case, which in turns fucks up its cache as
it associates ids and records incorrectly.

bzr revid: xmo@openerp.com-20140225162813-8ofxpiy1012eehgk
 2014-02-25 17:28:13 +01:00
Josse Colpaert f39d00a5ed [IMP] Do picking assign in group at the end of confirming all procurements for a sales order 
bzr revid: jco@openerp.com-20140225162211-7elk2pj4r8q8sx04
 2014-02-25 17:22:11 +01:00
Christophe Matthieu 1e2a5ddfa6 [FIX] website: fix for ie: add bootstrap class in website_sale and bind click for editor 
bzr revid: chm@openerp.com-20140225162136-5xdt7n498qxf9myw
 2014-02-25 17:21:36 +01:00
Kersten Jeremy 02835ebdbd [REF] Refactoring all filters. Now, calendar remember if the filter is checked between each do_search and event_source refresh 
bzr revid: jke@openerp.com-20140225154137-45tr7l50xlceom2b
 2014-02-25 16:41:37 +01:00
Kersten Jeremy 50c3d34a8e [FIX] Transform get_default_options of calendar into a function, to be instancied after date.js 
bzr revid: jke@openerp.com-20140225153926-ltwubk1sxfi3heuv
 2014-02-25 16:39:26 +01:00
Simon Lejeune 258c8b5ee5 [FIX] type in the import of the reset stylesheet 
bzr revid: sle@openerp.com-20140225144407-li218a3ppz4f8y7z
 2014-02-25 15:44:07 +01:00
Gery Debongnie 47340431f9 [FIX] fixes the tooltip position in chart mode (graph view). The position was wrong because the parent position was not 'relative'. (addon web_graph) 
bzr revid: ged@openerp.com-20140225141623-cawr7yur38zhjcz4
 2014-02-25 15:16:23 +01:00
Christophe Matthieu 77c484351c [FIX] website_sale: import test_ui 
bzr revid: chm@openerp.com-20140225135100-l526befjiyhnv5gp
 2014-02-25 14:51:00 +01:00
Sunil Sharma (OpenERP) afcea6e7bb [IMP]:improve static value to dynmaic value for user detail 
bzr revid: sunilsharma.sharma07@gmail.com-20140225132954-aw8quoloxv8vvhfc
 2014-02-25 18:59:54 +05:30
Josse Colpaert 593b812712 [IMP] When moving quants, do all the writes on the quants at once 
bzr revid: jco@openerp.com-20140225132939-c6dzv60sncsps19l
 2014-02-25 14:29:39 +01:00
Christophe Matthieu e886b5dd71 [MERGE] from trunk 
bzr revid: chm@openerp.com-20140225130638-c8mql44hwo340fg2
 2014-02-25 14:06:38 +01:00
Christophe Matthieu 8f7c96d5be [REM] website_event_sale: remove sale_order.py 
bzr revid: chm@openerp.com-20140225130201-3fu69q8tsbb9fdbu
 2014-02-25 14:02:01 +01:00
Christophe Matthieu 07b5cb38a0 [IMP] website_sale: refactoring: website_event_sale: fix for refactoring 
bzr revid: chm@openerp.com-20140225125736-dni507i8xpz1b61j
 2014-02-25 13:57:36 +01:00
Turkesh Patel (Open ERP) 255fa088bc [IMP] show ckeditor with basic toolbar. 
bzr revid: tpa@tinyerp.com-20140225124446-j95p74ln0kfd65j3
 2014-02-25 18:14:46 +05:30
ajay javiya (OpenERP) 5502781f34 [IMP] : page transition like medium 
bzr revid: aja@tinyerp.com-20140225105921-iz23qy6scmgz2tgo
 2014-02-25 16:29:21 +05:30
Fabien Meghazi 5da9305bf5 [MERGE] upstream 
bzr revid: fme@openerp.com-20140225105045-9t4a443nq0lw55qu
 2014-02-25 11:50:45 +01:00
Fabien Meghazi 35a7182893 [MERGE] upstream 
bzr revid: fme@openerp.com-20140225104654-d1ni7z5t8w0qc7mw
 2014-02-25 11:46:54 +01:00
Turkesh Patel (Open ERP) 5eb0e93eb3 [IMP] improved templates. 
bzr revid: tpa@tinyerp.com-20140225104242-zuf5v70jqpgm60tf
 2014-02-25 16:12:42 +05:30
Gery Debongnie fed81544ad [IMP] optimizes graph view to avoid reloading data in some cases (such as removing a filter from the search view) (addon web_graph) 
bzr revid: ged@openerp.com-20140225104233-zidrw03dh2hlwrng
 2014-02-25 11:42:33 +01:00
Gery Debongnie 02b70e2950 [FIX] fixes problems due to the preceding merge (resolved conflict was not properly resolved) (addon web_graph) 
bzr revid: ged@openerp.com-20140225103155-9cdbs8p79sa7hkwi
 2014-02-25 11:31:55 +01:00
Christophe Simonis 0123c51997 [FIX] crm: lead to opportunity convertion: pass id instead of browse record object 
bzr revid: chs@openerp.com-20140225102830-1za1ei2xlr1oc4nv
 2014-02-25 11:28:30 +01:00
Xavier Morel 750b9f405c [FIX] tags edition breakage in website_event_track 
* remove some nodes from the $editables set, ``li`` really does not like being
  widgetified. Remove a few others just in case

* split fa outside of li to make it safely (ish) editable

* simplify upcast function for icons cke widget

bzr revid: xmo@openerp.com-20140225131228-2m75itgi4zbj5xfh
 2014-02-25 14:12:28 +01:00
Olivier Dony 4572ea9ef3 [FIX] website_event_track: employees should not be restricted to public events only 
Also switched rule to noupdate. A manual fix of existing installations
will be necessary, as is usually the case for ir.rules changes.
This module has not made it into a LTS version yet, so it is acceptable.
+ Added a _description for the event.track model to avoid it being
replaced by inherited descriptions.

bzr revid: odo@openerp.com-20140225115742-ghnt3khn6hvycnnw
 2014-02-25 12:57:42 +01:00
Xavier Morel a67cd4c049 [FIX] t-ignore should remove injected sub-view branding below the ignore flag 
bzr revid: xmo@openerp.com-20140225114706-j8q44cubs59tuwby
 2014-02-25 12:47:06 +01:00
Frédéric van der Essen a949f024a1 [MERGE] point_of_sale: fixing duplicated orders, fixing crash when selling goods with lot tracking, accept ean13 barcodes with a stripped leading zero 
bzr revid: fva@openerp.com-20140225110142-oklvhmvh79u9ymuv
 2014-02-25 12:01:42 +01:00
Xavier Morel 1b2be9be76 [IMP] unbrand t-raw and t-esc as keeping them branded makes very little sense 
they can't be edited in any situation

bzr revid: xmo@openerp.com-20140225110046-90rdevm13pp4m51s
 2014-02-25 12:00:46 +01:00
Frédéric van der Essen 009451f1dc [MERGE] from upstream 
bzr revid: fva@openerp.com-20140225105924-1r2c9ha7703zlfxz
 2014-02-25 11:59:24 +01:00
Christophe Matthieu a5ca54fd5b [IMP] website_sale: fixed and refactored until shop/payment 
bzr revid: chm@openerp.com-20140225100934-74v930kb4suxb9x4
 2014-02-25 11:09:34 +01:00
Turkesh Patel (Open ERP) b5abfdcc71 [ADD] add template to post answer and improved demo data of answers. 
bzr revid: tpa@tinyerp.com-20140225095845-swmojhdo31t871pp
 2014-02-25 15:28:45 +05:30
Thibault Delavallée bb795e929d [FIX] mail: fixed sign-in URL in notification emails, use the new web/login controller introduced in saas-3. 
bzr revid: tde@openerp.com-20140225095054-kswinebsgsj5fex1
 2014-02-25 10:50:54 +01:00
Fabien Meghazi 434f100fb8 [MERGE] upstream 
bzr revid: fme@openerp.com-20140225094914-419sm2gji3kiq2e2
 2014-02-25 10:49:14 +01:00
Turkesh Patel (Open ERP) 837a43926e [ADD] add template to ask qestion and relatedd code. 
bzr revid: tpa@tinyerp.com-20140225093418-xab0yv4tqz4yx0u2
 2014-02-25 15:04:18 +05:30
Richard Mathot (OpenERP) ee51fc0ca6 [MERGE] Sync with trunk 
bzr revid: rim@openerp.com-20140225093040-6k4kmj93uo2bk6t9
 2014-02-25 10:30:40 +01:00
Xavier Morel cf702eb1c6 [IMP] in view tests, replace tostring() and string comparisons by custom lxml.etree comparator 
bzr revid: xmo@openerp.com-20140225092842-sc6whhm173azurtt
 2014-02-25 10:28:42 +01:00
Parth Gajjar (Open ERP) 7c686feaee [ADD] added country flags in res.country 
bzr revid: pga@tinyerp.com-20140225091358-475bxx2z9ipahjw1
 2014-02-25 14:43:58 +05:30
Gery Debongnie 893b7041f9 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140225091310-pzkj5ip17esl52kz
 2014-02-25 10:13:10 +01:00
Simon Lejeune 531ab41957 [MERGE] trunk 
bzr revid: sle@openerp.com-20140225091121-3cuuiofh2zt923p0
 2014-02-25 10:11:21 +01:00
Thibault Delavallée 700bbfcce1 [FIX] mail_thread: when reading subscription data, add a protection 
against not planned subtype data (coming from error in subtype relationship
table, or for undisplayed subtypes, old subtypes, ...).

bzr revid: tde@openerp.com-20140225090637-mnztroc05nk7l2sl
 2014-02-25 10:06:37 +01:00
Fabien Meghazi 2ab61cf001 [IMP] Rename request.httprequest.session -> request.session 
bzr revid: fme@openerp.com-20140225090506-4rnku48yg7ruvv8p
 2014-02-25 10:05:06 +01:00
Gery Debongnie 956b73998c [FIX] fixes various problems with the search bar integration with the graph view. Now, the code correctly computes the group_bys and col_groupbys contained in the various filters in the search bar (addon web_graph) 
bzr revid: ged@openerp.com-20140225090349-z6udsjn0cjafu0lt
 2014-02-25 10:03:49 +01:00
Chirag Dodiya (OpenERP) dbc6a8368d [MRG]Merge with trunk 
bzr revid: cod@tinyerp.com-20140225083944-abbn3m7e5c26crk1
 2014-02-25 14:09:44 +05:30
Turkesh Patel (Open ERP) 615d5c4ab8 [IMP] improved code to add search functionality 
bzr revid: tpa@tinyerp.com-20140225072356-v4sizgc1yn3mv3pl
 2014-02-25 12:53:56 +05:30
Chirag Dodiya (OpenERP) 47fa47e23b [MRG]Merge with trunk 
bzr revid: cod@tinyerp.com-20140225072331-xzbo2aedsk2te98n
 2014-02-25 12:53:31 +05:30
Launchpad Translations on behalf of openerp eaa20f9586 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225060535-e6jwphbnlp4q2vc6
 2014-02-25 06:05:35 +00:00
Mahendra Barad (OpenERP) 21c93eddf4 [IMP]arrow scroll on cover 
bzr revid: mba@tinyerp.com-20140225053329-fbmtjvgjwghj978n
 2014-02-25 11:03:29 +05:30
Dharmraj Jhala (OpenERP) c6917b9c07 [MERGE] with trunk-survey2-rim addons branch 
bzr revid: dizzy.zala@gmail.com-20140225053204-mra08nfvumkxyixa
 2014-02-25 11:02:04 +05:30