Unifield Server

Merge lp:~unifield-team/unifield-server/us-1108 into lp:unifield-server

  1. us-1108
  2. Merge into trunk
Proposed by Quentin THEURET @Amaris
Status: Merged
Merged at revision: 4038
Proposed branch: lp:~unifield-team/unifield-server/us-1108
Merge into: lp:unifield-server
Diff against target: 130 lines (+25/-3) (has conflicts)
7 files modified
bin/addons/delivery_mechanism/delivery_mechanism.py (+5/-1)
bin/addons/msf_outgoing/msf_outgoing.py (+4/-0)
bin/addons/msf_outgoing/msf_outgoing_view.xml (+2/-0)
bin/addons/msf_outgoing/report/picking_ticket.rml (+3/-1)
bin/addons/msf_profile/i18n/fr_MF.po (+8/-0)
bin/addons/stock_override/stock.py (+2/-1)
bin/addons/stock_override/stock_view.xml (+1/-0)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1108
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+309130@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/delivery_mechanism/delivery_mechanism.py'
2--- bin/addons/delivery_mechanism/delivery_mechanism.py 2016-08-23 12:54:03 +0000
3+++ bin/addons/delivery_mechanism/delivery_mechanism.py 2016-10-28 12:28:13 +0000
4@@ -1375,9 +1375,13 @@
5 res_wiz = wiz_obj.do_create_picking(cr, uid, [wiz['res_id']], context=wiz_context)
6 if 'res_id' in res_wiz:
7 new_pick_id = res_wiz['res_id']
8+ if new_pick_id:
9+ self.write(cr, uid, new_pick_id, {'incoming_id': backorder_id or picking_dict['id']}, context=context)
10 if backorder_id and new_pick_id:
11 new_pick_name = self.read(cr, uid, new_pick_id, ['name'], context=context)['name']
12- self.write(cr, uid, backorder_id, {'associate_pick_name': new_pick_name,}, context=context)
13+ self.write(cr, uid, backorder_id, {
14+ 'associate_pick_name': new_pick_name,
15+ }, context=context)
16
17 prog_id = self.update_processing_info(cr, uid, picking_id, prog_id, {
18 'prepare_pick': _('Done'),
19
20=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
21--- bin/addons/msf_outgoing/msf_outgoing.py 2016-10-25 07:49:35 +0000
22+++ bin/addons/msf_outgoing/msf_outgoing.py 2016-10-28 12:28:13 +0000
23@@ -1875,6 +1875,10 @@
24 default = {}
25 if context is None:
26 context = {}
27+
28+ if 'incoming_id' not in default:
29+ default['incoming_id'] = False
30+
31 obj = self.browse(cr, uid, copy_id, context=context)
32 if not context.get('allow_copy', False):
33 if obj.subtype == 'picking' and default.get('subtype', 'picking') == 'picking':
34
35=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
36--- bin/addons/msf_outgoing/msf_outgoing_view.xml 2016-05-30 07:12:04 +0000
37+++ bin/addons/msf_outgoing/msf_outgoing_view.xml 2016-10-28 12:28:13 +0000
38@@ -152,6 +152,7 @@
39 <field name="sale_id" invisible="True" />
40 <field name="reason_type_id" />
41 <field name="origin"/>
42+ <field name="incoming_id" />
43 <field name="overall_qty" invisible="True" />
44 <field name="date"/>
45 <field name="min_date" string="Expected Pick Date" />
46@@ -202,6 +203,7 @@
47 attrs="{'required': [('subtype', 'in', ('picking', 'ppl'))], 'readonly': [('partner_id2', '=', False)]}" />
48 <field name="backorder_id" readonly="1" />
49 <field name="reason_type_id" widget="selection" domain="[('outgoing_ok', '=', True)]" attrs="{'readonly': [('from_wkf', '=', True)]}"/>
50+ <field name="incoming_id" readonly="True" />
51 </group>
52 <group colspan="2" col="2">
53 <field name="date" readonly="1"/>
54
55=== modified file 'bin/addons/msf_outgoing/report/picking_ticket.rml'
56--- bin/addons/msf_outgoing/report/picking_ticket.rml 2016-07-28 12:32:01 +0000
57+++ bin/addons/msf_outgoing/report/picking_ticket.rml 2016-10-28 12:28:13 +0000
58@@ -120,7 +120,7 @@
59
60 <!-- Picking Ticket header values -->
61
62- <blockTable colWidths="20.0,60.0,235.0,5.0,80.0,120.0,5.0,242.0,80.0" style="HeaderInfos">
63+ <blockTable colWidths="20.0,70.0,225.0,5.0,80.0,120.0,5.0,242.0,80.0" style="HeaderInfos">
64 <tr>
65 <td>
66 <para style="HeaderInfosTitle"></para>
67@@ -128,12 +128,14 @@
68 <td>
69 <para style="HeaderInfosTitle">FO ref.:</para>
70 <para style="HeaderInfosTitle">Origin ref.:</para>
71+ <para style="HeaderInfosTitle">Incoming ref:</para>
72 <para style="HeaderInfosTitle">Category:</para>
73 <para style="HeaderInfosTitle">Total items:</para>
74 </td>
75 <td>
76 <para style="HeaderInfosValue">[[ pt.sale_id and pt.sale_id.name or '-' ]]</para>
77 <para style="HeaderInfosValue">[[ pt.sale_id and pt.sale_id.client_order_ref and pt.sale_id.client_order_ref or '-' ]]</para>
78+ <para style="HeaderInfosValue">[[ pt.incoming_id.name or '-' ]]</para>
79 <para style="HeaderInfosValue">[[ pt.sale_id and getSel(pt.sale_id, 'categ') or '-' ]]</para>
80 <para style="HeaderInfosValue">[[ getNbItems(pt) ]]</para>
81 </td>
82
83=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
84--- bin/addons/msf_profile/i18n/fr_MF.po 2016-10-25 09:13:52 +0000
85+++ bin/addons/msf_profile/i18n/fr_MF.po 2016-10-28 12:28:13 +0000
86@@ -74617,6 +74617,7 @@
87 " Number of columns is not equal to %s"
88 msgstr "\n"
89 " Le nombre de colonnes n'est pas égal à %s"
90+<<<<<<< TREE
91
92 #. module: specific_rules
93 #: report:addons/specific_rules/report/report_stock_inventory_all_locations_xls.mako:143
94@@ -74689,3 +74690,10 @@
95 msgid "You can't search on this object without using at least one exact search term (precede your search with the character '=')."
96 msgstr "Vous ne pouvez pas exécuter de recherche sur cet objet sans utiliser au moins une recherche exacte (ajoutez le caractère = devant votre filtre)."
97
98+=======
99+
100+#. module: stock_override
101+#: field:stock.picking,incoming_id:0
102+msgid "Incoming ref"
103+msgstr "Ref. Réception"
104+>>>>>>> MERGE-SOURCE
105
106=== modified file 'bin/addons/stock_override/stock.py'
107--- bin/addons/stock_override/stock.py 2016-08-26 12:47:12 +0000
108+++ bin/addons/stock_override/stock.py 2016-10-28 12:28:13 +0000
109@@ -366,7 +366,8 @@
110 store={
111 'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['partner_id2'], 10),
112 }
113- )
114+ ),
115+ 'incoming_id': fields.many2one('stock.picking', string='Incoming ref', readonly=True),
116 }
117
118 _defaults = {'from_yml_test': lambda *a: False,
119
120=== modified file 'bin/addons/stock_override/stock_view.xml'
121--- bin/addons/stock_override/stock_view.xml 2016-08-03 12:08:12 +0000
122+++ bin/addons/stock_override/stock_view.xml 2016-10-28 12:28:13 +0000
123@@ -313,6 +313,7 @@
124 domain="[('internal_ok', '=', True)]"
125 attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}"/>
126 <field name="order_category"/>
127+ <field name="incoming_id" />
128 </group>
129 <group colspan="2" col="2">
130 <field name="date" attrs="{'readonly': [('state', 'not in', ['draft', 'auto', 'assigned', 'confirmed'])]}"/>

Subscribers

People subscribed via source and target branches

to all changes: