diff --git a/activities_by_weeks.fods b/activities_by_weeks.fods
index e13a3af..3f2c0be 100644
--- a/activities_by_weeks.fods
+++ b/activities_by_weeks.fods
@@ -13,8 +13,8 @@
view1
- 4
- 6
+ 3
+ 8
2
0
0
@@ -143,112 +143,139 @@
-
-
- .
-
-
-
- $
+
+
+ -
+ -
+
+
+
+ $
+
+
+
+
+ ($
+
+ )
+
+
+
-
- $
+
-
-
- $
-
- -
-
-
-
-
-
-
-
-
-
- €
-
-
-
-
-
-
- €
-
-
- -
-
-
-
-
- €
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ $
+
- €
-
-
-
+
+
+ $
+
-
- €
-
-
-
+
+
+ $
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (
+
+ )
+
+
+
+ -
+
+
+
+
+
+
+
+
+
pta
-
+
-
pta
-
+
- pta
-
+
-
-
-
+
+
+
-
+
+ -
- (
- )
+
-
-
+
@@ -257,335 +284,308 @@
-
+
$
-
+
+ $
+
+ -
+
+
+
+
+ $
+
+ -
+
+
+
+
+
+
+
+
+
+ $
+
+
+
+
+ (
+ $
+
+ )
+
+
+
+
+
+
+
+
+
+ (
+
+ )
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+ €
+
+
+
+
+
+
+ €
+
+
+ -
+
+
+
+
+ €
+
+
+ -
+
+
+
+
+
+
+
+
+ €
+
+
+
+ -
+
+
+ €
+
+
+
+
+ -
+
+ -
+
+
+
+ $
+
+
+
+
+
$
(
)
-
+
$
-
-
+
-
-
-
+
+
+
-
+
/
/
-
+
-
+
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+ .
+
+
+
+
+
+
+
+ -
+
+
+
+
-
-
+
+ -
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
- $
-
-
-
-
-
- $
-
+
+
-
-
-
-
-
- $
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
-
-
+
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
- (
-
- )
-
-
-
- -
-
-
-
-
-
-
-
-
-
- $
-
-
-
-
- ($
-
- )
-
-
-
- $
-
-
-
+
- (
- $
+ -
+
+
+
+
- )
-
+
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
-
-
- -
- -
-
-
-
-
-
-
+
+ -
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
:
-
+
-
+
:
:
-
+
:
-
+
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
- -
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
- -
-
-
@@ -599,20 +599,20 @@
€
-
+
+
+
+
de
de
-
+
-
+
-
-
-
-
@@ -794,6 +794,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -848,17 +876,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -897,28 +914,16 @@
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
@@ -936,11 +941,6 @@
-
-
-
-
-
@@ -964,6 +964,176 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1006,7 +1176,7 @@
???(???)
- 00/00/0000, 00:00:00
+ 00/00/0000, 00:00:00
@@ -1022,335 +1192,335 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- company.rec_name
+ company.rec_name
-
-
-
-
-
+
+
+
+
+
-
+
CRONOGRAMA DE ACTIVIDADES POR CULTIVO
-
-
-
-
+
+
+
+
-
+
FECHA:
- data['start_date']
+ data['start_date']
-
-
-
+
+
+
-
-
- data['week1']
+
+
+ data['week1']
- data['week2']
+ data['week2']
- data['week3']
+ data['week3']
- data['week4']
+ data['week4']
- data['week5']
+ data['week5']
- data['week6']
+ data['week6']
- data['week7']
+ data['week7']
- data['week8']
+ data['week8']
- data['week9']
+ data['week9']
- data['week10']
+ data['week10']
- data['week11']
+ data['week11']
- data['week12']
+ data['week12']
- data['week13']
+ data['week13']
- data['week14']
+ data['week14']
- data['week15']
+ data['week15']
- data['week16']
+ data['week16']
-
+
-
+
-
+
CULTIVO
-
+
VARIEDAD
-
+
UBICACION
-
+
NUM. DE PLANTAS
- data['day1']
+ data['day1']
- data['day2']
+ data['day2']
- data['day3']
+ data['day3']
- data['day4']
+ data['day4']
- data['day5']
+ data['day5']
- data['day6']
+ data['day6']
- data['day7']
+ data['day7']
- data['day8']
+ data['day8']
- data['day9']
+ data['day9']
- data['day10']
+ data['day10']
- data['day11']
+ data['day11']
- data['day12']
+ data['day12']
- data['day13']
+ data['day13']
- data['day14']
+ data['day14']
- data['day15']
+ data['day15']
- data['day16']
+ data['day16']
-
+
-
-
+
+
- for each='crop in records'
+ for each='crop in records'
-
-
+
+
-
+
- crop['number']
+ crop['number']
- crop['variety']
+ crop['variety']
- crop['location']
+ crop['location']
- crop['plants']
+ crop['plants']
- crop['lots']
+ crop['lots']
-
-
+
+
-
+
- for each="rec in crop['activities']"
+ for each="rec in crop['activities']"
-
-
+
+
-
+
-
-
- rec['activity1']
+
+
+ rec['activity1']
- rec['activity2']
+ rec['activity2']
- rec['activity3']
+ rec['activity3']
- rec['activity4']
+ rec['activity4']
- rec['activity5']
+ rec['activity5']
- rec['activity6']
+ rec['activity6']
- rec['activity7']
+ rec['activity7']
- rec['activity8']
+ rec['activity8']
- rec['activity9']
+ rec['activity9']
- rec['activity10']
+ rec['activity10']
- rec['activity11']
+ rec['activity11']
- rec['activity12']
+ rec['activity12']
- rec['activity13']
+ rec['activity13']
- rec['activity14']
+ rec['activity14']
- rec['activity15']
+ rec['activity15']
- rec['activity16']
+ rec['activity16']
-
+
-
+
-
-
-
-
- rec['day1']
+
+
+
+
+ rec['day1']
- rec['day2']
+ rec['day2']
- rec['day3']
+ rec['day3']
- rec['day4']
+ rec['day4']
- rec['day5']
+ rec['day5']
- rec['day6']
+ rec['day6']
- rec['day7']
+ rec['day7']
- rec['day8']
+ rec['day8']
- rec['day9']
+ rec['day9']
- rec['day10']
+ rec['day10']
- rec['day11']
+ rec['day11']
- rec['day12']
+ rec['day12']
- rec['day13']
+ rec['day13']
- rec['day14']
+ rec['day14']
- rec['day15']
+ rec['day15']
- rec['day16']
+ rec['day16']
-
+
- /for
+ /for
-
-
-
-
+
+
+
+
-
+
- /for
+ /for
-
-
-
+
+
+
-
+
-
-
+
+
TIEMPO TOTAL
-
- data['total_day1']
+
+ data['total_day1']
- data['total_day2']
+ data['total_day2']
- data['total_day3']
+ data['total_day3']
- data['total_day4']
+ data['total_day4']
- data['total_day5']
+ data['total_day5']
- data['total_day6']
+ data['total_day6']
- data['total_day7']
+ data['total_day7']
- data['total_day8']
+ data['total_day8']
- data['total_day9']
+ data['total_day9']
- data['total_day10']
+ data['total_day10']
- data['total_day11']
+ data['total_day11']
- data['total_day12']
+ data['total_day12']
- data['total_day13']
+ data['total_day13']
- data['total_day14']
+ data['total_day14']
- data['total_day15']
+ data['total_day15']
- data['total_day16']
+ data['total_day16']
-
+
-
+
Impresión:
- company.time_now()
+ company.time_now()
-
-
-
-
-
+
+
+
+
+
diff --git a/crop.py b/crop.py
index 5f6704e..45b879d 100644
--- a/crop.py
+++ b/crop.py
@@ -1095,10 +1095,10 @@ class CropActivitiesReport(Report):
Company = pool.get('company.company')
Crop = pool.get('farming.crop')
date_start = data['start_date']
+ date_end = data['start_date'] + timedelta(days=(7*17))
dom = [
- ('start_date', '<=', date_start),
- ('end_date', '>=', date_start),
- ('activities', '!=', None)
+ ('activities.planned_date', '>=', date_start),
+ ('activities.planned_date', '<=', date_end),
]
if data['location']:
@@ -1236,7 +1236,6 @@ class CropSuppliesReport(Report):
])
supplies_list = []
- # total_list = [0 for x in range(13)]
for crop in crops:
for activity in crop.activities:
@@ -1258,7 +1257,7 @@ class CropSuppliesReport(Report):
'unit': '',
}
supply_info_list.append(spl)
- # supply_name = ''
+
for supply in activity.supplies:
for index, week in enumerate(week_list):
week_number = week['number']
@@ -1278,11 +1277,6 @@ class CropSuppliesReport(Report):
}
crop_list.append(suply_crop)
- #location_list.append({'name':location.name, 'crops':crop_list, 'total_time': total_list})
-
- #report_context['records'] = supplies_list
- #report_context['totals'] = total_report
- #report_context['company'] = .party.name
report_context['weeks'] = week_list
report_context['supplies'] = supplies_list
report_context['company'] = Company(data['company'])