From 00ee6e9960b700ca4e84ca19bcef102f3337444a Mon Sep 17 00:00:00 2001 From: jfefe Date: Mon, 5 Nov 2012 03:45:54 +0100 Subject: [PATCH 01/13] Can have the thirdparty status 'active' when creating by webservices --- htdocs/webservices/server_thirdparty.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php index f23bee5f631..2e6cfbc083c 100755 --- a/htdocs/webservices/server_thirdparty.php +++ b/htdocs/webservices/server_thirdparty.php @@ -94,6 +94,7 @@ $server->wsdl->addComplexType( 'ref' => array('name'=>'name','type'=>'xsd:string'), 'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'), 'fk_user_author' => array('name'=>'fk_user_author','type'=>'xsd:string'), + 'status' => array('name'=>'status','type'=>'xsd:string'), 'client' => array('name'=>'client','type'=>'xsd:string'), 'supplier' => array('name'=>'supplier','type'=>'xsd:string'), 'customer_code' => array('name'=>'customer_code','type'=>'xsd:string'), From 027ad065a53296a9744327c198f9b698a7fa5d85 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 5 Nov 2012 12:04:13 +0100 Subject: [PATCH 02/13] Removed TODO --- htdocs/fourn/facture/fiche.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index dfe8095d0e9..6218400d7ce 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -1471,16 +1471,15 @@ else print ''.$langs->trans('AmountVAT').''.price($object->total_tva).''.$langs->trans('Currency'.$conf->currency).''; // Amount Local Taxes - // TODO I use here $societe->localtax1_assuj. Before it was $mysoc->localtax1_assuj, but this is a supplier invoice, so made by supplier, so depends on supplier properties if ($societe->localtax1_assuj=="1") //Localtax1 RE { - print ''.$langs->transcountry("AmountLT1",$mysoc->country_code).''; + print ''.$langs->transcountry("AmountLT1",$societe->country_code).''; print ''.price($object->total_localtax1).''; print ''.$langs->trans("Currency".$conf->currency).''; } if ($societe->localtax2_assuj=="1") //Localtax2 IRPF { - print ''.$langs->transcountry("AmountLT2",$mysoc->country_code).''; + print ''.$langs->transcountry("AmountLT2",$societe->country_code).''; print ''.price($object->total_localtax2).''; print ''.$langs->trans("Currency".$conf->currency).''; } From 4cd1bbb0ca7921957042b444b7a68a68077c8635 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 5 Nov 2012 17:01:05 +0100 Subject: [PATCH 03/13] Fix: bad data init --- htdocs/install/mysql/data/llx_c_payment_term.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql index ef36bc41229..ebc6604e24e 100644 --- a/htdocs/install/mysql/data/llx_c_payment_term.sql +++ b/htdocs/install/mysql/data/llx_c_payment_term.sql @@ -34,4 +34,4 @@ insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_ insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (5,'60DENDMONTH', 5,1, '60 jours fin de mois','Réglement à 60 jours fin de mois',1,60); insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (6,'PT_ORDER', 6,1, 'A réception de commande','A réception de commande',0,0); insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (7,'PT_DELIVERY', 7,1, 'Livraison','Règlement à la livraison',0,0); -insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (8,'PT_5050', 8,1, '50 et 50','Règlement 50% à la commande, 50% à la livraison',1,60); +insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (8,'PT_5050', 8,1, '50 et 50','Règlement 50% à la commande, 50% à la livraison',0,0); From ba56e679bde29499aaf16e96fb5e4c6e64229201 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 5 Nov 2012 17:21:05 +0100 Subject: [PATCH 04/13] Fix: Calculation of default date for payment term was not using function. --- htdocs/compta/facture.php | 118 ++++++++++++++++++++------------------ 1 file changed, 63 insertions(+), 55 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index d3faa909ac2..92ff891cca9 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -266,36 +266,46 @@ else if ($action == 'setmode' && $user->rights->facture->creer) else if ($action == 'setinvoicedate' && $user->rights->facture->creer) { $object->fetch($id); + $old_date_lim_reglement=$object->date_lim_reglement; $object->date=dol_mktime(12,0,0,$_POST['invoicedatemonth'],$_POST['invoicedateday'],$_POST['invoicedateyear']); + $new_date_lim_reglement=$object->calculate_date_lim_reglement(); + if ($new_date_lim_reglement > $old_date_lim_reglement) $object->date_lim_reglement=$new_date_lim_reglement; if ($object->date_lim_reglement < $object->date) $object->date_lim_reglement=$object->date; $result=$object->update($user); if ($result < 0) dol_print_error($db,$object->error); } +else if ($action == 'setconditions' && $user->rights->facture->creer) +{ + $object->fetch($id); + $object->cond_reglement_code=0; // To clean property + $object->cond_reglement_id=0; // To clean property + $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int')); + if ($result < 0) dol_print_error($db,$object->error); + + $old_date_lim_reglement=$object->date_lim_reglement; + $new_date_lim_reglement=$object->calculate_date_lim_reglement(); + if ($new_date_lim_reglement > $old_date_lim_reglement) $object->date_lim_reglement=$new_date_lim_reglement; + if ($object->date_lim_reglement < $object->date) $object->date_lim_reglement=$object->date; + $result=$object->update($user); + if ($result < 0) dol_print_error($db,$object->error); +} else if ($action == 'setpaymentterm' && $user->rights->facture->creer) { $object->fetch($id); $object->date_lim_reglement=dol_mktime(12,0,0,$_POST['paymenttermmonth'],$_POST['paymenttermday'],$_POST['paymenttermyear']); if ($object->date_lim_reglement < $object->date) { - $object->date_lim_reglement=$object->date; + $object->date_lim_reglement=$object->calculate_date_lim_reglement(); setEventMessage($langs->trans("DatePaymentTermCantBeLowerThanObjectDate"),'warnings'); } $result=$object->update($user); if ($result < 0) dol_print_error($db,$object->error); } -else if ($action == 'setconditions' && $user->rights->facture->creer) -{ - $object->fetch($id); - $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int')); - if ($result < 0) dol_print_error($db,$object->error); -} - else if ($action == 'setremisepercent' && $user->rights->facture->creer) { $object->fetch($id); $result = $object->set_remise($user, $_POST['remise_percent']); } - else if ($action == "setabsolutediscount" && $user->rights->facture->creer) { // POST[remise_id] ou POST[remise_id_for_payment] @@ -764,7 +774,7 @@ else if ($action == 'add' && $user->rights->facture->creer) if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; } if ($element == 'contract') { $element = $subelement = 'contrat'; } if ($element == 'inter') { $element = $subelement = 'ficheinter'; } - if ($element == 'shipping') {$element = $subelement = 'expedition'; } + if ($element == 'shipping') { $element = $subelement = 'expedition'; } $object->origin = $_POST['origin']; $object->origin_id = $_POST['originid']; @@ -2823,14 +2833,40 @@ else if ($id > 0 || ! empty($ref)) print ''; - // Margin Infos - if (! empty($conf->margin->enabled)) { - print '
'; - $object->displayMarginInfos($object->statut > 0); - } + // Margin Infos + if (! empty($conf->margin->enabled)) + { + print '
'; + $object->displayMarginInfos($object->statut > 0); + } print ''; + // Conditions de reglement + print ''; + print ''; + if ($object->type != 2 && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print ''; + print '
'; + print $langs->trans('PaymentConditionsShort'); + print 'id.'">'.img_edit($langs->trans('SetConditions'),1).'
'; + print ''; + if ($object->type != 2) + { + if ($action == 'editconditions') + { + $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->cond_reglement_id,'cond_reglement_id'); + } + else + { + $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->cond_reglement_id,'none'); + } + } + else + { + print ' '; + } + print ''; + // Date payment term print ''; print ''; - // Conditions de reglement - print ''; - - // Mode de reglement + // Payment mode print '
'; @@ -2857,32 +2893,7 @@ else if ($id > 0 || ! empty($ref)) } print '
'; - print ''; - if ($object->type != 2 && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print ''; - print '
'; - print $langs->trans('PaymentConditionsShort'); - print 'id.'">'.img_edit($langs->trans('SetConditions'),1).'
'; - print '		'; - if ($object->type != 2) - { - if ($action == 'editconditions') - { - $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->cond_reglement_id,'cond_reglement_id'); - } - else - { - $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id,$object->cond_reglement_id,'none'); - } - } - else - { - print ' '; - } - print '
'; print ''; print ''; - print ''; + print ''; // Amount Local Taxes - if ($mysoc->pays_code=='ES') + if ($mysoc->localtax1_assuj=="1") //Localtax1 RE { - if ($mysoc->localtax1_assuj=="1") //Localtax1 RE - { - print ''; - print ''; - print ''; - } - if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF - { - print ''; - print ''; - print ''; - } + print ''; + print ''; + print ''; + } + if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF + { + print ''; + print ''; + print ''; } print ''; From 8361cc29a17bf3589ff35b42a93db5abaae13b2d Mon Sep 17 00:00:00 2001 From: jfefe Date: Mon, 5 Nov 2012 03:45:54 +0100 Subject: [PATCH 05/13] Can have the thirdparty status 'active' when creating by webservices --- htdocs/webservices/server_thirdparty.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php index f23bee5f631..2e6cfbc083c 100755 --- a/htdocs/webservices/server_thirdparty.php +++ b/htdocs/webservices/server_thirdparty.php @@ -94,6 +94,7 @@ $server->wsdl->addComplexType( 'ref' => array('name'=>'name','type'=>'xsd:string'), 'ref_ext' => array('name'=>'ref_ext','type'=>'xsd:string'), 'fk_user_author' => array('name'=>'fk_user_author','type'=>'xsd:string'), + 'status' => array('name'=>'status','type'=>'xsd:string'), 'client' => array('name'=>'client','type'=>'xsd:string'), 'supplier' => array('name'=>'supplier','type'=>'xsd:string'), 'customer_code' => array('name'=>'customer_code','type'=>'xsd:string'), From 9eac0d06ec6f370848b3c59d3f4b4c9d5392fafd Mon Sep 17 00:00:00 2001 From: jfefe Date: Tue, 6 Nov 2012 01:41:31 +0100 Subject: [PATCH 06/13] Add price_ttc value in product properties when call by webservice --- htdocs/webservices/server_productorservice.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index f9cc7334828..f486d3d95fb 100755 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -109,6 +109,7 @@ $server->wsdl->addComplexType( 'price_net' => array('name'=>'price_net','type'=>'xsd:string'), 'price' => array('name'=>'price','type'=>'xsd:string'), + 'price_ttc' => array('name'=>'price_ttc','type'=>'xsd:string'), 'price_base_type' => array('name'=>'price_base_type','type'=>'xsd:string'), 'stock_alert' => array('name'=>'stock_alert','type'=>'xsd:string'), @@ -278,6 +279,7 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='') 'price_net' => $product->price, 'price' => ($product->price_ttc-$product->price), 'vat_rate' => $product->tva_tx, + 'price_ttc' => $product->price_ttc, 'price_base_type' => $product->price_base_type, 'stock_real' => $product->stock_reel, From 0eb5e9fa8326d0b886457705e841193b84d230e9 Mon Sep 17 00:00:00 2001 From: fhenry Date: Tue, 6 Nov 2012 11:16:40 +0100 Subject: [PATCH 07/13] Remove non standard table in Dolibarr Demo script SQL (llx_cabinetmed_xxx) --- dev/initdata/mysqldump_dolibarr_3.2.0.sql | 284 ---------------------- dev/initdata/mysqldump_dolibarr_3.3.0.sql | 284 ---------------------- 2 files changed, 568 deletions(-) diff --git a/dev/initdata/mysqldump_dolibarr_3.2.0.sql b/dev/initdata/mysqldump_dolibarr_3.2.0.sql index 2f37511706f..82c76e1bdf8 100644 --- a/dev/initdata/mysqldump_dolibarr_3.2.0.sql +++ b/dev/initdata/mysqldump_dolibarr_3.2.0.sql @@ -1763,290 +1763,6 @@ LOCK TABLES `llx_c_ziptown` WRITE; /*!40000 ALTER TABLE `llx_c_ziptown` ENABLE KEYS */; UNLOCK TABLES; --- --- Table structure for table `llx_cabinetmed_c_banques` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_c_banques`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_c_banques` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `code` varchar(8) NOT NULL, - `label` varchar(64) NOT NULL, - `active` tinyint(4) NOT NULL DEFAULT '1', - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_c_banques` --- - -LOCK TABLES `llx_cabinetmed_c_banques` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_c_banques` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_c_banques` (`rowid`, `code`, `label`, `active`) VALUES (1,'HSBC','HSBC',1); -/*!40000 ALTER TABLE `llx_cabinetmed_c_banques` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_c_examconclusion` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_c_examconclusion`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_c_examconclusion` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `code` varchar(8) NOT NULL, - `label` varchar(64) NOT NULL, - `active` tinyint(4) NOT NULL DEFAULT '1', - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_c_examconclusion` --- - -LOCK TABLES `llx_cabinetmed_c_examconclusion` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_c_examconclusion` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_c_examconclusion` (`rowid`, `code`, `label`, `active`) VALUES (1,'AUTRE','Autre',1); -/*!40000 ALTER TABLE `llx_cabinetmed_c_examconclusion` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_cons` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_cons`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_cons` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `fk_soc` int(11) DEFAULT NULL, - `fk_user_creation` int(11) NOT NULL, - `datecons` date NOT NULL, - `typepriseencharge` varchar(8) DEFAULT NULL, - `motifconsprinc` varchar(64) DEFAULT NULL, - `diaglesprinc` varchar(64) DEFAULT NULL, - `motifconssec` text, - `diaglessec` text, - `hdm` text, - `examenclinique` text, - `examenprescrit` text, - `traitementprescrit` text, - `comment` text, - `typevisit` varchar(8) NOT NULL, - `infiltration` varchar(256) DEFAULT NULL, - `codageccam` varchar(16) DEFAULT NULL, - `montant_cheque` double(24,8) DEFAULT NULL, - `montant_espece` double(24,8) DEFAULT NULL, - `montant_carte` double(24,8) DEFAULT NULL, - `montant_tiers` double(24,8) DEFAULT NULL, - `banque` varchar(128) DEFAULT NULL, - `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`rowid`), - KEY `idx_cabinetmed_cons_fk_soc` (`fk_soc`), - KEY `idx_cabinetmed_cons_datecons` (`datecons`), - CONSTRAINT `fk_cabinetmed_cons_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_cons` --- - -LOCK TABLES `llx_cabinetmed_cons` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_cons` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_cons` (`rowid`, `fk_soc`, `fk_user_creation`, `datecons`, `typepriseencharge`, `motifconsprinc`, `diaglesprinc`, `motifconssec`, `diaglessec`, `hdm`, `examenclinique`, `examenprescrit`, `traitementprescrit`, `comment`, `typevisit`, `infiltration`, `codageccam`, `montant_cheque`, `montant_espece`, `montant_carte`, `montant_tiers`, `banque`, `tms`) VALUES (2,2,1,'2011-04-17',NULL,'Cervicalgies Inflammatoires','Arthrite Microcristalline','','','','rrrr','','','','CS','','',NULL,55.00000000,NULL,NULL,'','2011-05-25 13:59:03'),(3,2,1,'2011-05-01',NULL,'Cervicalgies Mécaniques','Arthrite Goutteuse','yyyykk\r\nDorsalgie\r\nDorsalgies Inflammatoires\r\nDouleur Chevillep\r\nDouleur Genou\r\nDouleur Genou','','lll','','','','','CS','','',NULL,NULL,NULL,50.00000000,'','2011-05-25 13:59:03'),(4,4,1,'2011-05-02',NULL,'Autre','Arthrite Goutteuse','','','','','','','','CCAM','inf','ccam',50.00000000,NULL,NULL,NULL,'HSBC','2011-05-25 13:59:03'),(5,5,1,'2011-05-02',NULL,'Cervicalgies Inflammatoires','Arthrite Microcristalline','','dgdfg','','','','','','CCAM','ingg','pp',50.00000000,NULL,NULL,NULL,'HSBC','2011-05-28 15:22:22'),(6,5,1,'2011-05-02',NULL,'Cervicalgies Inflammatoires','Arthrose FémoroPatellaire','','','','','','kk','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-05-25 13:59:03'),(7,4,1,'2011-05-03',NULL,'Cervicalgies Mécaniques','Arthrite Goutteuse','Douleur Cheville','Arthrite Microcristalline','fd','fd','Bilan Phosphocalcique','fdf','fdfd','CCAM','lllll','kkk',NULL,NULL,NULL,0.00000000,'','2011-06-14 23:13:42'),(8,5,1,'2011-05-03',NULL,'Cervicalgies Mécaniques','gggg','','','pppljklj','','','','','CS','kmlkmlkml mlmlkmkm mk ml mlk','',50.00000000,NULL,NULL,NULL,'HSBC','2011-05-28 15:00:27'),(10,3,1,'2011-05-07',NULL,'dfgdf','gfdgd','','','','','','','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-05-25 13:59:03'),(11,9,1,'2011-05-25',NULL,'Dérobement Membres Inférieurs','Arthrite Goutteuse','Dorsalgie\r\nDorsalgies Mécaniques','Lomboradiculalgie Discale\r\nLombosciatique L5 gauche','','','ArthroScanner Genou\r\nIRM Genou\r\nIRM Rachis Lombaire','1\r\n2\r\n3\r\n4\r\n5\r\n6','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-05-28 15:58:29'),(12,32,1,'2011-06-08',NULL,'Cervicalgies Inflammatoires','Arthrite Goutteuse','','','','','','','','CS','','',NULL,NULL,NULL,50.00000000,'','2011-06-08 14:38:10'),(13,26,1,'2011-06-13',NULL,'Cervicalgies Mécaniques','Arthrite Microcristalline','','','','','ArthroScanner Hanche','Traitement prescrit.','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-06-13 15:25:39'),(14,26,1,'2011-06-13',NULL,'Douleur Membre inférieur Gauche','Lombosciatique L5 gauche','','Lombalgie Discale','','','','AINS (biprohénide), murolaxan\r\ndoliprane\r\n+ rééduction','','CCAM','infiltr épidurale','AHLB001',90.00000000,NULL,NULL,NULL,'HSBC','2011-06-13 16:16:43'),(15,1,1,'2011-06-13',NULL,'Cervicalgies Mécaniques','Arthrite Microcristalline','','','','','','','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-06-13 18:07:26'),(16,36,1,'2011-06-15',NULL,'gdfgfd','gdfgdfgdf','','','','','ArthroScanner Epaule','','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-06-15 00:28:43'),(17,36,1,'2011-06-15',NULL,'hfghfg','hgfhfghf','','','','','','','','CS','','',NULL,10.00000000,NULL,NULL,'','2011-06-15 00:31:57'),(18,65,1,'2011-07-06',NULL,'Cervicalgies Inflammatoires','aaaaa','','','','','','','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-07-06 20:17:20'),(19,67,1,'2011-07-11',NULL,'Cervicalgies Inflammatoires','Canal Carpien','','','','','','','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-07-10 21:23:30'),(20,68,1,'2011-07-13',NULL,'Cervicalgies Mécaniques','Autre','','','','','','','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-07-13 16:26:21'),(21,68,1,'2011-07-13',NULL,'aaaa','bbbb','','','','','','','','CS','','',NULL,NULL,50.00000000,NULL,'','2011-07-13 18:18:29'),(22,68,1,'2011-07-13',NULL,'lll','llll','','','','','','','','CS','','',NULL,NULL,10.00000000,NULL,'','2011-07-13 18:21:57'),(23,68,1,'2011-07-13',NULL,'oo','oo','','','','','','','','CS','','',NULL,NULL,NULL,5.00000000,'','2011-07-13 18:26:18'); -/*!40000 ALTER TABLE `llx_cabinetmed_cons` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_diaglec` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_diaglec`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_diaglec` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `code` varchar(8) NOT NULL, - `label` varchar(64) NOT NULL, - `active` tinyint(4) NOT NULL DEFAULT '1', - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_diaglec` --- - -LOCK TABLES `llx_cabinetmed_diaglec` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_diaglec` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_diaglec` (`rowid`, `code`, `label`, `active`) VALUES (1,'AUTRE','Autre',1),(2,'LOMBL5D','Lombosciatique L5 droite',1),(3,'LOMBL5G','Lombosciatique L5 gauche',1),(4,'LOMBS1D','Lombosciatique S1 droite',1),(5,'LOMBS1G','Lombosciatique S1 gauche',1),(6,'NCB','Névralgie cervico-brachiale',1),(7,'PR','Polyarthrite rhumatoide',1),(8,'SA','Spondylarthrite ankylosante',1),(9,'GFTI','Gonarthrose fémoro-tibaile interne',1),(10,'GFTE','Gonarthrose fémoro-tibiale externe',1),(11,'COX','Coxarthrose',1),(12,'CC','Canal Carpien',1),(16,'CLER','Canal Lombaire Etroit et/ou Rétréci',1),(22,'RH PSO','Rhumatisme Psoriasique',1),(23,'LEAD','Lupus',1),(24,'LBDISC','Lombalgie Discale',1),(25,'LBRADD','Lomboradiculalgie Discale',1),(26,'LBRADND','Lomboradiculalgie Non Discale',1),(27,'CH ROT','Chondropathie Rotulienne',1),(28,'AFP','Arthrose FémoroPatellaire',1),(29,'PPR','Pseudo Polyarthrite Rhizomélique',1),(30,'SHARP','Maladie de Sharp',1),(31,'SAPHO','SAPHO',1),(32,'OMARTHC','Omarthrose Centrée',1),(33,'RH CCA','Rhumatisme Chondro Calcinosique',1),(34,'GOUTTE','Arthrite Goutteuse',1),(35,'CCA','Arthrite Chondro Calcinosique',1),(36,'ARTH MCR','Arthrite Microcristalline',1),(37,'CSA','Conflit Sous Acromial',1),(38,'TDCALCE','Tendinopathie Calcifiante d\'Epaule',1),(39,'TDCALCH','Tendinopathie Calcifiante de Hanche',1),(40,'TBT','TendinoBursite Trochantérienne',1),(41,'OMARTHE','Omarthrose Excentrée',1); -/*!40000 ALTER TABLE `llx_cabinetmed_diaglec` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_examaut` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_examaut`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_examaut` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `fk_soc` int(11) DEFAULT NULL, - `dateexam` date NOT NULL, - `examprinc` varchar(64) DEFAULT NULL, - `examsec` text, - `concprinc` varchar(64) DEFAULT NULL, - `concsec` text, - `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_examaut` --- - -LOCK TABLES `llx_cabinetmed_examaut` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_examaut` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_examaut` (`rowid`, `fk_soc`, `dateexam`, `examprinc`, `examsec`, `concprinc`, `concsec`, `tms`) VALUES (1,2,'2011-05-08','ArthroScanner Genou','ArthroScanner EpauleeeeArthroScanner HancheIRM EpauleggggBilan Radio ScolioseuuuuqqqqlIRM Rachis Cervical','Autre','','2011-05-01 14:47:57'),(2,2,'2011-05-02','dd','ArthroScanner Hanche\r\nBilan Radio Scoliose\r\neeee\r\nElectromiogramme','dd','','2011-05-01 23:49:59'),(3,32,'2011-06-08','ArthroScanner Genou','gdfgdfgdfgdfgdfgdfgd','Autre','','2011-06-08 14:54:45'),(4,32,'2011-06-08','IRM SacroIliaques','','fsdfsdfsdfsd','','2011-06-08 14:57:01'),(5,26,'2011-06-13','Bilan Radio Rhumatisme Inflammatoire','','Autre','','2011-06-13 15:27:39'),(6,26,'2011-06-13','ArthroScanner Genou','Autre','Autre','','2011-06-13 15:29:31'),(7,26,'2011-06-13','Scanner Lombaire','','Hernie discale L4-L5 gauche','','2011-06-13 16:20:47'),(8,65,'2011-07-06','ArthroScanner Hanche','','Autre','','2011-07-06 20:17:54'); -/*!40000 ALTER TABLE `llx_cabinetmed_examaut` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_exambio` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_exambio`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_exambio` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `fk_soc` int(11) DEFAULT NULL, - `dateexam` date NOT NULL, - `resultat` text, - `conclusion` text, - `comment` text, - `suivipr_ad` int(11) DEFAULT NULL, - `suivipr_ag` int(11) DEFAULT NULL, - `suivipr_vs` int(11) DEFAULT NULL, - `suivipr_eva` int(11) DEFAULT NULL, - `suivipr_err` int(11) DEFAULT NULL, - `suivisa_fat` int(11) DEFAULT NULL, - `suivisa_dax` int(11) DEFAULT NULL, - `suivisa_dpe` int(11) DEFAULT NULL, - `suivisa_dpa` int(11) DEFAULT NULL, - `suivisa_rno` int(11) DEFAULT NULL, - `suivisa_dma` int(11) DEFAULT NULL, - `suivisa_basdai` double DEFAULT NULL, - `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `suivisa_das28` double DEFAULT NULL, - `suivipr_das28` double DEFAULT NULL, - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_exambio` --- - -LOCK TABLES `llx_cabinetmed_exambio` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_exambio` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_exambio` (`rowid`, `fk_soc`, `dateexam`, `resultat`, `conclusion`, `comment`, `suivipr_ad`, `suivipr_ag`, `suivipr_vs`, `suivipr_eva`, `suivipr_err`, `suivisa_fat`, `suivisa_dax`, `suivisa_dpe`, `suivisa_dpa`, `suivisa_rno`, `suivisa_dma`, `suivisa_basdai`, `tms`, `suivisa_das28`, `suivipr_das28`) VALUES (1,2,'2011-05-01','aaajhkh','bbb','ccc',NULL,NULL,NULL,NULL,NULL,1,2,3,4,5,6,NULL,'2011-05-01 14:45:54',NULL,NULL),(3,2,'2011-05-01','dd','hfghfg','',1,2,6,9,NULL,2,2,2,2,2,2,NULL,'2011-05-01 15:24:06',NULL,NULL),(4,2,'2011-05-01','gdfgdf','1111','',NULL,NULL,NULL,NULL,NULL,1,7,8,9,10,11,NULL,'2011-05-01 15:25:17',NULL,NULL),(5,2,'2011-05-01','fdsfsdfsdfsd','ccccc','fsdfsdfs',1,2,4,3,NULL,1,2,3,4,5,6,NULL,'2011-05-01 16:37:51',NULL,NULL),(6,2,'2011-05-01','gfdgdfgdf','gdfgdf','',5,NULL,NULL,NULL,NULL,1,NULL,1,1,NULL,NULL,NULL,'2011-05-01 16:43:49',NULL,NULL),(8,1,'2011-05-01','lkjljkl','','',1,2,4,3,NULL,5,10,5,6,5,5,6.2,'2011-05-01 16:46:00',NULL,1.97),(9,32,'2011-06-08','retert','trete','',1,2,4,1,NULL,2,5,2,5,4,6,NULL,'2011-06-08 14:47:30',NULL,NULL),(10,32,'2011-06-08','fgdfgdfg','gfgdfgdf','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-06-08 14:54:23',NULL,NULL),(11,26,'2011-06-13','result bio 1','conclusion bio 1','',1,2,4,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-06-13 15:27:15',NULL,NULL),(12,26,'2011-06-13','result bio 2','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-06-13 15:27:25',NULL,NULL),(13,26,'2011-06-13','VS8\r\nCRP inférieur ) 5','Pas de syndrome inflammatoire.','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-06-13 16:19:08',NULL,NULL),(14,26,'2011-06-13','','','',NULL,NULL,NULL,NULL,NULL,1,2,2,4,5,6,NULL,'2011-06-13 16:19:38',NULL,NULL),(15,26,'2011-06-13','','','',1,2,4,3,NULL,1,2,3,4,5,6,0.31,'2011-06-13 17:50:25',NULL,1.97),(16,36,'2011-06-15','gdfgddfhghghhfghf','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-06-15 08:02:03',NULL,NULL),(17,65,'2011-07-06','hfghfghgf','Zob','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-07-06 20:17:33',NULL,NULL),(18,67,'2011-07-11','gfdg','gfdg','gfd',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-07-10 22:23:21',NULL,NULL),(19,62,'2011-07-13','dfgdf','gdfd','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-07-13 15:56:27',NULL,NULL); -/*!40000 ALTER TABLE `llx_cabinetmed_exambio` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_examenprescrit` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_examenprescrit`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_examenprescrit` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `code` varchar(8) NOT NULL, - `label` varchar(64) NOT NULL, - `biorad` varchar(8) NOT NULL, - `active` tinyint(4) NOT NULL DEFAULT '1', - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=43 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_examenprescrit` --- - -LOCK TABLES `llx_cabinetmed_examenprescrit` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_examenprescrit` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_examenprescrit` (`rowid`, `code`, `label`, `biorad`, `active`) VALUES (1,'AUTRE','Autre','AUTRE',1),(2,'IRMLOMB','IRM lombaire','RADIO',1),(5,'TDMLOMB','TDM lombaires','RADIO',1),(6,'RX BRL','Radios Bassin-Rachis Lombaire','RADIO',1),(7,'RX RL','Radios Rachis Lombaire','RADIO',1),(8,'RX BASS','Radios Bassin','RADIO',1),(9,'RX BH','Radios Bassin et Hanches','RADIO',1),(10,'RX GEN','Radios Genoux','RADIO',1),(11,'RX CHEV','Radios Chevilles','RADIO',1),(12,'RX AVPD','Radios Avants-Pieds','RADIO',1),(13,'RX EP','Radio Epaule','RADIO',1),(14,'RX MAINS','Radios Mains','RADIO',1),(15,'RX COUDE','Radios Coude','RADIO',1),(16,'RX RC','Radios Rachis Cervical','RADIO',1),(17,'RX RD','Radios Rachis Dorsal','RADIO',1),(18,'RX RCD','Radios Rachis CervicoDorsal','RADIO',1),(19,'RX RDL','Radios DorsoLombaire','RADIO',1),(20,'RX SCO','Bilan Radio Scoliose','RADIO',1),(21,'RX RIC','Bilan Radio Rhumatisme Inflammatoire','RADIO',1),(22,'TDM LOMB','Scanner Lombaire','RADIO',1),(23,'TDM DORS','Scanner Dorsal','RADIO',1),(24,'TDM CERV','Scanner Cervical','RADIO',1),(25,'TDM HANC','Scanner Hanche','RADIO',1),(26,'TDM GEN','Scanner Genou','RADIO',1),(27,'RX RDL','Radios Rachis DorsoLombaire','RADIO',1),(28,'ARTTDMG','ArthroScanner Genou','RADIO',1),(29,'ARTTDME','ArthroScanner Epaule','RADIO',1),(30,'ARTTDMH','ArthroScanner Hanche','RADIO',1),(31,'IRM GEN','IRM Genou','RADIO',1),(32,'IRM HANC','IRM Hanche','RADIO',1),(33,'IRM EP','IRM Epaule','RADIO',1),(34,'IRM SIL','IRM SacroIliaques','RADIO',1),(35,'IRM RL','IRM Rachis Lombaire','RADIO',1),(36,'IRM RD','IRM Rachis Dorsal','RADIO',1),(37,'IRM RC','IRM Rachis Cervical','RADIO',1),(38,'ELECMI','Electromiogramme','RADIO',1),(39,'NFS','NFS','BIO',1),(40,'BILPHO','Bilan Phosphocalcique','BIO',1),(41,'VSCRP','VS/CRP','BIO',1),(42,'EPP','Electrophorèse Protéine Plasmatique','BIO',1); -/*!40000 ALTER TABLE `llx_cabinetmed_examenprescrit` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_motifcons` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_motifcons`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_motifcons` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `code` varchar(8) NOT NULL, - `label` varchar(64) NOT NULL, - `active` tinyint(4) NOT NULL DEFAULT '1', - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_motifcons` --- - -LOCK TABLES `llx_cabinetmed_motifcons` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_motifcons` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_motifcons` (`rowid`, `code`, `label`, `active`) VALUES (5,'AUTRE','Autre',1),(6,'DORS','Dorsalgie',1),(7,'DOLMSD','Douleur Membre supérieur Droit',1),(8,'DOLMSG','Douleur Membre supérieur Gauche',1),(9,'DOLMID','Douleur Membre inférieur Droit',1),(10,'DOLMIG','Douleur Membre inférieur Gauche',1),(11,'PARESM','Paresthésie des mains',1),(12,'DOLEPG','Douleur épaule gauche',1),(13,'DOLEPD','Douleur épaule droite',1),(14,'GONAD','Gonaglie droite',1),(15,'GONAG','Gonalgie gauche',1),(16,'DOLPD','Douleur Pied Droit',1),(17,'DOUL MIN','Douleur Membre Inférieur',1),(18,'POLYAR','Polyarthralgie',1),(19,'SUIVIPR','Suivi PR',1),(20,'SUIVISPA','Suivi SPA',1),(21,'SUIVIRIC','Suivi RI',1),(22,'SUIVIPPR','Suivi PPR',1),(23,'DOLINGD','Douleur inguinale Droit',1),(24,'DOLINGG','Douleur inguinale Gauche',1),(25,'DOLCOUDD','Douleur coude Droit',1),(26,'DOLCOUDG','Douleur coude Gauche',1),(27,'TALAL','Talalgie',1),(28,'DOLTENDC','Douleur tandous Calcanien',1),(29,'DEROB','Dérobement Membres Inférieurs',1),(30,'LOMB MEC','Lombalgies Mécaniques',1),(31,'LOMB INF','Lombalgies Inflammatoires',1),(32,'DORS MEC','Dorsalgies Mécaniques',1),(33,'DORS INF','Dorsalgies Inflammatoires',1),(34,'CERV MEC','Cervicalgies Mécaniques',1),(35,'SCIAT','LomboSciatique ',1),(36,'CRUR','LomboCruralgie',1),(37,'DOUL SUP','Douleur Membre Supérieur',1),(38,'INGUINAL','Inguinalgie',1),(39,'CERV INF','Cervicalgies Inflammatoires',1),(40,'DOUL EP','Douleur Epaule',1),(41,'DOUL POI','Douleur Poignet',1),(42,'DOUL GEN','Douleur Genou',1),(43,'DOUL COU','Douleur Coude',1),(44,'DOUL HAN','Douleur Hanche',1),(45,'PAR MBRS','Paresthésies Membres Inférieurs',1),(46,'PAR MBRI','Paresthésies Membres Supérieurs',1),(47,'TR RACHI','Traumatisme Rachis',1),(48,'TR MBRS','Traumatisme Membres Supérieurs',1),(49,'TR MBRI','Traumatisme Membres Inférieurs',1),(50,'FAT MBRI','Fatiguabilité Membres Inférieurs',1),(51,'DOUL CHE','Douleur Cheville',1),(52,'DOUL PD','Douleur Pied',1),(53,'DOUL MA','Douleur Main',1); -/*!40000 ALTER TABLE `llx_cabinetmed_motifcons` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_patient` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_patient`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_patient` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `note_antemed` text, - `note_antechirgen` text, - `note_antechirortho` text, - `note_anterhum` text, - `note_other` text, - `note_traitclass` text, - `note_traitallergie` text, - `note_traitintol` text, - `note_traitspec` text, - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_patient` --- - -LOCK TABLES `llx_cabinetmed_patient` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_patient` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_patient` (`rowid`, `note_antemed`, `note_antechirgen`, `note_antechirortho`, `note_anterhum`, `note_other`, `note_traitclass`, `note_traitallergie`, `note_traitintol`, `note_traitspec`) VALUES (2,'fffgfgfgf','','','','jjj','aaaagggggggg','','',''),(5,'a','b','c','d','','','','i','u'),(8,NULL,NULL,NULL,NULL,NULL,'','','','tre tre terter
\r\nt
\r\nter tert'),(26,NULL,NULL,NULL,NULL,NULL,'','','intol','spec pharma'),(46,'hfhf','dddd','','hfghfg','',NULL,'',NULL,NULL); -/*!40000 ALTER TABLE `llx_cabinetmed_patient` ENABLE KEYS */; -UNLOCK TABLES; - -- -- Table structure for table `llx_categorie` -- diff --git a/dev/initdata/mysqldump_dolibarr_3.3.0.sql b/dev/initdata/mysqldump_dolibarr_3.3.0.sql index 233d1f56547..b7553e1355d 100644 --- a/dev/initdata/mysqldump_dolibarr_3.3.0.sql +++ b/dev/initdata/mysqldump_dolibarr_3.3.0.sql @@ -1769,290 +1769,6 @@ LOCK TABLES `llx_c_ziptown` WRITE; /*!40000 ALTER TABLE `llx_c_ziptown` ENABLE KEYS */; UNLOCK TABLES; --- --- Table structure for table `llx_cabinetmed_c_banques` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_c_banques`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_c_banques` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `code` varchar(8) NOT NULL, - `label` varchar(64) NOT NULL, - `active` tinyint(4) NOT NULL DEFAULT '1', - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_c_banques` --- - -LOCK TABLES `llx_cabinetmed_c_banques` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_c_banques` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_c_banques` (`rowid`, `code`, `label`, `active`) VALUES (1,'HSBC','HSBC',1); -/*!40000 ALTER TABLE `llx_cabinetmed_c_banques` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_c_examconclusion` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_c_examconclusion`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_c_examconclusion` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `code` varchar(8) NOT NULL, - `label` varchar(64) NOT NULL, - `active` tinyint(4) NOT NULL DEFAULT '1', - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_c_examconclusion` --- - -LOCK TABLES `llx_cabinetmed_c_examconclusion` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_c_examconclusion` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_c_examconclusion` (`rowid`, `code`, `label`, `active`) VALUES (1,'AUTRE','Autre',1); -/*!40000 ALTER TABLE `llx_cabinetmed_c_examconclusion` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_cons` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_cons`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_cons` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `fk_soc` int(11) DEFAULT NULL, - `fk_user_creation` int(11) NOT NULL, - `datecons` date NOT NULL, - `typepriseencharge` varchar(8) DEFAULT NULL, - `motifconsprinc` varchar(64) DEFAULT NULL, - `diaglesprinc` varchar(64) DEFAULT NULL, - `motifconssec` text, - `diaglessec` text, - `hdm` text, - `examenclinique` text, - `examenprescrit` text, - `traitementprescrit` text, - `comment` text, - `typevisit` varchar(8) NOT NULL, - `infiltration` varchar(256) DEFAULT NULL, - `codageccam` varchar(16) DEFAULT NULL, - `montant_cheque` double(24,8) DEFAULT NULL, - `montant_espece` double(24,8) DEFAULT NULL, - `montant_carte` double(24,8) DEFAULT NULL, - `montant_tiers` double(24,8) DEFAULT NULL, - `banque` varchar(128) DEFAULT NULL, - `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`rowid`), - KEY `idx_cabinetmed_cons_fk_soc` (`fk_soc`), - KEY `idx_cabinetmed_cons_datecons` (`datecons`), - CONSTRAINT `fk_cabinetmed_cons_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_cons` --- - -LOCK TABLES `llx_cabinetmed_cons` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_cons` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_cons` (`rowid`, `fk_soc`, `fk_user_creation`, `datecons`, `typepriseencharge`, `motifconsprinc`, `diaglesprinc`, `motifconssec`, `diaglessec`, `hdm`, `examenclinique`, `examenprescrit`, `traitementprescrit`, `comment`, `typevisit`, `infiltration`, `codageccam`, `montant_cheque`, `montant_espece`, `montant_carte`, `montant_tiers`, `banque`, `tms`) VALUES (2,2,1,'2011-04-17',NULL,'Cervicalgies Inflammatoires','Arthrite Microcristalline','','','','rrrr','','','','CS','','',NULL,55.00000000,NULL,NULL,'','2011-05-25 13:59:03'),(3,2,1,'2011-05-01',NULL,'Cervicalgies Mécaniques','Arthrite Goutteuse','yyyykk\r\nDorsalgie\r\nDorsalgies Inflammatoires\r\nDouleur Chevillep\r\nDouleur Genou\r\nDouleur Genou','','lll','','','','','CS','','',NULL,NULL,NULL,50.00000000,'','2011-05-25 13:59:03'),(4,4,1,'2011-05-02',NULL,'Autre','Arthrite Goutteuse','','','','','','','','CCAM','inf','ccam',50.00000000,NULL,NULL,NULL,'HSBC','2011-05-25 13:59:03'),(5,5,1,'2011-05-02',NULL,'Cervicalgies Inflammatoires','Arthrite Microcristalline','','dgdfg','','','','','','CCAM','ingg','pp',50.00000000,NULL,NULL,NULL,'HSBC','2011-05-28 15:22:22'),(6,5,1,'2011-05-02',NULL,'Cervicalgies Inflammatoires','Arthrose FémoroPatellaire','','','','','','kk','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-05-25 13:59:03'),(7,4,1,'2011-05-03',NULL,'Cervicalgies Mécaniques','Arthrite Goutteuse','Douleur Cheville','Arthrite Microcristalline','fd','fd','Bilan Phosphocalcique','fdf','fdfd','CCAM','lllll','kkk',NULL,NULL,NULL,0.00000000,'','2011-06-14 23:13:42'),(8,5,1,'2011-05-03',NULL,'Cervicalgies Mécaniques','gggg','','','pppljklj','','','','','CS','kmlkmlkml mlmlkmkm mk ml mlk','',50.00000000,NULL,NULL,NULL,'HSBC','2011-05-28 15:00:27'),(10,3,1,'2011-05-07',NULL,'dfgdf','gfdgd','','','','','','','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-05-25 13:59:03'),(11,9,1,'2011-05-25',NULL,'Dérobement Membres Inférieurs','Arthrite Goutteuse','Dorsalgie\r\nDorsalgies Mécaniques','Lomboradiculalgie Discale\r\nLombosciatique L5 gauche','','','ArthroScanner Genou\r\nIRM Genou\r\nIRM Rachis Lombaire','1\r\n2\r\n3\r\n4\r\n5\r\n6','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-05-28 15:58:29'),(12,32,1,'2011-06-08',NULL,'Cervicalgies Inflammatoires','Arthrite Goutteuse','','','','','','','','CS','','',NULL,NULL,NULL,50.00000000,'','2011-06-08 14:38:10'),(13,26,1,'2011-06-13',NULL,'Cervicalgies Mécaniques','Arthrite Microcristalline','','','','','ArthroScanner Hanche','Traitement prescrit.','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-06-13 15:25:39'),(14,26,1,'2011-06-13',NULL,'Douleur Membre inférieur Gauche','Lombosciatique L5 gauche','','Lombalgie Discale','','','','AINS (biprohénide), murolaxan\r\ndoliprane\r\n+ rééduction','','CCAM','infiltr épidurale','AHLB001',90.00000000,NULL,NULL,NULL,'HSBC','2011-06-13 16:16:43'),(15,1,1,'2011-06-13',NULL,'Cervicalgies Mécaniques','Arthrite Microcristalline','','','','','','','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-06-13 18:07:26'),(16,36,1,'2011-06-15',NULL,'gdfgfd','gdfgdfgdf','','','','','ArthroScanner Epaule','','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-06-15 00:28:43'),(17,36,1,'2011-06-15',NULL,'hfghfg','hgfhfghf','','','','','','','','CS','','',NULL,10.00000000,NULL,NULL,'','2011-06-15 00:31:57'),(18,65,1,'2011-07-06',NULL,'Cervicalgies Inflammatoires','aaaaa','','','','','','','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-07-06 20:17:20'),(19,67,1,'2011-07-11',NULL,'Cervicalgies Inflammatoires','Canal Carpien','','','','','','','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-07-10 21:23:30'),(20,68,1,'2011-07-13',NULL,'Cervicalgies Mécaniques','Autre','','','','','','','','CS','','',50.00000000,NULL,NULL,NULL,'HSBC','2011-07-13 16:26:21'),(21,68,1,'2011-07-13',NULL,'aaaa','bbbb','','','','','','','','CS','','',NULL,NULL,50.00000000,NULL,'','2011-07-13 18:18:29'),(22,68,1,'2011-07-13',NULL,'lll','llll','','','','','','','','CS','','',NULL,NULL,10.00000000,NULL,'','2011-07-13 18:21:57'),(23,68,1,'2011-07-13',NULL,'oo','oo','','','','','','','','CS','','',NULL,NULL,NULL,5.00000000,'','2011-07-13 18:26:18'); -/*!40000 ALTER TABLE `llx_cabinetmed_cons` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_diaglec` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_diaglec`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_diaglec` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `code` varchar(8) NOT NULL, - `label` varchar(64) NOT NULL, - `active` tinyint(4) NOT NULL DEFAULT '1', - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_diaglec` --- - -LOCK TABLES `llx_cabinetmed_diaglec` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_diaglec` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_diaglec` (`rowid`, `code`, `label`, `active`) VALUES (1,'AUTRE','Autre',1),(2,'LOMBL5D','Lombosciatique L5 droite',1),(3,'LOMBL5G','Lombosciatique L5 gauche',1),(4,'LOMBS1D','Lombosciatique S1 droite',1),(5,'LOMBS1G','Lombosciatique S1 gauche',1),(6,'NCB','Névralgie cervico-brachiale',1),(7,'PR','Polyarthrite rhumatoide',1),(8,'SA','Spondylarthrite ankylosante',1),(9,'GFTI','Gonarthrose fémoro-tibaile interne',1),(10,'GFTE','Gonarthrose fémoro-tibiale externe',1),(11,'COX','Coxarthrose',1),(12,'CC','Canal Carpien',1),(16,'CLER','Canal Lombaire Etroit et/ou Rétréci',1),(22,'RH PSO','Rhumatisme Psoriasique',1),(23,'LEAD','Lupus',1),(24,'LBDISC','Lombalgie Discale',1),(25,'LBRADD','Lomboradiculalgie Discale',1),(26,'LBRADND','Lomboradiculalgie Non Discale',1),(27,'CH ROT','Chondropathie Rotulienne',1),(28,'AFP','Arthrose FémoroPatellaire',1),(29,'PPR','Pseudo Polyarthrite Rhizomélique',1),(30,'SHARP','Maladie de Sharp',1),(31,'SAPHO','SAPHO',1),(32,'OMARTHC','Omarthrose Centrée',1),(33,'RH CCA','Rhumatisme Chondro Calcinosique',1),(34,'GOUTTE','Arthrite Goutteuse',1),(35,'CCA','Arthrite Chondro Calcinosique',1),(36,'ARTH MCR','Arthrite Microcristalline',1),(37,'CSA','Conflit Sous Acromial',1),(38,'TDCALCE','Tendinopathie Calcifiante d\'Epaule',1),(39,'TDCALCH','Tendinopathie Calcifiante de Hanche',1),(40,'TBT','TendinoBursite Trochantérienne',1),(41,'OMARTHE','Omarthrose Excentrée',1); -/*!40000 ALTER TABLE `llx_cabinetmed_diaglec` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_examaut` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_examaut`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_examaut` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `fk_soc` int(11) DEFAULT NULL, - `dateexam` date NOT NULL, - `examprinc` varchar(64) DEFAULT NULL, - `examsec` text, - `concprinc` varchar(64) DEFAULT NULL, - `concsec` text, - `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_examaut` --- - -LOCK TABLES `llx_cabinetmed_examaut` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_examaut` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_examaut` (`rowid`, `fk_soc`, `dateexam`, `examprinc`, `examsec`, `concprinc`, `concsec`, `tms`) VALUES (1,2,'2011-05-08','ArthroScanner Genou','ArthroScanner EpauleeeeArthroScanner HancheIRM EpauleggggBilan Radio ScolioseuuuuqqqqlIRM Rachis Cervical','Autre','','2011-05-01 14:47:57'),(2,2,'2011-05-02','dd','ArthroScanner Hanche\r\nBilan Radio Scoliose\r\neeee\r\nElectromiogramme','dd','','2011-05-01 23:49:59'),(3,32,'2011-06-08','ArthroScanner Genou','gdfgdfgdfgdfgdfgdfgd','Autre','','2011-06-08 14:54:45'),(4,32,'2011-06-08','IRM SacroIliaques','','fsdfsdfsdfsd','','2011-06-08 14:57:01'),(5,26,'2011-06-13','Bilan Radio Rhumatisme Inflammatoire','','Autre','','2011-06-13 15:27:39'),(6,26,'2011-06-13','ArthroScanner Genou','Autre','Autre','','2011-06-13 15:29:31'),(7,26,'2011-06-13','Scanner Lombaire','','Hernie discale L4-L5 gauche','','2011-06-13 16:20:47'),(8,65,'2011-07-06','ArthroScanner Hanche','','Autre','','2011-07-06 20:17:54'); -/*!40000 ALTER TABLE `llx_cabinetmed_examaut` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_exambio` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_exambio`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_exambio` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `fk_soc` int(11) DEFAULT NULL, - `dateexam` date NOT NULL, - `resultat` text, - `conclusion` text, - `comment` text, - `suivipr_ad` int(11) DEFAULT NULL, - `suivipr_ag` int(11) DEFAULT NULL, - `suivipr_vs` int(11) DEFAULT NULL, - `suivipr_eva` int(11) DEFAULT NULL, - `suivipr_err` int(11) DEFAULT NULL, - `suivisa_fat` int(11) DEFAULT NULL, - `suivisa_dax` int(11) DEFAULT NULL, - `suivisa_dpe` int(11) DEFAULT NULL, - `suivisa_dpa` int(11) DEFAULT NULL, - `suivisa_rno` int(11) DEFAULT NULL, - `suivisa_dma` int(11) DEFAULT NULL, - `suivisa_basdai` double DEFAULT NULL, - `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `suivisa_das28` double DEFAULT NULL, - `suivipr_das28` double DEFAULT NULL, - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_exambio` --- - -LOCK TABLES `llx_cabinetmed_exambio` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_exambio` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_exambio` (`rowid`, `fk_soc`, `dateexam`, `resultat`, `conclusion`, `comment`, `suivipr_ad`, `suivipr_ag`, `suivipr_vs`, `suivipr_eva`, `suivipr_err`, `suivisa_fat`, `suivisa_dax`, `suivisa_dpe`, `suivisa_dpa`, `suivisa_rno`, `suivisa_dma`, `suivisa_basdai`, `tms`, `suivisa_das28`, `suivipr_das28`) VALUES (1,2,'2011-05-01','aaajhkh','bbb','ccc',NULL,NULL,NULL,NULL,NULL,1,2,3,4,5,6,NULL,'2011-05-01 14:45:54',NULL,NULL),(3,2,'2011-05-01','dd','hfghfg','',1,2,6,9,NULL,2,2,2,2,2,2,NULL,'2011-05-01 15:24:06',NULL,NULL),(4,2,'2011-05-01','gdfgdf','1111','',NULL,NULL,NULL,NULL,NULL,1,7,8,9,10,11,NULL,'2011-05-01 15:25:17',NULL,NULL),(5,2,'2011-05-01','fdsfsdfsdfsd','ccccc','fsdfsdfs',1,2,4,3,NULL,1,2,3,4,5,6,NULL,'2011-05-01 16:37:51',NULL,NULL),(6,2,'2011-05-01','gfdgdfgdf','gdfgdf','',5,NULL,NULL,NULL,NULL,1,NULL,1,1,NULL,NULL,NULL,'2011-05-01 16:43:49',NULL,NULL),(8,1,'2011-05-01','lkjljkl','','',1,2,4,3,NULL,5,10,5,6,5,5,6.2,'2011-05-01 16:46:00',NULL,1.97),(9,32,'2011-06-08','retert','trete','',1,2,4,1,NULL,2,5,2,5,4,6,NULL,'2011-06-08 14:47:30',NULL,NULL),(10,32,'2011-06-08','fgdfgdfg','gfgdfgdf','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-06-08 14:54:23',NULL,NULL),(11,26,'2011-06-13','result bio 1','conclusion bio 1','',1,2,4,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-06-13 15:27:15',NULL,NULL),(12,26,'2011-06-13','result bio 2','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-06-13 15:27:25',NULL,NULL),(13,26,'2011-06-13','VS8\r\nCRP inférieur ) 5','Pas de syndrome inflammatoire.','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-06-13 16:19:08',NULL,NULL),(14,26,'2011-06-13','','','',NULL,NULL,NULL,NULL,NULL,1,2,2,4,5,6,NULL,'2011-06-13 16:19:38',NULL,NULL),(15,26,'2011-06-13','','','',1,2,4,3,NULL,1,2,3,4,5,6,0.31,'2011-06-13 17:50:25',NULL,1.97),(16,36,'2011-06-15','gdfgddfhghghhfghf','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-06-15 08:02:03',NULL,NULL),(17,65,'2011-07-06','hfghfghgf','Zob','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-07-06 20:17:33',NULL,NULL),(18,67,'2011-07-11','gfdg','gfdg','gfd',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-07-10 22:23:21',NULL,NULL),(19,62,'2011-07-13','dfgdf','gdfd','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2011-07-13 15:56:27',NULL,NULL); -/*!40000 ALTER TABLE `llx_cabinetmed_exambio` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_examenprescrit` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_examenprescrit`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_examenprescrit` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `code` varchar(8) NOT NULL, - `label` varchar(64) NOT NULL, - `biorad` varchar(8) NOT NULL, - `active` tinyint(4) NOT NULL DEFAULT '1', - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=43 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_examenprescrit` --- - -LOCK TABLES `llx_cabinetmed_examenprescrit` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_examenprescrit` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_examenprescrit` (`rowid`, `code`, `label`, `biorad`, `active`) VALUES (1,'AUTRE','Autre','AUTRE',1),(2,'IRMLOMB','IRM lombaire','RADIO',1),(5,'TDMLOMB','TDM lombaires','RADIO',1),(6,'RX BRL','Radios Bassin-Rachis Lombaire','RADIO',1),(7,'RX RL','Radios Rachis Lombaire','RADIO',1),(8,'RX BASS','Radios Bassin','RADIO',1),(9,'RX BH','Radios Bassin et Hanches','RADIO',1),(10,'RX GEN','Radios Genoux','RADIO',1),(11,'RX CHEV','Radios Chevilles','RADIO',1),(12,'RX AVPD','Radios Avants-Pieds','RADIO',1),(13,'RX EP','Radio Epaule','RADIO',1),(14,'RX MAINS','Radios Mains','RADIO',1),(15,'RX COUDE','Radios Coude','RADIO',1),(16,'RX RC','Radios Rachis Cervical','RADIO',1),(17,'RX RD','Radios Rachis Dorsal','RADIO',1),(18,'RX RCD','Radios Rachis CervicoDorsal','RADIO',1),(19,'RX RDL','Radios DorsoLombaire','RADIO',1),(20,'RX SCO','Bilan Radio Scoliose','RADIO',1),(21,'RX RIC','Bilan Radio Rhumatisme Inflammatoire','RADIO',1),(22,'TDM LOMB','Scanner Lombaire','RADIO',1),(23,'TDM DORS','Scanner Dorsal','RADIO',1),(24,'TDM CERV','Scanner Cervical','RADIO',1),(25,'TDM HANC','Scanner Hanche','RADIO',1),(26,'TDM GEN','Scanner Genou','RADIO',1),(27,'RX RDL','Radios Rachis DorsoLombaire','RADIO',1),(28,'ARTTDMG','ArthroScanner Genou','RADIO',1),(29,'ARTTDME','ArthroScanner Epaule','RADIO',1),(30,'ARTTDMH','ArthroScanner Hanche','RADIO',1),(31,'IRM GEN','IRM Genou','RADIO',1),(32,'IRM HANC','IRM Hanche','RADIO',1),(33,'IRM EP','IRM Epaule','RADIO',1),(34,'IRM SIL','IRM SacroIliaques','RADIO',1),(35,'IRM RL','IRM Rachis Lombaire','RADIO',1),(36,'IRM RD','IRM Rachis Dorsal','RADIO',1),(37,'IRM RC','IRM Rachis Cervical','RADIO',1),(38,'ELECMI','Electromiogramme','RADIO',1),(39,'NFS','NFS','BIO',1),(40,'BILPHO','Bilan Phosphocalcique','BIO',1),(41,'VSCRP','VS/CRP','BIO',1),(42,'EPP','Electrophorèse Protéine Plasmatique','BIO',1); -/*!40000 ALTER TABLE `llx_cabinetmed_examenprescrit` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_motifcons` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_motifcons`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_motifcons` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `code` varchar(8) NOT NULL, - `label` varchar(64) NOT NULL, - `active` tinyint(4) NOT NULL DEFAULT '1', - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_motifcons` --- - -LOCK TABLES `llx_cabinetmed_motifcons` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_motifcons` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_motifcons` (`rowid`, `code`, `label`, `active`) VALUES (5,'AUTRE','Autre',1),(6,'DORS','Dorsalgie',1),(7,'DOLMSD','Douleur Membre supérieur Droit',1),(8,'DOLMSG','Douleur Membre supérieur Gauche',1),(9,'DOLMID','Douleur Membre inférieur Droit',1),(10,'DOLMIG','Douleur Membre inférieur Gauche',1),(11,'PARESM','Paresthésie des mains',1),(12,'DOLEPG','Douleur épaule gauche',1),(13,'DOLEPD','Douleur épaule droite',1),(14,'GONAD','Gonaglie droite',1),(15,'GONAG','Gonalgie gauche',1),(16,'DOLPD','Douleur Pied Droit',1),(17,'DOUL MIN','Douleur Membre Inférieur',1),(18,'POLYAR','Polyarthralgie',1),(19,'SUIVIPR','Suivi PR',1),(20,'SUIVISPA','Suivi SPA',1),(21,'SUIVIRIC','Suivi RI',1),(22,'SUIVIPPR','Suivi PPR',1),(23,'DOLINGD','Douleur inguinale Droit',1),(24,'DOLINGG','Douleur inguinale Gauche',1),(25,'DOLCOUDD','Douleur coude Droit',1),(26,'DOLCOUDG','Douleur coude Gauche',1),(27,'TALAL','Talalgie',1),(28,'DOLTENDC','Douleur tandous Calcanien',1),(29,'DEROB','Dérobement Membres Inférieurs',1),(30,'LOMB MEC','Lombalgies Mécaniques',1),(31,'LOMB INF','Lombalgies Inflammatoires',1),(32,'DORS MEC','Dorsalgies Mécaniques',1),(33,'DORS INF','Dorsalgies Inflammatoires',1),(34,'CERV MEC','Cervicalgies Mécaniques',1),(35,'SCIAT','LomboSciatique ',1),(36,'CRUR','LomboCruralgie',1),(37,'DOUL SUP','Douleur Membre Supérieur',1),(38,'INGUINAL','Inguinalgie',1),(39,'CERV INF','Cervicalgies Inflammatoires',1),(40,'DOUL EP','Douleur Epaule',1),(41,'DOUL POI','Douleur Poignet',1),(42,'DOUL GEN','Douleur Genou',1),(43,'DOUL COU','Douleur Coude',1),(44,'DOUL HAN','Douleur Hanche',1),(45,'PAR MBRS','Paresthésies Membres Inférieurs',1),(46,'PAR MBRI','Paresthésies Membres Supérieurs',1),(47,'TR RACHI','Traumatisme Rachis',1),(48,'TR MBRS','Traumatisme Membres Supérieurs',1),(49,'TR MBRI','Traumatisme Membres Inférieurs',1),(50,'FAT MBRI','Fatiguabilité Membres Inférieurs',1),(51,'DOUL CHE','Douleur Cheville',1),(52,'DOUL PD','Douleur Pied',1),(53,'DOUL MA','Douleur Main',1); -/*!40000 ALTER TABLE `llx_cabinetmed_motifcons` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `llx_cabinetmed_patient` --- - -DROP TABLE IF EXISTS `llx_cabinetmed_patient`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; -CREATE TABLE `llx_cabinetmed_patient` ( - `rowid` int(11) NOT NULL AUTO_INCREMENT, - `note_antemed` text, - `note_antechirgen` text, - `note_antechirortho` text, - `note_anterhum` text, - `note_other` text, - `note_traitclass` text, - `note_traitallergie` text, - `note_traitintol` text, - `note_traitspec` text, - PRIMARY KEY (`rowid`) -) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `llx_cabinetmed_patient` --- - -LOCK TABLES `llx_cabinetmed_patient` WRITE; -/*!40000 ALTER TABLE `llx_cabinetmed_patient` DISABLE KEYS */; -INSERT INTO `llx_cabinetmed_patient` (`rowid`, `note_antemed`, `note_antechirgen`, `note_antechirortho`, `note_anterhum`, `note_other`, `note_traitclass`, `note_traitallergie`, `note_traitintol`, `note_traitspec`) VALUES (2,'fffgfgfgf','','','','jjj','aaaagggggggg','','',''),(5,'a','b','c','d','','','','i','u'),(8,NULL,NULL,NULL,NULL,NULL,'','','','tre tre terter
\r\nt
\r\nter tert'),(26,NULL,NULL,NULL,NULL,NULL,'','','intol','spec pharma'),(46,'hfhf','dddd','','hfghfg','',NULL,'',NULL,NULL); -/*!40000 ALTER TABLE `llx_cabinetmed_patient` ENABLE KEYS */; -UNLOCK TABLES; - -- -- Table structure for table `llx_categorie` -- From 353c932e111fe686f5a6ac62c40df3ada285d901 Mon Sep 17 00:00:00 2001 From: simnandez Date: Tue, 6 Nov 2012 12:33:35 +0100 Subject: [PATCH 08/13] Fix: if no results do not charge data --- htdocs/categories/class/categorie.class.php | 37 +++++++------ htdocs/product/stock/class/entrepot.class.php | 53 +++++++++++-------- 2 files changed, 52 insertions(+), 38 deletions(-) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index acf708005d3..dec5ebfea57 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -63,7 +63,7 @@ class Categorie * Load category into memory from database * * @param int $id Id of category - * @param strin $label Label of category + * @param string $label Label of category * @return int <0 if KO, >0 if OK */ function fetch($id,$label='') @@ -86,20 +86,27 @@ class Categorie $resql = $this->db->query($sql); if ($resql) { - $res = $this->db->fetch_array($resql); - - $this->id = $res['rowid']; - $this->fk_parent = $res['fk_parent']; - $this->label = $res['label']; - $this->description = $res['description']; - $this->socid = $res['fk_soc']; - $this->visible = $res['visible']; - $this->type = $res['type']; - $this->entity = $res['entity']; - - $this->db->free($resql); - - return 1; + if ($this->db->num_rows($resql) > 0) + { + $res = $this->db->fetch_array($resql); + + $this->id = $res['rowid']; + $this->fk_parent = $res['fk_parent']; + $this->label = $res['label']; + $this->description = $res['description']; + $this->socid = $res['fk_soc']; + $this->visible = $res['visible']; + $this->type = $res['type']; + $this->entity = $res['entity']; + + $this->db->free($resql); + + return 1; + } + else + { + return 0; + } } else { diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index eec0b8b22cf..35fb8faec4e 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -265,30 +265,37 @@ class Entrepot extends CommonObject $result = $this->db->query($sql); if ($result) { - $obj=$this->db->fetch_object($result); + if ($this->db->num_rows($result) > 0) + { + $obj=$this->db->fetch_object($result); - $this->id = $obj->rowid; - $this->ref = $obj->rowid; - $this->libelle = $obj->label; - $this->description = $obj->description; - $this->statut = $obj->statut; - $this->lieu = $obj->lieu; - $this->address = $obj->address; - $this->cp = $obj->zip; // deprecated - $this->ville = $obj->town; // deprecated - $this->pays_id = $obj->country_id; // deprecated - $this->zip = $obj->zip; - $this->town = $obj->town; - $this->country_id = $obj->country_id; - - include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; - $tmp=getCountry($this->country_id,'all'); - $this->pays=$tmp['label']; // deprecated - $this->pays_code=$tmp['code']; // deprecated - $this->country=$tmp['label']; - $this->country_code=$tmp['code']; - - return 1; + $this->id = $obj->rowid; + $this->ref = $obj->rowid; + $this->libelle = $obj->label; + $this->description = $obj->description; + $this->statut = $obj->statut; + $this->lieu = $obj->lieu; + $this->address = $obj->address; + $this->cp = $obj->zip; // deprecated + $this->ville = $obj->town; // deprecated + $this->pays_id = $obj->country_id; // deprecated + $this->zip = $obj->zip; + $this->town = $obj->town; + $this->country_id = $obj->country_id; + + include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; + $tmp=getCountry($this->country_id,'all'); + $this->pays=$tmp['label']; // deprecated + $this->pays_code=$tmp['code']; // deprecated + $this->country=$tmp['label']; + $this->country_code=$tmp['code']; + + return 1; + } + else + { + return 0; + } } else { From 3651b8895ea3c1d4dc65cb3ccb812f1d43662d45 Mon Sep 17 00:00:00 2001 From: fhenry Date: Tue, 6 Nov 2012 14:21:17 +0100 Subject: [PATCH 09/13] Fix bug on mass mailling unsubsscribe fonctionnality --- htdocs/public/emailing/mailing-unsubscribe.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php index db91864e3f6..4595e8aeb5f 100644 --- a/htdocs/public/emailing/mailing-unsubscribe.php +++ b/htdocs/public/emailing/mailing-unsubscribe.php @@ -29,7 +29,7 @@ define("NOLOGIN",1); // This means this output page does not require to be logg define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/lib/company.lib.php'; +dol_include_once('/core/lib/company.lib.php'); global $user, $conf, $langs; From 7de5a7fd3f759cf6a0423faf0f4085e9496a531b Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 6 Nov 2012 14:54:17 +0100 Subject: [PATCH 10/13] Fix: compatibility with multicompany --- htdocs/compta/paiement.php | 5 ++-- htdocs/compta/sociales/charges.php | 5 ++-- .../sociales/class/chargesociales.class.php | 24 ++++++++++++------- htdocs/compta/sociales/info.php | 2 +- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 4fbc531707f..b1896db302a 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -446,12 +446,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $sql = 'SELECT f.rowid as facid, f.facnumber, f.total_ttc, f.type, '; $sql.= ' f.datef as df'; $sql.= ' FROM '.MAIN_DB_PREFIX.'facture as f'; - $sql.= ' WHERE f.fk_soc = '.$facture->socid; + $sql.= ' WHERE f.entity = '.$conf->entity; + $sql.= ' AND f.fk_soc = '.$facture->socid; $sql.= ' AND f.paye = 0'; $sql.= ' AND f.fk_statut = 1'; // Statut=0 => not validated, Statut=2 => canceled if ($facture->type != 2) { - $sql .= ' AND type in (0,1,3)'; // Standard invoice, replacement, deposit + $sql .= ' AND type IN (0,1,3)'; // Standard invoice, replacement, deposit } else { diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index e08b736c7ad..7e380204640 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,8 +36,7 @@ $action=GETPOST("action"); // Security check $socid = GETPOST('socid','int'); if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'tax', $langs->trans("SocialContribution"), '', 'charges'); - +$result = restrictedArea($user, 'tax', $id, 'chargesociales','charges'); diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index a397ca5c29c..2c5896bbee3 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -262,8 +262,12 @@ class ChargeSociales extends CommonObject */ function solde($year = 0) { - $sql = "SELECT sum(f.amount) as amount"; - $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as f WHERE paye = 0"; + global $conf; + + $sql = "SELECT SUM(f.amount) as amount"; + $sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as f"; + $sql.= " WHERE f.entity = ".$conf->entity; + $sql.= " AND paye = 0"; if ($year) { $sql .= " AND f.datev >= '$y-01-01' AND f.datev <= '$y-12-31' "; @@ -300,8 +304,8 @@ class ChargeSociales extends CommonObject */ function set_paid($user) { - $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales"; - $sql.= " set paye=1"; + $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET"; + $sql.= " paye = 1"; $sql.= " WHERE rowid = ".$this->id; $return = $this->db->query($sql); if ($return) return 1; @@ -397,12 +401,14 @@ class ChargeSociales extends CommonObject */ function getSommePaiement() { - $table='paiementcharge'; - $field='fk_charge'; + global $conf; - $sql = 'SELECT sum(amount) as amount'; - $sql.= ' FROM '.MAIN_DB_PREFIX.$table; - $sql.= ' WHERE '.$field.' = '.$this->id; + $sql = 'SELECT SUM(amount) as amount'; + $sql.= ' FROM '.MAIN_DB_PREFIX.'paiementcharge as pc'; + $sql.= ', '.MAIN_DB_PREFIX.'chargesociales as c'; + $sql.= ' WHERE c.entity = '.$conf->entity; + $sql.= ' AND pc.fk_charge = c.rowid'; + $sql.= ' AND pc.fk_charge = '.$this->id; dol_syslog(get_class($this)."::getSommePaiement sql=".$sql, LOG_DEBUG); $resql=$this->db->query($sql); diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php index 08a14a16687..bc034de8171 100644 --- a/htdocs/compta/sociales/info.php +++ b/htdocs/compta/sociales/info.php @@ -35,7 +35,7 @@ $action=GETPOST("action"); // Security check $socid = GETPOST('socid','int'); if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'tax', $langs->trans("SocialContribution"), '', 'charges'); +$result = restrictedArea($user, 'tax', $id, 'chargesociales','charges'); /* From 8175a9a7e5780a5d5746319ce603e980d6854dd8 Mon Sep 17 00:00:00 2001 From: jfefe Date: Tue, 6 Nov 2012 15:16:49 +0100 Subject: [PATCH 11/13] Add image information in webservice product --- .../webservices/server_productorservice.php | 50 ++++++++++++++++++- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index f486d3d95fb..3a69061e459 100755 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -1,5 +1,6 @@ + * Copyright (C) 2012 JF FERRY * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -116,10 +117,49 @@ $server->wsdl->addComplexType( 'stock_real' => array('name'=>'stock_real','type'=>'xsd:string'), 'stock_pmp' => array('name'=>'stock_pmp','type'=>'xsd:string'), 'canvas' => array('name'=>'canvas','type'=>'xsd:string'), - 'import_key' => array('name'=>'import_key','type'=>'xsd:string') + 'import_key' => array('name'=>'import_key','type'=>'xsd:string'), + + 'dir' => array('name'=>'dir','type'=>'xsd:string'), + 'photos' => array('name'=>'photos','type'=>'tns:PhotosArray') ) ); + +/* + * Image of product +*/ +$server->wsdl->addComplexType( + 'PhotosArray', + 'complexType', + 'array', + '', + 'SOAP-ENC:Array', + array(), + array( + array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:image[]') + ), + '' +); + +/* + * An image +*/ +$server->wsdl->addComplexType( + 'image', + 'complexType', + 'array', + '', + 'SOAP-ENC:Array', + array(), + array( + 'photo' => array('name'=>'photo','type'=>'xsd:string'), + 'photo_vignette' => array('name'=>'photo_vignette','type'=>'xsd:string'), + 'imgWidth' => array('name'=>'imgWidth','type'=>'xsd:string'), + 'imgHeight' => array('name'=>'imgHeight','type'=>'xsd:string') + ) +); + + // Define other specific objects $server->wsdl->addComplexType( 'filterproduct', @@ -255,6 +295,10 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='') $result=$product->fetch($id,$ref,$ref_ext); if ($result > 0) { + $dir = (!empty($conf->product->dir_output)?$conf->product->dir_output:$conf->service->dir_output); + $pdir = get_exdir($obj->id,2) . $obj->id ."/photos/"; + $dir = $dir . '/'. $pdir; + // Create $objectresp = array( 'result'=>array('result_code'=>'OK', 'result_label'=>''), @@ -285,7 +329,9 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='') 'stock_real' => $product->stock_reel, 'stock_alert' => $product->seuil_stock_alerte, 'pmp' => $product->pmp, - 'import_key' => $product->import_key + 'import_key' => $product->import_key, + 'dir' => $pdir, + 'photos' => $obj->liste_photos($dir,$nbmax=10) )); } else From e12999bcfd6e67460ceb7f9e71322cde859b6129 Mon Sep 17 00:00:00 2001 From: fhenry Date: Tue, 6 Nov 2012 15:39:47 +0100 Subject: [PATCH 12/13] Correct fix --- htdocs/public/emailing/mailing-unsubscribe.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php index 4595e8aeb5f..9f2cf060841 100644 --- a/htdocs/public/emailing/mailing-unsubscribe.php +++ b/htdocs/public/emailing/mailing-unsubscribe.php @@ -29,7 +29,7 @@ define("NOLOGIN",1); // This means this output page does not require to be logg define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require '../../main.inc.php'; -dol_include_once('/core/lib/company.lib.php'); +require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; global $user, $conf, $langs; From 8a69a258fd098c8dc8a305b35fdb05e3fd21aedd Mon Sep 17 00:00:00 2001 From: jfefe Date: Tue, 6 Nov 2012 16:18:26 +0100 Subject: [PATCH 13/13] image information in webservice product : fix wrong objet --- htdocs/webservices/server_productorservice.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index 3a69061e459..0bba1e80058 100755 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -27,6 +27,7 @@ set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); require_once '../master.inc.php'; require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP require_once DOL_DOCUMENT_ROOT.'/core/lib/ws.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; @@ -137,8 +138,7 @@ $server->wsdl->addComplexType( array(), array( array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:image[]') - ), - '' + ) ); /* @@ -296,7 +296,7 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='') if ($result > 0) { $dir = (!empty($conf->product->dir_output)?$conf->product->dir_output:$conf->service->dir_output); - $pdir = get_exdir($obj->id,2) . $obj->id ."/photos/"; + $pdir = get_exdir($product->id,2) . $product->id ."/photos/"; $dir = $dir . '/'. $pdir; // Create @@ -331,7 +331,7 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='') 'pmp' => $product->pmp, 'import_key' => $product->import_key, 'dir' => $pdir, - 'photos' => $obj->liste_photos($dir,$nbmax=10) + 'photos' => $product->liste_photos($dir,$nbmax=10) )); } else
'; print $langs->trans('PaymentMode'); @@ -2907,23 +2918,20 @@ else if ($id > 0 || ! empty($ref)) print '
'.$langs->trans('AmountVAT').''.price($object->total_tva).''.$langs->trans('Currency'.$conf->currency).'
'.$langs->transcountry("AmountLT1",$mysoc->pays_code).''.price($object->total_localtax1).''.$langs->trans("Currency".$conf->currency).'
'.$langs->transcountry("AmountLT2",$mysoc->pays_code).''.price($object->total_localtax2).''.$langs->trans("Currency".$conf->currency).'
'.$langs->transcountry("AmountLT1",$mysoc->pays_code).''.price($object->total_localtax1).''.$langs->trans("Currency".$conf->currency).'
'.$langs->transcountry("AmountLT2",$mysoc->pays_code).''.price($object->total_localtax2).''.$langs->trans("Currency".$conf->currency).'
'.$langs->trans('AmountTTC').''.price($object->total_ttc).'