Commit Graph

568 Commits

Author SHA1 Message Date
Turkesh Patel (Open ERP) 49b46f47a7 [IMP] purchase_requisition: remove notes as notes field removed from purchase.order.line
bzr revid: tpa@tinyerp.com-20120907093642-6v16d6qws1tghf0n
2012-09-07 15:06:42 +05:30
Thibault Delavallée 48c081f271 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120904075142-4xnbxyf52ph0jezj
2012-09-04 09:51:42 +02:00
Fabien Pinckaers beb8a590e5 [IMP] product view improvements
bzr revid: fp@tinyerp.com-20120831135010-zo37jb6nyngvqfpy
2012-08-31 15:50:10 +02:00
Thibault Delavallée c14a11482c [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120831074032-3b41p3qnuknfv461
2012-08-31 09:40:32 +02:00
Thibault Delavallée 9b6379462b [REF] mail_mail: cool and clean refactoring of the models.
Removed body_html and content_subtype fields. We now entirely
rely on the body field, that holds sanitized HTML.
Added a user_signature field from email_template. mail_mail.send()
is now responsible of adding the signature on emails.
mail_notification.notify() sets the user_signature flag on
emails send for notifciations.
mail_mail.send() is responsible of adding a default subject
on emails send if there is no subject on the mail.message,
and res_id and model are set.
purchase_requisition: removed an override of mail.message
schedule_with_attach.

bzr revid: tde@openerp.com-20120829150002-v8t581oesnw0rhvl
2012-08-29 17:00:02 +02:00
Fabien Pinckaers d3bb4f5ae5 merge
bzr revid: fp@tinyerp.com-20120829094828-b8pxz76tfnigfffw
2012-08-29 11:48:28 +02:00
Thibault Delavallée 8b910c1f1d [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120829074244-x6u8dnw4owiw93pv
2012-08-29 09:42:44 +02:00
Dharti Ratani (OpenERP) 3733972565 [MERGE]merged with trunk
bzr revid: dhr@tinyerp.com-20120828092928-da2a6k1f2e7g9i42
2012-08-28 14:59:28 +05:30
Launchpad Translations on behalf of openerp 4e31d1be93 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
Thibault Delavallée 4b0d1be1c0 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd
2012-08-27 10:37:05 +02:00
Dharti Ratani (OpenERP) 00139302a7 [MERGE]merged with trunk
bzr revid: dhr@tinyerp.com-20120823072017-c48q59mif39j55wm
2012-08-23 12:50:17 +05:30
Antonin Bourguignon 121b351b59 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120822175756-ypym270e6cklpbds
2012-08-22 19:57:56 +02:00
Fabien Pinckaers b531d9cff1 [IMP] needaction after mail.thread
bzr revid: fp@tinyerp.com-20120822153145-g7xopqq7oje7y60c
2012-08-22 17:31:45 +02:00
Dharti Ratani (OpenERP) 75befda5e8 [IMP]Tax related fixes in account_invoice,delivery sale and stock ,purchase requistion
bzr revid: dhr@tinyerp.com-20120822131816-g4o83w2ot084wyeo
2012-08-22 18:48:16 +05:30
Saurang Suthar(OpenERP) 095843797c [IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
2012-08-22 18:32:32 +05:30
Dharti Ratani (OpenERP) 95517df97c [IMP]Changes in event_sale_view and purchase_requisition as per changes in supply_method
bzr revid: dhr@tinyerp.com-20120821084350-487odxa5rk2k9nze
2012-08-21 14:13:50 +05:30
Hardik 8f9f860323 [IMP]Update __openerp__.py for all modules
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
Hardik b040d2706d [IMP]update __openerp__.py in all modules
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Fabien Pinckaers b62858e83e [IMP] Merging different ways of posting a message:
message_append_note
  message_append_dict
  message_append
  --> merged all to message_post

bzr revid: fp@tinyerp.com-20120817100302-bqsqv23ogrchslew
2012-08-17 12:03:02 +02:00
Fabien Pinckaers c7c1cb1037 [IMP] renaming message_state to message_unread
bzr revid: fp@tinyerp.com-20120816092616-jnoj0d18rw1ifqth
2012-08-16 11:26:16 +02:00
Rucha (Open ERP) 7a24bdb1f7 [FIX]: Improved old product names with new
bzr revid: rpa@tinyerp.com-20120816084224-t12wf5vipd8u90a7
2012-08-16 14:12:24 +05:30
Fabien Pinckaers e5b76be9b8 [IMP] merge trunk
bzr revid: fp@tinyerp.com-20120816072402-7w1avco6ryt12x10
2012-08-16 09:24:02 +02:00
Antony Lesuisse da8045d784 add message_followers_ids
bzr revid: al@openerp.com-20120815223038-ppuq03m5wj97u6rj
2012-08-16 00:30:38 +02:00
Fabien Pinckaers d820e866ee [MERGE] trunk
bzr revid: fp@openerp.com-20120815185713-82zylb0yqqgs008y
2012-08-15 20:57:13 +02:00
Fabien Pinckaers eb0669850d [IMP] removed needaction_pending, some cleaning in messages mail
bzr revid: fp@openerp.com-20120815133643-loyzmyp6azs5lr47
2012-08-15 15:36:43 +02:00
Quentin (OpenERP) 0bcf969ec7 [MERGE] lp: 932059 (removal of dead state in PO)
bzr revid: qdp-launchpad@openerp.com-20120814143751-e14dqq9ofcf69jgb
2012-08-14 16:37:51 +02:00
Vo Minh Thu 9822629548 [MERGE] merged trunk.
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Rucha (Open ERP) dd7a2972d8 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
Twinkle Christian (OpenERP) fc1b1749a8 [IMP]Remove type field from the modules
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
2012-08-09 11:35:16 +05:30
Launchpad Translations on behalf of openerp e970ecd62c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120809050051-p6f437n80grsr5vz
2012-08-09 05:00:51 +00:00
Olivier Dony 3fd9a77c83 [REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.

bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
Rucha (Open ERP) d597437dd7 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
Antonin Bourguignon a97687a420 [MERGE] latest trunk
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'

bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
Antonin Bourguignon 59aa37f0e4 [IMP] all the warning messages now start with 'Warning\!' (not 'Warning' or 'Warning \!')
bzr revid: abo@openerp.com-20120807113414-7mryqyt3jnq8shsa
2012-08-07 13:34:14 +02:00
Launchpad Translations on behalf of openerp 3cfd65b43d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
Rucha (Open ERP) 7a112a0af7 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120807051730-yorimgtra9a5kss3
2012-08-07 10:47:30 +05:30
Fabien Pinckaers 63f2b492f5 [MERGE] improvement placeholders
bzr revid: fp@openerp.com-20120806190527-gb3gs4cexnijaezk
2012-08-06 21:05:27 +02:00
Thibault Delavallée b0d95be968 [FIX] subtype -> content_subtype.
bzr revid: tde@openerp.com-20120806105138-ipcsz8yscof5eg0f
2012-08-06 12:51:38 +02:00
Thibault Delavallée 4c2a3f4969 [FIX] purchase_requisition: fixed mail.message inheritance, where behavior specific to this module was executed for every composed message.
bzr revid: tde@openerp.com-20120806102431-2vw87hw656kss0q0
2012-08-06 12:24:31 +02:00
pso (OpenERP) 389f8d6803 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120806094234-1b145yrjixy5yrsg
2012-08-06 15:12:34 +05:30
Ajay Chauhan (OpenERP) fe54bc7b88 [Merge] Merge with main addons.
bzr revid: cha@tinyerp.com-20120806052353-8tp9p3bbood6b8pj
2012-08-06 10:53:53 +05:30
Rucha (Open ERP) b7daa1fb31 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120803045532-wsgei101ogh0o44d
bzr revid: rpa@tinyerp.com-20120806050952-xecwmyhg4p2fs4id
2012-08-06 10:39:52 +05:30
Fabien Pinckaers ea52cfae17 [IMP] introducing new file type: html
bzr revid: fp@openerp.com-20120804143556-457q040g6q30x3fu
2012-08-04 16:35:56 +02:00
Fabien Pinckaers b363b1f622 fix
bzr revid: fp@openerp.com-20120804135631-9qqfgcz9513qsyzp
2012-08-04 15:56:31 +02:00
Fabien Pinckaers 4e69bdd6fc [IMP] improved menu tips - 10 firsts clicks
bzr revid: fp@openerp.com-20120804132136-2b18cfkwv0njsglj
2012-08-04 15:21:36 +02:00
Ajay Chauhan (OpenERP) 47aadd9363 [IMP] product, purchase_requisition : added "e.g." before example related placeholder
bzr revid: cha@tinyerp.com-20120801102513-uim0xqrdscgp8qz7
2012-08-01 15:55:13 +05:30
Rucha (Open ERP) 01bea180bb [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120801064738-vcjdjnt3s57i2hgc
2012-08-01 12:17:38 +05:30
pso (OpenERP) 773c2d5c63 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
Twinkle Christian (OpenERP) cb1c6c08af [IMP]Improve search view in all modules
bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
2012-07-31 16:58:04 +05:30
vta vta@openerp.com 264d2c3365 [MERGE] Trunk.
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
2012-07-30 14:36:28 +02:00