projects / textcart.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 790eea7 9e245c8)
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)
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


Trivial merge
Textcart module