+ [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]][[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]][[ o.address_invoice_id.street ]][[ o.address_invoice_id.street2 or '' ]][[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]][[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]][[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]
-
+
+
+ Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]VAT : [[ o.partner_id.vat or removeParentNode('para') ]]
@@ -255,168 +248,278 @@
Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]
- Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]
+ Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]
-
+
+
+
-
Document
-
Invoice Date
-
Partner Ref.
+
+ Document
+
+
+ Invoice Date
+
+
+ Partner Ref.
+
-
[[ o.name ]]
-
[[ formatLang(o.date_invoice,date=True) ]]
-
[[ o.address_invoice_id.partner_id.ref or '' ]]
+
+ [[ o.name ]]
+
+
+ [[ formatLang(o.date_invoice,date=True) ]]
+
+
+ [[ o.address_invoice_id.partner_id.ref or '' ]]
+
-
-
-
+
+
+
+
-
Description
-
Taxes
-
Quantity
-
Unit Price
-
Disc.(%)
-
Price
+
+ Description
+
+
+ Taxes
+
+
+ Quantity
+
+
+ Unit Price
+
+
+ Disc.(%)
+
+
+ Price
+
[[ repeatIn(o.invoice_line,'l') ]]
-
+
-
[[ l.name ]]
-
[[ ', '.join([ lt.description or '' for lt in l.invoice_line_tax_id ]) ]]
-
[[ formatLang(l.quantity)]]
-
[[ (l.uos_id and l.uos_id.name) or '' ]]
-
[[ formatLang(l.price_unit) ]]
-
[[ formatLang(l.discount) ]]
-
[[ formatLang(l.price_subtotal) ]]
-
[[ o.currency_id.code ]]
+
+ [[ l.name ]]
+
+
+ [[ ', '.join([ lt.name or '' for lt in l.invoice_line_tax_id ]) ]]
+
+
+ [[ formatLang(l.quantity)]]
+
+
+ [[ (l.uos_id and l.uos_id.name) or '' ]]
+
+
+ [[ formatLang(l.price_unit) ]]
+
+
+ [[ formatLang(l.discount) ]]
+
+
+ [[ formatLang(l.price_subtotal) ]]
+
+
+ [[ o.currency_id.code ]]
+
-
[[ format(l.note) or removeParentNode('tr') ]]
-
-
-
-
-
-
-
+
+ [[ format(l.note or '') or removeParentNode('tr') ]]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
Net Total:
-
[[ formatLang(o.amount_untaxed) ]]
-
[[ o.currency_id.code ]]
+
+ Net Total:
+
+
+ [[ formatLang(o.amount_untaxed) ]]
+
+
+ [[ o.currency_id.code ]]
+
-
+
+
+
+
-
Taxes:
-
[[ formatLang(o.amount_tax) ]]
-
[[ o.currency_id.code ]]
+
+ Taxes:
+
+
+ [[ formatLang(o.amount_tax) ]]
+
+
+ [[ o.currency_id.code ]]
+
-
+
+
+
+
-
Total:
-
[[ formatLang(o.amount_total) ]]
-
[[ o.currency_id.code ]]
+
+ Total:
+
+
+ [[ formatLang(o.amount_total) ]]
+
+
+ [[ o.currency_id.code ]]
+
-
+
-
+
-
Tax
-
Base
-
Amount
+
+ Tax
+
+
+ Base
+
+
+ Amount
+
+
+
+
+
+
+
+
+
+
+ [[ repeatIn(o.tax_line,'t') ]]
+
+
+
+ [[ t.name ]]
+
+
+ [[ formatLang(t.base) ]]
+
+
+ [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]]
+
- [[ repeatIn(o.tax_line,'t') ]]
-
-
-
[[ t.name ]]
-
[[ formatLang(t.base) ]]
-
[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]]
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+ [[ format(o.comment or '') or removeParentNode('blockTable') ]]
-
+
-
-
+
+ [[ format((o.payment_term and o.payment_term.note) or '') or removeParentNode('blockTable') ]]
+
-
-
-
[[ format(o.comment or removeParentNode('blockTable')) ]]
-
-
-
-
-
-
-
-
[[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]]
-
-
-
-
-
-
+
Fiscal Position Remark :
- [[ format(o.fiscal_position and o.fiscal_position.note or removeParentNode('blockTable')) ]]
+ [[ format((o.fiscal_position and o.fiscal_position.note) or '') or removeParentNode('blockTable') ]]
-
-
-
-
-
-
+
+
+
+
+
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index 5aefa0abc96..7d47d46f926 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -53,6 +53,7 @@
'account_followup_data.xml'
],
'demo_xml': ['account_followup_demo.xml'],
+ 'test': ['test/account_followup.yml'],
'installable': True,
'active': False,
'certificate': '0072481076453',
diff --git a/addons/account_payment/test/account_payment.yml b/addons/account_payment/test/account_payment.yml
index f24ad4dc443..3379ebe9003 100644
--- a/addons/account_payment/test/account_payment.yml
+++ b/addons/account_payment/test/account_payment.yml
@@ -1,8 +1,5 @@
-
- In order to test account_payment in OpenERP I create a new record Type
--
--
- Creating a payment.type record
+ In order to test account_payment in OpenERP I create a new record Type.
-
!record {model: payment.type, id: payment_type_t0}:
code: T0
@@ -127,19 +124,3 @@
- state == 'done'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index c7e1a37b8fa..f34c0ce5917 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -4,9 +4,28 @@
-
-
+ name="Dashboard" sequence="30" />
+
+
+ board.note.search
+ board.note
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
board.note.tree
@@ -15,10 +34,11 @@
+
-
+
@@ -31,7 +51,8 @@
-
+
+
@@ -43,6 +64,7 @@
board.noteformform,tree
+
@@ -72,7 +94,7 @@
name="%(action_board_menu_create)d"
string="Create Menu" type="action"
icon="gtk-justify-fill" />
-
+
diff --git a/addons/event/test/test_event.yml b/addons/event/test/test_event.yml
index c5bee3a64d0..1b34089ac09 100644
--- a/addons/event/test/test_event.yml
+++ b/addons/event/test/test_event.yml
@@ -171,8 +171,8 @@
-
!python {model: event.event}: |
obj_event = self.browse(cr, uid, [ref('event_event_conference0')])[0]
- assert obj_event.register_current == '2'
- assert obj_event.register_prospect == '1'
+ assert obj_event.register_current == 2
+ assert obj_event.register_prospect == 1
- |
This event is finished by click on "Event Done" button of this event form.
@@ -198,7 +198,7 @@
!python {model: event.make.invoice}: |
self.make_invoice(cr, uid, [ref("event_make_invoice_0")], {"active_ids": [ref("event_registration_registrationzen0")]})
- |
- I check that Invoice for this partner is create or not.
+ I check that Invoice for this partner is created or not.
-
!python {model: event.registration}: |
obj_event_reg = self.pool.get('event.registration')
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index d1e66c92889..84ae3c304b0 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -224,6 +224,8 @@ class mrp_production(osv.osv):
obj = self.browse(cr, uid, ids)[0]
for workcenter_line in obj.workcenter_lines:
tmp = self.pool.get('mrp.production.workcenter.line').action_done(cr, uid, [workcenter_line.id])
+ wf_service = netsvc.LocalService("workflow")
+ wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_done', cr)
return super(mrp_production,self).action_production_end(cr, uid, ids)
def action_in_production(self, cr, uid, ids):
@@ -234,6 +236,8 @@ class mrp_production(osv.osv):
workcenter_line_obj = self.pool.get('mrp.production.workcenter.line')
for workcenter_line in obj.workcenter_lines:
workcenter_line_obj.action_start_working(cr, uid, [workcenter_line.id])
+ wf_service = netsvc.LocalService("workflow")
+ wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_start_working', cr)
return super(mrp_production,self).action_in_production(cr, uid, ids)
def action_cancel(self, cr, uid, ids):
@@ -243,6 +247,8 @@ class mrp_production(osv.osv):
obj = self.browse(cr, uid, ids)[0]
for workcenter_line in obj.workcenter_lines:
tmp = self.pool.get('mrp.production.workcenter.line').action_cancel(cr, uid, [workcenter_line.id])
+ wf_service = netsvc.LocalService("workflow")
+ wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_cancel', cr)
return super(mrp_production,self).action_cancel(cr,uid,ids)
def _compute_planned_workcenter(self, cr, uid, ids, context={}, mini=False):
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index 13cc0dfe695..2b94827ce1a 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -128,11 +128,30 @@
+
+ process.process.filter
+ process.process
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Processprocess.processformtree,form
+
+
+ process.transition.filter
+ process.transition
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Process Transitionsprocess.transitionformtree,form
+