diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 913e1a9a0a9..aaedd3d0bb9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -550,7 +550,16 @@ if ($_REQUEST['action'] == 'builddoc' && $user->rights->propale->creer) $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); $outputlangs->setDefaultLang($_REQUEST['lang_id']); } - propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs); + $result=propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs); + if ($result <= 0) + { + dolibarr_print_error($db,$result); + exit; + } + else + { + Header ('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'#builddoc'); + } } @@ -625,13 +634,29 @@ if ($_POST["action"] == 'setmode') if ($_GET['action'] == 'up' && $user->rights->propale->creer) { $propal = new Propal($db, '', $_GET["propalid"]); + $propal->fetch($_GET['propalid']); $propal->line_up($_GET['rowid']); + if ($_REQUEST['lang_id']) + { + $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); + $outputlangs->setDefaultLang($_REQUEST['lang_id']); + } + propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs); + Header ('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$_GET["propalid"].'#'.$_GET['rowid']); } if ($_GET['action'] == 'down' && $user->rights->propale->creer) { $propal = new Propal($db, '', $_GET["propalid"]); + $propal->fetch($_GET['propalid']); $propal->line_down($_GET['rowid']); + if ($_REQUEST['lang_id']) + { + $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); + $outputlangs->setDefaultLang($_REQUEST['lang_id']); + } + propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs); + Header ('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$_GET["propalid"].'#'.$_GET['rowid']); } @@ -1031,6 +1056,7 @@ if ($_GET['propalid'] > 0) else { print ''; + print ''; // ancre pour retourner sur la ligne if (($objp->info_bits & 2) == 2) { print ''; @@ -1123,9 +1149,9 @@ if ($_GET['propalid'] > 0) print ''; print ''; print ''; + print ''; // ancre pour retourner sur la ligne if ($objp->fk_product > 0) { - print ''; // ancre pour retourner sur la ligne print ''; if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service'); else print img_object($langs->trans('ShowProduct'),'product'); @@ -1489,6 +1515,7 @@ if ($_GET['propalid'] > 0) print ''; print ''; print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print "\n"; } $var=true; @@ -1241,6 +1261,7 @@ else else { print ''; print '
'; + print ''; // ancre /* diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index c4c8caf093f..4092bc34afb 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -430,13 +430,29 @@ if ($_GET['action'] == 'modif' && $user->rights->commande->creer) if ($_GET['action'] == 'up' && $user->rights->commande->creer) { $commande = new Commande($db,'',$_GET['id']); + $commande->fetch($_GET['id']); $commande->line_up($_GET['rowid']); + if ($_REQUEST['lang_id']) + { + $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); + $outputlangs->setDefaultLang($_REQUEST['lang_id']); + } + commande_pdf_create($db, $commande->id, $commande->modelpdf, $outputlangs); + Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$_GET["id"].'#'.$_GET['rowid']); } if ($_GET['action'] == 'down' && $user->rights->commande->creer) { $commande = new Commande($db,'',$_GET['id']); + $commande->fetch($_GET['id']); $commande->line_down($_GET['rowid']); + if ($_REQUEST['lang_id']) + { + $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); + $outputlangs->setDefaultLang($_REQUEST['lang_id']); + } + commande_pdf_create($db, $commande->id, $commande->modelpdf, $outputlangs); + Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$_GET["id"].'#'.$_GET['rowid']); } if ($_REQUEST['action'] == 'builddoc') // En get ou en post @@ -465,6 +481,10 @@ if ($_REQUEST['action'] == 'builddoc') // En get ou en post dolibarr_print_error($db,$result); exit; } + else + { + Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$commande->id.'#builddoc'); + } } // Efface les fichiers @@ -1208,9 +1228,9 @@ else print ''.$langs->trans('Qty').''.$langs->trans('ReductionShort').''.$langs->trans('AmountHT').'      
'; + print ''; // ancre pour retourner sur la ligne if (($objp->info_bits & 2) == 2) { print ''; @@ -1321,9 +1342,9 @@ else print ''; print '
'; + print ''; // ancre pour retourner sur la ligne if ($objp->fk_product > 0) { - print ''; // ancre pour retourner sur la ligne print ''; if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service'); else print img_object($langs->trans('ShowProduct'),'product'); @@ -1639,6 +1660,7 @@ else print ''; print '
'; + print ''; // ancre /* * Documents générés diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 924a2f1ae91..918d795da26 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -203,9 +203,15 @@ if ($_POST['action'] == 'confirm_deleteproductline' && $_POST['confirm'] == 'yes { if ($user->rights->facture->creer) { - $facture = new Facture($db); - $facture->fetch($_GET['facid']); - $facture->deleteline($_GET['rowid']); + $fac = new Facture($db); + $fac->fetch($_GET['facid']); + $fac->deleteline($_GET['rowid']); + if ($_REQUEST['lang_id']) + { + $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); + $outputlangs->setDefaultLang($_REQUEST['lang_id']); + } + facture_pdf_create($db, $fac->id, '', $fac->modelpdf, $outputlangs); } Header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$_GET['facid']); exit; @@ -551,6 +557,12 @@ if ($_GET['action'] == 'deleteline' && $user->rights->facture->creer && !$conf-> $fac = new Facture($db,'',$_GET['facid']); $fac->fetch($_GET['facid']); $result = $fac->deleteline($_GET['rowid']); + if ($_REQUEST['lang_id']) + { + $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); + $outputlangs->setDefaultLang($_REQUEST['lang_id']); + } + facture_pdf_create($db, $fac->id, '', $fac->modelpdf, $outputlangs); } if ($_POST['action'] == 'confirm_delete' && $_POST['confirm'] == 'yes') @@ -570,7 +582,7 @@ if ($_POST['action'] == 'confirm_canceled' && $_POST['confirm'] == 'yes') if ($user->rights->facture->supprimer) { $fac = new Facture($db); - $fac->fetch($_GET['facid']); + $fac->fetch($_GET['facid']); $result = $fac->set_canceled($user); } } @@ -582,13 +594,29 @@ if ($_POST['action'] == 'confirm_canceled' && $_POST['confirm'] == 'yes') if ($_GET['action'] == 'up' && $user->rights->facture->creer) { $fac = new Facture($db,'',$_GET['facid']); + $fac->fetch($_GET['facid']); $fac->line_up($_GET['rowid']); + if ($_REQUEST['lang_id']) + { + $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); + $outputlangs->setDefaultLang($_REQUEST['lang_id']); + } + facture_pdf_create($db, $fac->id, '', $fac->modelpdf, $outputlangs); + Header ('Location: '.$_SERVER["PHP_SELF"].'?facid='.$_GET["facid"].'#'.$_GET['rowid']); } if ($_GET['action'] == 'down' && $user->rights->facture->creer) { $fac = new Facture($db,'',$_GET['facid']); + $fac->fetch($_GET['facid']); $fac->line_down($_GET['rowid']); + if ($_REQUEST['lang_id']) + { + $outputlangs = new Translate(DOL_DOCUMENT_ROOT ."/langs"); + $outputlangs->setDefaultLang($_REQUEST['lang_id']); + } + facture_pdf_create($db, $fac->id, '', $fac->modelpdf, $outputlangs); + Header ('Location: '.$_SERVER["PHP_SELF"].'?facid='.$_GET["facid"].'#'.$_GET['rowid']); } /* @@ -736,12 +764,12 @@ if ($_POST['action'] == 'send' || $_POST['action'] == 'relance') */ if ($_REQUEST['action'] == 'builddoc') // En get ou en post { - $facture = new Facture($db, 0, $_GET['facid']); - $facture->fetch($_GET['facid']); + $fac = new Facture($db, 0, $_GET['facid']); + $fac->fetch($_GET['facid']); if ($_REQUEST['model']) { - $facture->set_pdf_model($user, $_REQUEST['model']); + $fac->set_pdf_model($user, $_REQUEST['model']); } if ($_REQUEST['lang_id']) @@ -750,11 +778,15 @@ if ($_REQUEST['action'] == 'builddoc') // En get ou en post $outputlangs->setDefaultLang($_REQUEST['lang_id']); } - $result=facture_pdf_create($db, $facture->id, '', $facture->modelpdf, $outputlangs); + $result=facture_pdf_create($db, $fac->id, '', $fac->modelpdf, $outputlangs); if ($result <= 0) { dolibarr_print_error($db,$result); - exit; + exit; + } + else + { + Header ('Location: '.$_SERVER["PHP_SELF"].'?facid='.$fac->id.'#builddoc'); } } @@ -1772,6 +1804,7 @@ else else { print ''; + print ''; // ancre pour retourner sur la ligne if (($objp->info_bits & 2) == 2) { print ''; @@ -1852,9 +1885,9 @@ else print ''; print '
'; + print ''; // ancre pour retourner sur la ligne if ($objp->fk_product > 0) { - print ''; // ancre pour retourner sur la ligne print ''; if ($objp->fk_product_type) print img_object($langs->trans('ShowService'),'service'); else print img_object($langs->trans('ShowProduct'),'product'); @@ -2221,6 +2254,7 @@ else } print '
'; + print ''; // ancre /* * Documents générés diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index 4311295542d..13fa1ad0951 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -2462,7 +2462,7 @@ class Form $headershown=1; - print '
'; + print ''; print ''; print_titre($langs->trans("Documents")); diff --git a/mysql/data/data.sql b/mysql/data/data.sql index 91dd15f883a..c8985dd5946 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -515,16 +515,100 @@ insert into llx_c_pays (rowid,code,libelle) values (28, 'MC', 'Monaco' ) insert into llx_c_pays (rowid,code,libelle) values (29, 'AU', 'Australie' ); insert into llx_c_pays (rowid,code,libelle) values (30, 'SG', 'Singapoure' ); insert into llx_c_pays (rowid,code,libelle) values (31, 'AF', 'Afghanistan' ); -insert into llx_c_pays (rowid,code,libelle) values (32, 'AX', 'Aland Islands' ); -insert into llx_c_pays (rowid,code,libelle) values (33, 'AL', 'Albanie' ); -insert into llx_c_pays (rowid,code,libelle) values (34, 'AS', 'American Samoa' ); +insert into llx_c_pays (rowid,code,libelle) values (32, 'AX', 'Iles Aland' ); +insert into llx_c_pays (rowid,code,libelle) values (33, 'AL', 'Albanie' ); +insert into llx_c_pays (rowid,code,libelle) values (34, 'AS', 'Samoa américaines'); insert into llx_c_pays (rowid,code,libelle) values (35, 'AD', 'Andorre' ); insert into llx_c_pays (rowid,code,libelle) values (36, 'AO', 'Angola' ); -insert into llx_c_pays (rowid,code,libelle) values (37, 'AI', 'Anguilla' ); -insert into llx_c_pays (rowid,code,libelle) values (38, 'AQ', 'Antartique' ); -insert into llx_c_pays (rowid,code,libelle) values (39, 'AG', 'Antigua et Barbuda'); -insert into llx_c_pays (rowid,code,libelle) values (40, 'AM', 'Armenie' ); -insert into llx_c_pays (rowid,code,libelle) values (41, 'AW', 'Aruba' ); +insert into llx_c_pays (rowid,code,libelle) values (37, 'AI', 'Anguilla' ); +insert into llx_c_pays (rowid,code,libelle) values (38, 'AQ', 'Antarctique' ); +insert into llx_c_pays (rowid,code,libelle) values (39, 'AG', 'Antigua-et-Barbuda'); +insert into llx_c_pays (rowid,code,libelle) values (40, 'AM', 'Arménie' ); +insert into llx_c_pays (rowid,code,libelle) values (41, 'AW', 'Aruba' ); +insert into llx_c_pays (rowid,code,libelle) values (42, 'AT', 'Autriche' ); +insert into llx_c_pays (rowid,code,libelle) values (43, 'AZ', 'Azerbaïdjan' ); +insert into llx_c_pays (rowid,code,libelle) values (44, 'BS', 'Bahamas' ); +insert into llx_c_pays (rowid,code,libelle) values (45, 'BH', 'Bahreïn' ); +insert into llx_c_pays (rowid,code,libelle) values (46, 'BD', 'Bangladesh' ); +insert into llx_c_pays (rowid,code,libelle) values (47, 'BB', 'Barbade' ); +insert into llx_c_pays (rowid,code,libelle) values (48, 'BY', 'Biélorussie' ); +insert into llx_c_pays (rowid,code,libelle) values (49, 'BZ', 'Belize' ); +insert into llx_c_pays (rowid,code,libelle) values (50, 'BJ', 'Bénin' ); +insert into llx_c_pays (rowid,code,libelle) values (51, 'BM', 'Bermudes' ); +insert into llx_c_pays (rowid,code,libelle) values (52, 'BT', 'Bhoutan' ); +insert into llx_c_pays (rowid,code,libelle) values (53, 'BO', 'Bolivie' ); +insert into llx_c_pays (rowid,code,libelle) values (54, 'BA', 'Bosnie-Herzégovine'); +insert into llx_c_pays (rowid,code,libelle) values (55, 'BW', 'Botswana' ); +insert into llx_c_pays (rowid,code,libelle) values (56, 'BV', 'Ile Bouvet' ); +insert into llx_c_pays (rowid,code,libelle) values (57, 'BR', 'Brésil' ); +insert into llx_c_pays (rowid,code,libelle) values (58, 'IO', 'Territoire britannique de l\'Océan Indien'); +insert into llx_c_pays (rowid,code,libelle) values (59, 'BN', 'Brunei' ); +insert into llx_c_pays (rowid,code,libelle) values (60, 'BG', 'Bulgarie' ); +insert into llx_c_pays (rowid,code,libelle) values (61, 'BF', 'Burkina Faso' ); +insert into llx_c_pays (rowid,code,libelle) values (62, 'BI', 'Burundi' ); +insert into llx_c_pays (rowid,code,libelle) values (63, 'KH', 'Cambodge' ); +insert into llx_c_pays (rowid,code,libelle) values (64, 'CV', 'Cap-Vert' ); +insert into llx_c_pays (rowid,code,libelle) values (65, 'KY', 'Iles Cayman' ); +insert into llx_c_pays (rowid,code,libelle) values (66, 'CF', 'République centrafricaine'); +insert into llx_c_pays (rowid,code,libelle) values (67, 'TD', 'Tchad' ); +insert into llx_c_pays (rowid,code,libelle) values (68, 'CL', 'Chili' ); +insert into llx_c_pays (rowid,code,libelle) values (69, 'CX', 'Ile Christmas' ); +insert into llx_c_pays (rowid,code,libelle) values (70, 'CC', 'Iles des Cocos (Keeling)'); +insert into llx_c_pays (rowid,code,libelle) values (71, 'CO', 'Colombie' ); +insert into llx_c_pays (rowid,code,libelle) values (72, 'KM', 'Comores' ); +insert into llx_c_pays (rowid,code,libelle) values (73, 'CG', 'Congo' ); +insert into llx_c_pays (rowid,code,libelle) values (74, 'CD', 'République démocratique du Congo'); +insert into llx_c_pays (rowid,code,libelle) values (75, 'CK', 'Iles Cook' ); +insert into llx_c_pays (rowid,code,libelle) values (76, 'CR', 'Costa Rica' ); +insert into llx_c_pays (rowid,code,libelle) values (77, 'HR', 'Croatie' ); +insert into llx_c_pays (rowid,code,libelle) values (78, 'CU', 'Cuba' ); +insert into llx_c_pays (rowid,code,libelle) values (79, 'CY', 'Chypre' ); +insert into llx_c_pays (rowid,code,libelle) values (80, 'CZ', 'République Tchèque'); +insert into llx_c_pays (rowid,code,libelle) values (81, 'DK', 'Danemark' ); +insert into llx_c_pays (rowid,code,libelle) values (82, 'DJ', 'Djibouti' ); +insert into llx_c_pays (rowid,code,libelle) values (83, 'DM', 'Dominique' ); +insert into llx_c_pays (rowid,code,libelle) values (84, 'DO', 'République Dominicaine'); +insert into llx_c_pays (rowid,code,libelle) values (85, 'EC', 'Equateur' ); +insert into llx_c_pays (rowid,code,libelle) values (86, 'EG', 'Egypte' ); +insert into llx_c_pays (rowid,code,libelle) values (87, 'SV', 'Salvador' ); +insert into llx_c_pays (rowid,code,libelle) values (88, 'GQ', 'Guinée Equatoriale'); +insert into llx_c_pays (rowid,code,libelle) values (89, 'ER', 'Erythrée' ); +insert into llx_c_pays (rowid,code,libelle) values (90, 'EE', 'Estonie' ); +insert into llx_c_pays (rowid,code,libelle) values (91, 'ET', 'Ethiopie' ); +insert into llx_c_pays (rowid,code,libelle) values (92, 'FK', 'Iles Falkland' ); +insert into llx_c_pays (rowid,code,libelle) values (93, 'FO', 'Iles Féroé' ); +insert into llx_c_pays (rowid,code,libelle) values (94, 'FJ', 'Iles Fidji' ); +insert into llx_c_pays (rowid,code,libelle) values (95, 'FI', 'Finlande' ); +insert into llx_c_pays (rowid,code,libelle) values (96, 'GF', 'Guyane française'); +insert into llx_c_pays (rowid,code,libelle) values (97, 'PF', 'Polynésie française'); +insert into llx_c_pays (rowid,code,libelle) values (98, 'TF', 'Terres australes françaises'); +insert into llx_c_pays (rowid,code,libelle) values (99, 'GM', 'Gambie' ); +insert into llx_c_pays (rowid,code,libelle) values (100, 'GE', 'Géorgie' ); +insert into llx_c_pays (rowid,code,libelle) values (101, 'GH', 'Ghana' ); +insert into llx_c_pays (rowid,code,libelle) values (102, 'GI', 'Gibraltar' ); +insert into llx_c_pays (rowid,code,libelle) values (103, 'GR', 'Grèce' ); +insert into llx_c_pays (rowid,code,libelle) values (104, 'GL', 'Groenland' ); +insert into llx_c_pays (rowid,code,libelle) values (105, 'GD', 'Grenade' ); +insert into llx_c_pays (rowid,code,libelle) values (106, 'GP', 'Guadeloupe' ); +insert into llx_c_pays (rowid,code,libelle) values (107, 'GU', 'Guam' ); +insert into llx_c_pays (rowid,code,libelle) values (108, 'GT', 'Guatemala' ); +insert into llx_c_pays (rowid,code,libelle) values (109, 'GN', 'Guinée' ); +insert into llx_c_pays (rowid,code,libelle) values (110, 'GW', 'Guinée-Bissao' ); +insert into llx_c_pays (rowid,code,libelle) values (111, 'GQ', 'Guinée équatoriale'); +insert into llx_c_pays (rowid,code,libelle) values (112, 'GY', 'Guyana' ); +insert into llx_c_pays (rowid,code,libelle) values (113, 'GF', 'Guyane française'); +insert into llx_c_pays (rowid,code,libelle) values (114, 'HT', 'Haïti' ); +insert into llx_c_pays (rowid,code,libelle) values (115, 'HM', 'Iles Heard et McDonald'); +insert into llx_c_pays (rowid,code,libelle) values (116, 'VA', 'Saint-Siège (Vatican)'); +insert into llx_c_pays (rowid,code,libelle) values (117, 'HN', 'Honduras' ); +insert into llx_c_pays (rowid,code,libelle) values (118, 'HK', 'Hong Kong' ); +insert into llx_c_pays (rowid,code,libelle) values (119, 'IS', 'Islande' ); +insert into llx_c_pays (rowid,code,libelle) values (120, 'IN', 'Inde' ); +insert into llx_c_pays (rowid,code,libelle) values (121, 'ID', 'Indonésie' ); +insert into llx_c_pays (rowid,code,libelle) values (122, 'IR', 'Iran' ); +insert into llx_c_pays (rowid,code,libelle) values (123, 'IQ', 'Iraq' ); +insert into llx_c_pays (rowid,code,libelle) values (124, 'IL', 'Israël' ); +insert into llx_c_pays (rowid,code,libelle) values (125, 'JM', 'Jamaïque' ); -- diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql index 3d378c48229..70f1616f6a8 100644 --- a/mysql/migration/2.0.0-2.1.0.sql +++ b/mysql/migration/2.0.0-2.1.0.sql @@ -326,3 +326,5 @@ alter table llx_commande_fournisseur drop column fk_soc_contact; alter table llx_commande drop column fk_soc_contact; alter table llx_livraison drop column fk_soc_contact; alter table llx_propal drop column fk_soc_contact; + +alter table llx_c_pays modify libelle varchar(50) NOT NULL; \ No newline at end of file diff --git a/mysql/tables/llx_c_pays.sql b/mysql/tables/llx_c_pays.sql index 019f604d717..208f0fa9fe3 100644 --- a/mysql/tables/llx_c_pays.sql +++ b/mysql/tables/llx_c_pays.sql @@ -26,6 +26,6 @@ create table llx_c_pays rowid integer PRIMARY KEY, code varchar(2) NOT NULL, code_iso varchar(3) , - libelle varchar(25) NOT NULL, + libelle varchar(50) NOT NULL, active tinyint DEFAULT 1 NOT NULL )type=innodb;