pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,490 Commits 1 Branch 0 Tags
a41835e296f94dea16b471b0d58349a0575d5de5
Commit Graph
75490 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christophe Simonis 2029aa28eb [MERGE] forward port of branch saas-1 up to revid 4914 chs@openerp.com-20131025103657-pbnqhw11mygyi5jn 
bzr revid: chs@openerp.com-20131025103939-5gta1eifjhx1tsmi
 2013-10-25 12:39:39 +02:00
Olivier Dony 1632666101 [FIX] stock: move analysis report incorrectly merges multiple lines with same picking, product and qty 
This error probably stems from the useless complexity of
the SQL view declaration and the double GROUP BY levels.

The patch rewrites the view query with a single GROUP BY
level and proper aggregation levels, but the core part
of the patch is to replace the outer `group by product_qty`
with a `sum(product_qty)`.

Some columns were also mentioned twice in the same GROUP
BY clause, for some reason.

bzr revid: odo@openerp.com-20131025103626-7l78kdjjr7c2wesb
 2013-10-25 12:36:26 +02:00
Turkesh Patel (Open ERP) 29214f0894 [IMP] improved code. 
bzr revid: tpa@tinyerp.com-20131025094512-m0mx0a0s94h1ldjg
 2013-10-25 15:15:12 +05:30
Launchpad Translations on behalf of openerp 8bc457816f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024052057-4ai7sltsmuoke8l5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131025060100-ua2rf6g9urivk8bm
 2013-10-25 06:01:00 +00:00
Christophe Simonis 2859897815 [FIX] allow falsy extra attributes on fields. 
bzr revid: chs@openerp.com-20131024135448-e2bpgaqu7mvg1icn
 2013-10-24 15:54:48 +02:00
Launchpad Translations on behalf of openerp 7345cfb697 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131019052730-g67chkz69pmoi5q4
bzr revid: launchpad_translations_on_behalf_of_openerp-20131020050443-pce4qrtn25h1qir6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131023052203-fvk0akb3avqxkqje
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024052015-8kg0owfhye4ws3xw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131025060039-0t8928ck7dgi8yv6
 2013-10-25 06:00:39 +00:00
Thibault Delavallée 357676b6de [MERGE] [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.

Misc :
- removed an unnecessary loop by merging two root.iter() that do not interfere
- changed occurrences of getiterator to iter, because getiterator is deprecated
- nodes are cleaned after processing, removing all attributes used to tag nodes
- fixed a bug about cleaning span containing only whitespaces not always cleaned

Added tests for shorten position.

bzr revid: tde@openerp.com-20131024084411-pytwt9g1gdmoebzc
 2013-10-24 10:44:11 +02:00
Thibault Delavallée dbe253b0e4 [FIX] Fixed bug due to copy-and-paste: outertext is now valid 
bzr revid: tde@openerp.com-20131024083955-ipbsf8rxbzm0mag3
 2013-10-24 10:39:55 +02:00
Launchpad Translations on behalf of openerp 95bca0c031 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024052102-y6y20mjt0raox65i
 2013-10-24 05:21:02 +00:00
Launchpad Translations on behalf of openerp 0ae4b7dc93 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024044442-55ny33bhhxic8yq3
 2013-10-24 04:44:42 +00:00
Olivier Dony 9b7398820e [DOC] stock: for the record, rationale for stock.location.complete_name being stored 
bzr revid: odo@openerp.com-20131023163247-bir34amewsxiby2t
 2013-10-23 18:32:47 +02:00
Olivier Dony 9dce48185f [IMP] portal_hr: avoid shadowing parent _description for no reason 
bzr revid: odo@openerp.com-20131023163108-ic3xp7yt3lx4bmkx
 2013-10-23 18:31:08 +02:00
Olivier Dony 0354391b10 [IMP] crm: defaults can be literals 
bzr revid: odo@openerp.com-20131023163029-z3q0ve4jykanibkv
 2013-10-23 18:30:29 +02:00
Olivier Dony a0fab67694 [FIX] hr_holidays: leave holiday overlap should ignore cancelled/refused ones 
Obviously a cancelled leave does not really
overlap with a new one.

bzr revid: odo@openerp.com-20131023162928-56vdsjxr8sa4n3jv
 2013-10-23 18:29:28 +02:00
Olivier Dony 5add0d31f3 [IMP] hr.employee: default search should includes work emails (useful e.g. for trigrams) 
bzr revid: odo@openerp.com-20131023162807-qjw68383a7612op6
 2013-10-23 18:28:07 +02:00
Christophe Simonis d7f9722a83 [FIX] web: bind RouteMap using environ to allow correct redirections 
bzr revid: chs@openerp.com-20131023162646-9t8iu2okkddg56yi
 2013-10-23 18:26:46 +02:00
Olivier Dony b1c221e9c4 [FIX] hr: notification about new employee joining should only be sent to employees (base.group_user) 
In the future we should directly use the
`Whole Company` mail.group, but this does
not work well enough now, as recipients
will not be able to directly go to the
employee record (e.g. to follow her)

bzr revid: odo@openerp.com-20131023155340-z2e78xo3vb7yq008
 2013-10-23 17:53:40 +02:00
Martin Trigaux eee78a1803 [FIX] stock_invoice_directly: if picking is not done while doing partial picking, create invoice on this backorder instead of the current picking 
bzr revid: mat@openerp.com-20131023153432-o7p90h9vmsp04ujb
 2013-10-23 17:34:32 +02:00
Martin Trigaux 20b9015339 [FIX] stock_invoice_directly: if picking is not done while doing partial picking, create invoice on this backorder instead of the current picking 
lp bug: https://launchpad.net/bugs/1060259 fixed

bzr revid: mat@openerp.com-20131023151342-328egar30upq5d5u
 2013-10-23 17:13:42 +02:00
Martin Trigaux d2042182b4 [FIX] product_visible_discount: don't compute negative discount, also prevent zero division 
bzr revid: mat@openerp.com-20131023132646-8l760d4swsq42zzo
 2013-10-23 15:26:46 +02:00
Thibault Delavallée e14de7a637 [FIX] Fixed previous commit, car go to len of the string. 
bzr revid: tde@openerp.com-20131023123839-gvf9ugft2b2xmo9a
 2013-10-23 14:38:39 +02:00
Thibault Delavallée 7f61d18ef9 [CLEAN] tools: cleaned modified code 
bzr revid: tde@openerp.com-20131023122744-3b3hayy4f8ss2bjx
 2013-10-23 14:27:44 +02:00
Thibault Delavallée 833c1f2072 [IMP] view_form: fieldstatus: deprecated folded on widget 
bzr revid: tde@openerp.com-20131023120804-vx7etkzewkgx9sk0
 2013-10-23 14:08:04 +02:00
Thibault Delavallée 3a8b57ddc5 [FIX] project: seems weird to be able to work on write_date without using it 
bzr revid: tde@openerp.com-20131023115525-1wu68w3fcljj37cs
 2013-10-23 13:55:25 +02:00
Thibault Delavallée 374f3c9c22 [REV] hr_recruitment: continuing reverting most changes, reparing analysis views. 
bzr revid: tde@openerp.com-20131023115505-k4eqt1jo5w0ruo4o
 2013-10-23 13:55:05 +02:00
Martin Trigaux 80e142cca3 [FIX] product_visible_discount: don't change the behaviour of account.invoice to be consistent with the normal behaviour (don't use pricelists) 
bzr revid: mat@openerp.com-20131023114233-74rtyy5vdsdcy4cl
 2013-10-23 13:42:33 +02:00
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
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
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
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
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
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