odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
95,293 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

428 Commits

Author SHA1 Message Date
Nicolas Martinelli d246e36c82 Revert commit "[FIX] sale_margin: purchase price calculated using the currency of the price type" 
Reasons:
- the currency conversion is done assuming that the cost price currency is the company currency
- we support only one price type per field. Defining several price types on the same field using
  different price types is not supported.
 2015-04-13 19:09:20 +02:00
Christophe Simonis 8ac8281a7f [MERGE] forward port of branch saas-3 up to d3e7a8e 2015-04-10 18:35:34 +02:00
Christophe Simonis d3e7a8ef5e [MERGE] forward port of branch 7.0 up to 856bc6f 2015-04-10 18:24:46 +02:00
Nicolas Martinelli 7b7b0d148a [FIX] sale_margin: purchase price calculated using the currency of the price type 
When the margin is calculated, the purchase price is calculated using the currency of the price
type 'standard_price' instead of the currency of the company, since they can be different.
opw: 631884
 2015-04-09 08:20:36 +02:00
Olivier Dony 8e03852fd4 [I18N] Update translations from Launchpad 8.0 branches 2015-01-26 16:36:51 +01:00
Olivier Dony 495ec92251 [I18N] Update translations from Launchpad 8.0 branches 2015-01-21 15:36:54 +01:00
Olivier Dony 39f00b3637 [I18N] Update translation templates with latest terms 
Total new terms: 270
Total deleted terms: 82
Total identical terms: 19653
Old total number of terms: 19735
New total number of terms: 19923
 2015-01-21 15:31:22 +01:00
Olivier Dony d0cd92bb9f [I18N] Sync updated 7.0 translations from Launchpad 2015-01-07 17:57:28 +01:00
Aaron Bohy ba37ae3cf3 [DEL] Cleaning: key 'images' removed from all __openerp__.py 2015-01-06 14:20:38 +01:00
Denis Ledoux 8ef286a12c [MERGE] forward port of branch saas-3 up to 162eb84 2014-12-12 15:46:54 +01:00
Denis Ledoux 162eb84438 [MERGE] forward port of branch 7.0 up to f46fa1d 2014-12-12 15:44:44 +01:00
Denis Ledoux f46fa1d026 [FIX] sale_margin: margin handle included taxes for sale 
Another fix should probably be build for purchase price, but it isn't that easy, we need to know the partner to which the product has been purchased, as taxes are partner/country dependent.

Besides, included taxes in purchase prices happen less often.
 2014-12-12 15:41:37 +01:00
Denis Ledoux 117d0d0ca2 [FIX] sale_margin: stored field functions cannot trigger other stored field functions 
the update of sale.order margin field was trigger with the margin stored field of sale.order.line: This cannot work with the old api
 2014-11-27 12:06:19 +01:00
Christophe Simonis 8e637bac92 [MERGE] forward port of branch saas-3 up to 21b1203 2014-10-29 19:33:02 +01:00
Denis Ledoux a6024a6376 [MERGE] forward port of branch 7.0 up to 00ec786 2014-10-28 13:40:17 +01:00
Martin Trigaux 79787084ff [FIX] sale_margin: cost price uom 
When computing the cost price to display, take the uom into account. The cost of 1 Unit or 1 dozen should not be the same. opw 599727
 2014-10-27 18:09:46 +01:00
Denis Ledoux be21986c8d [FIX] sale_margin: stored field functions cannot trigger other stored field functions 
the update of sale.order margin field was trigger with the margin stored field of sale.order.line: This cannot work with the old api
 2014-09-30 17:19:00 +02:00
Olivier Dony fac96241df [I18N] Update 8.0 translations with latest changes from Launchpad 2014-09-08 19:04:25 +02:00
Christophe Simonis 8046b7367d [MERGE] forward port of branch saas-5 up to 7e117b1 2014-08-28 16:51:11 +02:00
Christophe Simonis 7e117b18a0 [MERGE] forward port of branch saas-3 up to ada9724 2014-08-28 16:21:27 +02:00
Christophe Simonis ada9724655 [MERGE] forward port of branch 7.0 up to 3509e15 2014-08-28 16:12:55 +02:00
Daniel Dico f880d89cc4 [FIX] sale_order_line: use order date to compute currency instead of current date 2014-08-25 18:04:43 +02:00
Olivier Dony 50ef63881a [I18N] Update 8.0 translation with latest source code 2014-08-14 17:01:54 +02:00
Olivier Dony 85d2b45aaa [I18N] Update 7.0 translations with latest changes on Launchpad 
See also https://github.com/odoo/odoo/wiki/GitHub-Transition#translations
 2014-08-14 03:38:58 +02:00
Launchpad Translations on behalf of openerp c2584c8cb0 Launchpad automatic translations update. 2014-05-18 05:53:48 +00:00
Launchpad Translations on behalf of openerp 6ab0f645bc Launchpad automatic translations update. 2014-05-17 07:10:37 +00:00
Quentin (OpenERP) 57cebaaac6 [MERGE] merged trunk up to revision 9365. 
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
 2014-04-22 11:28:15 +02:00
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
 2014-04-22 07:52:47 +00:00
Quentin (OpenERP) 398d96f273 [MERGE] merged trunk up to revision 9327 
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
 2014-04-14 11:47:43 +02:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
 2014-04-12 08:31:53 +00:00
Quentin (OpenERP) ff4726ea7d [MERGE] merged trunk up to revision 9281 
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
 2014-04-03 10:14:27 +02:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
 2014-04-02 06:44:59 +00:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
 2014-03-27 07:35:04 +00:00
Quentin (OpenERP) da210e4b5e [MERGE] trunk 
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
 2014-03-11 14:28:13 +01:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
 2014-03-04 07:52:38 +00:00
Launchpad Translations on behalf of openerp 5d2f1c68ac Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064134-tam102h50au851o1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140215073800-2219ymc7ijxq57aa
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064223-17h9wz07b2siswzs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140217060328-7qh928zk8ro30qzb
 2014-02-17 06:03:28 +00:00
Launchpad Translations on behalf of openerp 8d85c23e4a Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065003-9soyulgvssk8n5ci
bzr revid: launchpad_translations_on_behalf_of_openerp-20140208071621-b018rnkhyxmmm5jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065224-kih7tx56elds0zok
bzr revid: launchpad_translations_on_behalf_of_openerp-20140210055324-raxopm5ej680oc73
 2014-02-10 05:53:24 +00:00
Quentin (OpenERP) 753f7541db [MERGE] main trunk 
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
 2014-02-03 18:30:00 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
 2014-01-28 06:41:39 +00:00
Launchpad Translations on behalf of openerp e0951d6e18 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227053952-0hms21l5679mfv9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228053802-9q255pplfsr06jvf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230050715-gywiu51n8ejcvnkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052701-yjrbqgyv2os2z8gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054400-7tz7obdh31v8log8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054530-gtwf0yp277zkqm0i
 2014-01-02 05:45:30 +00:00
Launchpad Translations on behalf of openerp 67e479e96e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
 2013-12-31 04:47:45 +00:00
Quentin (OpenERP) f5718efa6e [MERGE] merged with trunk 
bzr revid: qdp-launchpad@openerp.com-20131230102802-y1ux8470wxnj4yfr
 2013-12-30 11:28:02 +01:00
Launchpad Translations on behalf of openerp 45e34f2f6b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211053249-7onr7u94z5rfg60p
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212051525-n6q6vsucee027ihr
 2013-12-12 05:15:25 +00:00
Quentin (OpenERP) a5cc6d6aed [MERGE] merged with main trunk 
bzr revid: qdp-launchpad@openerp.com-20131211100354-hwlt65vk8p3xih9u
 2013-12-11 11:03:54 +01:00
Launchpad Translations on behalf of openerp 6fd5575930 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053957-ekc1bfm5ohug21aa
 2013-11-27 05:39:57 +00:00
Launchpad Translations on behalf of openerp 271ed43e7b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
 2013-11-21 06:38:38 +00:00
Launchpad Translations on behalf of openerp 15062bdffe Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131105060056-7xuq20lqt1upcdc6
 2013-11-05 06:00:56 +00:00
Launchpad Translations on behalf of openerp 9d4c7f4db9 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131101062724-823uztz81d48e7zk
bzr revid: launchpad_translations_on_behalf_of_openerp-20131102062340-1guhkeb34orj1d77
bzr revid: launchpad_translations_on_behalf_of_openerp-20131103054341-mg7xr0dkzd2rp6rx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131104060249-fio493wxgjvvlthm
 2013-11-04 06:02:49 +00:00
Launchpad Translations on behalf of openerp 40c309024c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026062529-74ir3upguunr9mw3
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027061317-d9s440jzv1juvswi
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131029051429-rcytejyrg2s4t9db
bzr revid: launchpad_translations_on_behalf_of_openerp-20131030055438-gp0hyend0jooi941
 2013-10-30 05:54:38 +00:00
Quentin (OpenERP) 2a982d199e [MERGE] merged with trunk 
bzr revid: qdp-launchpad@openerp.com-20131028093247-8eegjl3zle5aoqae
 2013-10-28 10:32:47 +01:00
Launchpad Translations on behalf of openerp e142005a01 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028052339-0v9n7leiirwlacok
 2013-10-28 05:23:39 +00:00
Quentin (OpenERP) 65966940c8 [MERGE] merged with main trunk 
bzr revid: qdp-launchpad@openerp.com-20131010133212-t058auv973pvvmjm
 2013-10-10 15:32:12 +02:00
Launchpad Translations on behalf of openerp 5d89ca5f6d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045555-o80w0vjyl4g3d2qn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060115-eauj5wlxmkpyxwys
bzr revid: launchpad_translations_on_behalf_of_openerp-20130922053444-ai66yjl1419gee8h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130923053502-xuqx6gazdvsak6e5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130921055928-8y21w291t5w0k13o
bzr revid: launchpad_translations_on_behalf_of_openerp-20130922053456-pcgrwl35kk8b7ff8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130923053531-3twd4g12gj4iqmv3
 2013-09-23 05:35:31 +00:00
Launchpad Translations on behalf of openerp c7471d1bff Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045624-x71znzpi3rpnvpcs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060145-80h8zse3uw3jg2fx
 2013-09-20 06:01:45 +00:00
Launchpad Translations on behalf of openerp 07f41591af Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130914055308-488d7jp6pk12s4oq
bzr revid: launchpad_translations_on_behalf_of_openerp-20130915061118-idedxdulpa7nb0s0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130916061418-3r990vgrtgj1quyt
 2013-09-16 06:14:18 +00:00
Launchpad Translations on behalf of openerp 9dba69ba48 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
 2013-09-12 06:40:18 +00:00
Cedric Snauwaert e17e0a2e42 [FIX]sale_margin: remove field type from sol since it does not exist anymore 
bzr revid: csn@openerp.com-20130911130247-h0hq3sopw26m8hcu
 2013-09-11 15:02:47 +02:00
Launchpad Translations on behalf of openerp cb8f9c5a0d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
 2013-09-03 05:48:57 +00:00
Fabien Pinckaers 9eb29913fa [IMP] removed old concept: invoice_quantity 
bzr revid: fp@openerp.com-20130803190359-e3xpl2yye2u15104
 2013-08-03 21:03:59 +02:00
Launchpad Translations on behalf of openerp d1a4e0aef0 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130711062622-v4muic3uqckueux5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063505-m63repwd0zokfibu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063525-b30s09rh63t3zox4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055943-xf6jvk2dpoemt6qx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051357-59o0nkhplh3e58mi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130704054706-ace1fcr1vtruoc4s
bzr revid: launchpad_translations_on_behalf_of_openerp-20130705061311-4735gtnj7xjmuprg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130712063510-g2yq0kxqgrx9x1df
bzr revid: launchpad_translations_on_behalf_of_openerp-20130713063533-7mjj5a7226xhtob6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130714055945-h6jn755mtdcubvei
bzr revid: launchpad_translations_on_behalf_of_openerp-20130715051400-rra06yzfd7zw4bt0
 2013-07-15 05:14:00 +00:00
Launchpad Translations on behalf of openerp 3a296f5386 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608070127-tu3wr0ejaojeuizk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061554-vunz3dsqv73j8io4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608074839-suk66wcjidodrzyu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061704-e1t9mv2alygf4g38
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608075116-643xgspj93t8g1y9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061708-y08i6exqm5v36qg7
 2013-06-09 06:17:08 +00:00
Olivier Dony 8c33eb76e1 [I18N] Synchronize translation templates with latest source code 
bzr revid: odo@openerp.com-20130607194309-eysyrkxpr0dukm07
 2013-06-07 21:43:09 +02:00
sgo@tinyerp.com 2bda4f7b3c [MERGE]sync with trunk 
bzr revid: sgo@tinyerp.com-20130607113500-jzhet9cr98c0ss4s
 2013-06-07 17:05:00 +05:30
Martin Trigaux ccb38117ee [MERGE] Forward porting of saas-1 until rev 8739 
bzr revid: mat@openerp.com-20130605090453-e4mg37kms5j1r18n
 2013-06-05 11:04:53 +02:00
sgo@tinyerp.com 1202f9c6d5 [MERGE]sync with trunk 
bzr revid: sgo@tinyerp.com-20130605072213-cwxmjtzt36434mgt
 2013-06-05 12:52:13 +05:30
Launchpad Translations on behalf of openerp 5cc8c30adf Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130605053257-nxfx57711h840uev
 2013-06-05 05:32:57 +00:00
Martin Trigaux 45c3fd063b [MERGE] Forward porting of latest 7.0 bugfixes, up to rev. 9193 
bzr revid: mat@openerp.com-20130604110041-yemgrfsi02uboe8m
 2013-06-04 13:00:41 +02:00
Dharti Ratani (Open ERP) 2d51566f66 [FIX]Hide the margin in SO if you see SO as a customer through portal, if 'Display margin on sale orders' is activated 
bzr revid: dhr@tinyerp.com-20130531092311-rgtlbv55ai4223pk
 2013-05-31 14:53:11 +05:30
Launchpad Translations on behalf of openerp 983b17ea0a Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130522052736-t0x1wh4cm1tqvfy2
 2013-05-22 05:27:36 +00:00
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
Launchpad Translations on behalf of openerp 086b844df5 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330052753-vptpgl8jh0zxx2zf
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331052801-af1yzruwutw4ce3b
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401050658-9x864eerp9tph8ia
bzr revid: launchpad_translations_on_behalf_of_openerp-20130403052653-u7naqcrqgxv41q33
 2013-04-03 05:26:53 +00:00
Launchpad Translations on behalf of openerp 252bcc802f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060824-pc5f2pj14gj0ak27
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055726-frtzw3gc9ut4wx4y
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053127-tolr13p1b3bhjny1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054749-t3x0zc7qk3n4man2
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060920-k0cnlpk0rxcli841
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055741-loojniiz6du9upat
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053211-yvt1h32v41rs6jje
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054814-fwg742kzhsupr6kc
bzr revid: launchpad_translations_on_behalf_of_openerp-20130329051100-3ul1k4qwwm2f49gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130330060923-wch1f8ndmb15nu6x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130331055759-aj1nc93t9420lov0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130401053215-kqqgqefzp95fa1tk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130402054817-k33rri349nc2ioiz
 2013-04-02 05:48:17 +00:00
