diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php index d494b5777f2..314a4641f12 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_card.php +++ b/htdocs/compta/cashcontrol/cashcontrol_card.php @@ -228,6 +228,7 @@ if ($action=="create" || $action=="start") $initialbalanceforterminal=array(); $theoricalamountforterminal=array(); + $theoricalnbofinvoiceforterminal=array(); if (GETPOST('posnumber','alpha') != '' && GETPOST('posnumber','alpha') != '' && GETPOST('posnumber','alpha') != '-1') { @@ -269,8 +270,7 @@ if ($action=="create" || $action=="start") { /*$sql = "SELECT SUM(amount) as total FROM ".MAIN_DB_PREFIX."bank"; $sql.= " WHERE fk_account = ".$bankid;*/ - - $sql = "SELECT SUM(pf.amount) as total"; + $sql = "SELECT SUM(pf.amount) as total, COUNT(*) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as cp"; $sql.= " WHERE pf.fk_facture = f.rowid AND p.rowid = pf.fk_paiement AND cp.id = p.fk_paiement"; $sql.= " AND f.module_source = '".$db->escape($posmodule)."'"; @@ -299,6 +299,7 @@ if ($action=="create" || $action=="start") if ($obj) { $theoricalamountforterminal[$terminalid][$key] = price2num($theoricalamountforterminal[$terminalid][$key] + $obj->total); + $theoricalnbofinvoiceforterminal[$terminalid][$key] = $obj->nb; } } else dol_print_error($db); @@ -415,6 +416,24 @@ if ($action=="create" || $action=="start") print ''; print ''; + print ''; + // Initial amount + print ''.$langs->trans("NbOfInvoices").''; + print ''; + print ''; + // Amount per payment type + $i=0; + foreach($arrayofpaymentmode as $key => $val) + { + print ''; + print $theoricalnbofinvoiceforterminal[$terminalid][$key]; + print ''; + $i++; + } + // Save + print ''; + print ''; + print ''; // Initial amount print ''.$langs->trans("TheoricalAmount").''; diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php index 219a8d987af..11c14218440 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_list.php +++ b/htdocs/compta/cashcontrol/cashcontrol_list.php @@ -18,7 +18,7 @@ /** * \file cashcontrol_list.php - * \ingroup bank + * \ingroup cashdesk|takepos * \brief List page for cashcontrol */ diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php index 071be33fd1f..d0a10ec94da 100644 --- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php +++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php @@ -20,7 +20,7 @@ /** * \file cashcontrol/class/cashcontrol.class.php - * \ingroup bank + * \ingroup cashdesk|takepos * \brief This file is CRUD class file (Create/Read/Update/Delete) for cash fence table */ diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php index a2187e3b344..749d112f711 100644 --- a/htdocs/compta/cashcontrol/report.php +++ b/htdocs/compta/cashcontrol/report.php @@ -25,13 +25,14 @@ /** * \file htdocs/compta/cashcontrol/report.php - * \ingroup pos + * \ingroup cashdesk|takepos * \brief List of bank transactions */ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $id = GETPOST('id','int'); @@ -94,9 +95,9 @@ $sql.=" OR b.fk_account=".$conf->global->CASHDESK_ID_BANKACCOUNT_CB; $sql.=" OR b.fk_account=".$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE; $sql.=")"; */ -$sql = "SELECT f.facnumber, pf.amount as total, cp.code"; -$sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as cp"; -$sql.= " WHERE pf.fk_facture = f.rowid AND p.rowid = pf.fk_paiement AND cp.id = p.fk_paiement"; +$sql = "SELECT f.rowid as facid, f.facnumber, f.datef as do, pf.amount as amount, b.fk_account as bankid, cp.code"; +$sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as cp, ".MAIN_DB_PREFIX."bank as b"; +$sql.= " WHERE pf.fk_facture = f.rowid AND p.rowid = pf.fk_paiement AND cp.id = p.fk_paiement AND p.fk_bank = b.rowid"; $sql.= " AND f.module_source = '".$db->escape($posmodule)."'"; $sql.= " AND f.pos_source = '".$db->escape($terminalid)."'"; $sql.= " AND f.paye = 1"; @@ -125,6 +126,12 @@ if ($resql) else print $langs->trans("CashControl")." - ".$langs->trans("Draft"); print "
".$langs->trans("DateCreationShort").": ".dol_print_date($cashcontrol->date_creation, 'dayhour').""; + $invoicetmp = new Facture($db); + + + print "

"; + print $langs->trans("InitialBankBalance").' - '.$langs->trans("Cash")." : ".price($cashcontrol->opening); + print "

"; print '
'; print ''."\n"; @@ -138,55 +145,17 @@ if ($resql) print_liste_field_titre($arrayfields['b.credit']['label'],$_SERVER['PHP_SELF'],'b.amount','',$param,'align="right"',$sortfield,$sortorder); print "\n"; - $balance = 0; // For balance - $balancecalculated = false; $posconciliatecol = 0; // Loop on each record $sign = 1; - $first='yes'; + $cash=$bank=$cheque=$other=0; $totalarray=array(); while ($i < min($num,$limit)) { $objp = $db->fetch_object($resql); - // If we are in a situation where we need/can show balance, we calculate the start of balance - if (! $balancecalculated && (! empty($arrayfields['balancebefore']['checked']) || ! empty($arrayfields['balance']['checked'])) && $mode_balance_ok) - { - if (! $account) - { - dol_print_error('', 'account is not defined but $mode_balance_ok is true'); - exit; - } - - // Loop on each record before - $sign = 1; - $i = 0; - $sqlforbalance='SELECT SUM(b.amount) as balance'; - $sqlforbalance.= " FROM "; - $sqlforbalance.= " ".MAIN_DB_PREFIX."bank_account as ba,"; - $sqlforbalance.= " ".MAIN_DB_PREFIX."bank as b"; - $sqlforbalance.= " WHERE b.fk_account = ba.rowid"; - $sqlforbalance.= " AND ba.entity IN (".getEntity('bank_account').")"; - $sqlforbalance.= " AND b.fk_account = ".$account; - $sqlforbalance.= " AND (b.datev < '" . $db->idate($db->jdate($objp->dv)) . "' OR (b.datev = '" . $db->idate($db->jdate($objp->dv)) . "' AND (b.dateo < '".$db->idate($db->jdate($objp->do))."' OR (b.dateo = '".$db->idate($db->jdate($objp->do))."' AND b.rowid < ".$objp->rowid."))))"; - $resqlforbalance = $db->query($sqlforbalance); - if ($resqlforbalance) - { - $objforbalance = $db->fetch_object($resqlforbalance); - if ($objforbalance) - { - $balance = $objforbalance->balance; - } - } - else dol_print_error($db); - - $balancecalculated=true; - } - - $balance = price2num($balance + ($sign * $objp->amount),'MT'); - if (empty($cachebankaccount[$objp->bankid])) { $bankaccounttmp = new Account($db); @@ -198,22 +167,22 @@ if ($resql) { $bankaccount = $cachebankaccount[$objp->bankid]; } - print ''; - if ($first == "yes") + /*if ($first == "yes") { print ''; print ''; print ''; print ''; $first = "no"; - } + }*/ print ''; // Ref print ''; if (! $i) $totalarray['nbfield']++; @@ -227,9 +196,10 @@ if ($resql) // Bank account print '\n"; if (! $i) $totalarray['nbfield']++; @@ -287,6 +257,7 @@ if ($resql) print $langs->trans("Cash").": ".price($cash)."

"; print $langs->trans("PaymentTypeCB").": ".price($bank)."

"; print $langs->trans("PaymentTypeCHQ").": ".price($cheque)."

"; + if ($other) print $langs->trans("Other").": ".price($other)."

"; print ""; //save totals to DB diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index a8784e1e87e..ca5dcccf12e 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4481,37 +4481,49 @@ function price2num($amount,$rounding='',$alreadysqlnb=0) * Output a dimension with best unit * * @param float $dimension Dimension - * @param int $unit Unit of dimension (0, -3, ...) + * @param int $unit Unit of dimension (Example: 0=kg, -3=g, 98=ounce, 99=pound, ...) * @param string $type 'weight', 'volume', ... * @param Translate $outputlangs Translate language object * @param int $round -1 = non rounding, x = number of decimal - * @param string $forceunitoutput 'no' or numeric (-3, -6, ...) compared to $unit + * @param string $forceunitoutput 'no' or numeric (-3, -6, ...) compared to $unit (In most case, this value is value defined into $conf->global->MAIN_WEIGHT_DEFAULT_UNIT) * @return string String to show dimensions */ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round=-1, $forceunitoutput='no') { require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; - if (($forceunitoutput == 'no' && $dimension < 1/10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6)) + if (($forceunitoutput == 'no' && $dimension < 1/10000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -6)) { $dimension = $dimension * 1000000; $unit = $unit - 6; } - elseif (($forceunitoutput == 'no' && $dimension < 1/10) || (is_numeric($forceunitoutput) && $forceunitoutput == -3)) + elseif (($forceunitoutput == 'no' && $dimension < 1/10 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -3)) { $dimension = $dimension * 1000; $unit = $unit - 3; } - elseif (($forceunitoutput == 'no' && $dimension > 100000000) || (is_numeric($forceunitoutput) && $forceunitoutput == 6)) + elseif (($forceunitoutput == 'no' && $dimension > 100000000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 6)) { $dimension = $dimension / 1000000; $unit = $unit + 6; } - elseif (($forceunitoutput == 'no' && $dimension > 100000) || (is_numeric($forceunitoutput) && $forceunitoutput == 3)) + elseif (($forceunitoutput == 'no' && $dimension > 100000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 3)) { $dimension = $dimension / 1000; $unit = $unit + 3; } + // Special case when we want output unit into pound or ounce + /* TODO + if ($unit < 90 && $type == 'weight' && is_numeric($forceunitoutput) && (($forceunitoutput == 98) || ($forceunitoutput == 99)) + { + $dimension = // convert dimension from standard unit into ounce or pound + $unit = $forceunitoutput; + } + if ($unit > 90 && $type == 'weight' && is_numeric($forceunitoutput) && $forceunitoutput < 90) + { + $dimension = // convert dimension from standard unit into ounce or pound + $unit = $forceunitoutput; + }*/ $ret=price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string($unit, $type); diff --git a/htdocs/langs/de_AT/agenda.lang b/htdocs/langs/de_AT/agenda.lang index 54235c2b65e..978befe9040 100644 --- a/htdocs/langs/de_AT/agenda.lang +++ b/htdocs/langs/de_AT/agenda.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - agenda Actions=Termine LocalAgenda=interner Kalender -Events=Termine EventsNb=Anzahl der Termine ListOfActions=Terminliste EventOnFullDay=Terminliste diff --git a/htdocs/langs/de_AT/banks.lang b/htdocs/langs/de_AT/banks.lang index a56f7dff964..78f8663fd90 100644 --- a/htdocs/langs/de_AT/banks.lang +++ b/htdocs/langs/de_AT/banks.lang @@ -23,7 +23,6 @@ BankAccountDomiciliation=Konto-Adresse LabelBankCashAccount=Bank- oder Kassabezeichnung BankType0=Sparkonto\n BankType2=Kassa -Account=Kontonummer IncludeClosedAccount=Geschlossene konten miteinbeziehen StatusAccountClosed=geschlossen WithdrawalPayment=Widerrufsrecht Zahlung diff --git a/htdocs/langs/de_AT/categories.lang b/htdocs/langs/de_AT/categories.lang index 39e26fbf16b..6daa1c3efb2 100644 --- a/htdocs/langs/de_AT/categories.lang +++ b/htdocs/langs/de_AT/categories.lang @@ -1,3 +1,2 @@ # Dolibarr language file - Source file is en_US - categories CategoryExistsAtSameLevel=Gleichnamige Kategorie auf diesem Level gefunden -DeleteFromCat=Aus dieser Kategorie entfernen diff --git a/htdocs/langs/de_AT/products.lang b/htdocs/langs/de_AT/products.lang index 9b23a8fba00..3957c4a86c0 100644 --- a/htdocs/langs/de_AT/products.lang +++ b/htdocs/langs/de_AT/products.lang @@ -19,7 +19,6 @@ SellingPriceHT=Verkaufspreis (netto) SellingPriceTTC=Verkaufspreis (brutto) MinPrice=Preisuntergrenze CantBeLessThanMinPrice=Der aktuelle Verkaufspreis unterschreitet die Preisuntergrenze dieses Produkts (%s ohne MwSt.) -ContractStatusClosed=geschlossen NoMatchFound=Keine Treffer gefunden ProductAssociationList=Liste der verknüpften Produkte/Services: Name des Produkts/des Service (Stückzahl) DeleteProduct=Produkt/Service löschen diff --git a/htdocs/langs/de_CH/agenda.lang b/htdocs/langs/de_CH/agenda.lang index e2a0bfdcccd..07ad040a915 100644 --- a/htdocs/langs/de_CH/agenda.lang +++ b/htdocs/langs/de_CH/agenda.lang @@ -10,7 +10,6 @@ AgendaAutoActionDesc=Definieren Sie hier Ereignisse für die Dolibarr einen Kale ShipmentValidatedInDolibarr=Versand %s in Dolibarr geprüft OrderCanceledInDolibarr=Auftrag storniert %s ShippingSentByEMail=Lieferung %s per Email versendet -InterventionSentByEMail=Intervention %s gesendet via E-Mail AgendaHideBirthdayEvents=Geburtstage von Kontakten verstecken DateActionBegin=Beginnzeit des Ereignis DateStartPlusOne=Anfangsdatum + 1 Stunde diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 58bf59bd37c..ce9940bccde 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -49,3 +49,4 @@ AmountAtEndOfPeriod=Amount at end of period (day, month or year) TheoricalAmount=Theorical amount RealAmount=Real amount CashFenceDone=Cash fence done for the period +NbOfInvoices=Nb of invoices \ No newline at end of file diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang index 27c8e300d02..a40e99a796c 100644 --- a/htdocs/langs/es_CL/admin.lang +++ b/htdocs/langs/es_CL/admin.lang @@ -604,7 +604,6 @@ PermanentLeftSearchForm=Formulario de búsqueda permanente en el menú de la izq EnableMultilangInterface=Habilitar interfaz multilingüe EnableShowLogo=Mostrar logo en el menú de la izquierda CompanyInfo=Empresa / Organización -CompanyName=Nombre CompanyCurrency=Moneda principal DoNotSuggestPaymentMode=No sugiera NoActiveBankAccountDefined=No se definió una cuenta bancaria activa @@ -969,7 +968,6 @@ Buy=Comprar Sell=Vender InvoiceDateUsed=Fecha de la factura utilizada YourCompanyDoesNotUseVAT=Su empresa ha sido definida para no usar el IVA (Inicio - Configuración - Compañía / Organización), por lo que no hay opciones de IVA para configurar. -AccountancyCode=Código de contabilidad AccountancyCodeSell=Cuenta de venta. código AccountancyCodeBuy=Cuenta de compra código AgendaSetup=Configuración del módulo de eventos y agenda diff --git a/htdocs/langs/es_CL/agenda.lang b/htdocs/langs/es_CL/agenda.lang index e77382bd868..e16e293a8d9 100644 --- a/htdocs/langs/es_CL/agenda.lang +++ b/htdocs/langs/es_CL/agenda.lang @@ -52,7 +52,6 @@ SupplierOrderSentByEMail=Pedido del proveedor %s enviado por EMail SupplierInvoiceSentByEMail=Factura del proveedor %s enviado por EMail ShippingSentByEMail=Envío %s enviado por EMail ShippingValidated=Envío %s validado -InterventionSentByEMail=Intervención %s enviado por EMail ProposalDeleted=Propuesta eliminada OrderDeleted=Orden eliminada InvoiceDeleted=Factura borrada diff --git a/htdocs/langs/es_CL/banks.lang b/htdocs/langs/es_CL/banks.lang index 73d6e9eae94..cd9413f895f 100644 --- a/htdocs/langs/es_CL/banks.lang +++ b/htdocs/langs/es_CL/banks.lang @@ -65,7 +65,6 @@ AddBankRecord=Añadir entrada AddBankRecordLong=Agregar entrada manualmente DateConciliating=Fecha de conciliación BankLineConciliated=Entrada reconciliada -CustomerInvoicePayment=Pago del Cliente SupplierInvoicePayment=Pago del proveedor WithdrawalPayment=Pago de retiros SocialContributionPayment=Pago de impuestos sociales/fiscales diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang index 9c34e11775f..e1da06b40d4 100644 --- a/htdocs/langs/es_CL/bills.lang +++ b/htdocs/langs/es_CL/bills.lang @@ -230,8 +230,6 @@ AddCreditNote=Crear nota de crédito ShowDiscount=Mostrar descuento ShowReduc=Muestra la deducción GlobalDiscount=Descuento global -CreditNote=Nota de crédito -CreditNotes=Notas de crédito Deposit=Pago inicial Deposits=Bajo pago DiscountFromCreditNote=Descuento de la nota de crédito %s @@ -256,7 +254,6 @@ IdSocialContribution=Identificación de pago de impuesto social / fiscal PaymentId=Identificación de pago PaymentRef=Pago ref. InvoiceId=Id de factura -InvoiceRef=Factura ref. InvoiceDateCreation=Fecha de creación de la factura InvoiceStatus=Estado de la factura InvoiceNote=Nota de factura diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang index 249ab6e6b41..ad25154bf97 100644 --- a/htdocs/langs/es_CL/companies.lang +++ b/htdocs/langs/es_CL/companies.lang @@ -83,7 +83,6 @@ VATIntraShort=Identificación del impuesto VATIntraSyntaxIsValid=La sintaxis es valida VATReturn=Devolución del IVA ProspectCustomer=Prospecto/Cliente -Prospect=Prospectar CustomerCard=Tarjeta Cliente CustomerRelativeDiscount=Descuento relativo del cliente SupplierRelativeDiscount=Descuento relativo del vendedor diff --git a/htdocs/langs/es_CL/orders.lang b/htdocs/langs/es_CL/orders.lang index a151781cc48..d83a1561aa4 100644 --- a/htdocs/langs/es_CL/orders.lang +++ b/htdocs/langs/es_CL/orders.lang @@ -56,7 +56,6 @@ AddToDraftOrders=Añadir a orden de borrador OrdersOpened=Órdenes para procesar NoDraftOrders=No hay borradores de pedidos NoOrder=Sin orden -NoSupplierOrder=Sin orden de compra LastOrders=Últimas %s pedidos de clientes LastCustomerOrders=Últimas %s pedidos de clientes LastSupplierOrders=Últimas %s órdenes de compra diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang index 2bc8138e1b8..a816959e177 100644 --- a/htdocs/langs/es_CL/projects.lang +++ b/htdocs/langs/es_CL/projects.lang @@ -22,7 +22,6 @@ ProjectCategories=Etiquetas / categorías de proyecto ConfirmDeleteAProject=¿Seguro que quieres eliminar este proyecto? ConfirmDeleteATask=¿Seguro que quieres eliminar esta tarea? ShowProject=Mostrar proyecto -ShowTask=Mostrar tarea SetProject=Establecer proyecto NoProject=Ningún proyecto definido o propiedad TimeSpentByYou=Tiempo pasado por ti diff --git a/htdocs/langs/es_CL/stocks.lang b/htdocs/langs/es_CL/stocks.lang index 1922b6ff759..3ec3de75e9f 100644 --- a/htdocs/langs/es_CL/stocks.lang +++ b/htdocs/langs/es_CL/stocks.lang @@ -13,7 +13,6 @@ CancelSending=Cancelar el envío StocksByLotSerial=Stock por lote/serie ErrorWarehouseRefRequired=Se requiere el nombre de referencia del almacén ListOfWarehouses=Lista de almacenes -ListOfStockMovements=Lista de movimientos de stock ListOfInventories=Lista de inventarios MovementId=Identificación del movimiento StockMovementForId=ID de movimiento %d diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang index b2e59fdd9a9..a652afe7502 100644 --- a/htdocs/langs/es_CO/admin.lang +++ b/htdocs/langs/es_CO/admin.lang @@ -68,4 +68,3 @@ CurrentHour=Hora del PHP (servidor) Position=Puesto DictionaryCanton=Departamento LTRate=Tipo -CompanyName=Nombre diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang index 49489213a95..33d57ef30e5 100644 --- a/htdocs/langs/es_MX/admin.lang +++ b/htdocs/langs/es_MX/admin.lang @@ -125,7 +125,6 @@ Module770Name=Reporte de gastos DictionaryCanton=Estado/Provincia DictionaryAccountancyJournal=Diarios de contabilidad Upgrade=Actualizar -CompanyName=Nombre LDAPFieldFirstName=Nombre(s) AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda ConfFileMustContainCustom=Instalar o construir un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio %s . Para que este directorio sea procesado por Dolibarr, debe configurar su conf/conf.php para agregar las 2 líneas de directiva: $dolibarr_main_url_root_alt='/custom';
$dolibarr_main_document_root_alt='%s/custom'; diff --git a/htdocs/langs/es_MX/banks.lang b/htdocs/langs/es_MX/banks.lang index 37a09ed7694..c2ea66eabab 100644 --- a/htdocs/langs/es_MX/banks.lang +++ b/htdocs/langs/es_MX/banks.lang @@ -46,7 +46,6 @@ AddBankRecord=Añadir entrada AddBankRecordLong=Añadir entrada manualmente DateConciliating=Fecha de conciliación BankLineConciliated=Entrada reconciliada -CustomerInvoicePayment=Pago de cliente WithdrawalPayment=Pago de retiro SocialContributionPayment=Pago de impuesto social/fiscal TransferFromToDone=La transferencia de %s hacia %s de %s %s ha sido registrada. diff --git a/htdocs/langs/es_MX/bills.lang b/htdocs/langs/es_MX/bills.lang index bc4047a4106..1bcc2895f3f 100644 --- a/htdocs/langs/es_MX/bills.lang +++ b/htdocs/langs/es_MX/bills.lang @@ -45,7 +45,6 @@ BillTo=Hacia StandingOrder=Orden de domiciliación bancaria SupplierBillsToPay=Facturas de proveedores no pagadas CustomerBillsUnpaid=Facturas de clientes no pagadas -CreditNote=Nota de crédito ReasonDiscount=Razón PaymentTypeCB=Tarjeta de crédito PaymentTypeShortCB=Tarjeta de crédito diff --git a/htdocs/langs/es_MX/products.lang b/htdocs/langs/es_MX/products.lang index 020764ca7f6..7577107fe4e 100644 --- a/htdocs/langs/es_MX/products.lang +++ b/htdocs/langs/es_MX/products.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - products ProductId=ID de producto / servicio CantBeLessThanMinPrice=El precio de venta no puede ser inferior al mínimo permitido para este producto (%s sin impuestos). Este mensaje también puede aparecer si escribe un descuento demasiado importante. -ContractStatusClosed=Cerrada ErrorProductBadRefOrLabel=Valor incorrecto para referencia o etiqueta. ProductsAndServicesArea=Área de productos y servicios ProductsArea=Área de producto diff --git a/htdocs/langs/es_MX/stocks.lang b/htdocs/langs/es_MX/stocks.lang index 07ee78f0dea..6b99216feac 100644 --- a/htdocs/langs/es_MX/stocks.lang +++ b/htdocs/langs/es_MX/stocks.lang @@ -1,5 +1,4 @@ # Dolibarr language file - Source file is en_US - stocks -Stock=stock Location=Ubicación inventoryEdit=Editar inventoryDeleteLine=Borrar línea diff --git a/htdocs/langs/fr_BE/bills.lang b/htdocs/langs/fr_BE/bills.lang index 8fe53169113..bb84bd2017d 100644 --- a/htdocs/langs/fr_BE/bills.lang +++ b/htdocs/langs/fr_BE/bills.lang @@ -16,7 +16,6 @@ UsedByInvoice=Utilisée pour payer la facture %s PredefinedInvoices=Factures prédéfinies SupplierBills=factures fournisseurs Payment=Paiement -Payments=Paiements DeletePayment=Supprimer paiement SupplierPayments=Paiements fournisseurs ReceivedPayments=Paiements reçus @@ -43,8 +42,6 @@ EscompteOfferedShort=Ristourne Discounts=Ristournes AddDiscount=Créer ristourne ShowDiscount=Visualiser le crédit -CreditNote=Note de crédit -CreditNotes=Notes de crédit DiscountFromCreditNote=Remise issue de la note de crédit %s PaymentTypeLIQ=En espèces PaymentTypeShortLIQ=En espèces diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang index 0a4118bdacf..a66102ceb59 100644 --- a/htdocs/langs/fr_CA/admin.lang +++ b/htdocs/langs/fr_CA/admin.lang @@ -201,7 +201,6 @@ UseUnits=Définir une unité de mesure pour la quantité lors de la commande, l' IsNotADir=n'est pas un répertoire BarcodeDescDATAMATRIX=Codebarre de type Datamatrix BarcodeDescQRCODE=Codebarre de type QRcode -WithdrawalsSetup=Configuration du module Ordres de paiement de débit direct SendingsAbility=Fiches d'expédition de soutien pour les livraisons aux clients FCKeditorForMail=Création / édition WYSIWIG pour tous les courriers (sauf Outils-> eMailing) NotTopTreeMenuPersonalized=Menus personnalisés non liés à une entrée de menu supérieure diff --git a/htdocs/langs/fr_CA/agenda.lang b/htdocs/langs/fr_CA/agenda.lang index 98f60f4c0c1..a485f8ab934 100644 --- a/htdocs/langs/fr_CA/agenda.lang +++ b/htdocs/langs/fr_CA/agenda.lang @@ -14,7 +14,6 @@ ShipmentDeletedInDolibarr=Envoi %s supprimé OrderCreatedInDolibarr=L'ordre %s a été créé OrderDeliveredInDolibarr=Commande %s classée Délivrée ShippingSentByEMail=Bon expédition %s envoyé par EMail -InterventionSentByEMail=Intervention %s envoyée par EMail ProposalDeleted=Proposition supprimée AgendaModelModule=Modèles de document pour l'événement AgendaShowBirthdayEvents=Afficher les dates d'anniversaire des contacts diff --git a/htdocs/langs/fr_CA/exports.lang b/htdocs/langs/fr_CA/exports.lang index d1b114f8f3d..33f87265ee6 100644 --- a/htdocs/langs/fr_CA/exports.lang +++ b/htdocs/langs/fr_CA/exports.lang @@ -1,9 +1,7 @@ # Dolibarr language file - Source file is en_US - exports -ExportsArea=Zone d'exportation ImportArea=Zone d'importation NewExport=Nouvelle exportation NewImport=Nouvelle importation -ExportableDatas=Ensemble de données exportables ImportableDatas=Ensemble de données Importable SelectExportDataSet=Choisissez l'ensemble de données que vous souhaitez exporter ... SelectImportDataSet=Choisissez l'ensemble de données que vous souhaitez importer ... @@ -34,7 +32,6 @@ FormatedExportDesc3=Lorsque les données à exporter sont sélectionnées, vous Sheet=Drap NoImportableData=Aucune donnée importable (aucun module avec des définitions permettant d'importer des données) SQLUsedForExport=Requête SQL utilisée pour créer un fichier d'exportation -LineId=Id de ligne LineLabel=Étiquette de ligne LineDescription=Description de la ligne LineUnitPrice=Prix ​​unitaire de la ligne diff --git a/htdocs/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang index 02bd444e0e5..e9cba99c00d 100644 --- a/htdocs/langs/fr_CA/products.lang +++ b/htdocs/langs/fr_CA/products.lang @@ -48,7 +48,6 @@ SoldAmount=Montant vendu PurchasedAmount=Montant acheté MinPrice=Min. prix de vente CantBeLessThanMinPrice=Le prix de vente ne peut être inférieur au minimum autorisé pour ce produit (%s sans taxes). Ce message peut également apparaître si vous tapez une remise trop importante. -ContractStatusClosed=Fermées ErrorProductBadRefOrLabel=Valeur incorrecte pour référence ou étiquette. ErrorProductClone=Il y a eu un problème en essayant de cloner le produit ou le service. SupplierRef=Produit ref. diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang index 1da2bce179f..f588b04a751 100644 --- a/htdocs/langs/fr_FR/cashdesk.lang +++ b/htdocs/langs/fr_FR/cashdesk.lang @@ -42,6 +42,10 @@ Place=Marché TakeposConnectorNecesary='Connecteur TakePOS' requis OrderPrinters=Commande imprimantes SearchProduct=Rechercher un produit -Receipt=Le reçu +Receipt=Reçu Header=Entête Footer=Bas de page +AmountAtEndOfPeriod=Montant en fin de période (jour, mois ou année) +TheoricalAmount=Montant théorique +RealAmount=Montant réel +CashFenceDone=Clôture de caisse faite pour la période diff --git a/htdocs/langs/nl_BE/categories.lang b/htdocs/langs/nl_BE/categories.lang index 02743f2348b..fbe021eae9e 100644 --- a/htdocs/langs/nl_BE/categories.lang +++ b/htdocs/langs/nl_BE/categories.lang @@ -62,7 +62,6 @@ CatSupLinks=Koppelingen tussen leveranciers en tags/categorieën CatCusLinks=Koppelingen tussen klanten/prospects en tags/categorieën CatProdLinks=Koppelingen tussen producten/diensten en tags/categorieën CatProJectLinks=Koppelingen tussen projecten en tags/categorieën -DeleteFromCat=Verwijderen uit tags/categorie CategoriesSetup=Tags/categorieën instellingen CategorieRecursiv=Automatische koppeling met bovenliggende tag/categorie CategorieRecursivHelp=Indien geactiveerd zal het product ook gekoppeld worden met de bovenliggende categorie wanneer een subcategorie toegevoegd wordt. diff --git a/htdocs/langs/nl_BE/stocks.lang b/htdocs/langs/nl_BE/stocks.lang index f61acb5d25d..4a966b06687 100644 --- a/htdocs/langs/nl_BE/stocks.lang +++ b/htdocs/langs/nl_BE/stocks.lang @@ -1,6 +1,4 @@ # Dolibarr language file - Source file is en_US - stocks -Movements=Mutaties -ListOfStockMovements=Voorraadmutatielijst SelectProductInAndOutWareHouse=Kies een product, een aantal, een van-magazijn, een naar-magazijn, en klik "%s". Als alle nodige bewegingen zijn aangeduid, klik op "%s". inventoryDraft=Actief inventoryConfirmCreate=Aanmaken diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 5dc6f379ef4..580099e2a95 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -700,7 +700,6 @@ PermanentLeftSearchForm=Formulário permanente de pesquisa no menu esquerdo DefaultLanguage=Idioma padrão a ser usado (código do idioma) EnableMultilangInterface=Habilitar interface multi-idioma EnableShowLogo=Exibir logo no menu esquerdo -CompanyName=Nome CompanyAddress=Endereço CompanyZip=CEP CompanyTown=Município @@ -992,7 +991,6 @@ BarcodeDescQRCODE=Código de barras do tipo QR code GenbarcodeLocation=Ferramenta em linha de comando para geração de código de barras (usado pelo mecanismo interno para alguns tipos de código de barras) BarcodeInternalEngine=Mecanismo interno BarCodeNumberManager=Gerente de auto definir números de código de barras -WithdrawalsSetup=Configuração do módulo de pedidos com pagamento por Débito direto ExternalRSSSetup=Configurações importantes de RSS externo NewRSS=Novo RSS Feed RSSUrl=URL de RSS @@ -1050,7 +1048,6 @@ SupposedToBeInvoiceDate=Data usada na fatura Buy=Compra Sell=Venda InvoiceDateUsed=Data usada na fatura -AccountancyCode=Código na Contabilidade AccountancyCodeSell=Código de contas de vendas AccountancyCodeBuy=Código de contas de compras AgendaSetup=Configurações do módulo de eventos e agenda diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang index 48f1162bc98..52656c887d0 100644 --- a/htdocs/langs/pt_BR/agenda.lang +++ b/htdocs/langs/pt_BR/agenda.lang @@ -55,7 +55,6 @@ SupplierOrderSentByEMail=Pedido de fornecedor %s enviado por e-mail SupplierInvoiceSentByEMail=Fatura de fornecedor %s enviado por e-mail ShippingSentByEMail=Frete %s enviado por e-mail ShippingValidated=Envio %s validado -InterventionSentByEMail=Intervenção %s enviado por e-mail ProposalDeleted=Proposta excluída OrderDeleted=Pedido excluído InvoiceDeleted=Fatura excluída diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang index a4e10bb560e..ca1d2ef00aa 100644 --- a/htdocs/langs/pt_BR/bills.lang +++ b/htdocs/langs/pt_BR/bills.lang @@ -218,8 +218,6 @@ EditGlobalDiscounts=Editar desconto fixo ShowDiscount=Mostrar desconto ShowReduc=Mostrar o desconto GlobalDiscount=Desconto global -CreditNote=Nota de crédito -CreditNotes=Notas de crédito Deposit=Depósito Deposits=Depósitos DiscountFromCreditNote=Desconto de nota de crédito %s @@ -234,7 +232,6 @@ IdSocialContribution=ID contribuição social PaymentId=ID pagamento PaymentRef=Ref. do pagamento InvoiceId=ID fatura -InvoiceRef=Ref. fatura InvoiceDateCreation=Data da criação da fatura InvoiceStatus=Status da fatura InvoiceNote=Nota de fatura diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang index e622b9b09e2..d7b6b1d718d 100644 --- a/htdocs/langs/pt_BR/categories.lang +++ b/htdocs/langs/pt_BR/categories.lang @@ -71,7 +71,6 @@ CatSupLinks=Ligações entre fornecedores e tags / categorias CatCusLinks=Relação/links entre clientes / perspectivas e tags / categorias CatProdLinks=Relação/links entre produtos / serviços e tags / categorias CatProJectLinks=Links entre projetos e tags/categorias -DeleteFromCat=Remover de tags / categoria ExtraFieldsCategories=atributos complementares CategoriesSetup=Configuração Tags / categorias CategorieRecursiv=Fazer a ligação com os pais tag/categoria automaticamente diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang index a0fb7ab48ed..7552724fd3c 100644 --- a/htdocs/langs/pt_BR/companies.lang +++ b/htdocs/langs/pt_BR/companies.lang @@ -101,7 +101,6 @@ ProfId3DZ=Numero de Contribuinte ProfId4DZ=Numero de Identificação Social VATIntraSyntaxIsValid=Sintaxe é válida ProspectCustomer=Possível cliente / Cliente -Prospect=Prospecto de cliente CustomerRelativeDiscount=Desconto relativo do cliente CustomerRelativeDiscountShort=Desconto relativo CompanyHasRelativeDiscount=Esse cliente tem um desconto padrão de %s%% diff --git a/htdocs/langs/pt_BR/exports.lang b/htdocs/langs/pt_BR/exports.lang index 7eed4f12f5d..1dd24b03c79 100644 --- a/htdocs/langs/pt_BR/exports.lang +++ b/htdocs/langs/pt_BR/exports.lang @@ -1,8 +1,6 @@ # Dolibarr language file - Source file is en_US - exports -ExportsArea=Área de exportações ImportArea=Área de importação NewImport=Nova importação -ExportableDatas=Conjunto de dados que podem ser exportados ImportableDatas=Conjunto de dados que podem ser importados SelectExportDataSet=Escolha um conjunto predefinido de dados que deseja exportar... SelectImportDataSet=Escolha um conjunto predefinido de dados que deseja importar... @@ -13,7 +11,6 @@ ImportModelName=Nome do perfil de importação ImportModelSaved=Perfil de importação guardado com o nome de %s. DatasetToImport=Conjunto de dados a importar NowClickToGenerateToBuildExportFile=Agora, faça click em "Gerar" para gerar o arquivo exportação... -AvailableFormats=Formatos disponíveis FormatedImport=Assistente de importação FormatedImportDesc2=O primeiro passo consiste em escolher o tipo de dado que deve importar, logo o arquivo e a continuação escolher os campos que deseja importar. FormatedExport=Assistente de exportação @@ -22,7 +19,6 @@ FormatedExportDesc3=Uma vez selecionados os dados, é possível escolher o forma NoImportableData=Não existe tipo de dados importavel (não existe nenhum módulo com definições de dados importavel ativado) FileSuccessfullyBuilt=Arquivo gerado SQLUsedForExport=Pedido de SQL usado para construir exportação de arquivo -LineId=Id da Linha LineLabel=Rótulo de linha LineDescription=Descrição da Linha LineUnitPrice=Preço Unitário da Linha diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang index 178bb8c6cb5..67d45e2bdac 100644 --- a/htdocs/langs/pt_BR/orders.lang +++ b/htdocs/langs/pt_BR/orders.lang @@ -6,7 +6,6 @@ Order=Pedido PdfOrderTitle=Pedido Orders=Pedidos OrderLine=Linha de Comando -OrderDate=Data Pedido OrderDateShort=Data do pedido OrderToProcess=Pedido a processar NewOrder=Novo Pedido diff --git a/htdocs/langs/pt_BR/paybox.lang b/htdocs/langs/pt_BR/paybox.lang index 49ab60c63fd..fef05a17b9b 100644 --- a/htdocs/langs/pt_BR/paybox.lang +++ b/htdocs/langs/pt_BR/paybox.lang @@ -7,7 +7,6 @@ ThisScreenAllowsYouToPay=Esta página lhe permite fazer seu pagamento on-line de ThisIsInformationOnPayment=Aqui está a informação sobre o pagamento a realizar Creditor=Beneficiário PayBoxDoPayment=Pagar com Cartão de Débito ou Crédito (Paybox) -ToPay=Realizar pagamento YouWillBeRedirectedOnPayBox=Va a ser redirecionado a a página segura de Paybox para indicar seu cartão de crédito ToOfferALinkForOnlinePayment=URL para %s pagamento ToOfferALinkForOnlinePaymentOnOrder=URL que oferece uma interface de pagamento on-line %s baseada no valor de un pedido de cliente diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang index f997ea2f9fb..227c9d52c11 100644 --- a/htdocs/langs/pt_BR/products.lang +++ b/htdocs/langs/pt_BR/products.lang @@ -35,7 +35,6 @@ SoldAmount=Total vendido PurchasedAmount=Total comprado MinPrice=Preço de venda min. CantBeLessThanMinPrice=O preço de venda não deve ser inferior ao mínimo para este produto (%s ICMS) -ContractStatusClosed=Encerrado ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorreto ErrorProductClone=Aconteceu um problema durante a clonação do produto ou serviço. SupplierCard=Ficha do fornecedor diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang index cafcce387a3..98b56cf950d 100644 --- a/htdocs/langs/pt_BR/projects.lang +++ b/htdocs/langs/pt_BR/projects.lang @@ -22,7 +22,6 @@ ConfirmDeleteATask=Você tem certeza que deseja excluir esta tarefa? OpenedProjects=Projetos em andamento OpenedTasks=Tarefas em andamento ShowProject=Mostrar projeto -ShowTask=Mostrar tarefa NoProject=Nenhum Projeto Definido TimeSpent=Dispêndio de tempo TimeSpentByUser=Tempo gasto por usuário diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang index ca15a6fe7fe..2a5a83701c8 100644 --- a/htdocs/langs/pt_BR/stocks.lang +++ b/htdocs/langs/pt_BR/stocks.lang @@ -6,15 +6,11 @@ WarehouseTarget=Armazém de destino ValidateSending=Apagar envio CancelSending=Cancelar envio DeleteSending=Apagar envio -Stock=Estoque -Stocks=Estoques StocksByLotSerial=Estoques por lote/nº de série LotSerial=Lotes/Series LotSerialList=Listagem de lotes/series -Movements=Movimentações ErrorWarehouseRefRequired=A referência do armazém é necessária ListOfWarehouses=Lista de armazéns -ListOfStockMovements=Lista de movimentações de estoque StocksArea=Setor de armazenagem NumberOfProducts=Número total de produtos CorrectStock=Corrigir estoque diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang index 36a506f9d86..02f5f3d46e1 100644 --- a/htdocs/langs/pt_BR/users.lang +++ b/htdocs/langs/pt_BR/users.lang @@ -24,7 +24,6 @@ ConfirmEnableUser=Tem certeza que deseja ativar o usuário %s? ConfirmReinitPassword=Tem certeza que deseja gerar uma nova senha para o usuário %s? ConfirmSendNewPassword=Tem certeza que deseja gerar e enviar uma nova senha para o usuário %s? NewUser=Novo usuário -CreateUser=Criar usuário LoginNotDefined=O usuário não está definido NameNotDefined=O nome não está definido ListOfUsers=Lista de usuário diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 3e95b3cbb45..698d65795f1 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1046,7 +1046,7 @@ else // Weight print ''; // Length if (empty($conf->global->PRODUCT_DISABLE_SIZE))
'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").''.price($cashcontrol->opening).'
'; - print $objp->facnumber; + $invoicetmp->fetch($objp->facid); + print $invoicetmp->getNomUrl(1); print ''; print $bankaccount->getNomUrl(1); - if ($sql.=$conf->global->CASHDESK_ID_BANKACCOUNT_CASH==$bankaccount->id) $cash+=$objp->amount; - if ($sql.=$conf->global->CASHDESK_ID_BANKACCOUNT_CB==$bankaccount->id) $bank+=$objp->amount; - if ($sql.=$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE==$bankaccount->id) $cheque+=$objp->amount; + if ($conf->global->CASHDESK_ID_BANKACCOUNT_CASH==$bankaccount->id) $cash+=$objp->amount; + elseif ($conf->global->CASHDESK_ID_BANKACCOUNT_CB==$bankaccount->id) $bank+=$objp->amount; + elseif ($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE==$bankaccount->id) $cheque+=$objp->amount; + else $other+=$objp->amount; print "
'.$langs->trans("Weight").''; print ''; - print $formproduct->select_measuring_units("weight_units","weight"); + print $formproduct->select_measuring_units("weight_units", "weight", (empty($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?0:$conf->global->MAIN_WEIGHT_DEFAULT_UNIT)); print '