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
Xavier Morel b702a9887c [IMP] remove /website/attachment, make attachments go through /website/image 
bzr revid: xmo@openerp.com-20131024103401-yik03je9qm1ge0tp
 2013-10-24 12:34:01 +02:00
ajay javiya (OpenERP) fbcabd1057 [REV]: noupdate in data 
bzr revid: aja@tinyerp.com-20131024102414-e1zdb6e6wh086jlj
 2013-10-24 15:54:14 +05:30
Thibault Delavallée fc513a2a1f [IMP] website: publish management 
'Edit' using a wrench is removed, replaced by an entry in the options menu.
The button text size is also increased, because currently in xsmall it is not
matching the website look.

Also re-indented the template.

bzr revid: tde@openerp.com-20131024093420-3vye9g2j11b3y602
 2013-10-24 11:34:20 +02:00
ddm 3ff98b4050 [IMP] eCommerce: remove duplicate button 
bzr revid: ddm@openerp.com-20131024092438-aelgmzbcpvwmf33p
 2013-10-24 11:24:38 +02:00
ddm bffc22b391 [IMP] Consistency 
bzr revid: ddm@openerp.com-20131024092057-p26cnzy9q37zuc6s
 2013-10-24 11:20:57 +02:00
Amit Bhavsar (Open ERP) a94b7a2c77 [MERGE] merge with lp:~openerp-dev/openobject-addons/trunk-product-variant-imp-amb-dka 
bzr revid: amb@tinyerp.com-20131024091218-k101jbqmlmj6ae2d
 2013-10-24 14:42:18 +05:30
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
Stephane Wirtel 1c398cd6f8 [REF] Start to abstract the Workflow engine 
bzr revid: stw@openerp.com-20131024075707-k1092bspi6ebixdw
 2013-10-24 09:57:07 +02:00
Darshan Kalola (OpenERP) cfb4780369 [IMP]add image field and description field in product_product. 
bzr revid: dka@tinyerp.com-20131024065805-lffcw1zq616dwv3m
 2013-10-24 12:28:05 +05:30
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
bth-openerp 12ca31cb2d [MERGE]Merge trunk-website-al. 
bzr revid: bth@tinyerp.com-20131024051543-zow19or2yqh5kczn
 2013-10-24 10:45:43 +05:30
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
Amit Bhavsar (Open ERP) 415e64f5cd [MERGE] merge with latest trunk. 
bzr revid: amb@tinyerp.com-20131023190249-gzlccl97xa0351d5
 2013-10-24 00:32:49 +05:30
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
ddm d5379f3b7c [FIX] eCommerce cart layout 
Fixed 'Continue Shopping' button spacing when cart empty

bzr revid: ddm@openerp.com-20131023154639-j7385c9oaka2k3g1
 2013-10-23 17:46:39 +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
Xavier Morel 1eb3d3269c [ADD] parsing of localized date & datetime t-fields 
turns out we use a bunch of them in the events section thing

bzr revid: xmo@openerp.com-20131023145729-tglusl27mt6ajwzn
 2013-10-23 16:57:29 +02:00
ddm 62bdd7bd9c [FIX] Fixed eCommerce pager 
bzr revid: ddm@openerp.com-20131023145152-smhlpc0eydvos7sx
 2013-10-23 16:51:52 +02:00
Stephane Wirtel f6c1b6bb86 [REF] Create a WorkflowItem object 
bzr revid: stw@openerp.com-20131023135838-ix7x6mzui3i3wfbi
 2013-10-23 15:58:38 +02:00
bth-openerp c7ddd83bb2 [REM]Removed image. 
bzr revid: bth@tinyerp.com-20131023135506-olydfbpmvtq9vt8h
 2013-10-23 19:25:06 +05:30
