Commit Graph

13301 Commits

Author SHA1 Message Date
Marco Antonio Nina Mena
b895fa79de Merged colosa/processmaker into master 2015-06-18 13:32:17 -04:00
Julio Cesar Laura Avendaño
fa0a00ea69 Merged in dashboards2 (pull request #2365)
PM-2987 - Error en el Inbox si no están los KPIs habilitados en la licencia
2015-06-18 11:44:46 -04:00
Dante Loayza
4288190b45 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2364)
NDD-75 El inbox da error de filterStatus
2015-06-18 10:44:47 -04:00
Marco Antonio Nina Mena
98d79f4906 NDD-75 El inbox da error de filterStatus
- se valido para no depender solo de la licencia y version de PM.
2015-06-18 10:40:56 -04:00
Dante
38f8468163 Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2 2015-06-18 10:26:35 -04:00
Dante
e8258b2e63 NDD70, 66, 73 2015-06-18 10:25:57 -04:00
Dante Loayza
2672e7a3eb Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2363)
NND-74 Agregar un total queue
2015-06-18 10:20:37 -04:00
Marco Antonio Nina Mena
232a89fb0d Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2 2015-06-18 10:16:11 -04:00
Dante Loayza
a3c3d00f72 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2360)
Delete graphic task status
2015-06-18 10:15:02 -04:00
Marco Antonio Nina Mena
2c174a0d8a Merged colosa/processmaker into master 2015-06-18 10:12:30 -04:00
Marco Antonio Nina Mena
2e0198622d NND-74 Agregar un total queue
- Se agrego la columna en usr_reporting, schema.xml, schema.sql
2015-06-18 10:09:38 -04:00
Marco Antonio Nina Mena
1b7962d656 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-06-18 08:59:07 -04:00
Marco Antonio Nina Mena
e14447cf65 Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-06-18 08:58:44 -04:00
Marco Antonio Nina Mena
864a09a996 Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-06-18 08:49:12 -04:00
Julio Cesar Laura Avendaño
9e0e442d97 Merged in dashboards2 (pull request #2362)
Schema and calendar modifications for KPIs
2015-06-18 08:48:16 -04:00
Dante
8955b60d36 resolution of integration conflicts with PM Final mods 2015-06-18 08:46:57 -04:00
Dante Loayza
f931be9a99 Merged master into dashboards2 2015-06-18 08:30:13 -04:00
Julio Cesar Laura Avendaño
f1d5636ef0 Merged in dashboards2 (pull request #2317)
Modifications to PM tables for new KPIs calculation
2015-06-17 17:54:16 -04:00
Dante Loayza
31f1d8a80f Merged master into dashboards2 2015-06-17 17:22:00 -04:00
Dante
f89a40ef61 schema confflicts resolution 5 2015-06-17 17:03:33 -04:00
Dante
645bb86b22 schema confflicts resolution 4 2015-06-17 16:58:43 -04:00
Dante
fce7dcbc0a schema confflicts resolution 3 2015-06-17 16:46:35 -04:00
Marco Antonio Nina Mena
139d23e8b0 Merged colosa/processmaker into master 2015-06-17 14:36:21 -04:00
Marco Antonio Nina Mena
e9f1f9ad41 Delete graphic task status 2015-06-17 13:47:52 -04:00
Julio Cesar Laura Avendaño
1efc67a0f7 Merged in victorsl/processmaker/PM-2917 (pull request #2356)
PM-2917 "Case Scheduler issues" SOLVED
2015-06-17 12:30:33 -04:00
Julio Cesar Laura Avendaño
3a6f10c002 Merged in paulis/processmaker/PM-2976 (pull request #2358)
PM-2976: ActionsByEmail is active in task
2015-06-17 11:36:17 -04:00
Dante
bc4cb7abea schema confflicts resolution 2 2015-06-17 11:30:24 -04:00
Paula V. Quispe
6d6746a53c PM-2976: ActionsByEmail is active in task 2015-06-17 11:25:04 -04:00
Dante
11376de960 schema confflicts resolution 2015-06-17 11:21:21 -04:00
Victor Saisa Lopez
5c8121cf09 PM-2917 "Case Scheduler issues" SOLVED
Fixes 2015-JUN-16
2015-06-17 10:25:36 -04:00
Julio Cesar Laura Avendaño
240800d32a Merged in paulis/processmaker/PM-2939 (pull request #2354)
PM-2939: ActionsByEmail executed if the task is active with actionsByEmail and exists the feature
2015-06-17 10:22:56 -04:00
Paula V. Quispe
37600cf77a PM-2939: I deleted the error log 2015-06-17 10:21:33 -04:00
Paula V. Quispe
6b2e912a49 PM-2939: ActionsByEmail executed if the task is active with actionsByEmail and exists the feature 2015-06-17 10:17:07 -04:00
Marco Antonio Nina Mena
954157ecb7 Merged colosa/processmaker into master 2015-06-17 08:58:23 -04:00
Julio Cesar Laura Avendaño
aef8aba74b Merged in gproly/processmaker/IMPROVEMENT (pull request #2351)
IMPROVEMENT
2015-06-17 08:40:39 -04:00
Roly Rudy Gutierrez Pinto
1796166a7b IMPROVEMENT 2015-06-16 15:56:20 -04:00
Julio Cesar Laura Avendaño
a8295bf601 Merged in victorsl/processmaker/PM-2917 (pull request #2320)
PM-2917 "Case Scheduler issues" SOLVED
2015-06-16 13:50:29 -04:00
Julio Cesar Laura Avendaño
3a647c4da7 Merged in paulis/processmaker/PM-2973 (pull request #2350)
PM-2973: Update the report table related to Batch routing
2015-06-16 10:59:14 -04:00
Paula V. Quispe
581c029a64 PM-2973: Update the report table related to Batch routing 2015-06-16 10:53:07 -04:00
Julio Cesar Laura Avendaño
097eb7cac5 Merged in qronald/processmaker (pull request #2348)
add method jsonr in get json definitions
2015-06-16 10:48:30 -04:00
Marco Antonio Nina Mena
332b368ab7 Merged colosa/processmaker into master 2015-06-16 10:04:31 -04:00
Dante Loayza
9ca3a7981c Merged master into dashboards2 2015-06-15 17:29:52 -04:00
Julio Cesar Laura Avendaño
5b6dc0667e Merged in gproly/processmaker/PM-2930-2895 (pull request #2346)
PM-2930-2895 MSSQL (http://php.net/manual/en/intro.mssql.php)
2015-06-15 17:22:01 -04:00
Julio Cesar Laura Avendaño
cd2e74dc3a Merged in dheeyi/processmaker/PM-2879 (pull request #2338)
PM-2879 Improve Case Tracker UX
2015-06-15 16:48:14 -04:00
Ronald Quenta
13ee3c6f2d Merge branch 'master' of bitbucket.org:qronald/processmaker 2015-06-15 15:34:52 -04:00
Ronald Quenta
7596424f35 Merge remote branch 'pm/master' 2015-06-15 15:34:30 -04:00
Quenta Ronald
d9573e3eef Merged colosa/processmaker into master 2015-06-15 15:33:32 -04:00
Ronald Quenta
c6338995e0 add method jsonr in get json definitions 2015-06-15 15:32:29 -04:00
Victor Saisa Lopez
d363690c3d PM-2917 "Case Scheduler issues" SOLVED
Issue:
    Case Scheduler issues
Cause:
    No se considero ciertas combinaciones de configuracion para: Daily, Monthly
Solution:
    - Se mejoro los metodos/algoritmos involucrados para la "generacion de la siguiente fecha de ejecucion"
    - Se reviso todas las opciones de configuracion: Daily, Weekly, Monthly, One time only, Every
2015-06-15 13:34:17 -04:00
Victor Saisa Lopez
1ff0ca9c72 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2917 2015-06-15 13:24:59 -04:00