Commit Graph
83232 Commits
Author SHA1 Message Date
Martin Trigaux 08f759e71a [MERGE] [FIX] document_ftp: allow to use '..' command when traveling in ftp directories
This command is triggered when trying to go one level up in some FTP softwares (eg: FileZilla)

bzr revid: mat@openerp.com-20140121133045-9p2p67bo2jz8uo9z
2014-01-21 11:30:45 -02:00
Martin Trigaux 9a0a02060f [FIX] format_value: when formating to date, make sure not converting from a datetime string as would make timezones apply and lead to a possible day change
bzr revid: mat@openerp.com-20140121132725-k9f8hna3lg7nq7g8
2014-01-21 11:27:25 -02:00
Xavier Morel a6ad36ef89 [ADD] attempt to correctly initialize ckeditor widgets (fontawesome icon things at the moment) within a dropped snippet
bzr revid: xmo@openerp.com-20140121131841-u0qzlk1ytng3af2h
2014-01-21 14:18:41 +01:00
ddm@openerp.com 35b8850ecc [IMP] add SEO preview
bzr revid: ddm@openerp.com-20140121125325-641psvqr4w96lsci
2014-01-21 13:53:25 +01:00
ajay javiya (OpenERP) 5b976496e1 [IMP]: Add optional product scroll to the pricing instead of top
-> Hide History and Edit button when print quotation
-> Add signature in customization option and order should not validate if sign is empty
-> Add options to the left menu and remove/hide it if no options available
-> Add sidenav to template
-> Improve Options view(table like pricing)

bzr revid: aja@tinyerp.com-20140121125314-1tom0sjcltegi57c
2014-01-21 18:23:14 +05:30
Christophe Matthieu 6d320f6f0b [FIX] website_sale: payement button
bzr revid: chm@openerp.com-20140121125040-r4o7wdys2hd3437d
2014-01-21 13:50:40 +01:00
Turkesh Patel (Open ERP) 7ca3383659 [IMP] move demo data file in demo setion
bzr revid: tpa@tinyerp.com-20140121124716-ipot2wp280ltloqa
2014-01-21 18:17:16 +05:30
Denis Ledoux a38a58cab8 [FIX] stock: updating cost price for products with cost method set to average price and inventory valuation periodic (manual) does not write move lines.
As the move line should be written manually by the accountant

bzr revid: dle@openerp.com-20140121124243-4a23ih2z51mh4svf
2014-01-21 13:42:43 +01:00
Christophe Matthieu 4ff1af4d01 [FIX] website: display or not editor edit button; website_sale: test tour; website: contact qweb widget
bzr revid: chm@openerp.com-20140121123912-0ya4ziusj09efti3
2014-01-21 13:39:12 +01:00
Thibault Delavallée 14bdf21b17 [CLEAN] product: cleaned product template copy method improvements
bzr revid: tde@openerp.com-20140121122139-j4jmr3jfbaoaamyj
2014-01-21 13:21:39 +01:00
Thibault Delavallée b3fa81982b [IMP] product: group_product_mono is default
bzr revid: tde@openerp.com-20140121122120-r2m1r927ne2r12mi
2014-01-21 13:21:20 +01:00
Antony Lesuisse 658ed76a84 [REM] preprocess of widget selection on m2o
As they are now directly supported by the webclient since commit
web 3863 nicolas.vanhoren@openerp.com-20131022131525-d0i61sbm0w6katfs

bzr revid: al@openerp.com-20140121112759-zavwqdyv8kdq4oys
2014-01-21 12:27:59 +01:00
Thibault Delavallée 744810bbb4 [REV] product: unlink method back, no comment about why it has been
removed. It is therefore added back.

bzr revid: tde@openerp.com-20140121111421-x35gyqwo9jdpr3d7
2014-01-21 12:14:21 +01:00
Thibault Delavallée 93711b0f91 [MERGE] Sync with website-al main branch
bzr revid: tde@openerp.com-20140121105805-msfn6i901v7kr2o3
2014-01-21 11:58:05 +01:00
Fabien Meghazi 3087646d34 [FIX] render bootstrap template checks request.debug
bzr revid: fme@openerp.com-20140121105233-h2c2nfs75qxc6w10
2014-01-21 11:52:33 +01:00
Cedric Snauwaert 86e7d60e23 [FIX]add some filter to search product qty
bzr revid: csn@openerp.com-20140121105100-offsz1so77u4z0x8
2014-01-21 11:51:00 +01:00
Thibault Delavallée b3a4778f26 [IMP] product variant: removed override of fields_view_get and use a "one group or another"
behavior for product variant. Users are either in group_product_mono or
group_product_variant, allowing to tune the form view according to the
group the user belongs to.
product: added group_product_mono group
sale: added set_group_product_variant method that adds or remove the
group_product_mono according to the group_product_variant being unchecked
or checked.
product: updated form view accordingly

