Commit Graph

87926 Commits

Author SHA1 Message Date
Quentin (OpenERP) 8ec2c8e0f9 [FIX] warehouse config for resuply warehouses
bzr revid: qdp-launchpad@openerp.com-20140505135836-3v9a46lb1kqsdj5w
2014-05-05 15:58:36 +02:00
chm@openerp.com 74a6bde093 [MERGE] from trunk
bzr revid: chm@openerp.com-20140505134608-hqcmqyo3d98y851j
2014-05-05 15:46:08 +02:00
Fabien Meghazi 45d64640f8 [REV] defer
bzr revid: fme@openerp.com-20140505131012-owp0qucjbnesp4ee
2014-05-05 15:10:12 +02:00
Denis Ledoux 41e6840169 [FIX] account_analytic_analysis: recurring invoices, prepare_invoice method actually prepare the invoice, without creating it. _recurring_create_invoice return value is the list of created invoices ids
bzr revid: dle@openerp.com-20140505130226-ylcycmzmj0hm35w6
2014-05-05 15:02:26 +02:00
Quentin (OpenERP) dcd10db66e [FIX] fixes
bzr revid: qdp-launchpad@openerp.com-20140505125630-903olg3ko3y5gekh
2014-05-05 14:56:30 +02:00
chm@openerp.com d3678bf521 [FIX] website_sale: don't rewrite sale order partner_id with the public user
bzr revid: chm@openerp.com-20140505124702-cq6tvb6h3lgyst99
2014-05-05 14:47:02 +02:00
Kersten Jeremy 4ce7e8c6dd [FIX] Fix access rule for portal. Add timezone in small calendar from email
bzr revid: jke@openerp.com-20140505124657-t6gxusxkkgon06hf
2014-05-05 14:46:57 +02:00
Denis Ledoux 4f1dbde8d5 [FIX] mail: attachments present for first recipient, but not for the others
attachments should be an array and not a generator [x for x in y] instead of (x for x in y)

