git.inspyration.org Git - odoo/odoo.git/log

merge_trunk

bzr revid: fp@tinyerp.com-20120716085048-3845ifsnnl0p12ni
bzr revid: fp@tinyerp.com-20120716111346-x9re5vedkitgjhi9
bzr revid: fp@tinyerp.com-20120716173231-9d9dxmj5ilmxkewa

commit | commitdiff | tree

Fabien Pinckaers [Mon, 16 Jul 2012 17:31:17 +0000 (19:31 +0200)]

[IMP] breadcrum separator fade, cause lots of sequence have slash in the prefix 'PO/001'

bzr revid: fp@tinyerp.com-20120716173117-znn02l6ida07pt15

commit | commitdiff | tree

Fabien Pinckaers [Mon, 16 Jul 2012 17:06:31 +0000 (19:06 +0200)]

[MERGE] New PoS
Multi-Sessions, PoS Physical Desks
Better Opening/Closing Control
Improved Accounting Entries
Touchscreen interface: bugs & improvements
New self-checkout interface
Interface with third party systems; barcode, light, cashier opener, payment, printer, weight
Better browser of products by categories
Identification of customer on PoS order
Several bugfixes

bzr revid: fp@tinyerp.com-20120716170631-z9crnd03275bsnv4

commit | commitdiff | tree

Fabien Pinckaers [Mon, 16 Jul 2012 16:48:56 +0000 (18:48 +0200)]

[IMP] remove print statement

bzr revid: fp@tinyerp.com-20120716164856-j7gicxtuhnnkap4h

commit | commitdiff | tree

Fabien Pinckaers [Mon, 16 Jul 2012 16:41:29 +0000 (18:41 +0200)]

[FIX] point of sale addons fixes + YAML test improve

bzr revid: fp@tinyerp.com-20120716164129-6u8ejw0h6rw3fstq

commit | commitdiff | tree

Fabien Pinckaers [Mon, 16 Jul 2012 15:00:29 +0000 (17:00 +0200)]

[IMP] double css removed

bzr revid: fp@tinyerp.com-20120716150029-8o4saxlooeg02zjs

commit | commitdiff | tree

Christophe Simonis [Mon, 16 Jul 2012 14:29:18 +0000 (16:29 +0200)]

[FIX] do not absolutify data uri when merging css files

bzr revid: chs@openerp.com-20120716142918-813sn1z197ily3un

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 16 Jul 2012 14:23:14 +0000 (16:23 +0200)]

[MERGE] settings: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120716142314-2htvjeqoiq8vrcxw

commit | commitdiff | tree

Frédéric van der Essen [Mon, 16 Jul 2012 14:11:04 +0000 (16:11 +0200)]

[FIX] point_of_sale: removed placeholder category images

bzr revid: fva@openerp.com-20120716141104-15dy9989mjksftfn

commit | commitdiff | tree

Frédéric van der Essen [Mon, 16 Jul 2012 14:03:55 +0000 (16:03 +0200)]

[FIX] point_of_sale: removed useless default category image in view data

bzr revid: fva@openerp.com-20120716140355-yleho36c0mstknvj

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 16 Jul 2012 13:44:52 +0000 (15:44 +0200)]

[MERGE] settings: usablity, review of form views

bzr revid: qdp-launchpad@openerp.com-20120716134452-0oncn2ybu0in278d

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 16 Jul 2012 13:43:14 +0000 (15:43 +0200)]

[REV] settings: reverted to revision 6971, for usability purposes

bzr revid: qdp-launchpad@openerp.com-20120716134314-os07j9sxreqc39tl

commit | commitdiff | tree

Frédéric van der Essen [Mon, 16 Jul 2012 12:00:04 +0000 (14:00 +0200)]

[FIX] point_of_sale: missing file: bg.png

bzr revid: fva@openerp.com-20120716120004-lui21pt4jmk31vnx

commit | commitdiff | tree

Frédéric van der Essen [Mon, 16 Jul 2012 11:54:24 +0000 (13:54 +0200)]

[FIX] point_of_sale: missing file: backbone-0.9.2.js

bzr revid: fva@openerp.com-20120716115424-kn3br23t3c6uidms

