[simpleinvoices/simpleinvoices] 5d2321: 2012-1 - updating submodules

6 views
Skip to first unread message

GitHub

unread,
Jun 12, 2013, 5:21:13 PM6/12/13
to simpleinv...@googlegroups.com
Branch: refs/heads/master
Home: https://github.com/simpleinvoices/simpleinvoices
Commit: 5d232174f160e533c36326ddbf3e882dc80cf6b3
https://github.com/simpleinvoices/simpleinvoices/commit/5d232174f160e533c36326ddbf3e882dc80cf6b3
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2012-11-15 (Thu, 15 Nov 2012)

Changed paths:
R library/Zend

Log Message:
-----------
2012-1 - updating submodules


Commit: 79da756fb4f07d1c312d64bfd9b26dd348dd1110
https://github.com/simpleinvoices/simpleinvoices/commit/79da756fb4f07d1c312d64bfd9b26dd348dd1110
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-10 (Sun, 10 Mar 2013)

Changed paths:
M include/sql_patches.php
A library/Zend

Log Message:
-----------
start new product matrix


Commit: 6d021ffa03e425e723a87dd8c586e86ea0c4d916
https://github.com/simpleinvoices/simpleinvoices/commit/6d021ffa03e425e723a87dd8c586e86ea0c4d916
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-11 (Mon, 11 Mar 2013)

Changed paths:
M include/sql_patches.php

Log Message:
-----------
start sql paches for matrix


Commit: 4f97fa36d9e5c37e5e92aacb6de55e26a44fecb4
https://github.com/simpleinvoices/simpleinvoices/commit/4f97fa36d9e5c37e5e92aacb6de55e26a44fecb4
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-11 (Mon, 11 Mar 2013)

Changed paths:
M include/sql_patches.php

Log Message:
-----------
Update sql_patches.php


Commit: 0916a0a075a566471ed68cb0589306c74d173ce1
https://github.com/simpleinvoices/simpleinvoices/commit/0916a0a075a566471ed68cb0589306c74d173ce1
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-13 (Wed, 13 Mar 2013)

