pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,391 Commits 1 Branch 0 Tags
92b8aafe97d94deacb06b37503a05d80b25dbba8
Commit Graph
81391 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibault Delavallée b3a928f78b [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130624160019-ef98nl9gqj57jydh
 2013-06-24 18:00:19 +02:00
Thibault Delavallée 9f84cc4968 [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20130624160006-ndlo68bdmm3ndj21
 2013-06-24 18:00:06 +02:00
niv-openerp f93d10957d [FIX] bad handling of werkzeug's exceptions 
bzr revid: nicolas.vanhoren@openerp.com-20130624155634-d5b5998jv01fa1wh
 2013-06-24 17:56:34 +02:00
Thibault Delavallée fd90140d7b [REF] mail_thread: refactored message_route improvement, to be closer to the original code + call to a new method that checks the route, instead of doing everything in one method. 
bzr revid: tde@openerp.com-20130624151827-hxwaelefs540pvca
 2013-06-24 17:18:27 +02:00
Denis Ledoux f4ac9a07a7 [FIX]account: fix of sxw of account_print_invoice, which was using o.address_invoice_id.partner_id instead of o.partner_id 
bzr revid: dle@openerp.com-20130624145856-vz0d8oezyqoj7gou
 2013-06-24 16:58:56 +02:00
Amit Bhavsar (Open ERP) 06fe2460d6 [MERGE] merge with latest trunk 
bzr revid: amb@tinyerp.com-20130624141838-mevmot56188pkoeo
 2013-06-24 19:48:38 +05:30
Amit Bhavsar (Open ERP) b9ed060fa8 [MERGE] merge with latest trunk 
bzr revid: amb@tinyerp.com-20130624141146-sq4rh2q3rqz67mcj
 2013-06-24 19:41:46 +05:30
Denis Ledoux b4a9b23f8e [MERGE]upstream 
bzr revid: dle@openerp.com-20130624135446-wqzbrpr2b4d13wm3
 2013-06-24 15:54:46 +02:00
Amit Bhavsar (Open ERP) b35375cc4b [MERGE] merge with latest trunk 
bzr revid: amb@tinyerp.com-20130624134518-lc8v8egz5tzomwzf
 2013-06-24 19:15:18 +05:30
Denis Ledoux d40bc9b776 [FIX]google_base_account: typo. (stoi le gogole *priceless*) 
bzr revid: dle@openerp.com-20130624133950-jcxv0nbn0ke6xzj0
 2013-06-24 15:39:50 +02:00
Fabien Meghazi b6aa736745 [WIP] website module 
bzr revid: fme@openerp.com-20130624133654-35kgthhzzk2dr488
 2013-06-24 15:36:54 +02:00
Foram Katharotiya (OpenERP) e69c92554f [MERGE] with trunk 
bzr revid: fka@tinyerp.com-20130620055021-sll6kxix7xhs02qq
bzr revid: fka@tinyerp.com-20130624050559-saso9gap2f1nelcj
bzr revid: fka@tinyerp.com-20130624133209-hofz15ydbip9gxem
 2013-06-24 19:02:09 +05:30
bth-openerp c851ea40f6 [MERGE]Merge lp;openobject-addons. 
bzr revid: bth@tinyerp.com-20130624132535-5r60013cyzie603n
 2013-06-24 18:55:35 +05:30
bth-openerp 92ad09af86 [MERGE]Merge lp;openobject-addons. 
bzr revid: bth@tinyerp.com-20130624132004-gnejudu8vdz3jkt1
 2013-06-24 18:50:04 +05:30
Paramjit Singh Sahota 0e11737c3f [MERGE] Sync with lp:openobject-addons. 
bzr revid: psa@tinyerp.com-20130624131714-vvdfx8t3j2tf210p
 2013-06-24 18:47:14 +05:30
Paramjit Singh Sahota bcadfb8383 [MERGE] Sync with lp:openobject-addons. 
bzr revid: psa@tinyerp.com-20130624131543-q5jao5toays4iqrx
 2013-06-24 18:45:43 +05:30
Foram Katharotiya (OpenERP) 95d9bcce6c [MERGE] with trunk 
bzr revid: fka@tinyerp.com-20130620044636-q4q2lxylcx605zms
bzr revid: fka@tinyerp.com-20130621045552-2x9142wov36lkb8x
bzr revid: fka@tinyerp.com-20130624045140-3uq5z920t51cnpkt
bzr revid: fka@tinyerp.com-20130624131337-nyzs74vi74kl4nu3
 2013-06-24 18:43:37 +05:30
Paramjit Singh Sahota a19a887639 [MERGE] Sync with lp:openobject-addons. 
bzr revid: psa@tinyerp.com-20130620051858-96jtajxo5qc51v3s
bzr revid: psa@tinyerp.com-20130624131046-m2fq48j84iyqzm2b
 2013-06-24 18:40:46 +05:30
Martin Trigaux db6e3bb4df [MERGE] [FIX] OPW 590066 account: remove accounting information lines from Journal items 
bzr revid: mat@openerp.com-20130624124418-r6fkvaokbfn3dvbg
 2013-06-24 14:44:18 +02:00
Olivier Dony 9ad04d4e9b [FIX] report_webkit: writing to disk implies having bytes to write, convert the unicode Jinja2 output to UTF-8 
Jinja2 always returns unicode strings

http://jinja.pocoo.org/docs/api/#jinja2.Template.render

bzr revid: odo@openerp.com-20130624122842-8gs8by3k8jn7bffx
 2013-06-24 14:28:42 +02:00
niv-openerp 0b6b7d643d [FIX] auth_oauth: authentication problem with the new server-side web framework 
bzr revid: nicolas.vanhoren@openerp.com-20130624095255-uj6702oq6601eql5
 2013-06-24 11:52:55 +02:00
Thibault Delavallée 853951a9d6 [IMP] res.users: improved form view to ease email, login and email preferences clarification 
bzr revid: tde@openerp.com-20130624093841-6vi3zjcz260dzuig
 2013-06-24 11:38:41 +02:00
ajay javiya (OpenERP) 9c4521d37f [MERGE]: with trunk 
bzr revid: aja@tinyerp.com-20130624091200-zhlkrezm07nejg0o
 2013-06-24 14:42:00 +05:30
Quentin (OpenERP) ea03ed65b6 [FIX] purchase, accont_anglo_saxon: fixed the creation of invoice from PO lines so that it reuse the _prepare_inv_line() method. This code factorization is needed in order to work with account_anglo_saxon module (before the anglo saxon accounting mode was ignored if the PO's invoicing method was 'generate invoices from PO lines') 
bzr revid: qdp-launchpad@openerp.com-20130624090741-eyy2r22yuti0gqit
 2013-06-24 11:07:41 +02:00
Quentin (OpenERP) d856e8361b [REF] *: change linked to server revision 4907. Removed deprecated 'view_load' attribute + removed duplicated first argument of property fields which is replaced with 'relation' argument in case where it is really needed (relational fields): indeed this first argument was totally useless for property of float type (for example). 
bzr revid: qdp-launchpad@openerp.com-20130624090515-12aeo4k5sz87veqb
 2013-06-24 11:05:15 +02:00
Quentin (OpenERP) 7e8e2ca75f [FIX] account_anglo_saxon: fixed the computation of price difference inc costing method != 'standard' + added yaml test for the same feature 
bzr revid: qdp-launchpad@openerp.com-20130624090329-o423720dp3oc4aez
 2013-06-24 11:03:29 +02:00
Quentin (OpenERP) bcac5bd834 [FIX] ir_property: fixes in property fields related to multi company use cases 
bzr revid: qdp-launchpad@openerp.com-20130624085731-fthhdpdm4ldi3220
 2013-06-24 10:57:31 +02:00
Quentin (OpenERP) c54bc51eb7 [IMP] ir_property fields: added the possibility to use 'selection' field type as properties 
bzr revid: qdp-launchpad@openerp.com-20130624085311-ujeahocdp0d2royg
 2013-06-24 10:53:11 +02:00
Quentin (OpenERP) 601ee8e030 [REF] ir_property: changed 'value_reference' and 'res_id' fields into char instead of reference fields because the code was fuzzy, the performances very bad (at least since 'view_load' attribute has been removed), and because there were no reason to have them as references (even from an useability point of view) 
bzr revid: qdp-launchpad@openerp.com-20130624085049-elmhvzkufntlzbf8
 2013-06-24 10:50:49 +02:00
Xavier ALT 58badffa74 [MERGE] [FIX] l10n_be_invoice_bba: correctly create bba reference when creating an invoice 
When creating an invoice from another object (sale: invoice from sale order
  line, sale: invoice on delivery order, ...) we have to make sure that newly
  created invoice respect partner's default ``communication type``, and
  accordingly generate a new BBA if required and none provided.

lp bug: https://launchpad.net/bugs/1135710 fixed

bzr revid: xal@openerp.com-20130624083322-h3h4h8nn876585m3
 2013-06-24 10:33:22 +02:00
ajay javiya (OpenERP) 5deb6ed7eb [REM]: state field from crm_partner_assign 
bzr revid: aja@tinyerp.com-20130624072459-2h6915rqnakzat9m
 2013-06-24 12:54:59 +05:30
ajay javiya (OpenERP) 2f3bbb8c25 [MERGE]: with trunk 
bzr revid: aja@tinyerp.com-20130624070057-0l0wiwzoblb1tk61
 2013-06-24 12:30:57 +05:30
ajay javiya (OpenERP) 105412b5d5 [REM]: Remove python action field from stage 
-> Improve convert to opportunity button not work.
-> Mark lost shold visible any time.

bzr revid: aja@tinyerp.com-20130624063531-i7t0sec0u0aj7d6j
 2013-06-24 12:05:31 +05:30
Bharat R. Devnani (OpenERP) 7d49873edf [MERGE] merged with main addons 
bzr revid: bde@tinyerp.com-20130624060440-y1hz3u9oxn0taawb
 2013-06-24 11:34:40 +05:30
Xavier Morel 11a0ece543 [FIX] evaluation context structures not being round-tripped through eval 
JS objects are converted to py.object when passed in through the
evaluation context. py.object are not serializable by default (because
that doesn't really make sense), which breaks when the input is
intended as a dict and returned (e.g. o2m values, which are triples of
(int, int?, dict?)).

Intuitively, JS objects passed as part of the context should be mostly
JSON-ish and thus dicts, but that turns out not work work as some
addons use attribute accesses within contexts (e.g. parent.access in
account/account_invoice_view.xml)

=> Temporarily solve by converting raw js objects to an "attributed
dict" which acts as both a dict and an object and can be converted to
JSON.

Ideally, py.js should provide for a pluggable conversion, or should
use an attributed mapping internally. See issues 21 and 23.

lp bug: https://launchpad.net/bugs/1182101 fixed

bzr revid: xmo@openerp.com-20130624055929-3rtkgqrp4o87pvau
 2013-06-24 07:59:29 +02:00
Launchpad Translations on behalf of openerp e2c795e297 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130622062509-09p9c2ue6lp31hfi
bzr revid: launchpad_translations_on_behalf_of_openerp-20130623055456-p4wd0c25eb7i07g1
bzr revid: launchpad_translations_on_behalf_of_openerp-20130624052601-ewqft8e70ql5qs27
 2013-06-24 05:26:01 +00:00
Launchpad Translations on behalf of openerp 89bc6e5e73 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130622062505-fobx7ncp6bkpouyt
bzr revid: launchpad_translations_on_behalf_of_openerp-20130623055452-s77jlu7z6kvjbdlz
bzr revid: launchpad_translations_on_behalf_of_openerp-20130624052557-hsaix5c3fu6opbva
 2013-06-24 05:25:57 +00:00
Foram Katharotiya (OpenERP) b957eba7a4 [MERGE] with trunk 
bzr revid: fka@tinyerp.com-20130618085601-a22grr42bptt5gyp
bzr revid: fka@tinyerp.com-20130620060851-9vralav3xyv87b32
bzr revid: fka@tinyerp.com-20130624045514-u9w913at3ihd6jsy
 2013-06-24 10:25:14 +05:30
Launchpad Translations on behalf of openerp de8272eb5f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20130622053637-2na4t63xol7god9l
bzr revid: launchpad_translations_on_behalf_of_openerp-20130623051400-l1l4wdl3b4cl9mdf
bzr revid: launchpad_translations_on_behalf_of_openerp-20130624044327-367rvnm4zfnn3ovd
 2013-06-24 04:43:27 +00:00
Mohammad Alhashash 285e188e67 Fix bug lp:1193779; Pull flows do not create procurement internal moves. 
bzr revid: alhashash@centrivision.com-20130623082753-n4q6na1qttiiay9z
 2013-06-23 10:27:53 +02:00
Maxime Chambreuil d30e1dd330 [MERGE] Resync with lp:openobject-addons/7.0 to fix conflicts 
bzr revid: maxime.chambreuil@savoirfairelinux.com-20130622035658-fsiuszsmflgr08wh
 2013-06-21 23:56:58 -04:00
Maxime Chambreuil 66f63b3015 [IMP] Documentation 
bzr revid: maxime.chambreuil@savoirfairelinux.com-20130622033026-isqkcje1k4t6iu36
 2013-06-21 23:30:26 -04:00
Maxime Chambreuil f8c8b74c80 [FIX] Typo 
bzr revid: maxime.chambreuil@savoirfairelinux.com-20130622031403-89lakq6kzyy3xvfq
 2013-06-21 23:14:03 -04:00
Maxime Chambreuil ee693b30c1 [IMP] Add accounts mapping to fiscal positions 
bzr revid: maxime.chambreuil@savoirfairelinux.com-20130622025728-ctugr41b0fulyr4i
 2013-06-21 22:57:28 -04:00
Maxime Chambreuil 39c0210f8e [IMP] Forgot one rule (intl2ab) 
bzr revid: maxime.chambreuil@savoirfairelinux.com-20130622014040-v3mr2qmhcww4m5hv
 2013-06-21 21:40:40 -04:00
Maxime Chambreuil 98b635c3f1 [IMP] Documentation 
bzr revid: maxime.chambreuil@gmail.com-20130622012626-hk1e2wfexewwfuve
 2013-06-21 21:26:26 -04:00
Denis Ledoux fcd929f3a2 [FIX]google_docs: supplier template => customer template 
bzr revid: dle@openerp.com-20130621145845-4626l1j33heaqs1y
 2013-06-21 16:58:45 +02:00
Martin Trigaux 591129f2eb [MERGE] [IMP] l10n_ca: Replaced french leftover tax names in l10n_ca's account_tax_en.xml. 
Replaced TVH by HST and TVQ by QST
courtesy of Virgil Dupras

lp bug: https://launchpad.net/bugs/1095382 fixed

bzr revid: mat@openerp.com-20130621145838-0dpupx3zp2jazdu1
 2013-06-21 16:58:38 +02:00
Martin Trigaux 2c2206650f [MERGE] [IMP] l10n_ca: Replaced french leftover tax names in l10n_ca's account_tax_en.xml. 
Replaced TVH by HST and TVQ by QST
courtesy of Virgil Dupras

bzr revid: mat@openerp.com-20130621145111-ps7ep8qcpgzvafde
 2013-06-21 16:51:11 +02:00
Martin Trigaux 628cc127a8 [MERGE] [FIX] idea: remove filter on many2many field 
bzr revid: mat@openerp.com-20130621144108-1ehuk2elr5a81i73
 2013-06-21 16:41:08 +02:00