Commit Graph
27294 Commits
Author SHA1 Message Date
Yogesh (OpenERP) d5494f5ea4 [IMP] emails,crm,project,project_scrum :- improve email.compose.wizard and add blank value add in selection box of template_id field in wizard. if template_id blank then default value set based on current record.
bzr revid: ysa@tinyerp.com-20110228113919-d7quaz8uqmjnkuzh
2011-02-28 17:09:19 +05:30
Yogesh (OpenERP) 7f34cf2493 {MERGE] merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
bzr revid: ysa@tinyerp.com-20110228094233-92j3saq1tnlkmfrf
2011-02-28 15:12:33 +05:30
Harry (OpenERP) ec73645c4c [MERGE] merged trunk-addons-development branch
bzr revid: hmo@tinyerp.com-20110228075715-o0wm18nhd910aubc
bzr revid: hmo@tinyerp.com-20110301055553-adkdzxqxj1fcroh6
2011-03-01 11:25:53 +05:30
Launchpad Translations on behalf of openerp 9c7afeb2c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110301043841-ufga2xxsn0e0jxpz
2011-03-01 04:38:41 +00:00
Olivier Dony 4017c9da74 [MERGE] merged multi-company rules fix from 6.0
bzr revid: odo@openerp.com-20110228104936-7o281husy5j1hz8l
bzr revid: odo@openerp.com-20110228140001-eo18g7ncst04v0lg
2011-02-28 15:00:01 +01:00
Olivier Dony beac68b7d2 [REVERT] all: revert incorrect change of default ir.rules for multi-company
By default only records belonging to the user's company or descendant companies
should be visible. The original patch introduced visibility of records
from ancestor companies, which should be suited only for a few cases, such
as res.patner.
Original revision: 3164.24.175  sbh@tinyerp.com-20101223095216-n6psmzicdcs8is8x

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

bzr revid: odo@openerp.com-20110228135754-6skiy4fb9dg54xb6
2011-02-28 14:57:54 +01:00
Jay Vora (OpenERP) f4faceac9c [MERGE] Merged the branch of Dhruti for the fix of a case
bzr revid: jvo@tinyerp.com-20110228110655-19ei6pq9odgl54ic
2011-02-28 16:36:55 +05:30
Quentin THEURET 7086606211 [FIX] product: name_search should give precedence to product code only on exact match
lp bug: https://launchpad.net/bugs/726415 fixed

bzr revid: odo@openerp.com-20110228102843-j85u4gmknxsni66y
2011-02-28 11:28:43 +01:00
Quentin THEURET 2bf57273d0 [FIX] product: name_search should give precedence to product code only on exact match
bzr revid: odo@openerp.com-20110228102555-ey1jjghta17fiua2
2011-02-28 11:25:55 +01:00
Quentin THEURET 00f0b7d9af [FIX] Fix the name_search method of product_product
lp bug: https://launchpad.net/bugs/726415 fixed

bzr revid: quentin@tempo-quentin-20110228093450-pffa9txsgza5eamm
2011-02-28 10:34:50 +01:00
Vo Minh Thu 957f2418d4 [MERGE] act_window access: corrected the access for normal users to read-only.
lp bug: https://launchpad.net/bugs/720277 fixed

bzr revid: vmt@openerp.com-20110228093014-a0p7n0tqpzifef4j
2011-02-28 10:30:14 +01:00
Yogesh (OpenERP) 8df17faa84 [IMP] emails :- add email_from field in search view and remove email filter.
bzr revid: ysa@tinyerp.com-20110228090919-r68zey4af7u8btze
2011-02-28 14:39:19 +05:30
Vo Minh Thu 4569d7856e [MERGE] from the 6.0 branch
bzr revid: vmt@openerp.com-20110228090850-g127ghkht08s60tu
2011-02-28 10:08:50 +01:00
Yogesh (OpenERP) 0d5cc2663c [IMP] fetchmail :- imap and pop server fetchmail keep in try and server quit in finally block.
bzr revid: ysa@tinyerp.com-20110228090344-uf965sg7hvkrv7o2
2011-02-28 14:33:44 +05:30
DHS (OpenERP) ded318bef1 [FIX] Account : Invoice line should contain the product description in notes (Ref : Case 4298)
bzr revid: dhs@tinyerp.com-20110228063659-e6q8jou2kcyg9on2
2011-02-28 12:06:59 +05:30
Launchpad Translations on behalf of openerp 08315fe28a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110226063924-7y7o7zjyjtzm2xxc
bzr revid: launchpad_translations_on_behalf_of_openerp-20110227062306-oeu1yf1d9p4a42e6
bzr revid: launchpad_translations_on_behalf_of_openerp-20110228055407-fo5auo95u3p0ifn2
2011-02-28 05:54:07 +00:00
Launchpad Translations on behalf of openerp eba20645f9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110224061559-uvwy3pqqdo1gtgx8
bzr revid: launchpad_translations_on_behalf_of_openerp-20110225060457-5wocg4ecjy0vhxrl
bzr revid: launchpad_translations_on_behalf_of_openerp-20110227062217-eev5qb158tjq5t5h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110228055344-2wm3uj29hj1f2lpa
2011-02-28 05:53:44 +00:00
Launchpad Translations on behalf of openerp 1bfe6c8df9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110226050040-nkymkib29qktvvqm
2011-02-26 05:00:40 +00:00
Jay Vora (OpenERP) 6f5b085c1c [MERGE] Merged the branch for the fix of bug 718616
lp bug: https://launchpad.net/bugs/718616 fixed