commit | commitdiff | tree

Frédéric van der Essen [Mon, 16 Jul 2012 11:46:56 +0000 (13:46 +0200)]

[MERGE] merging move_line fix

bzr revid: fva@openerp.com-20120716114656-dzob0nnazo2lfddo

commit | commitdiff | tree

Sanjay Gohel (Open ERP) [Mon, 16 Jul 2012 11:41:58 +0000 (17:11 +0530)]

[IMP]hr,mrp,project:res_config view improvement as per suggetion

bzr revid: sgo@tinyerp.com-20120716114158-nef7622tzmnzcpxa

commit | commitdiff | tree

Fabien Pinckaers [Mon, 16 Jul 2012 11:13:24 +0000 (13:13 +0200)]

[IMP] css

bzr revid: fp@tinyerp.com-20120716111324-xi5x9w0broortnls

commit | commitdiff | tree

Sanjay Gohel (Open ERP) [Mon, 16 Jul 2012 11:02:16 +0000 (16:32 +0530)]

[IMP]base_setup,purchase,stock: Improve res_config view for all this

bzr revid: sgo@tinyerp.com-20120716110216-95m1na5o09y934em

commit | commitdiff | tree

Sanjay Gohel (Open ERP) [Mon, 16 Jul 2012 10:44:28 +0000 (16:14 +0530)]

[IMP]sale:res_config view improve

bzr revid: sgo@tinyerp.com-20120716104428-q7ck7ho2q9pfjkkg

commit | commitdiff | tree

Frédéric van der Essen [Mon, 16 Jul 2012 10:18:27 +0000 (12:18 +0200)]

[IMP] point_of_sale: Adding barcode test sheet

bzr revid: fva@openerp.com-20120716101827-3e5iwibabq17fycj

commit | commitdiff | tree

Frédéric van der Essen [Mon, 16 Jul 2012 10:13:40 +0000 (12:13 +0200)]

[MERGE] from trunk

bzr revid: fva@openerp.com-20120716101340-hn3q1aucfk6qty9s

commit | commitdiff | tree

Quentin (OpenERP) [Mon, 16 Jul 2012 10:10:07 +0000 (12:10 +0200)]

[IMP] account: res_config, better use of groups

bzr revid: qdp-launchpad@openerp.com-20120716101007-zas8dba568n3zm1n

commit | commitdiff | tree

niv-openerp [Mon, 16 Jul 2012 09:29:29 +0000 (11:29 +0200)]

Trying to delete web_livechat to solve conflicts

bzr revid: nicolas.vanhoren@openerp.com-20120716092929-y605mvjl2mggxlt6

commit | commitdiff | tree

Sanjay Gohel (Open ERP) [Mon, 16 Jul 2012 08:56:08 +0000 (14:26 +0530)]

[IMP]improve xml architecture

bzr revid: sgo@tinyerp.com-20120716085608-elwahvnphgl8j9jn

commit | commitdiff | tree

Fabien Pinckaers [Mon, 16 Jul 2012 08:51:32 +0000 (10:51 +0200)]

merge

bzr revid: fp@tinyerp.com-20120716085132-wudvp93z4lzm2a4v

commit | commitdiff | tree

Sanjay Gohel (Open ERP) [Mon, 16 Jul 2012 08:35:20 +0000 (14:05 +0530)]

[IMP]improve view

bzr revid: sgo@tinyerp.com-20120716083520-a0cv3yfd0uxqg0s3

commit | commitdiff | tree

Sanjay Gohel (Open ERP) [Mon, 16 Jul 2012 06:57:50 +0000 (12:27 +0530)]

[MERGE]merge with trunk server

bzr revid: sgo@tinyerp.com-20120716065750-8b6vxpitjxeflx7d

commit | commitdiff | tree

Sanjay Gohel (Open ERP) [Mon, 16 Jul 2012 06:57:03 +0000 (12:27 +0530)]

[MERGE]merge with trunk addons

bzr revid: sgo@tinyerp.com-20120716065703-gcmugagvaaq1xl4c

commit | commitdiff | tree

Divyesh Makwana (Open ERP) [Mon, 16 Jul 2012 04:46:13 +0000 (10:16 +0530)]