Changed paths:
M .gitignore
M config/config.ini
A custom/default_template/ReadMe.txt
A custom/hooks.tpl
A custom/modules/ReadMe.txt
A extras/custom_example/ReadMe.txt
A extras/custom_example/default_template/auth/login.tpl
A extras/custom_example/default_template/index/index.tpl
A extras/custom_example/hooks.tpl
A extras/custom_example/modules/index/index.php
A extras/custom_example/my_medias/my.css
A extras/custom_example/my_medias/ubuntulogo.png
A images/common/mess_error.png
A images/common/mess_ok.png
R images/flexigrid/._fhbg.gif
R images/flexigrid/._wbg.gif
A images/jquery-ui/222222_11x11_icon_arrows_leftright.gif
A images/jquery-ui/222222_11x11_icon_arrows_updown.gif
A images/jquery-ui/222222_11x11_icon_close.gif
A images/jquery-ui/222222_11x11_icon_doc.gif
A images/jquery-ui/222222_11x11_icon_folder_closed.gif
A images/jquery-ui/222222_11x11_icon_folder_open.gif
A images/jquery-ui/222222_11x11_icon_minus.gif
A images/jquery-ui/222222_11x11_icon_plus.gif
A images/jquery-ui/222222_11x11_icon_resize_se.gif
A images/jquery-ui/222222_35x9_colorpicker_indicator.gif.gif
A images/jquery-ui/222222_7x7_arrow_down.gif
A images/jquery-ui/222222_7x7_arrow_left.gif
A images/jquery-ui/222222_7x7_arrow_right.gif
A images/jquery-ui/222222_7x7_arrow_up.gif
A images/jquery-ui/454545_11x11_icon_arrows_leftright.gif
A images/jquery-ui/454545_11x11_icon_arrows_updown.gif
A images/jquery-ui/454545_11x11_icon_close.gif
A images/jquery-ui/454545_11x11_icon_doc.gif
A images/jquery-ui/454545_11x11_icon_folder_closed.gif
A images/jquery-ui/454545_11x11_icon_folder_open.gif
A images/jquery-ui/454545_11x11_icon_minus.gif
A images/jquery-ui/454545_11x11_icon_plus.gif
A images/jquery-ui/454545_7x7_arrow_down.gif
A images/jquery-ui/454545_7x7_arrow_left.gif
A images/jquery-ui/454545_7x7_arrow_right.gif
A images/jquery-ui/454545_7x7_arrow_up.gif
A images/jquery-ui/888888_11x11_icon_arrows_leftright.gif
A images/jquery-ui/888888_11x11_icon_arrows_updown.gif
A images/jquery-ui/888888_11x11_icon_close.gif
A images/jquery-ui/888888_11x11_icon_doc.gif
A images/jquery-ui/888888_11x11_icon_folder_closed.gif
A images/jquery-ui/888888_11x11_icon_folder_open.gif
A images/jquery-ui/888888_11x11_icon_minus.gif
A images/jquery-ui/888888_11x11_icon_plus.gif
A images/jquery-ui/888888_7x7_arrow_down.gif
A images/jquery-ui/888888_7x7_arrow_left.gif
A images/jquery-ui/888888_7x7_arrow_right.gif
A images/jquery-ui/888888_7x7_arrow_up.gif
A images/jquery-ui/_x_
A images/jquery-ui/dadada_40x100_textures_02_glass_75.png
A images/jquery-ui/e6e6e6_40x100_textures_02_glass_75.png
A images/jquery-ui/ffffff_40x100_textures_01_flat_0.png
A images/jquery-ui/ffffff_40x100_textures_02_glass_65.png
M include/class/email.php
M include/class/export.php
M include/class/invoice.php
M include/class/product.php
M include/class/siLocal.php
M include/functions.php
M include/jquery/jquery.conf.js.tpl
M include/jquery/jquery.functions.js.tpl
M include/language.php
M include/reportrunlib.php
M include/sql_queries.php
M index.php
M lang/en_GB/lang.php
M lang/fr_FR/lang.php
A library/HTMLPurifier/standalone/HTMLPurifier/DefinitionCache/Serializer/readme.txt
R library/phpreports/PHPReport.dtd
R library/phpreports/PHPReport.xsd
R library/phpreports/PHPReportInputObject.php
R library/phpreports/PHPReportMaker.php
R library/phpreports/PHPReportOutputObject.php
R library/phpreports/PHPReportsUtil.php
R library/phpreports/css/bookmarks.css
R library/phpreports/css/phpreports.css
R library/phpreports/css/toolbar.css
R library/phpreports/database/db_adodb.php
R library/phpreports/database/db_array.php
R library/phpreports/database/db_informix.php
R library/phpreports/database/db_interbase.php
R library/phpreports/database/db_mssql.php
R library/phpreports/database/db_mysql.php
R library/phpreports/database/db_odbc.php
R library/phpreports/database/db_oracle.php
R library/phpreports/database/db_oracle_php5.php
R library/phpreports/database/db_pdo.php
R library/phpreports/database/db_peardb.php
R library/phpreports/database/db_postgresql.php
R library/phpreports/database/db_sqlite.php
R library/phpreports/help/connectionrefused.php
R library/phpreports/help/contactdeveloper.php
R library/phpreports/help/missingfield.php
R library/phpreports/help/nocolumns.php
R library/phpreports/help/nopage.php
R library/phpreports/help/noxsltprocessor.php
R library/phpreports/help/queryerror.php
R library/phpreports/input/PHPReportInputCrosstab.php
R library/phpreports/notused/AUTHORS
R library/phpreports/notused/COPYING
R library/phpreports/notused/Changelog
R library/phpreports/notused/INSTALL
R library/phpreports/notused/PHPReportConvert.php
R library/phpreports/notused/PHPReportsTest.php
R library/phpreports/notused/README
R library/phpreports/notused/THANKS
R library/phpreports/notused/encoding_change
R library/phpreports/notused/footer.xml
R library/phpreports/notused/header.xml
R library/phpreports/notused/img/error.png
R library/phpreports/notused/img/penguin.png
R library/phpreports/notused/img/runbetter.png
R library/phpreports/notused/img/warning.png
R library/phpreports/notused/outmenu.php
R library/phpreports/notused/sabtest.xml
R library/phpreports/notused/sales.css
R library/phpreports/notused/sales.php
R library/phpreports/notused/sales.sql
R library/phpreports/notused/sales.xml
R library/phpreports/notused/template.php
R library/phpreports/notused/template.xml
R library/phpreports/notused/xsltest.py
R library/phpreports/notused/xsltest.xml
R library/phpreports/output/bookmarks/PHPReportOutput.php
R library/phpreports/output/bookmarks/bookmarks.xsl
R library/phpreports/output/common/PHPReport.xsl
R library/phpreports/output/common/PHPReportBookmark.xsl
R library/phpreports/output/common/PHPReportCSS.xsl
R library/phpreports/output/common/PHPReportCol.xsl
R library/phpreports/output/common/PHPReportImg.xsl
R library/phpreports/output/common/PHPReportPage.xsl
R library/phpreports/output/common/PHPReportRow.xsl
R library/phpreports/output/common/PHPReportXHTML.xsl
R library/phpreports/output/csv/PHPReportOutput.php
R library/phpreports/output/csv/csv.xsl
R library/phpreports/output/default/PHPReportOutput.php
R library/phpreports/output/default/default.xsl
R library/phpreports/output/none/PHPReportOutput.php
R library/phpreports/output/page/PHPReportOutput.php
R library/phpreports/output/page/page.php
R library/phpreports/output/page/page.xsl
R library/phpreports/output/tsv/PHPReportOutput.php
R library/phpreports/output/tsv/tsv.xsl
R library/phpreports/output/txt/PHPReportOutput.php
R library/phpreports/output/txt/txt.xsl
R library/phpreports/php/PHPReportBookmark.php
R library/phpreports/php/PHPReportCol.php
R library/phpreports/php/PHPReportColParm.php
R library/phpreports/php/PHPReportEvent.php
R library/phpreports/php/PHPReportField.php
R library/phpreports/php/PHPReportForm.php
R library/phpreports/php/PHPReportGroup.php
R library/phpreports/php/PHPReportImg.php
R library/phpreports/php/PHPReportLink.php
R library/phpreports/php/PHPReportPage.php
R library/phpreports/php/PHPReportRow.php
R library/phpreports/php/PHPReportRpt.php
R library/phpreports/php/PHPReportXMLElement.php
R library/phpreports/php/sabtest.php
R library/phpreports/php/xsltest.php
R library/phpreports/xslt/PHPReport.xsl
R library/phpreports/xslt/PHPReportBookmark.xsl
R library/phpreports/xslt/PHPReportCol.xsl
R library/phpreports/xslt/PHPReportFields.xsl
R library/phpreports/xslt/PHPReportFooter.xsl
R library/phpreports/xslt/PHPReportForm.xsl
R library/phpreports/xslt/PHPReportGroup.xsl
R library/phpreports/xslt/PHPReportHeader.xsl
R library/phpreports/xslt/PHPReportImg.xsl
R library/phpreports/xslt/PHPReportLink.xsl
R library/phpreports/xslt/PHPReportPage.xsl
R library/phpreports/xslt/PHPReportPreview.xsl
R library/phpreports/xslt/PHPReportRow.xsl
R library/phpreports/xslt/PHPReportRpt.xsl
R library/phpreports/xslt/PHPReportUtil.xsl
R library/phpreports/xslt/PHPReportXHTML.xsl
R library/phpreports/xslt/sabtest.xsl
R library/phpreports/xslt/xsltest.xsl
M modules/custom_fields/manage.js.php
M modules/customers/manage.js.php
M modules/invoices/manage.js.php
M modules/invoices/quick_view.php
M modules/invoices/xml.php
M modules/options/backup_database.php
M modules/options/database_sqlpatches.php
M modules/payments/manage.js.php
M modules/payments/save.php
M modules/preferences/details.php
M modules/products/manage.js.php
M modules/products/xml.php
M modules/reports/report_biller_by_customer.php
R modules/reports/report_biller_by_customer.xml
M modules/reports/report_biller_total.php
R modules/reports/report_biller_total.xml
M modules/reports/report_debtors_aging_total.php
R modules/reports/report_debtors_aging_total.xml
M modules/reports/report_debtors_by_aging.php
R modules/reports/report_debtors_by_aging.xml
M modules/reports/report_debtors_by_amount.php
R modules/reports/report_debtors_by_amount.xml
M modules/reports/report_debtors_owing_by_customer.php
R modules/reports/report_debtors_owing_by_customer.xml
M modules/reports/report_products_sold_by_customer.php
R modules/reports/report_products_sold_by_customer.xml
M modules/reports/report_products_sold_total.php
R modules/reports/report_products_sold_total.xml
M modules/reports/report_sales_by_periods.php
M modules/reports/report_sales_customers_total.php
R modules/reports/report_sales_customers_total.xml
M modules/reports/report_sales_total.php
R modules/reports/report_sales_total.xml
M modules/reports/report_tax_total.php
R modules/reports/report_tax_total.xml
M readme.md
M templates/default/auth/login.tpl
M templates/default/billers/add.tpl
M templates/default/billers/details.tpl
M templates/default/billers/manage.tpl
M templates/default/billers/save.tpl
M templates/default/cron/add.tpl
M templates/default/cron/manage.tpl
R templates/default/css/flexigrid.css
R templates/default/css/iehacks.css
R templates/default/css/jquery-ui/default.css
R templates/default/css/jquery-ui/default/default.dialog.css
R templates/default/css/jquery-ui/default/images/222222_11x11_icon_arrows_leftright.gif
R templates/default/css/jquery-ui/default/images/222222_11x11_icon_arrows_updown.gif
R templates/default/css/jquery-ui/default/images/222222_11x11_icon_close.gif
R templates/default/css/jquery-ui/default/images/222222_11x11_icon_doc.gif
R templates/default/css/jquery-ui/default/images/222222_11x11_icon_folder_closed.gif
R templates/default/css/jquery-ui/default/images/222222_11x11_icon_folder_open.gif
R templates/default/css/jquery-ui/default/images/222222_11x11_icon_minus.gif
R templates/default/css/jquery-ui/default/images/222222_11x11_icon_plus.gif
R templates/default/css/jquery-ui/default/images/222222_11x11_icon_resize_se.gif
R templates/default/css/jquery-ui/default/images/222222_35x9_colorpicker_indicator.gif.gif
R templates/default/css/jquery-ui/default/images/222222_7x7_arrow_down.gif
R templates/default/css/jquery-ui/default/images/222222_7x7_arrow_left.gif
R templates/default/css/jquery-ui/default/images/222222_7x7_arrow_right.gif
R templates/default/css/jquery-ui/default/images/222222_7x7_arrow_up.gif
R templates/default/css/jquery-ui/default/images/454545_11x11_icon_arrows_leftright.gif
R templates/default/css/jquery-ui/default/images/454545_11x11_icon_arrows_updown.gif
R templates/default/css/jquery-ui/default/images/454545_11x11_icon_close.gif
R templates/default/css/jquery-ui/default/images/454545_11x11_icon_doc.gif
R templates/default/css/jquery-ui/default/images/454545_11x11_icon_folder_closed.gif
R templates/default/css/jquery-ui/default/images/454545_11x11_icon_folder_open.gif
R templates/default/css/jquery-ui/default/images/454545_11x11_icon_minus.gif
R templates/default/css/jquery-ui/default/images/454545_11x11_icon_plus.gif
R templates/default/css/jquery-ui/default/images/454545_7x7_arrow_down.gif
R templates/default/css/jquery-ui/default/images/454545_7x7_arrow_left.gif
R templates/default/css/jquery-ui/default/images/454545_7x7_arrow_right.gif
R templates/default/css/jquery-ui/default/images/454545_7x7_arrow_up.gif
R templates/default/css/jquery-ui/default/images/888888_11x11_icon_arrows_leftright.gif
R templates/default/css/jquery-ui/default/images/888888_11x11_icon_arrows_updown.gif
R templates/default/css/jquery-ui/default/images/888888_11x11_icon_close.gif
R templates/default/css/jquery-ui/default/images/888888_11x11_icon_doc.gif
R templates/default/css/jquery-ui/default/images/888888_11x11_icon_folder_closed.gif
R templates/default/css/jquery-ui/default/images/888888_11x11_icon_folder_open.gif
R templates/default/css/jquery-ui/default/images/888888_11x11_icon_minus.gif
R templates/default/css/jquery-ui/default/images/888888_11x11_icon_plus.gif
R templates/default/css/jquery-ui/default/images/888888_7x7_arrow_down.gif
R templates/default/css/jquery-ui/default/images/888888_7x7_arrow_left.gif
R templates/default/css/jquery-ui/default/images/888888_7x7_arrow_right.gif
R templates/default/css/jquery-ui/default/images/888888_7x7_arrow_up.gif
R templates/default/css/jquery-ui/default/images/_x_
R templates/default/css/jquery-ui/default/images/dadada_40x100_textures_02_glass_75.png
R templates/default/css/jquery-ui/default/images/e6e6e6_40x100_textures_02_glass_75.png
R templates/default/css/jquery-ui/default/images/ffffff_40x100_textures_01_flat_0.png
R templates/default/css/jquery-ui/default/images/ffffff_40x100_textures_02_glass_65.png
R templates/default/css/jquery-ui/tab-screen.css
R templates/default/css/jquery-ui/tab.css
R templates/default/css/jquery-ui/tab_menu.css
R templates/default/css/login.css
A templates/default/css/main.css
A templates/default/css/main_ie.css
R templates/default/css/phpreports.css
R templates/default/css/screen.css
R templates/default/css/tabs-ie.css
R templates/default/css/tabs.css
A templates/default/css/to_delete/moved/flexigrid.css
A templates/default/css/to_delete/moved/iehacks.css
A templates/default/css/to_delete/moved/jquery-ui/default.css
A templates/default/css/to_delete/moved/jquery-ui/default/default.dialog.css
A templates/default/css/to_delete/moved/jquery-ui/tab-screen.css
A templates/default/css/to_delete/moved/jquery-ui/tab.css
A templates/default/css/to_delete/moved/jquery-ui/tab_menu.css
A templates/default/css/to_delete/moved/login.css
A templates/default/css/to_delete/moved/phpreports.css
A templates/default/css/to_delete/unused/screen.css
A templates/default/css/to_delete/unused/tabs-ie.css
A templates/default/css/to_delete/unused/tabs.css
M templates/default/custom_fields/details.tpl
M templates/default/custom_fields/manage.tpl
M templates/default/custom_fields/save.tpl
M templates/default/customers/add.tpl
M templates/default/customers/details.tpl
M templates/default/customers/manage.tpl
M templates/default/customers/save.tpl
M templates/default/extensions/manage.tpl
M templates/default/extensions/register.tpl
M templates/default/footer.tpl
M templates/default/header.tpl
M templates/default/index/index.tpl
M templates/default/install/essential.tpl
A templates/default/install/inc_foot.tpl
A templates/default/install/inc_head.tpl
M templates/default/install/index.tpl
M templates/default/install/sample_data.tpl
M templates/default/install/structure.tpl
M templates/default/inventory/add.tpl
M templates/default/inventory/edit.tpl
M templates/default/inventory/manage.tpl
M templates/default/inventory/view.tpl
M templates/default/invoices/details.tpl
M templates/default/invoices/email.tpl
M templates/default/invoices/header.tpl
M templates/default/invoices/itemised.tpl
M templates/default/invoices/manage.tpl
M templates/default/invoices/quick_view.tpl
M templates/default/invoices/save.tpl
M templates/default/invoices/total.tpl
M templates/default/main.tpl
M templates/default/menu.tpl
M templates/default/options/database_sqlpatches.tpl
M templates/default/options/index.tpl
M templates/default/payment_types/add.tpl
M templates/default/payment_types/details.tpl
M templates/default/payment_types/manage.tpl
M templates/default/payment_types/save.tpl
M templates/default/payments/details.tpl
M templates/default/payments/manage.tpl
M templates/default/payments/process.tpl
M templates/default/preferences/add.tpl
M templates/default/preferences/details.tpl
M templates/default/preferences/manage.tpl
M templates/default/preferences/save.tpl
M templates/default/products/add.tpl
M templates/default/products/details.tpl
M templates/default/products/manage.tpl
M templates/default/reports/index.tpl
M templates/default/reports/report_biller_by_customer.tpl
M templates/default/reports/report_biller_total.tpl
M templates/default/reports/report_debtors_aging_total.tpl
M templates/default/reports/report_debtors_by_aging.tpl
M templates/default/reports/report_debtors_by_amount.tpl
M templates/default/reports/report_debtors_owing_by_customer.tpl
M templates/default/reports/report_products_sold_by_customer.tpl
M templates/default/reports/report_products_sold_total.tpl
M templates/default/reports/report_sales_by_periods.tpl
A templates/default/reports/report_sales_by_periods_include.tpl
M templates/default/reports/report_sales_customers_total.tpl
M templates/default/reports/report_sales_total.tpl
M templates/default/reports/report_tax_total.tpl
M templates/default/statement/index.tpl
M templates/default/system_defaults/edit.tpl
M templates/default/system_defaults/manage.tpl
M templates/default/system_defaults/save.tpl
M templates/default/tax_rates/add.tpl
M templates/default/tax_rates/details.tpl
M templates/default/tax_rates/manage.tpl
M templates/default/tax_rates/save.tpl
M templates/default/user/add.tpl
M templates/default/user/details.tpl
M templates/default/user/manage.tpl
M templates/default/user/save.tpl