bzr revid: jvo@tinyerp.com-20110225181141-v32xfonsja5qnjqt
2011-02-25 23:41:41 +05:30
Quentin (OpenERP) 1ab1c15e3c [MERGE] merged bugfix 723176
bzr revid: qdp-launchpad@openerp.com-20110225150850-vsky0v20x627c70v
2011-02-25 16:08:50 +01:00
Quentin (OpenERP) fb6c8c1bbf [MERGE] bugfix 718616
bzr revid: qdp-launchpad@openerp.com-20110225145953-mvkmixnm1imbl61f
2011-02-25 15:59:53 +01:00
Quentin (OpenERP) c2c46a6260 [MERGE] bugfix 723443
bzr revid: qdp-launchpad@openerp.com-20110225145706-3571oc4vppat75lm
2011-02-25 15:57:06 +01:00
Quentin (OpenERP) 0b2cdd30ed [MERGE] merged bugfix 722686
bzr revid: qdp-launchpad@openerp.com-20110225145542-guupidiukbjjjqje
2011-02-25 15:55:42 +01:00
Quentin (OpenERP) 45f264dca7 [MERGE] merged bugfix 722961
bzr revid: qdp-launchpad@openerp.com-20110225145347-p4x82nevh09nnhdr
2011-02-25 15:53:47 +01:00
Quentin (OpenERP) 41b6096a08 [MERGE] merged bugfix 722699
bzr revid: qdp-launchpad@openerp.com-20110225144403-ipbb4xl0k3mvpsok
2011-02-25 15:44:03 +01:00
Quentin (OpenERP) 3769897d69 [MERGE] merged bugfix 720138
bzr revid: qdp-launchpad@openerp.com-20110225144154-ijyurv65spd5lsdx
2011-02-25 15:41:54 +01:00
Quentin (OpenERP) a56dde158e [MERGE] merged bugfix 716107
bzr revid: qdp-launchpad@openerp.com-20110225141114-uxyug5oby21ngm07
2011-02-25 15:11:14 +01:00
Quentin (OpenERP) 8fe11d0c1b [MERGE] bugfix 720629
bzr revid: qdp-launchpad@openerp.com-20110225140314-fjvkuk1e5w7pdwug
2011-02-25 15:03:14 +01:00
Quentin (OpenERP) bd02d3e2e6 [IMP] hr_expense/hr_expense.py improved translability and allow to switch in tree view once the invoice is open
bzr revid: qdp-launchpad@openerp.com-20110225140154-79lg4tr1n4pd3x4w
2011-02-25 15:01:54 +01:00
Quentin (OpenERP) 62b785285a [FIX] hr_expense: do not validate the invoice created from a hr_expense automatically
bzr revid: qdp-launchpad@openerp.com-20110225134844-wrjp0p51gqg1bafo
2011-02-25 14:48:44 +01:00
Quentin (OpenERP) f1e62cf560 [MERGE] bugfix of bug number 720627
bzr revid: qdp-launchpad@openerp.com-20110225133259-qy3a7b11tuktgfb1
2011-02-25 14:32:59 +01:00
Quentin (OpenERP) e9b0d86ea6 [MERGE] merged bugfix of bug 720623
bzr revid: qdp-launchpad@openerp.com-20110225132457-hxxbr3vn6m4vvf14
2011-02-25 14:24:57 +01:00
Harry (OpenERP) 35df09c028 [FIX] crm: set False value in email_from instead of None Value
bzr revid: hmo@tinyerp.com-20110225115715-di6jxycn7wvvs5d1
2011-02-25 17:27:15 +05:30
Harry (OpenERP) d119099579 [MERGE]
bzr revid: hmo@tinyerp.com-20110225111241-jy3muaicg5l26cel
2011-02-25 16:42:41 +05:30
Yogesh (OpenERP) 5b28eaa868 [FIX] fix problem in emails.compose.message wizard.
bzr revid: ysa@tinyerp.com-20110225091112-t5pcq27rxk6ln0h3
2011-02-25 14:41:12 +05:30
Yogesh (OpenERP) dbaf2a1eba [MERGE[ merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
bzr revid: ysa@tinyerp.com-20110225083807-e2ydg5rt44fsbcl9
2011-02-25 14:08:07 +05:30
Harry (OpenERP) 9006764368 [REM] email_template: remove email_template_security.xml
bzr revid: hmo@tinyerp.com-20110225081418-91ynfdq1klcbv7zi
2011-02-25 13:44:18 +05:30
Harry (OpenERP) 85e8c93460 [MERGE] merged with trunk-addons-development
bzr revid: hmo@tinyerp.com-20110225074706-pjzvvfqe1200zwji
2011-02-25 13:17:06 +05:30
Yogesh (OpenERP) c6f3a2ef1c [MERGE] merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
bzr revid: ysa@tinyerp.com-20110225071654-br5ka298wopvajld
2011-02-25 12:46:54 +05:30
Harry (OpenERP) 896c250760 [MERGE] merged from ysa-email-framework-addons branch
bzr revid: hmo@tinyerp.com-20110225065704-8glt9lxi5oqjrgf0
2011-02-25 12:27:04 +05:30
Yogesh (OpenERP) 204ecec4f2 [IMP] crm, emails,crm_partner_assign:- change model name crm_send_new_email_attachment with crm_add_note_email_attachment in crm module, and bug fix of web-client wizard not close must return thy type:ir.action.act_window.close' in button click
bzr revid: ysa@tinyerp.com-20110225065403-expnty80rkb9m2jr
2011-02-25 12:24:03 +05:30
ksa (Open ERP) d47a8d8825 [FIX]: Purchase : invoice opened from the purchase order (second tab) only proposes the journal "sales"
bzr revid: ksa@tinyerp.co.in-20110225064642-ez74mzbe5ml3rpgk
2011-02-25 12:16:42 +05:30
Yogesh (OpenERP) df503eaf0d [IMP] crm,crm_partner_assing:- inherit email.compose.message instead of crm.send.mail and fix some problem.
bzr revid: ysa@tinyerp.com-20110225062346-tt0xn3mv6a90dozx
2011-02-25 11:53:46 +05:30
Launchpad Translations on behalf of openerp 5734ee225a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110224061639-agrphsv7latpjk8o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110225060542-bz7wfv19ahspukiw
2011-02-25 06:05:42 +00:00
Launchpad Translations on behalf of openerp adcd9eaa27 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110225044009-gb32846xiwjlmimn
2011-02-25 04:40:09 +00:00
Jay Vora (OpenERP) 3b9d87426c [FIX] Purchase : Relevant invoices should be opened in the format of Supplier invoice
lp bug: https://launchpad.net/bugs/724516 fixed

bzr revid: jvo@tinyerp.com-20110224195710-pgi7oqpdt4en7x28
2011-02-25 01:27:10 +05:30
Thibault Francois e20422ef9b [MERGE] crm-improvement project
bzr revid: tfr@openerp.com-20110224152851-kflj1ymf3830e1f4
2011-02-24 16:28:51 +01:00
Thibault Francois 33765897a3 [MERGE][FIX] merge from trunk + fixes conflict
bzr revid: tfr@openerp.com-20110224150309-nujh3109r295yc9b
2011-02-24 16:03:09 +01:00
Harry (OpenERP) bbbbf1359a [MERGE] merged with trunk-addons-development branch
bzr revid: hmo@tinyerp.com-20110224131516-zooy75ufkl0783kr
2011-02-24 18:45:16 +05:30
Harry (OpenERP) 81b186195a [MERGE]
bzr revid: hmo@tinyerp.com-20110224120319-743iwwk6vs6kd9z8
2011-02-24 17:33:19 +05:30