Commit Graph
37875 Commits
Author SHA1 Message Date
Ujjvala Collins (OpenERP) 4d1df18faf [IMP] crm: Simplified convert to opportunity wizard and accordingly changed ymls.
bzr revid: uco@tinyerp.com-20110204130556-8q3eahvrrbmdiwj0
2011-02-04 18:35:56 +05:30
Yogesh (OpenERP) 64d9fddcb0 Improve code.
bzr revid: ysa@tinyerp.com-20110204130409-7kcs95olx5nzjd6h
2011-02-04 18:34:09 +05:30
rha@tinyerp.com 87ff4b3c97 [IMP] account: Improve osv memory wizards
bzr revid: rha@tinyerp.com-20110204125809-yuiqwhpoy0j1cyfb
2011-02-04 18:28:09 +05:30
jam-openerp f7c77da28c [MERGE]with addons1-crm-imp
bzr revid: jam@tinyerp.com-20110204125151-xfc4mgh6xxvmwktl
2011-02-04 18:21:51 +05:30
Mustufa Rangwala 8f43d299d0 [FIX] POS: Lots in POS => Add product lot on pos order line for validate pos order for product which has tracking outgoing set to true
lp bug: https://launchpad.net/bugs/710561 fixed

bzr revid: mra@mra-laptop-20110204113247-732fgockzszz7n6k
2011-02-04 17:02:47 +05:30
Yogesh (OpenERP) ef5907f8be [IMP] improve onchange method. merge 3 method in 1 method. old method keep in comment.
bzr revid: ysa@tinyerp.com-20110204112851-q10tg2fgxpghbuof
2011-02-04 16:58:51 +05:30
Sbh (OpenERP) d995f834a2 [MERGE] Rewrite Merge opportunity wizard
bzr revid: sbh@tinyerp.com-20110204110709-759ebbto3w3xhxl9
2011-02-04 16:37:09 +05:30
Ujjvala Collins (OpenERP) b3850d1e78 [FIX] crm: Fixed merge opportunity wizard problem occurred in form view.
bzr revid: uco@tinyerp.com-20110204105626-qwhzwg5vvyk5iwlm
2011-02-04 16:26:26 +05:30
Thibault Francois b578de61c0 [IMP] assign salesman to opportunity and put is email in cc whil geoassignement
bzr revid: tfr@openerp.com-20110204103435-nzy8zhbp2yeyh935
2011-02-04 11:34:35 +01:00
aag (OpenERP) d94b60c23f [IMP] Board: Add context and chech for Read method is working
bzr revid: aag@tinyerp.co.in-20110204102910-y70hzv9cwweecknp
2011-02-04 15:59:10 +05:30
Mustufa Rangwala 51e3c0dff5 [MERGE] Account: accounting: improve the generation of journals and periods => backlog 991 id
bzr revid: mra@mra-laptop-20110204102049-2d80e0kr6vhk00el
2011-02-04 15:50:49 +05:30
Yogesh (OpenERP) dd448a6fd3 Fix in eamil_template module.
bzr revid: ysa@tinyerp.com-20110204101925-aawudln986xnmss5
2011-02-04 15:49:25 +05:30
Yogesh (OpenERP) 6bdf56a973 [MERGE] Merge with lp:openobject-addons
bzr revid: ysa@tinyerp.com-20110204092456-t9lequsjqs7pk1vz
2011-02-04 14:54:56 +05:30
jam-openerp 9eb5312f49 [IMP] thunderbird : implement https for thudnerbird
bzr revid: jam@tinyerp.com-20110204091922-fuk3dqyf9ollth8y
2011-02-04 14:49:22 +05:30
Yogesh (OpenERP) feb630b75f Remove history domain in partner in eamil module.
bzr revid: ysa@tinyerp.com-20110204091248-wnzm7ft6cx3v34p1
2011-02-04 14:42:48 +05:30
Anup (OpenERP) 1891a28934 [FIX] mrp : Corrected Quantity Calculation when having different UoM in MO
lp bug: https://launchpad.net/bugs/709055 fixed

bzr revid: ach@openerp.com-20110204090309-4i0jjr2tfszrcdni
2011-02-04 14:33:09 +05:30
mtr 01a08c7a52 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20110204085111-0f0tlr3id2zsfu4b
2011-02-04 14:21:11 +05:30
Yogesh (OpenERP) da82b82b97 Keep unused code in comment. Improve email_template_send wizard in email_template module.
bzr revid: ysa@tinyerp.com-20110204085048-zdkvb2y83lnnz83t
2011-02-04 14:20:48 +05:30
mtr 90fe3e95fe [FIX] hr_attendance:'Attendance by month' and 'Weekly Attendance' report now prints minutes also
lp bug: https://launchpad.net/bugs/711533 fixed

