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
Denis Ledoux 58080c6569 [FIX] ir, ir_translation: it was not possible to empty the source of a translation, or this is sometime something that we want 
bzr revid: dle@openerp.com-20131121132305-qjlclgz5v9tze1fr
 2013-11-21 14:23:05 +01:00
Darshan Kalola (OpenERP) d67a267c39 [IMP]solve traceback. 
bzr revid: dka@tinyerp.com-20131121130844-ywqfpx6aza6wuoia
 2013-11-21 18:38:44 +05:30
Christophe Matthieu 07819834bb [FIX] website_sale: filter controller and shop/?category=37 --> shop/category/37 
bzr revid: chm@openerp.com-20131121130529-1zs3ioih5156ceit
 2013-11-21 14:05:29 +01:00
Christophe Matthieu 31f64313c0 [IMP] website snippet: create website.snippet.StyleEditor to add styles with html class and other logical process into snippet options 
bzr revid: chm@openerp.com-20131121123439-wvvcdegvc1bornux
 2013-11-21 13:34:39 +01:00
Darshan Kalola (OpenERP) f19a433dbb [MERGE] with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb and change necessary code. 
bzr revid: dka@tinyerp.com-20131121122311-629hbtetmqfrtfyg
 2013-11-21 17:53:11 +05:30
Xavier Morel a9b228880b [FIX] hacky image edit button to be less hacky, fix image fields edition/save 
bzr revid: xmo@openerp.com-20131121121731-4ux9gxt8ltluw9e5
 2013-11-21 13:17:31 +01:00
Xavier Morel 82b40bf84c [FIX] urlparse.parse_qs returns a dict *of lists*, eq test on values with a string is always false 
bzr revid: xmo@openerp.com-20131121121235-hafy7n61h3v6kb0k
 2013-11-21 13:12:35 +01:00
