Commit Graph
75490 Commits
Author SHA1 Message Date
ajay javiya (OpenERP) efde708175 [REM]: unwanted code
bzr revid: aja@tinyerp.com-20130625134700-3f4i7ev28304c0c3
2013-06-25 19:17:00 +05:30
ajay javiya (OpenERP) e7d4ca7a4c [MERGE]: sync with trunk
bzr revid: aja@tinyerp.com-20130625122338-v5rixk3s8kbv2v3b
2013-06-25 17:53:38 +05:30
ajay javiya (OpenERP) 3ca7bb5d62 [IMP]: clean lead cancel yml
bzr revid: aja@tinyerp.com-20130625121413-83rzmqxg1p1724uq
2013-06-25 17:44:13 +05:30
Thibault Delavallée c180afab26 [MERGE] [CLEAN] Idea: cleaned idea module, to be used for demo data / demonstration
- cleaned coding style
- cleaned model, views
- removed specific tool group
- added a kanban view
- added and improved demo data
- removed inheritance and reference to mail module; to be added back soon
- added basic folder and files for tests

bzr revid: tde@openerp.com-20130625114155-mzkipkriafhfll9f
2013-06-25 13:41:55 +02:00
Dhruti Shastri (OpenERP) aa4410a866 [sale_order_dates]: Dates Fields are assigned in Technical group(Case:594184)
bzr revid: dhs@tinyerp.com-20130625112336-we04wyjcww6tm90q
2013-06-25 16:53:36 +05:30
Thibault Delavallée 3f03d66354 [IMP] Idea: small imp of kanban view
bzr revid: tde@openerp.com-20130625111508-2man23lschgqm427
2013-06-25 13:15:08 +02:00
Thibault Delavallée 3e6693e731 [CLEAN] Misc cleaning
bzr revid: tde@openerp.com-20130625111110-awwcjpq00xhohz93
2013-06-25 13:11:10 +02:00
Denis Ledoux 0bca00c42c [FIX]google_docs: generic function moved in base account
bzr revid: dle@openerp.com-20130625105819-l8d2zu0vf4tzne2t
2013-06-25 12:58:19 +02:00
Thibault Delavallée 734d900207 [REM] Removed patches.
bzr revid: tde@openerp.com-20130625105452-u7uqmvo73pqjzsp6
2013-06-25 12:54:52 +02:00
Thibault Delavallée 41c5283116 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130625100253-2xh7lwzelf0zwkl9
2013-06-25 12:02:53 +02:00
Thibault Delavallée 742dc3f77d [MERGE] [IMP] Alias Improvement
mail_alias:
- alias_name is not required anymore (but still unique),
- added the concept of 'parent of alias' that is the record that owns the alias. For example project+RD is an alias whose parent is a project, and the aliased model is the project.task model (create alias). user+admin is an alias whose parent is the user, and whose aliased record is also the user (update alias).
- added 'alias_contact' selection field that holds the alias settings. Values are:
-- everyone: everyone can contact the alias; the behavior will be the same as before this revision
-- partners: only authenticated partners can contact the alias. If the author of an incoming emails is not a known partner, the email bounces.
-- followers: only followers of the record owning the alias can contact the alias. Otherwise the email bounces. For example on a project only project followers can create new tasks or issues using the alias. On a mail group, only group followers can discuss in the group using the alias.
- improved form view; added 'open document' and 'open parent document' buttons

mail:
- updated message_route to handle alias contact settings. There is notably a new message_route_verify method that performs various checks on the route (message_update / messsage_new attribute, related record, alias contact settings)
- added _find_partner_from_emails method that merge various partner finding methods that were present in mail_thread
- added some mail-related CSS coming from web
- added tests; removed duplicate tests introduced when merging saas-1 into trunk

crm.lead, hr.job, mail.group, res.users, project.project:
- updated create method overrides
- improved alias display in views (form and kanban if exists)

event: moved visibility field (public / employees) from portal_event to event module

bzr revid: tde@openerp.com-20130625094421-b4gv8lkzxn020oeh
2013-06-25 11:44:21 +02:00
Thibault Delavallée 3994ea12e9 [CLEAN] Misc cleaning before merging (some code cleaning, added comments).
bzr revid: tde@openerp.com-20130625092606-l8bqt3ce2xz4zm9t
2013-06-25 11:26:06 +02:00
ajay javiya (OpenERP) 648c017332 [IMP]: Test case for merge lead and opportunity
bzr revid: aja@tinyerp.com-20130625092346-neq1wnzufdjokkfr
2013-06-25 14:53:46 +05:30
Thibault Delavallée 62b0561a13 [MERGE] [IMP] Alias Improvement
Server branch: res.users: improved form view to ease email, login and email preferences clarification.

