pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,161 Commits 1 Branch 0 Tags
9c77e29d4c65b9d190794de007a90e3d33bce7e2
Commit Graph
99161 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibault Delavallée 98472d8253 [CLEAN] Removed commented print 
bzr revid: tde@openerp.com-20140415144943-ov6g4n9tzjxtwlk9
 2014-04-15 16:49:43 +02:00
Anael Closson 1528f9273b [FIX] tools: Comments in e-mail templates are removed before mako/jinja2 processing - opw 605315 
bzr revid: acl@openerp.com-20140415143736-bcgwgribsv2hsbvo
 2014-04-15 16:37:36 +02:00
Thibault Delavallée 86e325b9f2 [REM] mass_mailing sub-modules: removed deda code 
bzr revid: tde@openerp.com-20140415143452-igpz14t4xjqta6dn
 2014-04-15 16:34:52 +02:00
Thibault Delavallée 55fc583f36 [REM] mail: compose message: removed unnecessary code 
bzr revid: tde@openerp.com-20140415143343-on2d3j92o6zifq59
 2014-04-15 16:33:43 +02:00
Christophe Simonis 61da3f4aba [MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3 
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
 2014-04-15 16:29:34 +02:00
Christophe Simonis 457b877160 [MERGE] forward port of branch saas-3 up to revid 4000 dle@openerp.com-20140415130951-ckuv8nsl17qkb300 
bzr revid: chs@openerp.com-20140415142910-c3fqzce7wju83f5e
 2014-04-15 16:29:10 +02:00
Gery Debongnie 9d358bad71 [FIX] change the string 'Reply survey' into 'Answer Survey' in survey form view (stat button work) (addon survey) 
bzr revid: ged@openerp.com-20140415141628-iyw063tkertas2e1
 2014-04-15 16:16:28 +02:00
Christophe Simonis 863e295937 [MERGE] forward port of branch saas-3 up to revid 5116 chs@openerp.com-20140415133650-y46i0o3qkb2atbvi 
bzr revid: chs@openerp.com-20140415140548-rlg9uypv78pywqhc
 2014-04-15 16:05:48 +02:00
Thibault Delavallée 7ffffe6889 [FIX] mass_mailing: fixed demo data 
bzr revid: tde@openerp.com-20140415135846-ql9883kwc3skqelo
 2014-04-15 15:58:46 +02:00
Gery Debongnie 569d9dc75a [FIX] move the purchase_ids, purchase_count fields defined in purchase.py from the model product.template to product.product to make them work correctly (addon purchase) 
bzr revid: ged@openerp.com-20140415135411-428kxcysuy73soeu
 2014-04-15 15:54:11 +02:00
Thibault Delavallée 19a2f350fa [IMP] mass_mailing: cleaned demo data 
bzr revid: tde@openerp.com-20140415135157-blrw8vcv66nzs6wa
 2014-04-15 15:51:57 +02:00
Thibault Delavallée f39fb269a4 [FIX] chardomain field: fixed button action 
bzr revid: tde@openerp.com-20140415135145-1wks35wufs9b1etq
 2014-04-15 15:51:45 +02:00
Martin Trigaux 35c7f4814d Allow overwrite of the serialising method to exclude some categories in the challenge search 
bzr revid: mat@openerp.com-20140415134809-uconkvnp0z32jxjs
 2014-04-15 15:48:09 +02:00
Thibault Delavallée da7cb60cfc [MOVE] Moved mass mailing chardomain widget to web. 
bzr revid: tde@openerp.com-20140415133933-1uqlj3yujdwozz2m
 2014-04-15 15:39:33 +02:00
Thibault Delavallée 02d07ac47e [ADD] web: form: added char domain widget coming from mass_mailing. This widget 
is used to compute the number of records according ot a domain, and to allow
selecting documents.

bzr revid: tde@openerp.com-20140415133914-v8fm6wn7up9ds85i
 2014-04-15 15:39:14 +02:00
Christophe Simonis 3d2e9b4d2b [MERGE] forward port of branch 7.0 up to revid 5281 launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k 
bzr revid: jke@openerp.com-20140409153527-mic1a8afcvdhsd27
bzr revid: chs@openerp.com-20140410102422-fcwxhjk40z0oy8x5
bzr revid: chs@openerp.com-20140415133650-y46i0o3qkb2atbvi
 2014-04-15 15:36:50 +02:00
Mehul Mehta (OpenERP) a8c1649423 [MERGE] merged with lp:openobject-addons 2014-04-15 19:01:17 +05:30
Thibault Delavallée c25b816a3b [FIX] web: fixed iamge buttons taking 2 lines 
bzr revid: tde@openerp.com-20140415132655-029ulw9jgeut4bce
 2014-04-15 15:26:55 +02:00
Thibault Delavallée 33ebae745d [REV] Reverted changes about sidebar as we now have 
a widget to handle things like selection in a list view.

bzr revid: tde@openerp.com-20140415132528-0spzmcb2xmphxpwn
 2014-04-15 15:25:28 +02:00
Mehul Mehta (OpenERP) 7ceaefb106 [IMP] draft state replace with shopping_cart state and remove the condition of pending which convert a draft quotation into quotation sent 2014-04-15 18:55:12 +05:30
Barad Mahendra ed8b9ba683 [Merge]with trunk 
bzr revid: mba@tinyerp.com-20140415131954-fi5gx8o6ue9c4p9z
 2014-04-15 18:49:54 +05:30
Martin Trigaux bc0738e47e One morning I shot an elephant in my pajamas. How he got in my pajamas, I don't know. 
bzr revid: mat@openerp.com-20140415131929-6pktlodmlgr2fuwz
 2014-04-15 15:19:29 +02:00
Gery Debongnie d1eb2547bb [FIX] change the string 'pay invoices' to 'supplier inv.' to avoid misleading the user (there is another 'invoices' button) (addon purchases) 
bzr revid: ged@openerp.com-20140415131818-geev2ewszvkjxj19
 2014-04-15 15:18:18 +02:00
Denis Ledoux f8d5ef0f80 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 4174 revid:dle@openerp.com-20140415130732-bud8xb3pzgxw2imr 
bzr revid: dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: dle@openerp.com-20140415130951-ckuv8nsl17qkb300
 2014-04-15 15:09:51 +02:00
Denis Ledoux 4a516a4709 [FIX] web_kanban: show more button of kanban view behind the kanban cards on (ie9) 
bzr revid: dle@openerp.com-20140415130732-bud8xb3pzgxw2imr
 2014-04-15 15:07:32 +02:00
Gery Debongnie 032a453f67 [FIX] spelling fix: Orderpoints -> Order Points in addon procurement 
bzr revid: ged@openerp.com-20140415130244-o2hkdo3qbpro7hrr
 2014-04-15 15:02:44 +02:00
Gery Debongnie d6a3d9d089 [FIX] change the timesheet stat button in project form view to not display the number of hours (addon project_timesheet) 
bzr revid: ged@openerp.com-20140415125715-slkpgg4mpqhw1mh0
 2014-04-15 14:57:15 +02:00
Thibault Delavallée 4808ca3796 [FIX] mass_mailing: various fixed in chardomain widget 
bzr revid: tde@openerp.com-20140415125222-uzvzgzo5gx6hmgor
 2014-04-15 14:52:22 +02:00
Darshan Kalola (OpenERP) 449ab7c433 [MERGE]sync with trunk. 
bzr revid: dka@tinyerp.com-20140415123511-61vax59dl6476zjb
 2014-04-15 18:05:11 +05:30
Darshan Kalola (OpenERP) f13e04ea0c [MERGE]sync with trunk. 
bzr revid: dka@tinyerp.com-20140415123258-dx6ynazg52064xfb
 2014-04-15 18:02:58 +05:30
Gery Debongnie c68163c160 [FIX] correct the spelling of 'task' in stat button in project form view (addon project) 
bzr revid: ged@openerp.com-20140415121404-gasss4hjx0vx9su5
 2014-04-15 14:14:04 +02:00
Gery Debongnie e0d45c418a [IMP] improves the put money in/take money out stat button in point of sale form views 
bzr revid: ged@openerp.com-20140415115349-360ydoz85069bgyb
 2014-04-15 13:53:49 +02:00
Jitendra Prajapati (OpenERP) 2d4197611e [MERGE]with main branch 
bzr revid: jpr@tinyerp.com-20140415115018-d66hy1gjljty8i8x
 2014-04-15 17:20:18 +05:30
Richard Mathot (OpenERP) 577245bc66 [REF] Terminology 
bzr revid: rim@openerp.com-20140415115017-wfbtidj4eypxyw8r
 2014-04-15 13:50:17 +02:00
Gery Debongnie c0aed69bdc [FIX] fix the spelling of count_regitrations to avoid crash (addon event) 
bzr revid: ged@openerp.com-20140415114542-algev359v37qsq12
 2014-04-15 13:45:42 +02:00
Thibault Delavallée ea2e59f86b [FIX] mass_mailing: fixed email sending 
bzr revid: tde@openerp.com-20140415113944-hjwjc2lh4ydzugr1
 2014-04-15 13:39:44 +02:00
Thibault Delavallée 4aa717b695 [FIX] mass_mailing: form view: usability imp 
bzr revid: tde@openerp.com-20140415113934-xu033xxibolvl62w
 2014-04-15 13:39:34 +02:00
Thibault Delavallée ecac1a7156 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140415113817-j38p3rn3j7pz2kxg
 2014-04-15 13:38:17 +02:00
Kersten Jeremy 1c5ed2973e [FIX] mail template view - Set body_html field as simple text area without cke by default. Else, the mako code are considered as mal formatted and moved. 
bzr revid: jke@openerp.com-20140415113751-h0a1tg36tht1bys1
 2014-04-15 13:37:51 +02:00
Martin Trigaux 15306066d0 I love the smell of napalm in the morning. 
bzr revid: mat@openerp.com-20140415113545-31efpjddjwqr4ajl
 2014-04-15 13:35:45 +02:00
Quentin (OpenERP) 205a13e2f5 [MERGE] stock_account, purchase: better usability in settings to install stock_account and manage options to use costing methods and invenotyr valuation 
bzr revid: qdp-launchpad@openerp.com-20140415112915-k8ba71ddo1vgu0tm
 2014-04-15 13:29:15 +02:00
Gery Debongnie a869dac948 [IMP] improves slightly the marketing campaign stat button in addon marketing_campaign 
bzr revid: ged@openerp.com-20140415111633-bg0tc21aidpzc8yx
 2014-04-15 13:16:33 +02:00
Thibault Delavallée 7e1e475d89 [IMP] mass_mailing :handle attachments for mailings 
bzr revid: tde@openerp.com-20140415110439-j72v9cnz3nml7g04
 2014-04-15 13:04:39 +02:00
Richard Mathot (OpenERP) c55057f322 [MERGE] from trunk 
bzr revid: rim@openerp.com-20140415110438-thh0io5aunro4kfl
 2014-04-15 13:04:38 +02:00
Gery Debongnie 8135812d34 [FIX] moves the field definitions of models hr.job and hr.employee that should have been in submodules to their correct place (in hr_something) to avoid dependencies problems (addons hr, hr_*) 
bzr revid: ged@openerp.com-20140415105419-wy026n5k10wo80wb
 2014-04-15 12:54:19 +02:00
Thibault Delavallée 922e8b610f [IMP] mass_mailing :improved demo data 
bzr revid: tde@openerp.com-20140415104337-gokvkpvx36wch132
 2014-04-15 12:43:37 +02:00
Thibault Delavallée d538a02c0e [FIX] mass_mailing: fixed graph buttons in form view + fixed stat computation 
bzr revid: tde@openerp.com-20140415104328-yll2kgxtjmg6f3hc
 2014-04-15 12:43:28 +02:00
Randhir Mayatra rma-openerp e25229a6da [IMP] update depends on sale_team and sale 2014-04-15 16:08:37 +05:30
Thibault Delavallée 1e643d4ce5 [FIX] mass_mailing: fixed demo data: reply_to specified + remove create_date, not allowed 
bzr revid: tde@openerp.com-20140415102818-zcm9vfc7zalg29f4
 2014-04-15 12:28:18 +02:00
Martin Trigaux 14ff39f96e [FIX] website_forum: mooooore baaaaaadges 
bzr revid: mat@openerp.com-20140415101842-yf6vndw7h62q0b42
 2014-04-15 12:18:42 +02:00