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
Thibault Delavallée b7a7cf5fb9 [MERGE] Sync with saas-2 
bzr revid: tde@openerp.com-20131021104729-8c39qu7pr431cb51
bzr revid: tde@openerp.com-20131023113825-u1uqcu07bt6i17rk
 2013-10-23 13:38:25 +02:00
Thibault Delavallée d4ce734a3b [MERGE] Sync with saas-2 
bzr revid: tde@openerp.com-20131023113815-hldc1ouglq9hhgcu
 2013-10-23 13:38:15 +02:00
Turkesh Patel (Open ERP) f48db35788 [FIX] sale_crmconvert target and forcat fields to float from int 
bzr revid: tpa@tinyerp.com-20131023113742-55szrqznr1imequi
 2013-10-23 17:07:42 +05:30
Thibault Delavallée d56d97ec62 [REV] project: like before for CRM (see previous commit) reverted 
most changes about stages.

Override in project_mrp is back therefore.

bzr revid: tde@openerp.com-20131023113716-jw8jh1jvn4dgpcyr
 2013-10-23 13:37:16 +02:00
Turkesh Patel (Open ERP) 416c47f324 [FIX] replace integer with float in validation 
bzr revid: tpa@tinyerp.com-20131023113652-rj74krv1lecyp2xf
 2013-10-23 17:06:52 +05:30
