Commit Graph

1720 Commits

Author SHA1 Message Date
vta vta@openerp.com 264d2c3365 [MERGE] Trunk.
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
2012-07-30 14:36:28 +02:00
Thibault Delavallée 7b8c68b4a0 [IMP] point of sale: added css to fix the image width/height.
bzr revid: tde@openerp.com-20120730103519-fn4rgqr6gcs7luwz
2012-07-30 12:35:19 +02:00
Thibault Delavallée 97d48ebf51 [REF] pos.category: propagated change of category_image.
bzr revid: tde@openerp.com-20120730103451-bce6bqone6e9f690
2012-07-30 12:34:51 +02:00
Thibault Delavallée 82f4612f53 [REF] pos.category: category_image removed and replaced by image, image_medium and image_small, to standardize through OpenERP.
bzr revid: tde@openerp.com-20120730103301-rw0s7077m3ed7vj3
2012-07-30 12:33:01 +02:00
Thibault Delavallée b9d62abd9a [FIX] point of sale: removed forgotten tree/merge, probably due to a forgotten conflict to resolve.
bzr revid: tde@openerp.com-20120730091946-3ml79eb6u4flzina
2012-07-30 11:19:46 +02:00
Thibault Delavallée 9e3844d666 [REM] Removed file added during merge.
bzr revid: tde@openerp.com-20120730091907-y1tnw3fytfmz1qwq
2012-07-30 11:19:07 +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) 4eb76030a6 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120726053855-8j8c70xqc0ynikx1
2012-07-26 11:08:55 +05:30
Raphael Collet df723a0b6c [MERGE] from trunk
bzr revid: rco@openerp.com-20120725133932-0cvvngral6nt8ixj
bzr revid: rco@openerp.com-20120725151612-lp3bozy0xb0gjrvp
2012-07-25 17:16:12 +02:00
pso (OpenERP) e5da0e191b [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Raphael Collet 495d222f4e [IMP] point_of_sale: add OpenChatter notification after module installation
bzr revid: rco@openerp.com-20120725112900-bv2eixl6ojc4w28h
2012-07-25 13:29:00 +02:00
Saurang Suthar(OpenERP) b7a5a1d928 [IMP] Improved warning messages for POS module
bzr revid: pso@tinyerp.com-20120725104932-1awd9eerplzglhui
2012-07-25 16:19:32 +05:30
Saurang Suthar(OpenERP) e9f73afd66 [IMP] Improved warning messages for POS module
bzr revid: pso@tinyerp.com-20120725103449-iyhg19xu0m8ev0sk
2012-07-25 16:04:49 +05:30
Rucha (Open ERP) ab9981e565 [IMP]: Replaced tabs with 4 spaces in some xml demo files
bzr revid: rpa@tinyerp.com-20120725094836-fqa0fs31bygvzh5p
2012-07-25 15:18:36 +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
Quentin (OpenERP) ebdc4ebb62 [MERGE] label VAT to Tax
bzr revid: qdp-launchpad@openerp.com-20120720151554-fp5t5nsddjyb81jr
2012-07-20 17:15:54 +02:00
Turkesh Patel (Open ERP) 6e178d51ec [IMP] point_of_sale: improved search views.
bzr revid: tpa@tinyerp.com-20120720124629-4eau5t3r09x7b5y2
2012-07-20 18:16:29 +05:30
Purnendu Singh (OpenERP) d5ec4a6535 [IMP] update pot files
bzr revid: psi@tinyerp.com-20120720114402-yipigtjmk4j7qk1r
2012-07-20 17:14:02 +05:30
Raphael Collet 75abad6a61 [MERGE] trunk-module-summary (add field 'summary' on modules)
bzr revid: rco@openerp.com-20120720100339-sk3mx0qucujeqsxe
2012-07-20 12:03:39 +02:00
Raphael Collet dee772d423 [FIX] in summary of modules: typos
bzr revid: rco@openerp.com-20120720093046-92l51ts5aaee9etq
2012-07-20 11:30:46 +02:00
Purnendu Singh (OpenERP) ec27d7e44f [MERGE] merge with main branch
bzr revid: psi@tinyerp.com-20120720061203-c6cpwc7f8uaa939n
2012-07-20 11:42:03 +05:30
Rajesh Prajapati (OpenERP) 0c1dc06331 [MERGE] merge with parent branch
bzr revid: rpr@tinyerp.com-20120720055401-hu537f6dua4px1d3
2012-07-20 11:24:01 +05:30
Rucha (Open ERP) 0145655e8c [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120720051100-gdofz4jfu3a0ggs9
2012-07-20 10:41:00 +05:30
Antonin Bourguignon a4fba2145b [MERGE] latest trunk
bzr revid: abo@openerp.com-20120718131530-a90b062c769y0u0e
bzr revid: abo@openerp.com-20120719164208-xj75h0socxc3p6jb
2012-07-19 18:42:08 +02:00
Quentin (OpenERP) 7b8c3788b1 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120719095420-llgnafgasfcwbwu9
2012-07-19 11:54:20 +02:00
Rajesh Prajapati (OpenERP) 1916eadb89 [IMP]vat to tax : changed the label Tax as its abbreviation
bzr revid: rpr@tinyerp.com-20120719055821-1d6ipvw6i8s0n7uk
2012-07-19 11:28:21 +05:30
Rajesh Prajapati (OpenERP) e068ed2663 [IMP]vat to tax : changed the label Vat as its abbreviation
bzr revid: rpr@tinyerp.com-20120719053803-r4p9dhh28h2bysmm
2012-07-19 11:08:03 +05:30
Quentin (OpenERP) 7ebf017845 [MERGE] accounting, usability review of form views
bzr revid: qdp-launchpad@openerp.com-20120718160828-l917gya3a57ln4cs
2012-07-18 18:08:28 +02:00
Antonin Bourguignon 391a35389c [IMP] remove deprecated attributes 'icon', 'web_icon' and 'web_icon_hover' from top menu items
bzr revid: abo@openerp.com-20120718131403-6pzpzhhqbxhtub9b
2012-07-18 15:14:03 +02:00
Rajesh Prajapati (OpenERP) 74a58c0f15 [IMP]vat to tax : I have changed the label as tax inplace of vat
bzr revid: rpr@tinyerp.com-20120718121821-esupnmy423ukxniz
2012-07-18 17:48:21 +05:30
Raphael Collet d713f20954 [FIX] point_of_sale: remove auto_install on module
bzr revid: rco@openerp.com-20120718112816-sby6j51xnevm0rzk
2012-07-18 13:28:16 +02:00
Antonin Bourguignon 6a2f418bfd [FIX] some wrong ordering sequences in top menus
bzr revid: abo@openerp.com-20120718101112-0i0oc550pd86oepu
2012-07-18 12:11:12 +02:00
Jigar Amin - OpenERP 3e5414bee9 [FIX] Imporved the TYPOs
bzr revid: jam@tinyerp.com-20120718083112-2h2swzyoanwzq6ov
2012-07-18 14:01:12 +05:30
Twinkle Christian (OpenERP) 9113f5da36 [IMP]improving summary
bzr revid: tch@tinyerp.com-20120718074040-eghe7nrbhq39780y
2012-07-18 13:10:40 +05:30
Atul Patel (OpenERP) e284d902ef [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120718064921-wob12umyjhi63v63
2012-07-18 12:19:21 +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
Antonin Bourguignon 2b59d63699 [IMP] give higher sequence numbers (with wider gaps) to top menu items
it should now be easier to insert new elements wherever we want in the main menu

bzr revid: abo@openerp.com-20120717162528-0kkk32mjeoyda9c4
2012-07-17 18:25:28 +02:00
Twinkle Christian (OpenERP) b25e73a680 [IMP]Adding summary
bzr revid: tch@tinyerp.com-20120717060547-6owny0ouxrc1hxlu
2012-07-17 11:35:47 +05:30
Rucha (Open ERP) c8a7ee2c0d [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120717054135-3iw8studvvkag06h
2012-07-17 11:11:35 +05:30
Fabien Pinckaers 40fe783301 [IMP] remove print statement
bzr revid: fp@tinyerp.com-20120716164856-j7gicxtuhnnkap4h
2012-07-16 18:48:56 +02:00
Fabien Pinckaers 5e0cce7d55 [FIX] point of sale addons fixes + YAML test improve
bzr revid: fp@tinyerp.com-20120716164129-6u8ejw0h6rw3fstq
2012-07-16 18:41:29 +02:00
Frédéric van der Essen 2d67ef5f55 [FIX] point_of_sale: removed placeholder category images
bzr revid: fva@openerp.com-20120716141104-15dy9989mjksftfn
2012-07-16 16:11:04 +02:00
Frédéric van der Essen 7d36e8b669 [FIX] point_of_sale: removed useless default category image in view data
bzr revid: fva@openerp.com-20120716140355-yleho36c0mstknvj
2012-07-16 16:03:55 +02:00
Frédéric van der Essen 6cee026b81 [FIX] point_of_sale: missing file: bg.png
bzr revid: fva@openerp.com-20120716120004-lui21pt4jmk31vnx
2012-07-16 14:00:04 +02:00
Frédéric van der Essen 562d105a70 [FIX] point_of_sale: missing file: backbone-0.9.2.js
bzr revid: fva@openerp.com-20120716115424-kn3br23t3c6uidms
2012-07-16 13:54:24 +02:00
Frédéric van der Essen f3742eb0d9 [IMP] point_of_sale: Adding barcode test sheet
bzr revid: fva@openerp.com-20120716101827-3e5iwibabq17fycj
2012-07-16 12:18:27 +02:00
Frédéric van der Essen 70b750d2d5 [MERGE] from trunk
bzr revid: fva@openerp.com-20120716101340-hn3q1aucfk6qty9s
2012-07-16 12:13:40 +02:00
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
Atul Patel (OpenERP) 7173035138 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120716060846-f6zpe2a5qlnji3zb
2012-07-16 11:38:46 +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
Frédéric van der Essen 54a3fd7fcc [FIX] packaging fix
bzr revid: fva@openerp.com-20120713165845-i9eceb3vuqlqp08e
2012-07-13 18:58:45 +02:00
Frédéric van der Essen db172f2531 [FIX] point_of_sale: close button doesn't crash anymore
bzr revid: fva@openerp.com-20120713153719-256zclhnwzvq52qf
2012-07-13 17:37:19 +02:00
Frédéric van der Essen 7fa6ccb47e [FIX] point_of_sale: missing default images
bzr revid: fva@openerp.com-20120713143647-ys3jrymkb58ukygl
2012-07-13 16:36:47 +02:00
Frédéric van der Essen 79e81b7fd9 [MERGE] merging is fun !
bzr revid: fva@openerp.com-20120713121803-w74ztfvizlm4v5f9
bzr revid: fva@openerp.com-20120713123434-25ciq29rkgmq0035
bzr revid: fva@openerp.com-20120713125409-uuc3vrr3rcqsgt2n
2012-07-13 14:54:09 +02:00
Ajay Chauhan (OpenERP) 9feb9aba74 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120713115125-pyfzt5cijs63qr9d
2012-07-13 17:21:25 +05:30
Rucha (Open ERP) 783618c5da [FIX]: point_of_sale: Fixed reference of sale shop in pos demo
bzr revid: rpa@tinyerp.com-20120713102003-lr21i1cv7e1h40zp
2012-07-13 15:50:03 +05:30
Harry (OpenERP) 1744fe2ffb [MERGE] upstream
bzr revid: hmo@tinyerp.com-20120713060815-n2gtoumchg1lupsb
2012-07-13 11:38:15 +05:30
Launchpad Translations on behalf of openerp 88c70c4340 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120713044619-j6n6qsnk8bnp9nmh
2012-07-13 04:46:19 +00:00
Frédéric van der Essen 6587e7fe99 [FIX] point_of_sale: various fixes for the client mode on the pos
bzr revid: fva@openerp.com-20120712170013-ea6u23wunncmslgz
2012-07-12 19:00:13 +02:00
Frédéric van der Essen 35b08fb1fc [FIX] point_of_sale: css fixes for firefox
bzr revid: fva@openerp.com-20120712113806-b3lh0h90jr6713hq
2012-07-12 13:38:06 +02:00
Ajay Chauhan (OpenERP) 66b80419e0 [IMP] : Update Description for modules
bzr revid: cha@tinyerp.com-20120712095425-l1i8o33okp2tzfjx
2012-07-12 15:24:25 +05:30
Rucha (Open ERP) 9dc752d788 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120712062623-cvhg4a2ewwqp9hcv
2012-07-12 11:56:23 +05:30
Launchpad Translations on behalf of openerp b0b5a5988f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120712044116-gnxo3c234xwbzacm
bzr revid: launchpad_translations_on_behalf_of_openerp-20120712045848-qoy4f00epmiytqw2
2012-07-12 04:58:48 +00:00
Frédéric van der Essen cd3a0c2b73 [MERGE] from trunk
bzr revid: fva@openerp.com-20120711162837-xirr40vvc81xk8ra
2012-07-11 18:28:37 +02:00
Frédéric van der Essen f5e0ad32f2 [MERGE] trunk into point_of_sale, WIP
bzr revid: fva@openerp.com-20120711160325-vmzhxwl74j2u7v8g
2012-07-11 18:03:25 +02:00
Purnendu Singh (OpenERP) 79a8450b72 [MERGE] merge with main branch
bzr revid: psi@tinyerp.com-20120711090814-z3khnc83bl9ndcy6
2012-07-11 14:38:14 +05:30
Ajay Chauhan (OpenERP) 8a847dcf5e [IMP] : improve title & description for modules
bzr revid: cha@tinyerp.com-20120711084057-b7f3jt6p0kht6wrp
2012-07-11 14:10:57 +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
Frédéric van der Essen f8d32d3304 [MERGE] point_of_sale
bzr revid: fva@openerp.com-20120710142447-s0z5ca89bofh0n2c
2012-07-10 16:24:47 +02:00
Frédéric van der Essen dd2384325b [IMP] point_of_sale: removing comments, console.logs, and debug globals
bzr revid: fva@openerp.com-20120710101515-0jla27j85xcg87nm
2012-07-10 12:15:15 +02:00
Frédéric van der Essen 841a25b231 [IMP] point_of_sale: removed commented-out code
bzr revid: fva@openerp.com-20120709155642-ibnh03xfei6wey7d
2012-07-09 17:56:42 +02:00
Frédéric van der Essen 0a2c340f92 [IMP] point_of_sale: new weighting workflow
bzr revid: fva@openerp.com-20120709155351-u8cgp4ft14ytwfdw
2012-07-09 17:53:51 +02:00
Atul Patel (OpenERP) b3b06e4587 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120706060327-9obeef705ve1w7z2
2012-07-06 11:33:27 +05:30
Atul Patel (OpenERP) 0347a93cda [FIX]: IMprovement in view. duration field also.
bzr revid: atp@tinyerp.com-20120705124233-6jchsxi9m6pvqvtr
2012-07-05 18:12:33 +05:30
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
Frédéric van der Essen 5eec5822cd [FIX] point_of_sale: various fixes for the payment screen
bzr revid: fva@openerp.com-20120703165039-xu538hp9e6mnnepv
2012-07-03 18:50:39 +02:00
Frédéric van der Essen 116c671d17 [IMP] point_of_sale: printing via proxy
bzr revid: fva@openerp.com-20120703140315-xnvioeiner7tz88i
2012-07-03 16:03:15 +02:00
Frédéric van der Essen 0e255c2b90 [IMP] point_of_sale: refactored Orderline and Paymentline, new OrderWidget design
bzr revid: fva@openerp.com-20120703114741-3xixto34i2wqfy0v
2012-07-03 13:47:41 +02:00
Launchpad Translations on behalf of openerp c449d53f0f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120703053613-vs3ebaffu079mlld
bzr revid: launchpad_translations_on_behalf_of_openerp-20120703055544-8hfe2zf9x5g8muvi
2012-07-03 05:55:44 +00: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) 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 7416e2443f [IMP] small form view improvements
bzr revid: rco@openerp.com-20120629093256-np0ver7xyzam2qzm
2012-06-29 11:32:56 +02:00
Raphael Collet 76f17eb480 [IMP] in form views, remove useless colspans on buttons in headers
bzr revid: rco@openerp.com-20120629084603-yz0hdnvtjy1fplp1
2012-06-29 10:46:03 +02:00
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
Frédéric van der Essen c753d215dd [MERGE] from stw
bzr revid: fva@openerp.com-20120628123912-pn1rzfji2xt7lv76
2012-06-28 14:39:12 +02:00
Frédéric van der Essen f69643a4a1 [IMP] point_of_sale: order widget is now complete
bzr revid: fva@openerp.com-20120628123825-hrat3tlhtyz8yv1i
2012-06-28 14:38:25 +02:00
Thibault Delavallée 9e7f29ccd9 [IMP] point of sale: updated used iamge size to image_medium in point of sale.
bzr revid: tde@openerp.com-20120628102735-lkidztrueu5emax0
2012-06-28 12:27:35 +02:00
Rucha (Open ERP) 237173eeff [IMP]: product: Improvement in product category demo, improved xml_id refereneces (work in progress)
bzr revid: rpa@tinyerp.com-20120628093001-k113siqn5sbp3xf2
2012-06-28 15:00:01 +05:30
Thibault Delavallée bd42290522 [MERGE] Merged with trunk addons.
bzr revid: tde@openerp.com-20120628090158-v3epmjb72eotwp3l
2012-06-28 11:01:58 +02:00
Thibault Delavallée 3650c035f5 [IMP] product: images modified accordign to new spec. Propagated changes to stock/product and point of sale, and also to demo data.
bzr revid: tde@openerp.com-20120628090133-zmdbmjeiajhtmo3m
2012-06-28 11:01:33 +02:00
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
Jigar Amin - OpenERP bfb4f471a3 [MERGE] lp:~openerp-commiter/openobject-addons/trunk-red-button-addcancelbutton-rma
bzr revid: jam@tinyerp.com-20120627142931-vfas27ijl6tn4jmd
2012-06-27 19:59:31 +05:30
Randhir Mayatra (OpenERP) a4b94dbee6 [USA] add cancel button
bzr revid: rma@tinyerp.com-20120627141917-bs9bg2j3dasy9n1y
2012-06-27 19:49:17 +05:30
Fabien Meghazi cd4c3b6c91 [CHG] Ashes to ashes, dashes to underscores.
bzr revid: fme@openerp.com-20120627141352-7a6d23iebv03rcv3
2012-06-27 16:13:52 +02:00