prueba
prueba dos
prueba final
funk
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
BUG 10953Report Table error with currency fields

When having a process with some currency field (Real Number), and running a case before creating the RT, when you create the RT and saw the data inside it shows the number as integer. But when you run a case after creating the RT it shows the currency in good way (Real number).

It was fixed.
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge branch 'master' of git@github.com:colosa/processmaker.git
Merge remote branch 'upstream/master'
Adding feature to coloring and check syntaxis on trigger editor.
Adding codeMirror Editor to Trigger custom and Trigger copy options.
BUG 10921 "When changing the password, the old password..." SOLVED

- When changing the password, the old password should be
  required (and verified)
- Problem solved, added a new field to validate the user, when changing
  the password (user's profile)
* Available from version ProcessMaker-2.0.46
BUG10870 - "A better trigger editor is needed"
error: The current trigger editor has no syntax check
Sol: Using CodeMirror as well as XMl editor, will give trigger editor the feature that it needs. + removing auto tabs at code begin.
Merge remote branch 'upstream/master'