Cedric Snauwaert
b8d99e7aa3
[FIX]sale: fix workflow problem when deleting an invoice the workflow should go to invoice_exception state
...
bzr revid: csn@openerp.com-20130418090011-dyg175mvwrp8ilij
2013-04-18 11:00:11 +02:00
Vishmita Jadeja (openerp)
e078eeeebe
[Merge]Merge lp:openobject-addons
...
bzr revid: vja@tinyerp.com-20130418074044-xlxquhnls1tccv5g
2013-04-18 13:10:44 +05:30
sgo@tinyerp.com
d1e17fbde0
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130417061434-zry7pxo7fb17063k
2013-04-17 11:44:34 +05:30
Vo Minh Thu
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Thibault Delavallée
4da68cbc22
[FORWARD] Forward port of addons 7.0 until revision 9008
...
bzr revid: tde@openerp.com-20130411124446-73gzyw3eo925w3dv
2013-04-11 14:44:46 +02:00
Olivier Dony
dcac505a5b
[FIX] sale: remove useless code to select commercial entity, now handled by res.partner.address_get directly
...
lp bug: https://launchpad.net/bugs/1160365 fixed
bzr revid: odo@openerp.com-20130407235115-4kovy1jngblrdd5z
2013-04-08 01:51:15 +02:00
Quentin (OpenERP)
3bb51ac696
[MERGE] forward port of bugfixes made in 7.0, up to revision 8969.
...
bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj
2013-04-04 11:52:57 +02:00
Quentin (OpenERP)
4bdd8252ba
[REF] sale_stock: removing of dead code and correction of documentation (process) linked to the invoicing after delivery of a sale order
...
bzr revid: qdp-launchpad@openerp.com-20130404151451-7fesb178mpijlv29
2013-04-04 17:14:51 +02:00
Vo Minh Thu
9d5115d0ec
[REF] sale: removed openerp.pooler imports.
...
bzr revid: vmt@openerp.com-20130327132105-becdw049vdr72zt7
2013-03-27 14:21:05 +01:00
Quentin (OpenERP)
2b64c79c3d
[MERGE] forward port of fixes made in v7 addons branch up to revision 8872
...
bzr revid: qdp-launchpad@openerp.com-20130318122717-qptmntn26bx4wn8r
2013-03-18 13:27:17 +01:00
sgo@tinyerp.com
b8a33bc393
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130318071519-3pae2jh7nk2iaqpe
2013-03-18 12:45:19 +05:30
Quentin (OpenERP)
513601e641
[FIX] sale: don't try to post messages on SO if there is no sale related to an invoice
...
bzr revid: qdp-launchpad@openerp.com-20130314164413-qv3j3b3tcc4zt6b7
2013-03-14 17:44:13 +01:00
Chris Biersbach
9dd5e354fd
[MERGE] sale: adds id to the sale_order_line _order so that lines sty in the same order when the sale order is created. Patch by Peter langenberg / Agaplan
...
bzr revid: cbi@openerp.com-20130314143705-9mpgrsemorg2l0b1
2013-03-14 15:37:05 +01:00
sgo@tinyerp.com
32cb2a3509
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130312051713-cph3m3pjozii3jwn
bzr revid: sgo@tinyerp.com-20130314130046-3bi97qv1628co8i3
2013-03-14 18:30:46 +05:30
Fabien Pinckaers
c7d709e579
[FIX] misc fixes on contracts, timesheets
...
bzr revid: fp@openerp.com-20130312123321-mly0k9lrh3im78bg
2013-03-12 13:33:21 +01:00
sgo@tinyerp.com
a21b4b9b56
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130311045638-npwv6lb6bc9i3m1y
2013-03-11 10:26:38 +05:30
Peter Langenberg
d79150eefa
sometimes sequence of sales order lines wrong after save (most frequent using debian squeeze)
...
lp bug: https://launchpad.net/bugs/1134365 fixed
bzr revid: pl@agaplan.eu-20130308170608-3zlsrow4rnw2fcqi
2013-03-08 18:06:08 +01:00
Thibault Delavallée
591eb1c74d
[MERGE] [FIX] sale, sale_stock: fixed crash when installing sale because of code belonging to sale_stock that was located in sale.
...
bzr revid: tde@openerp.com-20130307100621-7a5cb3gchkak2num
2013-03-07 11:06:21 +01:00
Anand Patel (OpenERP)
51a3c7a9a8
[IMP]Improved code
...
bzr revid: pan@tinyerp.com-20130306132608-6xm6w5ft9mgms8v5
2013-03-06 18:56:08 +05:30
Thibault Delavallée
9809dd5a43
[MERGE] Task 'OpenChatter: functional usability 1'
...
Creation log: Document created -> <model_name> created
Add some missing notifications in sale order and purchase order
bzr revid: tde@openerp.com-20130305111450-lb59pi9rpzuhhgve
2013-03-05 12:14:50 +01:00
Thibault Delavallée
2e039c3d5c
[CLEAN] Small code cleaning before merging (context management, coding style).
...
bzr revid: tde@openerp.com-20130305104801-d254qf2it3k22xl5
2013-03-05 11:48:01 +01:00
Anand Patel (OpenERP)
1a147be814
[IMP]Improved code as Suggested
...
bzr revid: pan@tinyerp.com-20130305091035-7uikbzuuziy311ra
2013-03-05 14:40:35 +05:30
Anand Patel (OpenERP)
b1a41adb35
[IMP]improved code as per suggation
...
bzr revid: pan@tinyerp.com-20130304095655-r0lf7c5x881bwqwq
2013-03-04 15:26:55 +05:30
Anand Patel (OpenERP)
055fe6804c
[IMP]Improved code as per suggation
...
bzr revid: pan@tinyerp.com-20130304090235-o7i8jt936c2tvoyk
2013-03-04 14:32:35 +05:30
Anand Patel (OpenERP)
b899234680
[MERGE]Trunk
...
bzr revid: pan@tinyerp.com-20130304044603-6bgcxqjyi0yp04ii
2013-03-04 10:16:03 +05:30
Fabien Pinckaers
a9d6cf634f
[IMP] typo
...
bzr revid: fp@tinyerp.com-20130301162806-ylfu9v0jxgfpjs7w
2013-03-01 17:28:06 +01:00
Fabien Pinckaers
a510050ba6
[IMP] default terms and conditions for quotations on companies
...
bzr revid: fp@tinyerp.com-20130301082928-bdxfr57pjdj33kyp
2013-03-01 09:29:28 +01:00
Fabien Pinckaers
bed8a96291
[FIX] misc contracts fixes, timesheets
...
bzr revid: fp@openerp.com-20130312121218-vsvmaj12px4vqpvz
2013-03-12 13:12:18 +01:00
Ajay Chauhan (OpenERP)
5c202a8ba2
[IMP] sale, sale_stock: remove shop_id concept from sale_condition feature
...
bzr revid: cha@tinyerp.com-20130225090236-k9im6bebl5k5s0wa
2013-02-25 14:32:36 +05:30
Bhumi Thakkar (Open ERP)
69fcf7bb62
[IMP] Remove bold and capital in first letter.
...
bzr revid: bth@tinyerp.com-20130220054249-4n3zpwvo767u6h4l
2013-02-20 11:12:49 +05:30
Ajay Chauhan (OpenERP)
5aeb5a885e
[IMP] made changes in code
...
bzr revid: cha@tinyerp.com-20130215133309-0842owye7wersb0o
2013-02-15 19:03:09 +05:30
Bhumi Thakkar (Open ERP)
a388774265
[IMP] Message on chatter Quotation created for SO and RFQ created when PO created when record created.
...
bzr revid: bth@tinyerp.com-20130215131933-moln7gh4563r1gdx
2013-02-15 18:49:33 +05:30
Bhumi Thakkar (Open ERP)
ad6d133d3c
[MERGE] Merge lp:openobeject-addons.
...
bzr revid: bth@tinyerp.com-20130215122526-einsh4wazw2e1lxs
2013-02-15 17:55:26 +05:30
Ajay Chauhan (OpenERP)
98e8e12ffc
[IMP] made changes in code
...
bzr revid: cha@tinyerp.com-20130215084428-s1sxky78rk0tevak
2013-02-15 14:14:28 +05:30
Ajay Chauhan (OpenERP)
c207c7c21b
[MERGE] merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20130214115126-xskif8vw2arurq7r
2013-02-14 17:21:26 +05:30
Quentin (OpenERP)
3fe67314cc
[MERGE] forward port of fixes made in version 7
...
bzr revid: qdp-launchpad@openerp.com-20130214100628-0eaudbqhflpmjjyf
2013-02-14 11:06:28 +01:00
Ajay Chauhan (OpenERP)
34946cf3fe
[IMP] made sale condition based on shop's company
...
bzr revid: cha@tinyerp.com-20130214093738-2r1wiw6zocozadae
2013-02-14 15:07:38 +05:30
Bhumi Thakkar (Open ERP)
e0dc4a8e4c
[IMP] Quotatioin confirmed message displayed only once when click on confirm sale.
...
bzr revid: bth@tinyerp.com-20130214085056-d7oqjmp2d7l892me
2013-02-14 14:20:56 +05:30
Ajay Chauhan (OpenERP)
6b81689749
merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20130214054214-j99w3zpjf0rqi2i7
2013-02-14 11:12:14 +05:30
Bhumi Thakkar (Open ERP)
00c07052ca
[IMP] Improve code for products delivered.
...
bzr revid: bth@tinyerp.com-20130213112125-1cbzelqg659pwc56
2013-02-13 16:51:25 +05:30
Raphael Collet
5f855a1ddb
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20130213083519-3nbg40h5em0gfeu3
2013-02-13 09:35:19 +01:00
Ajay Chauhan (OpenERP)
67d025a4cb
[IMP] sales terms & conditions note per company
...
bzr revid: cha@tinyerp.com-20130211101257-nw5pvqrs841pe2l9
2013-02-11 15:42:57 +05:30
Bhumi Thakkar (Open ERP)
cc8e739771
[IMP] Improve code to check type of stock picking.
...
bzr revid: bth@tinyerp.com-20130207130633-rm3jv5w4edxuhvxd
2013-02-07 18:36:33 +05:30
Bhumi Thakkar (Open ERP)
7210b2ee42
[IMP] Improve code.
...
bzr revid: bth@tinyerp.com-20130207115205-1j46xhbs85i8q6w4
2013-02-07 17:22:05 +05:30
Bhumi Thakkar (Open ERP)
c097b3aa2a
[IMP] Improve code.
...
bzr revid: bth@tinyerp.com-20130207110549-cvn8nnh50a50fitx
2013-02-07 16:35:49 +05:30
Bhumi Thakkar (Open ERP)
a362d7b222
[IMP] In SO message on chatter when so is delivered.
...
bzr revid: bth@tinyerp.com-20130207091219-23w206581muunjrv
2013-02-07 14:42:19 +05:30
csn-openerp
54d4bf413e
[FIX]sale : traceback in product_id_change, cannot concatenate string and dict object
...
bzr revid: csn@openerp.com-20130207084129-6duxkp96svudaj4n
2013-02-07 09:41:29 +01:00
Bhumi Thakkar (Open ERP)
d025bafb81
[IMP] Message on so when invoice is paid.
...
bzr revid: bth@tinyerp.com-20130207070127-2ngqgsla0l796erw
2013-02-07 12:31:27 +05:30
sgo@tinyerp.com
1150aac0fe
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130206124101-vuf5dkdtsr6bfe08
2013-02-06 18:11:01 +05:30
Tejas Tank
9b8d7de0ac
[IMP] Workflow api changes: [account_payment, account_voucher, hr_holidays, hr_payroll, hr_timesheet_sheet, l10n_in_hr_payroll, point_of_sale, procurement, purchase, sale, sale_stock].
...
bzr revid: tta@openerp.com-20130204082943-vfevxeb7za6r4sy7
bzr revid: tta@openerp.com-20130204112949-07l1v3ru215iglut
2013-02-04 16:59:49 +05:30
Ajay Chauhan (OpenERP)
27bd0dbfef
[FIX] sale: did some changes
...
bzr revid: cha@tinyerp.com-20130201065948-oae060lc7f25z1b3
2013-02-01 12:29:48 +05:30
Olivier Dony
ec9859e0a0
[FIX] sale: fix incorrect on_change on sale.order.line resetting the UoM field + added test
...
lp bug: https://launchpad.net/bugs/1082409 fixed
bzr revid: odo@openerp.com-20130131184356-y9ck1dr31nlsp73r
2013-01-31 19:43:56 +01:00
Ajay Chauhan (OpenERP)
19368fb65c
[IMP] sale: use the new signal_xxx methods instead of trg_validate.
...
bzr revid: cha@tinyerp.com-20130131044608-h5dj2xfqyo8ewm6k
2013-01-31 10:16:08 +05:30
Vishmita
a86611f97b
[Merge]Merge lp:openobject-addons
...
bzr revid: vja@tinyerp.com-20130128064925-t7hibhiysoq7x4td
2013-01-28 12:19:25 +05:30
sgo@tinyerp.com
5600ce8a34
[IMP]remove date related sale.shop and add warehouse_id as new field to handle location in sale order
...
bzr revid: sgo@tinyerp.com-20130122110857-61jsli1sywu3h5q0
2013-01-22 16:38:57 +05:30
sgo@tinyerp.com
cf6595baf2
[IMP]remove total sale.shop from sales
...
bzr revid: sgo@tinyerp.com-20130121100542-36qmkrd82md97phv
2013-01-21 15:35:42 +05:30
Quentin (OpenERP)
18a26bac3a
[FIX] sale: set a default value for a required field not present in form view for most of people
...
bzr revid: qdp-launchpad@openerp.com-20130103101045-32yq65xcibon2a35
2013-01-03 11:10:45 +01:00
Olivier Dony
49597f0e66
[MERGE] *: improved english wording, suggestions courtesy of OpenERP Community
...
bzr revid: odo@openerp.com-20121221164808-kdjrtcbgma4dr3on
2012-12-21 17:48:08 +01:00
Quentin (OpenERP)
1743dc6df7
[FIX] sale: fixed the batch invoicing of sales orders that was create invoice twice per order + some refactoring
...
bzr revid: qdp-launchpad@openerp.com-20130321113059-667qdj873r0h0t55
2013-03-21 12:30:59 +01:00
Josse Colpaert
6287c5c262
[MERGE] Merg efrom 7.0
...
bzr revid: jco@openerp.com-20130320144706-ylpji506pzhtj3do
2013-03-20 15:47:06 +01:00
Josse Colpaert
773a1fc51f
[FIX] Remove last | in source document when grouping
...
bzr revid: jco@openerp.com-20130320144336-tmtw1qje4eusqghr
2013-03-20 15:43:36 +01:00
Thibault Delavallée
f49f43958d
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121221100609-2x59amtxj4sjedcu
2012-12-21 11:06:09 +01:00
Thibault Delavallée
b37450ba49
[IMP] sale, purchase, invoice: automatically subscibe recipints of Send by email as document followers.
...
bzr revid: tde@openerp.com-20121221095902-k2xk928po48cogdm
2012-12-21 10:59:02 +01:00
Thibault Delavallée
e3c31cab9e
[IMP] track_visibility atribute: moved onto explicit strings.
...
bzr revid: tde@openerp.com-20121220114730-nip8qaaajr5mqw6s
2012-12-20 12:47:30 +01:00
Khushboo Bhatt (Open ERP)
ac4442df60
[FIX]sale:help updated
...
bzr revid: kbh@tinyerp.com-20121220114356-q7w7oodmv83no6n9
2012-12-20 17:13:56 +05:30
Thibault Delavallée
d737a7f098
[IMP] sale, purchase, hr_timesheet_sheet, hr_holidays, event, crm_meeting: fixed, improved and cleaned needaction_domain_get.
...
bzr revid: tde@openerp.com-20121220100005-d0r0se41fx83w38c
2012-12-20 11:00:05 +01:00
Thibault Delavallée
8d26e78582
[IMP] Addons: removed bold in subtype descriptions.
...
bzr revid: tde@openerp.com-20121219212330-xfx3lykstl1nsa8m
2012-12-19 22:23:30 +01:00
Khushboo Bhatt (Open ERP)
7fb3086296
[FIX]sale:string updated
...
bzr revid: kbh@tinyerp.com-20121219094942-6dkketgcdtxktvrl
2012-12-19 15:19:42 +05:30
Thibault Delavallée
cd290565a4
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121219093924-5rqmhb6ve7bv7qzl
2012-12-19 10:39:24 +01:00
Fabien Pinckaers
065821dfd6
[MOD] use read() instead of browse
...
bzr revid: fp@tinyerp.com-20121218234907-j672neyvifmo4bur
2012-12-19 00:49:07 +01:00
Olivier Dony
03b6acd13d
[MERGE] Access inherited product fields on the product directly rather than template, courtesy of Alexis de Lattre (Akretion)
...
It makes the code a little more straightforward and does not hurt.
bzr revid: odo@openerp.com-20121218225015-6r9ydxjlh147m3z1
2012-12-18 23:50:15 +01:00
Fabien Pinckaers
41f7f27881
[IMP] several subtype fixes
...
bzr revid: fp@tinyerp.com-20121218220617-d6ebdlkf1facw4x8
2012-12-18 23:06:17 +01:00
Thibault Delavallée
ddda5c3640
[REF] sale: removed some chatter messages, replaced by a track on state and amount, and a _track with subtype. Moved link between salesteam and sale order into sale_crm.
...
bzr revid: tde@openerp.com-20121218181718-zw3d4lmau83bhk7v
2012-12-18 19:17:18 +01:00
Thibault Delavallée
b95b32d644
[MERGE] Merged branch holding subtype work by APA.
...
bzr revid: tde@openerp.com-20121218131142-2jb6wac6y9q6dc7v
2012-12-18 14:11:42 +01:00
Thibault Delavallée
2dbe4a696e
[MERGE] Sync wirth trunk.
...
bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42
2012-12-18 10:32:41 +01:00
Foram Katharotiya (OpenERP)
a972f0181d
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121218045009-drt4gjkcnpl5hxxr
2012-12-18 10:20:09 +05:30
Cecile Tonglet
a3939acfa5
[FIX] replace from/import decimal_precision by from/import openerp.addons.decimal_precision
...
bzr revid: cto@openerp.com-20121217152303-8e3b1x30rlw9cb0d
2012-12-17 16:23:03 +01:00
Cecile Tonglet
15fe515601
[MERGE] From trunk
...
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
Vishmita
5a604f3c69
[Merge]Merge lp:openobject-addons
...
bzr revid: vja@tinyerp.com-20121217131717-1jfh3otphr563hdu
2012-12-17 18:47:17 +05:30
Raphael Collet
356fd3466e
[IMP] sale: remove size=... on text field
...
bzr revid: rco@openerp.com-20121217111656-ob89xgqy4409k6fg
2012-12-17 12:16:56 +01:00
Foram Katharotiya (OpenERP)
6ebeb076c3
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121217051643-o8j4hz7w8thwbymi
2012-12-17 10:46:43 +05:30
Sanjay Gohel (Open ERP)
de45fd4fc1
[MERGE]with trunk
...
bzr revid: sgo@tinyerp.com-20121217050659-q5w6zwefizgjv4fd
2012-12-17 10:36:59 +05:30
Fabien Pinckaers
67bdf29938
[IMP] date invoice in sale
...
bzr revid: fp@tinyerp.com-20121215170559-6qq3xwawj0p1bies
2012-12-15 18:05:59 +01:00
Vishmita
7d90b73d52
[FIX]Change tooltip sentence
...
bzr revid: vja@tinyerp.com-20121211051531-6luv78i10sp50x2v
2012-12-11 10:45:31 +05:30
Vo Minh Thu
6072fd11af
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
Sanjay Gohel (Open ERP)
510af53747
[MERGE]with trunk
...
bzr revid: sgo@tinyerp.com-20121210050956-qie5jf94xvgogiaq
2012-12-10 10:39:56 +05:30
Foram Katharotiya (OpenERP)
955f2588a2
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121210045724-sk2hk8mmi8iahfwn
2012-12-10 10:27:24 +05:30
Fabien Pinckaers
c270aa7693
[MERGE]
...
bzr revid: fp@tinyerp.com-20121208162456-f544eem3hs4sm8i7
2012-12-08 17:24:56 +01:00
Vo Minh Thu
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Bhumi Thakkar (Open ERP)
0a859cddcd
[IMP] Add string and renamed string.
...
bzr revid: bth@tinyerp.com-20121206065214-2dp3hmqhuu0r9g8n
2012-12-06 12:22:14 +05:30
Bhumi Thakkar (Open ERP)
39470414b0
[IMP]String Replaced Invoiced to Invoice Ratio and Given string to currency_id field.
...
bzr revid: bth@tinyerp.com-20121205083731-vuyi112ouewch5iw
2012-12-05 14:07:31 +05:30
Foram Katharotiya (OpenERP)
c300280eff
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20121205053732-s966xh7rx0nwajsm
2012-12-05 11:07:32 +05:30
Sanjay Gohel (Open ERP)
8b26c71ce6
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20121205051641-8cnalvjo2yd8ilz0
2012-12-05 10:46:41 +05:30
vta vta@openerp.com
6bbe9ad526
[MERGE] lp:~openerp-dev/openobject-addons/trunk-bug-1079205-pja
...
lp bug: https://launchpad.net/bugs/1079205 fixed
bzr revid: vta@openerp.com-20121204144649-abpod80i1nspeeof
2012-12-04 15:46:49 +01:00
Sanjay Gohel (Open ERP)
c91da1fb35
[MERGE]merge with latest trunk
...
bzr revid: sgo@tinyerp.com-20121203132425-umzbdj5gm6m29b6c
2012-12-03 18:54:25 +05:30
Thibault Delavallée
c3a3492848
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20121203093454-lf21qlsuse1ve8ro
2012-12-03 10:34:54 +01:00
Olivier Dony
8782163830
[FIX] sale: the `invoiced` field on sale.order.line should be a function field
...
Having a static boolean field is a mess and requires
a lot of custom code to make sure it is up-to-date,
implying a large source of possible bugs.
Using a function field should take care of updating
it when needed.
All the write() calls that were updating it were
normally removed, and there was also some cleanup
in the surrounding areas (quite minimal).
bzr revid: odo@openerp.com-20121129162629-5lt9e0v5aju36itj
2012-11-29 17:26:29 +01:00
Olivier Dony
0ad3703b18
[FIX] sale: writing False on a m2m is a no-op, and rather confusing here
...
bzr revid: odo@openerp.com-20121129153330-ld55e5qksflqy3bx
2012-11-29 16:33:30 +01:00
Jalpesh Patel (OpenERP)
fef66bb5d5
[Fix]fix problem of number always skip when create new sales 0rder
...
bzr revid: pja@tinyerp.com-20121129055743-yskji2sxhl0w20x4
2012-11-29 11:27:43 +05:30
Sanjay Gohel (Open ERP)
f630e0a338
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20121128095512-t9v6p77jl54yai9p
2012-11-28 15:25:12 +05:30