Launchpad Translations on behalf of openerp fc04522286 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130328060500-yc40z00ubsz154vw
 2013-03-28 06:05:00 +00:00
sgo@tinyerp.com b8a33bc393 [MERGE]sync with trunk 
bzr revid: sgo@tinyerp.com-20130318071519-3pae2jh7nk2iaqpe
 2013-03-18 12:45:19 +05:30
Launchpad Translations on behalf of openerp 4ce8d2697d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316055338-ogfw01ap8fh1hlaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317045918-zi1230lgxjbkqw3x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318044640-ts2tr31y2gl25rev
 2013-03-18 04:46:40 +00:00
Launchpad Translations on behalf of openerp 72f29d98b8 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130315055412-luy9qg1pkdjnqlud
 2013-03-15 05:54:12 +00:00
sgo@tinyerp.com a21b4b9b56 [MERGE]sync with trunk 
bzr revid: sgo@tinyerp.com-20130311045638-npwv6lb6bc9i3m1y
 2013-03-11 10:26:38 +05:30
Launchpad Translations on behalf of openerp b46c9dae1b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130302045718-19m5dowwcweyf3fy
bzr revid: launchpad_translations_on_behalf_of_openerp-20130303050056-i10g2vgmvxm9l392
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305050744-svuruvv63292prwx
 2013-03-05 05:07:44 +00:00
sgo@tinyerp.com 8e94b4c7ea [IMP]remove sale.shop from yml and improve code 
bzr revid: sgo@tinyerp.com-20130123123828-z7rikkrunp1rem55
 2013-01-23 18:08:28 +05:30
Launchpad Translations on behalf of openerp 94afe1ccef Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222060744-44at9lbhw0npx5h6
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223044213-e86qkwoh0uo3cjti
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224044035-1y0s4fc6ns7ytko6
 2012-12-24 04:40:35 +00:00
Olivier Dony 3815d22432 [I18N] Update translation templates for latest changes - ready for 7.0 release 
bzr revid: odo@openerp.com-20121221172005-uuwfq58gslzikygl
 2012-12-21 18:20:05 +01:00
Launchpad Translations on behalf of openerp cc87ba5db7 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308052354-6aerviht20qnfh26
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308060553-lujyj3qxhqljssu0
bzr revid: launchpad_translations_on_behalf_of_openerp-20130308060749-69tgopwkctb0v5ei
 2013-03-08 06:07:49 +00:00
Olivier Dony 1e5a3aa787 [I18N] *: update translation templates for latest term changes due to bug fixes 
bzr revid: odo@openerp.com-20130307121934-jfwfl1q0jtvswe0c
 2013-03-07 13:19:34 +01:00
Launchpad Translations on behalf of openerp 420f82ec0e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305053802-13krr4lhrwrebwak
bzr revid: launchpad_translations_on_behalf_of_openerp-20130305053905-y30zk4dbbcc3qj4b
 2013-03-05 05:39:05 +00:00
Launchpad Translations on behalf of openerp 03ad9f7290 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130302052257-0w9v71dump44rtov
bzr revid: launchpad_translations_on_behalf_of_openerp-20130303052333-9kn24ocknaagn33h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130304055956-54bietn1iazrisga
 2013-03-04 05:59:56 +00:00
Launchpad Translations on behalf of openerp ece4451176 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130301053921-r8m4764fosovd9h6
bzr revid: launchpad_translations_on_behalf_of_openerp-20130301054021-crdgcw5mb7m77u0t
 2013-03-01 05:40:21 +00:00