Log Message:
-----------
Merge branch 'master' of github.com:simpleinvoices/simpleinvoices into jk_product_matrix


Commit: 6dd16d7764502e939828ebe2618c10bf8658de3c
https://github.com/simpleinvoices/simpleinvoices/commit/6dd16d7764502e939828ebe2618c10bf8658de3c
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-13 (Wed, 13 Mar 2013)

Changed paths:
M include/sql_patches.php

Log Message:
-----------
update prod matrix branch with latest


Commit: b1d6cdacde5505c8a8d0896941f154f83551d232
https://github.com/simpleinvoices/simpleinvoices/commit/b1d6cdacde5505c8a8d0896941f154f83551d232
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-13 (Wed, 13 Mar 2013)

Changed paths:
M templates/default/css/main.css

Log Message:
-----------
Merge branch 'master' of github.com:simpleinvoices/simpleinvoices into jk_product_matrix


Commit: d68031e678d4478ab02145ca85afe3c72b3032cd
https://github.com/simpleinvoices/simpleinvoices/commit/d68031e678d4478ab02145ca85afe3c72b3032cd
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-13 (Wed, 13 Mar 2013)

Changed paths:
M include/sql_patches.php
M lang/en_GB/lang.php
M modules/install/essential.php
A modules/product_attribute/add.php
A modules/product_attribute/details.php
A modules/product_attribute/manage.js.php
A modules/product_attribute/manage.php
A modules/product_attribute/save.php
A modules/product_attribute/xml.php
A modules/product_value/add.php
A modules/product_value/details.php
A modules/product_value/manage.js.php
A modules/product_value/manage.php
A modules/product_value/save.php
A modules/product_value/xml.php
M modules/products/add.php
M templates/default/css/main.css
M templates/default/menu.tpl
A templates/default/product_attribute/add.tpl
A templates/default/product_attribute/details.tpl
A templates/default/product_attribute/manage.tpl
A templates/default/product_attribute/save.tpl
A templates/default/product_value/add.tpl
A templates/default/product_value/details.tpl
A templates/default/product_value/manage.tpl
A templates/default/product_value/save.tpl
M templates/default/products/add.tpl

