pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,391 Commits 1 Branch 0 Tags
92b8aafe97d94deacb06b37503a05d80b25dbba8
Commit Graph
81391 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric van der Essen cd1fe5b566 remove custom input background 
bzr revid: fva@openerp.com-20130731082117-r1qzq4b3mkcet2nl
 2013-07-31 10:21:17 +02:00
Frédéric van der Essen 723da9a65d [MERGE] quick fixes for the shopping cart display 
bzr revid: fva@openerp.com-20130731081359-xx2nrwzgl96eiztq
 2013-07-31 10:13:59 +02:00
Frédéric van der Essen b358db5228 [MERGE] from upstream 
bzr revid: fva@openerp.com-20130731081328-g6xnaaugia3866cn
 2013-07-31 10:13:28 +02:00
Frédéric van der Essen 1a0976a764 quick fix for the shopping cart display 
bzr revid: fva@openerp.com-20130731081304-1j2p1o13e061ka1q
 2013-07-31 10:13:04 +02:00
Christophe Matthieu 140132c58f [FIX] qweb.py: html rendering 
bzr revid: chm@openerp.com-20130731080913-aev9gz72vyev9ryj
 2013-07-31 10:09:13 +02:00
Frédéric van der Essen d5bc41ad3c [MERGE] making the editor top bar the same height as the openerp topbar 
bzr revid: fva@openerp.com-20130731075820-8mp2a2rec44bv29u
 2013-07-31 09:58:20 +02:00
Frédéric van der Essen 67051c3be5 [MERGE] from upstream 
bzr revid: fva@openerp.com-20130731075741-6bs9qdslevxzeesd
 2013-07-31 09:57:41 +02:00
Xavier Morel 7a12d33498 [FIX] whitelist section, header and footer for edition 
bzr revid: xmo@openerp.com-20130731075635-wr3tdl2p12j34cmw
 2013-07-31 09:56:35 +02:00
Frédéric van der Essen 3e373984a4 making the editor bar the same height as the rest of openerp 
bzr revid: fva@openerp.com-20130731075611-lurg5zye995r9te7
 2013-07-31 09:56:11 +02:00
Frédéric van der Essen 2ab528a07f [MERGE] fixing the navbar edition 
bzr revid: fva@openerp.com-20130731075016-pt1xzxm2zo3sjafu
 2013-07-31 09:50:16 +02:00
Frédéric van der Essen 7f8aacf82c [MERGE] from upstream 
bzr revid: fva@openerp.com-20130731074933-sd1ngn65e0jusqww
 2013-07-31 09:49:33 +02:00
Frédéric van der Essen dc7230517d temporary fix for p insertion in menu edition 
bzr revid: fva@openerp.com-20130731074859-q55bbgqtrd3xsbqs
 2013-07-31 09:48:59 +02:00
Antony Lesuisse d616e2d5fe m 
bzr revid: al@openerp.com-20130731074829-koml85g6ofa9r1c0
 2013-07-31 09:48:29 +02:00
Frédéric van der Essen 90787f3e41 [MERGE] banner insertion fixes 
bzr revid: fva@openerp.com-20130731074348-m52hhdl1o553450k
 2013-07-31 09:43:48 +02:00
Frédéric van der Essen e7b14ae02e fix banner insertion 
bzr revid: fva@openerp.com-20130731074313-taa1d02lyc9tyz4a
 2013-07-31 09:43:13 +02:00
Frédéric van der Essen 6cea820069 [MERGE] banner fixes 
bzr revid: fva@openerp.com-20130731073912-xiik792senjqa2ey
 2013-07-31 09:39:12 +02:00
Frédéric van der Essen b5f4f5b3d0 fixing the banner 
bzr revid: fva@openerp.com-20130731073548-g51heju7xpinmysq
 2013-07-31 09:35:48 +02:00
Frédéric van der Essen 5efbd1568f [MERGE] from upstream 
bzr revid: fva@openerp.com-20130731072956-zwoqfaqigm32x6v3
 2013-07-31 09:29:56 +02:00
