Add and Manage Customers, Suppliers: contact persons where not removed when deleting...

diff --git a/includes/db/crm_contacts_db.inc b/includes/db/crm_contacts_db.inc
index 98862b73ae3c25d2a6ad338a34eef770e38850cb..b9a7eda8776492023eb8bd444e3efd7caa5303a3 100644 (file)
--- a/includes/db/crm_contacts_db.inc
+++ b/includes/db/crm_contacts_db.inc
@@ -175,9 +175,9 @@ function update_person_contacts($id, $cat_ids, $entity_id=null, $type=null)
 
 function delete_entity_contacts($class, $entity)
 {
-       delete_crm_contacts(null, $class, $entity);
        // cleanup
        $res = get_crm_persons($class, null, $entity, null, true);
+       delete_crm_contacts(null, $class, $entity);
        while($person = db_fetch($res)) {
                $rels = get_person_contacts($person['id']);
                if (count($rels) == 0) {

diff --git a/purchasing/includes/db/suppliers_db.inc b/purchasing/includes/db/suppliers_db.inc
index dff68c123c302e1a7bdf6700b577dfd9425e7a5e..c3a16d21488a9ac516eb55379e87a39b3f18f517 100644 (file)
--- a/purchasing/includes/db/suppliers_db.inc
+++ b/purchasing/includes/db/suppliers_db.inc
@@ -73,8 +73,12 @@ function update_supplier($supplier_id, $supp_name, $supp_ref, $address, $supp_ad
 
 function delete_supplier($supplier_id)
 {
+       begin_transaction();
+       delete_entity_contacts('supplier', $supplier_id);
        $sql="DELETE FROM ".TB_PREF."suppliers WHERE supplier_id=".db_escape($supplier_id);
+
        db_query($sql,"check failed");
+       commit_transaction();
 }
 
 function get_supplier_details($supplier_id, $to=null, $all=true)