2376fe0add
[MERGE] merged view changes: the `type` is now a functional field derived from the arch.
...
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
b01fc5c9a2
[MERGE] lp:~openerp-dev/openobject-addons/trunk-addons-issues4-crm-pso
...
bzr revid: stw@openerp.com-20120810091332-c80h6kh3gc88mpt7
2012-08-10 11:13:32 +02:00
55da32ff65
[MERGE] Merged HSA's branch for sale_crm improvement
...
bzr revid: pso@tinyerp.com-20120809123606-7jrxaxqs9tqhvl2r
2012-08-09 18:06:06 +05:30
fc1b1749a8
[IMP]Remove type field from the modules
...
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
2012-08-09 11:35:16 +05:30
22a4b11322
[IMP]sale_crm : set the group on shop field
...
bzr revid: hsa@tinyerp.com-20120808112345-rqgdsncaghzq36nc
2012-08-08 16:53:45 +05:30
fe5956057a
[FIX] spelling: 'insufficient data' instead of 'data insufficient'
...
bzr revid: abo@openerp.com-20120807102326-sro2nxr4zn95zhs1
2012-08-07 12:23:26 +02:00
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
770df36345
[Merge] Merge with main addons.
...
bzr revid: mdi@tinyerp.com-20120711045811-fi5t79g6kk20wn8v
2012-07-11 10:28:11 +05:30
64a9321d56
[IMP] footer on forms
...
bzr revid: fp@tinyerp.com-20120710164011-unqi1okf2uu8yhts
2012-07-10 18:40:11 +02:00
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
5133bee1d5
[FIX] in form views, replace class 'oe_highlight_on_dirty' by 'oe_highlight'
...
bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
2012-06-29 10:30:24 +02:00
2963e31ebf
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120628142628-qi35145b8hsvpsfi
2012-06-28 16:26:28 +02:00
11224704cd
[FIX] purchase*, sale, share, report_webkit, buton cancel
...
bzr revid: jam@tinyerp.com-20120627134530-141mzncfffkmjrom
2012-06-27 19:15:30 +05:30
471037495c
[IMP]Apply css class flow on wizards buttons
...
bzr revid: tch@tinyerp.com-20120626063119-5i93di16milljxap
2012-06-26 12:01:19 +05:30
0e97cefe9e
[IMP]Improve wizard button
...
bzr revid: tch@tinyerp.com-20120625100901-ucjbttxod55erqmf
2012-06-25 15:39:01 +05:30
660cc67256
[IMP]Added highlight button on wizard
...
bzr revid: tch@tinyerp.com-20120620104923-z1hty740vn160fg9
2012-06-20 16:19:23 +05:30
26a39a6d0c
[FIX]sale_crm: update context
...
bzr revid: pat@tinyerp.com-20120619121016-quk5kem1eud7ddro
2012-06-19 17:40:16 +05:30
f3af6665cd
[IMP] sale_crm: remove cancel button and improved view of wizard.
...
bzr revid: tpa@tinyerp.com-20120615112725-xm98t0ifvkcmra95
2012-06-15 16:57:25 +05:30
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
1f885950b4
[FIX] headers
...
bzr revid: fp@tinyerp.com-20120609222849-gm9loztzarjyn7pl
2012-06-10 00:28:49 +02:00
fcc3896f5f
[IMP] form view, removed project_planning
...
bzr revid: fp@tinyerp.com-20120609203127-hzdb9tuua0dmydh0
2012-06-09 22:31:27 +02:00
2742e2ac20
[CLEAN] Cleaned code.
...
bzr revid: tde@openerp.com-20120403073533-8fc8w6o1c81wyt2h
2012-04-03 09:35:33 +02:00
b655344971
[MERGE] merge trunk-social-tde branch.
...
bzr revid: bth@tinyerp.com-20120402110518-q9vjn5m7jujsejhx
2012-04-02 16:35:18 +05:30
c16e8182c0
[Fix] sale_crm: remove unused field
...
bzr revid: kjo@tinyerp.com-20120321114227-mkm1rtuoplnfq339
2012-03-21 17:12:27 +05:30
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
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
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
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
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
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
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
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
a206306d23
[MERGE] polish1 (stw)
...
bzr revid: al@openerp.com-20111108225914-4ivtczbmyqk96na7
2011-11-08 23:59:14 +01:00
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
2f543db06e
[IMP] mail: cleanup/rename API + adapt dependencies (wip)
...
bzr revid: odo@openerp.com-20110825122757-0mqr0gbol25t0n41
2011-08-25 14:27:57 +02:00
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
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
4b2f93cb34
[FIX]: removed method _history() and called history() instead
...
bzr revid: rha@tinyerp.com-20110421091915-fw1sr549av69mm4b
2011-04-21 14:49:15 +05:30
8295f3125f
[MERGE] lp:684741
...
bzr revid: qdp-launchpad@openerp.com-20110317173316-1nwca68kko2dlu1c
2011-03-17 18:33:16 +01:00
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
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
a7789b2083
MERGE + Wizard return Improvments
...
bzr revid: jam@tinyerp.com-20101228104138-70p7kwpby3bxgu0r
2010-12-28 16:11:38 +05:30
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
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
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
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
471572043d
[IMP] sale modules: Cleaning modules
...
bzr revid: pso@tinyerp.com-20101022072346-ud8khvwiwhcjpcga
2010-10-22 12:53:46 +05:30
cc93971022
[REF] sale
...
bzr revid: vth@tinyerp.com-20101015121122-qj7pv8rcd0jg81rr
2010-10-15 17:41:22 +05:30
ed9dc2a01c
[FIX]: crm, sale_crm: Fixed pylint warnings
...
bzr revid: rpa@tinyerp.com-20101011060213-yd9g5nfzg4wg0i4o
2010-10-11 11:32:13 +05:30
Vo Minh Thu
Stephane Wirtel
pso (OpenERP)
Twinkle Christian (OpenERP)
Hardik
Antonin Bourguignon
Divyesh Makwana (Open ERP)
Fabien Pinckaers
Raphael Collet
Jigar Amin - OpenERP
Ankita Patel (OpenERP)
Turkesh Patel (Open ERP)
Thibault Delavallée
Bhumi Thakkar (Open ERP)
Sbh (Open ERP)
Olivier Dony
Numerigraphe - Lionel Sausin
Antony Lesuisse
Jacques-Etienne Baudoux
Rifakat Haradwala (Open ERP)
Quentin (OpenERP)
Mustufa Rangwala
uco (OpenERP)
vth
rpa (Open ERP)