bzr revid: dle@openerp.com-20140505123852-kjc6z0npiot9c54l
2014-05-05 14:38:52 +02:00
Quentin (OpenERP) 693a60058e [REV] revert of a partially wrong commit introduced in a previous merge with trunk and detected during the code review
bzr revid: qdp-launchpad@openerp.com-20140505123709-2v2efr7ghzgxgo76
2014-05-05 14:37:09 +02:00
Martin Trigaux 5e406734ab [FIX] module: do not crash in case of not found module
bzr revid: mat@openerp.com-20140505121840-f84u36mng3p1gstn
2014-05-05 14:18:40 +02:00
Fabien Meghazi 33ad1076e9 [TRY] defer
bzr revid: fme@openerp.com-20140505121036-044ecvq8s3d669b2
2014-05-05 14:10:36 +02:00
Quentin (OpenERP) 78a7ae966f [REF] product: get_price_history refactored and moved in product.template object
bzr revid: qdp-launchpad@openerp.com-20140505120743-zjviksa7o1mpawuf
2014-05-05 14:07:43 +02:00
Fabien Meghazi b0cbaf330a [IMP] website: load website.xml templates only in editable mode
bzr revid: fme@openerp.com-20140505113800-wv5vh802us270oez
2014-05-05 13:38:00 +02:00
chm@openerp.com 9eb7a78866 [MERGE] from trunk
bzr revid: chm@openerp.com-20140505112314-1zbn7ae61mg8xavl
2014-05-05 13:23:14 +02:00
Kersten Jeremy 834e0bb367 [FIX] Calendar - set tz compatible in template mail and view (from email link). now it's possible to choose in template the TZ of the attendee, or the tz from event creator...
bzr revid: jke@openerp.com-20140505104611-6qwpwwslxen0bea5
2014-05-05 12:46:11 +02:00
Martin Trigaux fab9da65d9 [MERGE] [FIX] hr: when duplicating an employee or user, do not duplicate the reference to other employees (opw 607313)
bzr revid: mat@openerp.com-20140505101313-5y72gs2xpgokhxl1
2014-05-05 12:13:13 +02:00
chm@openerp.com 41ade23b09 [FIX] website_sale & website_event: create product (redirect with slug)
bzr revid: chm@openerp.com-20140505095724-mc9k6d2yf68ln9nq
2014-05-05 11:57:24 +02:00
Jitendra Prajapati (OpenERP) 1bb22f2ddd [MERGE]with main branch
bzr revid: jpr@tinyerp.com-20140505095333-v514kj2dz0advdf8
2014-05-05 15:23:33 +05:30
Jitendra Prajapati (OpenERP) 59a9d91558 [MERGE]sync main branch
bzr revid: jpr@tinyerp.com-20140505095247-gv9je300z9j98sk0
2014-05-05 15:22:47 +05:30
Jacques-Etienne Baudoux a918e89995 [FIX] mail: change copy call to copy_data to avoid resending email during duplication (opw 607295)
bzr revid: mat@openerp.com-20140505094329-vr7h4c92i43ezob4
2014-05-05 11:43:29 +02:00
chm@openerp.com 06c63594be [FIX] website_sale: message confirmation
bzr revid: chm@openerp.com-20140505093423-nrmou02ov1txod3k
2014-05-05 11:34:23 +02:00
chm@openerp.com 5b839bea89 [IMP] website_sale: attribute's filters template unactive by default
bzr revid: chm@openerp.com-20140505092730-pxsdxlhxwuxoc3fr
2014-05-05 11:27:30 +02:00
chm@openerp.com 9e176a977e [FIX] website_sale: apply tax position on checkout signup
bzr revid: chm@openerp.com-20140505092300-l29tc4pum31nqd1h
2014-05-05 11:23:00 +02:00
chm@openerp.com 1a9f3165ce [FIX] sale: change fiscal_position don't change order line taxes; Add onchange_fiscal_position method on sale.order
bzr revid: chm@openerp.com-20140505085755-wewn9xm8bp08ywnd
2014-05-05 10:57:55 +02:00
Raphael Collet 1d0a6e20a4 [FIX] event: move definition of fields track_ids and count_tracks to the right module
bzr revid: rco@openerp.com-20140505085739-z2asr1vrx6yyjtlh
2014-05-05 10:57:39 +02:00
Josse Colpaert f6593c49a5 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140505080320-ity6lx0dtgq5g1n7
2014-05-05 10:03:20 +02:00
Olivier Dony 2f7ac6838d [MERGE] mail: avoid resetting purposefully empty catchall domain setting, courtesy of Stefan Rijnhart (Therp)
bzr revid: odo@openerp.com-20140505075129-hv4evrdw5v7crtmw
2014-05-05 09:51:29 +02:00
Olivier Dony 188930bb01 [FIX] convert: gracefully ignore missing XML IDs when processing <delete> tags + warn in log
bzr revid: odo@openerp.com-20140505074636-bl2y5pst4pfmpz3u
2014-05-05 09:46:36 +02:00
Josse Colpaert d763f43878 [IMP] Correct js assets for barcode scanner
bzr revid: jco@openerp.com-20140505073931-mwikrhmngq1ju402
2014-05-05 09:39:31 +02:00
Vidhin Mehta (OpenERP) e41508cb8d [MERGE]Trunk.
bzr revid: vme@tinyerp.com-20140505043233-2t2e2vb1yv86hyxp
2014-05-05 10:02:33 +05:30
Fabien Pinckaers f55dfdc40e [IMP] Certification Template
bzr revid: fp@tinyerp.com-20140504113847-4xmjg30m5leaqz2c
2014-05-04 13:38:47 +02:00
Launchpad Translations on behalf of openerp f426972e37 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140430070138-uuemdpfseyysxlvs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064550-9r0c2t3tr8dp1hwu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140501063929-ta3t6lhed5dpdz9a
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064608-1zwt52snc5pg5kfi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062721-dgb7m6o6ge2btumg
2014-05-04 06:27:21 +00:00
chm@openerp.com e09a8934b4 [FIX] website_event: access right for portal user
bzr revid: chm@openerp.com-20140502162138-qp2kci9i1bncsj1i
2014-05-02 18:21:38 +02:00
chm@openerp.com 1fd1114c69 [FIX] website_sale: access to the webite partner_id
bzr revid: chm@openerp.com-20140502160628-nbwzx28j4daj1ua8
2014-05-02 18:06:28 +02:00
chm@openerp.com 939b2f2d44 [FIX] website_sale & tour
bzr revid: chm@openerp.com-20140502155124-98xz2b4gd2zzzrkx
2014-05-02 17:51:24 +02:00
chm@openerp.com bbfdc57ad9 [FIX] website_sale: add to cart product => quantity + 1
bzr revid: chm@openerp.com-20140502150842-nitu8tsxd02e6dnh
2014-05-02 17:08:42 +02:00
Josse Colpaert 830a4af3e5 [IMP] Picking type instead of warehouse in PoS
bzr revid: jco@openerp.com-20140502145852-th5tc9tsdwm9l9z8
2014-05-02 16:58:52 +02:00
Denis Ledoux ce88158381 [FIX] crm: typo, interrests to interest
bzr revid: dle@openerp.com-20140502145823-vtkqkd7njqf31682
2014-05-02 16:58:23 +02:00
Gery Debongnie 8fbebfd752 [MERGE] merge the last changes to improve the 'stat buttons' support in web
Many small tweaks/css changes to correctly display the stat buttons in
various situations (with/without icons, with/without strings, with sub 
widgets, ...)

