From e685ed93c4d6e9648dbd336974a6b9f7f04be94a Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Mon, 11 Oct 2010 11:08:10 +0530
Subject: [PATCH 01/78] [IMP]Improved expense report of hr_expense module

bzr revid: azaz.201186@gmail.com-20101011053810-9r5hsvd6r34xzpul
---
 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 7d7be76ea8e..889887c9dd0 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="HR Expenses" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="16.0" y1="57.0" width="522" height="728"/>
     </pageTemplate>
@@ -259,7 +259,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ o.note or '' ]] [[ setTag('para','xpre') ]]</para>
+    <para style="terp_default_9">[[ o.note or removeParentNode('para')]] </para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>

From 2c2b2941aba9d21a883c11d414ca569920e4acd0 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Mon, 11 Oct 2010 13:13:36 +0530
Subject: [PATCH 02/78] [IMP]Improved reports of point_of_sale

bzr revid: azaz.201186@gmail.com-20101011074336-30gy3g8z1zec8mzy
---
 addons/point_of_sale/report/pos_details.rml   |  4 +--
 .../report/pos_details_summary.py             | 15 ++++++++---
 .../report/pos_details_summary.rml            | 26 ++++++++++++++-----
 .../report/pos_payment_report.rml             |  2 +-
 .../report/pos_payment_report_date.rml        |  2 +-
 .../point_of_sale/report/pos_users_product.py |  2 +-
 .../report/pos_users_product.rml              |  2 +-
 7 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index c10b8049356..7e04b788dfb 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -275,7 +275,7 @@
             <para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(p['amount']) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(p['amount']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -383,4 +383,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index a629929e204..8745e7c637f 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -38,7 +38,8 @@ class pos_details_summary(report_sxw.rml_parse):
             'getsuminvoice': self._sum_invoice,
             'gettaxamount': self._get_tax_amount,
             'getsalestotal': self._get_sales_total,
-            'getperiod': self._get_period,
+            'getstartperiod': self._get_start_period,
+            'getendperiod': self._get_end_period,            
             'getcompany':self.get_company
         })
 
@@ -119,15 +120,23 @@ class pos_details_summary(report_sxw.rml_parse):
     def _get_sales_total(self, objects):
         return reduce(lambda x, o: x + len(o.lines), objects, 0)
 
-    def _get_period(self, objects):
+    def _get_start_period(self, objects):
         date_orders = [obj.date_order for obj in objects]
         min_date = min(date_orders)
         max_date = max(date_orders)
         if min_date == max_date:
             return '%s' % min_date
         else:
-            return '%s - %s' % (min_date, max_date)
+            return '%s' % min_date
 
+    def _get_end_period(self, objects):
+        date_orders = [obj.date_order for obj in objects]
+        min_date = min(date_orders)
+        max_date = max(date_orders)
+        if min_date == max_date:
+            return '%s' % max_date
+        else:
+            return '%s' % max_date
 
 
 report_sxw.report_sxw('report.pos.details_summary',
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 4c538f3b15e..b4c0e51c249 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Detail of sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Details of Sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
@@ -20,9 +20,12 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
@@ -34,9 +37,12 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
@@ -157,7 +163,7 @@
     <para style="P4">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="170.0,170.0,170.0" style="Table1">
+    <blockTable colWidths="170.0,170.0,85.0,85.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -166,11 +172,14 @@
           <para style="terp_tblheader_General_Centre">Print Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Period</para>
+          <para style="terp_tblheader_General_Centre">Start Period</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">End Period</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="170.0,170.0,170.0" style="Table2">
+    <blockTable colWidths="170.0,170.0,85.0,85.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ '%s' % getcompany(objects)]]</para>
@@ -179,7 +188,10 @@
           <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ '%s' % getperiod(objects) ]]</para>
+          <para style="terp_default_Centre_8">[[ '%s' % getstartperiod(objects) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ '%s' % getendperiod(objects) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index 2d25c740d77..796f60050b3 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -184,7 +184,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]</para>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
index 23c3f950d81..2bddb2ae4d3 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -161,7 +161,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]] </para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]</para>
diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
index 83a02d49832..141445bcafe 100644
--- a/addons/point_of_sale/report/pos_users_product.py
+++ b/addons/point_of_sale/report/pos_users_product.py
@@ -25,7 +25,7 @@ from report import report_sxw
 class pos_user_product(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
-        super(pos_user_product, self).__init__(cr, uid, name, context=context)
+        super(pos_user_product, self).__init__(cr, uid, name, context)
         self.total = 0.0
         self.localcontext.update({
             'time': time,
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index ae15e6478e7..54c41ddf4a9 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="User's Product" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Product by user" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>

From e5bef4c1d0badf41aa1f09a6793de244e726648c Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Mon, 11 Oct 2010 16:57:14 +0530
Subject: [PATCH 03/78] [IMP]solve the bug of user's product report in pos
 module

bzr revid: azaz.201186@gmail.com-20101011112714-cd4tq2mrkcdqt7xn
---
 addons/point_of_sale/report/pos_users_product.py  | 2 +-
 addons/point_of_sale/report/pos_users_product.rml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
index 141445bcafe..63f75e4b76a 100644
--- a/addons/point_of_sale/report/pos_users_product.py
+++ b/addons/point_of_sale/report/pos_users_product.py
@@ -43,7 +43,7 @@ class pos_user_product(report_sxw.rml_parse):
         for r in data:
             a_l.append(r['id'])
         if len(a_l):
-            sql2="""SELECT sum(qty) as qty,l.price_unit*sum(l.qty) as amt,t.name as name from product_product p, product_template t, pos_order_line l where order_id IN %s and p.product_tmpl_id=t.id and l.product_id=p.id group by t.name, l.price_unit""",(tuple(a_l),)
+            sql2="""SELECT sum(qty) as qty,l.price_unit*sum(l.qty) as amt,t.name as name from product_product p, product_template t, pos_order_line l where order_id = %d and p.product_tmpl_id=t.id and l.product_id=p.id group by t.name, l.price_unit"""%(o.id)
             self.cr.execute(sql2)
             data = self.cr.dictfetchall()
         for d in data:
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index 54c41ddf4a9..ce746b207b0 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Product by user" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Users Product'" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -82,7 +82,6 @@
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
     <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>

From fc18acb72a27beeb8370f1db70e6799fb957d5d6 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Mon, 11 Oct 2010 17:56:33 +0530
Subject: [PATCH 04/78] [IMP]Improves the invoice report of account module

bzr revid: azaz.201186@gmail.com-20101011122633-1fy4wrwqabriszbs
---
 addons/account/report/invoice.rml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index 173cbd1e6c4..6432723e94a 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -211,7 +211,7 @@
           <para style="terp_tblheader_Details_Right">Disc.(%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Price</para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>
@@ -229,7 +229,7 @@
             <para style="terp_default_Right_9">[[ formatLang(l.quantity)]] [[ (l.uos_id and l.uos_id.name) or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]][[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(l.discount, digits=get_digits(dp='Account')) ]] </para>

From 9bb5a24639ab26d33c3a852a036df7acb5487ccb Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Mon, 11 Oct 2010 19:04:38 +0530
Subject: [PATCH 05/78] [IMP]Improves the details of summary report of pos
 module

bzr revid: azaz.201186@gmail.com-20101011133438-lffkuu5g5amr6v7t
---
 .../report/pos_details_summary.py             | 27 ++++++++++---------
 .../report/pos_details_summary.rml            | 14 +++-------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index 8745e7c637f..8b040426aa4 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -69,27 +69,28 @@ class pos_details_summary(report_sxw.rml_parse):
                                     objects,
                                     0.0 )
 
-    def _get_payments(self, objects, ignore_gift=False):
-        gift_journal_id = None
-        if ignore_gift:
-            config_journal_ids = self.pool.get("pos.config.journal").search(self.cr, self.uid, [('code', '=', 'GIFT')])
-            if len(config_journal_ids):
-                config_journal = self.pool.get("pos.config.journal").browse(self.cr, self.uid, config_journal_ids, {})[0]
-                gift_journal_id = config_journal.journal_id.id
+    def _get_payments(self, objects):
+#        gift_journal_id = None
+#        if ignore_gift:
+#            config_journal_ids = self.pool.get("pos.config.journal").search(self.cr, self.uid, [('code', '=', 'GIFT')])
+#            if len(config_journal_ids):
+#                config_journal = self.pool.get("pos.config.journal").browse(self.cr, self.uid, config_journal_ids, {})[0]
+#                gift_journal_id = config_journal.journal_id.id
 
         result = {}
         for obj in objects:
-            for payment in obj.payments:
-                if gift_journal_id and gift_journal_id == payment.journal_id.id:
-                    continue
-                result[payment.journal_id.name] = result.get(payment.journal_id.name, 0.0) + payment.amount
+            for statement in obj.statement_ids:
+                if statement.journal_id:
+                    result[statement.journal_id] = result.get(statement.journal_id, 0.0) + statement.amount
+
+        print "===================================",result.items()        
         return result
 
     def _paid_total(self, objects):
-        return sum(self._get_payments(objects, True).values(), 0.0)
+        return sum(self._get_payments(objects).values(), 0.0)
 
     def _total_of_the_day(self, objects):
-        total_paid = sum(self._get_payments(objects, True).values(), 0.0)
+        total_paid = self._paid_total(objects)
         total_invoiced = self._sum_invoice(objects)
         return total_paid - total_invoiced
 
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index b4c0e51c249..0cb07d3415b 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -218,17 +218,14 @@
             <para style="P6">[[ p[0] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ p[1] ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ p[1] ]] [[company.currency_id.symbol]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">
+      <para style="terp_default_9">
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="256.0,256.0" style="Table3">
       <tr>
         <td>
@@ -249,17 +246,14 @@
             <para style="P5">[[ t[0] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ '%.2f' % (t[1],) ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ '%.2f' % (t[1],) ]] [[company.currency_id.symbol]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">
+      <para style="terp_default_9">
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="256.0,256.0" style="Table8">
       <tr>
         <td>

From 343ac78ed6ce2d11da4b6e22863b49576aa5b3aa Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 12 Oct 2010 11:20:51 +0530
Subject: [PATCH 06/78] [Fix] delivery: Fix yml

bzr revid: sbh@tinyerp.com-20101012055051-vmz3ka2dzcq7tenm
---
 addons/delivery/test/delivery_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/test/delivery_report.yml b/addons/delivery/test/delivery_report.yml
index a88b6bd1942..b66528ea18c 100644
--- a/addons/delivery/test/delivery_report.yml
+++ b/addons/delivery/test/delivery_report.yml
@@ -12,7 +12,7 @@
     invoice_state: none
     move_lines:
       - company_id: base.main_company
-        date_planned: '2010-05-11 15:18:57'
+        date: '2010-05-11 15:18:57'
         location_dest_id: stock.stock_location_customers
         location_id: stock.stock_location_stock
         name: HP CD writers

From dfa5594e4af22928b812e28814bcb22a37cb14a7 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 12 Oct 2010 11:27:35 +0530
Subject: [PATCH 07/78] [Fix]  stock_invoice_directly: change the date_planned
 to date for stock  move

bzr revid: sbh@tinyerp.com-20101012055735-h1wpluft9xzd2fwb
---
 addons/stock_invoice_directly/test/stock_invoice_directly.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
index 9fde059fe17..6a7e99276b9 100644
--- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml
+++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
@@ -11,7 +11,7 @@
     move_lines:
       - company_id: base.main_company
         date_expected: '2010-08-03 11:05:47'
-        date_planned: '2010-08-03 11:05:47'
+        date: '2010-08-03 11:05:47'
         location_id: stock.stock_location_stock
         product_id: product.product_product_pc1
         product_qty: 3.0

From cad42f4ea53e563101c1911ec056d1ac381990fb Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 12 Oct 2010 11:51:56 +0530
Subject: [PATCH 08/78] [Fix]  stock: set readonly on Scheduled date

bzr revid: sbh@tinyerp.com-20101012062156-xc2fd2prhcgavn6c
---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 989fc50cc31..25c3715c072 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1441,7 +1441,7 @@ class stock_move(osv.osv):
         'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
         'create_date': fields.datetime('Creation Date', readonly=True),
         'date': fields.datetime('Date', required=True, help="Move date: scheduled date until move is done, then date of actual move processing", readonly=True),
-        'date_expected': fields.datetime('Scheduled Date', required=True, help="Scheduled date for the processing of this move"),
+        'date_expected': fields.datetime('Scheduled Date', states={'done': [('readonly', True)]},required=True, help="Scheduled date for the processing of this move"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')],states={'done': [('readonly', True)]}),
 
         'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM'), required=True,states={'done': [('readonly', True)]}),

From d8e6a7d71f2b31e8ef98024220793dc7f4f9c50d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 12 Oct 2010 12:30:09 +0530
Subject: [PATCH 09/78] [Fix] account: Fix yml

bzr revid: sbh@tinyerp.com-20101012070009-5th07cm82hhrlonp
---
 addons/account/test/account_validate_account_move.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index 9a733d8ad5f..44acc341d8e 100644
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -4,9 +4,6 @@
   !record {model: account.tax.code, id: account_tax_code_0}:
     name : Tax Code Test
     sign : 1.00
--
-
-
 -
   In order to test the 'Validate Journal Entries' wizard in OpenERP, I created an account move
 

From 10647a402b5a0909e8f5fad4c1bc2d4bb4a684c0 Mon Sep 17 00:00:00 2001
From: rch <rch@rch-openerp>
Date: Tue, 12 Oct 2010 14:38:57 +0530
Subject: [PATCH 10/78] [FIX]: Project dashboard.

bzr revid: rch@rch-openerp-20101012090857-q4vbt2fcfibos6rd
---
 addons/project_issue/board_project_issue_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 62b31b7732e..ff8bf0801f1 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -126,7 +126,7 @@
             	<xpath expr="/form/hpaned/child1/action[@string='My Delegated Tasks']" position="after">
 						<action colspan="4"  height="100" name="%(action_view_my_project_issue_tree)d" string="My Issues" />
             	</xpath>
-            	<xpath expr="/form/hpaned/child2/vpaned/child2/action[@string='Remaining Hours Per Project']" position="after">
+            	<xpath expr="/form/hpaned/child2/vpaned/child2/action[@string='My Remaining Hours by Project']" position="after">
 						<action colspan="4" height="100"  name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date" />
             	</xpath>
             </field>

From 0b7a5d56e43306b4aa96f8f9a792e39c2dcbf262 Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Tue, 12 Oct 2010 14:56:17 +0530
Subject: [PATCH 11/78] [Added company title. Removed Currency name in reports]

bzr revid: vro@tinyerp.com-20101012092617-xtydv2f89ztb9ywh
---
 .../account/report/account_print_overdue.rml  | 10 +--
 .../report/report_account_invoice_layout.rml  | 24 +++---
 .../report/special_message_invoice.rml        | 16 ++--
 addons/account_payment/report/order.rml       |  2 +-
 addons/lunch/report/order.rml                 | 77 +++++++++----------
 addons/mrp_repair/report/order.rml            |  2 +-
 addons/purchase/report/order.rml              | 14 ++--
 addons/purchase/report/request_quotation.rml  |  4 +-
 addons/sale/report/sale_order.rml             | 18 ++---
 addons/stock/report/picking.rml               | 12 +--
 10 files changed, 89 insertions(+), 90 deletions(-)

diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index d3d2c77e47a..81a9f072b51 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Overdue Payment" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Overdue Payments" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="42.0" y1="28.0" width="511" height="786"/>
     </pageTemplate>
@@ -97,7 +97,7 @@
           <para style="terp_default_9">[[ repeatIn(adr_get(o, 'invoice'),'addr') ]]</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.name ]]</para>
+          <para style="terp_default_9">[[ o.title.name or '' ]] [[ o.name ]]</para>
           <para style="terp_default_9">[[ addr['street'] ]]</para>
           <para style="terp_default_9">[[ addr['street2'] or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ addr['zip'] ]] [[ addr['city'] ]]</para>
@@ -138,7 +138,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="56.0,136.0,51.0,72.0,54.0,56.0,66.0,18.0" style="Table1">
+    <blockTable colWidths="57.0,136.0,51.0,72.0,54.0,56.0,66.0,18.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -168,7 +168,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[repeatIn(getLines(o), 'line') ]]</para>
-      <blockTable colWidths="56.0,136.0,52.0,71.0,55.0,56.0,66.0,17.0" style="Table3">
+      <blockTable colWidths="57.0,136.0,52.0,71.0,55.0,56.0,66.0,17.0" style="Table3">
         <tr>
           <td>
             <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
@@ -197,7 +197,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="244.0,71.0,56.0,56.0,66.0,17.0" style="Table2">
+    <blockTable colWidths="245.0,71.0,56.0,56.0,66.0,17.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_8">
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 3cd64a08b02..111bd63363f 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -185,7 +185,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]][[ o.address_invoice_id.city or '' ]]</para>
@@ -232,7 +232,7 @@
     <blockTable colWidths="179.0,179.0,180.0" style="Table_General_Detail_Content">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ o.name ]]<font color="white"> </font></para>
+          <para style="terp_default_Centre_8">[[ o.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(o.date_invoice,date=True) ]]</para>
@@ -297,7 +297,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Note">Note: [[ (a['note'] and format(a['note'] or '')) or removeParentNode('tr') ]]</para>
+            <para style="terp_default_Note">Note: [[ (a['note'] and format(a['note'])) or removeParentNode('tr') ]]</para>
             <para style="terp_default_Note">
               <font color="white"> </font>
             </para>
@@ -337,7 +337,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_9">[[ a['type']=='text' and format(a['name'] or '') or removeParentNode('blockTable') ]]</para>
+            <para style="terp_default_9">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para>
           </td>
           <td>
             <para style="terp_default_9">[[ a['type']=='text' and '' ]]</para>
@@ -376,7 +376,7 @@
           <para style="terp_default_9">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -391,7 +391,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -406,7 +406,7 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -445,10 +445,10 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_8">
@@ -467,7 +467,7 @@
     <blockTable colWidths="539.0" style="Table_Coment_Payment_Term">
       <tr>
         <td>
-          <para style="terp_default_9">[[ format(o.comment or '') or removeParentNode('blockTable') ]]</para>
+          <para style="terp_default_9">[[ format(o.comment or removeParentNode('blockTable')) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -477,7 +477,7 @@
     <blockTable colWidths="539.0" style="Table_Payment_Terms">
       <tr>
         <td>
-          <para style="terp_default_9">[[ o.payment_term and o.payment_term.name  + " :\n" + format(o.payment_term.note or '') or removeParentNode('blockTable') ]]</para>
+          <para style="terp_default_9">[[ o.payment_term and o.payment_term.name + “ :\n” + format(o.payment_term.note or '') or removeParentNode('blockTable') ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -485,4 +485,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index 8bea44a67f7..c1193497bb7 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -189,7 +189,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.street2 or removeParentNode('para')]]</para>
           <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]][[ o.address_invoice_id.city or '' ]]</para>
@@ -236,7 +236,7 @@
     <blockTable colWidths="179.0,179.0,180.0" style="Table_General_Detail_Content">
       <tr>
         <td>
-          <para style="terp_default_Centre_9">[[ o.name ]]<font color="white"> </font></para>
+          <para style="terp_default_Centre_9">[[ o.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
@@ -380,7 +380,7 @@
           <para style="terp_default_9">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -395,7 +395,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -410,7 +410,7 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -449,10 +449,10 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_8">
@@ -500,4 +500,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml
index 908b3523af0..50659be7869 100644
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.rml
@@ -192,7 +192,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="112.0,86.0,106.0,63.0,85.0,75.0" style="Table3">
+    <blockTable colWidths="112.0,86.0,107.0,63.0,85.0,75.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Partner</para>
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index e01e4df6d2e..81e1f8bcb78 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -80,20 +80,19 @@
     </initialize>
     <paraStyle name="P1" fontName="Helvetica-BoldOblique" fontSize="9.0" leading="11" alignment="LEFT"/>
     <paraStyle name="P2" fontName="Helvetica-BoldOblique" fontSize="9.0" leading="11"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P13" fontName="Helvetica-BoldOblique" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P16" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -116,26 +115,26 @@
       <font color="white"> </font>
     </para>
     <section>
-      <para style="P5">[[repeatIn(objects,'o')]]</para>
-      <blockTable colWidths="262.0,5.0,260.0" style="Table5">
+      <para style="P14">[[repeatIn(objects,'o')]]</para>
+      <blockTable colWidths="262.0,6.0,260.0" style="Table5">
         <tr>
           <td>
-            <para style="P10">
+            <para style="P9">
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="P10">
+            <para style="P9">
               <font color="white"> </font>
             </para>
           </td>
           <td>
-            <para style="P6">[[ o.user_id.address_id.title or '' ]] [[ o.user_id.address_id.name ]]</para>
-            <para style="P6">[[ o.user_id.address_id.street ]]</para>
-            <para style="P6">[[ o.user_id.address_id.street2 or removeParentNode('para') ]]</para>
-            <para style="P6">[[ o.user_id.address_id.zip or '' ]] [[ o.user_id.address_id.city or '' ]]</para>
-            <para style="P6">[[ (o.user_id.address_id.state_id and o.user_id.address_id.state_id.name) or removeParentNode('para')]] [[ (o.user_id.address_id.country_id and o.user_id.address_id.country_id.name) or '' ]]</para>
-            <para style="P6">
+            <para style="P15">[[ o.user_id.address_id.title.name or '' ]] [[ o.user_id.address_id.name ]]</para>
+            <para style="P15">[[ o.user_id.address_id.street ]]</para>
+            <para style="P15">[[ o.user_id.address_id.street2 or removeParentNode('para') ]]</para>
+            <para style="P15">[[ o.user_id.address_id.zip or '' ]] [[ o.user_id.address_id.city or '' ]]</para>
+            <para style="P15">[[ (o.user_id.address_id.state_id and o.user_id.address_id.state_id.name) or removeParentNode('para')]] [[ (o.user_id.address_id.country_id and o.user_id.address_id.country_id.name) or '' ]]</para>
+            <para style="P15">
               <font color="white"> </font>
             </para>
           </td>
@@ -150,7 +149,7 @@
       <blockTable colWidths="527.0" style="Table4">
         <tr>
           <td>
-            <para style="P4">Lunch Order</para>
+            <para style="P11">Lunch Order</para>
           </td>
         </tr>
       </blockTable>
@@ -163,16 +162,16 @@
       <blockTable colWidths="132.0,153.0,141.0,101.0" style="Table3">
         <tr>
           <td>
-            <para style="P7">Name</para>
+            <para style="P10">Name</para>
           </td>
           <td>
-            <para style="P11">Order</para>
+            <para style="P3">Order</para>
           </td>
           <td>
-            <para style="P11">Description</para>
+            <para style="P3">Description</para>
           </td>
           <td>
-            <para style="P12">Unit Price([[company.currency_id.code]])</para>
+            <para style="P4">Unit Price</para>
           </td>
         </tr>
       </blockTable>
@@ -180,37 +179,37 @@
     <blockTable colWidths="132.0,153.0,142.0,101.0" style="Table1">
       <tr>
         <td>
-          <para style="P14">[[repeatIn(objects, 'o') ]]</para>
-          <para style="P14">[[ o.user_id.name ]]</para>
+          <para style="P5">[[repeatIn(objects, 'o') ]]</para>
+          <para style="P5">[[ o.user_id.name ]]</para>
         </td>
         <td>
-          <para style="P16">[[o.product.name ]]</para>
+          <para style="P7">[[o.product.name ]]</para>
         </td>
         <td>
-          <para style="P8">[[ o.descript ]]</para>
+          <para style="P12">[[ o.descript ]]</para>
         </td>
         <td>
-          <para style="P15">[[formatLang(o.price) ]] [[company.currency_id.symbol]]</para>
+          <para style="P6">[[formatLang(o.price) ]] [[company.currency_id.symbol]]</para>
         </td>
       </tr>
     </blockTable>
     <blockTable colWidths="132.0,153.0,142.0,101.0" style="Table2">
       <tr>
         <td>
-          <para style="P3">
+          <para style="P8">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P3">
+          <para style="P8">
             <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="P11">Total:</para>
+          <para style="P3">Total:</para>
         </td>
         <td>
-          <para style="P9">[[ formatLang(sum_price(objects)) ]] <font face="Helvetica">[[company.currency_id.symbol]]</font></para>
+          <para style="P13">[[ formatLang(sum_price(objects)) ]] <font face="Helvetica">[[company.currency_id.symbol]]</font></para>
         </td>
       </tr>
     </blockTable>
@@ -218,4 +217,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 328b5e931ee..cafadca5aa2 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -277,7 +277,7 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Price<font size="8.0">([[ o.pricelist_id.currency_id. name ]])</font></para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 5fbc2cbdcc2..fe1b4ea9f78 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -149,7 +149,7 @@
               <td>
                 <para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
                 <para style="terp_default_Bold_9">Shipping address :</para>
-                <para style="terp_default_9">[[ addr.partner_id.title or '' ]] [[ addr.partner_id.name ]]</para>
+                <para style="terp_default_9">[[ addr.partner_id.title.name or '' ]] [[ addr.partner_id.name ]]</para>
                 <para style="terp_default_9">[[ addr.street ]]</para>
                 <para style="terp_default_9">[[ addr.street2 or removeParentNode('para') ]]</para>
                 <para style="terp_default_9">[[ addr.zip or '' ]] [[ addr.city or '' ]]</para>
@@ -168,7 +168,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para>
@@ -232,7 +232,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="179.0,82.0,73.0,64.0,56.0,79.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+    <blockTable colWidths="179.0,83.0,73.0,64.0,56.0,79.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -250,7 +250,7 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Net Price([[ o.pricelist_id.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Net Price</para>
         </td>
       </tr>
     </blockTable>
@@ -309,7 +309,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="391.0,55.0,88.0" style="Table_All_Total_Detail">
+    <blockTable colWidths="391.0,55.0,89.0" style="Table_All_Total_Detail">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -333,7 +333,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Purchase Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -364,4 +364,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 63e3ca791fc..95de453dca0 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -88,7 +88,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (order.partner_id and order.partner_id.title) or '' ]] [[ order.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ (order.partner_id and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.street) or '']]</para>
           <para style="terp_default_9">[[ (order.partner_address_id.street2) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.zip) or '' ]][[ (order.partner_address_id and order.partner_address_id.city) or '' ]]</para>
@@ -125,7 +125,7 @@
     </blockTable>
     <section>
       <para style="terp_default_9">[[repeatIn(order.order_line,'order_line')]]</para>
-      <blockTable colWidths="370.0,100.0,39.0,20.0" style="Table_Product_Line">
+      <blockTable colWidths="371.0,100.0,39.0,20.0" style="Table_Product_Line">
         <tr>
           <td>
             <para style="terp_default_9">[[ order_line.name ]]</para>
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index a4eab5aa86d..eabba41d4cb 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -132,7 +132,7 @@
       <tr>
         <td>
           <para style="terp_default_Bold_9">Shipping address :</para>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.zip or '' ]] [[ o.partner_shipping_id.city or '' ]]</para>
@@ -142,7 +142,7 @@
             <font color="white"> </font>
           </para>
           <para style="terp_default_Bold_9">Invoice address :</para>
-          <para style="terp_default_9">[[ o.partner_invoice_id.title or '' ]] [[ o.partner_invoice_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.partner_invoice_id.title.name or '' ]] [[ o.partner_invoice_id.name or '' ]]</para>
           <para style="terp_default_9">[[ o.partner_invoice_id.street ]] </para>
           <para style="terp_default_9">[[ (o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2)) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]]</para>
@@ -155,7 +155,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para>
@@ -234,7 +234,7 @@
           <para style="terp_tblheader_Details_Right">Disc.(%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Price([[ o.pricelist_id.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>
@@ -301,7 +301,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="387.0,56.0,93.0" style="Table6">
+    <blockTable colWidths="387.0,56.0,94.0" style="Table6">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -312,7 +312,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -325,7 +325,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -338,7 +338,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
         </td>
       </tr>
     </blockTable>
@@ -361,4 +361,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index c2b46959e1d..45b734855dd 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Packing List" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
     </pageTemplate>
@@ -125,7 +125,7 @@
       <tr>
         <td>
           <para style="terp_default_Bold_9">Shipping Address :</para>
-          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title.name) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '' ]]</para>
@@ -134,7 +134,7 @@
         </td>
         <td>
           <para style="terp_default_Bold_9">Contact Address :</para>
-          <para style="terp_default_9">[[ picking.address_id and picking.address_id.title or '' ]] [[ picking.address_id and picking.address_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ picking.address_id and picking.address_id.title.name or '' ]] [[ picking.address_id and picking.address_id.name or '' ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
           <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '' ]]</para>
@@ -181,7 +181,7 @@
           <para style="terp_default_Centre_8">[[ picking.origin or '']]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ (picking.address_id and picking.address_id.title) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
+          <para style="terp_default_Centre_8">[[ (picking.address_id and picking.address_id.title.name) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
@@ -215,7 +215,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'move_lines') ]]</para>
-      [[ picking.move_lines or removeParentNode('section')]]
+      <para style="terp_default_8">[[ picking.move_lines or removeParentNode('section')]]</para>
       <blockTable colWidths="256.0,74.0,58.0,60.0,73.0" style="Move_Line_Contect_Assign_State">
         <tr>
           <td>
@@ -239,7 +239,7 @@
     <para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and 'Non Assigned Products:' or removeParentNode('para') ]]</para>
     <section>
       <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]] </para>
-      [[ picking.move_lines or removeParentNode('section')]]
+      <para style="terp_default_8">[[ picking.move_lines or removeParentNode('section')]]</para>
       <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Move_Line_Content_Other_State">
         <tr>
           <td>

From 458d623a9891ece34e20bdba51e63610df4cc121 Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Tue, 12 Oct 2010 15:12:12 +0530
Subject: [PATCH 12/78] [Removed company currency from report]

bzr revid: vro@tinyerp.com-20101012094212-7hj5gzqz4sw75882
---
 addons/account_payment/report/order.rml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml
index 50659be7869..980de4fa876 100644
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.rml
@@ -237,7 +237,7 @@
             <para style="terp_default_Right_9">[[formatLang(line.amount) or '-' ]] [[get_company_currency_symbol()]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[get_company_currency_symbol()]]  </para>
+            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[get_company_currency_symbol()]] </para>
           </td>
         </tr>
       </blockTable>
@@ -256,7 +256,7 @@
           <para style="terp_default_Right_9">[[ formatLang(get_amount_total(o)) or '' ]] [[get_company_currency_symbol()]] </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]]  </para>
+          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]]</para>
         </td>
       </tr>
     </blockTable>

From 4a33709fcadfe8191db4e8ce85a503938ceee0d9 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 12 Oct 2010 15:41:16 +0530
Subject: [PATCH 13/78] [IMP]:account_invoice_layout:improved invoice report

bzr revid: apa@tinyerp.com-20101012101116-m2xtqwzwl8mz37w4
---
 .../report/report_account_invoice_layout.rml                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 111bd63363f..8faa0c99a09 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -477,7 +477,7 @@
     <blockTable colWidths="539.0" style="Table_Payment_Terms">
       <tr>
         <td>
-          <para style="terp_default_9">[[ o.payment_term and o.payment_term.name + “ :\n” + format(o.payment_term.note or '') or removeParentNode('blockTable') ]]</para>
+          <para style="terp_default_9"><font face="Helvetica" size="10.0">[[ o.payment_term and o.payment_term.name ]] </font>: <font face="Helvetica" size="10.0">[[ (o.payment_term and o.payment_term.note and format(o.payment_term.note)) or removeParentNode('blockTable') ]]</font></para>
         </td>
       </tr>
     </blockTable>

From cf1a4997e307fdf963784053a98e74e7fcbc33a6 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 12 Oct 2010 15:51:35 +0530
Subject: [PATCH 14/78] [IMP]:stock:Picking List

bzr revid: apa@tinyerp.com-20101012102135-vr2wyhzajo1kek1a
---
 addons/stock/report/picking.rml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 45b734855dd..6c6027093a0 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Picking List" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
     </pageTemplate>
@@ -214,8 +214,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'move_lines') ]]</para>
-      <para style="terp_default_8">[[ picking.move_lines or removeParentNode('section')]]</para>
+      <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'move_lines') ]]</para>
+      <para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para>
       <blockTable colWidths="256.0,74.0,58.0,60.0,73.0" style="Move_Line_Contect_Assign_State">
         <tr>
           <td>
@@ -238,8 +238,8 @@
     </section>
     <para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and 'Non Assigned Products:' or removeParentNode('para') ]]</para>
     <section>
-      <para style="terp_default_8">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]] </para>
-      <para style="terp_default_8">[[ picking.move_lines or removeParentNode('section')]]</para>
+      <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]] </para>
+      <para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para>
       <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Move_Line_Content_Other_State">
         <tr>
           <td>

From fe1fd0c8e5887f504783bc646ec2c04ae19a9638 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 12 Oct 2010 16:06:20 +0530
Subject: [PATCH 15/78] [Fix] stock: Remove the duplicate filter for product

bzr revid: sbh@tinyerp.com-20101012103620-vl7n13wzt2jxxcv9
---
 addons/stock/stock_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index fa81b7534c3..540a70731a1 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1831,7 +1831,6 @@
                         <filter string="Supplier" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="Order" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'origin'}"/>
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>

From 35ed213a139b5ce228e38928d06a340a09321189 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Tue, 12 Oct 2010 16:27:44 +0530
Subject: [PATCH 16/78] [Fix] product: Fix the name search method

bzr revid: sbh@tinyerp.com-20101012105744-1v1av7q0ir2y9c9o
---
 addons/product/product.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 22f57ac981f..3c94b396907 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -24,7 +24,7 @@ import decimal_precision as dp
 
 import math
 from _common import rounding
-
+import re  
 from tools.translate import _
 
 def is_pair(x):
@@ -501,6 +501,11 @@ class product_product(osv.osv):
             if not len(ids):
                 ids = self.search(cr, user, [('default_code',operator,name)]+ args, limit=limit, context=context)
                 ids += self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
+            if not len(ids):
+               ptrn=re.compile('(\[(.*?)\])')
+               res = ptrn.search(str(name))
+               if res:
+                   ids = self.search(cr, user, [('default_code','ilike',res.group(2))]+ args, limit=limit, context=context)
         else:
             ids = self.search(cr, user, args, limit=limit, context=context)
         result = self.name_get(cr, user, ids, context)

From de7aa4949ffea2dffdc99201b6129dbbd0421dfa Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 12 Oct 2010 16:38:41 +0530
Subject: [PATCH 17/78] [IMP]:account_payment:Payment Order

bzr revid: apa@tinyerp.com-20101012110841-6omcsbn4ed12z2fk
---
 addons/account_payment/report/order.rml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml
index 980de4fa876..79e548e53c9 100644
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.rml
@@ -192,7 +192,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="112.0,86.0,107.0,63.0,85.0,75.0" style="Table3">
+    <blockTable colWidths="112.0,86.0,106.0,63.0,85.0,75.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Partner</para>
@@ -214,11 +214,8 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <section>
-      <para style="terp_default_9">[[repeatIn(o.line_ids, 'line') ]]</para>
+      <para style="terp_default_2">[[repeatIn(o.line_ids, 'line') ]]</para>
       <blockTable colWidths="112.0,86.0,106.0,64.0,85.0,75.0" style="Table4">
         <tr>
           <td>
@@ -237,12 +234,12 @@
             <para style="terp_default_Right_9">[[formatLang(line.amount) or '-' ]] [[get_company_currency_symbol()]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[get_company_currency_symbol()]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.symbol]] </para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="304.0,64.0,85.0,75.0" style="Table5">
+    <blockTable colWidths="335.0,32.0,85.0,75.0" style="Table5">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -256,7 +253,7 @@
           <para style="terp_default_Right_9">[[ formatLang(get_amount_total(o)) or '' ]] [[get_company_currency_symbol()]] </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]] </para>
         </td>
       </tr>
     </blockTable>

From c996f70aa4685ad93a44a2198163217f9c39085c Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Tue, 12 Oct 2010 16:45:49 +0530
Subject: [PATCH 18/78] [IMP]:point_of_sale:Improves user_product and
 details_summary

bzr revid: azaz.201186@gmail.com-20101012111549-dkdorx3sxzuahty2
---
 .../report/pos_details_summary.rml            | 30 ++++++-----------
 .../point_of_sale/report/pos_users_product.py |  6 ++--
 .../report/pos_users_product.rml              | 33 ++++++-------------
 3 files changed, 23 insertions(+), 46 deletions(-)

diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 0cb07d3415b..5d2c9210d5c 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -53,12 +53,7 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
@@ -70,12 +65,7 @@
     <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table8">
@@ -115,9 +105,9 @@
     <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
     <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -156,14 +146,14 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P3">
+    <para style="terp_default_9">
       <font color="white"> </font>
     </para>
     <para style="P3">Details of Sales</para>
-    <para style="P4">
-      <font color="white"> </font>
+    <para style="P3">
+      <font face="Helvetica" size="9.0"/>
     </para>
-    <blockTable colWidths="170.0,170.0,85.0,85.0" style="Table1">
+    <blockTable colWidths="167.0,115.0,115.0,115.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -179,7 +169,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="170.0,170.0,85.0,85.0" style="Table2">
+    <blockTable colWidths="166.0,116.0,115.0,115.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ '%s' % getcompany(objects)]]</para>
@@ -215,7 +205,7 @@
       <blockTable colWidths="256.0,256.0" style="Table6">
         <tr>
           <td>
-            <para style="P6">[[ p[0] ]]</para>
+            <para style="P5">[[ p[0] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9_Bold">[[ p[1] ]] [[company.currency_id.symbol]]</para>
@@ -243,7 +233,7 @@
       <blockTable colWidths="256.0,256.0" style="Table9">
         <tr>
           <td>
-            <para style="P5">[[ t[0] ]]</para>
+            <para style="P4">[[ t[0] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9_Bold">[[ '%.2f' % (t[1],) ]] [[company.currency_id.symbol]]</para>
diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
index 63f75e4b76a..a147c03d113 100644
--- a/addons/point_of_sale/report/pos_users_product.py
+++ b/addons/point_of_sale/report/pos_users_product.py
@@ -26,7 +26,6 @@ class pos_user_product(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
         super(pos_user_product, self).__init__(cr, uid, name, context)
-        self.total = 0.0
         self.localcontext.update({
             'time': time,
             'get_data':self._get_data,
@@ -35,6 +34,7 @@ class pos_user_product(report_sxw.rml_parse):
 
         })
     def _get_data(self,o):
+        self.total = 0.0        
         data={}
         sql1=""" SELECT distinct(o.id) from account_bank_statement s, account_bank_statement_line l,pos_order o,pos_order_line i where  i.order_id=o.id and o.state='paid' and l.statement_id=s.id and l.pos_statement_id=o.id and s.id=%d"""%(o.id)
         self.cr.execute(sql1)
@@ -43,7 +43,7 @@ class pos_user_product(report_sxw.rml_parse):
         for r in data:
             a_l.append(r['id'])
         if len(a_l):
-            sql2="""SELECT sum(qty) as qty,l.price_unit*sum(l.qty) as amt,t.name as name from product_product p, product_template t, pos_order_line l where order_id = %d and p.product_tmpl_id=t.id and l.product_id=p.id group by t.name, l.price_unit"""%(o.id)
+            sql2="""SELECT sum(qty) as qty,l.price_unit*sum(l.qty) as amt,t.name as name, p.default_code as code, pu.name as uom from product_product p, product_template t,product_uom pu,pos_order_line l where order_id = %d and p.product_tmpl_id=t.id and l.product_id=p.id and pu.id=t.uom_id group by t.name,p.default_code,pu.name,l.price_unit"""%(o.id)
             self.cr.execute(sql2)
             data = self.cr.dictfetchall()
         for d in data:
@@ -58,7 +58,7 @@ class pos_user_product(report_sxw.rml_parse):
             self.cr.execute(sql)
             data = self.cr.fetchone()
             return data[0]
-    def _get_total(self):
+    def _get_total(self,o):
         return self.total
 
 report_sxw.report_sxw('report.pos.user.product', 'account.bank.statement', 'addons/statement/report/pos_users_product.rml', parser=pos_user_product,header='internal')
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index ce746b207b0..b4979b6e47a 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Users Product'" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="User's Product'" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="36.0" y1="57.0" width="520" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -60,15 +60,8 @@
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table5">
@@ -124,9 +117,6 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
     <para style="P2">User's Product</para>
     <para style="terp_default_8">
       <font color="white"> </font>
@@ -134,10 +124,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="96.0,96.0,96.0,96.0,96.0" style="Table1">
+    <blockTable colWidths="104.0,104.0,104.0,104.0,104.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">User</para>
@@ -156,7 +143,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="96.0,96.0,96.0,96.0,96.0" style="Table2">
+    <blockTable colWidths="104.0,104.0,104.0,104.0,104.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ get_user(objects) ]]</para>
@@ -178,7 +165,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table3">
+    <blockTable colWidths="370.0,55.0,95.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General">Product</para>
@@ -195,13 +182,13 @@
       <para style="terp_default_1">[[ repeatIn(get_data(statement), 'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
       <section>
         <para style="terp_default_1">[[ repeatIn(get_data(statement), 'line_ids')]]</para>
-        <blockTable colWidths="161.0,161.0,161.0" style="Table6">
+        <blockTable colWidths="371.0,55.0,95.0" style="Table6">
           <tr>
             <td>
-              <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+              <para style="terp_default_9">[ [[line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ formatLang(line_ids['qty']) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_9_Bold">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
@@ -210,7 +197,7 @@
         </blockTable>
       </section>
     </section>
-    <blockTable colWidths="319.0,80.0,83.0" style="Table5">
+    <blockTable colWidths="371.0,55.0,94.0" style="Table5">
       <tr>
         <td>
           <para style="P1">
@@ -221,7 +208,7 @@
           <para style="terp_tblheader_General_Right">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_total()) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(get_total(statement)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>

From e359ba1aeede8b5a63d2f5c1bd69e0c7384c7d67 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Tue, 12 Oct 2010 17:34:47 +0530
Subject: [PATCH 19/78] [IMP]:point_of_sale:Improves pos_details report

bzr revid: azaz.201186@gmail.com-20101012120447-82n9q5fv4m6ju1fk
---
 addons/point_of_sale/report/pos_details.py  |  8 ++++----
 addons/point_of_sale/report/pos_details.rml | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 26d427a3036..69a691a14f9 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -36,12 +36,12 @@ class pos_details(report_sxw.rml_parse):
 
     def _pos_sales_details(self,form,user):
         data={}
-        self.cr.execute ("select po.name as pos_name,po.date_order,pt.name ,pol.qty,pol.price_unit,pol.discount,po.invoice_id,sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as Total " \
-                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,res_users as ru,res_company as rc " \
-                         "where  pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  IN ('done','paid','invoiced') " \
+        self.cr.execute ("select po.name as pos_name,po.date_order,pt.name ,pp.default_code as code,pol.qty,pu.name as uom,pol.price_unit,pol.discount,po.invoice_id,sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as Total " \
+                         "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt,product_uom as pu,res_users as ru,res_company as rc " \
+                         "where  pt.id=pp.product_tmpl_id and pu.id=pt.uom_id and pp.id=pol.product_id and po.id = pol.order_id and po.state  IN ('done','paid','invoiced') " \
                          "and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  >= %s and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date  <= %s " \
                          "and po.user_id = ru.id and rc.id = %s and ru.id = %s " \
-                         "group by po.name,pol.qty,po.date_order,pt.name,pol.price_unit,pol.discount,po.invoice_id " \
+                         "group by po.name,pol.qty,po.date_order,pt.name,pp.default_code,pu.name,pol.price_unit,pol.discount,po.invoice_id " \
                              ,(form['date_start'],form['date_end'],str(user.company_id.id),str(self.uid)))
         data=self.cr.dictfetchall()
         if data:
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index 7e04b788dfb..388c30a42ce 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -199,7 +199,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="67.0,65.0,143.0,59.0,40.0,47.0,88.0" style="Table4">
+    <blockTable colWidths="53.0,44.0,158.0,54.0,76.0,37.0,88.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -214,7 +214,7 @@
           <para style="terp_tblheader_Details_Right">Price </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
+          <para style="terp_tblheader_Details_Centre">Qty</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Disc(%) </para>
@@ -226,7 +226,7 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]]</para>
-      <blockTable colWidths="67.0,66.0,142.0,59.0,41.0,46.0,89.0" style="Table6">
+      <blockTable colWidths="54.0,44.0,159.0,54.0,75.0,36.0,89.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[[ formatLang(line_ids['date_order'],date_time = True) ]]</para>
@@ -235,13 +235,13 @@
             <para style="terp_default_9">[[ line_ids['pos_name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ line_ids['name'] ]]</para>
+            <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]]</para>
+            <para style="terp_default_Centre_9">[[ formatLang(line_ids['qty']) ]] [[ line_ids['uom'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ formatLang(line_ids['discount']) ]]</para>

From d96d34347f20596546b62708f869d1e6d9fabb1c Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Tue, 12 Oct 2010 17:43:23 +0530
Subject: [PATCH 20/78] [Added company title]

bzr revid: vro@tinyerp.com-20101012121323-64gla8v4pugcxeso
---
 .../account/report/account_print_invoice.rml  | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index cec3903e11a..d10ab821c4d 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -139,7 +139,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_8">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_8">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.street ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
@@ -205,7 +205,7 @@
           <para style="terp_tblheader_Details_Centre">Quantity</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
+          <para style="terp_tblheader_Details_Right">Unit Price </para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Disc.(%)</para>
@@ -232,10 +232,10 @@
             <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.discount, digits=get_digits(dp='Account')) ]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(l.discount) ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]] [[ o.currency_id.symbol ]]</para>
           </td>
         </tr>
         <tr>
@@ -294,7 +294,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -311,17 +311,19 @@
         </td>
       </tr>
     </blockTable>
-    <para style="Text body"/>
-    <blockTable colWidths="167.0,59.0,56.0,247.0" style="Table9">
+    <para style="Text body">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="167.0,59.0,56.0,248.0" style="Table9">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Tax</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Base</para>
+          <para style="terp_tblheader_Details_Right">Base </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Amount</para>
+          <para style="terp_tblheader_Details_Right">Amount </para>
         </td>
         <td>
           <para style="terp_default_8">
@@ -338,7 +340,7 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base) ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]] [[ o.currency_id.symbol ]]</para>
@@ -362,7 +364,7 @@
     <blockTable colWidths="120.0,410.0" style="Table1">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Fiscal Position: </para>
+          <para style="terp_default_Bold_9">Fiscal Position Remark : </para>
         </td>
         <td>
           <para style="terp_default_9">[[ (o.fiscal_position.note and format(o.fiscal_position and o.fiscal_position.note)) or removeParentNode('blockTable') ]]</para>
@@ -373,4 +375,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file

From c592493b863531fbe8ea28ddb0f6480a25a58b6c Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Tue, 12 Oct 2010 17:54:06 +0530
Subject: [PATCH 21/78] [Added company title. Removed currency name from
 report]

bzr revid: vro@tinyerp.com-20101012122406-pn1878c8eroll1z0
---
 addons/sale_layout/report/report_sale_layout.rml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index b01affd5329..c1cf53b520a 100755
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -191,7 +191,7 @@
       <tr>
         <td>
           <para style="terp_default_Bold_9">Shipping address :</para>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_shipping_id.city or '' ]] [[ o.partner_shipping_id.zip or '' ]]</para>
@@ -214,7 +214,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.partner_id.title.name or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.street2 or removeParentNode('para') ]]</para>
           <para style="terp_default_9">[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]]</para>
@@ -293,7 +293,7 @@
           <para style="terp_tblheader_Details_Right">Disc.(%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Price([[ o.pricelist_id.currency_id.code ]])</para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>

From 35924bd5ff2f6669866aa6901206b89e1aaade8e Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 12 Oct 2010 18:47:59 +0530
Subject: [PATCH 22/78] [IMP]:account:Invoices

bzr revid: apa@tinyerp.com-20101012131759-4o084fm23wu4ltd5
---
 .../account/report/account_print_invoice.rml  | 19 ++++++++++---------
 .../report/report_account_invoice_layout.rml  | 18 ++++++------------
 .../report/special_message_invoice.rml        | 15 ++++++---------
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index d10ab821c4d..9e0782c1805 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Invoice" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
     </pageTemplate>
@@ -126,6 +126,7 @@
     <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Table" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="User Index 10" rightIndent="0.0" leftIndent="127.0" fontName="Helvetica"/>
+    <paraStyle name="Preformatted Text" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -232,10 +233,10 @@
             <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.discount) ]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(l.discount, digits=get_digits(dp='Account')) ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
           </td>
         </tr>
         <tr>
@@ -281,7 +282,7 @@
           <para style="terp_default_9">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -294,7 +295,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -307,14 +308,14 @@
           <para style="terp_tblheader_Details">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Bold_Right_9">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_Right_9">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="Text body">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="167.0,59.0,56.0,248.0" style="Table9">
+    <blockTable colWidths="167.0,59.0,56.0,247.0" style="Table9">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Tax</para>
@@ -340,10 +341,10 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_8">
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 8faa0c99a09..cd23fc1f4ac 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Invoice" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -376,7 +376,7 @@
           <para style="terp_default_9">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -391,7 +391,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -406,7 +406,7 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -434,9 +434,6 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
       <blockTable colWidths="105.0,51.0,63.0,320.0" style="Table8">
@@ -445,10 +442,10 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_8">
@@ -461,9 +458,6 @@
         <font color="white"> </font>
       </para>
     </section>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="539.0" style="Table_Coment_Payment_Term">
       <tr>
         <td>
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index c1193497bb7..dafde3d34a6 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Invoice" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Invoices" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -380,7 +380,7 @@
           <para style="terp_default_9">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -395,7 +395,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -410,7 +410,7 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -438,9 +438,6 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
       <blockTable colWidths="120.0,49.0,60.0,310.0" style="Table8">
@@ -449,10 +446,10 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_8">

From 3907d0c7bc8a33580e7c6c69832621fa93518c23 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Tue, 12 Oct 2010 18:56:12 +0530
Subject: [PATCH 23/78] [IMP]:sale:Sale Order

bzr revid: apa@tinyerp.com-20101012132612-m3it8nx3xpwhynyc
---
 addons/sale/report/sale_order.rml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index eabba41d4cb..ca8d56d0c41 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -258,10 +258,10 @@
             <para style="terp_default_Right_9">[[ formatLang(line.price_unit ) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.discount) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.discount, digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
           </td>
         </tr>
         <tr>
@@ -301,7 +301,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="387.0,56.0,94.0" style="Table6">
+    <blockTable colWidths="387.0,56.0,93.0" style="Table6">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -312,7 +312,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed , digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -325,7 +325,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -338,7 +338,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
         </td>
       </tr>
     </blockTable>

From 01dc02fe61f2fc0a02d7236a7a16637cefe03c0b Mon Sep 17 00:00:00 2001
From: rch <rch@rch-desktop>
Date: Tue, 12 Oct 2010 18:58:22 +0530
Subject: [PATCH 24/78] [IMP]: Remove My Sales Pipeline from sale dashboard.

bzr revid: rch@rch-desktop-20101012132822-lx9np9aema19qpbz
---
 addons/sale_crm/board_sale_crm_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/sale_crm/board_sale_crm_view.xml b/addons/sale_crm/board_sale_crm_view.xml
index 7d56779a613..58ebdc07cf6 100644
--- a/addons/sale_crm/board_sale_crm_view.xml
+++ b/addons/sale_crm/board_sale_crm_view.xml
@@ -83,8 +83,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="crm.board_crm_form"/>
             <field name="arch" type="xml">
-	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="attributes">
-	                <attribute name="string">My Sales Pipeline</attribute>
+	            <xpath expr="/form/hpaned/child2/action[@name='%(crm.act_sales_pipeline)d']" position="replace">
 	            </xpath>
             </field>
         </record>

From 825308570d3288f9c9d82f87ec0ea4bc21d88684 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Tue, 12 Oct 2010 19:09:56 +0530
Subject: [PATCH 25/78] [IMP]:point_of_sale:Improves the reports

bzr revid: azaz.201186@gmail.com-20101012133956-n53roc67kkxox3g1
---
 addons/point_of_sale/report/pos_details_summary.py   |  2 ++
 addons/point_of_sale/report/pos_details_summary.rml  |  8 ++++----
 addons/point_of_sale/report/pos_payment_report.rml   | 12 ++++++------
 .../point_of_sale/report/pos_payment_report_date.rml |  8 ++++----
 addons/point_of_sale/report/pos_users_product.rml    | 10 +++++-----
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index 5db70b80485..a9e2ac689d3 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -121,8 +121,10 @@ class pos_details_summary(report_sxw.rml_parse):
 
     def _get_start_period(self, objects):
         date_orders = [obj.date_order for obj in objects]
+        print "=========================",date_orders
         min_date = min(date_orders)
         max_date = max(date_orders)
+        print "========================",min_date
         if min_date == max_date:
             return '%s' % min_date
         else:
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 5d2c9210d5c..466500f0960 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -107,7 +107,7 @@
     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -150,8 +150,8 @@
       <font color="white"> </font>
     </para>
     <para style="P3">Details of Sales</para>
-    <para style="P3">
-      <font face="Helvetica" size="9.0"/>
+    <para style="P6">
+      <font color="white"> </font>
     </para>
     <blockTable colWidths="167.0,115.0,115.0,115.0" style="Table1">
       <tr>
@@ -240,7 +240,7 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_9">
+      <para style="terp_default_1">
         <font color="white"> </font>
       </para>
     </section>
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index 796f60050b3..5201de274ca 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -149,16 +149,16 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Tableau6">
+    <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Tableau6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
+          <para style="terp_tblheader_Details_Centre">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+          <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Unit Price</para>
@@ -172,7 +172,7 @@
 	<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
 	<section>
       <para style="terp_default_8">[[ repeatIn(pos_payment(o), 'line_ids') ]]</para>
-      <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Tableau7">
+      <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Tableau7">
         <tr>
           <td>
             <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
@@ -194,7 +194,7 @@
       </blockTable>
        </section>
        </section>
-      <blockTable colWidths="198.0,81.0,87.0,87.0,83.0" style="Table1">
+      <blockTable colWidths="302.0,57.0,34.0,57.0,61.0" style="Table1">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -215,7 +215,7 @@
           <para style="terp_tblheader_Details">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       </blockTable>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
index 2bddb2ae4d3..6017407e58f 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Payment" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Sales Lines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
@@ -128,7 +128,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table3">
+    <blockTable colWidths="301.0,57.0,35.0,57.0,61.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
@@ -149,7 +149,7 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(pos_payment_date(data['form']), 'line_ids') ]]</para>
-      <blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table6">
+      <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
@@ -169,7 +169,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="271.0,63.0,45.0,64.0,68.0" style="Table5">
+    <blockTable colWidths="302.0,57.0,34.0,57.0,61.0" style="Table5">
       <tr>
         <td>
           <para style="Table Contents">
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index b4979b6e47a..2c77f4ea5ba 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -165,7 +165,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="370.0,55.0,95.0" style="Table3">
+    <blockTable colWidths="356.0,68.0,95.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_General">Product</para>
@@ -182,7 +182,7 @@
       <para style="terp_default_1">[[ repeatIn(get_data(statement), 'line_ids') and ' ' or removeParentNode('blockTable') ]]</para>
       <section>
         <para style="terp_default_1">[[ repeatIn(get_data(statement), 'line_ids')]]</para>
-        <blockTable colWidths="371.0,55.0,95.0" style="Table6">
+        <blockTable colWidths="356.0,69.0,95.0" style="Table6">
           <tr>
             <td>
               <para style="terp_default_9">[ [[line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
@@ -191,13 +191,13 @@
               <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
       </section>
     </section>
-    <blockTable colWidths="371.0,55.0,94.0" style="Table5">
+    <blockTable colWidths="357.0,69.0,94.0" style="Table5">
       <tr>
         <td>
           <para style="P1">
@@ -208,7 +208,7 @@
           <para style="terp_tblheader_General_Right">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_total(statement)) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement)) ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>

From d54048c6d795b9928fc24489d1ac19f12cc1354b Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 13 Oct 2010 04:59:18 +0000
Subject: [PATCH 26/78] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101013045918-hlirree3j3xy4ga9
---
 addons/account/i18n/de.po                |   2 +-
 addons/account/i18n/hr.po                |  32 +-
 addons/account/i18n/mn.po                |   4 +-
 addons/account/i18n/sr.po                | 736 ++++++++++++-----------
 addons/account_report/i18n/it.po         |   6 +-
 addons/analytic/i18n/de.po               |   2 +-
 addons/analytic_user_function/i18n/mn.po |  12 +-
 addons/base_vat/i18n/fr.po               |  14 +-
 addons/claim_from_delivery/i18n/de.po    |   2 +-
 addons/crm/i18n/nl.po                    |   6 +-
 addons/crm_fundraising/i18n/nl.po        |   6 +-
 addons/crm_helpdesk/i18n/nl.po           |   6 +-
 addons/decimal_precision/i18n/de.po      |   2 +-
 addons/document_webdav/i18n/da.po        |  31 +
 addons/hr_payroll/i18n/de.po             |   2 +-
 addons/idea/i18n/tr.po                   |  14 +-
 addons/point_of_sale/i18n/sr.po          |   8 +-
 addons/procurement/i18n/mn.po            |  86 ++-
 addons/purchase/i18n/de.po               |   2 +-
 addons/report_intrastat/i18n/it.po       |  50 +-
 addons/resource/i18n/de.po               |   2 +-
 addons/resource/i18n/nl.po               |   6 +-
 addons/wiki_faq/i18n/de.po               |   2 +-
 addons/wiki_quality_manual/i18n/de.po    |   2 +-
 addons/wiki_sale_faq/i18n/de.po          |   2 +-
 25 files changed, 579 insertions(+), 458 deletions(-)
 create mode 100644 addons/document_webdav/i18n/da.po

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 94f0c92c017..dfcd273c439 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index ac5de3c9c51..9d97a299adf 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:55+0000\n"
-"Last-Translator: Goran Kliska (Aplikacija d.o.o.) <gkliska@gmail.com>\n"
+"PO-Revision-Date: 2010-10-12 16:53+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -411,7 +411,7 @@ msgstr "Zatvaranje plaćanja"
 #. module: account
 #: model:account.journal,name:account.expenses_journal
 msgid "Journal de frais"
-msgstr ""
+msgstr "Dnevnik Provizije"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -640,12 +640,12 @@ msgstr "Uvjeti plaćanja za partnera"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr "Zatvaranje stavke"
+msgstr "Zatvaranje stavke konta"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
 msgid "Open for bank reconciliation"
-msgstr "Otvor za zatvaranje banke"
+msgstr "Otvoreno za zatvaranje banke"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -830,6 +830,8 @@ msgid ""
 "These types are defined according to your country. The type contain more "
 "information about the account and it's specificities."
 msgstr ""
+"Ovi tipovi su kreirani u odnosu na vasu zemlju. Tip sadrzi vise informacija "
+"o kontu i njegovim specificnostima."
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -1040,7 +1042,7 @@ msgstr "Podređeni"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Fiskalno mapiranje poreza"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1063,7 +1065,7 @@ msgstr "Izlazni račun"
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
 msgid "Choose Fiscal Year"
-msgstr "Odaberite poreznu godinu"
+msgstr "Izaberite fiskalnu godinu"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -1079,7 +1081,7 @@ msgstr "Ispiši analitičke dnevnike"
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Voucher Nb"
-msgstr ""
+msgstr "Nbr Vaucera"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -1129,7 +1131,7 @@ msgstr "Novi analitički konto"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Mapping Templates"
-msgstr ""
+msgstr "Predlozci poreskih mapiranja"
 
 #. module: account
 #: rml:account.invoice:0
@@ -1145,17 +1147,17 @@ msgstr "Razdoblje od:"
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "carobnjak.vise.kontnih.naloga"
 
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr ""
+msgstr "Dnevnik Prodaje"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr "Iznos u drugoj valuti."
+msgstr "Iznos je predstavljen opciono u drugoj valuti"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -2081,7 +2083,7 @@ msgstr "Proces izlacnog računa"
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Mapping Remark :"
-msgstr ""
+msgstr "Napomena Fiskalnog mapiranja:"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -2144,7 +2146,7 @@ msgstr "Nova pretplata"
 #. module: account
 #: view:account.payment.term:0
 msgid "Computation"
-msgstr "Izračun"
+msgstr "Proračun"
 
 #. module: account
 #: view:account.analytic.line:0
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 82262de0ce2..a2e5ce8ef6b 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-11 07:18+0000\n"
+"PO-Revision-Date: 2010-10-12 07:43+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index a2514f02d24..19a1204ca17 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 11:37+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 17:21+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -41,12 +41,12 @@ msgstr "Enkodiranje unosa"
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr ""
+msgstr "Poruka na opomenama za neplaćene račune."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr ""
+msgstr "Potvrdi izvode iz pripreme"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
@@ -56,12 +56,12 @@ msgstr "Sredstvo"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Pogrešno ime modela u definiciji akcije."
 
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr ""
+msgstr "Valuta upotrebljena pri unosu izvoda"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
@@ -74,6 +74,8 @@ msgid ""
 "This account will be used to value incoming stock for the current product "
 "category"
 msgstr ""
+"Ovaj ce se nalog koristiti da vrednuje ulazni magacin za vazecu kategoriju "
+"proizvoda"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -83,24 +85,24 @@ msgstr ""
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
 msgid "Reconciliation result"
-msgstr ""
+msgstr "Rezultat zatvaranja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr "Nesnimljeni unos"
+msgstr "Otvorene stavke"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr ""
+msgstr "Osnovna Šifra"
 
 #. module: account
 #: view:account.account:0
 msgid "Account Statistics"
-msgstr "Statistike računa"
+msgstr "Knjigovodstvene statistike"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
@@ -116,7 +118,7 @@ msgstr "Roditelj"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr ""
+msgstr "Nalog za knjiženje"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -129,18 +131,18 @@ msgstr "Ostatak"
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr ""
+msgstr "Predznak šifre osnovice"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
 #: model:ir.ui.menu,name:account.menu_unreconcile_select
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "Ponisti stavke"
 
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "Greska! Dužina period(a) je loša/netačna. "
+msgstr "Greška! Trajanje razdoblja je pogrešno. "
 
 #. module: account
 #: view:account.bank.statement.reconcile:0
@@ -150,7 +152,7 @@ msgstr "Greska! Dužina period(a) je loša/netačna. "
 #: model:ir.actions.act_window,name:account.action_move_line_form
 #: model:ir.ui.menu,name:account.menu_action_move_line_form
 msgid "Entries"
-msgstr "Unosi"
+msgstr "Stavke"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -160,7 +162,7 @@ msgstr "Centralizacija Dugovanja"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
 msgid "Confirm draft invoices"
-msgstr ""
+msgstr "Potvrdi nacrtne fakture"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -170,18 +172,18 @@ msgid ""
 "it's based on the beginning of the month)."
 msgstr ""
 "Dan u mesecu, podesiti na -1 za poslednji dan tekućeg meseca. Ako je "
-"pozitivan, daje dan u sledećem mesecu. Podešen na 0 za ukupan broj dana (u "
+"pozitivan, daje dan u sledećem mesecu. Podesi na 0 za ukupan broj dana (u "
 "suprotnom zasnovan je na početku meseca)."
 
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr "Ukupno duguje"
+msgstr "Ukupno potrazuje"
 
 #. module: account
 #: field:account.config.wizard,charts:0
 msgid "Charts of Account"
-msgstr "Kontni plan"
+msgstr "Kontni planovi"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_move_line_select
@@ -194,12 +196,12 @@ msgstr "Premesti izabranu liniju"
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Entry label"
-msgstr ""
+msgstr "Oznaka stavke"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr ""
+msgstr "Stavke modela"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
@@ -210,23 +212,23 @@ msgstr "Zbir perioda"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
-msgstr ""
+msgstr "Izracunaj Kod ( if type= code) *programiranje"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "Stavke knjiženja"
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
 msgid "Aged Trial Balance"
-msgstr ""
+msgstr "Bruto bilanca"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurrent Entries"
-msgstr ""
+msgstr "Ponavljajuće stavke"
 
 #. module: account
 #: field:account.analytic.line,amount:0
@@ -246,7 +248,7 @@ msgstr "Iznos"
 #: model:ir.actions.wizard,name:account.wizard_third_party_ledger
 #: model:ir.ui.menu,name:account.menu_third_party_ledger
 msgid "Partner Ledger"
-msgstr "Partnerski dnevnik"
+msgstr "Salda konti partnera"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -271,6 +273,10 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
+"Daje pogled korišten kada se zapisuju ili pretrazuju stavke ovog dnevnika. "
+"Pogled govori Open ERP-u koja polja trebaju biti vidljiva, neophodna ili "
+"samo za čitanje i u kojem redosledu. Možete kreirati vlastiti pogled za brži "
+"unos stavki ovog dnevnika."
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -281,18 +287,23 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
+"Ako koristite uvjete plaćanja, datum valute plaćanja se izračunava "
+"automatski u trenutku generiranja stavki knjiženja.Ukoliko ostavite praznim "
+"uslove plaćanja i datum valute praznim, to označava direktno plaćanje. "
+"Uslovi plaćanja mogu izračunati više uplata, npr. 50% odmah, 50% za mjesec "
+"dana."
 
 #. module: account
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Fixed"
-msgstr "Popravljeno"
+msgstr "Fiksno"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr ""
+msgstr "Dospela plaćanja"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -314,7 +325,7 @@ msgstr "Poreklo"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Pomeri Ime"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -324,7 +335,7 @@ msgstr "Referenca"
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Subscription Compute"
-msgstr ""
+msgstr "Proračun pretplate"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -334,19 +345,19 @@ msgstr "Konto br."
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Debit"
-msgstr ""
+msgstr "Razlika duguje"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Porez"
 
 #. module: account
 #: rml:account.general.journal:0
 msgid "Debit Trans."
-msgstr ""
+msgstr "Dugovna transakcija"
 
 #. module: account
 #: field:account.analytic.line,account_id:0
@@ -360,14 +371,14 @@ msgstr "Analitički konto"
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Porez na podređene"
 
 #. module: account
 #: rml:account.central.journal:0
 #: rml:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr ""
+msgstr "Naziv dnevnika"
 
 #. module: account
 #: view:account.payment.term:0
@@ -377,7 +388,7 @@ msgstr "Opis na računima"
 #. module: account
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_entry:0
@@ -388,23 +399,23 @@ msgstr "Ukupno stavki"
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr ""
+msgstr "Originalni konto"
 
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr ""
+msgstr "Dozvoli storniranje stavki"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentorderreconcilation0
 msgid "Payment Reconcilation"
-msgstr ""
+msgstr "Zatvaranje plaćanja"
 
 #. module: account
 #: model:account.journal,name:account.expenses_journal
 msgid "Journal de frais"
-msgstr ""
+msgstr "Dnevnik Provizije"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -424,12 +435,12 @@ msgstr "Negativno"
 #. module: account
 #: rml:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "Naziv (Konta/Partnera)"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Contra"
-msgstr ""
+msgstr "Protuknjiženje"
 
 #. module: account
 #: field:account.analytic.account,state:0
@@ -439,36 +450,36 @@ msgstr ""
 #: view:account.move.line:0
 #: view:account.subscription:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree13
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree13
 msgid "Unpaid Supplier Refunds"
-msgstr ""
+msgstr "Neplaćeni povrati dobavljaču"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Special Computation"
-msgstr ""
+msgstr "Poseban proračun"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement with/without reconciliation from draft statement"
-msgstr ""
+msgstr "Potvrdi izvod sa/bez usklađivanja sa izvodom u pripremi."
 
 #. module: account
 #: wizard_view:account.move.bank.reconcile,init:0
 #: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
 msgid "Bank reconciliation"
-msgstr ""
+msgstr "Zatvaranje izvoda banke"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Disc.(%)"
-msgstr ""
+msgstr "Popust(%)"
 
 #. module: account
 #: rml:account.general.ledger:0
@@ -477,12 +488,12 @@ msgstr ""
 #: rml:account.overdue:0
 #: field:account.subscription,ref:0
 msgid "Ref"
-msgstr ""
+msgstr "Referenca"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
 msgid "Tax Use In"
-msgstr ""
+msgstr "Primena poreza za"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -494,18 +505,18 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodical Processing"
-msgstr ""
+msgstr "Periodična obrada"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr ""
+msgstr "Statistika analitičkih stavki"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr "obrasci Perskih stopa/tarifa"
+msgstr "Predlošci PDV obrasca"
 
 #. module: account
 #: view:account.invoice:0
@@ -516,12 +527,12 @@ msgstr "Račun dobavljača"
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "Reconcile Paid"
-msgstr ""
+msgstr "Zatvori plaćene"
 
 #. module: account
 #: wizard_field:account.chart,init,target_move:0
 msgid "Target Moves"
-msgstr ""
+msgstr "Ciljna knjiženja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -532,28 +543,28 @@ msgstr "Poreski obrasci"
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr ""
+msgstr "Plaćeno/Usklađeno"
 
 #. module: account
 #: field:account.account.type,close_method:0
 msgid "Deferral Method"
-msgstr ""
+msgstr "Način odlaganja"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr ""
+msgstr "Dodaj u osnovicu"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr ""
+msgstr "Šifra osnovice povrata"
 
 #. module: account
 #: view:account.invoice.line:0
 msgid "Line"
-msgstr ""
+msgstr "Red"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -564,7 +575,7 @@ msgstr ""
 #: selection:account.tax,applicable_type:0
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr ""
+msgstr "Tačno"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -572,6 +583,8 @@ msgid ""
 "Number of days to add before computation of the day of month.If Date=15/01, "
 "Number of Days=22, Day of Month=-1, then the due date is 28/02."
 msgstr ""
+"Broj dana koje treba dodati prije proracuna dana u mesecu. Ako je "
+"datum=15.01, broj dana=22, dan u mesecu=-1, onda je datum dospeća 28.02."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -597,7 +610,7 @@ msgstr ""
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr ""
+msgstr "Kontrole unosa"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -610,59 +623,59 @@ msgstr ""
 #: wizard_view:account.analytic.account.chart,init:0
 #: wizard_view:account.analytic.line,init:0
 msgid "(Keep empty to open the current situation)"
-msgstr ""
+msgstr "(Zadržite prazno da biste otvorili trenutno stanje)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Mapping"
-msgstr ""
+msgstr "Fiskalno mapiranje konta"
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
 
 #. module: account
 #: selection:account.model.line,date:0
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr ""
+msgstr "Uslovi plaćanja za partnera"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Account Entry Reconcile"
-msgstr ""
+msgstr "Zatvaranje stavke konta"
 
 #. module: account
 #: wizard_button:account.move.bank.reconcile,init,open:0
 msgid "Open for bank reconciliation"
-msgstr ""
+msgstr "Otvoreno za zatvaranje banke"
 
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr ""
+msgstr "Popust (%)"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,writeoff:0
 #: wizard_field:account.move.line.reconcile,init_partial,writeoff:0
 msgid "Write-Off amount"
-msgstr ""
+msgstr "Iznos otpisa"
 
 #. module: account
 #: help:account.fiscalyear,company_id:0
 msgid "Keep empty if the fiscal year belongs to several companies."
-msgstr ""
+msgstr "Ostavi prazno ako je fiskalna godina vlasništvo više firmi."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Analitičko računovodstvo"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Sub-Total :"
-msgstr ""
+msgstr "Među-iznos"
 
 #. module: account
 #: field:account.analytic.account,line_ids:0
@@ -670,32 +683,32 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
-msgstr ""
+msgstr "Analitičke stavke"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr ""
+msgstr "mesec"
 
 #. module: account
 #: field:account.analytic.account,partner_id:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Povezani partner"
 
 #. module: account
 #: field:account.invoice,comment:0
 msgid "Additional Information"
-msgstr ""
+msgstr "Dodatne informacije"
 
 #. module: account
 #: selection:account.invoice,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Povrat novca kupcu"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Select the Period for Analysis"
-msgstr ""
+msgstr "Odaberite period analize"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -703,12 +716,12 @@ msgstr ""
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr ""
+msgstr "Predznak Poreznog koda"
 
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr ""
+msgstr "Ukupan iznos dugovanja kupca"
 
 #. module: account
 #: view:account.move.line:0
@@ -723,39 +736,39 @@ msgstr ""
 #. module: account
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "Analytic Invoice"
-msgstr ""
+msgstr "Analitički račun"
 
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr ""
+msgstr "Naziv polja"
 
 #. module: account
 #: field:account.tax.code,sign:0
 #: field:account.tax.code.template,sign:0
 msgid "Sign for parent"
-msgstr ""
+msgstr "Predznak za roditelja"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr ""
+msgstr "Dnevnik knjiženja kraja godine"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr ""
+msgstr "Nabavka"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
 msgid "Can be draft or validated"
-msgstr ""
+msgstr "Može biti u pripremi ili potvrđen"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,reconcile:0
 msgid "Partial Payment"
-msgstr ""
+msgstr "Delimično plaćanje"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
@@ -770,23 +783,23 @@ msgstr ""
 #: field:account.period,state:0
 #: field:account.subscription,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr ""
+msgstr "Razdoblje do"
 
 #. module: account
 #: field:account.account.type,partner_account:0
 msgid "Partner account"
-msgstr ""
+msgstr "Konto partnera"
 
 #. module: account
 #: wizard_view:account.subscription.generate,init:0
 msgid "Generate entries before:"
-msgstr ""
+msgstr "Generisi stavke pre:"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -794,7 +807,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 #: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
 msgid "Cost Ledger"
-msgstr ""
+msgstr "Knjiga troškova"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -802,18 +815,18 @@ msgstr ""
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "(Keep empty for all open fiscal years)"
-msgstr ""
+msgstr "(Ostaviti prazno za sve otvorene poslovne godine)"
 
 #. module: account
 #: field:account.invoice,move_lines:0
 msgid "Move Lines"
-msgstr ""
+msgstr "Stavke knjiženja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print
 msgid "Account cost and revenue by journal"
-msgstr ""
+msgstr "Troškovi i prihodi konta po dnevniku"
 
 #. module: account
 #: help:account.account.template,user_type:0
@@ -821,83 +834,85 @@ msgid ""
 "These types are defined according to your country. The type contain more "
 "information about the account and it's specificities."
 msgstr ""
+"Ovi tipovi su kreirani u odnosu na vasu zemlju. Tip sadrzi vise informacija "
+"o kontu i njegovim specificnostima."
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "6"
-msgstr ""
+msgstr "6"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_30
 msgid "Bank Reconciliation"
-msgstr ""
+msgstr "Usklađivanje (zatvaranje) izvoda banke"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr ""
+msgstr "Predlošci za konta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.model,name:account.model_account_analytic_account
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr ""
+msgstr "Analitička konta"
 
 #. module: account
 #: wizard_view:account.print.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_print_journal
 #: model:ir.ui.menu,name:account.menu_print_journal
 msgid "Print Journal"
-msgstr ""
+msgstr "Stampa Dnevnika"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr ""
+msgstr "konto.banka.nalozi,carobjak"
 
 #. module: account
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "Datum kreiranja"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,cancel_invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Storniraj račun"
 
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr ""
+msgstr "Neophodno"
 
 #. module: account
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "Konto rashoda"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,journal_id:0
 msgid "Write-Off Journal"
-msgstr ""
+msgstr "Dnevnik otpisa"
 
 #. module: account
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr ""
+msgstr "Iznos u valuti"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr ""
+msgstr "Konto kategorije troška"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy2_id:0
 msgid "New Fiscal Year"
-msgstr ""
+msgstr "Nova poslovna godina"
 
 #. module: account
 #: help:account.tax,tax_group:0
@@ -909,12 +924,12 @@ msgstr ""
 #. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr ""
+msgstr "Poslovna godina za otvaranje"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Select Chart of Accounts"
-msgstr ""
+msgstr "Odaberite kontni plan"
 
 #. module: account
 #: field:account.analytic.account,quantity:0
@@ -927,7 +942,7 @@ msgstr ""
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Količina"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_to:0
@@ -935,33 +950,33 @@ msgstr ""
 #: wizard_field:account.partner.balance.report,init,date2:0
 #: wizard_field:account.third_party_ledger.report,init,date2:0
 msgid "End date"
-msgstr ""
+msgstr "Krajnji datum"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr ""
+msgstr "Iznos osnvice"
 
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr ""
+msgstr "Odgovorna osoba za ovaj dnevnik"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr ""
+msgstr "Osnovni dugovni konto"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Entries by Statements"
-msgstr ""
+msgstr "Stavke po izvodima"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 msgid "analytic Invoice"
-msgstr ""
+msgstr "analitički račun"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,period_id:0
@@ -980,22 +995,22 @@ msgstr ""
 #: wizard_field:account.print.journal.report,init,period_id:0
 #: field:account.subscription,period_nbr:0
 msgid "Period"
-msgstr ""
+msgstr "Razdoblje"
 
 #. module: account
 #: rml:account.partner.balance:0
 msgid "Grand total"
-msgstr ""
+msgstr "Celokupni iznos"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
 msgid "Financial Accounting"
-msgstr ""
+msgstr "Financijsko računovodstvo"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Neto Ukupno"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1015,62 +1030,62 @@ msgstr ""
 #: field:account.analytic.line,product_uom_id:0
 #: field:account.move.line,product_uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "JM"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,page_split:0
 msgid "One Partner Per Page"
-msgstr ""
+msgstr "Jedan partner po stranici"
 
 #. module: account
 #: field:account.account,child_parent_ids:0
 #: field:account.account.template,child_parent_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Podređeni"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Fiskalno mapiranje poreza"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new
 msgid "New Supplier Invoice"
-msgstr ""
+msgstr "Novi nabavni račun"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,amount:0
 msgid "Amount paid"
-msgstr ""
+msgstr "Plaćeni iznos"
 
 #. module: account
 #: selection:account.invoice,type:0
 #: model:process.transition,name:account.process_transition_customerinvoice0
 #: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Račun kupca"
 
 #. module: account
 #: wizard_view:account.open_closed_fiscalyear,init:0
 msgid "Choose Fiscal Year"
-msgstr ""
+msgstr "Izaberite fiskalnu godinu"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr ""
+msgstr "Glavna sekvenca"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Print Analytic Journals"
-msgstr ""
+msgstr "Stampaj analitičke dnevnike"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Voucher Nb"
-msgstr ""
+msgstr "Nbr Vaucera"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -1078,73 +1093,75 @@ msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
 msgstr ""
+"Polje redosled se upotrebljava za redjanje redova uslova plaćanja od "
+"najmanjeg do najvećeg"
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_new:0
 msgid "Total write-off"
-msgstr ""
+msgstr "Ukupni otpis"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Kod za izračun cena sa uključenim porezima"
 
 #. module: account
 #: view:account.invoice.tax:0
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr ""
+msgstr "Šifre poreza"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr ""
+msgstr "Predložak kontnog plana"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr ""
+msgstr "Konto prihoda"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_form
 msgid "New Analytic Account"
-msgstr ""
+msgstr "Novi analitički račun"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Mapping Templates"
-msgstr ""
+msgstr "Predlozci poreskih mapiranja"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Jedinična cijena"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Period from :"
-msgstr ""
+msgstr "Razdoblje od :"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "carobnjak.vise.kontnih.naloga"
 
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr ""
+msgstr "Dnevnik Prodaje"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr ""
+msgstr "Iznos je predstavljen opciono u drugoj valuti"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -1155,48 +1172,48 @@ msgstr ""
 #. module: account
 #: field:account.payment.term,line_ids:0
 msgid "Terms"
-msgstr ""
+msgstr "Uslovi"
 
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Report"
-msgstr ""
+msgstr "Porezki izvestaj"
 
 #. module: account
 #: wizard_button:account.analytic.account.chart,init,open:0
 #: wizard_button:account.chart,init,open:0
 msgid "Open Charts"
-msgstr ""
+msgstr "Otvori kontne planove"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
 msgid "Are you sure you want to close the fiscal year ?"
-msgstr ""
+msgstr "Da li ste sigurni da želite zatvoriti fiskalnu godinu ?"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Bank Receipt"
-msgstr ""
+msgstr "Bancina primka"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr ""
+msgstr "Bankovni račun"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr ""
+msgstr "Lista predloška poreza"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Invoice import"
-msgstr ""
+msgstr "Uvoz računa"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
 msgid "Standard entry"
-msgstr ""
+msgstr "Standardna stavka"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -1207,11 +1224,16 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
+"Ovaj izbor ce diktirati kako ce se obracunavati stanje trenutnog kursa za "
+"izlazne transakcije. U vecini zemalja vazeci metod je \" srednji\", ali ce "
+"samo mali broj softwerskih sistema biti u mogucnosti da obradi to. Tako da "
+"ako uvozite iz nekog drugog softwerskog sistema bilo bi pametno da koristite "
+"kurs na datum. Dolazece transakcije uvek koriste vazeci kurs toga dana."
 
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Valuta preduzeca"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
@@ -1221,108 +1243,108 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr ""
+msgstr "Nadređeni analitički konto"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
 msgid "Reconcile With Write-Off"
-msgstr ""
+msgstr "Zatvaranje s otpisom nezatvorenog dela"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
 msgid "Tax/Base Amount"
-msgstr ""
+msgstr "Iznos poreza/osnovice"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,code_digits:0
 msgid "No. of Digits to use for account code"
-msgstr ""
+msgstr "Broj oznaka( brojeva) za upotrebu u šifri konta"
 
 #. module: account
 #: field:account.bank.statement,balance_end_real:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Završni saldo"
 
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr ""
+msgstr "Porezi nabavke"
 
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
-msgstr ""
+msgstr "Naziv reda"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Fiksni iznos"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Credit"
-msgstr ""
+msgstr "Analitika potraživanja"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
 #: wizard_button:account.move.line.reconcile,init_partial,partial:0
 msgid "Partial Reconcile"
-msgstr ""
+msgstr "Delimično zatvaranje"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr ""
+msgstr "Otvorene stavke"
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr ""
+msgstr "Mapiranje poreza"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Continue"
-msgstr ""
+msgstr "Nastavi"
 
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Value"
-msgstr ""
+msgstr "Vrednost"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
 #: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Konto otpisa"
 
 #. module: account
 #: field:account.model.line,model_id:0
 #: field:account.subscription,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Model"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr ""
+msgstr "Zatvori fiskalnu godinu"
 
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "Centralizirana stavka zatvaranja"
 
 #. module: account
 #: view:wizard.company.setup:0
 msgid "Message"
-msgstr ""
+msgstr "Poruka"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Select invoices you want to pay and manages advances"
-msgstr ""
+msgstr "Odaberite račune koje želite da platite i unapredite ih"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1331,7 +1353,7 @@ msgstr ""
 #: selection:account.analytic.account,type:0
 #: field:account.journal,view_id:0
 msgid "View"
-msgstr ""
+msgstr "Pregled"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -1339,24 +1361,24 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
-msgstr ""
+msgstr "Sve"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic lines"
-msgstr ""
+msgstr "Analiticki redovi"
 
 #. module: account
 #: help:account.tax,type:0
 msgid "The computation method for the tax amount."
-msgstr ""
+msgstr "Način izračuna iznosa poreza"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Validated accounting entries."
-msgstr ""
+msgstr "Potvrđene računovodstvene stavke"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
@@ -1365,32 +1387,34 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
+"Ako želite poništiti zatvaranja transakcija, morate također provjeriti sve "
+"radnje koje su povezane sa tim transakcijama jer neće biti onemogućene"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr ""
+msgstr "Elektronska datoteka"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr ""
+msgstr "Potraživanja kupca"
 
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr ""
+msgstr "Redovi poreza"
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr ""
+msgstr "Sekvence"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
 #: model:ir.ui.menu,name:account.menu_action_account_type_form
 msgid "Account Types"
-msgstr ""
+msgstr "Tipovi konta"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,journal_id:0
@@ -1412,40 +1436,40 @@ msgstr ""
 #: wizard_field:populate_statement_from_inv,init,journal_id:0
 #: field:report.hr.timesheet.invoice.journal,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dnevnik"
 
 #. module: account
 #: field:account.account,child_id:0
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "Podređena konta"
 
 #. module: account
 #: field:account.account,check_history:0
 msgid "Display History"
-msgstr ""
+msgstr "Prikaži Istoriju"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,date1:0
 msgid "        Start date"
-msgstr ""
+msgstr "        Početni datum"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,display_account:0
 #: wizard_field:account.general.ledger.report,checktype,display_account:0
 msgid "Display accounts "
-msgstr ""
+msgstr "Prikaži konta "
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
 msgid "Statement reconcile line"
-msgstr ""
+msgstr "Red zatvaranja izvoda"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the income account"
-msgstr ""
+msgstr "Ostavite prazno za konto prihoda"
 
 #. module: account
 #: view:account.bank.statement.reconcile:0
@@ -1453,7 +1477,7 @@ msgstr ""
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Write-Off"
-msgstr ""
+msgstr "Otpis"
 
 #. module: account
 #: help:account.invoice,partner_bank:0
@@ -1461,143 +1485,145 @@ msgid ""
 "The partner bank account to pay\n"
 "Keep empty to use the default"
 msgstr ""
+"Partnerov bankovni racun da plati\n"
+"Ostavite prazno da koristite zadane vrednosti"
 
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr ""
+msgstr "Ukupno obaveze"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close.state,init,close:0
 msgid "Close states"
-msgstr ""
+msgstr "Zatvori stanja"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_company_setup
 msgid "wizard.company.setup"
-msgstr ""
+msgstr "carobnjak.kompanija.setup"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
 msgid "account.analytic.line.extended"
-msgstr ""
+msgstr "konto.analitika.prosireni.red"
 
 #. module: account
 #: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr ""
+msgstr "Dnevnik povrata"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income
 msgid "Income"
-msgstr ""
+msgstr "Prihod"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
 msgid "Supplier"
-msgstr ""
+msgstr "Dobavljač"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel.:"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr ""
+msgstr "Iznos poreza"
 
 #. module: account
 #: selection:account.account.type,sign:0
 msgid "Positive"
-msgstr ""
+msgstr "Pozitivan"
 
 #. module: account
 #: wizard_view:account.general.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_general_journal
 #: model:ir.ui.menu,name:account.menu_general_journal
 msgid "Print General Journal"
-msgstr ""
+msgstr "Stampa glavne knjige"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
-msgstr ""
+msgstr "Predlošci kontnog plana"
 
 #. module: account
 #: field:account.invoice,move_id:0
 msgid "Invoice Movement"
-msgstr ""
+msgstr "Knjiženja računa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_wizard
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "Generiraj kontni plan iz predloška"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Statements"
-msgstr ""
+msgstr "Zakonski izveštaji"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
 #: field:account.tax.code.template,parent_id:0
 msgid "Parent Code"
-msgstr ""
+msgstr "Šifra nadređenog"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile.select,init,open:0
 msgid "Open for reconciliation"
-msgstr ""
+msgstr "Otvori za usklađivanje"
 
 #. module: account
 #: model:account.journal,name:account.bilan_journal
 msgid "Journal d'ouverture"
-msgstr ""
+msgstr "Dnevnik Otvaranja"
 
 #. module: account
 #: selection:account.tax,tax_group:0
 #: selection:account.tax.template,tax_group:0
 msgid "VAT"
-msgstr ""
+msgstr "PDV"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Account n°"
-msgstr ""
+msgstr "Br. računa"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr "Zadrži prazno da bi koristio na kontu troškova"
+msgstr "Zadrži prazno za korištenje konta troška"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,account_ids:0
 msgid "Account to reconcile"
-msgstr ""
+msgstr "Konto za zatvaranje"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.model.line,partner_id:0
 #: field:account.move.line,partner_id:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Vezani partner"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
 #: selection:account.third_party_ledger.report,init,result_selection:0
 msgid "Receivable and Payable Accounts"
-msgstr ""
+msgstr "Konta potraživanja i dugovanja partnera"
 
 #. module: account
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr ""
+msgstr "Redovi pretplate"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1605,43 +1631,43 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
-msgstr ""
+msgstr "Nabavka"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total quantity"
-msgstr ""
+msgstr "Ukupna količina"
 
 #. module: account
 #: field:account.invoice,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "Datum dospeća"
 
 #. module: account
 #: wizard_view:account.period.close,init:0
 #: wizard_button:account.period.close,init,close:0
 msgid "Close Period"
-msgstr ""
+msgstr "Zatvori razdoblje"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Due"
-msgstr ""
+msgstr "Рок"
 
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Third party"
-msgstr ""
+msgstr "Treća strana"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
-msgstr ""
+msgstr "Dozvoljene vrste konta (prazno za bez kontrole)"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Početni saldo"
 
 #. module: account
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0
@@ -1649,132 +1675,132 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
 msgid "Journals"
-msgstr ""
+msgstr "Dnevnici"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Max Qty:"
-msgstr ""
+msgstr "Max. kol.:"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,refund:0
 msgid "Refund Invoice"
-msgstr ""
+msgstr "Storno računi"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_tree
 #: model:ir.actions.wizard,name:account.wizard_period_close
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr ""
+msgstr "Zatvori razdoblje"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
 msgid "Costs & Revenues"
-msgstr ""
+msgstr "Troškovi & prihodi"
 
 #. module: account
 #: constraint:account.account:0
 msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivna konta"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Account Number"
-msgstr ""
+msgstr "Broj računa"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Skip"
-msgstr ""
+msgstr "Preskoči"
 
 #. module: account
 #: field:account.invoice,period_id:0
 msgid "Force Period"
-msgstr ""
+msgstr "Forsiraj razdoblje"
 
 #. module: account
 #: help:account.account.type,sequence:0
 msgid "Gives the sequence order when displaying a list of account types."
-msgstr ""
+msgstr "Daje redoslijed pri prikazu liste vrsta konta."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr ""
+msgstr "Ponovno otvori"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Are you sure you want to create entries?"
-msgstr ""
+msgstr "Jeste sigurni da želite kreirati stavke?"
 
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Include in base amount"
-msgstr ""
+msgstr "Uključi u osnovicu"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Credit"
-msgstr ""
+msgstr "Razlika potražuje"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
 #: model:ir.actions.wizard,name:account.wizard_unreconcile
 msgid "Unreconcile Entries"
-msgstr ""
+msgstr "Poništi zatvaranje stavki"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Pre-generated invoice from control"
-msgstr ""
+msgstr "Prethodno generisani račun iz kontrole"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "Cost Legder for period"
-msgstr ""
+msgstr "Knjiga troškova za razdoblje"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree2
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2
 msgid "New Statement"
-msgstr ""
+msgstr "Nova Stavka"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,from_date:0
 #: wizard_field:account.analytic.line,init,from_date:0
 msgid "From"
-msgstr ""
+msgstr "Od"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Reconciliation of entries from invoice(s) and payment(s)"
-msgstr ""
+msgstr "Zatvaranje stavke računa i plaćanja"
 
 #. module: account
 #: wizard_view:account.central.journal.report,init:0
 #: model:ir.actions.wizard,name:account.wizard_central_journal
 #: model:ir.ui.menu,name:account.menu_central_journal
 msgid "Print Central Journal"
-msgstr ""
+msgstr "Stampa Glavnog dnevnika"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,period_length:0
 msgid "Period length (days)"
-msgstr ""
+msgstr "Duzina razdoblja (dana)"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
-msgstr ""
+msgstr "Procenat"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr ""
+msgstr "Kontni planovi"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1782,46 +1808,46 @@ msgstr ""
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
-msgstr ""
+msgstr "Prodaja"
 
 #. module: account
 #: wizard_button:account.account.balance.report,account_selection,checktype:0
 #: wizard_button:account.general.ledger.report,account_selection,checktype:0
 msgid "Next"
-msgstr ""
+msgstr "Sledeće"
 
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
 "The fiscal mapping will determine taxes and the accounts used for the "
 "partner."
-msgstr ""
+msgstr "Fiskalno mapiranje ce odrediti poreze i konta koristena za partnera"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 msgid "Date or Code"
-msgstr ""
+msgstr "Datum ili šifra"
 
 #. module: account
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr ""
+msgstr "Upravnik računovodstva"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "to :"
-msgstr ""
+msgstr "u :"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,debit:0
 #: wizard_field:account.move.line.reconcile,init_partial,debit:0
 msgid "Debit amount"
-msgstr ""
+msgstr "Iznos duguje"
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "year"
-msgstr ""
+msgstr "година"
 
 #. module: account
 #: wizard_button:account.account.balance.report,checktype,report:0
@@ -1838,17 +1864,17 @@ msgstr ""
 #: wizard_button:account.print.journal.report,init,print:0
 #: wizard_button:account.third_party_ledger.report,init,checkreport:0
 msgid "Print"
-msgstr ""
+msgstr "Štampaj"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_from:0
 msgid "Start date"
-msgstr ""
+msgstr "Datum početka"
 
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
 msgid "x Expenses Credit Notes Journal"
-msgstr ""
+msgstr "x Dnevnik knjižnih odobrenja troškova"
 
 #. module: account
 #: field:account.analytic.journal,type:0
@@ -1859,50 +1885,50 @@ msgstr ""
 #: field:account.move.reconcile,type:0
 #: xsl:account.transfer:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Allowed (empty for no control)"
-msgstr ""
+msgstr "Dozvoljena konta (prazno bez kontrole)"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Untaxed amount"
-msgstr ""
+msgstr "Neoporezovani iznos"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr ""
+msgstr "Konto poreza"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr ""
+msgstr "Redovi analitike"
 
 #. module: account
 #: wizard_view:account.invoice.pay,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_pay
 msgid "Pay invoice"
-msgstr ""
+msgstr "Plati račun"
 
 #. module: account
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Greška: Neispravan Bvr broj (kontrolna oznaka)."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
 #: model:ir.ui.menu,name:account.menu_invoice_draft
 msgid "Draft Customer Invoices"
-msgstr ""
+msgstr "Izlazni računi u pripremi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr ""
+msgstr "Redovi pretplatnog naloga"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -1910,89 +1936,89 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "No Filter"
-msgstr ""
+msgstr "Bez filtera"
 
 #. module: account
 #: field:account.payment.term.line,days:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Broj Dana"
 
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr ""
+msgstr "Partnerova refenerenca ovog racuna"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,sortbydate:0
 msgid "Sort by:"
-msgstr ""
+msgstr "Poređaj po:"
 
 #. module: account
 #: field:account.move,to_check:0
 msgid "To Be Verified"
-msgstr ""
+msgstr "Da bude verifikovano"
 
 #. module: account
 #: help:res.partner,debit:0
 msgid "Total amount you have to pay to this supplier."
-msgstr ""
+msgstr "Ukupni iznos koji trebas platiti ovom dobavljacu"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "7"
-msgstr ""
+msgstr "7"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
 msgid "Transfers"
-msgstr ""
+msgstr "Prenos"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Li."
-msgstr ""
+msgstr "Li."
 
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "Account charts"
-msgstr ""
+msgstr "Kontni planovi"
 
 #. module: account
 #: help:account.tax,name:0
 msgid "This name will be displayed on reports"
-msgstr ""
+msgstr "Naziv koji će se ispisati na izvještajima."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
-msgstr ""
+msgstr "Datum stampe"
 
 #. module: account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za pregled arhitekture"
 
 #. module: account
 #: wizard_field:account.partner.balance.report,init,date1:0
 msgid "          Start date"
-msgstr ""
+msgstr "          Početni datum"
 
 #. module: account
 #: wizard_view:account.analytic.account.journal.report,init:0
 msgid "Analytic Journal Report"
-msgstr ""
+msgstr "Dnevnik knjiženja analitike"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr ""
+msgstr "Povrat Musteriji"
 
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "Iznos poreza"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
@@ -2002,7 +2028,7 @@ msgstr ""
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr ""
+msgstr "Naziv dnevnika-razdoblja"
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -2028,7 +2054,7 @@ msgstr ""
 #: wizard_field:account.third_party_ledger.report,init,result_selection:0
 #: field:wizard.company.setup,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: account
 #: help:account.invoice,number:0
@@ -2036,41 +2062,42 @@ msgid ""
 "Unique number of the invoice, computed automatically when the invoice is "
 "created."
 msgstr ""
+"Jedinstveni broj racuna, koji se automatski kreira kada se racun kreira"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Neodobreni računi"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_expense
 msgid "Expense"
-msgstr ""
+msgstr "Trošak"
 
 #. module: account
 #: field:account.journal,invoice_sequence_id:0
 msgid "Invoice Sequence"
-msgstr ""
+msgstr "Sekvenca računa"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
 msgid "Options"
-msgstr ""
+msgstr "Opcije"
 
 #. module: account
 #: model:process.process,name:account.process_process_invoiceprocess0
 msgid "Customer Invoice Process"
-msgstr ""
+msgstr "Proces izlacnog računa"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Mapping Remark :"
-msgstr ""
+msgstr "Napomena Fiskalnog mapiranja:"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+msgstr "Period početnog stanja"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves
@@ -2082,12 +2109,12 @@ msgstr ""
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "days"
-msgstr ""
+msgstr "dana"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Past"
-msgstr ""
+msgstr "Prošlost"
 
 #. module: account
 #: field:account.analytic.account,company_currency_id:0
@@ -2101,103 +2128,103 @@ msgstr ""
 #: field:account.model.line,currency_id:0
 #: field:account.move.line,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid invoices"
-msgstr ""
+msgstr "Neplaćeni računi"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment Reconcile"
-msgstr ""
+msgstr "Zatvaranje plaćanja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
 msgid "Statements reconciliation"
-msgstr ""
+msgstr "Zatvaranje izvoda"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
 #: model:ir.ui.menu,name:account.menu_action_subscription_form_new
 msgid "New Subscription"
-msgstr ""
+msgstr "Nova pretplata"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Computation"
-msgstr ""
+msgstr "Proračun"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr ""
+msgstr "Stavka analitike"
 
 #. module: account
 #: view:res.company:0
 #: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr ""
+msgstr "Poruka kod prekoračenja roka plaćanja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
 #: model:ir.ui.menu,name:account.menu_action_tax_code_tree
 msgid "Chart of Taxes"
-msgstr ""
+msgstr "Shema poreza"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Value Amount"
-msgstr ""
+msgstr "Iznos"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr ""
+msgstr "Zatvorene stavke"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Kontakt Adresa"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr ""
+msgstr "Kreiraj 3-mesecni period"
 
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr ""
+msgstr "(ostaviti prazno ako želite koristiti tekuće razdoblje)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree8
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree8
 msgid "Draft Supplier Invoices"
-msgstr ""
+msgstr "Nepotvrđeni ulazni računi"
 
 #. module: account
 #: wizard_field:account.invoice.refund,init,period:0
 msgid "Force period"
-msgstr ""
+msgstr "Forsiraj period"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr ""
+msgstr "Detalji"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Consolidation"
-msgstr ""
+msgstr "Konsolidacija"
 
 #. module: account
 #: field:account.chart.template,account_root_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "Osnovni nalog (root)"
 
 #. module: account
 #: rml:account.overdue:0
@@ -2206,11 +2233,14 @@ msgid ""
 "stay unpaid. Please, take appropriate measures in order to carry out this "
 "payment in the next 8 days."
 msgstr ""
+"Ako se ne radi o našoj grešci, čini se da su sledeći računi ostali "
+"neplaćeni. Molimo preduzmite potrebne mere da se izvrši plaćanje u roku od "
+"sljedećih 8 dana."
 
 #. module: account
 #: rml:account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "PDV :"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,account_selection,Account_list:0
@@ -2219,38 +2249,38 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr ""
+msgstr "Kontni plan"
 
 #. module: account
 #: model:account.journal,name:account.check_journal
 msgid "x Checks Journal"
-msgstr ""
+msgstr "x Dnevnik čekova"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_generate_subscription
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Create subscription entries"
-msgstr ""
+msgstr "Kreiraj stavke pretplate"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,journal_id:0
 msgid "Opening Entries Journal"
-msgstr ""
+msgstr "Dnevnik početnog stanja"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Create a Fiscal Year"
-msgstr ""
+msgstr "Kreiraj Fiskalnu Godinu"
 
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr ""
+msgstr "Porezi kod prodaje"
 
 #. module: account
 #: field:account.invoice,date_invoice:0
 msgid "Date Invoiced"
-msgstr ""
+msgstr "Datum izrade računa"
 
 #. module: account
 #: help:account.account.balance.report,checktype,periods:0
@@ -2259,27 +2289,29 @@ msgstr ""
 #: help:account.third_party_ledger.report,init,periods:0
 #: help:account.vat.declaration,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Ako je prazno, sva razdoblja"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
 msgid "Liability"
-msgstr ""
+msgstr "Obveza"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #. module: account
 #: wizard_view:account.chart,init:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
 msgstr ""
+"(Ukoliko ne selektujete Fiskalnu godinu, uzece se u obzir sve otvorene "
+"fiskalne godine)"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr ""
+msgstr "Porezka osnovica"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2299,46 +2331,46 @@ msgstr ""
 #: rml:account.third_party_ledger_other:0
 #: xsl:account.transfer:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Reference Type"
-msgstr ""
+msgstr "Tip reference"
 
 #. module: account
 #: wizard_button:account.move.line.unreconcile,init,unrec:0
 #: wizard_button:account.reconcile.unreconcile,init,unrec:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Poništi zatvaranje"
 
 #. module: account
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
 msgid "Tax Type"
-msgstr ""
+msgstr "Vrsta poreza"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_statemententries0
 msgid "Statement Entries"
-msgstr ""
+msgstr "Stavke izvoda"
 
 #. module: account
 #: field:account.analytic.line,user_id:0
 #: field:account.journal,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_template_form
 msgid "Account Templates"
-msgstr ""
+msgstr "Predlošci konta"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr ""
+msgstr "Predložak kontnog plana"
 
 #. module: account
 #: model:account.journal,name:account.refund_sales_journal
@@ -2348,28 +2380,28 @@ msgstr ""
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Voucher No"
-msgstr ""
+msgstr "Br Potvrde"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic reconciliation"
-msgstr ""
+msgstr "Automatsko zatvaranje"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Import Invoice"
-msgstr ""
+msgstr "Uvezi račun(e)"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
 msgid "and Journals"
-msgstr ""
+msgstr "i dnevnike"
 
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
-msgstr ""
+msgstr "Konto poreza"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -2379,7 +2411,7 @@ msgstr "Pomeri liniju"
 #. module: account
 #: field:account.bank.accounts.wizard,acc_no:0
 msgid "Account No."
-msgstr ""
+msgstr "Broj računa"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -2387,11 +2419,13 @@ msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
 msgstr ""
+"Označite ako se porez računa na osnovi podređenih poreza umesto na osnovi "
+"ukupnog iznosa."
 
 #. module: account
 #: rml:account.central.journal:0
 msgid "Journal Code"
-msgstr ""
+msgstr "Šifra dnevnika"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -2399,16 +2433,18 @@ msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
 msgstr ""
+"Ako nije primenjivo (izračunato Python kodom), porez se neće iskazati na "
+"računu."
 
 #. module: account
 #: field:account.model,lines_id:0
 msgid "Model Entries"
-msgstr ""
+msgstr "Stavke modela"
 
 #. module: account
 #: field:account.analytic.account,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Završni datum"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2417,13 +2453,13 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
-msgstr ""
+msgstr "Stavke"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
-msgstr ""
+msgstr "Primjenjeni kod (ako je tip=Python kod)"
 
 #. module: account
 #: wizard_button:account.move.journal,init,open:0
diff --git a/addons/account_report/i18n/it.po b/addons/account_report/i18n/it.po
index 58987e1ff3e..2d3a600a78b 100644
--- a/addons/account_report/i18n/it.po
+++ b/addons/account_report/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-11 20:16+0000\n"
-"Last-Translator: simone.sandri <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
index 1d151da2e95..fea9b2cd23e 100644
--- a/addons/analytic/i18n/de.po
+++ b/addons/analytic/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/analytic_user_function/i18n/mn.po b/addons/analytic_user_function/i18n/mn.po
index 29affbf3bf3..478065209f3 100644
--- a/addons/analytic_user_function/i18n/mn.po
+++ b/addons/analytic_user_function/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:35+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"PO-Revision-Date: 2010-10-12 14:21+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -41,7 +41,7 @@ msgstr "Аналитик данс"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "Хэрэглэгч/Бүтээгдэхүүн"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,user_id:0
@@ -59,9 +59,9 @@ msgstr ""
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
-msgstr ""
+msgstr "Аналитик хэрэглэгчийн үүрэг"
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
-msgstr ""
+msgstr "Хэрэглэгчийн бүтээгдэхүүний аналитик данс"
diff --git a/addons/base_vat/i18n/fr.po b/addons/base_vat/i18n/fr.po
index 986ab70c5c5..9a8776d2680 100644
--- a/addons/base_vat/i18n/fr.po
+++ b/addons/base_vat/i18n/fr.po
@@ -7,15 +7,23 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:48+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-10-12 12:08+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: base_vat
+#: model:ir.module.module,description:base_vat.module_meta_information
+msgid ""
+"Enable the VAT Number for the partner. Check the validity of that VAT Number."
+msgstr ""
+"Active le numéro de TVA sur la fiche partenaire. Vérifie la validité du "
+"numéro de TVA."
+
 #. module: base_vat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
diff --git a/addons/claim_from_delivery/i18n/de.po b/addons/claim_from_delivery/i18n/de.po
index 99f04fa4284..258499f1a37 100644
--- a/addons/claim_from_delivery/i18n/de.po
+++ b/addons/claim_from_delivery/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: claim_from_delivery
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index d3da4ded812..7fe654c511f 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-10-11 13:45+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm_fundraising/i18n/nl.po b/addons/crm_fundraising/i18n/nl.po
index fe0003a7ecc..9175de4b202 100644
--- a/addons/crm_fundraising/i18n/nl.po
+++ b/addons/crm_fundraising/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 12:29+0000\n"
-"PO-Revision-Date: 2010-10-11 09:58+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
diff --git a/addons/crm_helpdesk/i18n/nl.po b/addons/crm_helpdesk/i18n/nl.po
index e1d802b6cf6..0db6e9f1a16 100644
--- a/addons/crm_helpdesk/i18n/nl.po
+++ b/addons/crm_helpdesk/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 13:01+0000\n"
-"PO-Revision-Date: 2010-10-11 08:22+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
diff --git a/addons/decimal_precision/i18n/de.po b/addons/decimal_precision/i18n/de.po
index d2218ef9d4c..12710962429 100644
--- a/addons/decimal_precision/i18n/de.po
+++ b/addons/decimal_precision/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
diff --git a/addons/document_webdav/i18n/da.po b/addons/document_webdav/i18n/da.po
new file mode 100644
index 00000000000..06dd36acc4e
--- /dev/null
+++ b/addons/document_webdav/i18n/da.po
@@ -0,0 +1,31 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-05-30 15:14+0000\n"
+"PO-Revision-Date: 2010-10-12 13:21+0000\n"
+"Last-Translator: Martin Pihl <martinpihl@gmail.com>\n"
+"Language-Team: Danish <da@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_webdav_old
+#: model:ir.module.module,description:document_webdav_old.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"\t* WebDav Interface\n"
+"\t* User Authentification\n"
+"\t* Document Indexation\n"
+msgstr ""
+"Dette er et komplet dokumenthåndteringssystem\n"
+"\t* WebDav Interface\n"
+"\t* Brugergodkendelse\n"
+"\t* Dokumentindeksering\n"
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index 0780f644296..406f344f044 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
diff --git a/addons/idea/i18n/tr.po b/addons/idea/i18n/tr.po
index e1bd6fc3db3..b3cadf12a88 100644
--- a/addons/idea/i18n/tr.po
+++ b/addons/idea/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 07:12+0000\n"
-"Last-Translator: Mustafa Yılmaz <apshalasha@gmail.com>\n"
+"PO-Revision-Date: 2010-10-12 23:56+0000\n"
+"Last-Translator: cafer can <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
@@ -96,7 +96,7 @@ msgstr "Taslak"
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's vote"
-msgstr "Fikrin oyu"
+msgstr ""
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote_stat
@@ -193,7 +193,7 @@ msgstr "Kategoriler"
 #. module: idea
 #: view:idea.stat:0
 msgid "stat"
-msgstr "durum"
+msgstr ""
 
 #. module: idea
 #: field:idea.idea,my_vote:0
@@ -237,7 +237,7 @@ msgstr "Oluşturulma tarihi"
 #. module: idea
 #: field:idea.idea,count_votes:0
 msgid "Count of votes"
-msgstr "Oy sayısı"
+msgstr "Oy Sayımı"
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
@@ -354,7 +354,7 @@ msgstr "Çok Kötü"
 #. module: idea
 #: selection:idea.idea,state:0
 msgid "Canceled"
-msgstr "İptal edilmiş"
+msgstr "İptal Edildi"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 98c46039a41..2005696db44 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-11 21:13+0000\n"
-"Last-Translator: zmmaj <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -438,7 +438,7 @@ msgstr ""
 #. module: point_of_sale
 #: rml:pos.invoice:0
 msgid "Draft Invoice"
-msgstr "Nacrti računa"
+msgstr "Neodobreni računi"
 
 #. module: point_of_sale
 #: field:pos.order.line,discount:0
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index 9ff3c68e11a..f6f3b4106a8 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 08:51+0000\n"
-"PO-Revision-Date: 2010-09-29 11:36+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"PO-Revision-Date: 2010-10-12 14:21+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -29,6 +29,9 @@ msgid ""
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
 msgstr ""
+"Виртуал агуулах нь тэгтэй тэнцүү бүх бараанд автомат татан авалтыг "
+"эхлүүлдэг. Та энэ сонголтыг ашиглахгүй байх нь дээр, бид танд барааны МТО "
+"тохиргоог ашиглахыг зөвлөж байна."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -92,7 +95,7 @@ msgstr "Шалтгаан"
 #. module: procurement
 #: view:procurement.order.compute:0
 msgid "Compute Procurements"
-msgstr ""
+msgstr "Татан авалт тооцоолох"
 
 #. module: procurement
 #: field:procurement.order,message:0
@@ -102,7 +105,7 @@ msgstr "Сүүлийн алдаа"
 #. module: procurement
 #: help:mrp.property,composition:0
 msgid "Not used in computations, for information purpose only."
-msgstr ""
+msgstr "Тооцоололд ашиглагдахгүй, зөвхөн мэдээллийн зорилгоор ашиглана."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
@@ -117,7 +120,7 @@ msgstr "Тэмдэглэгээ"
 #. module: procurement
 #: help:procurement.order,message:0
 msgid "Exception occurred while computing procurement orders."
-msgstr ""
+msgstr "Татан авалтын захиалгыг тооцоолж байх үед онцгой тохиолдол гардаг."
 
 #. module: procurement
 #: help:procurement.order,state:0
@@ -131,6 +134,13 @@ msgid ""
 " It is in 'Waiting'. state when the procurement is waiting for another one "
 "to finish."
 msgstr ""
+"Татан авалт үүсэхэд төлөв нь 'Draft'.\n"
+"Татан авалт нь баталгаажсан бол төлөв нь 'Confirmed'.\n"
+"Баталгаажсаны дараа төлөв нь 'Running'.\n"
+"Хэрэв ямар нэгэн онцгой тохиолдол захиалгад үүсвэл төлөв нь  'Exception'.\n"
+"Онцгой тохиолдол устхад төлөв нь 'Ready'.\n"
+"Нэг татан авалт нь нөгөө татан авалтаа дуусахыг хүлээж байхад төлөв нь "
+"'Waiting' байна."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -143,11 +153,14 @@ msgid ""
 "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Виртуал агуулах нь хамгийн бага тоо хэмжээнд ойртож байвал, OpenERP нь "
+"виртуал агуулахыг хамгийн их тоо хэмжээнд хүргэхийн тулд татан авалтыг "
+"боловсруулдаг."
 
 #. module: procurement
 #: view:procurement.order.compute.all:0
 msgid "Scheduler Parameters"
-msgstr ""
+msgstr "Төлөвлөгчийн үзүүлэлт"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action11
@@ -168,7 +181,7 @@ msgstr "Бэлэн"
 #. module: procurement
 #: field:procurement.order.compute.all,automatic:0
 msgid "Automatic orderpoint"
-msgstr ""
+msgstr "Автомат захиалгын цэг"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -197,11 +210,13 @@ msgid ""
 "Reference of the document that created this Procurement.\n"
 "This is automatically completed by OpenERP."
 msgstr ""
+"Татан авалтын үүсгэсэн баримтын дугаар. Үүнийг OpenERP автоматаар "
+"гүйцэтгэдэг."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
 msgid "Minimum Inventory Rule"
-msgstr ""
+msgstr "Хамгийн бага эрхтэй оролцогч"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action4
@@ -257,7 +272,7 @@ msgstr "Нийлүүлэлт"
 #. module: procurement
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range Days"
-msgstr ""
+msgstr "Төлөвлөгчийн өдрийн хязгаар"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -318,6 +333,8 @@ msgid ""
 "If you encode manually a Procurement, you probably want to use a make to "
 "order method."
 msgstr ""
+"Татан авалтыг гараар кодлохоор бол, методуудыг цэгцлэхийн тулд загвар харах "
+"болно."
 
 #. module: procurement
 #: view:res.company:0
@@ -330,6 +347,8 @@ msgid ""
 "Wizard run all the procurements, and generate task, production order or "
 "purchase order based on the product type"
 msgstr ""
+"Визард нь татан авалтыг ажиллуулдаг ба даалгавруудыг биелүүлдэг, барааны "
+"захиалга эсвэл худалдан авалтын захиалга нь барааны төрлөөс хамаарна."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_max_qty:0
@@ -422,6 +441,8 @@ msgid ""
 "Please check the Quantity in Procurement Order(s), it should not be less "
 "than 1!"
 msgstr ""
+"Татан авалтын захиалгын тоо хэмжээг шалгана уу, энэ нь нэгээс бага байх "
+"ёсгүй!"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -429,6 +450,9 @@ msgid ""
 "When the virtual stock goes belong the Max Quantity, OpenERP generates a "
 "procurement to bring the virtual stock to the Max Quantity."
 msgstr ""
+"Виртуал агуулах нь хамгийн бага тоо хэмжээнд ойртож байвал, OpenERP нь "
+"виртуал агуулахыг хамгийн их тоо хэмжээнд хүргэхийн тулд татан авалтыг "
+"боловсруулдаг."
 
 #. module: procurement
 #: help:procurement.orderpoint.compute,automatic:0
@@ -477,6 +501,9 @@ msgid ""
 "procurements. All procurements that are not between today and today+range "
 "are skipped for futur computation."
 msgstr ""
+"Энэ бол Татан авалтыг тооцоолж байх үед  төлөвлөгчийн дүгнэсэн боломжит "
+"хугацаа юм. Өнөөдөр болон өнөөдрийн хязгаар хооронд багтаагүй татан авалт нь "
+"дараагийн тооцоолол хүртэл орхигдоно."
 
 #. module: procurement
 #: selection:procurement.order,priority:0
@@ -494,6 +521,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the orderpoint "
 "without removing it."
 msgstr ""
+"Хэрэв идэвхтэй талбар нь үнэн болсон бол, захиалгын цэгийг устгалгүйгээр "
+"нуух боломжийг олгоно."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -525,12 +554,12 @@ msgstr "Алдаа"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr ""
+msgstr "Автомат захиалгын цэг"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,qty_multiple:0
 msgid "Qty Multiple"
-msgstr ""
+msgstr "Хуваагдах тоо хэмжээ"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -561,7 +590,7 @@ msgstr ""
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Order to Max"
-msgstr ""
+msgstr "Хамгийн их захиалга"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
@@ -571,7 +600,7 @@ msgstr "Хаагдсан огноо"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Late"
-msgstr ""
+msgstr "Хожимдсон"
 
 #. module: procurement
 #: field:mrp.property,composition:0
@@ -604,7 +633,7 @@ msgstr "Байршлууд"
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "from stock"
-msgstr ""
+msgstr "Агуулахаас"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -624,7 +653,7 @@ msgstr "Дууссан"
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will by rounded up to this multiple."
-msgstr ""
+msgstr "Татан авалтын тоо хэмжээ нь дараа дараагийн талбарт тоймлогдоно."
 
 #. module: procurement
 #: view:make.procurement:0
@@ -659,7 +688,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Current"
-msgstr ""
+msgstr "Одоо"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -695,7 +724,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Төлөвлөгдсөн огноо"
 
 #. module: procurement
 #: field:make.procurement,product_id:0
@@ -749,7 +778,7 @@ msgstr "Хүлээж байна"
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "on order"
-msgstr ""
+msgstr "Захиалга"
 
 #. module: procurement
 #: field:procurement.order,move_id:0
@@ -767,6 +796,9 @@ msgid ""
 "This wizard will plan the procurement for this product. This procurement may "
 "generate task, production orders or purchase orders."
 msgstr ""
+"Энэ визард нь тухайн барааны татан авалтыг төлөвлөдөг. Энэ татан авалт нь "
+"даалгаварууд, барааны захиалга эсвэл худалдан авалтын захиалгыг боловсруулах "
+"боломжтой."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -800,13 +832,15 @@ msgstr ""
 #: model:ir.actions.act_window,name:procurement.action_compute_schedulers
 #: view:procurement.order.compute.all:0
 msgid "Compute Schedulers"
-msgstr ""
+msgstr "Тооцоолол төлөвлөгч"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid ""
 "Wizard checks all the stock minimum rules and generate procurement order."
 msgstr ""
+"Визард нь агуулахын хамгийн бага дүрмийг шалгаад татан авалтын захиалгыг "
+"биелүүлдэг."
 
 #. module: procurement
 #: field:procurement.order,product_uom:0
@@ -826,7 +860,7 @@ msgstr "Маш яаралтай"
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr ""
+msgstr "Автомат захиалгын цэг"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -848,6 +882,16 @@ msgid ""
 "        if product_id:\n"
 "            w = self.pool.get('product.product"
 msgstr ""
+"Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
+"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
+"\n"
+"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
+"        \"\"\" Finds UoM and UoS of changed product.\n"
+"        @param product_id: Changed id of product.\n"
+"        @return: Dictionary of values.\n"
+"        \"\"\"\n"
+"        if product_id:\n"
+"            w = self.pool.get('product.product"
 
 #. module: procurement
 #: constraint:ir.rule:0
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 9beab0c4d59..82ab4a9320c 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/report_intrastat/i18n/it.po b/addons/report_intrastat/i18n/it.po
index 2c83dde0cb7..4dba312df22 100644
--- a/addons/report_intrastat/i18n/it.po
+++ b/addons/report_intrastat/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-10-12 20:22+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
@@ -27,7 +27,7 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Canceled Invoice"
-msgstr ""
+msgstr "Fattura Cancellata"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -43,7 +43,7 @@ msgstr "Intrastat (questo mese)"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Fattura Fornitore"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -58,7 +58,7 @@ msgstr ""
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Period"
-msgstr ""
+msgstr "Periodo"
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_90
@@ -73,22 +73,22 @@ msgstr "Importa"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "VAT :"
-msgstr ""
+msgstr "IVA"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Document"
-msgstr ""
+msgstr "Documento"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Tasse:"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -109,7 +109,7 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Data della fattura"
 
 #. module: report_intrastat
 #: model:ir.module.module,shortdesc:report_intrastat.module_meta_information
@@ -119,17 +119,17 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Base"
-msgstr ""
+msgstr "Base"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantità"
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_89
@@ -144,12 +144,12 @@ msgstr ""
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "Totale (tasse incluse)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Refund"
-msgstr ""
+msgstr "Rimborso"
 
 #. module: report_intrastat
 #: constraint:ir.ui.view:0
@@ -164,17 +164,17 @@ msgstr "Report Intrastat"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes"
-msgstr ""
+msgstr "Tasse"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Amount"
-msgstr ""
+msgstr "Importo"
 
 #. module: report_intrastat
 #: view:report.intrastat:0
@@ -214,7 +214,7 @@ msgstr "Codice Intrastat"
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Origin"
-msgstr ""
+msgstr "Origine"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -230,7 +230,7 @@ msgstr "Membro Intrastat"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tax"
-msgstr ""
+msgstr "Tassa"
 
 #. module: report_intrastat
 #: field:report.intrastat,code:0
@@ -250,22 +250,22 @@ msgstr "Esporta"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Rimborso Fornitore"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (excl. taxes):"
-msgstr ""
+msgstr "Totale (tasse escluse)"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Price"
-msgstr ""
+msgstr "Prezzo"
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index 6f3d120040d..63c3fdd1e05 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
diff --git a/addons/resource/i18n/nl.po b/addons/resource/i18n/nl.po
index bfb0bc36ad2..6848c21c15b 100644
--- a/addons/resource/i18n/nl.po
+++ b/addons/resource/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-18 06:50+0000\n"
-"PO-Revision-Date: 2010-10-11 12:36+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-12 07:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
diff --git a/addons/wiki_faq/i18n/de.po b/addons/wiki_faq/i18n/de.po
index b7849cc39cf..47809753226 100644
--- a/addons/wiki_faq/i18n/de.po
+++ b/addons/wiki_faq/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_faq
diff --git a/addons/wiki_quality_manual/i18n/de.po b/addons/wiki_quality_manual/i18n/de.po
index c0b73038993..5515df16029 100644
--- a/addons/wiki_quality_manual/i18n/de.po
+++ b/addons/wiki_quality_manual/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_quality_manual
diff --git a/addons/wiki_sale_faq/i18n/de.po b/addons/wiki_sale_faq/i18n/de.po
index a1e54fc3646..b3843e0e12b 100644
--- a/addons/wiki_sale_faq/i18n/de.po
+++ b/addons/wiki_sale_faq/i18n/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-12 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_sale_faq

From 0efa32fb0fc0af6280eb02da1b4477036efeaf23 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Wed, 13 Oct 2010 11:06:32 +0530
Subject: [PATCH 27/78] [IMP]:point_of_sale:Improves the period function in
 pos_details_summary.py

bzr revid: azaz.201186@gmail.com-20101013053632-khd9n57zga711dt1
---
 .../report/pos_details_summary.py             | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index a9e2ac689d3..579b28ca6ca 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import time
+import datetime
 from report import report_sxw
 
 
@@ -120,24 +121,15 @@ class pos_details_summary(report_sxw.rml_parse):
         return reduce(lambda x, o: x + len(o.lines), objects, 0)
 
     def _get_start_period(self, objects):
-        date_orders = [obj.date_order for obj in objects]
-        print "=========================",date_orders
-        min_date = min(date_orders)
-        max_date = max(date_orders)
-        print "========================",min_date
-        if min_date == max_date:
-            return '%s' % min_date
-        else:
-            return '%s' % min_date
+        date_orders = sorted([obj.date_order for obj in objects])
+        min_date = date_orders[0]
+        return '%s' % min_date
+
 
     def _get_end_period(self, objects):
         date_orders = [obj.date_order for obj in objects]
-        min_date = min(date_orders)
-        max_date = max(date_orders)
-        if min_date == max_date:
-            return '%s' % max_date
-        else:
-            return '%s' % max_date
+        max_date = date_orders[-1]
+        return '%s' % max_date
 
 
 report_sxw.report_sxw('report.pos.details_summary',

From 6b383b79ae03490756cb5896c9b09afcdda7c1d6 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Wed, 13 Oct 2010 11:45:44 +0530
Subject: [PATCH 28/78] [IMP]:point_of_sale:Improves pos_details_summary report

bzr revid: azaz.201186@gmail.com-20101013061544-8g6l5jxmmjrqrze7
---
 .../report/pos_details_summary.py             |   4 +-
 .../report/pos_details_summary.rml            | 100 +++++++++---------
 2 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index 579b28ca6ca..30cfdd7063c 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 import time
-import datetime
+from datetime import datetime
 from report import report_sxw
 
 
@@ -127,7 +127,7 @@ class pos_details_summary(report_sxw.rml_parse):
 
 
     def _get_end_period(self, objects):
-        date_orders = [obj.date_order for obj in objects]
+        date_orders = sorted([obj.date_order for obj in objects])
         max_date = date_orders[-1]
         return '%s' % max_date
 
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index 466500f0960..2c119c103f1 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Details of Sales" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
+      <frame id="first" x1="28.0" y1="57.0" width="511" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -44,46 +44,44 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-    </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table9">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table8">
+    <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table11">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,2" stop="0,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,2" stop="1,2"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,3" stop="0,3"/>
@@ -102,12 +100,8 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -146,14 +140,11 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
+    <para style="terp_header_Centre">Details of Sales</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P3">Details of Sales</para>
-    <para style="P6">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="167.0,115.0,115.0,115.0" style="Table1">
+    <blockTable colWidths="149.0,124.0,119.0,120.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Company</para>
@@ -169,16 +160,16 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="166.0,116.0,115.0,115.0" style="Table2">
+    <blockTable colWidths="148.0,124.0,119.0,119.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_default_Centre_8">[[ '%s' % getcompany(objects)]]</para>
+          <para style="terp_default_Centre_8">[[ company.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ '%s' % getstartperiod(objects) ]]</para>
+          <para style="terp_default_Centre_8">[[ '%s' % getstartperiod(objects) ]] </para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ '%s' % getendperiod(objects) ]]</para>
@@ -188,13 +179,18 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="256.0,256.0" style="Table4">
+    <section>
+      <para style="Standard">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <blockTable colWidths="256.0,256.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Mode of Taxes</para>
         </td>
         <td>
-          <para style="P2">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
@@ -202,27 +198,30 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(gettaxamount(objects).items(),'p') ]]</para>
-      <blockTable colWidths="256.0,256.0" style="Table6">
+      <blockTable colWidths="256.0,256.0" style="Table5">
         <tr>
           <td>
-            <para style="P5">[[ p[0] ]]</para>
+            <para style="P1">[[ p[0] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9_Bold">[[ p[1] ]] [[company.currency_id.symbol]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_9">
+      <para style="terp_default_1">
         <font color="white"> </font>
       </para>
     </section>
-    <blockTable colWidths="256.0,256.0" style="Table3">
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="257.0,255.0" style="Table9">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Mode of Payment</para>
         </td>
         <td>
-          <para style="P2">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
@@ -230,10 +229,10 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(getpayments(objects).items(),'t') ]]</para>
-      <blockTable colWidths="256.0,256.0" style="Table9">
+      <blockTable colWidths="255.0,255.0" style="Table11">
         <tr>
           <td>
-            <para style="P4">[[ t[0] ]]</para>
+            <para style="P2">[[ t[0] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9_Bold">[[ '%.2f' % (t[1],) ]] [[company.currency_id.symbol]]</para>
@@ -244,25 +243,28 @@
         <font color="white"> </font>
       </para>
     </section>
-    <blockTable colWidths="256.0,256.0" style="Table8">
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="257.0,255.0" style="Table8">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Summary</para>
+          <para style="terp_tblheader_Details">Summary</para>
         </td>
         <td>
-          <para style="P1">
+          <para style="terp_default_9">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="256.0,256.0" style="Table7">
+    <blockTable colWidths="257.0,254.0" style="Table7">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Sales total</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ '%d' % getsalestotal(objects) ]] [[company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ '%d' % getsalestotal(objects) ]]</para>
         </td>
       </tr>
       <tr>
@@ -306,7 +308,7 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_9">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
   </story>

From cff45072e7024a39ec3df798a8103499e8f412c0 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 13 Oct 2010 12:00:46 +0530
Subject: [PATCH 29/78] [Fix] stock: Done picking wizard ask for cost

bzr revid: sbh@tinyerp.com-20101013063046-34xg032inept5an1
---
 addons/stock/stock.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 941f878815d..e09ca183675 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -731,21 +731,29 @@ class stock_picking(osv.osv):
                 'button_confirm', cr)
         return True
 
-    def draft_validate(self, cr, uid, ids, *args):
+    def draft_validate(self, cr, uid, ids, context=None):
         """ Validates picking directly from draft state.
         @return: True
         """
+        if context is None:
+            context = {}
         wf_service = netsvc.LocalService("workflow")
         self.draft_force_assign(cr, uid, ids)
         for pick in self.browse(cr, uid, ids):
             move_ids = [x.id for x in pick.move_lines]
             self.pool.get('stock.move').force_assign(cr, uid, move_ids)
             wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
-
-            self.action_move(cr, uid, [pick.id])
-            wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
-        return True
-
+        context.update({'active_ids':ids})
+        return {
+                'name': 'Make Picking',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_model': 'stock.partial.picking',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+                'nodestroy': True,
+                'context':context
+            }
     def cancel_assign(self, cr, uid, ids, *args):
         """ Cancels picking and moves.
         @return: True

From 4ff60c931f01936bc8efd85f70be6e1c70c2e30d Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 13 Oct 2010 12:12:19 +0530
Subject: [PATCH 30/78] [Fix] stock: Fix the demo data

bzr revid: sbh@tinyerp.com-20101013064219-jf3eqy083oq3lgdx
---
 addons/stock/stock_demo.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index 33d130c2d77..bce4de8b593 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -264,6 +264,7 @@
             <field name="invoice_state">2binvoiced</field>
             <field name="address_id"  ref="base.main_address"/>
             <field name="company_id" ref="base.main_company"/>
+            <field name="partner_id" ref="base.main_partner"/>
         </record>
     </data>
 </openerp>

From 91734ec8e1e27ff732d8b8758eba723aa4a0899d Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 13 Oct 2010 08:51:40 +0200
Subject: [PATCH 31/78] [FIX] hr_timesheet_sheet: fixed a typo in security file

bzr revid: olt@tinyerp.com-20101013065140-zsuohiimhawbs3o7
---
 addons/hr_timesheet_sheet/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index c11a3ce7099..54d303d116a 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -4,6 +4,6 @@
 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
-"access_timesheet_report_employee","timesheet.report.employee","model_timesheet_report","base.group_hr_user",1,1,1,1
+"access_timesheet_report_employee","timesheet.report.employee","model_hr_timesheet_report","base.group_hr_user",1,1,1,1
 "access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
 "access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0

From 67b54aefe15037c51d7dd7ce375d8f7a7226ca51 Mon Sep 17 00:00:00 2001
From: ssi <ssi@tinyerp.com>
Date: Wed, 13 Oct 2010 12:48:58 +0530
Subject: [PATCH 32/78] [IMP] account_voucher: modified condition of pay btn in
 Sales Reciept

bzr revid: ssi@tinyerp.com-20101013071858-deza7wlc9ii7ofz3
---
 addons/account_voucher/voucher_sales_purchase_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 7bc64a825ae..ad44b842587 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -148,12 +148,14 @@
                             <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
                         </page>
                     </notebook>
-                    <group col="10" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="state"/>
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                        <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
+                        <group  colspan="2" attrs="{'invisible':[('pay_now','!=','pay_now')]}">
+			    <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('state','!=','posted')]}"/>
+			</group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </form>

From 0c1559160c9026469eb0c2a27811943d803b1f27 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 13 Oct 2010 09:56:18 +0200
Subject: [PATCH 33/78] [FIX] procurement: fixed workflow (error in 'confirm'
 after using 'delivery cost' wizard)

bzr revid: olt@tinyerp.com-20101013075618-qrh4jl0pch48aa94
---
 addons/procurement/procurement_workflow.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index b4bcd1e1f04..23b0a08af78 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -188,14 +188,14 @@
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_done"/>
             <field name="condition">action_check_finished()</field>
-			<field name="trigger_model">stock.move</field>
-            <field name="trigger_expr_id">[move_id.id]</field>            
+            <field name="trigger_model">stock.move</field>
+            <field name="trigger_expr_id">move_id and [move_id.id] or []</field>
         </record>
         <record id="trans_make_done_confirm" model="workflow.transition">
             <field name="act_from" ref="act_make_done"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="condition">check_move_cancel()</field>
         </record>
-    
+
     </data>
 </openerp>

From ff91a45e22900fc2567dc6b5c70b172a216f6bfc Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 13 Oct 2010 13:58:33 +0530
Subject: [PATCH 34/78] [IMP] stock: Improve the icon

bzr revid: sbh@tinyerp.com-20101013082833-xls09cjd79wzmd17
---
 addons/stock/stock_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 80c898daefa..0a0cfc76a03 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -101,7 +101,7 @@
                                     string="Split inventory lines" groups="base.group_extended"
                                     type="action" icon="terp-stock_effects-object-colorize" states="draft"/>
                                 <field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
-                                <field name="state" />
+                                <field name="state" invisible="True"/>
                             </tree>
                             <form string="Products ">
                                 <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
@@ -127,7 +127,7 @@
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
                                     <field name="date" string="Date"/>
-                                    <field name="state"/>
+                                    <field name="state"  invisible="True"/>
                                 </tree>
                              </field>
                     </page>
@@ -935,7 +935,7 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(action_partial_picking)d" states="assigned" string="Done" type="action" icon="gtk-execute"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Done" type="action" icon="gtk-go-forward"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
@@ -1150,7 +1150,7 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
-                                <button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-go-forward"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>

From ccadfbccd0578431be8fc0d2ec872041fcd0aded Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 13 Oct 2010 14:13:16 +0530
Subject: [PATCH 35/78] [IMP] stock: set Cancel button left side

bzr revid: sbh@tinyerp.com-20101013084316-h7tlk1dcqolgviz9
---
 addons/stock/stock_view.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 0a0cfc76a03..44717405b13 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -741,13 +741,14 @@
                             </field>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Confirm (Do Not Process Now)" type="object" icon="gtk-apply"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-apply"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                                
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -931,13 +932,14 @@
                             </field>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Done" type="action" icon="gtk-go-forward"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                                
                             </group>
                         </page>
                         <page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -1146,13 +1148,14 @@
                             </field>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
+                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-ok"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
                                 <button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-go-forward"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
-                                <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                                
                             </group>
                         </page>
                         <page string="Additional Info" groups="base.group_extended,base.group_multi_company">

From dca965d85cda6a386c76b8783a1d8dc2410e2281 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 13 Oct 2010 14:52:24 +0530
Subject: [PATCH 36/78] [Fix] procurement: Fix the link of Minimum Stock Rules

bzr revid: sbh@tinyerp.com-20101013092224-l4opck9q28cma8bi
---
 addons/procurement/procurement_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 3c9bff9be9c..4d54fa256a8 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -238,7 +238,7 @@
         </record>
 
         <act_window 
-        context="{'search_default_warehouse_id': [active_id]}"
+        context="{'search_default_warehouse_id': active_id}"
         id="act_stock_warehouse_2_stock_warehouse_orderpoint"
         name="Minimum Stock Rules" 
         res_model="stock.warehouse.orderpoint" 

From 1743200e489362a6c4776ac1ac9d7f239b1ddd63 Mon Sep 17 00:00:00 2001
From: vro <vro@tinyerp.com>
Date: Wed, 13 Oct 2010 15:03:12 +0530
Subject: [PATCH 37/78] [IMP]:lunch:Improved report

bzr revid: vro@tinyerp.com-20101013093312-ifw1pr3jeahsrlie
---
 addons/lunch/report/order.rml | 41 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index 81e1f8bcb78..62003478c4c 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -92,7 +92,7 @@
     <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
     <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
     <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P15" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -111,33 +111,33 @@
     <images/>
   </stylesheet>
   <story>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
+    <para style="P15">[[repeatIn(objects,'o')]]</para>
     <section>
-      <para style="P14">[[repeatIn(objects,'o')]]</para>
+      <para style="P15">
+        <font color="white"> </font>
+      </para>
       <blockTable colWidths="262.0,6.0,260.0" style="Table5">
         <tr>
           <td>
-            <para style="P9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P15">[[ o.user_id.address_id.title.name or '' ]] [[ o.user_id.address_id.name ]]</para>
-            <para style="P15">[[ o.user_id.address_id.street ]]</para>
-            <para style="P15">[[ o.user_id.address_id.street2 or removeParentNode('para') ]]</para>
-            <para style="P15">[[ o.user_id.address_id.zip or '' ]] [[ o.user_id.address_id.city or '' ]]</para>
-            <para style="P15">[[ (o.user_id.address_id.state_id and o.user_id.address_id.state_id.name) or removeParentNode('para')]] [[ (o.user_id.address_id.country_id and o.user_id.address_id.country_id.name) or '' ]]</para>
             <para style="P15">
               <font color="white"> </font>
             </para>
           </td>
+          <td>
+            <para style="P9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="P14">[[ o.user_id.address_id.partner_id.title.name or '' ]] [[ o.user_id.address_id.partner_id.name ]]</para>
+            <para style="P14">[[ o.user_id.address_id.street ]]</para>
+            <para style="P14">[[ o.user_id.address_id.street2 or removeParentNode('para') ]]</para>
+            <para style="P14">[[ o.user_id.address_id.zip or '' ]] [[ o.user_id.address_id.city or '' ]]</para>
+            <para style="P14">[[ (o.user_id.address_id.state_id and o.user_id.address_id.state_id.name) or removeParentNode('para')]] [[ (o.user_id.address_id.country_id and o.user_id.address_id.country_id.name) or '' ]]</para>
+            <para style="P14">
+              <font color="white"> </font>
+            </para>
+          </td>
         </tr>
       </blockTable>
       <para style="P1">
@@ -179,7 +179,6 @@
     <blockTable colWidths="132.0,153.0,142.0,101.0" style="Table1">
       <tr>
         <td>
-          <para style="P5">[[repeatIn(objects, 'o') ]]</para>
           <para style="P5">[[ o.user_id.name ]]</para>
         </td>
         <td>

From 54e6589b272a82a0b1d1c2963f27837ff52f3066 Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 13 Oct 2010 11:33:37 +0200
Subject: [PATCH 38/78] [FIX] event: now check that Closing Date is after
 Beginning Date

bzr revid: olt@tinyerp.com-20101013093337-jkmo3zx828o13m77
---
 addons/event/event.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 5c510ede613..192844f3f20 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -211,7 +211,7 @@ class event_event(osv.osv):
         'register_current': fields.function(_get_register, method=True, string='Confirmed Registrations', multi='register_current',
             help="Total of Open and Done Registrations"),
         'register_prospect': fields.function(_get_register, method=True, string='Unconfirmed Registrations', multi='register_prospect',
-            help="Total of Prospect Registrations"),
+            help="Total of Prospect Registrati./event/event.py:41:ons"),
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
         'date_begin': fields.datetime('Beginning date', required=True, help="Beginning Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.datetime('Closing date', required=True, help="Closing Date of Event", readonly=True, states={'draft': [('readonly', False)]}),
@@ -262,8 +262,15 @@ class event_event(osv.osv):
 
         return True
 
+    def _check_closing_date(self, cr, uid, ids):
+        for event in self.browse(cr, uid, ids):
+            if event.date_end < event.date_begin:
+                return False
+        return True
+
     _constraints = [
-        (_check_recursion, 'Error ! You cannot create recursive event.', ['parent_id'])
+        (_check_recursion, 'Error ! You cannot create recursive event.', ['parent_id']),
+        (_check_closing_date, 'Error ! Closing Date cannot be set before Beginning Date.', ['date_end']),
     ]
 
     def do_team_change(self, cr, uid, ids, team_id, context=None):

From 78dfe1f278058bc178c3133c1ee43763a337a631 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 13 Oct 2010 15:17:48 +0530
Subject: [PATCH 39/78] [IMP] stock_location: Rename the file

bzr revid: sbh@tinyerp.com-20101013094748-t2dotofsdkk7bo1a
---
 addons/stock_location/__init__.py                               | 2 +-
 addons/stock_location/__openerp__.py                            | 2 +-
 addons/stock_location/{mrp_pull.py => procurement_pull.py}      | 0
 .../{mrp_pull_workflow.xml => procurement_pull_workflow.xml}    | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename addons/stock_location/{mrp_pull.py => procurement_pull.py} (100%)
 rename addons/stock_location/{mrp_pull_workflow.xml => procurement_pull_workflow.xml} (100%)

diff --git a/addons/stock_location/__init__.py b/addons/stock_location/__init__.py
index 08f3f214ba0..4cd1ac5f0db 100644
--- a/addons/stock_location/__init__.py
+++ b/addons/stock_location/__init__.py
@@ -20,6 +20,6 @@
 ##############################################################################
 
 import stock_location
-import mrp_pull
+import procurement_pull
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index 5c2ae8e63e5..64dfb4c8078 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -87,7 +87,7 @@ You can use the demo data as follow:
     'author': 'OpenERP SA',
     'depends': ['procurement','stock','sale'],
     'init_xml': [],
-    'update_xml': ['stock_location_view.xml', 'security/ir.model.access.csv', 'mrp_pull_workflow.xml'],
+    'update_xml': ['stock_location_view.xml', 'security/ir.model.access.csv', 'procurement_pull_workflow.xml'],
     'demo_xml': [
         'stock_location_demo_cpu1.xml',
         'stock_location_demo_cpu3.yml',
diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/procurement_pull.py
similarity index 100%
rename from addons/stock_location/mrp_pull.py
rename to addons/stock_location/procurement_pull.py
diff --git a/addons/stock_location/mrp_pull_workflow.xml b/addons/stock_location/procurement_pull_workflow.xml
similarity index 100%
rename from addons/stock_location/mrp_pull_workflow.xml
rename to addons/stock_location/procurement_pull_workflow.xml

From b3191afaf72ce6abd5f70d1dd439caf82c5db13c Mon Sep 17 00:00:00 2001
From: "olt@tinyerp.com" <>
Date: Wed, 13 Oct 2010 11:56:27 +0200
Subject: [PATCH 40/78] [FIX] hr_timesheet: removed duplicate 'journal_id'
 field in view

bzr revid: olt@tinyerp.com-20101013095627-qn52st18zx8xtylr
---
 addons/hr_timesheet/hr_timesheet_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 664587b75a3..08ec23bd872 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -22,7 +22,6 @@
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" invisible="1"/>
                     <field name="amount" sum="Total cost" invisible="1"/>
                     <field name="general_account_id" invisible="1"/>
-                    <field name="journal_id" invisible="1"/>
                 </tree>
             </field>
         </record>

From a22787cadf9fdef396f44178ea5b249acbdced9c Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 13 Oct 2010 16:32:47 +0530
Subject: [PATCH 41/78] [Fix] stock: correct the Unreceived Products

bzr revid: sbh@tinyerp.com-20101013110247-2dwqhcy998va25tu
---
 addons/stock/stock.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e09ca183675..9afa0d2a481 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2541,16 +2541,16 @@ class stock_picking_move_wizard(osv.osv_memory):
     def _get_picking(self, cr, uid, ctx=None):
         if ctx is None:
             ctx = {}
-        if ctx.get('action_id', False):
-            return ctx['action_id']
+        if ctx.get('active_id', False):
+            return ctx['active_id']
         return False
 
     def _get_picking_address(self, cr, uid, context=None):
         picking_obj = self.pool.get('stock.picking')
         if context is None:
             context = {}
-        if context.get('action_id', False):
-            picking = picking_obj.browse(cr, uid, [context['action_id']])[0]
+        if context.get('active_id', False):
+            picking = picking_obj.browse(cr, uid, [context['active_id']])[0]
             return picking.address_id and picking.address_id.id or False
         return False
 

From 5b2361fbbdc292067e83362cd447ecbe93065486 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 13 Oct 2010 17:01:54 +0530
Subject: [PATCH 42/78] [IMP] hr_contract : Improvemetns in view

bzr revid: vir@tinyerp.com-20101013113154-daqk3yy39k9xpgjw
---
 addons/hr_contract/hr_contract_view.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 1ad05582d47..440afa2894e 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -146,8 +146,8 @@
             <field name="arch" type="xml">
                 <search string="Search Contract">
                    <group col='15' colspan='4'>
-                   <filter string="Current" icon="terp-check" name="current"  domain="[('date_end','&gt;=', time.strftime('%%Y-%%m-%%d'))]"                       context="{'group_by':'date_end'}" help="Contracts in progress"/> 
-                   <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]"                          context="{'group_by':'date_end'}" help="Contracts whose end date already passed"/>   
+                   <filter string="Current" icon="terp-check" name="current"  domain="['|',('date_end','&gt;=', time.strftime('%%Y-%%m-%%d')),('date_end','=',False)]" help="Contracts in progress"/> 
+                   <filter string="Overpassed" icon="terp-emblem-important" domain="[('date_end','&lt;', time.strftime('%%Y-%%m-%%d'))]" help="Contracts whose end date already passed"/>   
                    <separator orientation="vertical"/>                  
                    <field name="name"/>
                    <field name="employee_id"/>
@@ -157,9 +157,12 @@
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-                   <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
+                   <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/> 
+                   <separator orientation="vertical"/> 
                    <filter string="Working Schedule" icon="terp-go-week" domain="[]" context="{'group_by':'working_hours'}"/>
                    <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                    <separator orientation="vertical"/> 
+                    <filter string="Contract Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type_id'}"/>
                    </group>
                </search>
             </field>

From 5edc7052d11227fae21ab3048e173c031efdfae5 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 13 Oct 2010 17:14:08 +0530
Subject: [PATCH 43/78] [IMP] stock: Change string  Done to validate and set
 the icon

bzr revid: sbh@tinyerp.com-20101013114408-psy5zgge680hmqp7
---
 addons/stock/stock_view.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 44717405b13..659f8bf1c32 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -394,7 +394,7 @@
                     <field name="date" string="Date"/>
                     <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
-                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                    <button name="action_done" states="confirmed,assigned" string="Validate" type="object" icon="gtk-jump-to"/>
                 </tree>
             </field>
         </record>
@@ -873,7 +873,7 @@
                                     <field name="date"/>
                                     <field name="state"/>
                                     <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
-                                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                                    <button name="action_done" states="confirmed,assigned" string="Validate" type="object" icon="gtk-go-forward"/>
                                 </tree>
                                 <form string="Stock Moves">
                                     <group colspan="2" col="4">
@@ -937,7 +937,7 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(action_partial_picking)d" states="assigned" string="Done" type="action" icon="gtk-go-forward"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-go-forward"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 
                             </group>
@@ -1330,7 +1330,7 @@
                     <field name="date"/>
                     <field name="date_expected"/>
                     <field name="state"/>
-                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-ok"/>
+                    <button name="action_done" states="confirmed,assigned" string="Validate" type="object" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -1398,7 +1398,7 @@
                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                         <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                         <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
-                        <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                        <button name="action_done" states="assigned" string="Validate" type="object" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>
@@ -1502,7 +1502,7 @@
                     <field name="state"/>
                     <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                     <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
-                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                    <button name="action_done" states="confirmed,assigned" string="gtk-go-forward" type="object" icon="tk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -1520,7 +1520,7 @@
                     <field name="product_qty" />
                     <field name="product_uom" string="UoM"/>
                     <field name="date"/>
-                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                    <button name="action_done" states="confirmed,assigned" string="Validate" type="object" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -1586,7 +1586,7 @@
                         <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                         <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                         <button name="%(action_partial_move)d" states="assigned,confirmed" string="Partial" type="action" icon="gtk-justify-fill"/>
-                        <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                        <button name="action_done" states="assigned" string="Validate" type="object" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>

From 4b0c69ab392d62c12a7944ad12f031d7bf9b12d2 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Wed, 13 Oct 2010 17:30:39 +0530
Subject: [PATCH 44/78] [IMP] hr_timesheet_sheet : set a server action for my
 timesheet menu

bzr revid: vir@tinyerp.com-20101013120039-b4ffcjiv26koodwu
---
 addons/hr_timesheet_sheet/__openerp__.py      |  3 ++-
 .../hr_timesheet_sheet/hr_timesheet_sheet.py  |  5 ++++
 .../hr_timesheet_sheet_data.xml               | 24 +++++++++++++++++++
 ...ta.xml => hr_timesheet_sheet_security.xml} |  0
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
 rename addons/hr_timesheet_sheet/security/{hr_timesheet_data.xml => hr_timesheet_sheet_security.xml} (100%)

diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 7b114d46387..d00ee91a304 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -49,13 +49,14 @@ The validation can be configured in the company:
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
-        'security/hr_timesheet_data.xml',
+        'security/hr_timesheet_sheet_security.xml',
         'hr_timesheet_sheet_view.xml',
         'hr_timesheet_workflow.xml',
         'process/hr_timesheet_sheet_process.xml',
         'board_hr_timesheet_view.xml',
         'report/hr_timesheet_report_view.xml',
         'wizard/hr_timesheet_current_view.xml',
+        'hr_timesheet_sheet_data.xml'
     ],
     'demo_xml': ['hr_timesheet_sheet_demo.xml',
 
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index ce074715888..44bda56739f 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -334,11 +334,16 @@ class hr_timesheet_sheet(osv.osv):
             return time.strftime('%Y-12-31')
         return time.strftime('%Y-%m-%d')
 
+    def _default_employee(self,cr, uid, context=None):
+        emp_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
+        return emp_ids and emp_ids[0] or False
+
     _defaults = {
         'date_from' : _default_date_from,
         'date_current' : lambda *a: time.strftime('%Y-%m-%d'),
         'date_to' : _default_date_to,
         'state': 'new',
+        'employee_id': _default_employee,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr_timesheet_sheet.sheet', context=c)
     }
 
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
new file mode 100644
index 00000000000..e7fae82ec70
--- /dev/null
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <record id="ir_actions_server_timsheet_sheet" model="ir.actions.server">
+            <field eval="5" name="sequence"/>
+            <field eval="&quot;&quot;&quot;code&quot;&quot;&quot;" name="state"/>
+            <field eval="&quot;&quot;&quot;ir.actions.server&quot;&quot;&quot;" name="type"/>
+            <field name="model_id" ref="model_hr_timesheet_current_open"/>
+            <field eval="[(6,0,[])]" name="child_ids"/>
+            <field eval="&quot;&quot;&quot;action = self.pool.get('hr.timesheet.current.open').open_timesheet(cr, uid, object.id, context)&quot;&quot;&quot;" name="code"/>
+            <field eval="&quot;&quot;&quot;True&quot;&quot;&quot;" name="condition"/>
+            <field eval="&quot;&quot;&quot;My Timesheet&quot;&quot;&quot;" name="name"/>
+        </record>
+
+        <record id="menu_act_hr_timesheet_sheet_form_my_current" model="ir.ui.menu">
+            <field name="name">My Timesheet</field>
+            <field eval="1" name="sequence"/>
+            <field name="parent_id" ref="hr_attendance.menu_hr_time_tracking"/>
+            <field name="icon">STOCK_JUSTIFY_FILL</field>
+            <field name="action" ref="ir_actions_server_timsheet_sheet"/>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/hr_timesheet_sheet/security/hr_timesheet_data.xml b/addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml
similarity index 100%
rename from addons/hr_timesheet_sheet/security/hr_timesheet_data.xml
rename to addons/hr_timesheet_sheet/security/hr_timesheet_sheet_security.xml

From eec803e3470734aad4a9a7b352f49d6f9e605026 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 13 Oct 2010 14:08:18 +0200
Subject: [PATCH 45/78] [IMP] account: usablity change

bzr revid: qdp-launchpad@tinyerp.com-20101013120818-zk9uhis6gm85tr43
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index bf5e25a6f69..1520c4f0646 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -154,7 +154,7 @@ class account_account_type(osv.osv):
             ('expense','Profit & Loss (Expense Accounts)'),
             ('asset','Balance Sheet (Assets Accounts)'),
             ('liability','Balance Sheet (Liability Accounts)')
-        ],'Type Heads', select=True, readonly=False, help="According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)", required=True),
+        ],'P&L / BS Category', select=True, readonly=False, help="According value related accounts will be display on respective reports (Balance Sheet Profit & Loss Account)", required=True),
         'note': fields.text('Description'),
     }
     _defaults = {

From 8394924cc02566fb6a9e25d08332a11c750d5e22 Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Wed, 13 Oct 2010 14:09:11 +0200
Subject: [PATCH 46/78] [FIX] l10n_be: fixed the version number of vat file
 sent

bzr revid: qdp-launchpad@tinyerp.com-20101013120911-ovfpxtxr0j0lr9al
---
 addons/l10n_be/wizard/l10n_be_account_vat_declaration.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index e6e08e83b01..2b869e56306 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -81,7 +81,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
         account_period = obj_acc_period.browse(cr, uid, data['period_id'], context=context)
 
         send_ref = str(obj_company.partner_id.id) + str(account_period.date_start[5:7]) + str(account_period.date_stop[:4])
-        data_of_file = '<?xml version="1.0"?>\n<VATSENDING xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MultiDeclarationTVA-NoSignature-14.xml">'
+        data_of_file = '<?xml version="1.0"?>\n<VATSENDING xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MultiDeclarationTVA-NoSignature-16.xml">'
         data_of_file +='\n\t<DECLARER>\n\t\t<VATNUMBER>'+str(vat_no)+'</VATNUMBER>\n\t\t<NAME>'+ obj_company.name +'</NAME>\n\t\t<ADDRESS>'+address+'</ADDRESS>'
         data_of_file +='\n\t\t<POSTCODE>'+post_code+'</POSTCODE>\n\t\t<CITY>'+city+'</CITY>\n\t\t<COUNTRY>'+country_code+'</COUNTRY>\n\t\t<SENDINGREFERENCE>'+send_ref+'</SENDINGREFERENCE>\n\t</DECLARER>'
         data_of_file +='\n\t<VATRECORD>\n\t\t<RECNUM>1</RECNUM>\n\t\t<VATNUMBER>'+((vat_no and str(vat_no[2:])) or '')+'</VATNUMBER>\n\t\t<DPERIODE>\n\t\t\t'
@@ -127,4 +127,4 @@ class l10n_be_vat_declaration(osv.osv_memory):
 
 l10n_be_vat_declaration()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From c000866aa34de54bdc9f90c0ea9b82b540bba578 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 13 Oct 2010 17:55:19 +0530
Subject: [PATCH 47/78] [IMP] project: view improvement on delegrate wizard

bzr revid: hmo@tinyerp.com-20101013122519-8f2gjt5lzxzgr23q
---
 addons/project/wizard/project_task_delegate_view.xml | 5 +++--
 addons/project_long_term/project_long_term.py        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index e5eeed35573..f9b27af05b3 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -13,7 +13,8 @@
 		                    <field name="user_id" colspan="4"/>
 		                    <field name="planned_hours" widget="float_time" colspan="4"/>
 		                    <field name="name" colspan="4"/>
-		                    <field name="new_task_description" colspan="4" />
+                            <separator string="New Task Description" colspan="4"/>
+		                    <field name="new_task_description" colspan="4" nolabel="1"/>
                       </group>
                       <group colspan="2" col="2">
 		                    <separator string="Validation Task" colspan="4"/>
@@ -25,7 +26,7 @@
                       <group colspan="2" col="2">
                       </group>
 		              <group colspan="2" col="2">
-		            		<button icon="gtk-close" special="cancel" string="_Cancel"/>
+		            		<button icon="gtk-cancel" special="cancel" string="_Cancel"/>
 		            		<button icon="gtk-ok" name="delegate" string="_Delegate" type="object"/>
 		              </group>
 			  	</form>
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 903dbb3b17e..e6f65ba1fa9 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -396,7 +396,7 @@ class project_resource_allocation(osv.osv):
         'user_id': fields.related('resource_id', 'user_id', type='many2one', relation="res.users", string='User'),
         'date_start': fields.date('Start Date', help="Starting Date"),
         'date_end': fields.date('End Date', help="Ending Date"),
-        'useability': fields.float('Availability', help="Usability of this resource for this project phase in percentage (=50%)"),
+        'useability': fields.float('Availability', help="Availability of this resource for this project phase in percentage (=50%)"),
     }
     _defaults = {
         'useability': 100,

From 268da4799600808fd48ab50ffeb78c3bc71ce4c0 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Wed, 13 Oct 2010 18:09:02 +0530
Subject: [PATCH 48/78] [FIX] project: useability

bzr revid: hmo@tinyerp.com-20101013123902-lzcr18xw08n7v0cc
---
 addons/project/project_view.xml             | 2 +-
 addons/project_scrum/project_scrum_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 59bd8a6aff5..3ea6dab6649 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -328,7 +328,7 @@
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>                    
 					<button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                     <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
-                    <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
+                    <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index debf9316435..9b913f76294 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -104,7 +104,7 @@
                                         <field name="state" invisible="context.get('set_visible',False)"/>
                                         <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="terp-camera_test" help="For changing to open state" invisible="context.get('set_visible',False)"/>
                                         <button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
-                                        <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="gtk-jump-to" help="For changing to done state"/>
+                                        <button name="do_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
                                         <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-stop" help="For cancelling the task"/>
                                 </tree>
                             </field>

From 983e597d5243ebb455fdd4425e0be0218e61af10 Mon Sep 17 00:00:00 2001
From: saz-OpenERP <azaz.201186@gmail.com>
Date: Wed, 13 Oct 2010 18:11:38 +0530
Subject: [PATCH 49/78] [IMP]:point_of_sale:Improves the format of two reports

bzr revid: azaz.201186@gmail.com-20101013124138-bsxauhyecf3xa5eq
---
 addons/point_of_sale/report/pos_payment_report_date.rml | 6 +++---
 addons/point_of_sale/report/pos_users_product.rml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
index 6017407e58f..5abda34f54e 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Sales Lines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Payments" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
@@ -134,7 +134,7 @@
           <para style="terp_tblheader_Details">Product</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Qty</para>
+          <para style="terp_tblheader_General_Centre">Qty</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Right">Disc(%)</para>
@@ -190,7 +190,7 @@
           <para style="terp_tblheader_General_Right">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(pos_payment_date_total(data['form'])) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_date_total(data['form'])) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index 2c77f4ea5ba..9e58423ba7d 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -158,7 +158,7 @@
           <para style="terp_default_Centre_8">[[ formatLang(statement.date,date = True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date = True) ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date_time = True) ]]</para>
         </td>
       </tr>
     </blockTable>

From 76d3f92945f0c629c1ea5c8c6d79651d6bd0f404 Mon Sep 17 00:00:00 2001
From: "DBR(Open ERP)" <>
Date: Wed, 13 Oct 2010 18:34:43 +0530
Subject: [PATCH 50/78] [Fix] hr_expense : fixed error in report yml of expense
 report

bzr revid: vir@tinyerp.com-20101013130443-5mh69m5v37e71sxp
---
 addons/hr_expense/report/expense.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index 7d7be76ea8e..bfd0de77f49 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -259,7 +259,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ o.note or '' ]] [[ setTag('para','xpre') ]]</para>
+    <para style="terp_default_9">[[ setTag('para','xpre') ]] [[ o.note or '' ]]</para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>

From 6e48057d9329aaf8d11f55977fee903affb88dce Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 13 Oct 2010 18:43:18 +0530
Subject: [PATCH 51/78] improve

bzr revid: apa@tinyerp.com-20101013131318-gsilwkh2r49got8i
---
 addons/hr_expense/report/expense.rml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index 889887c9dd0..9754f9debe2 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Expenses" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="16.0" y1="57.0" width="522" height="728"/>
     </pageTemplate>

From 984eedc0a6858e64024a318810a9e60f4ef3a6ca Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Thu, 13 Jan 2011 17:12:07 +0530
Subject: [PATCH 52/78] [IMP] Fixing incorrect date range expressions in search
 filters: Month-1 in all rport

bzr revid: jam@tinyerp.com-20110113114207-arrf8mzf0g4dkrm9
---
 addons/crm/report/crm_lead_report_view.xml                    | 2 +-
 addons/crm/report/crm_phonecall_report_view.xml               | 2 +-
 addons/crm_claim/report/crm_claim_report_view.xml             | 2 +-
 addons/crm_fundraising/report/crm_fundraising_report_view.xml | 2 +-
 addons/crm_helpdesk/report/crm_helpdesk_report_view.xml       | 2 +-
 addons/hr_evaluation/report/hr_evaluation_report_view.xml     | 3 ++-
 addons/hr_expense/report/hr_expense_report_view.xml           | 3 ++-
 addons/hr_holidays/report/available_holidays_view.xml         | 4 +++-
 addons/hr_holidays/report/hr_holidays_report_view.xml         | 3 ++-
 addons/hr_recruitment/report/hr_recruitment_report_view.xml   | 2 +-
 addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml | 2 +-
 addons/idea/report/report_vote_view.xml                       | 2 +-
 addons/lunch/lunch_view.xml                                   | 2 +-
 addons/project/report/project_report_view.xml                 | 2 +-
 addons/project_issue/report/project_issue_report_view.xml     | 2 +-
 addons/purchase/report/purchase_report_view.xml               | 2 +-
 addons/sale/report/sale_report_view.xml                       | 2 +-
 addons/stock/report/report_stock_move_view.xml                | 2 +-
 18 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index c37c7bcec57..f93dde0560b 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -78,7 +78,7 @@
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
                             help="Leads/Opportunities created in current month"/>
                         <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Leads/Opportunities created in last month"/>
                             
                         <separator orientation="vertical" />
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 0f5452ad736..1bd1bb8a922 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -83,7 +83,7 @@
                            help="Phone calls made in current month"/>
 
                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Phone calls made in last month"/>
 
                            <separator orientation="vertical" />
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 5eeecf3d3ad..76debbf2c96 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -86,7 +86,7 @@
                            help="Claims created in current month"/>
 
                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Claims created in last month"/>
 
                            <separator orientation="vertical" />
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index ab90f7ad0c1..c15c73e5838 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -85,7 +85,7 @@
                     	   help="Funds raised in current month"/>
 
                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Funds raised in last month"/>
 
                    		<separator orientation="vertical" />
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 9490172e3e8..d9a1605838c 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -83,7 +83,7 @@
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
                             help="Helpdesk requests occurred in current month"/>
                         <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Helpdesk requests occurred in last month"/>
 
                    		<separator orientation="vertical" />
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index 59dade23d6f..b656838f721 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -51,7 +51,8 @@
                     	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]" help="Evaluation done in current year"/>
                     <filter icon="terp-go-month" string=" Month " name="month" domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Evaluation done in current month"/>
 	                <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                        domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Evaluation done in last month"/>
+                        domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                        help="Evaluation done in last month"/>
                     <separator orientation="vertical"/>
 	                <filter string="In Progress" icon="terp-camera_test" domain="[('state', '=' ,'wait')]"
 	                	help = "In progress Evaluations"/>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 3de4776b29f..2d7f3092c98 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -61,7 +61,8 @@
                       domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
                       help="Expenses during current month"/>
                 <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                      domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Expenses during last month"/>
+                      domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                      help="Expenses during last month"/>
                   <separator orientation="vertical"/>
                     <filter string="Waiting" icon="terp-gtk-media-pause" domain="[('state', '=' ,'confirm')]"
                     help = "Confirm Expenses"/>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index b4cb2a99b7a..f9bdb6fd35a 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -52,7 +52,9 @@
 	            	<group>
 						<filter icon="terp-go-year" string=" Year " domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Available Leaves of current year"/>
 						<filter icon="terp-go-month" string=" Month " name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Available Leaves of current month"/>
-						<filter icon="terp-go-month" string="    Month-1    " separator="1" domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Available Leaves of last month"/>
+						<filter icon="terp-go-month" string="    Month-1    " separator="1" 
+                                domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+						        help="Available Leaves of last month"/>
 						<separator orientation="vertical"/>
 						<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"/>
 		                <separator orientation="vertical"/>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index e2ffc0fc0e9..9c61f074677 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -50,7 +50,8 @@
                     	domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Leaves taken in current year"/>
                     <filter icon="terp-go-month" string=" Month " name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Leaves taken in current month"/>
 	                <filter icon="terp-go-month" string="    Month-1    " separator="1"
-                       domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]" help="Leaves taken in last month"/>
+                       domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                       help="Leaves taken in last month"/>
 	                <separator orientation="vertical"/>
 	                <filter string="Future Leaves" icon="terp-gtk-media-pause" domain="[('state', 'in' ,('draft','confirm'))]"
 	                	help = "Draft and Confirmed leaves"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index d29ecabefb0..ac304567867 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -60,7 +60,7 @@
 		            <filter icon="terp-go-month"
 	                    string="    Month-1    "
 	                    separator="1"
-	                    domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+	                    domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 	                    help="Recruitment during last month"/>
 	                <separator orientation="vertical"/>
 	                <filter string="New"
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 05cba7f1e49..22863a85288 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -51,7 +51,7 @@
                             help="Timesheet in current month"/>
                         <filter icon="terp-go-month"
                             string=" Month-1 "
-                            domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Timesheet of last month"/>
                         <separator orientation="vertical"/>
                             <field name="account_id" groups="analytic.group_analytic_accounting"/>
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index c68c829794b..44b2735ea95 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -38,7 +38,7 @@
                         <filter icon="terp-go-month"
                              string="    Month-1    "
                              separator="1"
-                             domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                             domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                              help="Idea Vote created last month"/>
                          <separator orientation="vertical"/>
                          <filter icon="terp-go-today"
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 0ecdea5c017..a2cbe64bda6 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -374,7 +374,7 @@
                         <filter icon="terp-go-month"
                          string="    Month-1    "
                          separator="1"
-                         domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Box amount in last month"/>
                     <separator orientation="vertical"/>
                         <field name="user_id" select="1"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index cb30a4b861c..2dd6753bc01 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -68,7 +68,7 @@
 		                <filter icon="terp-go-week"
 	                            string="    Month-1    "
 	                            separator="1"
-	                            domain="[('date_start','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                                domain="[('date_start','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 	                            help="Previous Month"/>
 	                    <separator orientation="vertical"/>
 	                    <filter string="Draft"
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 365f217dee4..050d9d986e6 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -62,7 +62,7 @@
                         domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"                           
                         />
                        <filter icon="terp-go-week" string="Month-1" separator="1" help="Previous Month"
-                            domain="[('create_date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                            domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                         />
 
                            <separator orientation="vertical" />
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 816efd65ac3..caac05a0e25 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -63,7 +63,7 @@
                 <filter icon="terp-go-month"
                  string="    Month-1    "
                  separator="1"
-                 domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                 domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                  help="Order in last month"/>
                 <separator orientation="vertical"/>
                 <filter icon="terp-document-new"
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 3d93d45cfc5..7a5546e012a 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -61,7 +61,7 @@
                     <filter icon="terp-go-month"
                          string="    Month-1    "
                          separator="1"
-                         domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                          help="Sales order created in last month"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-document-new"
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 1d9dc4a5ce4..c969b09e92b 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -74,7 +74,7 @@
                 <filter icon="terp-go-month"
                  string="Month-1"
                  name="month-1"
-                 domain="[('date','&lt;=', (datetime.date (int(time.strftime('%%Y')), datetime.date.today().month, 1) - datetime.timedelta (days = 1)).strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date (int(time.strftime('%%Y')), datetime.date.today().month-1, 1)).strftime('%%Y-%%m-%%d'))]"
+                 domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                  help="Last month"/>
                 <filter icon="terp-go-month" string="Month"
                 name="month"

From 114843c9f222e0af7e59cc356ef8d328f9bdd5ea Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Wed, 13 Oct 2010 18:43:43 +0530
Subject: [PATCH 53/78] [IMP] filter on Current Month in report view in addons

bzr revid: jam@tinyerp.com-20101013131343-gkqnw9awzt341jy9
---
 addons/crm/report/crm_lead_report_view.xml         |  2 +-
 addons/crm/report/crm_phonecall_report_view.xml    |  2 +-
 addons/crm_claim/report/crm_claim_report_view.xml  |  2 +-
 .../report/crm_fundraising_report_view.xml         |  2 +-
 .../report/crm_helpdesk_report_view.xml            |  2 +-
 .../report/hr_evaluation_report_view.xml           |  4 +++-
 addons/hr_expense/hr_expense_view.xml              |  2 +-
 .../hr_expense/report/hr_expense_report_view.xml   |  2 +-
 addons/hr_holidays/hr_holidays_view.xml            |  2 +-
 .../hr_holidays/report/available_holidays_view.xml |  4 +++-
 .../hr_holidays/report/hr_holidays_report_view.xml |  4 +++-
 .../report/hr_timesheet_invoice_report_view.xml    |  2 +-
 .../report/hr_timesheet_report_view.xml            |  2 +-
 addons/idea/report/report_vote_view.xml            |  2 +-
 addons/lunch/lunch_view.xml                        |  6 +++---
 addons/mrp/report/mrp_production_order_view.xml    |  4 ++--
 .../report/report_cash_register_view.xml           |  4 ++--
 .../point_of_sale/report/report_pos_order_view.xml |  4 ++--
 addons/project/report/project_report_view.xml      |  2 +-
 .../report/project_issue_report_view.xml           |  2 +-
 addons/purchase/report/purchase_report_view.xml    | 14 +++++++-------
 addons/sale/report/sale_report_view.xml            |  2 +-
 addons/stock/report/report_stock_move_view.xml     |  2 +-
 23 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index f93dde0560b..6ef227238b9 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -75,7 +75,7 @@
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                             help="Leads/Opportunities created in current year"/>
                         <filter string="   Month   " icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Leads/Opportunities created in current month"/>
                         <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 1bd1bb8a922..b0d03766825 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -79,7 +79,7 @@
                                help="Phone calls made in current year"/>
 
                        <filter string="   Month   " icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                            help="Phone calls made in current month"/>
 
                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 76debbf2c96..5636c07d784 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -82,7 +82,7 @@
                                help="Claims created in current year"/>
 
                        <filter string="   Month   " icon="terp-go-month" name="This Month"
-                           domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                            help="Claims created in current month"/>
 
                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index c15c73e5838..deaef2666fa 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -81,7 +81,7 @@
                    			help="Funds raised in current year"/>
 
                        <filter string="   Month   " icon="terp-go-month" name="This Month"
-                    	   domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                           domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                     	   help="Funds raised in current month"/>
 
                        <filter icon="terp-go-month" string="    Month-1    " separator="1"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index d9a1605838c..e039a14e2c1 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -80,7 +80,7 @@
                             domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
                             help="Helpdesk requests occurred in current year"/>
                         <filter string="   Month   " icon="terp-go-month" name="this_month"
-                            domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Helpdesk requests occurred in current month"/>
                         <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index b656838f721..c766390025c 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -49,7 +49,9 @@
             	<group>
             		<filter icon="terp-go-year" string=" Year "
                     	domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]" help="Evaluation done in current year"/>
-                    <filter icon="terp-go-month" string=" Month " name="month" domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Evaluation done in current month"/>
+                    <filter icon="terp-go-month" string=" Month " name="month" 
+                            domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="Evaluation done in current month"/>
 	                <filter icon="terp-go-month" string="    Month-1    " separator="1"
                         domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Evaluation done in last month"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 5d22113272c..3d92a76a3c3 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -139,7 +139,7 @@
                         help="Expenses to Invoice"/>
                       <separator orientation="vertical"/>
                       <filter icon="terp-go-month" string="This Month" name="this"
-                              domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                              domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
                       <separator orientation="vertical"/>
                       <field name="employee_id" select='1'/>
                       <field name="date" select='1'/>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 2d7f3092c98..70b8625d7b6 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -58,7 +58,7 @@
                       help="Expenses during current year"/>
                   <filter icon="terp-go-month" string="   Month   "
                       name="month"
-                      domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                      domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                       help="Expenses during current month"/>
                 <filter icon="terp-go-month" string="    Month-1    " separator="1"
                       domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1f57b25d402..b5380c4e5a9 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -16,7 +16,7 @@
                         <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve"/>
                         <separator orientation="vertical"/>
                         <filter string="This Month" icon="terp-go-month" name="This Month"
-                           domain="[('date_from','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_from','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
+                                domain="[('date_from','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_from','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"/>
                         <separator orientation="vertical"/>
                         <field name="employee_id">
                             <filter icon="terp-personal"
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index f9bdb6fd35a..5d173764ff6 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -51,7 +51,9 @@
 	            <search string="Leaves">
 	            	<group>
 						<filter icon="terp-go-year" string=" Year " domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Available Leaves of current year"/>
-						<filter icon="terp-go-month" string=" Month " name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Available Leaves of current month"/>
+						<filter icon="terp-go-month" string=" Month " name="month" 
+								domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+								help="Available Leaves of current month"/>
 						<filter icon="terp-go-month" string="    Month-1    " separator="1" 
                                 domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 						        help="Available Leaves of last month"/>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 9c61f074677..e59cf852366 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -48,7 +48,9 @@
             	<group>
 	            	<filter icon="terp-go-year" string=" Year "
                     	domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Leaves taken in current year"/>
-                    <filter icon="terp-go-month" string=" Month " name="month" domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]" help="Leaves taken in current month"/>
+                    <filter icon="terp-go-month" string=" Month " name="month" 
+                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                            help="Leaves taken in current month"/>
 	                <filter icon="terp-go-month" string="    Month-1    " separator="1"
                        domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                        help="Leaves taken in last month"/>
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 33b92d09241..6b436f4ef99 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -52,7 +52,7 @@
                             help="Timesheet lines in this year"/>
                       <filter icon="terp-go-month" string="This Month"
                           name="month"
-                          domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                          domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                           help="Timesheet lines in this month"/>
                     <filter icon="terp-go-week"
                               string="    7 Days    "
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 22863a85288..36ea5b6418a 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -47,7 +47,7 @@
                             help="Timesheet in current year"/>
                         <filter icon="terp-go-month" string=" Month "
                             name="month"
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Timesheet in current month"/>
                         <filter icon="terp-go-month"
                             string=" Month-1 "
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 44b2735ea95..26608a71301 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -33,7 +33,7 @@
                             domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                             help="Idea Vote created in curren year"/>
                         <filter icon="terp-go-month" string="   Month   "
-                            domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                            domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Idea Vote created in current month"/>
                         <filter icon="terp-go-month"
                              string="    Month-1    "
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index a2cbe64bda6..7fb2a7056ef 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -368,9 +368,9 @@
                         domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Box amount in current year"/>
                         <filter icon="terp-go-month" string="   Month   "
-                        name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                        help="Box amount in current month"/>
+                                name="month"
+                                domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                                help="Box amount in current month"/>
                         <filter icon="terp-go-month"
                          string="    Month-1    "
                          separator="1"
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index 6f88981fd5f..01b3381b0bb 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -53,12 +53,12 @@
 	                    	    help="Production performed during current year"/>
 	                    <filter icon="terp-go-month" string="Month"
 	                    		name="month"
-	                    		domain="[('month','=',time.strftime('%%m'))]"
+	                    		domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
 	                    		help="Production performed during current month"/>
 		                <filter icon="terp-go-week"
 	                            string="Month -1"
 	                            separator="1"
-	                            domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
+	                            domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 	                            help="Production during last month"/>
                       <separator orientation="vertical"/>
                         <filter string="Current" icon="terp-check" domain="[('state','in',('open','draft'))]"/>
diff --git a/addons/point_of_sale/report/report_cash_register_view.xml b/addons/point_of_sale/report/report_cash_register_view.xml
index df0dfc877de..40e59e38f0b 100644
--- a/addons/point_of_sale/report/report_cash_register_view.xml
+++ b/addons/point_of_sale/report/report_cash_register_view.xml
@@ -31,12 +31,12 @@
 	                        domain="[('year','=',time.strftime('%%Y'))]"
 	                        help="Cash Analysis created during this year"/>
 	                    <filter icon="terp-go-month" string="Month"
-	                        domain="[('month','=',time.strftime('%%m'))]"
+	                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
 	                        help="Cash Analysis created in current month"/>
 	                    <filter icon="terp-go-month"
 	                         string="Month -1"
 	                         separator="1"
-	                         domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
+	                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 	                         help="Cash Analysis created in last month"/>
 	                    <separator orientation="vertical"/>
 	                    <filter icon="terp-go-today"
diff --git a/addons/point_of_sale/report/report_pos_order_view.xml b/addons/point_of_sale/report/report_pos_order_view.xml
index 1ca4e9876ea..c72a6b6d415 100644
--- a/addons/point_of_sale/report/report_pos_order_view.xml
+++ b/addons/point_of_sale/report/report_pos_order_view.xml
@@ -42,12 +42,12 @@
 	                        domain="[('year','=',time.strftime('%%Y'))]"
 	                        help="POS ordered created during current year"/>
 	                    <filter icon="terp-go-month" string="Month"
-	                        domain="[('month','=',time.strftime('%%m'))]"
+	                       domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
 	                        help="POS ordered created during current month"/>
 	                    <filter icon="terp-go-month"
 	                         string="Month -1"
 	                         separator="1"
-	                         domain="[('month','=',(datetime.date.today() - datetime.timedelta(365/12)).strftime('%%m'))]"
+	                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
 	                         help="POS ordered created last month"/>
 	                    <separator orientation="vertical"/>
 	                    <filter icon="terp-go-today"
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 2dd6753bc01..788d5501683 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -63,7 +63,7 @@
 	                    	    help="Current Year"/>
 	                    <filter icon="terp-go-month" string="   Month   "
 	                    		name="month"
-	                    		domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;=',time.strftime('%%Y-%%m-01'))]"
+	                    		domain="[('date_start','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date_start','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
 	                    		help="Current Month"/>
 		                <filter icon="terp-go-week"
 	                            string="    Month-1    "
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 050d9d986e6..46292e954af 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -59,7 +59,7 @@
                         />                               
 
                        <filter string="Month" icon="terp-go-month" name="This Month"
-                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"                           
+                        domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         />
                        <filter icon="terp-go-week" string="Month-1" separator="1" help="Previous Month"
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index caac05a0e25..d2dbff3be94 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -57,14 +57,14 @@
                 domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                 help="Order in current year"/>
                 <filter icon="terp-go-month" string="   Month   "
-                name="month"
-                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                help="Order in  current month"/>
+                        name="month"
+                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                        help="Order in  current month"/>
                 <filter icon="terp-go-month"
-                 string="    Month-1    "
-                 separator="1"
-                 domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                 help="Order in last month"/>
+                         string="    Month-1    "
+                         separator="1"
+                         domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                         help="Order in last month"/>
                 <separator orientation="vertical"/>
                 <filter icon="terp-document-new"
                         string="Quotations"
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 7a5546e012a..87f134e857c 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -56,7 +56,7 @@
                         help="Sales order created in current year"/>
                     <filter icon="terp-go-month" string="   Month   "
                         name="month"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                        domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                         help="Sales order created in current month"/>
                     <filter icon="terp-go-month"
                          string="    Month-1    "
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index c969b09e92b..34e6e53dbdf 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -78,7 +78,7 @@
                  help="Last month"/>
                 <filter icon="terp-go-month" string="Month"
                 name="month"
-                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+                domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
                 help="Current month"/>
                 <separator orientation="vertical"/>
                 <filter string="Done"

From 8259566f5354c077fb1a8488e173546ed1031041 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Wed, 13 Oct 2010 18:48:10 +0530
Subject: [PATCH 54/78] [Fix] stock: check only product cost method in
 partial_move wizard

bzr revid: sbh@tinyerp.com-20101013131810-pwj61qh9twnkdm12
---
 addons/stock/wizard/stock_partial_move.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 5c7fd3c9472..f4d9cac9aee 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -50,7 +50,7 @@ class stock_partial_move(osv.osv_memory):
             if 'move%s_prodlot_id'%(m.id) not in self._columns:
                 self._columns['move%s_prodlot_id'%(m.id)] = fields.many2one('stock.production.lot', string="Lot")
                 
-            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+            if (m.product_id.cost_method == 'average'):
                 if 'move%s_product_price'%(m.id) not in self._columns:
                     self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
                 if 'move%s_product_currency'%(m.id) not in self._columns:
@@ -106,7 +106,7 @@ class stock_partial_move(osv.osv_memory):
                     <field name="move%s_product_uom" nolabel="1" />
                     <field name="move%s_prodlot_id" domain="[('product_id','=',move%s_product_id)]"  groups="base.group_extended" />                    
                 """%(m.id, m.id, m.id,m.id,m.id)
-                if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+                if m.product_id.cost_method == 'average':
                     _moves_fields.update({
                         'move%s_product_price'%(m.id) : {
                             'string': _('Price'),
@@ -207,7 +207,7 @@ class stock_partial_move(osv.osv_memory):
                 'prodlot_id' : getattr(partial, 'move%s_prodlot_id'%(m.id)).id                
             }
 
-            if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
+            if m.product_id.cost_method == 'average':
                 partial_datas['move%s'%(m.id)].update({
                     'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
                     'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id

From 29cf9e61b9a007c8c5caac24592b85edcc52907a Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Wed, 13 Oct 2010 19:02:22 +0530
Subject: [PATCH 55/78] improve

bzr revid: apa@tinyerp.com-20101013133222-llu44gapn6iuacob
---
 addons/purchase/report/order.rml              | 20 +++++++------------
 addons/sale/report/sale_order.rml             | 12 +++++------
 .../sale_layout/report/report_sale_layout.rml |  6 +++---
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index fe1b4ea9f78..2c565130030 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -186,12 +186,6 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
     <para style="terp_header">[[ o.state=='draft' and removeParentNode('para') ]] Purchase Order Confirmation N° [[ o.name ]]</para>
     <para style="terp_header">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Request for Quotation N° [[ o.name ]]</para>
     <para style="terp_default_8">
@@ -232,7 +226,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="179.0,83.0,73.0,64.0,56.0,79.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+    <blockTable colWidths="179.0,82.0,73.0,64.0,56.0,79.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -271,10 +265,10 @@
             <para style="terp_default_Right_9">[[ formatLang(line.product_qty ) ]] [[ line.product_uom.name ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_unit ) ]]</para>
+            <para style="Standard">[[ formatLang(line.price_unit, digits=get_digits(dp='Purchase Price') ) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Purchase Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
           </td>
         </tr>
         <tr>
@@ -309,7 +303,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="391.0,55.0,89.0" style="Table_All_Total_Detail">
+    <blockTable colWidths="391.0,55.0,88.0" style="Table_All_Total_Detail">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -320,7 +314,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Purchase Price') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -333,7 +327,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Purchase Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -346,7 +340,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total, digits=get_digits(dp='Purchase Price') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index ca8d56d0c41..b5f037625e6 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -243,7 +243,7 @@
       <blockTable colWidths="203.0,94.0,47.0,22.0,59.0,42.0,70.0" style="Table5">
         <tr>
           <td>
-            <para style="terp_default_9">[[ line.name ]]</para>
+            <para style="terp_default_9">[[ line.name ]] </para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ ', '.join(map(lambda x: x.name, line.tax_id)) ]]</para>
@@ -258,10 +258,10 @@
             <para style="terp_default_Right_9">[[ formatLang(line.price_unit ) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.discount, digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.discount, digits=get_digits(dp='Sale Price')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
           </td>
         </tr>
         <tr>
@@ -312,7 +312,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed , digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -325,7 +325,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -338,7 +338,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index c1cf53b520a..9413ca09901 100755
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -384,7 +384,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Sale Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -397,7 +397,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Sale Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -410,7 +410,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Sale Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>

From 80e627bb64bdb64dc45e099444db3f0f7099fb6e Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Wed, 13 Oct 2010 19:12:56 +0530
Subject: [PATCH 56/78] [IMP] Report Month Improvment

bzr revid: jam@tinyerp.com-20101013134256-lwwg9css5h62oyyi
---
 addons/hr_recruitment/report/hr_recruitment_report_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index ac304567867..f5e74724c25 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -55,7 +55,7 @@
 	                    help="Recruitment performed in current year"/>
 	                <filter icon="terp-go-month" string="Month"
 	                    name="month"
-	                    domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-%%m-01'))]"
+	                    domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
 	                    help="Recruitment performed in current month"/>
 		            <filter icon="terp-go-month"
 	                    string="    Month-1    "

From 286d295b5b1591f39a6c23f63ee2fbb401354240 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 13 Oct 2010 23:56:56 +0200
Subject: [PATCH 57/78] [IMP] procurement: safer cursor close + lint cleanup

bzr revid: odo@openerp.com-20101013215656-rw3al0oa0fz8y71f
---
 addons/procurement/schedulers.py | 170 ++++++++++++++++---------------
 1 file changed, 86 insertions(+), 84 deletions(-)

diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 9abdf3d1ff5..1bfa6e3d851 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -24,9 +24,9 @@ from mx import DateTime
 
 from osv import osv
 from tools.translate import _
+import tools
 import netsvc
 import pooler
-from tools.translate import _
 
 class procurement_order(osv.osv):
     _inherit = 'procurement.order'
@@ -46,94 +46,96 @@ class procurement_order(osv.osv):
         if not context:
             context = {}
 
-        if use_new_cursor:
-            cr = pooler.get_db(use_new_cursor).cursor()
-        wf_service = netsvc.LocalService("workflow")
-
-        procurement_obj = self.pool.get('procurement.order')
-        if not ids:
-            ids = procurement_obj.search(cr, uid, [], order="date_planned")
-        for id in ids:
-            wf_service.trg_validate(uid, 'procurement.order', id, 'button_restart', cr)
-        if use_new_cursor:
-            cr.commit()
-
-        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
-        maxdate = DateTime.now() + DateTime.RelativeDateTime(days=company.schedule_range)
-        start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
-        offset = 0
-        report = []
-        report_total = 0
-        report_except = 0
-        report_later = 0
-        allids = self.search(cr, uid, [])
-        while True:
-            cr.execute('select id from procurement_order where state=%s and procure_method=%s order by priority,date_planned limit 500 offset %s', ('confirmed', 'make_to_order', offset))
-            ids = map(lambda x: x[0], cr.fetchall())
-            for proc in procurement_obj.browse(cr, uid, ids):
-                if (maxdate.strftime('%Y-%m-%d') >= proc.date_planned):
-                    wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
-                else:
-                    offset += 1
-                    report_later += 1
-            for proc in procurement_obj.browse(cr, uid, ids):
-                if proc.state == 'exception':
-                    report.append('PROC %d: on order - %3.2f %-5s - %s' % \
-                            (proc.id, proc.product_qty, proc.product_uom.name,
-                                proc.product_id.name))
-                    report_except += 1
-                report_total += 1
+        try:
             if use_new_cursor:
-                cr.commit()
+                cr = pooler.get_db(use_new_cursor).cursor()
+            wf_service = netsvc.LocalService("workflow")
+    
+            procurement_obj = self.pool.get('procurement.order')
             if not ids:
-                break
-
-        offset = 0
-        ids = []
-        while True:
-            report_ids = []
-            ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_stock')], offset=offset)
-            for proc in procurement_obj.browse(cr, uid, ids):
-                if ((maxdate).strftime('%Y-%m-%d') >= proc.date_planned) :
-                    wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
-                    report_ids.append(proc.id)
-                else:
-                    report_later += 1
-                report_total += 1
-            for proc in procurement_obj.browse(cr, uid, report_ids):
-                if proc.state == 'exception':
-                    report.append('PROC %d: from stock - %3.2f %-5s - %s' % \
-                            (proc.id, proc.product_qty, proc.product_uom.name,
-                                proc.product_id.name,))
-                    report_except += 1
+                ids = procurement_obj.search(cr, uid, [], order="date_planned")
+            for id in ids:
+                wf_service.trg_validate(uid, 'procurement.order', id, 'button_restart', cr)
             if use_new_cursor:
                 cr.commit()
-            offset += len(ids)
-            if not ids: break
-        end_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
-        if uid:
-            request = self.pool.get('res.request')
-            summary = '''Here is the procurement scheduling report.
+            company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+            maxdate = (DateTime.now() + DateTime.RelativeDateTime(days=company.schedule_range)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+            start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
+            offset = 0
+            report = []
+            report_total = 0
+            report_except = 0
+            report_later = 0
+            while True:
+                cr.execute("select id from procurement_order where state='confirmed' and procure_method='make_to_order' order by priority,date_planned limit 500 offset %s", (offset,))
+                ids = map(lambda x: x[0], cr.fetchall())
+                for proc in procurement_obj.browse(cr, uid, ids):
+                    if maxdate >= proc.date_planned:
+                        wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
+                    else:
+                        offset += 1
+                        report_later += 1
+                for proc in procurement_obj.browse(cr, uid, ids):
+                    if proc.state == 'exception':
+                        report.append('PROC %d: on order - %3.2f %-5s - %s' % \
+                                (proc.id, proc.product_qty, proc.product_uom.name,
+                                    proc.product_id.name))
+                        report_except += 1
+                    report_total += 1
+                if use_new_cursor:
+                    cr.commit()
+                if not ids:
+                    break
+            offset = 0
+            ids = []
+            while True:
+                report_ids = []
+                ids = procurement_obj.search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_stock')], offset=offset)
+                for proc in procurement_obj.browse(cr, uid, ids):
+                    if maxdate >= proc.date_planned:
+                        wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
+                        report_ids.append(proc.id)
+                    else:
+                        report_later += 1
+                    report_total += 1
+                for proc in procurement_obj.browse(cr, uid, report_ids):
+                    if proc.state == 'exception':
+                        report.append('PROC %d: from stock - %3.2f %-5s - %s' % \
+                                (proc.id, proc.product_qty, proc.product_uom.name,
+                                    proc.product_id.name,))
+                        report_except += 1
+                if use_new_cursor:
+                    cr.commit()
+                offset += len(ids)
+                if not ids: break
+            end_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
+            if uid:
+                request = self.pool.get('res.request')
+                summary = '''Here is the procurement scheduling report.
+    
+        Start Time: %s
+        End Time: %s
+        Total Procurements processed: %d
+        Procurements with exceptions: %d
+        Skipped Procurements (scheduled date outside of scheduler range) %d
+    
+        Exceptions:\n'''% (start_date, end_date, report_total, report_except, report_later)
+                summary += '\n'.join(report)
+                request.create(cr, uid,
+                    {'name': "Procurement Processing Report.",
+                        'act_from': uid,
+                        'act_to': uid,
+                        'body': summary,
+                    })
 
-    Computation Started; %s
-    Computation Finished; %s
-
-    Total procurement: %d
-    Exception procurement: %d
-    Not run now procurement: %d
-
-    Exceptions;
-    '''% (start_date, end_date, report_total, report_except, report_later)
-            summary += '\n'.join(report)
-            request.create(cr, uid,
-                {'name': "Procurement calculation report.",
-                    'act_from': uid,
-                    'act_to': uid,
-                    'body': summary,
-                })
-        if use_new_cursor:
-            cr.commit()
-            cr.close()
+            if use_new_cursor:
+                cr.commit()
+        finally:
+            if use_new_cursor:
+                try:
+                    cr.close()
+                except Exception:
+                    pass
         return {}
 
     def create_automatic_op(self, cr, uid, context=None):

From 473d985e45d299fad87f6de0b82470aa6c51150e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 13 Oct 2010 23:58:05 +0200
Subject: [PATCH 58/78] [IMP] stock: minor lint cleanup

bzr revid: odo@openerp.com-20101013215805-3whcvcu3j6j4wncj
---
 addons/stock/stock.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5717143c1a6..faac0b94166 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1694,23 +1694,23 @@ class stock_move(osv.osv):
         """
         moves = self.browse(cr, uid, ids)
         self.write(cr, uid, ids, {'state': 'confirmed'})
-        i = 0
+        res_obj = self.pool.get('res.company')
+        location_obj = self.pool.get('stock.location')
+        move_obj = self.pool.get('stock.move')
+        wf_service = netsvc.LocalService("workflow")
 
         def create_chained_picking(self, cr, uid, moves, context=None):
             new_moves = []
-            res_obj = self.pool.get('res.company')
-            picking_obj = self.pool.get('stock.picking')
-            move_obj = self.pool.get('stock.move')
             if context is None:
                 context = {}
             for picking, todo in self._chain_compute(cr, uid, moves, context=context).items():
-                ptype = todo[0][1][5] and todo[0][1][5] or self.pool.get('stock.location').picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
+                ptype = todo[0][1][5] and todo[0][1][5] or location_obj.picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
                 pick_name = picking.name or ''
                 if picking:
                     pickid = self._create_chained_picking(cr, uid, pick_name,picking,ptype,todo,context)
                 else:
                     pickid = False
-                for move, (loc, auto, delay, journal, company_id, ptype) in todo:
+                for move, (loc, dummy, delay, dummy, company_id, ptype) in todo:
                     new_id = move_obj.copy(cr, uid, move.id, {
                         'location_id': move.location_dest_id.id,
                         'location_dest_id': loc.id,
@@ -1728,7 +1728,6 @@ class stock_move(osv.osv):
                     })
                     new_moves.append(self.browse(cr, uid, [new_id])[0])
                 if pickid:
-                    wf_service = netsvc.LocalService("workflow")
                     wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr)
             if new_moves:
                 create_chained_picking(self, cr, uid, new_moves, context)

From cf533b524f70d5d46e370195c895a4dc2270de18 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 13 Oct 2010 23:59:50 +0200
Subject: [PATCH 59/78] [FIX] stock_location: automatically process pulled
 procurements + add notes to documents

bzr revid: odo@openerp.com-20101013215950-u29e9tc7rlbqy8g2
---
 addons/stock_location/mrp_pull.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/stock_location/mrp_pull.py b/addons/stock_location/mrp_pull.py
index f4c9868a58f..8b780d7a7a6 100644
--- a/addons/stock_location/mrp_pull.py
+++ b/addons/stock_location/mrp_pull.py
@@ -55,21 +55,21 @@ class procurement_order(osv.osv):
         for proc in proc_obj.browse(cr, uid, ids, context=context):
             line = None
             for line in proc.product_id.flow_pull_ids:
-                if line.location_id==proc.location_id:
+                if line.location_id == proc.location_id:
                     break
             assert line, 'Line can not be False if we are on this state of the workflow'
             origin = (proc.origin or proc.name or '').split(':')[0] +':'+line.name
-            picking_id =picking_obj.create(cr, uid, {
+            picking_id = picking_obj.create(cr, uid, {
                 'origin': origin,
                 'company_id': line.company_id and line.company_id.id or False,
                 'type': line.picking_type,
                 'stock_journal_id': line.journal_id and line.journal_id.id or False,
                 'move_type': 'one',
                 'address_id': line.partner_address_id.id,
-                'note': line.name, # TODO: note on procurement ?
+                'note': _('Picking for pulled procurement coming from original location %s, pull rule %s, via original Procurement %s (#%d)') % (proc.location_id.name, line.name, proc.name, proc.id),
                 'invoice_state': line.invoice_state,
             })
-            move_id =move_obj.create(cr, uid, {
+            move_id = move_obj.create(cr, uid, {
                 'name': line.name,
                 'picking_id': picking_id,
                 'company_id':  line.company_id and line.company_id.id or False,
@@ -88,7 +88,7 @@ class procurement_order(osv.osv):
                 'tracking_id': False,
                 'cancel_cascade': line.cancel_cascade,
                 'state': 'confirmed',
-                'note': line.name, # TODO: same as above
+                'note': _('Move for pulled procurement coming from original location %s, pull rule %s, via original Procurement %s (#%d)') % (proc.location_id.name, line.name, proc.name, proc.id),
             })
             if proc.move_id and proc.move_id.state in ('confirmed'):
                 move_obj.write(cr,uid, [proc.move_id.id],  {
@@ -97,6 +97,7 @@ class procurement_order(osv.osv):
             proc_id = proc_obj.create(cr, uid, {
                 'name': line.name,
                 'origin': origin,
+                'note': _('Pulled procurement coming from original location %s, pull rule %s, via original Procurement %s (#%d)') % (proc.location_id.name, line.name, proc.name, proc.id),
                 'company_id':  line.company_id and line.company_id.id or False,
                 'date_planned': proc.date_planned,
                 'product_id': proc.product_id.id,
@@ -116,7 +117,10 @@ class procurement_order(osv.osv):
             if proc.move_id:
                 move_obj.write(cr, uid, [proc.move_id.id],
                     {'location_id':proc.location_id.id})
+            self.write(cr, uid, [proc.id], {'state':'running', 'message':_('Pulled from another location via procurement %d')%proc_id})
 
-            self.write(cr, uid, [proc.id], {'state':'running','message':_('Moved from other location')})
+            # trigger direct processing (the new procurement shares the same planned date as the original one, which is already being processed)
+            wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_check', cr)
         return False
-procurement_order()
+
+procurement_order()
\ No newline at end of file

From 33a749dbef75d4a2d23a7473ae077b77fd6d5bd0 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 14 Oct 2010 00:00:42 +0200
Subject: [PATCH 60/78] [IMP] stock_location: some improvement to yaml tests,
 pending final fixes to be re-enabled

bzr revid: odo@openerp.com-20101013220042-qnzll55qjv4y81j8
---
 .../test/stock_location_pull_flow.yml         | 77 +++++++++----------
 .../test/stock_location_push_flow.yml         |  6 +-
 2 files changed, 36 insertions(+), 47 deletions(-)

diff --git a/addons/stock_location/test/stock_location_pull_flow.yml b/addons/stock_location/test/stock_location_pull_flow.yml
index a6f7a8e913a..f38cb7cdaa6 100644
--- a/addons/stock_location/test/stock_location_pull_flow.yml
+++ b/addons/stock_location/test/stock_location_pull_flow.yml
@@ -5,65 +5,61 @@
 - 
   !record {model: account.account.type, id: account_account_type_asset0}:
     close_method: balance
-    code: asset
-    name: Asset
+    code: asset_test
+    name: Asset For Tests
     sign: 1
 - 
   I create a account type income.
 - 
   !record {model: account.account.type, id: account_account_type_income0}:
     close_method: unreconciled
-    code: income
-    name: Income
+    code: income_test
+    name: Income For Tests
     sign: 1
 - 
   I create a account type Expense.
 - 
   !record {model: account.account.type, id: account_account_type_expense0}:
     close_method: unreconciled
-    code: expense
-    name: Expense
+    code: expense_test
+    name: Expense For Tests
     sign: 1    
 - 
   I create a account type Receivable.
 - 
   !record {model: account.account.type, id: account_account_type_receivable0}:
     close_method: balance
-    code: receivable
-    name: Receivable
+    code: receivable_test
+    name: Receivable For Tests
     sign: 1
 -
  
   I create a account  Receivable.
 - 
   !record {model: account.account, id: account_account_receivable0}:
-    code: '40000'
+    code: 40000_test
     company_id: base.main_company
     currency_mode: current
-    name: Receivable
-    parent_left: 1
-    parent_right: 2
+    name: Receivable For Tests
     type: receivable
     user_type: account_account_type_receivable0
 - 
   I create a account  Payable.
 - 
   !record {model: account.account, id: account_account_payable0}:
-    code: '440000'
+    code: 440000_test
     company_id: base.main_company
     currency_mode: current
-    name: Payable
-    parent_left: 3
-    parent_right: 4
+    name: Payable For Tests
     type: payable
     user_type: account_account_type_expense0    
 - 
   I create a Purchase Journal.
 - 
   !record {model: account.journal, id: account_journal_purchasejournal0}:
-    code: pur
+    code: pur_test
     company_id: base.main_company
-    name: Purchase Journal
+    name: Purchase Journal For Tests
     sequence_id:  account.sequence_purchase_journal
     type: purchase
     view_id: account.account_journal_bank_view
@@ -72,33 +68,31 @@
   I create a Sale Journal.
 - 
   !record {model: account.journal, id: account_journal_salejouran0}:
-    code: sal
+    code: sal_test
     company_id: base.main_company
-    name: Sale Journal
+    name: Sale Journal For Tests
     sequence_id: account.sequence_sale_journal
     type: sale
     view_id: account.account_journal_view
     
 - 
-  I create a Sale Journal.
+  I create an Expense Account
 - 
   !record {model: account.account, id: account_account_expenseaccount0}:
-    code: Expe
+    code: Expe_test
     company_id: base.main_company
     currency_mode: current
-    name: Expense Account
-    parent_left: 5
-    parent_right: 6
+    name: Expense Account For Tests
     type: consolidation
     user_type: account_account_type_asset0
 - 
   I create  Product Sale account.
 - 
   !record {model: account.account, id: account_account_productsale0}:
-    code: '001'
+    code: 001_test
     company_id: base.main_company
     currency_mode: current
-    name: Product Sale
+    name: Product Sale For Tests
     type: other
     user_type: account_account_type_income0
 
@@ -106,31 +100,31 @@
   I create  Product Product Purchase.
 - 
   !record {model: account.account, id: account_account_productpurchase0}:
-    code: '0002'
+    code: 0002_test
     company_id: base.main_company
     currency_mode: current
-    name: Product Purchase
+    name: Product Purchase For Tests
     type: other
     user_type: account_account_type_expense0
 - 
-  I create  Supplier.
+  I create a Supplier.
 - 
   !record {model: res.partner, id: res_partner_shawtrust0}:
     address:
-      - country_id: base.in    
+      - country_id: base.in
       - street: St James House, Vicar Lane, Sheffield
     lang: en_US
     name: 'Shaw Trust '
     property_account_payable: account_account_payable0
     property_account_receivable: account_account_receivable0  
 -     
-  I create product category.
+  I create a product category.
 - 
   !record {model: product.category, id: product_category_computer0}:
     name: Computer
 -
-  I create product and define the  pulled flow condition for stock move.
-  I set shipping type Sending Goods. and set Procurement type move.
+  I create a product and define the pulled flow condition for stock move.
+  I set shipping type Sending Goods. and set Procurement type to move.
 - 
   !record {model: product.product, id: product_product_hpcdwriters0}:
     categ_id: product_category_computer0
@@ -176,7 +170,7 @@
     property_stock_production: stock.location_production
     qty_available: 15
 -   
-  I create procurement order.
+  I create a procurement order.
 - 
   !record {model: procurement.order, id: procurement_order_test0}:
     company_id: base.main_company
@@ -191,7 +185,7 @@
     product_uos: product.product_uom_unit
     product_uos_qty: 0.0
 - 
-  I confirm  procurement order.
+  I confirm the procurement order.
 - 
   !workflow {model: procurement.order, action: button_confirm, ref: procurement_order_test0}
 - 
@@ -208,19 +202,18 @@
    procurement_ids=self.search(cr, uid, [('id', '=', ref('procurement_order_test0'))])
    if procurement_ids:
     order=self.browse(cr,uid,procurement_ids)[0]
-    assert(order.state=='cancel')  
+    assert(order.state=='cancel')
 -
-  I check the new of procurement order  create .
+  I check the new procurement order has been created .
 -
   !python {model: procurement.order }: |  
    from tools.translate import _   
    procurement_ids=self.search(cr, uid, [('name','=','E001')])
-   assert len(procurement_ids), "Procurement order hasn't Created."  
+   assert len(procurement_ids), "Procurement order hasn't Created."
 -
-  I check the Outgoing Picking  is create for source location Shop 2 and destination shop1.
+  I check the Outgoing Picking is created for source location Shop 2 and destination shop1.
 -
   !python {model: stock.picking }: |
     from tools.translate import _   
     picking_id = self.search(cr, uid, [('origin','=','Testing pulled flow:E001'),('type','=','out')])
-    assert len(picking_id), "Picking  hasn't Created."  
-    
\ No newline at end of file
+    assert len(picking_id), "Picking  hasn't Created."
diff --git a/addons/stock_location/test/stock_location_push_flow.yml b/addons/stock_location/test/stock_location_push_flow.yml
index 3f473026c8b..1e974682b67 100644
--- a/addons/stock_location/test/stock_location_push_flow.yml
+++ b/addons/stock_location/test/stock_location_push_flow.yml
@@ -45,17 +45,13 @@
         name: res_partner_microlinktechnologies0
         min_qty: 5.0
     path_ids:
-      - auto: auto
-        invoice_state: none
-        location_dest_id: stock.stock_location_stock
-        location_from_id: stock.stock_location_suppliers
       - auto: auto
         invoice_state: none
         location_dest_id: stock_location.stock_location_qualitytest0
         location_from_id: stock.stock_location_stock
       - auto: auto
         invoice_state: none
-        location_dest_id: stock.stock_location_stock
+        location_dest_id: stock.stock_location_components
         location_from_id: stock_location.stock_location_qualitytest0
     supply_method: buy
     type: product

From d70acc176bb054f4c5c93641767e481f35a3299e Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 14 Oct 2010 02:02:58 +0200
Subject: [PATCH 61/78] [REM] all: modules: removed all remaining references to
 res.roles, replaced by specific res.groups

bzr revid: odo@openerp.com-20101014000258-7ay7so7gp8ki5iy6
---
 addons/account/account_invoice_workflow.xml   |  5 ----
 .../account_budget_workflow.xml               |  5 ----
 .../email_template_workflow.xml               |  4 ---
 addons/hr/process/hr_process.xml              |  2 +-
 addons/hr_expense/hr_expense_workflow.xml     | 10 --------
 addons/hr_holidays/__openerp__.py             |  2 +-
 addons/hr_holidays/hr_holidays_workflow.xml   |  6 -----
 .../hr_timesheet_workflow.xml                 |  6 -----
 .../process/hr_timesheet_sheet_process.xml    |  4 ---
 addons/olap/olap.py                           |  7 +++---
 addons/point_of_sale/pos_workflow.xml         |  6 -----
 addons/process/process.py                     | 25 ++++++++-----------
 addons/process/process_demo.xml               |  2 --
 addons/process/process_view.xml               |  5 +++-
 addons/sale/process/sale_process.xml          |  4 ---
 15 files changed, 19 insertions(+), 74 deletions(-)

diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml
index a6b7fe4a78e..2af1e192a9b 100644
--- a/addons/account/account_invoice_workflow.xml
+++ b/addons/account/account_invoice_workflow.xml
@@ -2,11 +2,6 @@
 <openerp>
     <data>
 
-        <record id="res_roles_invoice0" model="res.roles">
-            <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
-            <field name="description">Assign this role to the persons that should have the rights to confirm a draft invoice.</field>
-        </record>
-
         <record id="wkf" model="workflow">
             <field name="name">account.invoice.basic</field>
             <field name="osv">account.invoice</field>
diff --git a/addons/account_budget/account_budget_workflow.xml b/addons/account_budget/account_budget_workflow.xml
index 16997d694f2..39762375763 100644
--- a/addons/account_budget/account_budget_workflow.xml
+++ b/addons/account_budget/account_budget_workflow.xml
@@ -2,11 +2,6 @@
 <openerp>
 <data>
 
-	<record model="res.roles" id="crossovered_budget_role">
-			<field name="name">Crossovered Budget Validation</field>
-			<field name="description">Assign this role to the persons that should have the rights to Approve a confirm Budgets.</field>
-	</record>
-
 	<!-- Workflow definition -->
 
 	<record model="workflow" id="wkf_crossovered_budget">
diff --git a/addons/email_template/email_template_workflow.xml b/addons/email_template/email_template_workflow.xml
index 1a6a73cca77..84a58815b5e 100644
--- a/addons/email_template/email_template_workflow.xml
+++ b/addons/email_template/email_template_workflow.xml
@@ -2,10 +2,6 @@
 <openerp>
     <data>
 
-        <record id="PE_ADMIN" model="res.roles">
-            <field name="name">Email Administrator</field>
-        </record>
-
         <record id="wkf_email_template_setting" model="workflow">
             <field name="name">Email Template Workflow</field>
             <field name="osv">email_template.account</field>
diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml
index 1471fbe5352..8bc8e5e49b9 100644
--- a/addons/hr/process/hr_process.xml
+++ b/addons/hr/process/hr_process.xml
@@ -53,7 +53,7 @@
 		<record id="process_transition_employeeuser0" model="process.transition">
 			<field eval="[(6,0,[])]" name="transition_ids"/>
 			<field eval="&quot;&quot;&quot;Link a user to an employee&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;The field Relate'd user in the Employee form allows to link the OpenERP user (and his rights and role) to the employee.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;The Related user field on the Employee form allows to link the OpenERP user (and her rights) to the employee.&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_openerpuser0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_employee0"/>
 		</record>
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 547129e89e2..192533e67de 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -2,16 +2,6 @@
 <openerp>
     <data>
 
-        <!-- Roles definition -->
-
-        <record id="HR" model="res.roles">
-            <field name="name">Human Resources - Expenses</field>
-        </record>
-
-        <record id="HR_INV" model="res.roles">
-            <field name="name">Human Resources - Expenses invoice</field>
-        </record>
-
         <!-- Workflow definition -->
 
         <record id="wkf_expenses" model="workflow">
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index f06b41e69da..308f03ba293 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -43,7 +43,7 @@
                 HR / Employees / Employees
             then select the ones you want to choose, click on the print icon and select the option
                 'Print Summary of Employee's Holidays'
-    - The wizard allows you to choose if you want to print either the Confirmed & Validated holidays or only the Validated ones. These states must be set up by a user from the group 'HR' and with the role 'holidays'. You can define these features in the security tab from the user data in
+    - The wizard allows you to choose if you want to print either the Confirmed & Validated holidays or only the Validated ones. These states must be set up by a user from the group 'HR'. You can define these features in the security tab from the user data in
                 Administration / Users / Users
             for example, you maybe will do it for the user 'admin'
             .
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index de2bd9f1131..9d5338a801f 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -2,12 +2,6 @@
 <openerp>
 <data>
 
-    <!-- Roles definition -->
-
-    <record model="res.roles" id="HR_holidays">
-        <field name="name">Leaves Manager</field>
-    </record>
-
     <!-- Workflow definition -->
 
     <record model="workflow" id="wkf_holidays">
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
index b664fd79c96..1afc8909323 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
@@ -2,12 +2,6 @@
 <openerp>
     <data>
 
-        <!-- Roles definition -->
-
-        <record id="HR" model="res.roles">
-            <field name="name">Timesheets validation</field>
-        </record>
-
         <!-- Workflow definition -->
 
         <record id="wkf_timesheet" model="workflow">
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 7c259016fca..628cc2097ae 100644
--- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
+++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml
@@ -96,10 +96,6 @@
             Process Transition
         -->
 
-        <record id="res_roles_hr0" model="res.roles">
-            <field eval="&quot;&quot;&quot;HR&quot;&quot;&quot;" name="name"/>
-        </record>
-
         <record id="process_transition_attendancetimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Sign in/out&quot;&quot;&quot;" name="name"/>
diff --git a/addons/olap/olap.py b/addons/olap/olap.py
index b76adc66b08..ace43d212a1 100644
--- a/addons/olap/olap.py
+++ b/addons/olap/olap.py
@@ -1925,8 +1925,7 @@ class bi_auto_configure_wizard(osv.osv_memory):
                 table_new = dbtab_obj.write(cr, uid, tables['id'], end_user_name)
                 if not(tables['table_db_name'].startswith('ir') or \
                        tables['table_db_name'].startswith('wkf') or \
-                       tables['table_db_name'].startswith('res_groups') or \
-                       tables['table_db_name'].startswith('res_role')) and \
+                       tables['table_db_name'].startswith('res_groups')) and \
                        tables['table_db_name'] not in ['inherit', 'user_rule_group_rel',\
                                                  'group_rule_group_rel']:
                     vals = {}
@@ -1999,8 +1998,8 @@ class bi_auto_configure_wizard(osv.osv_memory):
                         table['table_db_name'].startswith('wkf')) or \
                         (table['table_db_name'].startswith('res_groups')) or \
                         (table['table_db_name'] in \
-                         ['inherit', 'res_roles', 'user_rule_group_rel', \
-                          'res_roles_users_rel', 'group_rule_group_rel']):
+                         ['inherit', 'user_rule_group_rel', \
+                          'group_rule_group_rel']):
                     vals['hide'] = True
                     vals['active'] = False
                     make_id.append(table['id'])
diff --git a/addons/point_of_sale/pos_workflow.xml b/addons/point_of_sale/pos_workflow.xml
index 189b38e348f..c325c4951c9 100644
--- a/addons/point_of_sale/pos_workflow.xml
+++ b/addons/point_of_sale/pos_workflow.xml
@@ -7,12 +7,6 @@
       <field name="on_create">True</field>
     </record>
 
-        <!-- Roles definition -->
-
-    <record model="res.roles" id="role_pos">
-        <field name="name">POS - Confirmation</field>
-    </record>
-
 <!--Activities-->
 
     <record model="workflow.activity" id="act_draft">
diff --git a/addons/process/process.py b/addons/process/process.py
index 7bb8593d467..479b8748ff3 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -19,9 +19,8 @@
 #
 ##############################################################################
 
-import netsvc
-import pooler, tools
-
+import pooler
+import tools
 from osv import fields, osv
 
 class Env(dict):
@@ -139,7 +138,7 @@ class process_process(osv.osv):
             if node.model_id and node.model_id.model == res_model:
                 try:
                     data['active'] = eval(node.model_states, expr_context)
-                except Exception, e:
+                except Exception:
                     pass
 
             if not data['active']:
@@ -169,23 +168,19 @@ class process_process(osv.osv):
                     button['state'] = b.state
                     button['action'] = b.action
                     buttons.append(button)
-                data['roles'] = roles = []
+                data['groups'] = groups = []
                 for r in tr.transition_ids:
-                    if r.role_id:
-                        role = {}
-                        role['name'] = r.role_id.name
-                        roles.append(role)
-                for r in tr.role_ids:
-                    role = {}
-                    role['name'] = r.name
-                    roles.append(role)
+                    if r.group_id:
+                        groups.append({'name': r.group_id.name})
+                for r in tr.group_ids:
+                    groups.append({'name': r.name})
                 transitions[tr.id] = data
 
         # now populate resource information
         def update_relatives(nid, ref_id, ref_model):
             relatives = []
 
-            for tid, tr in transitions.items():
+            for dummy, tr in transitions.items():
                 if tr['source'] == nid:
                     relatives.append(tr['target'])
                 if tr['target'] == nid:
@@ -349,7 +344,7 @@ class process_transition(osv.osv):
         'target_node_id': fields.many2one('process.node', 'Target Node', required=True, ondelete='cascade'),
         'action_ids': fields.one2many('process.transition.action', 'transition_id', 'Buttons'),
         'transition_ids': fields.many2many('workflow.transition', 'process_transition_ids', 'ptr_id', 'wtr_id', 'Workflow Transitions'),
-        'role_ids': fields.many2many('res.roles', 'process_transition_roles_rel', 'tid', 'rid', 'Roles'),
+        'group_ids': fields.many2many('res.groups', 'process_transition_group_rel', 'tid', 'rid', string='Required Groups'),
         'note': fields.text('Description', translate=True),
     }
 process_transition()
diff --git a/addons/process/process_demo.xml b/addons/process/process_demo.xml
index 41a4588fc0f..e0333feeefa 100644
--- a/addons/process/process_demo.xml
+++ b/addons/process/process_demo.xml
@@ -151,8 +151,6 @@
             <field name="transition_id" ref="transition_confirm_quotation"/>
         </record>
 
-        <!-- TODO: Transition roles (workflow transition ids) -->
-
     </data>
 
 </openerp>
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 1a5714437b8..d158dd83425 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -282,9 +282,12 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Roles from Workflow">
+                    <page string="Workflow Transitions">
                         <field name="transition_ids" colspan="4" nolabel="1"/>
                     </page>
+                    <page string="Associated Groups">
+                        <field name="group_ids" colspan="4" nolabel="1"/>
+                    </page>
                     <page string="Notes">
                         <field name="note" nolabel="1" colspan="4"/>
                     </page>
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index e20cf959c9b..83d80381c09 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -133,10 +133,6 @@
             Process Transition
         -->
 
-        <record id="res_roles_salesman0" model="res.roles">
-            <field eval="&quot;&quot;&quot;Salesman&quot;&quot;&quot;" name="name"/>
-        </record>
-
         <record id="process_transition_confirmquotation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Confirm Quotation&quot;&quot;&quot;" name="name"/>

From 3844c4f1580b2da47da5357d38c3eaf735e957f1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 14 Oct 2010 02:37:29 +0200
Subject: [PATCH 62/78] [IMP] purchase: minor cleanup in inherited stock
 classes

bzr revid: odo@openerp.com-20101014003729-34y6owej0crtszez
---
 addons/purchase/stock.py | 47 +++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index fb3d8f0b078..ea9cacd7979 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -28,9 +28,6 @@ class stock_move(osv.osv):
             'Purchase Order Line', ondelete='set null', select=True,
             readonly=True),
     }
-    _defaults = {
-        'purchase_line_id': False
-    }
 
     def _get_reference_accounting_values_for_valuation(self, cr, uid, move, context=None):
         """
@@ -73,47 +70,39 @@ class stock_picking(osv.osv):
                 return picking.note + '\n' + picking.purchase_id.notes
             else:
                 return picking.purchase_id.notes
-        return super(stock_picking, self)._get_comment_invoice(cursor, user,
-                picking)
+        return super(stock_picking, self)._get_comment_invoice(cursor, user, picking)
 
     def _get_price_unit_invoice(self, cursor, user, move_line, type):
         if move_line.purchase_line_id:
             return move_line.purchase_line_id.price_unit
-        return super(stock_picking, self)._get_price_unit_invoice(cursor,
-                user, move_line, type)
+        return super(stock_picking, self)._get_price_unit_invoice(cursor, user, move_line, type)
 
     def _get_discount_invoice(self, cursor, user, move_line):
         if move_line.purchase_line_id:
             return 0.0
-        return super(stock_picking, self)._get_discount_invoice(cursor, user,
-                move_line)
+        return super(stock_picking, self)._get_discount_invoice(cursor, user, move_line)
 
     def _get_taxes_invoice(self, cursor, user, move_line, type):
         if move_line.purchase_line_id:
             return [x.id for x in move_line.purchase_line_id.taxes_id]
-        return super(stock_picking, self)._get_taxes_invoice(cursor, user,
-                move_line, type)
+        return super(stock_picking, self)._get_taxes_invoice(cursor, user, move_line, type)
 
     def _get_account_analytic_invoice(self, cursor, user, picking, move_line):
         if move_line.purchase_line_id:
             return move_line.purchase_line_id.account_analytic_id.id
-        return super(stock_picking, self)._get_account_analytic_invoice(cursor,
-                user, picking, move_line)
+        return super(stock_picking, self)._get_account_analytic_invoice(cursor, user, picking, move_line)
 
     def _invoice_line_hook(self, cursor, user, move_line, invoice_line_id):
         if move_line.purchase_line_id:
             invoice_line_obj = self.pool.get('account.invoice.line')
-            invoice_line_obj.write(cursor, user, [invoice_line_id], {'note':  move_line.purchase_line_id.notes,})            
-        return super(stock_picking, self)._invoice_line_hook(cursor, user,
-                move_line, invoice_line_id)
+            invoice_line_obj.write(cursor, user, [invoice_line_id], {'note':  move_line.purchase_line_id.notes,})
+        return super(stock_picking, self)._invoice_line_hook(cursor, user, move_line, invoice_line_id)
 
     def _invoice_hook(self, cursor, user, picking, invoice_id):
         purchase_obj = self.pool.get('purchase.order')
         if picking.purchase_id:
-            purchase_obj.write(cursor, user, [picking.purchase_id.id], {'invoice_id': invoice_id,
-                })
-        return super(stock_picking, self)._invoice_hook(cursor, user,
-                picking, invoice_id)
+            purchase_obj.write(cursor, user, [picking.purchase_id.id], {'invoice_id': invoice_id,})
+        return super(stock_picking, self)._invoice_hook(cursor, user, picking, invoice_id)
 
 stock_picking()
 
@@ -132,11 +121,13 @@ class stock_partial_picking(osv.osv_memory):
         pick_obj = self.pool.get('stock.picking')
         res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+            has_product_cost = (pick.type == 'in' and pick.purchase_id)
             for m in pick.move_lines:
-                if (m.product_id.cost_method == 'average'):
-                    if pick.type == 'in' and pick.purchase_id and m.purchase_line_id:
-                        res['move%s_product_price'%(m.id)] =  m.purchase_line_id.price_unit
-                        res['move%s_product_currency'%(m.id)] =  pick.purchase_id.pricelist_id.currency_id.id
+                if has_product_cost and m.product_id.cost_method == 'average' and m.purchase_line_id:
+                    # We use the original PO unit purchase price as the basis for the cost, expressed
+                    # in the currency of the PO (i.e the PO's pricelist currency)
+                    res['move%s_product_price'%(m.id)] =  m.purchase_line_id.price_unit
+                    res['move%s_product_currency'%(m.id)] = pick.purchase_id.pricelist_id.currency_id.id
         return res
 stock_partial_picking()
 
@@ -154,10 +145,12 @@ class stock_partial_move(osv.osv_memory):
         res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
         move_obj = self.pool.get('stock.move')
         for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
-            if (m.product_id.cost_method == 'average'):
-                if m.picking_id.type == 'in' and m.purchase_line_id and m.picking_id.purchase_id:
+            if m.picking_id.type == 'in' and m.product_id.cost_method == 'average' \
+                and m.purchase_line_id and m.picking_id.purchase_id:
+                    # We use the original PO unit purchase price as the basis for the cost, expressed
+                    # in the currency of the PO (i.e the PO's pricelist currency)
                     res['move%s_product_price'%(m.id)] = m.purchase_line_id.price_unit
-                    res['move%s_product_currency'%(m.id)] =  m.picking_id.purchase_id.pricelist_id.currency_id.id
+                    res['move%s_product_currency'%(m.id)] = m.picking_id.purchase_id.pricelist_id.currency_id.id
         return res
 stock_partial_move()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From cda95a00e652ebdfa6aca66d6b808b289431447f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 14 Oct 2010 02:38:35 +0200
Subject: [PATCH 63/78] [REM+IMP] sale: inherited stock wizard: remove
 incorrect computation of product cost + minor lint cleanup

bzr revid: odo@openerp.com-20101014003835-cxsvl0aj2cjwaj2l
---
 addons/sale/stock.py | 99 +++++++-------------------------------------
 1 file changed, 16 insertions(+), 83 deletions(-)

diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 0bb47110213..ab4b165201a 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -26,28 +26,12 @@ class stock_move(osv.osv):
     _columns = {
         'sale_line_id': fields.many2one('sale.order.line', 'Sale Order Line', ondelete='set null', select=True, readonly=True),
     }
-    _defaults = {
-        'sale_line_id': False
-    }
 
-    def _get_reference_accounting_values_for_valuation(self, cr, uid, move, context=None):
-        """
-        Overrides the default stock valuation to take into account the currency that was specified
-        on the sale order in case the valuation data was not directly specified during picking
-        confirmation.
-        """
-        reference_amount, reference_currency_id = super(stock_move, self)._get_reference_accounting_values_for_valuation(cr, uid, move, context=context)
-        if move.product_id.cost_method != 'average' or not move.price_unit:
-            # no average price costing or cost not specified during picking validation, we will 
-            # plug the sale line values if they are found.
-            if move.sale_line_id and move.picking_id.sale_id.pricelist_id:
-                reference_amount, reference_currency_id = move.sale_line_id.price_unit, move.picking_id.sale_id.pricelist_id.currency_id.id
-        return reference_amount, reference_currency_id
     def _create_chained_picking(self, cr, uid, pick_name,picking,ptype,move, context=None):
         res=super(stock_move, self)._create_chained_picking(cr, uid, pick_name,picking,ptype,move, context=context)
         if picking.sale_id:
-            picking_obj = self.pool.get('stock.picking').write(cr,uid,[res],{'sale_id':picking.sale_id.id})
-        return res    
+            self.pool.get('stock.picking').write(cr,uid,[res],{'sale_id':picking.sale_id.id})
+        return res
 stock_move()
 
 class stock_picking(osv.osv):
@@ -66,11 +50,9 @@ class stock_picking(osv.osv):
             return super(stock_picking, self).get_currency_id(cursor, user, picking)
 
     def _get_payment_term(self, cursor, user, picking):
-        res = {}
         if picking.sale_id and picking.sale_id.payment_term:
             return picking.sale_id.payment_term.id
-        return super(stock_picking, self)._get_payment_term(cursor,
-                user, picking)
+        return super(stock_picking, self)._get_payment_term(cursor, user, picking)
 
     def _get_address_invoice(self, cursor, user, picking):
         res = {}
@@ -78,47 +60,42 @@ class stock_picking(osv.osv):
             res['contact'] = picking.sale_id.partner_order_id.id
             res['invoice'] = picking.sale_id.partner_invoice_id.id
             return res
-        return super(stock_picking, self)._get_address_invoice(cursor,
-                user, picking)
+        return super(stock_picking, self)._get_address_invoice(cursor, user, picking)
 
     def _get_comment_invoice(self, cursor, user, picking):
         if picking.note or (picking.sale_id and picking.sale_id.note):
             return picking.note or picking.sale_id.note
-        return super(stock_picking, self)._get_comment_invoice(cursor, user,
-                picking)
+        return super(stock_picking, self)._get_comment_invoice(cursor, user, picking)
 
     def _get_price_unit_invoice(self, cursor, user, move_line, type):
         if move_line.sale_line_id and move_line.sale_line_id.product_id.id == move_line.product_id.id:
             return move_line.sale_line_id.price_unit
-        return super(stock_picking, self)._get_price_unit_invoice(cursor,
-                user, move_line, type)
+        return super(stock_picking, self)._get_price_unit_invoice(cursor, user, move_line, type)
 
     def _get_discount_invoice(self, cursor, user, move_line):
         if move_line.sale_line_id:
             return move_line.sale_line_id.discount
-        return super(stock_picking, self)._get_discount_invoice(cursor, user,
-                move_line)
+        return super(stock_picking, self)._get_discount_invoice(cursor, user, move_line)
 
     def _get_taxes_invoice(self, cursor, user, move_line, type):
         if move_line.sale_line_id and move_line.sale_line_id.product_id.id == move_line.product_id.id:
             return [x.id for x in move_line.sale_line_id.tax_id]
-        return super(stock_picking, self)._get_taxes_invoice(cursor, user,
-                move_line, type)
+        return super(stock_picking, self)._get_taxes_invoice(cursor, user, move_line, type)
 
     def _get_account_analytic_invoice(self, cursor, user, picking, move_line):
         if picking.sale_id:
             return picking.sale_id.project_id.id
-        return super(stock_picking, self)._get_account_analytic_invoice(cursor,
-                user, picking, move_line)
+        return super(stock_picking, self)._get_account_analytic_invoice(cursor, user, picking, move_line)
 
     def _invoice_line_hook(self, cursor, user, move_line, invoice_line_id):
         sale_line_obj = self.pool.get('sale.order.line')
         if move_line.sale_line_id:
-            sale_line_obj.write(cursor, user, [move_line.sale_line_id.id], {'invoiced':True,
-                'invoice_lines': [(4, invoice_line_id)],
-                })
-        return super(stock_picking, self)._invoice_line_hook(cursor, user,
-                move_line, invoice_line_id)
+            sale_line_obj.write(cursor, user, [move_line.sale_line_id.id], 
+                                    {
+                                        'invoiced': True,
+                                        'invoice_lines': [(4, invoice_line_id)],
+                                    })
+        return super(stock_picking, self)._invoice_line_hook(cursor, user, move_line, invoice_line_id)
 
     def _invoice_hook(self, cursor, user, picking, invoice_id):
         sale_obj = self.pool.get('sale.order')
@@ -126,8 +103,7 @@ class stock_picking(osv.osv):
             sale_obj.write(cursor, user, [picking.sale_id.id], {
                 'invoice_ids': [(4, invoice_id)],
                 })
-        return super(stock_picking, self)._invoice_hook(cursor, user,
-                picking, invoice_id)
+        return super(stock_picking, self)._invoice_hook(cursor, user, picking, invoice_id)
 
     def action_invoice_create(self, cursor, user, ids, journal_id=False,
             group=False, type='out_invoice', context=None):
@@ -227,47 +203,4 @@ class stock_picking(osv.osv):
 
 stock_picking()
 
-class stock_partial_picking(osv.osv_memory):
-    _inherit = 'stock.partial.picking'
-
-    def default_get(self, cr, uid, fields, context=None):
-        """ To get default values for the object.
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param fields: List of fields for which we want default values
-        @param context: A standard dictionary
-        @return: A dictionary which of fields with values.
-        """
-        pick_obj = self.pool.get('stock.picking')
-        res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
-        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
-            for m in pick.move_lines:
-                if (m.product_id.cost_method == 'average'):
-                    if pick.type == 'out' and pick.sale_id and m.sale_line_id:
-                        res['move%s_product_price'%(m.id)] =  m.sale_line_id.price_unit
-                        res['move%s_product_currency'%(m.id)] =  pick.sale_id.pricelist_id.currency_id.id
-        return res
-stock_partial_picking()
-
-class stock_partial_move(osv.osv_memory):
-    _inherit = "stock.partial.move"
-    def default_get(self, cr, uid, fields, context=None):
-        """ To get default values for the object.
-        @param self: The object pointer.
-        @param cr: A database cursor
-        @param uid: ID of the user currently logged in
-        @param fields: List of fields for which we want default values
-        @param context: A standard dictionary
-        @return: A dictionary which of fields with values.
-        """
-        res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
-        move_obj = self.pool.get('stock.move')
-        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
-            if (m.product_id.cost_method == 'average'):
-                if m.picking_id.type == 'out' and  m.sale_line_id and m.picking_id.sale_id:
-                    res['move%s_product_price'%(m.id)] = m.sale_line_id.price_unit
-                    res['move%s_product_currency'%(m.id)] = m.picking_id.sale_id.pricelist_id.currency_id.id
-        return res
-stock_partial_move()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From d62bef258453be310029a324a7e65488161b3c8f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 14 Oct 2010 02:40:47 +0200
Subject: [PATCH 64/78] [FIX] stock.partial.*: product cost should only be used
 for incoming products + cleanup

bzr revid: odo@openerp.com-20101014004047-3bhd22rnfbyan2tm
---
 addons/stock/wizard/stock_partial_move.py    | 22 +++++++-------
 addons/stock/wizard/stock_partial_picking.py | 30 ++++++++++++--------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 5c7fd3c9472..a8327e50d0f 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -40,7 +40,6 @@ class stock_partial_move(osv.osv_memory):
             if m.state in ('done', 'cancel'):
                 raise osv.except_osv(_('Invalid action !'), _('Cannot deliver products which are already delivered !'))
 
-
             if 'move%s_product_id'%(m.id) not in self._columns:
                 self._columns['move%s_product_id'%(m.id)] = fields.many2one('product.product',string="Product")
             if 'move%s_product_qty'%(m.id) not in self._columns:
@@ -52,9 +51,9 @@ class stock_partial_move(osv.osv_memory):
                 
             if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
                 if 'move%s_product_price'%(m.id) not in self._columns:
-                    self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
+                    self._columns['move%s_product_price'%(m.id)] = fields.float("Cost", help="Unit Cost for this product line")
                 if 'move%s_product_currency'%(m.id) not in self._columns:
-                    self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
+                    self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed")
         return res
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
@@ -109,14 +108,15 @@ class stock_partial_move(osv.osv_memory):
                 if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
                     _moves_fields.update({
                         'move%s_product_price'%(m.id) : {
-                            'string': _('Price'),
+                            'string': _('Cost'),
                             'type' : 'float',
+                            'help': _('Unit Cost for this product line'),
                         },
                         'move%s_product_currency'%(m.id): {
                             'string': _('Currency'),
-                            'type' : 'float',
                             'type' : 'many2one',
                             'relation': 'res.currency',
+                            'help': _("Currency in which Unit Cost is expressed"),
                         }
                     })
                     _moves_arch_lst += """
@@ -162,8 +162,6 @@ class stock_partial_move(osv.osv_memory):
             if m.state in ('done', 'cancel'):
                 continue
             res['type'] = m.picking_id and m.picking_id.type or ''
-    
-
             if 'move%s_product_id'%(m.id) in fields:
                 res['move%s_product_id'%(m.id)] = m.product_id.id
             if 'move%s_product_qty'%(m.id) in fields:
@@ -171,10 +169,12 @@ class stock_partial_move(osv.osv_memory):
             if 'move%s_product_uom'%(m.id) in fields:
                 res['move%s_product_uom'%(m.id)] = m.product_uom.id
             if 'move%s_prodlot_id'%(m.id) in fields:
-                    res['move%s_prodlot_id'%(m.id)] = m.prodlot_id.id                
-            if  m.product_id.cost_method == 'average' :
+                    res['move%s_prodlot_id'%(m.id)] = m.prodlot_id.id
+            if m.picking_id.type == 'in' and m.product_id.cost_method == 'average':
+                # Always use default product cost and currency from Product Form, 
+                # which belong to the Company owning the product
+                currency = m.product_id.company_id.currency_id.id
                 price = m.product_id.standard_price
-                currency = False
                 if 'move%s_product_price'%(m.id) in fields:
                     res['move%s_product_price'%(m.id)] = price
                 if 'move%s_product_currency'%(m.id) in fields:
@@ -204,7 +204,7 @@ class stock_partial_move(osv.osv_memory):
                 'product_id' : getattr(partial, 'move%s_product_id'%(m.id)).id,
                 'product_qty' : getattr(partial, 'move%s_product_qty'%(m.id)),
                 'product_uom' : getattr(partial, 'move%s_product_uom'%(m.id)).id,
-                'prodlot_id' : getattr(partial, 'move%s_prodlot_id'%(m.id)).id                
+                'prodlot_id' : getattr(partial, 'move%s_prodlot_id'%(m.id)).id
             }
 
             if (m.picking_id.type == 'in') and (m.product_id.cost_method == 'average'):
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 2d9ec901a8d..1b746f230b5 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -35,8 +35,8 @@ class stock_partial_picking(osv.osv_memory):
         pick_obj = self.pool.get('stock.picking')
         if not context:
             context={}
-        moveids = []
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+            need_product_cost = (pick.type == 'in')
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
                     continue
@@ -49,11 +49,11 @@ class stock_partial_picking(osv.osv_memory):
                 if 'move%s_prodlot_id'%(m.id) not in self._columns:
                     self._columns['move%s_prodlot_id'%(m.id)] = fields.many2one('stock.production.lot', string="Lot")
 
-                if (m.product_id.cost_method == 'average'):
+                if (need_product_cost and m.product_id.cost_method == 'average'):
                     if 'move%s_product_price'%(m.id) not in self._columns:
-                        self._columns['move%s_product_price'%(m.id)] = fields.float("Price")
+                        self._columns['move%s_product_price'%(m.id)] = fields.float("Cost", help="Unit Cost for this product line")
                     if 'move%s_product_currency'%(m.id) not in self._columns:
-                        self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency',string="Currency")
+                        self._columns['move%s_product_currency'%(m.id)] = fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed")
         return res
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
@@ -70,6 +70,7 @@ class stock_partial_picking(osv.osv_memory):
         _moves_fields = result['fields']
         if picking_ids and view_type in ['form']:
             for pick in pick_obj.browse(cr, uid, picking_ids, context):
+                need_product_cost = (pick.type == 'in')
                 for m in pick.move_lines:
                     if m.state in ('done', 'cancel'):
                         continue
@@ -107,17 +108,19 @@ class stock_partial_picking(osv.osv_memory):
                         <field name="move%s_product_uom" nolabel="1" />
                         <field name="move%s_prodlot_id" domain="[('product_id','=',move%s_product_id)]" groups="base.group_extended" />
                     """%(m.id, m.id, m.id, m.id,m.id)
-                    if (m.product_id.cost_method == 'average'):
+
+                    if (need_product_cost and m.product_id.cost_method == 'average'):
                         _moves_fields.update({
                             'move%s_product_price'%(m.id) : {
-                                'string': _('Price'),
+                                'string': _('Cost'),
                                 'type' : 'float',
+                                'help': _('Unit Cost for this product line'),
                             },
                             'move%s_product_currency'%(m.id): {
                                 'string': _('Currency'),
-                                'type' : 'float',
                                 'type' : 'many2one',
                                 'relation': 'res.currency',
+                                'help': _("Currency in which Unit Cost is expressed"),
                             }
                         })
                         _moves_arch_lst += """
@@ -155,10 +158,10 @@ class stock_partial_picking(osv.osv_memory):
         pick_obj = self.pool.get('stock.picking')
         if not context:
             context={}
-        moveids = []
         if 'date' in fields:
             res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
         for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+            need_product_cost = (pick.type == 'in')
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
                     continue
@@ -170,8 +173,10 @@ class stock_partial_picking(osv.osv_memory):
                     res['move%s_product_uom'%(m.id)] = m.product_uom.id
                 if 'move%s_prodlot_id'%(m.id) in fields:
                     res['move%s_prodlot_id'%(m.id)] = m.prodlot_id.id
-                if (m.product_id.cost_method == 'average'):
-                    currency = False
+                if (need_product_cost and m.product_id.cost_method == 'average'):
+                    # Always use default product cost and currency from Product Form, 
+                    # which belong to the Company owning the product
+                    currency = m.product_id.company_id.currency_id.id
                     price = m.product_id.standard_price
                     if 'move%s_product_price'%(m.id) in fields:
                         res['move%s_product_price'%(m.id)] = price
@@ -195,6 +200,7 @@ class stock_partial_picking(osv.osv_memory):
             'delivery_date' : partial.date
         }
         for pick in pick_obj.browse(cr, uid, picking_ids):
+            need_product_cost = (pick.type == 'in')
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
                     continue
@@ -205,12 +211,12 @@ class stock_partial_picking(osv.osv_memory):
                     'prodlot_id' : getattr(partial, 'move%s_prodlot_id'%(m.id)).id
                 }
 
-                if (m.product_id.cost_method == 'average'):
+                if (need_product_cost and m.product_id.cost_method == 'average'):
                     partial_datas['move%s'%(m.id)].update({
                         'product_price' : getattr(partial, 'move%s_product_price'%(m.id)),
                         'product_currency': getattr(partial, 'move%s_product_currency'%(m.id)).id
                     })
-        res = pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+        pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
         return {}
 
 stock_partial_picking()

From 187064451e669e51729be76cebaacd6c6fda057b Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 14 Oct 2010 02:41:49 +0200
Subject: [PATCH 65/78] [IMP] stock: more consistent labels and icons for
 picking/move processing buttons + some lint cleanup

bzr revid: odo@openerp.com-20101014004149-am2600y815mz7s66
---
 addons/stock/stock.py       | 26 +-------------------------
 addons/stock/stock_view.xml | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index faac0b94166..29492ac84ec 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -25,7 +25,6 @@ from operator import itemgetter
 from itertools import groupby
 
 from osv import fields, osv
-from tools import config
 from tools.translate import _
 import netsvc
 import tools
@@ -1101,8 +1100,6 @@ class stock_picking(osv.osv):
                           delivery moves with product_id, product_qty, uom
         @return: Dictionary of values
         """
-        import pdb
-        #pdb.set_trace()
         if context is None:
             context = {}
         else:
@@ -1112,15 +1109,10 @@ class stock_picking(osv.osv):
         product_obj = self.pool.get('product.product')
         currency_obj = self.pool.get('res.currency')
         uom_obj = self.pool.get('product.uom')
-        price_type_obj = self.pool.get('product.price.type')
         sequence_obj = self.pool.get('ir.sequence')
         wf_service = netsvc.LocalService("workflow")
-        partner_id = partial_datas.get('partner_id', False)
-        address_id = partial_datas.get('address_id', False)
-        delivery_date = partial_datas.get('delivery_date', False)
         for pick in self.browse(cr, uid, ids, context=context):
             new_picking = None
-            new_moves = []
             complete, too_many, too_few = [], [], []
             move_product_qty = {}
             prodlot_ids = {}
@@ -1194,7 +1186,7 @@ class stock_picking(osv.osv):
                     prodlot_id = prodlot_ids[move.id]
                     if prodlot_id:
                         defaults.update(prodlot_id=prodlot_id)
-                    new_obj = move_obj.copy(cr, uid, move.id, defaults)
+                    move_obj.copy(cr, uid, move.id, defaults)
 
                 move_obj.write(cr, uid, [move.id],
                         {
@@ -1887,9 +1879,7 @@ class stock_move(osv.osv):
         These reference values should possibly be converted before being posted in Journals to adapt to the primary
         and secondary currencies of the relevant accounts.
         """
-        product_obj=self.pool.get('product.product')
         product_uom_obj = self.pool.get('product.uom')
-        price_type_obj = self.pool.get('product.price.type')
 
         # by default the reference currency is that of the move's company
         reference_currency_id = move.company_id.currency_id.id
@@ -1956,12 +1946,8 @@ class stock_move(osv.osv):
         """ Makes the move done and if all moves are done, it will finish the picking.
         @return:
         """
-        track_flag = False
         partial_datas=''
         picking_ids = []
-        product_uom_obj = self.pool.get('product.uom')
-        price_type_obj = self.pool.get('product.price.type')
-        product_obj = self.pool.get('product.product')
         partial_obj=self.pool.get('stock.partial.picking')
         partial_id=partial_obj.search(cr,uid,[])
         if partial_id:
@@ -1986,8 +1972,6 @@ class stock_move(osv.osv):
                     if move.move_dest_id.picking_id:
                         wf_service = netsvc.LocalService("workflow")
                         wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr)
-                    else:
-                        pass
                     if move.move_dest_id.auto_validate:
                         self.action_done(cr, uid, [move.move_dest_id.id], context=context)
 
@@ -2252,20 +2236,12 @@ class stock_move(osv.osv):
                           like partner_id, address_id, delivery_date, delivery
                           moves with product_id, product_qty, uom
         """
-        import pdb
-        #pdb.set_trace()
         res = {}
         picking_obj = self.pool.get('stock.picking')
         product_obj = self.pool.get('product.product')
         currency_obj = self.pool.get('res.currency')
         uom_obj = self.pool.get('product.uom')
-        price_type_obj = self.pool.get('product.price.type')
-        sequence_obj = self.pool.get('ir.sequence')
         wf_service = netsvc.LocalService("workflow")
-        partner_id = partial_datas.get('partner_id', False)
-        address_id = partial_datas.get('address_id', False)
-        delivery_date = partial_datas.get('delivery_date', False)
-        new_moves = []
 
         if  context is None:
             context = {}
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2a4bec6fe3b..cc7f7b67349 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -394,7 +394,7 @@
                     <field name="date" string="Date"/>
                     <field name="date_expected" string="Date Expected"/>
                     <field name="state"/>
-                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                    <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -624,7 +624,7 @@
                     <field name="invoice_state"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="confirmed,assigned" string="Approve Picking" type="action" icon="gtk-go-forward"/>
+                    <button name="%(action_partial_picking)d" states="confirmed,assigned" string="Process" type="action" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -741,12 +741,12 @@
                             </field>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
-                                <button name="draft_force_assign" states="draft" string="Confirm (Do Not Process Now)" type="object" icon="gtk-apply"/>
+                                <button name="draft_force_assign" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(action_partial_picking)d" states="assigned" string="Approve" type="action" icon="gtk-apply"/>
-                                <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Process" type="action" icon="gtk-go-forward"/>
+                                <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -816,7 +816,7 @@
                     <field name="invoice_state"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" string="Approve Picking" type="action" icon="gtk-go-forward"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Process" type="action" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -872,7 +872,7 @@
                                     <field name="date"/>
                                     <field name="state"/>
                                     <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
-                                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                                    <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
                                 </tree>
                                 <form string="Stock Moves">
                                     <group colspan="2" col="4">
@@ -935,7 +935,7 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(action_partial_picking)d" states="assigned" string="Done" type="action" icon="gtk-execute"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Process" type="action" icon="gtk-go-forward"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
@@ -1032,7 +1032,7 @@
                     <field name="invoice_state" groups="base.group_extended"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="%(action_partial_picking)d" states="assigned" string="Receive products" type="action" icon="gtk-ok"/>
+                    <button name="%(action_partial_picking)d" states="assigned" string="Process" type="action" icon="gtk-go-forward"/>
                     <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel" confirm="This operation will cancel the shipment. Do you want to continue?" />
                 </tree>
             </field>
@@ -1150,7 +1150,7 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
-                                <button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
+                                <button name="%(action_partial_picking)d" states="assigned" string="Process" type="action" icon="gtk-go-forward"/>
                                 <button name="%(action_stock_invoice_onshipping)d"  string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl" attrs="{'invisible':[('invoice_state','!=','2binvoiced')]}"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
                             </group>
@@ -1327,7 +1327,7 @@
                     <field name="date"/>
                     <field name="date_expected"/>
                     <field name="state"/>
-                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-ok"/>
+                    <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -1395,7 +1395,7 @@
                         <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
                         <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                         <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
-                        <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                        <button name="action_done" states="assigned" string="Process" type="object" icon="gtk-jump-to"/>
                     </group>
                 </form>
             </field>
@@ -1499,7 +1499,7 @@
                     <field name="state"/>
                     <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                     <button name="%(action_partial_move)d" string="Partial" type="action" states="confirmed,assigned" icon="gtk-justify-fill"/>
-                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                    <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -1517,7 +1517,7 @@
                     <field name="product_qty" />
                     <field name="product_uom" string="UoM"/>
                     <field name="date"/>
-                    <button name="action_done" states="confirmed,assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                    <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
@@ -1583,7 +1583,7 @@
                         <button name="action_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
                         <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
                         <button name="%(action_partial_move)d" states="assigned,confirmed" string="Partial" type="action" icon="gtk-justify-fill"/>
-                        <button name="action_done" states="assigned" string="Done" type="object" icon="gtk-jump-to"/>
+                        <button name="action_done" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
                     </group>
                 </form>
             </field>

From 150a880bfd1f041b1184f6749c410f19148fa05f Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 14 Oct 2010 04:45:33 +0000
Subject: [PATCH 66/78] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20101014044533-83rsj0azy18v1g4k
---
 addons/account/i18n/hr.po                   |   36 +-
 addons/account/i18n/sr.po                   | 1254 ++++++++++---------
 addons/account_analytic_analysis/i18n/sr.po |  352 ++++++
 addons/account_analytic_default/i18n/sr.po  |  114 ++
 addons/account_analytic_plans/i18n/sr.po    |  404 ++++++
 addons/account_cancel/i18n/sr.po            |   42 +
 addons/account_cancel/i18n/tr.po            |   37 +
 addons/account_tax_include/i18n/it.po       |   10 +-
 addons/analytic_user_function/i18n/mn.po    |    6 +-
 addons/base_vat/i18n/fr.po                  |    4 +-
 addons/board/i18n/sr.po                     |  221 ++++
 addons/document_webdav/i18n/da.po           |    4 +-
 addons/idea/i18n/tr.po                      |    6 +-
 addons/point_of_sale/i18n/sr.po             |    4 +-
 addons/procurement/i18n/mn.po               |   25 +-
 addons/report_intrastat/i18n/it.po          |    6 +-
 addons/stock/i18n/mn.po                     |  125 +-
 17 files changed, 1968 insertions(+), 682 deletions(-)
 create mode 100644 addons/account_analytic_analysis/i18n/sr.po
 create mode 100644 addons/account_analytic_default/i18n/sr.po
 create mode 100644 addons/account_analytic_plans/i18n/sr.po
 create mode 100644 addons/account_cancel/i18n/sr.po
 create mode 100644 addons/account_cancel/i18n/tr.po
 create mode 100644 addons/board/i18n/sr.po

diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 9d97a299adf..a34f7c100c0 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 16:53+0000\n"
+"PO-Revision-Date: 2010-10-13 15:51+0000\n"
 "Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2506,13 +2506,13 @@ msgstr "Iznos u valuti dnevnika"
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
 msgid "Landscape Mode"
-msgstr "Položeni način"
+msgstr "Prosireni način"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts, Create invoice."
-msgstr "Iz konta analitike, stvori račun."
+msgstr "Iz konta analitike, kreiraj račun."
 
 #. module: account
 #: wizard_button:account.account.balance.report,account_selection,end:0
@@ -2578,7 +2578,7 @@ msgstr "Naziv vrste konta"
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the VAT declaration."
-msgstr "Koristi u PDV obrazascu."
+msgstr "Koristi ovo za dekleraciju u PDV-a."
 
 #. module: account
 #: field:account.move.line,blocked:0
@@ -2626,7 +2626,8 @@ msgstr "Nalog za plaćanje"
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr "Omogućuje zatvaranje stavaka za ovaj konto."
+msgstr ""
+"Cekirajte ovde da omogućuite korisniku zatvaranje stavaka za ovaj konto."
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2818,6 +2819,10 @@ msgid ""
 "higher ones. The order is important if you have a tax that has several tax "
 "children. In this case, the evaluation order is important."
 msgstr ""
+"Sekvenciono polje se koristi da bi se poredjali porezi od najmanjeg do "
+"najveceg. Ovaj poredak je vazan, narocito ukoliko imate poreze koji, opet "
+"imaju nekoliko podredjenih poreza. U tom slucaju, ovaj evaluacioni poredak "
+"je vazan."
 
 #. module: account
 #: field:account.journal.column,view_id:0
@@ -2870,7 +2875,7 @@ msgstr "Nova izlazna faktura"
 #: wizard_button:account.move.line.reconcile,addendum,reconcile:0
 #: wizard_button:account.move.line.reconcile,init_full,reconcile:0
 msgid "Reconcile"
-msgstr "Zatvori"
+msgstr "Sravnjanje"
 
 #. module: account
 #: rml:account.overdue:0
@@ -2906,7 +2911,7 @@ msgstr "Konto poreza"
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid "From statement, create entries"
-msgstr "Stvori stavki iz izvoda"
+msgstr "Kreiraj stavku iz izvoda"
 
 #. module: account
 #: field:account.analytic.account,complete_name:0
@@ -3068,8 +3073,8 @@ msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
 msgstr ""
-"Označite za grupiranje stavki prilikom knjiženja računa. Istovrsne stavke se "
-"knjiže zbrojno, kao jedna."
+"Ako je cekirano, sistem ce probati da grupise konta prilikom generisanja iz "
+"racuna."
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
@@ -3192,7 +3197,7 @@ msgstr "Konto"
 #. module: account
 #: model:account.journal,name:account.bank_journal
 msgid "Journal de Banque CHF"
-msgstr ""
+msgstr "Dnevnik CHF Banke"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3559,7 +3564,7 @@ msgstr "3"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
 msgid "Taxes Report"
-msgstr "PDV obrazac"
+msgstr "Poreski Izvestaj"
 
 #. module: account
 #: selection:account.journal.period,state:0
@@ -5210,7 +5215,7 @@ msgstr "Primitak novca"
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr "Zamjenski porez"
+msgstr "Promenljiv porez"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
@@ -5934,7 +5939,7 @@ msgstr "Uvjet plaćanja"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Mappings"
-msgstr ""
+msgstr "Fiskalna mapiranja"
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
@@ -5958,7 +5963,7 @@ msgstr "Označite ovu kućicu"
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
-msgstr ""
+msgstr "Označite ovu kućicu ako cena proizvoda i racuna sadrze ovaj porez"
 
 #. module: account
 #: field:account.journal.column,name:0
@@ -5983,6 +5988,7 @@ msgstr "Da"
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
+"Označite ovu kućicu ako je dozvoljeno korisniku da ponisti stavke ovog racuna"
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index 19a1204ca17..d171553ea85 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 17:21+0000\n"
+"PO-Revision-Date: 2010-10-13 16:24+0000\n"
 "Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2464,7 +2464,7 @@ msgstr "Primjenjeni kod (ako je tip=Python kod)"
 #. module: account
 #: wizard_button:account.move.journal,init,open:0
 msgid "Open Journal"
-msgstr ""
+msgstr "Otvori dnevnik"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2477,53 +2477,53 @@ msgstr ""
 #: model:ir.ui.menu,name:account.account_entries_analytic_entries
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 msgid "Entries Encoding by Line"
-msgstr ""
+msgstr "Direktan unos stavki"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
 msgid "List of all the taxes that have to be installed by the wizard"
-msgstr ""
+msgstr "Lista svih poreza koji trebaju biti instalirani od strane čarobnjaka"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Period from"
-msgstr ""
+msgstr "Razdoblje od"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr ""
+msgstr "Izvod banke"
 
 #. module: account
 #: wizard_view:account.invoice.pay,addendum:0
 #: wizard_view:account.move.line.reconcile,addendum:0
 msgid "Information addendum"
-msgstr ""
+msgstr "Informaciski dodatak"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Entries Reconcile"
-msgstr ""
+msgstr "Zatvaranje stavaka"
 
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_amount:0
 msgid "The amount in the currency of the journal"
-msgstr ""
+msgstr "Iznos u valuti dnevnika"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,landscape:0
 msgid "Landscape Mode"
-msgstr ""
+msgstr "Prosireni način"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts, Create invoice."
-msgstr ""
+msgstr "Iz konta analitike, kreiraj račun."
 
 #. module: account
 #: wizard_button:account.account.balance.report,account_selection,end:0
@@ -2572,12 +2572,12 @@ msgstr ""
 #: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: account
 #: field:account.account.type,name:0
 msgid "Acc. Type Name"
-msgstr ""
+msgstr "Naziv vrste konta"
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -2589,55 +2589,56 @@ msgstr ""
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the VAT declaration."
-msgstr ""
+msgstr "Koristi ovo za dekleraciju u PDV-a."
 
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "Litigation"
-msgstr ""
+msgstr "Sporno"
 
 #. module: account
 #: view:account.move.line:0
 #: wizard_view:account.move.validate,init:0
 #: view:account.payment.term:0
 msgid "Information"
-msgstr ""
+msgstr "Informacija"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_tax_report
 msgid "Taxes Reports"
-msgstr ""
+msgstr "Poreski izvestaji"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr ""
+msgstr "Konta obveza"
 
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Import Invoices in Statement"
-msgstr ""
+msgstr "Uvezi račune u izvod"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Other Info"
-msgstr ""
+msgstr "Ostale informacije"
 
 #. module: account
 #: field:account.journal,default_credit_account_id:0
 msgid "Default Credit Account"
-msgstr ""
+msgstr "Osnovni konto potražuje"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
 msgid "Payment Order"
-msgstr ""
+msgstr "Nalog za plaćanje"
 
 #. module: account
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
 msgstr ""
+"Cekirajte ovde da omogućuite korisniku zatvaranje stavaka za ovaj konto."
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -2645,32 +2646,32 @@ msgstr ""
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic"
-msgstr ""
+msgstr "Analitika"
 
 #. module: account
 #: model:process.node,name:account.process_node_invoiceinvoice0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Kreiraj Račun"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_equity
 msgid "Equity"
-msgstr ""
+msgstr "Kapital"
 
 #. module: account
 #: field:wizard.company.setup,overdue_msg:0
 msgid "Overdue Payment Message"
-msgstr ""
+msgstr "Poruka prekoračenog roka plaćanja"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr ""
+msgstr "Predložak PDV obrasca"
 
 #. module: account
 #: rml:account.partner.balance:0
 msgid "In dispute"
-msgstr ""
+msgstr "Sporno"
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2681,43 +2682,48 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for deprecated "
 "accounts."
 msgstr ""
+"Sintetički zbirni konto, ne sadrži knjiženja\r\n"
+"Konsolidacija: Zbirni konto za više preduzeća i paralelne kontne planove\r\n"
+"Obveze: Salda konta partnera - dobavljači\r\n"
+"Potraživanja: Salda konta partnera - kupci\r\n"
+"Zatvoren: Za konta koja se više ne koriste"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
 msgid "End of Year Treatments"
-msgstr ""
+msgstr "Postupci završetka fiskalne godine"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_generic_report
 msgid "Generic Reports"
-msgstr ""
+msgstr "Generički izveštaji"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,power:0
 msgid "Power"
-msgstr ""
+msgstr "Eksponent"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
 msgid "Account Analytic Lines Analysis"
-msgstr ""
+msgstr "Analiza analitičkih knjiženja"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Price"
-msgstr ""
+msgstr "Cena"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "asgfas"
-msgstr ""
+msgstr "asgfas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -2726,54 +2732,54 @@ msgstr ""
 #: model:ir.ui.menu,name:account.account_analytic_def_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Analytic Chart of Accounts"
-msgstr ""
+msgstr "Analitički kontni plan"
 
 #. module: account
 #: wizard_view:account.analytic.line,init:0
 msgid "View Account Analytic Lines"
-msgstr ""
+msgstr "Pregled stavki analitičkog knjiženja"
 
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Select Period and Journal for Validation"
-msgstr ""
+msgstr "Odaberite razdoblje i dnevnik za potvrdu"
 
 #. module: account
 #: field:account.invoice,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "Broj računa"
 
 #. module: account
 #: field:account.period,date_stop:0
 msgid "End of Period"
-msgstr ""
+msgstr "Kraj Perioda"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,go,finish:0
 msgid "O_k"
-msgstr ""
+msgstr "U _redu"
 
 #. module: account
 #: field:account.invoice,amount_untaxed:0
 msgid "Untaxed"
-msgstr ""
+msgstr "Bez poreza"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 #: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report
 msgid "Inverted Analytic Balance"
-msgstr ""
+msgstr "Obrnuti saldo analitike"
 
 #. module: account
 #: field:account.tax,applicable_type:0
 #: field:account.tax.template,applicable_type:0
 msgid "Applicable Type"
-msgstr ""
+msgstr "Primjenjivi tip"
 
 #. module: account
 #: field:account.invoice,reference:0
 msgid "Invoice Reference"
-msgstr ""
+msgstr "Referenca računa"
 
 #. module: account
 #: field:account.account,name:0
@@ -2789,33 +2795,33 @@ msgstr ""
 #: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: account
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 msgid "Reconciliation transactions"
-msgstr ""
+msgstr "Transakcije zatvaranja"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,direction_selection:0
 msgid "Analysis Direction"
-msgstr ""
+msgstr "Direkcija Analiza"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,init,go:0
 msgid "_Go"
-msgstr ""
+msgstr "_Kreni"
 
 #. module: account
 #: field:res.partner,ref_companies:0
 msgid "Companies that refers to partner"
-msgstr ""
+msgstr "Firme koje se vežu sa partnerom"
 
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
-msgstr ""
+msgstr "Efektivni datum"
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -2824,6 +2830,10 @@ msgid ""
 "higher ones. The order is important if you have a tax that has several tax "
 "children. In this case, the evaluation order is important."
 msgstr ""
+"Sekvenciono polje se koristi da bi se poredjali porezi od najmanjeg do "
+"najveceg. Ovaj poredak je vazan, narocito ukoliko imate poreze koji, opet "
+"imaju nekoliko podredjenih poreza. U tom slucaju, ovaj evaluacioni poredak "
+"je vazan."
 
 #. module: account
 #: field:account.journal.column,view_id:0
@@ -2831,40 +2841,40 @@ msgstr ""
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
-msgstr ""
+msgstr "Pogled dnevnika"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Credit Centralisation"
-msgstr ""
+msgstr "Centralizacija potraživanja"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Customer Ref:"
-msgstr ""
+msgstr "Referenca kupca:"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
-msgstr ""
+msgstr "Šifra partnera"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
 #: wizard_view:account.invoice.pay,addendum:0
 #: wizard_view:account.move.line.reconcile,addendum:0
 msgid "Write-Off Move"
-msgstr ""
+msgstr "Knjiženje otpisa"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Total credit"
-msgstr ""
+msgstr "Ukupno potražuje"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1_new
 msgid "New Customer Invoice"
-msgstr ""
+msgstr "Nova izlazna faktura"
 
 #. module: account
 #: field:account.account,reconcile:0
@@ -2876,48 +2886,48 @@ msgstr ""
 #: wizard_button:account.move.line.reconcile,addendum,reconcile:0
 #: wizard_button:account.move.line.reconcile,init_full,reconcile:0
 msgid "Reconcile"
-msgstr ""
+msgstr "Sravnjanje"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Best regards."
-msgstr ""
+msgstr "Najlepse zelje."
 
 #. module: account
 #: model:ir.model,name:account.model_report_hr_timesheet_invoice_journal
 msgid "Analytic account costs and revenues"
-msgstr ""
+msgstr "Troškovi i prihodi analitičkih konta"
 
 #. module: account
 #: wizard_view:account.invoice.refund,init:0
 msgid "Are you sure you want to refund this invoice ?"
-msgstr ""
+msgstr "Jeste sigurni da želite izvšiti storno ovog računa?"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_paid_open
 msgid "Open State"
-msgstr ""
+msgstr "Otvoreno stanje"
 
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Created Entries"
-msgstr ""
+msgstr "Preskoči stanje 'U pripremi' za kreirane stavke"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
 #: field:account.move.line,tax_code_id:0
 msgid "Tax Account"
-msgstr "Poreski konto"
+msgstr "Konto poreza"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid "From statement, create entries"
-msgstr ""
+msgstr "Kreiraj stavku iz izvoda"
 
 #. module: account
 #: field:account.analytic.account,complete_name:0
 msgid "Full Account Name"
-msgstr ""
+msgstr "Puni naziv konta"
 
 #. module: account
 #: rml:account.account.balance:0
@@ -2931,54 +2941,54 @@ msgstr ""
 #: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
-msgstr ""
+msgstr "1cm 27,7cm 20cm 27,7cm"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree12
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree12
 msgid "Draft Supplier Refunds"
-msgstr ""
+msgstr "Nepotvrđeni povrati dobavljaču"
 
 #. module: account
 #: model:process.node,name:account.process_node_accountingstatemententries0
 msgid "Accounting Statement"
-msgstr ""
+msgstr "Računovodstveni izvod"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr ""
+msgstr "Dokument: Izvod konta kupca"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 #: view:res.partner:0
 msgid "Accounting"
-msgstr ""
+msgstr "Računovodstvo"
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Taxes Mapping"
-msgstr ""
+msgstr "Mapiranje poreza"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
 #: wizard_view:account.reconcile.unreconcile,init:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "Neponistene transakcije"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Reconcilation of entries from payment order."
-msgstr ""
+msgstr "zatvaranje stavki iz naloga za plaćanje."
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
 #: model:ir.model,name:account.model_account_move_line
 msgid "Entry lines"
-msgstr ""
+msgstr "Stavke knjiženja"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
@@ -2989,12 +2999,12 @@ msgstr ""
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
 msgid "Reconciliation"
-msgstr ""
+msgstr "Zatvaranje"
 
 #. module: account
 #: field:account.move.line,centralisation:0
 msgid "Centralisation"
-msgstr ""
+msgstr "Centralizacija (u saldu)"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -3003,33 +3013,33 @@ msgstr ""
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr ""
+msgstr "Sifra Poreza"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Analytic Journal -"
-msgstr ""
+msgstr "Dnevnik analitike"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Debit"
-msgstr ""
+msgstr "Analiticka dugovanja"
 
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr ""
+msgstr "Izlazna valutna lista"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree10
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree10
 msgid "Draft Customer Refunds"
-msgstr ""
+msgstr "Neodobreni povrati kupaca"
 
 #. module: account
 #: field:account.journal.column,readonly:0
 msgid "Readonly"
-msgstr ""
+msgstr "Samo za čitanje"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -3038,33 +3048,35 @@ msgid ""
 "between the date of the creation action or the the date of the creation of "
 "the entries plus the partner payment terms."
 msgstr ""
+"Datum dospeća generisanih stavki za ovaj model. Možete odabrati između "
+"datuma akcije ili datuma kreiranja stavki plus uslove plaćanja partnera."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
 #: selection:account.journal,type:0
 msgid "Situation"
-msgstr ""
+msgstr "Stanje"
 
 #. module: account
 #: rml:account.invoice:0
 #: xsl:account.transfer:0
 msgid "Document"
-msgstr ""
+msgstr "Dokument"
 
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr ""
+msgstr "Osnovica"
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Jedinica mere"
 
 #. module: account
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr ""
+msgstr "Konto potraživanja"
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
@@ -3072,17 +3084,19 @@ msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
 msgstr ""
+"Ako je cekirano, sistem ce probati da grupise konta prilikom generisanja iz "
+"racuna."
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
 #: wizard_field:account.move.line.reconcile,init_partial,trans_nbr:0
 msgid "# of Transaction"
-msgstr ""
+msgstr "# Broj transakcija"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_cancel
 msgid "Cancel selected invoices"
-msgstr ""
+msgstr "Otkazi izabrane racune"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -3091,48 +3105,48 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Analiticki Dnevnik"
 
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Entry Label"
-msgstr ""
+msgstr "Stavka"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Reconcilate the entries from payment"
-msgstr ""
+msgstr "Poravnaj stavku sa isplatom"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "("
-msgstr ""
+msgstr "("
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
 #: view:account.subscription:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Postavi u pripremu"
 
 #. module: account
 #: help:account.invoice,origin:0
 #: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
-msgstr ""
+msgstr "Vezna oznaka dokumenta koji je stvorio ovaj račun."
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Payable"
-msgstr ""
+msgstr "Plativo"
 
 #. module: account
 #: rml:account.invoice:0
 #: field:account.invoice.tax,base:0
 msgid "Base"
-msgstr ""
+msgstr "Osnova"
 
 #. module: account
 #: field:account.model,name:0
@@ -3143,35 +3157,35 @@ msgstr ""
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Others"
-msgstr ""
+msgstr "Drugo"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "8"
-msgstr ""
+msgstr "8"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.move:0
 #: wizard_button:account.move.validate,init,validate:0
 msgid "Validate"
-msgstr ""
+msgstr "Ovjeri"
 
 #. module: account
 #: view:account.model:0
 #: field:account.model,legend:0
 msgid "Legend"
-msgstr ""
+msgstr "Legenda"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 msgid "Proposed invoice to be checked, validated and printed"
-msgstr ""
+msgstr "Predložena faktura da bude potvrđena i ispisana"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_select
 msgid "account.move.line.select"
-msgstr ""
+msgstr "selektovani.konto"
 
 #. module: account
 #: view:account.account:0
@@ -3189,12 +3203,12 @@ msgstr ""
 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0
 #: model:ir.model,name:account.model_account_account
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: account
 #: model:account.journal,name:account.bank_journal
 msgid "Journal de Banque CHF"
-msgstr ""
+msgstr "Dnevnik CHF Banke"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3202,7 +3216,7 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "By Date and Period"
-msgstr ""
+msgstr "Po datumu i razdoblju"
 
 #. module: account
 #: view:account.account:0
@@ -3213,14 +3227,14 @@ msgstr ""
 #: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
-msgstr ""
+msgstr "Napomene"
 
 #. module: account
 #: help:account.invoice,reconciled:0
 msgid ""
 "The account moves of the invoice have been reconciled with account moves of "
 "the payment(s)."
-msgstr ""
+msgstr "Stavke knjiženja računa su zatvorene stavkama knjiženja plaćanja."
 
 #. module: account
 #: rml:account.invoice:0
@@ -3230,23 +3244,23 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_tax_form
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr ""
+msgstr "Porezi"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Close Fiscal Year with new entries"
-msgstr ""
+msgstr "Zatvori fiskalnu godinu sa novim stavkama"
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "Average Rate"
-msgstr ""
+msgstr "Prosečna stopa"
 
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Statement encoding produces payment entries"
-msgstr ""
+msgstr "Unos izvoda stvara stavke plaćanja"
 
 #. module: account
 #: field:account.account,code:0
@@ -3265,110 +3279,110 @@ msgstr ""
 #: rml:account.partner.balance:0
 #: field:account.period,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance
 msgid "Financial Management"
-msgstr ""
+msgstr "Finansijski Menadzment"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
-msgstr ""
+msgstr "Nijedan"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Fiscal Year Opening Entries"
-msgstr ""
+msgstr "Generiraj stavke za otvaranje fiskalne godine"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
-msgstr ""
+msgstr "Zatvori stavke"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr ""
+msgstr "(Treba poništiti zatvaranja računa da biste ga otvorili)"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Additionnal Information"
-msgstr ""
+msgstr "Dodatne informacije"
 
 #. module: account
 #: field:account.tax,name:0
 #: field:account.tax.template,name:0
 #: rml:account.vat.declaration:0
 msgid "Tax Name"
-msgstr ""
+msgstr "Naziv Poreza"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close.state,init:0
 msgid " Close states of Fiscal year and periods"
-msgstr ""
+msgstr " Zatvori stanja fiskalne godine i razdoblja"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
 msgid "30 Days End of Month"
-msgstr ""
+msgstr "30 dana kraj mjeseca"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
 msgid "Root Tax Code"
-msgstr ""
+msgstr "Šifra osnovnog poreza"
 
 #. module: account
 #: constraint:account.invoice:0
 msgid "Error: BVR reference is required."
-msgstr ""
+msgstr "Greska: BVR referenca je neohodna."
 
 #. module: account
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr ""
+msgstr "Ne ispisuje se na fakturi"
 
 #. module: account
 #: field:account.move.line,move_id:0
 msgid "Move"
-msgstr ""
+msgstr "Pomeri"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr ""
+msgstr "Izvor poreza"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
 #: model:ir.actions.wizard,name:account.account_analytic_account_balance_report
 msgid "Analytic Balance"
-msgstr ""
+msgstr "Saldo analitike"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "Ukupno duguje"
 
 #. module: account
 #: selection:account.analytic.account,state:0
 msgid "Pending"
-msgstr ""
+msgstr "U toku"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Bank Information"
-msgstr ""
+msgstr "Informacije o Banci"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Fax :"
-msgstr ""
+msgstr "Faks:"
 
 #. module: account
 #: rml:account.partner.balance:0
@@ -3376,13 +3390,13 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_partner_balance_report
 #: model:ir.ui.menu,name:account.menu_partner_balance
 msgid "Partner Balance"
-msgstr ""
+msgstr "Saldo partnera"
 
 #. module: account
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Third Party Ledger"
-msgstr ""
+msgstr "Analitika treće strane"
 
 #. module: account
 #: help:res.partner,property_account_receivable:0
@@ -3401,17 +3415,17 @@ msgstr ""
 #: field:account.tax.template,python_compute:0
 #: selection:account.tax.template,type:0
 msgid "Python Code"
-msgstr ""
+msgstr "Python kod"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr ""
+msgstr "Bankovni izvodi"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partner Accounts"
-msgstr ""
+msgstr "Konta partnera"
 
 #. module: account
 #: help:account.tax.template,tax_group:0
@@ -3419,39 +3433,41 @@ msgid ""
 "If a default tax if given in the partner it only override taxes from account "
 "(or product) of the same group."
 msgstr ""
+"Ako je zadani porez zadan kod partnera onda samo nadjačava poreze računa "
+"(ili proizvoda) iz iste grupe."
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Real Entries"
-msgstr ""
+msgstr "Stvarne stavke"
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import invoice"
-msgstr ""
+msgstr "Uvoz računa"
 
 #. module: account
 #: view:account.invoice:0
 #: view:wizard.company.setup:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Create"
-msgstr ""
+msgstr "Kreiraj"
 
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
 msgid "Create entry"
-msgstr ""
+msgstr "Kreiraj stavku"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_line
 msgid "Invoice line"
-msgstr ""
+msgstr "Red računa"
 
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
 msgid "Shortcut"
-msgstr ""
+msgstr "Prečica"
 
 #. module: account
 #: wizard_view:account.move.validate,init:0
@@ -3459,12 +3475,14 @@ msgid ""
 "All draft account entries in this journal and period will be validated. It "
 "means you won't be able to modify their accouting fields."
 msgstr ""
+"Sve stavke računa koje su u ovom dnevniku i razdoblju će biti potvrđene. To "
+"znači da nećete biti u mogućnosti mijenjati njihova računovodstvena polja."
 
 #. module: account
 #: selection:account.model.line,date:0
 #: selection:account.model.line,date_maturity:0
 msgid "Date of the day"
-msgstr ""
+msgstr "Datum dana"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -3477,7 +3495,7 @@ msgstr ""
 #: field:account.tax,parent_id:0
 #: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
-msgstr ""
+msgstr "Konto nadređenog poreza"
 
 #. module: account
 #: field:account.account,user_type:0
@@ -3486,12 +3504,12 @@ msgstr ""
 #: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
-msgstr ""
+msgstr "Vrsta konta"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank account owner"
-msgstr ""
+msgstr "Vlasnik bankovnog računa"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -3499,34 +3517,34 @@ msgstr ""
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Filter on Periods"
-msgstr ""
+msgstr "Filtar po razdobljima"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr ""
+msgstr "Konto potraživanja"
 
 #. module: account
 #: wizard_button:account.invoice.pay,addendum,reconcile:0
 msgid "Pay and reconcile"
-msgstr ""
+msgstr "Plati i zatvori"
 
 #. module: account
 #: rml:account.central.journal:0
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr ""
+msgstr "Glavni dnevnik"
 
 #. module: account
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance brought forward"
-msgstr ""
+msgstr "Donešeni saldo"
 
 #. module: account
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr ""
+msgstr "Konsolidirana konta"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,fiscalyear:0
@@ -3535,95 +3553,95 @@ msgstr ""
 #: wizard_field:account.partner.balance.report,init,fiscalyear:0
 #: wizard_field:account.third_party_ledger.report,init,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "Fiskalna Godina"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Balance :"
-msgstr ""
+msgstr "Saldo"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
 #: selection:account.general.ledger.report,checktype,display_account:0
 msgid "With balance is not equal to 0"
-msgstr ""
+msgstr "Sa saldom različitim od 0"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "3"
-msgstr ""
+msgstr "3"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
 msgid "Taxes Report"
-msgstr ""
+msgstr "Poreski Izvestaj"
 
 #. module: account
 #: selection:account.journal.period,state:0
 msgid "Printed"
-msgstr ""
+msgstr "Odstampano"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4_new
 msgid "New Supplier Refund"
-msgstr ""
+msgstr "Novi povrat dobavljaču"
 
 #. module: account
 #: view:account.model:0
 msgid "Entry Model"
-msgstr ""
+msgstr "Stavka modela"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,amount_currency:0
 msgid "With Currency"
-msgstr ""
+msgstr "Sa valutom"
 
 #. module: account
 #: view:account.account:0
 msgid "Chart of accounts"
-msgstr ""
+msgstr "Kontni plan"
 
 #. module: account
 #: field:account.subscription.line,subscription_id:0
 msgid "Subscription"
-msgstr ""
+msgstr "Pretplata"
 
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal code"
-msgstr ""
+msgstr "Šifra dnevnika"
 
 #. module: account
 #: wizard_button:account.fiscalyear.close,init,close:0
 #: view:account.model:0
 msgid "Create entries"
-msgstr ""
+msgstr "Kreiraj stavke"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Project line"
-msgstr ""
+msgstr "Red projekta"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,max_amount:0
 msgid "Maximum write-off amount"
-msgstr ""
+msgstr "Maksimalni iznos otpisa"
 
 #. module: account
 #: field:account.invoice.tax,manual:0
 msgid "Manual"
-msgstr ""
+msgstr "Ručno"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Compute Taxes"
-msgstr ""
+msgstr "Izračunaj poreze"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr ""
+msgstr "# Karaktera"
 
 #. module: account
 #: help:res.partner,property_payment_term:0
@@ -3631,17 +3649,18 @@ msgid ""
 "This payment term will be used instead of the default one for the current "
 "partner"
 msgstr ""
+"Ovaj uslov placanje ce biti koristen umesto osnovnog za datog partnera"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
-msgstr ""
+msgstr "Ime stavke"
 
 #. module: account
 #: help:account.invoice,account_id:0
 msgid "The partner account used for this invoice."
-msgstr ""
+msgstr "Konto partnera za ovu fakturu"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -3650,6 +3669,8 @@ msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
 msgstr ""
+"Označite ako ovde ako ne zelite da se ni jedan PDV vezan za ovu poresku "
+"sifru ne pojavi na računima."
 
 #. module: account
 #: field:account.account.type,sequence:0
@@ -3662,43 +3683,43 @@ msgstr ""
 #: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenca"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Mapping"
-msgstr ""
+msgstr "Predlozak za Fiskalno mapiranje"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Entry encoding"
-msgstr ""
+msgstr "Unos stavki"
 
 #. module: account
 #: wizard_view:account.invoice.refund,init:0
 #: model:ir.actions.wizard,name:account.wizard_invoice_refund
 msgid "Credit Note"
-msgstr ""
+msgstr "Knjižno odobrenje"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_fiscalyear
 msgid "Define Fiscal Years and Select Charts of Account"
-msgstr ""
+msgstr "Definisi fiskalne godine i odaberi kontne planove"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,period_id:0
 msgid "Write-Off Period"
-msgstr ""
+msgstr "Period otpisa"
 
 #. module: account
 #: selection:account.config.wizard,period:0
 msgid "3 Months"
-msgstr ""
+msgstr "3 meseca"
 
 #. module: account
 #: wizard_view:account.move.journal,init:0
 msgid "Standard entries"
-msgstr ""
+msgstr "Standardne stavke"
 
 #. module: account
 #: help:account.account,check_history:0
@@ -3706,89 +3727,91 @@ msgid ""
 "Check this box if you want to print all entries when printing the General "
 "Ledger, otherwise it will only print its balance."
 msgstr ""
+"Označite ako želite stampati sve stavke kada ispisujete glavnu knjigu, u "
+"supotnom će ispisati samo njen saldo."
 
 #. module: account
 #: model:ir.model,name:account.model_account_payment_term_line
 msgid "Payment Term Line"
-msgstr ""
+msgstr "Red uslova plaćanja"
 
 #. module: account
 #: selection:account.config.wizard,period:0
 #: field:report.hr.timesheet.invoice.journal,name:0
 msgid "Month"
-msgstr ""
+msgstr "Mesec"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr ""
+msgstr "Pretplata naloga"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
 #: field:account.move.line,date_maturity:0
 #: rml:account.overdue:0
 msgid "Maturity date"
-msgstr ""
+msgstr "Datum dospeća"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr ""
+msgstr "Stavka pretplate"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
 msgid "By date"
-msgstr ""
+msgstr "Po datumu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_config_wizard_form
 msgid "Account Configure Wizard "
-msgstr ""
+msgstr "Čarobnjak za konfiguraciju računovodstva "
 
 #. module: account
 #: field:account.config.wizard,date1:0
 #: field:account.fiscalyear,date_start:0
 #: field:account.subscription,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: account
 #: wizard_view:account.general.ledger.report,account_selection:0
 msgid "Select Chart"
-msgstr ""
+msgstr "Odaberi plan"
 
 #. module: account
 #: selection:account.chart,init,target_move:0
 #: model:ir.actions.report.xml,name:account.account_move_line_list
 msgid "All Entries"
-msgstr ""
+msgstr "Sve Stavke"
 
 #. module: account
 #: model:process.node,name:account.process_node_draftinvoices0
 #: model:process.node,name:account.process_node_supplierdraftinvoices0
 msgid "Draft Invoices"
-msgstr ""
+msgstr "Neodobreni računi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Mapping"
-msgstr ""
+msgstr "Predlozak poreza fiskalnog mapiranja"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Datum računa"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Unreconciled"
-msgstr ""
+msgstr "Otvoren"
 
 #. module: account
 #: field:account.account,note:0
 #: field:account.account.template,note:0
 msgid "Note"
-msgstr ""
+msgstr "Napomena"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -3803,27 +3826,36 @@ msgid ""
 "    Bank statements\n"
 "    "
 msgstr ""
+"Finansijski i racunovodsveni modul koji obuhvata:\n"
+"    Osnovne Obracube\n"
+"    Cene / Analiticko poslovanje\n"
+"    Analitiku TRece strane\n"
+"    Poreski Menadzment\n"
+"    Budzete\n"
+"    Korisnicke i Dobavljacke racune\n"
+"    Izvode Banaka\n"
+"    "
 
 #. module: account
 #: field:account.journal,sequence_id:0
 msgid "Entry Sequence"
-msgstr ""
+msgstr "Redoslijed unosa"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 msgid "Closed"
-msgstr ""
+msgstr "Zatvoren"
 
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 msgid "Payment Entries"
-msgstr ""
+msgstr "Stavke plaćanja"
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or tax code account."
-msgstr ""
+msgstr "Nalog moze biti i sifra osnovnog poreza i poreska sifra naloga."
 
 #. module: account
 #: help:account.automatic.reconcile,init,account_ids:0
@@ -3831,18 +3863,20 @@ msgid ""
 "If no account is specified, the reconciliation will be made using every "
 "accounts that can be reconcilied"
 msgstr ""
+"Ako nije naveden konto, sravnjenje ce koristiti sva konta koja se mogu "
+"uskladiti"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
 #: view:wizard.company.setup:0
 msgid "Overdue Payment Report Message"
-msgstr ""
+msgstr "Poruka o dospecu zakasnelih placanja"
 
 #. module: account
 #: selection:account.tax,tax_group:0
 #: selection:account.tax.template,tax_group:0
 msgid "Other"
-msgstr ""
+msgstr "Drugo"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_general_ledger
@@ -3850,22 +3884,22 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_general_ledger_report
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
-msgstr ""
+msgstr "Glavna knjiga"
 
 #. module: account
 #: field:account.journal.view,columns_id:0
 msgid "Columns"
-msgstr ""
+msgstr "Kolone"
 
 #. module: account
 #: selection:account.general.ledger.report,checktype,sortbydate:0
 msgid "Movement"
-msgstr ""
+msgstr "Knjiženje"
 
 #. module: account
 #: help:account.period,special:0
 msgid "These periods can overlap."
-msgstr ""
+msgstr "Ova razdoblja se mogu preklapati."
 
 #. module: account
 #: help:product.template,property_account_expense:0
@@ -3877,13 +3911,13 @@ msgstr ""
 #. module: account
 #: model:process.node,note:account.process_node_manually0
 msgid "Encode manually the statement"
-msgstr ""
+msgstr "Unesi izvod ručno"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_form
 #: model:ir.ui.menu,name:account.menu_action_account_journal_form
 msgid "Financial Journals"
-msgstr ""
+msgstr "Financijski dnevnici"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3891,27 +3925,27 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "By Period"
-msgstr ""
+msgstr "Po razdoblju"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
 msgid "Keep empty to use the current date"
-msgstr ""
+msgstr "Ostavi prazno za trenutni datum"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "."
-msgstr ""
+msgstr "."
 
 #. module: account
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Quantity"
-msgstr ""
+msgstr "Maximalna kolicina"
 
 #. module: account
 #: field:account.period,name:0
 msgid "Period Name"
-msgstr ""
+msgstr "Naziv Perioda"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -3920,16 +3954,18 @@ msgid ""
 "needs to create analytic entries, Open ERP will look for a matching journal "
 "of the same type."
 msgstr ""
+"Daje tip dnevnika analitike. Kada dokument (npr. faktura) treba da kreira "
+"stavke analitike, Aplikacija će tražiti dnevnik ovog tipa."
 
 #. module: account
 #: field:account.journal,groups_id:0
 msgid "Groups"
-msgstr ""
+msgstr "Grupe"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Code/Date"
-msgstr ""
+msgstr "Šifra/Datum"
 
 #. module: account
 #: field:account.account,active:0
@@ -3940,53 +3976,53 @@ msgstr ""
 #: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Import from your bank statements"
-msgstr ""
+msgstr "Uvoz iz bankovnih izvoda"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Properties"
-msgstr ""
+msgstr "Својства"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Accounting Properties"
-msgstr ""
+msgstr "Računovodstvo"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Select entries"
-msgstr ""
+msgstr "Odaberite stavke"
 
 #. module: account
 #: selection:account.chart,init,target_move:0
 msgid "All Posted Entries"
-msgstr ""
+msgstr "Sve proknjižene stavke"
 
 #. module: account
 #: wizard_field:account.vat.declaration,init,based_on:0
 msgid "Base on"
-msgstr ""
+msgstr "Osnovica na"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Cash Payment"
-msgstr ""
+msgstr "Gotovinsko plaćanje"
 
 #. module: account
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr ""
+msgstr "Konto obveza"
 
 #. module: account
 #: field:account.account,currency_id:0
 #: field:account.account.template,currency_id:0
 msgid "Secondary Currency"
-msgstr ""
+msgstr "Sekundarna valuta"
 
 #. module: account
 #: field:account.account,credit:0
@@ -4006,7 +4042,7 @@ msgstr ""
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,cost:0
 msgid "Credit"
-msgstr ""
+msgstr "Kredit"
 
 #. module: account
 #: help:account.tax.template,child_depend:0
@@ -4014,49 +4050,51 @@ msgid ""
 "Indicate if the tax computation is based on the value computed for the "
 "computation of child taxes or based on the total amount."
 msgstr ""
+"Pokazuje da li je izračun poreza zasnovan na vrijednosti izračunatoj za "
+"obračun podređenih poreza ili zasnovana na ukupnoj vrijednosti."
 
 #. module: account
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr ""
+msgstr "Konto povrata poreza"
 
 #. module: account
 #: field:account.tax.code,child_ids:0
 #: field:account.tax.code.template,child_ids:0
 msgid "Child Codes"
-msgstr ""
+msgstr "Podredjene Sifre"
 
 #. module: account
 #: field:account.invoice,move_name:0
 msgid "Account Move"
-msgstr ""
+msgstr "Knjiženje"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Redovi izvoda"
 
 #. module: account
 #: field:account.move.line,amount_taxed:0
 msgid "Taxed Amount"
-msgstr ""
+msgstr "Iznos s porezom"
 
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
 msgid "Subtotal w/o tax"
-msgstr ""
+msgstr "Subtotal bez poreza"
 
 #. module: account
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Ref"
-msgstr ""
+msgstr "Referenca fakture"
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Konto glavne knjige"
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -4064,11 +4102,14 @@ msgid ""
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very usefull for some reports."
 msgstr ""
+"Opcionalna kolicina prikazana ovom linijom. Npr. broj prodatih proizvoda. "
+"Velicina kao pojam NIJE zakonska obaveza ali je jako korisna za neke "
+"izvestaje."
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,reconcil:0
 msgid "       Include Reconciled Entries"
-msgstr ""
+msgstr "       Uključi zatvorene stavke"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -4076,17 +4117,18 @@ msgid ""
 "You can check this box to mark the entry line as a litigation with the "
 "associated partner"
 msgstr ""
+"Možete označiti ovo polje da biste označili redak kao tužbu pred sudom"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Računi kupca"
 
 #. module: account
 #: field:res.partner,debit_limit:0
 msgid "Payable Limit"
-msgstr ""
+msgstr "Limit plaćanja (duga)"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,state:0
@@ -4094,7 +4136,7 @@ msgstr ""
 #: wizard_field:account.partner.balance.report,init,state:0
 #: wizard_field:account.third_party_ledger.report,init,state:0
 msgid "Date/Period Filter"
-msgstr ""
+msgstr "Datum/Razdoblje filtar"
 
 #. module: account
 #: rml:account.analytic.account.journal:0
@@ -4102,28 +4144,28 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: selection:account.journal,type:0
 msgid "General"
-msgstr ""
+msgstr "Opšte"
 
 #. module: account
 #: rml:account.general.journal:0
 msgid "Credit Trans."
-msgstr ""
+msgstr "Dugovna transakcija"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr ""
+msgstr "Odvojene sekvence dnevnika"
 
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_currency:0
 msgid "The currency of the journal"
-msgstr ""
+msgstr "Valuta Dnevnika"
 
 #. module: account
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr ""
+msgstr "Kolona Dnevnika"
 
 #. module: account
 #: selection:account.fiscalyear,state:0
@@ -4132,7 +4174,7 @@ msgstr ""
 #: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gotovo"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,periods:0
@@ -4147,7 +4189,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
 msgid "Periods"
-msgstr ""
+msgstr "Razdoblja"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4156,7 +4198,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Račun"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -4164,30 +4206,31 @@ msgstr ""
 #: wizard_button:account.open_closed_fiscalyear,init,open:0
 #: wizard_button:account_use_models,create,open_move:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_29
 msgid "Search Entries"
-msgstr ""
+msgstr "Pretrazi stavke"
 
 #. module: account
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-msgstr ""
+msgstr "Analitički troškovi za refakturiranje nabave, timesheet-ovi,..."
 
 #. module: account
 #: field:account.account,tax_ids:0
 #: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
-msgstr ""
+msgstr "Osnovni porezi"
 
 #. module: account
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
 
 #. module: account
 #: help:account.account.type,sign:0
@@ -4196,11 +4239,14 @@ msgid ""
 "reports, so that you can see positive figures instead of negative ones in "
 "expenses accounts."
 msgstr ""
+"Omogucava vam da promenite predznak sume koja ce se prikazivati na "
+"izvestajuma, tako da mopzete da vidite pozitivne stavke umesto onih "
+"negativnih na troskovnim nalozima."
 
 #. module: account
 #: help:account.config.wizard,code:0
 msgid "Name of the fiscal year as displayed in reports."
-msgstr ""
+msgstr "Naziv fiskalne godine koji se prikazuje u izveštajima."
 
 #. module: account
 #: help:account.move.line,date_maturity:0
@@ -4208,26 +4254,28 @@ msgid ""
 "This field is used for payable and receivable entries. You can put the limit "
 "date for the payment of this entry line."
 msgstr ""
+"Ovo polje se koristi za unose dugovanja i potraživanja. Možete staviti datum "
+"dospeća za plaćanje ovog reda."
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid "Third party (Country)"
-msgstr ""
+msgstr "Treća strana (Država)"
 
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr ""
+msgstr "Roditelj lijevo"
 
 #. module: account
 #: help:account.journal,sequence_id:0
 msgid "The sequence gives the display order for a list of journals"
-msgstr ""
+msgstr "Sekvenca definise poredak u listi dnevnika."
 
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
-msgstr ""
+msgstr "Tip Kontrola"
 
 #. module: account
 #: field:account.analytic.account,name:0
@@ -4235,159 +4283,159 @@ msgstr ""
 #: rml:account.analytic.account.balance:0
 #: rml:account.central.journal:0
 msgid "Account Name"
-msgstr ""
+msgstr "Naziv računa"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,date:0
 msgid "Payment date"
-msgstr ""
+msgstr "Datum Isplate"
 
 #. module: account
 #: wizard_button:account_use_models,create,end:0
 msgid "Ok"
-msgstr ""
+msgstr "U redu"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Porezi:"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree7
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree7
 msgid "Unpaid Customer Invoices"
-msgstr ""
+msgstr "Neplaćeni računi kupca"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2
 msgid "Supplier Invoices"
-msgstr ""
+msgstr "Računi dobavljača"
 
 #. module: account
 #: field:account.analytic.line,product_id:0
 #: field:account.invoice.line,product_id:0
 #: field:account.move.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: account
 #: rml:account.tax.code.entries:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: account
 #: field:res.partner,credit:0
 msgid "Total Receivable"
-msgstr ""
+msgstr "Ukupno potraživanja"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period
 msgid "Account period"
-msgstr ""
+msgstr "Fiskalno razdoblje"
 
 #. module: account
 #: wizard_field:account.invoice.pay,init,journal_id:0
 msgid "Journal/Payment Mode"
-msgstr ""
+msgstr "Mod Dnevnik/Isplate"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Canceled Invoice"
-msgstr ""
+msgstr "Poništen račun"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Remove Lines"
-msgstr ""
+msgstr "Ukloni redove"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,soldeinit:0
 #: wizard_field:account.partner.balance.report,init,soldeinit:0
 #: wizard_field:account.third_party_ledger.report,init,soldeinit:0
 msgid "Include initial balances"
-msgstr ""
+msgstr "Uključi početna salda"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Account Template"
-msgstr ""
+msgstr "Predložak konta"
 
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
-msgstr ""
+msgstr "Godišnja suma"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import file from your bank statement"
-msgstr ""
+msgstr "Uvezi datoteku bankovnog izvoda"
 
 #. module: account
 #: field:account.account,type:0
 #: field:account.account.template,type:0
 msgid "Internal Type"
-msgstr ""
+msgstr "Interni Tip"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "9"
-msgstr ""
+msgstr "9"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
 #: model:ir.ui.menu,name:account.menu_action_subscription_form_running
 msgid "Running Subscriptions"
-msgstr ""
+msgstr "Tekuca Pretplata"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Bank Payment"
-msgstr ""
+msgstr "Bankovno plaćanje"
 
 #. module: account
 #: selection:account.move,state:0
 msgid "Posted"
-msgstr ""
+msgstr "Proknjiženo"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr ""
+msgstr "Knjižna odobrenja"
 
 #. module: account
 #: field:account.config.wizard,date2:0
 #: field:account.fiscalyear,date_stop:0
 msgid "End Date"
-msgstr ""
+msgstr "Završni Datum"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_open_closed_fy
 msgid "Cancel Opening Entries"
-msgstr ""
+msgstr "Otkazi otvaranje stavki"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manually statement"
-msgstr ""
+msgstr "Ručni izvod"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
 msgid "Day of the Month"
-msgstr ""
+msgstr "Dan u mesecu"
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
 #: field:account.tax.code,line_ids:0
 msgid "Lines"
-msgstr ""
+msgstr "redova"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Dear Sir/Madam,"
-msgstr ""
+msgstr "Dragi Gdine/Gdjo/Gdjice"
 
 #. module: account
 #: help:account.tax,sequence:0
@@ -4401,47 +4449,47 @@ msgstr ""
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Declaration"
-msgstr ""
+msgstr "Prijava poreza"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "File statement"
-msgstr ""
+msgstr "Datoteka izvoda"
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequences"
-msgstr ""
+msgstr "Sekvence Fiskalne Godine"
 
 #. module: account
 #: view:account.model.line:0
 msgid "Entry Model Line"
-msgstr ""
+msgstr "Unos reda modela"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Account Tax Template"
-msgstr ""
+msgstr "Predlošci poreza"
 
 #. module: account
 #: help:account.model,name:0
 msgid "This is a model for recurring accounting entries"
-msgstr ""
+msgstr "Ovo je model za ponavljajuće računovodstvene unose"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "otvoreni računi"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
 msgid "Set starting and ending balance for control"
-msgstr ""
+msgstr "Postavi početni i krajnji saldo za kontrolu"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
 msgid "Are you sure you want to open this invoice ?"
-msgstr ""
+msgstr "Sigurno želite da otvorite ovaj račun?"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
@@ -4451,12 +4499,12 @@ msgstr ""
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
-msgstr ""
+msgstr "Dugovanje dobavljaču"
 
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries"
-msgstr ""
+msgstr "Opcione kolicine u stavkama"
 
 #. module: account
 #: rml:account.third_party_ledger:0
@@ -4468,34 +4516,34 @@ msgstr ""
 #: view:account.fiscalyear:0
 #: view:account.period:0
 msgid "States"
-msgstr ""
+msgstr "Stanja"
 
 #. module: account
 #: view:account.move:0
 #: model:process.node,name:account.process_node_accountingentries0
 #: model:process.node,name:account.process_node_supplieraccountingentries0
 msgid "Accounting Entries"
-msgstr ""
+msgstr "Računovodstveni unosi"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
 msgid "Receivables & Payables"
-msgstr ""
+msgstr "Potraživanja & dugovanja"
 
 #. module: account
 #: rml:account.general.ledger:0
 msgid "General Ledger -"
-msgstr ""
+msgstr "Glavna knjiga -"
 
 #. module: account
 #: field:report.hr.timesheet.invoice.journal,quantity:0
 msgid "Quantities"
-msgstr ""
+msgstr "Količine"
 
 #. module: account
 #: field:account.analytic.account,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Početni datum"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -4505,31 +4553,31 @@ msgstr ""
 #: field:account.invoice,amount_total:0
 #: field:account.invoice,check_total:0
 msgid "Total"
-msgstr ""
+msgstr "Ukupno"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Number of entries are generated"
-msgstr ""
+msgstr "Broj generiranih stavki"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Valid Entries"
-msgstr ""
+msgstr "Potvrđene stavke"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_use_model
 #: model:ir.actions.wizard,name:account.wizard_line_account_use_model
 #: model:ir.ui.menu,name:account.menu_account_use_model
 msgid "Create Entries From Models"
-msgstr ""
+msgstr "Kreiraj stavke iz modela"
 
 #. module: account
 #: field:account.account.template,reconcile:0
 msgid "Allow Reconciliation"
-msgstr ""
+msgstr "Dozvoli zatvaranje"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -4537,33 +4585,33 @@ msgstr ""
 #: selection:account.partner.balance.report,init,state:0
 #: selection:account.third_party_ledger.report,init,state:0
 msgid "By Date"
-msgstr ""
+msgstr "Po datumu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr ""
+msgstr "Povrat dobavljaču"
 
 #. module: account
 #: help:account.model.line,date:0
 msgid "The date of the generated entries"
-msgstr ""
+msgstr "Datum generisanih stavki"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,modify_invoice:0
 msgid "Modify Invoice"
-msgstr ""
+msgstr "Izmjeni fakturu"
 
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Accounting Properties"
-msgstr ""
+msgstr "Svojstva naloga dobavljača"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr ""
+msgstr "Statistike analitičkog računa"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4571,46 +4619,48 @@ msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
 msgstr ""
+"Ovo će automatski podesiti vaš kontni plan, bankovne račune, poreze i "
+"dnevnike u skladu sa odabranim predloškom"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement.line,statement_id:0
 #: field:account.move.line,statement_id:0
 msgid "Statement"
-msgstr ""
+msgstr "Izvod"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
 #: model:ir.ui.menu,name:account.menu_encode_entries_by_move
 msgid "Entries Encoding by Move"
-msgstr ""
+msgstr "Unos stavki po osnovicama"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Analytic Account Charts"
-msgstr ""
+msgstr "Analitički kontni planovi"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,result_selection:0
 msgid "Filter on Partners"
-msgstr ""
+msgstr "Filtriraj po partnerima"
 
 #. module: account
 #: field:account.tax,price_include:0
 msgid "Tax Included in Price"
-msgstr ""
+msgstr "Porez je uključen u cenu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Entries by Journal"
-msgstr ""
+msgstr "Stavke analitike po dnevniku"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Valid entries from invoice"
-msgstr ""
+msgstr "Potvrđene stavke iz računa"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -4630,17 +4680,17 @@ msgstr ""
 #: field:wizard.company.setup,company_id:0
 #: field:wizard.multi.charts.accounts,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Preduzeće"
 
 #. module: account
 #: rml:account.general.ledger:0
 msgid "Crebit"
-msgstr ""
+msgstr "Potražuje"
 
 #. module: account
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr ""
+msgstr "Pokrenut"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -4648,75 +4698,77 @@ msgid ""
 "Indicate if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
+"Pokazuje da li iznos poreza mora biti uključen u osnovicu za izračun "
+"sledećih poreza"
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr ""
+msgstr "Izvod u pripremi"
 
 #. module: account
 #: field:account.analytic.journal,name:0
 msgid "Journal name"
-msgstr ""
+msgstr "naziv dnevnika"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid "Import invoice from statement"
-msgstr ""
+msgstr "Uvezi fakturu iz izvoda"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
 #: view:ir.sequence:0
 #: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
 msgid "Fiscal Years"
-msgstr ""
+msgstr "Fiskalne godine"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Import from invoices or payments"
-msgstr ""
+msgstr "Uvezi iz računa ili plaćanja"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_reconcile_select
 #: model:ir.ui.menu,name:account.menu_reconcile_select
 msgid "Reconcile entries"
-msgstr ""
+msgstr "Zatvori stavke"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Change"
-msgstr ""
+msgstr "Izmeni"
 
 #. module: account
 #: field:account.journal.period,icon:0
 msgid "Icon"
-msgstr ""
+msgstr "Ikona"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal - Period"
-msgstr ""
+msgstr "Dnevnik - Razdoblje"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,credit:0
 #: wizard_field:account.move.line.reconcile,init_partial,credit:0
 msgid "Credit amount"
-msgstr ""
+msgstr "Potražni iznos"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create Monthly Periods"
-msgstr ""
+msgstr "Kreiraj mesečna razdoblja"
 
 #. module: account
 #: wizard_button:account.aged.trial.balance,init,print:0
 msgid "Print Aged Trial Balance"
-msgstr ""
+msgstr "Stampaj bilans"
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -4726,17 +4778,17 @@ msgstr ""
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Ref."
-msgstr ""
+msgstr "Ref."
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Adresa računa"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "General Credit"
-msgstr ""
+msgstr "Opste potraživanje"
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -4745,67 +4797,70 @@ msgid ""
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
 msgstr ""
+"Overite ovde da bi ste definisali da svaka stavka ovog dnevnika nece "
+"kreirati novi brojac ali ce ga deliti sa postojecim. Ovo se koristi pri "
+"zatvaranju fiskalne godine"
 
 #. module: account
 #: selection:account.invoice,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отказано"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr ""
+msgstr "Nepotvrđeni izvodi"
 
 #. module: account
 #: wizard_field:populate_statement_from_inv,init,date:0
 msgid "Date payment"
-msgstr ""
+msgstr "Datum plaćanja"
 
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "A/c No."
-msgstr ""
+msgstr "Račun br."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
 #: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month
 msgid "Account cost and revenue by journal (This Month)"
-msgstr ""
+msgstr "Trošak i prihod konta po dnevniku (ovaj mesec)"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
 #: selection:account.third_party_ledger.report,init,result_selection:0
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "Konta potraživanja"
 
 #. module: account
 #: wizard_button:account.move.line.unreconcile.select,init,open:0
 msgid "Open for unreconciliation"
-msgstr ""
+msgstr "Otvori za poništenje zatvaranja"
 
 #. module: account
 #: field:account.bank.statement.reconcile,statement_line:0
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Red bankovnog izvoda"
 
 #. module: account
 #: wizard_button:account.automatic.reconcile,reconcile,end:0
 msgid "OK"
-msgstr ""
+msgstr "U redu"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierinvoiceinvoice0
 msgid "Control Invoice"
-msgstr ""
+msgstr "Kontrolisi račun"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable"
-msgstr ""
+msgstr "Potraživanja"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
@@ -4813,18 +4868,18 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_balance_report
 #: model:ir.ui.menu,name:account.menu_account_balance_report
 msgid "Account Balance"
-msgstr ""
+msgstr "Saldo konta"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_analytic_check
 #: model:ir.actions.wizard,name:account.account_analytic_account_analytic_check_report
 msgid "Analytic Check"
-msgstr ""
+msgstr "Analitička provjera"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "VAT:"
-msgstr ""
+msgstr "PDV:"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -4833,45 +4888,45 @@ msgstr ""
 #: rml:account.general.journal:0
 #: rml:account.invoice:0
 msgid "Total:"
-msgstr ""
+msgstr "Ukupno:"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "account.analytic.journal"
-msgstr ""
+msgstr "dnevnik.analitike.konta"
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
-msgstr ""
+msgstr "Mapiranje konta"
 
 #. module: account
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr ""
+msgstr "Porezi prodaje"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr ""
+msgstr "Zatvaranje konta"
 
 #. module: account
 #: view:account.bank.statement:0
 #: selection:account.bank.statement,state:0
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdi"
 
 #. module: account
 #: wizard_view:account.account.balance.report,account_selection:0
 msgid "Select parent account"
-msgstr ""
+msgstr "Odaberite nadređeni konto"
 
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
-msgstr ""
+msgstr "Predložak nadređenog konta"
 
 #. module: account
 #: help:account.tax,domain:0
@@ -4880,28 +4935,30 @@ msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
 msgstr ""
+"Ovo polje se upotrebljava samo ako razvijate vlastiti modul i dozvoljava "
+"programerima da stvaraju posebne poreze u vlastitom domenu."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_amount:0
 #: field:account.bank.statement.reconcile,total_second_amount:0
 msgid "Payment amount"
-msgstr ""
+msgstr "Iznos plaćanja"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Analitički konto"
 
 #. module: account
 #: rml:account.invoice:0
 #: selection:account.invoice,type:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Račun dobavljača"
 
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Valid"
-msgstr ""
+msgstr "Potvrđeno"
 
 #. module: account
 #: field:account.account,debit:0
@@ -4922,164 +4979,164 @@ msgstr ""
 #: rml:account.vat.declaration:0
 #: field:report.hr.timesheet.invoice.journal,revenue:0
 msgid "Debit"
-msgstr ""
+msgstr "Duguje"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_42
 msgid "All Months"
-msgstr ""
+msgstr "Svi meseci"
 
 #. module: account
 #: wizard_field:account.invoice.refund,init,date:0
 msgid "Operation date"
-msgstr ""
+msgstr "Datum postupka"
 
 #. module: account
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Stavke računa"
 
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr ""
+msgstr "Početak perioda"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,report_name:0
 msgid "Name of new entries"
-msgstr ""
+msgstr "Naziv novih stavki"
 
 #. module: account
 #: wizard_button:account_use_models,init_form,create:0
 msgid "Create Entries"
-msgstr ""
+msgstr "Kreiraj stavke"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr ""
+msgstr "Šifra poreza povrata"
 
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr ""
+msgstr "Opis poreza"
 
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated account moves."
-msgstr ""
+msgstr "Veza na automatski generirane osnovice"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr ""
+msgstr "Zatvorene transakcije"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Izveštavanje"
 
 #. module: account
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "/"
-msgstr ""
+msgstr "/"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Have a number and entries are generated"
-msgstr ""
+msgstr "Neka se brojevi i stavke generiraju"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Check -"
-msgstr ""
+msgstr "Analitička provera -"
 
 #. module: account
 #: rml:account.account.balance:0
 msgid "Account Balance -"
-msgstr ""
+msgstr "Saldo konta -"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group invoice lines"
-msgstr ""
+msgstr "Grupiraj stavke računa"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Podešavanje"
 
 #. module: account
 #: view:account.analytic.line:0
 #: view:account.invoice:0
 msgid "Total amount"
-msgstr ""
+msgstr "Ukupan iznos"
 
 #. module: account
 #: view:account.journal:0
 msgid "Account Journal"
-msgstr ""
+msgstr "Dnevnik konta"
 
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr ""
+msgstr "Redovi Pretplate"
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
 msgid "Income Account on Product Template"
-msgstr ""
+msgstr "Račun prihoda na predlošku proizvoda"
 
 #. module: account
 #: help:account.account,currency_id:0
 #: help:account.account.template,currency_id:0
 msgid "Force all moves for this account to have this secondary currency."
-msgstr ""
+msgstr "Sva knjiženja ovog konta koriste ovu sekundarnu valutu."
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,go,end:0
 #: wizard_button:populate_statement_from_inv,init,end:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Odustani"
 
 #. module: account
 #: wizard_view:account.general.ledger.report,checktype:0
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Select Date-Period"
-msgstr ""
+msgstr "Odaberite datum-razdoblje"
 
 #. module: account
 #: rml:account.analytic.account.inverted.balance:0
 msgid "Inverted Analytic Balance -"
-msgstr ""
+msgstr "Obrnuti saldo analitike -"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
 #: model:process.node,name:account.process_node_supplierpaidinvoice0
 msgid "Paid invoice"
-msgstr ""
+msgstr "Plaćeni račun"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Definition"
-msgstr ""
+msgstr "Definicija poreza"
 
 #. module: account
 #: field:account.tax,tax_group:0
 #: field:account.tax.template,tax_group:0
 msgid "Tax Group"
-msgstr ""
+msgstr "Porezka grupa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3_new
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
 msgid "New Customer Refund"
-msgstr ""
+msgstr "Novi povrat kupca"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -5087,55 +5144,57 @@ msgid ""
 "Check this box if you want to use a different sequence for each created "
 "journal. Otherwise, all will use the same sequence."
 msgstr ""
+"Označite ako želite upotrebiti drugu sekvencu za svaki stvoreni dnevnik. U "
+"suprotnom sve će se upotrebljavati ista sekvenca."
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
 msgid "Import invoices"
-msgstr ""
+msgstr "Uvezi račune"
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
 #: wizard_view:account.move.line.unreconcile.select,init:0
 #: wizard_view:account.reconcile.unreconcile,init:0
 msgid "Unreconciliation"
-msgstr ""
+msgstr "Poništavanje zatvaranja"
 
 #. module: account
 #: model:ir.model,name:account.model_fiscalyear_seq
 msgid "Maintains Invoice sequences with Fiscal Year"
-msgstr ""
+msgstr "Održava sekvencu osnovice sa fiskalnom godinom"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
 #: selection:account.general.ledger.report,checktype,display_account:0
 msgid "With movements"
-msgstr ""
+msgstr "Sa prijenosima"
 
 #. module: account
 #: field:account.tax,domain:0
 #: field:account.tax.template,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Домен"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Account Data"
-msgstr ""
+msgstr "Podatci analitičkog konta"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr ""
+msgstr "Predložak šifre poreza"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Subscription Periods"
-msgstr "Periodi upisivanja"
+msgstr "Pretplatnička razdoblja"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
 msgid "Manually"
-msgstr ""
+msgstr "Ručno"
 
 #. module: account
 #: view:account.invoice:0
@@ -5148,60 +5207,60 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_finance_invoice
 #: wizard_field:populate_statement_from_inv,go,lines:0
 msgid "Invoices"
-msgstr ""
+msgstr "Računi"
 
 #. module: account
 #: selection:account.partner.balance.report,init,result_selection:0
 #: selection:account.third_party_ledger.report,init,result_selection:0
 msgid "Payable Accounts"
-msgstr ""
+msgstr "Konta obveza"
 
 #. module: account
 #: view:account.invoice.line:0
 #: field:account.invoice.tax,invoice_id:0
 msgid "Invoice Line"
-msgstr ""
+msgstr "Red računa"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0
 msgid "Write-Off journal"
-msgstr ""
+msgstr "Dnevnik otpisa"
 
 #. module: account
 #: wizard_button:account.invoice.pay,init,writeoff_check:0
 msgid "Full Payment"
-msgstr ""
+msgstr "Plaćanje u celini"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Purchase"
-msgstr ""
+msgstr "Dnevnik nabavke"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Cash Receipt"
-msgstr ""
+msgstr "Prijem novca"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr ""
+msgstr "Promenljiv porez"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "Encode manually statement comes into the draft statement"
-msgstr ""
+msgstr "Ručno unesen izvod ide u pripremu"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
 msgid "This Month"
-msgstr ""
+msgstr "Ovog meseca"
 
 #. module: account
 #: field:account.account.type,sign:0
 msgid "Sign on Reports"
-msgstr ""
+msgstr "Predznak na izveštajima"
 
 #. module: account
 #: help:account.move.line,currency_id:0
@@ -5213,32 +5272,32 @@ msgstr ""
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
-msgstr ""
+msgstr "Isplate"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Accounting entries at statement's confirmation"
-msgstr ""
+msgstr "Knjiženja prilikom potvrde izvoda"
 
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Use Model"
-msgstr ""
+msgstr "Koristi Model"
 
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,end:0
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move
 msgid "All account entries"
-msgstr ""
+msgstr "Sve stavke naloga"
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
 msgid "The tax basis of the tax declaration."
-msgstr ""
+msgstr "Porez se bazira na dekleraciji istog"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -5246,12 +5305,12 @@ msgstr ""
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Date Filter"
-msgstr ""
+msgstr "Filter po datumu"
 
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Choose Journal and Payment Date"
-msgstr ""
+msgstr "Odaberite dnevnik i datum plaćanja"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5264,65 +5323,65 @@ msgstr ""
 #: selection:account.period,state:0
 #: selection:account.subscription,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Priprema"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Paid"
-msgstr ""
+msgstr "Plaćeno"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree11
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree11
 msgid "Unpaid Customer Refunds"
-msgstr ""
+msgstr "Neplaćeni povrati kupca"
 
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr ""
+msgstr "Preostali iznos Duga"
 
 #. module: account
 #: wizard_view:account.period.close,init:0
 msgid "Are you sure ?"
-msgstr ""
+msgstr "Jeste li sigurni?"
 
 #. module: account
 #: rml:account.invoice:0
 #: view:account.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "Predračun"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr ""
+msgstr "Redovi delimičnog unosa"
 
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr ""
+msgstr "Bankovni izvod korišten za bankovno poravnanje"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Fiscalyear"
-msgstr ""
+msgstr "FiskalnaGodina"
 
 #. module: account
 #: wizard_button:account.analytic.line,init,open:0
 msgid "Open Entries"
-msgstr ""
+msgstr "Otvori stavke"
 
 #. module: account
 #: selection:account.analytic.account,type:0
 #: selection:account.move.line,centralisation:0
 msgid "Normal"
-msgstr ""
+msgstr "Normalan"
 
 #. module: account
 #: model:process.process,name:account.process_process_supplierinvoiceprocess0
 msgid "Supplier Invoice Process"
-msgstr ""
+msgstr "Proces računa dobavljača"
 
 #. module: account
 #: rml:account.account.balance:0
@@ -5336,40 +5395,40 @@ msgstr ""
 #: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "Page"
-msgstr ""
+msgstr "Strana"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Optional Information"
-msgstr ""
+msgstr "Opcione informacije"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr ""
+msgstr "Uslovi plaćanja"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,result_selection:0
 msgid "Receivable and Payable"
-msgstr ""
+msgstr "Potraživanja i obveze"
 
 #. module: account
 #: rml:account.account.balance:0
 #: rml:account.general.journal:0
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #. module: account
 #: field:account.bank.statement.line,reconcile_amount:0
 msgid "Amount reconciled"
-msgstr ""
+msgstr "Zatvoreni iznos"
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "At Date"
-msgstr ""
+msgstr "Na Datum"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -5384,34 +5443,34 @@ msgstr ""
 #: view:account.bank.statement.reconcile:0
 #: view:account.subscription:0
 msgid "Compute"
-msgstr ""
+msgstr "Izracunaj"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
-msgstr ""
+msgstr "Konto prihoda ili troškova vezan za odabrani proizvod."
 
 #. module: account
 #: field:account.tax,type_tax_use:0
 msgid "Tax Application"
-msgstr ""
+msgstr "Poreska Aplikacija"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Subscription Entries"
-msgstr ""
+msgstr "Stavke pretplate"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree6
 msgid "PRO-FORMA Customer Invoices"
-msgstr ""
+msgstr "Predračuni kupcu"
 
 #. module: account
 #: field:account.subscription,period_total:0
 msgid "Number of Periods"
-msgstr ""
+msgstr "Broj perioda"
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
@@ -5422,19 +5481,19 @@ msgstr ""
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date2:0
 #: wizard_field:account.automatic.reconcile,init,date2:0
 msgid "End of period"
-msgstr ""
+msgstr "Završetak perioda"
 
 #. module: account
 #: view:account.move:0
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr ""
+msgstr "Sadrzaj Naloga"
 
 #. module: account
 #: rml:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr ""
+msgstr "Glavna Knjiga"
 
 #. module: account
 #: field:account.account,balance:0
@@ -5454,33 +5513,33 @@ msgstr ""
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: account
 #: rml:account.invoice:0
 msgid "Refund"
-msgstr ""
+msgstr "Povrat novca"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
 msgid "Invoice Tax"
-msgstr ""
+msgstr "Porezi računa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journal Definition"
-msgstr ""
+msgstr "Definicija analitičkog dnevnika"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
-msgstr ""
+msgstr "predlozak.poreske.taxe"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Bankovni računi"
 
 #. module: account
 #: constraint:account.period:0
@@ -5488,11 +5547,13 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
+"Neispravna razdoblja. Neka se razdoblja preklapaju, ili se datum razdoblja "
+"ne poklapa sa fiskalnom godinom. "
 
 #. module: account
 #: help:account.journal,invoice_sequence_id:0
 msgid "The sequence used for invoice numbers in this journal."
-msgstr ""
+msgstr "Sekvenca koriscena za broj racuna u ovom Dnevniku"
 
 #. module: account
 #: view:account.account:0
@@ -5501,7 +5562,7 @@ msgstr ""
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "General Information"
-msgstr ""
+msgstr "Opšte informacije"
 
 #. module: account
 #: help:populate_statement_from_inv,init,journal_id:0
@@ -5510,96 +5571,99 @@ msgid ""
 "filtering the invoices. If you left this field empty, it will search on all "
 "sale, purchase and cash journals."
 msgstr ""
+"Ovo polje vam omogucava da izaberete kontne dnevnike za pretragu racuna. Ako "
+"ovo polje ostavite praznim, pretrazivanje ce se obaviti po svim prodajnim, "
+"kupovnim i gotovinskim Dnevnicima."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error ! The duration of the Fiscal Year is invalid. "
-msgstr ""
+msgstr "Greška! Trajanje fiskalne godine je neispravno. "
 
 #. module: account
 #: selection:account.analytic.account,state:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr ""
+msgstr "Prenosi"
 
 #. module: account
 #: selection:account.invoice,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "Predračun"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_form
 #: model:ir.ui.menu,name:account.menu_action_account_form
 msgid "List of Accounts"
-msgstr ""
+msgstr "Lista konta"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Sales Properties"
-msgstr ""
+msgstr "Karakteristike prodaje"
 
 #. module: account
 #: rml:account.general.journal:0
 msgid "Printing Date :"
-msgstr ""
+msgstr "Datum Stampe :"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
 #: model:ir.actions.wizard,name:account.account_analytic_account_quantity_cost_ledger_report
 msgid "Cost Ledger (Only quantities)"
-msgstr ""
+msgstr "Knjiga troškova (Samo količine)"
 
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Validate Account Entries"
-msgstr ""
+msgstr "Potvrdi stavke"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
 msgid "Reference Number"
-msgstr ""
+msgstr "Referentni Broj"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Total amount due:"
-msgstr ""
+msgstr "Ukupni iznos duga:"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,to_date:0
 #: wizard_field:account.analytic.line,init,to_date:0
 msgid "To"
-msgstr ""
+msgstr "Do"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 msgid "Entries of Open Analytic Journals"
-msgstr ""
+msgstr "Stavke otvorenih dnevnika analitike"
 
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Manual Invoice Taxes"
-msgstr ""
+msgstr "Ručni porezi računa"
 
 #. module: account
 #: field:account.model.line,date:0
 msgid "Current Date"
-msgstr ""
+msgstr "Današnji datum"
 
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Sale"
-msgstr ""
+msgstr "Dnevnik prodaje"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,fy_id:0
 #: wizard_field:account.fiscalyear.close.state,init,fy_id:0
 msgid "Fiscal Year to close"
-msgstr ""
+msgstr "Fiskalna godina za zatvaranje"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
@@ -5611,22 +5675,22 @@ msgstr ""
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date1:0
 #: wizard_field:account.automatic.reconcile,init,date1:0
 msgid "Start of period"
-msgstr ""
+msgstr "Početak razdoblja"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
 msgid "Templates"
-msgstr ""
+msgstr "Šabloni"
 
 #. module: account
 #: wizard_button:account.vat.declaration,init,report:0
 msgid "Print VAT Decl."
-msgstr ""
+msgstr "Stampa PDV obrasca"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_intracom
 msgid "IntraCom"
-msgstr ""
+msgstr "IntraCom"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -5642,7 +5706,7 @@ msgstr ""
 #: field:account.tax.code,info:0
 #: field:account.tax.code.template,info:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: account
 #: help:product.template,property_account_income:0
@@ -5650,31 +5714,32 @@ msgid ""
 "This account will be used instead of the default one to value incoming stock "
 "for the current product"
 msgstr ""
+"Ovaj nalog ce se korietiti umesto osnovnog da doda stanje za dati proizvod"
 
 #. module: account
 #: field:account.tax,child_ids:0
 msgid "Child Tax Accounts"
-msgstr ""
+msgstr "Podredjeni Poreski nalozi"
 
 #. module: account
 #: field:account.account,parent_right:0
 msgid "Parent Right"
-msgstr ""
+msgstr "Roditelj Desno"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_account_menu
 msgid "Financial Accounts"
-msgstr ""
+msgstr "Financijski računi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
-msgstr ""
+msgstr "Sabloni kontnog plana"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Account Configure"
-msgstr ""
+msgstr "Podesavanje Konta"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -5687,101 +5752,101 @@ msgstr ""
 #: field:account.tax.code,code:0
 #: field:account.tax.code.template,code:0
 msgid "Case Code"
-msgstr ""
+msgstr "Šifra"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "5"
-msgstr ""
+msgstr "5"
 
 #. module: account
 #: field:product.category,property_account_income_categ:0
 #: field:product.template,property_account_income:0
 msgid "Income Account"
-msgstr ""
+msgstr "Konto prihoda"
 
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr ""
+msgstr "Razdoblje otvaranja/zatvaranja"
 
 #. module: account
 #: rml:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr ""
+msgstr "Analitički saldo -"
 
 #. module: account
 #: wizard_field:account_use_models,init_form,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
-msgstr ""
+msgstr "Knjigovodstveni model"
 
 #. module: account
 #: view:account.invoice:0
 #: model:ir.actions.act_window,name:account.act_account_analytic_account_2_account_invoice_line
 msgid "Invoice lines"
-msgstr ""
+msgstr "Redovi računa"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
 msgid "Customer"
-msgstr ""
+msgstr "Kupac"
 
 #. module: account
 #: field:account.subscription,period_type:0
 msgid "Period Type"
-msgstr ""
+msgstr "Tip razdoblja"
 
 #. module: account
 #: view:product.category:0
 msgid "Accounting Properties"
-msgstr ""
+msgstr "Računovodstveni podaci"
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
 msgid "account.sequence.fiscalyear"
-msgstr ""
+msgstr "konto.sekvenca.fiskalnagodina"
 
 #. module: account
 #: wizard_field:account.print.journal.report,init,sort_selection:0
 msgid "Entries Sorted By"
-msgstr ""
+msgstr "Stavke poredane po"
 
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Print Journal -"
-msgstr ""
+msgstr "Stampa dnevnika -"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
 #: field:account.chart.template,bank_account_view_id:0
 #: field:account.invoice,partner_bank:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Bankovni račun"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models Definition"
-msgstr ""
+msgstr "Definicija modela"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_moves
 #: selection:account.analytic.journal,type:0
 #: selection:account.journal,type:0
 msgid "Cash"
-msgstr ""
+msgstr "Gotovina"
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
 #: field:account.fiscal.position.account.template,account_dest_id:0
 msgid "Account Destination"
-msgstr ""
+msgstr "Ciljni račun"
 
 #. module: account
 #: rml:account.overdue:0
 msgid "Maturity"
-msgstr ""
+msgstr "Dospeće"
 
 #. module: account
 #: field:account.fiscalyear,name:0
@@ -5791,12 +5856,12 @@ msgstr ""
 #: field:fiscalyear.seq,fiscalyear_id:0
 #: model:ir.model,name:account.model_account_fiscalyear
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Fiskalna Godina"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Future"
-msgstr ""
+msgstr "Buduće"
 
 #. module: account
 #: help:account.account.balance.report,checktype,fiscalyear:0
@@ -5805,24 +5870,24 @@ msgstr ""
 #: help:account.partner.balance.report,init,fiscalyear:0
 #: help:account.third_party_ledger.report,init,fiscalyear:0
 msgid "Keep empty for all open fiscal year"
-msgstr ""
+msgstr "Ostavite prazno za sve otvorene fiskalne godine"
 
 #. module: account
 #: rml:account.invoice:0
 #: selection:account.invoice,type:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Povrat Dobavljaču"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Reconcile Entries."
-msgstr ""
+msgstr "Zatvori stavke."
 
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr ""
+msgstr "Stavka"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -5830,23 +5895,23 @@ msgstr ""
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
 msgid "Paid invoice when reconciled."
-msgstr ""
+msgstr "Plaćeni računi prilikom zatvaranja."
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
 #: field:account.tax.template,python_compute_inv:0
 msgid "Python Code (reverse)"
-msgstr ""
+msgstr "Python kod (obrnuti)"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and financial management"
-msgstr ""
+msgstr "Kontni i finansijski Menadzment"
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Accounts Mapping"
-msgstr ""
+msgstr "Mapiranje Konta"
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
@@ -5854,6 +5919,8 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category"
 msgstr ""
+"Ovaj nalog ce se koristiti za promeni izlazno stanje za kategoriju datog "
+"proizvoda"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -5865,32 +5932,32 @@ msgstr ""
 #: help:account.tax.template,ref_tax_sign:0
 #: help:account.tax.template,tax_sign:0
 msgid "Usually 1 or -1."
-msgstr ""
+msgstr "Obicno 1 ili -1"
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank Details"
-msgstr ""
+msgstr "Detalji Banke"
 
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr ""
+msgstr "Konto troškova na predlošku proizvoda"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "General Debit"
-msgstr ""
+msgstr "Glavni dugovni"
 
 #. module: account
 #: field:account.analytic.account,code:0
 msgid "Account Code"
-msgstr ""
+msgstr "Sifra Naloga"
 
 #. module: account
 #: help:account.config.wizard,name:0
 msgid "Name of the fiscal year as displayed on screens."
-msgstr ""
+msgstr "Naziv fiskalne godine kako je prikazano na ekranima"
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -5901,42 +5968,42 @@ msgstr ""
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr ""
+msgstr "Uslovi plaćanja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Mappings"
-msgstr ""
+msgstr "Fiskalna mapiranja"
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement Process"
-msgstr ""
+msgstr "Proces izvoda"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile
 msgid "Statement reconcile"
-msgstr ""
+msgstr "Zatvaranje izvoda"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,sure:0
 #: wizard_field:account.fiscalyear.close.state,init,sure:0
 #: wizard_field:account.period.close,init,sure:0
 msgid "Check this box"
-msgstr ""
+msgstr "Označite ovu kućicu"
 
 #. module: account
 #: help:account.tax,price_include:0
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
-msgstr ""
+msgstr "Označite ovu kućicu ako cena proizvoda i racuna sadrze ovaj porez"
 
 #. module: account
 #: field:account.journal.column,name:0
 msgid "Column Name"
-msgstr ""
+msgstr "Име колоне"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -5944,56 +6011,57 @@ msgstr ""
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Filters"
-msgstr ""
+msgstr "Filteri"
 
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,yes:0
 msgid "Yes"
-msgstr ""
+msgstr "Da"
 
 #. module: account
 #: help:account.account,reconcile:0
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
+"Označite ovu kućicu ako je dozvoljeno korisniku da ponisti stavke ovog racuna"
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
-msgstr ""
+msgstr "Izračunaj datume stavki"
 
 #. module: account
 #: view:board.board:0
 msgid "Analytic accounts to close"
-msgstr ""
+msgstr "Analitički računi za zatvaranje"
 
 #. module: account
 #: view:board.board:0
 msgid "Draft invoices"
-msgstr ""
+msgstr "Fakture u pripremi"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Računovodstvena nadzorna ploča"
 
 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "Računi za fakturisanje"
 
 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
 msgid "Costs to invoice"
-msgstr ""
+msgstr "Troškovi za fakturiranje"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged receivables"
-msgstr ""
+msgstr "Dospela potraživanja"
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
@@ -6003,84 +6071,84 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_income
 msgid "Income Accounts"
-msgstr ""
+msgstr "Konto Prihoda"
 
 #. module: account
 #: view:board.board:0
 msgid "My indicators"
-msgstr ""
+msgstr "Moji Indikatori"
 
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "Tabla Naloga"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged income"
-msgstr ""
+msgstr "Dospeli Prihodi"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,show_columns:0
 msgid "Show Debit/Credit Information"
-msgstr ""
+msgstr "Prikazi Dugovne/Kreditne Informacije"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,account_choice:0
 msgid "All accounts"
-msgstr ""
+msgstr "Svi nalozi"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,period_manner:0
 msgid "Entries Selection Based on"
-msgstr ""
+msgstr "Cela je selekcija bazirana na"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "Notification"
-msgstr ""
+msgstr "Obaveštenje"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Financial Period"
-msgstr ""
+msgstr "Finansijski period"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr ""
+msgstr "Saldo računa"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period(s)"
-msgstr ""
+msgstr "Odaberite razdoblje(a)"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Percentage"
-msgstr ""
+msgstr "Procenat"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Compare Selected Years In Terms Of"
-msgstr ""
+msgstr "Uporedi odabrane godine pod uslovima da"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Fiscal Year(s)(Maximum Three Years)"
-msgstr ""
+msgstr "Odaberite fiskalnu(ne) godine (a Maksimalno 3 godine)"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,select_account:0
 msgid "Select Reference Account(for  % comparision)"
-msgstr ""
+msgstr "Odaberite referentni račun(za poredjenje u u %)"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
 msgid "Account balance-Compare Years"
-msgstr ""
+msgstr "Saldo računa-Poredjenja godina"
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6103,68 +6171,76 @@ msgid ""
 "    5. You have an option to print the desired report in Landscape format.\n"
 "    "
 msgstr ""
+"Modul Salda Konta je dodao funkije mudulu Finansijskog Menadzmenta\n"
+"    1.Ovaj vam moduk da razlicite opcije za stampu salda\n"
+"    2.Mozete uporedjivati salde razlicitih godina\n"
+"    3.Mozete postaviti gotovinsko ili procentualno poredjenje dve godine\n"
+"    4.Mozete postaviti referentni nalog za procentualno poredjenje datih "
+"godina\n"
+"    5.Imate opciju da odstampate zeljeni izvestaj u  Landskape formatu\n"
+"    "
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You have to select 'Landscape' option. Please Check it."
-msgstr ""
+msgstr "Morate odabrati opciju 'Landscape'. Molimo označite je."
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,landscape:0
 msgid "Show Report in Landscape Form"
-msgstr ""
+msgstr "Prikaži izvještaj u 'Landscape' formi"
 
 #. module: account
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "Ukupno:"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
 msgid "Show Comparision in %"
-msgstr ""
+msgstr "Pokazi poredjenje u %"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Select Period"
-msgstr ""
+msgstr "Izaberi razdoblje"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Report Options"
-msgstr ""
+msgstr "Opcije IZvestaja"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,compare_pattern:0
 msgid "Don't Compare"
-msgstr ""
+msgstr "Ne uporedjuj"
 
 #. module: account
 #: wizard_field:account.balance.account.balance.report,init,account_choice:0
 msgid "Show Accounts"
-msgstr ""
+msgstr "Prikaži račune"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "1. You have selected more than 3 years in any case."
-msgstr ""
+msgstr "1. Odabrali ste više od 3 godine u svakom slučaju."
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
 msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "Kontni i Finansijski menadzersko-uporedni nalozi"
 
 #. module: account
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "Godina :"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid "You can select maximum 3 years. Please check again."
-msgstr ""
+msgstr "Mozes selektovati maksimalno 3 godine. Molim probaj ponovo."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6172,22 +6248,26 @@ msgid ""
 "3. You have selected 'Percentage' option with more than 2 years, but you "
 "have not selected landscape format."
 msgstr ""
+"3. Ti jesi selektovao opciju 'Procenat' sa vise od 2 godine, ali nisi "
+"izabrao 'Landscape' format stampe."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
 msgid ""
 "You might have done following mistakes. Please correct them and try again."
 msgstr ""
+"Cini mi se da si napravio sledece greske. Molim ispravi ih, pa pokusaj "
+"ponovo."
 
 #. module: account
 #: help:account.balance.account.balance.report,init,select_account:0
 msgid "Keep empty for comparision to its parent"
-msgstr ""
+msgstr "Ostavi prazno za poredjenje sa njegovim nadredjenim"
 
 #. module: account
 #: selection:account.balance.account.balance.report,init,period_manner:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Datum kreiranja"
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -6195,6 +6275,7 @@ msgid ""
 "2. You have not selected 'Percentage' option, but you have selected more "
 "than 2 years."
 msgstr ""
+"2. Niste odabrali opciju 'Procenat', ali ste odabrali više od 2 godine."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
@@ -6203,93 +6284,96 @@ msgid ""
 "credit/debit columns and % option.This can lead contents to be printed out "
 "of the paper.Please try again."
 msgstr ""
+"Postoji mogućnost da ste odabrali opcije poredjenja sa više od 1 godine sa "
+"stupcima duguje/potražuje i % opcijom. Ovo može biti uzrok ispisa van "
+"papira. Molimo pokušajte ponovno."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,zero_years:0
 msgid "You have to select at least 1 Fiscal Year. Try again."
-msgstr ""
+msgstr "Morate odabrati bar 1 fiskalnu godinu. Pokušajte ponovno."
 
 #. module: account
 #: wizard_view:account.balance.account.balance.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "Prilagodi Izvestaj"
 
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Raspon Meseci"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Računi kreirani u zadnjih 15 dana"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "Izvestaj računa kreiranih u zadnjih 15 dana"
 
 #. module: account
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Ukupni iznos"
 
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr ""
+msgstr "Konta po vrsti"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Zaostala potraživanja do danas"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "Konta Potraživanja"
 
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Raspon"
 
 #. module: account
 #: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
-msgstr ""
+msgstr "Modul koji dodaje nove izvještaje na osnovi ACCOUNT Modula"
 
 #. module: account
 #: model:ir.module.module,shortdesc:report_account.module_meta_information
 msgid "Account Reporting - Reporting"
-msgstr ""
+msgstr "Konto Izvestaja - Izvještavanje"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
 #: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Saldo po vrsti konta"
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "Nedelja u godini"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Kreiraj datum"
 
 #. module: account
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "Stara potraživanja"
 
 #. module: account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Iznos bez poreza"
 
 #, python-format
 #~ msgid "Integrity Error !"
diff --git a/addons/account_analytic_analysis/i18n/sr.po b/addons/account_analytic_analysis/i18n/sr.po
new file mode 100644
index 00000000000..073299c29e4
--- /dev/null
+++ b/addons/account_analytic_analysis/i18n/sr.po
@@ -0,0 +1,352 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-13 17:10+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_invoiced:0
+msgid ""
+"Number of hours that can be invoiced plus those that already have been "
+"invoiced."
+msgstr ""
+"Broj sati koji mogu biti fakturirani zajedno s onima koji su već fakturisana."
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours summary by user"
+msgstr "Sati sumarno od strane korisnika"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Zadnji Datum fakture"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_ca:0
+msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
+msgstr "Izračunato pomoću formule: Max Cijena Iznos - Iznos dostavnice."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_hours:0
+msgid "Computed using the formula: Maximum Quantity - Hours Tot."
+msgstr "Izračunato pomoću formule: Najveća količina - Ukupno vrijeme"
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
+msgid "All Analytic Accounts"
+msgstr "Svi analitički računi"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
+msgid "My Current Accounts"
+msgstr "Moji tekući računi"
+
+#. module: account_analytic_analysis
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "Date of the last invoice created for this analytic account."
+msgstr "Datum zadnje fakture kreirana za ovaj analitički račun."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theorical Revenue"
+msgstr "Prihodi teoretski"
+
+#. module: account_analytic_analysis
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,theorical_margin:0
+msgid "Computed using the formula: Theorial Revenue - Total Costs"
+msgstr "Izračunato pomoću formule: Prihodi Teorijski - Ukupni troškovi"
+
+#. module: account_analytic_analysis
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
+msgid "New Analytic Account"
+msgstr "Novi analitički račun"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theorical Margin"
+msgstr "Teoretska margina"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
+msgstr "Realna Stopa Margine (%)"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
+msgid "Current Analytic Accounts"
+msgstr "Tekući analitički računi"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr "Datum najnovijeg rada obavljenog na ovom računu."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_invoiced_date:0
+msgid ""
+"If invoice from the costs, this is the date of the latest work or cost that "
+"have been invoiced."
+msgstr ""
+"Ako račun od troškova, to je datum najnoviji rad ili cijene koje su "
+"fakturirane."
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
+msgid "Invoicing"
+msgstr "Fakturiranje"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_date:0
+msgid "Date of Last Cost/Work"
+msgstr "Datum poslednjeg  Cena / Posao"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,total_cost:0
+msgid "Total Costs"
+msgstr "Ukupni troškovi"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_quantity:0
+msgid ""
+"Number of hours you spent on the analytic account (from timesheet). It "
+"computes on all journal of type 'general'."
+msgstr ""
+"Broj sati provedenih na tom analitičkom račun (iz timesheet). Izračunava se "
+"iz svih dnevnih knjiga za tip 'Generalno'."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_hours:0
+msgid "Remaining Hours"
+msgstr "Preostali Sati"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_theorical:0
+msgid ""
+"Based on the costs you had on the project, what would have been the revenue "
+"if all these costs have been invoiced at the normal sale price provided by "
+"the pricelist."
+msgstr ""
+"Na temelju troškova koje ste imali na projektu, što bi bio prihod ako su svi "
+"ovi troškovi su obračunati po normalnoj prodajnoj cijeni proistekli iz "
+"cenovnika."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,user_ids:0
+#: field:account_analytic_analysis.summary.user,user:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
+msgid "My Pending Accounts"
+msgstr "Moji računi na čekanju"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_my
+msgid "My Uninvoiced Entries"
+msgstr "Moji nefakturirani Ulazi"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin:0
+msgid "Computed using the formula: Invoiced Amount - Total Costs."
+msgstr "Izračunato korištenjem formule: Fakturirani iznos - Ukupni troškovi."
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
+msgid "My Accounts"
+msgstr "Moji računi"
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
+msgid ""
+"Modify account analytic view to show\n"
+"important data for project manager of services companies.\n"
+"Add menu to show relevant information for each manager."
+msgstr ""
+"Promeni prozor analitičkog prikaza računa da bi video\n"
+"važne podatke za projekt menadžer od usluznih kompanija.\n"
+"Dodaj meni da prikaze relevantne informacije za svakog menadžera."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_non_invoiced:0
+msgid "Uninvoiced Hours"
+msgstr "Nefakturirani sati"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Hours Tot"
+msgstr "Ukupno sati"
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_account
+msgid "Analytic Accounts"
+msgstr "Analitička konta"
+
+#. module: account_analytic_analysis
+#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
+msgid "report_account_analytic"
+msgstr "izvestaj_analitickog_konta"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_invoiced:0
+msgid "Invoiced Amount"
+msgstr "Fakturirani iznos"
+
+#. module: account_analytic_analysis
+#: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
+msgid "Financial Project Management"
+msgstr "Finansijski Projekt Menadzment"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_worked_invoiced_date:0
+msgid "Date of Last Invoiced Cost"
+msgstr "Datum zadnje fakturiranog troška"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_to_invoice:0
+msgid "Uninvoiced Amount"
+msgstr "Nefakturirani iznos"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
+msgid "Pending Analytic Accounts"
+msgstr "Analitički računi na čekanju"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_invoiced:0
+msgid "Invoiced Hours"
+msgstr "Fakturirani sati"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin:0
+msgid "Real Margin"
+msgstr "Realna margina"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_invoiced:0
+msgid "Total customer invoiced amount for this account."
+msgstr "Ukupni iznos izlaznih faktura za ovaj račun."
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
+msgid "Hours summary by month"
+msgstr "Ukupno sati po mjesecu"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin_rate:0
+msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
+msgstr ""
+"Računa se korištenjem formule: (Stvarna granica / Ukupni troškovi) * 100"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of hours (from journal of type 'general') that can be invoiced if you "
+"invoice based on analytic account."
+msgstr ""
+"Broj sati (iz dnevnika ' generalnog' tipa) koji mogu biti fakturirani ako "
+"fakturirate na osnovu analitičkog računa."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Analytic accounts"
+msgstr "Analitički računi"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_ca:0
+msgid "Remaining Revenue"
+msgstr "Preostali prihod"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_to_invoice:0
+msgid ""
+"If invoice from analytic account, the remaining amount you can invoice to "
+"the customer based on the total costs."
+msgstr ""
+"Ako fakturirate iz analitičkog računa, preostali iznos kojeg možete "
+"fakturirati kupcu je zasnovan na ukupnim troškovima."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,revenue_per_hour:0
+msgid "Computed using the formula: Invoiced Amount / Hours Tot."
+msgstr "Izračunato korištenjem formule: Fakturirani iznos / Ukupno sati"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,revenue_per_hour:0
+msgid "Revenue per Hours (real)"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,unit_amount:0
+#: field:account_analytic_analysis.summary.user,unit_amount:0
+msgid "Total Time"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,month_ids:0
+#: field:account_analytic_analysis.summary.month,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
+msgid "Overpassed Accounts"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
+msgid "All Uninvoiced Entries"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,total_cost:0
+msgid ""
+"Total of costs for this account. It includes real costs (from invoices) and "
+"indirect costs, like time spent on timesheets."
+msgstr ""
diff --git a/addons/account_analytic_default/i18n/sr.po b/addons/account_analytic_default/i18n/sr.po
new file mode 100644
index 00000000000..a6168a5112d
--- /dev/null
+++ b/addons/account_analytic_default/i18n/sr.po
@@ -0,0 +1,114 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-13 17:16+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
+#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
+msgid "Analytic Defaults"
+msgstr "Uobičajene postavke analitike"
+
+#. module: account_analytic_default
+#: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
+msgid "Account Analytic Default"
+msgstr "Uobičajene postavke analize računa"
+
+#. module: account_analytic_default
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_analytic_default
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Seq"
+msgstr "Red"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_stop:0
+msgid "End Date"
+msgstr "Završni Datum"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,company_id:0
+msgid "Company"
+msgstr "Preduzeće"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,analytic_id:0
+msgid "Analytic Account"
+msgstr "Analitički nalog"
+
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distributions"
+msgstr "Distribucije analitike"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: account_analytic_default
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
+msgid "Entries"
+msgstr "Stavke"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_analytic_default
+#: field:account.analytic.default,date_start:0
+msgid "Start Date"
+msgstr "Početni datum"
+
+#. module: account_analytic_default
+#: view:account.analytic.default:0
+msgid "Conditions"
+msgstr "Uslovi"
+
+#. module: account_analytic_default
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
+#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
+msgid "Analytic Rules"
+msgstr "Pravila analitike"
diff --git a/addons/account_analytic_plans/i18n/sr.po b/addons/account_analytic_plans/i18n/sr.po
new file mode 100644
index 00000000000..6a85a880856
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/sr.po
@@ -0,0 +1,404 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-13 17:43+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr "Šifra računa4"
+
+#. module: account_analytic_plans
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: account_analytic_plans
+#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
+#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report
+msgid "Crossovered Analytic"
+msgstr "Unakrsna analitika"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr "Šifra računa5"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,date2:0
+msgid "End Date"
+msgstr "Završni Datum"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr "Stopa (%)"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,name:0
+#: field:account.analytic.plan.line,plan_id:0
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
+msgid "Analytic Plan"
+msgstr "Analiticki Plan"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr "Red analitičke instance"
+
+#. module: account_analytic_plans
+#: wizard_button:wizard.crossovered.analytic,init,print:0
+msgid "Print"
+msgstr "Štampaj"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr "Do datuma"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr "Šifra plana"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr "Modeli analitičke distribucije"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr "Naziv računa"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr "Red analitičke distribucije"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr "Šifra distribucije"
+
+#. module: account_analytic_plans
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr "Ime Plana"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr "Datum stampe"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Percentage"
+msgstr "Procenat"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,empty_line:0
+msgid "Dont show empty lines"
+msgstr "Ne prikazuj prazme redove"
+
+#. module: account_analytic_plans
+#: wizard_view:wizard.crossovered.analytic,init:0
+msgid "Select Information"
+msgstr "Selektuj informaciju"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr "Šifra računa3"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,journal_id:0
+#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
+msgid "Analytic Journal"
+msgstr "Analiticki Dnevnik"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
+msgstr "100.00%"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,ref:0
+msgid "Analytic Account Ref."
+msgstr "Veza analitičkog konta"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr "Analiticki konto :"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Line"
+msgstr "Red Analitickog Plana"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr "Veza analitičkog konta:"
+
+#. module: account_analytic_plans
+#: model:ir.actions.wizard,name:account_analytic_plans.create_model
+msgid "Create Model"
+msgstr "Kreiraj Model"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr "Uobičajene stavke"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,plan_ids:0
+#: field:account.journal,plan_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
+msgid "Analytic Plans"
+msgstr "Analitički planovi"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr "Minimalno dozvoljeno (%)"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr "Šifra računa1"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr "Maksimalno dozvoljeno (%)"
+
+#. module: account_analytic_plans
+#: wizard_view:create.model,info:0
+msgid "Distribution Model Saved"
+msgstr "Model distribucije je sacuvan"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr "Instanca analitičkog plana"
+
+#. module: account_analytic_plans
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr "Dsitribucioni Modeli"
+
+#. module: account_analytic_plans
+#: model:ir.module.module,description:account_analytic_plans.module_meta_information
+msgid ""
+"This module allows to use several analytic plans, according to the general "
+"journal,\n"
+"so that multiple analytic lines are created when the invoice or the entries\n"
+"are confirmed.\n"
+"\n"
+"For example, you can define the following analytic structure:\n"
+"  Projects\n"
+"      Project 1\n"
+"          SubProj 1.1\n"
+"          SubProj 1.2\n"
+"      Project 2\n"
+"  Salesman\n"
+"      Eric\n"
+"      Fabien\n"
+"\n"
+"Here, we have two plans: Projects and Salesman. An invoice line must\n"
+"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
+"Fabien. The amount can also be split. The following example is for\n"
+"an invoice that touches the two subproject and assigned to one salesman:\n"
+"\n"
+"Plan1:\n"
+"    SubProject 1.1 : 50%\n"
+"    SubProject 1.2 : 50%\n"
+"Plan2:\n"
+"    Eric: 100%\n"
+"\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic "
+"lines,\n"
+"for one account entry.\n"
+"        "
+msgstr ""
+"Ovaj modul vam omogucava da koristite nekoliko analiticka plana, koji "
+"odgovaraju osnovnom dnevniku,\n"
+"i tako visestruko analizirate stavke kreirane kada je racun ili stavka\n"
+"potvrdjena\n"
+"\n"
+"Na primer, mozete definisati sledecu analiticku strukturu:\n"
+"  Projekat\n"
+"      Projekat 1\n"
+"                   SubProj 1.1\n"
+"                   SubProj 1.2\n"
+"      Projekat 2\n"
+"  Prodavac\n"
+"               Janko\n"
+"               Marko\n"
+"\n"
+"Ovde imamo dva plana. Projekat i Prodavac. Red racuna mora da\n"
+"moze da napise analiticke stavke u 2 plana: SubProj 1.1 i\n"
+"Marko.  Iznos se takodje deli. Sledeci primer je za racune koji \n"
+"su zajednicko sa dva subprojekta i dodati su jednom prodavcu:\n"
+"\n"
+"Plan1:\n"
+"    SubProj 1.1 : 50%\n"
+"    SubProj 1.2 : 50%\n"
+"PLan2:\n"
+"    Janko: 100%\n"
+"\n"
+"Tako da kad se ova linija racuna potvrdi, ona ce generisati 3 \n"
+"analiticke linije za jednu stavku racuna.\n"
+"        "
+
+#. module: account_analytic_plans
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
+msgstr "Visestruki-planovi menadzmenta u Analitickom racunovodstvu"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
+msgid "Analytic Plan Lines"
+msgstr "Redovi analitičkog plana"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Crossovered Analytic -"
+msgstr "Unakrsna Analitika-"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr "Plan modela"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr "Šifra računa2"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr "Osnovni konto ovog plana."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr "Šifra računa6"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr "Šifra konta"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr "Kod"
+
+#. module: account_analytic_plans
+#: wizard_button:create.model,info,end:0
+msgid "OK"
+msgstr "U redu"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr "Osnovni nalog (root)"
+
+#. module: account_analytic_plans
+#: wizard_view:create.model,info:0
+msgid ""
+"This distribution model has been saved. You will be able to reuse it later."
+msgstr "Distribucijski Model je sacuvan. Možete ga koristiti kasnije."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Analitički nalog"
+
+#. module: account_analytic_plans
+#: field:account.analytic.default,analytics_id:0
+#: view:account.analytic.plan.instance:0
+#: field:account.analytic.plan.instance,name:0
+#: field:account.invoice.line,analytics_id:0
+#: field:account.move.line,analytics_id:0
+msgid "Analytic Distribution"
+msgstr "Analitička Distribucija"
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
+msgid "Analytic Distribution's models"
+msgstr "Modeli Analitičkih Distribucija"
+
+#. module: account_analytic_plans
+#: wizard_button:wizard.crossovered.analytic,init,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: account_analytic_plans
+#: wizard_field:wizard.crossovered.analytic,init,date1:0
+msgid "Start Date"
+msgstr "Početni datum"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr "u"
+
+#. module: account_analytic_plans
+#: rml:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr "Od datuma"
diff --git a/addons/account_cancel/i18n/sr.po b/addons/account_cancel/i18n/sr.po
new file mode 100644
index 00000000000..35ee862ca78
--- /dev/null
+++ b/addons/account_cancel/i18n/sr.po
@@ -0,0 +1,42 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-19 12:03+0000\n"
+"PO-Revision-Date: 2010-10-13 16:49+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_cancel
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: account_cancel
+#: model:ir.module.module,description:account_cancel.module_meta_information
+msgid ""
+"\n"
+"    Module adds 'Allow cancelling entries' field on form view of account "
+"journal. If set to true it allows user to cancel entries & invoices.\n"
+"    "
+msgstr ""
+"\n"
+"    Modul adds omogucava polja za otkazivanje u formi pregleda dnevnika "
+"konta. Ako je postavljeno na ' da' omogucava korisniku da otkaze stavke & "
+"racune\n"
+"    "
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "Otkazi Nalog"
diff --git a/addons/account_cancel/i18n/tr.po b/addons/account_cancel/i18n/tr.po
new file mode 100644
index 00000000000..38866a6c439
--- /dev/null
+++ b/addons/account_cancel/i18n/tr.po
@@ -0,0 +1,37 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-19 12:03+0000\n"
+"PO-Revision-Date: 2010-10-13 14:54+0000\n"
+"Last-Translator: cafer can <Unknown>\n"
+"Language-Team: Turkish <tr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_cancel
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
+#. module: account_cancel
+#: model:ir.module.module,description:account_cancel.module_meta_information
+msgid ""
+"\n"
+"    Module adds 'Allow cancelling entries' field on form view of account "
+"journal. If set to true it allows user to cancel entries & invoices.\n"
+"    "
+msgstr ""
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "Hesabı iptal et"
diff --git a/addons/account_tax_include/i18n/it.po b/addons/account_tax_include/i18n/it.po
index 5e270c999ae..0b3a6d3b846 100644
--- a/addons/account_tax_include/i18n/it.po
+++ b/addons/account_tax_include/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 08:32+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-10-13 18:13+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
@@ -24,7 +24,7 @@ msgstr "XML non valido per Visualizzazione Architettura!"
 #. module: account_tax_include
 #: field:account.invoice,price_type:0
 msgid "Price method"
-msgstr ""
+msgstr "Metodo di pagamento"
 
 #. module: account_tax_include
 #: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
@@ -49,4 +49,4 @@ msgstr ""
 #. module: account_tax_include
 #: field:account.invoice.line,price_subtotal_incl:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Subtotale"
diff --git a/addons/analytic_user_function/i18n/mn.po b/addons/analytic_user_function/i18n/mn.po
index 478065209f3..f474940ee17 100644
--- a/addons/analytic_user_function/i18n/mn.po
+++ b/addons/analytic_user_function/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 14:21+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"PO-Revision-Date: 2010-10-13 07:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/base_vat/i18n/fr.po b/addons/base_vat/i18n/fr.po
index 9a8776d2680..4bde62374ec 100644
--- a/addons/base_vat/i18n/fr.po
+++ b/addons/base_vat/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 12:08+0000\n"
+"PO-Revision-Date: 2010-10-13 07:43+0000\n"
 "Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/board/i18n/sr.po b/addons/board/i18n/sr.po
new file mode 100644
index 00000000000..d46cbf9de5c
--- /dev/null
+++ b/addons/board/i18n/sr.po
@@ -0,0 +1,221 @@
+# Serbian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-10-13 16:46+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora da počne sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "board.board"
+msgstr "tabla.tabla"
+
+#. module: board
+#: field:board.note,user_id:0
+msgid "Author"
+msgstr "Autor"
+
+#. module: board
+#: model:ir.module.module,shortdesc:board.module_meta_information
+msgid "Dashboard main module"
+msgstr "Glavna tabla osnovnog modula"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,note:0
+msgid "Note"
+msgstr "Napomena"
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr "širina"
+
+#. module: board
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Pogrešno ime modela u definiciji akcije."
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr "Naslov"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_list_form
+#: model:ir.ui.menu,name:board.menu_view_board_form
+msgid "Dashboard Definition"
+msgstr "Definicija Glavne Table"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_note_form
+#: model:ir.ui.menu,name:board.menu_view_board_note_form
+msgid "Publish a note"
+msgstr "Publikuj napomenu"
+
+#. module: board
+#: wizard_view:board.board.menu.create,init:0
+msgid "Menu Information"
+msgstr "Informacije Menija"
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr "Pregled Akcija"
+
+#. module: board
+#: model:ir.model,name:board.model_board_note
+msgid "board.note"
+msgstr "Napomena.tabla"
+
+#. module: board
+#: field:board.note,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: board
+#: model:ir.ui.menu,name:board.next_id_50
+msgid "Configuration"
+msgstr "Podešavanje"
+
+#. module: board
+#: field:board.note.type,name:0
+msgid "Note Type"
+msgstr "Tip Napomene"
+
+#. module: board
+#: wizard_view:board.board.menu.create,init:0
+msgid "Create Menu For Dashboard"
+msgstr "Kreiraj Meni za Glavnu Tablu"
+
+#. module: board
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nevažeći XML za pregled arhitekture"
+
+#. module: board
+#: wizard_field:board.board.menu.create,init,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Roditeljski Meni"
+
+#. module: board
+#: view:board.note:0
+msgid "Notes"
+msgstr "Napomene"
+
+#. module: board
+#: model:ir.model,name:board.model_board_note_type
+msgid "board.note.type"
+msgstr "Tabla.napomene.tip"
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+msgid "Dashboard"
+msgstr "Glavna Tabla"
+
+#. module: board
+#: model:ir.module.module,description:board.module_meta_information
+msgid "Base module for all dashboards."
+msgstr "Bazni modul za sve glavne table"
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr "Pozicija"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.dashboard_open
+msgid "Open Dashboard"
+msgstr "Otvori Glavnu Tablu"
+
+#. module: board
+#: wizard_field:board.board.menu.create,init,menu_name:0
+msgid "Menu Name"
+msgstr "Naziv menija"
+
+#. module: board
+#: field:board.note,type:0
+msgid "Note type"
+msgstr "Tip Napomene"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr "Levo"
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr ""
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr "Desno"
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: board
+#: view:board.board:0
+#: wizard_button:board.board.menu.create,init,create_menu:0
+msgid "Create Menu"
+msgstr "Kreiraj Meni"
+
+#. module: board
+#: model:ir.ui.menu,name:board.dashboard_menu
+msgid "Dashboards"
+msgstr "Glavna Tabla"
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr "Visina"
+
+#. module: board
+#: model:ir.actions.wizard,name:board.wizard_board_create_menu
+msgid "Create Board Menu"
+msgstr "Kreiraj Meni Table"
+
+#. module: board
+#: wizard_button:board.board.menu.create,init,end:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr "Pregled table"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "board.board.line"
+msgstr "tabla.tabla.red"
+
+#. module: board
+#: field:board.note,name:0
+msgid "Subject"
+msgstr "Tema"
diff --git a/addons/document_webdav/i18n/da.po b/addons/document_webdav/i18n/da.po
index 06dd36acc4e..959e9ee17db 100644
--- a/addons/document_webdav/i18n/da.po
+++ b/addons/document_webdav/i18n/da.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-05-30 15:14+0000\n"
-"PO-Revision-Date: 2010-10-12 13:21+0000\n"
+"PO-Revision-Date: 2010-10-13 07:44+0000\n"
 "Last-Translator: Martin Pihl <martinpihl@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav_old
diff --git a/addons/idea/i18n/tr.po b/addons/idea/i18n/tr.po
index b3cadf12a88..87c9f8b4fe7 100644
--- a/addons/idea/i18n/tr.po
+++ b/addons/idea/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 23:56+0000\n"
-"Last-Translator: cafer can <Unknown>\n"
+"PO-Revision-Date: 2010-10-13 07:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 2005696db44..88a975b8f89 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 07:46+0000\n"
+"PO-Revision-Date: 2010-10-13 07:42+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index f6f3b4106a8..02d6c295c84 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 08:51+0000\n"
-"PO-Revision-Date: 2010-10-12 14:21+0000\n"
-"Last-Translator: sugi <Unknown>\n"
+"PO-Revision-Date: 2010-10-13 07:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -165,7 +165,7 @@ msgstr "Төлөвлөгчийн үзүүлэлт"
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action11
 msgid "Temporary Procurement Exceptions"
-msgstr ""
+msgstr "Тухайн үеийн алдаатай татан авалт"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -221,7 +221,7 @@ msgstr "Хамгийн бага эрхтэй оролцогч"
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action4
 msgid "Procurement Exceptions to Fix"
-msgstr ""
+msgstr "Алдаатай татан авалтын төлөв"
 
 #. module: procurement
 #: field:procurement.order,priority:0
@@ -385,7 +385,7 @@ msgstr "Алдаанууд"
 #. module: procurement
 #: model:process.node,note:procurement.process_node_serviceonorder0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Бараа болон худалдан авалтын захиалгаас хөрөнгө гаргах"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property
@@ -458,6 +458,7 @@ msgstr ""
 #: help:procurement.orderpoint.compute,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
 msgstr ""
+"Хэрэв агуулахын бараа 0-ээс доогуур байвал захиалгын цэг акталсан гэсэн үг."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -513,7 +514,7 @@ msgstr "Ердийн"
 #. module: procurement
 #: view:procurement.order.compute:0
 msgid "This wizard will schedule procurements."
-msgstr ""
+msgstr "Энэ визард нь татан авалтыг төлөвлөнө."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,active:0
@@ -585,7 +586,7 @@ msgstr "Идэвхитэй"
 #: code:addons/procurement/procurement.py:0
 #, python-format
 msgid "Qty Multiple must be greater than zero."
-msgstr ""
+msgstr "Үржүүлсэн тоо хэмжээ 0-ээс илүү байх ёстой."
 
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
@@ -605,7 +606,7 @@ msgstr "Хожимдсон"
 #. module: procurement
 #: field:mrp.property,composition:0
 msgid "Properties composition"
-msgstr ""
+msgstr "Бүрэлдэхүүн хэсгийн шинж чанар"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -618,7 +619,7 @@ msgstr "Өгөгдөл хангалтгүй !"
 #: field:mrp.property,group_id:0
 #: field:mrp.property.group,name:0
 msgid "Property Group"
-msgstr ""
+msgstr "Группын шинж чанар"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -683,7 +684,7 @@ msgstr "Яаралтай бус"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute_all
 msgid "Compute all schedulers"
-msgstr ""
+msgstr "Төлөвлөгөө гаргагч бүгдийг тооцно"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -826,7 +827,7 @@ msgstr "Барааны зарах нэгж"
 #: code:addons/procurement/procurement.py:0
 #, python-format
 msgid "from stock: products assigned."
-msgstr ""
+msgstr "Агуулахаас: Оноосон бараанууд"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_compute_schedulers
diff --git a/addons/report_intrastat/i18n/it.po b/addons/report_intrastat/i18n/it.po
index 4dba312df22..8947d14214b 100644
--- a/addons/report_intrastat/i18n/it.po
+++ b/addons/report_intrastat/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-12 20:22+0000\n"
-"Last-Translator: simone.sandri <Unknown>\n"
+"PO-Revision-Date: 2010-10-13 07:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-13 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index c46b73e351d..31f82d2b8ae 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:24+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-14 03:06+0000\n"
+"Last-Translator: sugi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
+"X-Launchpad-Export-Date: 2010-10-14 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
 #: selection:stock.location,allocation_method:0
 msgid "LIFO"
-msgstr ""
+msgstr "Сүүлд орсон нь эхэнд гарна"
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
@@ -35,7 +35,7 @@ msgstr "Бараа хадгалах"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_15
 msgid "Sub Products"
-msgstr ""
+msgstr "Дэд бүтээгдэхүүн"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -45,7 +45,7 @@ msgstr ""
 #. module: stock
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Моделийн нэр алдаатай."
 
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
@@ -61,7 +61,7 @@ msgstr ""
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision"
-msgstr ""
+msgstr "Хяналт"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -82,7 +82,7 @@ msgstr ""
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "UoM"
-msgstr ""
+msgstr "Хэмжих нэгж"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.return_picking
@@ -97,7 +97,7 @@ msgstr "Барааны журнал"
 #. module: stock
 #: wizard_view:stock.fill_inventory,init:0
 msgid "Fill Inventory for specific location"
-msgstr ""
+msgstr "Бодит байрлалын нөөцийг дүүргэх"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
@@ -115,7 +115,7 @@ msgstr "Хэмжээ"
 #. module: stock
 #: view:stock.picking:0
 msgid "Products Received"
-msgstr ""
+msgstr "Бараа хүлээн авах"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
@@ -190,7 +190,7 @@ msgstr "Жинхэнэ барааны өртөг"
 #. module: stock
 #: view:stock.move:0
 msgid "UOM"
-msgstr ""
+msgstr "Хэмжих нэгж"
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -333,7 +333,7 @@ msgstr "Хөдөлгөөний мэдээлэл"
 #. module: stock
 #: view:stock.picking:0
 msgid "Unreceived Products"
-msgstr ""
+msgstr "Бараа хүлээн аваагүй"
 
 #. module: stock
 #: field:stock.inventory,state:0
@@ -713,7 +713,7 @@ msgstr ""
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Packing List:"
-msgstr ""
+msgstr "Савлагааны жагсаалт"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -748,7 +748,7 @@ msgstr "Нэхэмжлэлийн удирдлага"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
 msgid "Production lot revisions"
-msgstr ""
+msgstr "Барааны серийн дугаарын хяналт"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1412,6 +1412,15 @@ msgid ""
 "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
 "    "
 msgstr ""
+"OpenERP бүртгэлийн менежментийн модуль нь олон тооны агуулах, олон тооны мөн "
+"тодорхой бүтэцтэй агуулахын байршилыг зохион байгуулж чаддагДавхар нэвтрэх "
+"боломжтой менежментийн ачаар, бүртгэлийн хяналт чадалтай мөн уян хатан "
+"чанартай болсон:төлөвлөгөө болон түүхийг шилжүүлдэг, янз бүрийн бүртгэлийн "
+"аргууд, агуулахын барагцаалал (үнийн стандарт эсвэл дундаж), бүртгэлийн "
+"өөрчлөлттэй зэрэгцсэн тогтвортой байдал, дүрмийг автоматаар дахин шинэчлэх "
+"(агуулахын төвшин), дэмжигдсэн коддавхар нэвтрэлтийн системийн алдааг "
+"илрүүлэх, мөрдөгдөх чанар (өссөн/багассан, барааны цуврал, серийн дугаар)\n"
+"    "
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -1423,6 +1432,7 @@ msgstr "Тогтоосон байрлал"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"объектийн нэр нь x_ - ээр эхлэх ёстой ба тусгай тэмдэглэгээ агуулахгүй байх"
 
 #. module: stock
 #: field:stock.picking,min_date:0
@@ -1458,7 +1468,7 @@ msgstr "Барааны журнал"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CLEAR"
-msgstr ""
+msgstr "агуулахыг цэвэрлэх"
 
 #. module: stock
 #: field:stock.production.lot,date:0
@@ -1478,7 +1488,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Force Availability"
-msgstr ""
+msgstr "боломжийг хурдасгах"
 
 #. module: stock
 #: wizard_view:stock.location.products,init:0
@@ -1510,7 +1520,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_tracking_form
 #: model:ir.ui.menu,name:stock.menu_action_tracking_form
 msgid "Tracking Lots"
-msgstr ""
+msgstr "цувралын замыг тодорхойлох"
 
 #. module: stock
 #: wizard_button:inventory.merge,init,merge:0
@@ -1530,7 +1540,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PROPERTIES"
-msgstr ""
+msgstr "агуулахын дэлгэрэнгүй мэдээлэл"
 
 #. module: stock
 #: field:stock.location,stock_real:0
@@ -1578,12 +1588,12 @@ msgstr "Савлах үйл явц"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_STOP"
-msgstr ""
+msgstr "агуулахын дамжуулгыг зогсоох"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
-msgstr ""
+msgstr "боломжтой болгох"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.make_picking
@@ -1604,7 +1614,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REMOVE"
-msgstr ""
+msgstr "агуулахыг устгах (агуулахаас устгах)"
 
 #. module: stock
 #: field:stock.incoterms,active:0
@@ -1646,7 +1656,7 @@ msgstr ""
 #. module: stock
 #: wizard_field:stock.move.track,init,tracking_prefix:0
 msgid "Tracking prefix"
-msgstr ""
+msgstr "урьдчилсан нөхцлийг тодорхойлох"
 
 #. module: stock
 #: selection:stock.location,allocation_method:0
@@ -1666,7 +1676,7 @@ msgstr "Хяналтын нэр"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_COLOR"
-msgstr ""
+msgstr "агуулахын өнгийг сонгох"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1723,7 +1733,7 @@ msgstr "Яаралтай бус"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CLOSE"
-msgstr ""
+msgstr "агуулахыг хаах"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -1734,7 +1744,7 @@ msgstr "Агуулах"
 #. module: stock
 #: help:product.product,track_outgoing:0
 msgid "Force to use a Production Lot during deliveries"
-msgstr ""
+msgstr "Тарааж байх үед барааны цувралыг хурдасгах"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1776,7 +1786,7 @@ msgstr "Автомат савлагаа"
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
-msgstr ""
+msgstr "UOS бараа"
 
 #. module: stock
 #: field:stock.location,posz:0
@@ -1828,7 +1838,7 @@ msgstr "Бүтээгдэхүүний байрлал"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDO"
-msgstr ""
+msgstr "агуулахын үйлдлийг буцаах"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.move_split
@@ -1848,7 +1858,7 @@ msgstr "Сериал"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ADD"
-msgstr ""
+msgstr "агуулахад нэмэх"
 
 #. module: stock
 #: field:stock.location,chained_delay:0
@@ -1868,7 +1878,7 @@ msgstr "Дансны бичилт"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PAUSE"
-msgstr ""
+msgstr "агуулахын дамжуулгаг түр зогсоох"
 
 #. module: stock
 #: view:product.product:0
@@ -1883,7 +1893,7 @@ msgstr "Нэг мөсөн"
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outging Lots"
-msgstr ""
+msgstr "гаралтын цувралын замыг тодорхойлох"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
@@ -1896,12 +1906,12 @@ msgstr "Нөөцөлсөн огноо"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PRINT_PREVIEW"
-msgstr ""
+msgstr "агуулахыг урьдчилан харах"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FIND"
-msgstr ""
+msgstr "агуулахыг олох"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1917,6 +1927,11 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
+"энэ нь таныг бэхлэгдсэн байршилын төрлийг сонгох үед ашиглагданаавтомат "
+"шилжилтийн утга нь автоматаар батлагдах одоогийн агуулахын шилжилтийн "
+"дараагийн шилжилтийг үүсгэнэ. гар удирдлагыг ашиглавал агуулахын шилжилт "
+"заавал ажилтнаар баталгаажих хэрэгтэй болно. Алхам нэмэгдээгүй автоматыг "
+"ашиглавал байршил нь одоогийн шилжилтийн байрлалаар солигдоно."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -1926,7 +1941,7 @@ msgstr "Зураг"
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Tracking"
-msgstr ""
+msgstr "Зам тодорхойлох"
 
 #. module: stock
 #: wizard_button:stock.move.track,init,track:0
@@ -1939,6 +1954,7 @@ msgstr "Тийм"
 msgid ""
 "This account will be used, instead of the default one, to value input stock"
 msgstr ""
+"агуулахын оролтыг дүгнэхийн тулд заяамалынх нь оронд энэ гишүүн хэрэглэгдэнэ"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
@@ -1958,7 +1974,7 @@ msgstr "Эдгээр нөөцийг нэгтгэхийг та хүсч байн
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Planned Date"
-msgstr ""
+msgstr "төлөвлөгдсөн огнооны хамгийн дээд хязгаар"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1968,7 +1984,7 @@ msgstr "Зарласан нөөц"
 #. module: stock
 #: selection:stock.picking,type:0
 msgid "Getting Goods"
-msgstr ""
+msgstr "Барааг хүлээж авах"
 
 #. module: stock
 #: view:stock.location:0
@@ -1978,7 +1994,7 @@ msgstr "Барааны байршил"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PLAY"
-msgstr ""
+msgstr "Агуулахын дамжуулгыг явуулах"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
@@ -1997,6 +2013,8 @@ msgid ""
 "This stock location will be used, instead of the default one, as the "
 "destination location for goods you send to this partner"
 msgstr ""
+"энэ агуулахын байршил нь заяамал агуулахынх нь оронд захиалагч руу илгээсэн "
+"барааны хүрэх газар болж ашиглагдана"
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -2007,7 +2025,7 @@ msgstr "Баталсан"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PREVIOUS"
-msgstr ""
+msgstr "агуулахын өмнөх дамжуулга"
 
 #. module: stock
 #: view:stock.move:0
@@ -2017,7 +2035,7 @@ msgstr "Бататгах"
 #. module: stock
 #: view:stock.picking:0
 msgid "Check Availability"
-msgstr ""
+msgstr "Бэлэн байдлыг шалгах"
 
 #. module: stock
 #: wizard_view:inventory.merge,init:0
@@ -2041,6 +2059,7 @@ msgstr "Бараа_тусгаарлах"
 msgid ""
 "This account will be used, instead of the default one, to value output stock"
 msgstr ""
+"Агуулахын гаралтыг дүгнэхийн тулд заяамалын оронд энэ гишүүн ашиглагдана"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2050,12 +2069,12 @@ msgstr "Батлах(Одоо үйл ажиллагаа хийхгүй)"
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves Tracked"
-msgstr ""
+msgstr "шилжилтийн зам гаргах"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
 msgid "Reporting"
-msgstr "Мэдээлэл"
+msgstr "Тайлан"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_invoice_onshipping
@@ -2112,7 +2131,7 @@ msgstr "Цуцлагдсан"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_LAST"
-msgstr ""
+msgstr "Агуулах хоосрох"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -2131,6 +2150,9 @@ msgid ""
 "instead of the default one, as the source location for stock moves generated "
 "by production orders"
 msgstr ""
+"барааны захиалгаар боловсруулагдсан агуулахын шилжилтийн анхны байрлал "
+"болгохын тулд заяамал агуулахынх нь оронд тухайн бараанд энэ агуулахын "
+"байрлалыг ашиглана"
 
 #. module: stock
 #: view:stock.picking.move.wizard:0
@@ -2152,7 +2174,7 @@ msgstr "Ноорог"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_CENTER"
-msgstr ""
+msgstr "агуулахыг төвд нь зэрэгцүүлэх"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree3
@@ -2160,7 +2182,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree8
 msgid "Confirmed Packing Waiting Availability"
-msgstr ""
+msgstr "батлагдсан хүлээлтийн багц"
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -2190,12 +2212,12 @@ msgstr "Шууд хүргэлт"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REVERT_TO_SAVED"
-msgstr ""
+msgstr "агуулах буцаж хэвэндээ орон хадгалагдах"
 
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Production Lots"
-msgstr ""
+msgstr "барааны хэв маягийн багц"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2214,11 +2236,14 @@ msgid ""
 "instead of the default one, as the source location for stock moves generated "
 "by procurements"
 msgstr ""
+"Татан авалтаар биелэгдсэн агуулахын шилжилтийн анхны байрлал болгох "
+"зорилгоор заяамал агуулахынх нь оронд энэ агуулахын байршил тухайн бараанд "
+"ашиглагдана,"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking_move_wizard
 msgid "stock.picking.move.wizard"
-msgstr ""
+msgstr "агуулахын сонголтыг шилжүүлэх визард"
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
@@ -2254,7 +2279,7 @@ msgstr "Байршлууд"
 msgid ""
 "Scheduled date for the movement of the products or real date if the move is "
 "done."
-msgstr ""
+msgstr "Барааг шилжүүлэх төлөвлөгдсөн огноо эсвэл шилжилт хийгдсэн огноо"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2322,7 +2347,7 @@ msgstr "Тодорхойлолт"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_INDENT"
-msgstr ""
+msgstr "Агуулахын барааны захиалга"
 
 #. module: stock
 #: selection:stock.picking,type:0
@@ -2366,7 +2391,7 @@ msgstr "Гаралт"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_RIGHT"
-msgstr ""
+msgstr "Агуулахыг баруун талд нь зэрэгцүүлэх"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
@@ -2381,7 +2406,7 @@ msgstr "Бусад мэдээлэл"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_NEXT"
-msgstr ""
+msgstr "Агуулахын дараагийн дамжуулга"
 
 #. module: stock
 #: view:stock.move:0

From 413589655267ca77c701b7671b7ea03a33709064 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 13:57:21 +0530
Subject: [PATCH 67/78] [FIX] project_issue: correct dashboard problem

bzr revid: hmo@tinyerp.com-20101014082721-n7ingddyob4x09ff
---
 addons/project_issue/board_project_issue_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index ff8bf0801f1..2351869e003 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -126,7 +126,7 @@
             	<xpath expr="/form/hpaned/child1/action[@string='My Delegated Tasks']" position="after">
 						<action colspan="4"  height="100" name="%(action_view_my_project_issue_tree)d" string="My Issues" />
             	</xpath>
-            	<xpath expr="/form/hpaned/child2/vpaned/child2/action[@string='My Remaining Hours by Project']" position="after">
+            	<xpath expr="/form/hpaned/child2/action[@string='My Remaining Hours by Project']" position="after">
 						<action colspan="4" height="100"  name="%(action_view_my_open_project_issue_tree)d" string="My Open Issues by Creation Date" />
             	</xpath>
             </field>

From 2b29d4784d38f184b19b449ede5b01a1f6edb1d4 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 15:54:49 +0530
Subject: [PATCH 68/78] [IMP] project_issue: issue is pending after convert to
 task

bzr revid: hmo@tinyerp.com-20101014102449-0dt30yprikhvc62g
---
 addons/project_issue/project_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index ac8580f9c52..0e9807c865b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -281,7 +281,7 @@ class project_issue(crm.crm_case, osv.osv):
 
             vals = {
                 'task_id': new_task_id,
-                'state':'open'
+                'state':'pending'
             }
             case_obj.write(cr, uid, [bug.id], vals)
 

From 10ecb719bd9f013765cbb69d1c36b9e093edadf2 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 15:56:54 +0530
Subject: [PATCH 69/78] [IMP] project_long_term: improve gantt view

bzr revid: hmo@tinyerp.com-20101014102654-e3wkawf339sc9ido
---
 addons/document/document.py                   |  2 -
 addons/document/document_view.xml             | 60 ++++++++++---------
 addons/project_long_term/project_long_term.py |  8 ++-
 .../project_long_term_view.xml                | 12 ++--
 4 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index 6c2a6b6aff5..92a00f3222c 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -88,7 +88,6 @@ class document_file(osv.osv):
         'parent_id': fields.many2one('document.directory', 'Directory', select=1, required=True),
         'index_content': fields.text('Indexed Content'),
         'partner_id':fields.many2one('res.partner', 'Partner', select=1),
-        'company_id': fields.many2one('res.company', 'Company'),
         'file_size': fields.integer('File Size', required=True),
         'file_type': fields.char('Content Type', size=128),
 
@@ -102,7 +101,6 @@ class document_file(osv.osv):
         return dirobj._get_root_directory(cr, uid, context)
 
     _defaults = {
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'ir.attachment', context=c),
         'user_id': lambda self, cr, uid, ctx:uid,
         'file_size': lambda self, cr, uid, ctx:0,
         'parent_id': __get_def_directory
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index b978cd222db..eeb2a879cb6 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -277,38 +277,42 @@
             </form>
         </field>
     </record>
-
-    <record id="view_attach_filter" model="ir.ui.view">
-            <field name="name">IR Attachment</field>
+       
+    <record id="view_attach_filter_inherit0" model="ir.ui.view">
+            <field name="name">IR Attachment0</field>
             <field name="model">ir.attachment</field>
             <field name="type">search</field>
+            <field name="inherit_id" ref="base.view_attachment_search"/>
             <field name="arch" type="xml">
-             <search string="Document">
-             <filter icon="terp-go-month" string="Month"
-                    domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"
-                />
-                 <separator orientation="vertical"/>
-                 <field name="name"/>
-                 <field name="parent_id" />
-                 <field name="user_id">
-                    <filter icon="terp-personal"
-                        domain="[('user_id','=',uid)]"
-                        help="Filter on my documents" />
-                 </field>
-                <field name="partner_id"/>
-                <field name="company_id" groups="base.group_multi_company"/>
-                <newline/>
-                <group expand="0" string="Group By...">
-                    <filter string="Partner" icon="terp-personal" domain="[]"
+                <field name="create_uid" position="replace">
+                    <field name="user_id">
+                            <filter icon="terp-personal"
+                                domain="[('user_id','=',uid)]"
+                                help="Filter on my documents" />
+                        </field>
+                    <field name="parent_id" />
+                </field>
+            </field>
+    </record>
+
+        
+
+    <record id="view_attach_filter_inherit2" model="ir.ui.view">
+            <field name="name">IR Attachment2</field>
+            <field name="model">ir.attachment</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="base.view_attachment_search"/>
+            <field name="arch" type="xml">
+                <filter string="Owner" position="replace">
+                    <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="Partner" icon="terp-partner" domain="[]"
                        context="{'group_by':'partner_id'}"  groups="base.group_extended"/>
                     <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
-                    <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"  groups="base.group_extended"/>
-                    <filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Company" icon="terp-personal" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                </group>
-              </search>
-             </field>
-         </record>
+                    
+                 </filter>
+            </field>
+    </record>
+
     <record model="ir.ui.view" id="view_document_file_tree">
         <field name="name">ir.attachment</field>
         <field name="model">ir.attachment</field>
@@ -319,6 +323,7 @@
                 <field name="name"/>
                 <field name="parent_id" />
                 <field name="user_id"/>
+                <field name="company_id"/>
                 <field name="create_date"/>
                 <field name="write_date"/>
                 <field name="partner_id" groups="base.group_extended" />
@@ -333,7 +338,6 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">ir.attachment</field>
         <field name="view_type">form</field>
-        <field name="search_view_id" ref="view_attach_filter"/>
         <field name="help">The Documents repository gives you access to all attachments, such as mails, project documents, invoices etc.</field>
     </record>
     <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/>
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index e6f65ba1fa9..d6d43f83c5d 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -297,6 +297,7 @@ class project_phase(osv.osv):
         if context is None:
             context = {}
         resource_pool = self.pool.get('resource.resource')
+        resource_allocation_pool = self.pool.get('project.resource.allocation')
         uom_pool = self.pool.get('product.uom')
         if context is None:
            context = {}
@@ -344,7 +345,12 @@ class project_phase(osv.osv):
                                           'date_start': start_date.strftime('%Y-%m-%d'),
                                           'date_end': end_date.strftime('%Y-%m-%d')
                                         }, context=ctx)
-
+            # write dates into Resources Allocation
+            for resource in phase.resource_ids:
+                resource_allocation_pool.write(cr, uid, [resource.id], {
+                                        'date_start': start_date.strftime('%Y-%m-%d'),
+                                        'date_end': end_date.strftime('%Y-%m-%d')
+                                    }, context=ctx)
             # Recursive call till all the next phases scheduled
             for phase in phase.next_phase_ids:
                if phase.state in ['draft', 'open', 'pending']:
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index e83085c3afa..f124fc27c8c 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -14,8 +14,8 @@
             <field name="type">gantt</field>
             <field name="arch" type="xml">
               <gantt color="phase_id" date_start="date_start" date_stop="date_end" string="R.A." mode="year">
-               <level object="res.users" link="user_id" domain="[]">
-                   <field name="useability" string="Availability"/>
+               <level object="project.resource.allocation" link="id" domain="[]">
+                    <field name="resource_id"/>
                 </level>
               </gantt>
             </field>
@@ -27,7 +27,7 @@
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="user_id" date_start="date_start" date_stop="date_end" day_length="12" string="Resources">
+                <calendar color="resource_id" date_start="date_start" date_stop="date_end" day_length="12" string="Resources">
                     <field name="phase_id"/>
                     <field name="project_id"/>
                 </calendar>
@@ -244,7 +244,7 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <gantt color="responsible_id" date_stop="date_end" date_start="date_start" string="Phases">
-                    <level object="project.project" link="project_id" domain="[]">
+                    <level object="project.phase" link="id" domain="[]">
                         <field name="name"/>
                     </level>
                 </gantt>
@@ -288,7 +288,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
-            <field name="context">{'search_default_responsible_id':uid,'group_by':'project_id'}</field>
+            <field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
             <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>
         </record>
@@ -298,7 +298,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
- 			<field name="context">{'search_default_responsible_id':uid,'group_by':'project_id'}</field>
+ 			<field name="context">{'search_default_responsible_id':uid,'search_default_project':1}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>
 

From b8ba14a6d09284afeff3b9c02ffb78a24fc8b8d1 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 16:02:34 +0530
Subject: [PATCH 70/78] [IMP] project_long_term: menu rearrange

bzr revid: hmo@tinyerp.com-20101014103234-jhitg1bav1vcvbqh
---
 addons/project_long_term/project_long_term_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index f124fc27c8c..2d893a57a34 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -373,14 +373,14 @@
             id="menu_project_phase"   parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
-            name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
+            name="Resource Allocations" parent="base.menu_project_long_term" sequence="3"/>
 
         <menuitem id="menu_pm_resources_project1"
             groups="base.group_extended"
             name="Resources" parent="project.menu_definitions" sequence="3"/>
 
         <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4" groups="project.group_project_user,project.group_project_manager,base.group_system"/>
-        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="project.menu_project_management" sequence="4"/>
+        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="base.menu_project_long_term" sequence="2"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
 

From 4d79e1553ec6766994a5659df8d01bc7c8922dc7 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 16:14:13 +0530
Subject: [PATCH 71/78] [IMP] project_scrum: improve calendar view of sprint

bzr revid: hmo@tinyerp.com-20101014104413-10gnihbtkdjh26lg
---
 addons/project_scrum/project_scrum_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 9b913f76294..0356dcb9ff0 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -197,7 +197,7 @@
             <field name="model">project.scrum.sprint</field>
             <field name="type">calendar</field>
             <field name="arch" type="xml">
-                <calendar string="Scrum Sprint" date_start="date_start" date_stop="date_stop">
+                <calendar string="Scrum Sprint" date_start="date_start">
                     <field name="name"/>
                     <field name="project_id"/>
                 </calendar>

From dca39945f2c31b00e2818e872bedb504ad68981e Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 16:45:01 +0530
Subject: [PATCH 72/78] [IMP] document: add index context in search filter in
 document list view

bzr revid: hmo@tinyerp.com-20101014111501-nbdlbwl6uea49vr0
---
 addons/document/document_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index eeb2a879cb6..840c8a4c9e1 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -291,6 +291,7 @@
                                 help="Filter on my documents" />
                         </field>
                     <field name="parent_id" />
+                    <field name="index_content"/>
                 </field>
             </field>
     </record>
@@ -308,7 +309,6 @@
                     <filter string="Partner" icon="terp-partner" domain="[]"
                        context="{'group_by':'partner_id'}"  groups="base.group_extended"/>
                     <filter string="Directory" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
-                    
                  </filter>
             </field>
     </record>

From 90efafbb37ed9dabfc89a5a487510bffbfc9c213 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 17:45:12 +0530
Subject: [PATCH 73/78] [IMP] project_long_term: improvement gantt view

bzr revid: hmo@tinyerp.com-20101014121512-7gjrlk5mvkdad8nl
---
 addons/project_long_term/project_long_term_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 2d893a57a34..9a4e89011e9 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -13,9 +13,9 @@
             <field name="model">project.resource.allocation</field>
             <field name="type">gantt</field>
             <field name="arch" type="xml">
-              <gantt color="phase_id" date_start="date_start" date_stop="date_end" string="R.A." mode="year">
-               <level object="project.resource.allocation" link="id" domain="[]">
-                    <field name="resource_id"/>
+              <gantt color="resource_id" date_start="date_start" date_stop="date_end" mode="year">
+               <level object="project.project" link="project_id" domain="[]">
+                    <field name="phase_id"/>
                 </level>
               </gantt>
             </field>
@@ -243,8 +243,8 @@
             <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <gantt color="responsible_id" date_stop="date_end" date_start="date_start" string="Phases">
-                    <level object="project.phase" link="id" domain="[]">
+                <gantt color="name" date_stop="date_end" date_start="date_start" mode="year">
+                    <level object="project.project" link="project_id" domain="[]">
                         <field name="name"/>
                     </level>
                 </gantt>

From 24e34984642c75bacc8a5662a41a8da5f51b4994 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 18:10:32 +0530
Subject: [PATCH 74/78] [IMP] resource: improve calendar view of resource leave

bzr revid: hmo@tinyerp.com-20101014124032-6xagruqhmrbuu93n
---
 addons/resource/resource_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index de602a177af..a0db745efb4 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -140,7 +140,7 @@
             <field name="model">resource.calendar.leaves</field>
             <field name="type">calendar</field>
             <field name="arch" type="xml">
-                <calendar color="resource_id" date_start="date_from" string="Resource">
+                <calendar color="resource_id" date_start="date_from" date_stop="date_to" string="Resource">
                     <field name="name"/>
                 </calendar>
             </field>

From 049fd624c33f12ad38f08dc991c41c34ac93d998 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 18:18:23 +0530
Subject: [PATCH 75/78] [IMP] project_scrum: remove project_id from search
 filter in scrum meeting

bzr revid: hmo@tinyerp.com-20101014124823-xdw1jqnsv5yz051t
---
 addons/project_scrum/project_scrum_view.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 0356dcb9ff0..cd4eb8e61b4 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -366,7 +366,6 @@
             <field name="arch" type="xml">
                 <calendar string="Scrum Meeting" date_start="date" color="user_id">
                     <field name="sprint_id"/>
-                    <field name="project_id"/>
                 </calendar>
             </field>
         </record>
@@ -430,7 +429,6 @@
                         <field name="sprint_id">
                             <filter icon="terp-check" string="Current" domain="[('sprint_id.state','in',('draft','open'))]" help="Current Sprints" default="1"/>
                         </field>
-                        <field name="project_id"/>
                         <field name="date"/>
                     </group>
                     <newline/>

From afb78caf8d830c4c49cf531568659870efa9d72c Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Thu, 14 Oct 2010 19:11:24 +0530
Subject: [PATCH 76/78] [IMP] project_long_term: gantt view and search view of
 phase

bzr revid: hmo@tinyerp.com-20101014134124-s90f56e5dn3cx28g
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 9a4e89011e9..713322f5f0e 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -230,9 +230,9 @@
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="responsible_id" date_start="date_start" date_stop="date_end" day_length="12" string="Phases">
+                <calendar color="project_id" date_start="date_start" date_stop="date_end" day_length="12">
                     <field name="name"/>
-                    <field name="project_id"/>
+                    <field name="responsible_id"/>
                 </calendar>
             </field>
         </record>
@@ -243,7 +243,7 @@
             <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <gantt color="name" date_stop="date_end" date_start="date_start" mode="year">
+                <gantt color="project_id" date_stop="date_end" date_start="date_start" mode="year">
                     <level object="project.project" link="project_id" domain="[]">
                         <field name="name"/>
                     </level>

From 4ff5ed7c7e8f18d98d1b3c22bf91b110763423ac Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 15 Oct 2010 14:59:55 +0530
Subject: [PATCH 77/78] [IMP] project_scrum: improve burndown chart

bzr revid: hmo@tinyerp.com-20101015092955-0ewjltoo3agtjfh1
---
 addons/project_scrum/report/_burndown.py      | 66 ++++++++++++-------
 .../project_scrum/report/sprint_burndown.py   | 36 ++++------
 addons/project_scrum/report/task_burndown.py  | 54 ++-------------
 3 files changed, 57 insertions(+), 99 deletions(-)

diff --git a/addons/project_scrum/report/_burndown.py b/addons/project_scrum/report/_burndown.py
index 6f0db24bcb6..b2cedd85881 100644
--- a/addons/project_scrum/report/_burndown.py
+++ b/addons/project_scrum/report/_burndown.py
@@ -19,44 +19,60 @@
 #
 ##############################################################################
 
-
-from mx import DateTime
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 import time
+import pooler
+from report.render import render
+class external_pdf(render):
+    def __init__(self, pdf):
+        render.__init__(self)
+        self.pdf = pdf
+        self.output_type='pdf'
+    def _render(self):
+        return self.pdf
 
-def compute_burndown(cr, uid, tasks_id, date_start, date_stop):
+def compute_burndown(cr, uid, tasks_ids, date_start, date_stop):
     latest = False
-    if len(tasks_id):
-        cr.execute('select id,create_date,state,planned_hours from project_task where id IN %s order by create_date',(tuple(tasks_id),))
-        tasks = cr.fetchall()
-
-        cr.execute('select w.date,w.hours from project_task_work w left join project_task t on (t.id=w.task_id) where t.id IN %s and t.state in (%s,%s) order by date',(tuple(tasks_id),'open','progress',))
-        tasks2 = cr.fetchall()
-
-        cr.execute('select date_end,planned_hours from project_task where id IN %s and state in (%s,%s) order by date_end' ,(tuple(tasks_id),'cancelled','done',))
-        tasks2 += cr.fetchall()
-        tasks2.sort()
+    pool = pooler.get_pool(cr.dbname)
+    project_task_pool = pool.get('project.task')
+    task_work_pool = pool.get('project.task.work')
+    if len(tasks_ids):
+        tasks_ids = project_task_pool.search(cr, uid, [('id','in',tasks_ids)], order='create_date')
+        tasks = project_task_pool.read(cr, uid, tasks_ids, ['create_date','planned_hours','state'])
+        tasks_ids = project_task_pool.search(cr, uid, [('id','in',tasks_ids),('state', 'in', ['open','progress'])], order='create_date')
+        work_ids = task_work_pool.search(cr, uid, [('task_id','in',tasks_ids)], order='date')
+        close_tasks = task_work_pool.read(cr, uid, work_ids, ['date','hours','state'])        
+        tasks_ids = project_task_pool.search(cr, uid, [('id','in',tasks_ids),('state', 'in', ['cancelled','done'])], order='date_end')
+        close_tasks += project_task_pool.read(cr, uid, tasks_ids, ['date_end','planned_hours'])
+        
     else:
         tasks = []
-        tasks2 = []
+        close_tasks = []
 
     current_date = date_start
     total = 0
     done = 0
     result = []
-    while current_date<=date_stop:
-        while len(tasks) and tasks[0][1] and tasks[0][1][:10]<=current_date:
+    while datetime.strptime(current_date, '%Y-%m-%d') <= datetime.strptime(date_stop, '%Y-%m-%d'):
+        while len(tasks) and tasks[0]['create_date'] and datetime.strptime(tasks[0]['create_date'][:10], '%Y-%m-%d')<=datetime.strptime(current_date, '%Y-%m-%d'):
             latest = tasks.pop(0)
-            total += latest[3]
+            total += float(latest.get('planned_hours',0.0))
         i = 0
-        while i<len(tasks2):
-            if tasks2[i][0] and tasks2[i][0][:10]<=current_date:
-                t = tasks2.pop(i)
-                done += t[1]
-            else:
-                i+=1
+        while i < len(close_tasks):
+            if close_tasks[i]:
+                date_end = close_tasks[i].get('date',False)
+                hours = float(close_tasks[i].get('hours',0.0))
+                if not date_end:
+                    date_end = close_tasks[i].get('date_end',False)
+                    hours = float(close_tasks[i].get('planned_hours',0.0))
+                if datetime.strptime(date_end[:10], '%Y-%m-%d')<=datetime.strptime(current_date, '%Y-%m-%d'):
+                    t = close_tasks.pop(i)
+                    done += hours
+            i+=1
         result.append( (int(time.mktime(time.strptime(current_date,'%Y-%m-%d'))), total-done) )
-        current_date = (DateTime.strptime(current_date, '%Y-%m-%d') + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d')
-        if not len(tasks) and not len(tasks2):
+        current_date = (datetime.strptime(current_date, '%Y-%m-%d') + relativedelta(days=1)).strftime('%Y-%m-%d')
+        if not len(tasks) and not len(close_tasks):
             break
     result.append( (int(time.mktime(time.strptime(date_stop,'%Y-%m-%d'))), 0) )
     return result
diff --git a/addons/project_scrum/report/sprint_burndown.py b/addons/project_scrum/report/sprint_burndown.py
index 2bbe69be485..c7388b0e790 100644
--- a/addons/project_scrum/report/sprint_burndown.py
+++ b/addons/project_scrum/report/sprint_burndown.py
@@ -25,22 +25,13 @@ import pooler
 from report.render import render
 from report.interface import report_int
 
-from mx import DateTime
+from datetime import datetime
 import time
 
 from pychart import *
 import pychart.legend
 
 import _burndown
-
-class external_pdf(render):
-    def __init__(self, pdf):
-        render.__init__(self)
-        self.pdf = pdf
-        self.output_type='pdf'
-    def _render(self):
-        return self.pdf
-
 class report_tasks(report_int):
     def create(self, cr, uid, ids, datas, context=None):
         if context is None:
@@ -49,24 +40,19 @@ class report_tasks(report_int):
 
         canv = canvas.init(fname=io, format='pdf')
         canv.set_author("OpenERP")
-
-        cr.execute('select id,date_start,date_stop from project_scrum_sprint where id=%s', (datas['id'],))
-        for (id,date_start,date_stop) in cr.fetchall():
-            cr.execute('select id from project_task where product_backlog_id in(select id from project_scrum_product_backlog where sprint_id=%s)', (id,))
-
-            ids = map(lambda x: x[0], cr.fetchall())
-            datas = _burndown.compute_burndown(cr, uid, ids, date_start, date_stop)
-
+        pool = pooler.get_pool(cr.dbname)
+        sprint_pool = pool.get('project.scrum.sprint')
+        task_pool = pool.get('project.task')
+        int_to_date = lambda x: '/a60{}' + datetime(time.localtime(x).tm_year, time.localtime(x).tm_mon, time.localtime(x).tm_mday).strftime('%d %m %Y')
+        for sprint in sprint_pool.browse(cr, uid, ids, context=context):
+            task_ids = task_pool.search(cr, uid, [('sprint_id','=',sprint.id)], context=context)
+            datas = _burndown.compute_burndown(cr, uid, task_ids, sprint.date_start, sprint.date_stop)
             max_hour = reduce(lambda x,y: max(y[1],x), datas, 0)
-
-            date_to_int = lambda x: int(x.ticks())
-            int_to_date = lambda x: '/a60{}'+DateTime.localtime(x).strftime('%d %m %Y')
-
             def _interval_get(*args):
                 result = []
                 for i in range(20):
-                    d = DateTime.localtime(datas[0][0] + (((datas[-1][0]-datas[0][0])/20)*(i+1)))
-                    res = DateTime.DateTime(d.year, d.month, d.day).ticks()
+                    d = time.localtime(datas[0][0] + (((datas[-1][0]-datas[0][0])/20)*(i+1)))
+                    res = time.mktime(d)
                     if (not result) or result[-1]<>res:
                         result.append(res)
                 return result
@@ -92,7 +78,7 @@ class report_tasks(report_int):
             ar.draw(canv)
         canv.close()
 
-        self.obj = external_pdf(io.getvalue())
+        self.obj = _burndown.external_pdf(io.getvalue())
         self.obj.render()
         return (self.obj.pdf, 'pdf')
 report_tasks('report.scrum.sprint.burndown')
diff --git a/addons/project_scrum/report/task_burndown.py b/addons/project_scrum/report/task_burndown.py
index 50a02792ced..14807126503 100644
--- a/addons/project_scrum/report/task_burndown.py
+++ b/addons/project_scrum/report/task_burndown.py
@@ -20,53 +20,14 @@
 ##############################################################################
 
 import StringIO
-
 from report.render import render
 from report.interface import report_int
-
-from mx import DateTime
+from datetime import datetime
 import time
-
 from pychart import *
 import pychart.legend
-
 import _burndown
 
-class external_pdf(render):
-    def __init__(self, pdf):
-        render.__init__(self)
-        self.pdf = pdf
-        self.output_type='pdf'
-    def _render(self):
-        return self.pdf
-
-def burndown_chart(cr, uid, tasks_id, date_start, date_stop):
-    latest = False
-
-    cr.execute('select id,date_start,state,planned_hours from project_task where id IN %s order by date_start'(tuple(tasks_id),))
-    tasks = cr.fetchall()
-    cr.execute('select id,date_end,state,planned_hours*progress/100 from project_task where id IN %s  and state in (%s,%s) order by date_end', (tuple(tasks_id),'progress','done',))
-    tasks2 = cr.fetchall()
-    current_date = date_start
-    total = 0
-    done = 0
-    result = []
-    while current_date<=date_stop:
-        while len(tasks) and tasks[0][1] and tasks[0][1][:10]<=current_date:
-            total += tasks.pop(0)[3]
-        while len(tasks2) and tasks2[0][1] and tasks2[0][1][:10]<=current_date:
-            t2 = tasks2.pop(0)
-            if t2[2]<>'cancel':
-                done += t2[3]
-            else:
-                total -= t2[3]
-        result.append( (int(time.mktime(time.strptime(current_date,'%Y-%m-%d'))), total-done) )
-        current_date = (DateTime.strptime(current_date, '%Y-%m-%d') + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d')
-        if not len(tasks) and not len(tasks2):
-            break
-    result.append( (int(time.mktime(time.strptime(date_stop,'%Y-%m-%d'))), 0) )
-    return result
-
 class report_tasks(report_int):
     def create(self, cr, uid, ids, datas, context=None):
         if context is None:
@@ -87,24 +48,19 @@ class report_tasks(report_int):
             if res[1] and datas['date_stop']<res[1]:
                 datas['date_stop'] = res[1][:10]
 
-        date_to_int = lambda x: int(x.ticks())
-        int_to_date = lambda x: '/a60{}'+DateTime.localtime(x).strftime('%d/%m/%Y')
-
         datas = _burndown.compute_burndown(cr, uid, ids, datas['date_start'], datas['date_stop'])
-
         canv = canvas.init(fname=io, format='pdf')
         canv.set_author("OpenERP")
 
         max_hour = reduce(lambda x,y: max(y[1],x), datas, 0)
 
-        date_to_int = lambda x: int(x.ticks())
-        int_to_date = lambda x: '/a60{}'+DateTime.localtime(x).strftime('%d %m %Y')
+        int_to_date = lambda x: '/a60{}' + datetime(time.localtime(x).tm_year, time.localtime(x).tm_mon, time.localtime(x).tm_mday).strftime('%d %m %Y')
 
         def _interval_get(*args):
             result = set()
             for i in range(20):
-                d = DateTime.localtime(datas[0][0] + (((datas[-1][0]-datas[0][0])/20)*(i+1)))
-                res = DateTime.DateTime(d.year, d.month, d.day).ticks()
+                d = time.localtime(datas[0][0] + (((datas[-1][0]-datas[0][0])/20)*(i+1)))
+                res = time.mktime(d)
                 result.add(res)
 
             return list(result)
@@ -126,7 +82,7 @@ class report_tasks(report_int):
         ar.draw(canv)
         canv.close()
 
-        self.obj = external_pdf(io.getvalue())
+        self.obj = _burndown.external_pdf(io.getvalue())
         self.obj.render()
         return (self.obj.pdf,'pdf')
 report_tasks('report.project.tasks.burndown')

From 37583b3bf2d0863cec8b7f446122e8995aeccb64 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Fri, 15 Oct 2010 16:13:08 +0530
Subject: [PATCH 78/78] [IMP] project: demo data

bzr revid: hmo@tinyerp.com-20101015104308-tk3epmz3lnx5o2bw
---
 addons/hr_timesheet/hr_timesheet_view.xml     |   1 -
 addons/project/project_demo.xml               | 210 ++++++++++++++++
 .../project_long_term_demo.xml                | 234 ++++--------------
 .../test/schedule_phase_tasks.yml             |  22 +-
 .../test/schedule_project_tasks.yml           |  22 +-
 addons/project_timesheet/__openerp__.py       |   2 +-
 .../project_timesheet_demo.xml                |  60 +++++
 7 files changed, 335 insertions(+), 216 deletions(-)
 create mode 100644 addons/project_timesheet/project_timesheet_demo.xml

diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d2da8e6ea9e..08ec23bd872 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -101,7 +101,6 @@
 
     <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
     <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
-    <menuitem id="menu_partner_invc" parent="base.menu_project_management_time_tracking" action="account.action_invoice_tree1"/>
 
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index e365d095a20..8d3752c0979 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -2,6 +2,216 @@
 <openerp>
     <data noupdate="1">
 
+         <!-- Users -->
+
+        <record id="res_users_analyst" model="res.users">
+            <field name="name">Phuong</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
+            <field name="login">phu</field>
+            <field name="password">phu</field>
+        </record>
+        <record id="res_users_project_manager" model="res.users">
+            <field name="name">Anthony</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
+            <field name="login">al</field>
+            <field name="password">al</field>
+        </record>
+        <record id="res_users_technical_leader" model="res.users">
+            <field name="name">Quentin</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="login">qdp</field>
+            <field name="password">qdp</field>
+        </record>
+        <record id="res_users_developer" model="res.users">
+            <field name="name">Francois</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="login">fpi</field>
+            <field name="password">fpi</field>
+        </record>
+        <record id="res_users_designer" model="res.users">
+            <field name="name">Julien</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="login">jth</field>
+            <field name="password">jth</field>
+        </record>
+        <record id="res_users_tester" model="res.users">
+            <field name="name">Alien</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
+            <field name="login">apr</field>
+            <field name="password">apr</field>
+        </record>
+        <record id="res_users_finacial_manager" model="res.users">
+            <field name="name">Fabian</field>
+            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_finance')])]" name="groups_id"/>
+            <field name="login">fbs</field>
+            <field name="password">fbs</field>
+        </record>
+
+        <!-- Projects -->
+        <record id="project_integrate_openerp" model="project.project">
+            <field name="date_start" eval="time.strftime('%Y-%m-01 10:00:00')"/>
+            <field name="state">open</field>
+            <field name="type">normal</field>
+            <field name="description">Integrate a Sale and Warehouse Management.</field>
+            <field eval="[(6, 0, [
+                    ref('project.res_users_analyst'),
+                    ref('project.res_users_project_manager'),
+                    ref('project.res_users_technical_leader'),
+                    ref('project.res_users_developer'),
+                    ref('project.res_users_designer'),
+                    ref('project.res_users_tester'),
+                    ref('project.res_users_finacial_manager')])]" name="members"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="name">Integrate a Sale and Warehouse Management.</field>
+        </record>
+
+        <!-- Tasks -->
+
+        <record id="project_task_1" model="project.task">
+            <field eval="100.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Prepare Requirements Document</field>
+        </record>
+
+        <record id="project_task_2" model="project.task">
+            <field eval="80.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Make SRS</field>
+        </record>
+
+        <record id="project_task_3" model="project.task">
+            <field eval="40.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Design Use Cases</field>
+        </record>
+
+        <record id="project_task_4" model="project.task">
+            <field eval="25.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Budget Planning</field>
+        </record>
+
+        <record id="project_task_5" model="project.task">
+            <field eval="25.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Quality Planning</field>
+        </record>
+
+        <record id="project_task_6" model="project.task">
+            <field eval="20.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Risk Management Planning</field>
+        </record>
+
+        <record id="project_task_7" model="project.task">
+            <field eval="30.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Create Project Schedules</field>
+        </record>
+
+        <record id="project_task_8" model="project.task">
+            <field eval="10.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Dataflow Design</field>
+        </record>
+
+        <record id="project_task_9" model="project.task">
+            <field eval="50.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">User Interface Design</field>
+        </record>
+
+        <record id="project_task_10" model="project.task">
+            <field eval="40.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Develop Module in Sale Management</field>
+        </record>
+
+        <record id="project_task_11" model="project.task">
+            <field eval="90.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Develop module in Warehouse</field>
+        </record>
+
+        <record id="project_task_12" model="project.task">
+            <field eval="20.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Integrate Modules</field>
+        </record>
+
+        <record id="project_task_13" model="project.task">
+            <field eval="50.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Unit Testing</field>
+        </record>
+
+        <record id="project_task_14" model="project.task">
+            <field eval="30.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Regression Test</field>
+        </record>
+
+        <record id="project_task_15" model="project.task">
+            <field eval="15.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Documentation</field>
+        </record>
+
+        <record id="project_task_16" model="project.task">
+            <field eval="10" name="sequence"/>
+            <field eval="40.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Performance Tuning</field>
+        </record>
+
+        <record id="project_task_17" model="project.task">
+            <field eval="5.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Deploy and Review on Customer System</field>
+        </record>
+
+        <record id="project_task_18" model="project.task">
+            <field eval="10.0" name="planned_hours"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="priority">2</field>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
+            <field name="name">Training and Presentation</field>
+        </record>
+
         <!--
 	Resource: project.project
 	-->
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 4de53c0f38d..3bc236dee26 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -2,115 +2,56 @@
 <openerp>
     <data noupdate="1">
 <!--
-This Demo data file includes Users, Human Resources, Projects and it' members list, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
+This Demo data file Human Resources, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
 -->
-        <!-- Users -->
-
-        <record id="res_users_analyst" model="res.users">
-            <field name="name">Phuong</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
-            <field name="login">phu</field>
-            <field name="password">phu</field>
-        </record>
-        <record id="res_users_project_manager" model="res.users">
-            <field name="name">Anthony</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
-            <field name="login">al</field>
-            <field name="password">al</field>
-        </record>
-        <record id="res_users_technical_leader" model="res.users">
-            <field name="name">Quentin</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">qdp</field>
-            <field name="password">qdp</field>
-        </record>
-        <record id="res_users_developer" model="res.users">
-            <field name="name">Francois</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">fpi</field>
-            <field name="password">fpi</field>
-        </record>
-        <record id="res_users_designer" model="res.users">
-            <field name="name">Julien</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">jth</field>
-            <field name="password">jth</field>
-        </record>
-        <record id="res_users_tester" model="res.users">
-            <field name="name">Alien</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
-            <field name="login">apr</field>
-            <field name="password">apr</field>
-        </record>
-        <record id="res_users_finacial_manager" model="res.users">
-            <field name="name">Fabian</field>
-            <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_finance')])]" name="groups_id"/>
-            <field name="login">fbs</field>
-            <field name="password">fbs</field>
-        </record>
+       
 
         <!-- Human Resources -->
         <record id="resource_analyst" model="resource.resource">
-            <field name="user_id" ref="res_users_analyst"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
             <field name="name">Analyst</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_project_manager" model="resource.resource">
-            <field name="user_id" ref="res_users_project_manager"/>
+            <field name="user_id" ref="project.res_users_project_manager"/>
             <field name="name">Project Manager</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
          <record id="resource_technical_leader" model="resource.resource">
-            <field name="user_id" ref="res_users_technical_leader"/>
+            <field name="user_id" ref="project.res_users_technical_leader"/>
             <field name="name">Technical Leader</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_developer" model="resource.resource">
-            <field name="user_id" ref="res_users_developer"/>
+            <field name="user_id" ref="project.res_users_developer"/>
             <field name="name">Developer</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_designer" model="resource.resource">
-            <field name="user_id" ref="res_users_designer"/>
+            <field name="user_id" ref="project.res_users_designer"/>
             <field name="name">Designer</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_tester" model="resource.resource">
-            <field name="user_id" ref="res_users_tester"/>
+            <field name="user_id" ref="project.res_users_tester"/>
             <field name="name">Tester</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
         <record id="resource_finacial_manager" model="resource.resource">
-            <field name="user_id" ref="res_users_finacial_manager"/>
+            <field name="user_id" ref="project.res_users_finacial_manager"/>
             <field name="name">Project Finacial Manager</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
 
 
 
-        <!-- Projects -->
-        <record id="project_integrate_openerp" model="project.project">
-            <field name="date_start" eval="time.strftime('%Y-%m-01 10:00:00')"/>
-            <field name="state">open</field>
-            <field name="type">normal</field>
-            <field name="description">Integrate an Sale and Warehouse Management.</field>
-            <field eval="[(6, 0, [
-                    ref('res_users_analyst'),
-                    ref('res_users_project_manager'),
-                    ref('res_users_technical_leader'),
-                    ref('res_users_developer'),
-                    ref('res_users_designer'),
-                    ref('res_users_tester'),
-                    ref('res_users_finacial_manager')])]" name="members"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="name">Integrate an Sale and Warehouse Management.</field>
-        </record>
+        
 
         <!-- Project Phases -->
         <record id="project_phase_1" model="project.phase">
@@ -119,8 +60,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="1" name="sequence"/>
             <field name="duration">30</field>
-            <field name="responsible_id" ref="res_users_analyst"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_analyst"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_2" model="project.phase">
@@ -129,8 +70,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="2" name="sequence"/>
             <field name="duration">20</field>
-            <field name="responsible_id" ref="res_users_project_manager"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_project_manager"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_3" model="project.phase">
@@ -139,8 +80,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="3" name="sequence"/>
             <field name="duration">20</field>
-            <field name="responsible_id" ref="res_users_project_manager"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_project_manager"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_4" model="project.phase">
@@ -149,8 +90,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="4" name="sequence"/>
             <field name="duration">90</field>
-            <field name="responsible_id" ref="res_users_technical_leader"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_technical_leader"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_5" model="project.phase">
@@ -159,8 +100,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="5" name="sequence"/>
             <field name="duration">30</field>
-            <field name="responsible_id" ref="res_users_project_manager"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_project_manager"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <record id="project_phase_6" model="project.phase">
@@ -169,8 +110,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="product_uom" ref="product.uom_day"/>
             <field eval="5" name="sequence"/>
             <field name="duration">10</field>
-            <field name="responsible_id" ref="res_users_analyst"/>
-            <field name="project_id" ref="project_integrate_openerp"/>
+            <field name="responsible_id" ref="project.res_users_analyst"/>
+            <field name="project_id" ref="project.project_integrate_openerp"/>
         </record>
 
         <!--  Project Resource Allocation -->
@@ -221,173 +162,82 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
 
         <!-- Tasks -->
 
-        <record id="project_task_1" model="project.task">
-            <field eval="100.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_analyst"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Prepare Requirements Document</field>
+        <record id="project.project_task_1" model="project.task">
             <field name="phase_id" ref="project_phase_1"/>
         </record>
 
-        <record id="project_task_2" model="project.task">
-            <field eval="80.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_analyst"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Make SRS</field>
+        <record id="project.project_task_2" model="project.task">
             <field name="phase_id" ref="project_phase_1"/>
         </record>
 
-        <record id="project_task_3" model="project.task">
-            <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Design Use Cases</field>
+        <record id="project.project_task_3" model="project.task">
             <field name="phase_id" ref="project_phase_2"/>
         </record>
 
-        <record id="project_task_4" model="project.task">
-            <field eval="25.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Budget Planning</field>
+        <record id="project.project_task_4" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_5" model="project.task">
-            <field eval="25.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Quality Planning</field>
+        <record id="project.project_task_5" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_6" model="project.task">
-            <field eval="20.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Risk Management Planning</field>
+        <record id="project.project_task_6" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_7" model="project.task">
-            <field eval="30.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Create Project Schedules</field>
+        <record id="project.project_task_7" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_8" model="project.task">
-            <field eval="10.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Dataflow Design</field>
+        <record id="project.project_task_8" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_9" model="project.task">
-            <field eval="50.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_project_manager"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">User Interface Design</field>
+        <record id="project.project_task_9" model="project.task">
             <field name="phase_id" ref="project_phase_3"/>
         </record>
 
-        <record id="project_task_10" model="project.task">
-            <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_developer"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Develop Module in Sale Management</field>
+        <record id="project.project_task_10" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_11" model="project.task">
-            <field eval="90.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_developer"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Develop module in Warehouse</field>
+        <record id="project.project_task_11" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_12" model="project.task">
-            <field eval="20.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_developer"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Integrate Modules</field>
+        <record id="project.project_task_12" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_13" model="project.task">
-            <field eval="50.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_tester"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Unit Testing</field>
+        <record id="project.project_task_13" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_14" model="project.task">
-            <field eval="30.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_tester"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Regression Test</field>
+        <record id="project.project_task_14" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_15" model="project.task">
-            <field eval="15.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_developer"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Documentation</field>
+        <record id="project.project_task_15" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_16" model="project.task">
-            <field eval="10" name="sequence"/>
-            <field eval="40.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_tester"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Performance Tuning</field>
+        <record id="project.project_task_16" model="project.task">
             <field name="phase_id" ref="project_phase_4"/>
         </record>
 
-        <record id="project_task_17" model="project.task">
-            <field eval="5.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_analyst"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Deploy and Review on Customer System</field>
+        <record id="project.project_task_17" model="project.task">
             <field name="phase_id" ref="project_phase_6"/>
         </record>
 
-        <record id="project_task_18" model="project.task">
-            <field eval="10.0" name="planned_hours"/>
-            <field name="user_id" ref="res_users_analyst"/>
-            <field name="priority">2</field>
-            <field name="project_id" ref="project_integrate_openerp"/>
-            <field name="name">Training and Presentation</field>
+        <record id="project.project_task_18" model="project.task">
             <field name="phase_id" ref="project_phase_6"/>
         </record>
 
         <!-- run scheduling of phase -->
-        <function model="project.project" name="schedule_phases" eval="(ref('project_integrate_openerp'),)"/>
+        <function model="project.project" name="schedule_phases" eval="(ref('project.project_integrate_openerp'),)"/>
         <!-- run scheduling of tasks -->
-        <function model="project.project" name="schedule_tasks" eval="(ref('project_integrate_openerp'),)"/>
+        <function model="project.project" name="schedule_tasks" eval="(ref('project.project_integrate_openerp'),)"/>
 
     </data>
 </openerp>
diff --git a/addons/project_long_term/test/schedule_phase_tasks.yml b/addons/project_long_term/test/schedule_phase_tasks.yml
index 150d80af822..aa54fa1ac57 100644
--- a/addons/project_long_term/test/schedule_phase_tasks.yml
+++ b/addons/project_long_term/test/schedule_phase_tasks.yml
@@ -4,13 +4,13 @@
   !record {model: project.project, id: project_project_project0}:
     name: Develop an outlook-openerp synchronization plugin
     members:
-      - project_long_term.res_users_project_manager
-      - project_long_term.res_users_technical_leader
-      - project_long_term.res_users_developer
-      - project_long_term.res_users_designer
-      - project_long_term.res_users_tester
-      - project_long_term.res_users_analyst
-      - project_long_term.res_users_finacial_manager
+      - project.res_users_project_manager
+      - project.res_users_technical_leader
+      - project.res_users_developer
+      - project.res_users_designer
+      - project.res_users_tester
+      - project.res_users_analyst
+      - project.res_users_finacial_manager
 - 
   Create phase 'Develop GUI' in Outlook
 - 
@@ -40,7 +40,7 @@
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
     
 - 
   Create the phase task 'Develop GUI for Modules Configuration'
@@ -52,7 +52,7 @@
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
 - 
   Create the phase task 'Develop GUI for OpenERP Synchronisation'
 - 
@@ -63,7 +63,7 @@
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
 - 
   Create the phase task 'Design required GUI/Menus'
 - 
@@ -74,7 +74,7 @@
     state: draft
     phase_id: project_phase_phase0
     project_id: project_project_project0
-    user_id: project_long_term.res_users_designer
+    user_id: project.res_users_designer
     
 - 
   Schedule phase tasks
diff --git a/addons/project_long_term/test/schedule_project_tasks.yml b/addons/project_long_term/test/schedule_project_tasks.yml
index dfc4cf1fc5e..04a05437487 100644
--- a/addons/project_long_term/test/schedule_project_tasks.yml
+++ b/addons/project_long_term/test/schedule_project_tasks.yml
@@ -4,13 +4,13 @@
   !record {model: project.project, id: project_project_project1}:
     name: Develop a thunderbird-openerp synchronization plugin
     members:
-      - project_long_term.res_users_project_manager
-      - project_long_term.res_users_technical_leader
-      - project_long_term.res_users_developer
-      - project_long_term.res_users_designer
-      - project_long_term.res_users_tester
-      - project_long_term.res_users_analyst
-      - project_long_term.res_users_finacial_manager
+      - project.res_users_project_manager
+      - project.res_users_technical_leader
+      - project.res_users_developer
+      - project.res_users_designer
+      - project.res_users_tester
+      - project.res_users_analyst
+      - project.res_users_finacial_manager
         
 - 
   Create phase 'Develop GUI' in thunderbird
@@ -41,7 +41,7 @@
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
     
 - 
   Create the phase task 'Develop GUI for Modules Configuration'
@@ -53,7 +53,7 @@
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
 - 
   Create the phase task 'Develop GUI for OpenERP Synchronisation'
 - 
@@ -64,7 +64,7 @@
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    user_id: project_long_term.res_users_developer
+    user_id: project.res_users_developer
 - 
   Create the phase task 'Design required GUI/Menus'
 - 
@@ -75,7 +75,7 @@
     state: draft
     phase_id: project_phase_phase1
     project_id: project_project_project1
-    user_id: project_long_term.res_users_designer
+    user_id: project.res_users_designer
     
     
 - 
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index e1be86fe661..fbf3d389739 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -33,7 +33,7 @@
     'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'],
     'init_xml': [],
     'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"],
-    'demo_xml': [],
+    'demo_xml': ["project_timesheet_demo.xml"],
     'test': [
         'test/worktask_entry_to_timesheetline_entry.yml',
     ],
diff --git a/addons/project_timesheet/project_timesheet_demo.xml b/addons/project_timesheet/project_timesheet_demo.xml
new file mode 100644
index 00000000000..8eec74bc9e5
--- /dev/null
+++ b/addons/project_timesheet/project_timesheet_demo.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- Example employee -->
+        <record id="hr.employee2" model="hr.employee">
+            <field name="user_id" ref="project.res_users_technical_leader"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+
+        <record id="hr.employee3" model="hr.employee">
+            <field name="user_id" ref="project.res_users_project_manager"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+
+        <record id="hr.employee4" model="hr.employee">
+            <field name="name">Phuong</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_analyst"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+
+        <record id="hr.employee5" model="hr.employee">
+            <field name="name">Francois</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_developer"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+        <record id="hr.employee6" model="hr.employee">
+            <field name="name">Julien</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_designer"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+        <record id="hr.employee7" model="hr.employee">
+            <field name="name">Alien</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_tester"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+        <record id="hr.employee8" model="hr.employee">
+            <field name="name">Fabian</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
+            <field name="user_id" ref="project.res_users_finacial_manager"/>
+            <field name="category_ids" eval="[(6, 0, [ref('hr.category_employee')])]"/>
+            <field name="product_id" ref="hr_timesheet.product_consultant"/>
+            <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
+        </record>
+
+    </data>
+</openerp>