Log Message:
-----------
start adding product matrix code into base


Commit: ed668e73d9f0e8cfee058e61345399084e7bff3e
https://github.com/simpleinvoices/simpleinvoices/commit/ed668e73d9f0e8cfee058e61345399084e7bff3e
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-13 (Wed, 13 Mar 2013)

Changed paths:
M modules/product_attribute/add.php
M modules/product_value/add.php

Log Message:
-----------
fix prod attr save


Commit: 4b9b2beb8252b4ab3aba5896bcafa8adcd25fba9
https://github.com/simpleinvoices/simpleinvoices/commit/4b9b2beb8252b4ab3aba5896bcafa8adcd25fba9
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-14 (Thu, 14 Mar 2013)

Changed paths:
M include/sql_patches.php
M lang/en_GB/lang.php
M templates/default/products/add.tpl

Log Message:
-----------
add product note attributes


Commit: 1ee92121f0beba957265b207da8b50919fccb68c
https://github.com/simpleinvoices/simpleinvoices/commit/1ee92121f0beba957265b207da8b50919fccb68c
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-14 (Thu, 14 Mar 2013)

Changed paths:
M templates/default/customers/details.tpl
M templates/default/products/add.tpl

Log Message:
-----------
add tabs to product add and customer view


Commit: 5a1b3607e3cf6c93728f0e53b342c2886c17f419
https://github.com/simpleinvoices/simpleinvoices/commit/5a1b3607e3cf6c93728f0e53b342c2886c17f419
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-20 (Wed, 20 Mar 2013)

