Commit Graph
64748 Commits
Author SHA1 Message Date
Cedric Snauwaert 54721ea664 [FIX]corrected 2 bugs related to search vehicle with alerts and change some typo and domain value in contract
bzr revid: csn@openerp.com-20121109130603-v55e1cnuks8pnkjk
2012-11-09 14:06:03 +01:00
Ajay Chauhan (OpenERP) f7a802ebf7 [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121109130454-sj4c006qtomeivqb
2012-11-09 18:34:54 +05:30
Ajay Chauhan (OpenERP) 5a9330fe3a [MERGE] merge with lp:openobject-addons
bzr revid: cha@tinyerp.com-20121109130234-kktxkl40y2o43frx
2012-11-09 18:32:34 +05:30
Turkesh Patel (Open ERP) 93488d6cc8 [MRG] merge lp:~openerp-dev/openobject-addons/trunk-10click-warehouse-tpa-fix-aja
bzr revid: tpa@tinyerp.com-20121109124943-l3ojm3bcld78vt7h
2012-11-09 18:19:43 +05:30
vta vta@openerp.com c5961309c4 [FIX] Fixed POS delete_payment_line triggering and processing.
bzr revid: vta@openerp.com-20121109124854-qray80vx77vlli4r
2012-11-09 13:48:54 +01:00
Chris Forbes 8f357dbcc8 [FIX]account:fixed the issue Aged Partner Balance Report chooses FY for wrong company
lp bug: https://launchpad.net/bugs/1018591 fixed

bzr revid: ssu@tinyerp.com-20121109124309-zxritll4gzbr7jv8
2012-11-09 18:13:09 +05:30
Thibault Delavallée 62c419e66f [IMP] tools: mail: improved append_content_to_html, including plaintext2html. Updated tests.
bzr revid: tde@openerp.com-20121109123521-e04g4zrhtv947l1r
2012-11-09 13:35:21 +01:00
Turkesh Patel (Open ERP) ba2f569d6d [IMP] add placeholder in procurement order.
bzr revid: tpa@tinyerp.com-20121109121606-vku2c5zzukv185b1
2012-11-09 17:46:06 +05:30
ajay javiya (OpenERP) 6e27ee461b [FIX]: Fix issue in warehouse module
bzr revid: aja@tinyerp.com-20121109121358-4ws1vlcrteq0ckv4
2012-11-09 17:43:58 +05:30
vta vta@openerp.com c18686212a [FIX] Removed module_stock_planning from config.
bzr revid: vta@openerp.com-20121109115720-dpwdqke5n1an857p
2012-11-09 12:57:20 +01:00
Xavier Morel 4a4fc38d5e [FIX] nuke ir.model.data caches before starting imports
Otherwise a previous validation (or 2) will poison the cache and the
import itself will fail even though the validation succeeeded (and
importing with no validation would have succeeded), as the orm cache
doesn't take DB rollbacks in account.

bzr revid: xmo@openerp.com-20121109113951-p3qgg6m5g7poay5e
2012-11-09 12:39:51 +01:00
Hardik 9ebe965036 [MERGE]with parent branch
bzr revid: hsa@tinyerp.com-20121109113402-8u8eojkvu91zfj07
2012-11-09 17:04:02 +05:30
Bhumi Thakkar (Open ERP) d867a08f7c [IMP]Sass changes.
bzr revid: bth@tinyerp.com-20121109112628-pikbl2bk9exg5qeb
2012-11-09 16:56:28 +05:30
Bhumi Thakkar (Open ERP) 155cc738ee [IMP] Improve text.
bzr revid: bth@tinyerp.com-20121109110243-bhlnf0knx1zqmx38
2012-11-09 16:32:43 +05:30
Hiral Patel (OpenERP) 07c9837872 [IMP] Improve the code
bzr revid: hip@tinyerp.com-20121109105939-cx0ia3v2vtbqo9se
2012-11-09 16:29:39 +05:30
Bhumi Thakkar (Open ERP) 4d24c3fbec [IMP] Add attribute on div.
bzr revid: bth@tinyerp.com-20121109105120-iihflpk9h88uhism
2012-11-09 16:21:20 +05:30
Hiral Patel (OpenERP) 2456bb6be9 [MERGE] Merge with lp:openobject-server
bzr revid: hip@tinyerp.com-20121109104253-zebqn98pieaobgfp
2012-11-09 16:12:53 +05:30
Christophe Matthieu df96456fc5 [FIX] view_form: fixing blockUI attribute in multi file uploader
bzr revid: chm@openerp.com-20121109102102-o5t86g1jz82175jk
2012-11-09 11:21:02 +01:00
Christophe Matthieu c22eec5f7d [FIX] mail: scroll, avatar, delete attachments, print
bzr revid: chm@openerp.com-20121109101628-4e8cnjr1lcmt0tdv
2012-11-09 11:16:28 +01:00
Thibault Delavallée b1a5db6a91 [FIX] message_process: fixed wrong domain for finding parent message based on in-reply-to.
bzr revid: tde@openerp.com-20121109100900-ri2126fe0ejb8c8w
2012-11-09 11:09:00 +01:00
Thibault Delavallée 78959edc48 [IMP] email_template: cleaned a bit tools imports.
bzr revid: tde@openerp.com-20121109095122-pifpwr5u1hhyjakw
2012-11-09 10:51:22 +01:00
Ajay Chauhan (OpenERP) 6b5903958f [FIX] account: solve traceback when reconciliation
bzr revid: cha@tinyerp.com-20121109094731-28om60dojeipzg74
2012-11-09 15:17:31 +05:30
Thibault Delavallée d4df1e1998 [MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121108164753-mso6bdwoc0ihn7sk
bzr revid: tde@openerp.com-20121109094444-5vw7aojazupnudy6
2012-11-09 10:44:44 +01:00
Foram Katharotiya (OpenERP) 3633d0fb02 [IMP] put placeholder in note
bzr revid: fka@tinyerp.com-20121109093731-39dykanh2an7jlmd
2012-11-09 15:07:31 +05:30
Foram Katharotiya (OpenERP) 45d295d0ef [IMP] Rename Reference Type
bzr revid: fka@tinyerp.com-20121109092930-i8o1yu3lkk09tz21
2012-11-09 14:59:30 +05:30
Cedric Snauwaert c97b46323a [MERGE]merge with latest trunk
bzr revid: csn@openerp.com-20121109092510-jvkr23kx384k4t0o
2012-11-09 10:25:10 +01:00
Ajay Chauhan (OpenERP) 2dc6914649 [IMP] project: match indetation in code
bzr revid: cha@tinyerp.com-20121109091552-0kakdezzs2h24xus
2012-11-09 14:45:52 +05:30
Atul Patel (OpenERP) b57c6a9d35 [FIX]: Fix active_ids list problem
bzr revid: atp@tinyerp.com-20121109091114-ehqsf3cpk54vd4if
2012-11-09 14:41:14 +05:30
Atul Patel (OpenERP) e320af9320 [FIX]: Fix change button string name for incomming and delivery
bzr revid: atp@tinyerp.com-20121109090620-vb5o35bulkkr8eb6
2012-11-09 14:36:20 +05:30
Atul Patel (OpenERP) 5b770803f1 [FIX]: Fix wrong invoice for partial picking
bzr revid: atp@tinyerp.com-20121109084950-iy37q6zqc71343mr
2012-11-09 14:19:50 +05:30
Christophe Matthieu bc0a84e097 [MERGE] from trunk
bzr revid: chm@openerp.com-20121109084135-lor21hoxyh5rb6i4
2012-11-09 09:41:35 +01:00
Christophe Matthieu 65b8b46401 [MERGE] from trunk
bzr revid: chm@openerp.com-20121109083925-rpuk4rwyu3kx50vt
2012-11-09 09:39:25 +01:00
Ajay Chauhan (OpenERP) e5b6b3f7e0 [FIX] project: solve traceback on clicking 'Documents' button
bzr revid: cha@tinyerp.com-20121109083903-d8fk1yw5823u8q8k
2012-11-09 14:09:03 +05:30
Xavier Morel d3b22ccb36 [FIX] incorrect handling of empty values in m2m listview display
bzr revid: xmo@openerp.com-20121109083513-mjpzd01hhuylll4j
2012-11-09 09:35:13 +01:00
Christophe Matthieu 4ea0e6ea0e [FIX] mail: display the message after post
bzr revid: chm@openerp.com-20121109083451-83lnbqokig7jp5ob
2012-11-09 09:34:51 +01:00
Fabien Pinckaers 0c1bcadd23 [FIX] pad
bzr revid: fp@openerp.com-20121109081428-ha5sxo0wez8x3quh
2012-11-09 09:14:28 +01:00
Atul Patel (OpenERP) 070589ee7d [REM]: Remove pdf_file field from plugin
bzr revid: atp@tinyerp.com-20121109074049-0rrdb9k0r2e0c33o
2012-11-09 13:10:49 +05:30
Turkesh Patel (Open ERP) f502b905c5 [IMP] stock: improved search view.
bzr revid: tpa@tinyerp.com-20121109072506-ogbqzaz5wdu4gyq1
2012-11-09 12:55:06 +05:30
Randhir Mayatra (OpenERP) 7377e48bbd [IMP] change the read only for destination location
bzr revid: rma@tinyerp.com-20121109071528-la7r8x5jtelv5f8c
2012-11-09 12:45:28 +05:30
Randhir Mayatra (OpenERP) c18c3143a1 [MERGE]merge with parent branch
bzr revid: rma@tinyerp.com-20121109071053-46pb7d6v77pjzdud
2012-11-09 12:40:53 +05:30
Bhumi Thakkar (Open ERP) 0ffd487d18 [IMP] Add css class and remove inline style.
bzr revid: bth@tinyerp.com-20121109070434-00onkcty4js1lzbk
2012-11-09 12:34:34 +05:30
Bhumi Thakkar (Open ERP) 94935e92a5 [IMP] Add css class.
bzr revid: bth@tinyerp.com-20121109065546-0k3rmulfy59kyl6g
2012-11-09 12:25:46 +05:30
Tejas Tank 8be63a0043 [FIX] Corrected etherpad rending issue.
bzr revid: tta@openerp.com-20121109065144-hut93odny1ur16db
2012-11-09 12:21:44 +05:30
Turkesh Patel (Open ERP) 710a1b447f [IMP] mrp: change status name to Awaiting Raw Materials from waiting goods.
bzr revid: tpa@tinyerp.com-20121109065115-yv943wosxg89byxi
2012-11-09 12:21:15 +05:30
Turkesh Patel (Open ERP) ffbf3ef66d [IMP] mrp:set default supply method manufacture for bill of material product.
bzr revid: tpa@tinyerp.com-20121109064221-6ke8yqwgd7mmpxy4
2012-11-09 12:12:21 +05:30
Turkesh Patel (Open ERP) 1d49a96089 [IMP] change name of method.
bzr revid: tpa@tinyerp.com-20121109063531-ywqipjlza24tl48x
2012-11-09 12:05:31 +05:30
Sanjay Gohel (Open ERP) c34195db38 [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20121109063446-e26x25z3f059tgdl
2012-11-09 12:04:46 +05:30
Sanjay Gohel (Open ERP) d863c288c5 [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20121109063421-4t64ggioiflxzprl
2012-11-09 12:04:21 +05:30
Sanjay Gohel (Open ERP) bf07a0daa1 [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20121109063407-tebmex7hfpur96xw
2012-11-09 12:04:07 +05:30
Tejas Tank 71d81fff4d [IMP] Set api key in demo file and remove key from pad.py
bzr revid: tta@openerp.com-20121109063002-ej4bmzzxut5j12e7
2012-11-09 12:00:02 +05:30