Commit Graph
81391 Commits
Author SHA1 Message Date
Thibault Delavallée 1f1e28e19e [MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120910072957-jbu0w3rpr4stm3sf
2012-09-10 09:29:57 +02:00
Christophe Matthieu 22d1ff0c82 note : add comments and change name in 'Memo'
bzr revid: chm@openerp.com-20120910072459-tlue035os3ci1pbz
2012-09-10 09:24:59 +02:00
Xavier Morel 34d15bb862 [IMP] base_import: lexicographically sort fields in field-matching UI
bzr revid: xmo@openerp.com-20120910072032-wbgafg3z45z4l29a
2012-09-10 09:20:32 +02:00
Thibault Delavallée c0093aa540 [MERGE] Merged withi addons/trunk.
bzr revid: tde@openerp.com-20120910071845-2dioy0buibv55np5
2012-09-10 09:18:45 +02:00
Thibault Delavallée 2163e8a1a7 [MERGE] Merged with server/trunk.
bzr revid: tde@openerp.com-20120910071829-8zyem0ix32m6u4n1
2012-09-10 09:18:29 +02:00
Turkesh Patel (Open ERP) d5dffcd19e [MRG] merge with lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation
bzr revid: tpa@tinyerp.com-20120910070857-q4u35ra01443gr51
2012-09-10 12:38:57 +05:30
Jigar Amin - OpenERP c17a459f03 Merge lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-removed-tch
bzr revid: jam@tinyerp.com-20120910063452-mwa7zq3f91t1ndnf
2012-09-10 12:04:52 +05:30
Amit Patel (OpenERP) cb66834d8b [MERGE]:subtype help
bzr revid: apa@tinyerp.com-20120910062025-th6v2s3giayka3e3
2012-09-10 11:50:25 +05:30
ajay javiya (OpenERP) b9c3b1efea [IMP]: Improve fields readonly-ness in mrp
bzr revid: aja@tinyerp.com-20120910061409-g3ue25pqomfech3m
2012-09-10 11:44:09 +05:30
Jigar Amin - OpenERP e5aafdd000 Merge lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-account-coda-onchange-psa
bzr revid: jam@tinyerp.com-20120910055651-jnkxb2v0rwdcki0w
2012-09-10 11:26:51 +05:30
Sanjay Gohel (Open ERP) 5cf330f39a [IMP]add help on subtype name
bzr revid: sgo@tinyerp.com-20120910054903-22sveyi971arsl39
2012-09-10 11:19:03 +05:30
Atul Patel (OpenERP) b5ab7849ae [FIX]: Fix waning message in sale_stock
bzr revid: atp@tinyerp.com-20120910053859-gb6697ni0uk3is6i
2012-09-10 11:08:59 +05:30
ajay javiya (OpenERP) c8440c5094 [IMP]: Improve readonly-ness of field
bzr revid: aja@tinyerp.com-20120910052121-73o2wk7v8yb0ydzd
2012-09-10 10:51:21 +05:30
Jigar Amin - OpenERP 6971bbd2d4 Merged lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-accounting-journal_items_menu-psa
bzr revid: jam@tinyerp.com-20120910051903-w5neelpw5o5zkdub
2012-09-10 10:49:03 +05:30
Amit Patel (OpenERP) 33b3c0e6a0 [MERGE]:tunk
bzr revid: apa@tinyerp.com-20120910051334-54gadrzcbjzk37wn
2012-09-10 10:43:34 +05:30
ajay javiya (OpenERP) e8d432a9ae [MERGE]:Merge with main branch
bzr revid: aja@tinyerp.com-20120910045847-f4fylwf3i4fshv6m
2012-09-10 10:28:47 +05:30
Launchpad Translations on behalf of openerp d0577ed3ac Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120910044118-l9r2knhxlwtgg4eh
2012-09-10 04:41:18 +00:00
Jigar Amin - OpenERP 6c7cdd7712 Merge lp:openobject-addons
bzr revid: jam@tinyerp.com-20120910043039-vu4qn4t20je6ew8r
2012-09-10 10:00:39 +05:30
Jigar Amin - OpenERP 8dc411e3bc Merge lp:openobject-server
bzr revid: jra@tinyerp.com-20120904105151-x80la9q1mvfrqhfv
bzr revid: tpa@tinyerp.com-20120907071127-kodz8my0bycwt4sw
bzr revid: jam@tinyerp.com-20120910043029-y9xvj90x4e19m421
2012-09-10 10:00:29 +05:30
Divyesh Makwana (Open ERP) 10799de784 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120910042621-xdl27s9an7fc0vzg
2012-09-10 09:56:21 +05:30
Jigar Amin - OpenERP 08a5a24194 Merge lp:openobject-addons
bzr revid: jam@tinyerp.com-20120910041726-jmjdogjyn0dcv1ts
2012-09-10 09:47:26 +05:30
Atul Patel (OpenERP) d630d3b6b6 [IMP]: improve progress bar from sale order line tree view.
bzr revid: atp@tinyerp.com-20120909173020-gljs3gss7ljm310w
2012-09-09 23:00:20 +05:30
Atul Patel (OpenERP) 4cd3b7cecb [IMP]:Inherit advance invoice wizard for order policy picking..
bzr revid: atp@tinyerp.com-20120909170341-1th57w16upi6c3dt
2012-09-09 22:33:41 +05:30
Stéphane Bidoul 38dfccaaa0 hr_timesheet_invoice: in invoice task work, use the account default tax if the product has no taxes defined
lp bug: https://launchpad.net/bugs/1048305 fixed

bzr revid: stephane.bidoul@acsone.eu-20120909165919-xgxu45ugq3944gvu
2012-09-09 18:59:19 +02:00
Stéphane Bidoul 4deb1f84e7 hr_timesheet_invoice, bill task work: use the analytic account company for the generated invoice_cost_create
This makes life much easiers for people generating billings for several companies.

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

bzr revid: stephane.bidoul@acsone.eu-20120909152438-qax5pv4ij76asmbv
2012-09-09 17:24:38 +02:00
Atul Patel (OpenERP) 3017f5d6e3 [FIX]: ADD sale_stock dependency
bzr revid: atp@tinyerp.com-20120909131338-p6bfigvid3f6876m
2012-09-09 18:43:38 +05:30
Stéphane Bidoul 17edcf0630 select account and taxes for the invoice's company instead of the user's default company when changing product or account
This partially fixes lp:1048213 since the default account proposed when creating a new invoice line (in trunk only) is still from the user's company.

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

bzr revid: stephane.bidoul@acsone.eu-20120909124259-df6qo743sfogltf9
2012-09-09 14:42:59 +02:00
Atul Patel (OpenERP) 30bf8715cf [IMP]: Change workflow transition. remove type field
bzr revid: atp@tinyerp.com-20120909123216-vys9dyuqk5i7grgr
2012-09-09 18:02:16 +05:30
Atul Patel (OpenERP) e60d4abafc [REM]: move sale_stock wizard into sale wizard
bzr revid: atp@tinyerp.com-20120909121903-62z33di4idwsrzjf
2012-09-09 17:49:03 +05:30
Stéphane Bidoul 004b9c9a84 create invoice: changing journal changes company too
lp bug: https://launchpad.net/bugs/1047884 fixed

bzr revid: stephane.bidoul@acsone.eu-20120909114515-mbilk7jv2aj1mn9x
2012-09-09 13:45:15 +02:00
Atul Patel (OpenERP) f1cf4c04b9 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20120909110214-2e1c7e7t43c69zzo
2012-09-09 16:32:14 +05:30
Antony Lesuisse f2ddf0ea65 [FIX] document_page wiki
bzr revid: al@openerp.com-20120909104340-z4c85dcq6s11v83y
2012-09-09 12:43:40 +02:00
Atul Patel (OpenERP) eb28892a3a [IMP]: MOVE PROCUREMENT CHANGES INTO PROCUREMENT..
bzr revid: atp@tinyerp.com-20120909101156-9pna66qbx28px2ii
2012-09-09 15:41:56 +05:30
Launchpad Translations on behalf of openerp bc619a3e53 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120908045428-bfzum7jcffa1r8rd
bzr revid: launchpad_translations_on_behalf_of_openerp-20120909045300-ks25sg9ymy0igkrw
2012-09-09 04:53:00 +00:00
Launchpad Translations on behalf of openerp 8a48914a5c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120908045418-c9hj53ekfup0z9n8
2012-09-08 04:54:18 +00:00
Minh Tran 672e87bcc8 merge from mit-trunk
bzr revid: mit@openerp.com-20120907173139-8rk16jo3a2yyvqtb
2012-09-07 19:31:39 +02:00
Minh Tran 54532438cd restyling of kanban quick create
bzr revid: mit@openerp.com-20120907173102-628l5xpnpimmlnj6
2012-09-07 19:31:02 +02:00
Thibault Delavallée 741bbaa9f4 [WIP] mail_message.message_read(): WIP about having correct expandables. Will be updated next week.
bzr revid: tde@openerp.com-20120907160920-4ijs93y9ogp39xma
2012-09-07 18:09:20 +02:00
Thibault Delavallée 63fbe72b9c [FIX] mail: res_users: fixed the previous hook, done directly in SQL, to avoid doing sunversive things in _auto_init.
bzr revid: tde@openerp.com-20120907160841-f5ej19t7cdml10pr
2012-09-07 18:08:41 +02:00
Olivier Dony b2136d3110 [FIX] debian/control: missing dependency on docutils
Was added to setup.py but not in deb packaging.

bzr revid: odo@openerp.com-20120907160725-gb4to44oc0wzccwq
2012-09-07 18:07:25 +02:00
Christophe Matthieu 8b1a062c99 [IMP] kanban : Improve the opening on global bock. Add a class 'oe_kanban_global_click_edit' has same methods of 'oe_kanban_global_click' but open in form/edit view ; Improve display of menu dropdown
bzr revid: chm@openerp.com-20120907153330-2dmzfiy9vwtb36uv
2012-09-07 17:33:30 +02:00
Fabien Pinckaers bce12722a3 [MERGE] l10n_india_payroll
bzr revid: fp@tinyerp.com-20120907153158-3fa4aebapki0fhw9
2012-09-07 17:31:58 +02:00
Thibault Delavallée 83fe265fba [FIX] mail.js: fixed issue with user avatars.
bzr revid: tde@openerp.com-20120907151719-suopvkfbyzbb06ig
2012-09-07 17:17:19 +02:00
Raphael Collet cbcfe23802 [IMP] orm: simplify method definition
bzr revid: rco@openerp.com-20120907151016-fj7l6nt6uffxmdgh
2012-09-07 17:10:16 +02:00
Thibault Delavallée dcc971af06 [IMP] mail: css: removed dead CSS code; pre is now displayed using the regular fonts.
bzr revid: tde@openerp.com-20120907150820-kw3c5vj99mcpffzg
2012-09-07 17:08:20 +02:00
Thibault Delavallée 294f18f611 [IMP] mail: res_users: added a hook so that already existing users follow themselves when installing Social.
bzr revid: tde@openerp.com-20120907150629-tme3hyijuzohy0r4
2012-09-07 17:06:29 +02:00
Raphael Collet 5feea1cfa8 [MERGE] from trunk
bzr revid: rco@openerp.com-20120907150534-eyj92gtq40c83e3v
2012-09-07 17:05:34 +02:00
Raphael Collet 9a53893dbf [DUMMY] spaces
bzr revid: rco@openerp.com-20120907144315-4hg1u16ineujjupp
2012-09-07 16:43:15 +02:00
Christophe Simonis a661dd8e53 merge upstream
bzr revid: chs@openerp.com-20120907144122-wlb0p3ht2iapzq5y
2012-09-07 16:41:22 +02:00
Christophe Simonis 8b68252da4 [WIP] restart server + update of server via apps
bzr revid: chs@openerp.com-20120907144102-qi35brwee3wh9fwb
2012-09-07 16:41:02 +02:00