Changed paths:
M include/jquery/jquery.functions.js.tpl
M modules/invoices/invoice.php
M modules/invoices/product_ajax.php

Log Message:
-----------
make auto show line item description and auto pop description work


Commit: 5169eb7e95cb6c4b4c770b9588dc0a546e1d12bb
https://github.com/simpleinvoices/simpleinvoices/commit/5169eb7e95cb6c4b4c770b9588dc0a546e1d12bb
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-20 (Wed, 20 Mar 2013)

Changed paths:
M include/sql_queries.php
M templates/default/products/add.tpl

Log Message:
-----------
product matrix - make product add work correctly


Commit: a3237be8caf0b33d9877ee2729ecd1a094daf36d
https://github.com/simpleinvoices/simpleinvoices/commit/a3237be8caf0b33d9877ee2729ecd1a094daf36d
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-20 (Wed, 20 Mar 2013)

Changed paths:
M include/jquery/jquery.functions.js.tpl
M include/sql_queries.php
M modules/invoices/product_ajax.php

Log Message:
-----------
product matrix - start invoice -product select work


Commit: 0537dc8375fcfff13f31cf776930c6594fc755b9
https://github.com/simpleinvoices/simpleinvoices/commit/0537dc8375fcfff13f31cf776930c6594fc755b9
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-24 (Sun, 24 Mar 2013)

