WebSVN – SmartDukaan – Diff – /trunk/PyDTR/src/dtr/reports/affiliatereco.py



                        sh1.write(row3, inc(), None)
                        sh1.write(row3, inc(), None)
                        sh1.write(row3, inc(), None)
                        sh1.write(row3, inc(), None)
                    print result[10]
                    sh1.write(row3, inc(), unicode(result[10], errors='ignore') if result[10] else None)
                    sh1.write(row3, inc(), result[11])
                    sh1.write(row3, inc(), result[12])
                        
                    #removed filter as requested by Rajneesh
                    #if subOrder.get("cashBackStatus") == Store.CB_APPROVED or subOrder.get("cashBackStatus") == Store.CB_PENDING:

Rev 17015	Rev 17020
Line 1074...	Line 1074...
1074	`sh1.write(row3, inc(), None)`	1074	`sh1.write(row3, inc(), None)`
1075	`sh1.write(row3, inc(), None)`	1075	`sh1.write(row3, inc(), None)`
1076	`sh1.write(row3, inc(), None)`	1076	`sh1.write(row3, inc(), None)`
1077	`sh1.write(row3, inc(), None)`	1077	`sh1.write(row3, inc(), None)`
1078	`print result[10]`	1078	`print result[10]`
1079	`sh1.write(row3, inc(), result[10] if unicode(result[10], errors='ignore') else None)`	1079	`sh1.write(row3, inc(), unicode(result[10], errors='ignore') if result[10] else None)`
1080	`sh1.write(row3, inc(), result[11])`	1080	`sh1.write(row3, inc(), result[11])`
1081	`sh1.write(row3, inc(), result[12])`	1081	`sh1.write(row3, inc(), result[12])`
1082		1082
1083	`#removed filter as requested by Rajneesh`	1083	`#removed filter as requested by Rajneesh`
1084	`#if subOrder.get("cashBackStatus") == Store.CB_APPROVED or subOrder.get("cashBackStatus") == Store.CB_PENDING:`	1084	`#if subOrder.get("cashBackStatus") == Store.CB_APPROVED or subOrder.get("cashBackStatus") == Store.CB_PENDING:`

Subversion Repositories SmartDukaan

(root)/trunk/PyDTR/src/dtr/reports/affiliatereco.py – Rev 17015 → 17020