bzr revid: ged@openerp.com-20140502145211-ehnb1v66szw7nl01
2014-05-02 16:52:11 +02:00
Josse Colpaert fa355176d5 [IMP] Add read access for contact creation user on routes
bzr revid: jco@openerp.com-20140502144809-vkt5qufxn93u89ob
2014-05-02 16:48:09 +02:00
Gery Debongnie c9e7635859 [MERGE] converts buttons in form views into 'stat buttons'
This branch converts pretty much every buttons in 'stat buttons',
which means buttons that can display any kind of information.  Right
now, it is mostly used to display a numerical information (such as a 
number, for example 9 Calls).  Also, look at the invoices button in 
Customers form view for an example of a functional field, displaying
the total amount invoiced.

The stat buttons also supports sub widgets, for example a mini pie chart
or a mini bar chart.  Examples of such sub widgets can be found in 
marketing/mass mailings form views (not ready yet)

bzr revid: ged@openerp.com-20140502144544-c5j7bzlm9i4clv4l
2014-05-02 16:45:44 +02:00
Olivier Dony 61d2122987 [FIX] mail.mail: avoid prefetching attachment data in memory while processing mail queue, could fail due to memory limit
Specifically when there are many emails in the queue, prefetching
all their attachments at once when processing the first one
could fail, so not even one mail would be sent.

Added explicit logging when an email triggers a MemoryError,
as well as logging when each email is successfully sent.

bzr revid: odo@openerp.com-20140502144431-r3brgagl4gel4wmt
2014-05-02 16:44:31 +02:00
Kersten Jeremy 1aff5f6bf8 [MERGE] Merge with trunk
bzr revid: jke@openerp.com-20140502142126-408hej7jdb9bnrzm
2014-05-02 16:21:26 +02:00
chm@openerp.com c10800f2f1 [FIX] website_event_sale: multi tickets
bzr revid: chm@openerp.com-20140502140152-hx7ktaf0cg2m7ija
2014-05-02 16:01:52 +02:00
Simon Lejeune 5f708d1a21 [MERGE][FIX] Report: more consistency when using get_action by passing ids only when they are used, report_invoice: more place to display taxes and correct display of the fiscal position
bzr revid: sle@openerp.com-20140502135223-nvd2eegoye3gscxo
2014-05-02 15:52:23 +02:00
Josse Colpaert c60c1d1a72 [DEL] Delete boards
bzr revid: jco@openerp.com-20140502134701-lnoowskaqj9nsaof
2014-05-02 15:47:01 +02:00
Denis Ledoux deb091ea64 [FIX] website: missing acl for manage website menu
bzr revid: dle@openerp.com-20140502134135-zp05ecbpcj8inftc
2014-05-02 15:41:35 +02:00
Mohammed Shekha 5600a79007 [IMP]Improved the database manager, instead of calling html_template, created separate html file which is rendered using jinja2, so that we don't need html_template once pos and edit support render_bootstrap_template.
bzr revid: msh@tinyerp.com-20140502132349-bw9zdyaou4yf8o7q
2014-05-02 18:53:49 +05:30
Gery Debongnie a8e1fbcbd3 [FIX] correct a small typo in previous merge (addon crm)
bzr revid: ged@openerp.com-20140502132258-88x9mam35o3k5ndm
2014-05-02 15:22:58 +02:00
Simon Lejeune 139c35800f [FIX] account report_invoice: display the unit of measure in the same cell as the quantity
bzr revid: sle@openerp.com-20140502131706-cepyft5y0essj0zr
2014-05-02 15:17:06 +02:00