Commit Graph
51219 Commits
Author SHA1 Message Date
Vidhin Mehta (OpenERP) 372c96d5d7 [MERGE]merge with trunk and in testing OK.
bzr revid: vme@tinyerp.com-20120622085809-grscc61zy09malr9
2012-06-22 14:28:09 +05:30
Xavier Morel 5182068b43 [FIX] ensure containing form is saved when triggering an action from an editable o2m list
After opening a record with a list o2m, editing said list o2m and
saving a row, clicking the action button would lose all data
explicitly changed: the o2m would just call the action without saving
the form's current state, so the corresponding server method would
only be able to use data previously saved.

Fixed by overriding do_button_action, and only calling the _super()
method after the parent form has announced it is saved (either because
nothing was changed or because it did indeed save itself).

bzr revid: xmo@openerp.com-20120622085432-mh3977uygua5bypn
2012-06-22 10:54:32 +02:00
Sbh (Openerp) ab76f43b98 [Fix] fix view of sale_margin
bzr revid: sbh@tinyerp.com-20120622082500-83yqsqxzrjbuz3f1
2012-06-22 13:55:00 +05:30
Sbh (Openerp) cb0f82149a [MERGE] Merge logger changes
bzr revid: sbh@tinyerp.com-20120622082023-e6ha3w9gadml4uqo
2012-06-22 13:50:23 +05:30
Quentin (OpenERP) ecd59426ae [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120622080504-bd0291ildonwdz82
2012-06-22 10:05:04 +02:00
Raphael Collet 2460d18beb [MERGE] from trunk
bzr revid: rco@openerp.com-20120622075001-tka9azgj5n2oa8zy
2012-06-22 09:50:01 +02:00
Raphael Collet 2b85a687e5 [FIX] sale_margin: fix inherited view
bzr revid: rco@openerp.com-20120622074759-vm23obg6u0t7yqze
2012-06-22 09:47:59 +02:00
Sbh (Openerp) 964baee40a [MERGE] Merge document changes for logger
bzr revid: sbh@tinyerp.com-20120622073446-dn4286vztxbpekgk
2012-06-22 13:04:46 +05:30
Foram Katharotiya (OpenERP) 87decf703a [IMP] Add logging at the top of python files
bzr revid: fka@tinyerp.com-20120622072545-uuok6zj2jm2koxw4
2012-06-22 12:55:45 +05:30
DBR (OpenERP) 7930c98ae7 [Merge]with: lp:openobject-addons
bzr revid: dbr@tinyerp.com-20120622071338-vj43rer94ggppbag
2012-06-22 12:43:38 +05:30
Kuldeep Joshi (OpenERP) 179234552e [IMP]portal: set logger
bzr revid: kjo@tinyerp.com-20120622065756-hgi4crut0gqr9n63
2012-06-22 12:27:56 +05:30
DBR (OpenERP) 8e263da233 [IMP] the coma should not appears if the date is not setted
for Based on Purchase Order Lines

bzr revid: dbr@tinyerp.com-20120622065014-f45uy3da24flmfry
2012-06-22 12:20:14 +05:30
Kuldeep Joshi (OpenERP) 3c50eb017a [IMP] set logging.getLogger(__name__)
bzr revid: kjo@tinyerp.com-20120622064854-5f6fss55k7305e8q
2012-06-22 12:18:54 +05:30
Foram Katharotiya (OpenERP) 0c374a66bc [IMP] Add logging at the top of python files
bzr revid: fka@tinyerp.com-20120622064839-llitm8szgikxznwr
2012-06-22 12:18:39 +05:30
DBR (OpenERP) 365eeca894 [IMP] Some minore changes for requisition
bzr revid: dbr@tinyerp.com-20120622062746-072l4ve79ei4iaad
2012-06-22 11:57:46 +05:30
DBR (OpenERP) c579b919cc [IMP]purchase: View imp for cpompute btn and total
bzr revid: dbr@tinyerp.com-20120622061817-2kgmzi6i9rw6zu5x
2012-06-22 11:48:17 +05:30
Divyesh Makwana (Open ERP) 823f0cd1de [Merge] Merge with main server.
bzr revid: mdi@tinyerp.com-20120618104540-ybaga8r37l3q00kz
bzr revid: mdi@tinyerp.com-20120619101333-vf98ly624t18gu7p
bzr revid: mdi@tinyerp.com-20120622061232-4ecb5bkz4cl4p120
2012-06-22 11:42:32 +05:30
Sanjay Gohel (Open ERP) 6aea583ad9 [MERGE]merge with parent branch
bzr revid: sgo@tinyerp.com-20120622060449-pvqgprokiizsqv8m
2012-06-22 11:34:49 +05:30
Sanjay Gohel (Open ERP) 4c2541d7a3 [IMP]change name over 3 module and improve view
bzr revid: sgo@tinyerp.com-20120622060229-o0al0w0jxz19fd9k
2012-06-22 11:32:29 +05:30
Amit Patel (OpenERP) bbdbb9dd6b [MERGE]
bzr revid: apa@tinyerp.com-20120622060031-pp85k3ezxboev0it
2012-06-22 11:30:31 +05:30
DBR (OpenERP) 0b98166e73 [IMP] account, product:
account : Improve view for account_invoice_view.xml 
account : Improve view for product_view.xml
product : Improve product category as well as uom view file
stock : Improve product inherited view

bzr revid: dbr@tinyerp.com-20120622055524-j3erbqup81u72f6f
2012-06-22 11:25:24 +05:30
Purnendu Singh (OpenERP) 1c35eb1049 [MERGE] Mearge with main addons
bzr revid: psi@tinyerp.com-20120622055230-trqmxu7r1qtxa0ut
2012-06-22 11:22:30 +05:30
Sbh (Openerp) 434d2ca820 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120622052105-1ucbczumubnd1k4a
2012-06-22 10:51:05 +05:30
Launchpad Translations on behalf of openerp 838b035f5a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120622051402-aeivuh5dgoe8idc5
2012-06-22 05:14:02 +00:00
Vidhin Mehta (OpenERP) 9154d21065 [IMP]remove console
bzr revid: vme@tinyerp.com-20120622051116-1uowhyk27ffh34wc
2012-06-22 10:41:16 +05:30
Launchpad Translations on behalf of openerp eea8d59604 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120622044730-v8e5fvfsa039ahbf
2012-06-22 04:47:30 +00:00
Antony Lesuisse 3821fcc47f [IMP] mail layout simplications
bzr revid: al@openerp.com-20120622012102-ysfvjdj2jkhshuwq
2012-06-22 03:21:02 +02:00
Antony Lesuisse d4003f2ac9 [MERGE] fix-server-log (server warning)
bzr revid: al@openerp.com-20120622001150-tp61b1j2o0npwipl
2012-06-22 02:11:50 +02:00
Antony Lesuisse 5006656a28 [IMP] use Class builtin mixin support
bzr revid: al@openerp.com-20120621235641-ax1lsvi9x9foa3vd
2012-06-22 01:56:41 +02:00
Antony Lesuisse 725e9da9ed [MERGE] mail.message layout
bzr revid: al@openerp.com-20120621225718-8z229a7kieqb9w6q
2012-06-22 00:57:18 +02:00
Antony Lesuisse f216fcef42 [FIX] renable timeago, now packaged in web
bzr revid: al@openerp.com-20120621225154-ikh42l6e26t32ds6
2012-06-22 00:51:54 +02:00
Antony Lesuisse fc081f9213 [IMP] timeago i18n and coresetup reordering
bzr revid: al@openerp.com-20120621224928-a4ta4t1a8y6ydhyj
2012-06-22 00:49:28 +02:00
Antony Lesuisse cfd0dbe8dc [REM] remove unused js libs, add jquery.timeago
bzr revid: al@openerp.com-20120621221415-a81f43dphpval4pn
2012-06-22 00:14:15 +02:00
Antony Lesuisse c89c01929b [FIX] cleanups
bzr revid: al@openerp.com-20120621215527-5f05axqf9t1gnc8e
2012-06-21 23:55:27 +02:00
Fabien Meghazi 7d78741af4 [FIX] Override oe_higlight in oe_form_editable mode
bzr revid: fme@openerp.com-20120621163831-75qqmcsit353i9o2
2012-06-21 18:38:31 +02:00
Antonin Bourguignon ad71e2a680 [ADD] mail.group form view (from tde's branch)
bzr revid: abo@openerp.com-20120621161853-0vyfyt8rwdh4v8d0
2012-06-21 18:18:53 +02:00
Fabien Meghazi c3bbd6012b [IMP] Void oe_highlight in oe_form_editable
bzr revid: fme@openerp.com-20120621161849-dzedftfw2g789vwn
2012-06-21 18:18:49 +02:00
Thibault Delavallée d2f72d8143 [IMP] crm_lead, hr_recruitment: improved kanban views.
bzr revid: tde@openerp.com-20120621161111-kjafid5ajelda20d
2012-06-21 18:11:11 +02:00
Fabien Meghazi ce9ddadc9b [FIX] Fixed subtotal footer in project and sale order form views
bzr revid: fme@openerp.com-20120621160110-16bp8l8ej2rwagp0
2012-06-21 18:01:10 +02:00
Fabien Meghazi ab407563ed [FIX] Fixed oe_subtotal_footer
bzr revid: fme@openerp.com-20120621154914-kpkbank4wfchzyoh
2012-06-21 17:49:14 +02:00
Thibault Delavallée f452048296 [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120621153821-kbglscfgn5ekn2qq
2012-06-21 17:38:21 +02:00
Thibault Delavallée 13e23dba37 [IMP] mail_thread: message_summary: now directly send html code.
bzr revid: tde@openerp.com-20120621152311-fmqvxxaurvkuhl2b
2012-06-21 17:23:11 +02:00
Thibault Delavallée 87f754ca0a [MERGE] Merged with main web.
bzr revid: tde@openerp.com-20120621152104-boewl4pfi90vfygz
2012-06-21 17:21:04 +02:00
Raphael Collet 3622715a31 [IMP] cancel dummy change
bzr revid: rco@openerp.com-20120621151324-8fqy02lqbjz6dmr6
2012-06-21 17:13:24 +02:00
Antonin Bourguignon b821d42061 [IMP] properly prefix templates names with 'mail.'
use 'main' and 'aside' instead of 'left' and 'right' in the mail main boxes' class names

bzr revid: abo@openerp.com-20120621150002-u7saes5bc06bt51l
2012-06-21 17:00:02 +02:00
Vidhin Mehta (OpenERP) 9c8d325d97 [IMP]get dashboard from menu also.
bzr revid: vme@tinyerp.com-20120621144640-by7y68e7bx19e3f1
2012-06-21 20:16:40 +05:30
Christophe Simonis 136589aafd [FIX] base_vat: correct Switzerland VAT check
bzr revid: chs@openerp.com-20120621143152-1h8xvyoj5rw899ww
2012-06-21 16:31:52 +02:00
Fabien Meghazi e0f324ac25 [FIX] field text width
bzr revid: fme@openerp.com-20120621140642-s96lwuycykbxo719
2012-06-21 16:06:42 +02:00
Fabien Meghazi f91d828ef5 [FIX] Removed duplicate field in tasks form view
bzr revid: fme@openerp.com-20120621134744-7qiwzfxcim8p0ba9
2012-06-21 15:47:44 +02:00
Antonin Bourguignon 22a0a0208f [MERGE] latest trunk
bzr revid: abo@openerp.com-20120621133551-w2g9oznhxxi8kpf7
2012-06-21 15:35:51 +02:00