bzr revid: tde@openerp.com-20140121105046-zkbs778upjg0lpyr
2014-01-21 11:50:46 +01:00
Josse Colpaert 056bfc00a9 [IMP] Make sure the wizard does not take negative quants and refactor a little bit not to have duplicate code
bzr revid: jco@openerp.com-20140121104051-87ihs7fnz72i0b9z
2014-01-21 11:40:51 +01:00
Cedric Snauwaert df9a1f0325 [FIX]return picking, incorrect use of product_qty in wizard + should not force assign product when returning a picking
lp bug: https://launchpad.net/bugs/1269492 fixed

bzr revid: csn@openerp.com-20140121103222-5m93dfb2k79c7aq6
2014-01-21 11:32:22 +01:00
Martin Trigaux 6c0d8142ba [FIX] document_ftp: allow to use '..' command when traveling in ftp directories
lp bug: https://launchpad.net/bugs/734892 fixed

bzr revid: mat@openerp.com-20140121103021-mv9gcv4iprary0ac
2014-01-21 11:30:21 +01:00
Turkesh Patel (Open ERP) 3cfea8434f [MRG] merge with lp:openobject-addons
bzr revid: tpa@tinyerp.com-20140121102549-5xtvx4emv4nrylky
2014-01-21 15:55:49 +05:30
Turkesh Patel (Open ERP) c651b3554c [IMP] improved model given in template.
bzr revid: tpa@tinyerp.com-20140121100835-k65dkw05dom4xlfs
2014-01-21 15:38:35 +05:30
Xavier Morel 51f6977f39 [IMP] icons selection dialog
remove fixed size checkbox
add fayt for icons (by name)

bzr revid: xmo@openerp.com-20140121100408-64e32iio9r77yx9m
2014-01-21 11:04:08 +01:00
Turkesh Patel (Open ERP) 22a630fc57 [MRG] added new prodcut and templatre
bzr revid: tpa@tinyerp.com-20140121095700-9j9qxx2bpgdluizg
2014-01-21 15:27:00 +05:30
Turkesh Patel (Open ERP) e8036b627c [IMP] remove menu of product template
bzr revid: tpa@tinyerp.com-20140121094423-k17idc4cg9qy5n3j
2014-01-21 15:14:23 +05:30
Chirag Dodiya (OpenERP) 081be6181a [ADD]Added demo data for product template
bzr revid: cod@tinyerp.com-20140121093854-18dxvjdx6co1amqp
2014-01-21 15:08:54 +05:30
Thibault Delavallée 28eaa636f0 [MERGE] Merged DKA's branch about product variants in the CMS. Review is coming.
bzr revid: tde@openerp.com-20140121093832-yp3jl36nsuho74vk
2014-01-21 10:38:32 +01:00
Fabien Meghazi f43f06a6b0 [IMP] use 'error' key in login template
bzr revid: fme@openerp.com-20140121093224-8auf7b00jxfq8940
2014-01-21 10:32:24 +01:00
Josse Colpaert 96120dcdbd [IMP] Make sure consumed_for is set before doing action_done
bzr revid: jco@openerp.com-20140121093027-2h6xlgouhg49sr76
2014-01-21 10:30:27 +01:00
Quentin (OpenERP) e32b5bb6ae [FIX] sale_mrp; fixed error in yaml test. It seems we forgot the property_ids field on sale.order.line -_- . Also removed a unused method (_prepare_order_line_procurement on procurement order => this must be/is already defined in sale.order object)
bzr revid: qdp-launchpad@openerp.com-20140121084946-8aws5axdkgr8ng9r
2014-01-21 09:49:46 +01:00
Christophe Matthieu 3b1fec3220 [FIX] website: double reload in tests process
bzr revid: chm@openerp.com-20140121083038-63cubvi2bu59klaj
2014-01-21 09:30:38 +01:00
Quentin (OpenERP) c3f087f795 [FIX] sale_stock: fixed yaml test
bzr revid: qdp-launchpad@openerp.com-20140121080433-cx7zbrhzr7546msm
2014-01-21 09:04:33 +01:00
Launchpad Translations on behalf of openerp 698e2de138 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140121062040-gq8r12g3ypksxa4t
2014-01-21 06:20:40 +00:00
Darshan Kalola (OpenERP) 9ce241349f [MERGE] with lp:~openerp-dev/openobject-addons/trunk-website-al and removed temporary solution.
bzr revid: dka@tinyerp.com-20140121054638-b7hbckj39vsk93tm
2014-01-21 11:16:38 +05:30
Fabien Pinckaers e33c70a318 [IMP] Small improvements: messages
bzr revid: fp@tinyerp.com-20140120222228-pj7xhlui2cwmnrxw
2014-01-20 23:22:28 +01:00
Fabien Pinckaers cd3be26606 [IMP] Merge Trunk + Deisgn Improvements
bzr revid: fp@tinyerp.com-20140120205229-b9726jvb5tfmj3fc
2014-01-20 21:52:29 +01:00
Christophe Matthieu 53d8280f1d [IMP] website: test class with test for website_sale sale process
bzr revid: chm@openerp.com-20140120182643-tw65rig4qqi3sqqf
2014-01-20 19:26:43 +01:00
Denis Ledoux 4f3a4dce3b [FIX] purchase: on unlink purchase order line, cancel procurements associated to the move of the purchase order line
bzr revid: dle@openerp.com-20140120170729-57fm8tluz5p4zdk5
2014-01-20 18:07:29 +01:00
Christophe Simonis e516362da4 [IMP] calendar: tell orm to rename old select1 column
bzr revid: chs@openerp.com-20140120164054-ia6pw4svp3ylww5w
2014-01-20 17:40:54 +01:00
Martin Trigaux c09798bfbb [FIX] css: remove useless css properties
float:left with cleartext hack is the same as no properties, and it's working in firefox

