Commit Graph
34754 Commits
Author SHA1 Message Date
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) 5e19504a56 [MERGE] merged trunk-server-development branch
bzr revid: hmo@tinyerp.com-20110225075326-qv35g149vegd30h1
2011-02-25 13:23:26 +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
Rifakat Haradwala (Open ERP) feba9e68d6 [IMP]: Account_voucher : Company_id field made visible on top panel
bzr revid: rha@tinyerp.com-20110225074610-wypiuy2bcd6g9swe
2011-02-25 13:16:10 +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
ron@tinyerp.com f25f3795d0 [FIX]account,product,sale:Missing company rules
lp bug: https://launchpad.net/bugs/724073 fixed

bzr revid: ron@tinyerp.com-20110225063015-tv828yhgitxm2mlx
2011-02-25 12:00:15 +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
Mustufa Rangwala d1edc82d29 [MERGE] merge from trunk addons
bzr revid: mra@mra-laptop-20110225062336-wp2wq9l0lkgzq5y7
2011-02-25 11:53:36 +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
Bhumika (OpenERP) eb5afa06d4 [Fix] fix buildbot warning
bzr revid: sbh@tinyerp.com-20110225053455-jmbafszv2jy3i7sm
2011-02-25 11:04:55 +05:30
Bhumika (OpenERP) c4b9f8f781 [Fix] fix buildbot warning
bzr revid: sbh@tinyerp.com-20110225052042-7ejedxroblhl38j7
2011-02-25 10:50:42 +05:30
Bhumika (OpenERP) c7066c8073 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20110225044037-90t4f800eakrys8j
2011-02-25 10:10:37 +05:30
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 41cf1e36c6 [FIX] use uid = 1 for audittrails read/write to avoid acess rule problem
bzr revid: tfr@openerp.com-20110224165221-slwpk4x0okqeub6f
2011-02-24 17:52:21 +01:00
P. Christeas aaeb24b541 warning: set message-selectors as required, to force 'no-message' [Bug 720247]
Reported by: Ferdinand Gassauer <ferdinand.gassauer@camptocamp.com>
Original Subject: [6.0] - warning - must init fields
(cherry picked from commit 0ff9e4e58e3e46fc5097ad5fd36e7b69cce37cda)

bzr revid: p_christ@hol.gr-20110224163500-6x9pbgfvwaton17j
2011-02-24 18:35:00 +02:00
Stephane Wirtel c0bee8c4e3 [IMP] The responsible of the project issue is the manager of the associated project.
[IMP] There is a new domain on the resolution field, allow to select the project.task.type associated to the selected project.
[IMP] The assigned_to field is the connected user, but can be changed by the user

bzr revid: stephane@openerp.com-20110224160953-fv9p2qhkqdseh183
2011-02-24 17:09:53 +01:00
Thibault Francois e20422ef9b [MERGE] crm-improvement project
bzr revid: tfr@openerp.com-20110224152851-kflj1ymf3830e1f4
2011-02-24 16:28:51 +01:00
Stephane Wirtel 739dd7000e [IMP] We use the analytic account associated to the project
bzr revid: stephane@openerp.com-20110224152850-3poei06fhja3wm5w
2011-02-24 16:28:50 +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
Vo Minh Thu 44b392ef09 [FIX] setup.py: easy_install seems to work.
- the generated bin/openerp-server.py seems to work.
- I would like to remove the data_files() call as it seems redundant with MANIFEST.in.
- Same for find_package_dirs().
- I have to check first how the build on windows work (as it includes different files than on unix).

bzr revid: vmt@openerp.com-20110224142659-r2wbm9f8tkldgwe6
2011-02-24 15:26:59 +01:00
Thibault Francois 8392b4d3d0 [FIX] hard code template
bzr revid: tfr@openerp.com-20110224142216-x61sd77ad269cquk
2011-02-24 15:22:16 +01:00
Ujjvala Collins (OpenERP) 3794e8c51e [IMP] google_base_account: Catch import error if gdata libraries are not installed.
bzr revid: uco@tinyerp.com-20110224133342-oan3b58sswl5m80i
2011-02-24 19:03:42 +05:30
mtr f20088d203 [FIX] hr_recruitment:added 'survey' field in the form view
lp bug: https://launchpad.net/bugs/712555 fixed

bzr revid: mtr@mtr-20110224133049-zv1vor70hc7dccqi
2011-02-24 19:00:49 +05:30
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
mtr a59188e080 [IMP] hr_payroll: improvements-Salary Rules
bzr revid: mtr@mtr-20110224131220-468gscq24wbr3pt6
2011-02-24 18:42:20 +05:30
Vo Minh Thu 7855fad593 [FIX] setup.py: use the new openerp module.
- python setup.py build seems to work (it produces the same result as before).
- the install seems not good: code and data are duplicated in both site-packages and dist-packages.
  (This was already true before.)
- The bin/openerp-server is not good yet.

