odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
67,563 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

61 Commits

Author SHA1 Message Date
Olivier Dony 49597f0e66 [MERGE] *: improved english wording, suggestions courtesy of OpenERP Community 
bzr revid: odo@openerp.com-20121221164808-kdjrtcbgma4dr3on
 2012-12-21 17:48:08 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace. 
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
 2012-12-06 15:56:32 +01:00
Arnaud Pineux 7b76c5216e [MERGE] fix the phone call to opportunity to quotation 
lp bug: https://launchpad.net/bugs/1017353 fixed

bzr revid: api@openerp.com-20121113134911-gd4o1zj6ixtu83hm
 2012-11-13 14:49:11 +01:00
Mayur Maheshwari (OpenERP) e6541e7791 [MERGE]: Merge with lp:openobject-addons 
bzr revid: mma@tinyerp.com-20120823123824-6yot4cwpejdmdrdz
 2012-08-23 18:08:24 +05:30
Fabien Pinckaers b62858e83e [IMP] Merging different ways of posting a message: 
message_append_note
  message_append_dict
  message_append
  --> merged all to message_post

bzr revid: fp@tinyerp.com-20120817100302-bqsqv23ogrchslew
 2012-08-17 12:03:02 +02:00
Antonin Bourguignon fe5956057a [FIX] spelling: 'insufficient data' instead of 'data insufficient' 
bzr revid: abo@openerp.com-20120807102326-sro2nxr4zn95zhs1
 2012-08-07 12:23:26 +02:00
Stephane Wirtel 6a92f8856b [FIX] sale_crm: Rename 'Close Opportunity' to 'Mark Won' 
bzr revid: stw@openerp.com-20120803074013-4lzh8092oiu7xdcd
 2012-08-03 09:40:13 +02:00
Divyesh Makwana (Open ERP) 789103e93b [IMP] crm, sale_crm : Change the field defination of 'categ_id' to many2many and its related changes. 
bzr revid: mdi@tinyerp.com-20120706110621-nkgcqllbw1wpf1r6
 2012-07-06 16:36:21 +05:30
Mayur Maheshwari (OpenERP) 4a8e00cac7 [FIX]base:fix the issue convert to quote is not working via Scheduled Calls 
lp bug: https://launchpad.net/bugs/1017353 fixed

bzr revid: mma@tinyerp.com-20120625065109-5ciy82syodgtbcg9
 2012-06-25 12:21:09 +05:30
Ankita Patel (OpenERP) 26a39a6d0c [FIX]sale_crm: update context 
bzr revid: pat@tinyerp.com-20120619121016-quk5kem1eud7ddro
 2012-06-19 17:40:16 +05:30
Stephane Wirtel d36169b906 [REF] Review some form views with the guide lines 
bzr revid: stw@openerp.com-20120613090657-xfz9vtvqek3znqdr
 2012-06-13 11:06:57 +02:00
Thibault Delavallée 2742e2ac20 [CLEAN] Cleaned code. 
bzr revid: tde@openerp.com-20120403073533-8fc8w6o1c81wyt2h
 2012-04-03 09:35:33 +02:00
Bhumi Thakkar (Open ERP) b655344971 [MERGE] merge trunk-social-tde branch. 
bzr revid: bth@tinyerp.com-20120402110518-q9vjn5m7jujsejhx
 2012-04-02 16:35:18 +05:30
Sbh (Open ERP) c16e8182c0 [Fix] sale_crm: remove unused field 
bzr revid: kjo@tinyerp.com-20120321114227-mkm1rtuoplnfq339
 2012-03-21 17:12:27 +05:30
Bhumi Thakkar (Open ERP) edba2af7a2 [FIX] Improved language in notifications(present perfect simple with passive form) and imrpoved coding style. 
bzr revid: bth@tinyerp.com-20120312103420-hy4ln4pw0376173r
 2012-03-12 16:04:20 +05:30
Bhumi Thakkar (Open ERP) b57da53738 [IMP] removed need_action_user_id from message_append_note function when calling and overwrite get_needaction_user_id method. 
bzr revid: bth@tinyerp.com-20120309111644-7nzhptccx77dz996
 2012-03-09 16:46:44 +05:30
Bhumi Thakkar (Open ERP) c763083fc4 [FIX] remove lead and opportuniy name from notification messages,apply bold tag on stages,put quotation name when converted in quotation from opportunity,put need action only in create and open stage. 
bzr revid: bth@tinyerp.com-20120228074527-j53q7ulkyhb1uxib
 2012-02-28 13:15:27 +05:30
