Commit Graph

775 Commits

Author SHA1 Message Date
Olivier Dony 308e4f1073 [I18N] Removed duplicated terms for inherited [_sql]_constraints -> 400 terms removed
bzr revid: odo@openerp.com-20121203162755-p71dnn0k0t2b98yp
2012-12-03 17:27:55 +01:00
Atul Patel (OpenERP) 9fa4677b2c [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121201091113-dw0bnk3jzfr7r61z
2012-12-01 14:41:13 +05:30
Launchpad Translations on behalf of openerp 4c0ddb1f01 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121201050734-pfp8sbkds49ewcyv
bzr revid: launchpad_translations_on_behalf_of_openerp-20121201050910-yq8l30zsbpn4rbx8
2012-12-01 05:09:10 +00:00
Rucha (Open ERP) ca668a8acb [MERGE]: Merged with latest trunk-addons
bzr revid: rpa@tinyerp.com-20121130055252-9lu0qeabe2zcndcj
2012-11-30 11:22:52 +05:30
Launchpad Translations on behalf of openerp 4b464deeee Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121129051532-an3wp6f216pkzxiz
bzr revid: launchpad_translations_on_behalf_of_openerp-20121129052158-2gjacp96ppgmvr5t
2012-11-29 05:21:58 +00:00
Atul Patel (OpenERP) fd7e173625 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121129042339-1hc1i9n7ywp9tmrc
2012-11-29 09:53:39 +05:30
Fabien Pinckaers 854284b6af [MERGE] fgi improve
bzr revid: fp@openerp.com-20121127215908-q5yt8nwna6gmdu88
2012-11-27 22:59:08 +01:00
Saurang Suthar 453ec1ae10 [IMP]purchase_requisition:set purchase_requisition field after supply_method field
bzr revid: ssu@tinyerp.com-20121126111116-cut8h1s6kjv1vo77
2012-11-26 16:41:16 +05:30
Launchpad Translations on behalf of openerp 828cce9be0 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125063324-fjz8k77annh364u7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126044235-u20vi1440dgppikf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121125064209-s515ia18188hl147
bzr revid: launchpad_translations_on_behalf_of_openerp-20121126045508-rm6d2mx71a0sjqh9
2012-11-26 04:55:08 +00:00
Launchpad Translations on behalf of openerp 117bf937b9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124055830-p04ni2o2ogsch9zc
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124065500-zwtkurcb1ic9ktqb
bzr revid: launchpad_translations_on_behalf_of_openerp-20121124070752-itto1xb6r6oao3z5
2012-11-24 07:07:52 +00:00
Olivier Dony 771b216118 [I18N] Update translation templates in preparation for 7.0 release
bzr revid: odo@openerp.com-20121124030804-9dvr1qwec830p8fc
2012-11-24 04:08:04 +01:00
Ajay Chauhan (OpenERP) 037508d100 [IMP] purchase_requisition: made supplier created insted of customer from wizard 'Requests for quatation'
bzr revid: cha@tinyerp.com-20121122113722-asucj5l3l1j5hn1o
2012-11-22 17:07:22 +05:30
Launchpad Translations on behalf of openerp 87d3caa50f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121030053700-w841c92uvirpii9h
2012-10-30 05:37:00 +00:00
Christophe Matthieu 46a60cdac7 [MERGE] from trunk-mail-concreting-tde, TODO fix bug
bzr revid: chm@openerp.com-20121029090847-27h3tmyvsv9c8vej
2012-10-29 10:08:47 +01:00
Frédéric van der Essen 7cdf99ade1 [IMP] mail: improved display of openchatter in form views
bzr revid: fva@openerp.com-20121026095821-c3idarsd5yi9fzso
2012-10-26 11:58:21 +02:00
Launchpad Translations on behalf of openerp 93be12ab1e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121026045553-t4k1bgsmirz090jr
bzr revid: launchpad_translations_on_behalf_of_openerp-20121026045641-3opz9ueu2crfb479
bzr revid: launchpad_translations_on_behalf_of_openerp-20121026051921-6vyyfhq3fpp22atu
2012-10-26 05:19:21 +00:00
Divyesh Makwana (Open ERP) d3f99be6f7 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121016043915-jj52ndvtvtry8wtn
bzr revid: mdi@tinyerp.com-20121017044114-rx20qcnmj0h2di9m
bzr revid: mdi@tinyerp.com-20121018040816-rldo7d3wvdarhrrn
bzr revid: mdi@tinyerp.com-20121019043918-ajzdhughbwm3j859
bzr revid: mdi@tinyerp.com-20121022041308-wczx6ppb8id1100g
2012-10-22 09:43:08 +05:30
Launchpad Translations on behalf of openerp 5bfa3c5a7d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121019053933-51d6oob5aw0ujz40
2012-10-19 05:39:33 +00:00
Divyesh Makwana (Open ERP) fb87569289 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121011045301-ttt0tzlrk8ge06db
bzr revid: mdi@tinyerp.com-20121012052424-z2toltq0vw0pnyk9
2012-10-12 10:54:24 +05:30
Divyesh Makwana (Open ERP) 9a264c3369 [IMP] There is no consistency throughout OpenERP with 'Source document', 'Source', 'Origin'. It should always be 'Source document'.
bzr revid: mdi@tinyerp.com-20121008104151-opvu1mig2xbxxpli
2012-10-08 16:11:51 +05:30
Randhir Mayatra (OpenERP) fbd443a66e [MERGE] merge with addons
bzr revid: rma@tinyerp.com-20121003103503-5rdpwbp2cecfmna0
2012-10-03 16:05:03 +05:30
Fabien Pinckaers c93d70e919 [MERGE] chm - improved subtype - fixes
bzr revid: fp@openerp.com-20121002204023-8v3jf2n84xe2jol9
2012-10-02 22:40:23 +02:00
Antonin Bourguignon 1653332080 [MERGE] trunk
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
Randhir Mayatra (OpenERP) 9890c1da13 [MERGE] merge with parent branch
bzr revid: rma@tinyerp.com-20121001085821-7c7g51mtgdp99qgl
2012-10-01 14:28:21 +05:30
Randhir Mayatra (OpenERP) cd64e33d16 [IMP] make changes into product,procurement module
bzr revid: rma@tinyerp.com-20121001085603-1s2kt6ufg8fcom8e
2012-10-01 14:26:03 +05:30
Antony Lesuisse 6dd16f2613 [MERGE] trunk
bzr revid: al@openerp.com-20120930141638-bw50m7b5a8wnu2yh
2012-09-30 16:16:38 +02:00
Fabien Pinckaers 2c3da0188a [FIX] no need to overwrite name of requisition
bzr revid: fp@tinyerp.com-20120929090750-rho7tmgkpuaqpytp
2012-09-29 11:07:50 +02:00
Antonin Bourguignon 8683ea9c6d [MERGE] trunk
bzr revid: abo@openerp.com-20120928152152-p6s1dzq96g0sy2sf
2012-09-28 17:21:52 +02:00
Fabien Pinckaers e9f4840c93 [IMP] emoving bad code, no invitation system on events
[IMP] no more certifiate, will be managed in apps.openerp.com directly

bzr revid: fp@tinyerp.com-20120926121627-60isym4hdjkaxe9p
2012-09-26 14:16:27 +02:00
Christophe Matthieu f47111449c [IMP] mail_follower: unique field widget, sub-types on click
bzr revid: chm@openerp.com-20120924095616-keuji387bvy6pmcs
2012-09-24 11:56:16 +02:00
Christophe Matthieu fa63653de9 [MERGE] from trunk-mail-mail-rules-tde
bzr revid: chm@openerp.com-20120921095037-czl4s3v0do11yhkq
2012-09-21 11:50:37 +02:00
Thibault Delavallée cb806332be [FIX] subtype_xml_id -> subtype in message_post.
bzr revid: tde@openerp.com-20120920145405-vwi1kt1ttkd2w8sz
2012-09-20 16:54:05 +02:00
Thibault Delavallée 1206b8f7a0 [IMP] Addons: added message_is_follower and message_subtype_data invisible fields to all views using Chatter and Followers widgets.
bzr revid: tde@openerp.com-20120920115900-vvpfhjvw135vhf91
2012-09-20 13:59:00 +02:00
Thibault Delavallée dbcb9b2b1e [CLEAN] purchase_requisition: cleaned subtypes.
bzr revid: tde@openerp.com-20120919120602-1klpv75xzs5ngw3n
2012-09-19 14:06:02 +02:00
Mayur Maheshwari (OpenERP) 87ae883d52 [IMP]purchase_requisition : remove dependency mrp from purchase_requisition
bzr revid: mma@tinyerp.com-20120919054933-lw5myhphzix1qt3j
2012-09-19 11:19:33 +05:30
Thibault Delavallée abf16c58c6 [IMP] Addons: added invisible field for message_is_follower; note: reidented view; account_voucher: reidented one view.
bzr revid: tde@openerp.com-20120917153533-u102ds3eo1xr1mnt
2012-09-17 17:35:33 +02:00
Sanjay Gohel (Open ERP) e6cdcb6b51 [MERGE]merge with trunk addons
bzr revid: sgo@tinyerp.com-20120917065740-w9a3xhe632368t2n
2012-09-17 12:27:40 +05:30
Sanjay Gohel (Open ERP) 9524b34e31 [IMP]changed in purchase_requisition module for subtype update specification
bzr revid: sgo@tinyerp.com-20120913091208-si6e042trpzdyq6m
2012-09-13 14:42:08 +05:30
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
Amit Patel (OpenERP) 0a5ebb52e1 [MERGE]:trunk-mail-cleaning-fp
bzr revid: apa@tinyerp.com-20120904104409-w9zl98qjpem10pan
2012-09-04 16:14:09 +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
Amit Patel (OpenERP) 649b424f68 [MERGE]:purchase subtype data
bzr revid: apa@tinyerp.com-20120831131108-63qom4rj8zi70e1x
2012-08-31 18:41:08 +05:30
Foram Katharotiya (OpenERP) 84fd3b3a35 [IMP] change subtype close
bzr revid: fka@tinyerp.com-20120831124744-uup75dwshj5nmf2n
2012-08-31 18:17:44 +05:30
Foram Katharotiya (OpenERP) a6a3d4eda6 [IMP] set indentation in purchase_requisition.xml
bzr revid: fka@tinyerp.com-20120831104032-yfuugotohlgfvz75
2012-08-31 16:10:32 +05:30
Thibault Delavallée c14a11482c [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120831074032-3b41p3qnuknfv461
2012-08-31 09:40:32 +02:00
Foram Katharotiya (OpenERP) 7393c91391 [MERGE] Merge with parent branch
bzr revid: fka@tinyerp.com-20120830114651-tavazd2zdk3gm5tx
2012-08-30 17:16:51 +05:30
Foram Katharotiya (OpenERP) 1e6099d713 [IMP] Add data of subtype in purchase & purchase_requisition
bzr revid: fka@tinyerp.com-20120830113037-7t4raly1gf4a3uoh
2012-08-30 17:00:37 +05:30
Sanjay Gohel (Open ERP) 91c022497b [MERGE]merge with lp:~openerp-dev/openobject-addons/trunk-mail-cleaning-fp and done changes as needed
bzr revid: sgo@tinyerp.com-20120830112426-15b9jere67yyoa3q
2012-08-30 16:54:26 +05:30
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
Rucha (Open ERP) 4eb76030a6 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120726053855-8j8c70xqc0ynikx1
2012-07-26 11:08:55 +05:30
pso (OpenERP) e5da0e191b [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Rucha (Open ERP) 953cd056b4 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120725053226-e67t7qdy472jc3ev
2012-07-25 11:02:26 +05:30
Stephane Wirtel 9f299d9a20 [MERGE] lp:~openerp-dev/openobject-addons/trunk-review_module_desc-psi
bzr revid: stw@openerp.com-20120724080711-6655pbbfubiau3li
2012-07-24 10:07:11 +02:00
Launchpad Translations on behalf of openerp 61f361bfee Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120722044557-vi2dy3u2aq5y09v7
bzr revid: launchpad_translations_on_behalf_of_openerp-20120723051751-qjxz39bz1gs3fi6f
bzr revid: launchpad_translations_on_behalf_of_openerp-20120724045230-9oi8x0xfvobpqjab
2012-07-24 04:52:30 +00:00
Turkesh Patel (Open ERP) ad3f062692 [IMP] purchase_requisition: improved search view.
bzr revid: tpa@tinyerp.com-20120723072802-vjl6ujcgcoxm03ok
2012-07-23 12:58:02 +05:30
Purnendu Singh (OpenERP) c45d68d6b8 [MERGE] Merge with main addons
bzr revid: psi@tinyerp.com-20120718055558-03lss1ha0tcdi2dk
2012-07-18 11:25:58 +05:30
pso (OpenERP) 70845a9015 [IMP] Improved warning messages/exceptions of purchase modules
bzr revid: pso@tinyerp.com-20120716113425-o30kv0bwg1lyug8t
2012-07-16 17:04:25 +05:30
Rucha (Open ERP) 64137a63cf [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120716090657-r7mlld3rsufel2ge
2012-07-16 14:36:57 +05:30
Launchpad Translations on behalf of openerp 8028996327 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120714062750-arh47r4vgtj7zlwu
2012-07-14 06:27:50 +00:00
Alexis de Lattre 5101771cd9 Harmonize the noupdate flag on security XML files :
- ir.rule objects are noupdate="1"
- all other objects are noupdate="0"

bzr revid: alexis@via.ecp.fr-20120713170838-pjsysliyt6twazrc
2012-07-13 19:08:38 +02:00
Hardik 933c9b2441 [IMP]Purchase(.pot) : Warning Messages are changed
bzr revid: hsa@tinyerp.com-20120713104458-sl9r036o3spygs9n
2012-07-13 16:14:58 +05:30
Ajay Chauhan (OpenERP) 01981534f6 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120713093114-wzrprgaeo34tzjbx
2012-07-13 15:01:14 +05:30
Hardik 646b0a1067 [IMP]Purchase : Warinig Messages are Changed
bzr revid: hsa@tinyerp.com-20120712060049-u38d37i1oxz7bo3g
2012-07-12 11:30:49 +05:30
Rucha (Open ERP) 63bdc1851d [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120711052537-mjxlznfhrt4feee9
2012-07-11 10:55:37 +05:30
Fabien Pinckaers 64a9321d56 [IMP] footer on forms
bzr revid: fp@tinyerp.com-20120710164011-unqi1okf2uu8yhts
2012-07-10 18:40:11 +02:00
Rucha (Open ERP) 4217b46c0d [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120704113856-vytxzu1zf6x6mnip
2012-07-04 17:08:56 +05:30
Thibault Delavallée 27a1ac68d4 [REF] ThreadView widget renamed to mail_thread. Also added some footers where they were not used.
bzr revid: tde@openerp.com-20120703124111-smgj0kw3ct32552y
2012-07-03 14:41:11 +02:00
Rucha (Open ERP) 9e6f918bbe [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120703062351-tazpsjb7a3usajvf
2012-07-03 11:53:51 +05:30
Thibault Delavallée b7f2854c59 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120702155505-xnyy7oy97obmwcu2
2012-07-02 17:55:05 +02:00
Thibault Delavallée 37a0658521 [IMP] needaction: cleaned definitions in addons.
bzr revid: tde@openerp.com-20120702145747-3m3s78tfmavjj61k
2012-07-02 16:57:47 +02:00
Rucha (Open ERP) 953dff0367 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120702054353-ertcuzo8gmqu98wp
2012-07-02 11:13:53 +05:30
Quentin (OpenERP) fae0317a6f [MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20120629162024-wfp7pwskf5c5vctc
2012-06-29 18:20:24 +02:00
Amit Patel (OpenERP) d34ae7dc55 [MERGE]:merged from trunk
bzr revid: apa@tinyerp.com-20120629124211-sx17fxv6xdgedd13
2012-06-29 18:12:11 +05:30
Amit Patel (OpenERP) 48c28ba008 [IMP]:purchase_requisition:improved label
bzr revid: apa@tinyerp.com-20120629123937-r9psgvgepliilyw1
2012-06-29 18:09:37 +05:30
Quentin (OpenERP) 6fe94bd4bc [MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
2012-06-29 14:36:18 +02:00
Rucha (Open ERP) 40f83805c5 [IMP]: product: Improved reference of demo product xml_id from static names to number (work in progress)
bzr revid: rpa@tinyerp.com-20120629110424-xykxjjq7sn50ovww
2012-06-29 16:34:24 +05:30
Raphael Collet 5133bee1d5 [FIX] in form views, replace class 'oe_highlight_on_dirty' by 'oe_highlight'
bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
2012-06-29 10:30:24 +02:00
Raphael Collet 1debe0efcd [MERGE] from trunk
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
2012-06-28 15:12:10 +02:00
Amit Patel (OpenERP) 91abd5199e [MERGE]
bzr revid: apa@tinyerp.com-20120628053623-ah0zod4rfp6n9qw2
bzr revid: apa@tinyerp.com-20120628103132-dfo5wd88nrgcl085
2012-06-28 16:01:32 +05:30
Rucha (Open ERP) e6f71c5da8 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120627130205-pe2wszrpzbft0j8n
bzr revid: rpa@tinyerp.com-20120628065606-btdzpz0agjxxb3o7
2012-06-28 12:26:06 +05:30
Sanjay Gohel (Open ERP) 1702b2335d [IMP]remove tabs and add spaces instead of them
bzr revid: sgo@tinyerp.com-20120628064005-zuerrpazumf5lf1q
2012-06-28 12:10:05 +05:30
Raphael Collet 05a98fb70b [IMP] purchase_requisition: code simplifications and small bug fix
bzr revid: rco@openerp.com-20120627144836-kf0zvnfn63cpkcjs
2012-06-27 16:48:36 +02:00
Raphael Collet 8695ccfdbc [IMP] purchase_requisition: small improvement of form view
bzr revid: rco@openerp.com-20120627143849-rqql9upyy6t9yshr
2012-06-27 16:38:49 +02:00
Jigar Amin - OpenERP 11224704cd [FIX] purchase*, sale, share, report_webkit, buton cancel
bzr revid: jam@tinyerp.com-20120627134530-141mzncfffkmjrom
2012-06-27 19:15:30 +05:30
Amit Patel (OpenERP) 046639e4c2 [IMP]:improved view
bzr revid: apa@tinyerp.com-20120627112349-34bt1nvlwdoljnth
2012-06-27 16:53:49 +05:30
Twinkle (OpenERP) 471037495c [IMP]Apply css class flow on wizards buttons
bzr revid: tch@tinyerp.com-20120626063119-5i93di16milljxap
2012-06-26 12:01:19 +05:30
Amit Patel (OpenERP) a2b3426282 [IMP]:improved view
bzr revid: apa@tinyerp.com-20120626053302-mvg99mplc6d83hrl
2012-06-26 11:03:02 +05:30
Atul Patel (OpenERP) f1db2c80cc [FIX]: Improve Treeview colors red to black, Improve tooltips in product form.
bzr revid: atp@tinyerp.com-20120625120824-f21tkf3x5uviiroq
2012-06-25 17:38:24 +05:30
Jigar Amin - OpenERP a973485bc9 [MERGE] lp:~openerp-dev/openobject-addons/trunk-wizard-remove-cancel-editable-tch
bzr revid: jam@tinyerp.com-20120625111519-j8rpvnhb804tl1o1
2012-06-25 16:45:19 +05:30
Atul Patel (OpenERP) eaa3f47b92 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120625105833-yx7rn4ggvbiwpmlc
2012-06-25 16:28:33 +05:30
Twinkle (OpenERP) 0e97cefe9e [IMP]Improve wizard button
bzr revid: tch@tinyerp.com-20120625100901-ucjbttxod55erqmf
2012-06-25 15:39:01 +05:30
Rucha (Open ERP) 2c17177d7e [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120625071016-acetvlch37mbjqd6
2012-06-25 12:40:16 +05:30
DBR (OpenERP) f029877da2 [Merge]with: lp:openobject-addons
bzr revid: dbr@tinyerp.com-20120622084325-8shcfo7wbi32ad7q
bzr revid: dbr@tinyerp.com-20120625060046-x91gzrg8emjeumr2
2012-06-25 11:30:46 +05:30
Jigar Amin - OpenERP 622abf69b3 [MERGE] remove wizard cancel button and make action button red
bzr revid: jam@tinyerp.com-20120625051048-y6mydqljdpysabn1
2012-06-25 10:40:48 +05:30
Jigar Amin - OpenERP 43a50a651b [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120625041934-v1twcjzbjupl369n
2012-06-25 09:49:34 +05:30
Jigar Amin - OpenERP dfdbf8cf17 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120625041316-rwtc4zf2pska9t5c
2012-06-25 09:43:16 +05:30
Purnendu Singh (OpenERP) 55633a22a2 [REF] search views: removed filterr_domain if only one element was inside
bzr revid: psi@tinyerp.com-20120622111251-nykd53nolythqhu2
2012-06-22 16:42:51 +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
Purnendu Singh (OpenERP) 1c35eb1049 [MERGE] Mearge with main addons
bzr revid: psi@tinyerp.com-20120622055230-trqmxu7r1qtxa0ut
2012-06-22 11:22:30 +05:30
DBR (OpenERP) c564447c42 [IMP] Purchase, stock:
Improve view of Receive Products and Incoming shipments

bzr revid: dbr@tinyerp.com-20120621110327-w0jxyrunrjejt2qx
2012-06-21 16:33:27 +05:30
Rucha (Open ERP) 0b86a7375e [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120621110022-oracs89f3clotupp
2012-06-21 16:30:22 +05:30
Jigar Amin - OpenERP 501721883d [USB] removed useless class defination
bzr revid: jam@tinyerp.com-20120621070959-qrkmzuk1xg304kwa
2012-06-21 12:39:59 +05:30
Atul Patel (OpenERP) af8c698b46 [FIX]: FIX Warehouse_id problem
bzr revid: atp@tinyerp.com-20120621063620-613wzcje95x34v4o
2012-06-21 12:06:20 +05:30
Atul Patel (OpenERP) 7122b5722d [FIX]: Add missing arguments
bzr revid: atp@tinyerp.com-20120621062552-k476fitxgkv0h376
2012-06-21 11:55:52 +05:30
Atul Patel (OpenERP) 14a322a373 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120621060224-icwx1r0x5bdausvw
2012-06-21 11:32:24 +05:30
Atul Patel (OpenERP) f47748ccad [MERGE]: Merged with Improvement.
bzr revid: atp@tinyerp.com-20120621060034-o9zfb9e5d13yrsi8
2012-06-21 11:30:34 +05:30
Jigar Amin - OpenERP f7db2ab215 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120621044348-3r8ur7izhjriing4
2012-06-21 10:13:48 +05:30
Jigar Amin - OpenERP d145817fb8 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120621043747-n4sjqa91q2xc3wl9
2012-06-21 10:07:47 +05:30
Bharat Devnani (OpenERP) 24a350a2bd [ADD] added functionality which display mail in open chatter of purchase_requisition view when RFQ is asked for particular quotation
bzr revid: bde@tinyerp.com-20120620132520-hvznamdl2xpcl972
2012-06-20 18:55:20 +05:30
Rucha (Open ERP) 0aaef8a06e [IMP]: Improved partner demo xml_id referenced based on changes in server
bzr revid: rpa@tinyerp.com-20120620120305-g88c9cp55csnsvoc
2012-06-20 17:33:05 +05:30
Twinkle (OpenERP) 660cc67256 [IMP]Added highlight button on wizard
bzr revid: tch@tinyerp.com-20120620104923-z1hty740vn160fg9
2012-06-20 16:19:23 +05:30
Randhir Mayatra (OpenERP) e80980330b [USA] replaced red button class oe_form_button_active_flow to oe_highlight
bzr revid: rma@tinyerp.com-20120620101205-uf0ibqbq4uzu17iq
2012-06-20 15:42:05 +05:30
DBR (OpenERP) 3c2c745fa6 [IMP]purchase: improve the purchase form view
bzr revid: dbr@tinyerp.com-20120620085120-l19503yk32ea1kkc
2012-06-20 14:21:20 +05:30
Bharat Devnani (OpenERP) f8d244f3d6 [REM] removed color tag from Request a Quotation button
bzr revid: bde@tinyerp.com-20120620051307-terudmn2z8b07y1s
2012-06-20 10:43:07 +05:30
Bharat Devnani (OpenERP) d89a10cf75 [IMP] improved functionality for purchase_requisition, added group on destination field and improved view
bzr revid: bde@tinyerp.com-20120619133300-jqndqfhxm7g2p443
2012-06-19 19:03:00 +05:30
Jigar Amin - OpenERP 21650f9790 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120619093157-ay1hdzmp8yh8bfgz
2012-06-19 15:01:57 +05:30
Stephane Wirtel f2fba32b56 [REF] Change the CSS classes
bzr revid: stw@openerp.com-20120619085618-agdxk4fdgy3of6gp
2012-06-19 10:56:18 +02:00
Jigar Amin - OpenERP 7fc1b0b25e [MERGE] lp:openpbject-addons
bzr revid: jam@tinyerp.com-20120619061856-eok4a7xmyodeapku
2012-06-19 11:48:56 +05:30
Atul Patel (OpenERP) 68bfff9830 [MERGE]:Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120618151853-0rm2xcjqfie3c26e
2012-06-18 20:48:53 +05:30
Purnendu Singh (OpenERP) 3977b03463 [MERGE]purchase_*: search view update
bzr revid: psi@tinyerp.com-20120618115859-t98hzdesb7q08jjk
2012-06-18 17:28:59 +05:30
Twinkle (OpenERP) 5db031806b [IMP]Purchase:Remove cancel button from wizard and added active class flow on buttoncd
bzr revid: tch@tinyerp.com-20120618062029-byrsndkcfu5iv34f
2012-06-18 11:50:29 +05:30
Launchpad Translations on behalf of openerp 10291e4673 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120616050526-srd8lul8rylb2k80
bzr revid: launchpad_translations_on_behalf_of_openerp-20120617044416-mxknrkegpytqjux4
bzr revid: launchpad_translations_on_behalf_of_openerp-20120616045845-74cddydmo6bilpef
bzr revid: launchpad_translations_on_behalf_of_openerp-20120617043537-yuizdga4lqp4zvl5
bzr revid: launchpad_translations_on_behalf_of_openerp-20120618052727-0zp1kvye3gwpzepo
2012-06-18 05:27:27 +00:00
Ajay Chauhan (OpenERP) 0b4699a844 [IMP]purchase_* : improve search code in xml
bzr revid: cha@tinyerp.com-20120614061042-5uphhv6znjb3cavw
2012-06-14 11:40:42 +05:30
Jigar Amin - OpenERP 82f6efb08c [MERGE] lp:~openerp-dev/openobject-addons/trunk-red-button-purchase-tpa
bzr revid: jam@tinyerp.com-20120613104253-heensgzj37swt3vk
2012-06-13 16:12:53 +05:30
Turkesh Patel (Open ERP) e91297eef8 [IMP] purchase: improved color of button based on business flow
bzr revid: tpa@tinyerp.com-20120613062910-5ieg7p7f4yjlwuil
2012-06-13 11:59:10 +05:30
Atul Patel (OpenERP) 2474a8f1be [MERGE]: Merged lp:openobject-addons
bzr revid: atp@tinyerp.com-20120612090350-axi2bpkvs63zy3i5
2012-06-12 14:33:50 +05:30
Fabien Pinckaers 2047df4e4f [merge] trunk
bzr revid: fp@tinyerp.com-20120610083515-itgsn211254zp1b9
2012-06-10 10:35:15 +02:00
Launchpad Translations on behalf of openerp c95b6d26ab Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120609053947-vtt4bvvka4m7ss08
bzr revid: launchpad_translations_on_behalf_of_openerp-20120610043726-y2hq6n49adbitr1p
bzr revid: launchpad_translations_on_behalf_of_openerp-20120611044647-txtguaozavg1ipp2
2012-06-11 04:46:47 +00:00
Fabien Pinckaers 1f885950b4 [FIX] headers
bzr revid: fp@tinyerp.com-20120609222849-gm9loztzarjyn7pl
2012-06-10 00:28:49 +02:00
Fabien Pinckaers 7e5c7916a2 [IMP] form view, removed project_planning
bzr revid: fp@tinyerp.com-20120609194946-5pgqdhkf1mmrleox
2012-06-09 21:49:46 +02:00
Fabien Pinckaers b1ea5e4c97 [IMP] replace footer by divs for chatter
bzr revid: fp@tinyerp.com-20120713095341-6h0ganz4zmlwv9wg
2012-07-13 11:53:41 +02:00
Atul Patel (OpenERP) e782639f63 [FIX]: Fix typo
bzr revid: atp@tinyerp.com-20120608083305-j9f01hyozubkrlef
2012-06-08 14:03:05 +05:30
Atul Patel (OpenERP) 062ee8f300 [FIX]: Fix chatter display string problem
bzr revid: atp@tinyerp.com-20120608082919-nwq1oh8z7cjxs07m
2012-06-08 13:59:19 +05:30
Atul Patel (OpenERP) 5407eca204 [FIX]: ADD RFQ button below RFQ o2m fields.
bzr revid: atp@tinyerp.com-20120607114233-50bnw61hzqbdbjcu
2012-06-07 17:12:33 +05:30
Atul Patel (OpenERP) 53c75466dd [IMP]: Imp search view. status bar and put chatter below
bzr revid: atp@tinyerp.com-20120607111724-ocu016dyf7pujglq
2012-06-07 16:47:24 +05:30
Atul Patel (OpenERP) 964ed8f92b [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120607105938-t2v1u45075w1pi8y
2012-06-07 16:29:38 +05:30
Atul Patel (OpenERP) a1f6facfa8 [FIX]: Fix demo data for purchase requisition
bzr revid: atp@tinyerp.com-20120604133553-amvsxbf9y1blc8mk
2012-06-04 19:05:53 +05:30
Atul Patel (OpenERP) 1d7f42c371 [FIX]: Make RFQ o2m field in requisition readonly. make send note to chatter for requisition.
bzr revid: atp@tinyerp.com-20120604132653-8nqia7hzlb5y8161
2012-06-04 18:56:53 +05:30
Fabien Pinckaers 48f8823bad [IMP] replaced all oe_form_topbar with the new <header> style
bzr revid: fp@tinyerp.com-20120604121139-zqoqbou9v2fdue5h
2012-06-04 14:11:39 +02:00
Fabien Pinckaers 623fd428bd [IMP] xml of topbars, removed oe_right, oe_clear
bzr revid: fp@tinyerp.com-20120604105056-xvos3jwt3i9wsqrb
2012-06-04 12:50:56 +02:00
Atul Patel (OpenERP) 8f5ff5216d [FIX]: Changed message_ids_social name to message_ids
bzr revid: atp@tinyerp.com-20120604052419-7ltovf79mn7ary4r
2012-06-04 10:54:19 +05:30
Atul Patel (OpenERP) ee0745115d [MERGE]: Merge with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120604050122-6g8ba2hvjugobb2u
2012-06-04 10:31:22 +05:30
Atul Patel (OpenERP) f6c44bb285 [FIX]: Fix some name for usability.
bzr revid: atp@tinyerp.com-20120604045011-0zm2l6aadexkktjh
2012-06-04 10:20:11 +05:30
Atul Patel (OpenERP) 30442ae0f7 [FIX]: Fix state color in tree view.
bzr revid: atp@tinyerp.com-20120602073510-6ig49sshg2t4vdoa
2012-06-02 13:05:10 +05:30
Atul Patel (OpenERP) b89e09a077 [IMP]: Improve tree view.
bzr revid: atp@tinyerp.com-20120602065841-zoz75mk96usd2psi
2012-06-02 12:28:41 +05:30
Atul Patel (OpenERP) 219effb06a [MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp-po-related-functionality-bde
bzr revid: atp@tinyerp.com-20120601173011-te4xbjt67ba9y3dd
2012-06-01 23:00:11 +05:30
Atul Patel (OpenERP) 7068de6bc7 [FIX]: Allow add rfq manually with warning if same suppliers if given.
bzr revid: atp@tinyerp.com-20120601171345-o4uxah793kvxhs5v
2012-06-01 22:43:45 +05:30
Bharat Devnani (OpenERP) 4382469a3a [MERGE] merged with parent branch
bzr revid: bde@tinyerp.com-20120601131602-nae8jpxl2loyjqgn
2012-06-01 18:46:02 +05:30
Bharat Devnani (OpenERP) e7de1fcb4e [ADD] added functionality of counting records which are in draft state in purchase requisition menu and also changed string of partner_id in wizard
bzr revid: bde@tinyerp.com-20120601123048-ojix38618v9jo2km
2012-06-01 18:00:48 +05:30
Atul Patel (OpenERP) 79ccadc73d [MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp-add_open_chatter-nco with some changes
bzr revid: atp@tinyerp.com-20120601121344-zqubz51eh2936zv2
2012-06-01 17:43:44 +05:30
Thibault Delavallée cd19f68eb9 [MERGE] Merged with main addons.
bzr revid: tde@openerp.com-20120601113625-c9w0kmnw1dzvjswx
2012-06-01 13:36:25 +02:00
Nimesh (Open ERP) 17927188c0 [MERGE] merge with parent brach and resolve the conflicts
bzr revid: nco@tinyerp.com-20120601061200-hhlld3k829ajbgdh
2012-06-01 11:42:00 +05:30
Atul Patel (OpenERP) fb97abf406 [ADD]: Add proper groups in warehouse and product_uom fields
bzr revid: atp@tinyerp.com-20120601043933-wmmammgxrfbtjmm3
2012-06-01 10:09:33 +05:30
Atul Patel (OpenERP) fdd440897b [MERGE]: Merged lp:~openerp-commiter/openobject-addons/trunk-improve-purchase-requisition-view-atp-improve-state-buttons-pja
bzr revid: atp@tinyerp.com-20120601042503-0bctee8s796jtcjz
2012-06-01 09:55:03 +05:30