Changed paths:
M include/sql_patches.php

Log Message:
-----------
sql patch for prod matrix


Commit: f08e02091db7ee891a9c2bee78656203ff09437d
https://github.com/simpleinvoices/simpleinvoices/commit/f08e02091db7ee891a9c2bee78656203ff09437d
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Changed paths:
M include/sql_patches.php
M include/sql_queries.php
M modules/system_defaults/edit.php
M modules/system_defaults/manage.php
M templates/default/system_defaults/manage.tpl

Log Message:
-----------
add prod matric to sys defautls


Commit: 67917bfab4397b5985e32fc1494a04a8fc60e43e
https://github.com/simpleinvoices/simpleinvoices/commit/67917bfab4397b5985e32fc1494a04a8fc60e43e
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Changed paths:
M include/jquery/jquery.functions.js.tpl
M modules/invoices/product_ajax.php

Log Message:
-----------
prod matrix - new invoice - ajax fix ups


Commit: 1b87e8194577cb8a683115b158329368809ba818
https://github.com/simpleinvoices/simpleinvoices/commit/1b87e8194577cb8a683115b158329368809ba818
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Changed paths:
M include/sql_queries.php
M modules/products/details.php
M templates/default/products/details.tpl

Log Message:
-----------
prod matrix - make edit product work with attributes


Commit: 61aaad6a90bc7f436eb766113a4574e276bf699c
https://github.com/simpleinvoices/simpleinvoices/commit/61aaad6a90bc7f436eb766113a4574e276bf699c
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Changed paths:
M include/class/invoice.php
A include/class/product/attributes.php
M include/sql_patches.php
M include/sql_queries.php
M modules/invoices/product_ajax.php
M modules/invoices/quick_view.php
M modules/invoices/save.php
M templates/default/css/main.css
M templates/default/invoices/quick_view.tpl

Log Message:
-----------
prod matrix - print on quick view


Commit: 3d58901157c58ce2b835f73fa45482e2672cdf6f
https://github.com/simpleinvoices/simpleinvoices/commit/3d58901157c58ce2b835f73fa45482e2672cdf6f
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Changed paths:
M templates/invoices/default/template.tpl

Log Message:
-----------
prod matrix - print on quick view


Commit: 06bdcc05ad44bf35e64fe7ae13c870ca7c3ff606
https://github.com/simpleinvoices/simpleinvoices/commit/06bdcc05ad44bf35e64fe7ae13c870ca7c3ff606
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-27 (Wed, 27 Mar 2013)

Changed paths:
M include/class/invoice.php
M include/class/product/attributes.php
M include/sql_patches.php
M lang/en_GB/lang.php
M modules/invoices/product_ajax.php
M modules/product_attribute/add.php
M modules/product_attribute/details.php
M modules/product_attribute/manage.js.php
M modules/product_attribute/save.php
M modules/product_attribute/xml.php
M modules/product_value/add.php
M modules/product_value/manage.js.php
M modules/product_value/save.php
M modules/product_value/xml.php
M modules/products/add.php
M templates/default/invoices/quick_view.tpl
M templates/default/product_attribute/add.tpl
M templates/default/product_attribute/details.tpl
M templates/default/product_attribute/manage.tpl
M templates/default/product_value/add.tpl
M templates/default/product_value/details.tpl
M templates/default/product_value/manage.tpl
M templates/invoices/default/style.css
M templates/invoices/default/template.tpl

