Merge lp:~unifield-team/unifield-server/us-475 into lp:unifield-server
- us-475
- Merge into trunk
Proposed by
jftempo
| Status: | Merged |
|---|---|
| Merged at revision: | 4031 |
| Proposed branch: | lp:~unifield-team/unifield-server/us-475 |
| Merge into: | lp:unifield-server |
| Diff against target: |
167 lines (+36/-22) (has conflicts) 4 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+10/-0) bin/addons/purchase_override/report/merged_order.rml (+8/-7) bin/addons/purchase_override/report/purchase_order.rml (+9/-7) bin/addons/purchase_override/report/rfq.rml (+9/-8) Text conflict in bin/addons/msf_profile/i18n/fr_MF.po |
| To merge this branch: | bzr merge lp:~unifield-team/unifield-server/us-475 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| UniField Reviewer Team | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
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 2016-10-25 09:13:52 +0000 | |||
| 3 | +++ bin/addons/msf_profile/i18n/fr_MF.po 2016-11-02 09:27:37 +0000 | |||
| 4 | @@ -74617,6 +74617,7 @@ | |||
| 5 | 74617 | " Number of columns is not equal to %s" | 74617 | " Number of columns is not equal to %s" |
| 6 | 74618 | msgstr "\n" | 74618 | msgstr "\n" |
| 7 | 74619 | " Le nombre de colonnes n'est pas égal à %s" | 74619 | " Le nombre de colonnes n'est pas égal à %s" |
| 8 | 74620 | <<<<<<< TREE | ||
| 9 | 74620 | 74621 | ||
| 10 | 74621 | #. module: specific_rules | 74622 | #. module: specific_rules |
| 11 | 74622 | #: report:addons/specific_rules/report/report_stock_inventory_all_locations_xls.mako:143 | 74623 | #: report:addons/specific_rules/report/report_stock_inventory_all_locations_xls.mako:143 |
| 12 | @@ -74689,3 +74690,12 @@ | |||
| 13 | 74689 | msgid "You can't search on this object without using at least one exact search term (precede your search with the character '=')." | 74690 | msgid "You can't search on this object without using at least one exact search term (precede your search with the character '=')." |
| 14 | 74690 | 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)." | 74691 | 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)." |
| 15 | 74691 | 74692 | ||
| 16 | 74693 | ======= | ||
| 17 | 74694 | |||
| 18 | 74695 | #. module: purchase_override | ||
| 19 | 74696 | #: report:msf.purchase.order:0 | ||
| 20 | 74697 | #: report:msf.purchase.quotation:0 | ||
| 21 | 74698 | #: report:purchase.order.merged:0 | ||
| 22 | 74699 | msgid "Print date:" | ||
| 23 | 74700 | msgstr "Date d'impression :" | ||
| 24 | 74701 | >>>>>>> MERGE-SOURCE | ||
| 25 | 74692 | 74702 | ||
| 26 | === modified file 'bin/addons/purchase_override/report/merged_order.rml' | |||
| 27 | --- bin/addons/purchase_override/report/merged_order.rml 2016-03-17 14:54:50 +0000 | |||
| 28 | +++ bin/addons/purchase_override/report/merged_order.rml 2016-11-02 09:27:37 +0000 | |||
| 29 | @@ -3,7 +3,7 @@ | |||
| 30 | 3 | 3 | ||
| 31 | 4 | <template pageSize="(842.0,595.0)" title="Purchase Order" author="Medecins Sans Frontieres" allowSplitting="20"> | 4 | <template pageSize="(842.0,595.0)" title="Purchase Order" author="Medecins Sans Frontieres" allowSplitting="20"> |
| 32 | 5 | <pageTemplate id="first"> | 5 | <pageTemplate id="first"> |
| 34 | 6 | <frame id="first" x1="30.0" y1="15.0" width="772" height="520" /> | 6 | <frame id="first" x1="30.0" y1="15.0" width="772" height="500" /> |
| 35 | 7 | 7 | ||
| 36 | 8 | <pageGraphics> | 8 | <pageGraphics> |
| 37 | 9 | <drawString x="35" y="560.0">PURCHASE ORDER ([[ getSel(objects[0], 'order_type') ]])</drawString> | 9 | <drawString x="35" y="560.0">PURCHASE ORDER ([[ getSel(objects[0], 'order_type') ]])</drawString> |
| 38 | @@ -12,10 +12,11 @@ | |||
| 39 | 12 | <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image> | 12 | <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image> |
| 40 | 13 | <setFont name="Helvetica" size="8"/> | 13 | <setFont name="Helvetica" size="8"/> |
| 41 | 14 | <fill color="black"/> | 14 | <fill color="black"/> |
| 43 | 15 | <drawString x="730" y="520.0">Page : <pageNumber /></drawString> | 15 | <drawString x="700" y="520.0">Page : <pageNumber /></drawString> |
| 44 | 16 | <!-- TODO: OEB-148 - Waiting integration on unifield-server --> | 16 | <!-- TODO: OEB-148 - Waiting integration on unifield-server --> |
| 47 | 17 | <!--<drawString x="765" y="520.0">/</drawString> | 17 | <drawString x="735" y="520.0">/</drawString> |
| 48 | 18 | <drawString x="770" y="520.0"><pageCount /> </drawString>--> | 18 | <drawString x="740" y="520.0"><pageCount /> </drawString> |
| 49 | 19 | <drawString x="700" y="510.0">Print date: [[ time.strftime('%d/%b/%Y') ]]</drawString> | ||
| 50 | 19 | </pageGraphics> | 20 | </pageGraphics> |
| 51 | 20 | 21 | ||
| 52 | 21 | </pageTemplate> | 22 | </pageTemplate> |
| 53 | @@ -74,7 +75,7 @@ | |||
| 54 | 74 | <paraStyle name="all" alignment="justify"/> | 75 | <paraStyle name="all" alignment="justify"/> |
| 55 | 75 | </initialize> | 76 | </initialize> |
| 56 | 76 | 77 | ||
| 58 | 77 | <paraStyle name="Standard" fontName="Helvetica" fontSize="8.0" /> | 78 | <paraStyle name="Standard" fontName="Helvetica" fontSize="7.0" /> |
| 59 | 78 | 79 | ||
| 60 | 79 | <!-- Header font style --> | 80 | <!-- Header font style --> |
| 61 | 80 | <paraStyle name="Header" fontName="Helvetica-Bold" fontSize="13.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0" /> | 81 | <paraStyle name="Header" fontName="Helvetica-Bold" fontSize="13.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0" /> |
| 62 | @@ -83,9 +84,9 @@ | |||
| 63 | 83 | <!-- Information font style --> | 84 | <!-- Information font style --> |
| 64 | 84 | <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="3.0" spaceBefore="1.0" spaceAfter="1.0" /> | 85 | <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="3.0" spaceBefore="1.0" spaceAfter="1.0" /> |
| 65 | 85 | <paraStyle name="TextInformationMail" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" /> | 86 | <paraStyle name="TextInformationMail" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" /> |
| 67 | 86 | <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="9.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" /> | 87 | <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" /> |
| 68 | 87 | <!-- Lines font style --> | 88 | <!-- Lines font style --> |
| 70 | 88 | <paraStyle name="Lines" fontName="Helvetica" fontSize="6.0" alignment="LEFT" leading="7.0" /> | 89 | <paraStyle name="Lines" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" /> |
| 71 | 89 | <paraStyle name="LinesBlue" textColor="blue" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" /> | 90 | <paraStyle name="LinesBlue" textColor="blue" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" /> |
| 72 | 90 | </stylesheet> | 91 | </stylesheet> |
| 73 | 91 | 92 | ||
| 74 | 92 | 93 | ||
| 75 | === modified file 'bin/addons/purchase_override/report/purchase_order.rml' | |||
| 76 | --- bin/addons/purchase_override/report/purchase_order.rml 2016-03-21 13:31:17 +0000 | |||
| 77 | +++ bin/addons/purchase_override/report/purchase_order.rml 2016-11-02 09:27:37 +0000 | |||
| 78 | @@ -3,19 +3,21 @@ | |||
| 79 | 3 | 3 | ||
| 80 | 4 | <template pageSize="(842.0,595.0)" title="Purchase Order" author="Medecins Sans Frontieres" allowSplitting="20"> | 4 | <template pageSize="(842.0,595.0)" title="Purchase Order" author="Medecins Sans Frontieres" allowSplitting="20"> |
| 81 | 5 | <pageTemplate id="first"> | 5 | <pageTemplate id="first"> |
| 83 | 6 | <frame id="first" x1="30.0" y1="15.0" width="772" height="520" /> | 6 | <frame id="first" x1="30.0" y1="15.0" width="772" height="500" /> |
| 84 | 7 | 7 | ||
| 85 | 8 | <pageGraphics> | 8 | <pageGraphics> |
| 86 | 9 | <drawString x="35" y="560.0">PURCHASE ORDER ([[ getSel(objects[0], 'order_type') ]])</drawString> | 9 | <drawString x="35" y="560.0">PURCHASE ORDER ([[ getSel(objects[0], 'order_type') ]])</drawString> |
| 87 | 10 | <fill color="blue"/> | 10 | <fill color="blue"/> |
| 88 | 11 | <drawString x="35" y="548.0">[[ '%s %s %s' % (getSel(objects[0], 'order_type'), objects[0].name, getSel(objects[0], 'state')) ]]</drawString> | 11 | <drawString x="35" y="548.0">[[ '%s %s %s' % (getSel(objects[0], 'order_type'), objects[0].name, getSel(objects[0], 'state')) ]]</drawString> |
| 89 | 12 | <drawString x="700" y="548.0">[[ time.strftime('%Y-%m-%d') ]]</drawString> | ||
| 90 | 12 | <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image> | 13 | <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image> |
| 91 | 13 | <setFont name="Helvetica" size="8"/> | 14 | <setFont name="Helvetica" size="8"/> |
| 92 | 14 | <fill color="black"/> | 15 | <fill color="black"/> |
| 94 | 15 | <drawString x="730" y="520.0">Page : <pageNumber /></drawString> | 16 | <drawString x="700" y="520.0">Page : <pageNumber /></drawString> |
| 95 | 16 | <!-- TODO: OEB-148 - Waiting integration on unifield-server --> | 17 | <!-- TODO: OEB-148 - Waiting integration on unifield-server --> |
| 98 | 17 | <!-- <drawString x="765" y="520.0">/</drawString> | 18 | <drawString x="735" y="520.0">/</drawString> |
| 99 | 18 | <drawString x="770" y="520.0"><pageCount /> </drawString>--> | 19 | <drawString x="740" y="520.0"><pageCount /> </drawString> |
| 100 | 20 | <drawString x="700" y="510.0">Print date: [[ time.strftime('%d/%b/%Y') ]]</drawString> | ||
| 101 | 19 | </pageGraphics> | 21 | </pageGraphics> |
| 102 | 20 | 22 | ||
| 103 | 21 | </pageTemplate> | 23 | </pageTemplate> |
| 104 | @@ -74,7 +76,7 @@ | |||
| 105 | 74 | <paraStyle name="all" alignment="justify"/> | 76 | <paraStyle name="all" alignment="justify"/> |
| 106 | 75 | </initialize> | 77 | </initialize> |
| 107 | 76 | 78 | ||
| 109 | 77 | <paraStyle name="Standard" fontName="Helvetica" fontSize="8.0" /> | 79 | <paraStyle name="Standard" fontName="Helvetica" fontSize="7.0" /> |
| 110 | 78 | 80 | ||
| 111 | 79 | <!-- Header font style --> | 81 | <!-- Header font style --> |
| 112 | 80 | <paraStyle name="Header" fontName="Helvetica-Bold" fontSize="13.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0" /> | 82 | <paraStyle name="Header" fontName="Helvetica-Bold" fontSize="13.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0" /> |
| 113 | @@ -83,9 +85,9 @@ | |||
| 114 | 83 | <!-- Information font style --> | 85 | <!-- Information font style --> |
| 115 | 84 | <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="3.0" spaceBefore="1.0" spaceAfter="1.0" /> | 86 | <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="3.0" spaceBefore="1.0" spaceAfter="1.0" /> |
| 116 | 85 | <paraStyle name="TextInformationMail" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" /> | 87 | <paraStyle name="TextInformationMail" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" /> |
| 118 | 86 | <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="9.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" /> | 88 | <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" /> |
| 119 | 87 | <!-- Lines font style --> | 89 | <!-- Lines font style --> |
| 121 | 88 | <paraStyle name="Lines" fontName="Helvetica" fontSize="6.0" alignment="LEFT" leading="7.0" /> | 90 | <paraStyle name="Lines" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" /> |
| 122 | 89 | <paraStyle name="LinesBlue" textColor="blue" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" /> | 91 | <paraStyle name="LinesBlue" textColor="blue" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" /> |
| 123 | 90 | </stylesheet> | 92 | </stylesheet> |
| 124 | 91 | 93 | ||
| 125 | 92 | 94 | ||
| 126 | === modified file 'bin/addons/purchase_override/report/rfq.rml' | |||
| 127 | --- bin/addons/purchase_override/report/rfq.rml 2014-03-07 16:46:48 +0000 | |||
| 128 | +++ bin/addons/purchase_override/report/rfq.rml 2016-11-02 09:27:37 +0000 | |||
| 129 | @@ -3,7 +3,7 @@ | |||
| 130 | 3 | 3 | ||
| 131 | 4 | <template pageSize="(842.0,595.0)" title="Purchase Order" author="Medecins Sans Frontieres" allowSplitting="20"> | 4 | <template pageSize="(842.0,595.0)" title="Purchase Order" author="Medecins Sans Frontieres" allowSplitting="20"> |
| 132 | 5 | <pageTemplate id="first"> | 5 | <pageTemplate id="first"> |
| 134 | 6 | <frame id="first" x1="30.0" y1="0.0" width="772" height="520" /> | 6 | <frame id="first" x1="30.0" y1="0.0" width="772" height="500" /> |
| 135 | 7 | 7 | ||
| 136 | 8 | <pageGraphics> | 8 | <pageGraphics> |
| 137 | 9 | <drawString x="35" y="560.0">REQUEST FOR QUOTATION ([[ getSel(objects[0], 'order_type') ]])</drawString> | 9 | <drawString x="35" y="560.0">REQUEST FOR QUOTATION ([[ getSel(objects[0], 'order_type') ]])</drawString> |
| 138 | @@ -12,10 +12,11 @@ | |||
| 139 | 12 | <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image> | 12 | <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image> |
| 140 | 13 | <setFont name="Helvetica" size="8"/> | 13 | <setFont name="Helvetica" size="8"/> |
| 141 | 14 | <fill color="black"/> | 14 | <fill color="black"/> |
| 143 | 15 | <drawString x="730" y="520.0">Page : <pageNumber /></drawString> | 15 | <drawString x="700" y="520.0">Page : <pageNumber /></drawString> |
| 144 | 16 | <!-- TODO: OEB-148 - Waiting integration on unifield-server --> | 16 | <!-- TODO: OEB-148 - Waiting integration on unifield-server --> |
| 147 | 17 | <!-- <drawString x="765" y="520.0">/</drawString> | 17 | <drawString x="735" y="520.0">/</drawString> |
| 148 | 18 | <drawString x="770" y="520.0"><pageCount /> </drawString>--> | 18 | <drawString x="740" y="520.0"><pageCount /> </drawString> |
| 149 | 19 | <drawString x="700" y="510.0">Print date: [[ time.strftime('%d/%b/%Y') ]]</drawString> | ||
| 150 | 19 | </pageGraphics> | 20 | </pageGraphics> |
| 151 | 20 | 21 | ||
| 152 | 21 | </pageTemplate> | 22 | </pageTemplate> |
| 153 | @@ -77,11 +78,11 @@ | |||
| 154 | 77 | <paraStyle name="Header_9" fontName="Helvetica-Bold" fontSize="8.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0" /> | 78 | <paraStyle name="Header_9" fontName="Helvetica-Bold" fontSize="8.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="3.0" /> |
| 155 | 78 | <paraStyle name="HeaderBlue" textColor="blue" fontName="Helvetica-Bold" fontSize="13.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="35.0" /> | 79 | <paraStyle name="HeaderBlue" textColor="blue" fontName="Helvetica-Bold" fontSize="13.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="35.0" /> |
| 156 | 79 | <!-- Information font style --> | 80 | <!-- Information font style --> |
| 160 | 80 | <paraStyle name="TextInformation" fontName="Helvetica" fontSize="9.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" /> | 81 | <paraStyle name="TextInformation" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" /> |
| 161 | 81 | <paraStyle name="TextInformationOrigin" fontName="Helvetica" fontSize="8.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" /> | 82 | <paraStyle name="TextInformationOrigin" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" spaceBefore="1.0" spaceAfter="1.0" /> |
| 162 | 82 | <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="9.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" /> | 83 | <paraStyle name="TextRemarks" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="15.0" spaceBefore="1.0" spaceAfter="1.0" /> |
| 163 | 83 | <!-- Lines font style --> | 84 | <!-- Lines font style --> |
| 165 | 84 | <paraStyle name="Lines" fontName="Helvetica" fontSize="6.0" alignment="LEFT" leading="7.0" /> | 85 | <paraStyle name="Lines" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" /> |
| 166 | 85 | <paraStyle name="LinesBlue" textColor="blue" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" /> | 86 | <paraStyle name="LinesBlue" textColor="blue" fontName="Helvetica" fontSize="7.0" alignment="LEFT" leading="7.0" /> |
| 167 | 86 | </stylesheet> | 87 | </stylesheet> |
| 168 | 87 | 88 | ||
