Merge commit '9e245c'
authorMaxime Bourget <bmx007@gmail.com>
Sun, 7 Apr 2013 11:29:25 +0000 (12:29 +0100)
committerMaxime Bourget <bmx007@gmail.com>
Sun, 7 Apr 2013 11:29:25 +0000 (12:29 +0100)
commit69885d24e15509c24edbacdb9c365f4a8edfad0d
tree6e8e356583884ec9049843a2219d079eee365976
parent790eea7e835e59ebe39c5846e3cb87b844ef625f
parent9e245c856c41ad6e081cbc4a6e358bfae689c211
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