Launchpad Translations on behalf of openerp 35bc384f50 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130223060740-3n0izgt30e6k6j3d
bzr revid: launchpad_translations_on_behalf_of_openerp-20130223060813-35hs9o06qkcrlqme
bzr revid: launchpad_translations_on_behalf_of_openerp-20130224051257-hb610rps76ncuh5l
bzr revid: launchpad_translations_on_behalf_of_openerp-20130224051302-eltcq481gxdfn2gm
 2013-02-24 05:13:02 +00:00
Launchpad Translations on behalf of openerp ead19a73b2 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130213052157-zdt86kcrn8mbwa23
bzr revid: launchpad_translations_on_behalf_of_openerp-20130213052201-hnwd7qjf3tesspnh
 2013-02-13 05:22:01 +00:00
Launchpad Translations on behalf of openerp b64db1c007 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130207054227-fy00xo21liqcoqz8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130207054231-c558abx56zwr0mg2
 2013-02-07 05:42:31 +00:00
Launchpad Translations on behalf of openerp 7a49719d46 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130118071051-e8wytix67wlb17yd
 2013-01-18 07:10:51 +00:00
Launchpad Translations on behalf of openerp 0f8f807662 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130108060621-ui1ieo61n4a6evjr
bzr revid: launchpad_translations_on_behalf_of_openerp-20130108060625-j9tf52wfuw30yh8i
 2013-01-08 06:06:25 +00:00
Launchpad Translations on behalf of openerp 3ba106a80f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130106053125-9sb5dr03kc8gmvpe
bzr revid: launchpad_translations_on_behalf_of_openerp-20130107054512-8vxs3lzomicfru2z
bzr revid: launchpad_translations_on_behalf_of_openerp-20130107054515-z9gktg07rskvs12r
 2013-01-07 05:45:15 +00:00
Launchpad Translations on behalf of openerp d2d4748277 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121227055339-126egwmnviv4o13g
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222073914-5tzk3pmley7xt65v
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223050927-7arwzs18xy60iz6j
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224051047-ousn2b5ahnsj1hrg
bzr revid: launchpad_translations_on_behalf_of_openerp-20121225051618-l19m8q9sq3067kv7
bzr revid: launchpad_translations_on_behalf_of_openerp-20121226051842-szu8p5q7lmtwx6tc
bzr revid: launchpad_translations_on_behalf_of_openerp-20121227055344-qygiaxubtlootycb
 2012-12-27 05:53:44 +00:00
Launchpad Translations on behalf of openerp f49cf3ad50 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121222073731-s1qift4p97f9s1zf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121223050857-vzu6pl7ttzy10603
bzr revid: launchpad_translations_on_behalf_of_openerp-20121224051043-oxj4lz3tpjhai7hn
 2012-12-24 05:10:43 +00:00
Launchpad Translations on behalf of openerp 56248183fc Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219051749-jfkdv3ohgd61z9pq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219052238-gjyvmd0dp8pahk2c
 2012-12-19 05:22:38 +00:00
Olivier Dony 7aba2e01f9 [MERGE] sale_margin: functions passed to store triggers cannot use inheritance, courtesy of Serpent Consulting Services 
bzr revid: odo@openerp.com-20121219012510-m04yzgxnw9yzwtqc
 2012-12-19 02:25:10 +01:00
Raphael Collet 73980eba5f [MERGE] trunk-import-openerp-thu (use strict naming convention when importing openerp stuff) 
bzr revid: rco@openerp.com-20121218085914-qzr2upqfxmfbzfsx
 2012-12-18 09:59:14 +01:00
Launchpad Translations on behalf of openerp b2bb3eafbd Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218045907-df0xw1q7dgw696s1
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050221-ab50rd40d94gd9a0
bzr revid: launchpad_translations_on_behalf_of_openerp-20121218050832-5hvbj7p0bpsw6fp0
 2012-12-18 05:08:32 +00:00
Cecile Tonglet 15fe515601 [MERGE] From trunk 
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
 2012-12-17 15:43:06 +01:00