Thibault Delavallée bc726e4da7 [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20131121120935-srk3s4qhxar0k5l5
 2013-11-21 13:09:35 +01:00
Thibault Delavallée 2693636989 [IMP] website_sale: improved checkout process 
- confirmation is now a page displaying a sale order, which polls on the
related transaction to have its status
- when receiving an incoming notification thorugh the acquirer controller
the sale order is updated, then the confirmation page is displayed
- this allows to have a confirmation page that is independant from the 
rest of the checkout process
- cleaned confirmation page, removed order details

bzr revid: tde@openerp.com-20131121120902-fm8b7u94gmepohgi
 2013-11-21 13:09:02 +01:00
Thibault Delavallée 3ee84c32d2 [IMP] payment_acquirer_transfer: better logging 
bzr revid: tde@openerp.com-20131121120745-1j7p7pl5u6yv1g20
 2013-11-21 13:07:45 +01:00
Thibault Delavallée bfc226c4ae [REM] payment_acquirer: removed name field, only using reference 
bzr revid: tde@openerp.com-20131121120722-uxjqdn5ibnrs0k10
 2013-11-21 13:07:22 +01:00
Christophe Simonis fc9c571bcd [FIX] fleet: inherits reference fields must be required. 
Note: there is no db schema change as orm was forcing these values.

bzr revid: chs@openerp.com-20131121120637-c5ufw20ck30hefr5
 2013-11-21 13:06:37 +01:00
Christophe Simonis 6f67143908 [FIX] *: do not call deprecated method LocalService() 
bzr revid: chs@openerp.com-20131121120611-06h1pki3460tzj1s
 2013-11-21 13:06:11 +01:00
ddm 56e19c374f [FIX] Avoid reserved keywords as method names 
bzr revid: ddm@openerp.com-20131121114922-w731pvjnnvqzxu42
 2013-11-21 12:49:22 +01:00
ddm 135345bf2a [IMP] Tour: better modal handling 
bzr revid: ddm@openerp.com-20131121113507-qmz5inlge2ixkib8
 2013-11-21 12:35:07 +01:00
Martin Trigaux 0a60ad5aee [MERGE] [FIX] sale: sale.order.line, remove duplicated state field that made the statusbar in the header to be incorrectly rendered (opw 598572) 
lp bug: https://launchpad.net/bugs/1233567 fixed

bzr revid: mat@openerp.com-20131121113304-kntnvmdmoll2n6hl
 2013-11-21 12:33:04 +01:00
Martin Trigaux b6b86f34f4 [MERGE] [FIX] stock: correctly recount quantity when split on multiple locations for product reservations (opw 600277) 
bzr revid: mat@openerp.com-20131121112321-fdttljrrogsbihf2
 2013-11-21 12:23:21 +01:00
ddm 77c60a94be [IMP] Tour: method names 
bzr revid: ddm@openerp.com-20131121112312-2n8kd2tja6upji3i
 2013-11-21 12:23:12 +01:00
ddm ec4372ac23 [IMP] Tour: better defaults 
bzr revid: ddm@openerp.com-20131121111102-l66jzdysdkqm7fje
 2013-11-21 12:11:02 +01:00
Xavier Morel fee8cb0fff [FIX] reimplement [Edit] button on images 
Button implementation turned out to be crap:

* Didn't work at all in Firefox (!)

* Unreliable in webkit, some types of image selection wouldn't
  correctly activate the button

->

* changed RTEImageDialog to take an (optional) image element, used as
  the "source element" if provided. This allows greater reliability
  for events which may leave selection in debatable or variable
  (across browsers) state

* setup and teardown button on hover, using selection triggered issues
  with oe_overlay thing where e.g. the first click on the button would
  work but the second one would not (it'd be intercepted by the
  overlay as far as I can tell).

  This also saves a click for user, they will see the [Edit] button
  immediately when putting the cursor over the image.

bzr revid: xmo@openerp.com-20131121110748-s5e2ne3etpzwi2a6
 2013-11-21 12:07:48 +01:00
Xavier Morel 2985681366 [FIX] fixup snippets json controller for lazyresponse changes 
bzr revid: xmo@openerp.com-20131121095959-lwi6mnge684pxi1q
 2013-11-21 10:59:59 +01:00
Thibault Delavallée 04818e7584 [FIX] website_sale: fixed some 'add cart' buttons not working 
bzr revid: tde@openerp.com-20131121094816-w8ulontnt9kv5zbf
 2013-11-21 10:48:16 +01:00
Gery Debongnie a309c97505 [IMP] allows row expansion to query and display correct data when columns are already expanded (addon web_graph) 
bzr revid: ged@openerp.com-20131121090719-lauwesqz7c189nba
 2013-11-21 10:07:19 +01:00
Kunal Chavda (Open ERP) e22d25ecdc [MERGE]with latest. 
bzr revid: kch@tinyerp.com-20131121061028-t0mu64yq94yn1drv
 2013-11-21 11:40:28 +05:30
Darshan Kalola (OpenERP) 17a5f388eb [IMP]add variant group in product by template menu. 
bzr revid: dka@tinyerp.com-20131121055920-fh4e2elnrdy3rz45
 2013-11-21 11:29:20 +05:30
Launchpad Translations on behalf of openerp bdc5ae3291 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121052817-v5bocf8e1j6pbuby
 2013-11-21 05:28:17 +00:00
Fabien Meghazi 7d43b226ab [IMP] Use LazyResponse for website.render() 
bzr revid: fme@openerp.com-20131120202842-zethge8jykzlzjjy
 2013-11-20 21:28:42 +01:00
Fabien Meghazi 80ebc1225a [ADD] LazyRequest 
bzr revid: fme@openerp.com-20131120194618-qzw4icf41ep3kbj3
 2013-11-20 20:46:18 +01:00
Fabien Meghazi 4346aa99a4 [IMP] Two men's patch (al & chs) Clean up http.py, keep cursor open until dispatch is done. 
bzr revid: fme@openerp.com-20131120192550-i9xzyqkufe3stnb3
 2013-11-20 20:25:50 +01:00
Christophe Simonis 8721307dae [IMP] web: avoid double reload() when clicking on a button on a editable form view. 
bzr revid: chs@openerp.com-20131120185337-w8857fmwosa36r4d
 2013-11-20 19:53:37 +01:00
Launchpad Translations on behalf of openerp b1f8f3dfd2 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060235-8k2oxuc94x45jjoc
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060308-lb2sgcxbv804pafr
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062541-ouuae0dl331ekjcb
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054520-eypowk6g8qatvq7n
bzr revid: launchpad_translations_on_behalf_of_openerp-20131120054421-95x86930ezm0p33h
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063904-5igv5f7tgwlaipvv
bzr revid: launchpad_translations_on_behalf_of_openerp-20131122060313-x4c5bx498gyrkhqr
 2013-11-22 06:03:13 +00:00
Martin Trigaux 79d977d491 [MERGE] [FIX] mail: exclude document name from the string to translate (avoid having one translation per file name...) 
bzr revid: mat@openerp.com-20131121170505-4i957pyyuz486iy6
 2013-11-21 18:05:05 +01:00
Martin Trigaux 161f102486 [MERGE] [IMP] survey: hide readonly field if empty on request form 
bzr revid: mat@openerp.com-20131121165012-lqgg06i6tqzvis4i
 2013-11-21 17:50:12 +01:00
Martin Trigaux 50121cc659 [MERGE] [FIX] warning: modify onchange behaviour for purchase.order.line to match the one of original purchase.order.line: when removing product, keeps other information instead of setting it to blank. Had the side effet to make impossible to select a unit of measure (required field) without a product (not mandatory) 
bzr revid: mat@openerp.com-20131121164723-02617zye2qnekahz
 2013-11-21 17:47:23 +01:00
Martin Trigaux 0fae7f6bc9 [FIX] stock: don't display the evaluated boolean in delivery slip report 
bzr revid: mat@openerp.com-20131121161445-escpjd0264rh9q28
 2013-11-21 17:14:45 +01:00
Denis Ledoux d602f9de03 [ADD]crm_partner_assign: add filter to leads and opp searchviews - My Assigned Partners 
bzr revid: dle@openerp.com-20131120171259-z2dnj53e55hl449p
 2013-11-20 18:12:59 +01:00
Denis Ledoux 93973114dd [FIX]crm: change typo of opportunities searchview to be consistent to leads searchview 
bzr revid: dle@openerp.com-20131120170719-oenzvh67a2t5281n
 2013-11-20 18:07:19 +01:00
Denis Ledoux 39e07e7e83 [FIX]crm_partner_assign: use the probability of the stage of the lead instead of the probability ofthe lead directly to choose the lead to reassign, in case of the data is not correct in database (lead probability null, for instance) 
bzr revid: dle@openerp.com-20131120170002-54qjaz7wr87u65k9
 2013-11-20 18:00:02 +01:00
Denis Ledoux b5f2233381 [FIX]crm: change typo to be more consistent. Assigned to me > My leads, Assigned to My Team(s) > My Team(s) 
bzr revid: dle@openerp.com-20131120165825-e2xvhl3ualpezwuy
 2013-11-20 17:58:25 +01:00
ddm 2f0f411b43 [FIX] Tour bug with snippet editor 
bzr revid: ddm@openerp.com-20131120155444-yn5fovlq0q3dkpau
 2013-11-20 16:54:44 +01:00
Thibault Delavallée 1761086ad7 [FIX] mail: auto_subscribe: fix subscription, could have subtypes linked to another model than the current model 
bzr revid: tde@openerp.com-20131120154320-gf67wbv3en2f7ral
 2013-11-20 16:43:20 +01:00
Launchpad Translations on behalf of openerp 271ed43e7b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
 2013-11-21 06:38:38 +00:00
Antony Lesuisse a85442d6db [FIX] fleet,project allow demo user to create cars and projects 
bzr revid: al@openerp.com-20131120165314-btwzd5b0yvqcg2gc
 2013-11-20 17:53:14 +01:00
Christophe Simonis 82da5541e2 [MERGE] remove warnings 
bzr revid: chs@openerp.com-20131120161051-pk7n0itjcxx06uwm
 2013-11-20 17:10:51 +01:00
Martin Trigaux 2941a64cee [MERGE] [FIX] l10n_fr: Restore the appropriate accounts on tax ACH-19.6, courtesy of Alexis de Lattre (akretion) 
bzr revid: mat@openerp.com-20131120155959-kgu0h34wa5k131v0
 2013-11-20 16:59:59 +01:00
ddm eb23569c9e [IMP] Blog tour add first section 
bzr revid: ddm@openerp.com-20131120154042-8byh7l4eifchcfe8
 2013-11-20 16:40:42 +01:00
Martin Trigaux bbe50b786a [MERGE] [FIX] project: add noupdate on data to avoid erasing changes on stages, exclude mail.message.subtypes (want overwrite), courtesy of Alex Comba (Agile BG) 
lp bug: https://launchpad.net/bugs/1172149 fixed

bzr revid: mat@openerp.com-20131120151439-96l2z98tebj46fzs
 2013-11-20 16:14:39 +01:00
Christophe Simonis c26c178f98 [MERGE] remove warnings 
bzr revid: chs@openerp.com-20131120151237-ij9llw0fnhya10f7
 2013-11-20 16:12:37 +01:00
Olivier Dony 44664076da [MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o 
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
 2013-11-20 15:43:18 +01:00
Martin Trigaux 84deced55e [MERGE] [FIX] hr_expense: add expenses in state 'Waiting payment' in the search filter 'To Pay' (opw 597054) 
bzr revid: mat@openerp.com-20131120144002-7wzh6zxily5j7mr5
 2013-11-20 15:40:02 +01:00