bzr revid: mat@openerp.com-20140120163554-zf0sq98ko8qqc9fb
2014-01-20 17:35:54 +01:00
Quentin (OpenERP) 8d8b592fbd [FIX] sale_mrp: fixed wrong signature of _prepare_order_line_procurement().
bzr revid: qdp-launchpad@openerp.com-20140120163403-pwzrlhww131gu329
2014-01-20 17:34:03 +01:00
Josse Colpaert 24f6ed8973 [WIP] Give warnings when not possible to do traceability and needed, group by quants
bzr revid: jco@openerp.com-20140120162828-6xgxshtkc44tlesi
2014-01-20 17:28:28 +01:00
Xavier Morel ca02581993 [IMP] replace icon size select by selectable multi-size preview
bzr revid: xmo@openerp.com-20140120162604-yoyg21bf1z306hwg
2014-01-20 17:26:04 +01:00
Fabien Meghazi 1e921cd03d [MERGE] upstream
bzr revid: fme@openerp.com-20140120161321-txvp4fpb136tfker
2014-01-20 17:13:21 +01:00
Fabien Meghazi 4d6e7e2d2e [REM] Remove testing route
bzr revid: fme@openerp.com-20140120161237-m96w38qd6zqajc12
2014-01-20 17:12:37 +01:00
Fabien Meghazi c1f0fb5ed1 [MERGE] upstream
bzr revid: fme@openerp.com-20140120161145-ntxx6y01vekk3tg2
2014-01-20 17:11:45 +01:00
Fabien Meghazi 05e2942121 [MERGE] upstream
bzr revid: fme@openerp.com-20140120161129-elnp1afn8ognyc6z
2014-01-20 17:11:29 +01:00
Cedric Snauwaert 596499193c [FIX]add stock_picking_wave module to warehouse settings menu
bzr revid: csn@openerp.com-20140120161051-dufjods0bpngvq9o
2014-01-20 17:10:51 +01:00
Quentin (OpenERP) 3f8ec15bbe [MERGE] stock, sale, sale_stock: several usability problem fixed.
lp bug: https://launchpad.net/bugs/1269045 fixed

bzr revid: qdp-launchpad@openerp.com-20140120160303-v5hmfmb6roeg56v6
2014-01-20 17:03:03 +01:00
Martin Trigaux 263693e44e [FIX] search: add delay of 250us (was 0) on autocomplete fields in search bar and m2o fields.
This avoids making a search request for each keypressed

bzr revid: mat@openerp.com-20140120160147-q7lg4j93c836ec44
2014-01-20 17:01:47 +01:00