Bhumi Thakkar (Open ERP) cafffbfb46 [FIX] Remove <em> and <b> tags from notification messages it is not working so removed. 
bzr revid: bth@tinyerp.com-20120228055537-asmg2uiuuwssgpex
 2012-02-28 11:25:37 +05:30
Bhumi Thakkar (Open ERP) c232373c4b [IMP] notification coming when state change from pending to open,in progress message is changed,remove need_action_user_id from system notification,format apply on notification,for pending notification type is checked whether it is lead or opportunity,message modified for escalate,in _merge_notification(), replace message_append with message_append_note in crm_lead.py,in _convert_opportunity_notification(), replace message_append with message_append_note in crm_lead.py, remove log and _send_mail_to_salesman(),in write() replace log with message_append_note and remove message_append(),add message_ids and message_ids_social field in crm lead view of xml,replace log with message_append_note from sale_crm/wizard/crm_make_sale.py. 
bzr revid: bth@tinyerp.com-20120227072313-etqyoji7101k1zvs
 2012-02-27 12:53:13 +05:30
Olivier Dony da84f36eb4 [FIX] all: update context_today calls after API change 
See also server revision 4053
revision-id: odo@openerp.com-20120214122413-rznpdyqajrzswk4o

bzr revid: odo@openerp.com-20120214122520-f4lyaoolw1sik7zo
 2012-02-14 13:25:20 +01:00
Olivier Dony 5fc1a9fc7b [FIX] all: use newly introduced fields.date.context_today 
Following the introduction of fields.date.context_today,
correct the main cases where we need to use the user's
timezone instead of the default UTC one.
There are probably many minor cases where this may be
useful, but those cases should be easy to fix now
that there is a common way to fix them.

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

bzr revid: odo@openerp.com-20120213180741-4hvd4p7wsep0fomf
 2012-02-13 19:07:41 +01:00
Numerigraphe - Lionel Sausin 779fa653c1 [IMP] Added missing vim mode lines 
lp bug: https://launchpad.net/bugs/524279 fixed

bzr revid: ls@numerigraphe.fr-20111122085138-x6u2lcl6vrpyybp9
 2011-11-22 09:51:38 +01:00
Antony Lesuisse a206306d23 [MERGE] polish1 (stw) 
bzr revid: al@openerp.com-20111108225914-4ivtczbmyqk96na7
 2011-11-08 23:59:14 +01:00
Stephane Wirtel f24c63436c [IMP] sale_crm: Set the reference of the sale order in the opportunity when we convert the opp to so 
bzr revid: stw@openerp.com-20111026140445-db4vd7dho7b3nh27
 2011-10-26 16:04:45 +02:00
Olivier Dony 2f543db06e [IMP] mail: cleanup/rename API + adapt dependencies (wip) 
bzr revid: odo@openerp.com-20110825122757-0mqr0gbol25t0n41
 2011-08-25 14:27:57 +02:00
Olivier Dony 50507512cb [MERGE] latest trunk 
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.

bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
 2011-08-10 01:44:28 +02:00
Jacques-Etienne Baudoux d8c9f67865 [IMP] add category in sale order and copy category from opportunity to sale order when creating a quote from an opportunity 
lp bug: https://launchpad.net/bugs/791151 fixed

bzr revid: jba@openerp.com-20110601102501-5ofq4jyb72u6lqo6
 2011-06-01 12:25:01 +02:00
Rifakat Haradwala (Open ERP) 4b2f93cb34 [FIX]: removed method _history() and called history() instead 
bzr revid: rha@tinyerp.com-20110421091915-fw1sr549av69mm4b
 2011-04-21 14:49:15 +05:30
Quentin (OpenERP) 8295f3125f [MERGE] lp:684741 
bzr revid: qdp-launchpad@openerp.com-20110317173316-1nwca68kko2dlu1c
 2011-03-17 18:33:16 +01:00
Jigar Amin 50fd414738 [BUG/FIX] lp:732518 sale_crm : Covert to Quote shoud show only list of Customers 
lp bug: https://launchpad.net/bugs/732518 fixed

bzr revid: jam@tinyerp.com-20110311125535-l3trf4ykjpn48qax
 2011-03-11 18:25:35 +05:30
Rifakat Haradwala (Open ERP) 64f9d7e94f [IMP] : base_module_quality, crm, email_template, mail_gateway, sale_crm, share: string formatting 
bzr revid: rha@tinyerp.com-20110308112208-40jbv5er9w21xiw0
 2011-03-08 16:52:08 +05:30