Denis Ledoux 6bf5d02627 [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 3859 rev-id: dle@openerp.com-20131023110926-tc2n3oqg0l2ga138 
bzr revid: dle@openerp.com-20131023113414-mlwppd4d7vyh1tyj
 2013-10-23 13:34:14 +02:00
Darshan Kalola (OpenERP) a54bdb0b27 [MERGE]merged with main addons. 
bzr revid: dka@tinyerp.com-20131023112859-hetth94wbcwc37eq
 2013-10-23 16:58:59 +05:30
Denis Ledoux 3279b24128 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 3748 rev-id: dle@openerp.com-20131023103308-18pj2gqq3imrcir7 
bzr revid: dle@openerp.com-20131023110926-tc2n3oqg0l2ga138
 2013-10-23 13:09:26 +02:00
Thibault Delavallée 8ce54029cf [REV] crm: reverted most changes about stages for this branch. 
We keep fold, because it has a meaning in kanban view, and is kind of
'drop' stage, for won / lost / cancel / dead.

New stage is now the stage with the lower sequence, not necessarily the
stage with sequence 1. Note that this could break the _track because it
checks for stages with sequence <= 1; however with OpenERP values it
works fine. In some specific stage configuration, some subtypes could
not be tracked precisely.

bzr revid: tde@openerp.com-20131023100429-a3vfxi5zkn18v6qq
 2013-10-23 12:04:29 +02:00
Turkesh Patel (Open ERP) cabc3bbece [IMP] added new _currency_conversation method. 
bzr revid: tpa@tinyerp.com-20131023095000-082hgraqi6i7h3o6
 2013-10-23 15:20:00 +05:30
Fabien Meghazi 7dd1934585 [FIX] option typo: unable_editor -> enable_editor 
bzr revid: fme@openerp.com-20131023091152-h0hxw47hzfor2al8
 2013-10-23 11:11:52 +02:00
Xavier Morel 31b059d3f6 [IMP] url t-ization 
bzr revid: xmo@openerp.com-20131023090207-jto4fzz153xiqtm6
 2013-10-23 11:02:07 +02:00
Fabien Meghazi 6495851102 [ADD] UI improvement: Translate "or Edit Master" 
bzr revid: fme@openerp.com-20131023081501-f9owb501j16757bk
 2013-10-23 10:15:01 +02:00
Turkesh Patel (Open ERP) 4e0a8f9173 [IMP] removed unused create_uid field. 
bzr revid: tpa@tinyerp.com-20131023064455-ge7pxrmz1qskh6jf
 2013-10-23 12:14:55 +05:30
Turkesh Patel (Open ERP) 44eaa430cc [IMP] add direct currency_id field insted of related field. 
bzr revid: tpa@tinyerp.com-20131023061053-3avp9mp31v7vl9o6
 2013-10-23 11:40:53 +05:30
Turkesh Patel (Open ERP) 0668ebf17b [MRG] merge with lp:openerp-web 
bzr revid: tpa@tinyerp.com-20131015105425-xpajdv2oeicymqeo
bzr revid: tpa@tinyerp.com-20131015115209-6zwdes62i2r1q6e5
bzr revid: tpa@tinyerp.com-20131023055432-wxxuss1d2d1xm8gi
 2013-10-23 11:24:32 +05:30
Turkesh Patel (Open ERP) dcc739abed [MRG] merge with lp:openobject-addons 
bzr revid: tpa@tinyerp.com-20131023054724-aocpge4eta3z93gb
 2013-10-23 11:17:24 +05:30
Turkesh Patel (Open ERP) f684f68173 [RMV] removed code to convert forcast and target amount in user currency. 
bzr revid: tpa@tinyerp.com-20131023054254-gw4mjjighbbn1unm
 2013-10-23 11:12:54 +05:30
Launchpad Translations on behalf of openerp 8d046c15d4 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131023052221-vwbblwzow9zkbd7l
 2013-10-23 05:22:21 +00:00
Antony Lesuisse 2e3af6f3d0 import cleanups part2 
bzr revid: al@openerp.com-20131022225247-3zv7hjz1iidnb6zl
 2013-10-23 00:52:47 +02:00
Christophe Simonis c58f13c8e9 [FIX] im: do not search users before start polling. This avoid a race condition for im.user creation 
bzr revid: chs@openerp.com-20131022171010-ilfvqced6q8qta3h
 2013-10-22 19:10:10 +02:00
Antony Lesuisse 3d8b7984be import cleanups part1 
bzr revid: al@openerp.com-20131022170659-kg9err029ha22evh
 2013-10-22 19:06:59 +02:00
Denis Ledoux 4e0530f16c [FIX]web: test testing the customer filter save was wrong, was using wrong method text() instead of val() to set the filter name 
bzr revid: dle@openerp.com-20131022165318-2imkhgb6iecalbbi
 2013-10-22 18:53:18 +02:00
Denis Ledoux 752341f0cb [FIX]web: filter name input for custom filters in search dropdown is now required 
bzr revid: dle@openerp.com-20131022162519-u03cn5k5od8jg6ka
 2013-10-22 18:25:19 +02:00
ddm 3873868633 [FIX] Fixed eCommerce pager 
bzr revid: ddm@openerp.com-20131022151655-erprk7ci7mrwmb18
 2013-10-22 17:16:55 +02:00
Xavier Morel 3655f43e42 [IMP] warnings and shit 
bzr revid: xmo@openerp.com-20131022151144-tblwba9rf77iuidl
 2013-10-22 17:11:44 +02:00
Martin Trigaux 391e45b34e [REV] l10n_fr: revert changes to rev 8409 
bzr revid: mat@openerp.com-20131022143044-67uqzvvbois9150k
 2013-10-22 16:30:44 +02:00
Thibault Delavallée 57c11338ae [IMP] tools: mail: added a protection in a string.find, could have a None argument 
bzr revid: tde@openerp.com-20131022142908-sol44xaprx1b0b0a
 2013-10-22 16:29:08 +02:00
Xavier Morel ab20dbc885 [FIX] Attribute values in selectors must be attributes or strings 
http://www.w3.org/TR/css3-selectors/#attribute-selectors

http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier

> identifiers (including element names, classes, and IDs in selectors)
> can contain only the characters [a-zA-Z0-9] and ISO 10646 characters
> U+00A0 and higher, plus the hyphen (-) and the underscore (_); they
> cannot start with a digit, two hyphens, or a hyphen followed by a
> digit.

so "0" or "1" is not a valid identifier, must be a string and must
thus be quoted.

bzr revid: xmo@openerp.com-20131022142049-6fq70sielv95kmu0
 2013-10-22 16:20:49 +02:00
ddm 7994ceb43d [IMP] eCommerce: layout improvements 
bzr revid: ddm@openerp.com-20131022142804-58oabf37w3zsg2pg
 2013-10-22 16:28:04 +02:00
ddm 1888dea9b4 [IMP] eCommerce: Checkout summary moved to left (cf. apr's review) 
bzr revid: ddm@openerp.com-20131022140119-82ex7kvrzeqc7jri
 2013-10-22 16:01:19 +02:00
Thibault Delavallée af29bf7bc9 [FIX] tools: mail: fixed shortening of html content. 
Fixed length computation of text in html nodes: multiples successive
whitespaces are considered as one whitespaces; better truncate position
when adding a read more link; now always protect words (placed after
the first word that exceeds the shorten position); pre nodes are preserved
about whitespaces; when the read more link should go into a quote, it instead
goes at the end of the first parent node not being quoted instead of at
a wrong position.

Added tests for shorten position.

bzr revid: tde@openerp.com-20131022135037-igauu2kkglvdrqu7
 2013-10-22 15:50:37 +02:00
ddm 291ffdb515 [CMS] eCommerce: remove product list title (cf. apr's review) 
bzr revid: ddm@openerp.com-20131022134409-g1qi25a96jvzby8s
 2013-10-22 15:44:09 +02:00
bth-openerp e10e93baa3 [IMP]Removed full size code. 
bzr revid: bth@tinyerp.com-20131022134012-zq2x1unn4vpal9ls
 2013-10-22 19:10:12 +05:30
niv-openerp 55ac10cd3d [FIX] Bug in form view. When a on_change alters the domain of a field, the view_content_has_changed event is 
triggered *before* we alter the domain of the field. So, it is not possible for the fields to really know
when they have to re-calculate their domain.

bzr revid: nicolas.vanhoren@openerp.com-20131022133432-l0m36mfiwx8z6014
 2013-10-22 15:34:32 +02:00
Paramjit Singh Sahota 928b651c7b [IMP]Improved the layout of parallax snippet for ABOUT US page. 
bzr revid: psa@tinyerp.com-20131022133327-fatvxnkc0bqtejv2
 2013-10-22 19:03:27 +05:30
Fabien Meghazi e4121220c6 [IMP] Language selected label 
bzr revid: fme@openerp.com-20131022132054-o60ekjtbz62sg6p6
 2013-10-22 15:20:54 +02:00
Fabien Meghazi fd5bae6a98 [FIX] do not normalize urls for images 
bzr revid: fme@openerp.com-20131022131629-vo67pv9yqyuoe7q6
 2013-10-22 15:16:29 +02:00
niv-openerp 439cc0b94b [IMP] Altered behavior of form selection fields when used on many 2 one. Now it will query directly 
the possible selections from the server instead of using the data sent by the fields_view_get. This
allows to dynamically change the possible values during edition with a domain on the selection field.

bzr revid: nicolas.vanhoren@openerp.com-20131022131525-d0i61sbm0w6katfs
 2013-10-22 15:15:25 +02:00
niv-openerp 02177329c9 fix 
bzr revid: nicolas.vanhoren@openerp.com-20131022131510-zvqt6xgsln0bk6zp
 2013-10-22 15:15:10 +02:00
niv-openerp 48e9bbff2b wip 
bzr revid: nicolas.vanhoren@openerp.com-20131022131323-jicyw0pchzs5x38t
 2013-10-22 15:13:23 +02:00
Christophe Simonis 91fdcc63a7 [FIX] board: correct /board/add_to_dashboard to use new @route decorator and request object 
bzr revid: chs@openerp.com-20131022131049-lb6mva47y0i3kpvq
 2013-10-22 15:10:49 +02:00
Xavier Morel 42f2544250 [FIX] cleanup modified arch sections before reinserting them in source arch 
otherwise there are leftovers data-* attributes stored in the DB

bzr revid: xmo@openerp.com-20131022130608-jccohqlmbzvxhnzv
 2013-10-22 15:06:08 +02:00
bth-openerp 0e558dca0a [Add]Add image. 
bzr revid: bth@tinyerp.com-20131022122606-j3jz7rpstk5z5tn8
 2013-10-22 17:56:06 +05:30
niv-openerp d0145bd0ec Now selection fields on m2o query the records directly 
bzr revid: nicolas.vanhoren@openerp.com-20131022121952-piye1e3k80w217r0
 2013-10-22 14:19:52 +02:00
ajay javiya (OpenERP) cea90fd863 [IMP]: improve align in email template 
bzr revid: aja@tinyerp.com-20131022114120-xlq8dqp3y2t4n0kp
 2013-10-22 17:11:20 +05:30
bth-openerp 12adac9272 [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al. 
bzr revid: bth@tinyerp.com-20131022112425-v4x7l02a0jsv5d0a
 2013-10-22 16:54:25 +05:30
bth-openerp 2c77c2c78a [MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al. 
bzr revid: bth@tinyerp.com-20131022111724-327ql1yk8s5ivfvv
 2013-10-22 16:47:24 +05:30
Xavier Morel 58f1b5ad02 [IMP] prevent default on triple-click interrupt 
bzr revid: xmo@openerp.com-20131022110015-iewvo1x0jdogswus
 2013-10-22 13:00:15 +02:00
Xavier Morel 31ba0b8b5a [FIX] image t-field lost during a merge 
bzr revid: xmo@openerp.com-20131022105955-i550clo5snyvnv26
 2013-10-22 12:59:55 +02:00