Skip to content

erp5
erp5
Commit b6faeaec authored by Jean-Paul Smets's avatar Jean-Paul Smets
Browse files
Options

*** empty log message *** 


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@299 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5d10854e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 231 additions and 34 deletions
product/Coramy/skins/coramy_trade/purchase_packing_list_view.form
View file @ b6faeaec
...@@ -500,17 +500,17 @@ ...@@ -500,17 +500,17 @@
<field><id>listbox</id> <type>ListBox</type> <field><id>listbox</id> <type>ListBox</type>
<values> <values>
<all_columns type="list">[('resource_title', 'Produit'), ('variation_text', 'Variantes'), ('quantity', 'Objectif quantit\xe9'), ('target_quantity', 'Quantit\xe9'), ('quantity_unit', 'Unit\xe9'), ('price', 'Prix'), ('item_id_list', 'Lots associ\xe9s')]</all_columns> <all_columns type="list">[('resource_title', 'Produit'), ('variation_text', 'Variantes'), ('quantity', 'Objectif quantit\xe9'), ('target_quantity', 'Quantit\xe9'), ('item_id_list', 'Lots associ\xe9s'), ('quantity_unit', 'Unit\xe9')]</all_columns>
<all_editable_columns type="list">[]</all_editable_columns> <all_editable_columns type="list">[]</all_editable_columns>
<alternate_name></alternate_name> <alternate_name></alternate_name>
<columns type="list">[('resource_title', 'Produit'), ('variation_text', 'Variantes'), ('getPurchaseDeliveryCellSourceReference', 'R\xe9f. fournisseur'), ('quantity', 'Objectif quantit\xe9'), ('target_quantity', 'Quantit\xe9'), ('quantity_unit', 'Unit\xe9'), ('price', 'Prix'), ('item_id_list', 'Lots associ\xe9s')]</columns> <columns type="list">[('resource_title', 'Produit'), ('variation_text', 'Variantes'), ('getPurchaseDeliveryCellSourceReference', 'R\xe9f. fournisseur'), ('quantity', 'Objectif quantit\xe9'), ('target_quantity', 'Quantit\xe9'), ('item_id_list', 'Lots associ\xe9s'), ('quantity_unit', 'Unit\xe9')]</columns>
<css_class></css_class> <css_class></css_class>
<default></default> <default></default>
<default_params type="list">[]</default_params> <default_params type="list">[]</default_params>
<description></description> <description></description>
<domain_root_list type="list">[]</domain_root_list> <domain_root_list type="list">[]</domain_root_list>
<domain_tree type="int">0</domain_tree> <domain_tree type="int">0</domain_tree>
<editable_columns type="list">[('target_quantity', 'target_quantity'), ('price', 'price'), ('item_id_list', 'item_id_list'), ('quantity_unit', 'quantity_unit')]</editable_columns> <editable_columns type="list">[('target_quantity', 'target_quantity'), ('item_id_list', 'item_id_list')]</editable_columns>
<external_validator></external_validator> <external_validator></external_validator>
<global_attributes type="list">[]</global_attributes> <global_attributes type="list">[]</global_attributes>
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
...@@ -522,7 +522,7 @@ ...@@ -522,7 +522,7 @@
<report_root_list type="list">[]</report_root_list> <report_root_list type="list">[]</report_root_list>
<report_tree type="int">0</report_tree> <report_tree type="int">0</report_tree>
<search type="int">0</search> <search type="int">0</search>
<search_columns></search_columns> <search_columns type="list">[]</search_columns>
<select type="int">0</select> <select type="int">0</select>
<selection_name>delivery_cells_selection</selection_name> <selection_name>delivery_cells_selection</selection_name>
<sort type="list">[('variation_text', 'variation_text')]</sort> <sort type="list">[('variation_text', 'variation_text')]</sort>
...@@ -556,7 +556,7 @@ ...@@ -556,7 +556,7 @@
<max_lines></max_lines> <max_lines></max_lines>
<required type="int">0</required> <required type="int">0</required>
<title>Pices en stock</title> <title>Pices en stock</title>
<width type="int">20</width> <width type="int">8</width>
</values> </values>
<tales> <tales>
</tales> </tales>
......
product/Coramy/skins/coramy_trade/sales_invoice_list_view.form
View file @ b6faeaec
...@@ -26,7 +26,31 @@ ...@@ -26,7 +26,31 @@
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<max_length></max_length> <max_length></max_length>
<required type="int">1</required> <required type="int">1</required>
<title>Commande</title> <title>Id</title>
<truncate type="int">0</truncate>
</values>
<tales>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
<message name="required_not_found">Input is required but no input given.</message>
<message name="too_long">Too much input was given.</message>
</messages>
</field>
<field><id>my_reference</id> <type>StringField</type>
<values>
<alternate_name></alternate_name>
<css_class></css_class>
<default></default>
<description></description>
<display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width>
<external_validator></external_validator>
<extra></extra>
<hidden type="int">0</hidden>
<max_length></max_length>
<required type="int">0</required>
<title>Numro de facture</title>
<truncate type="int">0</truncate> <truncate type="int">0</truncate>
</values> </values>
<tales> <tales>
...@@ -124,6 +148,52 @@ ...@@ -124,6 +148,52 @@
<message name="too_long">You entered too many characters.</message> <message name="too_long">You entered too many characters.</message>
</messages> </messages>
</field> </field>
<field><id>my_value_added_tax_ratio</id> <type>FloatField</type>
<values>
<alternate_name></alternate_name>
<css_class></css_class>
<default></default>
<description></description>
<display_maxwidth></display_maxwidth>
<display_width type="int">20</display_width>
<external_validator></external_validator>
<extra></extra>
<hidden type="int">0</hidden>
<required type="int">1</required>
<title>Taux de TVA</title>
</values>
<tales>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
<message name="required_not_found">Input is required but no input given.</message>
<message name="not_float">You did not enter a floating point number.</message>
</messages>
</field>
<field><id>my_value_added_tax_recoverable</id> <type>ListField</type>
<values>
<alternate_name></alternate_name>
<css_class></css_class>
<default></default>
<description></description>
<external_validator></external_validator>
<extra></extra>
<first_item type="int">0</first_item>
<hidden type="int">0</hidden>
<items type="list">[('Non', '0'), ('Oui', '1')]</items>
<required type="int">0</required>
<size type="int">1</size>
<title>Soumis la TVA</title>
</values>
<tales>
<default>python:str(here.getValueAddedTaxRecoverable())</default>
</tales>
<messages>
<message name="external_validator_failed">The input failed the external validator.</message>
<message name="required_not_found">Input is required but no input given.</message>
<message name="unknown_selection">You selected an item that was not in the list.</message>
</messages>
</field>
</fields> </fields>
</group> </group>
<group> <group>
......
product/Coramy/skins/coramy_trade/sales_packing_list_print.pt
View file @ b6faeaec
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
<TABLE border="0" width="660" height="900" cellpadding="0" cellspacing="0" <TABLE border="0" width="660" height="900" cellpadding="0" cellspacing="0"
tal:define="order python:delivery.getCausalityValue(portal_type=['Sales Order']); tal:define="order python:delivery.getCausalityValue(portal_type=['Sales Order']);
destination python:delivery.getDestinationValue(portal_type=['Organisation']); destination python:delivery.getDestinationValue(portal_type=['Organisation']);
delivery_line_list python:delivery.contentValues(filter={'portal_type': delivery_line_list python:filter(lambda line_item: line_item.getTargetTotalQuantity() > 0, delivery.contentValues(filter={'portal_type':
'Sales Packing List Line'}); 'Sales Packing List Line'}));
totalizer python:[0,0,0]"><!-- Tableau general --> totalizer python:[0,0,0]"><!-- Tableau general -->
<TR> <TR>
<TD> <TD>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
Lieferschein Nr / Delivery note N Lieferschein Nr / Delivery note N
</TD> </TD>
<TD align="right"> <TD align="right">
<span tal:content="python:'Gravelines, le '+str(delivery.getStartDate())"/> <span tal:content="python:'Gravelines, le '+str(delivery.DateTime_getFormattedDate())"/>
</TD> </TD>
</TR> </TR>
</TABLE> </TABLE>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<TD nowrap align="center" class="Bordereau">Nombre de colis<br>Kolli Anzahl / Nb of parcels <br><span class="Normal" tal:content="python:len(delivery.contentValues(filter={'portal_type':'Container'}))" /></TD> <TD nowrap align="center" class="Bordereau">Nombre de colis<br>Kolli Anzahl / Nb of parcels <br><span class="Normal" tal:content="python:len(delivery.contentValues(filter={'portal_type':'Container'}))" /></TD>
</TR> </TR>
<TR> <TR>
<TD nowrap align="center" class="Bordereau"> Date d'expdition<br>Versand Tag / Sending Date <br><span class="Normal" tal:content="python:str(delivery.getStartDate())" /></TD> <TD nowrap align="center" class="Bordereau"> Date d'expdition<br>Versand Tag / Sending Date <br><span class="Normal" tal:content="python:str(here.DateTime_getFormattedDate(delivery.getTargetStartDate()))" /></TD>
<TD nowrap align="center" class="Bordereau" >Nombre d'articles<br>Artikel Anzahl / Nb of items<br><span class="Normal" tal:content="python:delivery.getTargetTotalQuantity()" /></TD> <TD nowrap align="center" class="Bordereau" >Nombre d'articles<br>Artikel Anzahl / Nb of items<br><span class="Normal" tal:content="python:delivery.getTargetTotalQuantity()" /></TD>
<TD nowrap align="center" class="Bordereau" >Transporteur <br> Carrier / Spediteur<br><span class="Normal" tal:content="python:delivery.getDeliveryMode()" /></TD> <TD nowrap align="center" class="Bordereau" >Transporteur <br> Carrier / Spediteur<br><span class="Normal" tal:content="python:delivery.getDeliveryMode()" /></TD>
</TR> </TR>
...@@ -72,7 +72,8 @@ ...@@ -72,7 +72,8 @@
tal:define="correspondance_tailles python:delivery_line.getResourceValue().getSpecialiseValue(portal_type=['Correspondance Tailles']); tal:define="correspondance_tailles python:delivery_line.getResourceValue().getSpecialiseValue(portal_type=['Correspondance Tailles']);
coloris_list python:delivery_line.Variated_getColorisList(); coloris_list python:delivery_line.Variated_getColorisList();
taille_qty python:len(delivery_line.Variated_getTailleList(correspondance_tailles)[0]); taille_qty python:len(delivery_line.Variated_getTailleList(correspondance_tailles)[0]);
morphologie_list python:delivery_line.getMorphologieList() morphologie_list python:delivery_line.getMorphologieList();
toto python:delivery_line.PT_reset_total_list(totalizer,[1])
"> ">
<TR> <TR>
<TD align="center">Dnomination des produits</TD> <TD align="center">Dnomination des produits</TD>
...@@ -91,6 +92,7 @@ ...@@ -91,6 +92,7 @@
<TD> <TD>
<SPAN tal:condition="python:delivery_line.getResourceValue().getPortalType()=='Modele'" width="30%" tal:content="python:delivery_line.getResourceValue().getComposition()"/> <SPAN tal:condition="python:delivery_line.getResourceValue().getPortalType()=='Modele'" width="30%" tal:content="python:delivery_line.getResourceValue().getComposition()"/>
<SPAN tal:condition="python:delivery_line.getResourceValue().getPortalType()=='Assortiment'" width="30%" tal:content="python:delivery_line.getResourceValue().getDescription()"/>
</TD> </TD>
</TR> </TR>
...@@ -114,6 +116,8 @@ ...@@ -114,6 +116,8 @@
<TD align = right tal:content="python: '%.0f' %target_quantity"/> <TD align = right tal:content="python: '%.0f' %target_quantity"/>
<SPAN tal:define="toto python:delivery_line.PT_update_total_list(totalizer,[0,1,2],target_quantity)"/> <SPAN tal:define="toto python:delivery_line.PT_update_total_list(totalizer,[0,1,2],target_quantity)"/>
</SPAN> </SPAN>
<SPAN tal:condition="python:taille_qty==0"
tal:define="toto python:delivery_line.PT_update_total_list(totalizer,[0,1,2],delivery_line.getTargetQuantity())"/>
<TD align="right" tal:content="python: '%.0f' %totalizer[2]"/> <TD align="right" tal:content="python: '%.0f' %totalizer[2]"/>
</TR> </TR>
</SPAN> </SPAN>
...@@ -139,6 +143,7 @@ ...@@ -139,6 +143,7 @@
<TD> <TD>
<SPAN tal:condition="python:delivery_line.getResourceValue().getPortalType()=='Modele'" width="30%" tal:content="python:delivery_line.getResourceValue().getComposition()"/> <SPAN tal:condition="python:delivery_line.getResourceValue().getPortalType()=='Modele'" width="30%" tal:content="python:delivery_line.getResourceValue().getComposition()"/>
<SPAN tal:condition="python:delivery_line.getResourceValue().getPortalType()=='Assortiment'" width="30%" tal:content="python:delivery_line.getResourceValue().getDescription()"/>
</TD> </TD>
</TR> </TR>
...@@ -178,7 +183,13 @@ ...@@ -178,7 +183,13 @@
<TD height="40%"/> <TD height="40%"/>
</TR> </TR>
<TR> <TR>
<TD align="center">Coramy - 5 bis, rue Denis Cordonnier - 59820 Gravelines (FRANCE)<br>Tl. : + 33 (0) 3 28 51 91 51 - Fax : + 33 (0) 3 28 23 34 96 <TD tal:condition="python:delivery.getSourceSectionTitle()=='BLS'" align="center">BLS - 5 bis, rue Denis Cordonnier - 59820 Gravelines (FRANCE)<br>Tl. : + 33 (0) 3 28 51 86 26 - Fax : + 33 (0) 3 28 23 34 96
<p class="Copy">S.A.R.L. au capital de 10.000 - T.V.A. FR 51 442 959 243 - R.C. Dunkerque 442 959 243 - SIRET 442 959 243 00019</p>
</TD>
<TD tal:condition="python:delivery.getSourceSectionTitle()=='Houvenaegel'" align="center">Houvenaegel Cration - 5 bis, rue Denis Cordonnier - 59820 Gravelines (FRANCE)<br>Tl. : + 33 (0) 3 28 51 91 55 - Fax : + 33 (0) 3 28 23 34 96
<p class="Copy">S.A.R.L. au capital de 7.622,45 - T.V.A. FR 07 422 769 810 - R.C. Dunkerque 422 769 810 - SIRET 422 769 810 00025</p>
</TD>
<TD tal:condition="python:delivery.getSourceSectionTitle()=='Coramy'" align="center">Coramy - 5 bis, rue Denis Cordonnier - 59820 Gravelines (FRANCE)<br>Tl. : + 33 (0) 3 28 51 91 51 - Fax : + 33 (0) 3 28 23 34 96
<p class="Copy">S.A.S. au capital de 435.200 - T.V.A. FR 67 611 750 274 - R.C. Dunkerque 611 750 274 - SIRET 611 750 274 00023 - CNUF 15971</p> <p class="Copy">S.A.S. au capital de 435.200 - T.V.A. FR 67 611 750 274 - R.C. Dunkerque 611 750 274 - SIRET 611 750 274 00023 - CNUF 15971</p>
</TD> </TD>
</TR> </TR>
......
product/Coramy/skins/coramy_trade/sales_packing_list_secure_print.py
View file @ b6faeaec
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
##bind namespace= ##bind namespace=
##bind script=script ##bind script=script
##bind subpath=traverse_subpath ##bind subpath=traverse_subpath
##parameters=form_id='' ##parameters=form_id='', packing_list_page_template
##title= ##title=
## ##
packing_list = context packing_list = context
...@@ -13,7 +13,7 @@ request = context.REQUEST ...@@ -13,7 +13,7 @@ request = context.REQUEST
packing_list.flushActivity(invoke=1) packing_list.flushActivity(invoke=1)
redirect_url = '%s/%s?%s' % ( context.absolute_url() redirect_url = '%s/%s?%s' % ( context.absolute_url()
, 'sales_packing_list_print' , packing_list_page_template
, 'portal_status_message=Mise+a+jour+en+cours.' , 'portal_status_message=Impression+en+cours.'
) )
request[ 'RESPONSE' ].redirect( redirect_url ) request[ 'RESPONSE' ].redirect( redirect_url )
product/Coramy/skins/coramy_trade/sales_packing_list_view.form
View file @ b6faeaec
...@@ -461,7 +461,7 @@ ...@@ -461,7 +461,7 @@
<hidden type="int">0</hidden> <hidden type="int">0</hidden>
<lines type="int">20</lines> <lines type="int">20</lines>
<list_action>folder_contents</list_action> <list_action>folder_contents</list_action>
<list_method type="method">Delivery_zGetCellList</list_method> <list_method type="method">Delivery_zGetNeededCellList</list_method>
<meta_types type="list">[]</meta_types> <meta_types type="list">[]</meta_types>
<portal_types type="list">[]</portal_types> <portal_types type="list">[]</portal_types>
<report_root_list type="list">[]</report_root_list> <report_root_list type="list">[]</report_root_list>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7