bzr revid: tde@openerp.com-20130625085406-d4l5uchpumv5adif
2013-06-25 10:54:06 +02:00
Thibault Delavallée 9b791c51d1 [MERGE] [IMP] Alias Improvement
Web branch: removed some mail-specific CSS that is now located in the mail module.

bzr revid: tde@openerp.com-20130625085350-eraevdv2odhkhkc8
2013-06-25 10:53:50 +02:00
niv-openerp 1f3b8129f7 [FIX] auth_openid: converted controllers to fit the new API
bzr revid: nicolas.vanhoren@openerp.com-20130625085007-6ylj5mzyzp9du5bs
2013-06-25 10:50:07 +02:00
Thibault Delavallée f4efff8ecb [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130625084653-0r3uezndvn18fc62
2013-06-25 10:46:53 +02:00
Thibault Delavallée d0aea936ac [CLEAN] Misc cleaning before merging, mainly in views
bzr revid: tde@openerp.com-20130625084630-oqlertvzxl8a8w7f
2013-06-25 10:46:30 +02:00
Thibault Delavallée 27ae6e25a2 [FIX] hr_recruitment: fixed view preventing from creating a new job
bzr revid: tde@openerp.com-20130625084621-smra6kdy7fj42o5d
2013-06-25 10:46:21 +02:00
ajay javiya (OpenERP) 730e2b44bb [IMP]: yml for crm merge lead
bzr revid: aja@tinyerp.com-20130625055843-0rogdox72xbsvww0
2013-06-25 11:28:43 +05:30
ajay javiya (OpenERP) 70a1f74269 [MERG] : sync with trunk
bzr revid: aja@tinyerp.com-20130625053539-afrjhv9f28zz48pl
2013-06-25 11:05:39 +05:30
Launchpad Translations on behalf of openerp 9102c2c512 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20130625051442-1chu4wdtgur1nub1
2013-06-25 05:14:42 +00:00
ajay javiya (OpenERP) 90e2ff1da7 [IMP]: clean yaml for crm,hr_recruitment and project task
bzr revid: aja@tinyerp.com-20130625050409-letmh3v98ca6nqob
2013-06-25 10:34:09 +05:30
Chirag Dodiya (OpenERP Trainee) 52cbc9ed3a [MERGE] merge with trunk server
bzr revid: chiragdd7@gmail.com-20130619120454-ax7ejguq1tpblcr0
bzr revid: chiragdd7@gmail.com-20130624053825-8he5eeg9yv9orx8c
bzr revid: chiragdd7@gmail.com-20130625044539-l16wdav0vzep8gq9
2013-06-25 10:15:39 +05:30
Thibault Delavallée e6ee1d315e [CLEAN] Misc cleaning before merging
bzr revid: tde@openerp.com-20130624162457-8y8eqwebwolvcdc6
2013-06-24 18:24:57 +02:00
Thibault Delavallée d7e5eb67bc [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130624160023-lhg92flym8svgo0l
2013-06-24 18:00:23 +02:00
Thibault Delavallée b3a928f78b [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130624160019-ef98nl9gqj57jydh
2013-06-24 18:00:19 +02:00
Thibault Delavallée 9f84cc4968 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130624160006-ndlo68bdmm3ndj21
2013-06-24 18:00:06 +02:00
niv-openerp f93d10957d [FIX] bad handling of werkzeug's exceptions
bzr revid: nicolas.vanhoren@openerp.com-20130624155634-d5b5998jv01fa1wh
2013-06-24 17:56:34 +02:00
Thibault Delavallée fd90140d7b [REF] mail_thread: refactored message_route improvement, to be closer to the original code + call to a new method that checks the route, instead of doing everything in one method.
bzr revid: tde@openerp.com-20130624151827-hxwaelefs540pvca
2013-06-24 17:18:27 +02:00
Denis Ledoux f4ac9a07a7 [FIX]account: fix of sxw of account_print_invoice, which was using o.address_invoice_id.partner_id instead of o.partner_id
bzr revid: dle@openerp.com-20130624145856-vz0d8oezyqoj7gou
2013-06-24 16:58:56 +02:00
Amit Bhavsar (Open ERP) 06fe2460d6 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130624141838-mevmot56188pkoeo
2013-06-24 19:48:38 +05:30
Amit Bhavsar (Open ERP) b9ed060fa8 [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130624141146-sq4rh2q3rqz67mcj
2013-06-24 19:41:46 +05:30
Denis Ledoux b4a9b23f8e [MERGE]upstream
bzr revid: dle@openerp.com-20130624135446-wqzbrpr2b4d13wm3
2013-06-24 15:54:46 +02:00
Amit Bhavsar (Open ERP) b35375cc4b [MERGE] merge with latest trunk
bzr revid: amb@tinyerp.com-20130624134518-lc8v8egz5tzomwzf
2013-06-24 19:15:18 +05:30
Denis Ledoux d40bc9b776 [FIX]google_base_account: typo. (stoi le gogole *priceless*)
bzr revid: dle@openerp.com-20130624133950-jcxv0nbn0ke6xzj0
2013-06-24 15:39:50 +02:00
Foram Katharotiya (OpenERP) e69c92554f [MERGE] with trunk
bzr revid: fka@tinyerp.com-20130620055021-sll6kxix7xhs02qq
bzr revid: fka@tinyerp.com-20130624050559-saso9gap2f1nelcj
bzr revid: fka@tinyerp.com-20130624133209-hofz15ydbip9gxem
2013-06-24 19:02:09 +05:30
bth-openerp c851ea40f6 [MERGE]Merge lp;openobject-addons.
bzr revid: bth@tinyerp.com-20130624132535-5r60013cyzie603n
2013-06-24 18:55:35 +05:30
bth-openerp 92ad09af86 [MERGE]Merge lp;openobject-addons.
bzr revid: bth@tinyerp.com-20130624132004-gnejudu8vdz3jkt1
2013-06-24 18:50:04 +05:30
Paramjit Singh Sahota 0e11737c3f [MERGE] Sync with lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130624131714-vvdfx8t3j2tf210p
2013-06-24 18:47:14 +05:30
Paramjit Singh Sahota bcadfb8383 [MERGE] Sync with lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130624131543-q5jao5toays4iqrx
2013-06-24 18:45:43 +05:30
Foram Katharotiya (OpenERP) 95d9bcce6c [MERGE] with trunk
bzr revid: fka@tinyerp.com-20130620044636-q4q2lxylcx605zms
bzr revid: fka@tinyerp.com-20130621045552-2x9142wov36lkb8x
bzr revid: fka@tinyerp.com-20130624045140-3uq5z920t51cnpkt
bzr revid: fka@tinyerp.com-20130624131337-nyzs74vi74kl4nu3
2013-06-24 18:43:37 +05:30
Paramjit Singh Sahota a19a887639 [MERGE] Sync with lp:openobject-addons.
bzr revid: psa@tinyerp.com-20130620051858-96jtajxo5qc51v3s
bzr revid: psa@tinyerp.com-20130624131046-m2fq48j84iyqzm2b
2013-06-24 18:40:46 +05:30
Martin Trigaux db6e3bb4df [MERGE] [FIX] OPW 590066 account: remove accounting information lines from Journal items
bzr revid: mat@openerp.com-20130624124418-r6fkvaokbfn3dvbg
2013-06-24 14:44:18 +02:00
Olivier Dony 9ad04d4e9b [FIX] report_webkit: writing to disk implies having bytes to write, convert the unicode Jinja2 output to UTF-8
Jinja2 always returns unicode strings

http://jinja.pocoo.org/docs/api/#jinja2.Template.render

bzr revid: odo@openerp.com-20130624122842-8gs8by3k8jn7bffx
2013-06-24 14:28:42 +02:00
niv-openerp 0b6b7d643d [FIX] auth_oauth: authentication problem with the new server-side web framework
bzr revid: nicolas.vanhoren@openerp.com-20130624095255-uj6702oq6601eql5
2013-06-24 11:52:55 +02:00
Thibault Delavallée 853951a9d6 [IMP] res.users: improved form view to ease email, login and email preferences clarification
bzr revid: tde@openerp.com-20130624093841-6vi3zjcz260dzuig
2013-06-24 11:38:41 +02:00
Quentin (OpenERP) ea03ed65b6 [FIX] purchase, accont_anglo_saxon: fixed the creation of invoice from PO lines so that it reuse the _prepare_inv_line() method. This code factorization is needed in order to work with account_anglo_saxon module (before the anglo saxon accounting mode was ignored if the PO's invoicing method was 'generate invoices from PO lines')
bzr revid: qdp-launchpad@openerp.com-20130624090741-eyy2r22yuti0gqit
2013-06-24 11:07:41 +02:00
Quentin (OpenERP) d856e8361b [REF] *: change linked to server revision 4907. Removed deprecated 'view_load' attribute + removed duplicated first argument of property fields which is replaced with 'relation' argument in case where it is really needed (relational fields): indeed this first argument was totally useless for property of float type (for example).
bzr revid: qdp-launchpad@openerp.com-20130624090515-12aeo4k5sz87veqb
2013-06-24 11:05:15 +02:00
Quentin (OpenERP) 7e8e2ca75f [FIX] account_anglo_saxon: fixed the computation of price difference inc costing method != 'standard' + added yaml test for the same feature
bzr revid: qdp-launchpad@openerp.com-20130624090329-o423720dp3oc4aez
2013-06-24 11:03:29 +02:00