Additional conflict fixes after merge.
authorJanusz Dobrowolski <janusz@frontaccounting.eu>
Tue, 25 Nov 2008 10:53:04 +0000 (10:53 +0000)
committerJanusz Dobrowolski <janusz@frontaccounting.eu>
Tue, 25 Nov 2008 10:53:04 +0000 (10:53 +0000)
commitd2bd6087025dfd8497777f6ce2305ff98879473a
treebd7fd57dffaa4347050e501d423eab006b014dd0
parentbf00f0e16df5974ecba17b59be8bc660bdf6b8a8
parentea52d139c2309cc07ec2e37155a3fe304471c0fc
Additional conflict fixes after merge.
sales/includes/db/cust_trans_db.inc
sales/includes/db/sales_credit_db.inc
sales/includes/db/sales_delivery_db.inc
sales/includes/db/sales_invoice_db.inc