lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3

Browse Source
This commit is contained in:
Laurent Destailleur 2013-01-09 11:45:04 +01:00
commit 4a2a8e438d
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/propal.php
View File

@ -634,7 +634,7 @@ else if ($action == "addline" && $user->rights->propal->creer)
$idprod=GETPOST('idprod', 'int'); $idprod=GETPOST('idprod', 'int');
$product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):(GETPOST('dp_desc')?GETPOST('dp_desc'):''))); $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'); $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) 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')); $description=dol_htmlcleanlastbr(GETPOST('product_desc'));
// Define vat_rate // Define vat_rate
$vat_rate=GETPOST('tva_tx'); $vat_rate=(GETPOST('tva_tx')?GETPOST('tva_tx'):0);
$vat_rate=str_replace('*','',$vat_rate); $vat_rate=str_replace('*','',$vat_rate);
$localtax1_rate=get_localtax($vat_rate,1,$object->client); $localtax1_rate=get_localtax($vat_rate,1,$object->client);
$localtax2_rate=get_localtax($vat_rate,2,$object->client); $localtax2_rate=get_localtax($vat_rate,2,$object->client);

6
htdocs/commande/fiche.php
View File

@ -537,7 +537,7 @@ else if ($action == 'addline' && $user->rights->commande->creer)
$idprod=GETPOST('idprod', 'int'); $idprod=GETPOST('idprod', 'int');
$product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):(GETPOST('dp_desc')?GETPOST('dp_desc'):''))); $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'); $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)) 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')); $date_end=dol_mktime(0, 0, 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
$description=dol_htmlcleanlastbr(GETPOST('product_desc')); $description=dol_htmlcleanlastbr(GETPOST('product_desc'));
$pu_ht=GETPOST('price_ht'); $pu_ht=GETPOST('price_ht');
$vat_rate=(GETPOST('tva_tx')?GETPOST('tva_tx'):0);
// Define info_bits // Define info_bits
$info_bits=0; $info_bits=0;
if (preg_match('/\*/', GETPOST('tva_tx'))) $info_bits |= 0x01; if (preg_match('/\*/', $vat_rate)) $info_bits |= 0x01;
// Define vat_rate // Define vat_rate
$vat_rate=GETPOST('tva_tx');
$vat_rate=str_replace('*','',$vat_rate); $vat_rate=str_replace('*','',$vat_rate);
$localtax1_rate=get_localtax($vat_rate,1,$object->client); $localtax1_rate=get_localtax($vat_rate,1,$object->client);
$localtax2_rate=get_localtax($vat_rate,2,$object->client); $localtax2_rate=get_localtax($vat_rate,2,$object->client);

6
htdocs/compta/facture.php
View File

@ -965,7 +965,7 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights-
$idprod=GETPOST('idprod', 'int'); $idprod=GETPOST('idprod', 'int');
$product_desc = (GETPOST('product_desc')?GETPOST('product_desc'):(GETPOST('np_desc')?GETPOST('np_desc'):(GETPOST('dp_desc')?GETPOST('dp_desc'):''))); $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'); $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)) 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')); $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')); $description=dol_htmlcleanlastbr(GETPOST('product_desc'));
$pu_ht=GETPOST('price_ht'); $pu_ht=GETPOST('price_ht');
$vat_rate=(GETPOST('tva_tx')?GETPOST('tva_tx'):0);
// Define info_bits // Define info_bits
$info_bits=0; $info_bits=0;
if (preg_match('/\*/', GETPOST('tva_tx'))) $info_bits |= 0x01; if (preg_match('/\*/', $vat_rate)) $info_bits |= 0x01;
// Define vat_rate // Define vat_rate
$vat_rate=$_POST['tva_tx'];
$vat_rate=str_replace('*','',$vat_rate); $vat_rate=str_replace('*','',$vat_rate);
$localtax1_rate=get_localtax($vat_rate,1,$object->client); $localtax1_rate=get_localtax($vat_rate,1,$object->client);
$localtax2_rate=get_localtax($vat_rate,2,$object->client); $localtax2_rate=get_localtax($vat_rate,2,$object->client);

2
htdocs/fichinter/fiche.php
View File

@ -653,7 +653,7 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA
} }
else // Id du contact 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'); $sendtoid = GETPOST('receiver','alpha');
} }
} }

2
htdocs/langs/ca_ES/admin.lang
View File

@ -261,7 +261,7 @@ ModuleFamilyHr=Recursos Humans
ModuleFamilyProjects=Projectes/Treball cooperatiu ModuleFamilyProjects=Projectes/Treball cooperatiu
ModuleFamilyOther=Altre ModuleFamilyOther=Altre
ModuleFamilyTechnic=Mòduls eines o Sistema ModuleFamilyTechnic=Mòduls eines o Sistema
ModuleFamilyExperimental=Mòduls experimentals (no utilitzar en producció) ModuleFamilyExperimental=Mòduls experimentals
ModuleFamilyFinancial=Mòduls financers (Comptabilitat/tresoreria) ModuleFamilyFinancial=Mòduls financers (Comptabilitat/tresoreria)
ModuleFamilyECM=Gestió Electrònica de Documents (GED) ModuleFamilyECM=Gestió Electrònica de Documents (GED)
MenuHandlers=Gestors de menú MenuHandlers=Gestors de menú

2
htdocs/langs/es_ES/admin.lang
View File

@ -262,7 +262,7 @@ ModuleFamilyHr=Recursos Humanos
ModuleFamilyProjects=Proyectos/Trabajo cooperativo ModuleFamilyProjects=Proyectos/Trabajo cooperativo
ModuleFamilyOther=Otro ModuleFamilyOther=Otro
ModuleFamilyTechnic=Módulos herramientas o Sistema 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) ModuleFamilyFinancial=Módulos financieros (Contabilidad/tesorería)
ModuleFamilyECM=Gestión Electrónica de Documentos (GED) ModuleFamilyECM=Gestión Electrónica de Documentos (GED)
MenuHandlers=Gestores menú MenuHandlers=Gestores menú

2
htdocs/langs/pt_BR/admin.lang
View File

@ -202,7 +202,7 @@ ModuleFamilyHr=Recursos Humanos
ModuleFamilyProjects=Projetos/Trabalho cooperativo ModuleFamilyProjects=Projetos/Trabalho cooperativo
ModuleFamilyOther=Outro ModuleFamilyOther=Outro
ModuleFamilyTechnic=Módulos ferramentas do sistema 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) ModuleFamilyFinancial=Módulos financeiros (Contabilidade/Tesouraria)
ModuleFamilyECM=ECM ModuleFamilyECM=ECM
MenuHandlers=Configuradores menu MenuHandlers=Configuradores menu

2
htdocs/langs/pt_PT/admin.lang
View File

@ -652,7 +652,7 @@ ModuleDisabledSoNoEvent = Módulo deficientes evento nunca criado
ModuleFamilyBase = Sistema ModuleFamilyBase = Sistema
ModuleFamilyCrm = Gestão cliente (CRM) ModuleFamilyCrm = Gestão cliente (CRM)
ModuleFamilyECM = ECM ModuleFamilyECM = ECM
ModuleFamilyExperimental = Módulos testes (não utilizar em produção) ModuleFamilyExperimental = Módulos testes
ModuleFamilyFinancial = Módulos financeiros (Contabilidade/Tesouraria) ModuleFamilyFinancial = Módulos financeiros (Contabilidade/Tesouraria)
ModuleFamilyHr = Recursos Humanos ModuleFamilyHr = Recursos Humanos
ModuleFamilyOther = Outro ModuleFamilyOther = Outro