Olivier Dony cf9d7aaa5f [MERGE] Forward-port of latest bugfixes from 7.0 up to rev 4007 (launchpad_translations_on_behalf_of_openerp-20130730045810-58du4wi80axs0t81) 
bzr revid: dle@openerp.com-20130627115936-iw2x6yjejabkc8ys
bzr revid: chs@openerp.com-20130702141958-zxkppo4c6zvpo0uf
bzr revid: odo@openerp.com-20130731072914-0uk62hnao5x502hh
 2013-07-31 09:29:14 +02:00
Launchpad Translations on behalf of openerp 49b1952180 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130731060956-vxbj0r9l9pzvfivu
 2013-07-31 06:09:56 +00:00
ajay javiya (OpenERP) 8c816485e6 [MERGE]: with trunk 
bzr revid: aja@tinyerp.com-20130731051559-zo5hz9bmx5yxpu4o
 2013-07-31 10:45:59 +05:30
Frédéric van der Essen a6dbff10d1 [MERGE] first run of bootstrapification on the cms modules 
bzr revid: fva@openerp.com-20130730185157-q9mwmgnf8o3tqpa0
 2013-07-30 20:51:57 +02:00
Frédéric van der Essen 7a89ee8d68 [MERGE] from upstream 
bzr revid: fva@openerp.com-20130730184923-at0b7xbs9gc50g10
 2013-07-30 20:49:23 +02:00
Frédéric van der Essen a26d3cdbae styling improvements on ecommerce and blog 
bzr revid: fva@openerp.com-20130730182433-33t3ggw722usd82w
 2013-07-30 20:24:33 +02:00
Frédéric van der Essen 21cbfa2828 put back snippets.css and homepage fixes 
bzr revid: fva@openerp.com-20130730161834-r71km6nl6f59fmr6
 2013-07-30 18:18:34 +02:00
Frédéric van der Essen 195ebf72d0 replacing css madness by bootstrap, homepage is mostly ok, ecommerce is broken 
bzr revid: fva@openerp.com-20130730160317-j5aj1ktxt3u5rlyf
 2013-07-30 18:03:17 +02:00
Christophe Matthieu 5d90e20f8b [FIX] website: error on click on Edit button. Fix: filter not(data-oe-type). xmo 
bzr revid: chm@openerp.com-20130730152856-du26nlnqjd4evulg
 2013-07-30 17:28:56 +02:00
Xavier Morel 9b49dfb46a [FIX] RTE on links and 'correct' enabling of save button 
bzr revid: xmo@openerp.com-20130730151544-m3ggaaoyckvhos65
 2013-07-30 17:15:44 +02:00
Christophe Matthieu 4c1760cdf5 [IMP] website_crm: fix dom error (todo: fix parser) 
bzr revid: chm@openerp.com-20130730151428-3i42sln7zxm31mit
 2013-07-30 17:14:28 +02:00
Xavier Morel 4d41a7f389 [FIX] add event handlers on non-rte contenteditables to trigger enabling of save button, fixup filters 
bzr revid: xmo@openerp.com-20130730150955-ttqovqamexqtd8r9
 2013-07-30 17:09:55 +02:00
Christophe Matthieu 443129ca7a [IMP] qweb: fix for many2one with None value 
bzr revid: chm@openerp.com-20130730150905-9qh0y5geug9uz2v9
 2013-07-30 17:09:05 +02:00
Martin Trigaux ce11369083 [FIX] mrp: don't see produce button if don't have necessary quantity 
lp bug: https://launchpad.net/bugs/1181168 fixed

bzr revid: mat@openerp.com-20130730150747-9yhd6xt0k7nhadbu
 2013-07-30 17:07:47 +02:00
Christophe Matthieu cd076c1c9a [IMP] website: contactus 
bzr revid: chm@openerp.com-20130730150725-iinv39k9krjh3cl0
 2013-07-30 17:07:25 +02:00
Christophe Matthieu 327f943c45 [IMP] website: carousel image bg 
bzr revid: chm@openerp.com-20130730144252-grypnxx2urswvzb6
 2013-07-30 16:42:52 +02:00
Christophe Matthieu 1d0af41f61 [IMP] website: carousel 
bzr revid: chm@openerp.com-20130730143643-1itg8hhwuchnb5k3
 2013-07-30 16:36:43 +02:00
