|
55 | 55 | <filter string="Invoice" domain="['|', ('type','=','out_invoice'),('type','=','in_invoice')]"/> |
56 | 56 | <filter string="Refund" domain="['|', ('type','=','out_refund'),('type','=','in_refund')]"/> |
57 | 57 | <separator/> |
58 | | - <filter string="With AFIP Document" name="with_afip_document" domain="[('journal_id.use_documents', '=', True)]"/> |
| 58 | + <filter string="With AFIP Document" name="with_afip_document" domain="[('journal_id.use_documents', '=', True), ('journal_id.localization', '=', 'argentina')]"/> |
59 | 59 | <separator/> |
60 | 60 | <field name="name_template"/> |
61 | 61 | <filter string="Draft" |
|
69 | 69 | <separator/> |
70 | 70 | <filter string="Last month" |
71 | 71 | name="last_month" |
72 | | - domain="[('date_invoice', '>=', (context_today()-relativedelta(months=1)).strftime('%Y-%m-01')), ('date_invoice', '<', (context_today()).strftime('%Y-%m-01'))]"/> |
| 72 | + help="Last month (by accounting date)" |
| 73 | + domain="[('date', '>=', (context_today()-relativedelta(months=1)).strftime('%Y-%m-01')), ('date', '<', (context_today()).strftime('%Y-%m-01'))]"/> |
73 | 74 | <filter string="This month" |
74 | 75 | name="this_month" |
75 | | - domain="[('date_invoice', '>=', context_today().strftime('%Y-%m-01')), ('date_invoice', '<', (context_today()+relativedelta(months=1)).strftime('%Y-%m-01'))]"/> |
| 76 | + help="This month (by accounting date)" |
| 77 | + domain="[('date', '>=', context_today().strftime('%Y-%m-01')), ('date', '<', (context_today()+relativedelta(months=1)).strftime('%Y-%m-01'))]"/> |
76 | 78 | <separator/> |
77 | 79 | <filter string="Last year" |
78 | 80 | name="last_year" |
79 | | - domain="[('date_invoice', '>=', (context_today()-relativedelta(years=1)).strftime('%Y-01-01')), ('date_invoice', '<', (context_today()).strftime('%Y-01-01'))]"/> |
| 81 | + help="Last year (by accounting date)" |
| 82 | + domain="[('date', '>=', (context_today()-relativedelta(years=1)).strftime('%Y-01-01')), ('date', '<', (context_today()).strftime('%Y-01-01'))]"/> |
80 | 83 | <filter string="This year" |
81 | 84 | name="this_year" |
82 | | - domain="[('date_invoice', '>=', context_today().strftime('%Y-01-01')), ('date_invoice', '<', (context_today()+relativedelta(years=1)).strftime('%Y-01-01'))]"/> |
| 85 | + help="This year (by accounting date)" |
| 86 | + domain="[('date', '>=', context_today().strftime('%Y-01-01')), ('date', '<', (context_today()+relativedelta(years=1)).strftime('%Y-01-01'))]"/> |
83 | 87 |
|
84 | 88 | <field name="date_invoice_from" filter_domain="[('date_invoice','>=',self)]"/> |
85 | 89 | <field name="date_invoice_to" filter_domain="[('date_invoice','<=',self)]"/> |
|
89 | 93 | <!-- <field name="period_id" /> --> |
90 | 94 | <!-- <field name="fiscalyear_id" /> --> |
91 | 95 | <field name="product_id"/> |
| 96 | + <field name="account_id"/> |
92 | 97 | <field name="document_type_id"/> |
93 | 98 | <field name="product_category_id" filter_domain="[('product_category_id', 'child_of', self)]"/> |
94 | 99 | <field name="partner_id"/> |
95 | 100 | <!-- <field name="partner_category_ids"/> --> |
96 | 101 | <group expand="1" string="Group By..."> |
97 | | - <filter string="Use" name="partner" context="{'group_by':'partner_id'}"/> |
98 | | - <filter string="Partner" name="partner" context="{'group_by':'partner_id'}"/> |
99 | | - <filter string="Currency" name="currency" context="{'group_by':'currency_id'}"/> |
100 | | - <filter string="Salesman" name='user' context="{'group_by':'user_id'}"/> |
101 | | - <filter string="AFIP Activity" name='afip_activity_id' context="{'group_by':'afip_activity_id'}"/> |
| 102 | + <filter string="Use" name="group_by_partner" context="{'group_by':'partner_id'}"/> |
| 103 | + <filter string="Partner" name="group_by_partner" context="{'group_by':'partner_id'}"/> |
| 104 | + <filter string="Currency" name="group_by_currency" context="{'group_by':'currency_id'}"/> |
| 105 | + <filter string="Salesman" name="group_by_user" context="{'group_by':'user_id'}"/> |
102 | 106 | <!-- <filter string="Period" name='period_id' context="{'group_by':'period_id'}"/> --> |
103 | 107 | <!-- <filter string="Fiscal Year" name='fiscalyear_id' context="{'group_by':'fiscalyear_id'}"/> --> |
104 | | - <filter string="State" context="{'group_by':'state_id'}"/> |
105 | | - <filter string="Document Type" context="{'group_by':'document_type_id'}"/> |
106 | | - <filter string="Product" context="{'group_by':'product_id'}"/> |
107 | | - <filter string="Product Category" name="category_product" context="{'group_by':'product_category_id'}"/> |
108 | | - <filter string="State" context="{'group_by':'state'}"/> |
109 | | - <filter string="Journal Type" context="{'group_by':'type'}"/> |
110 | | - <filter string="Journal" context="{'group_by':'journal_id'}"/> |
111 | | - <filter string="Company" context="{'group_by':'company_id'}"/> |
| 108 | + <filter name="group_by_company_id" string="Company" context="{'group_by':'company_id'}"/> |
| 109 | + <filter name="group_by_state_id" string="State" context="{'group_by':'state_id'}"/> |
| 110 | + <filter name="group_by_document_type_id" string="Document Type" context="{'group_by':'document_type_id'}"/> |
| 111 | + <filter string="AFIP Activity" name="group_by_afip_activity_id" context="{'group_by':'afip_activity_id'}"/> |
| 112 | + <filter string="Account" name="group_by_account_id" context="{'group_by':'account_id'}"/> |
| 113 | + <filter name="group_by_product_id" string="Product" context="{'group_by':'product_id'}"/> |
| 114 | + <filter string="Product Category" name="group_by_category_product" context="{'group_by':'product_category_id'}"/> |
| 115 | + <filter name="group_by_state" string="State" context="{'group_by':'state'}"/> |
| 116 | + <filter name="group_by_type" string="Journal Type" context="{'group_by':'type'}"/> |
| 117 | + <filter name="group_by_journal_id" string="Journal" context="{'group_by':'journal_id'}"/> |
112 | 118 | <!-- <filter string="Week" name="week" context="{'group_by':'week'}" help="Group by week of Invoice Date"/> --> |
113 | 119 | <!-- <filter string="Month" name="month" context="{'group_by':'month'}" help="Group by month of Invoice Date"/> --> |
114 | 120 | <!-- <filter string="Year" name="year" context="{'group_by':'year'}" help="Group by year of Invoice Date"/> --> |
115 | | - </group> |
| 121 | + </group> |
116 | 122 | </search> |
117 | 123 | </field> |
118 | 124 | </record> |
|
0 commit comments