From c5e2c4dee5969c594d2b0e5fe64c8aad91777916 Mon Sep 17 00:00:00 2001 From: Shanta Kabra Date: Thu, 11 Sep 2008 18:27:49 +0530 Subject: [PATCH 001/104] Interchanged 'x' and 'y' roles in result dictionary. Normalized order of nodes bzr revid: shanta.kabra@gmail.com-20080911125749-ny4btftghgazh29q --- bin/tools/graph.py | 124 ++++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 64 deletions(-) diff --git a/bin/tools/graph.py b/bin/tools/graph.py index 8508f10ce42..e0469d4fd06 100644 --- a/bin/tools/graph.py +++ b/bin/tools/graph.py @@ -56,7 +56,7 @@ class graph(object): """ self.edge_wt = {} for link in self.links: - self.edge_wt[link] = self.result[link[1]]['y'] - self.result[link[0]]['y'] + self.edge_wt[link] = self.result[link[1]]['x'] - self.result[link[0]]['x'] tot_node = self.partial_order.__len__() #do until all the nodes in the component are searched @@ -88,10 +88,10 @@ class graph(object): for node in self.result: if node in self.reachable_nodes: - self.result[node]['y'] += delta + self.result[node]['x'] += delta for edge in self.edge_wt: - self.edge_wt[edge] = self.result[edge[1]]['y'] - self.result[edge[0]]['y'] + self.edge_wt[edge] = self.result[edge[1]]['x'] - self.result[edge[0]]['x'] self.init_cutvalues() @@ -164,10 +164,10 @@ class graph(object): """ if node not in self.result: - self.result[node] = {'x': None, 'y':level, 'mark':0} + self.result[node] = {'y': None, 'x':level, 'mark':0} else: - if level > self.result[node]['y']: - self.result[node]['y'] = level + if level > self.result[node]['x']: + self.result[node]['x'] = level if self.result[node]['mark']==0: self.result[node]['mark'] = 1 @@ -272,7 +272,7 @@ class graph(object): def finalize_rank(self, node, level): - self.result[node]['y'] = level + self.result[node]['x'] = level for destination in self.optimal_edges.get(node, []): self.finalize_rank(destination, level+1) @@ -281,15 +281,11 @@ class graph(object): """The ranks are normalized by setting the least rank to zero. """ - least_rank=100 - - for node in self.result: - if least_rank>self.result[node]['y']: - least_rank = self.result[node]['y'] + least_rank = min(map(lambda x: x['x'], self.result.values())) if(least_rank!=0): for node in self.result: - self.result[node]['y']-=least_rank + self.result[node]['x']-=least_rank def make_chain(self): @@ -300,12 +296,12 @@ class graph(object): for edge in self.edge_wt: if self.edge_wt[edge]>1: self.transitions[edge[0]].remove(edge[1]) - start = self.result[edge[0]]['y'] - end = self.result[edge[1]]['y'] + start = self.result[edge[0]]['x'] + end = self.result[edge[1]]['x'] for rank in range(start+1, end): if not self.result.get((rank, 'temp'), False): - self.result[(rank, 'temp')] = {'x': None, 'y': rank, 'mark': 0} + self.result[(rank, 'temp')] = {'y': None, 'x': rank, 'mark': 0} for rank in range(start, end): if start==rank: @@ -319,12 +315,12 @@ class graph(object): def init_order(self, node, level): """Initialize orders the nodes in each rank with depth-first search """ - if not self.result[node]['x']: - self.result[node]['x'] = self.order[level] + if not self.result[node]['y']: + self.result[node]['y'] = self.order[level] self.order[level] = self.order[level]+1 for sec_end in self.transitions.get(node, []): - self.init_order(sec_end, self.result[sec_end]['y']) + self.init_order(sec_end, self.result[sec_end]['x']) def order_heuristic(self): @@ -349,10 +345,8 @@ class graph(object): self.levels[level] = new_list order = 0 for node in nodes: - self.result[node]['x'] = order - order +=1 - - + self.result[node]['y'] = order + order +=1 def median_value(self, node, adj_rank): @@ -390,7 +384,7 @@ class graph(object): if pre_level_nodes: for src in pre_level_nodes: if (self.transitions.get(src) and self.transitions[src].__contains__(node)): - adj_nodes.append(self.result[src]['x']) + adj_nodes.append(self.result[src]['y']) return adj_nodes @@ -399,7 +393,7 @@ class graph(object): levels = {} for r in self.partial_order: - l = self.result[r]['y'] + l = self.result[r]['x'] levels.setdefault(l,[]) levels[l].append(r) @@ -425,28 +419,28 @@ class graph(object): else: first_half = list[no/2+1:] if max_level==1:#for the case when horizontal graph is there - self.result[list[no/2]]['x'] = mid_pos + (self.result[list[no/2]]['y']%2 * 0.5) + self.result[list[no/2]]['y'] = mid_pos + (self.result[list[no/2]]['x']%2 * 0.5) else: - self.result[list[no/2]]['x'] = mid_pos + factor + self.result[list[no/2]]['y'] = mid_pos + factor last_half = list[:no/2] i=1 for node in first_half: - self.result[node]['x'] = mid_pos - (i + factor) + self.result[node]['y'] = mid_pos - (i + factor) i += 1 i=1 for node in last_half: - self.result[node]['x'] = mid_pos + (i + factor) + self.result[node]['y'] = mid_pos + (i + factor) i += 1 else: self.max_order += max_level+1 - mid_pos = self.result[self.start]['x'] + mid_pos = self.result[self.start]['y'] def tree_order(self, node, last=0): - mid_pos = self.result[node]['x'] + mid_pos = self.result[node]['y'] l = self.transitions.get(node, []) l.reverse() no = len(l) @@ -462,41 +456,41 @@ class graph(object): i=1 for child in first_half: - self.result[child]['x'] = mid_pos - (i - (factor * 0.5)) + self.result[child]['y'] = mid_pos - (i - (factor * 0.5)) i += 1 if self.transitions.get(child, False): if last: - self.result[child]['x'] = last + len(self.transitions[child])/2 + 1 + self.result[child]['y'] = last + len(self.transitions[child])/2 + 1 last = self.tree_order(child, last) if no%2: mid_node = l[no/2] - self.result[mid_node]['x'] = mid_pos + self.result[mid_node]['y'] = mid_pos if self.transitions.get((mid_node), False): if last: - self.result[mid_node]['x'] = last + len(self.transitions[mid_node])/2 + 1 + self.result[mid_node]['y'] = last + len(self.transitions[mid_node])/2 + 1 last = self.tree_order(mid_node) else: if last: - self.result[mid_node]['x'] = last + 1 - self.result[node]['x'] = self.result[mid_node]['x'] - mid_pos = self.result[node]['x'] + self.result[mid_node]['y'] = last + 1 + self.result[node]['y'] = self.result[mid_node]['y'] + mid_pos = self.result[node]['y'] i=1 last_child = None for child in last_half: - self.result[child]['x'] = mid_pos + (i - (factor * 0.5)) + self.result[child]['y'] = mid_pos + (i - (factor * 0.5)) last_child = child i += 1 if self.transitions.get(child, False): if last: - self.result[child]['x'] = last + len(self.transitions[child])/2 + 1 + self.result[child]['y'] = last + len(self.transitions[child])/2 + 1 last = self.tree_order(child, last) if last_child: - last = self.result[last_child]['x'] + last = self.result[last_child]['y'] return last @@ -504,27 +498,29 @@ class graph(object): def process_order(self): """Finds actual-order of the nodes with respect to maximum number of nodes in a rank in component """ - max_level = max(map(lambda x: len(x), self.levels.values())) - - if max_level%2: - self.result[self.start]['x'] = (max_level+1)/2 + self.max_order +1 - else: - self.result[self.start]['x'] = (max_level)/2 + self.max_order + 1 if self.Is_Cyclic: + max_level = max(map(lambda x: len(x), self.levels.values())) + + if max_level%2: + self.result[self.start]['y'] = (max_level+1)/2 + self.max_order + (self.max_order and 1) + else: + self.result[self.start]['y'] = (max_level)/2 + self.max_order + (self.max_order and 1) + self.graph_order() else: - self.result[self.start]['x'] = 0 + self.result[self.start]['y'] = 0 self.tree_order(self.start, 0) - min_order = math.fabs(min(map(lambda x: x['x'], self.result.values()))) - min_order += self.max_order + 1 + min_order = math.fabs(min(map(lambda x: x['y'], self.result.values()))) + min_order += self.max_order + (self.max_order and 1) for level in self.levels: for node in self.levels[level]: - self.result[node]['x'] += min_order + self.result[node]['y'] += min_order - self.max_order = max(map(lambda x: x['x'], self.result.values())) + self.max_order = max(map(lambda x: x['y'], self.result.values())) + def find_starts(self): """Finds other start nodes of the graph in the case when graph is disconneted @@ -606,7 +602,7 @@ class graph(object): #normalization self.normalize() for edge in self.edge_wt: - self.edge_wt[edge] = self.result[edge[1]]['y'] - self.result[edge[0]]['y'] + self.edge_wt[edge] = self.result[edge[1]]['x'] - self.result[edge[0]]['x'] def order_in_rank(self): """Finds optimized order of the nodes within their ranks using median heuristic @@ -622,10 +618,10 @@ class graph(object): for i in range(max_rank+1): self.order[i] = 0 - self.init_order(self.start, self.result[self.start]['y']) + self.init_order(self.start, self.result[self.start]['x']) for level in self.levels: - self.levels[level].sort(lambda x, y: cmp(self.result[x]['x'], self.result[y]['x'])) + self.levels[level].sort(lambda x, y: cmp(self.result[x]['y'], self.result[y]['y'])) self.order_heuristic() self.process_order() @@ -673,7 +669,7 @@ class graph(object): for l in self.levels: result += 'PosY: ' + str(l) + '\n' for node in self.levels[l]: - result += '\tPosX: '+ str(self.result[node]['x']) + ' - Node:' + node + "\n" + result += '\tPosX: '+ str(self.result[node]['y']) + ' - Node:' + node + "\n" return result @@ -684,16 +680,16 @@ class graph(object): #for flat edges ie. source an destination nodes are on the same rank for src in self.transitions: for des in self.transitions[src]: - if (self.result[des]['y'] - self.result[src]['y'] == 0): - self.result[src]['y'] += 0.08 - self.result[des]['y'] -= 0.08 + if (self.result[des]['x'] - self.result[src]['x'] == 0): + self.result[src]['x'] += 0.08 + self.result[des]['x'] -= 0.08 factorX = maxx + nheight factorY = maxy + nwidth for node in self.result: - self.result[node]['x'] = (self.result[node]['x']) * factorX + margin - self.result[node]['y'] = (self.result[node]['y']) * factorY + margin + self.result[node]['y'] = (self.result[node]['y']) * factorX + margin + self.result[node]['x'] = (self.result[node]['x']) * factorY + margin def result_get(self): @@ -731,13 +727,13 @@ if __name__=='__main__': draw = ImageDraw.Draw(img) for name,node in g.result.items(): - draw.arc( (int(node['x']-radius), int(node['y']-radius),int(node['x']+radius), int(node['y']+radius) ), 0, 360, (128,128,128)) - draw.text( (int(node['x']), int(node['y'])), name, (128,128,128)) + draw.arc( (int(node['y']-radius), int(node['x']-radius),int(node['y']+radius), int(node['x']+radius) ), 0, 360, (128,128,128)) + draw.text( (int(node['y']), int(node['x'])), name, (128,128,128)) for nodefrom in g.transitions: for nodeto in g.transitions[nodefrom]: - draw.line( (int(g.result[nodefrom]['x']), int(g.result[nodefrom]['y']),int(g.result[nodeto]['x']),int(g.result[nodeto]['y'])),(128,128,128) ) + draw.line( (int(g.result[nodefrom]['y']), int(g.result[nodefrom]['x']),int(g.result[nodeto]['y']),int(g.result[nodeto]['x'])),(128,128,128) ) img.save("graph.png", "PNG") From 56d6d3235d98f8889df5c86538a85adb4c1a89cb Mon Sep 17 00:00:00 2001 From: Priyesh Date: Tue, 23 Sep 2008 18:28:32 +0530 Subject: [PATCH 002/104] made sale_process.xml for sales workflow in sale module bzr revid: solanki.priyesh@gmail.com-20080923125832-5ly7v74to7202t1t --- addons/process/__terp__.py | 1 + addons/sale/process/sale_process.xml | 243 +++++++++++++++++++++++++++ 2 files changed, 244 insertions(+) create mode 100644 addons/sale/process/sale_process.xml diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py index f8cbf4ad927..80008ca6181 100644 --- a/addons/process/__terp__.py +++ b/addons/process/__terp__.py @@ -14,6 +14,7 @@ This module allows you to manage your process for the end-users. "update_xml" : [ "security/ir.model.access.csv", 'process_view.xml', + '../sale/process/sale_process.xml' ], "active": False, "installable": True diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml new file mode 100644 index 00000000000..6865fa8a57b --- /dev/null +++ b/addons/sale/process/sale_process.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 457ada6dff32509b78495d22c4d9e60da40232d3 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Fri, 26 Sep 2008 20:18:14 +0530 Subject: [PATCH 004/104] Demo of all process bzr revid: solanki.priyesh@gmail.com-20080926144814-4lyid0srfi35ff1d --- addons/account/process/invoice_process.xml | 214 ++++++++++++++++++ addons/account/process/statement_process.xml | 135 +++++++++++ .../process/hr_timesheet_process.xml | 135 +++++++++++ .../process/hr_timesheet_sheet_process.xml | 154 +++++++++++++ addons/process/__terp__.py | 13 +- addons/product/process/product_process.xml | 141 ++++++++++++ addons/project/process/task_process.xml | 177 +++++++++++++++ addons/purchase/process/purchase_process.xml | 155 +++++++++++++ 8 files changed, 1123 insertions(+), 1 deletion(-) create mode 100644 addons/account/process/invoice_process.xml create mode 100644 addons/account/process/statement_process.xml create mode 100644 addons/hr_timesheet/process/hr_timesheet_process.xml create mode 100644 addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml create mode 100644 addons/product/process/product_process.xml create mode 100644 addons/project/process/task_process.xml create mode 100644 addons/purchase/process/purchase_process.xml diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml new file mode 100644 index 00000000000..7e8e3ef7c7a --- /dev/null +++ b/addons/account/process/invoice_process.xml @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml new file mode 100644 index 00000000000..10365e76df0 --- /dev/null +++ b/addons/account/process/statement_process.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_timesheet/process/hr_timesheet_process.xml b/addons/hr_timesheet/process/hr_timesheet_process.xml new file mode 100644 index 00000000000..9af5f1453a3 --- /dev/null +++ b/addons/hr_timesheet/process/hr_timesheet_process.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml new file mode 100644 index 00000000000..8ba8e0392d9 --- /dev/null +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py index 80008ca6181..b692a8f3c8e 100644 --- a/addons/process/__terp__.py +++ b/addons/process/__terp__.py @@ -10,7 +10,18 @@ This module allows you to manage your process for the end-users. """, "depends" : ["base", "sale"], "init_xml" : [], - "demo_xml" : ['process_demo.xml'], +# "demo_xml" : ['process_demo.xml'], + "demo_xml" : [ + '../sale/process/sale_process.xml', + '../hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml', + '../account/process/invoice_process.xml', + '../account/process/statement_process.xml', + '../project/process/task_process.xml', + '../hr_timesheet/process/hr_timesheet_process.xml', + '../purchase/process/purchase_process.xml', + '../product/process/product_process.xml', + ] + "update_xml" : [ "security/ir.model.access.csv", 'process_view.xml', diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml new file mode 100644 index 00000000000..73d28808133 --- /dev/null +++ b/addons/product/process/product_process.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml new file mode 100644 index 00000000000..9f5da3b2de0 --- /dev/null +++ b/addons/project/process/task_process.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml new file mode 100644 index 00000000000..05a1857cbe3 --- /dev/null +++ b/addons/purchase/process/purchase_process.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From f3dfb5481bd5209772ace8523a53c904dda5a56f Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Mon, 29 Sep 2008 11:54:46 +0530 Subject: [PATCH 006/104] modified some chenges in invoice sxw and rml file in account module bzr revid: vinusoft85@gmail.com-20080929062446-aj0grlmuelp34ae7 --- addons/account/report/invoice.rml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index 7b82cb44bd9..37b6872dece 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -350,9 +350,6 @@ [[ format(l.note or removeParentNode('tr')) ]] - - - @@ -466,19 +463,16 @@ - Tax + Tax - Base + Base - Amount + Amount - - - From 5c02f5e44e62870e1df882e629baaf5e9056f18b Mon Sep 17 00:00:00 2001 From: Priyesh Date: Mon, 29 Sep 2008 12:44:10 +0530 Subject: [PATCH 007/104] demo for procurement flow bzr revid: solanki.priyesh@gmail.com-20080929071410-xc0t6oqb2tvvcv8f --- addons/mrp/process/procurement_process.xml | 275 +++++++++++++++++++++ addons/process/__terp__.py | 1 + 2 files changed, 276 insertions(+) create mode 100644 addons/mrp/process/procurement_process.xml diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml new file mode 100644 index 00000000000..73e12053143 --- /dev/null +++ b/addons/mrp/process/procurement_process.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py index b692a8f3c8e..2dbab4d079c 100644 --- a/addons/process/__terp__.py +++ b/addons/process/__terp__.py @@ -20,6 +20,7 @@ This module allows you to manage your process for the end-users. '../hr_timesheet/process/hr_timesheet_process.xml', '../purchase/process/purchase_process.xml', '../product/process/product_process.xml', + '../mrp/process/procurement_process.xml', ] "update_xml" : [ From ce6f095b2d8bac105e7e17c2cb0f90d42875f517 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Mon, 29 Sep 2008 14:10:56 +0530 Subject: [PATCH 008/104] modified terp files bzr revid: solanki.priyesh@gmail.com-20080929084056-35wl5hygi2b5ny30 --- addons/account/__terp__.py | 4 +++- addons/hr_timesheet/__terp__.py | 3 ++- addons/hr_timesheet_sheet/__terp__.py | 5 +++-- addons/mrp/__terp__.py | 3 ++- addons/process/__terp__.py | 14 +------------- addons/product/__terp__.py | 5 +++-- addons/project/__terp__.py | 3 ++- addons/purchase/__terp__.py | 3 ++- addons/sale/__terp__.py | 3 ++- 9 files changed, 20 insertions(+), 23 deletions(-) diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index 2051c8dc501..bed1cc2a0b6 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -29,7 +29,7 @@ { "name" : "Accounting and financial management", "version" : "1.0", - "depends" : ["product", "base"], + "depends" : ["product", "base", "process"], "author" : "Tiny", "description": """Financial and accounting module that covers: General accounting @@ -66,6 +66,8 @@ "project/project_report.xml", "product_view.xml", "account_assert_test.xml", + "process/invoice_process.xml" + "process/statement_process.xml" ], "translations" : { "fr": "i18n/french_fr.csv" diff --git a/addons/hr_timesheet/__terp__.py b/addons/hr_timesheet/__terp__.py index 1004f06d903..fd84f3fb051 100644 --- a/addons/hr_timesheet/__terp__.py +++ b/addons/hr_timesheet/__terp__.py @@ -43,7 +43,7 @@ Lots of reporting on time and employee tracking are provided. It is completly integrated with the cost accounting module. It allows you to set up a management by affair. """, - "depends" : ["account", "hr", "base", "hr_attendance"], + "depends" : ["account", "hr", "base", "hr_attendance", "process"], "init_xml" : ["hr_timesheet_data.xml"], "demo_xml" : ["hr_timesheet_demo.xml",], "update_xml" : [ @@ -51,6 +51,7 @@ to set up a management by affair. "hr_timesheet_view.xml", "hr_timesheet_report.xml", "hr_timesheet_wizard.xml", + "process/hr_timesheet_process.xml" ], "active": False, "installable": True diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__terp__.py index 4c307a5af33..19419f71dd1 100644 --- a/addons/hr_timesheet_sheet/__terp__.py +++ b/addons/hr_timesheet_sheet/__terp__.py @@ -51,13 +51,14 @@ The validation can be configured in te company: * Period size (day, week, month, year) * Maximal difference between timesheet and attendances """, - "depends" : ["hr_timesheet", "hr_timesheet_invoice"], + "depends" : ["hr_timesheet", "hr_timesheet_invoice", "process"], "init_xml" : [], "demo_xml" : ["hr_timesheet_sheet_demo.xml",], "update_xml" : [ "security/ir.model.access.csv", "hr_timesheet_sheet_view.xml", - "hr_timesheet_workflow.xml" + "hr_timesheet_workflow.xml", + "process/hr_timesheet_sheet_process.xml" ], "active": False, "installable": True diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py index 8fa15f145fd..ea672858ebc 100644 --- a/addons/mrp/__terp__.py +++ b/addons/mrp/__terp__.py @@ -32,7 +32,7 @@ "author" : "Tiny", "website" : "http://tinyerp.com/module_mrp.html", "category" : "Generic Modules/Production", - "depends" : ["stock", "hr", "purchase", "product"], + "depends" : ["stock", "hr", "purchase", "product", "process"], "description": """ This is the base module to manage the manufacturing process in Tiny ERP. @@ -70,6 +70,7 @@ "mrp_wizard.xml", "mrp_report.xml", "company_view.xml", + "process/procurement_process.xml" ], "active": False, "installable": True diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py index 2dbab4d079c..80008ca6181 100644 --- a/addons/process/__terp__.py +++ b/addons/process/__terp__.py @@ -10,19 +10,7 @@ This module allows you to manage your process for the end-users. """, "depends" : ["base", "sale"], "init_xml" : [], -# "demo_xml" : ['process_demo.xml'], - "demo_xml" : [ - '../sale/process/sale_process.xml', - '../hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml', - '../account/process/invoice_process.xml', - '../account/process/statement_process.xml', - '../project/process/task_process.xml', - '../hr_timesheet/process/hr_timesheet_process.xml', - '../purchase/process/purchase_process.xml', - '../product/process/product_process.xml', - '../mrp/process/procurement_process.xml', - ] - + "demo_xml" : ['process_demo.xml'], "update_xml" : [ "security/ir.model.access.csv", 'process_view.xml', diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py index 34cd432b10e..c9e52f9b7e5 100644 --- a/addons/product/__terp__.py +++ b/addons/product/__terp__.py @@ -31,7 +31,7 @@ "version" : "1.0", "author" : "Tiny", "category" : "Generic Modules/Inventory Control", - "depends" : ["base"], + "depends" : ["base", "process"], "init_xml" : [], "demo_xml" : ["product_demo.xml"], "description": """ @@ -57,7 +57,8 @@ "security/ir.model.access.csv", "product_data.xml","product_report.xml", "product_view.xml", "pricelist_view.xml", - "partner_view.xml", "product_wizard.xml"], + "partner_view.xml", "product_wizard.xml", + "process/product_process.xml"], "active": False, "installable": True } diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py index cbef75ca0e3..d153de14336 100644 --- a/addons/project/__terp__.py +++ b/addons/project/__terp__.py @@ -32,7 +32,7 @@ "author" : "Tiny", "website" : "http://tinyerp.com/module_project.html", "category" : "Generic Modules/Projects & Services", - "depends" : ["product", "account", "hr"], + "depends" : ["product", "account", "hr", "process"], "description": "Project management module that track multi-level projects, tasks, works done on tasks, eso. It is able to render planning, order tasks, eso.", "init_xml" : [], "demo_xml" : ["project_demo.xml"], @@ -43,6 +43,7 @@ "project_wizard.xml", "project_view.xml", "project_report.xml", + "process/task_process.xml" ], "active": False, "installable": True diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py index d5d50f6d5f8..ec218e520c5 100644 --- a/addons/purchase/__terp__.py +++ b/addons/purchase/__terp__.py @@ -31,7 +31,7 @@ "version" : "1.0", "author" : "Tiny", "website" : "http://tinyerp.com/module_purchase.html", - "depends" : ["base", "account", "stock"], + "depends" : ["base", "account", "stock", "process"], "category" : "Generic Modules/Sales & Purchases", "init_xml" : [], "demo_xml" : ["purchase_demo.xml", @@ -48,6 +48,7 @@ "purchase_wizard.xml", "stock_view.xml", "partner_view.xml" + "process/purchase_process.xml" ], "active": False, "installable": True diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py index d5bc58a98ae..6dbd080b853 100644 --- a/addons/sale/__terp__.py +++ b/addons/sale/__terp__.py @@ -31,7 +31,7 @@ "version" : "1.0", "author" : "Tiny", "website" : "http://tinyerp.com/module_sale.html", - "depends" : ["product", "stock", "mrp"], + "depends" : ["product", "stock", "mrp", "process"], "category" : "Generic Modules/Sales & Purchases", "init_xml" : [], "demo_xml" : ["sale_demo.xml"], @@ -62,6 +62,7 @@ "sale_report.xml", "sale_wizard.xml", "stock_view.xml", + "process/sale_process.xml" ], "active": False, "installable": True From 6a057519f8ba642319216f2cab35595f27b42680 Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Tue, 30 Sep 2008 14:18:03 +0530 Subject: [PATCH 009/104] modified account_analytic_profit.sxw and rml in hr_timesheet_invoice module bzr revid: vinusoft85@gmail.com-20080930084803-cjjtmc1g8vlzxzvq --- .../report/account_analytic_profit.rml | 343 +++++++----------- 1 file changed, 139 insertions(+), 204 deletions(-) diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml index 0fc27c8c1a1..1e3a7972fda 100644 --- a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml +++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml @@ -10,11 +10,11 @@ - + - + @@ -28,7 +28,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -52,37 +52,37 @@ - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + - - - - - - - - @@ -92,7 +92,6 @@ - @@ -113,15 +112,18 @@ - + + + + - + - + @@ -129,240 +131,173 @@ Invoice rate by user - + - + - + - + - Period from startdate + Period from startdate - Period to enddate + Period to enddate - Currency + Currency - + - [[ data['form']['date_from'] ]] + [[ data['form']['date_from'] ]] - [[ data['form']['date_to'] ]] + [[ data['form']['date_to'] ]] - [[ company.currency_id.name ]] + [[ company.currency_id.name ]] - + - + - + - Employee + Employee or Journal Name - + Units + + + Theorical + + + Income + + + Cost + + + Profit + + + Eff. + + + + + + + + + + Totals: + + + [[ reduce(lambda x, y: x+y['unit_amount'], line(data['form'], data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] + + + - Units + [[ reduce(lambda x, y: x+y['amount'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] - Theorical + [[ reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] - Income + [[ reduce(lambda x, y: x+y['profit'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] - Cost - - - Profit - - - Eff. + [[ round(reduce(lambda x, y: x+y['amount'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)/reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)* -100, 2)]] % - +
- [[ repeatIn(user_ids(lines(data['form'])), 'e') ]] - + [[ repeatIn(user_ids(lines(data['form'])), 'e') ]] + - [[ e.name ]] + [[ e.name ]] + [[ repeatIn(journal_ids(data['form'], e.id), 'j') ]] + + + [[ reduce(lambda x, y: x+y['unit_amount'], line(data['form'], [j.id], [e.id]), 0) ]] + + + [[ reduce(lambda x, y: x+y['amount_th'], line(data['form'], [j.id], [e.id]), 0) ]] + + + [[ reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) ]] + + + [[ reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) ]] + + + [[ reduce(lambda x, y: x+y['profit'], line(data['form'], [j.id], [e.id]), 0) ]] + + + [[ '%d' % (reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) / reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) * 100.0,)]] % - [[ repeatIn(journal_ids(data['form'], e.id), 'j') ]] [[ j.name ]] - - - - - - - - - [[ reduce(lambda x, y: x+y['unit_amount'], line(data['form'], [j.id], [e.id]), 0) ]] - - - [[ reduce(lambda x, y: x+y['amount_th'], line(data['form'], [j.id], [e.id]), 0) ]] - - - [[ reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) ]] - - - [[ reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) ]] - - - [[ reduce(lambda x, y: x+y['profit'], line(data['form'], [j.id], [e.id]), 0) ]] - - - [[ '%d' % (reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) / reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) * 100.0,)]] % - - - - - [[ repeatIn(line(data['form'], [j.id], [e.id]), 'l') ]] - [[ l['name'] ]] - - - [[ l['unit_amount'] ]] - - - [[ l['amount_th'] ]] - - - [[ l['amount'] ]] - - - [[ l['cost'] ]] - - - [[ l['profit'] ]] - - - [[ l['eff'] ]] % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - Totals - - - - - - - - - - - [[ reduce(lambda x, y: x+y['unit_amount'], line(data['form'], data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] - - - - - - - - [[ reduce(lambda x, y: x+y['amount'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] - - - [[ reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] - - - [[ reduce(lambda x, y: x+y['profit'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] - - - [[ round(reduce(lambda x, y: x+y['amount'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)/reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)* -100, 2)]] % - - - - - - - - - - - - -
+ + + + [[ repeatIn(line(data['form'], [j.id],[e.id]), 'l') ]] + + + + [[ l['name'] ]] + + + [[ l['unit_amount'] ]] + + + [[ l['amount_th'] ]] + + + [[ l['amount'] ]] + + + [[ l['cost'] ]] + + + [[ l['profit'] ]] + + + [[ l['eff'] ]] % + + +
+ + + From c45d17392bb0e6b0b147d12c89d45f5299c10497 Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Tue, 30 Sep 2008 17:06:04 +0530 Subject: [PATCH 010/104] modified account_analytic_profit.sxw and rml in hr_timesheet_invoice module bzr revid: vinusoft85@gmail.com-20080930113604-fcuc6kidr1jsy26s --- .../report/account_analytic_profit.rml | 84 +++++++++++++------ 1 file changed, 57 insertions(+), 27 deletions(-) diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml index 1e3a7972fda..fe783c3c79f 100644 --- a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml +++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml @@ -67,18 +67,16 @@ - + + - + + + + + - - - - - - - @@ -217,29 +215,29 @@ - [[ reduce(lambda x, y: x+y['amount'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] + [[ reduce(lambda x, y: x+y['amount'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] - [[ reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] + [[ reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] - [[ reduce(lambda x, y: x+y['profit'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] + [[ reduce(lambda x, y: x+y['profit'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] - [[ round(reduce(lambda x, y: x+y['amount'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)/reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)* -100, 2)]] % + [[ round(reduce(lambda x, y: x+y['amount'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)/reduce(lambda x, y: x+y['cost'], line(data['form'],data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0)* -100, 2)]] % - - - +
[[ repeatIn(user_ids(lines(data['form'])), 'e') ]] - + [[ e.name ]] - [[ repeatIn(journal_ids(data['form'], e.id), 'j') ]] + + + [[ repeatIn(journal_ids(data['form'], e.id), 'j') ]] [[ reduce(lambda x, y: x+y['unit_amount'], line(data['form'], [j.id], [e.id]), 0) ]] @@ -248,29 +246,58 @@ [[ reduce(lambda x, y: x+y['amount_th'], line(data['form'], [j.id], [e.id]), 0) ]] - [[ reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) ]] + [[ reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) ]] - [[ reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) ]] + [[ reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) ]] - [[ reduce(lambda x, y: x+y['profit'], line(data['form'], [j.id], [e.id]), 0) ]] + [[ reduce(lambda x, y: x+y['profit'], line(data['form'], [j.id], [e.id]), 0) ]] - [[ '%d' % (reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) / reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) * 100.0,)]] % + [[ '%d' % (reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) / reduce(lambda x, y: x+y['cost'], line(data['form'], [j.id], [e.id]), 0) * 100.0,)]] % + + [[ j.name ]] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - [[ repeatIn(line(data['form'], [j.id],[e.id]), 'l') ]] - + [[ l['name'] ]] @@ -295,9 +322,12 @@ + + +
- + \ No newline at end of file From 735fc82f7bc5555e86ee45dd571896f75ff3b80a Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Tue, 30 Sep 2008 17:58:15 +0530 Subject: [PATCH 011/104] doing some changes account_analytic_profit.sxw and rml in hr_timesheet_invoice module bzr revid: vinusoft85@gmail.com-20080930122815-0nb9ae1m5exa6ig1 --- .../hr_timesheet_invoice/report/account_analytic_profit.rml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml index fe783c3c79f..897bb26da55 100644 --- a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml +++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml @@ -207,7 +207,7 @@ Totals: - [[ reduce(lambda x, y: x+y['unit_amount'], line(data['form'], data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] + [[ reduce(lambda x, y: x+y['unit_amount'], line(data['form'], data['form']['journal_ids'][0][2], data['form']['employee_ids'][0][2]), 0) ]] @@ -240,10 +240,10 @@ [[ repeatIn(journal_ids(data['form'], e.id), 'j') ]] - [[ reduce(lambda x, y: x+y['unit_amount'], line(data['form'], [j.id], [e.id]), 0) ]] + [[ reduce(lambda x, y: x+y['unit_amount'], line(data['form'], [j.id], [e.id]), 0) ]] - [[ reduce(lambda x, y: x+y['amount_th'], line(data['form'], [j.id], [e.id]), 0) ]] + [[ reduce(lambda x, y: x+y['amount_th'], line(data['form'], [j.id], [e.id]), 0) ]] [[ reduce(lambda x, y: x+y['amount'], line(data['form'], [j.id], [e.id]), 0) ]] From f56900c5686b03fb5b10b2dbae8df5d1f76eb0c3 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Tue, 30 Sep 2008 19:01:00 +0530 Subject: [PATCH 012/104] modified files for demo of process bzr revid: solanki.priyesh@gmail.com-20080930133100-fwqoguvrwpy41poc --- addons/.pydevproject | 6 + addons/account/__terp__.py | 2 +- addons/account/process/invoice_process.xml | 40 ------ .../process/hr_timesheet_process.xml | 119 ------------------ addons/hr_timesheet_project/__terp__.py | 4 +- .../process/hr_timesheet_project_process.xml | 75 +++++++++++ addons/hr_timesheet_sheet/__terp__.py | 2 +- .../process/hr_timesheet_sheet_process.xml | 108 +++++++++++++--- addons/mrp/__terp__.py | 2 +- addons/mrp/process/procurement_process.xml | 109 ++++++++++------ addons/process/__terp__.py | 7 +- addons/product/__terp__.py | 3 +- addons/product/process/product_process.xml | 47 ------- addons/project/process/task_process.xml | 63 +--------- addons/project_mrp/__terp__.py | 6 +- .../process/project_mrp_process.xml | 84 +++++++++++++ addons/purchase/__terp__.py | 2 +- addons/purchase/process/purchase_process.xml | 32 ++--- addons/sale/__terp__.py | 2 +- addons/sale/process/sale_process.xml | 77 ++++++++---- addons/scrum/__terp__.py | 3 +- addons/scrum/process/scrum_process.xml | 34 +++++ 22 files changed, 446 insertions(+), 381 deletions(-) create mode 100644 addons/.pydevproject create mode 100644 addons/hr_timesheet_project/process/hr_timesheet_project_process.xml create mode 100644 addons/project_mrp/process/project_mrp_process.xml create mode 100644 addons/scrum/process/scrum_process.xml diff --git a/addons/.pydevproject b/addons/.pydevproject new file mode 100644 index 00000000000..78259a9c3db --- /dev/null +++ b/addons/.pydevproject @@ -0,0 +1,6 @@ + + + + +python 2.4 + diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index bed1cc2a0b6..01d9f9e499f 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -66,7 +66,7 @@ "project/project_report.xml", "product_view.xml", "account_assert_test.xml", - "process/invoice_process.xml" + "process/invoice_process.xml", "process/statement_process.xml" ], "translations" : { diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index 7e8e3ef7c7a..e38d3d8b288 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -16,28 +16,6 @@ Process Node --> - - - - - - - - - - - - - - - - - - - - - - @@ -129,24 +107,6 @@ Process Transition --> - - - - - - - - - - - - - - - - - - diff --git a/addons/hr_timesheet/process/hr_timesheet_process.xml b/addons/hr_timesheet/process/hr_timesheet_process.xml index 9af5f1453a3..157ffc09deb 100644 --- a/addons/hr_timesheet/process/hr_timesheet_process.xml +++ b/addons/hr_timesheet/process/hr_timesheet_process.xml @@ -12,124 +12,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/addons/hr_timesheet_project/__terp__.py b/addons/hr_timesheet_project/__terp__.py index bc2db6c0d8c..06922784d56 100644 --- a/addons/hr_timesheet_project/__terp__.py +++ b/addons/hr_timesheet_project/__terp__.py @@ -33,8 +33,8 @@ "category" : "Generic Modules/Human Resources", "description": """Auto-complete timesheet based on tasks made on the project management module.""", "website" : "http://tinyerp.com/module_hr.html", - "depends" : ["project", "hr_timesheet"], - "update_xml" : ["hr_timesheet_project_view.xml"], + "depends" : ["project", "hr_timesheet_sheet"], + "update_xml" : ["hr_timesheet_project_view.xml", "process/hr_timesheet_project_process.xml"], "active": False, "installable": True } diff --git a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml new file mode 100644 index 00000000000..5c96a0c8239 --- /dev/null +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__terp__.py index 19419f71dd1..f09a7d63978 100644 --- a/addons/hr_timesheet_sheet/__terp__.py +++ b/addons/hr_timesheet_sheet/__terp__.py @@ -58,7 +58,7 @@ The validation can be configured in te company: "security/ir.model.access.csv", "hr_timesheet_sheet_view.xml", "hr_timesheet_workflow.xml", - "process/hr_timesheet_sheet_process.xml" + "process/hr_timesheet_sheet_process.xml", ], "active": False, "installable": True diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml index 8ba8e0392d9..2e59204aa30 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -15,18 +15,63 @@ - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -96,15 +141,6 @@ Process Transition --> - - - - - - - - - @@ -149,6 +185,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py index ea672858ebc..3f4b301fe11 100644 --- a/addons/mrp/__terp__.py +++ b/addons/mrp/__terp__.py @@ -70,7 +70,7 @@ "mrp_wizard.xml", "mrp_report.xml", "company_view.xml", - "process/procurement_process.xml" + "process/procurement_process.xml", ], "active": False, "installable": True diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 73e12053143..f0eae8dd157 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -15,6 +15,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27,17 +58,6 @@ - - - - - - - - - - - @@ -93,17 +113,6 @@ - - - - - - - - - - - @@ -172,15 +181,6 @@ - - - - - - - - - @@ -217,15 +217,6 @@ - - - - - - - - - @@ -270,6 +261,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py index 80008ca6181..ca48fada8a6 100644 --- a/addons/process/__terp__.py +++ b/addons/process/__terp__.py @@ -8,14 +8,13 @@ "description": """ This module allows you to manage your process for the end-users. """, - "depends" : ["base", "sale"], + "depends" : ["base"], "init_xml" : [], - "demo_xml" : ['process_demo.xml'], + "demo_xml" : [], "update_xml" : [ "security/ir.model.access.csv", 'process_view.xml', - '../sale/process/sale_process.xml' - ], + ], "active": False, "installable": True } diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py index c9e52f9b7e5..0328b8d03e9 100644 --- a/addons/product/__terp__.py +++ b/addons/product/__terp__.py @@ -58,7 +58,8 @@ "product_data.xml","product_report.xml", "product_view.xml", "pricelist_view.xml", "partner_view.xml", "product_wizard.xml", - "process/product_process.xml"], + "process/product_process.xml" + ], "active": False, "installable": True } diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index 73d28808133..987f86331ae 100644 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -27,26 +27,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -83,24 +63,6 @@ Process Transition --> - - - - - - - - - - - - - - - - - - @@ -110,15 +72,6 @@ - - - - - - - - - diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 9f5da3b2de0..4fef858fa8e 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -16,17 +16,6 @@ Process Node --> - - - - - - - - - - - @@ -38,17 +27,6 @@ - - - - - - - - - - - @@ -94,31 +72,10 @@ - - - - - - - - - - - - - - - - - - - - - @@ -128,15 +85,6 @@ - - - - - - - - - @@ -163,15 +111,6 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/addons/project_mrp/__terp__.py b/addons/project_mrp/__terp__.py index 208b879cef7..e83b5e832db 100644 --- a/addons/project_mrp/__terp__.py +++ b/addons/project_mrp/__terp__.py @@ -5,7 +5,7 @@ "author" : "Tiny", "website" : "http://tinyerp.com/module_project.html", "category" : "Generic Modules/Projects & Services", - "depends" : ["project", 'mrp'], + "depends" : ["project", 'mrp', "sale"], "description": """ This module is used to automatically create tasks base on different procurements: sales order, manufacturing order, ... @@ -15,7 +15,9 @@ order on services products. """, "init_xml" : [], "demo_xml" : [], - "update_xml": ["project_workflow.xml"], + "update_xml": ["project_workflow.xml", + "process/project_mrp_process.xml" + ], "active": False, "installable": True } diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml new file mode 100644 index 00000000000..c8bd1738314 --- /dev/null +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py index ec218e520c5..0c24b8df2f4 100644 --- a/addons/purchase/__terp__.py +++ b/addons/purchase/__terp__.py @@ -47,7 +47,7 @@ "purchase_report.xml", "purchase_wizard.xml", "stock_view.xml", - "partner_view.xml" + "partner_view.xml", "process/purchase_process.xml" ], "active": False, diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index 05a1857cbe3..ce69d273c01 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -16,14 +16,14 @@ Process Node --> - - - + + + - - - - + + + + @@ -96,15 +96,6 @@ - - - - - - - - - @@ -150,6 +141,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py index 6dbd080b853..fd9e2440794 100644 --- a/addons/sale/__terp__.py +++ b/addons/sale/__terp__.py @@ -62,7 +62,7 @@ "sale_report.xml", "sale_wizard.xml", "stock_view.xml", - "process/sale_process.xml" + "process/sale_process.xml", ], "active": False, "installable": True diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 6865fa8a57b..217172d46e2 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -1,11 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -62,24 +93,6 @@ - - - - - - - - - - - - - - - - - - @@ -90,6 +103,10 @@ + + @@ -97,6 +114,10 @@ + + @@ -211,12 +232,22 @@ - + + - - - - + + + + + + + + + + + + + diff --git a/addons/scrum/__terp__.py b/addons/scrum/__terp__.py index 7be9cb422be..dfb466307c0 100644 --- a/addons/scrum/__terp__.py +++ b/addons/scrum/__terp__.py @@ -30,7 +30,7 @@ "name" : "Scrum, Agile Development Method", "version": "1.0", "author" : "Tiny", - "depends" : ["project"], + "depends" : ["project", "process"], "category" : "Enterprise Specific Modules/Information Technology", "init_xml" : [], "description": """ @@ -61,6 +61,7 @@ "scrum_view.xml", "scrum_report.xml", "scrum_wizard.xml", + "process/scrum_process.xml", ], "active": False, "installable": True diff --git a/addons/scrum/process/scrum_process.xml b/addons/scrum/process/scrum_process.xml new file mode 100644 index 00000000000..9fbaec3964b --- /dev/null +++ b/addons/scrum/process/scrum_process.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From bd689b530d1ac47056fde893b9591d370066e35b Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Tue, 30 Sep 2008 19:05:17 +0530 Subject: [PATCH 013/104] modified hr expense report sxw and rml in hr expense module bzr revid: vinusoft85@gmail.com-20080930133517-cik7kwytqnj71ec0 --- addons/hr_expense/report/expense.rml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml index e39874f84f3..7ab564bf011 100644 --- a/addons/hr_expense/report/expense.rml +++ b/addons/hr_expense/report/expense.rml @@ -159,13 +159,13 @@ Ref. - Unit Price + Unit Price Qty - Total + Total Price From 2a18ecb3389c510d7b238a1911e6d38f3954dd1f Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Fri, 3 Oct 2008 15:29:21 +0530 Subject: [PATCH 014/104] doing some changes in account_balance report py and rml file in account module bzr revid: vinusoft85@gmail.com-20081003095921-yd5tjxwerhxvwpyj --- addons/account/report/account_balance.py | 10 ++++++++- addons/account/report/account_balance.rml | 27 ++++++++++++----------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 5ff60c44a18..1ecb0869876 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -71,7 +71,10 @@ class account_balance(report_sxw.rml_parse): self.cr.execute("select name from account_period where id in (%s)" % (period_ids)) res=self.cr.fetchall() for r in res: - result+=r[0]+", " + if (r == res[res.__len__()-1]): + result+=r[0]+". " + else: + result+=r[0]+", " return str(result and result[:-1]) or '' def lines(self, form, ids={}, done=None, level=1): @@ -118,6 +121,7 @@ class account_balance(report_sxw.rml_parse): 'credit': account.credit, 'balance': account.balance, 'leef': not bool(account.child_id), + 'bal_type':'', } self.sum_debit += account.debit self.sum_credit += account.credit @@ -177,6 +181,10 @@ class account_balance(report_sxw.rml_parse): r['credit']='' r['balance']='' r['leef']='' + if sum > 0.0: + r['bal_type']=" Dr." + else: + r['bal_type']=" Cr." return res or '' def date_range(self,start,end): diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 462a7bd1744..0b614106551 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -61,15 +61,14 @@ - - + - - + + - + @@ -94,7 +93,7 @@ fontSize="8.0" /> [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ (a['level']<6 and removeParentNode('font') or '... '*(a['level']-4)) ]][[ setTag('blockTable','blockTable',{'style':'TrLevel'+str(a['level'])}) ]][[ a['name'] ]] - [[ formatLang(a['debit']) and '%.2f'%a['debit'] or '']] + [[ (a['level']<4) and setTag('para','para',{'style':'P3'}) ]][[ (a['leef'] and removeParentNode('para')) or formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] + [[ ((not a['leef']) and removeParentNode('para')) or formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] - [[ formatLang(a['credit']) and '%.2f'%a['credit'] or '']] + [[ (a['level']<4) and setTag('para','para',{'style':'P3'}) ]][[ (a['leef'] and removeParentNode('para')) or formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] + [[ ((not a['leef']) and removeParentNode('para')) or formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] - [[ (a['level']<4) and setTag('para','para',{'style':'P3a'}) ]][[ (a['leef'] and removeParentNode('para')) or formatLang(a['balance']) and '%.2f'%a['balance'] or '' ]] - [[ ((not a['leef']) and removeParentNode('para')) or formatLang(a['balance']) and formatLang(a['balance']) or '' ]] + [[ (a['level']<4) and setTag('para','para',{'style':'P3a'}) ]][[ (a['leef'] and removeParentNode('para')) or formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]] + [[ ((not a['leef']) and removeParentNode('para')) or formatLang(a['balance']) and formatLang(a['balance']) or '0.00' ]] @@ -166,13 +167,13 @@ [[ '... '*(a['level']-3) ]][[ a['lname'] ]] - [[ formatLang(a['debit1']) and '%.2f'%a['debit1'] or '']] + [[ formatLang(a['debit1']) and '%.2f'%a['debit1'] or '0.00']] - [[ formatLang(a['credit1']) and '%.2f'%a['credit1'] or '']] + [[ formatLang(a['credit1']) and '%.2f'%a['credit1'] or '0.00']] - [[ formatLang(a['balance1']) and '%.2f'%a['balance1'] or '']] + [[ formatLang(a['balance1']) and '%.2f'%a['balance1'] or '0.00' ]] From 79da75376d73067ae93da5b51abd607f6c43fe4a Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Mon, 6 Oct 2008 19:42:47 +0530 Subject: [PATCH 015/104] done some changes in account balance report rml file in account module bzr revid: vinusoft85@gmail.com-20081006141247-9oeze2t4l4d1p92a --- addons/account/report/account_balance.rml | 138 +++++++++++++++++++--- 1 file changed, 123 insertions(+), 15 deletions(-) diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 0b614106551..7ba0204caa4 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -19,6 +19,7 @@ 1cm 27.7cm 20cm 27.7cm + @@ -51,12 +52,15 @@ + + + - + @@ -75,6 +79,11 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -146,34 +254,34 @@ [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ a['code'] or removeParentNode('tr') ]] - [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ (a['level']<6 and removeParentNode('font') or '... '*(a['level']-4)) ]][[ setTag('blockTable','blockTable',{'style':'TrLevel'+str(a['level'])}) ]][[ a['name'] ]] + [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ setTag('blockTable','blockTable',{'style':'TrLevel'+str(a['level'])}) ]][[ a['name'] ]] - [[ (a['level']<4) and setTag('para','para',{'style':'P3'}) ]][[ (a['leef'] and removeParentNode('para')) or formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] - [[ ((not a['leef']) and removeParentNode('para')) or formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] + [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] + [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] - [[ (a['level']<4) and setTag('para','para',{'style':'P3'}) ]][[ (a['leef'] and removeParentNode('para')) or formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] - [[ ((not a['leef']) and removeParentNode('para')) or formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] + [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] + [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] - [[ (a['level']<4) and setTag('para','para',{'style':'P3a'}) ]][[ (a['leef'] and removeParentNode('para')) or formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]] - [[ ((not a['leef']) and removeParentNode('para')) or formatLang(a['balance']) and formatLang(a['balance']) or '0.00' ]] + [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]] + [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]] - [[ a['jname'] or removeParentNode('tr') ]] + [[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][[ a['jname'] or removeParentNode('tr') ]] - [[ '... '*(a['level']-3) ]][[ a['lname'] ]] + [[ a['level']<4 and removeParentNode('font') or '...'*(2) ]][[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][[ a['lname'] ]] - [[ formatLang(a['debit1']) and '%.2f'%a['debit1'] or '0.00']] + [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit1']) and '%.2f'%a['debit1'] or '0.00']] - [[ formatLang(a['credit1']) and '%.2f'%a['credit1'] or '0.00']] + [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit1']) and '%.2f'%a['credit1'] or '0.00']] - [[ formatLang(a['balance1']) and '%.2f'%a['balance1'] or '0.00' ]] + [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance1']) and '%.2f'%a['balance1'] or '0.00' ]] From 06036274da564939fef7603d9a764e92869afe4a Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Tue, 7 Oct 2008 11:47:53 +0530 Subject: [PATCH 016/104] done some changes in account balance report rml and py file in account module bzr revid: vinusoft85@gmail.com-20081007061753-c6gjwxa60idzgibq --- addons/account/report/account_balance.py | 2 +- addons/account/report/account_balance.rml | 91 ++++++++++------------- 2 files changed, 40 insertions(+), 53 deletions(-) diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 1ecb0869876..624f49ebdfa 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -224,5 +224,5 @@ class account_balance(report_sxw.rml_parse): def _sum_debit(self): return self.sum_debit -report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=2) +report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=False) diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 7ba0204caa4..eb0d023302e 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -41,7 +41,7 @@ - + @@ -82,19 +82,19 @@ - - - @@ -247,46 +244,36 @@ Balance - - - - [[ repeatIn(lines(data['form']), 'a') ]] - - [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ a['code'] or removeParentNode('tr') ]] - - [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ setTag('blockTable','blockTable',{'style':'TrLevel'+str(a['level'])}) ]][[ a['name'] ]] - - - [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] - [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] - - - [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] - [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] - - - [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]] - [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]] - - - - [[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][[ a['jname'] or removeParentNode('tr') ]] - - [[ a['level']<4 and removeParentNode('font') or '...'*(2) ]][[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][[ a['lname'] ]] - - - [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit1']) and '%.2f'%a['debit1'] or '0.00']] - - - [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit1']) and '%.2f'%a['credit1'] or '0.00']] - - - [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance1']) and '%.2f'%a['balance1'] or '0.00' ]] - - - - - + + + + [[ repeatIn(lines(data['form']), 'a') ]] + + [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ a['code'] or removeParentNode('tr') ]] + [[ setTag('para','para',{'style':('Level'+str(a['level']))}) ]][[ setTag('blockTable','blockTable',{'style':'TrLevel'+str(a['level'])}) ]][[ a['name'] ]] + + [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] + [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit']) and '%.2f'%a['debit'] or '0.00' ]] + + + [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] + [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit']) and '%.2f'%a['credit'] or '0.00' ]] + + + [[ a['level']>3 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]] + [[ a['level']<4 and removeParentNode('font') ]][[ setTag('para','para',{'style':('Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance']) and '%.2f'%a['balance'] or '0.00' ]] + + + + [[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][[ a['jname'] or removeParentNode('tr') ]] + [[ a['level']<4 and removeParentNode('font') or '...'*(2) ]][[ setTag('para','para',{'style':('Det_Level'+str(a['level']))}) ]][ref: [[ a['ref'] or removeParentNode('font') ]] ] [[ a['lname'] ]] + [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['debit1']) and '%.2f'%a['debit1'] or '0.00']] + [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['credit1']) and '%.2f'%a['credit1'] or '0.00']] + [[ setTag('para','para',{'style':('Det_Amt_Level'+str(a['level']))}) ]][[ formatLang(a['balance1']) and '%.2f'%a['balance1'] or '0.00' ]] + + + + From 149975a69a589d2cabe69c52161f1c86eedfd879 Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Tue, 7 Oct 2008 12:44:29 +0530 Subject: [PATCH 017/104] done some changes in account balance report rml file in account module bzr revid: vinusoft85@gmail.com-20081007071429-q0hob8o2xzpwu8gu --- addons/account/report/account_balance.rml | 34 +++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index eb0d023302e..cfabf9d545f 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -149,67 +149,67 @@ + fontSize="8.0" leading="5"/> + fontSize="8.0" leading="5"/> + fontSize="8.0" leading="5"/> + fontSize="8.0" leading="5"/> + fontSize="8.0" leading="5"/> + fontSize="8.0" leading="5"/> + fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> + fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> + fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> + fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> + fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> + fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/> From df723755044ac4af0ee4e989e99ecc166cacac6e Mon Sep 17 00:00:00 2001 From: Naresh Choksy Date: Tue, 7 Oct 2008 17:18:28 +0530 Subject: [PATCH 018/104] changed tag to bzr revid: nch@tinyerp.com-20081007114828-92lmkwru2s5dc1yq --- addons/base_contact/base_contact_demo.xml | 4 ++-- addons/base_module_record/base_module_record.py | 2 +- addons/document/custom_report.xml | 4 ++-- addons/document/custom_view.xml | 4 ++-- addons/document/document_data.xml | 4 ++-- addons/document/document_demo.xml | 4 ++-- addons/document/document_view.xml | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml index 6efa01a7267..00104813896 100644 --- a/addons/base_contact/base_contact_demo.xml +++ b/addons/base_contact/base_contact_demo.xml @@ -1,5 +1,5 @@ - + @@ -323,4 +323,4 @@ 1 - + diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 1a623b2dbb5..17ff37645f6 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -172,7 +172,7 @@ class base_module_record(osv.osv): # Create the minidom document self.ids = {} doc = minidom.Document() - terp = doc.createElement("terp") + terp = doc.createElement("openerp") doc.appendChild(terp) for rec in self.recording_data: if rec[0]=='workflow': diff --git a/addons/document/custom_report.xml b/addons/document/custom_report.xml index 02cf10e6a4a..ebfe70e4c50 100644 --- a/addons/document/custom_report.xml +++ b/addons/document/custom_report.xml @@ -1,6 +1,6 @@ - + - + diff --git a/addons/document/custom_view.xml b/addons/document/custom_view.xml index 4909336c498..61d95f9aa27 100644 --- a/addons/document/custom_view.xml +++ b/addons/document/custom_view.xml @@ -1,4 +1,4 @@ - + grcompta @@ -8,5 +8,5 @@ - + diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml index 98793851804..9953d07dd92 100644 --- a/addons/document/document_data.xml +++ b/addons/document/document_data.xml @@ -1,6 +1,6 @@ - + - + diff --git a/addons/document/document_demo.xml b/addons/document/document_demo.xml index 3de248ffa28..94c52923556 100644 --- a/addons/document/document_demo.xml +++ b/addons/document/document_demo.xml @@ -1,5 +1,5 @@ - + @@ -90,4 +90,4 @@ - + diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 5ae50b2f539..4e5a0b717ba 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -1,4 +1,4 @@ - + @@ -237,5 +237,5 @@ - + From 18e039d48e379795b5fc1dcb83100d690366f980 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Tue, 7 Oct 2008 18:02:24 +0530 Subject: [PATCH 019/104] modified files for demo of process bzr revid: solanki.priyesh@gmail.com-20081007123224-7up0s7vwe196ispa --- addons/account/account_view.xml | 2 +- addons/account/process/invoice_process.xml | 48 +++++------ addons/account/process/statement_process.xml | 32 +++---- addons/crm_configuration/__terp__.py | 10 ++- addons/crm_configuration/crm_config_view.xml | 2 +- addons/hr/__terp__.py | 3 +- addons/hr_contract/__terp__.py | 2 +- addons/hr_holidays/__terp__.py | 3 +- .../process/hr_timesheet_project_process.xml | 18 ++-- .../process/hr_timesheet_sheet_process.xml | 62 +++++++------- addons/mrp/process/procurement_process.xml | 84 +++++++++---------- addons/product/process/product_process.xml | 26 +++--- addons/profile_service/profile_service.xml | 2 +- addons/project/process/task_process.xml | 28 +++---- .../process/project_mrp_process.xml | 18 ++-- addons/purchase/process/purchase_process.xml | 38 ++++----- addons/sale/process/sale_process.xml | 46 +++++----- addons/sale/sale_view.xml | 2 +- addons/scrum/process/scrum_process.xml | 6 +- 19 files changed, 219 insertions(+), 213 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 62cb55b13e4..1dbe58e6db2 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1362,7 +1362,7 @@ - + Account Configure Wizard Define Fiscal Years and Select Charts of Account diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index e38d3d8b288..95877564ae0 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -15,12 +15,12 @@ - + - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -112,8 +112,8 @@ - - + + @@ -121,8 +121,8 @@ - - + + @@ -130,8 +130,8 @@ - - + + @@ -139,8 +139,8 @@ - - + + @@ -148,8 +148,8 @@ - - + + @@ -157,8 +157,8 @@ - - + + @@ -166,9 +166,9 @@ - - + + - \ No newline at end of file + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 10365e76df0..b84dc63e3d3 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -91,8 +91,8 @@ - - + + @@ -100,8 +100,8 @@ - - + + @@ -109,8 +109,8 @@ - - + + @@ -118,8 +118,8 @@ - - + + @@ -127,8 +127,8 @@ - - + + diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py index 45503709487..ae144ad04c2 100644 --- a/addons/crm_configuration/__terp__.py +++ b/addons/crm_configuration/__terp__.py @@ -9,7 +9,7 @@ people to intelligently and efficiently manage tasks, issues, and requests. It manages key tasks such as communication, identification, prioritization, assignment, resolution and notification.""", - "depends" : ["crm","report_crm"], + "depends" : ["crm","report_crm", "process"], "init_xml" : [ "crm_config_view.xml", "crm_bugs_view.xml", @@ -34,8 +34,12 @@ "crm_jobs_data.xml", "crm_meeting_data.xml", "crm_lead_data.xml", - "crm_opportunity_data.xml", - + "crm_opportunity_data.xml", + "crm_bugs_menu.xml", "crm_fund_menu.xml", + "crm_jobs_menu.xml", "crm_opportunity_menu.xml", + "crm_helpdesk_menu.xml", "crm_lead_menu.xml", + "crm_meeting_menu.xml", + "process/crm_configuration_process.xml" ], "active": False, "installable": True diff --git a/addons/crm_configuration/crm_config_view.xml b/addons/crm_configuration/crm_config_view.xml index 20dc8ed42c5..78ef4180eee 100644 --- a/addons/crm_configuration/crm_config_view.xml +++ b/addons/crm_configuration/crm_config_view.xml @@ -38,7 +38,7 @@ - + Create Menu for CRM Case Section This Configuration step use to create Menu for Case Sections diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py index fb8873e5fc7..e36ed98c564 100644 --- a/addons/hr/__terp__.py +++ b/addons/hr/__terp__.py @@ -40,7 +40,7 @@ Different reports are also provided, mainly for attendance statistics. """, - "depends" : ["base"], + "depends" : ["base", "process"], "init_xml" : [], "demo_xml" : [ "hr_demo.xml", @@ -52,6 +52,7 @@ "hr_view.xml", "hr_wizard.xml", "hr_department_view.xml", +# "process/hr_process.xml" ], "active": False, "installable": True diff --git a/addons/hr_contract/__terp__.py b/addons/hr_contract/__terp__.py index c07e6c55a5a..a03f8140f72 100644 --- a/addons/hr_contract/__terp__.py +++ b/addons/hr_contract/__terp__.py @@ -46,7 +46,7 @@ "demo_xml" : [], "update_xml" : [ "security/hr_contract_security.xml", - "security/ir.model.access.csv", +# "security/ir.model.access.csv", "hr_contract_view.xml", ], "active": False, diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py index dd4d6d796a5..6f3188d6acf 100644 --- a/addons/hr_holidays/__terp__.py +++ b/addons/hr_holidays/__terp__.py @@ -24,7 +24,7 @@ Administration \ Users \ Users for example, you maybe will do it for the user 'admin'. """, - "depends" : ["hr","crm_configuration"], + "depends" : ["hr","crm_configuration", "process"], "init_xml" : [], "update_xml" : [ "security/ir.model.access.csv", @@ -32,6 +32,7 @@ "hr_view.xml", "hr_holidays_report.xml", "hr_holidays_wizard.xml", +# "process/hr_holidays_process.xml" ], # "demo_xml" : ["hr_bel_holidays_2008.xml",], "demo_xml" : [], diff --git a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml index 5c96a0c8239..f3617ad9520 100644 --- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -10,7 +10,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -48,8 +48,8 @@ - - + + @@ -57,8 +57,8 @@ - - + + @@ -66,8 +66,8 @@ - - + + diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml index 2e59204aa30..1351426e186 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -146,8 +146,8 @@ - - + + @@ -155,8 +155,8 @@ - - + + @@ -164,8 +164,8 @@ - - + + @@ -173,8 +173,8 @@ - - + + @@ -182,8 +182,8 @@ - - + + @@ -191,17 +191,17 @@ - - + + - - - - + + + + @@ -209,8 +209,8 @@ - - + + @@ -218,8 +218,8 @@ - - + + diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index f0eae8dd157..cf677195342 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -20,7 +20,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -177,8 +177,8 @@ - - + + @@ -186,8 +186,8 @@ - - + + @@ -195,8 +195,8 @@ - - + + @@ -204,8 +204,8 @@ - - + + @@ -213,8 +213,8 @@ - - + + @@ -222,8 +222,8 @@ - - + + @@ -231,8 +231,8 @@ - - + + @@ -240,8 +240,8 @@ - - + + @@ -249,8 +249,8 @@ - - + + @@ -258,8 +258,8 @@ - - + + @@ -267,8 +267,8 @@ - - + + @@ -276,8 +276,8 @@ - - + + @@ -285,8 +285,8 @@ - - + + @@ -294,8 +294,8 @@ - - + + diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index 987f86331ae..d66ba12e875 100644 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -15,12 +15,12 @@ - + - + @@ -31,7 +31,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -68,8 +68,8 @@ - - + + @@ -77,8 +77,8 @@ - - + + @@ -86,9 +86,9 @@ - - + + - + - \ No newline at end of file + diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml index 50e90f4c1d1..830dc59f4dd 100644 --- a/addons/profile_service/profile_service.xml +++ b/addons/profile_service/profile_service.xml @@ -42,7 +42,7 @@ new - Service Profile : Install Extra modules A few modules are proposed according to the 'service profile' you selected. You will be able to install them or more modules later through the Administration menu. diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 4fef858fa8e..9bfc8c97964 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,8 +64,8 @@ - - + + @@ -81,8 +81,8 @@ - - + + @@ -90,8 +90,8 @@ - - + + @@ -99,8 +99,8 @@ - - + + @@ -108,8 +108,8 @@ - - + + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index c8bd1738314..56096ac6029 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -10,7 +10,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -58,8 +58,8 @@ - - + + @@ -67,8 +67,8 @@ - - + + @@ -76,8 +76,8 @@ - - + + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index ce69d273c01..c5ef5203635 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -102,8 +102,8 @@ - - + + @@ -111,8 +111,8 @@ - - + + @@ -120,8 +120,8 @@ - - + + @@ -129,8 +129,8 @@ - - + + @@ -138,8 +138,8 @@ - - + + @@ -147,8 +147,8 @@ - - + + diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 217172d46e2..318530a99f0 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -13,14 +13,14 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -123,8 +123,8 @@ - - + + @@ -145,8 +145,8 @@ - - + + @@ -174,8 +174,8 @@ - - + + @@ -202,8 +202,8 @@ - - + + @@ -228,8 +228,8 @@ - - + + @@ -237,8 +237,8 @@ - - + + @@ -246,8 +246,8 @@ - - + + diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 68cf27bddf5..9d173ec09f9 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -475,7 +475,7 @@ - + Select the default picking policy for Sale Order This Configuration step use to set default picking policy when make sale order diff --git a/addons/scrum/process/scrum_process.xml b/addons/scrum/process/scrum_process.xml index 9fbaec3964b..a5a36296507 100644 --- a/addons/scrum/process/scrum_process.xml +++ b/addons/scrum/process/scrum_process.xml @@ -10,7 +10,7 @@ - + @@ -26,8 +26,8 @@ - - + + From 9420ba80afc930f798e576b99ae721157bd94ab9 Mon Sep 17 00:00:00 2001 From: qdp Date: Tue, 7 Oct 2008 14:51:22 +0200 Subject: [PATCH 020/104] *improvement and bugfixes bzr revid: qdp@tinyerp.com-20081007125122-bcyr6lv1uxd36sp5 --- addons/event/event.py | 18 ++++++++++-------- addons/event/event_view.xml | 6 ++++-- addons/event/wizard/confirm_registration.py | 3 +-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/addons/event/event.py b/addons/event/event.py index 05b9033d488..407c86a4d93 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -203,18 +203,20 @@ class event_registration(osv.osv): return True def create(self, cr, uid, *args, **argv): - args[0]['section_id']= self.pool.get('event.event').browse(cr, uid, args[0]['event_id'], None).section_id.id - args[0]['date_deadline']= self.pool.get('event.event').browse(cr, uid, args[0]['event_id'], None).date_begin - args[0]['description']= self.pool.get('event.event').browse(cr, uid, args[0]['event_id'], None).mail_confirm + event = self.pool.get('event.event').browse(cr, uid, args[0]['event_id'], None) + args[0]['section_id']= event.section_id.id + args[0]['date_deadline']= event.date_begin + args[0]['description']= event.mail_confirm res = super(event_registration, self).create(cr, uid, *args, **argv) self._history(cr, uid,self.browse(cr, uid, [res]), 'Created', history=True) return res def write(self, cr, uid, *args, **argv): if 'event_id' in args[1]: - args[1]['section_id']= self.pool.get('event.event').browse(cr, uid, args[1]['event_id'], None).section_id.id - args[1]['date_deadline']= self.pool.get('event.event').browse(cr, uid, args[1]['event_id'], None).date_begin - args[1]['description']= self.pool.get('event.event').browse(cr, uid, args[1]['event_id'], None).mail_confirm + event = self.pool.get('event.event').browse(cr, uid, args[1]['event_id'], None) + args[1]['section_id']= event.section_id.id + args[1]['date_deadline']= event.date_begin + args[1]['description']= event.mail_confirm return super(event_registration, self).write(cr, uid, *args, **argv) def mail_user_confirm(self,cr,uid,ids): @@ -242,7 +244,7 @@ class event_registration(osv.osv): if reg_id.event_id.state in ['draft', 'fixed', 'open','confirm','running'] and reg_id.event_id.mail_auto_registr: tools.email_send(src, dest,'Auto Registration: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_registr, tinycrm = str(reg_id.case_id.id)) if (reg_id.event_id.state in ['confirm','running']) and reg_id.event_id.mail_auto_confirm: - tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.description, tinycrm = str(reg_id.case_id.id)) + tools.email_send(src, dest,'Auto Confirmation: '+'['+str(reg_id.id)+']'+' '+reg_id.name, reg_id.event_id.mail_confirm, tinycrm = str(reg_id.case_id.id)) if not src: raise osv.except_osv(_('Error!'), _('You must define a reply-to address in order to mail the participant. You can do this in the Mailing tab of your event. Note that this is also the place where you can configure your event to not send emails automaticly while registering')) return False @@ -309,7 +311,7 @@ class event_registration(osv.osv): return {'value':{'unit_price' : False,'invoice_label' : False}} - def onchange_partner_id(self, cr, uid, ids, part, event_id): + def onchange_partner_id(self, cr, uid, ids, part, event_id, email=False): data={} data['badge_partner'] = data['contact_id'] = data['partner_invoice_id'] = data['email_from'] = data['badge_title'] = data['badge_name'] = False if not part: diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index ff729ada1cd..708d99d3896 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -203,7 +203,10 @@ - + + +