Turkesh Patel (Open ERP) 9010169be2 [IMP] sale_crm: improved filter in search view 
bzr revid: tpa@tinyerp.com-20130730132539-zgh8y85sz83ly5bt
 2013-07-30 18:55:39 +05:30
Mansi Kariya (OpenERP Trainee) 497ba7dab9 [IMP] purchases Configuration menus location and name changed 
bzr revid: mansi.mk.179@gmail.com-20130730114745-o2xzb0h63ze29stq
 2013-07-30 17:17:45 +05:30
Olivier Dony d2ce7b4120 [FIX] ir.model: during creation of custom models, the _auto_init call should also take care of custom fields created on-the-fly 
The _auto_init call in ir.model.fields creation will not
do it because it happens before the insertion of the model
in the registry. It will only work for later addition of
fields.

bzr revid: odo@openerp.com-20130730114645-185kbupcrbtnv1tf
 2013-07-30 13:46:45 +02:00
Martin Trigaux 6fcd169b52 [FIX] report: force encoding of dateformat string 
some locales have unicode into the date format (eg: zh_CN uses %Y年%m月%d日)
conversion using str() would not work for them
opw #593932

bzr revid: mat@openerp.com-20130730125534-77hfb2k6z7epbhsv
 2013-07-30 14:55:34 +02:00
Turkesh Patel (Open ERP) e72bd73750 [MRG] merge with lp:openobject-addons 
bzr revid: tpa@tinyerp.com-20130730113423-2try697gn838swrr
 2013-07-30 17:04:23 +05:30
Turkesh Patel (Open ERP) 4a826985a2 [IMP] improved code to show Lead(s) insted of Leads and make it traslatable also 
bzr revid: tpa@tinyerp.com-20130730113059-03mvlq21b3dlzknz
 2013-07-30 17:00:59 +05:30
bth-openerp d7322de797 [IMP]Add job postion for career. 
bzr revid: bth@tinyerp.com-20130730111910-1ahiibbeec601q2b
 2013-07-30 16:49:10 +05:30
Turkesh Patel (Open ERP) 14522ba8a8 [IMP] improved code to show only paid invoices on click action of graph 
bzr revid: tpa@tinyerp.com-20130730111337-nw7s9i2dad7s4o7k
 2013-07-30 16:43:37 +05:30
Turkesh Patel (Open ERP) eb700cf29b [IMP] Added company_id and currency_symbole field and improved related code to show tooltip as per requrement and 5 sec late,improved css to show proper cursore, improved actions & domains for proper results. 
bzr revid: tpa@tinyerp.com-20130730110822-zzioh92in4azqay8
 2013-07-30 16:38:22 +05:30
Christophe Matthieu 3c7fb776c8 [IMP] website home page: add banner with boostrap carousel 
bzr revid: chm@openerp.com-20130730103213-4nst7sqqcz3lzir5
 2013-07-30 12:32:13 +02:00
Xavier Morel 2a0dc6af7a [ADD] quote, text justification, list indent/outdent 
todo: really need contextual conditions on buttons

bzr revid: xmo@openerp.com-20130730094320-n352j55bo7bs3ubj
 2013-07-30 11:43:20 +02:00
Olivier Dony cf666e2d78 [FIX] account: paypal url generation should not crash for draft invoices that have no number yet 
bzr revid: odo@openerp.com-20130730091643-27iwpblnjgjc8a2j
 2013-07-30 11:16:43 +02:00
Christophe Matthieu 781ae74c18 [IMP] website_mail: button add a new blog; link on header and footer 
bzr revid: chm@openerp.com-20130730085027-beo81wr0ru1m6q2d
 2013-07-30 10:50:27 +02:00
Martin Trigaux 63b2e2c44c [FIX] base_calendar: don't compute reccuring events if reccurency checkbox is disabled 
bzr revid: mat@openerp.com-20130730081409-d84sz1e1w2201yqr
 2013-07-30 10:14:09 +02:00
Darshan Kalola 4c65325522 [MERGE]merged with main addons 
bzr revid: darshankalola@gmail.com-20130730053015-j7wo4azxls8ciryz
 2013-07-30 11:00:15 +05:30