jam-openerp a7789b2083 MERGE + Wizard return Improvments 
bzr revid: jam@tinyerp.com-20101228104138-70p7kwpby3bxgu0r
 2010-12-28 16:11:38 +05:30
Mustufa Rangwala b0f61a9546 [MERGE] merge from trunk addons 
bzr revid: mra@mra-laptop-20101214130232-wqsim6966u1hilu9
bzr revid: mra@mra-laptop-20101217043732-ri8dfx38pacpruye
 2010-12-17 10:07:32 +05:30
uco (OpenERP) d827b2f6ea [REF]: Added remaining context changes in _constraints. Removed unnecessary checking for context from methods. 
bzr revid: uco@tinyerp.com-20101213064309-vg36f1510xv2f8zb
 2010-12-13 12:13:09 +05:30
Mustufa Rangwala 7b390b3c81 [FIX] Sale_*: Misc improvements (tooltips,strings...etc) 
lp bug: https://launchpad.net/bugs/687463 fixed

bzr revid: mra@mra-laptop-20101213060723-3yvidr2b3x9n4q6n
 2010-12-13 11:37:23 +05:30
uco (OpenERP) 6dd290e824 [REF]: Replace the condition 'if not context' with 'if context is None'. 
bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn
 2010-11-23 12:35:05 +05:30
pso 471572043d [IMP] sale modules: Cleaning modules 
bzr revid: pso@tinyerp.com-20101022072346-ud8khvwiwhcjpcga
 2010-10-22 12:53:46 +05:30
vth cc93971022 [REF] sale 
bzr revid: vth@tinyerp.com-20101015121122-qj7pv8rcd0jg81rr
 2010-10-15 17:41:22 +05:30
rpa (Open ERP) ed9dc2a01c [FIX]: crm, sale_crm: Fixed pylint warnings 
bzr revid: rpa@tinyerp.com-20101011060213-yd9g5nfzg4wg0i4o
 2010-10-11 11:32:13 +05:30
rpa (Open ERP) 7eb77dafb9 [MERGE]: Merge with lp:openobject-addons 
bzr revid: rpa@tinyerp.com-20101011051327-28nxc8ok6ofxxn19
 2010-10-11 10:43:27 +05:30
fp 8cb8b0af2b [IMP] useability improvmeents misc 
bzr revid: fp@fp-laptop-20101010173239-4563xgh24q2jt0lt
 2010-10-10 19:32:39 +02:00
qdp-launchpad@tinyerp.com 911e541195 [MERGE] merged with main addons branch 
bzr revid: qdp-launchpad@tinyerp.com-20101008160635-ucfw3c7uwudt4csb
 2010-10-08 18:06:35 +02:00
Fabien Pinckaers 900be54ed6 [IMP] misc useability improvements 
bzr revid: fp@tinyerp.com-20101008144049-2deun7vlgd6ek1be
 2010-10-08 16:40:49 +02:00
rpa (Open ERP) 924d95427a [IMP]: sale_crm: Created history when opportunity is converted into quotation 
bzr revid: rpa@tinyerp.com-20101008071242-vqbezmuq76e6sbcb
 2010-10-08 12:42:42 +05:30
Fabien Pinckaers 4a1157c057 [IMP] useability improvements 
bzr revid: fp@tinyerp.com-20101005075418-0t33zy0trdmiwbfj
 2010-10-05 09:54:18 +02:00
rpa (Open ERP) 71a3990a04 [FIX]: Fixed pylint warnings 
bzr revid: rpa@tinyerp.com-20100927134403-d0xv04c0kkfkn724
 2010-09-27 19:14:03 +05:30
rpa (Open ERP) e6657edd35 [REF, IMP]: sale_crm: Code improvement, Removed unused code 
bzr revid: rpa@tinyerp.com-20100923135047-b55igfq4dg66xjzw
 2010-09-23 19:20:47 +05:30
rpa (Open ERP) 5490c9769a [MERGE]: Merge with lp:openobject-addons 
bzr revid: rpa@tinyerp.com-20100921104052-01ng5nrnv5acdjsu
 2010-09-21 16:10:52 +05:30
rpa (Open ERP) 2f9a1347cc [IMP]: sale_crm: Fixed partner address and default valu in Make sale wizard 
bzr revid: rpa@tinyerp.com-20100917133617-0qm90sn2wdpow8wu
 2010-09-17 19:06:17 +05:30
uco (Open ERP) 41613533df [MERGE] 
bzr revid: uco@tinyerp.com-20100909051553-0rzvp52mevlvdsl6
 2010-09-09 10:45:53 +05:30