[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120712044249-z0xy8j6ueloi2bqs
bzr revid: mdi@tinyerp.com-20120713043610-i5370isy4gb0jevv
bzr revid: mdi@tinyerp.com-20120716044613-pstjqy53b8v5kwf1

commit | commitdiff | tree

Fabien Pinckaers [Sun, 15 Jul 2012 12:30:09 +0000 (14:30 +0200)]

[IMP] css

bzr revid: fp@openerp.com-20120715123009-evvlbucsex188s7b

commit | commitdiff | tree

Fabien Pinckaers [Sun, 15 Jul 2012 11:41:12 +0000 (13:41 +0200)]

[IMP] kanban views for cstomers and suppliers in accounting

bzr revid: fp@openerp.com-20120715114112-04d62y2ykx54g0az

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120715051341-64aocmtnt57g4enz

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 23:44:29 +0000 (01:44 +0200)]

[IMP] customer payment

bzr revid: fp@openerp.com-20120714234429-zvuyng3xcv0iyghc

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 23:35:25 +0000 (01:35 +0200)]

[IMP] sales receipt form viewé

bzr revid: fp@openerp.com-20120714233525-0g8x3bl76kfloqfk

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 23:18:43 +0000 (01:18 +0200)]

[IMP] form view supplier invoice

bzr revid: fp@openerp.com-20120714231843-pdgqdms3cjqtmg6f

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 22:12:00 +0000 (00:12 +0200)]

[FIX] note on invoices

bzr revid: fp@openerp.com-20120714221200-zdwhp48812cixfei

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 22:01:23 +0000 (00:01 +0200)]

[FIX] edit without note

bzr revid: fp@openerp.com-20120714220123-a6m22nj0lz92cg8y

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 21:18:27 +0000 (23:18 +0200)]

[IMP] merge note and name for PO, SO, Invoice Lines

bzr revid: fp@openerp.com-20120714211827-fe8e1mbz4cu37ayc

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 20:51:50 +0000 (22:51 +0200)]

[IMP] merge note&name on purchase lines

bzr revid: fp@openerp.com-20120714205150-c5qjjjyuovbyxac5

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 20:36:23 +0000 (22:36 +0200)]

[IMP] invoice layout + merge note&name

bzr revid: fp@openerp.com-20120714203623-9n1iap9hplafnjp9

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 20:02:07 +0000 (22:02 +0200)]

merge

bzr revid: fp@openerp.com-20120714200207-gwcq5xi2q5yzknu6

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 20:01:42 +0000 (22:01 +0200)]

fix

bzr revid: fp@openerp.com-20120714200142-n8tkm5zyltgxbm25

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 20:01:05 +0000 (22:01 +0200)]

form

bzr revid: fp@openerp.com-20120714200105-cr5psndz9duu2qfn

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 19:57:57 +0000 (21:57 +0200)]

[IMP] better addons

bzr revid: fp@openerp.com-20120714195757-zqk43d7zhupitlsk

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 17:10:22 +0000 (19:10 +0200)]

imp

bzr revid: fp@openerp.com-20120714171022-grn0n9wtbpjvcpm3

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 17:07:03 +0000 (19:07 +0200)]

trunk

bzr revid: fp@openerp.com-20120713225718-21ke0ro01pzjtp06
bzr revid: fp@openerp.com-20120714170703-0nms2vjgyxy5sgdt

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 16:58:56 +0000 (18:58 +0200)]

[IMP] layout

bzr revid: fp@openerp.com-20120714165856-wqv4ldiu3y8ovln4

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 16:22:03 +0000 (18:22 +0200)]

[FIX] meetings change

bzr revid: fp@openerp.com-20120714162203-fnnsbo7hpnduo29g

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 16:04:03 +0000 (18:04 +0200)]

[IMP] partner kanban, holidays, meeting

bzr revid: fp@openerp.com-20120714160403-if88yyfrqn07xp3t

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 16:03:53 +0000 (18:03 +0200)]

[IMP] partner kanban, holidays, meeting

bzr revid: fp@openerp.com-20120714160353-6rty6sqjfl152fde

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 15:33:50 +0000 (17:33 +0200)]

