diff --git a/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml b/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml index 11d404b7337d2c31fa6c7f18572cb86c128f7678..e9f7782b31d1464ecd3c2f6dc53ccaf079ef1620 100644 --- a/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml +++ b/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoice_transaction_rule.xml @@ -39,10 +39,22 @@ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> + <item> + <key> <string>categories</string> </key> + <value> + <tuple/> + </value> + </item> <item> <key> <string>default_reference</string> </key> <value> <string>default_invoice_transaction_rule</string> </value> </item> + <item> + <key> <string>description</string> </key> + <value> + <none/> + </value> + </item> <item> <key> <string>id</string> </key> <value> <string>default_invoice_transaction_rule</string> </value> @@ -57,6 +69,16 @@ <key> <string>last_id</string> </key> <value> <string>15</string> </value> </item> + <item> + <key> <string>matching_property</string> </key> + <value> + <tuple> + <string>resource_list</string> + <string>source_list</string> + <string>destination_list</string> + </tuple> + </value> + </item> <item> <key> <string>portal_type</string> </key> <value> <string>Invoice Transaction Rule</string> </value> @@ -71,7 +93,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Invoice Transaction Rule</string> </value> + <value> <string>Default Invoice Transaction Rule</string> </value> </item> <item> <key> <string>version</string> </key> @@ -82,48 +104,21 @@ </record> <record id="2" aka="AAAAAAAAAAI="> <pickle> - <tuple> - <tuple> - <string>BTrees.Length</string> - <string>Length</string> - </tuple> - <none/> - </tuple> + <global name="Length" module="BTrees.Length"/> </pickle> <pickle> <int>0</int> </pickle> </record> <record id="3" aka="AAAAAAAAAAM="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> - <tuple> - <tuple> - <tuple> - <tuple> - <string>ERP5 Predicate Group</string> - <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> - </tuple> - </tuple> - </tuple> - </tuple> + <none/> </pickle> </record> <record id="4" aka="AAAAAAAAAAQ="> <pickle> - <tuple> - <tuple> - <string>BTrees.OOBTree</string> - <string>OOBTree</string> - </tuple> - <none/> - </tuple> + <global name="OOBTree" module="BTrees._OOBTree"/> </pickle> <pickle> <none/> @@ -148,13 +143,13 @@ <item> <key> <string>movement</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> </value> </item> <item> <key> <string>vat_per_region</string> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> </value> </item> </dictionary> @@ -164,35 +159,6 @@ </pickle> </record> <record id="6" aka="AAAAAAAAAAY="> - <pickle> - <tuple> - <tuple> - <string>BTrees.OIBTree</string> - <string>OIBTree</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <tuple> - <tuple> - <tuple> - <tuple> - <string>10</string> - <int>1</int> - <string>11</string> - <int>1</int> - <string>12</string> - <int>1</int> - <string>4</string> - <int>1</int> - </tuple> - </tuple> - </tuple> - </tuple> - </pickle> - </record> - <record id="7" aka="AAAAAAAAAAc="> <pickle> <tuple> <tuple> @@ -213,7 +179,7 @@ </dictionary> </pickle> </record> - <record id="8" aka="AAAAAAAAAAg="> + <record id="7" aka="AAAAAAAAAAc="> <pickle> <tuple> <tuple> @@ -232,13 +198,13 @@ <item> <key> <int>0</int> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> </value> </item> <item> <key> <int>1</int> </key> <value> - <persistent> <string encoding="base64">AAAAAAAAAAo=</string> </persistent> + <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent> </value> </item> </dictionary> @@ -247,7 +213,7 @@ </dictionary> </pickle> </record> - <record id="9" aka="AAAAAAAAAAk="> + <record id="8" aka="AAAAAAAAAAg="> <pickle> <tuple> <tuple> @@ -273,7 +239,7 @@ </dictionary> </pickle> </record> - <record id="10" aka="AAAAAAAAAAo="> + <record id="9" aka="AAAAAAAAAAk="> <pickle> <tuple> <tuple> diff --git a/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoicing_rule.xml b/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoicing_rule.xml index 739ec53c154b6e224faa30a89c7adc89eee233a0..3a4de450ab8a8dbc433d919bc6f4d65d494ac64f 100644 --- a/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoicing_rule.xml +++ b/bt5/erp5_invoicing/PathTemplateItem/portal_rules/default_invoicing_rule.xml @@ -30,7 +30,17 @@ <item> <key> <string>_range_criterion</string> </key> <value> - <dictionary/> + <dictionary> + <item> + <key> <string>start_date</string> </key> + <value> + <tuple> + <none/> + <none/> + </tuple> + </value> + </item> + </dictionary> </value> </item> <item> @@ -97,6 +107,16 @@ <key> <string>id</string> </key> <value> <string>default_invoicing_rule</string> </value> </item> + <item> + <key> <string>matching_property</string> </key> + <value> + <tuple> + <string>resource_list</string> + <string>variation_category_list</string> + <string>variation_property_dict</string> + </tuple> + </value> + </item> <item> <key> <string>portal_type</string> </key> <value> <string>Invoicing Rule</string> </value> @@ -111,7 +131,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Invoicing Rule</string> </value> + <value> <string>Default Invoicing Rule</string> </value> </item> <item> <key> <string>version</string> </key> diff --git a/bt5/erp5_invoicing/bt/change_log b/bt5/erp5_invoicing/bt/change_log index 616ef869721ddefb0702d160ddd9525576366a11..d7212429ff69b476bcc37d328e2bd0dd6dec84bd 100644 --- a/bt5/erp5_invoicing/bt/change_log +++ b/bt5/erp5_invoicing/bt/change_log @@ -1,3 +1,6 @@ +2009-12-16 yusei +* Set default matching properties to default invoicing rule and default invoice transaction rule for convenience. + 2009-12-15 yusei * Add default expandable properties to default invoicing rule. diff --git a/bt5/erp5_invoicing/bt/revision b/bt5/erp5_invoicing/bt/revision index cb28afbd3c61fe2dce75f1167ad47625fdec9b9e..75af06ed6776f1c1e133f3684b1a1f03c44ec429 100644 --- a/bt5/erp5_invoicing/bt/revision +++ b/bt5/erp5_invoicing/bt/revision @@ -1 +1 @@ -313 \ No newline at end of file +315 \ No newline at end of file