ledger: Include all fund accounts in default project ledger reports.
This brings the reporting into sync with the fund report.
This commit is contained in:
		
							parent
							
								
									69d079190c
								
							
						
					
					
						commit
						0e8745bf51
					
				
					 3 changed files with 11 additions and 2 deletions
				
			
		| 
						 | 
					@ -438,7 +438,14 @@ metadata to match. A single ticket number is a shortcut for
 | 
				
			||||||
    args = parser.parse_args(arglist)
 | 
					    args = parser.parse_args(arglist)
 | 
				
			||||||
    if args.sheet_names is None:
 | 
					    if args.sheet_names is None:
 | 
				
			||||||
        if any(term.meta_key == 'project' for term in args.search_terms):
 | 
					        if any(term.meta_key == 'project' for term in args.search_terms):
 | 
				
			||||||
            args.sheet_names = ['Income', 'Expenses', 'Assets:Receivable', 'Liabilities:Payable']
 | 
					            args.sheet_names = [
 | 
				
			||||||
 | 
					                'Income',
 | 
				
			||||||
 | 
					                'Expenses',
 | 
				
			||||||
 | 
					                'Assets:Receivable',
 | 
				
			||||||
 | 
					                'Assets:Prepaid',
 | 
				
			||||||
 | 
					                'Liabilities:UnearnedIncome',
 | 
				
			||||||
 | 
					                'Liabilities:Payable',
 | 
				
			||||||
 | 
					            ]
 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
            args.sheet_names = list(LedgerODS.ACCOUNT_COLUMNS)
 | 
					            args.sheet_names = list(LedgerODS.ACCOUNT_COLUMNS)
 | 
				
			||||||
    return args
 | 
					    return args
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								setup.py
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								setup.py
									
										
									
									
									
								
							| 
						 | 
					@ -5,7 +5,7 @@ from setuptools import setup
 | 
				
			||||||
setup(
 | 
					setup(
 | 
				
			||||||
    name='conservancy_beancount',
 | 
					    name='conservancy_beancount',
 | 
				
			||||||
    description="Plugin, library, and reports for reading Conservancy's books",
 | 
					    description="Plugin, library, and reports for reading Conservancy's books",
 | 
				
			||||||
    version='1.5.8',
 | 
					    version='1.5.9',
 | 
				
			||||||
    author='Software Freedom Conservancy',
 | 
					    author='Software Freedom Conservancy',
 | 
				
			||||||
    author_email='info@sfconservancy.org',
 | 
					    author_email='info@sfconservancy.org',
 | 
				
			||||||
    license='GNU AGPLv3+',
 | 
					    license='GNU AGPLv3+',
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -52,6 +52,8 @@ PROJECT_REPORT_SHEETS = [
 | 
				
			||||||
    'Income',
 | 
					    'Income',
 | 
				
			||||||
    'Expenses',
 | 
					    'Expenses',
 | 
				
			||||||
    'Assets:Receivable',
 | 
					    'Assets:Receivable',
 | 
				
			||||||
 | 
					    'Assets:Prepaid',
 | 
				
			||||||
 | 
					    'Liabilities:UnearnedIncome',
 | 
				
			||||||
    'Liabilities:Payable',
 | 
					    'Liabilities:Payable',
 | 
				
			||||||
]
 | 
					]
 | 
				
			||||||
OVERSIZE_RE = re.compile(
 | 
					OVERSIZE_RE = re.compile(
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue