From: Maxime Bourget <bmx007@gmail.com>
Date: Sat, 25 May 2013 13:31:07 +0000 (+0100)
Subject: Update patched file with FA 2.3.16
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=67993e9d3bd99cc467a9ef81051f6e6bf2141a99;p=textcart.git

Update patched file with FA 2.3.16

Conflicts:
	CHANGELOG.txt
	admin/db/transactions_db.inc
	admin/db/voiding_db.inc
	admin/fiscalyears.php
	config.default.php
	dimensions/view/view_dimension.php
	gl/bank_transfer.php
	gl/gl_bank.php
	gl/inquiry/gl_trial_balance.php
	includes/page/header.inc
	includes/ui/ui_view.inc
	inventory/includes/db/movement_types_db.inc
	inventory/inquiry/stock_movements.php
	js/inserts.js
	js/payalloc.js
	js/utils.js
	lang/new_language_template/LC_MESSAGES/empty.po
	manufacturing/includes/db/work_orders_quick_db.inc
	manufacturing/work_order_release.php
	purchasing/includes/db/invoice_db.inc
	purchasing/includes/po_class.inc
	purchasing/includes/supp_trans_class.inc
	purchasing/includes/ui/invoice_ui.inc
	purchasing/includes/ui/po_ui.inc
	purchasing/supplier_credit.php
	purchasing/supplier_payment.php
	reporting/includes/class.mail.inc
	reporting/rep101.php
	reporting/rep107.php
	reporting/rep108.php
	reporting/rep201.php
	reporting/rep303.php
	reporting/rep305.php
	reporting/rep306.php
	reporting/rep708.php
	reporting/reports_main.php
	sales/customer_delivery.php
	sales/includes/cart_class.inc
	sales/includes/db/sales_credit_db.inc
	sales/includes/ui/sales_credit_ui.inc
	sales/includes/ui/sales_order_ui.inc
	sales/inquiry/sales_orders_view.php
	sales/manage/customers.php
	sql/en_US-demo.sql
	sql/en_US-new.sql
	themes/cool/renderer.php
	update.html
	version.php
---

67993e9d3bd99cc467a9ef81051f6e6bf2141a99