Unifield Server

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

  1. US-2411
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6527
Proposed branch: lp:~dorian-kemps/unifield-server/US-2411
Merge into: lp:unifield-server
Diff against target: 47 lines (+11/-1) (has conflicts)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+4/-0)
bin/addons/stock_override/report/delivery_order.rml (+7/-1)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-2411
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+447512@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/msf_profile/i18n/fr_MF.po'
2--- bin/addons/msf_profile/i18n/fr_MF.po 2023-07-13 11:47:42 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2023-07-24 08:28:06 +0000
4@@ -82424,7 +82424,11 @@
5 #: field:esc.invoice.line,state:0
6 #: field:esc.line.import,state:0
7 #: field:unidata.sync.log,state:0
8+<<<<<<< TREE
9 #: report:addons/msf_supply_doc_export/report/report_request_for_quotation_xls.mako:80
10+=======
11+#: report:delivery.order:0
12+>>>>>>> MERGE-SOURCE
13 #, python-format
14 msgid "State"
15 msgstr "Statut"
16
17=== modified file 'bin/addons/stock_override/report/delivery_order.rml'
18--- bin/addons/stock_override/report/delivery_order.rml 2023-02-27 16:02:34 +0000
19+++ bin/addons/stock_override/report/delivery_order.rml 2023-07-24 08:28:06 +0000
20@@ -186,7 +186,7 @@
21
22
23 <section>
24- <blockTable colWidths="20.0,100.0,120.0,50.0,65.0,45.0,35.0,60.0,70.0,60.0,65.0,65.0" style="LineHeader" repeatRows="1">
25+ <blockTable colWidths="20.0,100.0,100.0,50.0,65.0,45.0,30.0,50.0,70.0,55.0,65.0,65.0,40.0" style="LineHeader" repeatRows="1">
26 <tr>
27 <td>
28 <para style="LHeader">Line</para>
29@@ -224,6 +224,9 @@
30 <td>
31 <para style="LHeader">Destination Location</para>
32 </td>
33+ <td>
34+ <para style="LHeader">State</para>
35+ </td>
36 </tr>
37 <tr>
38 [[ repeatIn(picking.move_lines, 'line', 'tr') ]]
39@@ -264,6 +267,9 @@
40 <td>
41 <para style="Line">[[ line.location_dest_id.name ]]</para>
42 </td>
43+ <td>
44+ <para style="Line">[[ getSel(line, 'state') ]]</para>
45+ </td>
46 </tr>
47 </blockTable>
48

Subscribers

People subscribed via source and target branches