Merge lp:~openerp-dev/openerp-web/trunk-purchase-visibility-nco into lp:openerp-web

Proposed by Nimesh Contractor(Open ERP) on 2013-04-22
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/trunk-purchase-visibility-nco
Merge into: lp:openerp-web
Diff against target: 23 lines (+2/-0)
2 files modified
addons/web/static/src/css/base.css (+1/-0)
addons/web/static/src/css/base.sass (+1/-0)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-purchase-visibility-nco
Reviewer Review Type Date Requested Status
OpenERP Core Team 2013-04-22 Pending
Review via email: mp+160011@code.launchpad.net

Description of the change

Hello,

  On incoming shipments menuitem: browser warning message opens up when creating the invoice.
  I have remove the oe_form_dirty, so that unused popup will not open anymore when creating invoice.

Thanks,
Nimesh.

To post a comment you must log in.
3722. By Nimesh Contractor(Open ERP) on 2013-05-23

[MERGE] with trunk.

3723. By Nimesh Contractor(Open ERP) on 2013-06-03

[MERGE] with trunk.

3724. By Nimesh Contractor(Open ERP) on 2013-06-07

[MERGE] with trunk.

3725. By Nimesh Contractor(Open ERP) on 2013-06-10

[MERGE] with trunk.

3726. By Nimesh Contractor(Open ERP) on 2013-06-11

[MERGE] with trunk.

3727. By Chandni Machchhar(OpenERP) on 2013-06-12

[IMP] set the grey help a little closer.

3728. By Nimesh Contractor(Open ERP) on 2013-06-18

[MERGE] with trunk.

3729. By Nimesh Contractor(Open ERP) on 2013-07-01

[MERGE] with trunk.

3730. By Nimesh Contractor(Open ERP) on 2013-07-03

[MERGE] with trunk.

3731. By Darshan Kalola(OpenERP) on 2013-08-23

[MERGE]merged with lp:openerp-web

3732. By Darshan Kalola(OpenERP) on 2013-10-30

[MERGE]merged with lp:openerp-web.

3733. By Darshan Kalola(OpenERP) on 2013-11-01

[MERGE]merged with lp:openerp-web.

3734. By Darshan Kalola(OpenERP) on 2013-11-11

[MERGE]merged with lp:openerp-web.

3735. By Darshan Kalola(OpenERP) on 2014-02-10

[MERGE]sync with trunk.

3736. By Chirag Dodiya(OpenERP) on 2014-04-21

[MRG]Merged with lp:openerp-web

3737. By Chirag Dodiya(OpenERP) on 2014-05-05

[MRG]Merged with lp:openerp-web

Unmerged revisions

3737. By Chirag Dodiya(OpenERP) on 2014-05-05

[MRG]Merged with lp:openerp-web

3736. By Chirag Dodiya(OpenERP) on 2014-04-21

[MRG]Merged with lp:openerp-web

3735. By Darshan Kalola(OpenERP) on 2014-02-10

[MERGE]sync with trunk.

3734. By Darshan Kalola(OpenERP) on 2013-11-11

[MERGE]merged with lp:openerp-web.

3733. By Darshan Kalola(OpenERP) on 2013-11-01

[MERGE]merged with lp:openerp-web.

3732. By Darshan Kalola(OpenERP) on 2013-10-30

[MERGE]merged with lp:openerp-web.

3731. By Darshan Kalola(OpenERP) on 2013-08-23

[MERGE]merged with lp:openerp-web

3730. By Nimesh Contractor(Open ERP) on 2013-07-03

[MERGE] with trunk.

3729. By Nimesh Contractor(Open ERP) on 2013-07-01

[MERGE] with trunk.

3728. By Nimesh Contractor(Open ERP) on 2013-06-18

[MERGE] with trunk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/css/base.css'
2--- addons/web/static/src/css/base.css 2014-05-02 12:33:55 +0000
3+++ addons/web/static/src/css/base.css 2014-05-05 10:00:32 +0000
4@@ -1931,6 +1931,7 @@
5 .openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol {
6 color: #aaaaaa;
7 max-width: 650px;
8+ margin-top: 5px;
9 }
10 .openerp .oe_form div.oe_form_configuration label {
11 min-width: 150px;
12
13=== modified file 'addons/web/static/src/css/base.sass'
14--- addons/web/static/src/css/base.sass 2014-05-02 12:33:55 +0000
15+++ addons/web/static/src/css/base.sass 2014-05-05 10:00:32 +0000
16@@ -1585,6 +1585,7 @@
17 p, ul, ol
18 color: #aaa
19 max-width: 650px
20+ margin-top: 5px
21 label
22 min-width: 150px
23 .oe_form_group_cell_label