Sahana-Eden

Merge lp:~graeme-acm/sahana-eden/LA into lp:sahana-eden/la

  1. LA
  2. Merge into la
Proposed by Graeme Foster
Status: Merged
Merged at revision: 2626
Proposed branch: lp:~graeme-acm/sahana-eden/LA
Merge into: lp:sahana-eden/la
Diff against target: 77 lines (+31/-4) (has conflicts)
2 files modified
models/req.py (+26/-0)
models/vol.py (+5/-4)
Text conflict in models/req.py
To merge this branch: bzr merge lp:~graeme-acm/sahana-eden/LA
Reviewer Review Type Date Requested Status
Fran Boon Pending
Review via email: mp+72221@code.launchpad.net

Description of the change

Slight change to the volunteer assignment form (add the disclaimer)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'models/req.py'
2--- models/req.py 2011-08-19 16:47:11 +0000
3+++ models/req.py 2011-08-19 16:49:38 +0000
4@@ -1750,6 +1750,7 @@
5 "double",
6 notnull = True),
7 site_id,
8+<<<<<<< TREE
9 Field( "quantity_commit",
10 "double",
11 label = T("Quantity Donated"),
12@@ -1761,6 +1762,18 @@
13 writable = False,
14 #writable = quantities_writable
15 ),
16+=======
17+ Field( "quantity_commit",
18+ "double",
19+ label = T("Quantity Donated"),
20+ represent = lambda quantity_commit: \
21+ req_quantity_represent(quantity_commit,
22+ "commit"),
23+ default = 0,
24+ readable=False,
25+ writable=False),
26+ # writable = quantities_writable),
27+>>>>>>> MERGE-SOURCE
28 Field( "quantity_transit",
29 "double",
30 label = T("Quantity in Transit"),
31@@ -1769,6 +1782,7 @@
32 "transit"),
33 default = 0,
34 writable = quantities_writable),
35+<<<<<<< TREE
36 Field( "quantity_fulfil",
37 "double",
38 label = T("Quantity Received"),
39@@ -1780,6 +1794,18 @@
40 writable = False,
41 #writable = quantities_writable
42 ),
43+=======
44+ Field( "quantity_fulfil",
45+ "double",
46+ label = T("Quantity Received"),
47+ represent = lambda quantity_fulfil: \
48+ req_quantity_represent(quantity_fulfil,
49+ "fulfil"),
50+ default = 0,
51+ readable=False,
52+ writable=False),
53+ # writable = quantities_writable),
54+>>>>>>> MERGE-SOURCE
55 #comments("surplus_instruct",
56 # label = T("Instruction for Surplus Items")),
57 comments(),
58
59=== modified file 'models/vol.py'
60--- models/vol.py 2011-08-19 10:19:12 +0000
61+++ models/vol.py 2011-08-19 16:49:38 +0000
62@@ -696,10 +696,11 @@
63 lbl_volunteer = T("Volunteer")
64 lbl_address = T("Address")
65 lbl_emergenctContact = T("Emergency Contact")
66- txt_disclaimer = T("As a volunteer working to assist disaster survivors and in disaster recovery efforts, you will be required to fill out and sign the Give2LA Registration Forms.")
67- disclaimer = pdf.addParagraph(txt_disclaimer, append=False)
68- txt_disclaimer = T("Please let us know in advance if you cannot report for your Volunteer Assignment by calling the Report To Contact Person listed on this form.")
69- disclaimer = pdf.addParagraph(txt_disclaimer, append=True)
70+ txt_disclaimer1 = T("As a volunteer working to assist disaster survivors and in disaster recovery efforts, you will be required to fill out and sign the Give2LA Registration Forms.")
71+ disclaimer1 = pdf.addParagraph(txt_disclaimer1, append=False)
72+ txt_disclaimer2 = T("Please let us know in advance if you cannot report for your Volunteer Assignment by calling the Report To Contact Person listed on this form.")
73+ disclaimer2 = pdf.addParagraph(txt_disclaimer2, append=False)
74+ disclaimer = pdf.addParagraph("%s<br/><br/>%s" % (txt_disclaimer1, txt_disclaimer2), append=False)
75
76 cell1 = []
77 heading = "<para align='CENTER'><b>%s</b></para>" % lbl_title1

Subscribers

People subscribed via source and target branches

to all changes: