Commit Graph

1637 Commits

Author SHA1 Message Date
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
Fabien Pinckaers c17b2443e7 [IMP] improved UI for PoS - mainly forms version=7.0
bzr revid: fp@openerp.com-20120811133406-jvso3qhmozmgnj3j
2012-08-11 15:34:06 +02:00
Antonin Bourguignon 4388ace499 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120808091048-hr1r4vn9milozexf
2012-08-08 11:10:48 +02:00
Rucha (Open ERP) 526b8af2cc [FIX]: product: Fixed field name of product image
bzr revid: rpa@tinyerp.com-20120808064411-gkq77wya0l4zy7kj
2012-08-08 12:14:11 +05:30
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
Thibault Delavallée a4e00edcdc [IMP] Added iamges as fields in kanban view where used.
bzr revid: tde@openerp.com-20120807120210-kp0yrn6iiv61yu0o
2012-08-07 14:02:10 +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
Antonin Bourguignon 8a64e7580a [IMP] all the error messages now start with 'Error\!' (not 'Error' or 'Error \!')
bzr revid: abo@openerp.com-20120807113137-44vehm0mthqawlo3
2012-08-07 13:31:37 +02:00
Thibault Delavallée 023262e519 [IMP] product, hr, point of sale, mail_group: propagated function name change (now prefixed with image_) in image module.
bzr revid: tde@openerp.com-20120807111039-57cykhxurm2wj79k
2012-08-07 13:10:39 +02:00
Thibault Delavallée 6c4dda8441 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120807100920-mr0oc56qs2zntvu1
2012-08-07 12:09:20 +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
Thibault Delavallée c8c95d46f9 [IMP] product, hr, pos, mail_group: removed the onchange_image, updated used images and classes in views.
bzr revid: tde@openerp.com-20120806155354-sjkrmrffgb2ik4ba
2012-08-06 17:53:54 +02:00
Thibault Delavallée a814343ab7 [MERGE] Mergede with addons/trunk.
bzr revid: tde@openerp.com-20120806124445-hym9imdiqgeot8fu
2012-08-06 14:44:45 +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
Antonin Bourguignon 206252d606 [IMP] fix a first batch of typos and spelling mistakes (listed by UCO on the 2012-08-01)
bzr revid: abo@openerp.com-20120803172636-s23g6yturpb5chd6
2012-08-03 19:26:36 +02:00
Ajay Chauhan (OpenERP) 74c1be68f6 [Merge] Merge with main addons.
bzr revid: cha@tinyerp.com-20120801120610-qswrdthuyhzeil02
bzr revid: cha@tinyerp.com-20120803091456-538xpz38vks38g3v
2012-08-03 14:44:56 +05:30
Thibault Delavallée 8a408f2ff3 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120803071454-ictuwjq0y3gri4f8
2012-08-03 09:14:54 +02:00
Hardik 9c2de5a3bd [IMP]product : product by location wizard improved
bzr revid: hsa@tinyerp.com-20120801105901-2s2bqg1hqoxl2pfi
2012-08-01 16:29:01 +05:30
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
Quentin (OpenERP) e1b50e304d [MEGUEZ] merged the clean search view branch
bzr revid: qdp-launchpad@openerp.com-20120731150358-jqd3eoz06imzlx01
2012-07-31 17:03:58 +02:00
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
Thibault Delavallée 81f6d43ee4 [CLEAN] images: cleaned typos.
bzr revid: tde@openerp.com-20120730133343-f1jofji7bl9u09zp
2012-07-30 15:33:43 +02:00
vta vta@openerp.com 264d2c3365 [MERGE] Trunk.
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
2012-07-30 14:36:28 +02:00
Antonin Bourguignon 3aef7dbc24 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120730095020-e6hdaf050baguujm
2012-07-30 11:50:20 +02:00
vta@openerp.com f920e391e0 [IMP] search view: review of the search views.
bzr revid: qdp-launchpad@openerp.com-20120730085027-0khspe8pl0t4118j
2012-07-30 10:50:27 +02:00
Thibault Delavallée 238598c041 [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120730081600-y92rgh002zhpp4tw
2012-07-30 10:16:00 +02:00
Rucha (Open ERP) 9be1dc63e5 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120730052105-tjzeohx0hyi43qi4
2012-07-30 10:51:05 +05:30
Launchpad Translations on behalf of openerp 0c581831b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120728045741-hrbggtt37yutrbpx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120729043802-x7m56po0nxue0jb0
2012-07-29 04:38:02 +00:00
Quentin (OpenERP) 234abbc5d6 [IMP] demo data of product categories
bzr revid: qdp-launchpad@openerp.com-20120727154329-2dj5piwce9o5b7ra
2012-07-27 17:43:29 +02:00
Rucha (Open ERP) 9f8a9829d1 [FIX]: product: Fixed string in pricelist yml
bzr revid: rpa@tinyerp.com-20120727112228-ymvm6feasi0jieek
2012-07-27 16:52:28 +05:30
Rucha (Open ERP) db8991e3c7 [IMP]: product: Improved product categories structure and related changes
bzr revid: rpa@tinyerp.com-20120727112025-2t75kivor8pcm2b8
2012-07-27 16:50:25 +05:30
Antonin Bourguignon f14850b63d [MERGE] latest trunk
bzr revid: abo@openerp.com-20120727092135-6vsw4et9khbph9io
2012-07-27 11:21:35 +02:00
Launchpad Translations on behalf of openerp 0dee110ef6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120727052304-iux3j0f0prqcs3qp
2012-07-27 05:23:04 +00:00
Rucha (Open ERP) a9cdfad12a [IMP]: product: Changed xml_id of product category in data file to identify this record easily when accessing from py
bzr revid: rpa@tinyerp.com-20120726131700-ob1unjqwpaqns7nx
2012-07-26 18:47:00 +05:30
Rucha (Open ERP) 780bdb4a29 [IMP]: product: Changed xml_id of product in data file from product_product_0 to product_product_consultant to identify this record easily when accessing from py
bzr revid: rpa@tinyerp.com-20120726113914-gvpo9rx7fan77w3f
2012-07-26 17:09:14 +05:30
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
Antonin Bourguignon 7350bdb271 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120725180118-l6flsrakml2ijxqy
2012-07-25 20:01:18 +02:00
Quentin (OpenERP) e5dcb6d833 [MERGE] staging branch with misc fixes and improevmeents
bzr revid: qdp-launchpad@openerp.com-20120725171054-ulo0febioz2n7wry
2012-07-25 19:10:54 +02:00
Quentin (OpenERP) 0f7f3a06e6 [MERGE] partial revert of commit 7101, that was renaming the column product_id into product_template_id on supplierinfo table because it was not passing the runbot tests
bzr revid: qdp-launchpad@openerp.com-20120725164959-capumyjm76ac1puv
2012-07-25 18:49:59 +02:00
Antonin Bourguignon 8ea8f1da5b [IMP] put groups attributes in the product's form view in order to hide qty incoming, qty outgoing, qty available, procurement method and costing method from portal users
also remove some code commented out since 2010 (written by qdp, commented by sbh)

bzr revid: abo@openerp.com-20120725162306-n4ypzds4ltsrhy6j
2012-07-25 18:23:06 +02:00
Quentin (OpenERP) b644c99c43 [MERGE] moved some fields from product.template to product.product. Courtesy of Sebastien Beau (Akretion)
bzr revid: qdp-launchpad@openerp.com-20120725120719-czen18843ywoqx67
2012-07-25 14:07:19 +02:00
Stephane Wirtel ac580aeae0 [MERGE] lp:~openerp-dev/openobject-addons/trunk-review_devs-stw
bzr revid: stw@openerp.com-20120725105833-3bdcb66bzd9l5pg7
2012-07-25 12:58:33 +02:00