[IMP] meetings forms and features

bzr revid: fp@openerp.com-20120714153350-tr9dkw5f4pxpf5ev

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 15:31:55 +0000 (17:31 +0200)]

[IMP] layot

bzr revid: fp@openerp.com-20120714153155-t7j43co12g460fla

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 13:41:05 +0000 (15:41 +0200)]

[IMP] sale order form

bzr revid: fp@openerp.com-20120714134105-omqlxtymeg1p15kh

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 12:54:56 +0000 (14:54 +0200)]

[IMP] delivery on SO

bzr revid: fp@openerp.com-20120714125456-p4qexmx4vvaka1rh

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 11:42:25 +0000 (13:42 +0200)]

merge_mit

bzr revid: fp@openerp.com-20120714114225-fe6se86e2idqzwr3

Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20120714062750-arh47r4vgtj7zlwu

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 00:21:14 +0000 (02:21 +0200)]

[iMP] SO view

bzr revid: fp@openerp.com-20120714002114-u8ttbocnvysprpju

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 00:20:56 +0000 (02:20 +0200)]

imp

bzr revid: fp@openerp.com-20120714002056-q6xtj18jpj4fmy0w

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 00:16:07 +0000 (02:16 +0200)]

[IMP] subtotal

bzr revid: fp@openerp.com-20120714001607-02vp586jbeeeyjih

commit | commitdiff | tree

Fabien Pinckaers [Sat, 14 Jul 2012 00:05:19 +0000 (02:05 +0200)]

[IMP] dialogs

bzr revid: fp@openerp.com-20120714000519-ksf14svlnp6xljri

commit | commitdiff | tree

Fabien Pinckaers [Fri, 13 Jul 2012 22:56:36 +0000 (00:56 +0200)]

merge

bzr revid: fp@openerp.com-20120713225636-ttjfg4c13iar904t

commit | commitdiff | tree

Fabien Pinckaers [Fri, 13 Jul 2012 22:51:31 +0000 (00:51 +0200)]

[IMP] sale order view

bzr revid: fp@openerp.com-20120713225131-f5l8w42u34rvqpa4

commit | commitdiff | tree

Fabien Pinckaers [Fri, 13 Jul 2012 22:25:28 +0000 (00:25 +0200)]

[IMP] layout web, mianly dialogs and improved mit merge

bzr revid: fp@openerp.com-20120713222528-5sflq6ah9redrcry

commit | commitdiff | tree

Fabien Pinckaers [Fri, 13 Jul 2012 20:38:00 +0000 (22:38 +0200)]

merge_mit

bzr revid: fp@openerp.com-20120713203800-cyqmtjn2q2g05gcx

commit | commitdiff | tree

Fabien Pinckaers [Fri, 13 Jul 2012 20:36:13 +0000 (22:36 +0200)]

merge

bzr revid: fp@openerp.com-20120713203613-5o143hbyyzbp20ab

commit | commitdiff | tree

Fabien Pinckaers [Fri, 13 Jul 2012 20:34:34 +0000 (22:34 +0200)]

merge

bzr revid: fp@openerp.com-20120713203434-p7z6u5qltl7dxe3f

commit | commitdiff | tree

Frédéric van der Essen [Fri, 13 Jul 2012 16:58:45 +0000 (18:58 +0200)]

[FIX] packaging fix

bzr revid: fva@openerp.com-20120713165845-i9eceb3vuqlqp08e

commit | commitdiff | tree

Antony Lesuisse [Fri, 13 Jul 2012 16:36:21 +0000 (18:36 +0200)]

[FIX] declare bus class

bzr revid: al@openerp.com-20120713163621-1a4mj8e01970ks44

commit | commitdiff | tree

Antony Lesuisse [Fri, 13 Jul 2012 16:24:36 +0000 (18:24 +0200)]

[MERGE] display the db manager when no db defined

bzr revid: al@openerp.com-20120713162436-gfd89ocleaqhb43h

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 13 Jul 2012 16:16:18 +0000 (18:16 +0200)]

[IMP] settings: better form view for res.company

bzr revid: qdp-launchpad@openerp.com-20120713161618-hu7xp8yhn8ilmjar

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 13 Jul 2012 16:12:22 +0000 (18:12 +0200)]