bzr revid: vmt@openerp.com-20110224121830-hte18v9zzvel5zb5
2011-02-24 13:18:30 +01:00
Harry (OpenERP) 81b186195a [MERGE]
bzr revid: hmo@tinyerp.com-20110224120319-743iwwk6vs6kd9z8
2011-02-24 17:33:19 +05:30
Yogesh (OpenERP) d44239edd2 [REM] remove unused value in context. like mail=new remove in context related to email.compose.message wizard.
bzr revid: ysa@tinyerp.com-20110224115801-wc1ka9ntxtvnwm4y
2011-02-24 17:28:01 +05:30
Harry (OpenERP) 28a5ac73f0 [MERGE]
bzr revid: hmo@tinyerp.com-20110224115010-ozpjes08hb5uu69r
2011-02-24 17:20:10 +05:30
Rifakat Haradwala (Open ERP) e086688440 [Fix]: account_payment: missing company information in payment.order and payment.line
lp bug: https://launchpad.net/bugs/724059 fixed

bzr revid: rha@tinyerp.com-20110224114537-gygz2yf3jjpgk6z3
2011-02-24 17:15:37 +05:30
Yogesh (OpenERP) 7a12698123 [IMP] project_planning :- email_mode key add in context on button to call the eamil.compose.message wizard.
bzr revid: ysa@tinyerp.com-20110224114444-eexi2uy52thnept3
2011-02-24 17:14:44 +05:30
Yogesh (OpenERP) 28e6582238 emails:- fix problem of reference value.
bzr revid: ysa@tinyerp.com-20110224112508-najqlczluuxdo87e
2011-02-24 16:55:08 +05:30
Thibault Francois 6d01d1b175 [FIX] click on geo assign don't change assigned salesman, now it do it
bzr revid: tfr@openerp.com-20110224112125-804wumb2n0s9whts
2011-02-24 12:21:25 +01:00
Harry (OpenERP) 2137084ff4 [MERGE]
bzr revid: hmo@tinyerp.com-20110224105709-cfck7d0iyclfijws
2011-02-24 16:27:09 +05:30
Yogesh (OpenERP) 122e28da04 [IMP] email_template :- Change the action of old email.send wizard to new email.compose.message in create_action method in email_template and inherit default_get method and set default value of template.
bzr revid: ysa@tinyerp.com-20110224104801-xcua49za83sm12mn
2011-02-24 16:18:01 +05:30
ron@tinyerp.com faf349adf9 [IMP]Purchase Requisition:Quotes tab allows identical rfqs from same supplier
bzr revid: ron@tinyerp.com-20110224104036-uepef8frgbsswgzq
2011-02-24 16:10:36 +05:30
Yogesh (OpenERP) ece864e532 [IMP] email.compose.message :- add the email_model=model name pass in context in xml file and change the active_model to email_model in default_get method. Global list define of email_model in crm and module are install then add the model name in this list.
bzr revid: ysa@tinyerp.com-20110224101305-iagvga1j6o6h4k0k
2011-02-24 15:43:05 +05:30
Ujjvala Collins (OpenERP) 23f58050f9 [IMP] sync_google_contact: By default Create partner is true.
bzr revid: uco@tinyerp.com-20110224100800-ok8x1vbwa87jdh6v
2011-02-24 15:38:00 +05:30
ron@tinyerp.com 55cd652fe7 [FIX]Purchase Requisition:Quotes tab allows identical rfqs from same supplier
lp bug: https://launchpad.net/bugs/721595 fixed

bzr revid: ron@tinyerp.com-20110224095401-06uw9y9i01uhwb40
2011-02-24 15:24:01 +05:30
Mustufa Rangwala e98d215d49 [REVERT] account: chart of account https://bugs.launchpad.net/openobject-addons/+bug/716300
bzr revid: mra@mra-laptop-20110224094621-7xeasbtw25194cfv
2011-02-24 15:16:21 +05:30
Bhumika (OpenERP) c587299b88 [Fix] Fix buildbot Warnings
bzr revid: sbh@tinyerp.com-20110224094342-gekzkzjjlcj58448
2011-02-24 15:13:42 +05:30
Rifakat Haradwala (Open ERP) 36d7cccc33 [Fix]: product: correct indentation
bzr revid: rha@tinyerp.com-20110224094016-8d49byc5vxctps9g
2011-02-24 15:10:16 +05:30
Harry (OpenERP) 05d250b121 [MERGE]
bzr revid: hmo@tinyerp.com-20110224092200-wqls7m3mj1znale5
2011-02-24 14:52:00 +05:30
Bhumika (OpenERP) 5b8dfb4b3b [IMP] sync_google_contact: fetch the system group
bzr revid: sbh@tinyerp.com-20110224091443-3xec6pygox49p5gx
2011-02-24 14:44:43 +05:30
Harry (OpenERP) 206c7a3142 [MERGE] merged ysa-email-framework-server branch
bzr revid: hmo@tinyerp.com-20110224083459-3f4yrx0rta7basew
2011-02-24 14:04:59 +05:30