Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-4950 into lp:unifield-server

  1. US-4950
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5364
Proposed branch: lp:~dorian-kemps/unifield-server/US-4950
Merge into: lp:unifield-server
Diff against target: 51 lines (+7/-0) (has conflicts)
4 files modified
bin/addons/base/rng/view.rng (+4/-0)
bin/addons/purchase/purchase_view.xml (+1/-0)
bin/addons/sale/sale_view.xml (+1/-0)
bin/addons/useability_dashboard_and_menu/dashboard/board_sale_view.xml (+1/-0)
Text conflict in bin/addons/base/rng/view.rng
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-4950
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+367329@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/base/rng/view.rng'
2--- bin/addons/base/rng/view.rng 2019-04-30 15:23:48 +0000
3+++ bin/addons/base/rng/view.rng 2019-05-13 07:25:28 +0000
4@@ -488,7 +488,11 @@
5 <rng:optional><rng:attribute name="filter_selector"/></rng:optional>
6 <rng:optional><rng:attribute name="default_selector"/></rng:optional>
7 <rng:optional><rng:attribute name="o2m_selectable"/></rng:optional>
8+<<<<<<< TREE
9 <rng:optional><rng:attribute name="required_error_msg"/></rng:optional>
10+=======
11+ <rng:optional><rng:attribute name="truncate"/></rng:optional>
12+>>>>>>> MERGE-SOURCE
13 <rng:zeroOrMore>
14 <rng:choice>
15 <rng:ref name="diagram"/>
16
17=== modified file 'bin/addons/purchase/purchase_view.xml'
18--- bin/addons/purchase/purchase_view.xml 2019-05-10 15:26:36 +0000
19+++ bin/addons/purchase/purchase_view.xml 2019-05-13 07:25:28 +0000
20@@ -514,6 +514,7 @@
21 <field name="origin"/>
22 <field name="customer_ref"/>
23 <field name="dest_partner_names"/>
24+ <field name="details" truncate="15"/>
25 <field name="line_count"/>
26 <field name="shipped_rate" widget="progressbar"/>
27 <field name="invoiced_rate" widget="progressbar"/>
28
29=== modified file 'bin/addons/sale/sale_view.xml'
30--- bin/addons/sale/sale_view.xml 2019-05-09 08:29:36 +0000
31+++ bin/addons/sale/sale_view.xml 2019-05-13 07:25:28 +0000
32@@ -89,6 +89,7 @@
33 <field name="date_order"/>
34 <field name="client_order_ref" groups="base.group_extended"/>
35 <field name="partner_id"/>
36+ <field name="details" truncate="15"/>
37 <field name="user_id" />
38 <field name="line_count"/>
39 <field name="picked_rate" widget="progressbar"/>
40
41=== modified file 'bin/addons/useability_dashboard_and_menu/dashboard/board_sale_view.xml'
42--- bin/addons/useability_dashboard_and_menu/dashboard/board_sale_view.xml 2019-04-05 08:34:04 +0000
43+++ bin/addons/useability_dashboard_and_menu/dashboard/board_sale_view.xml 2019-05-13 07:25:28 +0000
44@@ -12,6 +12,7 @@
45 <field name="date_order"/>
46 <field name="client_order_ref" />
47 <field name="partner_id"/>
48+ <field name="details" truncate="15"/>
49 <field name="user_id" />
50 <field name="line_count"/>
51 <field name="picked_rate" widget="progressbar"/>

Subscribers

People subscribed via source and target branches