Randhir Mayatra (OpenERP)
de149b50f9
[IMP] Improve code
...
bzr revid: rma@tinyerp.com-20130417113838-kit0g1g2iybvj2t9
2013-04-17 17:08:38 +05:30
Randhir Mayatra (OpenERP)
1f930d3c4c
[IMP] improve the code
...
bzr revid: rma@tinyerp.com-20130417100806-ti12zqg8cl1tfrit
2013-04-17 15:38:06 +05:30
Randhir Mayatra (OpenERP)
507cd402b7
[IMP] changes the labels string as per suggestion
...
bzr revid: rma@tinyerp.com-20130417095544-wl04gd57vuv4k2c4
2013-04-17 15:25:44 +05:30
ggh-openerp
735a20f320
[REM] Remove the onchange pos available method
...
bzr revid: ggh@tinyerp.com-20130417052737-4t5ejcwzkkkgfqdj
2013-04-17 10:57:37 +05:30
Tejas Tank
6e63c47c64
[FIX] pos,cash-register: corrected word theoritical to theoretical changes.
...
bzr revid: tta@openerp.com-20130412093807-9bazw36l9khrjm0l
2013-04-12 15:08:07 +05:30
Frédéric van der Essen
ef81f0bd43
[IMP] point_of_sale: add a configuration option to enable invoicing from the Point of Sale (enabled by default)
...
bzr revid: fva@openerp.com-20130411122250-aju5cl91wduj2bj0
2013-04-11 14:22:50 +02:00
ggh-openerp
e582096959
[IMP] Improved code in Pos
...
bzr revid: ggh@tinyerp.com-20130411102949-lfeakwxskka8hzyy
2013-04-11 15:59:49 +05:30
ggh-openerp
43a9fa81fd
[IMP] Name of method changed
...
bzr revid: ggh@tinyerp.com-20130411051350-0esvxad9a189x8iz
2013-04-11 10:43:50 +05:30
ggh-openerp
07db55efa3
[IMP] POS:Available in pos checkbox not click pos_categ no need to display
...
bzr revid: ggh@tinyerp.com-20130409132314-2o0uvomvd5afy624
2013-04-09 18:53:14 +05:30
ggh-openerp
054465b3ed
[IMP] POS:Change the data code into demo code
...
bzr revid: ggh@tinyerp.com-20130409100917-pvwkamgwh0trtu4m
2013-04-09 15:39:17 +05:30
ggh-openerp
d4a1f8b434
[IMP] POS: All pos payment method show, domain based on Available in the point of sales
...
bzr revid: ggh@tinyerp.com-20130409051836-g8u2f6ebbc4rlkyn
2013-04-09 10:48:36 +05:30
Tejas Tank
b062573df4
[IMP] pos,cash-register: Corrected tooltips and layout.
...
bzr revid: tta@openerp.com-20130409044724-1jhnyjhp0ka1ckf6
2013-04-09 10:17:24 +05:30
Tejas Tank
76b7a08275
[IMP] pos session and cash register, Improved tooltip and layout.
...
bzr revid: tta@openerp.com-20130405092419-jpa89isevfq6jw49
2013-04-05 14:54:19 +05:30
Ajay Chauhan (OpenERP)
cbc2fc05c8
[IMP] POS: made changes to have POS total well aligned
...
bzr revid: cha@tinyerp.com-20130318095952-wynm8qf0nmuq7uc5
2013-03-18 15:29:52 +05:30
Ajay Chauhan (OpenERP)
3c9a40ff84
[IMP] POS: made currency_id field invisible
...
bzr revid: cha@tinyerp.com-20130318090747-4413l0il1pk7slww
2013-03-18 14:37:47 +05:30
Ajay Chauhan (OpenERP)
d3b14e953a
[IMP] POS: added field currency_id to have currency symbol at pos total
...
bzr revid: cha@tinyerp.com-20130318084547-42fwyv84jqqfi03h
2013-03-18 14:15:47 +05:30
Ajay Chauhan (OpenERP)
0a7683d39f
[IMP] account, pos: added string 'Closing Balance' to fields 'balance_end_real' & 'cash_register_balance_end_real'
...
bzr revid: cha@tinyerp.com-20130315095454-ljh2bjd1brds80m5
2013-03-15 15:24:54 +05:30
Ajay Chauhan (OpenERP)
c121461ea8
[IMP] account, pos: change string Theoretical Balance to 'Computed Balance'
...
bzr revid: cha@tinyerp.com-20130314052259-9zp8hwepvoey29mv
2013-03-14 10:52:59 +05:30
Tejas Tank
1e48c24516
[FIX] Point Of Sale: Added Closing Subtotal in Cashbox lines.
...
bzr revid: tta@openerp.com-20130306093828-ult0l5tnxdsvm8eb
2013-03-06 15:08:28 +05:30
sgo@tinyerp.com
d7bd9743a2
[IMP]improve pos config view
...
bzr revid: sgo@tinyerp.com-20130207095827-oaya9xo9cjroqcex
2013-02-07 15:28:27 +05:30
sgo@tinyerp.com
bc17621cec
[IMP]improve pos config form view and add group on warehouse
...
bzr revid: sgo@tinyerp.com-20130207065126-1liwmg1u3emnra6j
2013-02-07 12:21:26 +05:30
sgo@tinyerp.com
9e99431d1f
[IMP]add pricelist field in pos config and set default
...
bzr revid: sgo@tinyerp.com-20130206123851-4b3lhr5bzf7msla6
2013-02-06 18:08:51 +05:30
sgo@tinyerp.com
e4250d1558
[IMP]remove sale.shop from pos and improve code
...
bzr revid: sgo@tinyerp.com-20130123113306-n7enol5as84sv0g2
2013-01-23 17:03:06 +05:30
Randhir Mayatra (OpenERP)
c87ab693a3
[MERGE] merge with parent
...
bzr revid: rma@tinyerp.com-20121127051533-kpy6m65bna2e1ncg
2012-11-27 10:45:33 +05:30
Quentin (OpenERP)
90e268d14c
[MERGE] staging branch
...
bzr revid: qdp-launchpad@openerp.com-20121126162933-a3c1agw0z72auw0e
2012-11-26 17:29:33 +01:00
Quentin (OpenERP)
846b6a0477
[FIX] delivery, warning, point_of_sale: onchange_partner_id now takes context as argument
...
bzr revid: qdp-launchpad@openerp.com-20121126142142-1i7tm04z85aeozqk
2012-11-26 15:21:42 +01:00
Fabien Pinckaers
9c66d7d2f9
[IMP] PoS Useability
...
bzr revid: fp@tinyerp.com-20121126121350-1n3v1nqsrjf8b5qf
2012-11-26 13:13:50 +01:00
Randhir Mayatra (OpenERP)
061f894aa1
[MERGE] merge with parent
...
bzr revid: rma@tinyerp.com-20121126084100-gagk2faf833cir4f
2012-11-26 14:11:00 +05:30
Frédéric van der Essen
5e83cce0ca
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20121123141458-h3vo5blt3h9eh9iz
2012-11-23 15:14:58 +01:00
Randhir Mayatra (OpenERP)
0d915a11c4
[IMP] Change the string of the button in pos
...
bzr revid: rma@tinyerp.com-20121123111706-serad30xiaznzgvo
2012-11-23 16:47:06 +05:30
Frédéric van der Essen
4d90fdd32e
[IMP] point_of_sale: you must now use available_in_pos to make product available in pos ... Products without categories will appear at the root category
...
bzr revid: fva@openerp.com-20121122175254-ippyf1rstggvvwh7
2012-11-22 18:52:54 +01:00
Arnaud Pineux
1d335a7cdb
[IMP] Re-set the sequence number for main menus
...
bzr revid: api@openerp.com-20121121162753-3mi0si4kf3rei42n
2012-11-21 17:27:53 +01:00
Sanjay Gohel (Open ERP)
8f83c2194b
[IMP]pos tab in user will show edit button only in edit form and change string of form and help
...
bzr revid: sgo@tinyerp.com-20121105131121-umf8viq2gy1mf3p9
2012-11-05 18:41:21 +05:30
Amit Patel
0bf0b95d67
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121029051732-hcgpnra148041ews
2012-10-29 10:47:32 +05:30
Mayur Maheshwari (OpenERP)
0b87880029
[IMP]all: imporve string state to status
...
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
Amit Patel
57011e3ef5
[MERGE/FIX]:
...
- If you manually create a session by clicking on "All Sessions" then "Create" and enter a pos, the pos field will dissapear..
- Should not be possible to select view accounts for profit/losss acount on cash registers tab of payment method
bzr revid: apa@tinyerp.com-20121010104043-gcj3ytsjhua7k8p7
2012-10-10 16:10:43 +05:30
Foram Katharotiya (OpenERP)
0e26c16d0f
[IMP] appear the pos fields when create a session
...
bzr revid: fka@tinyerp.com-20121010070940-vyjatobj08nmpoir
2012-10-10 12:39:40 +05:30
Sanjay Gohel (Open ERP)
a014d89ab6
[IMP]add receipt ref for receipt in pos and pos order
...
bzr revid: sgo@tinyerp.com-20121005133315-qjwl6nx360em8u43
2012-10-05 19:03:15 +05:30
Stephane Wirtel
3bd0b43e81
[FIX] point_of_sale: We use a callback for the 'Validate & Open
...
Session' button, because we want to open the PoS UI.
[FIX] point_of_sale: Hide/Show the opening/closing cash control
bzr revid: stw@openerp.com-20121001095254-bcteq9amp0eurn3g
2012-10-01 11:52:54 +02:00
Stephane Wirtel
4f74d0aee1
[FIX] point_of_sale: show the cash_register_balance when we are in closing_control
...
bzr revid: stw@openerp.com-20120927121954-1safkpgurh4nu9kc
2012-09-27 14:19:54 +02:00
Stephane Wirtel
1149fffd9a
[MERGE] point_of_sale: Show the opening & closing control
...
bzr revid: stw@openerp.com-20120926094502-d6qe9mkarfvr8rha
2012-09-26 11:45:02 +02:00
Fabien Pinckaers
e3003f56b2
[IMP] point of sale, 10 firsts clicks cleaned
...
bzr revid: fp@tinyerp.com-20120925075645-9ydq1dh6usmwyknx
2012-09-25 09:56:45 +02:00
Stephane Wirtel
24a4e57171
[FIX] point_of_sale: show the opening cash control
...
bzr revid: stw@openerp.com-20120924115320-nkbfhfnyab4bhxrc
2012-09-24 13:53:20 +02:00
Stephane Wirtel
f0a883e6d6
[FIX] point_of_sale: Show the opening_control & closing_control
...
bzr revid: stw@openerp.com-20120924102613-twii7ba34wctx6c6
2012-09-24 12:26:13 +02:00
Stephane Wirtel
69d83db1e5
[MERGE] point_of_sale: select the cash journals and hide some elements on the form view.
...
bzr revid: stw@openerp.com-20120917153714-kelopzdwaysht3pd
2012-09-17 17:37:14 +02:00
Stephane Wirtel
2a4aaeba31
[FIX] point_of_sale: Show/Hide some groups in function of the state and the cash_control flag
...
bzr revid: stw@openerp.com-20120917140138-sjsnjxv27nd8rnao
2012-09-17 16:01:38 +02:00
Antonin Bourguignon
ccb15e76f6
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120917114455-nygv16c93qwcwnsx
2012-09-17 13:44:55 +02:00
Jigar Amin - OpenERP
d7dfc3dc1c
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120912044315-t7gtrwck9fc3h9vd
bzr revid: jam@tinyerp.com-20120913045246-iuvrqt992b60tekt
bzr revid: jam@tinyerp.com-20120914042725-jiagjctwti0vd68m
2012-09-14 09:57:25 +05:30
Fabien Pinckaers
f711f7d9a6
[MERGE] muti-currency group
...
bzr revid: fp@openerp.com-20120910201408-paf7q0cj22i72k2n
2012-09-10 22:14:08 +02:00
Turkesh Patel (Open ERP)
ac75763855
[MRG] merge with lp:openobjec-addons.
...
bzr revid: tpa@tinyerp.com-20120907063657-l0eve7vwo9w3jij1
2012-09-07 12:06:57 +05:30
Stephane Wirtel
97de9d6d3f
[FIX] point_of_sale: Set the right account for the internal account.
...
[REF] point_of_sale: Review the code for the Take Money Out and Push Money In.
[FIX] point_of_sale: Can post a session with an order in the invoiced state.
bzr revid: stw@openerp.com-20120905150538-v9ex7wehyebft7tu
2012-09-05 17:05:38 +02:00
Jiten (OpenERP)
5930fd069f
[MERGE] Merged trunk.
...
bzr revid: jra@tinyerp.com-20120904102700-8f94o2dvdt0f33bv
2012-09-04 15:57:00 +05:30
Stephane Wirtel
42ae38116a
[MERGE] point_of_sale: Improve the layout of the pos.session.opening wizard.
...
bzr revid: stw@openerp.com-20120904100711-rp4ca0u9hs0t7vm4
2012-09-04 12:07:11 +02:00
Stephane Wirtel
d5459171bd
[FIX] point_of_sale: Show the Opening and Closing balance only if the session is closed
...
bzr revid: stw@openerp.com-20120903125740-xxl4x298imiyo0y9
2012-09-03 14:57:40 +02:00
Tejas Tank
f39f799897
Fix: Account configuration : removed currency group.
...
bzr revid: tta@openerp.com-20120903095908-tswt6gi2zl5w89s2
2012-09-03 15:29:08 +05:30
Fabien Pinckaers
7ebf462e07
[IMP] product view
...
bzr revid: fp@tinyerp.com-20120831174746-7bfitkd45m73r6oz
2012-08-31 19:47:46 +02:00
Fabien Pinckaers
33897328bc
[IMP] product view
...
bzr revid: fp@tinyerp.com-20120831164018-b8m7xhxi2na5eraj
2012-08-31 18:40:18 +02:00
Fabien Pinckaers
349c24a1cd
[IMP] usability
...
bzr revid: fp@tinyerp.com-20120831163517-vqatk8mzl7u2vuym
2012-08-31 18:35:17 +02:00
Fabien Pinckaers
6eb0b6af71
fix
...
bzr revid: fp@tinyerp.com-20120831162831-qn2ai0258pki7fxp
2012-08-31 18:28:31 +02:00
Jiten (OpenERP)
2e664de4f8
[IMP] Improved code to remove warning(server log) for deprecated type.
...
bzr revid: jra@tinyerp.com-20120831101659-voh9g3kwmhji2bf1
2012-08-31 15:46:59 +05:30
Stephane Wirtel
54237bc2a2
[MERGE] point_of_sale: Add some improvements and bug fixes
...
bzr revid: stw@openerp.com-20120830132642-o9ish51w0s7aigzn
2012-08-30 15:26:42 +02:00
Stephane Wirtel
7d120eb1d1
[FIX] point_of_sale: Set the right balance end for a bank statement
...
[FIX] point_of_sale: Show/Hide some tabs
bzr revid: stw@openerp.com-20120829154634-ko3v2bi6oephr04e
2012-08-29 17:46:34 +02:00
Stephane Wirtel
6aded504b3
[FIX] point_of_sale: redefine the copy function for the pos.config to avoid a copy of the sequence.
...
[IMP] point_of_sale: Associate a default category for the existing products.
bzr revid: stw@openerp.com-20120829122501-xta26dk5bbav36zz
2012-08-29 14:25:01 +02:00
Dharti Ratani (OpenERP)
0e14e8dc20
[MERGE]Merged with latest trunk
...
bzr revid: dhr@tinyerp.com-20120829102402-3sdf5i8rfgq9dxca
2012-08-29 15:54:02 +05:30
Stephane Wirtel
768d9cdb7e
[IMP] account: Merge the opening_control and closing_control flags in cash_control
...
[IMP] account: In the case where the bank statement is a cash register, we can get the coins of the last register.
[IMP] account: Hide the 'Available Coins' if the journal hasn't the cash_control flag.
[FIX] account: Use some default values for the profit/loss and internal account.
[IMP] point_of_sale: Avoid to have two payment methods with the cash_control in a pos.config object.
[REF] point_of_sale: Refactor the computation code of the cash_journal, cash_register and cash_control flags.
[IMP] point_of_sale: Store the difference in the right account if the journal of the statement is a cash_control or nota.
[FIX] point_of_sale: Use the session name instead of the order name for the account.bank.statement.line .
[IMP] point_of_sale: [DEMO] Define the default payment_methods for the pos.config.
bzr revid: stw@openerp.com-20120828112116-lblikdcn92lcpc7w
2012-08-28 13:21:16 +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
Dharti Ratani (OpenERP)
c2a8adb976
[IMP]pos,product(pricelist) and hr_expense_report : applying multi_currency group to currency field
...
bzr revid: dhr@tinyerp.com-20120828070841-l318wc2b4jkm99dz
2012-08-28 12:38:41 +05:30
Stephane Wirtel
45cf233538
[FIX] point_of_sale: Hide the has_XXX_control fields in the session
...
bzr revid: stw@openerp.com-20120824130730-8dqrjjqr7z1stwl5
2012-08-24 15:07:30 +02:00
Stephane Wirtel
ec6bd9c649
[FIX] point_of_sale: Review the buttons for the pos.session object
...
bzr revid: stw@openerp.com-20120824114300-jdax2175w9mbcb2n
2012-08-24 13:43:00 +02:00
Bhumi Thakkar (Open ERP)
de6d26886a
[IMP] Remove type field from ir.ui.view model.
...
bzr revid: bth@tinyerp.com-20120823125311-nx4x46ea3g2ercl8
2012-08-23 18:23:11 +05:30
Dharti Ratani (OpenERP)
00139302a7
[MERGE]merged with trunk
...
bzr revid: dhr@tinyerp.com-20120823072017-c48q59mif39j55wm
2012-08-23 12:50:17 +05:30
Dharti Ratani (OpenERP)
3ecb0798a3
[IMP]Fixing inherit id issues related to procurement and location changes
...
bzr revid: dhr@tinyerp.com-20120821124241-mibvnmuxby5xuzsv
2012-08-21 18:12:41 +05:30
Frédéric van der Essen
0d930ba843
[MERGE] from stw
...
bzr revid: fva@openerp.com-20120821121123-ingbtoedurmt6h48
2012-08-21 14:11:23 +02:00
Frédéric van der Essen
2e4d656dcb
[IMP] point_of_sale: removed useless settings, Wubbit Twarks
...
bzr revid: fva@openerp.com-20120821104814-wuxk1qptj7xqr1i9
2012-08-21 12:48:14 +02:00
Stephane Wirtel
bc1f8e6d4b
[IMP] point_of_sale: improve the layout of the pos.order
...
bzr revid: stw@openerp.com-20120821084857-4ieoknwcsivdooa1
2012-08-21 10:48:57 +02:00
Stephane Wirtel
890371d982
[IMP] point_of_sale: fix some typo
...
[FIX] point_of_sale: add some groups
bzr revid: stw@openerp.com-20120817151529-1kkm9m5g5ob291ur
2012-08-17 17:15:29 +02:00
Stephane Wirtel
211a9d0904
[FIX] point_of_sale: Typo
...
bzr revid: stw@openerp.com-20120817142838-rc2zu2xa57xoty7f
2012-08-17 16:28:38 +02:00
Frédéric van der Essen
36b8744644
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120816162407-w35dzm3xqkxj8jry
2012-08-16 18:24:07 +02:00
Frédéric van der Essen
715e52130f
[IMP] point_of_sale: removed websql option from backend
...
bzr revid: fva@openerp.com-20120816160455-25gz0qb7kh0t3nfs
2012-08-16 18:04:55 +02:00
Vo Minh Thu
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Frédéric van der Essen
01cb3ebb99
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120813124439-izug22kl0plts08x
2012-08-13 14:44:39 +02:00
Frédéric van der Essen
4c3e048d40
[MERGE WIP] merging from trunk. Still some issues with the thumbnails
...
bzr revid: fva@openerp.com-20120813120801-gjufnck0f78ddivg
2012-08-13 14:08:01 +02:00
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
72fdeea2d8
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120810153957-asszi74t9dxrzhx7
2012-08-10 17:39:57 +02:00
Olivier Dony
1f32ebdc7c
[FIX] pos: Fix runbot breakage: use new XML id for unreference_product + move to pos_data file
...
bzr revid: odo@openerp.com-20120810151204-t6c0wmiusf9un7gq
2012-08-10 17:12:04 +02:00
Frédéric van der Essen
8759e49b83
[FIX] point_of_sale: reverting changes on the pos's views
...
bzr revid: fva@openerp.com-20120810141930-3xkh9ny0splzrs75
2012-08-10 16:19:30 +02:00
Antonin Bourguignon
f2fd44d85b
[MERGE] latust trunk
...
bzr revid: abo@openerp.com-20120810140856-xl6sj3xu9t4bee6c
2012-08-10 16:08:56 +02:00
Fabien Pinckaers
01dc1b218b
[IMP] help menutips for PoS
...
bzr revid: fp@tinyerp.com-20120810135548-w2cgv11ynu6l8n5l
2012-08-10 15:55:48 +02:00
Fabien Pinckaers
cf57a87d41
[IMP] point of sale backend, useability improvements
...
bzr revid: fp@tinyerp.com-20120810134517-tenqseu6otf0rdin
2012-08-10 15:45:17 +02:00
Fabien Pinckaers
9dd3e6476f
[IMP] PoS backend
...
bzr revid: fp@tinyerp.com-20120809212311-q2b86eww9ppvdv8s
2012-08-09 23:23:11 +02:00
Antonin Bourguignon
ee4fd16e94
[FIX] remove the option from the user_id fields
...
we want users to be openable !
also improve indentation and remove some useless whitespaces
bzr revid: abo@openerp.com-20120809163529-8adlpszt3n6lhszi
2012-08-09 18:35:29 +02:00
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
Mayur Maheshwari (OpenERP)
ff612f9d02
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120808094005-o7v0l6u15ide75za
2012-08-08 15:10:05 +05:30
Frédéric van der Essen
dc8f543d17
[WIP] point_of_sale: indexeddb : compatible localstorage backend. + anthony's modifications to the views...
...
bzr revid: fva@openerp.com-20120807161844-hd7ioxipnc6794jf
2012-08-07 18:18:44 +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
Mayur Maheshwari (OpenERP)
7c51b1811d
[FIX]all :set a no_open widget in this filed(country_id,state_id,title,context_id,timebox_id,user_id)
...
bzr revid: mma@tinyerp.com-20120806110307-nj7qipixr14puhub
2012-08-06 16:33:07 +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
Thibault Delavallée
8a408f2ff3
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120803071454-ictuwjq0y3gri4f8
2012-08-03 09:14:54 +02:00