Viewing all changes in revision 16.
- Committer: Santi Argueso (Pexego)
- Date: 2013-08-28 18:19:09 UTC
- mfrom: (14.1.14 6.1)
- Revision ID: santiago@pexego.es-20130828181909-wds7dw2n9r44d1hb
MERGE
- files added:
- restaurant_pos/account_bank_statement.py
- restaurant_pos/i18n
- restaurant_pos/report
- restaurant_pos/security
- restaurant_pos/wizard
- task_time_control
- task_time_control/i18n
- task_time_control/security
- task_time_control/wizard
- files removed:
- django_pos
- django_pos/apps
- django_pos/apps/dajax
- django_pos/apps/dajax/core
- django_pos/apps/dajaxice
- django_pos/apps/dajaxice/core
- django_pos/apps/dajaxice/management
- django_pos/apps/dajaxice/management/commands
- django_pos/apps/dajaxice/templates
- django_pos/apps/dajaxice/templates/dajaxice
- django_pos/apps/dajaxice/templatetags
- django_pos/apps/dajaxice/tests
- django_pos/apps/dajaxice/tests/submodules
- django_pos/apps/inplaceeditform
- django_pos/apps/inplaceeditform/locale
- django_pos/apps/inplaceeditform/locale/ca
- django_pos/apps/inplaceeditform/locale/ca/LC_MESSAGES
- django_pos/apps/inplaceeditform/locale/en
- django_pos/apps/inplaceeditform/locale/en/LC_MESSAGES
- django_pos/apps/inplaceeditform/locale/es
- django_pos/apps/inplaceeditform/locale/es/LC_MESSAGES
- django_pos/apps/inplaceeditform/static
- django_pos/apps/inplaceeditform/static/css
- django_pos/apps/inplaceeditform/static/img
- django_pos/apps/inplaceeditform/static/js
- django_pos/apps/inplaceeditform/templates
- django_pos/apps/inplaceeditform/templates/inplaceeditform
- django_pos/apps/inplaceeditform/templates/inplaceeditform/adaptor_boolean
- django_pos/apps/inplaceeditform/templates/inplaceeditform/adaptor_date
- django_pos/apps/inplaceeditform/templates/inplaceeditform/adaptor_datetime
- django_pos/apps/inplaceeditform/templates/inplaceeditform/adaptor_file
- django_pos/apps/inplaceeditform/templates/inplaceeditform/adaptor_image
- django_pos/apps/inplaceeditform/templates/inplaceeditform/adaptor_m2m
- django_pos/apps/inplaceeditform/templatetags
- django_pos/pos
- django_pos/pos/static
- django_pos/pos/static/css
- django_pos/pos/static/img
- django_pos/pos/static/js
- django_pos/pos/templates
- django_pos/pos/templates/pos
- django_pos/pos/templatetags
- django_pos/static
- django_pos/static/admin
- django_pos/static/admin/css
- django_pos/static/admin/img
- django_pos/static/admin/img/gis
- django_pos/static/admin/js
- django_pos/static/admin/js/admin
- django_pos/static/css
- django_pos/static/img
- django_pos/static/js
- django_pos/templates
- django_pos/templates/inplaceeditform
- files modified:
- full_stock_traceability/stock_move.py
- pexego-runbot/font/mnmliconsv21-webfont.eot *
- pexego-runbot/font/mnmliconsv21-webfont.svg *
- pexego-runbot/font/mnmliconsv21-webfont.ttf *
- pexego-runbot/font/mnmliconsv21-webfont.woff *
- pexego-runbot/pxgorunbot/app.py *
- pexego-runbot/pxgorunbot/auth.py *
- pexego-runbot/pxgorunbot/database.py *
- pexego-runbot/pxgorunbot/models.py *
expand all
collapse all
added
removed
django_pos/apps/inplaceeditform/static/img/apply.gif
django_pos/apps/inplaceeditform/static/img/cancel.gif
django_pos/apps/inplaceeditform/static/img/false.gif
django_pos/apps/inplaceeditform/static/img/load.png
django_pos/apps/inplaceeditform/static/img/true.gif
django_pos/pos/static/img/backspace.png
django_pos/pos/static/img/barra.jpg
django_pos/pos/static/img/eliminar.gif
django_pos/pos/static/img/eliminar.png
django_pos/pos/static/img/gtk-apply.png
django_pos/pos/static/img/gtk-go-back.png
django_pos/pos/static/img/headerbackground.jpg
django_pos/pos/static/img/home.png
django_pos/pos/static/img/mesa.jpg
django_pos/pos/static/img/search.png
django_pos/pos/static/img/search_reset.gif
django_pos/static/admin/img/changelist-bg.gif
django_pos/static/admin/img/changelist-bg_rtl.gif
django_pos/static/admin/img/chooser-bg.gif
django_pos/static/admin/img/chooser_stacked-bg.gif
django_pos/static/admin/img/default-bg-reverse.gif
django_pos/static/admin/img/default-bg.gif
django_pos/static/admin/img/deleted-overlay.gif
django_pos/static/admin/img/gis/move_vertex_off.png
django_pos/static/admin/img/gis/move_vertex_on.png
django_pos/static/admin/img/icon-no.gif
django_pos/static/admin/img/icon-unknown.gif
django_pos/static/admin/img/icon-yes.gif
django_pos/static/admin/img/icon_addlink.gif
django_pos/static/admin/img/icon_alert.gif
django_pos/static/admin/img/icon_calendar.gif
django_pos/static/admin/img/icon_changelink.gif
django_pos/static/admin/img/icon_clock.gif
django_pos/static/admin/img/icon_deletelink.gif
django_pos/static/admin/img/icon_error.gif
django_pos/static/admin/img/icon_searchbox.png
django_pos/static/admin/img/icon_success.gif
django_pos/static/admin/img/inline-delete-8bit.png
django_pos/static/admin/img/inline-delete.png
django_pos/static/admin/img/inline-restore-8bit.png
django_pos/static/admin/img/inline-restore.png
django_pos/static/admin/img/inline-splitter-bg.gif
django_pos/static/admin/img/nav-bg-grabber.gif
django_pos/static/admin/img/nav-bg-reverse.gif
django_pos/static/admin/img/nav-bg-selected.gif
django_pos/static/admin/img/nav-bg.gif
django_pos/static/admin/img/selector-icons.gif
django_pos/static/admin/img/selector-search.gif
django_pos/static/admin/img/sorting-icons.gif
django_pos/static/admin/img/tool-left.gif
django_pos/static/admin/img/tool-left_over.gif
django_pos/static/admin/img/tool-right.gif
django_pos/static/admin/img/tool-right_over.gif
django_pos/static/admin/img/tooltag-add.gif
django_pos/static/admin/img/tooltag-add_over.gif
django_pos/static/admin/img/tooltag-arrowright.gif
django_pos/static/admin/img/tooltag-arrowright_over.gif
django_pos/static/img/apply.gif
django_pos/static/img/backspace.png
django_pos/static/img/barra.jpg
django_pos/static/img/cancel.gif
django_pos/static/img/eliminar.gif
django_pos/static/img/eliminar.png
django_pos/static/img/false.gif
django_pos/static/img/gtk-apply.png
django_pos/static/img/gtk-go-back.png
django_pos/static/img/headerbackground.jpg
django_pos/static/img/home.png
django_pos/static/img/load.png
django_pos/static/img/mesa.jpg
django_pos/static/img/search.png
django_pos/static/img/search_reset.gif
django_pos/static/img/true.gif
