pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,175 Commits 1 Branch 0 Tags
aa09b2c1ce439e603f5390431ddb9d0dbb94de73
Commit Graph
48175 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Olivier Dony e216218f44 [FIX] res.partner.category: merge the 2 classes bearing the same name 
The name conflict causes the second class to
shadow the first one, thus breaking future
references to the first one, including any
super() call inside it!
6.1 has 2-pass loading of models so we can
simply merge the two classes now, and get
rid of the issue.

bzr revid: odo@openerp.com-20120112105043-ij740gptzu4gv6tw
 2012-01-12 11:50:43 +01:00
Xavier Morel f4efb938e2 [FIX] forgot to forward arguments correctly in xmo@openerp.com-20120112084910-6fxbzbgmv51utyko 
bzr revid: xmo@openerp.com-20120112102941-qa596ufk5nlc2nqp
 2012-01-12 11:29:41 +01:00
Thibault Delavallée 813a847aff [MERGE] account_followup: small fixes in views 
bzr revid: tde@openerp.com-20120112102723-13m2kni11irx5e1f
 2012-01-12 11:27:23 +01:00
MVA 0375bad8df [ADD] correct some bugs and review form registration view 
bzr revid: mva@openerp.com-20120112102400-2dxcwhynikh0bu2r
 2012-01-12 11:24:00 +01:00
Fabien Meghazi c16b3461b5 [FIX] Fixed Data Import Dialog that I previously broke during Dialog refactoring 
bzr revid: fme@openerp.com-20120112100206-sk9vnsdeqk18ursa
 2012-01-12 11:02:06 +01:00
Divyesh Makwana (Open ERP) 59cbdd3341 [ADD] hr_attendance : Added Test Cases For Hr Attendance 
bzr revid: mdi@tinyerp.com-20120112094904-b10x1mx4c2uxitzj
 2012-01-12 15:19:04 +05:30
hbto(humbertoarocha) 4cc5c14273 [FIX] account: add Missing date on fiscalyear clousure wizard account.fiscalyear.close 
lp bug: https://launchpad.net/bugs/912623 fixed

bzr revid: jap@tinyerp.com-20120112092149-ism5impd38iliz2u
 2012-01-12 14:51:49 +05:30
Thibault Delavallée 650c9cc56e [MERGE] survey: fixed bug 914208: removed dynamic sequence calculation not working in web client and making client crash by removing o2m referencing themselves in context. Also removed now unused data_get method. 
bzr revid: tde@openerp.com-20120112090258-kl5g5sb7hn906i27
 2012-01-12 10:02:58 +01:00
Xavier Morel 12e3ef7fbf [IMP] add lazier proxy method on CallbackEnabled, use it in WebClient and ListView 
bzr revid: xmo@openerp.com-20120112084910-6fxbzbgmv51utyko
 2012-01-12 09:49:10 +01:00
Vo Minh Thu c92b29e3f9 [FIX] gunicorn.conf.py: undo the previous change (commited by mistake with another, intended, change). 
bzr revid: vmt@openerp.com-20120112084842-1xqal5okrmuhyxsu
 2012-01-12 09:48:42 +01:00
Vo Minh Thu 5089a678cb [IMP] res_users.login(): eliminate a possibility to get a transaction rollbacked 
because of concurrent access. This can happen when the same user is trying to log in
from many clients concurrently.

bzr revid: vmt@openerp.com-20120112084030-kkz1aztp5t6vkbh9
 2012-01-12 09:40:30 +01:00
Harry (OpenERP) cdabe44260 [IMP] purchase: remove unused method 
bzr revid: hmo@tinyerp.com-20120112071856-zh0bl7tn7zv0x21i
 2012-01-12 12:48:56 +05:30
Harry (OpenERP) 2c6418bde6 [MERGE] merged with trunk development branch 
bzr revid: hmo@tinyerp.com-20120112070927-liv9yfctl4wo5i08
 2012-01-12 12:39:27 +05:30
Harry (OpenERP) a4eb2a04b5 [REF] purchase: refactor product_id_change and rename with onchange_product_id 
bzr revid: hmo@tinyerp.com-20120112070240-zgsic6tjiy7j7g30
 2012-01-12 12:32:40 +05:30
Nimesh (Open ERP) afd266bf6a [FIX]import_google: i have change the external_id_field in initialize. 
bzr revid: nco@tinyerp.com-20120112061636-xw78p1gog5til567
 2012-01-12 11:46:36 +05:30
