pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,090 Commits 1 Branch 0 Tags
cf4fda9764694592adbddadbf4e32d9d3d00a06d
Commit Graph
28090 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rucha (Open ERP) f6ac1c8b3a [MERGE]: Merge with lp:openobject-addons/trunk 
bzr revid: rpa@tinyerp.com-20110204051443-mgds0d0a2p0g929e
bzr revid: rpa@tinyerp.com-20110207044401-ta35237c3413x2u1
 2011-02-07 10:14:01 +05:30
tfr 68a53bd4a8 [FIX] merge opportunities according to specification 
bzr revid: tfr@openerp.com-20110207004729-fa7stlyq9qnctjgi
 2011-02-07 01:47:29 +01:00
tfr 8cbf5bc1f1 [FIX] previous stage didn't worked 
bzr revid: tfr@openerp.com-20110206231647-dg5f50am7wsuuz7g
 2011-02-07 00:16:47 +01:00
tfr 810204d16a [IMP] Convert to opportunity convert if no opportunity for a given partner 
bzr revid: tfr@openerp.com-20110206215240-cvsliu757hh5hq5z
 2011-02-06 22:52:40 +01:00
tfr fac1d52e2e [IMP] Convert to opportunity merge with opportunity with the link partner 
bzr revid: tfr@openerp.com-20110206212834-pkhlzurbdxznntsd
 2011-02-06 22:28:34 +01:00
Thibault Francois ad1aad1eac [FIX] convert before merging 
bzr revid: tfr@openerp.com-20110206185459-2waxg7itl5j2puvz
 2011-02-06 19:54:59 +01:00
Olivier Dony 87a1392f99 [IMP] osv: added test for parent_store computations + fix for another edge case 
The yaml test create a tree structure and modifies it by copying nodes
around and then moving them, checking that the child_of operator keeps
working afterwards. This test caught another edge case, as a follow-up
to the case of bug 708603

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

bzr revid: odo@openerp.com-20110205004316-zaw9qqfke1bcw0s7
 2011-02-05 01:43:16 +01:00
Thibault Francois 84fece6cf2 [MERGE] improvement geoassign 
bzr revid: tfr@openerp.com-20110204151427-jph6qduupj5gsyo0
 2011-02-04 16:14:27 +01:00
Thibault Francois 8b012aaad0 [ADD] group by partner 
bzr revid: tfr@openerp.com-20110204151054-ktedkrckk9pbw8kr
 2011-02-04 16:10:54 +01:00
Sbh (OpenERP) 50c30e573e [MERGE] 
bzr revid: sbh@tinyerp.com-20110204134351-xqi7k1222183x7e5
 2011-02-04 19:13:51 +05:30
psi (Open ERP) 9010bd5cc9 [MERGE] merge with dev-addons3 
bzr revid: psi@tinyerp.co.in-20110204132444-3upwmphirbzhc0uy
 2011-02-04 18:54:44 +05:30
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
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
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
jam-openerp 9eb5312f49 [IMP] thunderbird : implement https for thudnerbird 
bzr revid: jam@tinyerp.com-20110204091922-fuk3dqyf9ollth8y
 2011-02-04 14:49:22 +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
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
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
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
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
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
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
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
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
mtr fd9ad72a06 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3 
bzr revid: mtr@mtr-20110203102356-cejx2a2ltw9rgthc
 2011-02-03 15:53:56 +05:30
Ravindra Mekhiya (OpenERP) cda4b2cea3 [IMP] crm: Added group by partner when crm_parter_assign is installed. 
bzr revid: uco@tinyerp.com-20110203102325-alvauhlh4bmmoj7k
 2011-02-03 15:53:25 +05:30
mtr 94c626ed9a [FIX] hr_attendance:Attendance by month report now prints minutes also 
lp bug: https://launchpad.net/bugs/711533 fixed

bzr revid: mtr@mtr-20110203101717-2hr3a3q83fto442h
 2011-02-03 15:47:17 +05:30
psi (Open ERP) 43b097f7dd [ADD, IMP] account: changes in my last commite as per merge suggetion(New Opening and Miscellaneous journal) 
bzr revid: psi@tinyerp.co.in-20110203101630-rvzgahp15111jf8s
 2011-02-03 15:46:30 +05:30
Sbh (OpenERP) bacd2755dc [Fix] crm: fix lead is link with a partner, deleting this partner do not erase phone number email 
bzr revid: sbh@tinyerp.com-20110203101220-nyj0rkabjvjvj49m
 2011-02-03 15:42:20 +05:30
Mustufa Rangwala 8c316dca64 [FIX] Account: Add company on period and fiscalyear tree view with multicompany group 
lp bug: https://launchpad.net/bugs/711998 fixed

bzr revid: mra@mra-laptop-20110203092255-qpprxha1wur2br98
 2011-02-03 14:52:55 +05:30