[Collective-checkins] r46461 - in corenetoinvoices/trunk: adapters content skins/corenetoinvoices

[lzdych <svn...@pl...>]

Author: lzdych
Date: Tue Jul 31 17:16:37 2007
New Revision: 46461

Modified:
   corenetoinvoices/trunk/adapters/oinvoiceissuer.py
   corenetoinvoices/trunk/content/outinvoice.py
   corenetoinvoices/trunk/skins/corenetoinvoices/coutinvoice_view.pt
Log:
- removed createdBy also from automatic invoicing procedure
- fields with totals of invoice made hidden in the edit form


Modified: corenetoinvoices/trunk/adapters/oinvoiceissuer.py
==============================================================================
--- corenetoinvoices/trunk/adapters/oinvoiceissuer.py	(original)
+++ corenetoinvoices/trunk/adapters/oinvoiceissuer.py	Tue Jul 31 17:16:37 2007
@@ -116,9 +116,6 @@
             fields['creationDate'] = now
             fields['taxDate'] = fields['creationDate']
             fields['dueDate'] = fields['creationDate'] + (client.getMaturity() or 10)
-            member = mtool.getAuthenticatedMember()
-            if member:
-                fields['createdBy'] = member.getId()
             fields['prePayments'] = 0
             fields['currency'] = template.getDefaultCurrency()
             # not set fields['cancelled'] = None

Modified: corenetoinvoices/trunk/content/outinvoice.py
==============================================================================
--- corenetoinvoices/trunk/content/outinvoice.py	(original)
+++ corenetoinvoices/trunk/content/outinvoice.py	Tue Jul 31 17:16:37 2007
@@ -470,7 +470,8 @@
                                     description_msgid = "help_outinvoice_totalAmount",
                                     label = "Total amount",
                                     label_msgid = "label_outinvoice_totalAmount",
-                                    i18n_domain = "corenetoinvoices"),
+                                    i18n_domain = "corenetoinvoices",
+                                    visible = {'edit':'hidden', 'view':'visible'}),
                 ),
         atapi.FloatField('totalTax',
                             required=False,
@@ -481,7 +482,8 @@
                                     description_msgid = "help_outinvoice_totalTax",
                                     label = "Total tax",
                                     label_msgid = "label_outinvoice_totalTax",
-                                    i18n_domain = "corenetoinvoices"),
+                                    i18n_domain = "corenetoinvoices",
+                                    visible = {'edit':'hidden', 'view':'visible'}),
                 ),
         atapi.StringField('currency',
                             required=True,

Modified: corenetoinvoices/trunk/skins/corenetoinvoices/coutinvoice_view.pt
==============================================================================
--- corenetoinvoices/trunk/skins/corenetoinvoices/coutinvoice_view.pt	(original)
+++ corenetoinvoices/trunk/skins/corenetoinvoices/coutinvoice_view.pt	Tue Jul 31 17:16:37 2007
@@ -504,7 +504,11 @@
                         </th>
                     
                         <td>
-                            <metal:widget use-macro="python:context.widget('createdBy')" />
+                            <tal:block tal:define="author context/Creator;
+								info python:mtool.getMemberInfo(author)"
+								tal:condition="info">
+								<tal:block tal:content="info/fullname|author" />
+							</tal:block>
                         </td>
                     </tr>