[IMP] settings: better form view for res.company

bzr revid: qdp-launchpad@openerp.com-20120713161222-4irw0jpcbz7ivh0q

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 13 Jul 2012 16:11:58 +0000 (18:11 +0200)]

[IMP] settings: better form view for res.company

bzr revid: qdp-launchpad@openerp.com-20120713161158-w0e5268zip8drzi1

commit | commitdiff | tree

Frédéric van der Essen [Fri, 13 Jul 2012 15:37:19 +0000 (17:37 +0200)]

[FIX] point_of_sale: close button doesn't crash anymore

bzr revid: fva@openerp.com-20120713153719-256zclhnwzvq52qf

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 13 Jul 2012 15:36:07 +0000 (17:36 +0200)]

[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20120713153607-muuauno83ku2vsom

commit | commitdiff | tree

Quentin (OpenERP) [Fri, 13 Jul 2012 15:35:20 +0000 (17:35 +0200)]

[IMP] settings: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120713153520-unk4nr4rhjdwykjr

commit | commitdiff | tree

Antony Lesuisse [Fri, 13 Jul 2012 15:01:56 +0000 (17:01 +0200)]

[FIX] fp misindentation

bzr revid: al@openerp.com-20120713150156-b07dd3qeff5xi3em

commit | commitdiff | tree

Antony Lesuisse [Fri, 13 Jul 2012 14:57:40 +0000 (16:57 +0200)]

[IMP] allow xml ids for action_id

bzr revid: al@openerp.com-20120713145740-xkwp0hxy7kou61f0

commit | commitdiff | tree

Christophe Simonis [Fri, 13 Jul 2012 14:40:30 +0000 (16:40 +0200)]

[FIX] account: clean account.move.line tree view generation + ensure "state" is always shown

bzr revid: chs@openerp.com-20120713144030-nmmkmw6mh7emex1r

commit | commitdiff | tree

Frédéric van der Essen [Fri, 13 Jul 2012 14:36:47 +0000 (16:36 +0200)]

[FIX] point_of_sale: missing default images

bzr revid: fva@openerp.com-20120713143647-ys3jrymkb58ukygl

commit | commitdiff | tree

Fabien Pinckaers [Fri, 13 Jul 2012 14:18:55 +0000 (16:18 +0200)]

merge_trunk

bzr revid: fp@tinyerp.com-20120713115247-qiwljgk5adp6y069
bzr revid: fp@tinyerp.com-20120713141855-5jbmiqii067ntkk2

relooking one2many listview and changed padding in popup

bzr revid: mit@openerp.com-20120713141237-on8z29w5dnh2at2z

Restyling of form listview subtotals

bzr revid: mit@openerp.com-20120713134616-rpntccxdiei562u6

commit | commitdiff | tree

Frédéric van der Essen [Fri, 13 Jul 2012 12:54:09 +0000 (14:54 +0200)]

[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

commit | commitdiff | tree

Frédéric van der Essen [Fri, 13 Jul 2012 12:52:35 +0000 (14:52 +0200)]

[FIX] more fixes for fabien's mess

bzr revid: fva@openerp.com-20120713125235-9m3rdccqoeq0pnw7

commit | commitdiff | tree

Fabien Pinckaers [Fri, 13 Jul 2012 12:28:44 +0000 (14:28 +0200)]

[FIX] stupid type fixed

bzr revid: fp@tinyerp.com-20120713122844-qnvoxlk6cms9b5gm

commit | commitdiff | tree

Fabien Pinckaers [Fri, 13 Jul 2012 11:53:45 +0000 (13:53 +0200)]

merge_trunk

bzr revid: fp@tinyerp.com-20120713115345-nfvg7sraq6cmhrno

commit | commitdiff | tree

Fabien Pinckaers [Fri, 13 Jul 2012 11:47:37 +0000 (13:47 +0200)]

[IMP] modal dialogs

bzr revid: fp@tinyerp.com-20120713114737-hqieh0oi6nnnbjqh

commit | commitdiff | tree

Fabien Pinckaers [Fri, 13 Jul 2012 09:07:44 +0000 (11:07 +0200)]