bzr revid: mtr@mtr-20110204084725-y2kjj4arrnv62zds
2011-02-04 14:17:25 +05:30
jam-openerp d22de0cba9 [MERGE] with trunk-dev-addons1
bzr revid: jam@tinyerp.com-20110204074507-cd2kv0w1cwtdo444
2011-02-04 13:15:07 +05:30
aag (OpenERP) 6af654f7bf [IMP] survey: Add context and chech for Read method is working
bzr revid: aag@tinyerp.co.in-20110204074305-tscrng9ju5sha0zv
2011-02-04 13:13:05 +05:30
Yogesh (OpenERP) 7d9d3c5611 [IMP] replace mail_gateway to email_gateway module in dependancy of module.
bzr revid: ysa@tinyerp.com-20110204065627-sfir225ag1bzwgay
2011-02-04 12:26:27 +05:30
Dhruti(OpenERP) 5914731fb5 [FIX] Sale_crm : Correction the inheritance of views,made by string. (Ref:SaaS maintenance Case 3974)
bzr revid: jvo@tinyerp.com-20110204063243-33yu7bgb4271ox07
2011-02-04 12:02:43 +05:30
YSA (Openerp) 5140ae0d98 [IMP] add email module depedancy in related module.
bzr revid: ysa@tinyerp.com-20110204062934-yf8in8dzu15vdmeh
2011-02-04 11:59:34 +05:30
YSA (Openerp) bbdac458fd [IMP] call email_send method of email.message object insted of tools.
bzr revid: ysa@tinyerp.com-20110204061819-bb3p94bs7og680je
2011-02-04 11:48:19 +05:30
psi (Open ERP) 4c9e34cbd3 [MERGE] merge with dev-addons3
bzr revid: psi@tinyerp.co.in-20110203103228-0ii7bxdk2bgtydxr
bzr revid: psi@tinyerp.co.in-20110204050801-t6w0b0s0xae7wkx7
2011-02-04 10:38:01 +05:30
Mustufa Rangwala 545bf5805b [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110204044842-i79i51jfk3ti97b6
2011-02-04 10:18:42 +05:30
Olivier Dony 1eca241d52 [MERGE] merged latest fixes from 6.0, up to rev 3334
bzr revid: odo@openerp.com-20110203230023-o2a0b5tovewu0ft2
2011-02-04 00:00:23 +01:00
Olivier Dony 22a2fc6aa6 [FIX] orm.write: avoid miscalculation of parent_left/right when moving multiple records under same parent
This issue caused the parent_left and parent_right values to be correct
only for the first record being update as part of a batch update on several
children from the same parent. An example of the consequences is the linked
bug 708503.

lp bug: https://launchpad.net/bugs/708603 fixed

bzr revid: odo@openerp.com-20110203225102-a7v8bv90l2ph5ujh
2011-02-03 23:51:02 +01:00
Olivier Dony 4900c41842 [REVERT] account: reverted incorrect fix for bug 708603, this is in fact a server error
Commit reverted was merged in rev 3164.118.782 mra@mra-laptop-20110131082002-xzx4v2adzdvv8nmg

lp bug: https://launchpad.net/bugs/708603 fixed

bzr revid: odo@openerp.com-20110203222026-ln6hmyivaj9bo11g
2011-02-03 23:20:26 +01:00
aag (OpenERP) 343374954b [MERGE]: Merge with lp:openobject-trunk-dev-addons2
bzr revid: aag@tinyerp.co.in-20110203142124-2x9dk2jaf3c7x2w1
2011-02-03 19:51:24 +05:30
aag (OpenERP) 14dbf4d28e [IMP] stock: Add context and chech for Read method22
bzr revid: aag@tinyerp.co.in-20110203140403-bmtd0opgmq3iyq0n
2011-02-03 19:34:03 +05:30
rpa (Open ERP) 071ded9a1c [MERGE]: Merge with lp:~openerp-commiter/openobject-addons/trunk-addons-aag
bzr revid: rpa@tinyerp.com-20110203133418-oxt6aqy06rrfgrgg
2011-02-03 19:04:18 +05:30
Sbh (OpenERP) 04eee480eb [MERGE] Merge lp:lp:710723
bzr revid: sbh@tinyerp.com-20110203132639-psx4icipc0hnoesz
2011-02-03 18:56:39 +05:30
YSA (Openerp) e9e229568b [IMP] email_template :- generate template to message then donot send the mail bug set state waiting and put in outbox folder.
bzr revid: ysa@tinyerp.com-20110203132617-sx55sje74w765qsx
2011-02-03 18:56:17 +05:30
rpa (Open ERP) f5ee528cdd [MERGE]: Merge with lp:~openerp-dev/openobject-addons/ron-dev-addons2
bzr revid: rpa@tinyerp.com-20110203131953-9ozr4imdr1i0qwno
2011-02-03 18:49:53 +05:30
YSA (Openerp) f140c853ca [IMP] import netsvc and define logger object for run_mail_scheduler method in email module.
bzr revid: ysa@tinyerp.com-20110203131743-0a8xb1bhm19vy4d8
2011-02-03 18:47:43 +05:30
rpa (Open ERP) 3a9316b52a [MERGE]: Merge with lp:~openerp-dev/openobject-addons/ksa-addons2
bzr revid: rpa@tinyerp.com-20110203131511-dan3b3e2l876xxbt
2011-02-03 18:45:11 +05:30
YSA (Openerp) 7efe625e33 [ADD] add template_id field in email_message and process_email_queue method override.
bzr revid: ysa@tinyerp.com-20110203131357-4tdrujcq3lh120v0
2011-02-03 18:43:57 +05:30
rpa (Open ERP) d40ed41564 [MREGE]: Merge with lp:~openerp-commiter/openobject-addons/dev-addons2-rha1
bzr revid: rpa@tinyerp.com-20110203130753-bz7xrrif5ez1uh2j
2011-02-03 18:37:53 +05:30
YSA (Openerp) c1d0c83373 [REM] remove account_id field in email.messae objects.
bzr revid: ysa@tinyerp.com-20110203125113-021wxjoxdyvbp9cn
2011-02-03 18:21:13 +05:30
YSA (Openerp) 4b2611c37b [IMP] create a spearate file of email_message and email_smtp_server objects in email module.
bzr revid: ysa@tinyerp.com-20110203124437-6lzousfrq6pr2m1v
2011-02-03 18:14:37 +05:30
aag (OpenERP) 7807995b54 [IMP] stock: Add context and chech for Read method
bzr revid: aag@tinyerp.co.in-20110203123747-0jcpq8xqlthstw2z
2011-02-03 18:07:47 +05:30
rpa (Open ERP) 23e5d00ed7 [MERGE]: Merge with lp:openobject-addons/trunk
bzr revid: ksa@tinyerp.co.in-20110202094655-rfuid6yr2g5r90hu
bzr revid: rpa@tinyerp.com-20110203123736-99ziw0tv74o1evy0
2011-02-03 18:07:36 +05:30
Sbh (OpenERP) 3065af1390 [MERGE] Merge lead and opportunity improvement
bzr revid: sbh@tinyerp.com-20110203113916-1mbceuk6yk84yat9
2011-02-03 17:09:16 +05:30
jam-openerp 399f791523 [MERGE] trunk-dev-addons1
bzr revid: jam@tinyerp.com-20110203112837-6151hhwh81qgn3a9
2011-02-03 16:58:37 +05:30
YSA (Openerp) 43878cbedb [IMP] improve view and menu in email and email_template module.
bzr revid: ysa@tinyerp.com-20110203112831-u3yq2pkv2fdxflgu
2011-02-03 16:58:31 +05:30
Mustufa Rangwala eff87b20ec [FIX] pos: [wizard: pos_payment] When you create invoices with different currencies set, the price is well mapped, but with the wrong currency
lp bug: https://launchpad.net/bugs/710462 fixed

bzr revid: mra@mra-laptop-20110203105528-0pe8uzhg0brgib58
2011-02-03 16:25:28 +05:30
YSA (Openerp) d5395059b6 [REM] remove marketing dependancy in email_template module.
bzr revid: ysa@tinyerp.com-20110203104456-gibuqz9ppe7v0ikv
2011-02-03 16:14:56 +05:30
YSA (Openerp) f4516dd2ac [ADD] add process_queue button in email.message.
bzr revid: ysa@tinyerp.com-20110203102459-u1jencznkp1a60c9
2011-02-03 15:54:59 +05:30