Log Message:
-----------
prod matrix - add enabled and visible


Commit: f4c4237e5e217024ac3342c21f65be0e91ec82a0
https://github.com/simpleinvoices/simpleinvoices/commit/f4c4237e5e217024ac3342c21f65be0e91ec82a0
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-27 (Wed, 27 Mar 2013)

Changed paths:
M include/sql_patches.php
M modules/product_attribute/details.php
M modules/product_attribute/save.php
M modules/product_value/save.php
M modules/products/add.php
M templates/default/product_attribute/details.tpl

Log Message:
-----------
prod matrix - remove display_name


Commit: cd8795196d9ff3d4625f22bd6931c5aa2790cf65
https://github.com/simpleinvoices/simpleinvoices/commit/cd8795196d9ff3d4625f22bd6931c5aa2790cf65
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-27 (Wed, 27 Mar 2013)

Changed paths:
M templates/default/products/details.tpl

Log Message:
-----------
prod matrix - remove disabled attributes from prod add/edit pages


Commit: dbc30ab70aa7a979a110300fd2eaf316ce0746ee
https://github.com/simpleinvoices/simpleinvoices/commit/dbc30ab70aa7a979a110300fd2eaf316ce0746ee
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-31 (Sun, 31 Mar 2013)

Changed paths:
M include/jquery/jquery.functions.js.tpl
M modules/invoices/details.php
M templates/default/invoices/details.tpl

Log Message:
-----------
make prod attr work in invoice edit


Commit: 4a0149c6d16a853a85b311d402fcc96cb3e652f4
https://github.com/simpleinvoices/simpleinvoices/commit/4a0149c6d16a853a85b311d402fcc96cb3e652f4
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-31 (Sun, 31 Mar 2013)

Changed paths:
M include/sql_queries.php
M modules/invoices/save.php

Log Message:
-----------
make prod attr - make edit -> save work


Commit: 3993a7a707e69509274b4f2bfc4de1323f113411
https://github.com/simpleinvoices/simpleinvoices/commit/3993a7a707e69509274b4f2bfc4de1323f113411
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-03-31 (Sun, 31 Mar 2013)

Changed paths:
M modules/invoices/details.php

Log Message:
-----------
make prod attr - make edit -> save work


Commit: d9ded5bc85ebf2da9960a6a33656f19e30d04642
https://github.com/simpleinvoices/simpleinvoices/commit/d9ded5bc85ebf2da9960a6a33656f19e30d04642
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-04-02 (Tue, 02 Apr 2013)

Changed paths:
M modules/invoices/details.php

Log Message:
-----------
prod matrix : make edit invoice - save attributes work


Commit: f424bb858bfc488bf36ab1d6e6dbab3994edd823
https://github.com/simpleinvoices/simpleinvoices/commit/f424bb858bfc488bf36ab1d6e6dbab3994edd823
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-04-02 (Tue, 02 Apr 2013)

Changed paths:
M include/class/invoice.php
M include/class/product/attributes.php
M lang/en_GB/lang.php
M modules/invoices/product_ajax.php
M templates/default/invoices/quick_view.tpl
M templates/default/product_attribute/add.tpl
M templates/invoices/default/template.tpl

Log Message:
-----------
prod matrix : make free text and decimal type work


Commit: 551ce885f670990d205083c5fc78a14b21d9b8fd
https://github.com/simpleinvoices/simpleinvoices/commit/551ce885f670990d205083c5fc78a14b21d9b8fd
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-04-02 (Tue, 02 Apr 2013)

Changed paths:
M include/jquery/jquery.functions.js.tpl
M modules/invoices/details.php

Log Message:
-----------
prod matrix : make edit - add new line item select blank product


Commit: 411b1b22fb927cabf934f4568e076d3c60114982
https://github.com/simpleinvoices/simpleinvoices/commit/411b1b22fb927cabf934f4568e076d3c60114982
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-04-18 (Thu, 18 Apr 2013)

Changed paths:
M lang/en_GB/lang.php
M templates/invoices/default/template.tpl

Log Message:
-----------
spelling mistake and prod matrix inv template change


Commit: 800b42328eeb79352e7bc830ab4937ac03d47586
https://github.com/simpleinvoices/simpleinvoices/commit/800b42328eeb79352e7bc830ab4937ac03d47586
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-04-23 (Tue, 23 Apr 2013)

Changed paths:
M include/class/invoice.php
M include/sql_patches.php
M include/sql_queries.php
M lang/en_GB/lang.php
M modules/invoices/xml.php
M modules/system_defaults/manage.php
M templates/default/system_defaults/manage.tpl

Log Message:
-----------
large dataset option added


