[Erp5-report] r32116 jerome - in /erp5/trunk/bt5/erp5_simplified_invoicing: ActionTemplateI...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Feb  1 11:10:36 2010
New Revision: 32116

URL: http://svn.erp5.org?rev=32116&view=rev
Log:
Make invoice view the default before confirmed state, because user is supposed to enter invoice lines first, and let accounting lines be generated from invoice lines

Modified:
    erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/confirmed_invoice_view.xml
    erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/invoice_view.xml
    erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/confirmed_invoice_view.xml
    erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/invoice_view.xml
    erp5/trunk/bt5/erp5_simplified_invoicing/bt/revision

Modified: erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/confirmed_invoice_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%2520Invoice%2520Transaction/confirmed_invoice_view.xml?rev=32116&r1=32115&r2=32116&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/confirmed_invoice_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/confirmed_invoice_view.xml [utf8] Mon Feb  1 11:10:36 2010
@@ -97,7 +97,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python: object.getSimulationState() == \'confirmed\'</string> </value>
+            <value> <string>python: object.getSimulationState() in (\'draft\', \'planned\', \'confirmed\')</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/invoice_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%2520Invoice%2520Transaction/invoice_view.xml?rev=32116&r1=32115&r2=32116&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/invoice_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/invoice_view.xml [utf8] Mon Feb  1 11:10:36 2010
@@ -97,7 +97,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python: object.getSimulationState() != \'confirmed\'</string> </value>
+            <value> <string>python: object.getSimulationState() not in (\'draft\', \'planned\', \'confirmed\')</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/confirmed_invoice_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%2520Invoice%2520Transaction/confirmed_invoice_view.xml?rev=32116&r1=32115&r2=32116&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/confirmed_invoice_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/confirmed_invoice_view.xml [utf8] Mon Feb  1 11:10:36 2010
@@ -97,7 +97,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python: object.getSimulationState() == \'confirmed\'</string> </value>
+            <value> <string>python: object.getSimulationState() in (\'draft\', \'planned\', \'confirmed\')</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/invoice_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%2520Invoice%2520Transaction/invoice_view.xml?rev=32116&r1=32115&r2=32116&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/invoice_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/invoice_view.xml [utf8] Mon Feb  1 11:10:36 2010
@@ -97,7 +97,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python: object.getSimulationState() != \'confirmed\'</string> </value>
+            <value> <string>python: object.getSimulationState() not in (\'draft\', \'planned\', \'confirmed\')</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_simplified_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_simplified_invoicing/bt/revision?rev=32116&r1=32115&r2=32116&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_simplified_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_simplified_invoicing/bt/revision [utf8] Mon Feb  1 11:10:36 2010
@@ -1,1 +1,1 @@
-47
+48