Mayur Maheshwari (OpenERP) cc1712f620 [IMP]account_followup: added a separator & nolabel on text field and set a separator above on text area 
bzr revid: mma@tinyerp.com-20120112061108-njj8qwiotblkt1oz
 2012-01-12 11:41:08 +05:30
Launchpad Translations on behalf of openerp a2895b719f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20120111044006-ehpf8voofuo20mzc
bzr revid: launchpad_translations_on_behalf_of_openerp-20120112054003-82qy0l7x1jbboc9r
bzr revid: launchpad_translations_on_behalf_of_openerp-20120112054058-8hdv1vhku59lbgb3
bzr revid: launchpad_translations_on_behalf_of_openerp-20120112060622-vns7g4vc2v6thkme
 2012-01-12 06:06:22 +00:00
Mayur Maheshwari (OpenERP) 3399221f62 [IMP]mrp: added a domian on product field 
bzr revid: mma@tinyerp.com-20120112054438-e6w60ghk1i26l0ym
 2012-01-12 11:14:38 +05:30
Kuldeep Joshi (OpenERP) 08d728e05c [IMP] survey: remove o2m field from context 
bzr revid: kjo@tinyerp.com-20120112053524-cepe03223ac1eyds
 2012-01-12 11:05:24 +05:30
Xavier Morel 88eb2db8f9 [FIX] doc typo 
bzr revid: xmo@openerp.com-20120111162923-v1icuslj5jtcfme8
 2012-01-11 17:29:23 +01:00
Fabien Meghazi cd24ca9485 [IMP] Avoid overflow of large menu items 
bzr revid: fme@openerp.com-20120111160746-c995eu97zi9eia3p
 2012-01-11 17:07:46 +01:00
Fabien Meghazi 36ff9d800f [IMP] Restyling of the config todo list 
bzr revid: fme@openerp.com-20120111155933-bh30vkmnxx53wrka
 2012-01-11 16:59:33 +01:00
Raphael Collet 7c19651b79 [MERGE] crm_claim: small fix in view 
bzr revid: rco@openerp.com-20120111151134-otcm22hc4dlr6msf
 2012-01-11 16:11:34 +01:00
Raphael Collet c209340237 [MERGE] stock: fix upstream/downstream traceability actions on stock.tracking form 
bzr revid: rco@openerp.com-20120111150942-1n1uvga1mcenlmhw
 2012-01-11 16:09:42 +01:00
Raphael Collet 28cd00faff [MERGE] document: fix spelling 
bzr revid: rco@openerp.com-20120111150047-wk95ms1h2hg2cipq
 2012-01-11 16:00:47 +01:00
Thibault Delavallée d7495a1fce [MERGE]: crm_meeting: added fields in tree view, because inheritance by import_google make it crash 
bzr revid: tde@openerp.com-20120111145731-wv4jcrzu9c790hbz
 2012-01-11 15:57:31 +01:00
Raphael Collet 8a5e65e136 [IMP] mrp: code cleanup 
bzr revid: rco@openerp.com-20120111145015-p7dyajf516izv97c
 2012-01-11 15:50:15 +01:00
Xavier Morel 927cd5135a [IMP] add explanation as to why the preferences dialog reloads the page instead of reloading just the web client (session and menus) 
bzr revid: xmo@openerp.com-20120111144443-a9cbbysgkxrukqub
 2012-01-11 15:44:43 +01:00
Xavier Morel ca493e5481 [FIX] button order in preferences dialog 
bzr revid: xmo@openerp.com-20120111144345-8n63z50gic7m0d3w
 2012-01-11 15:43:45 +01:00
Xavier Morel c7cae917d0 [FIX] implicit global 
bzr revid: xmo@openerp.com-20120111144327-s1vox3q1hdpufxmz
 2012-01-11 15:43:27 +01:00
Raphael Collet f5d9ff5ba9 [MERGE] stock: fix 'split into production lots', raise error when quantity exceeds available quantity 
bzr revid: rco@openerp.com-20120111143956-a5c3pr3ffltuw201
 2012-01-11 15:39:56 +01:00
Xavier Morel 79845e5e1d [IMP] attach old callback to webclient reloading 
bzr revid: xmo@openerp.com-20120111143502-n1dl41qm74v6uj4i
 2012-01-11 15:35:02 +01:00
Xavier Morel c1b26ed89d [FIX] WebClient.do_reload's deferred chain, split session reloading and session init 
that way we don't try to reload all addons every time, not sure it's the best idea though, we'll see