Commit: 271fc96999d7579613639a681233dd44798f1c9d
https://github.com/simpleinvoices/simpleinvoices/commit/271fc96999d7579613639a681233dd44798f1c9d
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-04-29 (Mon, 29 Apr 2013)

Changed paths:
M modules/system_defaults/edit.php

Log Message:
-----------
enable large dataset config option


Commit: bfd0f0fcc37a40ffc45a87875d9d8121cd135a95
https://github.com/simpleinvoices/simpleinvoices/commit/bfd0f0fcc37a40ffc45a87875d9d8121cd135a95
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-04-29 (Mon, 29 Apr 2013)

Changed paths:
M templates/default/css/main.css
M templates/default/customers/details.tpl

Log Message:
-----------
customer view updates


Commit: 6a2f0473a523b27392fd5cd54b11227f6e613622
https://github.com/simpleinvoices/simpleinvoices/commit/6a2f0473a523b27392fd5cd54b11227f6e613622
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-05-08 (Wed, 08 May 2013)

Changed paths:
M include/class/invoice.php
M lang/en_GB/lang.php
M modules/customers/details.php
M templates/default/customers/details.tpl

Log Message:
-----------
unpaid invoice list in customer view


Commit: 8318471e50c5acd630a7da75ee630d98fd662f7d
https://github.com/simpleinvoices/simpleinvoices/commit/8318471e50c5acd630a7da75ee630d98fd662f7d
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-05-14 (Tue, 14 May 2013)

Changed paths:
M templates/default/css/main.css
M templates/default/customers/details.tpl

Log Message:
-----------
customer view update


Commit: 63a2261f4694282cf15181aeb301dc4ce9a01b64
https://github.com/simpleinvoices/simpleinvoices/commit/63a2261f4694282cf15181aeb301dc4ce9a01b64
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-05-14 (Tue, 14 May 2013)

Changed paths:
M templates/default/css/main.css
M templates/default/customers/details.tpl

Log Message:
-----------
customer view update - minor


Commit: 3798e796def9a647d3cf41973328aa29baaa5c2c
https://github.com/simpleinvoices/simpleinvoices/commit/3798e796def9a647d3cf41973328aa29baaa5c2c
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-05-14 (Tue, 14 May 2013)

Changed paths:
M templates/default/css/main.css
M templates/default/customers/details.tpl
M templates/default/footer.tpl

Log Message:
-----------
footer upgate g+


Commit: 8cc0c3cfd1d9b372eb317bd49d70646ef465f495
https://github.com/simpleinvoices/simpleinvoices/commit/8cc0c3cfd1d9b372eb317bd49d70646ef465f495
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-06-12 (Wed, 12 Jun 2013)

Changed paths:
M config/config.ini

Log Message:
-----------
prep to merge jk_prod_matr to master


Commit: 4f4cdf906562f6b69528434f7044d08f956f0337
https://github.com/simpleinvoices/simpleinvoices/commit/4f4cdf906562f6b69528434f7044d08f956f0337
Author: Justin Kelly <jus...@kelly.org.au>
Date: 2013-06-12 (Wed, 12 Jun 2013)

Changed paths:
M config/config.ini
M include/class/invoice.php
A include/class/product/attributes.php
M include/jquery/jquery.functions.js.tpl
M include/sql_patches.php
M include/sql_queries.php
M lang/en_GB/lang.php
M modules/customers/details.php
M modules/install/essential.php
M modules/invoices/details.php
M modules/invoices/invoice.php
M modules/invoices/product_ajax.php
M modules/invoices/quick_view.php
M modules/invoices/save.php
M modules/invoices/xml.php
A modules/product_attribute/add.php
A modules/product_attribute/details.php
A modules/product_attribute/manage.js.php
A modules/product_attribute/manage.php
A modules/product_attribute/save.php
A modules/product_attribute/xml.php
A modules/product_value/add.php
A modules/product_value/details.php
A modules/product_value/manage.js.php
A modules/product_value/manage.php
A modules/product_value/save.php
A modules/product_value/xml.php
M modules/products/add.php
M modules/products/details.php
M modules/system_defaults/edit.php
M modules/system_defaults/manage.php
M templates/default/css/main.css
M templates/default/customers/details.tpl
M templates/default/footer.tpl
M templates/default/invoices/details.tpl
M templates/default/invoices/quick_view.tpl
M templates/default/menu.tpl
A templates/default/product_attribute/add.tpl
A templates/default/product_attribute/details.tpl
A templates/default/product_attribute/manage.tpl
A templates/default/product_attribute/save.tpl
A templates/default/product_value/add.tpl
A templates/default/product_value/details.tpl
A templates/default/product_value/manage.tpl
A templates/default/product_value/save.tpl
M templates/default/products/add.tpl
M templates/default/products/details.tpl
M templates/default/system_defaults/manage.tpl
M templates/invoices/default/style.css
M templates/invoices/default/template.tpl

Log Message:
-----------
Merge branch 'jk_product_matrix'


Compare: https://github.com/simpleinvoices/simpleinvoices/compare/bfe6e0057e91...4f4cdf906562
Reply all
Reply to author
Forward
0 new messages