Commit Graph
70686 Commits
Author SHA1 Message Date
Christophe Matthieu b577b29487 [MERGE] from trunk
bzr revid: chm@openerp.com-20121203091951-fd9dn570gfv13edr
2012-12-03 10:19:51 +01:00
Christophe Matthieu ffe7fd9bcc [FIX] etherpad: When a user access to the edit mode from a kanban view or list view, etherpad is dipslay on readonly mode but with the oe_editing class. Why: The deferer for read only arrive after the display of edit mode. Fix: check in the deferer if the etherpad is already in readonly mode.
bzr revid: chm@openerp.com-20121203085116-jn83em3pd5le28rp
2012-12-03 09:51:16 +01:00
Xavier Morel 0b54cbb64f [IMP] update py.js for abs builtin support
bzr revid: xmo@openerp.com-20121203084803-ib325gp18g5xvdv6
2012-12-03 09:48:03 +01:00
Vishmita 305f64478d [FIX]Change report title
bzr revid: vja@tinyerp.com-20121203081331-w7ahvcy6garpn4v8
2012-12-03 13:43:31 +05:30
Tejas Tank 61382204dc [FIX] Does not require to set related field in default.
bzr revid: tta@openerp.com-20121203074442-cbzavdhswqyd306g
2012-12-03 12:44:42 +05:00
Ajay Chauhan (OpenERP) 2469d3b4ab [MERGE] merge with lp:openobject-server
bzr revid: cha@tinyerp.com-20121203062636-xnhqfm6491lib2hl
2012-12-03 11:56:36 +05:30
Paramjit Singh Sahota 4521ee8108 [IMP] Improved code for the End Date field: which should be updated automatically if you change the Scheduled Date.
bzr revid: psa@tinyerp.com-20121203062209-t57bjlhw0vkraeg0
2012-12-03 11:52:09 +05:30
Divyesh Makwana (Open ERP) 0993b7fcc2 [Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20121203055922-apvkuwgy02d62rsx
2012-12-03 11:29:22 +05:30
Paramjit Singh Sahota 77a640594e [IMP] Improved.
bzr revid: psa@tinyerp.com-20121203053238-mv0xz9mexf651f87
2012-12-03 11:02:38 +05:30
Tejas Tank 82b2faa366 Merged Latest.
bzr revid: tta@openerp.com-20121203052209-cxcrp8nru1rvd6y1
2012-12-03 10:22:09 +05:00
Ajay Chauhan (OpenERP) 8b67b2f597 [MERGE] merge with main addons
bzr revid: cha@tinyerp.com-20121203052157-f40ofmgrxws7oktx
2012-12-03 10:51:57 +05:30
Paramjit Singh Sahota 4290c54aa7 [MERGE] Merged lp:openobject-addons.
bzr revid: psa@tinyerp.com-20121203051142-3kqunad7eob21ujn
2012-12-03 10:41:42 +05:30
Paramjit Singh Sahota 09eeab5cdf [IMP] Improved code.
bzr revid: psa@tinyerp.com-20121203050607-dvx596nf8qjs3yub
2012-12-03 10:36:07 +05:30
Launchpad Translations on behalf of openerp 772a721d85 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121203043613-1gilvazjie7ji5pb
2012-12-03 04:36:13 +00:00
Launchpad Translations on behalf of openerp b184574f18 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121202043653-0wjef9gxgx96i7pf
bzr revid: launchpad_translations_on_behalf_of_openerp-20121203043528-zme86exbes8aiol3
2012-12-03 04:35:28 +00:00
Atul Patel (OpenERP) 374c717ec7 [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121203043300-x9npixhsf6eyojkv
2012-12-03 10:03:00 +05:30
Fabien Pinckaers 929d1cf6c2 [MERGE] fix create invoice on picking
bzr revid: fp@openerp.com-20121202173607-we6l6uy38nic1t12
2012-12-02 18:36:07 +01:00
Fabien Pinckaers 017e2c2f77 [FIX] account creation
bzr revid: fp@openerp.com-20121202172651-0gtlf31avv8d01ti
2012-12-02 18:26:51 +01:00
Fabien Pinckaers 2ab4b76b5f [MERGE] l10n_nl fiscal positions
bzr revid: fp@openerp.com-20121202161123-16cm2sh67ah2tps3
2012-12-02 17:11:23 +01:00
Fabien Pinckaers 2b4372e58b [MERGE] sequence in l10n_nl + cleaned indentation
bzr revid: fp@openerp.com-20121202160220-oniiebur8zbt6j15
2012-12-02 17:02:20 +01:00
Launchpad Translations on behalf of openerp 0c1c7e0645 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121201052150-yqa0633xufeghwro
bzr revid: launchpad_translations_on_behalf_of_openerp-20121202044423-mgcbteebgi44toci
2012-12-02 04:44:23 +00:00
Launchpad Translations on behalf of openerp c0d74ff9a5 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121202043859-e4rnpga3ab08i8ks
2012-12-02 04:38:59 +00:00
dusan 23297c411f [MERGE]with parent
bzr revid: dusan@ubuntu-20121201233429-rbar3myou3kladd8
2012-12-02 00:34:29 +01:00
Fabien Pinckaers cada27b307 [FIX] followup
bzr revid: fp@openerp.com-20121201113637-c3cr6yrkjxow6qds
2012-12-01 12:36:37 +01:00
Fabien Pinckaers 0a933f44e5 [IMP] small fix in YAML XML import
bzr revid: fp@openerp.com-20121201113524-8n94vnpxt3g21b1b
2012-12-01 12:35:24 +01:00
Atul Patel (OpenERP) 9fa4677b2c [MERGE]: Merged with lp:openobject-addons
bzr revid: atp@tinyerp.com-20121201091113-dw0bnk3jzfr7r61z
2012-12-01 14:41:13 +05:30
Launchpad Translations on behalf of openerp 4c0ddb1f01 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20121201050734-pfp8sbkds49ewcyv
bzr revid: launchpad_translations_on_behalf_of_openerp-20121201050910-yq8l30zsbpn4rbx8
2012-12-01 05:09:10 +00:00
Fabien Pinckaers f391da8624 [IMP]
bzr revid: fp@openerp.com-20121130234651-2ps66qeu3fv2jda0
2012-12-01 00:46:51 +01:00
Fabien Pinckaers 1165abefc4 [IMP] followup
bzr revid: fp@openerp.com-20121130232837-mnp8cdlnsjpl6jeh
2012-12-01 00:28:37 +01:00
dle@openerp.com fe3327fb42 [MERGE]Latest turkn
bzr revid: dle@openerp.com-20121130193135-zerc3hir61ik7oax
2012-11-30 20:31:35 +01:00
dle@openerp.com d963fb8186 [FIX]Delete name_company_uniq constraint in bank statement
bzr revid: dle@openerp.com-20121130192938-qj9wu6iztkg7helz
2012-11-30 20:29:38 +01:00
Antonin Bourguignon 26ef6d145f [IMP] tests for lead2opp conversion; properly use m2m operations instead of a simple list of ids
bzr revid: abo@openerp.com-20121130192537-2ammzl0irumnau2g
2012-11-30 20:25:37 +01:00
Antonin Bourguignon 6d0aaa0dde [FIX] forgot a .id
bzr revid: abo@openerp.com-20121130191345-bixfvf7cp7g2w8fp
2012-11-30 20:13:45 +01:00
Antonin Bourguignon 448888985b [IMP] tests for the salesmen assignations; properly use m2m operations instead of a simple list of ids (which doesn't work - and it should be corrected in several other tests)
bzr revid: abo@openerp.com-20121130185917-3jxajrp7c3usp5hv
2012-11-30 19:59:17 +01:00
Olivier Dony e91080c251 [I18N] Update translation templates with latest terms
bzr revid: odo@openerp.com-20121130183717-5a4h24j8b5v7kxfl
2012-11-30 19:37:17 +01:00
Olivier Dony 5c9135f118 [I18N] Update base translation template with latest terms
bzr revid: odo@openerp.com-20121130183055-xyq5lji852y47nw2
2012-11-30 19:30:55 +01:00
Antonin Bourguignon 94197bdf2a [IMP] tests for the salesmen assignations
bzr revid: abo@openerp.com-20121130181718-0hpl4vvvw84g97ua
2012-11-30 19:17:18 +01:00
Olivier Dony ab39c09a7b [MERGE] Less intrusive timezone offset warning (comes with corresponding server branch)
bzr revid: odo@openerp.com-20121130175658-r3zvuhx75iqa5sus
2012-11-30 18:56:58 +01:00
Olivier Dony 706a58bfec [IMP] instance.init: less offensive constant
bzr revid: odo@openerp.com-20121130175249-yrbcdsn2z1io79dz
2012-11-30 18:52:49 +01:00
Olivier Dony 8fba574007 [MERGE] Less intrusive timezone offset warning (corresponds to web branch)
bzr revid: odo@openerp.com-20121130174819-q8g6m5mhoaczcr8q
2012-11-30 18:48:19 +01:00
Quentin (OpenERP) 9fc63f9572 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121130173041-iyvd47qushkbmenm
2012-11-30 18:30:41 +01:00
Quentin (OpenERP) 057ca2072c [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121130173008-4ew25fx09uamyyp6
2012-11-30 18:30:08 +01:00
dle@openerp.com 6f3f1d4217 [MERGE](Sort of :D)From Luc De Meyer Zip from apps.openerp.com
bzr revid: dle@openerp.com-20121130172033-dinqyw8arg79eh31
2012-11-30 18:20:33 +01:00
Quentin (OpenERP) a68e5f9041 [MERGE] merged the branch with supplier payment term from alexis de Lattre (Akretion). Thanks for the nice proposal
bzr revid: qdp-launchpad@openerp.com-20121130171130-dugntyqmjunwr20m
2012-11-30 18:11:30 +01:00
Antonin Bourguignon 60884cc4f6 [MERGE] trunk
bzr revid: abo@openerp.com-20121130170307-732mw3b7zjkc9l9l
2012-11-30 18:03:07 +01:00
niv-openerp e50b0249b6 Added multi bubble
bzr revid: nicolas.vanhoren@openerp.com-20121130170243-0isooew0e5g01tz0
2012-11-30 18:02:43 +01:00
Antonin Bourguignon a38bdc15c5 [IMP] introduce tests for the salesmen assignations
bzr revid: abo@openerp.com-20121130170034-7f5ytzptsks997oq
2012-11-30 18:00:34 +01:00
Antonin Bourguignon a9f67c3729 [IMP] indentation
bzr revid: abo@openerp.com-20121130165958-eg00un2qhipubcwr
2012-11-30 17:59:58 +01:00
Olivier Dony 43e8cda76d [MERGE] Bugfixes from 6.1 until revision 6700
Rev.6700 is xal@openerp.com-20120323142541-ebxn935mdfk7bk9s

bzr revid: odo@openerp.com-20121130165415-0yujyc1mkl7lsmd4
2012-11-30 17:54:15 +01:00
Quentin (OpenERP) 56e72783ae [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20121130165350-btj0wcm1u3ejyp3f
2012-11-30 17:53:50 +01:00