← Back to branch summary

~colin-zaber/openobject-addons/colin-testing

~colin-zaber/openobject-addons/colin-testing

Viewing all changes in revision 194.

Committer: Colin Ligertwood
Date: 2013-09-03 22:12:27 UTC
mfrom: (179.3.4 zaber-custom)
Revision ID: colin@zaber.com-20130903221227-ksdox56oz913rs70

merge from trunk with zerp_purchase

files added:
zerp_purchase

zerp_purchase/__init__.py

zerp_purchase/__openerp__.py

zerp_purchase/purchase_workflow.xml

files removed:
zerp_purchase

zerp_purchase/__init__.py

zerp_purchase/__openerp__.py

zerp_purchase/purchase_workflow.xml

zerp_timesheet_alert/test

zerp_timesheet_alert/test/zerp_timesheet_alert.yml

files modified:
zerp_timesheet_alert/ISSUES

zerp_timesheet_alert/TODO

zerp_timesheet_alert/__openerp__.py

zerp_timesheet_alert/zerp_timesheet_alert.py

zerp_timesheet_alert/zerp_timesheet_alert_view.xml

Show diffs side-by-side

added added

removed removed

zerp_purchase/__init__.py

zerp_purchase/__init__.py

zerp_purchase/__openerp__.py

zerp_purchase/__openerp__.py

zerp_purchase/purchase_workflow.xml

zerp_purchase/purchase_workflow.xml

zerp_timesheet_alert/ISSUES

zerp_timesheet_alert/TODO

zerp_timesheet_alert/__openerp__.py

zerp_timesheet_alert/test/

zerp_timesheet_alert/test/zerp_timesheet_alert.yml

zerp_timesheet_alert/zerp_timesheet_alert.py

zerp_timesheet_alert/zerp_timesheet_alert_view.xml

Older »