5763688273
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130318065136-t5o01f51dycctjxv
2013-03-18 12:21:36 +05:30
Turkesh Patel (Open ERP)
4a0e878584
[IMP] addd data of related accounts
...
bzr revid: tpa@tinyerp.com-20130318063224-0lefhgsq3l1ddd1q
2013-03-18 12:02:24 +05:30
Dharti Ratani (Open ERP)
0306b355d0
[IMP]Improved the demo data for template to send mail and now mails are sent when Refuse application or Contract signed
...
bzr revid: dhr@tinyerp.com-20130318062044-0qmp56vibva2fcra
2013-03-18 11:50:44 +05:30
8ef0677a23
[MERGE]merge fka's branch for changes done in other module which are suggested
...
bzr revid: sgo@tinyerp.com-20130318061320-j7gquchn4qt6wej3
2013-03-18 11:43:20 +05:30
Paramjit Singh Sahota
d6a8dc2af5
[MERGE] Merged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130318061027-p2w4b4oupcnkdhtb
2013-03-18 11:40:27 +05:30
Foram Katharotiya (OpenERP)
2496811ec4
[IMP] improve yml strings
...
bzr revid: fka@tinyerp.com-20130318055412-se3c890mlckxd8ty
2013-03-18 11:24:12 +05:30
9485c49f4f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316063604-hv8xtn4g8e76no72
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317053030-q0f5iyfhv4qtah18
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318052217-ua2ev323qlvhi8l2
2013-03-18 05:22:17 +00:00
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
dcc9a3aeab
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317052921-m3gthz6l7fx1jwu7
bzr revid: launchpad_translations_on_behalf_of_openerp-20130315064417-68iimts1xgj8bn5z
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317053035-kqb70nwvcg1iqldu
2013-03-17 05:30:35 +00:00
Martin Trigaux
4c70a9c9de
[IMP] badge kanban clickable and default
...
bzr revid: mat@openerp.com-20130315150230-czzvf7zw1kq03gpj
2013-03-15 16:02:30 +01:00
Mohammed Shekha
a4e609c469
[FIX]Fixed the issue of account receivable property not found if someone has explicitly delete the property added by data file, the code was throwing traceback if there is no property_account_receivable found so even though user deletes data file record code should throw traceback to user, if property_account_receivable not found then we are going to use current_company.account_receivable.id.
...
bzr revid: msh@openerp.com-20130315144226-eqsz74ohwjbxnp3z
2013-03-15 20:12:26 +05:30
Yannick Vaucher
5cb1835e26
[FIX] add missing context on compute call in pricelist price_get_multi context
...
lp bug: https://launchpad.net/bugs/1155624 fixed
bzr revid: yannick.vaucher@camptocamp.com-20130315142403-gz7fy7etwzls96rt
2013-03-15 15:24:03 +01:00
Martin Trigaux
8c7c72efd3
[IMP] badge demo is now in data and added comment field
...
bzr revid: mat@openerp.com-20130315140422-eh0nhi8bbgbkhahb
2013-03-15 15:04:22 +01:00
Martin Trigaux
db73be36da
[IMP] the manager of plan is not added to group
...
bzr revid: mat@openerp.com-20130315133929-ti40as243kbw115b
2013-03-15 14:39:29 +01:00
Quentin (OpenERP)
9745c8c6c6
[FIX] account: prevent the residual amount of invoices/credit notes to be negative
...
bzr revid: qdp-launchpad@openerp.com-20130315130147-1n6g5z7nghmucibo
2013-03-15 14:01:47 +01:00
Paramjit Singh Sahota
0abe605544
[IMP] Oops sorry forgot to remove the prints and improved code.
...
bzr revid: psa@tinyerp.com-20130315124843-xtp19rbm2cvyfb67
2013-03-15 18:18:43 +05:30
Thibault Delavallée
660b94845a
[IMP] mail_compose_message: mass mailing does not auto_subscribe author anymore.
...
bzr revid: tde@openerp.com-20130315124009-xgfwr5xuxe1fhrut
2013-03-15 13:40:09 +01:00
Dharti Ratani (Open ERP)
2ae7717edb
[IMP]Changed the partner_id for manager
...
bzr revid: dhr@tinyerp.com-20130315123724-hv05rkub1agooz6h
2013-03-15 18:07:24 +05:30
Paramjit Singh Sahota
b5df63291a
[IMP] Removed the dialog box on apply and close to open a new dialog box everytime.
...
Removed unwanted code.
bzr revid: psa@tinyerp.com-20130315123157-n0n3fdej014ysz7v
2013-03-15 18:01:57 +05:30
Dharti Ratani (Open ERP)
e3e177d5f0
[IMP]Changed the typo and string in templates
...
bzr revid: dhr@tinyerp.com-20130315122606-v6arcu6dr978zk8w
2013-03-15 17:56:06 +05:30
Martin Trigaux
98e0e7edc6
[FIX] correct browse for creating employee
...
bzr revid: mat@openerp.com-20130315121757-2x2sh9fcteuatgj4
2013-03-15 13:17:57 +01:00
Tejas Tank
24a009a222
[Merged] lp:~openerp-dev/openobject-addons/trunk-cashcontrol--cha
...
bzr revid: tta@openerp.com-20130315120916-ci9uzoq1m70tg15d
2013-03-15 17:39:16 +05:30
Thibault Delavallée
5d59401b91
[MERGE] Sync with trunk, tried to resolve the conflicts without breakign everything.
...
bzr revid: tde@openerp.com-20130315120759-sf1o1sd80ycuuy7n
2013-03-15 13:07:59 +01:00
Xavier Morel
9494f21ea8
[FIX] __getattr__ implementation on BaseModel
...
object has no __getattr__, in the usual case super(BaseModel,
self).__getattr__ will blow up with an AttributeError (but the wrong
one).
On the other hand, if a BaseModel descendant class is used in MI
alongside a non-BM descendant (e.g. res_partner inheriting from Model
and format_address) and the non-BM descendant also implements
__getattr__, we want to forward the failed attr search to the other
__getattr__ implementation.
So check if super() has a __getattr__, call it if it does otherwise
AttributeError right there.
bzr revid: xmo@openerp.com-20130315115302-z7jla334gb9a5e43
2013-03-15 12:53:02 +01:00
Thibault Delavallée
4484a3197c
[MERGE] Sync with trunk, resolved conflicts due to forward port of 7.0
...
bzr revid: tde@openerp.com-20130315114338-54scb00rkp7zwr30
2013-03-15 12:43:38 +01:00
Olivier Dony
914a97f329
[FIX] account_analytic_analysis: remove duplicate method kept by mistake while porting 7.0 fixes to trunk in rev.8620
...
bzr revid: odo@openerp.com-20130315113120-xsmfoxw6a6kaylzm
2013-03-15 12:31:20 +01:00
niv-openerp
8ae0252436
Forgot a rename
...
bzr revid: nicolas.vanhoren@openerp.com-20130315112337-1d5d29wegmhml5zc
2013-03-15 12:23:37 +01:00
niv-openerp
296b9fbbb4
Renammed modules
...
bzr revid: nicolas.vanhoren@openerp.com-20130315112153-ftm3i021erfnqp01
2013-03-15 12:21:53 +01:00
Martin Trigaux
21e5abe8a2
[ADD] add test data for goal plan
...
bzr revid: mat@openerp.com-20130315110938-np60znn9ffjiymzc
2013-03-15 12:09:38 +01:00
Ajay Chauhan (OpenERP)
b9cd6db6bc
[IMP] account: once again change css to match alignment of difference
...
bzr revid: cha@tinyerp.com-20130315110851-1i8uufaj9avti7iq
2013-03-15 16:38:51 +05:30
Thibault Delavallée
4387187b8b
[IMP] mail: invite: slighty updated invite message. Updated tests accordingly.
...
bzr revid: tde@openerp.com-20130315110554-rszi5u1c9dybzq46
2013-03-15 12:05:54 +01:00
Thibault Delavallée
46101c447b
[FIX] mail.css: fixed a forgotten ';'; added a bit of style to invite people button.
...
bzr revid: tde@openerp.com-20130315110528-oggnd7iwktgag5a1
2013-03-15 12:05:28 +01:00
Thibault Delavallée
627ebc4a73
[CLEAN] mail_followers: cleaned code of get_signature_footer: same feature, but a bit less code.
...
bzr revid: tde@openerp.com-20130315110455-7ho0djpjlkbap6l1
2013-03-15 12:04:55 +01:00
Thibault Delavallée
646c83c250
[IMP] mail_mail: delegated footer modification into a dedicated method called by send_get_email_body.
...
bzr revid: tde@openerp.com-20130315110421-if39vmvov4loe5u7
2013-03-15 12:04:21 +01:00
Quentin (OpenERP)
6643ad24a9
[FIX] account_payment: soft removal of buggy _amount_to_pay field, not needed as the field residual is making the trick most of the time
...
bzr revid: qdp-launchpad@openerp.com-20130315110052-u57rx4ntaazqw827
2013-03-15 12:00:52 +01:00
Turkesh Patel (Open ERP)
96aa7aa6ea
[IMP] l10n_in:improved demo data of account tax
...
bzr revid: tpa@tinyerp.com-20130315105846-sgdli94fp6d8i8dp
2013-03-15 16:28:46 +05:30
Quentin (OpenERP)
970531816e
[FIX] account_analytic_analysis, usability: removal of a default filter not wanted
...
bzr revid: qdp-launchpad@openerp.com-20130315104619-lh31vdupmkxzvou7
2013-03-15 11:46:19 +01:00
Quentin (OpenERP)
c7b92b785b
[FIX] linkedin module compliancy with saas and https protocol
...
bzr revid: qdp-launchpad@openerp.com-20130315103847-lr9ofry7ceuqgcu5
2013-03-15 11:38:47 +01:00
Quentin (OpenERP)
d0f5b28bd0
[MERGE] merge with main trunk branch to get last translations from launchpad
...
bzr revid: qdp-launchpad@openerp.com-20130315103116-lxj96usw3ipd11z5
2013-03-15 11:31:16 +01:00
Christophe Matthieu
33e2d08bc4
[IMP] portal: group no_one for Quotations and Sales Orders
...
bzr revid: chm@openerp.com-20130315101004-yiuehnnr3aqr7mv8
2013-03-15 11:10:04 +01:00
Ajay Chauhan (OpenERP)
9bcf832d71
[IMP] account, pos: added tooltip to field 'balance_end_real' & made other little change
...
bzr revid: cha@tinyerp.com-20130315100804-9jzt9fgz430gwof9
2013-03-15 15:38:04 +05:30
Christophe Matthieu
3cc9dea526
[IMP] portal: remove menu todo, change root menu name
...
bzr revid: chm@openerp.com-20130315100451-87xsy5xibxjv85he
2013-03-15 11:04:51 +01:00
Ajay Chauhan (OpenERP)
0a7683d39f
[IMP] account, pos: added string 'Closing Balance' to fields 'balance_end_real' & 'cash_register_balance_end_real'
...
bzr revid: cha@tinyerp.com-20130315095454-ljh2bjd1brds80m5
2013-03-15 15:24:54 +05:30
Thibault Delavallée
cb6b598763
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20130315093907-8kc28n669unmr1n2
2013-03-15 10:39:07 +01:00
Thibault Delavallée
a8aebe31f3
[IMP] res_users: improved simplified form (using info_box).
...
bzr revid: tde@openerp.com-20130315093658-8ihhf3h4w6q3vypo
2013-03-15 10:36:58 +01:00
Martin Trigaux
8b6cdd23a3
[MERGE] Latest trunk
...
bzr revid: mat@openerp.com-20130315093059-i9iaaplp1erf4ac3
2013-03-15 10:30:59 +01:00
Dharti Ratani (Open ERP)
a47060f9ff
[MERGE]Merged with trunk
...
bzr revid: dhr@tinyerp.com-20130313050711-uqcfk4eju02hddgr
bzr revid: dhr@tinyerp.com-20130315091914-7n78yx8vd0wl65db
2013-03-15 14:49:14 +05:30
Somesh Khare (OpenERP)
7daa6807ee
[FIX]account_move_line:due to boolean value for journal_id and period_id error occurred (Case: ref 589954)
...
bzr revid: skh@tinyerp.com-20130315090517-84g17n9ax2iijh0j
2013-03-15 14:35:17 +05:30
Olivier Dony
8e06ab16d0
[MERGE] Bugfixes from the 7.0 branch, up to rev. 3845
...
rev.3845 = launchpad_translations_on_behalf_of_openerp-20130315064417-68iimts1xgj8bn5z
bzr revid: odo@openerp.com-20130315090112-n4h5wpxk2sjhwvrd
2013-03-15 10:01:12 +01:00
Paramjit Singh Sahota
90868a8089
[IMP] Add method for the apply button when the user click on the apply button of the dialog box the data will be updated
...
Removed unwanted code and clean the code.
bzr revid: psa@tinyerp.com-20130315085245-uhefj63na5z62of5
2013-03-15 14:22:45 +05:30
sgo@tinyerp.com