From: Maxime Bourget <bmx007@gmail.com>
Date: Sun, 7 Apr 2013 11:29:25 +0000 (+0100)
Subject: Merge commit '9e245c'
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=69885d24e15509c24edbacdb9c365f4a8edfad0d;p=textcart.git

Merge commit '9e245c'

Merge with initial version of FA.
This allow to update easily the file common to textcart and FA
by just mergin the up to date version of FA.

Conflicts:
	inventory/adjustments.php
	inventory/transfers.php
	purchasing/po_entry_items.php
	sales/sales_order_entry.php
---

69885d24e15509c24edbacdb9c365f4a8edfad0d