- [[ formatLang(line.date_value,date = True) ]]
+ [[ formatLang(line.date_value,date=True) ]]
[[ line.name or '' ]] [[ line.description or '' ]]
@@ -259,7 +259,7 @@
- [[ setTag('para','xpre') ]] [[ o.note or '' ]]
+ [[ o.note or '' ]] [[ setTag('para','xpre') ]]
diff --git a/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py b/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
index 5ee6e894cf5..a59dbbf85eb 100644
--- a/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
+++ b/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
@@ -21,14 +21,15 @@
__name__ = "Convert the Holidays Per User limits into positive leave request"
def migrate(cr, version):
- cr.execute("""SELECT id, employee_id, holiday_status, max_leaves, notes, create_uid
- FROM hr_holidays_per_user;""")
- for record in cr.fetchall():
- cr.execute("""INSERT INTO hr_holidays
- (employee_id, type, allocation_type, name, holiday_status_id,
- state, number_of_days, notes, manager_id) VALUES
- (%s, 'add', 'company', 'imported holiday_per_user', %s,
- 'validated', %s, %s, %s) """, (record[1],record[2],record[3],record[4],record[5]))
+# cr.execute("""SELECT id, employee_id, holiday_status, max_leaves, notes, create_uid
+# FROM hr_holidays_per_user;""")
+# for record in cr.fetchall():
+# cr.execute("""INSERT INTO hr_holidays
+# (employee_id, type, allocation_type, name, holiday_status_id,
+# state, number_of_days, notes, manager_id) VALUES
+# (%s, 'add', 'company', 'imported holiday_per_user', %s,
+# 'validated', %s, %s, %s) """, (record[1],record[2],record[3],record[4],record[5]))
+ return {}
diff --git a/addons/hr_holidays/report/hr_custom_default.xsl b/addons/hr_holidays/report/hr_custom_default.xsl
index 39e71d6d53e..e8b133da1b0 100644
--- a/addons/hr_holidays/report/hr_custom_default.xsl
+++ b/addons/hr_holidays/report/hr_custom_default.xsl
@@ -9,8 +9,6 @@
1.3cm 19.3cm 28.5cm 19.3cm
@@ -23,8 +21,6 @@
1.3cm 19.3cm 28.5cm 19.3cm
diff --git a/addons/hr_payroll/report/report_employees_detail.py b/addons/hr_payroll/report/report_employees_detail.py
index fe4b0537896..efa4c1ee236 100644
--- a/addons/hr_payroll/report/report_employees_detail.py
+++ b/addons/hr_payroll/report/report_employees_detail.py
@@ -218,7 +218,7 @@ class employees_salary_report(rml_parse.rml_parse):
def get_monthly_total(self):
return self.month_total_list
-report_sxw.report_sxw('report.employees.salary', 'hr.payslip', 'hr_payroll/report/report_employees_detail.rml', parser=employees_salary_report,header=3)
+report_sxw.report_sxw('report.employees.salary', 'hr.payslip', 'hr_payroll/report/report_employees_detail.rml', parser=employees_salary_report,header='internal landscape')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index b4e577e1f22..542e370eb34 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -616,4 +616,4 @@
-
+
\ No newline at end of file
diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
index 527491552aa..212bb59e7b3 100755
--- a/addons/hr_payroll/report/report_year_report.rml
+++ b/addons/hr_payroll/report/report_year_report.rml
@@ -296,4 +296,4 @@
-
+
\ No newline at end of file
diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py
index 6c830b80941..0a7857582d4 100755
--- a/addons/hr_payroll/report/report_year_salary.py
+++ b/addons/hr_payroll/report/report_year_salary.py
@@ -95,7 +95,7 @@ class year_salary_report(rml_parse.rml_parse):
self.total += item[count]
return self.total
-report_sxw.report_sxw('report.year.salary', 'hr.payslip', 'hr_payroll/report/report_year_report.rml', parser=year_salary_report,header=3)
+report_sxw.report_sxw('report.year.salary', 'hr.payslip', 'hr_payroll/report/report_year_report.rml', parser=year_salary_report,header='internal landscape')
diff --git a/addons/hr_payroll/report/rml_parse.py b/addons/hr_payroll/report/rml_parse.py
index 2e3ca9dc019..7abb29711b6 100755
--- a/addons/hr_payroll/report/rml_parse.py
+++ b/addons/hr_payroll/report/rml_parse.py
@@ -151,10 +151,10 @@ class rml_parse(report_sxw.rml_parse):
print Stringer
return Stringer
- def _add_header(self, node, header=1):
- if header==2:
+ def _add_header(self, node, header='external'):
+ if header=='internal':
rml_head = self.rml_header2
- elif header==3:
+ elif header=='internal landscape':
rml_head = self.rml_header3
else:
rml_head = self.rml_header
diff --git a/addons/hr_timesheet/report/custom_default.xsl b/addons/hr_timesheet/report/custom_default.xsl
index 39e71d6d53e..e8b133da1b0 100644
--- a/addons/hr_timesheet/report/custom_default.xsl
+++ b/addons/hr_timesheet/report/custom_default.xsl
@@ -9,8 +9,6 @@
1.3cm 19.3cm 28.5cm 19.3cm
@@ -23,8 +21,6 @@
1.3cm 19.3cm 28.5cm 19.3cm
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index f45490867c2..dfcda5ec534 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -31,9 +31,9 @@ reports, eso.""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['account', 'hr_timesheet'],
- 'init_xml': [],
- 'update_xml': [
+ 'data': [
'security/ir.model.access.csv',
+ 'hr_timesheet_invoice_data.xml',
'hr_timesheet_invoice_view.xml',
'hr_timesheet_invoice_wizard.xml',
'hr_timesheet_invoice_report.xml',
@@ -45,11 +45,12 @@ reports, eso.""",
'wizard/hr_timesheet_invoice_create_final_view.xml',
'board_hr_timesheet_invoice.xml',
],
- 'demo_xml': ['hr_timesheet_invoice_demo.xml',
- ],
+ 'demo': [
+ 'hr_timesheet_invoice_demo.xml',
+ ],
'test': ['test/test_hr_timesheet_invoice.yml',
'test/hr_timesheet_invoice_report.yml',
- ],
+ ],
'installable': True,
'active': False,
'certificate': '0056091842381',
diff --git a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
index ff61617661c..792ea34ae53 100644
--- a/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
+++ b/addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
@@ -11,7 +11,7 @@
graph,tree
-
+
-
+
timesheet.uninvoiced.line.tree
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
new file mode 100644
index 00000000000..a81af0788b6
--- /dev/null
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ Yes (100%)
+ 100%
+ 0.0
+
+
+
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
index adc9e47b033..ee6bdf23538 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
@@ -1,36 +1,24 @@
-
-
- 100%
- 0.0
-
-
50%
50% Discount
50.0
-
Gratis
Offered developments
100.0
-
-
-
-
diff --git a/addons/hr_timesheet_invoice/report/cost_ledger.py b/addons/hr_timesheet_invoice/report/cost_ledger.py
index 8daf40fded6..18de548ad1c 100644
--- a/addons/hr_timesheet_invoice/report/cost_ledger.py
+++ b/addons/hr_timesheet_invoice/report/cost_ledger.py
@@ -167,7 +167,7 @@ report_sxw.report_sxw(
'report.hr.timesheet.invoice.account.analytic.account.cost_ledger',
'account.analytic.account',
'addons/hr_timesheet_invoice/report/cost_ledger.rml',
- parser=account_analytic_cost_ledger, header=False)
+ parser=account_analytic_cost_ledger, header='internal')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/i18n/ar.po b/addons/mrp/i18n/ar.po
index f2b3d711f2e..3c0a5730203 100644
--- a/addons/mrp/i18n/ar.po
+++ b/addons/mrp/i18n/ar.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index 44e7b102d18..a1bd0ba39d7 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.po
@@ -565,7 +565,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/bs.po b/addons/mrp/i18n/bs.po
index 4d3fd7169e9..6114a513680 100644
--- a/addons/mrp/i18n/bs.po
+++ b/addons/mrp/i18n/bs.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index 6a674f9d1c3..ed1ee7ba401 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/i18n/ca.po
@@ -584,7 +584,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Temps en hores per realitzar un cicle."
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Data final"
diff --git a/addons/mrp/i18n/cs.po b/addons/mrp/i18n/cs.po
index cf9c4b7dbc1..012d1c2eae0 100644
--- a/addons/mrp/i18n/cs.po
+++ b/addons/mrp/i18n/cs.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index e6a45d18a49..2e84ba9f1e2 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -585,7 +585,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Zeit in Stunden für einen (Auftrags-) Zyklus"
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Endedatum"
diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po
index fc5cb55363f..6904be353b3 100644
--- a/addons/mrp/i18n/el.po
+++ b/addons/mrp/i18n/el.po
@@ -585,7 +585,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Χρόνος ενός κύκλου σε ώρες"
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Ημερ/νία Τέλους"
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index 9212132769a..d2568c453cf 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -585,7 +585,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Tiempo en horas para realizar un ciclo."
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Fecha final"
diff --git a/addons/mrp/i18n/es_AR.po b/addons/mrp/i18n/es_AR.po
index c1c0ee7e6b9..6146c57db3d 100644
--- a/addons/mrp/i18n/es_AR.po
+++ b/addons/mrp/i18n/es_AR.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/es_EC.po b/addons/mrp/i18n/es_EC.po
index d86a3f54173..ff994127269 100644
--- a/addons/mrp/i18n/es_EC.po
+++ b/addons/mrp/i18n/es_EC.po
@@ -585,7 +585,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Tiempo en horas para realizar un ciclo."
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Fecha final"
diff --git a/addons/mrp/i18n/et.po b/addons/mrp/i18n/et.po
index 434a4622aa5..1e78dd6168b 100644
--- a/addons/mrp/i18n/et.po
+++ b/addons/mrp/i18n/et.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Aeg tundides mis kulub ühes tsükklis."
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Lõppkuupäev"
diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po
index 8610bec1dea..1d33d2dedff 100644
--- a/addons/mrp/i18n/fi.po
+++ b/addons/mrp/i18n/fi.po
@@ -580,7 +580,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Yhden kierron kesto tunneissa."
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Lopetuspäivämäärä"
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 51287167558..a39551a404d 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -600,7 +600,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Temps nécessaire à la réalisation d'un cycle"
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Date de fin"
diff --git a/addons/mrp/i18n/hi.po b/addons/mrp/i18n/hi.po
index 96be03f1000..d8352b7d12d 100644
--- a/addons/mrp/i18n/hi.po
+++ b/addons/mrp/i18n/hi.po
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "समाप्ति तिथि"
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index 652303d8bb4..17504495bf8 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/hu.po b/addons/mrp/i18n/hu.po
index 10d9b0da8ba..fb78fa66ed3 100644
--- a/addons/mrp/i18n/hu.po
+++ b/addons/mrp/i18n/hu.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/id.po b/addons/mrp/i18n/id.po
index c91d0f8438e..23308aeca00 100644
--- a/addons/mrp/i18n/id.po
+++ b/addons/mrp/i18n/id.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index c001e0a2d6e..148820c77f9 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/i18n/it.po
@@ -586,7 +586,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Tempo in ore per completare un ciclo."
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Data di fine"
diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po
index 1068e604527..8df359442fb 100644
--- a/addons/mrp/i18n/ko.po
+++ b/addons/mrp/i18n/ko.po
@@ -567,7 +567,7 @@ msgid "Time in hours for doing one cycle."
msgstr "한 사이클을 수행하는 시간"
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "마감 날짜"
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index 677f640b861..faae3ef23ce 100644
--- a/addons/mrp/i18n/lt.po
+++ b/addons/mrp/i18n/lt.po
@@ -575,7 +575,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Vieno ciklo laikas valandomis."
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Pabaigos data"
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index d576151f247..913acfe3f9f 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -546,7 +546,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index 97c4f6ee79c..4faad6c115e 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -584,7 +584,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Tijd in uren voor één productiecyclus."
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Einddatum"
diff --git a/addons/mrp/i18n/nl_BE.po b/addons/mrp/i18n/nl_BE.po
index a6bea998b5f..a4df723195a 100644
--- a/addons/mrp/i18n/nl_BE.po
+++ b/addons/mrp/i18n/nl_BE.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index d65d0617e75..37985293f94 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -582,7 +582,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Czas wykonania jednego cyklu w godzinach"
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Data końcowa"
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index 71ea973805e..39c9c359335 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/i18n/pt.po
@@ -564,7 +564,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Data de finalização"
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index b348ca0faee..ba0de24330e 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -567,7 +567,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Tempo em hora para fazer um ciclo."
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Data final"
diff --git a/addons/mrp/i18n/ro.po b/addons/mrp/i18n/ro.po
index 11f24dae6c9..346792757ce 100644
--- a/addons/mrp/i18n/ro.po
+++ b/addons/mrp/i18n/ro.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index 3f227b676ac..b0a01bfe8f2 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -567,7 +567,7 @@ msgid "Time in hours for doing one cycle."
msgstr "Время в часах на выполнение одного цикла"
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Дата окончания"
diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po
index e9bdba85b42..5cad0bfc519 100644
--- a/addons/mrp/i18n/sk.po
+++ b/addons/mrp/i18n/sk.po
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po
index 1c314829f6a..16c4b4c8067 100644
--- a/addons/mrp/i18n/sl.po
+++ b/addons/mrp/i18n/sl.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Končni datum"
diff --git a/addons/mrp/i18n/sq.po b/addons/mrp/i18n/sq.po
index ba8543fe2f7..bbd4051e28a 100644
--- a/addons/mrp/i18n/sq.po
+++ b/addons/mrp/i18n/sq.po
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index d3865dd7691..c086b7f24f1 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Slutdatum"
diff --git a/addons/mrp/i18n/tlh.po b/addons/mrp/i18n/tlh.po
index 81ba3486333..5ac8e02d5aa 100644
--- a/addons/mrp/i18n/tlh.po
+++ b/addons/mrp/i18n/tlh.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index be3a69b6415..ee6b7017c3b 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Bitiş Tarihi"
diff --git a/addons/mrp/i18n/uk.po b/addons/mrp/i18n/uk.po
index a5824ca6d96..fcbd14cb9e7 100644
--- a/addons/mrp/i18n/uk.po
+++ b/addons/mrp/i18n/uk.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "Кінцева дата"
diff --git a/addons/mrp/i18n/vi.po b/addons/mrp/i18n/vi.po
index 516438d2dfc..6c620e01062 100644
--- a/addons/mrp/i18n/vi.po
+++ b/addons/mrp/i18n/vi.po
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index b4b04af2f15..1fb75aececc 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr "一个周期的工作小时数"
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr "结束日期"
diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po
index 88ec10de504..43c27d45606 100644
--- a/addons/mrp/i18n/zh_HK.po
+++ b/addons/mrp/i18n/zh_HK.po
@@ -562,7 +562,7 @@ msgid "Time in hours for doing one cycle."
msgstr "一個循環所須的小時數"
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index b0be94ac800..08120747e9a 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -561,7 +561,7 @@ msgid "Time in hours for doing one cycle."
msgstr "一個循環所須的小時數"
#. module: mrp
-#: field:mrp.production,date_finnished:0
+#: field:mrp.production,date_finished:0
msgid "End Date"
msgstr ""
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 1a71114c336..eea2e4a5224 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -456,7 +456,7 @@ class mrp_production(osv.osv):
'date_planned_date': fields.function(_production_date, method=True, type='date', string='Scheduled Date'),
'date_planned': fields.datetime('Scheduled date', required=True, select=1),
'date_start': fields.datetime('Start Date'),
- 'date_finnished': fields.datetime('End Date'),
+ 'date_finished': fields.datetime('End Date'),
'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production plannification."),
@@ -658,7 +658,7 @@ class mrp_production(osv.osv):
"""
for production in self.browse(cr, uid, ids):
self._costs_generate(cr, uid, production)
- return self.write(cr, uid, ids, {'state': 'done', 'date_finnished': time.strftime('%Y-%m-%d %H:%M:%S')})
+ return self.write(cr, uid, ids, {'state': 'done', 'date_finished': time.strftime('%Y-%m-%d %H:%M:%S')})
def test_production_done(self, cr, uid, ids):
""" Tests whether production is done or not.
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 39ecec5ad95..6fda888190c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -545,7 +545,7 @@
mrp.production
gantt
-
+
1.3cm 28.1cm 20cm 28.1cm
@@ -35,8 +33,6 @@
1.3cm 28.1cm 20cm 28.1cm
diff --git a/addons/mrp/report/mrp_production_order.py b/addons/mrp/report/mrp_production_order.py
index 9aeae1781cd..3ad4184c413 100644
--- a/addons/mrp/report/mrp_production_order.py
+++ b/addons/mrp/report/mrp_production_order.py
@@ -51,7 +51,7 @@ class mrp_production_order(osv.osv):
'date_planned':fields.date('Scheduled Date'),
'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', readonly=True),
'date_start': fields.datetime('Start Date',readonly=True),
- 'date_finnished': fields.datetime('End Date',readonly=True),
+ 'date_finished': fields.datetime('End Date',readonly=True),
'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', readonly=True),
'company_id': fields.many2one('res.company','Company',readonly=True),
'bom_id': fields.many2one('mrp.bom', 'Bill of Material',readonly=True),
@@ -100,7 +100,7 @@ class mrp_production_order(osv.osv):
s.routing_id,
s.picking_id,
s.date_start,
- s.date_finnished,
+ s.date_finished,
to_date(to_char(s.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY') as date_planned,
s.origin,
s.priority,
@@ -128,7 +128,7 @@ class mrp_production_order(osv.osv):
to_date(to_char(s.date_planned, 'dd-MM-YYYY'),'dd-MM-YYYY'),
s.origin,
s.date_start,
- s.date_finnished,
+ s.date_finished,
s.company_id
)""")
mrp_production_order()
diff --git a/addons/mrp/report/mrp_production_order_view.xml b/addons/mrp/report/mrp_production_order_view.xml
index ea1f15bc3ea..6f88981fd5f 100644
--- a/addons/mrp/report/mrp_production_order_view.xml
+++ b/addons/mrp/report/mrp_production_order_view.xml
@@ -58,7 +58,7 @@
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index 1bf82338cdd..dcb2bcb3566 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -101,7 +101,8 @@
graph,tree
Weekly Stock Value Variation enables you to track stock value evolution as a result of manufacturing activities (consumption of raw materials, production of finished goods, added accounting value of stock by the creation of value following the transformation of products).
-
+
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 79c5de9a505..e63ced14997 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -5,12 +5,14 @@
"access_mrp_bom","mrp.bom","model_mrp_bom","group_mrp_user",1,1,1,0
"access_mrp_bom_revision","mrp.bom.revision","model_mrp_bom_revision","group_mrp_user",1,0,0,0
"access_mrp_production","mrp.production user","model_mrp_production","mrp.group_mrp_user",1,1,1,1
+"access_mrp_property_group","mrp.property.group","procurement.model_mrp_property_group","mrp.group_mrp_manager",1,1,1,1
+"access_mrp_property","mrp.property","procurement.model_mrp_property","mrp.group_mrp_manager",1,1,1,1
"access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
"access_procurement","procurement.order","model_procurement_order","mrp.group_mrp_user",1,1,1,1
-"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,1,1,1
+"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_manager",1,0,0,0
"access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
"access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
-"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,0,0,0
+"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,0,0,1
"access_mrp_bom_revision_manager","mrp.bom.revision.manager","model_mrp_bom_revision","mrp.group_mrp_manager",1,1,1,1
"access_stock_location_mrp_worker","stock.location mrp_worker","stock.model_stock_location","mrp.group_mrp_user",1,0,0,0
"access_stock_move_mrp_worker","stock.move mrp_worker","stock.model_stock_move","mrp.group_mrp_user",1,1,1,0
@@ -20,14 +22,15 @@
"access_account_account","account.account mrp_worker","account.model_account_account","mrp.group_mrp_user",1,0,0,0
"access_purchase_order_mrp_worker","purchase.order mrp_worker","purchase.model_purchase_order","mrp.group_mrp_user",1,1,1,1
"access_purchase_order_line_mrp_worker","purchase.order.line mrp_worker","purchase.model_purchase_order_line","mrp.group_mrp_user",1,0,0,0
-"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_worker","resource.model_resource_calendar","base.group_system",1,1,1,1
+"access_hr_timesheet_group_mrp_worker","resource.calendar mrp_manager","resource.model_resource_calendar","mrp.group_mrp_manager",1,1,1,1
"access_procurement_stock_worker","procurement.order stock_worker","model_procurement_order","stock.group_stock_user",1,1,1,1
"access_procurement_user","procurement.order.user","model_procurement_order","base.group_user",1,1,1,1
"access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
"access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_manager",1,1,1,1
-"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,0,0,0
-"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,0,0,0
-"access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,1,1,1
+"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,1,1,1
+"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,1,1,1
+"access_product_product_manager","product.product manager","model_product_product","mrp.group_mrp_manager",1,0,0,0
+"access_ir_property_manager","ir.property manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
"access_account_sequence_fiscalyear","account.sequence.fiscalyear","account.model_account_sequence_fiscalyear","mrp.group_mrp_user",1,1,1,1
"access_product_product_user","product.product user","model_product_product","mrp.group_mrp_user",1,1,1,1
"access_product_template_user","product.template user","product.model_product_template","mrp.group_mrp_user",1,1,1,1
@@ -39,6 +42,7 @@
"access_workcenter_user","mrp.production.workcenter.line.user","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
"access_resource_calendar_leaves_user","mrp.resource.calendar.leaves.user","resource.model_resource_calendar_leaves","mrp.group_mrp_user",1,1,1,1
"access_resource_calendar_leaves_manager","mrp.resource.calendar.leaves.manager","resource.model_resource_calendar_leaves","mrp.group_mrp_manager",1,0,0,0
+"access_resource_calendar_attendance_manager","mrp.resource.calendar.attendance.manager","resource.model_resource_calendar_attendance","mrp.group_mrp_manager",1,1,1,1
"access_product_puom_categ","product.uom.categ","product.model_product_uom_categ","mrp.group_mrp_user",1,1,1,0
"access_resource_resource","resource.resource","resource.model_resource_resource","mrp.group_mrp_user",1,1,1,0
"access_board_board_user","mrp.board.board","board.model_board_board","mrp.group_mrp_user",1,1,1,0
@@ -55,7 +59,7 @@
"access_mrp_production_manager","mrp.production manager","model_mrp_production","mrp.group_mrp_manager",1,0,0,0
"access_procurement_manager","procurement.order","model_procurement_order","mrp.group_mrp_manager",1,0,0,0
"access_workcenter_manager","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_manager",1,0,0,0
-"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,0
+"access_stock_move_mrp_manager","stock.move mrp_manager","stock.model_stock_move","mrp.group_mrp_manager",1,0,0,1
"access_mrp_production_product_line_manager","mrp.production.product.line manager","model_mrp_production_product_line","mrp.group_mrp_manager",1,0,0,0
"access_account_sequence_fiscalyear_system","account.sequence.fiscalyear.system","account.model_account_sequence_fiscalyear","mrp.group_mrp_manager",1,0,0,0
"access_product_template_system","product.template mgr.system","product.model_product_template","base.group_system",1,0,0,0
@@ -87,6 +91,6 @@
"access_mrp_production_system","mrp.production system","model_mrp_production","base.group_system",1,0,0,0
"access_stock_production_lot_user","stock.production.lot","stock.model_stock_production_lot","mrp.group_mrp_user",1,1,1,1
"access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint","procurement.model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,0,0,0
-"access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,1,1,1
+"access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,0,0,0
"access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0
"access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index 46b1d19244a..08a0bc31c86 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -230,17 +230,6 @@
wf_service = netsvc.LocalService("workflow")
for p_id in purch_ids:
wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
--
- I get the approval from both the suppliers. So I approve my purchase orders.
--
- !python {model: purchase.order}: |
- from tools.translate import _
- import netsvc
- purch_ids = self.search(cr, uid, [('state','=','confirmed')])
- assert purch_ids, _('No Confirmed Purchase Orders found!')
- wf_service = netsvc.LocalService("workflow")
- for p_id in purch_ids:
- wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
-
I see two incoming pickings for Orange and Sugar.
-
diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
index 7435503bac9..40d22ae817f 100644
--- a/addons/mrp/test/mrp_procurement.yml
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -178,17 +178,7 @@
wf_service = netsvc.LocalService("workflow")
for p_id in purch_ids:
wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
--
- I get the approval from the supplier. So I approve my purchase orders.
--
- !python {model: purchase.order}: |
- from tools.translate import _
- import netsvc
- purch_ids = self.search(cr, uid, [('state','=','confirmed')])
- assert purch_ids, _('No Confirmed Purchase Orders found!')
- wf_service = netsvc.LocalService("workflow")
- for p_id in purch_ids:
- wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
+
-
I confirm purchase order for Buttons.
-
@@ -198,17 +188,7 @@
wf_service = netsvc.LocalService("workflow")
for p_id in purch_ids:
wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
--
- I get the approval from the supplier. So I approve my purchase orders.
--
- !python {model: purchase.order}: |
- from tools.translate import _
- import netsvc
- purch_ids = self.search(cr, uid, [('state','=','confirmed')])
- assert purch_ids, _('No Confirmed Purchase Orders found!')
- wf_service = netsvc.LocalService("workflow")
- for p_id in purch_ids:
- wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
+
-
I Check incoming shipments for cloth. And receive products.
-
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 5f7aa0754e1..f5d62d535c9 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -87,10 +87,10 @@ class change_production_qty(osv.osv_memory):
factor = prod.product_qty * prod.product_uom.factor / bom_point.product_uom.factor
res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
for r in res[0]:
- if r['product_id']== move.product_id.id:
- move_lines_obj.write(cr, uid,move.id, {'product_qty' : r['product_qty']})
+ if r['product_id'] == move.product_id.id:
+ move_lines_obj.write(cr, uid, [move.id], {'product_qty' : r['product_qty']})
for m in prod.move_created_ids:
- move_lines_obj.write(cr, uid,m.id, {'product_qty': wiz_qty.product_qty})
+ move_lines_obj.write(cr, uid, [m.id], {'product_qty': wiz_qty.product_qty})
return {}
diff --git a/addons/mrp_operations/i18n/ar.po b/addons/mrp_operations/i18n/ar.po
index 0546e0d4ce5..ab7c0e86910 100644
--- a/addons/mrp_operations/i18n/ar.po
+++ b/addons/mrp_operations/i18n/ar.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/bg.po b/addons/mrp_operations/i18n/bg.po
index f67c785f82e..39a5d93bdb5 100644
--- a/addons/mrp_operations/i18n/bg.po
+++ b/addons/mrp_operations/i18n/bg.po
@@ -248,7 +248,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/bs.po b/addons/mrp_operations/i18n/bs.po
index ff9a28f1473..f1f31cefc6b 100644
--- a/addons/mrp_operations/i18n/bs.po
+++ b/addons/mrp_operations/i18n/bs.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/ca.po b/addons/mrp_operations/i18n/ca.po
index fd8d311dcc4..6567a54a457 100644
--- a/addons/mrp_operations/i18n/ca.po
+++ b/addons/mrp_operations/i18n/ca.po
@@ -249,7 +249,7 @@ msgid "mrp_operations.operation"
msgstr "mrp_operations.operation"
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/cs.po b/addons/mrp_operations/i18n/cs.po
index 0546e0d4ce5..ab7c0e86910 100644
--- a/addons/mrp_operations/i18n/cs.po
+++ b/addons/mrp_operations/i18n/cs.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/de.po b/addons/mrp_operations/i18n/de.po
index 2c4800228d0..82d75040b9e 100644
--- a/addons/mrp_operations/i18n/de.po
+++ b/addons/mrp_operations/i18n/de.po
@@ -250,7 +250,7 @@ msgid "mrp_operations.operation"
msgstr "mrp_operations.operation"
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/es.po b/addons/mrp_operations/i18n/es.po
index e973ddb2381..2b0bf5b7c50 100644
--- a/addons/mrp_operations/i18n/es.po
+++ b/addons/mrp_operations/i18n/es.po
@@ -251,7 +251,7 @@ msgid "mrp_operations.operation"
msgstr "mrp_operations.operation"
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/es_AR.po b/addons/mrp_operations/i18n/es_AR.po
index d0589260312..3c140fd1541 100644
--- a/addons/mrp_operations/i18n/es_AR.po
+++ b/addons/mrp_operations/i18n/es_AR.po
@@ -248,7 +248,7 @@ msgid "mrp_operations.operation"
msgstr "mrp_operations.operation"
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/es_EC.po b/addons/mrp_operations/i18n/es_EC.po
index b0caeb9a279..730a921b999 100644
--- a/addons/mrp_operations/i18n/es_EC.po
+++ b/addons/mrp_operations/i18n/es_EC.po
@@ -251,7 +251,7 @@ msgid "mrp_operations.operation"
msgstr "mrp_operations.operation"
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/et.po b/addons/mrp_operations/i18n/et.po
index 493f060565b..de913493585 100644
--- a/addons/mrp_operations/i18n/et.po
+++ b/addons/mrp_operations/i18n/et.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
msgstr "mrp_operations.operation"
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/fi.po b/addons/mrp_operations/i18n/fi.po
index 0f94be1c01a..27936f066f7 100644
--- a/addons/mrp_operations/i18n/fi.po
+++ b/addons/mrp_operations/i18n/fi.po
@@ -249,7 +249,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/fr.po b/addons/mrp_operations/i18n/fr.po
index 4e818c3655a..a5f40616d0a 100644
--- a/addons/mrp_operations/i18n/fr.po
+++ b/addons/mrp_operations/i18n/fr.po
@@ -248,7 +248,7 @@ msgid "mrp_operations.operation"
msgstr "mrp_operations.operation"
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/hi.po b/addons/mrp_operations/i18n/hi.po
index cdd3e5fd4a4..865f2353a13 100644
--- a/addons/mrp_operations/i18n/hi.po
+++ b/addons/mrp_operations/i18n/hi.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/hr.po b/addons/mrp_operations/i18n/hr.po
index 0546e0d4ce5..ab7c0e86910 100644
--- a/addons/mrp_operations/i18n/hr.po
+++ b/addons/mrp_operations/i18n/hr.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/hu.po b/addons/mrp_operations/i18n/hu.po
index 0546e0d4ce5..ab7c0e86910 100644
--- a/addons/mrp_operations/i18n/hu.po
+++ b/addons/mrp_operations/i18n/hu.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/id.po b/addons/mrp_operations/i18n/id.po
index 064aeb7c14b..871abf389d6 100644
--- a/addons/mrp_operations/i18n/id.po
+++ b/addons/mrp_operations/i18n/id.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/it.po b/addons/mrp_operations/i18n/it.po
index 379639b9d39..9c93f457091 100644
--- a/addons/mrp_operations/i18n/it.po
+++ b/addons/mrp_operations/i18n/it.po
@@ -249,7 +249,7 @@ msgid "mrp_operations.operation"
msgstr "mrp_operations.operation"
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/ko.po b/addons/mrp_operations/i18n/ko.po
index c4c54b0857b..33a70f940fa 100644
--- a/addons/mrp_operations/i18n/ko.po
+++ b/addons/mrp_operations/i18n/ko.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/lt.po b/addons/mrp_operations/i18n/lt.po
index 0546e0d4ce5..ab7c0e86910 100644
--- a/addons/mrp_operations/i18n/lt.po
+++ b/addons/mrp_operations/i18n/lt.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/mrp_operations.pot b/addons/mrp_operations/i18n/mrp_operations.pot
index a1f61b1965d..90df737dde5 100644
--- a/addons/mrp_operations/i18n/mrp_operations.pot
+++ b/addons/mrp_operations/i18n/mrp_operations.pot
@@ -242,7 +242,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/nl.po b/addons/mrp_operations/i18n/nl.po
index 1a7674b11cd..7905b9cc363 100644
--- a/addons/mrp_operations/i18n/nl.po
+++ b/addons/mrp_operations/i18n/nl.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/nl_BE.po b/addons/mrp_operations/i18n/nl_BE.po
index 6d8bb017f25..173b7601ae9 100644
--- a/addons/mrp_operations/i18n/nl_BE.po
+++ b/addons/mrp_operations/i18n/nl_BE.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/pl.po b/addons/mrp_operations/i18n/pl.po
index 48b6475b9fd..dd4ff7ee02c 100644
--- a/addons/mrp_operations/i18n/pl.po
+++ b/addons/mrp_operations/i18n/pl.po
@@ -248,7 +248,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/pt.po b/addons/mrp_operations/i18n/pt.po
index 96427a43ff0..d874808086b 100644
--- a/addons/mrp_operations/i18n/pt.po
+++ b/addons/mrp_operations/i18n/pt.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/pt_BR.po b/addons/mrp_operations/i18n/pt_BR.po
index 731aded6cda..981c5624c8b 100644
--- a/addons/mrp_operations/i18n/pt_BR.po
+++ b/addons/mrp_operations/i18n/pt_BR.po
@@ -248,7 +248,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/ro.po b/addons/mrp_operations/i18n/ro.po
index 54db3294f60..2658a2ce74e 100644
--- a/addons/mrp_operations/i18n/ro.po
+++ b/addons/mrp_operations/i18n/ro.po
@@ -250,7 +250,7 @@ msgid "mrp_operations.operation"
msgstr "mrp_operations.operation"
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/ru.po b/addons/mrp_operations/i18n/ru.po
index 333caa9e4f3..69c0d6fb0a5 100644
--- a/addons/mrp_operations/i18n/ru.po
+++ b/addons/mrp_operations/i18n/ru.po
@@ -248,7 +248,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/sl.po b/addons/mrp_operations/i18n/sl.po
index 81ab1c3b66e..0d012e0211e 100644
--- a/addons/mrp_operations/i18n/sl.po
+++ b/addons/mrp_operations/i18n/sl.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
msgstr "mrp_operations.operation"
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/sq.po b/addons/mrp_operations/i18n/sq.po
index 27c43ff72cf..d61f3069824 100644
--- a/addons/mrp_operations/i18n/sq.po
+++ b/addons/mrp_operations/i18n/sq.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/sv.po b/addons/mrp_operations/i18n/sv.po
index 945c20d62cb..52e7c2b59e5 100644
--- a/addons/mrp_operations/i18n/sv.po
+++ b/addons/mrp_operations/i18n/sv.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/tlh.po b/addons/mrp_operations/i18n/tlh.po
index 5d7551ac4b7..5af1d671159 100644
--- a/addons/mrp_operations/i18n/tlh.po
+++ b/addons/mrp_operations/i18n/tlh.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index bbcb1006500..3643a54ae6a 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/i18n/tr.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/uk.po b/addons/mrp_operations/i18n/uk.po
index 4f55f459921..fadaf9ba531 100644
--- a/addons/mrp_operations/i18n/uk.po
+++ b/addons/mrp_operations/i18n/uk.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/vi.po b/addons/mrp_operations/i18n/vi.po
index 38bbfea8310..9fcae413139 100644
--- a/addons/mrp_operations/i18n/vi.po
+++ b/addons/mrp_operations/i18n/vi.po
@@ -247,7 +247,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/zh_CN.po b/addons/mrp_operations/i18n/zh_CN.po
index 8ff3bb9f5b2..d7b5635fcc0 100644
--- a/addons/mrp_operations/i18n/zh_CN.po
+++ b/addons/mrp_operations/i18n/zh_CN.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
msgstr "运作"
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/i18n/zh_TW.po b/addons/mrp_operations/i18n/zh_TW.po
index b49e5f9d85b..a8c0f97102f 100644
--- a/addons/mrp_operations/i18n/zh_TW.po
+++ b/addons/mrp_operations/i18n/zh_TW.po
@@ -246,7 +246,7 @@ msgid "mrp_operations.operation"
msgstr ""
#. module: mrp_operations
-#: field:mrp.production.workcenter.line,date_finnished:0
+#: field:mrp.production.workcenter.line,date_finished:0
#: field:mrp.production.workcenter.line,date_planned_end:0
#: field:mrp_operations.operation,date_finished:0
msgid "End Date"
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 3328f24a59f..9585a34df36 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -67,7 +67,7 @@ class mrp_production_workcenter_line(osv.osv):
@return: Dictionary of values.
"""
ops = self.browse(cr, uid, ids, context=context)
- date_and_hours_by_cal = [(op.date_planned, op.hour, op.workcenter_id.calendar_id.id) for op in ops]
+ date_and_hours_by_cal = [(op.production_id.date_planned, op.hour, op.workcenter_id.calendar_id.id) for op in ops]
intervals = self.pool.get('resource.calendar').interval_get_multi(cr, uid, date_and_hours_by_cal)
res = {}
@@ -95,7 +95,7 @@ class mrp_production_workcenter_line(osv.osv):
'date_planned': fields.datetime('Scheduled Date'),
'date_planned_end': fields.function(_get_date_end, method=True, string='End Date', type='datetime'),
'date_start': fields.datetime('Start Date'),
- 'date_finnished': fields.datetime('End Date'),
+ 'date_finished': fields.datetime('End Date'),
'delay': fields.float('Working Hours',help="This is lead time between operation start and stop in this workcenter",readonly=True),
'production_state':fields.related('production_id','state',
type='selection',
@@ -179,7 +179,7 @@ class mrp_production_workcenter_line(osv.osv):
delay += (date_finished-date_start).days * 24
delay += (date_finished-date_start).seconds / float(60*60)
- self.write(cr, uid, ids, {'state':'done', 'date_finnished': date_now,'delay':delay})
+ self.write(cr, uid, ids, {'state':'done', 'date_finished': date_now,'delay':delay})
self.modify_production_order_state(cr,uid,ids,'done')
return True
@@ -288,7 +288,7 @@ class mrp_production(osv.osv):
dt_end = datetime.strptime(wc.date_planned_end, '%Y-%m-%d %H:%M:%S')
old = wc.sequence or 0
super(mrp_production, self).write(cr, uid, [po.id], {
- 'date_finnished': dt_end
+ 'date_finished': dt_end
})
return dt_end
@@ -306,7 +306,7 @@ class mrp_production(osv.osv):
if l.state in ('done','cancel','draft'):
continue
todo += l.move_dest_id_lines
- if l.production_id and (l.production_id.date_finnished > dt):
+ if l.production_id and (l.production_id.date_finished > dt):
if l.production_id.state not in ('done','cancel'):
for wc in l.production_id.workcenter_lines:
i = self.pool.get('resource.calendar').interval_min_get(
@@ -335,8 +335,8 @@ class mrp_production(osv.osv):
break
if l.production_id.state in ('done','cancel'):
break
- if l.production_id and (l.production_id.date_start < po.date_finnished):
- self.write(cr, uid, [l.production_id.id], {'date_start': po.date_finnished})
+ if l.production_id and (l.production_id.date_start < po.date_finished):
+ self.write(cr, uid, [l.production_id.id], {'date_start': po.date_finished})
break
@@ -511,7 +511,7 @@ class mrp_operations_operation(osv.osv):
if code.start_stop=='done':
self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,wc_op_id)
wf_service.trg_validate(uid, 'mrp.production.workcenter.line', wc_op_id[0], 'button_done', cr)
- self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finnished':datetime.now().strftime('%Y-%m-%d %H:%M:%S')})
+ self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finished':datetime.now().strftime('%Y-%m-%d %H:%M:%S')})
if code.start_stop=='pause':
self.pool.get('mrp.production.workcenter.line').action_pause(cr,uid,wc_op_id)
@@ -532,7 +532,7 @@ class mrp_operations_operation(osv.osv):
line_vals['delay'] = delay
if vals.get('date_start',False):
if code.start_stop == 'done':
- line_vals['date_finnished'] = vals['date_start']
+ line_vals['date_finished'] = vals['date_start']
elif code.start_stop == 'start':
line_vals['date_start'] = vals['date_start']
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 7a5a5af3dc9..9a93b67a36f 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -101,7 +101,7 @@
@@ -170,7 +170,7 @@
mrp.production.workcenter.line
calendar
-
+
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index f7a6837aace..5848fa7057c 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -21,7 +21,7 @@
from osv import fields,osv
import netsvc
-from datetime import datetime, date
+from datetime import datetime
from dateutil.relativedelta import relativedelta
from tools.translate import _
import decimal_precision as dp
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 3b5f235251f..a5bdf5ec0f8 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -175,9 +175,8 @@ class pos_order(osv.osv):
cur_obj = self.pool.get('res.currency')
cur = order.pricelist_id.currency_id
for payment in order.statement_ids:
- res[order.id]['amount_paid'] += payment.amount
- for payment in order.payments:
- res[order.id]['amount_return'] += (payment.amount < 0 and payment.amount or 0)
+ res[order.id]['amount_paid'] += payment.amount
+ res[order.id]['amount_return'] += (payment.amount < 0 and payment.amount or 0)
for line in order.lines:
if order.price_type!='tax_excluded':
res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
@@ -221,7 +220,6 @@ class pos_order(osv.osv):
default = {}
default.update({
'state': 'draft',
- 'payments': [],
'partner_id': False,
'invoice_id': False,
'account_move': False,
@@ -285,7 +283,6 @@ class pos_order(osv.osv):
('tax_excluded','Tax excluded')
], 'Price method', required=True),
'statement_ids': fields.one2many('account.bank.statement.line','pos_statement_id','Payments',states={'draft': [('readonly', False)]},readonly=True),
- 'payments': fields.one2many('pos.payment', 'order_id', 'Order Payments', states={'draft': [('readonly', False)]}, readonly=True),
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
'partner_id': fields.many2one( 'res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),
'state': fields.selection([('draft', 'Quotation'), ('payment', 'Payment'),
@@ -1046,6 +1043,7 @@ class pos_order_line(osv.osv):
tax_amount = 0.0
taxes = [t for t in line.product_id.taxes_id]
if line.qty == 0.0:
+ res[line.id][f] = 0.0
continue
computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
for tax in computed_taxes:
@@ -1265,55 +1263,6 @@ class pos_order_line(osv.osv):
pos_order_line()
-
-class pos_payment(osv.osv):
- _name = 'pos.payment'
- _description = 'Pos Payment'
-
- def _journal_get(self, cr, uid, context=None):
- obj = self.pool.get('account.journal')
- ids = obj.search(cr, uid, [('type', '=', 'cash')])
- res = obj.read(cr, uid, ids, ['id', 'name'], context)
- res = [(r['id'], r['name']) for r in res]
- return res
-
- def _journal_default(self, cr, uid, context=None):
- journal_list = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')])
- if journal_list:
- return journal_list[0]
- else:
- return False
-
- _columns = {
- 'name': fields.char('Description', size=64),
- 'order_id': fields.many2one('pos.order', 'Order Ref', required=True, ondelete='cascade'),
- 'journal_id': fields.many2one('account.journal', "Journal", required=True),
- 'payment_id': fields.many2one('account.payment.term','Payment Term', select=True),
- 'payment_nb': fields.char('Piece Number', size=32),
- 'payment_name': fields.char('Payment Name', size=32),
- 'payment_date': fields.date('Payment Date', required=True),
- 'amount': fields.float('Amount', required=True),
- }
- _defaults = {
- 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.payment'),
- 'journal_id': _journal_default,
- 'payment_date': lambda *a: time.strftime('%Y-%m-%d'),
- }
-
- def create(self, cr, user, vals, context=None):
- if vals.get('journal_id') and vals.get('amount'):
- return super(pos_payment, self).create(cr, user, vals, context)
- return False
-
- def write(self, cr, user, ids, values, context=None):
- if 'amount' in values and not values['amount']:
- return False
- if 'journal_id' in values and not values['journal_id']:
- return False
- return super(pos_payment, self).write(cr, user, ids, values, context)
-
-pos_payment()
-
class product_product(osv.osv):
_inherit = 'product.product'
_columns = {
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index 80ba3d24397..913a2907e03 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -1,7 +1,140 @@
-
+
+ POS/019
+ POS/019
+ SAJ/2010/010
+ none
+ open
+ out_invoice
+ SAJ/2010/010
+ /
+ 2010-10-07
+ Invoice from POS: POS/019
+
+
+ [PC1] Basic PC
+
+
+ 2011-04-07
+ 2010-10-07 16:53:11
+ paid
+ 2010-10-07
+ POS/019
+ tax_excluded
+
+
+ 10
+ open
+ 2010-10-07
+
+
+ general
+ Cash Journal - (test)
+ 2010-10-07
+ Payment POS/019
+
+
+
+
+ POS/019
+ 2010-10-07 16:53:46
+ direct
+ POS notes
+ done
+ out
+ 2010-10-07 16:53:46
+ 2010-10-07 16:33:30
+ OUT/00019
+ none
+ 2010-10-07 16:53:46
+
+
+ POS/019
+ 1
+ done
+ 2010-10-07 16:33:30
+ 2010-10-07 16:33:30
+ Stock move (POS 12)
+ 2010-10-07 16:53:46
+
+
+ No Discount
+ Order Line/07
+
+
diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/pos_report.xml
index b079f6b9177..3e6a265b34e 100644
--- a/addons/point_of_sale/pos_report.xml
+++ b/addons/point_of_sale/pos_report.xml
@@ -9,7 +9,7 @@
name="pos.invoice"
auto="False"
multi="True"
- rml="account/report/invoice.rml"
+ rml="account/report/account_print_invoice.rml"
/>
3
-
- POS Payment
- pos.payment
-
-
- POS Payment
- pos.payment
- Payment/
- 2
-
-
POS order line
pos.order.line
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 17420b1ffe9..7453682f566 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -706,7 +706,7 @@
+ id="menu_point_config_product" sequence="25" groups="base.group_system,group_pos_manager"/>
Products
@@ -732,7 +732,7 @@
parent="menu_point_config_product"
action="action_product_input"
id="products_for_input_operations"
- groups="base.group_system"/>
+ groups="base.group_system,group_pos_manager"/>
Products
@@ -758,7 +758,7 @@
parent="menu_point_config_product"
action="action_product_output"
id="products_for_output_operations"
- groups="base.group_system"/>
+ groups="base.group_system,group_pos_manager"/>
-
@@ -78,16 +78,19 @@
+
-
+
-
[[ repeatIn(objects,'statement') ]]
-
-
-
-
-
-
-
-
-
- Statement
-
-
-
-
-
-
-
+ Statement
+
Statement Name
@@ -169,7 +154,7 @@
-
+
[[ statement.name ]]
@@ -188,10 +173,7 @@
-
-
-
-
+
Opening Date
@@ -207,29 +189,26 @@
-
+
[[ formatLang(statement.date,date=True) ]]
- [[ formatLang(statement.closing_date,date=True) ]]
+ [[ formatLang(statement.closing_date,date_time=True)]]
- [[ formatLang(statement.balance_start, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(statement.balance_start)]] [[ company.currency_id.symbol ]]
- [[ formatLang(statement.balance_end_real, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(statement.balance_end_real)]] [[ company.currency_id.symbol ]]
-
-
-
-
+
Name
@@ -238,38 +217,41 @@
Partner
- Amount ([[ company.currency_id.code ]])
+ Amount
-
+
+ [[ repeatIn(statement.line_ids,'line_ids') and ' ' or removeParentNode('blockTable') ]]
+
+ [[ repeatIn(get_data(statement), 'line_ids')]]
+
+
+
+ [[ line_ids.name ]]
+
+
+ [[ line_ids.partner_id.name ]]
+
+
+ [[ formatLang(line_ids.amount) ]] [[ company.currency_id.symbol ]]
+
+
+
+
+
+
- [[ repeatIn(statement.line_ids,'line_ids') and ' ' or removeParentNode('blockTable') ]]
- [[ repeatIn(get_data(statement), 'line_ids')]]
-
- [[ line_ids['name'] ]]
-
-
- [[ line_ids.partner_id.name ]]
-
-
- [[ formatLang(line_ids.amount, digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]
-
-
-
-
-
-
-
+
- Total :
+ Total :
- [[ formatLang(get_total(statement.line_ids), digits=get_digits(dp='Account')) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(get_total(statement.line_ids)) ]] [[ company.currency_id.symbol ]]
@@ -283,4 +265,4 @@
-
+
\ No newline at end of file
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
index 28b96f7aebe..337a121bd41 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -26,7 +26,7 @@ from report import report_sxw
class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
#TOFIX: sql injection problem: SQL Request must be pass from sql injection...
def __init__(self, cr, uid, name, context):
- super(all_closed_cashbox_of_the_day, self).__init__(cr, uid, name, context)
+ super(all_closed_cashbox_of_the_day, self).__init__(cr, uid, name, context=context)
self.localcontext.update({
'time': time,
'get_data':self._get_data,
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
index f75c08dbadb..7013ddcfb6f 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
@@ -2,7 +2,7 @@
-
@@ -10,134 +10,86 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+ [[ repeatIn(objects,'statement') ]]
-
+
+
+
+ Today's Closed Cashbox
+
+
+
+
Company
@@ -186,11 +125,9 @@
User
-
+
-
-
-
+
[[ company.name ]]
@@ -200,10 +137,10 @@
-
+
-
+
St.Name
@@ -224,76 +161,89 @@
Ending Balance
+
+
- Total :
+ Total:
-
+
+
-
+
+
-
+
+
- [[ formatLang(get_net_total_starting(user)[1]) ]] [[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]
- [[ formatLang(get_net_total(user)) ]] [[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]
-
-
-[[ repeatIn(get_data(user),'statement') ]]
-
-
-
- [[ statement['statement'] ]]
-
-
- [[ statement['journal'] ]]
-
-
- [[ statement['date'] ]]
-
-
- [[ statement['closing_date'] ]]
-
-
- [[ (get_bal(statement)) or '0.00' ]]
-
- [[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]]
-
-
-
-
- [[ repeatIn(get_lines(statement),'line_ids') ]]
-
-
-
- [[ line_ids['name'] ]]
-
-
- [[ get_partner(line_ids) or removeParentNode('font') ]]
-
- [[ get_user(line_ids) or removeParentNode('font') ]]
-
- [[ formatLang(line_ids['amount']) ]]
-
-
-
-
+
+ [[ repeatIn(get_data(user),'statement') ]]
+
+
+
+ [[ statement['statement'] ]]
+
+
+ [[ statement['journal'] ]]
+
+
+ [[ statement['date'] ]]
+
+
+ [[ statement['closing_date'] ]]
+
+
+ [[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]
+
+ [[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]
+
+
+
+ [[ repeatIn(get_lines(statement),'line_ids') ]]
+
+
+
+ [[ line_ids['name'] ]]
+
+
+
+
+
+ [[ get_partner(line_ids) or removeParentNode('font') ]]
+
+
+ [[ get_user(line_ids) or removeParentNode('font') ]]
+
+
+
+
+
+
+
+ [[ formatLang(line_ids['amount']) ]] [[company.currency_id.symbol]]
+
+
+
+
+
+
+
-
-
-
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index d1e881befac..26d427a3036 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -177,7 +177,7 @@ class pos_details(report_sxw.rml_parse):
return form['date_end']
def __init__(self, cr, uid, name, context):
- super(pos_details, self).__init__(cr, uid, name, context)
+ super(pos_details, self).__init__(cr, uid, name, context=context)
self.total = 0.0
self.qty = 0.0
self.invoice_id = ''
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index f3bebade402..c10b8049356 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -2,7 +2,7 @@
-
@@ -20,9 +20,12 @@
-
+
+
+
+
+
-
-
+
Details of Sales
-
+
-
+
Company
@@ -171,11 +173,14 @@
Print Date
- Period
+ Start Period
+
+
+ End Period
-
+
[[ company.name ]]
@@ -184,14 +189,17 @@
[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]
- [[ formatLang(getperiod(data['form']),date = True) ]] - [[ formatLang(getperiod2(data['form']),date = True) ]]
+ [[ formatLang(getperiod(data['form']),date = True) ]]
+
+
+ [[ formatLang(getperiod2(data['form']),date = True) ]]
-
+
-
+
Date
@@ -203,101 +211,116 @@
Product
- Price ([[ company.currency_id.code ]])
+ Price
Qty
- Disc ([[ company.currency_id.code ]])
+ Disc(%)
- Invoiced ([[ company.currency_id.code ]])
+ Invoiced
-
-
-
- [[ pos_sales_details(data['form'],user) and '' or removeParentNode('blockTable') ]]
- [[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]] [[ formatLang(line_ids['date_order'],date = True) ]]
-
-
- [[ line_ids['pos_name'] ]]
-
-
- [[ line_ids['name'] ]]
-
-
- [[ formatLang(line_ids['price_unit']) ]][[ company.currency_id.symbol ]]
-
-
- [[ formatLang(line_ids['qty']) ]]
-
-
- [[ formatLang(line_ids['discount']) ]][[ company.currency_id.symbol ]]
-
-
- [[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]
-
-
-
-
+
+ [[ repeatIn(pos_sales_details(data['form'],user), 'line_ids') ]]
+
+
+
+ [[ formatLang(line_ids['date_order'],date_time = True) ]]
+
+
+ [[ line_ids['pos_name'] ]]
+
+
+ [[ line_ids['name'] ]]
+
+
+ [[ formatLang(line_ids['price_unit']) ]] [[ company.currency_id.symbol ]]
+
+
+ [[ formatLang(line_ids['qty']) ]]
+
+
+ [[ formatLang(line_ids['discount']) ]]
+
+
+ [[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]
+
+
+
+
+
-
+
Mode of Taxes
-
+
-
-
- [[ repeatIn(gettaxamount(data['form'],user), 'p') ]]
-
- [[ formatLang(p['amount']) or removeParentNode('font') ]][[ company.currency_id.symbol ]]
-
-
-
+
+ [[ repeatIn(gettaxamount(data['form'],user), 'p')]]
+
+
+
+ [[ p['name'] or removeParentNode('para') ]]
+
+
+ [[ formatLang(p['amount']) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]
+
+
+
+
+
+
+
+
+
+
+
Mode of Payment
-
+
-
-
- [[ repeatIn(getpayments(data['form'],user), 'p') ]] [[ p['name'] or removeParentNode('tr') ]]
-
- [[ formatLang(p['sum']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]
-
-
-
+
+ [[ repeatIn(getpayments(data['form'],user), 'p') ]]
+
+
+
+ [[ p['name'] or removeParentNode('para') ]]
+
+
+ [[ formatLang(p['sum']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
- Summary
+ Summary
@@ -306,13 +329,13 @@
-
+
Sales total
- [[ formatLang(getsalestotal2(data['form'],user)) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(getsalestotal2(data['form'],user)) ]] [[ company.currency_id.symbol ]]
@@ -320,7 +343,7 @@
Qty of product
- [[ formatLang(getqtytotal2(data['form'],user)) ]]
+ [[ formatLang(getqtytotal2(data['form'],user)) ]]
@@ -328,7 +351,7 @@
Total invoiced
- [[ formatLang(getsuminvoice2(data['form'],user)) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(getsuminvoice2(data['form'],user)) ]] [[ company.currency_id.symbol ]]
@@ -336,7 +359,7 @@
Total discount
- [[ formatLang(getsumdisc(objects)) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(getsumdisc(objects)) ]] [[ company.currency_id.symbol ]]
@@ -344,7 +367,7 @@
Total paid
- [[ formatLang(getpaidtotal2(data['form'],user)) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(getpaidtotal2(data['form'],user)) ]] [[ company.currency_id.symbol ]]
@@ -352,11 +375,11 @@
Total of the day
- [[ formatLang(gettotalofthaday(data['form'])) ]][[ company.currency_id.symbol ]]
+ [[ formatLang(gettotalofthaday(data['form'])) ]] [[ company.currency_id.symbol ]]
-
+
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index 7a57e17bf87..d17eb2f33dc 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -24,6 +24,23 @@ from report import report_sxw
class pos_details_summary(report_sxw.rml_parse):
+ def __init__(self, cr, uid, name, context):
+ super(pos_details_summary, self).__init__(cr, uid, name, context=context)
+ self.total = 0.0
+ self.localcontext.update({
+ 'time': time,
+ 'strip_name': self._strip_name,
+ 'getpayments': self._get_payments,
+ 'getqtytotal': self._get_qty_total,
+ 'getsumdisc': self._get_sum_discount,
+ 'getpaidtotal': self._paid_total,
+ 'gettotalofthaday': self._total_of_the_day,
+ 'getsuminvoice': self._sum_invoice,
+ 'gettaxamount': self._get_tax_amount,
+ 'getsalestotal': self._get_sales_total,
+ 'getperiod': self._get_period,
+ 'getcompany':self.get_company
+ })
def get_company(self,objects):
comp=[obj.company_id.name for obj in objects]
@@ -61,10 +78,10 @@ class pos_details_summary(report_sxw.rml_parse):
result = {}
for obj in objects:
- for payment in obj.payments:
- if gift_journal_id and gift_journal_id == payment.journal_id.id:
+ for payment in obj.statement_ids:
+ if gift_journal_id and gift_journal_id == payment.statement_id.journal_id.id:
continue
- result[payment.journal_id.name] = result.get(payment.journal_id.name, 0.0) + payment.amount
+ result[payment.statement_id.journal_id.name] = result.get(payment.statement_id.journal_id.name, 0.0) + payment.amount
return result
def _paid_total(self, objects):
@@ -111,23 +128,7 @@ class pos_details_summary(report_sxw.rml_parse):
else:
return '%s - %s' % (min_date, max_date)
- def __init__(self, cr, uid, name, context):
- super(pos_details_summary, self).__init__(cr, uid, name, context)
- self.total = 0.0
- self.localcontext.update({
- 'time': time,
- 'strip_name': self._strip_name,
- 'getpayments': self._get_payments,
- 'getqtytotal': self._get_qty_total,
- 'getsumdisc': self._get_sum_discount,
- 'getpaidtotal': self._paid_total,
- 'gettotalofthaday': self._total_of_the_day,
- 'getsuminvoice': self._sum_invoice,
- 'gettaxamount': self._get_tax_amount,
- 'getsalestotal': self._get_sales_total,
- 'getperiod': self._get_period,
- 'getcompany':self.get_company
- })
+
report_sxw.report_sxw('report.pos.details_summary',
'pos.order',
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index aa559eb9961..4c538f3b15e 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -1,8 +1,8 @@
-
+
-
@@ -38,23 +38,30 @@
+
+
+
-
+
-
- Details of Sales
-
+
-
+ Details of Sales
+
+
+
+
Company
@@ -155,7 +170,7 @@
-
+
[[ '%s' % getcompany(objects)]]
@@ -168,86 +183,90 @@
-
+
-
+
Mode of Taxes
+
+
+
+
+
+
+
+
+ [[ repeatIn(gettaxamount(objects).items(),'p') ]]
+
+
+
+ [[ p[0] ]]
+
+
+ [[ p[1] ]]
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Mode of Payment
+
+
+
+
+
+
+
+
+
+ [[ repeatIn(getpayments(objects).items(),'t') ]]
+
+
+
+ [[ t[0] ]]
+
+
+ [[ '%.2f' % (t[1],) ]]
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Summary
+
-
-
-
- [[ repeatIn(gettaxamount(objects).items(),'p') ]]
- [[ p[0] ]]
-
-
-
- [[ p[1] ]]
-
-
-
-
-
- Mode of Payment
-
-
-
-
-
-
-
-
-
-
- [[ repeatIn(getpayments(objects).items(),'t') ]]
- [[ t[0] ]]
-
-
-
- [[ '%.2f' % (t[1],) ]]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Summary
-
-
-
-
-
-
-
-
-
+
Sales total
- [[ '%d' % getsalestotal(objects) ]]
+ [[ '%d' % getsalestotal(objects) ]] [[company.currency_id.symbol ]]
@@ -255,7 +274,7 @@
Qty of product
- [[ '%d' % getqtytotal(objects) ]]
+ [[ '%d' % getqtytotal(objects) ]]
@@ -263,7 +282,7 @@
Total invoiced
- [[ '%.2f' % getsuminvoice(objects) ]][[ company.currency_id.symbol ]]
+ [[ '%.2f' % getsuminvoice(objects) ]] [[ company.currency_id.symbol ]]
@@ -271,7 +290,7 @@
Total discount
- [[ '%.2f' % getsumdisc(objects) ]][[ company.currency_id.symbol ]]
+ [[ '%.2f' % getsumdisc(objects) ]] [[ company.currency_id.symbol ]]
@@ -279,7 +298,7 @@
Total paid
- [[ '%.2f' % getpaidtotal(objects) ]][[ company.currency_id.symbol ]]
+ [[ '%.2f' % getpaidtotal(objects) ]] [[ company.currency_id.symbol ]]
@@ -287,7 +306,7 @@
Total of the day
- [[ '%.2f' % gettotalofthaday(objects) ]][[ company.currency_id.symbol ]]
+ [[ '%.2f' % gettotalofthaday(objects) ]] [[ company.currency_id.symbol ]]
@@ -295,4 +314,4 @@
-
\ No newline at end of file
+
diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index 376f0965633..62054570dfe 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -28,7 +28,7 @@ from tools.translate import _
class pos_invoice(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
- super(pos_invoice, self).__init__(cr, uid, name, context)
+ super(pos_invoice, self).__init__(cr, uid, name, context=context)
self.localcontext.update({
'time': time,
})
diff --git a/addons/point_of_sale/report/pos_lines.py b/addons/point_of_sale/report/pos_lines.py
index ad855087cad..cb45b107931 100644
--- a/addons/point_of_sale/report/pos_lines.py
+++ b/addons/point_of_sale/report/pos_lines.py
@@ -26,7 +26,7 @@ from report import report_sxw
class pos_lines(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
- super(pos_lines, self).__init__(cr, uid, name, context)
+ super(pos_lines, self).__init__(cr, uid, name, context=context)
self.total = 0.0
self.localcontext.update({
'time': time,
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index fd3bbf9c43c..95f02bb5c1c 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -1,8 +1,8 @@
-
+
-
@@ -73,7 +73,6 @@
-
[[repeatIn(objects,'o')]]
[[ setLang(o.partner_id.lang) ]]
-
-
-
Sales lines
-
+
Company
@@ -132,7 +128,7 @@
-
+
[[ company.name ]]
@@ -141,7 +137,7 @@
[[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]
- [[formatLang(total_quantity(o))]]
+ [[ formatLang(total_quantity(o)) ]]
@@ -151,13 +147,13 @@
-
+
Description
- VAT
+ VAT
Quantity
@@ -166,7 +162,7 @@
Unit Price
- Disc. (%)
+ Disc. (%)
Price
@@ -174,31 +170,31 @@
- [[repeatIn(o.lines,'l')]]
-
+ [[repeatIn(o.lines,'l')]]
+
- [[l.product_id.code]] [[l.product_id.name]]
+ [ [[l.product_id.code]] ] [[l.product_id.name]]
- [[taxes(l)]]
+ [[taxes(l)]]
[[ formatLang(l.qty) ]] [[l.product_id.uom_id.name]]
- [[ formatLang(l.price_unit) ]]
+ [[ formatLang(l.price_unit) ]]
- [[ formatLang(l.discount) ]]
+ [[ formatLang(l.discount) ]]
- [[ formatLang(l.price_subtotal) ]][[o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(l.price_subtotal) ]] [[o.pricelist_id.currency_id. symbol ]]
-
+
@@ -221,7 +217,7 @@
- Net Total :
+ Net Total
[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]
@@ -249,7 +245,7 @@
- Taxes :
+ Taxes
[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
@@ -277,10 +273,10 @@
- Total :
+ Total:
- [[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
diff --git a/addons/point_of_sale/report/pos_payment_report.py b/addons/point_of_sale/report/pos_payment_report.py
index 3d82025da89..f679e230107 100644
--- a/addons/point_of_sale/report/pos_payment_report.py
+++ b/addons/point_of_sale/report/pos_payment_report.py
@@ -25,7 +25,7 @@ from report import report_sxw
class pos_payment_report(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
- super(pos_payment_report, self).__init__(cr, uid, name, context)
+ super(pos_payment_report, self).__init__(cr, uid, name, context=context)
self.total = 0.0
self.localcontext.update({
'time': time,
@@ -38,17 +38,17 @@ class pos_payment_report(report_sxw.rml_parse):
sql = """ select id from pos_order where id = %d"""%(obj.id)
self.cr.execute(sql)
if self.cr.fetchone():
- self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+ self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
"(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 " \
- "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
+ "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt, product_uom as pu " \
+ "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id " \
"and po.state IN ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date and po.id=%d"%(obj.id))
data=self.cr.dictfetchall()
else :
- self.cr.execute ("select pt.name,pol.qty,pol.discount,pol.price_unit, " \
+ self.cr.execute ("select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
"(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 " \
- "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id " \
+ "from pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt, product_uom as pu " \
+ "where pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id and pu.id=pt.uom_id " \
"and po.state IN ('paid','invoiced') and to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::date = current_date")
data=self.cr.dictfetchall()
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index e62b4bd1290..2d25c740d77 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -161,10 +161,10 @@
Disc. (%)
- Unit Price ([[ company.currency_id.code ]])
+ Unit Price
- Total ([[ company.currency_id.code ]])
+ Total