Nuevo desarrollo incial para operacion diaria de ingresos
Merge remote-tracking branch 'upstream/master'

Conflicts:
	opentaps-1.5/opentaps/financials/data/FinancialsWebappSeedData.xml
	opentaps-1.5/opentaps/financials/widget/financials/screens/transactions/TransactionsScreens.xml
Merge pull request #90 from salvadorcortes/master

operacion diaria
Merge remote-tracking branch 'upstream/master'