Foram Katharotiya (OpenERP)
4a21d05144
[IMP] hide Storage Location entire group in the inventory for products of type service & move company_id after sale price in information tab
...
bzr revid: fka@tinyerp.com-20130412070548-3wh0mi5k32la17yk
2013-04-12 12:35:48 +05:30
63167859c1
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130410055405-w3d7pmwo87vl44eu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130411144320-1vmytr6rwujytg83
bzr revid: launchpad_translations_on_behalf_of_openerp-20130412060508-w8b9st5nhhzb0hh0
2013-04-12 06:05:08 +00:00
Antony Lesuisse
354ac328c8
[FIX] point_of_sale fix tax rouding, this time tested, tnx fva
...
bzr revid: al@openerp.com-20130411224306-eei87tz4xp3d0o7n
2013-04-12 00:43:06 +02:00
Antony Lesuisse
0dded37377
[MERGE] point_of_sale fix tax rouding
...
lp bug: https://launchpad.net/bugs/1157761 fixed
bzr revid: al@openerp.com-20130411221119-cng0p4mct4pdf5tv
2013-04-12 00:11:19 +02:00
Olivier Dony
c5e4faa7dc
[FIX] res.partner: make the computed display_address use all address fields, including extra/custom ones
...
lp bug: https://launchpad.net/bugs/1122363 fixed
bzr revid: odo@openerp.com-20130411191110-5q7vd77m0e78dg8u
2013-04-11 21:11:10 +02:00
Christophe Simonis
8a7fad6b22
[FIX] email_template/tests/test_mail.py: compose.body is not htmlized anymore
...
bzr revid: chs@openerp.com-20130411190401-0ajvlapuyxop0zhn
2013-04-11 21:04:01 +02:00
Olivier Dony
e78ed60a5a
[FIX] res.partner: make _address_fields method conform to its documented return type (detected by Nhomar Hernandez)
...
This will make overriddes more straightforward.
bzr revid: odo@openerp.com-20130411190050-8vhx9laialsyrm3r
2013-04-11 21:00:50 +02:00
Christophe Simonis
b01528e3f0
[FIX] res_config: add missing import lost during previous commit
...
bzr revid: chs@openerp.com-20130411183634-pmg5cn82f8s174y1
2013-04-11 20:36:34 +02:00
Christophe Simonis
326506db2c
[FIX] mail: mail composer: Use a text field instead of a html field
...
html fields are sanitized just before saving data into the database.
In the composer, this cause the sanitization of the templated
message (for mass mailing messages) before the rendering, forbidding
the use of templated html links.
The html of the message is sanitized by message_post()
bzr revid: chs@openerp.com-20130411182226-lwnpkh4tmyswjjnc
2013-04-11 20:22:26 +02:00
Fabien Meghazi
428fdca40a
[FIX] FormRenderingEngine: allow class propagation to group cells
...
bzr revid: fme@openerp.com-20130411163238-qy377cdnn9enax34
2013-04-11 18:32:38 +02:00
Anael Closson
543c6012da
[FIX] Multiline texts could not be matched for tranlations
...
bzr revid: acl@openerp.com-20130411162035-ij47tyulejkqqz4t
2013-04-11 18:20:35 +02:00
Christophe Simonis
5b7c5414d3
merge upstream
...
bzr revid: chs@openerp.com-20130411155351-y286kg2uoazzop6o
2013-04-11 17:53:51 +02:00
Christophe Simonis
841cf5aaad
merge upstream
...
bzr revid: chs@openerp.com-20130411154519-xvepmjrm4ibqddx7
2013-04-11 17:45:19 +02:00
Thibault Delavallée
b8d11c1087
[ADD] [IMP] [WIP] [FIX] [TEST] portal_project: added file to update project demo data; added first tests about access rights; fixed access rights for anonymous users.
...
bzr revid: tde@openerp.com-20130411152734-318j2dneoymp9af0
2013-04-11 17:27:34 +02:00
Olivier Dony
3bd4cef043
[FIX] sale_stock: when creating invoices after delivery, use invoicing contact from SO + update test (reported by Joel Grand-Guillaume while reviewing bug 1160365)
...
The existing tests were modified to explicitly cover
the case where the "invoice partner" is set on the
Sales Order. This minimal change was done with a
!python block because !record triggers the on_change
calls on the SO and cause undesired changes.
This could be improved by creating a new customer
with a real invoicing contact and creating a new
SO.
bzr revid: odo@openerp.com-20130411145636-emmagu7uu5kis1aa
2013-04-11 16:56:36 +02:00
e2620bb5c7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130410055459-5aphwzsdpres8fvu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130411144402-pc6d2zj1j2x3y3jp
2013-04-11 14:44:02 +00:00
494c0f8bca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130411144357-92txcwycw3kgyd5k
2013-04-11 14:43:57 +00:00
Thibault Delavallée
ed901946eb
[FIX] project_issue: fixed security, group_user is in base, not project.
...
bzr revid: tde@openerp.com-20130411142740-pbpz293a252el1hy
2013-04-11 16:27:40 +02:00
Thibault Delavallée
f35246e81c
[MERGE] Sync with trunk, to benefit from freshly forward-ported 7.0 bugfixes.
...
bzr revid: tde@openerp.com-20130411082704-qce7e1moyo2sxz0c
bzr revid: tde@openerp.com-20130411141158-lk7lsf2haqbjit1u
2013-04-11 16:11:58 +02:00
Thibault Delavallée
4c4c48dc72
[MERGE] [FORWARD] Forward port of addons 7.0 until revision 9008
...
bzr revid: tde@openerp.com-20130411140957-tboxywmic8rxs4ns
2013-04-11 16:09:57 +02:00
Thibault Delavallée
f728ec93fd
[FIX] email_template: fixed errors due to template_id now being a many2one, not an int anymore.
...
bzr revid: tde@openerp.com-20130411134119-q1o71pn34v8u49jy
2013-04-11 15:41:19 +02:00
bth-openerp
79a335f2f4
[IMP] date start & end taken from template.
...
bzr revid: bth@tinyerp.com-20130411133351-z8zypiywjbgwt7by
2013-04-11 19:03:51 +05:30
Randhir Mayatra (OpenERP)
b6ad182a70
[MERGE] merge with trunk
...
bzr revid: rma@tinyerp.com-20130411130015-n7tetfiol6go2yic
2013-04-11 18:30:15 +05:30
Olivier Dony
b9eafcde22
[ADD] account_report_company module: new module for adding "commercial entity" m2o on invoices and "Partner Company" dimension on Invoice Analysis
...
bzr revid: odo@openerp.com-20130411125525-1typd4fuuvrbobae
2013-04-11 14:55:25 +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
Paramjit Singh Sahota
1a2e7c01ff
[MERGE] Merged lp:openobject-addons
...
bzr revid: psa@tinyerp.com-20130411123808-1bmkyv5h042r672a
2013-04-11 18:08:08 +05:30
Paramjit Singh Sahota
5bbffbc39c
[IMP] Improved code and made the EDIT followers visible when 'Technical Features' are given and it is in 'DEBUG mode'.
...
bzr revid: psa@tinyerp.com-20130411123537-2wzb468o7o0dno8c
2013-04-11 18:05:37 +05:30
Thibault Delavallée
ee844c0ac6
[FIX] crm: fixed on_change_user that was crashing because
...
refers to a default_section_id field that is added in sale_crm bridge module.
New behavior is : one of the team user_id is a member (crm), or
default_section_id if defined or default behavior (sale_crm)
bzr revid: tde@openerp.com-20130411123356-kc8ty16i71nwgzsm
2013-04-11 14:33:56 +02:00
Frédéric van der Essen
ef81f0bd43
[IMP] point_of_sale: add a configuration option to enable invoicing from the Point of Sale (enabled by default)
...
bzr revid: fva@openerp.com-20130411122250-aju5cl91wduj2bj0
2013-04-11 14:22:50 +02:00
Frédéric van der Essen
3aa6f4add5
[IMP] point_of_sale: the invoicing should now work reliably and validate the orders
...
bzr revid: fva@openerp.com-20130411120719-colzjq4l8eaiotdf
2013-04-11 14:07:19 +02:00
Thibault Delavallée
f8a2299525
[MERGE] [FIX] mail, email_template: fix attachment duplication and clean attachment management
...
The way attachments are linked to the document has been cleaned. Posting method message_post may receives 2 arguments:
- attachment_ids: those linked to the wizard model (mail.compose.message) are linked to the document (res_model, res_id)
- attachments: the tuples are used to create new attachments linked to the document
The wizard does not set the res_model and res_id of attachments anymore, delegating this job to message_post.
The mail.message and mail.compose.message now use their respective attachment_ids field when possible. This is done instead of reading/creating new attachments based on the attachments tuple each time a mail.compose.message is processed. Email templates now also use attachment_ids, in particular when generating emails, instead of using the attachments tuple. Only reports are still generated on the fly and put into attachments instead of attachment_ids.
A cron job has been added to unlink 'lost' attachments. Those are attachments:
- linked to 'mail.compose.message'
- with res_id=0 (due Chatter used in minimal mode or reports generated by templates before the wizard has an ID)
- with no activity for more than one day (create_date and write_date)
bzr revid: tde@openerp.com-20130411112033-mqph9vjlcjkoolfs
2013-04-11 13:20:33 +02:00
d2620baa79
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130411104746-3es0zngtda287wzb
2013-04-11 16:17:46 +05:30
Thibault Delavallée
9e4486ae52
[FIX] mail: fixed missing conflict resolution
...
bzr revid: tde@openerp.com-20130411104659-ik62af6wubzu5j6q
2013-04-11 12:46:59 +02:00
78fc70f27c
[IMP]replace true from variable analytic_accounting and put context in onchange method
...
bzr revid: sgo@tinyerp.com-20130411104643-m89up113haejewx9
2013-04-11 16:16:43 +05:30
Hardik Ansodariya
62205a72e0
[IMP] Removed changes from .pot files
...
bzr revid: han@tinyerp.com-20130411104627-ttjw7q0s9joee7go
2013-04-11 16:16:27 +05:30
Thibault Delavallée
8c7cf300eb
[MERGE] [FIX] mail: bettersuggested recipients based on email address. It tries to find a partner that is in the related document followers, or a user, or the first partner with matching email.
...
bzr revid: tde@openerp.com-20130411104151-wi5ru54b362pv957
2013-04-11 12:41:51 +02:00
Thibault Delavallée
fe2ea997a2
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20130411103645-rmr3sa8p9ropx2gc
2013-04-11 12:36:45 +02:00
ggh-openerp
e582096959
[IMP] Improved code in Pos
...
bzr revid: ggh@tinyerp.com-20130411102949-lfeakwxskka8hzyy
2013-04-11 15:59:49 +05:30
Thibault Delavallée
f994529725
[IMP] mail: finding partner based on email: improved code for suggested partners, added somme comments and tests.
...
bzr revid: tde@openerp.com-20130411101720-mumz152dsxvv1xbj
2013-04-11 12:17:20 +02:00
Jigar Amin
356115167d
[FIX] User Partner Company has to same as User Compnay not as usder company
...
bzr revid: jam@tinyerp.com-20130411094336-03i3475ydat8d5jj
2013-04-11 15:13:36 +05:30
Christophe Matthieu
5623719b1c
[IMP] view_form: radio remove console log
...
bzr revid: chm@openerp.com-20130411093433-jmsrcxjw0xb6vp1m
2013-04-11 11:34:33 +02:00
Christophe Matthieu
9319356537
[IMP] view_form: radio css readonly
...
bzr revid: chm@openerp.com-20130411093319-q25a0fbybsjzwvfe
2013-04-11 11:33:19 +02:00
Christophe Matthieu
1d12a480c3
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130411092306-wypa8h3kh1v5q8qn
2013-04-11 11:23:06 +02:00
Pinakin Nayi (OpenERP)
a9e8b58ec5
[Remove]survey:remove pot changes
...
bzr revid: pna@tinyerp.com-20130411090842-2s8i8t1wr11hvs8c
2013-04-11 14:38:42 +05:30
Christophe Matthieu
67452d290e
[IMP] view_form: radio button: change style for required field
...
bzr revid: chm@openerp.com-20130411090654-ujf7fio6lnsppv90
2013-04-11 11:06:54 +02:00
Thibault Delavallée
f74248679f
[ADD] portal_project: added forgotten project.py file in portal_project.
...
bzr revid: tde@openerp.com-20130411082256-u6lx2eibo0mrsco5
2013-04-11 10:22:56 +02:00
Raphael Collet
385f4dbaaa
[MERGE] Avoid error-hiding calls like registry.get(X) when X is dynamic.
...
Use registry[X] instead, and test model existence with: X in registry.
bzr revid: rco@openerp.com-20130411075241-0f5u1vzmtzcxwnp4
2013-04-11 09:52:41 +02:00
Raphael Collet
ef1cbabe25
[MERGE] Avoid error-hiding calls like registry.get(X) when X is dynamic.
...
Use registry[X] instead, and test model existence with: X in registry.
Also make class Registry a subclass of collections.Mapping.
bzr revid: rco@openerp.com-20130411074602-j8w67g6rzlpo0l06
2013-04-11 09:46:02 +02:00
Raphael Collet
894eeef8e0
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20130411073708-gaxl2332umtedmg6
2013-04-11 09:37:08 +02:00
Raphael Collet
05851d21ba
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20130411073017-x6e4h8xbvmy3ofdw
2013-04-11 09:30:17 +02:00
Foram Katharotiya (OpenERP)