From ae98ebc793f1c6c82383a9aec1b004f4b374feb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Tue, 8 Jan 2013 12:14:11 +0100 Subject: [PATCH 1/3] There is no need to warn the user as the picto already does --- htdocs/langs/ca_ES/admin.lang | 2 +- htdocs/langs/es_ES/admin.lang | 2 +- htdocs/langs/pt_BR/admin.lang | 2 +- htdocs/langs/pt_PT/admin.lang | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 2d21925a2db..1e285b0264a 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -261,7 +261,7 @@ ModuleFamilyHr=Recursos Humans ModuleFamilyProjects=Projectes/Treball cooperatiu ModuleFamilyOther=Altre ModuleFamilyTechnic=Mòduls eines o Sistema -ModuleFamilyExperimental=Mòduls experimentals (no utilitzar en producció) +ModuleFamilyExperimental=Mòduls experimentals ModuleFamilyFinancial=Mòduls financers (Comptabilitat/tresoreria) ModuleFamilyECM=Gestió Electrònica de Documents (GED) MenuHandlers=Gestors de menú diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 6e891ee4194..ae0e14de364 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -262,7 +262,7 @@ ModuleFamilyHr=Recursos Humanos ModuleFamilyProjects=Proyectos/Trabajo cooperativo ModuleFamilyOther=Otro ModuleFamilyTechnic=Módulos herramientas o Sistema -ModuleFamilyExperimental=Módulos experimentales (no utilizar en producción) +ModuleFamilyExperimental=Módulos experimentales ModuleFamilyFinancial=Módulos financieros (Contabilidad/tesorería) ModuleFamilyECM=Gestión Electrónica de Documentos (GED) MenuHandlers=Gestores menú diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 5d0665f7404..78a92d28d73 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -202,7 +202,7 @@ ModuleFamilyHr=Recursos Humanos ModuleFamilyProjects=Projetos/Trabalho cooperativo ModuleFamilyOther=Outro ModuleFamilyTechnic=Módulos ferramentas do sistema -ModuleFamilyExperimental=Módulos testes (não utilizar em produção) +ModuleFamilyExperimental=Módulos testes ModuleFamilyFinancial=Módulos financeiros (Contabilidade/Tesouraria) ModuleFamilyECM=ECM MenuHandlers=Configuradores menu diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 26e530e5f05..c9a0c81d20e 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -652,7 +652,7 @@ ModuleDisabledSoNoEvent = Módulo deficientes evento nunca criado ModuleFamilyBase = Sistema ModuleFamilyCrm = Gestão cliente (CRM) ModuleFamilyECM = ECM -ModuleFamilyExperimental = Módulos testes (não utilizar em produção) +ModuleFamilyExperimental = Módulos testes ModuleFamilyFinancial = Módulos financeiros (Contabilidade/Tesouraria) ModuleFamilyHr = Recursos Humanos ModuleFamilyOther = Outro From 1a3cecfae5dfead52ed0a8d0c840fc0315370442 Mon Sep 17 00:00:00 2001 From: jfefe Date: Wed, 9 Jan 2013 06:30:27 +0100 Subject: [PATCH 2/3] Fix bug #666 : error when sending intervention card --- htdocs/fichinter/fiche.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 1f27c594908..1c8eb84b40f 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -653,7 +653,7 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA } else // Id du contact { - $sendto = $object->client->contact_get_email(GETPOST('receiver','alpha')); + $sendto = $object->client->contact_get_property(GETPOST('receiver'),'email'); $sendtoid = GETPOST('receiver','alpha'); } } From a7ed40b10df517721caf60669664eed241dc9b26 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 9 Jan 2013 10:40:36 +0100 Subject: [PATCH 3/3] Fix: empty value if combobox disabled --- htdocs/comm/propal.php | 4 ++-- htdocs/commande/fiche.php | 6 +++--- htdocs/compta/facture.php | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index a8c268ccfee..86a7c6526ba 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -634,7 +634,7 @@ else if ($action == "addline" && $user->rights->propal->creer) $idprod=GETPOST('idprod', 'int'); $product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):(GETPOST('dp_desc')?GETPOST('dp_desc'):''))); $price_ht = GETPOST('price_ht'); - $tva_tx = GETPOST('tva_tx'); + $tva_tx = (GETPOST('tva_tx')?GETPOST('tva_tx'):0); if (empty($idprod) && GETPOST('type') < 0) { @@ -844,7 +844,7 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa $description=dol_htmlcleanlastbr(GETPOST('product_desc')); // Define vat_rate - $vat_rate=GETPOST('tva_tx'); + $vat_rate=(GETPOST('tva_tx')?GETPOST('tva_tx'):0); $vat_rate=str_replace('*','',$vat_rate); $localtax1_rate=get_localtax($vat_rate,1,$object->client); $localtax2_rate=get_localtax($vat_rate,2,$object->client); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 167f4c53268..a1e9acf3607 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -537,7 +537,7 @@ else if ($action == 'addline' && $user->rights->commande->creer) $idprod=GETPOST('idprod', 'int'); $product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):(GETPOST('dp_desc')?GETPOST('dp_desc'):''))); $price_ht = GETPOST('price_ht'); - $tva_tx = GETPOST('tva_tx'); + $tva_tx = (GETPOST('tva_tx')?GETPOST('tva_tx'):0); if ((empty($idprod) || GETPOST('usenewaddlineform')) && ($price_ht < 0) && (GETPOST('qty') < 0)) { @@ -767,13 +767,13 @@ else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST(' $date_end=dol_mktime(0, 0, 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear')); $description=dol_htmlcleanlastbr(GETPOST('product_desc')); $pu_ht=GETPOST('price_ht'); + $vat_rate=(GETPOST('tva_tx')?GETPOST('tva_tx'):0); // Define info_bits $info_bits=0; - if (preg_match('/\*/', GETPOST('tva_tx'))) $info_bits |= 0x01; + if (preg_match('/\*/', $vat_rate)) $info_bits |= 0x01; // Define vat_rate - $vat_rate=GETPOST('tva_tx'); $vat_rate=str_replace('*','',$vat_rate); $localtax1_rate=get_localtax($vat_rate,1,$object->client); $localtax2_rate=get_localtax($vat_rate,2,$object->client); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index bd1e21157de..6c5a865d473 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -965,7 +965,7 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights- $idprod=GETPOST('idprod', 'int'); $product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):(GETPOST('dp_desc')?GETPOST('dp_desc'):''))); $price_ht = GETPOST('price_ht'); - $tva_tx = GETPOST('tva_tx'); + $tva_tx=(GETPOST('tva_tx')?GETPOST('tva_tx'):0); if ((empty($idprod) || GETPOST('usenewaddlineform')) && ($price_ht < 0) && (GETPOST('qty') < 0)) { @@ -1220,13 +1220,13 @@ else if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['sa $date_end=dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear')); $description=dol_htmlcleanlastbr(GETPOST('product_desc')); $pu_ht=GETPOST('price_ht'); + $vat_rate=(GETPOST('tva_tx')?GETPOST('tva_tx'):0); // Define info_bits $info_bits=0; - if (preg_match('/\*/', GETPOST('tva_tx'))) $info_bits |= 0x01; + if (preg_match('/\*/', $vat_rate)) $info_bits |= 0x01; // Define vat_rate - $vat_rate=$_POST['tva_tx']; $vat_rate=str_replace('*','',$vat_rate); $localtax1_rate=get_localtax($vat_rate,1,$object->client); $localtax2_rate=get_localtax($vat_rate,2,$object->client);