bth-openerp 17a37e775d [IMP]Created for invoiced and waiting state membership. 
bzr revid: bth@tinyerp.com-20131023135241-zphclcokpyj0jc75
 2013-10-23 19:22:41 +05:30
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
bth-openerp acc7d965f1 [IMP]Improved. 
bzr revid: bth@tinyerp.com-20131023132529-kvtvs64mnu8so4pr
 2013-10-23 18:55:29 +05:30
bth-openerp 9f098d3e77 [IMP]Add demo data for company slogan. 
bzr revid: bth@tinyerp.com-20131023132004-9vlx3kcpefg1yz81
 2013-10-23 18:50:04 +05:30
bth-openerp f0b7eedd9e [IMP]Name given. 
bzr revid: bth@tinyerp.com-20131023131753-3txmnp97k4smq5fx
 2013-10-23 18:47:53 +05:30
bth-openerp 5810455fec [IMP]Removed code. 
bzr revid: bth@tinyerp.com-20131023131632-k0t4um32ypa0hlyg
 2013-10-23 18:46:32 +05:30
Xavier Morel 1ce3230d13 [IMP] don't completely wedge the RTE in case save fails. This may well break snippets entirely in case of save failure. 
bzr revid: xmo@openerp.com-20131023130918-j5s81t0j60gitr1t
 2013-10-23 15:09:18 +02:00
bth-openerp 9efb55b0be [MERGE]Merge trunk-website-al. 
bzr revid: bth@tinyerp.com-20131023130855-6rt6rip6x1h04xc5
 2013-10-23 18:38:55 +05:30
Stephane Wirtel 6a3a2709ef [REF] Remove the useless wkf_expr.py file and copy it into workitem.py 
bzr revid: stw@openerp.com-20131023130705-k4u7ssba820b7hwi
 2013-10-23 15:07:05 +02:00
Stephane Wirtel fad743a978 [REF] Remove old code from the workflow engine 
bzr revid: stw@openerp.com-20131023125818-3g3fe49lfrube9kq
 2013-10-23 14:58:18 +02:00
Stephane Wirtel c7afc04be3 [REF] First step, use the same vocabulary for the cr, uid, res_type and res_id 
=> Session, Record.
* a Session is a container of one cursor and one user 
* a Record is a container for the res_type and res_id, in this object, the right
  names are model and id.

Examples:

session = Session(cr, uid)
record = Record(res_type, res_id)
record.mode, record.id

A new class named 'WorkflowService' is a wrapper for the instance.* functions.

bzr revid: stw@openerp.com-20131023125343-uo0bq52n86ae0fb0
 2013-10-23 14:53:43 +02:00
bth-openerp c8d1d72a0b [IMP]Added yml file for invoiced status of membership. 
bzr revid: bth@tinyerp.com-20131023125340-xo6fu8loygwjo355
 2013-10-23 18:23:40 +05:30
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
bth-openerp e84f95360f [MERGE]Merge trunk-website-al. 
bzr revid: bth@tinyerp.com-20131023123435-nfv542f67ndogazl
 2013-10-23 18:04:35 +05:30
bth-openerp 6a1bde2151 [ADD]Added logo which is removed in last revision. 
bzr revid: bth@tinyerp.com-20131023123254-gd1rrqjdbqoj7iya
 2013-10-23 18:02:54 +05:30
Thibault Delavallée 7f61d18ef9 [CLEAN] tools: cleaned modified code 
bzr revid: tde@openerp.com-20131023122744-3b3hayy4f8ss2bjx
 2013-10-23 14:27:44 +02:00
bth-openerp eb3ef77319 [IMP]Put static image as not getting customize option when coming dynamically. 
bzr revid: bth@tinyerp.com-20131023122735-s9had1vgl90g6zz1
 2013-10-23 17:57:35 +05:30
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
bth-openerp 32169579f2 [IMP]Image and slogan from res company and added image in background. 
bzr revid: bth@tinyerp.com-20131023120354-ltvzoxwby6dbaytv
 2013-10-23 17:33:54 +05:30
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