bzr revid: xmo@openerp.com-20120111143144-akq23gtyuxfdq6z9
 2012-01-11 15:31:44 +01:00
niv-openerp a03bd12a44 [fix] problem in o2m 
bzr revid: nicolas.vanhoren@openerp.com-20120111143712-fln5ddnfobp84ieb
 2012-01-11 15:37:12 +01:00
Thibault Delavallée ae95d87a22 [MERGE] leads: fixed broken 'convert to opportunity' button in tree view. Also modified button icon. 
bzr revid: tde@openerp.com-20120111142608-yz2ndtn5os6y1ovi
 2012-01-11 15:26:08 +01:00
Fabien Meghazi 5f3e6fdd9e [IMP] Disable right click on m2o button 
bzr revid: fme@openerp.com-20120111140222-cirxtmubrma6qj9b
 2012-01-11 15:02:22 +01:00
Stephane Wirtel 6d64acd8b6 [FIX] pass the rpm bdist packaging 
bzr revid: stw@openerp.com-20120111135851-xsge7gtze1jf4gml
 2012-01-11 14:58:51 +01:00
Thibault Delavallée 20ed63d598 [IMP] Refactored _altern_si_so code. Added limits to searches. Code now validates only new data, not all past data. Cleaned algorithm documentation. 
bzr revid: tde@openerp.com-20120111130121-8bcgnjt233nv0izj
 2012-01-11 14:01:21 +01:00
Thibault Delavallée 7fd25b30f3 [MERGE] Merged with trunk addons 
bzr revid: tde@openerp.com-20120111125555-04w1yb6ixiewz4yl
 2012-01-11 13:55:55 +01:00
vishmita fb7d6b2111 [FIX]attachment without fname_attachment. 
lp bug: https://launchpad.net/bugs/909069 fixed

bzr revid: vja@vja-desktop-20120111125501-3jh2u9oyvt92ble9
 2012-01-11 18:25:01 +05:30
Fabien Meghazi 946b33ad9c [FIX] Binary Field shouldn't load all base64 data when the object data is loaded 
lp bug: https://launchpad.net/bugs/914272 fixed

bzr revid: fme@openerp.com-20120111124911-73ee4heyy8xqq4zp
 2012-01-11 13:49:11 +01:00
Kuldeep Joshi (OpenERP) bb310058cd [FIX] survey: set default_get method 
lp bug: https://launchpad.net/bugs/914208 fixed

bzr revid: kjo@tinyerp.com-20120111124845-sgqff6zxul3bbwh8
 2012-01-11 18:18:45 +05:30
Minh Tran ee54da8b90 Merge from trunk 
bzr revid: mit@openerp.com-20120111122421-5mywxemtnp0e7an8
 2012-01-11 13:24:21 +01:00
Minh Tran 0d64d9940d Added padding to dashboard action content 
bzr revid: mit@openerp.com-20120111122147-6296xy0i7h7lm71v
 2012-01-11 13:21:47 +01:00
Mayur Maheshwari (OpenERP) eb6c9087f2 [IMP]crm: added a email_from field in convert_opportunity method 
bzr revid: mma@tinyerp.com-20120111120122-8kneus873a5mhsl9
 2012-01-11 17:31:22 +05:30
Mayur Maheshwari (OpenERP) 7438ed5e88 [IMP]auction: remove a separator 
bzr revid: mma@tinyerp.com-20120111114837-joly8423b415k31o
 2012-01-11 17:18:37 +05:30
Fabien Meghazi 57bc6ec7d0 [IMP] Change uservoice javascript due to web client's Dataset refactoring in Rev#1930 
bzr revid: fme@openerp.com-20120111112120-sxq5zvz489zvanfx
 2012-01-11 12:21:20 +01:00
Fabien Meghazi 37f923fb0f [REM] Refactored Dataset. Removed callbacks for #read_ids, #read_slice, #read_index and #default_get 
Added options argument where needed

bzr revid: fme@openerp.com-20120111111539-wr0afax30sf66rmk
 2012-01-11 12:15:39 +01:00
Roberto López López (OpenERP) 45a9b89cf4 [IMP] content management configuration should be accesible by all content management group members 
bzr revid: rlo@openerp.com-20120111111028-y76miqurbaghbafo
 2012-01-11 12:10:28 +01:00
Minh Tran ce2202a823 Merge from trunk 
bzr revid: mit@openerp.com-20120111110803-pcizwc2x9w51tsdx
 2012-01-11 12:08:03 +01:00