diff --git a/ChangeLog b/ChangeLog index 3a539a63938..b22376cebac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: +- New: Each user can include its own external ics calendar into dolibarr agenda view. - New: Intervention documents are now available in ECM module. - New: Can attach supplier order to a customer order. - New: Supervisor is now visible into user list. @@ -38,6 +39,11 @@ For users: - New: Intervention documents are now available in ECM module - New: Add attachments on user card + in ECM module - New: Can add __PROJECT_REF__ and __TIHRPARTY_NAME__ into email topic or content template. +- New: [ task #1204 ] add Numering contrat module free (like leopard in product module) +- New: [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice +- New: Enable supplier price log table +- New: [ task #1204 ] add a External reference to contract +- New: [ task #1218 ] Can drag and drop an event from calendar to change its day. - Fix: [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action - Fix: [ bug #1470, #1472, #1473] User trigger problem - Fix: [ bug #1489, #1491 ] Intervention trigger problem @@ -55,7 +61,6 @@ For users: - Fix: [ bug #1506, #1507 ] ECM trigger error problem - Fix: [ bug #1469 ] Triggers CONTACT_MODIFY and CONTACT_DELETE duplicates error message - Fix: [ bug #1537 ] Difference between societe.nom and adherent.societe. -- New: [ task #1204 ] add a External reference to contract For translators: - Update language files. @@ -71,8 +76,9 @@ For developers: - LINEBILL_DELETE, LINK_DELETE, ORDER_SUPPLIER_DELETE, RESOURCE_DELETE trigger called before SQL delete - New: [ Task #1481 ] Add trigger BILL_SUPPLIER_UPDATE. - New: [ Task #1495 ] Add trigger LINECONTRACT_CREATE. -- New: Added hook "formConfirm" and "doActions" for supplier invoice card. -- New: [ task #1511, #1426 ] Added hook "doActions" for supplier card and supplier order card. +- New: Added hook "formConfirm" and "doActions" for supplier invoice card +- New: [ task #1511, #1426 ] Added hook "doActions" for supplier card and supplier order card +- New: renamed table llx_c_pays to llx_c_country & libelle field to label - Qual: Renamed table llx_c_civilite into llx_c_civility field civilite into label in the same table and field civilite into civility in other table @@ -80,7 +86,9 @@ For developers: WARNING: Following change may create regression for some external modules, but was necessary to make Dolibarr better: -- Changed the way parameters are provided to scripts sync_xxx_ldap2dolibarr.php +- Changed the way parameters are provided to scripts sync_xxx_ldap2dolibarr.php +- Some field into database wwere renamed from "libelle" to "label". +- Table llx_c_pays were renamed into llx_c_country. ***** ChangeLog for 3.6 compared to 3.5.* ***** @@ -199,19 +207,23 @@ removed. You must now use the 6 parameters way. See file modMyModule.class.php f ***** ChangeLog for 3.5.5 compared to 3.5.4 ***** Fix: Holiday module was broken. Initializaion of amount of holidays failed. Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas. -Fix: Fusion PDF button on unpaid invoice is no more displayed -Fix: Unpaid invoice launch fusion PDF action even if it is only search (with enter keyboard input instead of lens click) +Fix: Fusion PDF button on unpaid invoice is no more displayed. +Fix: Unpaid invoice launch fusion PDF action even if it is only search (with enter keyboard input instead of lens click). Fix: Pb when showing log list of holiday module with some mysql versions. Fix: Error with bad timezone pushed by some browsers. Fix: shipping list SQL request was not filtering on shipping element Fix: debian package provided by dolibarr team must use embedded libraries. Fix: [ bug #1528 ] Leopard Services numeration module description is not translated. -Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas -Fix: [ bug #1534 ] Unknown error when deleting a product photo under special circumstances +Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne s'appliquent pas. +Fix: [ bug #1534 ] Unknown error when deleting a product photo under special circumstances. Fix: Update impayees.php -Fix: Link product, In list view and label product +Fix: Link product, In list view and label product. Fix: visible task into area "time" for "My task" must limit task to tasks i am assigned to. Fix: When disabled, all fields to add time into task line must be disabled. +Fix: Missing include files.lib.php in some pages that use dol_delete_recursive +Fix: Missing include files.lib.php in some pages ti use dol_delete_recursive. +Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead of old ref. +Fix: [ bug #1553 ] Saving User displays setup removes menu. ***** ChangeLog for 3.5.4 compared to 3.5.3 ***** Fix: Hide title of event when agenda module disabled. diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php index d8bda8922cb..781bbc1f77c 100644 --- a/dev/skeletons/skeleton_class.class.php +++ b/dev/skeletons/skeleton_class.class.php @@ -106,7 +106,7 @@ class Skeleton_Class extends CommonObject //// Call triggers //$result=$this->call_trigger('MYOBJECT_CREATE',$user); - //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail} + //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail} //// End call triggers } } @@ -133,10 +133,11 @@ class Skeleton_Class extends CommonObject /** * Load object in memory from the database * - * @param int $id Id object + * @param int $id Id object + * @param string $ref Ref * @return int <0 if KO, >0 if OK */ - function fetch($id) + function fetch($id,$ref='') { global $langs; $sql = "SELECT"; @@ -145,7 +146,8 @@ class Skeleton_Class extends CommonObject $sql.= " t.field2"; //... $sql.= " FROM ".MAIN_DB_PREFIX."mytable as t"; - $sql.= " WHERE t.rowid = ".$id; + if ($ref) $sql.= " WHERE t.ref = '".$ref."'"; + else $sql.= " WHERE t.rowid = ".$id; dol_syslog(get_class($this)."::fetch"); $resql=$this->db->query($sql); @@ -214,7 +216,7 @@ class Skeleton_Class extends CommonObject //// Call triggers //$result=$this->call_trigger('MYOBJECT_MODIFY',$user); - //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail} + //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail} //// End call triggers } } @@ -261,7 +263,7 @@ class Skeleton_Class extends CommonObject //// Call triggers //$result=$this->call_trigger('MYOBJECT_DELETE',$user); - //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail} + //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail} //// End call triggers } } diff --git a/dev/skeletons/skeleton_page.php b/dev/skeletons/skeleton_page.php index 00222bcce61..67d6298863a 100644 --- a/dev/skeletons/skeleton_page.php +++ b/dev/skeletons/skeleton_page.php @@ -43,6 +43,7 @@ if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@includ if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php'; // Used on dev env only if (! $res) die("Include of main fails"); // Change this following line to use the correct relative path from htdocs +include_once(DOL_DOCUMENT_ROOT.'/core/class/formcompany.class.php'); dol_include_once('/module/class/skeleton_class.class.php'); // Load traductions files requiredby by page @@ -52,6 +53,7 @@ $langs->load("other"); // Get parameters $id = GETPOST('id','int'); $action = GETPOST('action','alpha'); +$backtopage = GETPOST('backtopage'); $myparam = GETPOST('myparam','alpha'); // Protection if external user @@ -60,6 +62,16 @@ if ($user->societe_id > 0) //accessforbidden(); } +if (empty($action) && empty($id) && empty($ref)) $action='create'; + +// Load object if id or ref is provided as parameter +$object=new Skeleton_Class($db); +if (($id > 0 || ! empty($ref)) && $action != 'add') +{ + $result=$object->fetch($id,$ref); + if ($result < 0) dol_print_error($db); +} + /******************************************************************* @@ -68,19 +80,104 @@ if ($user->societe_id > 0) * Put here all code to do according to value of "action" parameter ********************************************************************/ +// Action to add record if ($action == 'add') { - $object=new Skeleton_Class($db); - $object->prop1=$_POST["field1"]; - $object->prop2=$_POST["field2"]; - $result=$object->create($user); + if (GETPOST('cancel')) + { + $urltogo=$backtopage?$backtopage:dol_buildpath('/buildingmanagement/list.php',1); + header("Location: ".$urltogo); + exit; + } + + $error=0; + + /* object_prop_getpost_prop */ + $object->prop1=GETPOST("field1"); + $object->prop2=GETPOST("field2"); + + if (empty($object->ref)) + { + $error++; + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")),'errors'); + } + + if (! $error) + { + $result=$object->create($user); + if ($result > 0) + { + // Creation OK + $urltogo=$backtopage?$backtopage:dol_buildpath('/mymodule/list.php',1); + header("Location: ".$urltogo); + exit; + } + { + // Creation KO + if (! empty($object->errors)) setEventMessage($object->errors, 'errors'); + else setEventMessage($object->error, 'errors'); + $action='create'; + } + } + else + { + $action='create'; + } +} + +// Cancel +if ($action == 'update' && GETPOST('cancel')) $action='view'; + +// Action to update record +if ($action == 'update' && ! GETPOST('cancel')) +{ + $error=0; + + $object->prop1=GETPOST("field1"); + $object->prop2=GETPOST("field2"); + + if (empty($object->ref)) + { + $error++; + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")),'errors'); + } + + if (! $error) + { + $result=$object->update($user); + if ($result > 0) + { + $action='view'; + } + else + { + // Creation KO + if (! empty($object->errors)) setEventMessage($object->errors, 'errors'); + else setEventMessage($object->error, 'errors'); + $action='edit'; + } + } + else + { + $action='edit'; + } +} + +// Action to delete +if ($action == 'confirm_delete') +{ + $result=$object->delete($user); if ($result > 0) { - // Creation OK + // Delete OK + setEventMessage($langs->trans("RecordDeleted")); + header("Location: ".dol_buildpath('/buildingmanagement/list.php',1)); + exit; } + else { - // Creation KO - $mesg=$object->error; + if (! empty($object->errors)) setEventMessage($object->errors,'errors'); + else setEventMessage($object->error,'errors'); } } @@ -101,7 +198,7 @@ $form=new Form($db); // Put here content of your page -// Example 1 : Adding jquery code +// Example : Adding jquery code print ''; -// Example 2 : Adding links to objects -// The class must extends CommonObject class to have this method available -//$somethingshown=$object->showLinkedObjectBlock(); - - -// Example 3 : List of data -if ($action == 'list') +// Part to show a list +if ($action == 'list' || empty($id)) { $sql = "SELECT"; $sql.= " t.rowid,"; @@ -145,21 +237,18 @@ if ($action == 'list') { $num = $db->num_rows($resql); $i = 0; - if ($num) + while ($i < $num) { - while ($i < $num) + $obj = $db->fetch_object($resql); + if ($obj) { - $obj = $db->fetch_object($resql); - if ($obj) - { - // You can use here results - print ''; - print $obj->field1; - print $obj->field2; - print ''; - } - $i++; + // You can use here results + print ''; + print $obj->field1; + print $obj->field2; + print ''; } + $i++; } } else @@ -173,6 +262,100 @@ if ($action == 'list') +// Part to create +if ($action == 'create') +{ + print_fiche_titre($langs->trans("NewResidence")); + + dol_fiche_head(); + + print '
'; + print ''; + print ''; + + print ''."\n"; + print ''; + + print '
'.$langs->trans("Label").''; + print ''; + print '
'."\n"; + + print '
'; + + print '
 
'; + + print '
'; + + dol_fiche_end(); +} + + + +// Part to edit record +if (($id || $ref) && $action == 'edit') +{ + dol_fiche_head(); + + print '
'; + print ''; + print ''; + print ''; + + + print '
'; + + print '
'; + + print '
'; + + dol_fiche_end(); +} + + + +// Part to show record +if ($id && (empty($action) || $action == 'view')) +{ + dol_fiche_head(); + + + + dol_fiche_end(); + + + // Buttons + print '
'."\n"; + $parameters=array(); + $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + if (empty($reshook)) + { + if ($user->rights->mymodule->write) + { + print '
'.$langs->trans("Modify").'
'."\n"; + } + + if ($user->rights->mymodule->delete) + { + if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)) // We can't use preloaded confirm form with jmobile + { + print '
'.$langs->trans('Delete').'
'."\n"; + } + else + { + print '
'.$langs->trans('Delete').'
'."\n"; + } + } + } + print '
'."\n"; + + + // Example 2 : Adding links to objects + // The class must extends CommonObject class to have this method available + //$somethingshown=$object->showLinkedObjectBlock(); + +} + + // End of page llxFooter(); $db->close(); diff --git a/htdocs/.gitignore b/htdocs/.gitignore index a4ebd2bb7c7..8ba0a69acb3 100644 --- a/htdocs/.gitignore +++ b/htdocs/.gitignore @@ -2,6 +2,7 @@ /custom* /extensions* /nltechno* +/anco* /bootstrap* /google* /multicompany* diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php index fc593e826f2..9bd164a9b32 100644 --- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php +++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php @@ -412,7 +412,7 @@ abstract class ActionsAdherentCardCommon // We set country_id, and country_code label of the chosen country if ($this->object->country_id) { - $sql = "SELECT code, libelle FROM ".MAIN_DB_PREFIX."c_pays WHERE rowid = ".$this->object->country_id; + $sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id; $resql=$this->db->query($sql); if ($resql) { diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php index ade8f059810..98f5e908e16 100644 --- a/htdocs/adherents/cartes/carte.php +++ b/htdocs/adherents/cartes/carte.php @@ -64,9 +64,9 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg $sql = "SELECT d.rowid, d.firstname, d.lastname, d.login, d.societe as company, d.datefin,"; $sql.= " d.address, d.zip, d.town, d.country, d.birth, d.email, d.photo,"; $sql.= " t.libelle as type,"; - $sql.= " p.code as country_code, p.libelle as country"; + $sql.= " c.code as country_code, c.label as country"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON d.country = p.rowid"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid"; $sql.= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1"; if (is_numeric($foruserid)) $sql.=" AND d.rowid=".$foruserid; if ($foruserlogin) $sql.=" AND d.login='".$db->escape($foruserlogin)."'"; diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 2314aebcdb9..ce3ad4905a7 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1058,12 +1058,12 @@ class Adherent extends CommonObject $sql.= " d.datevalid as datev,"; $sql.= " d.country,"; $sql.= " d.state_id,"; - $sql.= " p.rowid as country_id, p.code as country_code, p.libelle as country,"; + $sql.= " c.rowid as country_id, c.code as country_code, c.label as country,"; $sql.= " dep.nom as state, dep.code_departement as state_code,"; $sql.= " t.libelle as type, t.cotisation as cotisation,"; $sql.= " u.rowid as user_id, u.login as user_login"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON d.country = p.rowid"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as dep ON d.state_id = dep.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON d.rowid = u.fk_member"; $sql.= " WHERE d.fk_adherent_type = t.rowid"; diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 49eabe52d43..777cead2469 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -326,6 +326,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer) { if (GETPOST('deletephoto')) { + require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; $fileimg=$conf->adherent->dir_output.'/'.get_exdir($object->id,2,0,1).'/photos/'.$object->photo; $dirthumbs=$conf->adherent->dir_output.'/'.get_exdir($object->id,2,0,1).'/photos/thumbs'; dol_delete_file($fileimg); @@ -945,7 +946,7 @@ else $country=GETPOST('country','int'); if (!empty($country) || $object->country_id) { - $sql = "SELECT rowid, code, libelle as label from ".MAIN_DB_PREFIX."c_pays where rowid = ".(!empty($country)?$country:$object->country_id); + $sql = "SELECT rowid, code, label from ".MAIN_DB_PREFIX."c_country where rowid = ".(!empty($country)?$country:$object->country_id); $resql=$db->query($sql); if ($resql) { diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php index ecf27f78465..736f6ef0140 100644 --- a/htdocs/adherents/stats/geo.php +++ b/htdocs/adherents/stats/geo.php @@ -76,11 +76,11 @@ if ($mode) $tab='statscountry'; $data = array(); - $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, c.code, c.libelle as label"; - $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_pays as c on d.country = c.rowid"; + $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, c.code, c.label"; + $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid"; $sql.=" WHERE d.entity IN (".getEntity().")"; $sql.=" AND d.statut = 1"; - $sql.=" GROUP BY c.libelle, c.code"; + $sql.=" GROUP BY c.label, c.code"; //print $sql; } @@ -91,29 +91,29 @@ if ($mode) $tab='statsstate'; $data = array(); - $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, p.code, p.libelle as label, c.nom as label2"; // + $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, co.code, co.label, c.nom as label2"; // $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid"; $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region"; - $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p on d.country = p.rowid"; + $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid"; $sql.=" WHERE d.entity IN (".getEntity().")"; $sql.=" AND d.statut = 1"; - $sql.=" GROUP BY p.libelle, p.code, c.nom"; + $sql.=" GROUP BY co.label, co.code, c.nom"; //print $sql; } if ($mode == 'memberbyregion') // { - $label=$langs->trans("Country"); //pays + $label=$langs->trans("Country"); $label2=$langs->trans("Region"); //département $tab='statsregion'; //onglet $data = array(); //tableau de donnée - $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, p.code, p.libelle as label, r.nom as label2"; + $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, co.code, co.label, r.nom as label2"; $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.state_id = c.rowid"; $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region"; - $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p on d.country = p.rowid"; + $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_country as co on d.country = co.rowid"; $sql.=" WHERE d.entity IN (".getEntity().")"; $sql.=" AND d.statut = 1"; - $sql.=" GROUP BY p.libelle, p.code, r.nom"; //+ + $sql.=" GROUP BY co.label, co.code, r.nom"; //+ //print $sql; } if ($mode == 'memberbytown') @@ -123,12 +123,12 @@ if ($mode) $tab='statstown'; $data = array(); - $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, p.code, p.libelle as label, d.town as label2"; + $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, c.code, c.label, d.town as label2"; $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d"; - $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p on d.country = p.rowid"; + $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_country as c on d.country = c.rowid"; $sql.=" WHERE d.entity IN (".getEntity().")"; $sql.=" AND d.statut = 1"; - $sql.=" GROUP BY p.libelle, p.code, d.town"; + $sql.=" GROUP BY c.label, c.code, d.town"; //print $sql; } diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index 371854410b0..6b683c8b52b 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -62,10 +62,11 @@ if ($actionsave) // Save agendas while ($i <= $MAXAGENDA) { - $name=trim(GETPOST('agenda_ext_name'.$i,'alpha')); - $src=trim(GETPOST('agenda_ext_src'.$i,'alpha')); - $color=trim(GETPOST('agenda_ext_color'.$i,'alpha')); + $name=trim(GETPOST('AGENDA_EXT_NAME'.$i,'alpha')); + $src=trim(GETPOST('AGENDA_EXT_SRC'.$i,'alpha')); + $color=trim(GETPOST('AGENDA_EXT_COLOR'.$i,'alpha')); if ($color=='-1') $color=''; + $enabled=trim(GETPOST('AGENDA_EXT_ENABLED'.$i,'alpha')); if (! empty($src) && ! dol_is_url($src)) { @@ -82,6 +83,8 @@ if ($actionsave) if (! $res > 0) $error++; $res=dolibarr_set_const($db,'AGENDA_EXT_COLOR'.$i,$color,'chaine',0,'',$conf->entity); if (! $res > 0) $error++; + $res=dolibarr_set_const($db,'AGENDA_EXT_ENABLED'.$i,$enabled,'chaine',0,'',$conf->entity); + if (! $res > 0) $error++; $i++; } @@ -195,19 +198,20 @@ while ($i <= $MAXAGENDA) $name='AGENDA_EXT_NAME'.$key; $src='AGENDA_EXT_SRC'.$key; $color='AGENDA_EXT_COLOR'.$key; + $enabled='AGENDA_EXT_ENABLED'.$key; $var=!$var; print ""; // Nb print ''.$langs->trans("AgendaExtNb",$key).""; // Name - print ''; + print ''; // URL - print ''; + print ''; // Color (Possible colors are limited by Google) print ''; //print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist); - print $formother->selectColor((GETPOST("agenda_ext_color".$key)?GETPOST("agenda_ext_color".$key):$conf->global->$color), "agenda_ext_color".$key, 'extsitesconfig', 1, '', 'hideifnotset'); + print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR".$key)?GETPOST("AGENDA_EXT_COLOR".$key):$conf->global->$color), "AGENDA_EXT_COLOR".$key, 'extsitesconfig', 1, '', 'hideifnotset'); print ''; print ""; $i++; diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index c69f269f301..c774faf5caa 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -318,7 +318,7 @@ if ($action == 'edit' || $action == 'updateedit') // Country $var=!$var; print ''; - //if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2); // Par defaut, pays de la localisation + //if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2); // By default, country of localization print $form->select_country($mysoc->country_id,'country_id'); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print ''."\n"; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 273510b3a19..28573c63677 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -77,7 +77,7 @@ $tabname=array(); $tabname[1] = MAIN_DB_PREFIX."c_forme_juridique"; $tabname[2] = MAIN_DB_PREFIX."c_departements"; $tabname[3] = MAIN_DB_PREFIX."c_regions"; -$tabname[4] = MAIN_DB_PREFIX."c_pays"; +$tabname[4] = MAIN_DB_PREFIX."c_country"; $tabname[5] = MAIN_DB_PREFIX."c_civility"; $tabname[6] = MAIN_DB_PREFIX."c_actioncomm"; $tabname[7] = MAIN_DB_PREFIX."c_chargesociales"; @@ -132,31 +132,31 @@ $tablib[26]= "DictionaryResourceType"; // Requests to extract data $tabsql=array(); -$tabsql[1] = "SELECT f.rowid as rowid, f.code, f.libelle, p.code as country_code, p.libelle as country, f.active FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_pays as p WHERE f.fk_pays=p.rowid"; -$tabsql[2] = "SELECT d.rowid as rowid, d.code_departement as code, d.nom as libelle, d.fk_region as region_id, r.nom as region, p.code as country_code, p.libelle as country, d.active FROM ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_pays as p WHERE d.fk_region=r.code_region and r.fk_pays=p.rowid and r.active=1 and p.active=1"; -$tabsql[3] = "SELECT r.rowid as rowid, r.code_region as code, r.nom as libelle, r.fk_pays as country_id, p.code as country_code, p.libelle as country, r.active FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_pays as p WHERE r.fk_pays=p.rowid and p.active=1"; -$tabsql[4] = "SELECT rowid as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_pays"; +$tabsql[1] = "SELECT f.rowid as rowid, f.code, f.libelle, c.code as country_code, c.label as country, f.active FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c WHERE f.fk_pays=c.rowid"; +$tabsql[2] = "SELECT d.rowid as rowid, d.code_departement as code, d.nom as libelle, d.fk_region as region_id, r.nom as region, c.code as country_code, c.label as country, d.active FROM ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and r.active=1 and c.active=1"; +$tabsql[3] = "SELECT r.rowid as rowid, r.code_region as code, r.nom as libelle, r.fk_pays as country_id, c.code as country_code, c.label as country, r.active FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c WHERE r.fk_pays=c.rowid and c.active=1"; +$tabsql[4] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_country"; $tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.label, c.active FROM ".MAIN_DB_PREFIX."c_civility AS c"; $tabsql[6] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, a.position FROM ".MAIN_DB_PREFIX."c_actioncomm AS a"; -$tabsql[7] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, p.code as country_code, p.libelle as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_pays as p WHERE a.fk_pays=p.rowid and p.active=1"; -$tabsql[8] = "SELECT t.id as rowid, t.code as code, t.libelle, t.fk_country as country_id, p.code as country_code, p.libelle as country, t.active FROM ".MAIN_DB_PREFIX."c_typent as t LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON t.fk_country=p.rowid"; +$tabsql[7] = "SELECT a.id as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, a.deductible, c.code as country_code, c.label as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_pays=c.rowid and c.active=1"; +$tabsql[8] = "SELECT t.id as rowid, t.code as code, t.libelle, t.fk_country as country_id, c.code as country_code, c.label as country, t.active FROM ".MAIN_DB_PREFIX."c_typent as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON t.fk_country=c.rowid"; $tabsql[9] = "SELECT code_iso as code, label, unicode, active FROM ".MAIN_DB_PREFIX."c_currencies"; -$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, p.libelle as country, p.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p WHERE t.fk_pays=p.rowid"; +$tabsql[10]= "SELECT t.rowid, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid"; $tabsql[11]= "SELECT t.rowid as rowid, element, source, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_contact AS t"; $tabsql[12]= "SELECT c.rowid as rowid, code, sortorder, c.libelle, c.libelle_facture, nbjour, fdm, decalage, active FROM ".MAIN_DB_PREFIX.'c_payment_term AS c'; $tabsql[13]= "SELECT id as rowid, code, c.libelle, type, active, accountancy_code FROM ".MAIN_DB_PREFIX."c_paiement AS c"; -$tabsql[14]= "SELECT e.rowid as rowid, e.code as code, e.libelle, e.price, e.organization, e.fk_pays as country_id, p.code as country_code, p.libelle as country, e.active FROM ".MAIN_DB_PREFIX."c_ecotaxe AS e, ".MAIN_DB_PREFIX."c_pays as p WHERE e.fk_pays=p.rowid and p.active=1"; +$tabsql[14]= "SELECT e.rowid as rowid, e.code as code, e.libelle, e.price, e.organization, e.fk_pays as country_id, c.code as country_code, c.label as country, e.active FROM ".MAIN_DB_PREFIX."c_ecotaxe AS e, ".MAIN_DB_PREFIX."c_country as c WHERE e.fk_pays=c.rowid and c.active=1"; $tabsql[15]= "SELECT rowid as rowid, code, label as libelle, width, height, unit, active FROM ".MAIN_DB_PREFIX."c_paper_format"; $tabsql[16]= "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_PREFIX."c_prospectlevel"; -$tabsql[17]= "SELECT id as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_type_fees"; +$tabsql[17]= "SELECT id as rowid, code, label, accountancy_code, active FROM ".MAIN_DB_PREFIX."c_type_fees"; $tabsql[18]= "SELECT rowid as rowid, code, libelle, tracking, active FROM ".MAIN_DB_PREFIX."c_shipment_mode"; $tabsql[19]= "SELECT id as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_effectif"; $tabsql[20]= "SELECT rowid as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_input_method"; $tabsql[21]= "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_availability AS c"; $tabsql[22]= "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason"; $tabsql[23]= "SELECT rowid as rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number as accountancy_code, account_parent, label, active FROM ".MAIN_DB_PREFIX."accountingaccount"; -$tabsql[24]= "SELECT s.rowid as rowid, pcg_version, s.fk_pays as country_id, p.code as country_code, p.libelle as pays, s.label, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s, ".MAIN_DB_PREFIX."c_pays as p WHERE s.fk_pays=p.rowid and p.active=1"; -$tabsql[25]= "SELECT t.rowid, t.taux, p.libelle as country, p.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_pays as p WHERE t.fk_pays=p.rowid"; +$tabsql[24]= "SELECT s.rowid as rowid, pcg_version, s.fk_pays as country_id, c.code as country_code, c.label as country, s.label, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s, ".MAIN_DB_PREFIX."c_country as c WHERE s.fk_pays=c.rowid and c.active=1"; +$tabsql[25]= "SELECT t.rowid, t.taux, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid"; $tabsql[26]= "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource"; // Criteria to sort dictionaries @@ -193,7 +193,7 @@ $tabfield=array(); $tabfield[1] = "code,libelle,country"; $tabfield[2] = "code,libelle,region_id,region,country"; // "code,libelle,region,country_code-country" $tabfield[3] = "code,libelle,country_id,country"; -$tabfield[4] = "code,libelle"; +$tabfield[4] = "code,label"; $tabfield[5] = "code,label"; $tabfield[6] = "code,libelle,type,position"; $tabfield[7] = "code,libelle,country_id,country,accountancy_code,deductible"; @@ -206,7 +206,7 @@ $tabfield[13]= "code,libelle,type,accountancy_code"; $tabfield[14]= "code,libelle,price,organization,country_id,country"; $tabfield[15]= "code,libelle,width,height,unit"; $tabfield[16]= "code,libelle,sortorder"; -$tabfield[17]= "code,libelle"; +$tabfield[17]= "code,label,accountancy_code"; $tabfield[18]= "code,libelle,tracking"; $tabfield[19]= "code,libelle"; $tabfield[20]= "code,libelle"; @@ -222,7 +222,7 @@ $tabfieldvalue=array(); $tabfieldvalue[1] = "code,libelle,country"; $tabfieldvalue[2] = "code,libelle,region"; // "code,libelle,region" $tabfieldvalue[3] = "code,libelle,country"; -$tabfieldvalue[4] = "code,libelle"; +$tabfieldvalue[4] = "code,label"; $tabfieldvalue[5] = "code,label"; $tabfieldvalue[6] = "code,libelle,type,position"; $tabfieldvalue[7] = "code,libelle,country,accountancy_code,deductible"; @@ -235,7 +235,7 @@ $tabfieldvalue[13]= "code,libelle,type,accountancy_code"; $tabfieldvalue[14]= "code,libelle,price,organization,country"; $tabfieldvalue[15]= "code,libelle,width,height,unit"; $tabfieldvalue[16]= "code,libelle,sortorder"; -$tabfieldvalue[17]= "code,libelle"; +$tabfieldvalue[17]= "code,label,accountancy_code"; $tabfieldvalue[18]= "code,libelle,tracking"; $tabfieldvalue[19]= "code,libelle"; $tabfieldvalue[20]= "code,libelle"; @@ -251,7 +251,7 @@ $tabfieldinsert=array(); $tabfieldinsert[1] = "code,libelle,fk_pays"; $tabfieldinsert[2] = "code_departement,nom,fk_region"; $tabfieldinsert[3] = "code_region,nom,fk_pays"; -$tabfieldinsert[4] = "code,libelle"; +$tabfieldinsert[4] = "code,label"; $tabfieldinsert[5] = "code,label"; $tabfieldinsert[6] = "code,libelle,type,position"; $tabfieldinsert[7] = "code,libelle,fk_pays,accountancy_code,deductible"; @@ -264,7 +264,7 @@ $tabfieldinsert[13]= "code,libelle,type,accountancy_code"; $tabfieldinsert[14]= "code,libelle,price,organization,fk_pays"; $tabfieldinsert[15]= "code,label,width,height,unit"; $tabfieldinsert[16]= "code,label,sortorder"; -$tabfieldinsert[17]= "code,libelle"; +$tabfieldinsert[17]= "code,label,accountancy_code"; $tabfieldinsert[18]= "code,libelle,tracking"; $tabfieldinsert[19]= "code,libelle"; $tabfieldinsert[20]= "code,libelle"; @@ -421,7 +421,7 @@ if ($id == 11) 'fichinter' => $langs->trans('InterventionCard'), 'agenda' => $langs->trans('Agenda') ); - if (! empty($conf->global->MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES)) $elementList["societe"] = $langs->trans('ThirdParty'); + if (! empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) $elementList["societe"] = $langs->trans('ThirdParty'); $sourceList = array( 'internal' => $langs->trans('Internal'), 'external' => $langs->trans('External') @@ -570,7 +570,8 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) $result = $db->query($sql); if ($result) // Add is ok { - $_POST=array('id'=>$id); // Clean $_POST array, we keep only + setEventMessage($langs->transnoentities("RecordSaved")); + $_POST=array('id'=>$id); // Clean $_POST array, we keep only } else { @@ -1019,7 +1020,7 @@ if ($id) $valuetoshow=($obj->code && $key != "PaymentCondition".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]); $valuetoshow=nl2br($valuetoshow); } - else if ($fieldlist[$field]=='libelle' && $tabname[$id]==MAIN_DB_PREFIX.'c_pays') { + else if ($fieldlist[$field]=='label' && $tabname[$id]==MAIN_DB_PREFIX.'c_country') { $key=$langs->trans("Country".strtoupper($obj->code)); $valuetoshow=($obj->code && $key != "Country".strtoupper($obj->code)?$key:$obj->$fieldlist[$field]); } @@ -1082,7 +1083,7 @@ if ($id) $key = $langs->trans('PaperFormat'.strtoupper($obj->code)); $valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->$fieldlist[$field]); } - else if ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees') + else if ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees') { $langs->load('trips'); $key = $langs->trans(strtoupper($obj->code)); @@ -1276,7 +1277,7 @@ function fieldList($fieldlist,$obj='',$tabname='') foreach ($fieldlist as $field => $value) { if ($fieldlist[$field] == 'country') { - if (in_array('region_id',$fieldlist)) { print ' '; continue; } // For region page, we do not show the country input + if (in_array('region_id',$fieldlist)) { print ''.join(',',$fieldlist).' '; continue; } // For state page, we do not show the country input (we link to region, not country) print ''; print $form->select_country((! empty($obj->country_code)?$obj->country_code:(! empty($obj->country)?$obj->country:'')), 'country', '', 28); print ''; diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 54bae759647..3c251cf6c3b 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -5,6 +5,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2008 Raphael Bertrand (Resultic) * Copyright (C) 2012-2013 Juanjo Menent + * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com> * * 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 @@ -261,6 +262,24 @@ if ($action == 'setforcedate') } } +if ($action == 'set_FAC_AUTO_FILLJS') +{ + $freetext = GETPOST('FAC_AUTO_FILLJS'); // No alpha here, we want exact string + + $res = dolibarr_set_const($db, "FAC_AUTO_FILLJS",$freetext,'chaine',0,'',$conf->entity); + + if (! $res > 0) $error++; + + if (! $error) + { + setEventMessage($langs->trans("SetupSaved")); + } + else + { + setEventMessage($langs->trans("Error"),'errors'); + } +} + /* * View @@ -500,7 +519,7 @@ print "\n"; clearstatcache(); $var=true; -foreach ($def as $reldir) +foreach ($dirmodels as $reldir) { foreach (array('','/doc') as $valdir) { @@ -765,6 +784,20 @@ print '\n"; print ''; +// Add js auto fill amount on paiement form +$var=! $var; +print '
'; +print ''; +print ''; +print ''; +print $langs->trans("JSOnPaimentBill"); +print ''; +print $form->selectyesno("FAC_AUTO_FILLJS",$conf->global->FAC_AUTO_FILLJS,1); +print ''; +print ''; +print "\n"; +print '
'; + print ''; diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index 26f6c08aee9..781bc24aa09 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -205,8 +205,8 @@ else $vat_rates=array(); $sql.="SELECT taux as vat_rate"; - $sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p"; - $sql.=" WHERE t.active=1 AND t.fk_pays = p.rowid AND p.code='".$mysoc->country_code."' AND taux != 0"; + $sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c"; + $sql.=" WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$mysoc->country_code."' AND taux != 0"; $sql.=" ORDER BY t.taux ASC"; $resql=$db->query($sql); if ($resql) diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 12ee7e2d98a..641a3166c04 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -332,7 +332,11 @@ foreach($configfileparameters as $key => $value) { if ($i > 0) print ', '; print $value2; - if (! is_readable($value2)) print ' '.img_warning($langs->trans("ErrorCantReadDirr")); + if (! is_readable($value2)) + { + $langs->load("errors"); + print ' '.img_warning($langs->trans("ErrorCantReadDir",$value2)); + } ++$i; } } diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index 18a55168191..40683bdc747 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -23,7 +23,7 @@ */ require '../../main.inc.php'; -include_once $dolibarr_main_document_root.'/core/lib/files.lib.php'; +include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; $langs->load("admin"); $langs->load("other"); diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php index 95f3583fe94..a168fba5b7b 100644 --- a/htdocs/cashdesk/facturation.php +++ b/htdocs/cashdesk/facturation.php @@ -156,10 +156,10 @@ $i=0; $sql = "SELECT t.rowid, t.taux"; $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t"; -$sql.= ", ".MAIN_DB_PREFIX."c_pays as p"; -$sql.= " WHERE t.fk_pays = p.rowid"; -$sql.= " AND t.active = 1"; -$sql.= " AND p.code = '".$mysoc->country_code."'"; +$sql.= ", ".MAIN_DB_PREFIX."c_country as c"; +$sql.= " WHERE t.fk_pays = c.rowid"; +$sql.= " AND c.active = 1"; +$sql.= " AND c.code = '".$mysoc->country_code."'"; //print $request; $resql = $db->query($sql); diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index f04c9e372a9..6a11985aa6a 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -5,6 +5,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2010-2013 Juanjo Menent * Copyright (C) 2013 Florian Henry + * Copyright (C) 2014 Cedric GROSS * * 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 @@ -384,7 +385,48 @@ if ($action == 'update') } } +/* + * Action move update, used when user move an event in calendar by drag'n drop + */ +if ($action == 'mupdate') +{ + $object->fetch($id); + $shour = dol_print_date($object->datep,"%H"); + $smin = dol_print_date($object->datep, "%M"); + + $newdate=GETPOST('newdate','alpha'); + if (empty($newdate) || strpos($newdate,'dayevent_') != 0 ) + { + header("Location: ".$backtopage); + exit; + } + $datep=dol_mktime($shour, $smin, 0, substr($newdate,13,2), substr($newdate,15,2), substr($newdate,9,4)); + if ($datep!=$object->datep) + { + if (!empty($object->datef)) + { + $object->datef+=$datep-$object->datep; + } + $object->datep=$datep; + $result=$object->update($user); + if ($result < 0) + { + setEventMessage($object->error,'errors'); + setEventMessage($object->errors,'errors'); + } + } + if (! empty($backtopage)) + { + header("Location: ".$backtopage); + exit; + } + else + { + $action=''; + } + +} /* * View */ diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index fe6e218f1a1..318d7efbee9 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -4,6 +4,7 @@ * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2014 Cedric GROSS * * 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 @@ -162,8 +163,9 @@ $nowyear=$nowarray['year']; $nowmonth=$nowarray['mon']; $nowday=$nowarray['mday']; -// Define list of all external calendars $listofextcals=array(); + +// Define list of external calendars (global admin setup) if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0) { $i=0; @@ -181,7 +183,22 @@ if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0 } } } - +// Define list of external calendars (user setup) +$i=0; +while($i < $conf->global->AGENDA_EXT_NB) +{ + $i++; + $source='AGENDA_EXT_SRC_'.$user->id.'_'.$i; + $name='AGENDA_EXT_NAME_'.$user->id.'_'.$i; + $color='AGENDA_EXT_COLOR_'.$user->id.'_'.$i; + $enabled='AGENDA_EXT_ENABLED_'.$user->id.'_'.$i; + $buggedfile='AGENDA_EXT_BUGGEDFILE_'.$user->id.'_'.$i; + if (! empty($user->conf->$source) && ! empty($user->conf->$name)) + { + // Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight' + $listofextcals[]=array('src'=>$user->conf->$source,'name'=>$user->conf->$name,'color'=>$user->conf->$color,'buggedfile'=>(isset($user->conf->buggedfile)?$user->conf->buggedfile:0)); + } +} if (empty($action) || $action=='show_month') { @@ -330,7 +347,12 @@ if ($conf->use_javascript_ajax) $s.='jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });' . "\n"; $s.='jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n"; $s.='jQuery(".family_birthday").toggle();' . "\n"; - $s.='});' . "\n"; + if ($action=="show_week" || $action=="show_month" || empty($action)) + { + $s.='jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {'; + $s.='var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n"; + } + $s.='});' . "\n"; $s.='' . "\n"; if (! empty($conf->use_javascript_ajax)) { @@ -932,6 +954,12 @@ if (empty($action) || $action == 'show_month') // View by month echo " \n"; } echo "\n"; + echo '
'; + echo ''; + echo ''; + echo '' ; + echo '
'; + } elseif ($action == 'show_week') // View by week { @@ -992,6 +1020,11 @@ elseif ($action == 'show_week') // View by week echo " \n"; echo "\n"; + echo '
'; + echo ''; + echo ''; + echo '' ; + echo '
'; } else // View by day { @@ -1089,7 +1122,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa print ''; } print ''; - print ''; + print ''; //$curtime = dol_mktime (0, 0, 0, $month, $day, $year); $i=0; $nummytasks=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array(); @@ -1134,9 +1167,9 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa $numicals[dol_string_nospecial($event->icalname)]++; } $color=$event->icalcolor; - $cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other'); + $cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other unsortable'); } - else if ($event->type_code == 'BIRTHDAY') { $numbirthday++; $colorindex=2; $cssclass='family_birthday'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]); } + else if ($event->type_code == 'BIRTHDAY') { $numbirthday++; $colorindex=2; $cssclass='family_birthday unsortable'; $color=sprintf("%02x%02x%02x",$theme_datacolor[$colorindex][0],$theme_datacolor[$colorindex][1],$theme_datacolor[$colorindex][2]); } else { $numother++; $cssclass='family_other'; } if ($color == -1) // Color was not forced. Set color according to color index. { @@ -1158,6 +1191,25 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa } $cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd; + // Defined style to disable drag and drop feature + if (empty($event->fulldayevent)) + { + if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) + { + $tmpyearend = date('Y',$event->date_end_in_calendar); + $tmpmonthend = date('m',$event->date_end_in_calendar); + $tmpdayend = date('d',$event->date_end_in_calendar); + if ($tmpyearend != $annee || $tmpmonthend != $mois || $tmpdayend != $jour) + { + $cssclass.= " unsortable"; + } + } + if ($event->type_code =='AC_OTH_AUTO') + { + $cssclass.= " unsortable"; + } + } + // Show rect of event print '
'; print '
  • '; @@ -1329,6 +1381,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa print '}'."\n"; print '});'."\n"; + print ''."\n"; } diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index 4c0d2d756da..55323b697f9 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -340,7 +340,7 @@ if ($resql) print ''; print ''; - if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_valid),$db->jdate($objp->date_livraison)) < ($now - $conf->commande->client->warning_delay)) + if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_commande),$db->jdate($objp->date_livraison)) < ($now - $conf->commande->client->warning_delay)) print img_picto($langs->trans("Late"),"warning"); if(!empty($objp->note_private)) { diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index e50c7bb34f6..4ca6175d785 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -607,10 +607,10 @@ class Account extends CommonObject $sql.= " ba.domiciliation, ba.proprio, ba.owner_address, ba.state_id, ba.fk_pays as country_id,"; $sql.= " ba.account_number, ba.accountancy_journal, ba.currency_code,"; $sql.= " ba.min_allowed, ba.min_desired, ba.comment,"; - $sql.= ' p.code as country_code, p.libelle as country,'; + $sql.= ' c.code as country_code, c.label as country,'; $sql.= ' d.code_departement as state_code, d.nom as state'; $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba"; - $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON ba.fk_pays = p.rowid'; + $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON ba.fk_pays = c.rowid'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON ba.state_id = d.rowid'; $sql.= " WHERE entity IN (".getEntity($this->element, 1).")"; if ($id) $sql.= " AND ba.rowid = ".$id; diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 0f17c543b9d..9eeacee312c 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -377,7 +377,7 @@ class Deplacement extends CommonObject $ret=array(); - $sql = "SELECT id, code, libelle as label"; + $sql = "SELECT id, code, label"; $sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees"; $sql.= " WHERE active = ".$active; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 53a607eac57..876e2966ccd 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -744,7 +744,7 @@ else if ($action == 'add' && $user->rights->facture->creer) } // Standard invoice or Deposit invoice created from a Predefined invoice - if (($_POST['type'] == 0 || $_POST['type'] == 3) && $_POST['fac_rec'] > 0) + if (($_POST['type'] == Facture::TYPE_STANDARD || $_POST['type'] == Facture::TYPE_DEPOSIT) && $_POST['fac_rec'] > 0) { $dateinvoice = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); if (empty($dateinvoice)) @@ -773,7 +773,7 @@ else if ($action == 'add' && $user->rights->facture->creer) } // Standard or deposit or proforma invoice - if (($_POST['type'] == 0 || $_POST['type'] == 3 || $_POST['type'] == 4) && $_POST['fac_rec'] <= 0) + if (($_POST['type'] == Facture::TYPE_STANDARD || $_POST['type'] == Facture::TYPE_DEPOSIT || $_POST['type'] == Facture::TYPE_PROFORMA) && $_POST['fac_rec'] <= 0) { if (GETPOST('socid', 'int') < 1) { @@ -852,7 +852,7 @@ else if ($action == 'add' && $user->rights->facture->creer) if ($id > 0) { // If deposit invoice - if ($_POST['type'] == 3) + if ($_POST['type'] == Facture::TYPE_DEPOSIT) { $typeamount = GETPOST('typedeposit', 'alpha'); $valuedeposit = GETPOST('valuedeposit', 'int'); @@ -938,6 +938,9 @@ else if ($action == 'add' && $user->rights->facture->creer) $num=count($lines); for ($i=0;$i<$num;$i++) { + // Don't add lines with qty 0 when coming from a shipment including all order lines + if($srcobject->element == 'shipping' && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS && $lines[$i]->qty == 0) continue; + $label=(! empty($lines[$i]->label)?$lines[$i]->label:''); $desc=(! empty($lines[$i]->desc)?$lines[$i]->desc:$lines[$i]->libelle); @@ -2304,7 +2307,16 @@ if ($action == 'create') elseif ($newclassname == 'Fichinter') $newclassname = 'Intervention'; - print '' . $langs->trans($newclassname) . '' . $objectsrc->getNomUrl(1) . ''; + print '' . $langs->trans($newclassname) . '' . $objectsrc->getNomUrl(1); + //We check if Origin document has already an invoice attached to it + $objectsrc->fetchObjectLinked($originid,'','','facture'); + $cntinvoice=count($objectsrc->linkedObjects['facture']); + if ($cntinvoice>=1) + { + setEventMessage('WarningBillExist','warnings'); + echo ' ('.$langs->trans('LatestRelatedBill').end($objectsrc->linkedObjects['facture'])->getNomUrl(1).')'; + } + echo ''; print '' . $langs->trans('TotalHT') . '' . price($objectsrc->total_ht) . ''; print '' . $langs->trans('TotalVAT') . '' . price($objectsrc->total_tva) . ""; if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) // Localtax1 diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 7e5af441280..9b0e236af35 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -593,6 +593,8 @@ class Facture extends CommonInvoice // Load source object $objFrom = dol_clone($this); + + // Change socid if needed if (! empty($socid) && $socid != $this->socid) @@ -635,10 +637,22 @@ class Facture extends CommonInvoice unset($this->products[$i]); // Tant que products encore utilise } } - + // Create clone $result=$this->create($user); if ($result < 0) $error++; + else { + // copy internal contacts + if ($this->copy_linked_contact($objFrom, 'internal') < 0) + $error++; + + // copy external contacts if same company + elseif ($objFrom->socid == $this->socid) + { + if ($this->copy_linked_contact($objFrom, 'external') < 0) + $error++; + } + } if (! $error) { diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 99f3a0ba082..4cac0678f4e 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -367,6 +367,7 @@ $now=dol_now(); $search_ref = GETPOST("search_ref"); $search_refcustomer=GETPOST('search_refcustomer'); $search_societe = GETPOST("search_societe"); +$search_paymentmode = GETPOST("search_paymentmode"); $search_montant_ht = GETPOST("search_montant_ht"); $search_montant_ttc = GETPOST("search_montant_ttc"); $late = GETPOST("late"); @@ -386,7 +387,7 @@ $limit = $conf->liste_limit; $sql = "SELECT s.nom, s.rowid as socid, s.email"; $sql.= ", f.rowid as facid, f.facnumber, f.ref_client, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp"; $sql.= ", f.datef as df, f.date_lim_reglement as datelimite"; -$sql.= ", f.paye as paye, f.fk_statut, f.type"; +$sql.= ", f.paye as paye, f.fk_statut, f.type, f.fk_mode_reglement"; $sql.= ", sum(pf.amount) as am"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user "; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; @@ -412,6 +413,7 @@ if (GETPOST('filtre')) if ($search_ref) $sql .= " AND f.facnumber LIKE '%".$db->escape($search_ref)."%'"; if ($search_refcustomer) $sql .= " AND f.ref_client LIKE '%".$db->escape($search_refcustomer)."%'"; if ($search_societe) $sql .= " AND s.nom LIKE '%".$db->escape($search_societe)."%'"; +if ($search_paymentmode) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode.""; if ($search_montant_ht) $sql .= " AND f.total = '".$db->escape($search_montant_ht)."'"; if ($search_montant_ttc) $sql .= " AND f.total_ttc = '".$db->escape($search_montant_ttc)."'"; if (GETPOST('sf_ref')) $sql .= " AND f.facnumber LIKE '%".$db->escape(GETPOST('sf_ref'))."%'"; @@ -441,6 +443,7 @@ if ($resql) if ($search_ref) $param.='&search_ref='.urlencode($search_ref); if ($search_refcustomer) $param.='&search_ref='.urlencode($search_refcustomer); if ($search_societe) $param.='&search_societe='.urlencode($search_societe); + if ($search_societe) $param.='&search_paymentmode='.urlencode($search_paymentmode); if ($search_montant_ht) $param.='&search_montant_ht='.urlencode($search_montant_ht); if ($search_montant_ttc) $param.='&search_montant_ttc='.urlencode($search_montant_ttc); if ($late) $param.='&late='.urlencode($late); @@ -530,6 +533,7 @@ if ($resql) print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"f.date_lim_reglement","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("PaymentMode"),$_SERVER["PHP_SELF"],"f.fk_reglement_mode","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Taxes"),$_SERVER["PHP_SELF"],"f.tva","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder); @@ -557,6 +561,9 @@ if ($resql) print ' '; print ' '; print ''; + print ''; + $form->select_types_paiements($search_paymentmode, 'search_paymentmode'); + print ''; print ''; print ' '; print ''; @@ -636,7 +643,20 @@ if ($resql) print ''.dol_print_date($db->jdate($objp->df),'day').''."\n"; print ''.dol_print_date($db->jdate($objp->datelimite),'day').''."\n"; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,28).''; + print ''; + $thirdparty=new Societe($db); + $thirdparty->id=$objp->socid; + $thirdparty->nom=$objp->nom; + $thirdparty->client=$objp->client; + $thirdparty->code_client=$objp->code_client; + print $thirdparty->getNomUrl(1,'customer'); + print ''; + + // Payment mode + print ''; + $form->form_modes_reglement($_SERVER['PHP_SELF'], $objp->fk_mode_reglement, 'none'); + print ''; + print ''.price($objp->total_ht).''; print ''.price($objp->total_tva); diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 008721ef018..e7d11fb1b99 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -4,6 +4,7 @@ * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke + * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com> * * 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 @@ -374,19 +375,15 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie }); '; - // Add user helper to input amount on invoices - if (! empty($conf->global->MAIN_JS_ON_PAYMENT) && $facture->type != 2) - { - print ' $("#payment_form").find("img").click(function() { - callForResult(jQuery(this).attr("id")); - }); - - $("#amountpayment").change(function() { - callForResult(); - });'; - } - print ' });'."\n"; + if(!empty($conf->global->FAC_AUTO_FILLJS)){ + //Add js for AutoFill + print ' $(document).ready(function () {'; + print ' $(".AutoFillAmout").on(\'click touchstart\', function(){ + $("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value")).trigger("change"); + });'; + print ' });'."\n"; + } print ' '."\n"; } @@ -412,7 +409,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''.$langs->trans('Comments').''; $rowspan=5; - if ($conf->use_javascript_ajax && !empty($conf->global->MAIN_JS_ON_PAYMENT)) $rowspan++; // Payment mode print ''.$langs->trans('PaymentMode').''; @@ -438,24 +434,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie } print "\n"; - // Payment amount - if ($conf->use_javascript_ajax && !empty($conf->global->MAIN_JS_ON_PAYMENT)) - { - print ''.$langs->trans('AmountPayment').''; - print ''; - if ($action == 'add_paiement') - { - print ''; - print ''; - } - else - { - print ''; - } - print ''; - print ''; - } - // Cheque number print ''.$langs->trans('Numero'); print ' ('.$langs->trans("ChequeOrTransferNumber").')'; @@ -578,10 +556,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie if ($action != 'add_paiement') { - if ($conf->use_javascript_ajax && !empty($conf->global->MAIN_JS_ON_PAYMENT)) - { - print img_picto($langs->trans('AddRemind'),'rightarrow.png','id="'.$objp->facid.'"'); - } + if(!empty($conf->global->FAC_AUTO_FILLJS)) + print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'"); print ''; print ''; } diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 60b056babf4..6c0c7c87558 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -1260,7 +1260,7 @@ class BonPrelevement extends CommonObject /* * section Debiteur (sepa Debiteurs bloc lines) */ - $sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, soc.datec, p.code as country_code,"; + $sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, soc.datec, c.code as country_code,"; $sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,"; $sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum"; $sql.= " FROM"; @@ -1268,12 +1268,12 @@ class BonPrelevement extends CommonObject $sql.= " ".MAIN_DB_PREFIX."facture as f,"; $sql.= " ".MAIN_DB_PREFIX."prelevement_facture as pf,"; $sql.= " ".MAIN_DB_PREFIX."societe as soc,"; - $sql.= " ".MAIN_DB_PREFIX."c_pays as p,"; + $sql.= " ".MAIN_DB_PREFIX."c_country as c,"; $sql.= " ".MAIN_DB_PREFIX."societe_rib as rib"; $sql.= " WHERE pl.fk_prelevement_bons = ".$this->id; $sql.= " AND pl.rowid = pf.fk_prelevement_lignes"; $sql.= " AND pf.fk_facture = f.rowid"; - $sql.= " AND soc.fk_pays = p.rowid"; + $sql.= " AND soc.fk_pays = c.rowid"; $sql.= " AND soc.rowid = f.fk_soc"; $sql.= " AND rib.fk_soc = f.fk_soc"; $sql.= " AND rib.default_rib = 1"; @@ -1493,7 +1493,7 @@ class BonPrelevement extends CommonObject * @param string $row_address soc.address AS adr, * @param string $row_zip soc.zip * @param string $row_town soc.town - * @param string $row_country_code p.code AS pays, + * @param string $row_country_code c.code AS country, * @param string $row_cb pl.code_banque AS cb, * @param string $row_cg pl.code_guichet AS cg, * @param string $row_cc pl.number AS cc, @@ -1648,7 +1648,7 @@ class BonPrelevement extends CommonObject $obj = $this->db->fetch_object($resql); // DONNEES BRUTES : par la suite Rows['XXX'] de la requete au dessus - $pays = explode(':', $configuration->global->MAIN_INFO_SOCIETE_COUNTRY); + $country = explode(':', $configuration->global->MAIN_INFO_SOCIETE_COUNTRY); $IdBon = sprintf("%05d", $obj->rowid); $RefBon = $obj->ref; $type = ($nombre == 1) ? 'FRST' : 'RCUR' ; @@ -1673,7 +1673,7 @@ class BonPrelevement extends CommonObject $XML_SEPA_INFO .= ' '.$CrLf; $XML_SEPA_INFO .= ' '.$configuration->global->PRELEVEMENT_RAISON_SOCIALE.''.$CrLf; $XML_SEPA_INFO .= ' '.$CrLf; - $XML_SEPA_INFO .= ' '.$pays[1].''.$CrLf; + $XML_SEPA_INFO .= ' '.$country[1].''.$CrLf; $XML_SEPA_INFO .= ' '.$configuration->global->MAIN_INFO_SOCIETE_ADDRESS.''.$CrLf; $XML_SEPA_INFO .= ' '.$configuration->global->MAIN_INFO_SOCIETE_ZIP.' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN.''.$CrLf; $XML_SEPA_INFO .= ' '.$CrLf; @@ -1691,7 +1691,7 @@ class BonPrelevement extends CommonObject /* $XML_SEPA_INFO .= ' '.$CrLf; $XML_SEPA_INFO .= ' '.$configuration->global->PRELEVEMENT_RAISON_SOCIALE.''.$CrLf; $XML_SEPA_INFO .= ' '.$CrLf; - $XML_SEPA_INFO .= ' '.$pays[1].''.$CrLf; + $XML_SEPA_INFO .= ' '.$country[1].''.$CrLf; $XML_SEPA_INFO .= ' '.$conf->global->MAIN_INFO_SOCIETE_ADDRESS.''.$CrLf; $XML_SEPA_INFO .= ' '.$conf->global->MAIN_INFO_SOCIETE_ZIP.' '.$conf->global->MAIN_INFO_SOCIETE_TOWN.''.$CrLf; $XML_SEPA_INFO .= ' '.$CrLf; diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php index a2612e51e47..3cb150b8432 100644 --- a/htdocs/contact/canvas/actions_contactcard_common.class.php +++ b/htdocs/contact/canvas/actions_contactcard_common.class.php @@ -450,7 +450,7 @@ abstract class ActionsContactCardCommon // We set country_id, and country_code label of the chosen country if ($this->object->country_id) { - $sql = "SELECT code, libelle FROM ".MAIN_DB_PREFIX."c_pays WHERE rowid = ".$this->object->country_id; + $sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id; $resql=$this->db->query($sql); if ($resql) { @@ -460,9 +460,9 @@ abstract class ActionsContactCardCommon { dol_print_error($this->db); } - $this->object->country_id = $langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->libelle; + $this->object->country_id = $langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label; $this->object->country_code = $obj->code; - $this->object->country = $langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->libelle; + $this->object->country = $langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label; } } diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 7df509ddefa..878ee1fa956 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -506,12 +506,12 @@ class Contact extends CommonObject $sql.= " c.poste, c.phone, c.phone_perso, c.phone_mobile, c.fax, c.email, c.jabberid, c.skype,"; $sql.= " c.priv, c.note_private, c.note_public, c.default_lang, c.no_email, c.canvas,"; $sql.= " c.import_key,"; - $sql.= " p.libelle as country, p.code as country_code,"; + $sql.= " co.label as country, co.code as country_code,"; $sql.= " d.nom as state, d.code_departement as state_code,"; $sql.= " u.rowid as user_id, u.login as user_login,"; $sql.= " s.nom as socname, s.address as socaddress, s.zip as soccp, s.town as soccity, s.default_lang as socdefault_lang"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p ON c.fk_pays = p.rowid"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON c.fk_pays = co.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON c.fk_departement = d.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid"; diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 5c2b2f04938..d8e21b8cc4c 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -124,9 +124,9 @@ $formother=new FormOther($db); $sql = "SELECT s.rowid as socid, s.nom as name,"; $sql.= " p.rowid as cidp, p.lastname as lastname, p.statut, p.firstname, p.poste, p.email, p.skype,"; $sql.= " p.phone, p.phone_mobile, p.fax, p.fk_pays, p.priv, p.tms,"; -$sql.= " cp.code as country_code"; +$sql.= " co.code as country_code"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as p"; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_pays as cp ON cp.rowid = p.fk_pays"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = p.fk_pays"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc"; if (! empty($search_categ)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_contact as cs ON p.rowid = cs.fk_socpeople"; // We need this table joined to the select in order to filter by categ if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc"; @@ -172,11 +172,11 @@ if (strlen($search_phone)) } if (strlen($search_phoneper)) { - $sql .= " AND p.phone LIKE '%".$db->escape($search_phoneper)."%'"; + $sql .= " AND p.phone_perso LIKE '%".$db->escape($search_phoneper)."%'"; } if (strlen($search_phonepro)) { - $sql .= " AND p.phone_perso LIKE '%".$db->escape($search_phonepro)."%'"; + $sql .= " AND p.phone LIKE '%".$db->escape($search_phonepro)."%'"; } if (strlen($search_phonemob)) { diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 9c57ff9f570..d42db357ffe 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -45,6 +45,7 @@ class Contrat extends CommonObject var $id; var $ref; var $ref_ext; + var $ref_customer; var $socid; var $societe; // Objet societe var $statut=0; // 0=Draft, @@ -400,6 +401,7 @@ class Contrat extends CommonObject $sql.= " fk_projet,"; $sql.= " fk_commercial_signature, fk_commercial_suivi,"; $sql.= " note_private, note_public, extraparams"; + $sql.= " ,ref_customer"; $sql.= " ,ref_ext"; $sql.= " FROM ".MAIN_DB_PREFIX."contrat"; if ($ref) @@ -419,6 +421,7 @@ class Contrat extends CommonObject { $this->id = $result["rowid"]; $this->ref = (!isset($result["ref"]) || !$result["ref"]) ? $result["rowid"] : $result["ref"]; + $this->ref_customer = $result["ref_customer"]; $this->ref_ext = $result["ref_ext"]; $this->statut = $result["statut"]; $this->mise_en_service = $this->db->jdate($result["datemise"]); @@ -720,7 +723,7 @@ class Contrat extends CommonObject // Insert contract $sql = "INSERT INTO ".MAIN_DB_PREFIX."contrat (datec, fk_soc, fk_user_author, date_contrat,"; $sql.= " fk_commercial_signature, fk_commercial_suivi, fk_projet,"; - $sql.= " ref, entity, note_private, note_public, ref_ext)"; + $sql.= " ref, entity, note_private, note_public, ref_customer, ref_ext)"; $sql.= " VALUES ('".$this->db->idate($now)."',".$this->socid.",".$user->id; $sql.= ", '".$this->db->idate($this->date_contrat)."'"; $sql.= ",".($this->commercial_signature_id>0?$this->commercial_signature_id:"NULL"); @@ -730,6 +733,7 @@ class Contrat extends CommonObject $sql.= ", ".$conf->entity; $sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL"); $sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL"); + $sql.= ", ".(!empty($this->ref_customer)?("'".$this->db->escape($this->ref_customer)."'"):"NULL"); $sql.= ", ".(!empty($this->ref_ext)?("'".$this->db->escape($this->ref_ext)."'"):"NULL"); $sql.= ")"; $resql=$this->db->query($sql); @@ -739,13 +743,28 @@ class Contrat extends CommonObject $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."contrat"); - // Mise a jour ref - $sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id; - if ($this->db->query($sql)) + + // Load object modContract + $module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_olive'); + if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php') { - if ($this->id) + $module = substr($module, 0, dol_strlen($module)-4); + } + $result=dol_include_once('/core/modules/contract/'.$module.'.php'); + if ($result > 0) + { + $modCodeContract = new $module(); + } + + if (!empty($modCodeContract->code_auto)) { + // Mise a jour ref + $sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id; + if ($this->db->query($sql)) { - $this->ref="(PROV".$this->id.")"; + if ($this->id) + { + $this->ref="(PROV".$this->id.")"; + } } } @@ -824,6 +843,7 @@ class Contrat extends CommonObject function delete($user) { global $conf, $langs; + require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; $error=0; @@ -965,6 +985,7 @@ class Contrat extends CommonObject // Clean parameters if (isset($this->ref)) $this->ref=trim($this->ref); + if (isset($this->ref_customer)) $this->ref_customer=trim($this->ref_customer); if (isset($this->ref_ext)) $this->ref_ext=trim($this->ref_ext); if (isset($this->entity)) $this->entity=trim($this->entity); if (isset($this->statut)) $this->statut=trim($this->statut); @@ -988,6 +1009,7 @@ class Contrat extends CommonObject $sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET"; $sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").","; + $sql.= " ref_customer=".(isset($this->ref_customer)?"'".$this->db->escape($this->ref_customer)."'":"null").","; $sql.= " ref_ext=".(isset($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null").","; $sql.= " entity=".$conf->entity.","; $sql.= " date_contrat=".(dol_strlen($this->date_contrat)!=0 ? "'".$this->db->idate($this->date_contrat)."'" : 'null').","; diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index ef5b4efab74..38f4ba9a8c4 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -207,7 +207,7 @@ if ($action == 'add' && $user->rights->contrat->creer) $object->fk_project = GETPOST('projectid','int'); $object->remise_percent = GETPOST('remise_percent','alpha'); $object->ref = GETPOST('ref','alpha'); - $object->ref_ext = GETPOST('ref_ext','alpha'); + $object->ref_customer = GETPOST('ref_customer','alpha'); // If creation from another object of another module (Example: origin=propal, originid=1) if ($_POST['origin'] && $_POST['originid']) @@ -342,7 +342,7 @@ if ($action == 'add' && $user->rights->contrat->creer) // Fill array 'array_options' with data from add form $ret = $extrafields->setOptionalsFromPost($extralabels, $object); - + $result = $object->create($user); if ($result > 0) { @@ -729,17 +729,32 @@ else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contra $action = 'edit_extras'; setEventMessage($object->error,'errors'); } -} elseif ($action=='setref_ext') { +} elseif ($action=='setref_customer') { $result = $object->fetch($id); if ($result < 0) { setEventMessage($object->errors,'errors'); } - $object->ref_ext=GETPOST('ref_ext','alpha'); + $object->ref_customer=GETPOST('ref_customer','alpha'); $result = $object->update($user); if ($result < 0) { setEventMessage($object->errors,'errors'); - $action='editref_ext'; + $action='editref_customer'; + } else { + header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); + exit; + } +} elseif ($action=='setref') { + $result = $object->fetch($id); + if ($result < 0) { + setEventMessage($object->errors,'errors'); + } + $object->ref=GETPOST('ref','alpha'); + + $result = $object->update($user); + if ($result < 0) { + setEventMessage($object->errors,'errors'); + $action='editref'; } else { header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; @@ -818,6 +833,18 @@ $form = new Form($db); $objectlignestatic=new ContratLigne($db); +// Load object modContract +$module=(! empty($conf->global->CONTRACT_ADDON)?$conf->global->CONTRACT_ADDON:'mod_contract_olive'); +if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php') +{ + $module = substr($module, 0, dol_strlen($module)-4); +} +$result=dol_include_once('/core/modules/contract/'.$module.'.php'); +if ($result > 0) +{ + $modCodeContract = new $module(); +} + /********************************************************************* * @@ -878,8 +905,6 @@ if ($action == 'create') $object->date_contrat = dol_now(); - $numct = $object->getNextNumRef($soc); - print '
    '; print ''; @@ -890,11 +915,16 @@ if ($action == 'create') print ''; // Ref - print ''; + if (! empty($modCodeContract->code_auto)) { + $tmpcode=$langs->trans("Draft"); + } else { + $tmpcode=''; + } + print ''; // Ref Int print ''; - print ''; + print ''; // Customer print ''; @@ -1040,7 +1070,7 @@ else if ($action == 'valid') { $ref = substr($object->ref, 1, 4); - if ($ref == 'PROV') + if ($ref == 'PROV' && !empty($modCodeContract->code_auto)) { $numref = $object->getNextNumRef($soc); } @@ -1079,15 +1109,25 @@ else $linkback = ''.$langs->trans("BackToList").''; // Ref du contrat - print '"; + if (!empty($modCodeContract->code_auto)) { + print '"; + } else { + print ''; + print ''; + print ''; + } print ''; print ''; print ''; diff --git a/htdocs/contrat/liste.php b/htdocs/contrat/liste.php index 16586b9dd4c..6bd9e249bc7 100644 --- a/htdocs/contrat/liste.php +++ b/htdocs/contrat/liste.php @@ -42,7 +42,7 @@ $offset = $limit * $page ; $search_nom=GETPOST('search_nom'); $search_contract=GETPOST('search_contract'); -$search_ref_ext=GETPOST('search_ref_ext','alpha'); +$search_ref_customer=GETPOST('search_ref_customer','alpha'); $sall=GETPOST('sall'); $statut=GETPOST('statut')?GETPOST('statut'):1; $socid=GETPOST('socid'); @@ -75,7 +75,7 @@ $sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND $sql.= ' SUM('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,'; $sql.= " c.rowid as cid, c.ref, c.datec, c.date_contrat, c.statut,"; $sql.= " s.nom, s.rowid as socid"; -$sql.= " ,c.ref_ext"; +$sql.= " ,c.ref_customer"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= ", ".MAIN_DB_PREFIX."contrat as c"; @@ -90,8 +90,8 @@ if ($search_nom) { if ($search_contract) { $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract); } -if (!empty($search_ref_ext)) { - $sql .= natural_search(array('c.ref_ext'), $search_ref_ext); +if (!empty($search_ref_customer)) { + $sql .= natural_search(array('c.ref_customer'), $search_ref_customer); } if ($sall) { $sql .= natural_search(array('s.nom', 'cd.label', 'cd.description'), $sall); @@ -114,9 +114,9 @@ if ($resql) print ''; $param='&search_contract='.$search_contract; $param.='&search_nom='.$search_nom; - $param.='&search_ref_ext='.$search_ref_ext; + $param.='&search_ref_customer='.$search_ref_customer; print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "c.rowid","","$param",'',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("RefCustomer"), $_SERVER["PHP_SELF"], "c.ref_ext","","$param",'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("RefCustomer"), $_SERVER["PHP_SELF"], "c.ref_customer","","$param",'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"], "s.nom","","$param",'',$sortfield,$sortorder); //print_liste_field_titre($langs->trans("DateCreation"), $_SERVER["PHP_SELF"], "c.datec","","$param",'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateContract"), $_SERVER["PHP_SELF"], "c.date_contrat","","$param",'align="center"',$sortfield,$sortorder); @@ -134,7 +134,7 @@ if ($resql) print ''; print ''; print ''; print ''; - print ''; + print ''; print ''; //print ''; print ''; diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php index 80f6cd9bd63..def98b25ae8 100644 --- a/htdocs/core/ajax/ziptown.php +++ b/htdocs/core/ajax/ziptown.php @@ -63,13 +63,13 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town'])) if (! empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) // Use zip-town table { $sql = "SELECT z.rowid, z.zip, z.town, z.fk_county, z.fk_pays as fk_country"; - $sql.= ", p.rowid as fk_country, p.code as country_code, p.libelle as country"; + $sql.= ", c.rowid as fk_country, c.code as country_code, c.label as country"; $sql.= ", d.rowid as fk_county, d.code_departement as county_code, d.nom as county"; - $sql.= " FROM (".MAIN_DB_PREFIX."c_ziptown as z,".MAIN_DB_PREFIX."c_pays as p)"; + $sql.= " FROM (".MAIN_DB_PREFIX."c_ziptown as z,".MAIN_DB_PREFIX."c_country as c)"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON z.fk_county = d.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r ON d.fk_region = r.code_region"; - $sql.= " WHERE z.fk_pays = p.rowid"; - $sql.= " AND z.active = 1 AND p.active = 1"; + $sql.= " WHERE z.fk_pays = c.rowid"; + $sql.= " AND z.active = 1 AND c.active = 1"; if ($zipcode) $sql.=" AND z.zip LIKE '" . $db->escape($zipcode) . "%'"; if ($town) $sql.=" AND z.town LIKE '%" . $db->escape($town) . "%'"; $sql.= " ORDER BY z.zip, z.town"; @@ -78,11 +78,11 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town'])) else // Use table of third parties { $sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country"; - $sql.= ", p.code as country_code, p.libelle as country"; + $sql.= ", c.code as country_code, c.label as country"; $sql.= ", d.code_departement as county_code , d.nom as county"; $sql.= " FROM ".MAIN_DB_PREFIX.'societe as s'; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON fk_departement = d.rowid"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.'c_pays as p ON fk_pays = p.rowid'; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.'c_country as c ON fk_pays = c.rowid'; $sql.= " WHERE"; if ($zipcode) $sql.= " s.zip LIKE '".$db->escape($zipcode)."%'"; if ($town) $sql.= " s.town LIKE '%" . $db->escape($town) . "%'"; diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php index fab476c0c95..62ed89dd65b 100644 --- a/htdocs/core/boxes/box_project.php +++ b/htdocs/core/boxes/box_project.php @@ -77,10 +77,8 @@ class box_project extends ModeleBoxes { $sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut "; - $sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."projet as p"; - $sql.= ")"; - $sql.= " WHERE p.fk_soc = s.rowid"; - $sql.= " AND s.entity = ".$conf->entity; + $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; + $sql.= " WHERE p.entity = ".$conf->entity; $sql.= " AND p.fk_statut = 1"; // Seulement les projets ouverts $sql.= " ORDER BY p.datec DESC"; $sql.= $db->plimit($max, 0); @@ -107,16 +105,16 @@ class box_project extends ModeleBoxes ); $sql ="SELECT count(*) as nb, sum(progress) as totprogress"; - $sql.=" FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet as p"; - $sql.=" WHERE pt.fk_projet = p.rowid"; - $sql.=" AND p.entity = ".$conf->entity; + $sql.=" FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid"; + $sql.=" WHERE p.entity = ".$conf->entity; + $resultTask = $db->query($sql); if ($resultTask) { $objTask = $db->fetch_object($resultTask); $this->info_box_contents[$i][3] = array('td' => 'align="right"', 'text' => number_format($objTask->nb, 0, ',', ' ')." ".$langs->trans("Tasks")); if ($objTask->nb > 0 ) - $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => number_format(($objTask->totprogress/$objTask->nb), 0, ',', ' ')." % ".$langs->trans("Progress")); + $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => number_format(($objTask->totprogress/$objTask->nb), 0, ',', ' ')."%"); else $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => "N/A "); $totalnbTask += $objTask->nb; @@ -134,10 +132,11 @@ class box_project extends ModeleBoxes // Add the sum à the bottom of the boxes - $this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'colspan=2 align="left" ', 'text' => $langs->trans("Total")." ".$textHead); - $this->info_box_contents[$i][1] = array('td' => 'align="right" ', 'text' => number_format($num, 0, ',', ' ')." ".$langs->trans("Projects")); - $this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => number_format($totalnbTask, 0, ',', ' ')." ".$langs->trans("Tasks")); - $this->info_box_contents[$i][4] = array('td' => 'colspan=2', 'text' => ""); + $this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'align="left" ', 'text' => $langs->trans("Total")." ".$textHead); + $this->info_box_contents[$i][1] = array('td' => '', 'text' => ""); + $this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => number_format($num, 0, ',', ' ')." ".$langs->trans("Projects")); + $this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => number_format($totalnbTask, 0, ',', ' ')." ".$langs->trans("Tasks")); + $this->info_box_contents[$i][4] = array('td' => '', 'text' => ""); } diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php index 3f2e5f05c16..c15bc9831ce 100644 --- a/htdocs/core/boxes/box_task.php +++ b/htdocs/core/boxes/box_task.php @@ -120,12 +120,13 @@ class box_task extends ModeleBoxes // Add the sum à the bottom of the boxes - $this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'colspan=2 align="left" ', 'text' => $langs->trans("Total")." ".$textHead); - $this->info_box_contents[$i][1] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')." ".$langs->trans("Tasks")); - $this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5)); - $this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5)); - $this->info_box_contents[$i][4] = array('td' => 'colspan=2', 'text' => ""); - + $this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'align="left" ', 'text' => $langs->trans("Total")." ".$textHead); + $this->info_box_contents[$i][1] = array('td' => '', 'text' => ""); + $this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')." ".$langs->trans("Tasks")); + $this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5)); + $this->info_box_contents[$i][4] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5)); + $this->info_box_contents[$i][5] = array('td' => '', 'text' => ""); + } /** diff --git a/htdocs/core/class/cpays.class.php b/htdocs/core/class/ccountry.class.php similarity index 90% rename from htdocs/core/class/cpays.class.php rename to htdocs/core/class/ccountry.class.php index e75f8a75a1a..088dfaf327b 100644 --- a/htdocs/core/class/cpays.class.php +++ b/htdocs/core/class/ccountry.class.php @@ -16,9 +16,9 @@ */ /** - * \file htdocs/core/class/cpays.class.php + * \file htdocs/core/class/ccountry.class.php * \ingroup core - * \brief This file is a CRUD class file (Create/Read/Update/Delete) for c_pays dictionary + * \brief This file is a CRUD class file (Create/Read/Update/Delete) for c_country dictionary */ // Put here all includes required by your class file @@ -30,18 +30,18 @@ /** * Class to manage dictionary Countries (used by imports) */ -class Cpays // extends CommonObject +class Ccountry // extends CommonObject { var $db; //!< To store db handler var $error; //!< To return error code (or message) var $errors=array(); //!< To return several error codes (or messages) - //var $element='cpays'; //!< Id that identify managed objects - //var $table_element='cpays'; //!< Name of table without prefix where object is stored + //var $element='ccountry'; //!< Id that identify managed objects + //var $table_element='ccountry'; //!< Name of table without prefix where object is stored var $id; var $code; var $code_iso; - var $libelle; + var $label; var $active; @@ -74,24 +74,24 @@ class Cpays // extends CommonObject // Clean parameters if (isset($this->code)) $this->code=trim($this->code); if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso); - if (isset($this->libelle)) $this->libelle=trim($this->libelle); + if (isset($this->label)) $this->label=trim($this->label); if (isset($this->active)) $this->active=trim($this->active); // Check parameters // Put here code to add control on parameters values // Insert request - $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_pays("; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country("; $sql.= "rowid,"; $sql.= "code,"; $sql.= "code_iso,"; - $sql.= "libelle,"; + $sql.= "label,"; $sql.= "active"; $sql.= ") VALUES ("; $sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->rowid."'").","; $sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").","; $sql.= " ".(! isset($this->code_iso)?'NULL':"'".$this->db->escape($this->code_iso)."'").","; - $sql.= " ".(! isset($this->libelle)?'NULL':"'".$this->db->escape($this->libelle)."'").","; + $sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").","; $sql.= " ".(! isset($this->active)?'NULL':"'".$this->active."'").""; $sql.= ")"; @@ -103,7 +103,7 @@ class Cpays // extends CommonObject if (! $error) { - $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_pays"); + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country"); if (! $notrigger) { @@ -152,9 +152,9 @@ class Cpays // extends CommonObject $sql.= " t.rowid,"; $sql.= " t.code,"; $sql.= " t.code_iso,"; - $sql.= " t.libelle,"; + $sql.= " t.label,"; $sql.= " t.active"; - $sql.= " FROM ".MAIN_DB_PREFIX."c_pays as t"; + $sql.= " FROM ".MAIN_DB_PREFIX."c_country as t"; if ($id) $sql.= " WHERE t.rowid = ".$id; elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'"; @@ -169,7 +169,7 @@ class Cpays // extends CommonObject $this->id = $obj->rowid; $this->code = $obj->code; $this->code_iso = $obj->code_iso; - $this->libelle = $obj->libelle; + $this->label = $obj->label; $this->active = $obj->active; } $this->db->free($resql); @@ -199,7 +199,7 @@ class Cpays // extends CommonObject // Clean parameters if (isset($this->code)) $this->code=trim($this->code); if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso); - if (isset($this->libelle)) $this->libelle=trim($this->libelle); + if (isset($this->label)) $this->label=trim($this->label); if (isset($this->active)) $this->active=trim($this->active); @@ -207,10 +207,10 @@ class Cpays // extends CommonObject // Put here code to add control on parameters values // Update request - $sql = "UPDATE ".MAIN_DB_PREFIX."c_pays SET"; + $sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET"; $sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").","; $sql.= " code_iso=".(isset($this->code_iso)?"'".$this->db->escape($this->code_iso)."'":"null").","; - $sql.= " libelle=".(isset($this->libelle)?"'".$this->db->escape($this->libelle)."'":"null").","; + $sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").","; $sql.= " active=".(isset($this->active)?$this->active:"null").""; $sql.= " WHERE rowid=".$this->id; @@ -267,7 +267,7 @@ class Cpays // extends CommonObject global $conf, $langs; $error=0; - $sql = "DELETE FROM ".MAIN_DB_PREFIX."c_pays"; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."c_country"; $sql.= " WHERE rowid=".$this->id; $this->db->begin(); diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 69c3050ba30..af71662b3a5 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -47,6 +47,8 @@ abstract class CommonObject public $array_options=array(); + public $thirdparty; + public $linkedObjectsIds; // Loaded by ->fetchObjectLinked public $linkedObjects; // Loaded by ->fetchObjectLinked @@ -596,10 +598,10 @@ abstract class CommonObject { global $conf; - if (empty($this->socid) && empty($this->fk_soc)) return 0; + if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty)) return 0; $thirdparty = new Societe($this->db); - $result=$thirdparty->fetch(isset($this->socid)?$this->socid:$this->fk_soc); + $result=$thirdparty->fetch(isset($this->socid)?$this->socid:(isset($this->fk_soc)?$this->fk_soc:$this->fk_thirdparty)); $this->client = $thirdparty; // deprecated $this->thirdparty = $thirdparty; diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 2ba661a9af4..df1527d47b9 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -680,6 +680,7 @@ class ExtraFields } $out.=''; + $out.= ''."\n"; } } } - print "
    '.$langs->trans('Ref').''.$langs->trans("Draft").'
    '.$langs->trans('Ref').''.$tmpcode.'
    '.$langs->trans('RefCustomer').'
    '.$langs->trans("Ref").''; - print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', ''); - print "
    '.$langs->trans("Ref").''; + print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', ''); + print "
    '; + print $form->editfieldkey("Ref",'ref',$object->ref,$object,$user->rights->contrat->creer); + print ''; + print $form->editfieldval("Ref",'ref',$object->ref,$object,$user->rights->contrat->creer); + print '
    '; - print $form->editfieldkey("RefCustomer",'ref_ext',$object->ref_ext,$object,$user->rights->contrat->creer); + print $form->editfieldkey("RefCustomer",'ref_customer',$object->ref_customer,$object,$user->rights->contrat->creer); print ''; - print $form->editfieldval("RefCustomer",'ref_ext',$object->ref_ext,$object,$user->rights->contrat->creer); + print $form->editfieldval("RefCustomer",'ref_customer',$object->ref_customer,$object,$user->rights->contrat->creer); print '
    '; - print ''; + print ''; print ''; print ''; @@ -156,7 +156,7 @@ if ($resql) print img_object($langs->trans("ShowContract"),"contract").' '.(isset($obj->ref) ? $obj->ref : $obj->cid) .''; if ($obj->nb_late) print img_warning($langs->trans("Late")); print ''.$obj->ref_ext.''.$obj->ref_customer.''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''.dol_print_date($obj->datec).''.dol_print_date($db->jdate($obj->date_contrat)).''; //print $form->select_dolusers($filtera, 'userasked', 1, '', ! $canedit); //print '   '.$langs->trans("or") . ' '; - print $langs->trans("ActionsForUser").'   '; + print $langs->trans("ActionAffectedTo").'   '; print ''; - //print '  '; + //print $langs->trans("User"); print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit); if (! empty($conf->use_javascript_ajax)) { include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php'; print ajax_combobox('usertodo'); } - print '   '.$langs->trans("or") . ' '; - print $langs->trans("ActionsForUsersGroup").'   '; + if (empty($conf->dol_optimize_smallscreen)) print '   '.$langs->trans("or") . ' '; + else print '
    '; + print $langs->trans("Group").'   '; print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit); if (! empty($conf->use_javascript_ajax)) { diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index 47363ac8d06..e68fe78bc87 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -1,6 +1,6 @@ - * Copyright (C) 2007-2012 Regis Houssin + * Copyright (C) 2007-2014 Regis Houssin * Copyright (C) 2012 Christophe Battarel * * This program is free software; you can redistribute it and/or modify @@ -391,9 +391,10 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0) * @param array $input Array of type->list of CSS element to switch. Example: array('disabled'=>array(0=>'cssid')) * @param int $entity Entity to set * @param int $revertonoff Revert on/off + * @param bool $strict Use only "disabled" with delConstant and "enabled" with setConstant * @return void */ -function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0) +function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0, $strict=0) { global $conf, $langs; @@ -413,6 +414,7 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0) var url = \''.DOL_URL_ROOT.'/core/ajax/constantonoff.php\'; var code = \''.$code.'\'; var entity = \''.$entity.'\'; + var strict = \''.$strict.'\'; var yesButton = "'.dol_escape_js($langs->transnoentities("Yes")).'"; var noButton = "'.dol_escape_js($langs->transnoentities("No")).'"; @@ -421,7 +423,7 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0) if (input.alert && input.alert.set) { if (input.alert.set.yesButton) yesButton = input.alert.set.yesButton; if (input.alert.set.noButton) noButton = input.alert.set.noButton; - confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton); + confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton, strict); } else { setConstant(url, code, input, entity); } @@ -432,7 +434,7 @@ function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0) if (input.alert && input.alert.del) { if (input.alert.del.yesButton) yesButton = input.alert.del.yesButton; if (input.alert.del.noButton) noButton = input.alert.del.noButton; - confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton); + confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict); } else { delConstant(url, code, input, entity); } diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 8d2e33305e8..619aad511e9 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -64,13 +64,21 @@ function societe_prepare_head($object) $h++; } - if (($object->localtax1_assuj || $object->localtax2_assuj) && (isset($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL > 0) ) - { - $head[$h][0] = DOL_URL_ROOT.'/societe/localtaxes.php?socid='.$object->id; - $head[$h][1] = $langs->trans("LocalTaxes"); - $head[$h][2] = 'localtaxes'; - $h++; - } + if (! empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) + { + $head[$h][0] = DOL_URL_ROOT.'/societe/societecontact.php?socid='.$object->id; + $head[$h][1] = $langs->trans("Contact"); + $head[$h][2] = 'contact'; + $h++; + } + + if (($object->localtax1_assuj || $object->localtax2_assuj) && (isset($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL > 0) ) + { + $head[$h][0] = DOL_URL_ROOT.'/societe/localtaxes.php?socid='.$object->id; + $head[$h][1] = $langs->trans("LocalTaxes"); + $head[$h][2] = 'localtaxes'; + $h++; + } if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) )) { @@ -262,10 +270,10 @@ function getCountry($searchkey,$withcode='',$dbtouse=0,$outputlangs='',$entconv= if (! is_object($dbtouse)) $dbtouse=$db; if (! is_object($outputlangs)) $outputlangs=$langs; - $sql = "SELECT rowid, code, libelle FROM ".MAIN_DB_PREFIX."c_pays"; + $sql = "SELECT rowid, code, label FROM ".MAIN_DB_PREFIX."c_country"; if (is_numeric($searchkey)) $sql.= " WHERE rowid=".$searchkey; elseif (! empty($searchkey)) $sql.= " WHERE code='".$db->escape($searchkey)."'"; - else $sql.= " WHERE libelle='".$db->escape($searchlabel)."'"; + else $sql.= " WHERE label='".$db->escape($searchlabel)."'"; dol_syslog("Company.lib::getCountry", LOG_DEBUG); $resql=$dbtouse->query($sql); @@ -274,7 +282,7 @@ function getCountry($searchkey,$withcode='',$dbtouse=0,$outputlangs='',$entconv= $obj = $dbtouse->fetch_object($resql); if ($obj) { - $label=((! empty($obj->libelle) && $obj->libelle!='-')?$obj->libelle:''); + $label=((! empty($obj->label) && $obj->label!='-')?$obj->label:''); if (is_object($outputlangs)) { $outputlangs->load("dict"); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f3add9e66c8..8973b54734b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -11,7 +11,8 @@ * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2013 Alexandre Spangaro * Copyright (C) 2014 Marcos García - * + * Copyright (C) 2014 Cédric GROSS + * * 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 * the Free Software Foundation; either version 3 of the License, or @@ -169,11 +170,13 @@ function dol_shutdown() * Return value of a param into GET or POST supervariable * * @param string $paramname Name of parameter to found - * @param string $check Type of check (''=no check, 'int'=check it's numeric, 'alpha'=check it's text and sign, 'aZ'=check it's a-z only, 'array'=check it's array) + * @param string $check Type of check (''=no check, 'int'=check it's numeric, 'alpha'=check it's text and sign, 'aZ'=check it's a-z only, 'array'=check it's array, 'san_alpha'= Use filter_var with FILTER_SANITIZE_STRING, 'custom'= custom filter specify $filter and $options) * @param int $method Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get, 4 = post then get then cookie) + * @param int $filter Filter to apply when $check is set to custom. (See http://php.net/manual/en/filter.filters.php for détails) + * @param mixed $options Options to pass to filter_var when $check is set to custom * @return string||string[] Value found, or '' if check fails */ -function GETPOST($paramname,$check='',$method=0) +function GETPOST($paramname,$check='',$method=0,$filter=NULL,$options=NULL) { if (empty($method)) $out = isset($_GET[$paramname])?$_GET[$paramname]:(isset($_POST[$paramname])?$_POST[$paramname]:''); elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:''; @@ -184,28 +187,33 @@ function GETPOST($paramname,$check='',$method=0) if (! empty($check)) { - // Check if numeric - if ($check == 'int' && ! is_numeric($out)) $out=''; - // Check if alpha - elseif ($check == 'alpha') - { - $out=trim($out); - // '"' is dangerous because param in url can close the href= or src= and add javascript functions. - // '../' is dangerous because it allows dir transversals - if (preg_match('/"/',$out)) $out=''; - else if (preg_match('/\.\.\//',$out)) $out=''; - } - elseif ($check == 'aZ') - { - $out=trim($out); - // '"' is dangerous because param in url can close the href= or src= and add javascript functions. - // '../' is dangerous because it allows dir transversals - if (preg_match('/[^a-z]+/i',$out)) $out=''; - } - elseif ($check == 'array') - { - if (! is_array($out) || empty($out)) $out=array(); - } + switch ($check) + { + case 'int': + if (! is_numeric($out)) { $out=''; } + break; + case 'alpha': + $out=trim($out); + // '"' is dangerous because param in url can close the href= or src= and add javascript functions. + // '../' is dangerous because it allows dir transversals + if (preg_match('/"/',$out)) $out=''; + else if (preg_match('/\.\.\//',$out)) $out=''; + break; + case 'san_alpha': + $out=filter_var($out,FILTER_SANITIZE_STRING); + break; + case 'aZ': + $out=trim($out); + if (preg_match('/[^a-z]+/i',$out)) $out=''; + break; + case 'array': + if (! is_array($out) || empty($out)) $out=array(); + break; + case 'custom': + if (empty($filter)) return 'BadFourthParameterForGETPOST'; + $out=filter_var($out, $filter, $options); + break; + } } return $out; @@ -2989,8 +2997,8 @@ function get_localtax($tva, $local, $thirdparty_buyer="", $thirdparty_seller="") $sql = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type"; - $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p"; - $sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$thirdparty_seller->country_code."'"; + $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c"; + $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'"; $sql .= " AND t.taux = ".$tva." AND t.active = 1"; dol_syslog("get_localtax", LOG_DEBUG); @@ -3037,11 +3045,11 @@ function isOnlyOneLocalTax($local) function get_localtax_by_third($local) { global $db, $mysoc; - $sql="SELECT t.localtax1, t.localtax2 "; - $sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_pays as p ON p.rowid=t.fk_pays"; - $sql.=" WHERE p.code = '".$mysoc->country_code."' AND t.taux=(SELECT max(tt.taux)"; - $sql.=" FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_pays as p ON p.rowid=tt.fk_pays"; - $sql.= " WHERE p.code = '".$mysoc->country_code."')"; + $sql ="SELECT t.localtax1, t.localtax2 "; + $sql.=" FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=t.fk_pays"; + $sql.=" WHERE c.code = '".$mysoc->country_code."' AND t.taux=(SELECT max(tt.taux)"; + $sql.=" FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays"; + $sql.=" WHERE c.code = '".$mysoc->country_code."')"; $resql=$db->query($sql); if ($resql) @@ -3077,8 +3085,8 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller) // Search local taxes $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy"; - $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p"; - $sql .= " WHERE t.fk_pays = p.rowid AND p.code = '".$buyer->country_code."'"; + $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c"; + $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'"; $sql .= " AND t.taux = ".$vatrate." AND t.active = 1"; $resql=$db->query($sql); @@ -3212,8 +3220,8 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr { // If vat of product for the country not found or not defined, we return higher vat of country. $sql = "SELECT taux as vat_rate"; - $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p"; - $sql.= " WHERE t.active=1 AND t.fk_pays = p.rowid AND p.code='".$thirdparty_seller->country_code."'"; + $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c"; + $sql.= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'"; $sql.= " ORDER BY t.taux DESC, t.recuperableonly ASC"; $sql.= $db->plimit(1); @@ -3282,8 +3290,8 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller) { // If vat of product for the country not found or not defined, we return higher vat of country. $sql = "SELECT taux as vat_rate, localtax1, localtax2"; - $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_pays as p"; - $sql.= " WHERE t.active=1 AND t.fk_pays = p.rowid AND p.code='".$thirdparty_seller->country_code."'"; + $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c"; + $sql.= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'"; $sql.= " ORDER BY t.taux DESC, t.recuperableonly ASC"; $sql.= $db->plimit(1); @@ -4432,6 +4440,7 @@ function dol_eval($s,$returnvalue=0) global $langs, $user, $conf; global $leftmenu; global $rights; + global $object; //print $s."
    \n"; if ($returnvalue) return @eval('return '.$s.';'); diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index cdf05a2c29d..ade08400762 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -430,7 +430,7 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height) global $conf; // Add a background image on document - if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF)) + if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF)) // Warning, this option make TCPDF generation beeing crazy and some content disappeared behin the image { $pdf->SetAutoPageBreak(0,0); // Disable auto pagebreak before adding image $pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height); @@ -798,7 +798,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass if ($line) // Free text { $pdf->SetXY($dims['lm'],-$posy); - $pdf->MultiCell($width, 3, $line, 0, $align, 0); + $pdf->MultiCell(0, 3, $line, 0, $align, 0); $posy-=$freetextheight; } diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 0b8c759f21a..97354bd08ab 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -71,6 +71,14 @@ function user_prepare_head($object) $head[$h][2] = 'guisetup'; $h++; + if (! empty($conf->agenda->enabled)) + { + $head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id; + $head[$h][1] = $langs->trans("ExtSites"); + $head[$h][2] = 'extsites'; + $h++; + } + if (! empty($conf->clicktodial->enabled)) { $head[$h][0] = DOL_URL_ROOT.'/user/clicktodial.php?id='.$object->id; diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php index 8281552b459..289b474de5e 100644 --- a/htdocs/core/modules/contract/mod_contract_magre.php +++ b/htdocs/core/modules/contract/mod_contract_magre.php @@ -32,6 +32,7 @@ class mod_contract_magre extends ModelNumRefContracts var $version='dolibarr'; var $error = ''; var $nom = 'Magre'; + var $code_auto=1; /** * Return default description of numbering model diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php new file mode 100644 index 00000000000..2b10d520b25 --- /dev/null +++ b/htdocs/core/modules/contract/mod_contract_olive.php @@ -0,0 +1,106 @@ + + * Copyright (C) 2006-2009 Laurent Destailleur + * Copyright (C) 2014 Floran Henry + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ + +/** + * \file htdocs/core/modules/contract/mod_contract_olive.php + * \ingroup contract + * \brief File of class to manage contract numbering rules Olive + */ + +require_once DOL_DOCUMENT_ROOT .'/core/modules/contract/modules_contract.php'; + + +/** + * Class to manage contract numbering rules Olive + */ +class mod_contract_olive extends ModelNumRefContracts +{ + + + var $nom='Olive'; // Nom du modele + var $code_modifiable = 1; // Code modifiable + var $code_modifiable_invalide = 1; // Code modifiable si il est invalide + var $code_modifiable_null = 1; // Code modifiables si il est null + var $code_null = 1; // Code facultatif + var $version='dolibarr'; // 'development', 'experimental', 'dolibarr' + var $code_auto = 0; // Numerotation automatique + + + /** + * Return description of module + * + * @return string Description of module + */ + function info() + { + global $langs; + + $langs->load("companies"); + return $langs->trans("LeopardNumRefModelDesc"); + } + + /** + * Return an example of result returned by getNextValue + * + * @param Societe $objsoc Object thirdparty + * @param Contrat $contract Object contract + * @return string Return next value + */ + function getNextValue($objsoc,$contract) + { + global $langs; + return ''; + } + + + /** + * Check validity of code according to its rules + * + * @param DoliDB $db Database handler + * @param string &$code Code to check/correct + * @param Product $product Object product + * @param int $type 0 = product , 1 = service + * @return int 0 if OK + * -1 ErrorBadProductCodeSyntax + * -2 ErrorProductCodeRequired + * -3 ErrorProductCodeAlreadyUsed + * -4 ErrorPrefixRequired + */ + function verif($db, &$code, $product, $type) + { + global $conf; + + $result=0; + $code = strtoupper(trim($code)); + + if (empty($code) && $this->code_null && empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED)) + { + $result=0; + } + else if (empty($code) && (! $this->code_null || ! empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED)) ) + { + $result=-2; + } + + dol_syslog("mod_contract_olive::verif type=".$type." result=".$result); + return $result; + } +} + diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php index 61ca01ae419..b909b762541 100644 --- a/htdocs/core/modules/contract/mod_contract_serpis.php +++ b/htdocs/core/modules/contract/mod_contract_serpis.php @@ -32,6 +32,7 @@ class mod_contract_serpis extends ModelNumRefContracts var $prefix='CT'; var $error=''; var $nom='Serpis'; + var $code_auto=1; /** diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php index b2f6fdaa367..8cec64f2d20 100644 --- a/htdocs/core/modules/modAdherent.class.php +++ b/htdocs/core/modules/modAdherent.class.php @@ -173,9 +173,10 @@ class modAdherent extends DolibarrModules $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]='MembersAndSubscriptions'; $this->export_permission[$r]=array(array("adherent","export")); - $this->export_fields_array[$r]=array('a.rowid'=>'Id','a.civility'=>"UserTitle",'a.lastname'=>"Lastname",'a.firstname'=>"Firstname",'a.login'=>"Login",'a.morphy'=>'Nature','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'d.nom'=>"State",'p.code'=>"CountryCode",'p.libelle'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation','a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel','c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.cotisation'=>'Amount'); - $this->export_TypeFields_array[$r]=array('a.civility'=>"Text",'a.lastname'=>"Text",'a.firstname'=>"Text",'a.login'=>"Text",'a.morphy'=>'Text','a.societe'=>'Text','a.address'=>"Text",'a.zip'=>"Text",'a.town'=>"Text",'d.nom'=>"Text",'p.code'=>'Text','p.libelle'=>"Text",'a.phone'=>"Text",'a.phone_perso'=>"Text",'a.phone_mobile'=>"Text",'a.email'=>"Text",'a.birth'=>"Date",'a.statut'=>"Status",'a.note'=>"Text",'a.datec'=>'Date','a.datevalid'=>'Date','a.tms'=>'Date','a.datefin'=>'Date','ta.rowid'=>'List:fk_adherent_type:libelle','ta.libelle'=>'Text','c.dateadh'=>'Date','c.cotisation'=>'Number'); - $this->export_entities_array[$r]=array('a.rowid'=>'member','a.civility'=>"member",'a.lastname'=>"member",'a.firstname'=>"member",'a.login'=>"member",'a.morphy'=>'member','a.societe'=>'member','a.address'=>"member",'a.zip'=>"member",'a.town'=>"member",'d.nom'=>"member",'p.code'=>"member",'p.libelle'=>"member",'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.birth'=>"member",'a.statut'=>"member",'a.photo'=>"member",'a.note'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member','a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.cotisation'=>'subscription'); + $this->export_fields_array[$r]=array('a.rowid'=>'Id','a.civility'=>"UserTitle",'a.lastname'=>"Lastname",'a.firstname'=>"Firstname",'a.login'=>"Login",'a.morphy'=>'Nature','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'d.nom'=>"State",'co.code'=>"CountryCode",'co.label'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation','a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel','c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.cotisation'=>'Amount'); + $this->export_TypeFields_array[$r]=array('a.civility'=>"Text",'a.lastname'=>"Text",'a.firstname'=>"Text",'a.login'=>"Text",'a.morphy'=>'Text','a.societe'=>'Text','a.address'=>"Text",'a.zip'=>"Text",'a.town'=>"Text",'d.nom'=>"Text",'co.code'=>'Text','co.label'=>"Text",'a.phone'=>"Text",'a.phone_perso'=>"Text",'a.phone_mobile'=>"Text",'a.email'=>"Text",'a.birth'=>"Date",'a.statut'=>"Status",'a.note'=>"Text",'a.datec'=>'Date','a.datevalid'=>'Date','a.tms'=>'Date','a.datefin'=>'Date','ta.rowid'=>'List:fk_adherent_type:libelle','ta.libelle'=>'Text','c.dateadh'=>'Date','c.cotisation'=>'Number'); + $this->export_entities_array[$r]=array('a.rowid'=>'member','a.civility'=>"member",'a.lastname'=>"member",'a.firstname'=>"member",'a.login'=>"member",'a.morphy'=>'member','a.societe'=>'member','a.address'=>"member",'a.zip'=>"member",'a.town'=>"member",'d.nom'=>"member",'co.code'=>"member",'co.label'=>"member",'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.birth'=>"member",'a.statut'=>"member",'a.photo'=>"member",'a.note'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member','a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.cotisation'=>'subscription'); + // Add extra fields $sql="SELECT name, label FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity = ".$conf->entity; $resql=$this->db->query($sql); @@ -192,7 +193,7 @@ class modAdherent extends DolibarrModules $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'adherent_extrafields as extra ON a.rowid = extra.fk_object'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'cotisation as c ON c.fk_adherent = a.rowid'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON a.state_id = d.rowid'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON a.country = p.rowid'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON a.country = co.rowid'; $this->export_sql_end[$r] .=' WHERE a.fk_adherent_type = ta.rowid'; $this->export_dependencies_array[$r]=array('subscription'=>'c.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php index ec53754440f..8d7b930df08 100644 --- a/htdocs/core/modules/modAgenda.class.php +++ b/htdocs/core/modules/modAgenda.class.php @@ -371,20 +371,20 @@ class modAgenda extends DolibarrModules 'ac.datep2'=>"DateActionEnd",'ac.label'=>"Title",'ac.note'=>"Note",'ac.percent'=>"Percent",'ac.durationp'=>"durationp", 'cac.libelle'=>"ActionType", 's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town', - 'cp.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4', + 'co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4', 's.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra'); $this->export_TypeFields_array[$r]=array('ac.ref_ext'=>"Text",'ac.datec'=>"Date",'ac.datep'=>"Date", 'ac.datep2'=>"Date",'ac.label'=>"Text",'ac.note'=>"Text",'ac.percent'=>"Number", 'ac.durationp'=>"Duree", 'cac.libelle'=>"List:c_actioncomm:libelle:rowid", 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text', - 'cp.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text', + 'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text', 's.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text'); $this->export_entities_array[$r]=array('ac.id'=>"action",'ac.ref_ext'=>"action",'ac.datec'=>"action",'ac.datep'=>"action", 'ac.datep2'=>"action",'ac.label'=>"action",'ac.note'=>"action",'ac.percent'=>"action",'ac.durationp'=>"action", 'cac.libelle'=>"action", 's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company', - 'cp.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company', + 'co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company', 's.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company',); $this->export_sql_start[$r]='SELECT DISTINCT '; @@ -392,7 +392,7 @@ class modAgenda extends DolibarrModules $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_actioncomm as cac on ac.fk_action = cac.id'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp on ac.fk_contact = sp.rowid'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s on ac.fk_soc = s.rowid'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as cp on s.fk_pays = cp.rowid'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co on s.fk_pays = co.rowid'; $this->export_sql_end[$r] .=' Where ac.entity = '.$conf->entity; $this->export_sql_end[$r] .=' ORDER BY datep'; diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php index 73c2f9ac61f..327608c8814 100644 --- a/htdocs/core/modules/modCategorie.class.php +++ b/htdocs/core/modules/modCategorie.class.php @@ -116,11 +116,11 @@ class modCategorie extends DolibarrModules $this->export_icon[$r]='category'; $this->export_enabled[$r]='$conf->fournisseur->enabled'; $this->export_permission[$r]=array(array("categorie","lire"),array("fournisseur","lire")); - $this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'IdThirdParty','s.nom'=>'Name','s.prefix_comm'=>"Prefix",'s.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.siret'=>"ProfId1",'s.siren'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_public'=>"NotePublic"); - $this->export_TypeFields_array[$r]=array('u.label'=>"Text",'u.description'=>"Text",'s.rowid'=>'List:societe:nom','s.nom'=>'Text','s.prefix_comm'=>"Text",'s.client'=>"Text",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'p.libelle'=>"List:c_pays:libelle:libelle",'p.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_public'=>"Text"); - $this->export_entities_array[$r]=array('s.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",'s.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'p.libelle'=>"company",'p.code'=>"company",'s.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",'s.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company"); // We define here only fields that use another picto + $this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'IdThirdParty','s.nom'=>'Name','s.prefix_comm'=>"Prefix",'s.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.siret'=>"ProfId1",'s.siren'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_public'=>"NotePublic"); + $this->export_TypeFields_array[$r]=array('u.label'=>"Text",'u.description'=>"Text",'s.rowid'=>'List:societe:nom','s.nom'=>'Text','s.prefix_comm'=>"Text",'s.client'=>"Text",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_public'=>"Text"); + $this->export_entities_array[$r]=array('s.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",'s.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'c.label'=>"company",'c.code'=>"company",'s.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",'s.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company"); // We define here only fields that use another picto $this->export_sql_start[$r]='SELECT DISTINCT '; - $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_fournisseur as cf, '.MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON s.fk_pays = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code'; + $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_fournisseur as cf, '.MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code'; $this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_societe = s.rowid'; $this->export_sql_end[$r] .=' AND u.entity = '.$conf->entity; $this->export_sql_end[$r] .=' AND u.type = 1'; // Supplier categories @@ -131,11 +131,11 @@ class modCategorie extends DolibarrModules $this->export_icon[$r]='category'; $this->export_enabled[$r]='$conf->societe->enabled'; $this->export_permission[$r]=array(array("categorie","lire"),array("societe","lire")); - $this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'IdThirdParty','s.nom'=>'Name','s.prefix_comm'=>"Prefix",'s.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.siret'=>"ProfId1",'s.siren'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_public'=>"NotePublic",'s.fk_prospectlevel'=>'ProspectLevel','s.fk_stcomm'=>'ProspectStatus'); - $this->export_TypeFields_array[$r]=array('u.label'=>"Text",'u.description'=>"Text",'s.rowid'=>'List:societe:nom','s.nom'=>'Text','s.prefix_comm'=>"Text",'s.client'=>"Text",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'p.libelle'=>"List:c_pays:libelle:libelle",'p.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_public'=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code'); - $this->export_entities_array[$r]=array('s.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",'s.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'p.libelle'=>"company",'p.code'=>"company",'s.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",'s.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company",'s.fk_prospectlevel'=>'company','s.fk_stcomm'=>'company'); // We define here only fields that use another picto + $this->export_fields_array[$r]=array('u.rowid'=>"CategId",'u.label'=>"Label",'u.description'=>"Description",'s.rowid'=>'IdThirdParty','s.nom'=>'Name','s.prefix_comm'=>"Prefix",'s.client'=>"Customer",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.siret'=>"ProfId1",'s.siren'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_public'=>"NotePublic",'s.fk_prospectlevel'=>'ProspectLevel','s.fk_stcomm'=>'ProspectStatus'); + $this->export_TypeFields_array[$r]=array('u.label'=>"Text",'u.description'=>"Text",'s.rowid'=>'List:societe:nom','s.nom'=>'Text','s.prefix_comm'=>"Text",'s.client'=>"Text",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note_public'=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code'); + $this->export_entities_array[$r]=array('s.rowid'=>'company','s.nom'=>'company','s.prefix_comm'=>"company",'s.client'=>"company",'s.datec'=>"company",'s.tms'=>"company",'s.code_client'=>"company",'s.address'=>"company",'s.zip'=>"company",'s.town'=>"company",'c.label'=>"company",'c.code'=>"company",'s.phone'=>"company",'s.fax'=>"company",'s.url'=>"company",'s.email'=>"company",'s.siret'=>"company",'s.siren'=>"company",'s.ape'=>"company",'s.idprof4'=>"company",'s.tva_intra'=>"company",'s.capital'=>"company",'s.note_public'=>"company",'s.fk_prospectlevel'=>'company','s.fk_stcomm'=>'company'); // We define here only fields that use another picto $this->export_sql_start[$r]='SELECT DISTINCT '; - $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_societe as cf, '.MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON s.fk_pays = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code'; + $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'categorie as u, '.MAIN_DB_PREFIX.'categorie_societe as cf, '.MAIN_DB_PREFIX.'societe as s LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code'; $this->export_sql_end[$r] .=' WHERE u.rowid = cf.fk_categorie AND cf.fk_societe = s.rowid'; $this->export_sql_end[$r] .=' AND u.entity = '.$conf->entity; $this->export_sql_end[$r] .=' AND u.type = 2'; // Customer/Prospect categories @@ -188,7 +188,7 @@ class modCategorie extends DolibarrModules 'p.zip' => 'Zip', 'p.town' => 'Town', 'country.code' => 'CountryCode', - 'country.libelle' => 'Country', + 'country.label' => 'Country', 'p.birthday' => 'DateToBirth', 'p.poste' => 'PostOrFunction', 'p.phone' => 'Phone', @@ -218,7 +218,7 @@ class modCategorie extends DolibarrModules 'p.zip' => 'contact', 'p.town' => 'contact', 'country.code' => 'contact', - 'country.libelle' => 'contact', + 'country.label' => 'contact', 'p.birthday' => 'contact', 'p.poste' => 'contact', 'p.phone' => 'contact', @@ -231,7 +231,7 @@ class modCategorie extends DolibarrModules ); // We define here only fields that use another picto $this->export_sql_start[$r] = 'SELECT DISTINCT '; $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'categorie as u, '.MAIN_DB_PREFIX . 'categorie_contact as cp, '.MAIN_DB_PREFIX . 'socpeople as p'; - $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_pays as country ON p.fk_pays = country.rowid'; + $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_country as country ON p.fk_pays = country.rowid'; $this->export_sql_end[$r] .= ' WHERE u.rowid = cp.fk_categorie AND cp.fk_socpeople = p.rowid AND u.entity = ' . $conf->entity; $this->export_sql_end[$r] .= ' AND u.type = 4'; // contact categories diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php index 22197c9beff..7a9434ab934 100644 --- a/htdocs/core/modules/modCommande.class.php +++ b/htdocs/core/modules/modCommande.class.php @@ -173,15 +173,15 @@ class modCommande extends DolibarrModules $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]='CustomersOrdersAndOrdersLines'; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_permission[$r]=array(array("commande","commande","export")); - $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.libelle'=>'Country','co.code'=>"CountryCode",'s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"OrderDate",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"Billed",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); - //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.libelle'=>'List:c_pays:libelle:libelle','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Number",'cd.qty'=>"Number",'cd.total_ht'=>"Number",'cd.total_tva'=>"Number",'cd.total_ttc'=>"Number",'p.rowid'=>'List:Product:ref','p.ref'=>'Text','p.label'=>'Text'); - $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.libelle'=>'List:c_pays:libelle:libelle','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Number",'cd.qty'=>"Number",'cd.total_ht'=>"Number",'cd.total_tva'=>"Number",'cd.total_ttc'=>"Number",'p.rowid'=>'List:Product:ref','p.ref'=>'Text','p.label'=>'Text'); - $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.libelle'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"order",'c.ref'=>"order",'c.ref_client'=>"order",'c.fk_soc'=>"order",'c.date_creation'=>"order",'c.date_commande'=>"order",'c.amount_ht'=>"order",'c.remise_percent'=>"order",'c.total_ht'=>"order",'c.total_ttc'=>"order",'c.facture'=>"order",'c.fk_statut'=>"order",'c.note'=>"order",'c.date_livraison'=>"order",'cd.rowid'=>'order_line','cd.label'=>"order_line",'cd.description'=>"order_line",'cd.product_type'=>'order_line','cd.tva_tx'=>"order_line",'cd.qty'=>"order_line",'cd.total_ht'=>"order_line",'cd.total_tva'=>"order_line",'cd.total_ttc'=>"order_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'); + $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.label'=>'Country','co.code'=>"CountryCode",'s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"OrderDate",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"Billed",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); + //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Number",'cd.qty'=>"Number",'cd.total_ht'=>"Number",'cd.total_tva'=>"Number",'cd.total_ttc'=>"Number",'p.rowid'=>'List:Product:ref','p.ref'=>'Text','p.label'=>'Text'); + $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Number",'cd.qty'=>"Number",'cd.total_ht'=>"Number",'cd.total_tva'=>"Number",'cd.total_ttc'=>"Number",'p.rowid'=>'List:Product:ref','p.ref'=>'Text','p.label'=>'Text'); + $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.label'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"order",'c.ref'=>"order",'c.ref_client'=>"order",'c.fk_soc'=>"order",'c.date_creation'=>"order",'c.date_commande'=>"order",'c.amount_ht'=>"order",'c.remise_percent'=>"order",'c.total_ht'=>"order",'c.total_ttc'=>"order",'c.facture'=>"order",'c.fk_statut'=>"order",'c.note'=>"order",'c.date_livraison'=>"order",'cd.rowid'=>'order_line','cd.label'=>"order_line",'cd.description'=>"order_line",'cd.product_type'=>'order_line','cd.tva_tx'=>"order_line",'cd.qty'=>"order_line",'cd.total_ht'=>"order_line",'cd.total_tva'=>"order_line",'cd.total_ttc'=>"order_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'); $this->export_dependencies_array[$r]=array('order_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'commande as c, '.MAIN_DB_PREFIX.'societe as s'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as co ON s.fk_pays = co.rowid,'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,'; $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commandedet as cd'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid'; $this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande'; diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php index 0d39edd40fa..20c679556e7 100644 --- a/htdocs/core/modules/modExpedition.class.php +++ b/htdocs/core/modules/modExpedition.class.php @@ -216,15 +216,15 @@ class modExpedition extends DolibarrModules $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]='Shipments'; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_permission[$r]=array(array("expedition","shipment","export")); - $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.libelle'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateSending",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); - //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.libelle'=>'List:c_pays:libelle:libelle','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text"); - $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.libelle'=>'List:c_pays:libelle:libelle','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",'c.date_delivery'=>"Date",'c.tracking_number'=>"Number",'c.height'=>"Number",'c.width'=>"Number",'c.weight'=>"Number",'c.fk_statut'=>'Status','c.note_public'=>"Text",'ed.qty'=>"Number"); + $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.label'=>'Country','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_delivery'=>"DateSending",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); + //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Number",'c.remise_percent'=>"Number",'c.total_ht'=>"Number",'c.total_ttc'=>"Number",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text"); + $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",'c.date_delivery'=>"Date",'c.tracking_number'=>"Number",'c.height'=>"Number",'c.width'=>"Number",'c.weight'=>"Number",'c.fk_statut'=>'Status','c.note_public'=>"Text",'ed.qty'=>"Number"); $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note_public'=>"shipment",'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'); $this->export_dependencies_array[$r]=array('shipment_line'=>'ed.rowid','product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'expedition as c, '.MAIN_DB_PREFIX.'societe as s'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as co ON s.fk_pays = co.rowid,'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,'; $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expeditiondet as ed, '.MAIN_DB_PREFIX.'commandedet as cd'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid'; $this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid'; diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php index 02a3972e05d..5bb85dea7db 100644 --- a/htdocs/core/modules/modFacture.class.php +++ b/htdocs/core/modules/modFacture.class.php @@ -219,7 +219,7 @@ class modFacture extends DolibarrModules // End add axtra fields $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'societe as s'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as c on s.fk_pays = c.rowid,'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid,'; $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture as f'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON f.fk_user_author = uc.rowid'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON f.fk_user_valid = uc.rowid'; @@ -275,7 +275,7 @@ class modFacture extends DolibarrModules // End add axtra fields $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'societe as s'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as c on s.fk_pays = c.rowid,'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid,'; $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture as f'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON f.fk_user_author = uc.rowid'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON f.fk_user_valid = uc.rowid'; diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php index f54e4fef497..45d8a0fa7bc 100644 --- a/htdocs/core/modules/modFicheinter.class.php +++ b/htdocs/core/modules/modFicheinter.class.php @@ -139,8 +139,8 @@ class modFicheinter extends DolibarrModules $this->export_label[$r]='InterventionCardsAndInterventionLines'; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_permission[$r]=array(array("ficheinter","export")); $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','s.fk_pays'=>'Country','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','f.rowid'=>"InterId",'f.ref'=>"InterRef",'f.datec'=>"InterDateCreation",'f.duree'=>"InterDuration",'f.fk_statut'=>'InterStatus','f.description'=>"InterNote",'fd.rowid'=>'InterLineId','fd.date'=>"InterLineDate",'fd.duree'=>"InterLineDuration",'fd.description'=>"InterLineDesc"); - //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_pays:libelle','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean",'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",'fd.total_ht'=>"Numeric"); - $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_pays:libelle','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean",'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",'fd.total_ht'=>"Numeric"); + //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean",'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",'fd.total_ht'=>"Numeric"); + $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.duree'=>"Duree",'f.fk_statut'=>'Statut','f.description'=>"Text",'f.datee'=>"Date",'f.dateo'=>"Date",'f.fulldayevent'=>"Boolean",'fd.date'=>"Date",'fd.duree'=>"Duree",'fd.description'=>"Text",'fd.total_ht'=>"Numeric"); $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.code_compta'=>'company','s.code_compta_fournisseur'=>'company','f.rowid'=>"intervention",'f.ref'=>"intervention",'f.datec'=>"intervention",'f.duree'=>"intervention",'f.fk_statut'=>"intervention",'f.description'=>"intervention",'fd.rowid'=>"inter_line",'fd.date'=>"inter_line",'fd.duree'=>'inter_line','fd.description'=>'inter_line'); $this->export_dependencies_array[$r]=array('inter_line'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php index 92c27bb11f9..1f1a8072e1e 100644 --- a/htdocs/core/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -291,7 +291,7 @@ class modFournisseur extends DolibarrModules // End add axtra fields $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'societe as s'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as c ON s.fk_pays = c.rowid,'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,'; $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_extrafields as extra ON f.rowid = extra.fk_object'; $this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'facture_fourn_det as fd'; @@ -345,7 +345,7 @@ class modFournisseur extends DolibarrModules // End add axtra fields $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'societe as s'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as c ON s.fk_pays = c.rowid,'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,'; $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_extrafields as extra ON f.rowid = extra.fk_object'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid'; @@ -365,7 +365,7 @@ class modFournisseur extends DolibarrModules $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'societe as s'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as c ON s.fk_pays = c.rowid,'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,'; $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande_fournisseur as f, '.MAIN_DB_PREFIX.'commande_fournisseurdet as fd'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)'; $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande'; diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index d9d2817759f..97ddc6afaba 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -190,7 +190,7 @@ class modProjet extends DolibarrModules $this->export_permission[$r]=array(array("projet","export")); $this->export_dependencies_array[$r]=array('task_time'=>'ppt.rowid'); - $this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_pays:libelle', + $this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_country:label', 's.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text', 'p.rowid'=>"List:projet:ref",'p.ref'=>"Text",'p.datec'=>"Date",'p.dateo'=>"Date",'p.datee'=>"Date",'p.fk_statut'=>'Status','p.description'=>"Text", 'pt.dateo'=>"Date",'pt.datee'=>"Date",'pt.duration_effective'=>"Duree",'pt.planned_workload'=>"Number",'pt.progress'=>"Number",'pt.description'=>"Text", diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php index 5e81edc87f5..e97005c37be 100644 --- a/htdocs/core/modules/modPropale.class.php +++ b/htdocs/core/modules/modPropale.class.php @@ -169,15 +169,15 @@ class modPropale extends DolibarrModules $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]='ProposalsAndProposalsLines'; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_permission[$r]=array(array("propale","export")); - $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','cp.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); - //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','cp.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text'); - $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','cp.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.ref'=>'Text','p.label'=>'Text'); - $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','cp.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"propal",'c.ref'=>"propal",'c.ref_client'=>"propal",'c.fk_soc'=>"propal",'c.datec'=>"propal",'c.datep'=>"propal",'c.fin_validite'=>"propal",'c.remise_percent'=>"propal",'c.total_ht'=>"propal",'c.total'=>"propal",'c.fk_statut'=>"propal",'c.note_public'=>"propal",'c.date_livraison'=>"propal",'cd.rowid'=>'propal_line','cd.label'=>"propal_line",'cd.description'=>"propal_line",'cd.product_type'=>'propal_line','cd.tva_tx'=>"propal_line",'cd.qty'=>"propal_line",'cd.total_ht'=>"propal_line",'cd.total_tva'=>"propal_line",'cd.total_ttc'=>"propal_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'); + $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate','cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'); + //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text'); + $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.ref'=>'Text','p.label'=>'Text'); + $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"propal",'c.ref'=>"propal",'c.ref_client'=>"propal",'c.fk_soc'=>"propal",'c.datec'=>"propal",'c.datep'=>"propal",'c.fin_validite'=>"propal",'c.remise_percent'=>"propal",'c.total_ht'=>"propal",'c.total'=>"propal",'c.fk_statut'=>"propal",'c.note_public'=>"propal",'c.date_livraison'=>"propal",'cd.rowid'=>'propal_line','cd.label'=>"propal_line",'cd.description'=>"propal_line",'cd.product_type'=>'propal_line','cd.tva_tx'=>"propal_line",'cd.qty'=>"propal_line",'cd.total_ht'=>"propal_line",'cd.total_tva'=>"propal_line",'cd.total_ttc'=>"propal_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'); $this->export_dependencies_array[$r]=array('propal_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'societe as s '; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as cp ON s.fk_pays = cp.rowid,'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,'; $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'propal as c, '.MAIN_DB_PREFIX.'propaldet as cd'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)'; $this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal'; diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php index 8d276075e90..28a5fcaebe3 100644 --- a/htdocs/core/modules/modSociete.class.php +++ b/htdocs/core/modules/modSociete.class.php @@ -264,10 +264,10 @@ class modSociete extends DolibarrModules $this->export_label[$r]='ExportDataset_company_1'; $this->export_icon[$r]='company'; $this->export_permission[$r]=array(array("societe","export")); - $this->export_fields_array[$r]=array('s.rowid'=>"Id",'s.nom'=>"Name",'s.status'=>"Status",'s.client'=>"Customer",'s.fournisseur'=>"Supplier",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode",'s.code_compta'=>"AccountancyCode",'s.code_compta_fournisseur'=>"SupplierAccountancyCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'p.libelle'=>"Country",'p.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.default_lang'=>"DefaultLang",'s.siren'=>"ProfId1",'s.siret'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.idprof5'=>"ProfId5",'s.idprof6'=>"ProfId6",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_private'=>"NotePrivate",'s.note_public'=>"NotePublic",'t.libelle'=>"ThirdPartyType",'ce.code'=>"Staff","cfj.libelle"=>"JuridicalStatus",'s.fk_prospectlevel'=>'ProspectLevel','st.code'=>'ProspectStatus','d.nom'=>'State'); + $this->export_fields_array[$r]=array('s.rowid'=>"Id",'s.nom'=>"Name",'s.status'=>"Status",'s.client'=>"Customer",'s.fournisseur'=>"Supplier",'s.datec'=>"DateCreation",'s.tms'=>"DateLastModification",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode",'s.code_compta'=>"AccountancyCode",'s.code_compta_fournisseur'=>"SupplierAccountancyCode",'s.address'=>"Address",'s.zip'=>"Zip",'s.town'=>"Town",'c.label'=>"Country",'c.code'=>"CountryCode",'s.phone'=>"Phone",'s.fax'=>"Fax",'s.url'=>"Url",'s.email'=>"Email",'s.default_lang'=>"DefaultLang",'s.siren'=>"ProfId1",'s.siret'=>"ProfId2",'s.ape'=>"ProfId3",'s.idprof4'=>"ProfId4",'s.idprof5'=>"ProfId5",'s.idprof6'=>"ProfId6",'s.tva_intra'=>"VATIntraShort",'s.capital'=>"Capital",'s.note_private'=>"NotePrivate",'s.note_public'=>"NotePublic",'t.libelle'=>"ThirdPartyType",'ce.code'=>"Staff","cfj.libelle"=>"JuridicalStatus",'s.fk_prospectlevel'=>'ProspectLevel','st.code'=>'ProspectStatus','d.nom'=>'State'); if (! empty($conf->global->SOCIETE_USEPREFIX)) $this->export_fields_array[$r]['s.prefix']='Prefix'; - //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'p.libelle'=>"List:c_pays:libelle:libelle",'p.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Number",'s.note'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'List:c_departements:nom:rowid'); - $this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Number",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'p.libelle'=>"List:c_pays:libelle:libelle",'p.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Number",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text'); + //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Number",'s.note'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'List:c_departements:nom:rowid'); + $this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Number",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Number",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','st.code'=>'List:c_stcomm:libelle:code','d.nom'=>'Text'); $this->export_entities_array[$r]=array(); // We define here only fields that use another picto // Add extra fields $sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe'"; @@ -307,7 +307,7 @@ class modSociete extends DolibarrModules $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'societe as s'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON s.fk_pays = p.rowid'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid'; @@ -321,7 +321,7 @@ class modSociete extends DolibarrModules $this->export_icon[$r]='contact'; $this->export_permission[$r]=array(array("societe","contact","export")); $this->export_fields_array[$r]=array('c.rowid'=>"IdContact",'c.civility'=>"CivilityCode",'c.lastname'=>'Lastname','c.firstname'=>'Firstname','c.poste'=>'PostOrFunction','c.datec'=>"DateCreation",'c.tms'=>"DateLastModification",'c.priv'=>"ContactPrivate",'c.address'=>"Address",'c.zip'=>"Zip",'c.town'=>"Town",'d.nom'=>'State','p.libelle'=>"Country",'p.code'=>"CountryCode",'c.phone'=>"Phone",'c.fax'=>"Fax",'c.phone_mobile'=>"Mobile",'c.email'=>"EMail",'s.rowid'=>"IdCompany",'s.nom'=>"CompanyName",'s.status'=>"Status",'s.code_client'=>"CustomerCode",'s.code_fournisseur'=>"SupplierCode", 's.client'=>'Customer 0 (no customer no prospect)/1 (customer)/2 (prospect)/3 (customer and prospect)','s.fournisseur'=>'Supplier 0 or 1'); - $this->export_TypeFields_array[$r]=array('c.civility'=>"List:c_civility:label:code",'c.lastname'=>'Text','c.firstname'=>'Text','c.poste'=>'Text','c.datec'=>"Date",'c.priv'=>"Boolean",'c.address'=>"Text",'c.cp'=>"Text",'c.ville'=>"Text",'d.nom'=>'Text','p.libelle'=>"List:c_pays:libelle:rowid",'p.code'=>"Text",'c.phone'=>"Text",'c.fax'=>"Text",'c.email'=>"Text",'s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Status",'s.client'=>"Text",'s.fournisseur'=>"Text"); + $this->export_TypeFields_array[$r]=array('c.civility'=>"List:c_civility:label:code",'c.lastname'=>'Text','c.firstname'=>'Text','c.poste'=>'Text','c.datec'=>"Date",'c.priv'=>"Boolean",'c.address'=>"Text",'c.cp'=>"Text",'c.ville'=>"Text",'d.nom'=>'Text','co.label'=>"List:c_country:label:rowid",'co.code'=>"Text",'c.phone'=>"Text",'c.fax'=>"Text",'c.email'=>"Text",'s.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Status",'s.client'=>"Text",'s.fournisseur'=>"Text"); $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>"company",'s.code_client'=>"company",'s.code_fournisseur'=>"company", 's.client'=>"company", 's.fournisseur'=>"company"); // We define here only fields that use another picto if (empty($conf->fournisseur->enabled)) { @@ -366,7 +366,7 @@ class modSociete extends DolibarrModules $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'socpeople as c'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON c.fk_soc = s.rowid'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON c.fk_departement = d.rowid'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON c.fk_pays = p.rowid'; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON c.fk_pays = co.rowid'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = c.rowid'; $this->export_sql_end[$r] .=' WHERE c.entity IN ('.getEntity("societe", 1).')'; @@ -399,7 +399,7 @@ class modSociete extends DolibarrModules $this->import_fieldshidden_array[$r]=array('s.fk_user_creat'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'societe'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent) $this->import_convertvalue_array[$r]=array( 's.fk_typent'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ctypent.class.php','class'=>'Ctypent','method'=>'fetch','dict'=>'DictionaryCompanyType'), - 's.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cpays.class.php','class'=>'Cpays','method'=>'fetch','dict'=>'DictionaryCountry'), + 's.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'), 's.fk_stcomm'=>array('rule'=>'zeroifnull'), 's.code_client'=>array('rule'=>'getcustomercodeifauto'), 's.code_fournisseur'=>array('rule'=>'getsuppliercodeifauto'), @@ -434,7 +434,7 @@ class modSociete extends DolibarrModules $this->import_fieldshidden_array[$r]=array('s.fk_user_creat'=>'user->id','extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'socpeople'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent) $this->import_convertvalue_array[$r]=array( 's.fk_soc'=>array('rule'=>'fetchidfromref','file'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty'), - 's.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cpays.class.php','class'=>'Cpays','method'=>'fetch','dict'=>'DictionaryCountry'), + 's.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry'), ); //$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t'); $this->import_regex_array[$r]=array('s.birthday'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$'); diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php index 8a13fff5bc9..43c7cec6fb3 100644 --- a/htdocs/core/modules/modStock.class.php +++ b/htdocs/core/modules/modStock.class.php @@ -154,7 +154,7 @@ class modStock extends DolibarrModules ); $this->import_convertvalue_array[$r]=array( - 'e.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/cpays.class.php','class'=>'Cpays','method'=>'fetch','dict'=>'DictionaryCountry') + 'e.fk_pays'=>array('rule'=>'fetchidfromcodeid','classfile'=>'/core/class/ccountry.class.php','class'=>'Ccountry','method'=>'fetch','dict'=>'DictionaryCountry') ); $this->import_regex_array[$r]=array('e.statut'=>'^[0|1]'); $this->import_examplevalues_array[$r]=array('e.label'=>"ALM001", diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php index 22273be31dd..363bfb67e80 100644 --- a/htdocs/core/modules/project/modules_project.php +++ b/htdocs/core/modules/project/modules_project.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2010-2014 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 @@ -226,10 +226,10 @@ function project_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, dol_meta_create($object); // Appel des triggers - /*include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; + include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($db); $result=$interface->run_triggers('PROJECT_BUILDDOC',$object,$user,$langs,$conf); - if ($result < 0) { $error++; $this->errors=$interface->errors; }*/ + if ($result < 0) { $error++; $this->errors=$interface->errors; } // Fin appel triggers return 1; diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index efd0b46d6b4..55beeeebd98 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -25,6 +25,9 @@ if (GETPOST('dol_optimize_smallscreen')) $conf->dol_optimize_smallscreen=1; if (GETPOST('dol_no_mouse_hover')) $conf->dol_no_mouse_hover=1; if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1; +// If we force to use jmobile, then we reenable javascript +if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1; + $arrayofjs=array('/core/js/dst.js'.(empty($conf->dol_use_jmobile)?'':'?version='.urlencode(DOL_VERSION))); // Javascript code on logon page only to detect user tz, dst_observed, dst_first, dst_second $titleofloginpage=$langs->trans('Login').' '.$title; // title is defined by dol_loginfunction in security2.lib.php print top_htmlhead('',$titleofloginpage,0,0,$arrayofjs); @@ -212,7 +215,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file - + diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php index 0cce9a3e3b4..66b310da69d 100644 --- a/htdocs/core/tpl/notes.tpl.php +++ b/htdocs/core/tpl/notes.tpl.php @@ -22,6 +22,7 @@ $note_public = 'note_public'; $note_private = 'note_private'; $colwidth=(isset($colwidth)?$colwidth:25); + $permission=(isset($permission)?$permission:(isset($user->rights->$module->creer)?$user->rights->$module->creer:0)); // If already defined by caller page $moreparam=(isset($moreparam)?$moreparam:''); $value_public=$object->note_public; @@ -59,8 +60,9 @@ elseif ($module == 'contact') { $permission=$user->rights->societe->creer;} elseif ($module == 'shipping') { $permission=$user->rights->expedition->creer;} //else dol_print_error('','Bad value '.$module.' for param module'); -if (! empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata='ckeditor:dolibarr_notes:100%:200::1:12:100'; +if (! empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata='ckeditor:dolibarr_notes:100%:200::1:12:100'; // Rem: This var is for all notes, not only thirdparties note. else $typeofdata='textarea:12:100'; + ?> diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index 5e002653922..7331a81ead0 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -25,6 +25,9 @@ if (GETPOST('dol_optimize_smallscreen')) $conf->dol_optimize_smallscreen=1; if (GETPOST('dol_no_mouse_hover')) $conf->dol_no_mouse_hover=1; if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1; +// If we force to use jmobile, then we reenable javascript +if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1; + print top_htmlhead('',$langs->trans('Login').' '.$title); ?> diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN index d1f093af09b..c5749a18459 100644 --- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN +++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN @@ -1,7 +1,7 @@ - * Copyright (C) 2005-2011 Regis Houssin - * Copyright (C) 2014 Marcos García +/* Copyright (C) 2005-2011 Laurent Destailleur + * Copyright (C) 2005-2014 Regis Houssin + * Copyright (C) 2014 Marcos García * * 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 @@ -227,6 +227,7 @@ class InterfaceDemo extends DolibarrTriggers case 'PROJECT_CREATE': case 'PROJECT_MODIFY': case 'PROJECT_DELETE': + case 'PROJECT_BUILDDOC': // Project tasks case 'TASK_CREATE': @@ -253,4 +254,4 @@ class InterfaceDemo extends DolibarrTriggers return 0; } -} \ No newline at end of file +} diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index cbaf3277be8..8ac1f6e6d48 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -732,7 +732,7 @@ if ($step == 3 && $datatoexport) // Filter value print '    		'; - if (! empty($Typefieldsarray[$code])) // Example: Text, List:c_pays:libelle:rowid, Number, Boolean + if (! empty($Typefieldsarray[$code])) // Example: Text, List:c_country:label:rowid, Number, Boolean { $szInfoFiltre=$objexport->genDocFilter($Typefieldsarray[$code]); if ($szInfoFiltre) // Is there an info help for this filter ? diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 930f9371522..50a18f5e57c 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -463,31 +463,6 @@ class Fichinter extends CommonObject } } - /** - * Set intervetnion as billed - * - * @return int <0 si ko, >0 si ok - */ - function setBilled() - { - global $conf; - - $sql = 'UPDATE '.MAIN_DB_PREFIX.'fichinter SET fk_statut = 2'; - $sql.= ' WHERE rowid = '.$this->id; - $sql.= " AND entity = ".$conf->entity; - $sql.= " AND fk_statut = 1"; - - if ($this->db->query($sql) ) - { - return 1; - } - else - { - dol_print_error($this->db); - return -1; - } - } - /** * Returns the label status diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index d459b20767b..437002aa23c 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -471,7 +471,22 @@ else if ($action == "addline" && $user->rights->ficheinter->creer) // Classify Billed else if ($action == 'classifybilled' && $user->rights->ficheinter->creer) { - $result=$object->setBilled(); + $result=$object->setStatut(2); + if ($result > 0) + { + header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); + exit; + } + else + { + $mesg='
    '.$object->error.'
    '; + } +} + +// Classify Billed +else if ($action == 'classifyunbilled' && $user->rights->ficheinter->creer) +{ + $result=$object->setStatut(1); if ($result > 0) { header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id); @@ -485,7 +500,7 @@ else if ($action == 'classifybilled' && $user->rights->ficheinter->creer) /* * Mise a jour d'une ligne d'intervention -*/ + */ else if ($action == 'updateline' && $user->rights->ficheinter->creer && GETPOST('save','alpha') == $langs->trans("Save")) { $objectline = new FichinterLigne($db); @@ -1289,19 +1304,19 @@ else if ($id > 0 || ! empty($ref)) print $extrafields->showInputField($key,$value); - print ''; + print '   '; } else { print $extrafields->showOutputField($key,$value); - if ($object->statut == 0 && $user->rights->ficheinter->creer) print ''.img_picto('','edit').' '.$langs->trans('Modify').''; + if ($object->statut == 0 && $user->rights->ficheinter->creer) print '   '.img_picto('','edit').' '.$langs->trans('Modify').''; } print '

    "; + print ""; print '
    '; @@ -1319,196 +1334,199 @@ else if ($id > 0 || ! empty($ref)) include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'; } - - print '
    '; - print ''; - print ''; - if ($action == 'editline') - { - print ''; - print ''; - } - else - { - print ''; - } - - // Intervention lines - $sql = 'SELECT ft.rowid, ft.description, ft.fk_fichinter, ft.duree, ft.rang,'; - $sql.= ' ft.date as date_intervention'; - $sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft'; - $sql.= ' WHERE ft.fk_fichinter = '.$object->id; - $sql.= ' ORDER BY ft.rang ASC, ft.rowid'; - - $resql = $db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i = 0; - - if ($num) + if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) + { + print ''; + print ''; + print ''; + if ($action == 'editline') { - print '
    '; - print ''; - - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; + print ''; + print ''; } - $var=true; - while ($i < $num) + else { - $objp = $db->fetch_object($resql); - $var=!$var; + print ''; + } - // Ligne en mode visu - if ($action != 'editline' || GETPOST('line_id','int') != $objp->rowid) + // Intervention lines + $sql = 'SELECT ft.rowid, ft.description, ft.fk_fichinter, ft.duree, ft.rang,'; + $sql.= ' ft.date as date_intervention'; + $sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft'; + $sql.= ' WHERE ft.fk_fichinter = '.$object->id; + $sql.= ' ORDER BY ft.rang ASC, ft.rowid'; + + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; + + if ($num) { - print ''; - print '
    '.$langs->trans('Description').''.$langs->trans('Date').''.$langs->trans('Duration').' 
    '; - print ''; // ancre pour retourner sur la ligne - print dol_htmlentitiesbr($objp->description); + print '
    '; + print ''; - // Date - print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; + } + $var=true; + while ($i < $num) + { + $objp = $db->fetch_object($resql); + $var=!$var; - // Duration - print ''; - - print "\n"; - - - // Icone d'edition et suppression - if ($object->statut == 0 && $user->rights->ficheinter->creer) + // Ligne en mode visu + if ($action != 'editline' || GETPOST('line_id','int') != $objp->rowid) { - print ''; - print ''; - if ($num > 1) + print ''; + print ''; + + // Duration + print ''; + + print "\n"; + + + // Icone d'edition et suppression + if ($object->statut == 0 && $user->rights->ficheinter->creer) { print ''; + print ''; + if ($num > 1) + { + print ''; + } } - } - else - { - print ''; + else + { + print ''; + } + + print ''; } - print ''; + // Line in update mode + if ($object->statut == 0 && $action == 'editline' && $user->rights->ficheinter->creer && GETPOST('line_id','int') == $objp->rowid) + { + print ''; + print ''; + + // Date d'intervention + print ''; + + // Duration + print ''; + + print ''; + print '' . "\n"; + } + + $i++; } - // Line in update mode - if ($object->statut == 0 && $action == 'editline' && $user->rights->ficheinter->creer && GETPOST('line_id','int') == $objp->rowid) - { - print ''; - print '
    '.dol_print_date($db->jdate($objp->date_intervention),'dayhour').'
    '.$langs->trans('Description').''.$langs->trans('Date').''.$langs->trans('Duration').' 
    '.convertSecondToTime($objp->duree).''; - print 'rowid.'#'.$objp->rowid.'">'; - print img_edit(); - print ''; - print ''; - print 'rowid.'">'; - print img_delete(); - print '
    '; + print ''; // ancre pour retourner sur la ligne + print dol_htmlentitiesbr($objp->description); + + // Date + print ''.dol_print_date($db->jdate($objp->date_intervention),'dayhour').''.convertSecondToTime($objp->duree).''; - if ($i > 0) - { - print 'rowid.'">'; - print img_up(); - print ''; - } - if ($i < $num-1) - { - print 'rowid.'">'; - print img_down(); - print ''; - } + print 'rowid.'#'.$objp->rowid.'">'; + print img_edit(); + print ''; print ''; + print 'rowid.'">'; + print img_delete(); + print ''; + if ($i > 0) + { + print 'rowid.'">'; + print img_up(); + print ''; + } + if ($i < $num-1) + { + print 'rowid.'">'; + print img_down(); + print ''; + } + print '  
    '; + print ''; // ancre pour retourner sur la ligne + + // Editeur wysiwyg + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; + $doleditor=new DolEditor('np_desc',$objp->description,'',164,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70); + $doleditor->Create(); + print ''; + $form->select_date($db->jdate($objp->date_intervention),'di',1,1,0,"date_intervention"); + print ''; + $form->select_duration('duration',$objp->duree); + print ''; + print '
    '; - print ''; // ancre pour retourner sur la ligne + $db->free($resql); - // Editeur wysiwyg + // Add new line + if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline' && empty($conf->global->FICHINTER_DISABLE_DETAILS)) + { + if (! $num) print '
    '; + + print ''; + print ''; + print ''; + print ''; + + print ''; + print "\n"; + + $var=false; + + print '\n"; + print ''; - // Date d'intervention + // Date intervention print ''; // Duration print ''; - print ''; - print '' . "\n"; + print ''; + print ''; + + if (! $num) print '
    '; + print ''; // ancre + print $langs->trans('Description').''.$langs->trans('Date').''.$langs->trans('Duration').' 
    '; + // editeur wysiwyg require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; - $doleditor=new DolEditor('np_desc',$objp->description,'',164,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70); + $doleditor=new DolEditor('np_desc',GETPOST('np_desc','alpha'),'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70); $doleditor->Create(); print ''; - $form->select_date($db->jdate($objp->date_intervention),'di',1,1,0,"date_intervention"); + $now=dol_now(); + $timearray=dol_getdate($now); + if (! GETPOST('diday','int')) $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']); + else $timewithnohour=dol_mktime(GETPOST('dihour','int'),GETPOST('dimin','int'), 0,GETPOST('dimonth','int'),GETPOST('diday','int'),GETPOST('diyear','int')); + $form->select_date($timewithnohour,'di',1,1,0,"addinter"); print ''; - $form->select_duration('duration',$objp->duree); + $selectmode='select'; + if (! empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) $selectmode='text'; + $form->select_duration('duration', (!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))?3600:(60*60*GETPOST('durationhour','int')+60*GETPOST('durationmin','int')), 0, $selectmode, 1); print ''; - print '
    '; } - $i++; + if ($num) print '
    '; } - - $db->free($resql); - - // Add new line - if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline' && empty($conf->global->FICHINTER_DISABLE_DETAILS)) + else { - if (! $num) print '
    '; - - print ''; - print ''; - print ''; - print ''; - - print ''; - print "\n"; - - $var=false; - - print '\n"; - print ''; - - // Date intervention - print ''; - - // Duration - print ''; - - print ''; - print ''; - - if (! $num) print '
    '; - print ''; // ancre - print $langs->trans('Description').''.$langs->trans('Date').''.$langs->trans('Duration').' 
    '; - // editeur wysiwyg - require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; - $doleditor=new DolEditor('np_desc',GETPOST('np_desc','alpha'),'',100,'dolibarr_details','',false,true,$conf->global->FCKEDITOR_ENABLE_DETAILS,ROWS_2,70); - $doleditor->Create(); - print ''; - $now=dol_now(); - $timearray=dol_getdate($now); - if (! GETPOST('diday','int')) $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']); - else $timewithnohour=dol_mktime(GETPOST('dihour','int'),GETPOST('dimin','int'), 0,GETPOST('dimonth','int'),GETPOST('diday','int'),GETPOST('diyear','int')); - $form->select_date($timewithnohour,'di',1,1,0,"addinter"); - print ''; - $selectmode='select'; - if (! empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) $selectmode='text'; - $form->select_duration('duration', (!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))?3600:(60*60*GETPOST('durationhour','int')+60*GETPOST('durationmin','int')), 0, $selectmode, 1); - print '
    '; + dol_print_error($db); } - if ($num) print '
    '; - } - else - { - dol_print_error($db); - } + print '
    '."\n"; + } - print ''."\n"; + dol_fiche_end(); - print '
'; print "\n"; @@ -1529,7 +1547,7 @@ else if ($id > 0 || ! empty($ref)) } // Modify - if ($object->statut == 1 && $user->rights->ficheinter->creer) + if ($object->statut == 1 && $user->rights->ficheinter->creer && empty($conf->global->FICHINTER_DISABLE_DETAILS)) { print '
'.$langs->trans("Modify").'
'; @@ -1572,6 +1590,10 @@ else if ($id > 0 || ! empty($ref)) { print '
'.$langs->trans("ClassifyBilled").'
'; } + else + { + print '
'.$langs->trans("ClassifyUnBilled").'
'; + } } } diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index aa18223c0c5..6a730dbe046 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011-2012 Juanjo Menent * Copyright (C) 2013 Cédric Salvador @@ -108,8 +108,11 @@ if ($result) print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$urlparam,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Description"),$_SERVER["PHP_SELF"],"f.description","",$urlparam,'',$sortfield,$sortorder); print_liste_field_titre('',$_SERVER["PHP_SELF"],''); - print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"fd.date","",$urlparam,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],"fd.duree","",$urlparam,'align="right"',$sortfield,$sortorder); + if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) + { + print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"fd.date","",$urlparam,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Duration"),$_SERVER["PHP_SELF"],"fd.duree","",$urlparam,'align="right"',$sortfield,$sortorder); + } print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"f.fk_statut","",$urlparam,'align="right"',$sortfield,$sortorder); print "\n"; @@ -122,8 +125,11 @@ if ($result) print ''; print ''; print ' '; - print ' '; - print ' '; + if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) + { + print ' '; + print ' '; + } print ''; print "\n"; @@ -150,8 +156,11 @@ if ($result) print ''; print ''.dol_htmlentitiesbr(dol_trunc($objp->description,20)).''; print ''.dol_htmlentitiesbr(dol_trunc($objp->descriptiondetail,20)).''; - print ''.dol_print_date($db->jdate($objp->dp),'dayhour')."\n"; - print ''.convertSecondToTime($objp->duree).''; + if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) + { + print ''.dol_print_date($db->jdate($objp->dp),'dayhour')."\n"; + print ''.convertSecondToTime($objp->duree).''; + } print ''.$interventionstatic->LibStatut($objp->fk_statut,5).''; print "\n"; @@ -159,9 +168,13 @@ if ($result) $total += $objp->duree; $i++; } - print ''.$langs->trans("Total").''; - print ''.convertSecondToTime($total).' '; - print ''; + $rowspan=3; + if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) + { + print ''.$langs->trans("Total").''; + print ''.convertSecondToTime($total).' '; + print ''; + } print ''; print "\n"; diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index b9cd7f40163..367ba5b972e 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -263,9 +263,9 @@ class ProductFournisseur extends Product $error++; } - /*if (! $error) + if (! $error && !empty($cong->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) { - // Ajoute modif dans table log + // Add record into log table $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_log("; $sql.= "datec, fk_product_fournisseur,fk_user,price,quantity)"; $sql.= "values('".$this->db->idate($now)."',"; @@ -281,7 +281,7 @@ class ProductFournisseur extends Product $error++; } } - */ + if (! $error) { diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 02010d1e2e8..8903ff3b66a 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -203,7 +203,7 @@ class PaiementFourn extends Paiement { // Call trigger $result=$this->call_trigger('PAYMENT_SUPPLIER_CREATE',$user); - if ($result < 0) $error++; + if ($result < 0) $error++; // End call triggers } } @@ -255,7 +255,7 @@ class PaiementFourn extends Paiement { if (count($billsarray)) { - $this->error='Can\'t delete a payment shared by at least one invoice with status payed'; + $this->error="ErrorCantDeletePaymentSharedWithPayedInvoice"; $this->db->rollback(); return -1; } @@ -274,7 +274,7 @@ class PaiementFourn extends Paiement $accline->fetch($bank_line_id); if ($accline->rappro) { - $this->error='Impossible de supprimer un paiement qui a genere une ecriture qui a ete rapprochee'; + $this->error="ErrorCantDeletePaymentReconciliated"; $this->db->rollback(); return -3; } diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 5e7658d25b0..c66a03382de 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -5,6 +5,7 @@ * Copyright (C) 2004 Christophe Combelles * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com> * * 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 @@ -328,9 +329,19 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie { $i = 0; print '
'; - print $langs->trans('Invoices').'
'; - print ''; + + if(!empty($conf->global->FAC_AUTO_FILLJS)){ + //Add js for AutoFill + print "\n".''."\n"; + } + print '
'; print ''; print ''; print ''; @@ -370,8 +381,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; print '\n"; + print "\n"; $total+=$objp->total_ht; $total_ttc+=$objp->total_ttc; $totalrecu+=$objp->am; @@ -468,7 +481,7 @@ if (empty($action)) { $sql .= ' AND p.rowid='.$db->escape($search_ref); } - if (! empty($search_account)) + if (! empty($search_account) && $search_account > 0) { $sql .= ' AND b.fk_account='.$db->escape($search_account); } diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql new file mode 100644 index 00000000000..497b85d4059 --- /dev/null +++ b/htdocs/install/mysql/data/llx_00_c_country.sql @@ -0,0 +1,272 @@ +-- Copyright (C) 2001-2004 Rodolphe Quiedeville +-- Copyright (C) 2003 Jean-Louis Bergamo +-- Copyright (C) 2004-2010 Laurent Destailleur +-- Copyright (C) 2004 Benoit Mortier +-- Copyright (C) 2004 Guillaume Delecourt +-- Copyright (C) 2005-2009 Regis Houssin +-- Copyright (C) 2007 Patrick Raguin +-- +-- 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 +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- Do not add comment at end of line. This file is parsed by install and -- are removed + +-- +-- Countries +-- + +-- delete from llx_c_country; +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (0,'',NULL,'-',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (1,'FR','FRA','France',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (2,'BE','BEL','Belgium',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (3,'IT','ITA','Italy',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (4,'ES','ESP','Spain',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (5,'DE','DEU','Germany',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (6,'CH','CHE','Switzerland',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (7,'GB','GBR','United Kingdom',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (8,'IE','IRL','Irland',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (9,'CN','CHN','China',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (10,'TN','TUN','Tunisia',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (11,'US','USA','United States',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (12,'MA','MAR','Maroc',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (13,'DZ','DZA','Algeria',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (14,'CA','CAN','Canada',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (15,'TG','TGO','Togo',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (16,'GA','GAB','Gabon',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (17,'NL','NLD','Nerderland',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (18,'HU','HUN','Hongrie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (19,'RU','RUS','Russia',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (20,'SE','SWE','Sweden',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (21,'CI','CIV','Côte d''Ivoire',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (22,'SN','SEN','Senegal',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (23,'AR','ARG','Argentine',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (24,'CM','CMR','Cameroun',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (25,'PT','PRT','Portugal',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (26,'SA','SAU','Saudi Arabia',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (27,'MC','MCO','Monaco',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (28,'AU','AUS','Australia',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (29,'SG','SGP','Singapour',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (30,'AF','AFG','Afghanistan',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (31,'AX','ALA','Iles Aland',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (32,'AL','ALB','Albanie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (33,'AS','ASM','Samoa américaines',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (34,'AD','AND','Andorre',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (35,'AO','AGO','Angola',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (36,'AI','AIA','Anguilla',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (37,'AQ','ATA','Antarctique',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (38,'AG','ATG','Antigua-et-Barbuda',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (39,'AM','ARM','Arménie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (40,'AW','ABW','Aruba',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (41,'AT','AUT','Autriche',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (42,'AZ','AZE','Azerbaïdjan',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (43,'BS','BHS','Bahamas',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (44,'BH','BHR','Bahreïn',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (45,'BD','BGD','Bangladesh',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (46,'BB','BRB','Barbade',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (47,'BY','BLR','Biélorussie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (48,'BZ','BLZ','Belize',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (49,'BJ','BEN','Bénin',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (50,'BM','BMU','Bermudes',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (51,'BT','BTN','Bhoutan',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (52,'BO','BOL','Bolivie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (53,'BA','BIH','Bosnie-Herzégovine',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (54,'BW','BWA','Botswana',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (55,'BV','BVT','Ile Bouvet',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (56,'BR','BRA','Brazil',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (57,'IO','IOT','Territoire britannique de l''Océan Indien',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (58,'BN','BRN','Brunei',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (59,'BG','BGR','Bulgarie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (60,'BF','BFA','Burkina Faso',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (61,'BI','BDI','Burundi',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (62,'KH','KHM','Cambodge',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (63,'CV','CPV','Cap-Vert',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (64,'KY','CYM','Iles Cayman',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (65,'CF','CAF','République centrafricaine',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (66,'TD','TCD','Tchad',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (67,'CL','CHL','Chili',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (68,'CX','CXR','Ile Christmas',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (69,'CC','CCK','Iles des Cocos (Keeling)',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (70,'CO','COL','Colombie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (71,'KM','COM','Comores',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (72,'CG','COG','Congo',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (73,'CD','COD','République démocratique du Congo',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (74,'CK','COK','Iles Cook',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (75,'CR','CRI','Costa Rica',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (76,'HR','HRV','Croatie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (77,'CU','CUB','Cuba',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (78,'CY','CYP','Chypre',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (79,'CZ','CZE','République Tchèque',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (80,'DK','DNK','Danemark',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (81,'DJ','DJI','Djibouti',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (82,'DM','DMA','Dominique',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (83,'DO','DOM','République Dominicaine',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (84,'EC','ECU','Equateur',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (85,'EG','EGY','Egypte',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (86,'SV','SLV','Salvador',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (87,'GQ','GNQ','Guinée Equatoriale',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (88,'ER','ERI','Erythrée',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (89,'EE','EST','Estonia',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (90,'ET','ETH','Ethiopie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (91,'FK','FLK','Iles Falkland',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (92,'FO','FRO','Iles Féroé',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (93,'FJ','FJI','Iles Fidji',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (94,'FI','FIN','Finlande',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (95,'GF','GUF','Guyane française',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (96,'PF','PYF','Polynésie française',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (97,'TF','ATF','Terres australes françaises',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (98,'GM','GMB','Gambie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (99,'GE','GEO','Georgia',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (100,'GH','GHA','Ghana',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (101,'GI','GIB','Gibraltar',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (102,'GR','GRC','Greece',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (103,'GL','GRL','Groenland',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (104,'GD','GRD','Grenade',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (106,'GU','GUM','Guam',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (107,'GT','GTM','Guatemala',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (108,'GN','GIN','Guinea',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (109,'GW','GNB','Guinea-Bissao',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (111,'HT','HTI','Haiti',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (112,'HM','HMD','Iles Heard et McDonald',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (113,'VA','VAT','Saint-Siège (Vatican)',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (114,'HN','HND','Honduras',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (115,'HK','HKG','Hong Kong',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (116,'IS','ISL','Islande',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (117,'IN','IND','India',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (118,'ID','IDN','Indonésie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (119,'IR','IRN','Iran',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (120,'IQ','IRQ','Iraq',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (121,'IL','ISR','Israel',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (122,'JM','JAM','Jamaïque',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (123,'JP','JPN','Japon',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (124,'JO','JOR','Jordanie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (125,'KZ','KAZ','Kazakhstan',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (126,'KE','KEN','Kenya',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (127,'KI','KIR','Kiribati',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (128,'KP','PRK','North Corea',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (129,'KR','KOR','South Corea',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (130,'KW','KWT','Koweït',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (131,'KG','KGZ','Kirghizistan',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (132,'LA','LAO','Laos',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (133,'LV','LVA','Lettonie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (134,'LB','LBN','Liban',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (135,'LS','LSO','Lesotho',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (136,'LR','LBR','Liberia',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (137,'LY','LBY','Libye',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (138,'LI','LIE','Liechtenstein',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (139,'LT','LTU','Lituanie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (140,'LU','LUX','Luxembourg',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (141,'MO','MAC','Macao',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (142,'MK','MKD','ex-République yougoslave de Macédoine',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (143,'MG','MDG','Madagascar',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (144,'MW','MWI','Malawi',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (145,'MY','MYS','Malaisie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (146,'MV','MDV','Maldives',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (147,'ML','MLI','Mali',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (148,'MT','MLT','Malte',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (149,'MH','MHL','Iles Marshall',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (151,'MR','MRT','Mauritanie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (152,'MU','MUS','Maurice',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (153,'YT','MYT','Mayotte',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (154,'MX','MEX','Mexique',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (155,'FM','FSM','Micronésie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (156,'MD','MDA','Moldavie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (157,'MN','MNG','Mongolie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (158,'MS','MSR','Monserrat',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (159,'MZ','MOZ','Mozambique',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (160,'MM','MMR','Birmanie (Myanmar)',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (161,'NA','NAM','Namibie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (162,'NR','NRU','Nauru',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (163,'NP','NPL','Népal',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (164,'AN',NULL,'Antilles néerlandaises',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (165,'NC','NCL','Nouvelle-Calédonie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (166,'NZ','NZL','Nouvelle-Zélande',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (167,'NI','NIC','Nicaragua',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (168,'NE','NER','Niger',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (169,'NG','NGA','Nigeria',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (170,'NU','NIU','Nioué',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (171,'NF','NFK','Ile Norfolk',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (172,'MP','MNP','Mariannes du Nord',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (173,'NO','NOR','Norvège',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (174,'OM','OMN','Oman',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (175,'PK','PAK','Pakistan',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (176,'PW','PLW','Palaos',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (177,'PS','PSE','Territoire Palestinien Occupé',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (178,'PA','PAN','Panama',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (179,'PG','PNG','Papouasie-Nouvelle-Guinée',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (180,'PY','PRY','Paraguay',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (181,'PE','PER','Peru',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (182,'PH','PHL','Philippines',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (183,'PN','PCN','Iles Pitcairn',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (184,'PL','POL','Pologne',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (185,'PR','PRI','Porto Rico',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (186,'QA','QAT','Qatar',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (188,'RO','ROU','Roumanie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (189,'RW','RWA','Rwanda',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (190,'SH','SHN','Sainte-Hélène',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (191,'KN','KNA','Saint-Christophe-et-Niévès',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (192,'LC','LCA','Sainte-Lucie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (193,'PM','SPM','Saint-Pierre-et-Miquelon',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (194,'VC','VCT','Saint-Vincent-et-les-Grenadines',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (195,'WS','WSM','Samoa',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (196,'SM','SMR','Saint-Marin',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (197,'ST','STP','Sao Tomé-et-Principe',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (198,'RS','SRB','Serbie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (199,'SC','SYC','Seychelles',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (200,'SL','SLE','Sierra Leone',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (201,'SK','SVK','Slovaquie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (202,'SI','SVN','Slovénie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (203,'SB','SLB','Iles Salomon',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (204,'SO','SOM','Somalie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (205,'ZA','ZAF','Afrique du Sud',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (206,'GS','SGS','Iles Géorgie du Sud et Sandwich du Sud',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (207,'LK','LKA','Sri Lanka',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (208,'SD','SDN','Soudan',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (209,'SR','SUR','Suriname',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (210,'SJ','SJM','Iles Svalbard et Jan Mayen',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (211,'SZ','SWZ','Swaziland',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (212,'SY','SYR','Syrie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (213,'TW','TWN','Taïwan',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (214,'TJ','TJK','Tadjikistan',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (215,'TZ','TZA','Tanzanie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (216,'TH','THA','Thaïlande',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (217,'TL','TLS','Timor Oriental',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (218,'TK','TKL','Tokélaou',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (219,'TO','TON','Tonga',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (220,'TT','TTO','Trinité-et-Tobago',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (221,'TR','TUR','Turquie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (222,'TM','TKM','Turkménistan',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (223,'TC','TCA','Iles Turks-et-Caicos',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (224,'TV','TUV','Tuvalu',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (225,'UG','UGA','Ouganda',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (226,'UA','UKR','Ukraine',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (227,'AE','ARE','Émirats arabes unis',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (228,'UM','UMI','Iles mineures éloignées des États-Unis',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (229,'UY','URY','Uruguay',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (230,'UZ','UZB','Ouzbékistan',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (231,'VU','VUT','Vanuatu',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (232,'VE','VEN','Vénézuela',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (233,'VN','VNM','Viêt Nam',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (234,'VG','VGB','Iles Vierges britanniques',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (235,'VI','VIR','Iles Vierges américaines',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (236,'WF','WLF','Wallis-et-Futuna',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (237,'EH','ESH','Sahara occidental',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (238,'YE','YEM','Yémen',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (239,'ZM','ZMB','Zambie',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (240,'ZW','ZWE','Zimbabwe',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (241,'GG','GGY','Guernesey',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (242,'IM','IMN','Ile de Man',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (243,'JE','JEY','Jersey',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (244,'ME','MNE','Monténégro',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (245,'BL','BLM','Saint-Barthélemy',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (246,'MF','MAF','Saint-Martin',1); +INSERT INTO llx_c_country (rowid,code,code_iso,label,active) VALUES (247,'BU', null, 'Burundi',1); diff --git a/htdocs/install/mysql/data/llx_00_c_pays.sql b/htdocs/install/mysql/data/llx_00_c_pays.sql deleted file mode 100644 index 6db4454f3c2..00000000000 --- a/htdocs/install/mysql/data/llx_00_c_pays.sql +++ /dev/null @@ -1,272 +0,0 @@ --- Copyright (C) 2001-2004 Rodolphe Quiedeville --- Copyright (C) 2003 Jean-Louis Bergamo --- Copyright (C) 2004-2010 Laurent Destailleur --- Copyright (C) 2004 Benoit Mortier --- Copyright (C) 2004 Guillaume Delecourt --- Copyright (C) 2005-2009 Regis Houssin --- Copyright (C) 2007 Patrick Raguin --- --- 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 --- the Free Software Foundation; either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see . --- --- Do not add comment at end of line. This file is parsed by install and -- are removed - --- --- Countries --- - --- delete from llx_c_pays; -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (0,'',NULL,'-',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (1,'FR','FRA','France',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (2,'BE','BEL','Belgium',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (3,'IT','ITA','Italy',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (4,'ES','ESP','Spain',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (5,'DE','DEU','Germany',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (6,'CH','CHE','Switzerland',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (7,'GB','GBR','United Kingdom',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (8,'IE','IRL','Irland',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (9,'CN','CHN','China',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (10,'TN','TUN','Tunisia',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (11,'US','USA','United States',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (12,'MA','MAR','Maroc',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (13,'DZ','DZA','Algeria',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (14,'CA','CAN','Canada',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (15,'TG','TGO','Togo',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (16,'GA','GAB','Gabon',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (17,'NL','NLD','Nerderland',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (18,'HU','HUN','Hongrie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (19,'RU','RUS','Russia',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (20,'SE','SWE','Sweden',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (21,'CI','CIV','Côte d''Ivoire',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (22,'SN','SEN','Senegal',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (23,'AR','ARG','Argentine',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (24,'CM','CMR','Cameroun',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (25,'PT','PRT','Portugal',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (26,'SA','SAU','Saudi Arabia',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (27,'MC','MCO','Monaco',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (28,'AU','AUS','Australia',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (29,'SG','SGP','Singapour',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (30,'AF','AFG','Afghanistan',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (31,'AX','ALA','Iles Aland',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (32,'AL','ALB','Albanie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (33,'AS','ASM','Samoa américaines',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (34,'AD','AND','Andorre',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (35,'AO','AGO','Angola',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (36,'AI','AIA','Anguilla',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (37,'AQ','ATA','Antarctique',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (38,'AG','ATG','Antigua-et-Barbuda',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (39,'AM','ARM','Arménie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (40,'AW','ABW','Aruba',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (41,'AT','AUT','Autriche',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (42,'AZ','AZE','Azerbaïdjan',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (43,'BS','BHS','Bahamas',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (44,'BH','BHR','Bahreïn',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (45,'BD','BGD','Bangladesh',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (46,'BB','BRB','Barbade',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (47,'BY','BLR','Biélorussie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (48,'BZ','BLZ','Belize',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (49,'BJ','BEN','Bénin',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (50,'BM','BMU','Bermudes',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (51,'BT','BTN','Bhoutan',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (52,'BO','BOL','Bolivie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (53,'BA','BIH','Bosnie-Herzégovine',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (54,'BW','BWA','Botswana',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (55,'BV','BVT','Ile Bouvet',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (56,'BR','BRA','Brazil',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (57,'IO','IOT','Territoire britannique de l''Océan Indien',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (58,'BN','BRN','Brunei',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (59,'BG','BGR','Bulgarie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (60,'BF','BFA','Burkina Faso',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (61,'BI','BDI','Burundi',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (62,'KH','KHM','Cambodge',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (63,'CV','CPV','Cap-Vert',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (64,'KY','CYM','Iles Cayman',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (65,'CF','CAF','République centrafricaine',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (66,'TD','TCD','Tchad',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (67,'CL','CHL','Chili',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (68,'CX','CXR','Ile Christmas',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (69,'CC','CCK','Iles des Cocos (Keeling)',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (70,'CO','COL','Colombie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (71,'KM','COM','Comores',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (72,'CG','COG','Congo',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (73,'CD','COD','République démocratique du Congo',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (74,'CK','COK','Iles Cook',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (75,'CR','CRI','Costa Rica',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (76,'HR','HRV','Croatie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (77,'CU','CUB','Cuba',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (78,'CY','CYP','Chypre',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (79,'CZ','CZE','République Tchèque',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (80,'DK','DNK','Danemark',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (81,'DJ','DJI','Djibouti',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (82,'DM','DMA','Dominique',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (83,'DO','DOM','République Dominicaine',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (84,'EC','ECU','Equateur',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (85,'EG','EGY','Egypte',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (86,'SV','SLV','Salvador',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (87,'GQ','GNQ','Guinée Equatoriale',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (88,'ER','ERI','Erythrée',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (89,'EE','EST','Estonia',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (90,'ET','ETH','Ethiopie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (91,'FK','FLK','Iles Falkland',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (92,'FO','FRO','Iles Féroé',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (93,'FJ','FJI','Iles Fidji',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (94,'FI','FIN','Finlande',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (95,'GF','GUF','Guyane française',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (96,'PF','PYF','Polynésie française',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (97,'TF','ATF','Terres australes françaises',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (98,'GM','GMB','Gambie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (99,'GE','GEO','Georgia',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (100,'GH','GHA','Ghana',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (101,'GI','GIB','Gibraltar',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (102,'GR','GRC','Greece',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (103,'GL','GRL','Groenland',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (104,'GD','GRD','Grenade',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (106,'GU','GUM','Guam',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (107,'GT','GTM','Guatemala',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (108,'GN','GIN','Guinea',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (109,'GW','GNB','Guinea-Bissao',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (111,'HT','HTI','Haiti',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (112,'HM','HMD','Iles Heard et McDonald',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (113,'VA','VAT','Saint-Siège (Vatican)',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (114,'HN','HND','Honduras',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (115,'HK','HKG','Hong Kong',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (116,'IS','ISL','Islande',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (117,'IN','IND','India',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (118,'ID','IDN','Indonésie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (119,'IR','IRN','Iran',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (120,'IQ','IRQ','Iraq',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (121,'IL','ISR','Israel',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (122,'JM','JAM','Jamaïque',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (123,'JP','JPN','Japon',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (124,'JO','JOR','Jordanie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (125,'KZ','KAZ','Kazakhstan',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (126,'KE','KEN','Kenya',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (127,'KI','KIR','Kiribati',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (128,'KP','PRK','North Corea',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (129,'KR','KOR','South Corea',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (130,'KW','KWT','Koweït',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (131,'KG','KGZ','Kirghizistan',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (132,'LA','LAO','Laos',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (133,'LV','LVA','Lettonie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (134,'LB','LBN','Liban',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (135,'LS','LSO','Lesotho',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (136,'LR','LBR','Liberia',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (137,'LY','LBY','Libye',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (138,'LI','LIE','Liechtenstein',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (139,'LT','LTU','Lituanie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (140,'LU','LUX','Luxembourg',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (141,'MO','MAC','Macao',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (142,'MK','MKD','ex-République yougoslave de Macédoine',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (143,'MG','MDG','Madagascar',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (144,'MW','MWI','Malawi',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (145,'MY','MYS','Malaisie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (146,'MV','MDV','Maldives',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (147,'ML','MLI','Mali',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (148,'MT','MLT','Malte',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (149,'MH','MHL','Iles Marshall',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (151,'MR','MRT','Mauritanie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (152,'MU','MUS','Maurice',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (153,'YT','MYT','Mayotte',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (154,'MX','MEX','Mexique',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (155,'FM','FSM','Micronésie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (156,'MD','MDA','Moldavie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (157,'MN','MNG','Mongolie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (158,'MS','MSR','Monserrat',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (159,'MZ','MOZ','Mozambique',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (160,'MM','MMR','Birmanie (Myanmar)',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (161,'NA','NAM','Namibie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (162,'NR','NRU','Nauru',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (163,'NP','NPL','Népal',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (164,'AN',NULL,'Antilles néerlandaises',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (165,'NC','NCL','Nouvelle-Calédonie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (166,'NZ','NZL','Nouvelle-Zélande',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (167,'NI','NIC','Nicaragua',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (168,'NE','NER','Niger',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (169,'NG','NGA','Nigeria',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (170,'NU','NIU','Nioué',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (171,'NF','NFK','Ile Norfolk',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (172,'MP','MNP','Mariannes du Nord',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (173,'NO','NOR','Norvège',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (174,'OM','OMN','Oman',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (175,'PK','PAK','Pakistan',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (176,'PW','PLW','Palaos',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (177,'PS','PSE','Territoire Palestinien Occupé',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (178,'PA','PAN','Panama',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (179,'PG','PNG','Papouasie-Nouvelle-Guinée',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (180,'PY','PRY','Paraguay',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (181,'PE','PER','Peru',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (182,'PH','PHL','Philippines',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (183,'PN','PCN','Iles Pitcairn',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (184,'PL','POL','Pologne',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (185,'PR','PRI','Porto Rico',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (186,'QA','QAT','Qatar',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (188,'RO','ROU','Roumanie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (189,'RW','RWA','Rwanda',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (190,'SH','SHN','Sainte-Hélène',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (191,'KN','KNA','Saint-Christophe-et-Niévès',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (192,'LC','LCA','Sainte-Lucie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (193,'PM','SPM','Saint-Pierre-et-Miquelon',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (194,'VC','VCT','Saint-Vincent-et-les-Grenadines',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (195,'WS','WSM','Samoa',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (196,'SM','SMR','Saint-Marin',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (197,'ST','STP','Sao Tomé-et-Principe',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (198,'RS','SRB','Serbie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (199,'SC','SYC','Seychelles',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (200,'SL','SLE','Sierra Leone',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (201,'SK','SVK','Slovaquie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (202,'SI','SVN','Slovénie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (203,'SB','SLB','Iles Salomon',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (204,'SO','SOM','Somalie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (205,'ZA','ZAF','Afrique du Sud',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (206,'GS','SGS','Iles Géorgie du Sud et Sandwich du Sud',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (207,'LK','LKA','Sri Lanka',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (208,'SD','SDN','Soudan',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (209,'SR','SUR','Suriname',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (210,'SJ','SJM','Iles Svalbard et Jan Mayen',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (211,'SZ','SWZ','Swaziland',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (212,'SY','SYR','Syrie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (213,'TW','TWN','Taïwan',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (214,'TJ','TJK','Tadjikistan',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (215,'TZ','TZA','Tanzanie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (216,'TH','THA','Thaïlande',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (217,'TL','TLS','Timor Oriental',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (218,'TK','TKL','Tokélaou',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (219,'TO','TON','Tonga',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (220,'TT','TTO','Trinité-et-Tobago',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (221,'TR','TUR','Turquie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (222,'TM','TKM','Turkménistan',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (223,'TC','TCA','Iles Turks-et-Caicos',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (224,'TV','TUV','Tuvalu',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (225,'UG','UGA','Ouganda',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (226,'UA','UKR','Ukraine',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (227,'AE','ARE','Émirats arabes unis',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (228,'UM','UMI','Iles mineures éloignées des États-Unis',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (229,'UY','URY','Uruguay',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (230,'UZ','UZB','Ouzbékistan',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (231,'VU','VUT','Vanuatu',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (232,'VE','VEN','Vénézuela',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (233,'VN','VNM','Viêt Nam',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (234,'VG','VGB','Iles Vierges britanniques',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (235,'VI','VIR','Iles Vierges américaines',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (236,'WF','WLF','Wallis-et-Futuna',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (237,'EH','ESH','Sahara occidental',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (238,'YE','YEM','Yémen',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (239,'ZM','ZMB','Zambie',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (240,'ZW','ZWE','Zimbabwe',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (241,'GG','GGY','Guernesey',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (242,'IM','IMN','Ile de Man',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (243,'JE','JEY','Jersey',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (244,'ME','MNE','Monténégro',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (245,'BL','BLM','Saint-Barthélemy',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (246,'MF','MAF','Saint-Martin',1); -INSERT INTO llx_c_pays (rowid,code,code_iso,libelle,active) VALUES (247,'BU', null, 'Burundi',1); diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index 2b8b5f92dea..4415f5711bf 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -32,242 +32,243 @@ -- Regions -- -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (0,0,0,'0',0,'-'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 0, 0, '0',0,'-'); -- Regions France (id country=1) -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 101, 1, 1,'97105',3,'Guadeloupe'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 102, 1, 2,'97209',3,'Martinique'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 103, 1, 3,'97302',3,'Guyane'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 104, 1, 4,'97411',3,'Réunion'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 105, 1, 11,'75056',1,'Île-de-France'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 106, 1, 21,'51108',0,'Champagne-Ardenne'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 107, 1, 22,'80021',0,'Picardie'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 108, 1, 23,'76540',0,'Haute-Normandie'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 109, 1, 24,'45234',2,'Centre'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 110, 1, 25,'14118',0,'Basse-Normandie'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 111, 1, 26,'21231',0,'Bourgogne'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 112, 1, 31,'59350',2,'Nord-Pas-de-Calais'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 113, 1, 41,'57463',0,'Lorraine'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 114, 1, 42,'67482',1,'Alsace'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 115, 1, 43,'25056',0,'Franche-Comté'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 116, 1, 52,'44109',4,'Pays de la Loire'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 117, 1, 53,'35238',0,'Bretagne'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 118, 1, 54,'86194',2,'Poitou-Charentes'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 119, 1, 72,'33063',1,'Aquitaine'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 120, 1, 73,'31555',0,'Midi-Pyrénées'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 121, 1, 74,'87085',2,'Limousin'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 122, 1, 82,'69123',2,'Rhône-Alpes'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 123, 1, 83,'63113',1,'Auvergne'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 124, 1, 91,'34172',2,'Languedoc-Roussillon'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 125, 1, 93,'13055',0,'Provence-Alpes-Côte d''Azur'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 126, 1, 94,'2A004',0,'Corse'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 1,'97105',3,'Guadeloupe'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 2,'97209',3,'Martinique'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 3,'97302',3,'Guyane'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 4,'97411',3,'Réunion'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 6,'',3,'Mayotte'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 11,'75056',1,'Île-de-France'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 21,'51108',0,'Champagne-Ardenne'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 22,'80021',0,'Picardie'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 23,'76540',0,'Haute-Normandie'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 24,'45234',2,'Centre'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 25,'14118',0,'Basse-Normandie'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 26,'21231',0,'Bourgogne'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 31,'59350',2,'Nord-Pas-de-Calais'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 41,'57463',0,'Lorraine'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 42,'67482',1,'Alsace'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 43,'25056',0,'Franche-Comté'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 52,'44109',4,'Pays de la Loire'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 53,'35238',0,'Bretagne'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 54,'86194',2,'Poitou-Charentes'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 72,'33063',1,'Aquitaine'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 73,'31555',0,'Midi-Pyrénées'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 74,'87085',2,'Limousin'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 82,'69123',2,'Rhône-Alpes'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 83,'63113',1,'Auvergne'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 91,'34172',2,'Languedoc-Roussillon'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 93,'13055',0,'Provence-Alpes-Côte d''Azur'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 1, 94,'2A004',0,'Corse'); -- Regions Belgium (id country=2) -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 201, 2, 201, '',1,'Flandre'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 202, 2, 202, '',2,'Wallonie'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values ( 203, 2, 203, '',3,'Bruxelles-Capitale'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 2, 201, '',1,'Flandre'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 2, 202, '',2,'Wallonie'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 2, 203, '',3,'Bruxelles-Capitale'); -- Regions Italy (id country=3) -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (301, 3, 301, NULL, 1, 'Abruzzo'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (302, 3, 302, NULL, 1, 'Basilicata'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (303, 3, 303, NULL, 1, 'Calabria'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (304, 3, 304, NULL, 1, 'Campania'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (305, 3, 305, NULL, 1, 'Emilia-Romagna'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (306, 3, 306, NULL, 1, 'Friuli-Venezia Giulia'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (307, 3, 307, NULL, 1, 'Lazio'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (308, 3, 308, NULL, 1, 'Liguria'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (309, 3, 309, NULL, 1, 'Lombardia'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (310, 3, 310, NULL, 1, 'Marche'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (311, 3, 311, NULL, 1, 'Molise'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (312, 3, 312, NULL, 1, 'Piemonte'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (313, 3, 313, NULL, 1, 'Puglia'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (314, 3, 314, NULL, 1, 'Sardegna'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (315, 3, 315, NULL, 1, 'Sicilia'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (316, 3, 316, NULL, 1, 'Toscana'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (317, 3, 317, NULL, 1, 'Trentino-Alto Adige'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (318, 3, 318, NULL, 1, 'Umbria'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (319, 3, 319, NULL, 1, 'Valle d Aosta'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (320, 3, 320, NULL, 1, 'Veneto'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 301, NULL, 1, 'Abruzzo'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 302, NULL, 1, 'Basilicata'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 303, NULL, 1, 'Calabria'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 304, NULL, 1, 'Campania'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 305, NULL, 1, 'Emilia-Romagna'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 306, NULL, 1, 'Friuli-Venezia Giulia'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 307, NULL, 1, 'Lazio'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 308, NULL, 1, 'Liguria'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 309, NULL, 1, 'Lombardia'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 310, NULL, 1, 'Marche'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 311, NULL, 1, 'Molise'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 312, NULL, 1, 'Piemonte'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 313, NULL, 1, 'Puglia'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 314, NULL, 1, 'Sardegna'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 315, NULL, 1, 'Sicilia'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 316, NULL, 1, 'Toscana'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 317, NULL, 1, 'Trentino-Alto Adige'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 318, NULL, 1, 'Umbria'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 319, NULL, 1, 'Valle d Aosta'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values ( 3, 320, NULL, 1, 'Veneto'); -- Regions Spain (id country=4) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (401, 4, 401, '', 0, 'Andalucia', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (402, 4, 402, '', 0, 'Aragón', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (403, 4, 403, '', 0, 'Castilla y León', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (404, 4, 404, '', 0, 'Castilla la Mancha', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (405, 4, 405, '', 0, 'Canarias', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (406, 4, 406, '', 0, 'Cataluña', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (407, 4, 407, '', 0, 'Comunidad de Ceuta', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (408, 4, 408, '', 0, 'Comunidad Foral de Navarra', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (409, 4, 409, '', 0, 'Comunidad de Melilla', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (410, 4, 410, '', 0, 'Cantabria', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (411, 4, 411, '', 0, 'Comunidad Valenciana', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (412, 4, 412, '', 0, 'Extemadura', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (413, 4, 413, '', 0, 'Galicia', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (414, 4, 414, '', 0, 'Islas Baleares', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (415, 4, 415, '', 0, 'La Rioja', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (416, 4, 416, '', 0, 'Comunidad de Madrid', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (417, 4, 417, '', 0, 'Región de Murcia', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (418, 4, 418, '', 0, 'Principado de Asturias', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (419, 4, 419, '', 0, 'Pais Vasco', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (420, 4, 420, '', 0, 'Otros', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 401, '', 0, 'Andalucia', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 402, '', 0, 'Aragón', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 403, '', 0, 'Castilla y León', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 404, '', 0, 'Castilla la Mancha', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 405, '', 0, 'Canarias', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 406, '', 0, 'Cataluña', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 407, '', 0, 'Comunidad de Ceuta', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 408, '', 0, 'Comunidad Foral de Navarra', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 409, '', 0, 'Comunidad de Melilla', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 410, '', 0, 'Cantabria', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 411, '', 0, 'Comunidad Valenciana', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 412, '', 0, 'Extemadura', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 413, '', 0, 'Galicia', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 414, '', 0, 'Islas Baleares', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 415, '', 0, 'La Rioja', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 416, '', 0, 'Comunidad de Madrid', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 417, '', 0, 'Región de Murcia', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 418, '', 0, 'Principado de Asturias', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 419, '', 0, 'Pais Vasco', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 4, 420, '', 0, 'Otros', 1); -- Regions Germany (id country=5) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (501, 5, 501, '', 0, 'Deutschland', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 5, 501, '', 0, 'Deutschland', 1); -- Regions Greece (id_country=102) -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10201, 10201, 102, NULL, NULL, 'Αττική', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10202, 10202, 102, NULL, NULL, 'Στερεά Ελλάδα', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10203, 10203, 102, NULL, NULL, 'Κεντρική Μακεδονία', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10204, 10204, 102, NULL, NULL, 'Κρήτη', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10205, 10205, 102, NULL, NULL, 'Ανατολική Μακεδονία και Θράκη', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10206, 10206, 102, NULL, NULL, 'Ήπειρος', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10207, 10207, 102, NULL, NULL, 'Ιόνια νησιά', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10208, 10208, 102, NULL, NULL, 'Βόρειο Αιγαίο', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10209, 10209, 102, NULL, NULL, 'Πελοπόννησος', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10210, 10210, 102, NULL, NULL, 'Νότιο Αιγαίο', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10211, 10211, 102, NULL, NULL, 'Δυτική Ελλάδα', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10212, 10212, 102, NULL, NULL, 'Θεσσαλία', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (10213, 10213, 102, NULL, NULL, 'Δυτική Μακεδονία', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10201, 102, NULL, NULL, 'Αττική', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10202, 102, NULL, NULL, 'Στερεά Ελλάδα', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10203, 102, NULL, NULL, 'Κεντρική Μακεδονία', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10204, 102, NULL, NULL, 'Κρήτη', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10205, 102, NULL, NULL, 'Ανατολική Μακεδονία και Θράκη', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10206, 102, NULL, NULL, 'Ήπειρος', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10207, 102, NULL, NULL, 'Ιόνια νησιά', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10208, 102, NULL, NULL, 'Βόρειο Αιγαίο', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10209, 102, NULL, NULL, 'Πελοπόννησος', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10210, 102, NULL, NULL, 'Νότιο Αιγαίο', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10211, 102, NULL, NULL, 'Δυτική Ελλάδα', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10212, 102, NULL, NULL, 'Θεσσαλία', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 10213, 102, NULL, NULL, 'Δυτική Μακεδονία', 1); -- Regions Switzerland (id country=6) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (601, 6, 601, '', 1, 'Cantons', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 6, 601, '', 1, 'Cantons', 1); -- Regions England (id_country=7) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (701, 7, 701, '', 0, 'England', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (702, 7, 702, '', 0, 'Wales', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (703, 7, 703, '', 0, 'Scotland', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (704, 7, 704, '', 0, 'Northern Ireland', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 7, 701, '', 0, 'England', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 7, 702, '', 0, 'Wales', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 7, 703, '', 0, 'Scotland', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 7, 704, '', 0, 'Northern Ireland', 1); -- Regions Tunisia (id country=10) -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1001,10,1001, '',0,'Ariana'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1002,10,1002, '',0,'Béja'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1003,10,1003, '',0,'Ben Arous'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1004,10,1004, '',0,'Bizerte'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1005,10,1005, '',0,'Gabès'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1006,10,1006, '',0,'Gafsa'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1007,10,1007, '',0,'Jendouba'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1008,10,1008, '',0,'Kairouan'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1009,10,1009, '',0,'Kasserine'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1010,10,1010, '',0,'Kébili'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1011,10,1011, '',0,'La Manouba'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1012,10,1012, '',0,'Le Kef'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1013,10,1013, '',0,'Mahdia'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1014,10,1014, '',0,'Médenine'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1015,10,1015, '',0,'Monastir'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1016,10,1016, '',0,'Nabeul'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1017,10,1017, '',0,'Sfax'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1018,10,1018, '',0,'Sidi Bouzid'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1019,10,1019, '',0,'Siliana'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1020,10,1020, '',0,'Sousse'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1021,10,1021, '',0,'Tataouine'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1022,10,1022, '',0,'Tozeur'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1023,10,1023, '',0,'Tunis'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1024,10,1024, '',0,'Zaghouan'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1001, '',0,'Ariana'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1002, '',0,'Béja'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1003, '',0,'Ben Arous'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1004, '',0,'Bizerte'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1005, '',0,'Gabès'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1006, '',0,'Gafsa'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1007, '',0,'Jendouba'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1008, '',0,'Kairouan'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1009, '',0,'Kasserine'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1010, '',0,'Kébili'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1011, '',0,'La Manouba'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1012, '',0,'Le Kef'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1013, '',0,'Mahdia'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1014, '',0,'Médenine'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1015, '',0,'Monastir'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1016, '',0,'Nabeul'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1017, '',0,'Sfax'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1018, '',0,'Sidi Bouzid'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1019, '',0,'Siliana'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1020, '',0,'Sousse'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1021, '',0,'Tataouine'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1022, '',0,'Tozeur'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1023, '',0,'Tunis'); +insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (10,1024, '',0,'Zaghouan'); -- Region US (id country=11) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1101, 11, 1101, '', 0, 'United-States', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 11, 1101, '', 0, 'United-States', 1); -- Region Canada (id country=14) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1401, 14, 1401, '', 0, 'Canada', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 14, 1401, '', 0, 'Canada', 1); -- Regions The Netherlands (id country=17) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1701, 17, 1701, '', 0,'Provincies van Nederland ', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 17, 1701, '', 0,'Provincies van Nederland ', 1); -- Regions Argentina (id country=23) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2301, 23, 2301, '', 0, 'Norte', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2302, 23, 2302, '', 0, 'Litoral', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2303, 23, 2303, '', 0, 'Cuyana', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2304, 23, 2304, '', 0, 'Central', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2305, 23, 2305, '', 0, 'Patagonia', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 23, 2301, '', 0, 'Norte', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 23, 2302, '', 0, 'Litoral', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 23, 2303, '', 0, 'Cuyana', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 23, 2304, '', 0, 'Central', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 23, 2305, '', 0, 'Patagonia', 1); -- Regions Australia (id country=28) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2801, 28, 2801, '', 0, 'Australia', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 28, 2801, '', 0, 'Australia', 1); -- Regions Brazil (id country=56) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (5601, 56, 5601, '', 0, 'Brasil', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 56, 5601, '', 0, 'Brasil', 1); -- Regions Colombie (id country=70) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (7001, 70, 7001, '', 0, 'Colombie', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 70, 7001, '', 0, 'Colombie', 1); -- Regions Chile (id country=67) -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6701, 67, NULL, NULL, 'Tarapacá', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6702, 67, NULL, NULL, 'Antofagasta', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6703, 67, NULL, NULL, 'Atacama', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6704, 67, NULL, NULL, 'Coquimbo', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6705, 67, NULL, NULL, 'Valparaíso', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6707, 67, NULL, NULL, 'Maule', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6708, 67, NULL, NULL, 'Biobío', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6709, 67, NULL, NULL, 'Raucanía', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6710, 67, NULL, NULL, 'Los Lagos', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6714, 67, NULL, NULL, 'Los Ríos', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 6715, 67, NULL, NULL, 'Arica y Parinacota', 1); -- Regions San Salvador (id country=86) -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8602, 8602, 86, NULL, NULL, 'Oriental', 1); -INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8603, 8603, 86, NULL, NULL, 'Occidental', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 8601, 86, NULL, NULL, 'Central', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 8602, 86, NULL, NULL, 'Oriental', 1); +INSERT INTO llx_c_regions ( code_region, fk_pays, cheflieu, tncc, nom, active) values ( 8603, 86, NULL, NULL, 'Occidental', 1); -- Regions Honduras (id country=114) -insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (11401, 114, 11401, '', 0, 'Honduras', 1); +insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 114, 11401, '', 0, 'Honduras', 1); -- Regions India (id country=117) -insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (11701, 117, 11701, '', 0, 'India', 1); +insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 117, 11701, '', 0, 'India', 1); -- Regions Mauritius (id country=152) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15201, 152, 15201, '', 0, 'Rivière Noire', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15202, 152, 15202, '', 0, 'Flacq', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15203, 152, 15203, '', 0, 'Grand Port', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15204, 152, 15204, '', 0, 'Moka', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15205, 152, 15205, '', 0, 'Pamplemousses', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15206, 152, 15206, '', 0, 'Plaines Wilhems', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15207, 152, 15207, '', 0, 'Port-Louis', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15208, 152, 15208, '', 0, 'Rivière du Rempart', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15209, 152, 15209, '', 0, 'Savanne', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15210, 152, 15210, '', 0, 'Rodrigues', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15211, 152, 15211, '', 0, 'Les îles Agaléga', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15212, 152, 15212, '', 0, 'Les écueils des Cargados Carajos', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 152, 15201, '', 0, 'Rivière Noire', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 152, 15202, '', 0, 'Flacq', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 152, 15203, '', 0, 'Grand Port', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 152, 15204, '', 0, 'Moka', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 152, 15205, '', 0, 'Pamplemousses', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 152, 15206, '', 0, 'Plaines Wilhems', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 152, 15207, '', 0, 'Port-Louis', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 152, 15208, '', 0, 'Rivière du Rempart', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 152, 15209, '', 0, 'Savanne', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 152, 15210, '', 0, 'Rodrigues', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 152, 15211, '', 0, 'Les îles Agaléga', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 152, 15212, '', 0, 'Les écueils des Cargados Carajos', 1); -- Regions Mexique (id country=154) -insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (15401, 154, 15401, '', 0, 'Mexique', 1); +insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 154, 15401, '', 0, 'Mexique', 1); -- Regions Barbados (id country=46) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (4601, 46, 4601, '', 0, 'Barbados', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 46, 4601, '', 0, 'Barbados', 1); -- Regions Venezuela (id country=232) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23201, 232, 23201, '', 0, 'Los Andes', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23202, 232, 23202, '', 0, 'Capital', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23203, 232, 23203, '', 0, 'Central', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23204, 232, 23204, '', 0, 'Cento Occidental', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23205, 232, 23205, '', 0, 'Guayana', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23206, 232, 23206, '', 0, 'Insular', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23207, 232, 23207, '', 0, 'Los Llanos', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23208, 232, 23208, '', 0, 'Nor-Oriental', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (23209, 232, 23209, '', 0, 'Zuliana', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 232, 23201, '', 0, 'Los Andes', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 232, 23202, '', 0, 'Capital', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 232, 23203, '', 0, 'Central', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 232, 23204, '', 0, 'Cento Occidental', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 232, 23205, '', 0, 'Guayana', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 232, 23206, '', 0, 'Insular', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 232, 23207, '', 0, 'Los Llanos', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 232, 23208, '', 0, 'Nor-Oriental', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 232, 23209, '', 0, 'Zuliana', 1); -- Regions Algeria (id country=13) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1301, 13, 1301, '', 0, 'Algerie', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 13, 1301, '', 0, 'Algerie', 1); -- Regions Maroc (id country=12) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1201, 12, 1201, '', 0, 'Tanger-Tétouan', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1202, 12, 1202, '', 0, 'Gharb-Chrarda-Beni Hssen', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1203, 12, 1203, '', 0, 'Taza-Al Hoceima-Taounate', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1204, 12, 1204, '', 0, 'L''Oriental', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1205, 12, 1205, '', 0, 'Fès-Boulemane', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1206, 12, 1206, '', 0, 'Meknès-Tafialet', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1207, 12, 1207, '', 0, 'Rabat-Salé-Zemour-Zaër', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1208, 12, 1208, '', 0, 'Grand Cassablanca', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1209, 12, 1209, '', 0, 'Chaouia-Ouardigha', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1210, 12, 1210, '', 0, 'Doukahla-Adba', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1211, 12, 1211, '', 0, 'Marrakech-Tensift-Al Haouz', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1212, 12, 1212, '', 0, 'Tadla-Azilal', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1213, 12, 1213, '', 0, 'Sous-Massa-Drâa', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1214, 12, 1214, '', 0, 'Guelmim-Es Smara', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1215, 12, 1215, '', 0, 'Laâyoune-Boujdour-Sakia el Hamra', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1216, 12, 1216, '', 0, 'Oued Ed-Dahab Lagouira', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1201, '', 0, 'Tanger-Tétouan', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1202, '', 0, 'Gharb-Chrarda-Beni Hssen', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1203, '', 0, 'Taza-Al Hoceima-Taounate', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1204, '', 0, 'L''Oriental', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1205, '', 0, 'Fès-Boulemane', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1206, '', 0, 'Meknès-Tafialet', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1207, '', 0, 'Rabat-Salé-Zemour-Zaër', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1208, '', 0, 'Grand Cassablanca', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1209, '', 0, 'Chaouia-Ouardigha', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1210, '', 0, 'Doukahla-Adba', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1211, '', 0, 'Marrakech-Tensift-Al Haouz', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1212, '', 0, 'Tadla-Azilal', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1213, '', 0, 'Sous-Massa-Drâa', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1214, '', 0, 'Guelmim-Es Smara', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1215, '', 0, 'Laâyoune-Boujdour-Sakia el Hamra', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 12, 1216, '', 0, 'Oued Ed-Dahab Lagouira', 1); -- Regions Tunisia (id country=10) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES(1001, 10, 1001, '', 0, 'Algerie', 1); +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom, active) values ( 10, 1001, '', 0, 'Algerie', 1); diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 739b1d1f537..116f9572052 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -32,7 +32,7 @@ -- Departements/Cantons/Provinces -- -insert into llx_c_departements (rowid, fk_region, code_departement,cheflieu,tncc,ncc,nom) values (0,0,'0','0',0,'-','-'); +insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values ( 0, '0', '0',0,'-','-'); -- Departements France (id country=1) insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (82,'01','01053',5,'AIN','Ain'); diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 1d4572591d1..01d2894bca6 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -124,10 +124,17 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 3 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 34, 3, '0','0','VAT Rate 0',1); -- INDIA (id country=117) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1171, 117, '12.5','0','VAT standard rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1172, 117, '4','0','VAT reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1173, 117, '1','0','VAT super-reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1174, 117, '0','0','VAT Rate 0',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1171, 117, '12.5','0','VAT standard rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1172, 117, '4','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1173, 117, '1','0','VAT super-reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1174, 117, '0','0','VAT Rate 0',1); + +-- IRELAND (id country=8) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (81, 8, '0','0','VAT Rate 0',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (82, 8, '23','0','VAT standard rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (83, 8, '13.5','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (84, 8, '9','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (85, 8, '4.8','0','VAT reduced rate',1); -- JAPAN (id country=123) insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1231, 123, '0','0','VAT Rate 0',1); diff --git a/htdocs/install/mysql/data/llx_c_type_fees.sql b/htdocs/install/mysql/data/llx_c_type_fees.sql index 55c3268b635..9e763bf5ba8 100644 --- a/htdocs/install/mysql/data/llx_c_type_fees.sql +++ b/htdocs/install/mysql/data/llx_c_type_fees.sql @@ -30,6 +30,6 @@ -- Type fees -- -insert into llx_c_type_fees (code,libelle,active) values ('TF_OTHER', 'Other', 1); -insert into llx_c_type_fees (code,libelle,active) values ('TF_TRIP', 'Trip', 1); -insert into llx_c_type_fees (code,libelle,active) values ('TF_LUNCH', 'Lunch', 1); +insert into llx_c_type_fees (code,label,active) values ('TF_OTHER', 'Other', 1); +insert into llx_c_type_fees (code,label,active) values ('TF_TRIP', 'Trip', 1); +insert into llx_c_type_fees (code,label,active) values ('TF_LUNCH', 'Lunch', 1); diff --git a/htdocs/install/mysql/migration/2.0.0-2.1.0.sql b/htdocs/install/mysql/migration/2.0.0-2.1.0.sql deleted file mode 100644 index e2205b29953..00000000000 --- a/htdocs/install/mysql/migration/2.0.0-2.1.0.sql +++ /dev/null @@ -1,958 +0,0 @@ --- --- Attention a l ordre des requetes. --- Ce fichier doit etre charge sur une version 2.0.0 --- sans AUCUNE erreur ni warning --- - -create table llx_paiementfourn_facturefourn -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_paiementfourn INT(11) DEFAULT NULL, - fk_facturefourn INT(11) DEFAULT NULL, - amount DOUBLE DEFAULT '0' -) TYPE=innodb; -ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn); -ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_paiement(fk_paiementfourn); - - -drop table if exists llx_commande_model_pdf; -drop table if exists llx_commande_fournisseur_model_pdf; - -alter table llx_commande add column note_public text after note; - -alter table llx_contrat add column note text; -alter table llx_contrat add column note_public text after note; - -alter table llx_facture add column note_public text after note; -alter table llx_facture add column remise_absolue real DEFAULT 0 after remise_percent; -alter table llx_facture add column close_code varchar(16) after remise; -alter table llx_facture add column close_note varchar(128) after close_code; -alter table llx_facture modify close_code varchar(16); - -alter table llx_propal add column note_public text after note; -alter table llx_propal add column remise_absolue real DEFAULT 0 after remise_percent; - -alter table llx_commande add column remise_absolue real DEFAULT 0 after remise_percent; - -ALTER TABLE llx_societe add mode_reglement tinyint; -ALTER TABLE llx_societe add cond_reglement tinyint; -ALTER TABLE llx_societe add tva_assuj tinyint DEFAULT '1'; -ALTER TABLE llx_societe add email varchar(128) after url; - -ALTER TABLE llx_societe change active statut tinyint DEFAULT 0; - -ALTER TABLE llx_societe modify mode_reglement tinyint NULL; -ALTER TABLE llx_societe modify cond_reglement tinyint NULL; -ALTER TABLE llx_societe modify cond_reglement tinyint NULL; -ALTER TABLE llx_societe modify fk_stcomm tinyint DEFAULT 0; -ALTER TABLE llx_societe modify services tinyint DEFAULT 0; -ALTER TABLE llx_societe modify client tinyint DEFAULT 0; -ALTER TABLE llx_societe modify fournisseur tinyint DEFAULT 0; - -ALTER TABLE llx_societe add customer_bad tinyint DEFAULT 0 after fournisseur; -ALTER TABLE llx_societe add customer_rate real DEFAULT 0 after customer_bad; -ALTER TABLE llx_societe add supplier_rate real DEFAULT 0 after customer_rate; - -ALTER TABLE llx_societe modify siren varchar(16); -ALTER TABLE llx_societe modify siret varchar(16); -ALTER TABLE llx_societe modify ape varchar(16); -ALTER TABLE llx_societe add idprof4 varchar(16) after ape; - -ALTER TABLE llx_societe drop column id; - -ALTER TABLE llx_societe modify parent integer; -UPDATE llx_societe set parent = null where parent = 0; - -ALTER TABLE llx_product ADD COLUMN stock_loc VARCHAR(10) DEFAULT NULL; -ALTER TABLE llx_product ADD COLUMN gencode VARCHAR(255) DEFAULT NULL; -ALTER TABLE llx_product ADD COLUMN weight float DEFAULT NULL; -ALTER TABLE llx_product ADD COLUMN weight_units tinyint DEFAULT NULL; -ALTER TABLE llx_product ADD COLUMN canvas varchar(15) DEFAULT ''; - -ALTER TABLE llx_stock_mouvement ADD COLUMN price FLOAT(13,4) DEFAULT 0; - -insert into llx_cond_reglement(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (6,'PROFORMA', 6,1, 'Proforma','R�glement avant livraison',0,0); - -alter table llx_cond_reglement add (decalage smallint(6) default 0); - -alter table llx_commande add fk_cond_reglement integer DEFAULT NULL; -alter table llx_commande add fk_mode_reglement integer DEFAULT NULL; - - -alter table llx_categorie drop column fk_statut; -alter table llx_categorie add visible tinyint DEFAULT 1 NOT NULL; -ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label); - -alter table llx_c_actioncomm add module varchar(16) DEFAULT NULL after libelle; - -delete from llx_c_actioncomm where id in (1,2,3,4,5,8,9,50); -insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 1, 'AC_TEL', 'system', 'Appel Téléphonique' ,NULL); -insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 2, 'AC_FAX', 'system', 'Envoi Fax' ,NULL); -insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 3, 'AC_PROP', 'system', 'Envoi Proposition' ,'propal'); -insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 4, 'AC_EMAIL','system', 'Envoi Email' ,NULL); -insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 5, 'AC_RDV', 'system', 'Rendez-vous' ,NULL); -insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 8, 'AC_COM', 'system', 'Envoi Commande' ,'order'); -insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 9, 'AC_FAC', 'system', 'Envoi Facture' ,'invoice'); -insert into llx_c_actioncomm (id, code, type, libelle, module) values (50, 'AC_OTH', 'system', 'Autre' ,NULL); - -alter table llx_actioncomm modify datea datetime; -alter table llx_actioncomm add column datec datetime after id; -alter table llx_actioncomm add column datep datetime after datec; -alter table llx_actioncomm add column datep2 datetime after datep; -alter table llx_actioncomm add column datea2 datetime after datea; -alter table llx_actioncomm add column tms timestamp after datea2; -alter table llx_actioncomm add column fk_commande integer after propalrowid; -alter table llx_actioncomm add column fk_parent integer NOT NULL default 0 after fk_contact; -alter table llx_actioncomm add column durationp real after percent; -alter table llx_actioncomm add column durationa real after durationp; -alter table llx_actioncomm add column fk_projet integer after label; -alter table llx_actioncomm add column punctual smallint NOT NULL default 1 after priority; - - -update llx_actioncomm set datec = datea where datec is null; -update llx_actioncomm set datep = datea where datep is null AND percent < 100; -update llx_actioncomm set datep = datec where datea is null AND datep is null AND percent < 100; -update llx_actioncomm set datea = datec where datea is null AND datep is null AND percent = 100; -update llx_actioncomm set fk_action = '8' where fk_action = '3' and label = 'Envoi commande par mail'; - - - -drop table if exists llx_expedition_model_pdf; - - -create table llx_product_det -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_product integer DEFAULT 0 NOT NULL, - lang varchar(5) DEFAULT 0 NOT NULL, - label varchar(255) NOT NULL, - description text, - note text -)ENGINE=innodb; - -ALTER TABLE `llx_propal` ADD `date_livraison` DATE; -ALTER TABLE `llx_commande` ADD `date_livraison` DATE; -update llx_commande set date_livraison = null where date_livraison = '0000-00-00'; -update llx_commande set date_livraison = null where date_livraison = '1970-01-01'; - -ALTER TABLE llx_facture_fourn DROP INDEX facnumber; -ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref (facnumber, fk_soc); -ALTER TABLE llx_facture_fourn ADD note_public text after note; -alter table llx_facture_fourn add column `type` smallint DEFAULT 0 NOT NULL after facnumber; - -ALTER TABLE llx_facture_fourn_det ADD INDEX idx_facture_fourn_det_fk_facture (fk_facture_fourn); -ALTER TABLE llx_facture_fourn_det ADD CONSTRAINT fk_facture_fourn_det_fk_facture FOREIGN KEY (fk_facture_fourn) REFERENCES llx_facture_fourn (rowid); - - -ALTER TABLE llx_facturedet ADD COLUMN fk_remise_except integer NULL AFTER remise; -ALTER TABLE llx_facturedet ADD COLUMN total_ht real AFTER price; -ALTER TABLE llx_facturedet ADD COLUMN total_tva real AFTER total_ht; -ALTER TABLE llx_facturedet ADD COLUMN total_ttc real AFTER total_tva; -ALTER TABLE llx_facturedet ADD COLUMN info_bits integer DEFAULT 0 AFTER date_end; -ALTER TABLE llx_facturedet modify fk_product integer NULL; - -UPDATE llx_facturedet SET info_bits=0 where (fk_remise_except IS NULL OR fk_remise_except = 0); -UPDATE llx_facturedet SET fk_product=NULL where fk_product=0; - -ALTER TABLE llx_propaldet ADD COLUMN total_ht real AFTER price; -ALTER TABLE llx_propaldet ADD COLUMN total_tva real AFTER total_ht; -ALTER TABLE llx_propaldet ADD COLUMN total_ttc real AFTER total_tva; -ALTER TABLE llx_propaldet ADD COLUMN info_bits integer DEFAULT 0 AFTER total_ttc; - -ALTER TABLE llx_commandedet ADD COLUMN total_ht real AFTER price; -ALTER TABLE llx_commandedet ADD COLUMN total_tva real AFTER total_ht; -ALTER TABLE llx_commandedet ADD COLUMN total_ttc real AFTER total_tva; -ALTER TABLE llx_commandedet ADD COLUMN info_bits integer DEFAULT 0 AFTER total_ttc; - -ALTER TABLE llx_contratdet ADD COLUMN total_ht real AFTER price_ht; -ALTER TABLE llx_contratdet ADD COLUMN total_tva real AFTER total_ht; -ALTER TABLE llx_contratdet ADD COLUMN total_ttc real AFTER total_tva; -ALTER TABLE llx_contratdet ADD COLUMN info_bits integer DEFAULT 0 AFTER total_ttc; - - -ALTER TABLE llx_commande ADD INDEX idx_commande_fk_soc (fk_soc); -ALTER TABLE llx_commande ADD CONSTRAINT fk_commande_societe FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); - -ALTER TABLE llx_commande_fournisseur ADD INDEX idx_commande_fournisseur_fk_soc (fk_soc); -ALTER TABLE llx_commande_fournisseur ADD CONSTRAINT fk_commande_fournisseur_societe FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); - - -alter table llx_commande_fournisseur add note_public text after note; - - -drop table if exists llx_avoir_model_pdf; - - -drop table if exists llx_soc_recontact; - - -update llx_const set name='PRODUIT_DESC_IN_FORM' where name='FORM_ADD_PROD_DESC'; -update llx_const set name='PRODUIT_CHANGE_PROD_DESC' where name='CHANGE_PROD_DESC'; -update llx_const set name='COMMANDE_ADD_PROD_DESC' where name='COM_ADD_PROD_DESC'; -update llx_const set name='PROPALE_ADD_PROD_DESC' where name='PROP_ADD_PROD_DESC'; -update llx_const set name='DON_FORM' where name='DONS_FORM'; -update llx_const set name='MAIN_SIZE_LISTE_LIMIT' where name='SIZE_LISTE_LIMIT'; -update llx_const set name='SOCIETE_FISCAL_MONTH_START' where name='FISCAL_MONTH_START'; -update llx_const set visible=0 where name='FACTURE_DISABLE_RECUR'; -update llx_const set visible=0 where name='MAILING_EMAIL_FROM'; -update llx_const set visible=1 where name='PRODUIT_CONFIRM_DELETE_LINE'; -update llx_const set name='NOTIFICATION_EMAIL_FROM', visible=0 where name='MAIN_MAIL_FROM'; -update llx_const set name='NOTIFICATION_EMAIL_FROM', visible=0 where name='MAIN_EMAIL_FROM'; -update llx_const set value=2048, visible=0 where name='MAIN_UPLOAD_DOC' and value=1; -delete from llx_const where name = 'SIZE_LISTE_LIMIT'; - - -insert into llx_const(name,value,type,visible,note) values('MAIN_SHOW_DEVELOPMENT_MODULES','0','yesno',1,'Make development modules visible'); - -delete from llx_const where name in ('OSC_CATALOG_URL','OSC_LANGUAGE_ID'); -update llx_const set visible=0 where name like 'OSC_DB_%'; - -alter table llx_paiementfourn add statut smallint(6) NOT NULL DEFAULT 0; - - -alter table llx_bank_url add column type enum("company","payment","member","subscription","donation","sc","payment_sc"); -update llx_bank_url set type=null where type=''; -alter table llx_bank_url modify type enum("company","payment","member","subscription","donation","sc","payment_sc") NOT NULL; - -update llx_bank_url set type = 'payment_supplier' where label = '(paiement)' and type='payment' and url like '%/fourn/%'; - -alter table llx_bank_url drop index fk_bank; -alter table llx_bank_url drop index fk_bank_2; -alter table llx_bank_url drop index fk_bank_3; -alter table llx_bank_url drop index fk_bank_4; -alter table llx_bank_url drop index fk_bank_5; -alter table llx_bank_url drop index fk_bank_6; -alter table llx_bank_url drop index fk_bank_7; -alter table llx_bank_url drop index fk_bank_8; -alter table llx_bank_url drop index fk_bank_9; - -ALTER TABLE llx_bank_url DROP INDEX uk_bank_url; -ALTER TABLE llx_bank_url ADD UNIQUE INDEX uk_bank_url (fk_bank,type); - -create table llx_societe_adresse_livraison -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - datec datetime, - tms timestamp, - fk_societe integer DEFAULT 0, - nom varchar(60), - address varchar(255), - cp varchar(10), - ville varchar(50), - fk_departement integer DEFAULT 0, - fk_pays integer DEFAULT 0, - note text, - fk_user_creat integer, - fk_user_modif integer -)ENGINE=innodb; - -alter table llx_societe_adresse_livraison add column label varchar(30) after tms; - -alter table llx_propal add column fk_adresse_livraison integer after date_livraison; -alter table llx_commande add column fk_adresse_livraison integer after date_livraison; - -alter table llx_c_pays modify libelle varchar(50) NOT NULL; - -SET FOREIGN_KEY_CHECKS = 0; -delete from llx_c_pays; -SET FOREIGN_KEY_CHECKS = 1; -insert into llx_c_pays (rowid,code,libelle) values (0, '' , '-' ); -insert into llx_c_pays (rowid,code,libelle) values (1, 'FR', 'France' ); -insert into llx_c_pays (rowid,code,libelle) values (2, 'BE', 'Belgique' ); -insert into llx_c_pays (rowid,code,libelle) values (3, 'IT', 'Italie' ); -insert into llx_c_pays (rowid,code,libelle) values (4, 'ES', 'Espagne' ); -insert into llx_c_pays (rowid,code,libelle) values (5, 'DE', 'Allemagne' ); -insert into llx_c_pays (rowid,code,libelle) values (6, 'CH', 'Suisse' ); -insert into llx_c_pays (rowid,code,libelle) values (7, 'GB', 'Royaume uni' ); -insert into llx_c_pays (rowid,code,libelle) values (8, 'IE', 'Irlande' ); -insert into llx_c_pays (rowid,code,libelle) values (9, 'CN', 'Chine' ); -insert into llx_c_pays (rowid,code,libelle) values (10, 'TN', 'Tunisie' ); -insert into llx_c_pays (rowid,code,libelle) values (11, 'US', 'Etats Unis' ); -insert into llx_c_pays (rowid,code,libelle) values (12, 'MA', 'Maroc' ); -insert into llx_c_pays (rowid,code,libelle) values (13, 'DZ', 'Algérie' ); -insert into llx_c_pays (rowid,code,libelle) values (14, 'CA', 'Canada' ); -insert into llx_c_pays (rowid,code,libelle) values (15, 'TG', 'Togo' ); -insert into llx_c_pays (rowid,code,libelle) values (16, 'GA', 'Gabon' ); -insert into llx_c_pays (rowid,code,libelle) values (17, 'NL', 'Pays Bas' ); -insert into llx_c_pays (rowid,code,libelle) values (18, 'HU', 'Hongrie' ); -insert into llx_c_pays (rowid,code,libelle) values (19, 'RU', 'Russie' ); -insert into llx_c_pays (rowid,code,libelle) values (20, 'SE', 'Suède' ); -insert into llx_c_pays (rowid,code,libelle) values (21, 'CI', 'Côte d\'Ivoire' ); -insert into llx_c_pays (rowid,code,libelle) values (22, 'SN', 'Sénégal' ); -insert into llx_c_pays (rowid,code,libelle) values (23, 'AR', 'Argentine' ); -insert into llx_c_pays (rowid,code,libelle) values (24, 'CM', 'Cameroun' ); -insert into llx_c_pays (rowid,code,libelle) values (25, 'PT', 'Portugal' ); -insert into llx_c_pays (rowid,code,libelle) values (26, 'SA', 'Arabie Saoudite'); -insert into llx_c_pays (rowid,code,libelle) values (27, 'MC', 'Monaco' ); -insert into llx_c_pays (rowid,code,libelle) values (28, 'AU', 'Australie' ); -insert into llx_c_pays (rowid,code,libelle) values (29, 'SG', 'Singapoure' ); -insert into llx_c_pays (rowid,code,libelle) values (30, 'AF', 'Afghanistan' ); -insert into llx_c_pays (rowid,code,libelle) values (31, 'AX', 'Iles Aland' ); -insert into llx_c_pays (rowid,code,libelle) values (32, 'AL', 'Albanie' ); -insert into llx_c_pays (rowid,code,libelle) values (33, 'AS', 'Samoa américaines'); -insert into llx_c_pays (rowid,code,libelle) values (34, 'AD', 'Andorre' ); -insert into llx_c_pays (rowid,code,libelle) values (35, 'AO', 'Angola' ); -insert into llx_c_pays (rowid,code,libelle) values (36, 'AI', 'Anguilla' ); -insert into llx_c_pays (rowid,code,libelle) values (37, 'AQ', 'Antarctique' ); -insert into llx_c_pays (rowid,code,libelle) values (38, 'AG', 'Antigua-et-Barbuda'); -insert into llx_c_pays (rowid,code,libelle) values (39, 'AM', 'Arménie' ); -insert into llx_c_pays (rowid,code,libelle) values (40, 'AW', 'Aruba' ); -insert into llx_c_pays (rowid,code,libelle) values (41, 'AT', 'Autriche' ); -insert into llx_c_pays (rowid,code,libelle) values (42, 'AZ', 'Azerbaïdjan' ); -insert into llx_c_pays (rowid,code,libelle) values (43, 'BS', 'Bahamas' ); -insert into llx_c_pays (rowid,code,libelle) values (44, 'BH', 'Bahreïn' ); -insert into llx_c_pays (rowid,code,libelle) values (45, 'BD', 'Bangladesh' ); -insert into llx_c_pays (rowid,code,libelle) values (46, 'BB', 'Barbade' ); -insert into llx_c_pays (rowid,code,libelle) values (47, 'BY', 'Biélorussie' ); -insert into llx_c_pays (rowid,code,libelle) values (48, 'BZ', 'Belize' ); -insert into llx_c_pays (rowid,code,libelle) values (49, 'BJ', 'Bénin' ); -insert into llx_c_pays (rowid,code,libelle) values (50, 'BM', 'Bermudes' ); -insert into llx_c_pays (rowid,code,libelle) values (51, 'BT', 'Bhoutan' ); -insert into llx_c_pays (rowid,code,libelle) values (52, 'BO', 'Bolivie' ); -insert into llx_c_pays (rowid,code,libelle) values (53, 'BA', 'Bosnie-Herzégovine'); -insert into llx_c_pays (rowid,code,libelle) values (54, 'BW', 'Botswana' ); -insert into llx_c_pays (rowid,code,libelle) values (55, 'BV', 'Ile Bouvet' ); -insert into llx_c_pays (rowid,code,libelle) values (56, 'BR', 'Brésil' ); -insert into llx_c_pays (rowid,code,libelle) values (57, 'IO', 'Territoire britannique de l\'Océan Indien'); -insert into llx_c_pays (rowid,code,libelle) values (58, 'BN', 'Brunei' ); -insert into llx_c_pays (rowid,code,libelle) values (59, 'BG', 'Bulgarie' ); -insert into llx_c_pays (rowid,code,libelle) values (60, 'BF', 'Burkina Faso' ); -insert into llx_c_pays (rowid,code,libelle) values (61, 'BI', 'Burundi' ); -insert into llx_c_pays (rowid,code,libelle) values (62, 'KH', 'Cambodge' ); -insert into llx_c_pays (rowid,code,libelle) values (63, 'CV', 'Cap-Vert' ); -insert into llx_c_pays (rowid,code,libelle) values (64, 'KY', 'Iles Cayman' ); -insert into llx_c_pays (rowid,code,libelle) values (65, 'CF', 'République centrafricaine'); -insert into llx_c_pays (rowid,code,libelle) values (66, 'TD', 'Tchad' ); -insert into llx_c_pays (rowid,code,libelle) values (67, 'CL', 'Chili' ); -insert into llx_c_pays (rowid,code,libelle) values (68, 'CX', 'Ile Christmas' ); -insert into llx_c_pays (rowid,code,libelle) values (69, 'CC', 'Iles des Cocos (Keeling)'); -insert into llx_c_pays (rowid,code,libelle) values (70, 'CO', 'Colombie' ); -insert into llx_c_pays (rowid,code,libelle) values (71, 'KM', 'Comores' ); -insert into llx_c_pays (rowid,code,libelle) values (72, 'CG', 'Congo' ); -insert into llx_c_pays (rowid,code,libelle) values (73, 'CD', 'République démocratique du Congo'); -insert into llx_c_pays (rowid,code,libelle) values (74, 'CK', 'Iles Cook' ); -insert into llx_c_pays (rowid,code,libelle) values (75, 'CR', 'Costa Rica' ); -insert into llx_c_pays (rowid,code,libelle) values (76, 'HR', 'Croatie' ); -insert into llx_c_pays (rowid,code,libelle) values (77, 'CU', 'Cuba' ); -insert into llx_c_pays (rowid,code,libelle) values (78, 'CY', 'Chypre' ); -insert into llx_c_pays (rowid,code,libelle) values (79, 'CZ', 'République Tchèque'); -insert into llx_c_pays (rowid,code,libelle) values (80, 'DK', 'Danemark' ); -insert into llx_c_pays (rowid,code,libelle) values (81, 'DJ', 'Djibouti' ); -insert into llx_c_pays (rowid,code,libelle) values (82, 'DM', 'Dominique' ); -insert into llx_c_pays (rowid,code,libelle) values (83, 'DO', 'République Dominicaine'); -insert into llx_c_pays (rowid,code,libelle) values (84, 'EC', 'Equateur' ); -insert into llx_c_pays (rowid,code,libelle) values (85, 'EG', 'Egypte' ); -insert into llx_c_pays (rowid,code,libelle) values (86, 'SV', 'Salvador' ); -insert into llx_c_pays (rowid,code,libelle) values (87, 'GQ', 'Guinée Equatoriale'); -insert into llx_c_pays (rowid,code,libelle) values (88, 'ER', 'Erythrée' ); -insert into llx_c_pays (rowid,code,libelle) values (89, 'EE', 'Estonie' ); -insert into llx_c_pays (rowid,code,libelle) values (90, 'ET', 'Ethiopie' ); -insert into llx_c_pays (rowid,code,libelle) values (91, 'FK', 'Iles Falkland' ); -insert into llx_c_pays (rowid,code,libelle) values (92, 'FO', 'Iles Féroé' ); -insert into llx_c_pays (rowid,code,libelle) values (93, 'FJ', 'Iles Fidji' ); -insert into llx_c_pays (rowid,code,libelle) values (94, 'FI', 'Finlande' ); -insert into llx_c_pays (rowid,code,libelle) values (95, 'GF', 'Guyane française'); -insert into llx_c_pays (rowid,code,libelle) values (96, 'PF', 'Polynésie française'); -insert into llx_c_pays (rowid,code,libelle) values (97, 'TF', 'Terres australes françaises'); -insert into llx_c_pays (rowid,code,libelle) values (98, 'GM', 'Gambie' ); -insert into llx_c_pays (rowid,code,libelle) values (99, 'GE', 'Géorgie' ); -insert into llx_c_pays (rowid,code,libelle) values (100, 'GH', 'Ghana' ); -insert into llx_c_pays (rowid,code,libelle) values (101, 'GI', 'Gibraltar' ); -insert into llx_c_pays (rowid,code,libelle) values (102, 'GR', 'Grèce' ); -insert into llx_c_pays (rowid,code,libelle) values (103, 'GL', 'Groenland' ); -insert into llx_c_pays (rowid,code,libelle) values (104, 'GD', 'Grenade' ); -insert into llx_c_pays (rowid,code,libelle) values (105, 'GP', 'Guadeloupe' ); -insert into llx_c_pays (rowid,code,libelle) values (106, 'GU', 'Guam' ); -insert into llx_c_pays (rowid,code,libelle) values (107, 'GT', 'Guatemala' ); -insert into llx_c_pays (rowid,code,libelle) values (108, 'GN', 'Guinée' ); -insert into llx_c_pays (rowid,code,libelle) values (109, 'GW', 'Guinée-Bissao' ); -insert into llx_c_pays (rowid,code,libelle) values (110, 'GY', 'Guyana' ); -insert into llx_c_pays (rowid,code,libelle) values (111, 'HT', 'Haïti' ); -insert into llx_c_pays (rowid,code,libelle) values (112, 'HM', 'Iles Heard et McDonald'); -insert into llx_c_pays (rowid,code,libelle) values (113, 'VA', 'Saint-Siège (Vatican)'); -insert into llx_c_pays (rowid,code,libelle) values (114, 'HN', 'Honduras' ); -insert into llx_c_pays (rowid,code,libelle) values (115, 'HK', 'Hong Kong' ); -insert into llx_c_pays (rowid,code,libelle) values (116, 'IS', 'Islande' ); -insert into llx_c_pays (rowid,code,libelle) values (117, 'IN', 'Inde' ); -insert into llx_c_pays (rowid,code,libelle) values (118, 'ID', 'Indonésie' ); -insert into llx_c_pays (rowid,code,libelle) values (119, 'IR', 'Iran' ); -insert into llx_c_pays (rowid,code,libelle) values (120, 'IQ', 'Iraq' ); -insert into llx_c_pays (rowid,code,libelle) values (121, 'IL', 'Israël' ); -insert into llx_c_pays (rowid,code,libelle) values (122, 'JM', 'Jamaïque' ); -insert into llx_c_pays (rowid,code,libelle) values (123, 'JP', 'Japon' ); -insert into llx_c_pays (rowid,code,libelle) values (124, 'JO', 'Jordanie' ); -insert into llx_c_pays (rowid,code,libelle) values (125, 'KZ', 'Kazakhstan' ); -insert into llx_c_pays (rowid,code,libelle) values (126, 'KE', 'Kenya' ); -insert into llx_c_pays (rowid,code,libelle) values (127, 'KI', 'Kiribati' ); -insert into llx_c_pays (rowid,code,libelle) values (128, 'KP', 'Corée du Nord' ); -insert into llx_c_pays (rowid,code,libelle) values (129, 'KR', 'Corée du Sud' ); -insert into llx_c_pays (rowid,code,libelle) values (130, 'KW', 'Koweït' ); -insert into llx_c_pays (rowid,code,libelle) values (131, 'KG', 'Kirghizistan' ); -insert into llx_c_pays (rowid,code,libelle) values (132, 'LA', 'Laos' ); -insert into llx_c_pays (rowid,code,libelle) values (133, 'LV', 'Lettonie' ); -insert into llx_c_pays (rowid,code,libelle) values (134, 'LB', 'Liban' ); -insert into llx_c_pays (rowid,code,libelle) values (135, 'LS', 'Lesotho' ); -insert into llx_c_pays (rowid,code,libelle) values (136, 'LR', 'Liberia' ); -insert into llx_c_pays (rowid,code,libelle) values (137, 'LY', 'Libye' ); -insert into llx_c_pays (rowid,code,libelle) values (138, 'LI', 'Liechtenstein' ); -insert into llx_c_pays (rowid,code,libelle) values (139, 'LT', 'Lituanie' ); -insert into llx_c_pays (rowid,code,libelle) values (140, 'LU', 'Luxembourg' ); -insert into llx_c_pays (rowid,code,libelle) values (141, 'MO', 'Macao' ); -insert into llx_c_pays (rowid,code,libelle) values (142, 'MK', 'ex-République yougoslave de Macédoine'); -insert into llx_c_pays (rowid,code,libelle) values (143, 'MG', 'Madagascar' ); -insert into llx_c_pays (rowid,code,libelle) values (144, 'MW', 'Malawi' ); -insert into llx_c_pays (rowid,code,libelle) values (145, 'MY', 'Malaisie' ); -insert into llx_c_pays (rowid,code,libelle) values (146, 'MV', 'Maldives' ); -insert into llx_c_pays (rowid,code,libelle) values (147, 'ML', 'Mali' ); -insert into llx_c_pays (rowid,code,libelle) values (148, 'MT', 'Malte' ); -insert into llx_c_pays (rowid,code,libelle) values (149, 'MH', 'Iles Marshall' ); -insert into llx_c_pays (rowid,code,libelle) values (150, 'MQ', 'Martinique' ); -insert into llx_c_pays (rowid,code,libelle) values (151, 'MR', 'Mauritanie' ); -insert into llx_c_pays (rowid,code,libelle) values (152, 'MU', 'Maurice' ); -insert into llx_c_pays (rowid,code,libelle) values (153, 'YT', 'Mayotte' ); -insert into llx_c_pays (rowid,code,libelle) values (154, 'MX', 'Mexique' ); -insert into llx_c_pays (rowid,code,libelle) values (155, 'FM', 'Micronésie' ); -insert into llx_c_pays (rowid,code,libelle) values (156, 'MD', 'Moldavie' ); -insert into llx_c_pays (rowid,code,libelle) values (157, 'MN', 'Mongolie' ); -insert into llx_c_pays (rowid,code,libelle) values (158, 'MS', 'Monserrat' ); -insert into llx_c_pays (rowid,code,libelle) values (159, 'MZ', 'Mozambique' ); -insert into llx_c_pays (rowid,code,libelle) values (160, 'MM', 'Birmanie' ); -insert into llx_c_pays (rowid,code,libelle) values (161, 'NA', 'Namibie' ); -insert into llx_c_pays (rowid,code,libelle) values (162, 'NR', 'Nauru' ); -insert into llx_c_pays (rowid,code,libelle) values (163, 'NP', 'Népal' ); -insert into llx_c_pays (rowid,code,libelle) values (164, 'AN', 'Antilles néerlandaises'); -insert into llx_c_pays (rowid,code,libelle) values (165, 'NC', 'Nouvelle-Calédonie'); -insert into llx_c_pays (rowid,code,libelle) values (166, 'NZ', 'Nouvelle-Zélande'); -insert into llx_c_pays (rowid,code,libelle) values (167, 'NI', 'Nicaragua' ); -insert into llx_c_pays (rowid,code,libelle) values (168, 'NE', 'Niger' ); -insert into llx_c_pays (rowid,code,libelle) values (169, 'NG', 'Nigeria' ); -insert into llx_c_pays (rowid,code,libelle) values (170, 'NU', 'Nioué' ); -insert into llx_c_pays (rowid,code,libelle) values (171, 'NF', 'Ile Norfolk' ); -insert into llx_c_pays (rowid,code,libelle) values (172, 'MP', 'Mariannes du Nord'); -insert into llx_c_pays (rowid,code,libelle) values (173, 'NO', 'Norvège' ); -insert into llx_c_pays (rowid,code,libelle) values (174, 'OM', 'Oman' ); -insert into llx_c_pays (rowid,code,libelle) values (175, 'PK', 'Pakistan' ); -insert into llx_c_pays (rowid,code,libelle) values (176, 'PW', 'Palaos' ); -insert into llx_c_pays (rowid,code,libelle) values (177, 'PS', 'territoire Palestinien Occupé'); -insert into llx_c_pays (rowid,code,libelle) values (178, 'PA', 'Panama' ); -insert into llx_c_pays (rowid,code,libelle) values (179, 'PG', 'Papouasie-Nouvelle-Guinée'); -insert into llx_c_pays (rowid,code,libelle) values (180, 'PY', 'Paraguay' ); -insert into llx_c_pays (rowid,code,libelle) values (181, 'PE', 'Pérou' ); -insert into llx_c_pays (rowid,code,libelle) values (182, 'PH', 'Philippines' ); -insert into llx_c_pays (rowid,code,libelle) values (183, 'PN', 'Iles Pitcairn' ); -insert into llx_c_pays (rowid,code,libelle) values (184, 'PL', 'Pologne' ); -insert into llx_c_pays (rowid,code,libelle) values (185, 'PR', 'Porto Rico' ); -insert into llx_c_pays (rowid,code,libelle) values (186, 'QA', 'Qatar' ); -insert into llx_c_pays (rowid,code,libelle) values (187, 'RE', 'Réunion' ); -insert into llx_c_pays (rowid,code,libelle) values (188, 'RO', 'Roumanie' ); -insert into llx_c_pays (rowid,code,libelle) values (189, 'RW', 'Rwanda' ); -insert into llx_c_pays (rowid,code,libelle) values (190, 'SH', 'Sainte-Hélène' ); -insert into llx_c_pays (rowid,code,libelle) values (191, 'KN', 'Saint-Christophe-et-Niévès'); -insert into llx_c_pays (rowid,code,libelle) values (192, 'LC', 'Sainte-Lucie' ); -insert into llx_c_pays (rowid,code,libelle) values (193, 'PM', 'Saint-Pierre-et-Miquelon'); -insert into llx_c_pays (rowid,code,libelle) values (194, 'VC', 'Saint-Vincent-et-les-Grenadines'); -insert into llx_c_pays (rowid,code,libelle) values (195, 'WS', 'Samoa' ); -insert into llx_c_pays (rowid,code,libelle) values (196, 'SM', 'Saint-Marin' ); -insert into llx_c_pays (rowid,code,libelle) values (197, 'ST', 'Sao Tomé-et-Principe'); -insert into llx_c_pays (rowid,code,libelle) values (198, 'RS', 'Serbie' ); -insert into llx_c_pays (rowid,code,libelle) values (199, 'SC', 'Seychelles' ); -insert into llx_c_pays (rowid,code,libelle) values (200, 'SL', 'Sierra Leone' ); -insert into llx_c_pays (rowid,code,libelle) values (201, 'SK', 'Slovaquie' ); -insert into llx_c_pays (rowid,code,libelle) values (202, 'SI', 'Slovénie' ); -insert into llx_c_pays (rowid,code,libelle) values (203, 'SB', 'Iles Salomon' ); -insert into llx_c_pays (rowid,code,libelle) values (204, 'SO', 'Somalie' ); -insert into llx_c_pays (rowid,code,libelle) values (205, 'ZA', 'Afrique du Sud'); -insert into llx_c_pays (rowid,code,libelle) values (206, 'GS', 'Iles Géorgie du Sud et Sandwich du Sud'); -insert into llx_c_pays (rowid,code,libelle) values (207, 'LK', 'Sri Lanka' ); -insert into llx_c_pays (rowid,code,libelle) values (208, 'SD', 'Soudan' ); -insert into llx_c_pays (rowid,code,libelle) values (209, 'SR', 'Suriname' ); -insert into llx_c_pays (rowid,code,libelle) values (210, 'SJ', 'Iles Svalbard et Jan Mayen'); -insert into llx_c_pays (rowid,code,libelle) values (211, 'SZ', 'Swaziland' ); -insert into llx_c_pays (rowid,code,libelle) values (212, 'SY', 'Syrie' ); -insert into llx_c_pays (rowid,code,libelle) values (213, 'TW', 'Taïwan' ); -insert into llx_c_pays (rowid,code,libelle) values (214, 'TJ', 'Tadjikistan' ); -insert into llx_c_pays (rowid,code,libelle) values (215, 'TZ', 'Tanzanie' ); -insert into llx_c_pays (rowid,code,libelle) values (216, 'TH', 'Thaïlande' ); -insert into llx_c_pays (rowid,code,libelle) values (217, 'TL', 'Timor Oriental'); -insert into llx_c_pays (rowid,code,libelle) values (218, 'TK', 'Tokélaou' ); -insert into llx_c_pays (rowid,code,libelle) values (219, 'TO', 'Tonga' ); -insert into llx_c_pays (rowid,code,libelle) values (220, 'TT', 'Trinité-et-Tobago'); -insert into llx_c_pays (rowid,code,libelle) values (221, 'TR', 'Turquie' ); -insert into llx_c_pays (rowid,code,libelle) values (222, 'TM', 'Turkménistan' ); -insert into llx_c_pays (rowid,code,libelle) values (223, 'TC', 'Iles Turks-et-Caicos'); -insert into llx_c_pays (rowid,code,libelle) values (224, 'TV', 'Tuvalu' ); -insert into llx_c_pays (rowid,code,libelle) values (225, 'UG', 'Ouganda' ); -insert into llx_c_pays (rowid,code,libelle) values (226, 'UA', 'Ukraine' ); -insert into llx_c_pays (rowid,code,libelle) values (227, 'AE', 'Emirats arabes unis'); -insert into llx_c_pays (rowid,code,libelle) values (228, 'UM', 'Iles mineures éloignées des états-Unis'); -insert into llx_c_pays (rowid,code,libelle) values (229, 'UY', 'Uruguay' ); -insert into llx_c_pays (rowid,code,libelle) values (230, 'UZ', 'Ouzbékistan' ); -insert into llx_c_pays (rowid,code,libelle) values (231, 'VU', 'Vanuatu' ); -insert into llx_c_pays (rowid,code,libelle) values (232, 'VE', 'Vénézuela' ); -insert into llx_c_pays (rowid,code,libelle) values (233, 'VN', 'Viêt Nam' ); -insert into llx_c_pays (rowid,code,libelle) values (234, 'VG', 'Iles Vierges britanniques'); -insert into llx_c_pays (rowid,code,libelle) values (235, 'VI', 'Iles Vierges américaines'); -insert into llx_c_pays (rowid,code,libelle) values (236, 'WF', 'Wallis-et-Futuna'); -insert into llx_c_pays (rowid,code,libelle) values (237, 'EH', 'Sahara occidental'); -insert into llx_c_pays (rowid,code,libelle) values (238, 'YE', 'Yémen' ); -insert into llx_c_pays (rowid,code,libelle) values (239, 'ZM', 'Zambie' ); -insert into llx_c_pays (rowid,code,libelle) values (240, 'ZW', 'Zimbabwe' ); - -delete from llx_c_regions where rowid='2901' and code_region='2901'; -delete from llx_c_departements where fk_region='2901'; - -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (2801,28,2801, '',0,'Australia'); -insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'NSW','',1,'','New South Wales'); -insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'VIC','',1,'','Victoria'); -insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'QLD','',1,'','Queensland'); -insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801, 'SA','',1,'','South Australia'); -insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'ACT','',1,'','Australia Capital Territory'); -insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'TAS','',1,'','Tasmania'); -insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801, 'WA','',1,'','Western Australia'); -insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801, 'NT','',1,'','Northern Territory'); - -delete from llx_c_tva where rowid='291' and fk_pays='5'; -delete from llx_c_tva where rowid='292' and fk_pays='5'; -delete from llx_c_tva where rowid='291' and fk_pays='29'; -delete from llx_c_tva where rowid='292' and fk_pays='29'; -delete from llx_c_tva where rowid='261' and fk_pays='26'; -delete from llx_c_tva where rowid='262' and fk_pays='26'; -delete from llx_c_tva where rowid='263' and fk_pays='26'; -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (281, 28, '10','0','VAT Rate 10',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (282, 28, '0','0','VAT Rate 0',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (251,25, '17','0','VAT Rate 17',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (252,25, '12','0','VAT Rate 12',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (253,25, '0','0','VAT Rate 0',1); - - -update llx_const set name='DON_ADDON_MODEL' where name='DON_ADDON'; -update llx_const set value='neptune' where value='pluton' and name = 'FACTURE_ADDON'; -update llx_const set value='azur' where value='orange' and name = 'PROPALE_ADDON'; -update llx_const set value='mod_commande_diamant' where value='mod_commande_jade' and name ='COMMANDE_ADDON'; -insert into llx_const (name, value, type, visible) values ('FICHEINTER_ADDON', 'pacific','chaine',0); - -alter table llx_propal_model_pdf rename to llx_document_model; - -alter table llx_document_model DROP PRIMARY KEY; -alter table llx_document_model add column rowid integer AUTO_INCREMENT PRIMARY KEY FIRST; -alter table llx_document_model add column type varchar(20) NOT NULL after nom; -update llx_document_model set type='propal' where type=''; - -delete from llx_document_model where nom='adytek'; -delete from llx_document_model where nom='rouge' and type='order'; -delete from llx_document_model where nom='azur' and type='order'; -delete from llx_document_model where nom='orange' and type='propal'; -delete from llx_document_model where nom='transporteur' and type='shipping'; -delete from llx_document_model where nom='dorade' and type='shipping'; - - - - -ALTER TABLE llx_facture ADD UNIQUE INDEX idx_facture_uk_facnumber (facnumber); - -alter table llx_facture_rec add column remise_absolue real default 0 after remise_percent; -alter table llx_facture_rec add column fk_mode_reglement integer default 0 after fk_cond_reglement; -alter table llx_facture_rec add column date_lim_reglement date after fk_mode_reglement; -alter table llx_facture_rec add column note_public text after note; -update llx_facture_rec set fk_mode_reglement='0' where fk_mode_reglement='NULL'; - -ALTER TABLE llx_facture_rec ADD INDEX idx_facture_rec_fk_soc (fk_soc); -ALTER TABLE llx_facture_rec ADD INDEX idx_facture_rec_fk_user_author (fk_user_author); -ALTER TABLE llx_facture_rec ADD INDEX idx_facture_rec_fk_projet (fk_projet); - -ALTER TABLE llx_facture_rec ADD CONSTRAINT fk_facture_rec_fk_user_author FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid); -ALTER TABLE llx_facture_rec ADD CONSTRAINT fk_facture_rec_fk_projet FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid); - -ALTER TABLE llx_facture_rec ADD UNIQUE INDEX idx_facture_rec_uk_titre (titre); - -ALTER TABLE llx_commandedet ADD COLUMN fk_remise_except integer NULL AFTER remise; -ALTER TABLE llx_commandedet ADD COLUMN special_code tinyint(1) UNSIGNED DEFAULT 0; - -ALTER TABLE llx_propaldet ADD COLUMN fk_remise_except integer NULL AFTER remise; - -ALTER TABLE llx_contratdet ADD COLUMN fk_remise_except integer NULL AFTER remise; - -create table llx_livraison -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp, - fk_commande integer DEFAULT 0, - fk_expedition integer, - ref varchar(30) NOT NULL, - date_creation datetime, - date_valid datetime, - fk_user_author integer, - fk_user_valid integer, - fk_statut smallint default 0, - note text, - note_public text, - model_pdf varchar(50), - date_livraison date default NULL, - fk_adresse_livraison integer, - - UNIQUE INDEX (ref), - key(fk_commande) -)ENGINE=innodb; - -alter table llx_livraison drop foreign key fk_livraison_societe; -alter table llx_livraison drop column fk_soc; - - -create table llx_livraisondet -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_livraison integer, - fk_commande_ligne integer NOT NULL, - qty real, - key(fk_livraison), - key(fk_commande_ligne) -)ENGINE=innodb; - - -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (90, 'commande', 'internal', 'SALESREPSIGN', 'Commercial signataire de la commande', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (91, 'commande', 'internal', 'SALESREPFOLL', 'Commercial suivi de la commande', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (100, 'commande', 'external', 'BILLING', 'Contact client facturation commande', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (101, 'commande', 'external', 'CUSTOMER', 'Contact client suivi commande', 1); - -alter table llx_bank_account add column ref varchar(12) NOT NULL; -alter table llx_bank_account add column url varchar(128); -alter table llx_bank_account add column currency_code varchar(2) NOT NULL; -alter table llx_bank_account add column min_allowed integer DEFAULT 0; -alter table llx_bank_account add column min_desired integer DEFAULT 0; -alter table llx_bank_account add column comment varchar(254); -alter table llx_bank_account modify bic varchar(11); - -update llx_bank_account set currency_code='EU'; -update llx_bank_account set rappro=0 where courant=2; - -ALTER TABLE llx_bank ADD COLUMN fk_bordereau INTEGER DEFAULT 0; -ALTER TABLE llx_bank ADD COLUMN banque varchar(255); -ALTER TABLE llx_bank ADD COLUMN emetteur varchar(255); - -alter table llx_accountingsystem_det rename to llx_accountingaccount; - - -insert into llx_rights_def (id, libelle, module, type, bydefault, subperms, perms) values (262,'Consulter tous les clients','commercial','r',1,'voir','client'); --- V4.1 insert into llx_user_rights(fk_user,fk_id) select distinct fk_user, '262' from llx_user_rights where fk_id = 261; -update llx_rights_def set subperms='creer' where subperms='supprimer' AND module='user' AND perms='self' AND id=255; -update llx_rights_def set module='tax' where module='compta' AND id in ('91','92','93'); -update llx_rights_def set subperms='receptionner' where id=186; - - -alter table llx_commandedet add column rang integer DEFAULT 0; -alter table llx_propaldet add column rang integer DEFAULT 0; - -alter table llx_facture drop column model; -alter table llx_facture add column model_pdf varchar(50) after note_public; - -alter table llx_facture drop foreign key fk_facture_fk_facture; -alter table llx_facture drop column fk_facture; -alter table llx_facture add column fk_facture_source integer after fk_user_valid; -ALTER TABLE llx_facture ADD INDEX idx_facture_fk_facture_source (fk_facture_source); -ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_source_fk_facture FOREIGN KEY (fk_facture_source) REFERENCES llx_facture (rowid); -alter table llx_facture add column type smallint DEFAULT 0 NOT NULL after facnumber; - - --- Supprimme orphelins pour permettre montée de la clé --- V4 DELETE llx_commandedet FROM llx_commandedet LEFT JOIN llx_commande ON llx_commandedet.fk_commande = llx_commande.rowid WHERE llx_commande.rowid IS NULL; - -ALTER TABLE llx_commandedet ADD INDEX idx_commandedet_fk_commande (fk_commande); -ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_commande FOREIGN KEY (fk_commande) REFERENCES llx_commande (rowid); - - --- drop table llx_societe_remise_except; -create table llx_societe_remise_except -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_soc integer NOT NULL, - datec datetime, - amount_ht real NOT NULL, - fk_user integer NOT NULL, - fk_facture integer, - description varchar(255) NOT NULL -)ENGINE=innodb; - -alter table llx_societe_remise_except ADD COLUMN amount_tva real DEFAULT 0 NOT NULL after amount_ht; -alter table llx_societe_remise_except ADD COLUMN amount_ttc real DEFAULT 0 NOT NULL after amount_tva; -alter table llx_societe_remise_except ADD COLUMN tva_tx real DEFAULT 0 NOT NULL after amount_ttc; -alter table llx_societe_remise_except ADD COLUMN fk_facture_source integer after fk_user; - -update llx_societe_remise_except set amount_tva=0, tva_tx=0, amount_ttc = amount_ht where amount_ttc = 0; -delete from llx_societe_remise_except WHERE amount_ht=0; - --- Supprimme orphelins pour permettre montée de la clé --- V4 DELETE llx_societe_remise_except FROM llx_societe_remise_except LEFT JOIN llx_facturedet ON llx_societe_remise_except.fk_facture = llx_facturedet.rowid WHERE llx_facturedet.rowid IS NULL; - -ALTER TABLE llx_societe_remise_except DROP FOREIGN KEY fk_societe_remise_fk_facture; -ALTER TABLE llx_societe_remise_except DROP FOREIGN KEY fk_societe_remise_fk_facture_source; - -ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_user (fk_user); -ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_soc (fk_soc); -ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture (fk_facture); -ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture_source (fk_facture_source); -ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_user FOREIGN KEY (fk_user) REFERENCES llx_user (rowid); -ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp); -ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture FOREIGN KEY (fk_facture) REFERENCES llx_facturedet (rowid); -ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture_source FOREIGN KEY (fk_facture_source) REFERENCES llx_facture (rowid); - -update llx_societe_remise_except set description='Remise sans description' where description is NULL or description =''; -alter table llx_societe_remise_except modify description varchar(255) NOT NULL; - -insert into llx_const (name, value, type, visible, note) VALUES ('PROPALE_VALIDITY_DURATION', '15', 'chaine', 0, 'Durée de validitée des propales'); - -alter table llx_propal add column ref_client varchar(30) after ref; - -alter table llx_societe_adresse_livraison drop column fk_departement; - -alter table llx_user change datelastaccess datelastlogin datetime; -alter table llx_user add column datepreviouslogin datetime after datelastlogin; -alter table llx_user add column ldap_sid varchar(255) DEFAULT NULL; -alter table llx_user add column statut tinyint DEFAULT 1; -alter table llx_user add column lang varchar(6); -alter table llx_user add column pass_crypted varchar(128) after pass; - -alter table llx_user add column office_phone varchar(20); -alter table llx_user add column office_fax varchar(20); -alter table llx_user add column user_mobile varchar(20); - - -alter table llx_user modify login varchar(24) NOT NULL; -alter table llx_user drop code; - - -update llx_user set pass_crypted = MD5(pass) where pass IS NOT NULL AND pass_crypted IS NULL and length(pass) < 32; -update llx_user set pass_crypted = pass where pass IS NOT NULL AND pass_crypted IS NULL and length(pass) = 32; -update llx_user set pass = NULL where length(pass) = 32; - -ALTER TABLE llx_user modify fk_societe integer; -ALTER TABLE llx_user modify fk_socpeople integer; -alter table llx_user add column fk_member integer after fk_socpeople; - -update llx_user set fk_societe = NULL where fk_societe = 0; -update llx_user set fk_socpeople = NULL where fk_socpeople = 0; -update llx_user set fk_member = NULL where fk_member = 0; - -ALTER TABLE llx_user DROP INDEX login; - -ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_login (login); - -ALTER TABLE llx_user ADD INDEX uk_user_fk_societe (fk_societe); - -ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_socpeople (fk_socpeople); -ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_member (fk_member); - - -alter table llx_boxes add column fk_user integer; - -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_commandedet drop column label; - - -insert into llx_action_def (rowid,code,titre,description,objet_type) values (3,'NOTIFY_VAL_ORDER_SUUPLIER','Validation commande fournisseur','Déclenché lors de la validation d\'une commande fournisseur','order_supplier'); - - - -drop table if exists llx_sqltables; - - -ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_1; -ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_2; -ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_3; -ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_4; -ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_5; - -ALTER TABLE llx_categorie_product ADD CONSTRAINT fk_categorie_product_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid); -ALTER TABLE llx_categorie_product ADD CONSTRAINT fk_categorie_product_product_rowid FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); - -ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product); - -alter table llx_product modify label varchar(255) NOT NULL; -alter table llx_product modify description text; -ALTER TABLE llx_product ADD COLUMN price_base_type varchar(3) DEFAULT 'HT' AFTER price; -ALTER TABLE llx_product ADD COLUMN price_ttc float(12,4) DEFAULT 0 AFTER price_base_type; -alter table llx_product_det modify label varchar(255) NOT NULL; -alter table llx_product_det modify description text; - -create table llx_accountingdebcred -( - fk_transaction integer NOT NULL, - fk_account integer NOT NULL, - amount real NOT NULL, - direction varchar(1) NOT NULL -)ENGINE=innodb; - -alter table llx_facturedet_rec add column total_ht real; -alter table llx_facturedet_rec add column total_tva real; -alter table llx_facturedet_rec add column total_ttc real; - -alter table llx_adherent add column phone varchar(30) after email; -alter table llx_adherent add column phone_perso varchar(30) after phone; -alter table llx_adherent add column phone_mobile varchar(30) after phone_perso; - -delete from llx_adherent_type where libelle IS NULL; -alter table llx_adherent_type modify libelle varchar(50) NOT NULL; - -update llx_facture set fk_facture_source=null where fk_facture_source is not null and type = 0; -update llx_facture set fk_statut=2 where paye=1; -update llx_facture set fk_statut=2 where close_code is not null and close_code != '' and close_code != 'replaced'; - - -update llx_boxes set fk_user = 0 where fk_user IS NULL; -ALTER TABLE llx_boxes modify fk_user integer default 0 NOT NULL; - --- Supprimme orphelins pour permettre montee de la cle --- V4 DELETE llx_boxes FROM llx_boxes LEFT JOIN llx_boxes_def ON llx_boxes.box_id = llx_boxes_def.rowid WHERE llx_boxes_def.rowid IS NULL; - -ALTER TABLE llx_boxes ADD INDEX idx_boxes_boxid (box_id); --- V4 ALTER TABLE llx_boxes ADD CONSTRAINT fk_boxes_box_id FOREIGN KEY (box_id) REFERENCES llx_boxes_def (rowid); - -ALTER TABLE llx_boxes ADD INDEX idx_boxes_fk_user (fk_user); - - -create table llx_categorie_fournisseur -( - fk_categorie integer NOT NULL, - fk_societe integer NOT NULL, - UNIQUE (fk_categorie, fk_societe) -)ENGINE=innodb; - - -create table llx_fournisseur_ca -( - fk_societe integer, - date_calcul datetime, - year smallint UNSIGNED, - ca_genere float, - UNIQUE (fk_societe, year) -)ENGINE=innodb; - -alter table llx_fournisseur_ca add ca_achat float(11,2) DEFAULT 0; - -create table llx_product_ca -( - fk_product integer, - date_calcul datetime, - year smallint UNSIGNED, - ca_genere float, - UNIQUE (fk_product, year) -)ENGINE=innodb; - -create table llx_commande_fournisseur_dispatch -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_commande integer, - fk_product integer, - qty float, -- quantit� - fk_entrepot integer, - fk_user integer, - datec datetime -)ENGINE=innodb; - -ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX (fk_commande); - -create table llx_stock_valorisation -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp, -- date technique mise a jour automatiquement - date_valo datetime, -- date de valorisation - fk_product integer NOT NULL, -- id du produit concerne par l'operation - qty_ope float(9,3), -- quantite de l'operation - price_ope float(12,4), -- prix unitaire du produit concerne par l'operation - valo_ope float(12,4), -- valorisation de l'operation - price_pmp float(12,4), -- valeur PMP de l'operation - qty_stock float(9,3) DEFAULT 0, -- qunatite en stock - valo_pmp float(12,4), -- valorisation du stock en PMP - fk_stock_mouvement integer, -- id du mouvement de stock - - key(fk_product) -)ENGINE=innodb; - - -create table llx_entrepot_valorisation -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp, -- date technique mise a jour automatiquement - date_calcul date, -- date auquel a ete calcule la valeur - fk_entrepot integer UNSIGNED NOT NULL , - valo_pmp float(12,4), -- valoristaion du stock en PMP - key(fk_entrepot) -)ENGINE=innodb; - -ALTER TABLE llx_entrepot ADD COLUMN valo_pmp float(12,4) DEFAULT 0; - -create table llx_user_entrepot -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_entrepot integer UNSIGNED, -- pointe sur llx_entrepot - fk_user integer UNSIGNED, -- pointe sur llx_user - consult tinyint(1) UNSIGNED, - send tinyint(1) UNSIGNED -)ENGINE=innodb; - -create table llx_product_subproduct -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_product integer NOT NULL, -- id du produit maitre - fk_product_subproduct integer NOT NULL, -- id du sous-produit - UNIQUE(fk_product, fk_product_subproduct) -)ENGINE=innodb; - -create table llx_bordereau_cheque -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - datec datetime, - date_bordereau date, - number mediumint, - amount float(12,2), - nbcheque smallint UNSIGNED DEFAULT 0, - fk_bank_account integer, - fk_user_author integer, - note text, - statut tinyint(1) UNSIGNED DEFAULT 0 -)ENGINE=innodb; - -alter table llx_product_price add price_level tinyint(4) NULL DEFAULT 1; -alter table llx_product_price add column price_ttc float(12,4) DEFAULT 0 after price; -alter table llx_product_price add column price_base_type varchar(3) DEFAULT 'HT' after price_ttc; - -ALTER TABLE llx_document_model ADD UNIQUE uk_document_model (nom,type); - -ALTER TABLE llx_chargesociales drop column date_pai; - -UPDATE llx_facture SET type=0 where type=3; - -create table llx_export_model -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - label varchar(50) NOT NULL, - type varchar(20) NOT NULL, - field text -)ENGINE=innodb; - -ALTER table llx_export_model add fk_user integer DEFAULT 0 NOT NULL after rowid; - -ALTER TABLE llx_export_model ADD UNIQUE uk_export_model (label); - -UPDATE llx_rights_def SET ID=ID+1001 WHERE ID BETWEEN 180 AND 189 AND module='fournisseur'; -UPDATE llx_user_rights SET fk_id=fk_id+1001 WHERE fk_id BETWEEN 180 AND 189; -UPDATE llx_usergroup_rights SET fk_id=fk_id+1001 WHERE fk_id BETWEEN 180 AND 189; - -UPDATE llx_rights_def SET ID=ID+1000 WHERE ID BETWEEN 230 AND 236 AND module='fournisseur'; -UPDATE llx_user_rights SET fk_id=fk_id+1000 WHERE fk_id BETWEEN 230 AND 236; -UPDATE llx_usergroup_rights SET fk_id=fk_id+1000 WHERE fk_id BETWEEN 230 AND 236; - -UPDATE llx_rights_def SET ID=ID+1 WHERE ID BETWEEN 1320 AND 1320 AND module='facture'; -UPDATE llx_user_rights SET fk_id=fk_id+1 WHERE fk_id BETWEEN 1320 AND 1320; -UPDATE llx_usergroup_rights SET fk_id=fk_id+1 WHERE fk_id BETWEEN 1320 AND 1320; - -UPDATE llx_rights_def SET ID=ID+1 WHERE ID BETWEEN 1420 AND 1420 AND module='commande'; -UPDATE llx_user_rights SET fk_id=fk_id+1 WHERE fk_id BETWEEN 1420 AND 1420; -UPDATE llx_usergroup_rights SET fk_id=fk_id+1 WHERE fk_id BETWEEN 1420 AND 1420; - - --- Not used. Just to be compatible with upgrade process of higher versions -alter table llx_const add column entity integer DEFAULT 1 NOT NULL; diff --git a/htdocs/install/mysql/migration/2.1.0-2.2.0.sql b/htdocs/install/mysql/migration/2.1.0-2.2.0.sql deleted file mode 100644 index 835c78e151a..00000000000 --- a/htdocs/install/mysql/migration/2.1.0-2.2.0.sql +++ /dev/null @@ -1,1183 +0,0 @@ --- --- Attention a l ordre des requetes. --- Ce fichier doit etre charge sur une version 2.1.0 --- sans AUCUNE erreur ni warning --- - - -alter table llx_commande_fournisseur_dispatch drop index fk_commande; -alter table llx_commande_fournisseur_dispatch drop index fk_commande_2; -alter table llx_commande_fournisseur_dispatch drop index fk_commande_3; -alter table llx_commande_fournisseur_dispatch drop index fk_commande_4; -alter table llx_commande_fournisseur_dispatch drop index fk_commande_5; - -ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande); - ---V4.1 UPDATE llx_product_fournisseur_price set fk_user = null where fk_user not in (select rowid from llx_user); ---V4.1 delete llx_commande where fk_soc not in (select rowid from llx_societe); - -alter table llx_categorie add column type tinyint DEFAULT 1 NOT NULL; - --- Supprime les doublons de la table llx_categories --- V4.1 DROP TABLE tmp_categorie1; --- V4.1 DROP TABLE tmp_categorie2; --- V4.1 CREATE TABLE tmp_categorie1 SELECT * FROM llx_categorie; --- V4.1 CREATE TABLE tmp_categorie2 SELECT * FROM llx_categorie; --- V4.1 delete c from llx_categorie as c where c.rowid in (select distinct c2.rowid from tmp_categorie1 as c2, tmp_categorie2 as cc2 where c2.rowid != cc2.rowid and c2.type = cc2.type and c2.label = cc2.label) and c.rowid not in (select min(c3.rowid) from tmp_categorie1 as c3, tmp_categorie2 as cc3 where c3.rowid != cc3.rowid and c3.type = cc3.type and c3.label = cc3.label group by c3.label,c3.type); --- V4.1 DROP TABLE tmp_categorie1; --- V4.1 DROP TABLE tmp_categorie2; --- Si suppression des doublons precedente a ete faite, on monte la cle sur les categories --- V4.1 ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type); - --- On migre les categories fournisseur de la table llx_fournisseur_categorie qui est obsolete vers table llx_categories qui est generique pour gerer les categories de tout type --- V4.1 INSERT into llx_categorie (label, description, visible, type) (select distinct label, label, 1, 1 from llx_fournisseur_categorie); --- V4.1 UPDATE llx_categorie_fournisseur as cf SET cf.fk_categorie = IFNULL((SELECT distinct c.rowid from llx_categorie as c, llx_fournisseur_categorie as fc where fc.rowid = cf.fk_categorie AND c.type = 1 AND c.label = fc.label),cf.fk_categorie); - --- Supprime les doublons de la table llx_categories --- V4.1 DROP TABLE tmp_categorie1; --- V4.1 DROP TABLE tmp_categorie2; --- V4.1 CREATE TABLE tmp_categorie1 SELECT * FROM llx_categorie; --- V4.1 CREATE TABLE tmp_categorie2 SELECT * FROM llx_categorie; --- V4.1 delete c from llx_categorie as c where c.rowid in (select distinct c2.rowid from tmp_categorie1 as c2, tmp_categorie2 as cc2 where c2.rowid != cc2.rowid and c2.type = cc2.type and c2.label = cc2.label) and c.rowid not in (select min(c3.rowid) from tmp_categorie1 as c3, tmp_categorie2 as cc3 where c3.rowid != cc3.rowid and c3.type = cc3.type and c3.label = cc3.label group by c3.label,c3.type); --- V4.1 DROP TABLE tmp_categorie1; --- V4.1 DROP TABLE tmp_categorie2; --- Si suppression des doublons precedente a ete faite, on monte la cle sur les categories --- V4.1 ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type); - - --- Corrige mauvaise insertion du a champ trop court -alter table llx_action_def modify code varchar(28) UNIQUE NOT NULL; -alter table llx_action_def modify objet_type varchar(16) NOT NULL; -update llx_action_def set code = 'NOTIFY_VAL_ORDER_SUPPLIER' where code = 'NOTIFY_VAL_ORDER_SUUPLIE'; -update llx_action_def set objet_type = 'order_supplier' where code = 'NOTIFY_VAL_ORDER_SUPPLIER'; - --- Nettoyage champ ref table llx_bank_account -update llx_bank_account set ref=concat('ACCOUNT',rowid) where (ref='' or ref is null); - -update llx_bank_account set currency_code='EU' where (currency_code IS NULL or currency_code=''); -alter table llx_bank_account modify currency_code varchar(3) NOT NULL; -update llx_bank_account set currency_code='EUR' where (currency_code IS NULL or currency_code='' or currency_code='EU'); - --- Sequence de requete pour nettoyage et correction champ type table llx_bank_url -update llx_bank_url set type='company' where (type is null or type = '') and url like '%compta/fiche.php?socid=%'; -alter table llx_bank_url modify `type` varchar(20); -update llx_bank_url set type='?' where (type is null or type = '') and url like '%compta/facture.php?facid=%'; -update llx_bank_url set type='payment_supplier' where (type='' or type is null) and url like '%fourn/paiement/fiche.php?id=%'; -update llx_bank_url set type='?' where (type is null or type = ''); -alter table llx_bank_url modify `type` varchar(20) NOT NULL; - -update llx_bank set datev = datec where datev = '1970-01-01 00:00:00' and rappro = 0; -update llx_bank set dateo = datec where datev = '1970-01-01 00:00:00' and rappro = 0; - -alter table llx_c_chargesociales add column actioncompta varchar(12) NOT NULL; -insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 1, 'Allocations familiales', 1,1,'TAXFAM'); -insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 2, 'GSG Déductible', 1,1,'TAXCSGD'); -insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 3, 'GSG/CRDS NON Déductible',0,1,'TAXCSGND'); -insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (10, 'Taxe apprentissage', 0,1,'TAXAPP'); -insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (11, 'Taxe professionnelle', 0,1,'TAXPRO'); -insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (12, 'Contribution à la formation professionnelle', 1,1,'TAXOPCA'); -insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (20, 'Impots locaux/fonciers', 0,1,'TAXFON'); -insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (30, 'Assurance Santé (SECU-URSSAF)', 0,1,'TAXSECU'); -insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (40, 'Mutuelle', 0,1,'TAXMUT'); -insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (50, 'Assurance vieillesse (CNAV)', 0,1,'TAXRET'); -insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (60, 'Assurance Chomage (ASSEDIC)', 0,1,'TAXCHOM'); -update llx_c_chargesociales set actioncompta='TAXFAM' where id = 1; -update llx_c_chargesociales set actioncompta='TAXCSGD' where id = 2; -update llx_c_chargesociales set actioncompta='TAXCSGND' where id = 3; -update llx_c_chargesociales set actioncompta='TAXAPP' where id = 10; -update llx_c_chargesociales set actioncompta='TAXPRO' where id = 11; -update llx_c_chargesociales set actioncompta='TAXFON' where id = 20; -alter table llx_chargesociales modify fk_type integer NOT NULL; -alter table llx_chargesociales modify libelle varchar(80) NOT NULL; - -insert into llx_rights_def (id, libelle, module, type, bydefault, subperms, perms) values (114,'Rapprocher transactions','banque','w',0,null,'consolidate'); -update llx_rights_def set libelle='Creer/modifier/supprimer ecriture bancaire' where perms='modifier' AND module='banque'; - --- Supprime colone en doublon avec fk_user_creat -alter table llx_paiement drop column author; - -update llx_actioncomm set fk_action = 9 where fk_action = 10; -update llx_actioncomm set percent = 100 where percent = 0 and datea is not null; - -ALTER TABLE llx_cotisation ADD COLUMN datef date after dateadh; -ALTER TABLE llx_cotisation modify datef date; -ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh); --- V4.1 update llx_cotisation set datef = ADDDATE(ADDDATE(dateadh, INTERVAL 1 YEAR),INTERVAL -1 DAY); - - -delete from llx_const where name='MAIN_SHOW_DEVELOPMENT_MODULES'; -delete from llx_const where name='MAIN_ENABLE_DEVELOPMENT'; -DELETE FROM llx_const WHERE name = 'PRODUIT_CHANGE_PROD_DESC'; -DELETE FROM llx_const WHERE name like 'FICHINTER_ADDON%'; -insert into llx_const (name, value, type, visible) values ('FICHEINTER_ADDON', 'pacific','chaine',0); -insert into llx_const (name, value, type, visible) values ('FICHEINTER_ADDON_PDF','soleil','chaine',0); - -INSERT INTO llx_const(name, value, type, note, visible) VALUES ('GENBARCODE_LOCATION','/usr/local/bin/genbarcode','chaine','location of genbarcode',0); -insert into llx_const(name, value, type, visible, note) values('MAIN_FEATURES_LEVEL','0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development'); - -update llx_const set name='MAIN_MAIL_EMAIL_FROM' where name='NOTIFICATION_EMAIL_FROM'; - -update llx_const set value='bluelagoon' where name='MAIN_THEME' and value ='dolibarr'; - -update llx_const set visible=0 where name in ('MAIN_UPLOAD_DOC','MAIN_MAIL_SMTP_SERVER','MAIN_MAIL_SMTP_PORT','MAIN_MAIL_EMAIL_FROM'); - -update llx_const set value='rodolphe.php' where name='MAIN_MENU_BARRELEFT' and value='default.php'; -update llx_const set value='rodolphe.php' where name='MAIN_MENU_BARRETOP' and value='default.php'; -update llx_const set value='rodolphe.php' where name='MAIN_MENUFRONT_BARRELEFT' and value='default.php'; -update llx_const set value='rodolphe.php' where name='MAIN_MENUFRONT_BARRETOP' and value='default.php'; - - -delete from llx_adherent_type where libelle IS NULL; -alter table llx_adherent_type modify libelle varchar(50) NOT NULL; - - -alter table llx_tva add fk_bank integer NOT NULL; -alter table llx_tva add fk_user_creat integer; -alter table llx_tva add fk_user_modif integer; - --- V4.1 UPDATE llx_tva as t set fk_bank = (SELECT IFNULL(MIN(rowid),0) FROM llx_bank as b WHERE b.datev = t.datev AND b.amount = -t.amount AND b.label like 'R%glement TVA') WHERE t.fk_bank = 0; --- V4.1 UPDATE llx_tva as t set fk_user_creat = (SELECT MIN(fk_user_author) FROM llx_bank as b WHERE b.datev = t.datev AND b.amount = -t.amount AND b.label like 'R%glement TVA') WHERE t.fk_user_creat IS NULL; - - --- Extention de la gestion des categories -alter table llx_categorie ADD type int not null default '0'; --- V4 ALTER TABLE llx_categorie DROP INDEX uk_categorie_ref; - -create table `llx_categorie_societe` ( - `fk_categorie` integer not null, - `fk_societe` integer not null, - UNIQUE KEY `fk_categorie` (`fk_categorie`,`fk_societe`), - KEY `fk_societe` (`fk_societe`) -) ENGINE=innodb; - -alter table `llx_categorie_societe` drop foreign key fk_societe; -alter table `llx_categorie_societe` add constraint `fk_categorie_societe_categorie_rowid` foreign key(`fk_categorie`) REFERENCES `llx_categorie` (`rowid`); -alter table `llx_categorie_societe` add constraint `fk_categorie_societe_fk_soc` foreign key(`fk_societe`) REFERENCES `llx_societe` (`rowid`); - -create table `llx_categorie_product` ( - `fk_categorie` integer not null, - `fk_product` integer not null, - PRIMARY KEY (`fk_categorie`,`fk_product`), - KEY `idx_categorie_product_fk_categorie` (`fk_categorie`), - KEY `idx_categorie_product_fk_product` (`fk_product`) -) ENGINE=innodb; - -alter table `llx_categorie_product` - add constraint `fk_categorie_product_categorie_rowid` foreign key(`fk_categorie`) REFERENCES `llx_categorie` (`rowid`), - add constraint `fk_categorie_product_product_rowid` foreign key(`fk_product`) REFERENCES `llx_product` (`rowid`); - - --- Ajout gestion du droit de pret -drop table if exists `llx_droitpret_rapport`; -create table `llx_droitpret_rapport` ( - `rowid` integer NOT NULL auto_increment, - `date_envoie` datetime NOT NULL, - `format` varchar(10) NOT NULL, - `date_debut` datetime NOT NULL, - `date_fin` datetime NOT NULL, - `fichier` varchar(255) NOT NULL, - `nbfact` integer NOT NULL, - PRIMARY KEY (`rowid`) -) ENGINE=innodb; - - --- Gestion des menu -CREATE TABLE `llx_menu` ( - `rowid` integer NOT NULL, - `menu_handler` varchar(16) NOT NULL default 'auguria', - `type` enum('top','left') NOT NULL default 'left', - `mainmenu` varchar(100) NOT NULL, - `fk_menu` integer NOT NULL, - `order` tinyint(4) NOT NULL, - `url` varchar(255) NOT NULL, - `target` varchar(100) NULL, - `titre` varchar(255) NOT NULL, - `langs` varchar(100), - `level` tinyint(1), - `leftmenu` varchar(100) NULL, - `right` varchar(255), - `user` tinyint(4) NOT NULL default '0', - PRIMARY KEY (`rowid`) -) ENGINE=innodb; - -create table `llx_menu_constraint` ( - `rowid` integer NOT NULL, - `action` varchar(255) NOT NULL, - PRIMARY KEY (`rowid`) -) ENGINE=innodb; - -create table `llx_menu_const` ( - `rowid` integer NOT NULL auto_increment, - `fk_menu` integer NOT NULL, - `fk_constraint` integer NOT NULL, - `user` tinyint(4) NOT NULL default '2', - PRIMARY KEY (`rowid`) -) ENGINE=innodb; - -ALTER TABLE `llx_menu_const` ADD INDEX `idx_menu_const_fk_menu` (`fk_menu`); -ALTER TABLE `llx_menu_const` ADD INDEX `idx_menu_const_fk_constraint` (`fk_constraint`); - -ALTER TABLE `llx_menu_const` ADD CONSTRAINT `fk_menu_const_fk_menu` FOREIGN KEY (`fk_menu`) REFERENCES `llx_menu` (`rowid`); -ALTER TABLE `llx_menu_const` ADD CONSTRAINT `fk_menu_const_fk_constraint` FOREIGN KEY (`fk_constraint`) REFERENCES `llx_menu_constraint` (`rowid`); - - --- --- Contenu de la table `llx_menu` --- -delete from llx_menu_const; -delete from llx_menu_constraint; -delete from llx_menu where menu_handler='auguria'; -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1, 'home', '', 0, '/index.php?mainmenu=home&leftmenu=', 'Home', -1, '', '', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2, 'companies', '', 0, '/index.php?mainmenu=companies&leftmenu=', 'ThirdParties', -1, 'companies', '', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3, 'products', '', 0, '/product/index.php?mainmenu=products&leftmenu=', 'Products/Services', -1, 'products', '$user->rights->produit->lire', '', 0, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4, 'suppliers', '', 0, '/fourn/index.php?mainmenu=suppliers&leftmenu=', 'Suppliers', -1, 'suppliers', '$user->rights->fournisseur->lire', '', 0, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (5, 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->commercial->main->lire', '', 2, 5); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (6, 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire || $user->rights->commande->lire || $user->rights->facture->lire || $user->rights->banque->lire', '', 2, 6); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (7, 'project', '', 0, '/projet/index.php?mainmenu=project&leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 0, 7); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (8, 'tools', '', 0, '/index.php?mainmenu=tools&leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire', '', 2, 8); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (9, 'telephony', '', 0, '/telephonie/index.php?mainmenu=telephony&leftmenu=', 'Telephony', -1, 'telephony', '$user->rights->telephonie->lire', '', 2, 9); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (10, 'energy', '', 0, '/energie/index.php?mainmenu=energy&leftmenu=', 'Energy', -1, 'energy', '', '', 2, 10); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (11, 'shop', '', 0, '/boutique/index.php?mainmenu=shop&leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 11); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (12, 'shop', '', 0, '/oscommerce_ws/index.php?mainmenu=shop&leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 12); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (13, 'webcal', '', 0, '/webcal/webcal.php?mainmenu=webcal&leftmenu=', 'Calendar', -1, 'other', '', '', 0, 13); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (14, 'mantis', '', 0, '/mantis/mantis.php?mainmenu=mantis', 'BugTracker', -1, 'other', '', '', 2, 14); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (15, 'members', '', 0, '/adherents/index.php?mainmenu=members&leftmenu=', 'Members', -1, 'members', '', '', 2, 15); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (16, 'phenix', '', 0, '/phenix/phenix.php?mainmenu=phenix&leftmenu=', 'Calendar', -1, 'other', '', '', 0, 16); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (100, 'home', '', 1, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (101, 'home', '$leftmenu=="setup"', 100, '/admin/company.php', 'MenuCompanySetup', 1, 'admin', '', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (102, 'home', '$leftmenu=="setup"', 100, '/admin/ihm.php', 'GUISetup', 1, 'admin', '', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (103, 'home', '$leftmenu=="setup"', 100, '/admin/modules.php', 'Modules', 1, 'admin', '', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (104, 'home', '$leftmenu=="setup"', 100, '/admin/boxes.php', 'Boxes', 1, 'admin', '', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (105, 'home', '$leftmenu=="setup"', 100, '/admin/menus.php', 'Menus', 1, 'admin', '', '', 2, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (106, 'home', '$leftmenu=="setup"', 100, '/admin/delais.php', 'DelaysBeforeWarning', 1, 'admin', '', '', 2, 5); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (107, 'home', '$leftmenu=="setup"', 100, '/admin/triggers.php', 'Triggers', 1, 'admin', '', '', 2, 6); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (108, 'home', '$leftmenu=="setup"', 100, '/admin/perms.php', 'Security', 1, 'admin', '', '', 2, 7); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (109, 'home', '$leftmenu=="setup"', 100, '/admin/mails.php', 'Emails', 1, 'admin', '', '', 2, 8); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (110, 'home', '$leftmenu=="setup"', 100, '/admin/limits.php', 'Limits', 1, 'admin', '', '', 2, 9); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (111, 'home', '$leftmenu=="setup"', 100, '/admin/dict.php', 'DictionarySetup', 1, 'admin', '', '', 2, 10); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (112, 'home', '$leftmenu=="setup"', 100, '/admin/const.php', 'OtherSetup', 1, 'admin', '', '', 2, 11); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (200, 'home', '', 1, '/admin/system/index.php?leftmenu=system', 'SystemInfo', 0, 'admin', '', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (201, 'home', '$leftmenu=="system"', 200, '/admin/system/dolibarr.php', 'Dolibarr', 1, 'admin', '', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (202, 'home', '$leftmenu=="system"', 201, '/admin/system/constall.php', 'AllParameters', 2, 'admin', '', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (203, 'home', '$leftmenu=="system"', 201, '/about.php', 'About', 2, 'admin', '', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (204, 'home', '$leftmenu=="system"', 200, '/admin/system/os.php', 'OS', 1, 'admin', '', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (205, 'home', '$leftmenu=="system"', 200, '/admin/system/web.php', 'WebServer', 1, 'admin', '', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (206, 'home', '$leftmenu=="system"', 200, '/admin/system/phpinfo.php', 'Php', 1, 'admin', '', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (207, 'home', '$leftmenu=="system"', 206, '/admin/system/phpinfo.php?what=conf', 'PhpConf', 2, 'admin', '', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (208, 'home', '$leftmenu=="system"', 206, '/admin/system/phpinfo.php?what=env', 'PhpEnv', 2, 'admin', '', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (209, 'home', '$leftmenu=="system"', 206, '/admin/system/phpinfo.php?what=modules', 'PhpModules', 2, 'admin', '', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (210, 'home', '$leftmenu=="system"', 200, '/admin/system/database.php', 'Database', 1, 'admin', '', '', 2, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (211, 'home', '$leftmenu=="system"', 210, '/admin/system/database-tables.php', 'Tables', 2, 'admin', '', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (212, 'home', '$leftmenu=="system"', 210, '/admin/system/database-tables-contraintes.php', 'Constraints', 2, 'admin', '', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (300, 'home', '', 1, '/admin/tools/index.php?leftmenu=admintools', 'SystemTools', 0, 'admin', '', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (301, 'home', '$leftmenu=="admintools"', 300, '/admin/tools/dolibarr_export.php', 'Backup', 1, 'admin', '', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (302, 'home', '$leftmenu=="admintools"', 300, '/admin/tools/dolibarr_import.php', 'Restore', 1, 'admin', '', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (303, 'home', '$leftmenu=="admintools"', 300, '/admin/tools/purge.php', 'Purge', 1, 'admin', '', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (304, 'home', '$leftmenu=="admintools"', 300, '/admin/tools/eaccelerator.php', 'EAccelerator', 1, 'admin', '', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (400, 'home', '', 1, '/user/home.php?leftmenu=users', 'MenuUsersAndGroups', 0, 'users', '', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (401, 'home', '$leftmenu=="users"', 400, '/user/index.php', 'Users', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (402, 'home', '$leftmenu=="users"', 401, '/user/fiche.php?action=create', 'NewUser', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (403, 'home', '$leftmenu=="users"', 400, '/user/group/index.php', 'Groups', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (404, 'home', '$leftmenu=="users"', 403, '/user/group/fiche.php?action=create', 'NewGroup', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (500, 'companies', '', 2, '/societe.php', 'ThirdParty', 0, 'companies', '$user->rights->societe->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (501, 'companies', '', 500, '/soc.php?action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (502, 'companies', '', 500, '/societe/groupe/index.php', 'MenuSocGroup', 1, 'companies', '$user->rights->societe->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (503, 'companies', '', 500, '/fourn/liste.php?leftmenu=suppliers', 'Suppliers', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (504, 'companies', '', 503, '/soc.php?leftmenu=supplier&action=create&type=f', 'NewSupplier', 2, 'suppliers', '$user->rights->societe->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (505, 'companies', '', 503, '/contact/index.php?leftmenu=suppliers&type=f', 'Contacts', 2, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (506, 'companies', '', 500, '/comm/prospect/prospects.php?leftmenu=prospects', 'Prospects', 1, 'companies', '$user->rights->societe->lire', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (507, 'companies', '', 506, '/soc.php?leftmenu=prospects&action=create&type=p', 'MenuNewProspect', 2, 'companies', '$user->rights->societe->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (508, 'companies', '', 506, '/contact/index.php?leftmenu=customers&type=p', 'Contacts', 2, 'companies', '$user->rights->societe->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (509, 'companies', '', 500, '/comm/clients.php?leftmenu=customers', 'Customers', 1, 'companies', '$user->rights->societe->lire', '', 2, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (510, 'companies', '', 509, '/soc.php?leftmenu=customers&action=create&type=c', 'MenuNewCustomer', 2, 'companies', '$user->rights->societe->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (511, 'companies', '', 509, '/contact/index.php?leftmenu=customers&type=c', 'Contacts', 2, 'companies', '$user->rights->societe->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (600, 'companies', '', 2, '/contact/index.php?leftmenu=contacts', 'Contacts', 0, 'companies', '$user->rights->societe->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (601, 'companies', '', 600, '/contact/fiche.php?leftmenu=contacts&action=create', 'NewContact', 1, 'companies', '$user->rights->societe->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (602, 'companies', '', 600, '/contact/index.php?leftmenu=contacts', 'List', 1, 'companies', '$user->rights->societe->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (700, 'commercial', '', 5, '/comm/prospect/index.php?leftmenu=prospects', 'Prospects', 0, 'companies', '$user->rights->societe->lire', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (701, 'commercial', '', 700, '/soc.php?leftmenu=prospects&action=create&type=c', 'MenuNewProspect', 1, 'companies', '$user->rights->societe->creer', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (702, 'commercial', '', 700, '/contact/index.php?leftmenu=prospects&type=p', 'List', 1, 'companies', '$user->rights->societe->lire', '', 0, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (703, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=-1', 'LastProspectDoNotContact', 2, 'companies', '$user->rights->societe->lire', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (704, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=0', 'LastProspectNeverContacted', 2, 'companies', '$user->rights->societe->lire', '', 0, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (705, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=1', 'LastProspectToContact', 2, 'companies', '$user->rights->societe->lire', '', 0, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (706, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=2', 'LastProspectContactInProcess', 2, 'companies', '$user->rights->societe->lire', '', 0, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (707, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=3', 'LastProspectContactDone', 2, 'companies', '$user->rights->societe->lire', '', 0, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (708, 'commercial', '', 700, '/contact/index.php?leftmenu=prospects&type=p', 'Contacts', 1, 'companies', '$user->rights->societe->lire', '', 0, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (800, 'commercial', '', 5, '/comm/index.php?leftmenu=customers', 'Customers', 0, 'companies', '$user->rights->societe->lire', '', 0, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (801, 'commercial', '', 800, '/soc.php?leftmenu=customers&action=create&type=c', 'MenuNewCustomer', 1, 'companies', '$user->rights->societe->creer', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (802, 'commercial', '', 800, '/comm/clients.php?leftmenu=customers', 'List', 1, 'companies', '$user->rights->societe->lire', '', 0, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (803, 'commercial', '', 800, '/contact/index.php?leftmenu=customers&type=c', 'Contacts', 1, 'companies', '$user->rights->societe->lire', '', 0, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (900, 'commercial', '', 5, '/contact/index.php?leftmenu=contacts', 'Contacts', 0, 'companies', '$user->rights->societe->lire', '', 0, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (901, 'commercial', '', 900, '/contact/fiche.php?leftmenu=contacts&action=create', 'NewContact', 1, 'companies', '$user->rights->societe->creer', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (902, 'commercial', '', 900, '/contact/index.php?leftmenu=contacts&action=create', 'List', 1, 'companies', '$user->rights->societe->lire', '', 0, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1000, 'commercial', '', 5, '/comm/action/index.php?leftmenu=actions', 'Actions', 0, 'companies', '$user->rights->societe->lire', '', 0, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1001, 'commercial', '$leftmenu=="actions"', 1000, '/societe.php?leftmenu=actions', 'NewAction', 1, 'companies', '$user->rights->societe->lire', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1002, 'commercial', '$leftmenu=="actions"', 1000, '/comm/action/index.php?leftmenu=actions&status=todo', 'MenuToDoActions', 1, 'companies', '$user->rights->societe->lire', '', 0, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1003, 'commercial', '$leftmenu=="actions"', 1000, '/comm/action/index.php?leftmenu=actions&time=today', 'Today', 1, 'companies', '$user->rights->societe->lire', '', 0, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1004, 'commercial', '$leftmenu=="actions"', 1000, '/comm/action/rapport/index.php?leftmenu=actions', 'Reportings', 1, 'companies', '$user->rights->societe->lire', '', 0, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1100, 'commercial', '', 5, '/comm/propal.php?leftmenu=propals', 'Prop', 0, 'propal', '$user->rights->propale->lire', '', 2, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1101, 'commercial', '$leftmenu=="propals"', 1100, '/societe.php?leftmenu=propals', 'NewPropal', 1, 'propal', '$user->rights->propale->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1102, 'commercial', '$leftmenu=="propals"', 1100, '/comm/propal.php?viewstatut=0', 'PropalsDraft', 1, 'propal', '$user->rights->propale->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1103, 'commercial', '$leftmenu=="propals"', 1100, '/comm/propal.php?viewstatut=1', 'PropalsOpened', 1, 'propal', '$user->rights->propale->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1104, 'commercial', '$leftmenu=="propals"', 1100, '/comm/propal.php?viewstatut=2,3,4', 'PropalStatusClosedShort', 1, 'propal', '$user->rights->propale->lire', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1105, 'commercial', '$leftmenu=="propals"', 1100, '/comm/propal/stats/index.php?leftmenu=propals', 'Statistics', 1, 'propal', '$user->rights->propale->lire', '', 2, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1200, 'commercial', '', 5, '/commande/index.php?leftmenu=orders', 'Orders', 0, 'orders', '$user->rights->commande->lire', '', 2, 5); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1201, 'commercial', '$leftmenu=="orders"', 1200, '/societe.php?leftmenu=orders', 'NewOrder', 1, 'orders', '$user->rights->commande->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1202, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=0', 'StatusOrderDraftShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1203, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=1', 'StatusOrderValidated', 1, 'orders', '$user->rights->commande->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1204, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=2', 'StatusOrderOnProcessShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1205, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=3', 'StatusOrderToBill', 1, 'orders', '$user->rights->commande->lire', '', 2, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1206, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=4', 'StatusOrderProcessed', 1, 'orders', '$user->rights->commande->lire', '', 2, 5); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1207, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=-1', 'StatusOrderCanceledShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 6); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1208, 'commercial', '$leftmenu=="orders"', 1200, '/commande/stats/index.php?leftmenu=orders', 'Statistics', 1, 'orders', '$user->rights->commande->lire', '', 2, 7); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1300, 'commercial', '', 5, '/expedition/index.php?leftmenu=sendings', 'Sendings', 0, 'orders', '$user->rights->expedition->lire', '', 2, 6); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1301, 'commercial', '$leftmenu=="sendings"', 1300, '/expedition/liste.php?leftmenu=sendings', 'List', 1, 'orders', '$user->rights->expedition->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1302, 'commercial', '$leftmenu=="sendings"', 1300, '/expedition/stats/index.php?leftmenu=sendings', 'Statistics', 1, 'orders', '$user->rights->expedition->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1400, 'commercial', '', 5, '/contrat/index.php?leftmenu=contracts', 'Contracts', 0, 'contracts', '$user->rights->contrat->lire', '', 2, 7); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1401, 'commercial', '$leftmenu=="contracts"', 1400, '/societe.php?leftmenu=contracts', 'NewContract', 1, 'contracts', '$user->rights->contrat->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1402, 'commercial', '$leftmenu=="contracts"', 1400, '/contrat/liste.php?leftmenu=contracts', 'List', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1403, 'commercial', '$leftmenu=="contracts"', 1400, '/contrat/services.php?leftmenu=contracts', 'MenuServices', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1404, 'commercial', '$leftmenu=="contracts"', 1402, '/contrat/services.php?leftmenu=contracts&mode=0', 'MenuInactiveServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1405, 'commercial', '$leftmenu=="contracts"', 1402, '/contrat/services.php?leftmenu=contracts&mode=4', 'MenuRunningServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1406, 'commercial', '$leftmenu=="contracts"', 1402, '/contrat/services.php?leftmenu=contracts&mode=4&filter=expired', 'MenuExpiredServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1407, 'commercial', '$leftmenu=="contracts"', 1402, '/contrat/services.php?leftmenu=contracts&mode=5', 'MenuClosedServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1500, 'commercial', '', 5, '/fichinter/index.php?leftmenu=ficheinter', 'Interventions', 0, 'interventions', '$user->rights->ficheinter->lire', '', 2, 8); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1501, 'commercial', '$leftmenu=="ficheinter"', 1500, '/fichinter/fiche.php?action=create&leftmenu=ficheinter', 'NewIntervention', 1, 'interventions', '$user->rights->ficheinter->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1502, 'commercial', '$leftmenu=="ficheinter"', 1500, '/fichinter/index.php?leftmenu=ficheinter', 'List', 1, 'interventions', '$user->rights->ficheinter->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1600, 'accountancy', '', 6, '/compta/index.php?leftmenu=suppliers', 'Suppliers', 0, 'companies', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1601, 'accountancy', '', 1600, '/soc.php?leftmenu=suppliers&action=create&type=f', 'NewSupplier', 1, 'companies', '$user->rights->societe->creer && $user->rights->fournisseur->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1602, 'accountancy', '', 1600, '/fourn/liste.php?leftmenu=suppliers', 'List', 1, 'companies', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1603, 'accountancy', '', 1600, '/contact/index.php?leftmenu=suppliers&type=f', 'Contacts', 1, 'companies', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1604, 'accountancy', '', 1600, '/fourn/facture/index.php?leftmenu=suppliers_bills', 'BillsSuppliers', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1605, 'accountancy', '$leftmenu=="suppliers_bills"', 1604, '/fourn/facture/fiche.php?action=create', 'NewBill', 2, 'bills', '$user->rights->fournisseur->facture->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1606, 'accountancy', '$leftmenu=="suppliers_bills"', 1604, '/fourn/facture/impayees.php', 'Unpaid', 2, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1607, 'accountancy', '$leftmenu=="suppliers_bills"', 1604, '/fourn/facture/paiement.php', 'Payments', 2, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1700, 'accountancy', '', 6, '/compta/index.php?leftmenu=customers', 'Customers', 0, 'companies', '$user->rights->societe->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1701, 'accountancy', '', 1700, '/soc.php?leftmenu=customers&action=create&type=c', 'MenuNewCustomer', 1, 'companies', '$user->rights->societe->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1702, 'accountancy', '', 1700, '/compta/clients.php?leftmenu=customers', 'List', 1, 'companies', '$user->rights->societe->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1703, 'accountancy', '', 1700, '/contact/index.php?leftmenu=customers&type=c', 'Contacts', 1, 'companies', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1704, 'accountancy', '', 1700, '/compta/facture/list.php?leftmenu=customers_bills', 'BillsCustomers', 1, 'bills', '$user->rights->facture->lire', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1705, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/clients.php?action=facturer&leftmenu=customers_bills', 'NewBill', 2, 'bills', '$user->rights->facture->creer', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1706, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/facture/fiche-rec.php?leftmenu=customers_bills', 'Repeatable', 2, 'bills', '$user->rights->facture->lire', '', 2, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1707, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/facture/impayees.php?action=facturer&leftmenu=customers_bills', 'Unpaid', 2, 'bills', '$user->rights->facture->lire', '', 2, 5); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1708, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/paiement/liste.php?leftmenu=customers_bills_payments', 'Payments', 2, 'bills', '$user->rights->facture->lire', '', 2, 6); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1709, 'accountancy', 'preg_match("/customers_bills_payments/i",$leftmenu)', 1708, '/compta/paiement/avalider.php?leftmenu=customers_bills_payments', 'MenuToValid', 3, 'bills', '$user->rights->facture->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1710, 'accountancy', 'preg_match("/customers_bills_payments/i",$leftmenu)', 1708, '/compta/paiement/rapport.php?leftmenu=customers_bills_payments', 'Reportings', 3, 'bills', '$user->rights->facture->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1711, 'accountancy', '', 6, '/compta/paiement/cheque/index.php?leftmenu=checks', 'MenuChequeDeposits', 0, 'bills', '$user->rights->facture->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1712, 'accountancy', 'preg_match("/checks/i",$leftmenu)', 1711, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'bills', '$user->rights->facture->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1713, 'accountancy', 'preg_match("/checks/i",$leftmenu)', 1711, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'MenuChequesReceipts', 1, 'bills', '$user->rights->facture->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1714, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/facture/stats/index.php?leftmenu=customers_bills', 'Statistics', 2, 'bills', '$user->rights->facture->lire', '', 2, 8); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1715, 'accountancy', '', 1700, '/compta/paiement/cheque/index.php', 'CheckReceipt', 1, 'bills', '$user->rights->facture->lire', '', 1, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1716, 'accountancy', '', 1704, '/compta/paiement/cheque/fiche.php?action=new', 'New', 2, 'bills', '$user->rights->facture->lire', '', 1, 9); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1717, 'accountancy', '', 1704, '/compta/paiement/cheque/liste.php', 'List', 2, 'bills', '$user->rights->facture->lire', '', 1, 10); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1800, 'accountancy', '', 6, '/compta/propal.php', 'Prop', 0, 'propal', '$user->rights->propale->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1900, 'accountancy', '', 6, '/compta/commande/liste.php?leftmenu=orders&status=3&afacturer=1', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2000, 'accountancy', '', 6, '/compta/dons/index.php?leftmenu=donations&mainmenu=accountancy', 'Donations', 0, 'donations', '$user->rights->don->lire', '', 2, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2001, 'accountancy', '$leftmenu=="donations"', 2000, '/compta/dons/fiche.php?action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2002, 'accountancy', '$leftmenu=="donations"', 2000, '/compta/dons/liste.php?action=create', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2003, 'accountancy', '$leftmenu=="donations"', 2000, '/compta/dons/stats.php', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2100, 'accountancy', '', 6, '/compta/deplacement/index.php', 'Trips', 0, 'trips', '$user->rights->deplacement->lire', '', 0, 5); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2200, 'accountancy', '', 6, '/compta/charges/index.php?leftmenu=charges&mainmenu=accountancy', 'Charges', 0, 'Charges', '$user->rights->tax->charges->lire', '', 0, 6); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2201, 'accountancy', '$leftmenu=="charges"', 2200, '/compta/sociales/index.php', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2300, 'accountancy', '', 6, '/compta/tva/index.php?leftmenu=vat&mainmenu=accountancy', 'VAT', 0, 'companies', '$user->rights->tax->charges->lire', '', 0, 7); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2301, 'accountancy', '$leftmenu=="vat"', 2300, '/compta/tva/fiche.php?action=create', 'NewPayment', 1, 'companies', '$user->rights->tax->charges->creer', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2302, 'accountancy', '$leftmenu=="vat"', 2300, '/compta/tva/reglement.php', 'Payments', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2303, 'accountancy', '$leftmenu=="vat"', 2300, '/compta/tva/clients.php', 'ReportByCustomers', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2400, 'accountancy', '', 6, '/compta/ventilation/index.php?leftmenu=ventil', 'Ventilation', 0, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 8); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2401, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/ventilation/liste.php', 'A ventiler', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2402, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/ventilation/lignes.php', 'Ventil�es', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2403, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/param/', 'Setup', 1, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2404, 'accountancy', '$leftmenu=="ventil"', 2403, '/compta/param/comptes/liste.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2405, 'accountancy', '$leftmenu=="ventil"', 2403, '/compta/param/comptes/fiche.php?action=create', 'New', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2406, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/export/', 'Export', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2407, 'accountancy', '$leftmenu=="ventil"', 2406, '/compta/export/index.php', 'New', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2408, 'accountancy', '$leftmenu=="ventil"', 2406, '/compta/export/liste.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2500, 'accountancy', '', 6, '/compta/prelevement/index.php?leftmenu=withdraw', 'StandingOrders', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2501, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/demandes.php?status=0', 'StandingOrderToProcess', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2502, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/create.php', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2503, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/bons.php', 'WithdrawalsReceipts', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2504, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/liste.php', 'WithdrawalsLines', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2505, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/liste_factures.php', 'WithdrawedBills', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2506, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/rejets.php', 'Rejects', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 5); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2507, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/stats.php', 'Statistics', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 6); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2508, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/config.php', 'Setup', 1, 'withdrawals', '$user->rights->prelevement->bons->configurer', '', 2, 7); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2600, 'accountancy', '', 6, '/compta/bank/index.php?leftmenu=bank', 'MenuBankCash', 0, 'banks', '$user->rights->banque->lire', '', 0, 10); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2601, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/fiche.php?action=create', 'MenuNewFinancialAccount', 1, 'banks', '$user->rights->banque->configurer', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2602, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/categ.php', 'Categories', 1, 'banks', '$user->rights->banque->configurer', '', 0, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2603, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/search.php', 'SearchTransaction', 1, 'banks', '$user->rights->banque->lire', '', 0, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2604, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/budget.php', 'ByRubriques', 1, 'banks', '$user->rights->banque->lire', '', 0, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2605, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/bilan.php', 'Bilan', 1, 'banks', '$user->rights->banque->lire', '', 0, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2606, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/virement.php', 'BankTransfers', 1, 'banks', '$user->rights->banque->modifier', '', 0, 5); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2607, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/bplc.php', 'Transactions BPLC', 1, 'banks', '', '', 0, 6); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2700, 'accountancy', '', 6, '/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 11); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2701, 'accountancy', '$leftmenu=="ca"', 2700, '/compta/resultat/index.php?leftmenu=ca', 'R�sultat / Exercice', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2702, 'accountancy', '$leftmenu=="ca"', 2701, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2703, 'accountancy', '$leftmenu=="ca"', 2700, '/compta/stats/index.php?leftmenu=ca', 'Chiffre d''affaire', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2704, 'accountancy', '$leftmenu=="ca"', 2703, '/compta/stats/casoc?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2705, 'accountancy', '$leftmenu=="ca"', 2703, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2800, 'products', '', 3, '/product/index.php?leftmenu=product&type=0', 'Products', 0, 'products', '$user->rights->produit->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2801, 'products', '', 2800, '/product/fiche.php?leftmenu=product&action=create&type=0', 'NewProduct', 1, 'products', '$user->rights->produit->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2802, 'products', '', 2800, '/product/liste.php?leftmenu=product&type=0', 'List', 1, 'products', '$user->rights->produit->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2803, 'products', '', 2800, '/product/reassort.php?type=0', 'Stocks', 1, 'products', '$user->rights->stock->lire', '', 2, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2804, 'products', '', 2800, '/product/fiche.php?leftmenu=product&action=create&type=0&canvas=livre', 'Nouveau livre', 1, 'products', '$user->rights->produit->creer', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2805, 'products', '', 2800, '/product/liste.php?leftmenu=product&type=0&canvas=livre', 'Livre', 1, 'products', '$user->rights->produit->lire', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2900, 'products', '', 3, '/product/index.php?leftmenu=service&type=1', 'Services', 0, 'products', '$user->rights->produit->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2901, 'products', '', 2900, '/product/fiche.php?leftmenu=service&action=create&type=1', 'NewService', 1, 'products', '$user->rights->produit->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2902, 'products', '', 2900, '/product/liste.php?leftmenu=service&type=1', 'List', 1, 'products', '$user->rights->produit->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3000, 'products', '', 3, '/product/stats/index.php?leftmenu=stats', 'Statistics', 0, 'main', '$user->rights->produit>lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3001, 'products', '', 3000, '/product/popuprop.php?leftmenu=stats', 'Popularity', 1, 'main', '$user->rights->produit>lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3100, 'products', '', 3, '/product/stock/index.php?leftmenu=stock', 'Stock', 0, 'stocks', '$user->rights->stock->lire', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3101, 'products', '$leftmenu=="stock"', 3100, '/product/stock/fiche.php?action=create', 'MenuNewWarehouse', 1, 'stocks', '$user->rights->stock->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3102, 'products', '$leftmenu=="stock"', 3100, '/product/stock/liste.php', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3103, 'products', '$leftmenu=="stock"', 3100, '/product/stock/valo.php', 'EnhancedValue', 1, 'stocks', '$user->rights->stock->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3104, 'products', '$leftmenu=="stock"', 3100, '/product/stock/mouvement.php', 'Movements', 1, 'stocks', '$user->rights->stock->mouvement->lire', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3200, 'products', '', 3, '/categories/index.php?leftmenu=cat&type=0', 'Categories', 0, 'categories', '$user->rights->categorie>lire', '', 2, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3201, 'products', '$leftmenu=="cat"', 3200, '/categories/fiche.php?action=create&type=0', 'NewCat', 1, 'categories', '$user->rights->categorie>creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3300, 'suppliers', '', 4, '/fourn/index.php?leftmenu=suppliers', 'Suppliers', 0, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3301, 'suppliers', '', 3300, '/soc.php?leftmenu=suppliers&action=create&type=f', 'NewSupplier', 1, 'suppliers', '$user->rights->societe->creer && $user->rights->fournisseur->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3302, 'suppliers', '', 3300, '/fourn/liste.php', 'List', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3303, 'suppliers', '', 3300, '/contact/index.php?leftmenu=supplier&type=f', 'Contacts', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3304, 'suppliers', '', 3300, '/fourn/stats.php', 'Statistics', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3400, 'suppliers', '', 4, '/fourn/facture/index.php', 'Bills', 0, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3401, 'suppliers', '', 3400, '/fourn/facture/fiche.php?action=create', 'NewBill', 1, 'bills', '$user->rights->fournisseur->facture->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3402, 'suppliers', '', 3400, '/fourn/facture/paiement.php', 'Payments', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3500, 'suppliers', '', 4, '/fourn/commande/index.php?leftmenu=suppliers', 'Orders', 0, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3501, 'suppliers', '', 3500, '/societe.php?leftmenu=supplier', 'NewOrder', 1, 'orders', '$user->rights->fournisseur->commande->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3502, 'suppliers', '', 3500, '/fourn/commande/liste.php?leftmenu=suppliers', 'List', 1, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3600, 'project', '', 7, '/projet/index.php?leftmenu=projects', 'Projects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3601, 'project', '', 3600, '/comm/clients.php?leftmenu=projects', 'NewProject', 1, 'projects', '$user->rights->projet->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3602, 'project', '', 3600, '/projet/liste.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3700, 'project', '', 7, '/projet/tasks', 'Tasks', 0, 'projects', '$user->rights->projet->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3701, 'project', '', 3700, '/projet/tasks/mytasks.php', 'MyTasks', 1, 'projects', '$user->rights->projet->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3800, 'project', '', 7, '/projet/activity', 'Activity', 0, 'projects', '$user->rights->projet->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3801, 'project', '', 3800, '/projet/activity/myactivity.php', 'MyActivity', 1, 'projects', '$user->rights->projet->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3900, 'tools', '', 8, '/comm/mailing/index.php?leftmenu=mailing', 'EMailings', 0, 'mails', '$user->rights->mailing->lire', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3901, 'tools', '', 3900, '/comm/mailing/fiche.php?leftmenu=mailing&action=create', 'NewMailing', 1, 'mails', '$user->rights->mailing->creer', '', 0, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3902, 'tools', '', 3900, '/comm/mailing/liste.php?leftmenu=mailing', 'List', 1, 'mails', '$user->rights->mailing->lire', '', 0, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4000, 'tools', '', 8, '/bookmarks/liste.php?leftmenu=bookmarks', 'Bookmarks', 0, 'other', '$user->rights->bookmark->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4001, 'tools', '', 4000, '/bookmarks/fiche.php?action=create', 'NewBookmark', 1, 'other', '$user->rights->bookmark->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4002, 'tools', '', 4000, '/bookmarks/liste.php', 'List', 1, 'other', '$user->rights->bookmark->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4100, 'tools', '', 8, '/exports/index.php?leftmenu=export', 'FormatedExport', 0, 'exports', '$user->rights->export->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4101, 'tools', '', 4100, '/exports/export.php?leftmenu=export', 'NewExport', 1, 'exports', '$user->rights->export->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4130, 'tools', '', 8, '/admin/import/index.php?leftmenu=import', 'FormatedImport', 0, 'imports', '$user->rights->import->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4131, 'tools', '', 4130, '/admin/import/import.php?leftmenu=import', 'NewImport', 1, 'imports', '$user->rights->import->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4200, 'members', '', 15, '/adherents/index.php?leftmenu=members&mainmenu=members', 'Members', 0, 'members', '$user->rights->adherent->lire', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4201, 'members', '', 4200, '/adherents/fiche.php?action=create', 'NewMember', 1, 'members', '$user->rights->adherent->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4202, 'members', '', 4200, '/adherents/liste.php', 'List', 1, 'members', '$user->rights->adherent->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4203, 'members', '', 4200, '/adherents/liste.php?statut=-1', 'MenuMembersToValidate', 1, 'members', '$user->rights->adherent->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4204, 'members', '', 4200, '/adherents/liste.php?statut=1', 'MenuMembersValidated', 1, 'members', '$user->rights->adherent->lire', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4205, 'members', '', 4200, '/adherents/liste.php?statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 1, 'members', '$user->rights->adherent->lire', '', 2, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4206, 'members', '', 4200, '/adherents/liste.php?statut=1&filter=uptodate', 'MenuMembersUpToDate', 1, 'members', '$user->rights->adherent->lire', '', 2, 5); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4207, 'members', '', 4200, '/adherents/liste.php?statut=0', 'MenuMembersResiliated', 1, 'members', '$user->rights->adherent->lire', '', 2, 6); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4300, 'members', '', 15, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4301, 'members', '', 4300, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4302, 'members', '', 4300, '/adherents/cotisations.php?leftmenu=accountancy', 'List', 1, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4400, 'members', '', 15, '/compta/bank/index.php?leftmenu=accountancy', 'Bank', 0, 'banks', '$user->rights->adherent->lire', '', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4500, 'members', '', 15, '/adherents/index.php?leftmenu=export&mainmenu=members', 'Exports', 0, 'members', '$user->rights->adherent->export', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4501, 'members', '$leftmenu=="export"', 4500, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4502, 'members', '$leftmenu=="export"', 4500, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4503, 'members', '$leftmenu=="export"', 4500, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '_blank', 2, 2); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4504, 'members', '$leftmenu=="export"', 4500, '/adherents/cartes/etiquette.php?leftmenu=export', 'Etiquettes d''adh�rents', 1, 'members', '$user->rights->adherent->export', '_blank', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4600, 'members', '', 15, '/public/adherents/index.php?leftmenu=member_public', 'MemberPublicLinks', 0, 'members', '$user->rights->adherent->export', '', 2, 4); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4700, 'members', '', 15, '/adherents/index.php?leftmenu=setup&mainmenu=members', 'Setup', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4701, 'members', '', 4700, '/adherents/type.php?leftmenu=setup', 'MembersTypes', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4702, 'members', '', 4700, '/adherents/options.php?leftmenu=setup', 'MembersAttributes', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4800, 'product', '', 3, '/product/droitpret/index.php?leftmenu=droitpret', 'Droit de pr�t', 0, 'products', '$user->rights->droitpret->lire', '', 2, 5); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4801, 'product', '$leftmenu=="droitpret"', 4800, '/product/droitpret/index.php?leftmenu=droitpret', 'G�n�rer rapport', 1, 'products', '$user->rights->droitpret->creer', '', 2, 1); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4900, 'suppliers', '', 4, '/categories/index.php?leftmenu=cat&type=1', 'Categories', 0, 'categories', '$user->rights->categorie>lire', '', 2, 3); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4901, 'suppliers', '$leftmenu=="cat"', 4900, '/categories/fiche.php?action=create&type=1', 'NewCat', 1, 'categories', '$user->rights->categorie>creer', '', 2, 0); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (5000, 'commercial', '', 5, '/categories/index.php?leftmenu=cat&type=2', 'Categories', 0, 'commercial', '$user->rights->categorie>lire', '', 2, 9); -insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (5001, 'commercial', '$leftmenu=="cat"', 5000, '/categories/fiche.php?action=create&type=2', 'NewCat', 1, 'commercial', '$user->rights->categorie>creer', '', 2, 0); -update llx_menu set type='top' where level=-1; - --- --- Contenu de la table `llx_menu_constraint` --- -insert into `llx_menu_constraint` (`rowid`, `action`) values (1, '$user->admin'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (2, '$conf->societe->enabled && $user->rights->societe->lire'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (3, '$user->rights->societe->creer'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (4, 'is_dir("societe/groupe")'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (5, '$conf->societe->enabled && $conf->fournisseur->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (6, '$user->societe_id == 0'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (7, '$conf->propal->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (8, '$conf->commande->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (9, '$conf->expedition->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (10, '$conf->contrat->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (11, '$conf->fichinter->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (12, '$conf->societe->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (13, '$conf->facture->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (14, '! $conf->global->FACTURE_DISABLE_RECUR'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (15, '$conf->don->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (16, '$conf->deplacement->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (17, '$conf->tax->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (18, '($conf->compta->enabled || $conf->comptaexpert->enabled) && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $user->societe_id == 0'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (19, '$conf->compta-enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (20, '$conf->prelevement->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (21, '$conf->banque->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (22, '$conf->compta->enabled || $conf->comptaexpert->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (23, '$conf->produit->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (24, '$conf->stock->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (25, '$conf->service->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (26, '$conf->categorie->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (27, '$conf->projet->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (28, '$conf->mailing->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (29, '$conf->bookmark->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (30, '$conf->export->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (31, '$conf->adherent->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (32, '($conf->societe->enabled && $user->rights->societe->lire) || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (33, '$conf->produit->enabled || $conf->service->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (34, '$conf->fournisseur->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (35, '$conf->commercial->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (36, '$conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled\r\n || $conf->commande->enabled || $conf->facture->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (37, '$conf->mailing->enabled || $conf->export->enabled || $conf->bookmark->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (38, '$conf->boutique->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (39, '$conf->oscommerce2->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (40, '$conf->webcal->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (41, '$conf->mantis->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (42, '(dolibarr_get_const($this->db,"PRODUIT_SPECIAL_LIVRE")) && (dolibarr_get_const($this->db,"PRODUCT_CANVAS_ABILITY"))'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (43, '!((dolibarr_get_const($this->db,"PRODUIT_SPECIAL_LIVRE")) && (dolibarr_get_const($this->db,"PRODUCT_CANVAS_ABILITY")))'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (44, '$conf->droitpret->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (45, '$conf->menudb->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (46, '$conf->energie->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (47, '$conf->telephonie->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (48, '($user->admin && function_exists("eaccelerator_info"))'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (49, '$conf->import->enabled'); -insert into `llx_menu_constraint` (`rowid`, `action`) values (50, '$conf->phenix->enabled'); - --- --- Contenu de la table `llx_menu_const` --- -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (1, 100, 1, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (2, 200, 1, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (3, 300, 1, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (4, 304, 48, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (5, 501, 3, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (6, 502, 4, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (7, 504, 6, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (8, 503, 5, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (9, 504, 5, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (10, 505, 5, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (11, 500, 2, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (12, 1100, 7, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (13, 1200, 8, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (14, 1300, 9, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (15, 1400, 10, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (16, 1500, 11, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (17, 1600, 5, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (18, 1601, 6, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (19, 1603, 12, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (20, 1605, 6, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (21, 1604, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (22, 1605, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (23, 1606, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (24, 1607, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (25, 1701, 6, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (26, 1700, 12, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (27, 1705, 6, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (28, 1706, 14, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (29, 1704, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (30, 1705, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (31, 1706, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (32, 1708, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (33, 1709, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (34, 1710, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (35, 1711, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (36, 1712, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (37, 1713, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (38, 1714, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (39, 1800, 7, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (40, 1900, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (41, 1900, 8, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (42, 2000, 15, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (43, 2100, 16, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (44, 2200, 17, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (45, 2300, 18, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (46, 2400, 19, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (47, 2500, 20, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (48, 2300, 21, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (49, 2700, 22, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (50, 2800, 23, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (51, 2801, 6, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (52, 2803, 24, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (53, 2900, 25, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (54, 2901, 6, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (55, 3000, 7, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (56, 3100, 24, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (57, 3200, 26, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (58, 3201, 6, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (59, 3300, 5, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (60, 3301, 6, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (61, 3400, 13, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (62, 3401, 6, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (63, 3500, 8, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (64, 3600, 27, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (65, 3700, 27, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (66, 3800, 27, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (67, 3900, 28, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (68, 4000, 29, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (69, 4100, 30, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (70, 4130, 49, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (71, 4200, 31, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (72, 4300, 31, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (73, 4400, 31, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (74, 4500, 31, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (75, 4600, 31, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (76, 4700, 31, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (77, 4400, 21, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (78, 4501, 30, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (79, 2, 32, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (80, 3, 33, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (81, 4, 34, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (82, 5, 35, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (83, 6, 36, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (84, 7, 27, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (85, 8, 37, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (86, 9, 47, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (87, 10, 46, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (88, 11, 38, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (89, 12, 39, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (90, 13, 40, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (91, 14, 41, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (92, 15, 31, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (93, 16, 50, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (100, 1715, 13, 1); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (101, 1716, 13, 1); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (102, 1717, 13, 1); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (103, 2804, 42, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (104, 2805, 42, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (105, 2801, 43, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (106, 2802, 43, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (110, 4800, 44, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (111, 4900, 26, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (112, 4901, 6, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (113, 5000, 26, 2); -insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (114, 5001, 6, 2); - -ALTER TABLE llx_product ADD COLUMN volume float DEFAULT NULL after weight_units; -ALTER TABLE llx_product ADD COLUMN volume_units tinyint DEFAULT NULL after volume; - -ALTER TABLE llx_product modify ref varchar(32) NOT NULL; - -ALTER TABLE `llx_socpeople` CHANGE `fk_user` `fk_user_creat` INT(11) NULL; -ALTER TABLE `llx_socpeople` CHANGE `fk_user_create` `fk_user_creat` INT(11) NULL; --- V4.1 UPDATE llx_socpeople set fk_user_creat = null where llx_socpeople.fk_user_creat is not null and llx_socpeople.fk_user_creat not in (select rowid from llx_user); --- V4 ALTER TABLE llx_socpeople ADD INDEX idx_socpeople_fk_user_creat (fk_user_creat); --- V4 ALTER TABLE llx_socpeople DROP INDEX idx_fk_user_creat; --- V4 ALTER TABLE llx_socpeople ADD CONSTRAINT fk_socpeople_user_creat_user_rowid FOREIGN KEY (fk_user_creat) REFERENCES llx_user (rowid); - -ALTER TABLE llx_user add pass_temp VARCHAR(32) NULL after pass_crypted; -update llx_user set pass = null where pass = pass_crypted and length(pass) = 32; - -drop table if exists llx_soc_events; -drop table if exists llx_todocomm; -drop table if exists llx_ventes; -drop table if exists llx_pointmort; -drop table if exists llx_birthday_alert; - -ALTER TABLE llx_commande_fournisseurdet ADD total_ht double(24,8) DEFAULT 0 after subprice; -ALTER TABLE llx_commande_fournisseurdet ADD total_tva double(24,8) DEFAULT 0 after total_ht; -ALTER TABLE llx_commande_fournisseurdet ADD total_ttc double(24,8) DEFAULT 0 after total_tva; -ALTER TABLE llx_commande_fournisseurdet ADD info_bits integer DEFAULT 0 after total_ttc; - - --- Pas de limite sur nb decimal des prix dans base car definie en option --- Tous les prix doivent etre au format float(16,8) --- Tous les tx tva doivent etre au format float(6,3) -ALTER TABLE llx_product_price ADD COLUMN price_ttc double(24,8) DEFAULT 0 AFTER price; -ALTER TABLE llx_product ADD COLUMN price_ttc double(24,8) DEFAULT 0 AFTER price_base_type; - -ALTER TABLE llx_product MODIFY price double(24,8) DEFAULT 0; -ALTER TABLE llx_product MODIFY price_ttc double(24,8) DEFAULT 0; -ALTER TABLE llx_product MODIFY tva_tx double(6,3) DEFAULT 0; - -ALTER TABLE llx_product_price MODIFY price double(24,8) DEFAULT 0; -ALTER TABLE llx_product_price MODIFY price_ttc double(24,8) DEFAULT 0; -ALTER TABLE llx_product_price MODIFY tva_tx double(6,3) DEFAULT 0; - -ALTER TABLE llx_product_fournisseur_price_log MODIFY price double(24,8) DEFAULT 0; -ALTER TABLE llx_product_fournisseur_price_log MODIFY quantity double; -ALTER TABLE llx_product_fournisseur_price MODIFY price double(24,8) DEFAULT 0; -ALTER TABLE llx_product_fournisseur_price MODIFY quantity double; - - -ALTER TABLE llx_facture_fourn MODIFY amount double(24,8) DEFAULT 0 NOT NULL; -ALTER TABLE llx_facture_fourn MODIFY remise double(24,8) DEFAULT 0; -ALTER TABLE llx_facture_fourn MODIFY tva double(24,8) DEFAULT 0; -ALTER TABLE llx_facture_fourn MODIFY total double(24,8) DEFAULT 0; -ALTER TABLE llx_facture_fourn MODIFY total_ht double(24,8) DEFAULT 0; -ALTER TABLE llx_facture_fourn MODIFY total_tva double(24,8) DEFAULT 0; -ALTER TABLE llx_facture_fourn MODIFY total_ttc double(24,8) DEFAULT 0; - -ALTER TABLE llx_facture_fourn_det MODIFY pu_ht double(24,8); -ALTER TABLE llx_facture_fourn_det ADD pu_ttc double(24,8) AFTER pu_ht; -ALTER TABLE llx_facture_fourn_det MODIFY pu_ttc double(24,8); -ALTER TABLE llx_facture_fourn_det MODIFY qty smallint DEFAULT 1; -ALTER TABLE llx_facture_fourn_det MODIFY total_ht double(24,8) DEFAULT 0; -ALTER TABLE llx_facture_fourn_det MODIFY tva_taux double(24,8) DEFAULT 0; -ALTER TABLE llx_facture_fourn_det MODIFY tva double(24,8) DEFAULT 0; -ALTER TABLE llx_facture_fourn_det MODIFY total_ttc double(24,8) DEFAULT 0; - -ALTER TABLE llx_propal ADD total_ht double(24,8) DEFAULT 0 after remise; - -ALTER TABLE llx_propal MODIFY tva double(24,8) DEFAULT 0; -ALTER TABLE llx_propal MODIFY total_ht double(24,8) DEFAULT 0; -ALTER TABLE llx_propal MODIFY total double(24,8) DEFAULT 0; - -ALTER TABLE llx_propaldet MODIFY tva_tx double(6,3) DEFAULT 0; -ALTER TABLE llx_propaldet MODIFY total_ht double(24,8) DEFAULT 0; -ALTER TABLE llx_propaldet MODIFY total_tva double(24,8) DEFAULT 0; -ALTER TABLE llx_propaldet MODIFY total_ttc double(24,8) DEFAULT 0; -ALTER TABLE llx_propaldet MODIFY subprice double(24,8) DEFAULT 0; - -ALTER TABLE llx_contratdet MODIFY tva_tx double(6,3) DEFAULT 0; -ALTER TABLE llx_contratdet MODIFY subprice double(24,8) DEFAULT 0; -ALTER TABLE llx_contratdet MODIFY total_ht double(24,8) DEFAULT 0; -ALTER TABLE llx_contratdet MODIFY total_tva double(24,8) DEFAULT 0; -ALTER TABLE llx_contratdet MODIFY total_ttc double(24,8) DEFAULT 0; - -ALTER TABLE llx_commande MODIFY total_ht double(24,8) DEFAULT 0; -ALTER TABLE llx_commande MODIFY tva double(24,8) DEFAULT 0; -ALTER TABLE llx_commande MODIFY total_ttc double(24,8) DEFAULT 0; - -ALTER TABLE llx_commande_fournisseur MODIFY total_ht double(24,8) DEFAULT 0; -ALTER TABLE llx_commande_fournisseur MODIFY tva double(24,8) DEFAULT 0; -ALTER TABLE llx_commande_fournisseur MODIFY total_ttc double(24,8) DEFAULT 0; - -ALTER TABLE llx_commandedet MODIFY subprice double(24,8) DEFAULT 0; -ALTER TABLE llx_commandedet MODIFY total_tva double(24,8) DEFAULT 0; -ALTER TABLE llx_commandedet MODIFY total_ht double(24,8) DEFAULT 0; -ALTER TABLE llx_commandedet MODIFY total_ttc double(24,8) DEFAULT 0; -ALTER TABLE llx_commandedet MODIFY tva_tx double(6,3) DEFAULT 0; - -ALTER TABLE llx_commande_fournisseurdet MODIFY subprice double(24,8) DEFAULT 0; -ALTER TABLE llx_commande_fournisseurdet MODIFY total_tva double(24,8) DEFAULT 0; -ALTER TABLE llx_commande_fournisseurdet MODIFY total_ht double(24,8) DEFAULT 0; -ALTER TABLE llx_commande_fournisseurdet MODIFY total_ttc double(24,8) DEFAULT 0; -ALTER TABLE llx_commande_fournisseurdet MODIFY tva_tx double(6,3) DEFAULT 0; - -ALTER TABLE llx_societe_remise_except MODIFY amount_ht double(24,8) DEFAULT 0; -ALTER TABLE llx_societe_remise_except MODIFY amount_tva double(24,8) DEFAULT 0; -ALTER TABLE llx_societe_remise_except MODIFY amount_ttc double(24,8) DEFAULT 0; -ALTER TABLE llx_societe_remise_except MODIFY tva_tx double(6,3) DEFAULT 0; - - --- Supprimme orphelins pour permettre montee de la cle --- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; - - --- Changement de idp en rowid --- V4 ALTER TABLE llx_propal DROP FOREIGN KEY llx_propal_ibfk1; --- V4 ALTER TABLE llx_socpeople DROP FOREIGN KEY fk_socpeople_fk_soc; --- V4 ALTER TABLE llx_commande DROP FOREIGN KEY fk_commande_societe; --- V4 ALTER TABLE llx_commande_fournisseur DROP FOREIGN KEY fk_commande_fournisseur_societe; --- V4 ALTER TABLE llx_contrat DROP FOREIGN KEY fk_contrat_societe; --- V4 ALTER TABLE llx_facture DROP FOREIGN KEY fk_facture_fk_soc; --- V4 ALTER TABLE llx_facture_fourn DROP FOREIGN KEY fk_facture_fourn_fk_soc; --- V4 ALTER TABLE llx_fichinter DROP FOREIGN KEY fk_fichinter_fk_soc; --- V4 ALTER TABLE llx_osc_customer DROP FOREIGN KEY llx_osc_customer_fk_soc; --- V4 ALTER TABLE llx_propal DROP FOREIGN KEY fk_propal_fk_soc; --- V4 ALTER TABLE llx_societe_remise_except DROP FOREIGN KEY fk_societe_remise_fk_soc; --- V4 ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur_price_fk_soc; --- V4 ALTER TABLE llx_categorie_societe DROP FOREIGN KEY fk_categorie_societe_societe_rowid; - --- V4 ALTER TABLE `llx_osc_customer` DROP FOREIGN KEY llx_osc_customer_societe_idp; --- V4 ALTER TABLE `llx_osc_customer` DROP FOREIGN KEY fk_osc_customer_fk_soc; - --- V4 ALTER TABLE llx_telephonie_adsl_fournisseur DROP FOREIGN KEY fk_soc; --- V4 ALTER TABLE llx_telephonie_client_stats DROP FOREIGN KEY fk_client_comm; --- V4 ALTER TABLE llx_telephonie_contact_facture DROP FOREIGN KEY fk_contact; --- V4 ALTER TABLE llx_telephonie_societe_ligne DROP FOREIGN KEY fk_client_comm; --- V4 ALTER TABLE llx_telephonie_societe_ligne DROP FOREIGN KEY fk_soc; --- V4 ALTER TABLE llx_telephonie_societe_ligne DROP FOREIGN KEY fk_soc_facture; --- V4 ALTER TABLE llx_telephonie_tarif_client DROP FOREIGN KEY fk_client; --- V4 ALTER TABLE llx_telephonie_adsl_fournisseur DROP INDEX fk_soc_2; --- V4 ALTER TABLE llx_telephonie_commande_ligne DROP INDEX fk_ligne_2; --- V4 ALTER TABLE llx_telephonie_commande_ligne DROP INDEX fk_commande_2; --- V4 ALTER TABLE llx_telephonie_commande DROP INDEX fk_user_creat_2; --- V4 ALTER TABLE llx_telephonie_commande DROP INDEX fk_fournisseur_2; --- V4 ALTER TABLE llx_telephonie_contact_facture DROP INDEX fk_contact_2; --- V4 ALTER TABLE llx_telephonie_contact_facture DROP INDEX fk_contact_3; --- V4 ALTER TABLE llx_telephonie_contact_facture DROP INDEX fk_ligne_2; --- V4 ALTER TABLE llx_telephonie_contact_facture DROP INDEX fk_ligne_3; - -ALTER TABLE `llx_societe` CHANGE `idp` `rowid` integer AUTO_INCREMENT; -ALTER TABLE `llx_socpeople` CHANGE `idp` `rowid` integer AUTO_INCREMENT; - -ALTER TABLE `llx_osc_customer` CHANGE `osc_custid` `rowid` integer NOT NULL default 0; -ALTER TABLE `llx_osc_customer` CHANGE `osc_lastmodif` `datem` datetime default NULL; -ALTER TABLE `llx_osc_customer` CHANGE `doli_socidp` `fk_soc` integer NOT NULL default '0'; -ALTER TABLE `llx_osc_customer` ADD PRIMARY KEY (rowid); -ALTER TABLE `llx_osc_customer` ADD UNIQUE KEY `fk_soc` (`fk_soc`); -ALTER TABLE `llx_osc_order` CHANGE `osc_orderid` `rowid` integer NOT NULL default 0; -ALTER TABLE `llx_osc_order` CHANGE `osc_lastmodif` `datem` datetime default NULL; -ALTER TABLE `llx_osc_order` CHANGE `doli_orderidp` `fk_commande` integer NOT NULL default 0; -ALTER TABLE `llx_osc_order` ADD PRIMARY KEY (rowid); -ALTER TABLE `llx_osc_order` ADD UNIQUE KEY `fk_commande` (`fk_commande`); -ALTER TABLE `llx_osc_product` CHANGE `osc_prodid` `rowid` integer NOT NULL default 0; -ALTER TABLE `llx_osc_product` CHANGE `osc_lastmodif` `datem` datetime default NULL; -ALTER TABLE `llx_osc_product` CHANGE `doli_prodidp` `fk_product` integer NOT NULL default 0; -ALTER TABLE `llx_osc_product` ADD PRIMARY KEY (rowid); -ALTER TABLE `llx_osc_product` ADD UNIQUE KEY `fk_product` (`fk_product`); - --- V4 ALTER TABLE llx_socpeople ADD CONSTRAINT fk_socpeople_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); --- V4 ALTER TABLE llx_commande ADD CONSTRAINT fk_commande_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); --- V4 ALTER TABLE llx_commande_fournisseur ADD CONSTRAINT fk_commande_fournisseur_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); --- V4 ALTER TABLE llx_contrat ADD CONSTRAINT fk_contrat_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); --- V4 ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); --- V4 ALTER TABLE llx_facture_fourn ADD CONSTRAINT fk_facture_fourn_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); --- V4 ALTER TABLE llx_fichinter ADD CONSTRAINT fk_fichinter_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); --- V4 ALTER TABLE llx_propal ADD CONSTRAINT fk_propal_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); --- V4 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); --- V4 ALTER TABLE llx_categorie_societe ADD CONSTRAINT fk_categorie_societe_fk_soc FOREIGN KEY (fk_societe) REFERENCES llx_societe (rowid); - --- V4 ALTER TABLE llx_osc_customer ADD CONSTRAINT fk_osc_customer_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); - --- V4 ALTER TABLE llx_telephonie_adsl_fournisseur ADD CONSTRAINT fk_telephonie_adsl_fournisseur_societe FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); --- V4 ALTER TABLE llx_telephonie_client_stats ADD CONSTRAINT fk_telephonie_client_stats_societe FOREIGN KEY (fk_client_comm) REFERENCES llx_societe(rowid); --- V4 ALTER TABLE llx_telephonie_contact_facture ADD CONSTRAINT fk_telephonie_contact_facture_contact FOREIGN KEY (fk_contact) REFERENCES llx_socpeople (rowid); --- V4 ALTER TABLE llx_telephonie_contact_facture ADD CONSTRAINT fk_telephonie_contact_facture_ligne FOREIGN KEY (fk_ligne) REFERENCES llx_telephonie_societe_ligne (rowid); --- V4 ALTER TABLE llx_telephonie_societe_ligne ADD CONSTRAINT llx_telephonie_societe_ligne_client_comm FOREIGN KEY (fk_client_comm) REFERENCES llx_societe(rowid); --- V4 ALTER TABLE llx_telephonie_societe_ligne ADD CONSTRAINT llx_telephonie_societe_ligne_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe(rowid); --- V4 ALTER TABLE llx_telephonie_societe_ligne ADD CONSTRAINT llx_telephonie_societe_ligne_soc_facture FOREIGN KEY (fk_soc_facture) REFERENCES llx_societe(rowid); --- V4 ALTER TABLE llx_telephonie_tarif_client ADD CONSTRAINT llx_telephonie_tarif_client_client FOREIGN KEY (fk_client) REFERENCES llx_societe (rowid); --- fin du changement idp en rowid - -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (120, 'fichinter','internal', 'INTERREPFOLL', 'Responsable suivi de l\'intervention', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (121, 'fichinter','internal', 'INTERVENING', 'Intervenant', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (130, 'fichinter','external', 'BILLING', 'Contact client facturation intervention', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (131, 'fichinter','external', 'CUSTOMER', 'Contact client suivi de l\'intervention', 1); - -ALTER TABLE llx_fichinter CHANGE note description text DEFAULT NULL; -ALTER TABLE llx_fichinter ADD COLUMN note_private text DEFAULT NULL after description; -ALTER TABLE llx_fichinter ADD COLUMN note_public text DEFAULT NULL after note_private; -ALTER TABLE llx_fichinter ADD COLUMN tms timestamp after ref; -ALTER TABLE llx_fichinter ADD COLUMN fk_contrat integer DEFAULT 0 after fk_projet; - -drop table if exists `llx_accountingsystem_det`; - - -update llx_bank set label='(InitialBankBalance)' where fk_type='SOLD' and label in ('Balance','(Balance)','Solde','(Solde)'); - -alter table llx_product_fournisseur_price add unitprice double(24,8); -alter table llx_product_fournisseur_price MODIFY unitprice double(24,8); -update llx_product_fournisseur_price set unitprice = ROUND(price/quantity,8) where unitprice IS NULL; - -update llx_fichinter set tms=datec where tms < datec; -update llx_fichinter set tms=date_valid where tms < date_valid; - -ALTER TABLE llx_commande_fournisseur DROP INDEX ref; -ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc); - -create table llx_c_ecotaxe -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - code varchar(64) UNIQUE NOT NULL, - libelle varchar(255), - price double(24,8), - organization varchar(255), - fk_pays integer NOT NULL, - active tinyint DEFAULT 1 NOT NULL -)ENGINE=innodb; - -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (1, 'ER-A-A', 'Mat�riels �lectriques < 0,2kg', 0.01000000, 'ERP', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (2, 'ER-A-B', 'Mat�riels �lectriques >= 0,2 kg et < 0,5 kg', 0.03000000, 'ERP', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (3, 'ER-A-C', 'Mat�riels �lectriques >= 0,5 kg et < 1 kg', 0.04000000, 'ERP', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (4, 'ER-A-D', 'Mat�riels �lectriques >= 1 kg et < 2 kg', 0.13000000, 'ERP', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (5, 'ER-A-E', 'Mat�riels �lectriques >= 2 kg et < 4kg', 0.21000000, 'ERP', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (6, 'ER-A-F', 'Mat�riels �lectriques >= 4 kg et < 8 kg', 0.42000000, 'ERP', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (7, 'ER-A-G', 'Mat�riels �lectriques >= 8 kg et < 15 kg', 0.84000000, 'ERP', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (8, 'ER-A-H', 'Mat�riels �lectriques >= 15 kg et < 20 kg', 1.25000000, 'ERP', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (9, 'ER-A-I', 'Mat�riels �lectriques >= 20 kg et < 30 kg', 1.88000000, 'ERP', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (10, 'ER-A-J', 'Mat�riels �lectriques >= 30 kg', 3.34000000, 'ERP', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (11, 'ER-M-1', 'TV, Moniteurs < 9kg', 0.84000000, 'ERP', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (12, 'ER-M-2', 'TV, Moniteurs >= 9kg et < 15kg', 1.67000000, 'ERP', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (13, 'ER-M-3', 'TV, Moniteurs >= 15kg et < 30kg', 3.34000000, 'ERP', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (14, 'ER-M-4', 'TV, Moniteurs >= 30 kg', 6.69000000, 'ERP', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (15, 'EC-A-A', 'Mat�riels �lectriques 0,2 kg max', 0.00840000, 'Ecologic', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (16, 'EC-A-B', 'Mat�riels �lectriques 0,21 kg min - 0,50 kg max', 0.02500000, 'Ecologic', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (17, 'EC-A-C', 'Mat�riels �lectriques 0,51 kg min - 1 kg max', 0.04000000, 'Ecologic', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (18, 'EC-A-D', 'Mat�riels �lectriques 1,01 kg min - 2,5 kg max', 0.13000000, 'Ecologic', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (19, 'EC-A-E', 'Mat�riels �lectriques 2,51 kg min - 4 kg max', 0.21000000, 'Ecologic', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (20, 'EC-A-F', 'Mat�riels �lectriques 4,01 kg min - 8 kg max', 0.42000000, 'Ecologic', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (21, 'EC-A-G', 'Mat�riels �lectriques 8,01 kg min - 12 kg max', 0.63000000, 'Ecologic', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (22, 'EC-A-H', 'Mat�riels �lectriques 12,01 kg min - 20 kg max', 1.05000000, 'Ecologic', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (23, 'EC-A-I', 'Mat�riels �lectriques 20,01 kg min', 1.88000000, 'Ecologic', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (24, 'EC-M-1', 'TV, Moniteurs 9 kg max', 0.84000000, 'Ecologic', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (25, 'EC-M-2', 'TV, Moniteurs 9,01 kg min - 18 kg max', 1.67000000, 'Ecologic', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (26, 'EC-M-3', 'TV, Moniteurs 18,01 kg min - 36 kg max', 3.34000000, 'Ecologic', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (27, 'EC-M-4', 'TV, Moniteurs 36,01 kg min', 6.69000000, 'Ecologic', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (28, 'ES-M-1', 'TV, Moniteurs <= 20 pouces', 0.84000000, 'Eco-syst�mes', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (29, 'ES-M-2', 'TV, Moniteurs > 20 pouces et <= 32 pouces', 3.34000000, 'Eco-syst�mes', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (30, 'ES-M-3', 'TV, Moniteurs > 32 pouces et autres grands �crans', 6.69000000, 'Eco-syst�mes', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (31, 'ES-A-A', 'Ordinateur fixe, Audio home systems (HIFI), �l�ments hifi s�par�s...', 0.84000000, 'Eco-syst�mes', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (32, 'ES-A-B', 'Ordinateur portable, CD-RCR, VCR, lecteurs et enregistreurs DVD... Instruments de musique et caisses de r�sonance, haut parleurs...', 0.25000000, 'Eco-syst�mes', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (33, 'ES-A-C', 'Imprimante, photocopieur, t�l�copieur,...', 0.42000000, 'Eco-syst�mes', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (34, 'ES-A-D', 'Accessoires, clavier, souris, PDA, imprimante photo, appareil photo, gps, t�l�phone, r�pondeur, t�l�phone sans fil, modem,... T�l�commande, casque, cam�scope, baladeur mp3, radio portable, radio K7 et CD portable, set top box, radio r�veil,...', 0.08400000, 'Eco-syst�mes', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (35, 'ES-A-E', 'GSM', 0.00840000, 'Eco-syst�mes', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (36, 'ES-A-F', 'Jouets et �quipements de loisirs et de sports < 0,5 kg', 0.04200000, 'Eco-syst�mes', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (37, 'ES-A-G', 'Jouets et �quipements de loisirs et de sports > 0,5 kg', 0.17000000, 'Eco-syst�mes', 1, 1); -INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (38, 'ES-A-H', 'Jouets et �quipements de loisirs et de sports > 10 kg', 1.25000000, 'Eco-syst�mes', 1, 1); - -ALTER TABLE llx_commandedet CHANGE coef marge_tx double(6,3) DEFAULT 0; -ALTER TABLE llx_commandedet ADD COLUMN marge_tx double(6,3) DEFAULT 0; -ALTER TABLE llx_commandedet ADD COLUMN marque_tx double(6,3) DEFAULT 0 after marge_tx; -ALTER TABLE llx_commandedet MODIFY marge_tx double(6,3) DEFAULT 0; -ALTER TABLE llx_commandedet MODIFY marque_tx double(6,3) DEFAULT 0; - -ALTER TABLE llx_propaldet CHANGE coef marge_tx double(6,3) DEFAULT 0; -ALTER TABLE llx_propaldet ADD COLUMN marge_tx double(6,3) DEFAULT 0; -ALTER TABLE llx_propaldet ADD COLUMN marque_tx double(6,3) DEFAULT 0 after marge_tx; -ALTER TABLE llx_propaldet MODIFY marge_tx double(6,3) DEFAULT 0; -ALTER TABLE llx_propaldet MODIFY marque_tx double(6,3) DEFAULT 0; - --- Nouveau mode de stockage de l'ordre des box (X99 ou X = colonne et 99 position dans colonne) -alter table llx_boxes modify box_order varchar(3) NOT NULL; --- V4.1 update llx_boxes set box_order = concat('A0',box_order) where length(box_order) = 1 and substring(box_order,-1) in ('1','3','5','7','9'); --- V4.1 update llx_boxes set box_order = concat('B0',box_order) where length(box_order) = 1 and substring(box_order,-1) in ('0','2','4','6','8'); --- V4.1 update llx_boxes set box_order = concat('A',box_order) where length(box_order) = 2 and substring(box_order,-1) in ('1','3','5','7','9'); --- V4.1 update llx_boxes set box_order = concat('B',box_order) where length(box_order) = 2 and substring(box_order,-1) in ('0','2','4','6','8'); - -create table llx_fichinterdet -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_fichinter integer, - date date, - description text, - duree integer, - rang integer DEFAULT 0 -)ENGINE=innodb; - -ALTER TABLE llx_fichinter ADD COLUMN model_pdf varchar(50) after note_public; - -ALTER TABLE llx_bordereau_cheque MODIFY number varchar(16) NOT NULL; -ALTER TABLE llx_bordereau_cheque MODIFY amount double(24,8) NOT NULL; -ALTER TABLE llx_bordereau_cheque MODIFY nbcheque smallint NOT NULL; -ALTER TABLE llx_bordereau_cheque MODIFY statut smallint(1) NOT NULL DEFAULT 0; - -ALTER TABLE llx_facturedet ADD COLUMN special_code tinyint(4) unsigned default 0; -ALTER TABLE llx_facturedet MODIFY special_code tinyint(4) unsigned default 0; - -ALTER TABLE llx_commandedet MODIFY special_code tinyint(4) unsigned default 0; - -ALTER TABLE llx_propaldet ADD COLUMN special_code tinyint(4) unsigned default 0 after marque_tx; -ALTER TABLE llx_propaldet ADD COLUMN pa_ht double(24,8) DEFAULT 0 after info_bits; -ALTER TABLE llx_propaldet MODIFY pa_ht double(24,8) DEFAULT 0; - -ALTER TABLE llx_bank MODIFY amount double(24,8) DEFAULT 0; - - --- Nouveau fonctionnement de la table llx_product_fournisseur_price --- V4 ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur_price_fk_user; --- V4 ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur_price_fk_soc; --- V4 ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur_price_fk_product; -ALTER TABLE llx_product_fournisseur_price DROP INDEX idx_product_fournisseur_price_fk_user; -ALTER TABLE llx_product_fournisseur_price DROP INDEX idx_product_fournisseur_price_fk_soc; -ALTER TABLE llx_product_fournisseur_price DROP INDEX idx_product_fournisseur_price_fk_product; -ALTER TABLE llx_product_fournisseur_price DROP COLUMN ref_fourn; --- V4.1 UPDATE llx_product_fournisseur_price as pfp SET pfp.fk_product = (SELECT pf.rowid FROM llx_product_fournisseur AS pf WHERE pfp.fk_product = pf.fk_product AND pfp.fk_soc = pf.fk_soc); -ALTER TABLE llx_product_fournisseur_price DROP COLUMN fk_soc; -ALTER TABLE llx_product_fournisseur_price CHANGE fk_product fk_product_fournisseur integer NOT NULL; -ALTER TABLE llx_product_fournisseur_price ADD INDEX idx_product_fournisseur_price_fk_user (fk_user); -ALTER TABLE llx_product_fournisseur_price ADD INDEX idx_product_fournisseur_price_fk_product_fournisseur (fk_product_fournisseur); --- V4 ALTER TABLE llx_product_fournisseur_price ADD CONSTRAINT fk_product_fournisseur_price_fk_user FOREIGN KEY (fk_user) REFERENCES llx_user (rowid); --- V4 ALTER TABLE llx_product_fournisseur_price ADD CONSTRAINT fk_product_fournisseur_price_fk_product_fournisseur FOREIGN KEY (fk_product_fournisseur) REFERENCES llx_product_fournisseur (rowid); - --- Nouveau fonctionnement de la table llx_product_fournisseur_price_log --- V4.1 UPDATE llx_product_fournisseur_price_log as pfpl SET pfpl.fk_product = (SELECT pf.rowid FROM llx_product_fournisseur AS pf WHERE pfpl.fk_product = pf.fk_product AND pfpl.fk_soc = pf.fk_soc); -ALTER TABLE llx_product_fournisseur_price_log DROP COLUMN fk_soc; -ALTER TABLE llx_product_fournisseur_price_log CHANGE fk_product fk_product_fournisseur integer NOT NULL; - -ALTER TABLE llx_commande_fournisseurdet MODIFY fk_commande integer NOT NULL; - -ALTER TABLE llx_product ADD COLUMN partnumber varchar(32) after gencode; - -ALTER TABLE llx_element_contact ADD INDEX idx_element_contact_fk_socpeople (fk_socpeople); - --- Supprimme orphelins pour permettre montee de la cle --- V4 DELETE llx_fichinter FROM llx_fichinter LEFT JOIN llx_societe ON llx_fichinter.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL; - - - -ALTER TABLE llx_societe ADD COLUMN supplier_account varchar(32) after fournisseur; - -drop table if exists llx_c_barcode; - -create table llx_c_barcode_type -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - code varchar(16) NOT NULL, - libelle varchar(50) NOT NULL, - coder integer NOT NULL DEFAULT 0, - example varchar(16) NOT NULL -)ENGINE=innodb; - -INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (1, 'EAN8', 'EAN8', 0, '1234567'); -INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (2, 'EAN13', 'EAN13', 0, '123456789012'); -INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (3, 'UPC', 'UPC', 0, '123456789012'); -INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (4, 'ISBN', 'ISBN', 0, '123456789'); -INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (5, 'C39', 'Code 39', 0, '1234567890'); -INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (6, 'C128', 'Code 128', 0, 'ABCD1234567890'); - -ALTER TABLE llx_product CHANGE gencode barcode varchar(255) DEFAULT NULL; -ALTER TABLE llx_product ADD COLUMN fk_barcode_type integer DEFAULT 0 after barcode; - -create table llx_c_paper_format -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - code varchar(16) NOT NULL, - label varchar(50) NOT NULL, - width float(6,2) DEFAULT 0, - height float(6,2) DEFAULT 0, - unit enum('mm','cm','point','inch') NOT NULL, - active tinyint DEFAULT 1 NOT NULL -)ENGINE=innodb; - -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (1, '4A0', 'Format 4A0', '1682', '2378', 'mm', 1); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (2, '2A0', 'Format 2A0', '1189', '1682', 'mm', 1); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (3, 'A0', 'Format A0', '840', '1189', 'mm', 1); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (4, 'A1', 'Format A1', '594', '840', 'mm', 1); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (5, 'A2', 'Format A2', '420', '594', 'mm', 1); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (6, 'A3', 'Format A3', '297', '420', 'mm', 1); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (7, 'A4', 'Format A4', '210', '297', 'mm', 1); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (8, 'A5', 'Format A5', '148', '210', 'mm', 1); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (9, 'A6', 'Format A6', '105', '148', 'mm', 1); - -ALTER TABLE llx_user ADD COLUMN phenix_login varchar(25) after webcal_login; -ALTER TABLE llx_user ADD COLUMN phenix_pass varchar(128) after phenix_login; - -update llx_propal set total_ht = price where total_ht = 0 and total > 0; -update llx_propal set date_livraison = NULL where date_livraison = '1970-01-01 00:00:00'; - -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (102,'commande','external', 'SHIPPING', 'Contact client livraison commande', 1); - --- Uniformisation du nom. Rem: Cette table n'est pas utilise en lecture a ce jour -drop table llx_socstatutlog; -create table llx_societe_log -( - id integer AUTO_INCREMENT PRIMARY KEY, - datel datetime, - fk_soc integer, - fk_statut integer, - fk_user integer, - author varchar(30), - label varchar(128) -)ENGINE=innodb; - - --- Pour la Tunisie (Formes les plus utilisees) -insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1000','Société à responsabilité limitée SARL'); -insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1001','Société en Nom Collectif'); -insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1002','Société en Commandite Simple'); -insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1003','société en participation'); -insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1004','Société Anonyme SA'); -insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1005','Société Unipersonnelle à Responsabilité Limitée SUARL'); -insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1006','Groupement d\'intérêt économique GEI'); -insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1007','Groupe de sociétés'); - --- Regions de Tunisie (id pays=10) -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1001,10,1001, '',0,'Ariana'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1002,10,1002, '',0,'Béja'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1003,10,1003, '',0,'Ben Arous'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1004,10,1004, '',0,'Bizerte'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1005,10,1005, '',0,'Gabès'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1006,10,1006, '',0,'Gafsa'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1007,10,1007, '',0,'Jendouba'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1008,10,1008, '',0,'Kairouan'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1009,10,1009, '',0,'Kasserine'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1010,10,1010, '',0,'Kèbili'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1011,10,1011, '',0,'La Manouba'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1012,10,1012, '',0,'Le Kef'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1013,10,1013, '',0,'Mahdia'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1014,10,1014, '',0,'Médenine'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1015,10,1015, '',0,'Monastir'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1016,10,1016, '',0,'Nabeul'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1017,10,1017, '',0,'Sfax'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1018,10,1018, '',0,'Sidi Bouzid'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1019,10,1019, '',0,'Siliana'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1020,10,1020, '',0,'Sousse'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1021,10,1021, '',0,'Tataouine'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1022,10,1022, '',0,'Tozeur'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1023,10,1023, '',0,'Tunis'); -insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1024,10,1024, '',0,'Zaghouan'); - --- TUNISIE (id 10) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (101,10, '6','0','TVA 6%',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (102,10, '12','0','TVA 12%',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (103,10, '18','0','VAT 18%',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (104,10, '7.5','0','TVA 6% Majoré à 25% (7.5%)',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (105,10, '15','0','TVA 12% Majoré à 25% (15%)',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (106,10, '22.5','0','VAT 18% Majoré à 25% (22.5%)',1); - --- GUADELOUPE (id 105) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 111, 105, '8.5','0','VAT Rate 8.5',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 112, 105, '8.5','1','VAT Rate 8.5 non perçu par le vendeur mais récupérable par l\'acheteur',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 113, 105, '0','0','VAT Rate 0 ou non applicable',1); - --- MARTINIQUE (id 150) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 121, 150, '8.5','0','VAT Rate 8.5',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 122, 150, '8.5','1','VAT Rate 8.5 non perçu par le vendeur mais récupérable par l\'acheteur',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 123, 150, '0','0','VAT Rate 0 ou non applicable',1); - --- REUNION (id 187) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 131, 187, '8.5','0','VAT Rate 8.5',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 132, 187, '8.5','1','VAT Rate 8.5 non perçu par le vendeur mais récupérable par l\'acheteur',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 133, 187, '0','0','VAT Rate 0 ou non applicable',1); - -ALTER TABLE llx_bank_account MODIFY iban_prefix varchar(50); -ALTER TABLE llx_bank_account ADD COLUMN country_iban varchar(2) after iban_prefix; -ALTER TABLE llx_bank_account ADD COLUMN cle_iban varchar(2) after country_iban; - - --- Mise a jour des pays -update llx_c_pays set libelle = 'Palaos' where rowid = 176 and code = 'PW' and libelle = 'Belau'; -update llx_c_pays set libelle = 'Serbie' where rowid = 198 and code = 'CS'; -update llx_c_pays set code = 'RS' where rowid = 198 and code = 'CS'; -insert into llx_c_pays (rowid,code,libelle) values (241, 'GG', 'Guernesey' ); -insert into llx_c_pays (rowid,code,libelle) values (242, 'IM', 'Ile de Man' ); -insert into llx_c_pays (rowid,code,libelle) values (243, 'JE', 'Jersey' ); -insert into llx_c_pays (rowid,code,libelle) values (244, 'ME', 'Monténégro' ); -insert into llx_c_pays (rowid,code,libelle) values (245, 'BL', 'Saint-Barthélemy'); -insert into llx_c_pays (rowid,code,libelle) values (246, 'MF', 'Saint-Martin' ); - - -ALTER TABLE llx_boxes ADD UNIQUE INDEX uk_boxes (box_id, position, fk_user); - --- Nettoyage vieux enregistrement detail pourris -delete from llx_facturedet where price = 0 and subprice = 0 and remise_percent = 0 and total_ttc = 0 and total_ht = 0; - - --- Drop constraints to allow rename -ALTER TABLE llx_societe_remise_except drop foreign key fk_societe_remise_fk_facture; -ALTER TABLE llx_societe_remise_except drop index idx_societe_remise_except_fk_facture; - --- Rename field -ALTER TABLE llx_societe_remise_except change fk_facture fk_facture_line integer; -ALTER TABLE llx_societe_remise_except add fk_facture integer after fk_facture_line; - --- Create constraints -ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture_line (fk_facture_line); -ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture (fk_facture); -ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture_line FOREIGN KEY (fk_facture_line) REFERENCES llx_facturedet (rowid); -ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid); - --- Corrige statut des avoirs qui ont ete transforme en reduc et pour lesquels la reduc a ete ensuite supprimee --- V4.1 update llx_facture set paye=0, fk_statut=1 where paye=1 and type=2 and rowid not in (select fk_facture_source from llx_societe_remise_except); - --- Corrige avoirs affectes en ligne a affectation sur facture. On met total a null pour permettre recalcul par upgrade2 --- V4.1 update llx_facture set total_ttc = NULL where rowid in (select fk_facture from llx_facturedet where description = '(CREDIT_NOTE)'); --- V4.1 update llx_societe_remise_except as re set re.fk_facture = (select fk_facture from llx_facturedet as fd where fd.rowid = re.fk_facture_line), re.fk_facture_line = NULL where re.fk_facture_line in (select rowid from llx_facturedet where description = '(CREDIT_NOTE)'); --- V4.1 delete from llx_facturedet where description = '(CREDIT_NOTE)'; - -update llx_facture set close_code = 'discount_vat' where close_code = 'escompte'; - -ALTER TABLE llx_commande_fournisseurdet MODIFY fk_product integer; - --- Le prix d'un produit ne doit pas avoir la valeur NULL -UPDATE llx_product SET price = 0 WHERE price is NULL; -UPDATE llx_product SET price_ttc = 0 WHERE price_ttc is NULL; - - --- Not used. Just to be compatible with upgrade process of higher versions -alter table llx_const add column entity integer DEFAULT 1 NOT NULL; --- Not used. Just to be compatible with 2.7 upgrade process or higher -alter table llx_menu add column enabled varchar(255) NULL default '1'; diff --git a/htdocs/install/mysql/migration/2.2.0-2.4.0.sql b/htdocs/install/mysql/migration/2.2.0-2.4.0.sql deleted file mode 100644 index 372131e331c..00000000000 --- a/htdocs/install/mysql/migration/2.2.0-2.4.0.sql +++ /dev/null @@ -1,351 +0,0 @@ --- --- Attention a l ordre des requetes. --- Ce fichier doit etre charge sur une version 2.2.0 --- - -DROP TABLE llx_facture_tva_sum; -DROP TABLE llx_c_ape; - -delete from llx_const where name='MAIN_GRAPH_LIBRARY' and (value like 'phplot%' or value like 'artichow%'); - -ALTER TABLE llx_societe_adresse_livraison ADD COLUMN tel varchar(20) after fk_pays; -ALTER TABLE llx_societe_adresse_livraison ADD COLUMN fax varchar(20) after tel; - -RENAME TABLE llx_c_barcode TO llx_c_barcode_type; - -alter table llx_c_barcode_type modify coder varchar(16) NOT NULL; -update llx_c_barcode_type set coder = 0 where coder in (1,2); - -update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_ALL' and value='MAIN_FORCE_SETLOCALE_LC_ALL'; -update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_MONETARY' and value='MAIN_FORCE_SETLOCALE_LC_MONETARY'; -update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_NUMERIC' and value='MAIN_FORCE_SETLOCALE_LC_NUMERIC'; -update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_TIME' and value='MAIN_FORCE_SETLOCALE_LC_TIME'; - --- remove old deprecated options -update llx_const set name='SOCIETE_CODECLIENT_ADDON' where name='CODECLIENT_ADDON'; -update llx_const set name='SOCIETE_CODEFOURNISSEUR_ADDON' where name='CODEFOURNISSEUR_ADDON'; -delete from llx_const where name='CODECLIENT_ADDON'; -delete from llx_const where name='CODEFOURNISSEUR_ADDON'; - -alter table llx_const add tms timestamp; -update llx_const set tms=sysdate() where tms is null; -update llx_const set tms=sysdate() where tms <= 0; - - -alter table llx_document_model modify type varchar(20) NOT NULL; - -DELETE FROM llx_rights_def WHERE module = 'menudb'; - -ALTER table llx_boxes_def drop column name; -ALTER table llx_boxes_def add column tms timestamp; - --- Rename primary key of llx_menu -ALTER TABLE llx_menu_const drop foreign key fk_menu_const_fk_menu; -alter table llx_menu drop primary key; -alter table llx_menu modify rowid integer AUTO_INCREMENT NOT NULL PRIMARY KEY; -ALTER TABLE llx_menu_const ADD CONSTRAINT fk_menu_const_fk_menu FOREIGN KEY (fk_menu) REFERENCES llx_menu (rowid); - -alter table llx_menu modify user integer NOT NULL default '0'; -alter table llx_menu change `order` position integer NOT NULL; -alter table llx_menu change `right` perms varchar(255); -alter table llx_menu add column module varchar(64) after menu_handler; -alter table llx_menu add column tms timestamp; - --- Add a unique key -update llx_menu set url='/comm/prospect/prospects.php?leftmenu=prospects' where rowid=702 and url='/contact/index.php?leftmenu=prospects&type=p'; -ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, url); - --- Drop unused table -drop table if exists llx_so_gr; - --- Modification expedition -create table llx_co_exp -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_commande integer NOT NULL, - fk_expedition integer NOT NULL, - - key(fk_commande), - key(fk_expedition) -)ENGINE=innodb; - --- V4 ALTER TABLE llx_expedition DROP INDEX fk_expedition_methode; --- V4 ALTER TABLE llx_expedition DROP INDEX fk_commande; --- V4 ALTER TABLE llx_expedition DROP INDEX ref; --- V4 ALTER TABLE llx_expeditiondet DROP INDEX fk_expedition; --- V4 ALTER TABLE llx_expeditiondet DROP INDEX fk_commande_ligne; - --- V4.1 update llx_commande set fk_adresse_livraison = null where fk_adresse_livraison is not null and fk_adresse_livraison not in (select rowid from llx_societe_adresse_livraison); --- V4.1 delete from llx_expeditiondet where fk_expedition not in (select rowid from llx_expedition); --- V4.1 delete from llx_livraisondet where fk_livraison not in (select rowid from llx_livraison); - -alter table llx_expedition add column fk_soc integer NOT NULL after ref; -alter table llx_expedition add column fk_adresse_livraison integer DEFAULT NULL after date_expedition; --- V4.1 UPDATE llx_expedition as e SET e.fk_soc = (SELECT c.fk_soc FROM llx_commande AS c WHERE e.fk_commande = c.rowid); --- V4.1 UPDATE llx_expedition as e SET e.fk_adresse_livraison = (SELECT c.fk_adresse_livraison FROM llx_commande AS c WHERE e.fk_commande = c.rowid); -update llx_expedition set fk_adresse_livraison=NULL where fk_adresse_livraison = 0; - -ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_soc (fk_soc); -ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_user_author (fk_user_author); -ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_user_valid (fk_user_valid); -ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_adresse_livraison (fk_adresse_livraison); -ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_expedition_methode (fk_expedition_methode); --- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); --- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_author FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid); --- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_valid FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid); --- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_adresse_livraison FOREIGN KEY (fk_adresse_livraison) REFERENCES llx_societe_adresse_livraison (rowid); --- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_expedition_methode FOREIGN KEY (fk_expedition_methode) REFERENCES llx_expedition_methode (rowid); -ALTER TABLE llx_expedition ADD UNIQUE INDEX idx_expedition_uk_ref (ref); - -ALTER TABLE llx_expeditiondet CHANGE fk_commande_ligne fk_origin_line integer; -ALTER TABLE llx_expeditiondet ADD COLUMN fk_entrepot integer after fk_origin_line; -ALTER TABLE llx_expeditiondet ADD COLUMN rang integer DEFAULT 0 after qty; --- V4.1 UPDATE llx_expeditiondet as ed SET ed.fk_entrepot = (SELECT e.fk_entrepot FROM llx_expedition AS e WHERE ed.fk_expedition = e.rowid); -ALTER TABLE llx_expedition DROP COLUMN fk_entrepot; - -ALTER TABLE llx_expeditiondet ADD INDEX idx_expeditiondet_fk_expedition (fk_expedition); -ALTER TABLE llx_expeditiondet ADD INDEX idx_expeditiondet_fk_entrepot (fk_entrepot); --- V4 ALTER TABLE llx_expeditiondet ADD CONSTRAINT fk_expeditiondet_fk_expedition FOREIGN KEY (fk_expedition) REFERENCES llx_expedition (rowid); --- V4 ALTER TABLE llx_expeditiondet ADD CONSTRAINT fk_expeditiondet_fk_entrepot FOREIGN KEY (fk_entrepot) REFERENCES llx_entrepot (rowid); - --- Modification livraison -create table llx_co_liv -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_commande integer NOT NULL, - fk_livraison integer NOT NULL, - - key(fk_commande), - key(fk_livraison) -)ENGINE=innodb; - --- V4 ALTER TABLE llx_livraison DROP INDEX fk_commande; --- V4 ALTER TABLE llx_livraison DROP INDEX ref; --- V4 ALTER TABLE llx_livraisondet DROP INDEX fk_livraison; --- V4 ALTER TABLE llx_livraisondet DROP INDEX fk_commande_ligne; -ALTER TABLE llx_livraison DROP COLUMN total_ttc; - -ALTER TABLE llx_livraison add column total_ht double(24,8) DEFAULT 0; -ALTER TABLE llx_livraison MODIFY total_ht double(24,8) DEFAULT 0; -ALTER TABLE llx_livraison MODIFY fk_adresse_livraison integer DEFAULT NULL; -alter table llx_livraison add column ref_client varchar(30) after ref; -alter table llx_livraison add column fk_soc integer NOT NULL after ref_client; -UPDATE llx_livraison SET fk_adresse_livraison = NULL WHERE fk_adresse_livraison = 0; --- V4.1 UPDATE llx_livraison as l SET l.fk_soc = (SELECT c.fk_soc FROM llx_commande AS c WHERE l.fk_commande = c.rowid); - -ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_soc (fk_soc); -ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_user_author (fk_user_author); -ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_user_valid (fk_user_valid); -ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_adresse_livraison (fk_adresse_livraison); --- V4 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); --- V4 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_user_author FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid); --- V4 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_user_valid FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid); --- V4 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_adresse_livraison FOREIGN KEY (fk_adresse_livraison) REFERENCES llx_societe_adresse_livraison (rowid); -ALTER TABLE llx_livraison ADD UNIQUE INDEX idx_livraison_uk_ref (ref); - -alter table llx_livraisondet add column fk_product integer after fk_livraison; -alter table llx_livraisondet add column description text after fk_product; -alter table llx_livraisondet add column subprice double(24,8) DEFAULT 0 after qty; -alter table llx_livraisondet add column total_ht double(24,8) DEFAULT 0 after subprice; -alter table llx_livraisondet add column rang integer DEFAULT 0 after total_ht; - -ALTER TABLE llx_livraisondet ADD INDEX idx_livraisondet_fk_expedition (fk_livraison); --- V4 ALTER TABLE llx_livraisondet ADD CONSTRAINT fk_livraisondet_fk_livraison FOREIGN KEY (fk_livraison) REFERENCES llx_livraison (rowid); - -create table llx_pr_exp -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_propal integer NOT NULL, - fk_expedition integer NOT NULL, - - key(fk_propal), - key(fk_expedition) -)ENGINE=innodb; - -create table llx_pr_liv -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_propal integer NOT NULL, - fk_livraison integer NOT NULL, - - key(fk_propal), - key(fk_livraison) -)ENGINE=innodb; - -ALTER TABLE llx_paiement modify fk_bank integer NOT NULL DEFAULT 0; - - -create table llx_element_element -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - sourceid integer NOT NULL, - sourcetype varchar(12) NOT NULL, - targetid integer NOT NULL, - targettype varchar(12) NOT NULL -) ENGINE=innodb; - - -ALTER TABLE llx_element_element - ADD UNIQUE INDEX idx_element_element_idx1 (sourceid, sourcetype, targetid, targettype); - -ALTER TABLE llx_element_element ADD INDEX idx_element_element_targetid (targetid); - - -ALTER TABLE llx_actioncomm add column fk_user_mod integer after fk_user_author; -ALTER TABLE llx_actioncomm add column fk_user_done integer after fk_user_action; - ---drop table if exists llx_events; -create table llx_events -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp, - type varchar(32) NOT NULL, - dateevent datetime, - fk_user integer, - description varchar(250) NOT NULL, - ip varchar(32) NOT NULL, - fk_object integer -) ENGINE=innodb; - - -ALTER TABLE llx_events ADD INDEX idx_events_dateevent (dateevent); - -ALTER TABLE llx_c_forme_juridique ADD isvatexempted tinyint DEFAULT 0 NOT NULL after libelle; - -ALTER TABLE llx_facturedet ADD product_type integer DEFAULT NULL after total_ttc; -ALTER TABLE llx_facture_fourn_det ADD product_type integer DEFAULT NULL after total_ttc; - --- V4.1 update llx_facturedet set product_type = 0 where fk_product in (select rowid from llx_product where fk_product_type = 0); --- V4.1 update llx_facture_fourn_det set product_type = 0 where fk_product in (select rowid from llx_product where fk_product_type = 0); --- V4.1 update llx_facturedet set product_type = 1 where fk_product in (select rowid from llx_product where fk_product_type = 1); --- V4.1 update llx_facture_fourn_det set product_type = 1 where fk_product in (select rowid from llx_product where fk_product_type = 1); --- V4.1 update llx_facturedet set product_type = 1 where product_type is null; --- V4.1 update llx_facture_fourn_det set product_type = 1 where product_type is null; - -create table llx_c_prospectlevel -( - code varchar(12) PRIMARY KEY, - label varchar(30), - sortorder smallint, - active smallint DEFAULT 1 NOT NULL -) ENGINE=innodb; - -insert into llx_c_prospectlevel (code,label,sortorder) values ('PL_UNKOWN', 'Unknown', 1); -insert into llx_c_prospectlevel (code,label,sortorder) values ('PL_LOW', 'Low', 2); -insert into llx_c_prospectlevel (code,label,sortorder) values ('PL_MEDIUM', 'Medium', 3); -insert into llx_c_prospectlevel (code,label,sortorder) values ('PL_HIGH', 'High', 4); - - -alter table llx_societe add column fk_prospectlevel varchar(12) after fournisseur; -alter table llx_societe modify tva_assuj tinyint DEFAULT 1; - - ---update llx_actioncomm set datea = datep where datea is null and percent = 100; ---update llx_actioncomm set datea2 = datea where datea2 is null and percent = 100; -update llx_actioncomm set datep = datea where datep is null and datea is not null; -update llx_actioncomm set datep = datec where datep is null and datea is null; -update llx_actioncomm set datep2 = datep where datep2 is null and percent = 100; - - -alter table llx_projet modify fk_soc integer; - -update llx_rights_def set module='societe' where module='commercial' and perms='client' and subperms='voir'; - -insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (25, 'Impots revenus', 0,1,'TAXREV'); - -alter table llx_socpeople add priv smallint NOT NULL DEFAULT 0 after jabberid; - -alter table llx_tva modify fk_bank integer; - -delete from llx_const where name='MAIN_USE_PREVIEW_TABS'; - -alter table llx_menu_const drop column user; -update llx_menu set leftmenu = '1' where leftmenu != '0'; -alter table llx_menu modify leftmenu varchar(1) default '1'; - - -create table llx_ecm_directories -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - label varchar(32) NOT NULL, - fk_parent integer, - description varchar(255) NOT NULL, - cachenbofdoc integer NOT NULL DEFAULT 0, - date_c datetime, - date_m timestamp, - fk_user_c integer, - fk_user_m integer -) ENGINE=innodb; - -create table llx_ecm_documents -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - ref varchar(16) NOT NULL, - filename varchar(255) NOT NULL, - filesize integer NOT NULL, - filemime varchar(32) NOT NULL, - fullpath_dol varchar(255) NOT NULL, - fullpath_orig varchar(255) NOT NULL, - description text, - manualkeyword text, - fk_create integer NOT NULL, - fk_update integer, - date_c datetime NOT NULL, - date_u timestamp, - fk_directory integer, - fk_status smallint DEFAULT 0, - private smallint DEFAULT 0 -) ENGINE=innodb; - -ALTER TABLE llx_bank modify num_chq varchar(50); - -ALTER TABLE llx_menu_const ADD UNIQUE KEY uk_menu_const(fk_menu, fk_constraint); - -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (100, 'USLetter', 'Format Letter (A)', '216', '279', 'mm', 0); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (105, 'USLegal', 'Format Legal', '216', '356', 'mm', 0); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (110, 'USExecutive', 'Format Executive', '190', '254', 'mm', 0); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (115, 'USLedger', 'Format Ledger/Tabloid (B)', '279', '432', 'mm', 0); - -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (200, 'Canadian P1', 'Format Canadian P1', '560', '860', 'mm', 0); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (205, 'Canadian P2', 'Format Canadian P2', '430', '560', 'mm', 0); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (210, 'Canadian P3', 'Format Canadian P3', '280', '430', 'mm', 0); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (215, 'Canadian P4', 'Format Canadian P4', '215', '280', 'mm', 0); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (220, 'Canadian P5', 'Format Canadian P5', '140', '215', 'mm', 0); -INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (225, 'Canadian P6', 'Format Canadian P6', '107', '140', 'mm', 0); - -ALTER TABLE llx_commande_fournisseurdet DROP COLUMN price; - -alter table llx_adherent modify fk_user_mod integer; -alter table llx_adherent modify fk_user_valid integer; - -create table llx_c_type_fees -( - id integer AUTO_INCREMENT PRIMARY KEY, - code varchar(12) UNIQUE NOT NULL, - libelle varchar(30), - active tinyint DEFAULT 1 NOT NULL -)ENGINE=innodb; - - -alter table llx_deplacement modify type varchar(12) NOT NULL; -alter table llx_deplacement modify km real; - -insert into llx_c_type_fees (code,libelle,active) values ('TF_OTHER', 'Other', 1); -insert into llx_c_type_fees (code,libelle,active) values ('TF_TRIP', 'Trip', 1); -insert into llx_c_type_fees (code,libelle,active) values ('TF_LUNCH', 'Lunch', 1); - -drop table llx_comfourn_facfourn; - -alter table llx_element_element modify sourcetype varchar(16) NOT NULL; -alter table llx_element_element modify targettype varchar(16) NOT NULL; - -update llx_societe set fk_typent = 0 where fk_typent is null; - -ALTER TABLE llx_surveys_answers_summary ENGINE=innodb; - - --- Not used. Just to be compatible with upgrade process of higher versions -alter table llx_const add column entity integer DEFAULT 1 NOT NULL; --- Not used. Just to be compatible with 2.7 upgrade process or higher -alter table llx_menu add column enabled varchar(255) NULL default '1'; - diff --git a/htdocs/install/mysql/migration/2.4.0-2.5.0.sql b/htdocs/install/mysql/migration/2.4.0-2.5.0.sql deleted file mode 100644 index 36d78dac859..00000000000 --- a/htdocs/install/mysql/migration/2.4.0-2.5.0.sql +++ /dev/null @@ -1,115 +0,0 @@ --- --- Be carefull to requests order. --- This file must be loaded by calling /install/index.php page --- when current version is 2.4.0 or higher. --- - -alter table llx_product add column price_min double(24,8) DEFAULT 0; -alter table llx_product add column price_min_ttc double(24,8) DEFAULT 0; -alter table llx_product add column finished tinyint DEFAULT NULL after canvas; - -alter table llx_product_price add column price_min double(24,8) default NULL; -alter table llx_product_price add column price_min_ttc double(24,8) default NULL; - -alter table llx_societe add column gencod varchar(255); - -delete from llx_user_param where page <> ''; - -alter table llx_expedition add column tracking_number varchar(50) after fk_expedition_methode; - -alter table llx_actioncomm add column location varchar(128) after percent; - --- remove enum type -alter table llx_adherent_type modify column cotisation varchar(3) NOT NULL DEFAULT 'yes'; -alter table llx_adherent_type modify column vote varchar(3) NOT NULL DEFAULT 'yes'; -alter table llx_adherent modify column morphy varchar(3) NOT NULL; -alter table llx_c_paper_format modify column unit varchar(5) NOT NULL; -alter table llx_const modify column type varchar(6); -alter table llx_menu modify column type varchar(4) NOT NULL; -alter table llx_notify modify column objet_type varchar(24) NOT NULL; -alter table llx_projet_task_actors modify column role varchar(5) DEFAULT 'admin'; -alter table llx_projet_task modify column statut varchar(6) DEFAULT 'open'; -alter table llx_rights_def modify column type varchar(1); - -ALTER TABLE llx_menu ADD COLUMN enabled varchar(255) NULL default '1' after perms; - -ALTER TABLE `llx_commandedet` ADD column `date_start` DATETIME DEFAULT NULL, ADD `date_end` DATETIME DEFAULT NULL ; - -alter table llx_categorie add column fk_soc integer DEFAULT NULL after description; - -alter table llx_product drop column nbvente; - -alter table llx_product add column import_key varchar(14); -alter table llx_socpeople add column import_key varchar(14); -alter table llx_facture add column import_key varchar(14); -alter table llx_facturedet add column import_key varchar(14); -alter table llx_commande add column import_key varchar(14); -alter table llx_commandedet add column import_key varchar(14); -alter table llx_facture_fourn add column import_key varchar(14); -alter table llx_facture_fourn_det add column import_key varchar(14); - -alter table llx_commande modify column source smallint NULL; - -update llx_c_prospectlevel set code='PL_NONE', label='None' where code='PL_UNKOWN' or code='PL_NONE'; - -update llx_societe set fk_prospectlevel=null where fk_prospectlevel='PL_UNKOWN'; - -alter table llx_expedition add height integer; -alter table llx_expedition add width integer; -alter table llx_expedition add size_units integer; -alter table llx_expedition add size integer; -alter table llx_expedition add weight_units integer; -alter table llx_expedition add weight integer; - -ALTER TABLE llx_paiement_facture ADD UNIQUE INDEX uk_paiement_facture(fk_paiement, fk_facture); -ALTER TABLE llx_paiementfourn_facturefourn ADD UNIQUE INDEX uk_paiementfourn_facturefourn(fk_paiementfourn, fk_facturefourn); - -update llx_expedition_methode set code='ENL', libelle='Enlevement' where code='enlevement'; -update llx_expedition_methode set code='TRANS', libelle='Transporteur' where code='transporteur'; - -alter table llx_fichinterdet modify date datetime; - -alter table llx_don modify fk_don_projet integer NULL; -alter table llx_don modify fk_user_valid integer NULL; -alter table llx_don add note_public text; -alter table llx_don add model_pdf varchar(50); -alter table llx_don add import_key varchar(14); - -ALTER TABLE llx_export_model DROP INDEX uk_export_model; -ALTER TABLE llx_export_model ADD UNIQUE uk_export_model (label,type); - -alter table llx_adherent_options_label add column type varchar(8); -alter table llx_adherent_options_label add column size integer DEFAULT 0; -alter table llx_adherent_options_label add column pos integer DEFAULT 0; - --- Reverse option -update llx_const set visible = 1, name = 'FACTURE_ENABLE_RECUR', value='1' where name = 'FACTURE_DISABLE_RECUR' and value = '0'; -delete from llx_const where name = 'FACTURE_DISABLE_RECUR' and value = '1'; -delete from llx_const where name like 'MAIN_FASTSEARCH_%'; - -alter table llx_bank_account modify comment text; - -update llx_bank_account set ref = label where ref is null or ref = ''; - --- 2.5.1 -update llx_actioncomm set datep = datea where datep is null; - - -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (70, 'facture_fourn', 'internal', 'SALESREPFOLL', 'Responsable suivi du paiement', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (71, 'facture_fourn', 'external', 'BILLING', 'Contact fournisseur facturation', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (72, 'facture_fourn', 'external', 'SHIPPING', 'Contact fournisseur livraison', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (73, 'facture_fourn', 'external', 'SERVICE', 'Contact fournisseur prestation', 1); - -alter table llx_product_stock add column pmp double(24,8) default 0 NOT NULL; - -alter table llx_expedition_methode change statut active tinyint DEFAULT 1; - -INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); -INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); -INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); - - --- Not used. Just to be compatible with upgrade process of higher versions -alter table llx_const add column entity integer DEFAULT 1 NOT NULL; --- Not used. Just to be compatible with 2.7 upgrade process or higher -alter table llx_menu add column enabled varchar(255) NULL default '1'; diff --git a/htdocs/install/mysql/migration/2.5.0-2.6.0.sql b/htdocs/install/mysql/migration/2.5.0-2.6.0.sql deleted file mode 100644 index 5bfc011e579..00000000000 --- a/htdocs/install/mysql/migration/2.5.0-2.6.0.sql +++ /dev/null @@ -1,139 +0,0 @@ --- --- Be carefull to requests order. --- This file must be loaded by calling /install/index.php page --- when current version is 2.5.0 or higher. --- - -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (140,'order_supplier','internal', 'SALESREPFOLL', 'Responsable suivi de la commande', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (141,'order_supplier','internal', 'SHIPPING', 'Responsable reception de la commande', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (142,'order_supplier','external', 'BILLING', 'Contact fournisseur facturation commande', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (143,'order_supplier','external', 'CUSTOMER', 'Contact fournisseur suivi commande', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (145,'order_supplier','external', 'SHIPPING', 'Contact fournisseur livraison commande', 1); - -update llx_const set visible = 1 where name = 'PROPALE_ADD_DELIVERY_ADDRESS'; - -delete from llx_const where name like 'MAIN_LOGEVENTS_%' and name not like 'MAIN_LOGEVENTS_USER%' and name not like 'MAIN_LOGEVENTS_GROUP%'; -delete from llx_events where type not like 'USER%' and type not like 'GROUP%'; - -alter table llx_expedition_methode change statut active tinyint DEFAULT 1; - -update llx_actioncomm set datep = datea where datep is null; - - -INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1); -INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); -INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); -UPDATE llx_expedition_methode set code='CATCH', libelle='Catch', description='Catch by client' where rowid=1; -UPDATE llx_expedition_methode set code='TRANS', libelle='Transporter', description='Generic transporter' where rowid=2; -UPDATE llx_expedition_methode set code='COLSUI', libelle='Colissimo Suivi', description='Colissimo Suivi' where rowid=3; - - -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (70, 'facture_fourn', 'internal', 'SALESREPFOLL', 'Responsable suivi du paiement', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (71, 'facture_fourn', 'external', 'BILLING', 'Contact fournisseur facturation', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (72, 'facture_fourn', 'external', 'SHIPPING', 'Contact fournisseur livraison', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (73, 'facture_fourn', 'external', 'SERVICE', 'Contact fournisseur prestation', 1); - -alter table llx_product_stock add column pmp double(24,8) default 0 NOT NULL; -alter table llx_product add column pmp double(24,8) default 0 NOT NULL; - -alter table llx_product_stock modify column reel real; - -ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev); -ALTER TABLE llx_bank ADD INDEX idx_bank_dateo(dateo); -ALTER TABLE llx_bank ADD INDEX idx_bank_fk_account(fk_account); -ALTER TABLE llx_bank ADD INDEX idx_bank_rappro(rappro); - - -ALTER TABLE llx_mailing_cibles add column other varchar(255) NULL; - -ALTER TABLE llx_mailing_cibles ADD INDEX idx_mailing_cibles_email (email); - -ALTER TABLE llx_categorie ADD INDEX idx_categorie_type (type); - -ALTER TABLE llx_product drop column stock_propale; -ALTER TABLE llx_product drop column stock_commande; -ALTER TABLE llx_product add column stock integer after import_key; - -ALTER TABLE llx_product ADD INDEX idx_product_barcode (barcode); -ALTER TABLE llx_product ADD INDEX idx_product_import_key (import_key); - -ALTER TABLE llx_adherent drop index login; -ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_login (login); - -ALTER TABLE llx_adherent add column fk_soc integer NULL after societe; -ALTER TABLE llx_adherent ADD INDEX idx_adherent_fk_soc (fk_soc); -ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); -ALTER TABLE llx_adherent modify column fk_user_author integer NULL; - -ALTER TABLE llx_societe drop column rubrique; - --- SAINT PIERRE ET MIQUELON -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1931,193, '0','0','No VAT in SPM',1); - --- SAINT MARTIN -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2461,246, '0','0','VAT Rate 0',1); - - -insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'35','Regime auto-entrepreneur'); - - -alter table llx_user_param drop column page; - -alter table llx_commande_fournisseur_log add column comment varchar(255) NULL; - -delete from llx_categorie_association where fk_categorie_mere = fk_categorie_fille; - - -alter table llx_societe add price_level tinyint(4) NULL; - -delete from llx_document_model where nom = 'huitre' and type = 'invoice'; - -drop table llx_don_projet; - -alter table llx_facture_fourn_det add column date_start datetime DEFAULT NULL; -alter table llx_facture_fourn_det add column date_end datetime DEFAULT NULL; - -alter table llx_commandedet add column product_type integer DEFAULT 0 after total_ttc; - -alter table llx_propaldet add column product_type integer DEFAULT 0 after total_ttc; -alter table llx_propaldet add column date_start datetime DEFAULT NULL after product_type; -alter table llx_propaldet add column date_end datetime DEFAULT NULL after date_start; - -alter table llx_commande_fournisseurdet add column product_type integer DEFAULT 0 after total_ttc; -alter table llx_commande_fournisseurdet add column date_start datetime DEFAULT NULL after product_type; -alter table llx_commande_fournisseurdet add column date_end datetime DEFAULT NULL after date_start; -alter table llx_commande_fournisseur drop column product_type; -alter table llx_commande_fournisseur drop column date_start; -alter table llx_commande_fournisseur drop column date_end; - -drop table llx_models; - --- V4.1 delete from llx_projet_task where fk_projet not in (select rowid from llx_projet); --- V4.1 ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_projet FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid); - -ALTER TABLE llx_adherent modify fk_adherent_type integer NOT NULL; -ALTER TABLE llx_adherent ADD INDEX idx_adherent_fk_adherent_type (fk_adherent_type); --- V4.1 delete from llx_adherent where fk_adherent_type not in (select rowid from llx_adherent_type); --- V4.1 ALTER TABLE llx_adherent ADD CONSTRAINT fk_adherent_adherent_type FOREIGN KEY (fk_adherent_type) REFERENCES llx_adherent_type (rowid); - --- Put at the end. Cas have duplicate values -ALTER TABLE llx_categorie_association drop index idx_categorie_association_fk_categorie_fille; -ALTER TABLE llx_categorie_association ADD UNIQUE INDEX uk_categorie_association (fk_categorie_mere, fk_categorie_fille); -ALTER TABLE llx_categorie_association ADD UNIQUE INDEX uk_categorie_association_fk_categorie_fille (fk_categorie_fille); - --- Multi company -ALTER TABLE llx_const ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER name; -ALTER TABLE llx_user ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER login; -ALTER TABLE llx_usergroup ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER nom; - -ALTER TABLE llx_const DROP INDEX name; -ALTER TABLE llx_user DROP INDEX uk_user_login; -ALTER TABLE llx_usergroup DROP INDEX nom; - -ALTER TABLE llx_const ADD UNIQUE INDEX uk_const (name, entity); -ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_login (login, entity); -ALTER TABLE llx_usergroup ADD UNIQUE INDEX uk_usergroup_name (nom, entity); - - --- Not used. Just to be compatible with 2.7 upgrade process or higher -alter table llx_menu add column enabled varchar(255) NULL default '1'; diff --git a/htdocs/install/mysql/migration/2.6.0-2.7.0.sql b/htdocs/install/mysql/migration/2.6.0-2.7.0.sql deleted file mode 100644 index be3b786e8a7..00000000000 --- a/htdocs/install/mysql/migration/2.6.0-2.7.0.sql +++ /dev/null @@ -1,476 +0,0 @@ --- --- Be carefull to requests order. --- This file must be loaded by calling /install/index.php page --- when current version is 2.6.0 or higher. --- - -alter table llx_tmp_caisse modify fk_tva integer NOT NULL; - -drop table llx_facture_stats; -drop table llx_stock_valorisation; -drop table llx_entrepot_valorisation; -drop table llx_groupesociete_remise; -drop table llx_groupesociete; - -update llx_actioncomm set datep = datec where datep is null and datec is not null; - --- Create new table for import module -create table llx_import_model -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_user integer DEFAULT 0 NOT NULL, - label varchar(50) NOT NULL, - type varchar(20) NOT NULL, - field text NOT NULL -)ENGINE=innodb; - -update llx_bank_url set type='banktransfert' where type='?' and label='(banktransfert)'; - -ALTER TABLE llx_import_model ADD UNIQUE INDEX uk_import_model (label,type); - -delete from llx_const where name = 'FACTURE_ENABLE_RECUR'; - -alter table llx_facturedet_rec add column product_type integer DEFAULT 0 after fk_product; - -alter table llx_c_chargesociales change actioncompta code varchar(12) NOT NULL; -alter table llx_c_chargesociales add column fk_pays integer DEFAULT 1 NOT NULL; - --- Usage of llx_menu_const and llx_menu_constraint is too complicated --- so we made first change to remove it -alter table llx_menu_const drop foreign key fk_menu_const_fk_menu; -update llx_menu_constraint set action = '$conf->societe->enabled' where action = '$conf->commercial->enabled'; - -ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_fk_soc (fk_soc); - -alter table llx_facture add column tms timestamp after date_valid; -alter table llx_facture_fourn add column tms timestamp after datef; -alter table llx_facture_fourn add column fk_facture_source integer after fk_user_valid; - -update llx_facture set tms = datec where tms <= 0; -update llx_facture_fourn set tms = datec where tms <= 0; - - --- Clean no more required parameters -delete from llx_const where name = 'MAIN_MODULE_COMMERCIAL'; -delete from llx_const where name like 'MAIN_MODULE_%_DIR_OUTPUT'; -delete from llx_const where name like 'MAIN_MODULE_%_DIR_TEMP'; -delete from llx_const where name like 'PRODUIT_CONFIRM_DELETE_LINE'; -delete from llx_const where name = 'MAIN_MODULE_SYSLOG' and entity = 2; -delete from llx_const where name = 'SYSLOG_FILE' and entity = 2; -delete from llx_const where name = 'SYSLOG_LEVEL' and entity = 2; - -alter table llx_societe add column import_key varchar(14); - - --- V4.1 delete from llx_paiementfourn where rowid not in (select fk_paiementfourn from llx_paiementfourn_facturefourn); --- V4.1 delete from llx_paiementfourn_facturefourn where fk_facturefourn not in (select rowid from llx_facture_fourn); - - - --- Multi company -ALTER TABLE llx_rights_def ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER module; -ALTER TABLE llx_events ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER type; -ALTER TABLE llx_boxes_def ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER file; -ALTER TABLE llx_user_param ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER fk_user; -ALTER TABLE llx_societe ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER nom; -ALTER TABLE llx_socpeople ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER fk_soc; -ALTER TABLE llx_product ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; -ALTER TABLE llx_entrepot ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label; -ALTER TABLE llx_chargesociales ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER libelle; -ALTER TABLE llx_tva ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label; -ALTER TABLE llx_bank_account ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label; -ALTER TABLE llx_document_model ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER nom; -ALTER TABLE llx_menu ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER menu_handler; -ALTER TABLE llx_ecm_directories ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label; -ALTER TABLE llx_mailing ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER titre; -ALTER TABLE llx_categorie ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label; -ALTER TABLE llx_propal ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; -ALTER TABLE llx_commande ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; -ALTER TABLE llx_commande_fournisseur ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; -ALTER TABLE llx_product_fournisseur ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref_fourn; -ALTER TABLE llx_facture ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER facnumber; -ALTER TABLE llx_expedition ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; -ALTER TABLE llx_facture_fourn ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER facnumber; -ALTER TABLE llx_livraison ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; -ALTER TABLE llx_fichinter ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; -ALTER TABLE llx_contrat ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; -ALTER TABLE llx_c_barcode_type ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER code; -ALTER TABLE llx_dolibarr_modules ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER numero; -ALTER TABLE llx_bank_categ ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label; -ALTER TABLE llx_bordereau_cheque ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER number; -ALTER TABLE llx_prelevement_bons ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; -ALTER TABLE llx_projet ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; -ALTER TABLE llx_adherent ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid; -ALTER TABLE llx_adherent_type ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid; -ALTER TABLE llx_adherent_options_label ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER name; -ALTER TABLE llx_facture_rec ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER fk_soc; - -ALTER TABLE llx_rights_def DROP PRIMARY KEY; -ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY; - -ALTER TABLE llx_adherent_options_label DROP PRIMARY KEY; -ALTER TABLE llx_adherent_options_label MODIFY COLUMN name varchar(64) NOT NULL; -ALTER TABLE llx_adherent_options_label ADD COLUMN rowid integer AUTO_INCREMENT PRIMARY KEY FIRST; - -ALTER TABLE llx_user_param DROP INDEX fk_user; -ALTER TABLE llx_societe DROP INDEX uk_societe_prefix_comm; -ALTER TABLE llx_societe DROP INDEX uk_societe_code_client; -ALTER TABLE llx_product DROP INDEX uk_product_ref; -ALTER TABLE llx_entrepot DROP INDEX label; -ALTER TABLE llx_bank_account DROP INDEX uk_bank_account_label; -ALTER TABLE llx_document_model DROP INDEX uk_document_model; -ALTER TABLE llx_menu DROP INDEX idx_menu_uk_menu; -ALTER TABLE llx_categorie DROP INDEX uk_categorie_ref; -ALTER TABLE llx_propal DROP INDEX ref; -ALTER TABLE llx_commande DROP INDEX ref; -ALTER TABLE llx_commande_fournisseur DROP INDEX uk_commande_fournisseur_ref; -ALTER TABLE llx_product_fournisseur DROP INDEX fk_product; -ALTER TABLE llx_product_fournisseur DROP INDEX fk_soc; -ALTER TABLE llx_facture DROP INDEX idx_facture_uk_facnumber; -ALTER TABLE llx_expedition DROP INDEX idx_expedition_uk_ref; -ALTER TABLE llx_facture_fourn DROP INDEX uk_facture_fourn_ref; -ALTER TABLE llx_livraison DROP INDEX idx_expedition_uk_ref; -ALTER TABLE llx_livraison DROP INDEX idx_livraison_uk_ref; -ALTER TABLE llx_fichinter DROP INDEX ref; -ALTER TABLE llx_prelevement_bons DROP INDEX ref; -ALTER TABLE llx_projet DROP INDEX ref; -ALTER TABLE llx_boxes_def DROP INDEX uk_boxes_def; -ALTER TABLE llx_adherent DROP INDEX uk_adherent_login; -ALTER TABLE llx_adherent_type DROP INDEX uk_adherent_type_libelle; -ALTER TABLE llx_facture_rec DROP INDEX idx_facture_rec_uk_titre; - -ALTER TABLE llx_rights_def ADD PRIMARY KEY pk_rights_def (id, entity); -ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); - -ALTER TABLE llx_user_param ADD UNIQUE INDEX uk_user_param (fk_user,param,entity); -ALTER TABLE llx_societe ADD UNIQUE INDEX uk_societe_prefix_comm (prefix_comm, entity); -ALTER TABLE llx_societe ADD UNIQUE INDEX uk_societe_code_client (code_client, entity); -ALTER TABLE llx_product ADD UNIQUE INDEX uk_product_ref (ref, entity); -ALTER TABLE llx_entrepot ADD UNIQUE INDEX uk_entrepot_label (label, entity); -ALTER TABLE llx_bank_account ADD UNIQUE INDEX uk_bank_account_label (label, entity); -ALTER TABLE llx_document_model ADD UNIQUE INDEX uk_document_model (nom, type, entity); -ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, url, entity); -ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label, type, entity); -ALTER TABLE llx_propal ADD UNIQUE INDEX uk_propal_ref (ref, entity); -ALTER TABLE llx_commande ADD UNIQUE INDEX uk_commande_ref (ref, entity); -ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity); -ALTER TABLE llx_product_fournisseur ADD UNIQUE INDEX uk_product_fournisseur_ref (ref_fourn, fk_soc, entity); -ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_product (fk_product, entity); -ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_soc (fk_soc, entity); -ALTER TABLE llx_facture ADD UNIQUE INDEX idx_facture_uk_facnumber (facnumber, entity); -ALTER TABLE llx_expedition ADD UNIQUE INDEX idx_expedition_uk_ref (ref, entity); -ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref (facnumber, fk_soc, entity); -ALTER TABLE llx_livraison ADD UNIQUE INDEX idx_livraison_uk_ref (ref, entity); -ALTER TABLE llx_fichinter ADD UNIQUE INDEX uk_fichinter_ref (ref, entity); -ALTER TABLE llx_contrat ADD UNIQUE INDEX uk_contrat_ref (ref, entity); -ALTER TABLE llx_bordereau_cheque ADD UNIQUE INDEX uk_bordereau_cheque (number, entity); -ALTER TABLE llx_prelevement_bons ADD UNIQUE INDEX uk_prelevement_bons_ref (ref, entity); -ALTER TABLE llx_projet ADD UNIQUE INDEX uk_projet_ref (ref, entity); -ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity); -ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_login (login, entity); -ALTER TABLE llx_adherent_type ADD UNIQUE INDEX uk_adherent_type_libelle (libelle, entity); -ALTER TABLE llx_adherent_options_label ADD UNIQUE INDEX uk_adherent_options_label_name (name, entity); -ALTER TABLE llx_facture_rec ADD UNIQUE INDEX idx_facture_rec_uk_titre (titre, entity); - -ALTER TABLE llx_projet ADD INDEX idx_projet_fk_soc (fk_soc); --- V4.1 update llx_projet set fk_soc=null where fk_soc is not null and fk_soc not in (select rowid from llx_societe); -ALTER TABLE llx_projet ADD CONSTRAINT fk_projet_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); - -ALTER TABLE llx_facture_rec ADD CONSTRAINT fk_facture_rec_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); - - -UPDATE llx_const SET entity=0 WHERE name='MAIN_MODULE_USER' AND entity=1; -UPDATE llx_const SET entity=0 WHERE name='MAIN_POPUP_CALENDAR' AND entity=1; -UPDATE llx_const SET entity=0 WHERE name='MAIN_MAIL_SMTP_SERVER' AND entity=1; -UPDATE llx_const SET entity=0 WHERE name='MAIN_MAIL_SMTP_PORT' AND entity=1; -UPDATE llx_const SET entity=0 WHERE name='MAIN_UPLOAD_DOC' AND entity=1; -UPDATE llx_const SET entity=0 WHERE name='MAIN_FEATURES_LEVEL' AND entity=1; -UPDATE llx_const SET entity=0 WHERE name='MAIN_SEARCHFORM_SOCIETE' AND entity=1; -UPDATE llx_const SET entity=0 WHERE name='MAIN_SEARCHFORM_CONTACT' AND entity=1; -UPDATE llx_const SET entity=0 WHERE name='MAIN_SEARCHFORM_PRODUITSERVICE' AND entity=1; -UPDATE llx_const SET entity=0 WHERE name='MAIN_SEARCHFORM_ADHERENT' AND entity=1; -UPDATE llx_const SET entity=0 WHERE name='MAIN_SIZE_LISTE_LIMIT' AND entity=1; -UPDATE llx_const SET entity=0 WHERE name='MAIN_SHOW_WORKBOARD' AND entity=1; -UPDATE llx_const SET entity=0 WHERE name='SOCIETE_NOLIST_COURRIER' AND entity=1; -UPDATE llx_const SET entity=0 WHERE name='GENBARCODE_LOCATION' AND entity=1; - -UPDATE llx_const SET entity=0 WHERE name='MAIN_MODULE_SYSLOG'; -UPDATE llx_const SET entity=0 WHERE name='SYSLOG_FILE'; -UPDATE llx_const SET entity=0 WHERE name='SYSLOG_LEVEL'; - - --- Fix to solve forgoten names on keys -ALTER TABLE llx_dolibarr_modules drop primary KEY; -ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); - -ALTER TABLE llx_events add column user_agent varchar(128) NULL after ip; - - -alter table llx_commande_fournisseur add column ref_supplier varchar(30) after entity; - -alter table llx_mailing add column bgcolor varchar(8) after body; -alter table llx_mailing add column bgimage varchar(255) after bgcolor; - --- Added US states -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1101, 11, 1101, '', 0, 'United-States', 1); --- --- Provinces US -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AL', 1101, '', 0, 'ALABAMA', 'Alabama', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AK', 1101, '', 0, 'ALASKA', 'Alaska', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AZ', 1101, '', 0, 'ARIZONA', 'Arizona', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AR', 1101, '', 0, 'ARKANSAS', 'Arkansas', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('CA', 1101, '', 0, 'CALIFORNIA', 'California', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('CO', 1101, '', 0, 'COLORADO', 'Colorado', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('CT', 1101, '', 0, 'CONNECTICUT', 'Connecticut', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('DE', 1101, '', 0, 'DELAWARE', 'Delaware', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('FL', 1101, '', 0, 'FLORIDA', 'Florida', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('GA', 1101, '', 0, 'GEORGIA', 'Georgia', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('HI', 1101, '', 0, 'HAWAII', 'Hawaii', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('ID', 1101, '', 0, 'IDAHO', 'Idaho', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('IL', 1101, '', 0, 'ILLINOIS','Illinois', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('IN', 1101, '', 0, 'INDIANA', 'Indiana', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('IA', 1101, '', 0, 'IOWA', 'Iowa', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('KS', 1101, '', 0, 'KANSAS', 'Kansas', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('KY', 1101, '', 0, 'KENTUCKY', 'Kentucky', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('LA', 1101, '', 0, 'LOUISIANA', 'Louisiana', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('ME', 1101, '', 0, 'MAINE', 'Maine', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MD', 1101, '', 0, 'MARYLAND', 'Maryland', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MA', 1101, '', 0, 'MASSACHUSSETTS', 'Massachusetts', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MI', 1101, '', 0, 'MICHIGAN', 'Michigan', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MN', 1101, '', 0, 'MINNESOTA', 'Minnesota', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MS', 1101, '', 0, 'MISSISSIPPI', 'Mississippi', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MO', 1101, '', 0, 'MISSOURI', 'Missouri', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MT', 1101, '', 0, 'MONTANA', 'Montana', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NE', 1101, '', 0, 'NEBRASKA', 'Nebraska', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NV', 1101, '', 0, 'NEVADA', 'Nevada', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NH', 1101, '', 0, 'NEW HAMPSHIRE', 'New Hampshire', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NJ', 1101, '', 0, 'NEW JERSEY', 'New Jersey', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NM', 1101, '', 0, 'NEW MEXICO', 'New Mexico', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NY', 1101, '', 0, 'NEW YORK', 'New York', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NC', 1101, '', 0, 'NORTH CAROLINA', 'North Carolina', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('ND', 1101, '', 0, 'NORTH DAKOTA', 'North Dakota', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('OH', 1101, '', 0, 'OHIO', 'Ohio', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('OK', 1101, '', 0, 'OKLAHOMA', 'Oklahoma', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('OR', 1101, '', 0, 'OREGON', 'Oregon', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('PA', 1101, '', 0, 'PENNSYLVANIA', 'Pennsylvania', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('RI', 1101, '', 0, 'RHODE ISLAND', 'Rhode Island', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('SC', 1101, '', 0, 'SOUTH CAROLINA', 'South Carolina', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('SD', 1101, '', 0, 'SOUTH DAKOTA', 'South Dakota', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('TN', 1101, '', 0, 'TENNESSEE', 'Tennessee', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('TX', 1101, '', 0, 'TEXAS', 'Texas', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('UT', 1101, '', 0, 'UTAH', 'Utah', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('VT', 1101, '', 0, 'VERMONT', 'Vermont', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('VA', 1101, '', 0, 'VIRGINIA', 'Virginia', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WA', 1101, '', 0, 'WASHINGTON', 'Washington', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WV', 1101, '', 0, 'WEST VIRGINIA', 'West Virginia', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WI', 1101, '', 0, 'WISCONSIN', 'Wisconsin', 1); -insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WY', 1101, '', 0, 'WYOMING', 'Wyoming', 1); - -alter table llx_facture_fourn_det add column ref varchar(50) after fk_product; -alter table llx_facture_fourn_det add column label varchar(255) after ref; - -alter table llx_societe_rib modify column iban_prefix varchar(34); -alter table llx_bank_account modify column iban_prefix varchar(34); - - -alter table llx_projet add column datec date after fk_statut; - -delete from llx_action_def; -insert into llx_action_def (rowid,code,titre,description,objet_type) values (1,'NOTIFY_VAL_FICHINTER','Validation fiche intervention','Executed when a intervention is validated','ficheinter'); -insert into llx_action_def (rowid,code,titre,description,objet_type) values (2,'NOTIFY_VAL_FAC','Validation facture client','Executed when a customer invoice is approved','facture'); -insert into llx_action_def (rowid,code,titre,description,objet_type) values (3,'NOTIFY_APP_ORDER_SUPPLIER','Approbation commande fournisseur','Executed when a supplier order is approved','order_supplier'); -insert into llx_action_def (rowid,code,titre,description,objet_type) values (4,'NOTIFY_REF_ORDER_SUPPLIER','Refus commande fournisseur','Executed when a supplier order is refused','order_supplier'); - - -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 51, 5, '19','0','VAT standard rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 52, 5, '7','0','VAT reduced rate', 1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 53, 5, '0','0','VAT Rate 0', 1); - --- Add rule to avoid duplicate use of discount -update llx_facturedet set fk_remise_except = null where fk_remise_except = 0; -ALTER TABLE llx_facturedet ADD UNIQUE INDEX uk_fk_remise_except (fk_remise_except); - --- Add Mauritius -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15201', 'Mauritius Private Company Limited By Shares', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15202', 'Mauritius Company Limited By Guarantee', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15203', 'Mauritius Public Company Limited By Shares', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15204', 'Mauritius Foreign Company', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15205', 'Mauritius GBC1 (Offshore Company)', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15206', 'Mauritius GBC2 (International Company)', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15207', 'Mauritius General Partnership', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15208', 'Mauritius Limited Partnership', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15209', 'Mauritius Sole Proprietorship', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15210', 'Mauritius Trusts', 1); - -insert into llx_c_currencies ( code, code_iso, active, label ) values ( 'MU', 'MUR', 1, 'Roupies mauritiennes'); - -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1521,152, '0','0','VAT Rate 0',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1522,152, '15','0','VAT Rate 15',1); - -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15201, 152, 15201, '', 0, 'Rivière Noire', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15202, 152, 15202, '', 0, 'Flacq', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15203, 152, 15203, '', 0, 'Grand Port', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15204, 152, 15204, '', 0, 'Moka', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15205, 152, 15205, '', 0, 'Pamplemousses', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15206, 152, 15206, '', 0, 'Plaines Wilhems', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15207, 152, 15207, '', 0, 'Port-Louis', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15208, 152, 15208, '', 0, 'Rivière du Rempart', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15209, 152, 15209, '', 0, 'Savanne', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15210, 152, 15210, '', 0, 'Rodrigues', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15211, 152, 15211, '', 0, 'Les îles Agaléga', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15212, 152, 15212, '', 0, 'Les écueils des Cargados Carajos', 1); - -alter table llx_const modify column name varchar(255) NOT NULL; -alter table llx_const modify column value text NOT NULL; - --- SWEDEN (id 20) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (201,20, '25','0','VAT standard rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (202,20, '12','0','VAT reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (203,20, '6','0','VAT super-reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (204,20, '0','0','VAT Rate 0', 1); - --- Regions Suisse (id pays=6) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (601, 6, 601, '', 1, 'Cantons', 1); - --- Cantons Suisse -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'AG','ARGOVIE','Argovie',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'AI','APPENZELL RHODES INTERIEURES','Appenzell Rhodes intérieures',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'AR','APPENZELL RHODES EXTERIEURES','Appenzell Rhodes extérieures',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'BE','BERNE','Berne',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'BL','BALE CAMPAGNE','Bâle Campagne',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'BS','BALE VILLE','Bâle Ville',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'FR','FRIBOURG','Fribourg',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'GE','GENEVE','Genève',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'GL','GLARIS','Glaris',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'GR','GRISONS','Grisons',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'JU','JURA','Jura',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'LU','LUCERNE','Lucerne',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'NE','NEUCHATEL','Neuchâtel',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'NW','NIDWALD','Nidwald',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'OW','OBWALD','Obwald',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'SG','SAINT-GALL','Saint-Gall',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'SH','SCHAFFHOUSE','Schaffhouse',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'SO','SOLEURE','Soleure',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'SZ','SCHWYZ','Schwyz',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'TG','THURGOVIE','Thurgovie',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'TI','TESSIN','Tessin',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'UR','URI','Uri',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'VD','VAUD','Vaud',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'VS','VALAIS','Valais',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'ZG','ZUG','Zug',1); -INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'ZH','ZURICH','Zürich',1); - --- Regions spain (id pays=4) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (401, 4, 401, '', 0, 'Andalucia', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (402, 4, 402, '', 0, 'Aragón', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (403, 4, 403, '', 0, 'Castilla y León', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (404, 4, 404, '', 0, 'Castilla la Mancha', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (405, 4, 405, '', 0, 'Canarias', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (406, 4, 406, '', 0, 'Cataluña', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (407, 4, 407, '', 0, 'Comunidad de Ceuta', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (408, 4, 408, '', 0, 'Comunidad Foral de Navarra', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (409, 4, 409, '', 0, 'Comunidad de Melilla', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (410, 4, 410, '', 0, 'Cantabria', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (411, 4, 411, '', 0, 'Comunidad Valenciana', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (412, 4, 412, '', 0, 'Extemadura', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (413, 4, 413, '', 0, 'Galicia', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (414, 4, 414, '', 0, 'Islas Baleares', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (415, 4, 415, '', 0, 'La Rioja', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (416, 4, 416, '', 0, 'Comunidad de Madrid', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (417, 4, 417, '', 0, 'Región de Murcia', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (418, 4, 418, '', 0, 'Principado de Asturias', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (419, 4, 419, '', 0, 'Pais Vasco', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (420, 4, 420, '', 0, 'Otros', 1); - --- Provinces Spain -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('01', 419, '', 19, 'PAIS VASCO', 'País Vasco', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('02', 404, '', 4, 'ALBACETE', 'Albacete', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('03', 411, '', 11, 'ALICANTE', 'Alicante', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('04', 401, '', 1, 'ALMERIA', 'Almería', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('05', 403, '', 3, 'AVILA', 'Avila', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('06', 412, '', 12, 'BADAJOZ', 'Badajoz', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('07', 414, '', 14, 'ISLAS BALEARES', 'Islas Baleares', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('08', 406, '', 6, 'BARCELONA', 'Barcelona', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('09', 403, '', 8, 'BURGOS', 'Burgos', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('10', 412, '', 12, 'CACERES', 'Cáceres', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('11', 401, '', 1, 'CADIz', 'Cádiz', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('12', 411, '', 11, 'CASTELLON', 'Castellón', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('13', 404, '', 4, 'CIUDAD REAL', 'Ciudad Real', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('14', 401, '', 1, 'CORDOBA', 'Córdoba', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('15', 413, '', 13, 'LA CORUÑA', 'La Coruña', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('16', 404, '', 4, 'CUENCA', 'Cuenca', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('17', 406, '', 6, 'GERONA', 'Gerona', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('18', 401, '', 1, 'GRANADA', 'Granada', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('19', 404, '', 4, 'GUADALAJARA', 'Guadalajara', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('20', 419, '', 19, 'GUIPUZCOA', 'Guipúzcoa', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('21', 401, '', 1, 'HUELVA', 'Huelva', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('22', 402, '', 2, 'HUESCA', 'Huesca', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('23', 401, '', 1, 'JAEN', 'Jaén', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('24', 403, '', 3, 'LEON', 'León', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('25', 406, '', 6, 'LERIDA', 'Lérida', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('26', 415, '', 15, 'LA RIOJA', 'La Rioja', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('27', 413, '', 13, 'LUGO', 'Lugo', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('28', 416, '', 16, 'MADRID', 'Madrid', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('29', 401, '', 1, 'MALAGA', 'Málaga', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('30', 417, '', 17, 'MURCIA', 'Murcia', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('31', 408, '', 8, 'NAVARRA', 'Navarra', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('32', 413, '', 13, 'ORENSE', 'Orense', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('33', 418, '', 18, 'ASTURIAS', 'Asturias', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('34', 403, '', 3, 'PALENCIA', 'Palencia', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('35', 405, '', 5, 'LAS PALMAS', 'Las Palmas', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('36', 413, '', 13, 'PONTEVEDRA', 'Pontevedra', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('37', 403, '', 3, 'SALAMANCA', 'Salamanca', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('38', 405, '', 5, 'STA. CRUZ DE TENERIFE', 'Sta. Cruz de Tenerife', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('39', 410, '', 10, 'CANTABRIA', 'Cantabria', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('40', 403, '', 3, 'SEGOVIA', 'Segovia', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('41', 401, '', 1, 'SEVILLA', 'Sevilla', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('42', 403, '', 3, 'SORIA', 'Soria', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('43', 406, '', 6, 'TARRAGONA', 'Tarragona', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('44', 402, '', 2, 'TERUEL', 'Teruel', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('45', 404, '', 5, 'TOLEDO', 'Toledo', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('46', 411, '', 11, 'VALENCIA', 'Valencia', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('47', 403, '', 3, 'VALLADOLID', 'Valladolid', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('48', 419, '', 19, 'VIZCAYA', 'Vizcaya', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('49', 403, '', 3, 'ZAMORA', 'Zamora', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('50', 402, '', 1, 'ZARAGOZA', 'Zaragoza', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('51', 407, '', 7, 'CEUTA', 'Ceuta', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('52', 409, '', 9, 'MELILLA', 'Melilla', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('53', 420, '', 20, 'OTROS', 'Otros', 1); - - -alter table llx_product_price modify price_level smallint NULL DEFAULT 1; -alter table llx_commandedet modify special_code integer UNSIGNED DEFAULT 0; -alter table llx_facturedet modify special_code integer UNSIGNED DEFAULT 0; -alter table llx_propaldet modify special_code integer UNSIGNED DEFAULT 0; -alter table llx_societe modify special_code integer NULL; -alter table llx_c_forme_juridique modify code integer NOT NULL; - -ALTER TABLE llx_bank_class ADD UNIQUE INDEX idx_bank_class_lineid (lineid); -ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code); -ALTER TABLE llx_c_methode_commande_fournisseur ADD UNIQUE INDEX uk_c_methode_commande_fournisseur (code); - -ALTER TABLE llx_menu change user usertype integer NOT NULL default '0'; - --- Rename index -ALTER TABLE llx_adherent_options MODIFY COLUMN optid integer; -ALTER TABLE llx_adherent_options DROP PRIMARY KEY; -ALTER TABLE llx_adherent_options DROP INDEX uk_adherent_options; -ALTER TABLE llx_adherent_options DROP INDEX idx_adherent_options; -ALTER TABLE llx_adherent_options DROP INDEX adhid; -ALTER TABLE llx_adherent_options CHANGE optid rowid integer AUTO_INCREMENT PRIMARY KEY; -ALTER TABLE llx_adherent_options CHANGE adhid fk_member integer NOT NULL; -ALTER TABLE llx_adherent_options ADD INDEX idx_adherent_options (fk_member); - -ALTER TABLE llx_adherent DROP INDEX idx_adherent_fk_soc; - -ALTER TABLE llx_propaldet ADD INDEX idx_propaldet_fk_propal (fk_propal); --- V4.1 delete from llx_propaldet where fk_propal not in (select rowid from llx_propal); -ALTER TABLE llx_propaldet ADD CONSTRAINT fk_propaldet_fk_propal FOREIGN KEY (fk_propal) REFERENCES llx_propal (rowid); - -ALTER TABLE llx_bank_class DROP INDEX idx_bank_class_lineid; -ALTER TABLE llx_bank_class DROP INDEX uk_bank_class_lineid; -ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); - - --- Not used. Just to be compatible with 2.7 upgrade process or higher -alter table llx_menu add column enabled varchar(255) NULL default '1'; diff --git a/htdocs/install/mysql/migration/2.7.0-2.8.0.sql b/htdocs/install/mysql/migration/2.7.0-2.8.0.sql deleted file mode 100755 index 045f72cf9f5..00000000000 --- a/htdocs/install/mysql/migration/2.7.0-2.8.0.sql +++ /dev/null @@ -1,211 +0,0 @@ --- --- Be carefull to requests order. --- This file must be loaded by calling /install/index.php page --- when current version is 2.7.0 or higher. --- - -ALTER TABLE llx_actioncomm CHANGE fk_projet fk_project integer; - -ALTER TABLE llx_don ADD COLUMN ref varchar(30) DEFAULT NULL AFTER rowid; -ALTER TABLE llx_don ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; - -ALTER TABLE llx_stock_mouvement ADD COLUMN label varchar(128); - -ALTER TABLE llx_deplacement ADD COLUMN ref varchar(30) DEFAULT NULL AFTER rowid; -ALTER TABLE llx_deplacement ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; -ALTER TABLE llx_deplacement ADD COLUMN note_public text; - -ALTER TABLE llx_element_element DROP INDEX idx_element_element_idx1; -ALTER TABLE llx_element_element DROP INDEX idx_element_element_targetid; -ALTER TABLE llx_element_element CHANGE sourceid fk_source integer NOT NULL; -ALTER TABLE llx_element_element CHANGE targetid fk_target integer NOT NULL; -ALTER TABLE llx_element_element ADD UNIQUE INDEX idx_element_element_idx1 (fk_source, sourcetype, fk_target, targettype); -ALTER TABLE llx_element_element ADD INDEX idx_element_element_fk_target (fk_target); - -ALTER TABLE llx_ecm_document RENAME TO llx_ecm_documents; -ALTER TABLE llx_ecm_documents ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref; -ALTER TABLE llx_ecm_documents ADD COLUMN crc varchar(32) DEFAULT '' NOT NULL AFTER private; -ALTER TABLE llx_ecm_documents ADD COLUMN cryptkey varchar(50) DEFAULT '' NOT NULL AFTER crc; -ALTER TABLE llx_ecm_documents ADD COLUMN cipher varchar(50) DEFAULT 'twofish' NOT NULL AFTER cryptkey; - -ALTER TABLE llx_facture_fourn_det MODIFY COLUMN qty real; - - -ALTER TABLE llx_notify ADD COLUMN email VARCHAR(255); - -ALTER TABLE llx_c_currencies ADD COLUMN labelsing varchar(64); -update llx_c_currencies set labelsing='Euro' where code_iso='EUR'; -update llx_c_currencies set labelsing='Dollar' where code_iso='USD'; - -insert into llx_action_def (rowid,code,titre,description,objet_type) values (5,'NOTIFY_VAL_ORDER','Validation commande client','Executed when a customer order is validated','order'); -insert into llx_action_def (rowid,code,titre,description,objet_type) values (6,'NOTIFY_VAL_PROPAL','Validation proposition client','Executed when a commercial proposal is validated','propal'); - -UPDATE llx_c_type_contact SET element='project' WHERE element='projet'; - -UPDATE llx_const set value='mail' where value='simplemail' and name='MAIN_MAIL_SENDMODE'; - -ALTER TABLE llx_projet ADD COLUMN model_pdf varchar(50) AFTER note; - -ALTER TABLE llx_societe ADD COLUMN localtax1_assuj tinyint DEFAULT 0 after tva_assuj; -ALTER TABLE llx_societe ADD COLUMN localtax2_assuj tinyint DEFAULT 0 after localtax1_assuj; - -ALTER TABLE llx_user ADD COLUMN photo varchar(255) after statut; - --- Create table of extra fields -create table llx_extra_fields -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp, - entity integer DEFAULT 1 NOT NULL, - object varchar(64) NOT NULL, - assign integer, - name varchar(64) NOT NULL, - label varchar(64) NOT NULL, - format varchar(8) NOT NULL, - fieldsize integer, - maxlength integer, - options varchar(45), - rank integer -)ENGINE=innodb; - -ALTER TABLE llx_extra_fields ADD UNIQUE INDEX idx_extra_fields_name (name, entity); - --- Create table of possible values -create table llx_extra_fields_options -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp, - fk_extra_fields integer NOT NULL, - value varchar(255) NOT NULL, - rank integer -)ENGINE=innodb; - -ALTER TABLE llx_extra_fields_options ADD INDEX idx_extra_fields_options_fk_extra_fields (fk_extra_fields); -ALTER TABLE llx_extra_fields_options ADD CONSTRAINT fk_extra_fields_options_fk_extra_fields FOREIGN KEY (fk_extra_fields) REFERENCES llx_extra_fields (rowid); - --- Create table of values -create table llx_extra_fields_values -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp, - entity integer DEFAULT 1 NOT NULL, - datec datetime, - datem datetime, - fk_object integer NOT NULL, - fk_extra_fields integer NOT NULL, - value varchar(255), - fk_user_create integer, - fk_user_modif integer -)ENGINE=innodb; - -ALTER TABLE llx_extra_fields_values ADD INDEX idx_extra_fields_values_fk_extra_fields (fk_extra_fields, entity); -ALTER TABLE llx_extra_fields_values ADD CONSTRAINT fk_extra_fields_values_fk_extra_fields FOREIGN KEY (fk_extra_fields) REFERENCES llx_extra_fields (rowid); - -ALTER TABLE llx_bank_class DROP INDEX idx_bank_class_lineid; -ALTER TABLE llx_bank_class DROP INDEX uk_bank_class_lineid; -ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ); - -ALTER TABLE llx_rights_def MODIFY COLUMN module varchar(64); - --- Enhancement of project tasks -ALTER TABLE llx_projet ADD COLUMN datee DATE AFTER dateo; -ALTER TABLE llx_projet ADD COLUMN public integer; - -ALTER TABLE llx_projet_task ADD COLUMN datec datetime AFTER fk_task_parent; -ALTER TABLE llx_projet_task ADD COLUMN tms timestamp AFTER datec; -ALTER TABLE llx_projet_task ADD COLUMN dateo datetime AFTER tms; -ALTER TABLE llx_projet_task ADD COLUMN datee datetime AFTER dateo; -ALTER TABLE llx_projet_task ADD COLUMN datev datetime AFTER datee; -ALTER TABLE llx_projet_task CHANGE title label varchar(255) NOT NULL; -ALTER TABLE llx_projet_task ADD COLUMN description text AFTER label; -ALTER TABLE llx_projet_task MODIFY description text; -ALTER TABLE llx_projet_task MODIFY duration_effective real DEFAULT 0 NOT NULL; -ALTER TABLE llx_projet_task ADD COLUMN progress integer DEFAULT 0 AFTER duration_effective; -ALTER TABLE llx_projet_task ADD COLUMN priority integer DEFAULT 0 AFTER progress; -ALTER TABLE llx_projet_task ADD COLUMN fk_milestone integer DEFAULT 0 AFTER priority; -ALTER TABLE llx_projet_task ADD COLUMN fk_user_modif integer AFTER fk_user_creat; -ALTER TABLE llx_projet_task ADD COLUMN fk_user_valid integer AFTER fk_user_modif; -UPDATE llx_projet_task SET statut='1' WHERE statut='open'; -ALTER TABLE llx_projet_task CHANGE statut fk_statut smallint DEFAULT 0 NOT NULL; -ALTER TABLE llx_projet_task CHANGE note note_private text; -ALTER TABLE llx_projet_task ADD COLUMN note_public text AFTER note_private; -ALTER TABLE llx_projet_task ADD COLUMN rang integer DEFAULT 0 AFTER note_public; - --- Delete old key -ALTER TABLE llx_projet_task DROP INDEX fk_projet; -ALTER TABLE llx_projet_task DROP INDEX fk_user_creat; -ALTER TABLE llx_projet_task DROP INDEX statut; --- Add new key -ALTER TABLE llx_projet_task ADD INDEX idx_projet_task_fk_projet (fk_projet); -ALTER TABLE llx_projet_task ADD INDEX idx_projet_task_fk_user_creat (fk_user_creat); -ALTER TABLE llx_projet_task ADD INDEX idx_projet_task_fk_user_valid (fk_user_valid); --- V4.1 DELETE FROM llx_projet_task WHERE fk_projet NOT IN (SELECT rowid from llx_projet); --- V4.1 UPDATE llx_projet_task set fk_user_creat=NULL WHERE fk_user_creat IS NOT NULL AND fk_user_creat NOT IN (SELECT rowid from llx_user); --- V4.1 UPDATE llx_projet_task set fk_user_valid=NULL WHERE fk_user_valid IS NOT NULL AND fk_user_valid NOT IN (SELECT rowid from llx_user); -ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_projet FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid); -ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user (rowid); -ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_user_valid FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid); - -ALTER TABLE llx_element_contact DROP FOREIGN KEY fk_element_contact_fk_c_type_contact; -ALTER TABLE llx_element_contact DROP INDEX fk_element_contact_fk_c_type_contact; -UPDATE llx_c_type_contact SET rowid='160' WHERE rowid='80'; -UPDATE llx_c_type_contact SET rowid='170' WHERE rowid='81'; -UPDATE llx_element_contact SET fk_c_type_contact='160' WHERE fk_c_type_contact='80'; -UPDATE llx_element_contact SET fk_c_type_contact='170' WHERE fk_c_type_contact='81'; -ALTER TABLE llx_element_contact ADD CONSTRAINT fk_element_contact_fk_c_type_contact FOREIGN KEY (fk_c_type_contact) REFERENCES llx_c_type_contact(rowid); - -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (161, 'project', 'internal', 'CONTRIBUTOR', 'Intervenant', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (171, 'project', 'external', 'CONTRIBUTOR', 'Intervenant', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (180, 'project_task', 'internal', 'TASKEXECUTIVE', 'Responsable', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (181, 'project_task', 'internal', 'CONTRIBUTOR', 'Intervenant', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (190, 'project_task', 'external', 'TASKEXECUTIVE', 'Responsable', 1); -insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (191, 'project_task', 'external', 'CONTRIBUTOR', 'Intervenant', 1); - -ALTER TABLE llx_projet ADD COLUMN description text AFTER title; -ALTER TABLE llx_projet CHANGE note note_private text; -ALTER TABLE llx_projet ADD COLUMN note_public text AFTER note_private; -ALTER TABLE llx_projet MODIFY fk_statut smallint DEFAULT 0 NOT NULL; -ALTER TABLE llx_projet MODIFY fk_user_creat integer NOT NULL; - --- Uniformize code: change tva_taux to tva_tx -ALTER TABLE llx_facturedet CHANGE tva_taux tva_tx real; -ALTER TABLE llx_facture_fourn_det CHANGE tva_taux tva_tx double(6,3); -ALTER TABLE llx_facturedet_rec CHANGE tva_taux tva_tx real DEFAULT 19.6; - --- Create table for entities -create table llx_entity -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp, - label varchar(255) NOT NULL, - description text, - datec datetime, - fk_user_creat integer, - visible tinyint DEFAULT 1 NOT NULL, - active tinyint DEFAULT 1 NOT NULL -) ENGINE=innodb; - -INSERT INTO llx_entity (rowid, label, description, datec, fk_user_creat, visible, active) VALUES (1, 'Default Entity', 'This is the default entity', NOW(), 1, 1, 1); - --- Add constraint --- V4.1 DELETE FROM llx_fichinterdet WHERE fk_fichinter NOT IN (SELECT rowid from llx_fichinter); -ALTER TABLE llx_fichinterdet ADD INDEX idx_fichinterdet_fk_fichinter (fk_fichinter); -ALTER TABLE llx_fichinterdet ADD CONSTRAINT fk_fichinterdet_fk_fichinter FOREIGN KEY (fk_fichinter) REFERENCES llx_fichinter (rowid); - - - --- This was created into 2.9.0 but we need them to avoid errors of migration to 2.8 using new classes -alter table llx_facture add column localtax1 double(24,8) DEFAULT 0 after tva; -alter table llx_facture add column localtax2 double(24,8) DEFAULT 0 after localtax1; -alter table llx_facturedet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx; -alter table llx_facturedet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx; -alter table llx_facturedet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva; -alter table llx_facturedet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1; - - - --- This was created into 3.0.0 but we need them to avoid errors of migration to 2.8 using new classes -ALTER TABLE llx_propaldet ADD COLUMN fk_parent_line integer NULL AFTER fk_propal; -ALTER TABLE llx_commandedet ADD COLUMN fk_parent_line integer NULL AFTER fk_commande; -ALTER TABLE llx_facturedet ADD COLUMN fk_parent_line integer NULL AFTER fk_facture; -ALTER TABLE llx_facturedet_rec ADD COLUMN fk_parent_line integer NULL AFTER fk_facture; diff --git a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql deleted file mode 100755 index d4c889d9398..00000000000 --- a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql +++ /dev/null @@ -1,329 +0,0 @@ --- --- Be carefull to requests order. --- This file must be loaded by calling /install/index.php page --- when current version is 2.8.0 or higher. --- - --- Add unique key -ALTER TABLE llx_product_stock ADD UNIQUE INDEX uk_product_stock (fk_product,fk_entrepot); - -ALTER TABLE llx_product_stock drop column location; - --- Add missing table llx_product_association -create table llx_product_association -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_product_pere integer NOT NULL DEFAULT 0, - fk_product_fils integer NOT NULL DEFAULT 0, - qty double NULL -)ENGINE=innodb; - - -ALTER TABLE llx_product_association ADD UNIQUE INDEX uk_product_association (fk_product_pere, fk_product_fils); - -ALTER TABLE llx_product_association ADD INDEX idx_product_association_fils (fk_product_fils); - - - -ALTER TABLE llx_product ADD INDEX idx_product_label (label); - --- V4.1 DELETE FROM llx_projet_task WHERE fk_projet NOT IN (SELECT rowid from llx_projet); --- V4.1 UPDATE llx_projet_task set fk_user_creat=NULL WHERE fk_user_creat IS NOT NULL AND fk_user_creat NOT IN (SELECT rowid from llx_user); --- V4.1 UPDATE llx_projet_task set fk_user_valid=NULL WHERE fk_user_valid IS NOT NULL AND fk_user_valid NOT IN (SELECT rowid from llx_user); - -ALTER table llx_bank_account ADD COLUMN fk_pays integer DEFAULT 0 NOT NULL after domiciliation; -ALTER TABLE llx_bank_account ADD COLUMN fk_departement integer DEFAULT NULL after domiciliation; -ALTER TABLE llx_socpeople ADD COLUMN fk_departement integer DEFAULT NULL after ville; -ALTER TABLE llx_adherent ADD COLUMN fk_departement integer DEFAULT NULL after ville; -ALTER TABLE llx_entrepot ADD COLUMN fk_departement integer DEFAULT NULL after ville; - -ALTER TABLE llx_bookmark ADD COLUMN position integer DEFAULT 0; - --- Rename llx_product_det -ALTER TABLE llx_product_det RENAME TO llx_product_lang; -ALTER TABLE llx_product_lang ADD UNIQUE INDEX uk_product_lang (fk_product, lang); --- V4.1 DELETE FROM llx_product_lang WHERE fk_product NOT IN (SELECT rowid from llx_product); -ALTER TABLE llx_product_lang ADD CONSTRAINT fk_product_lang_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); - -ALTER TABLE llx_product ADD COLUMN virtual tinyint DEFAULT 0 NOT NULL AFTER tms; -ALTER TABLE llx_product ADD COLUMN fk_parent integer DEFAULT 0 AFTER virtual; - -alter table llx_societe add column default_lang varchar(6) after price_level; -alter table llx_socpeople add column default_lang varchar(6) after note; - - -alter table llx_mailing add column joined_file1 varchar(255); -alter table llx_mailing add column joined_file2 varchar(255); -alter table llx_mailing add column joined_file3 varchar(255); -alter table llx_mailing add column joined_file4 varchar(255); - -update llx_facture_fourn set fk_statut=2 where fk_statut=1 AND paye=1; - -alter table llx_facture_fourn add column close_code varchar(16) after remise; -alter table llx_facture_fourn add column close_note varchar(128) after close_code; - --- Add local taxes -alter table llx_facture add column localtax1 double(24,8) DEFAULT 0 after tva; -alter table llx_facture add column localtax2 double(24,8) DEFAULT 0 after localtax1; -alter table llx_facturedet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx; -alter table llx_facturedet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx; -alter table llx_facturedet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva; -alter table llx_facturedet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1; - -alter table llx_facture_rec add column localtax1 double(24,8) DEFAULT 0 after tva; -alter table llx_facture_rec add column localtax2 double(24,8) DEFAULT 0 after localtax1; -alter table llx_facturedet_rec add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx; -alter table llx_facturedet_rec add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx; -alter table llx_facturedet_rec add column total_localtax1 double(24,8) DEFAULT 0 after total_tva; -alter table llx_facturedet_rec add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1; - -alter table llx_c_tva add column localtax1 double NOT NULL DEFAULT 0 after taux; -alter table llx_c_tva add column localtax2 double NOT NULL DEFAULT 0 after localtax1; - -alter table llx_propal add column localtax1 double(24,8) DEFAULT 0 after tva; -alter table llx_propal add column localtax2 double(24,8) DEFAULT 0 after localtax1; -alter table llx_propaldet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx; -alter table llx_propaldet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx; -alter table llx_propaldet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva; -alter table llx_propaldet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1; - -alter table llx_commande add column localtax1 double(24,8) DEFAULT 0 after tva; -alter table llx_commande add column localtax2 double(24,8) DEFAULT 0 after localtax1; -alter table llx_commandedet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx; -alter table llx_commandedet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx; -alter table llx_commandedet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva; -alter table llx_commandedet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1; - -alter table llx_commande_fournisseur add column localtax1 double(24,8) DEFAULT 0 after tva; -alter table llx_commande_fournisseur add column localtax2 double(24,8) DEFAULT 0 after localtax1; -alter table llx_commande_fournisseurdet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx; -alter table llx_commande_fournisseurdet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx; -alter table llx_commande_fournisseurdet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva; -alter table llx_commande_fournisseurdet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1; - -alter table llx_facture_fourn add column localtax1 double(24,8) DEFAULT 0 after tva; -alter table llx_facture_fourn add column localtax2 double(24,8) DEFAULT 0 after localtax1; -alter table llx_facture_fourn_det add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx; -alter table llx_facture_fourn_det add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx; -alter table llx_facture_fourn_det add column total_localtax1 double(24,8) DEFAULT 0 after tva; -alter table llx_facture_fourn_det add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1; - -alter table llx_product add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx; -alter table llx_product add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx; -alter table llx_product_price add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx; -alter table llx_product_price add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx; - -alter table llx_contratdet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx; -alter table llx_contratdet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx; -alter table llx_contratdet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva; -alter table llx_contratdet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1; - -alter table llx_product add column hidden tinyint DEFAULT 0; - -alter table llx_product add column length float DEFAULT NULL after weight_units; -alter table llx_product add column length_units tinyint DEFAULT NULL after length; -alter table llx_product add column surface float DEFAULT NULL after length_units; -alter table llx_product add column surface_units tinyint DEFAULT NULL after surface; - -alter table llx_product add column accountancy_code_sell varchar(15) after fk_barcode_type; -alter table llx_product add column accountancy_code_buy varchar(15) after accountancy_code_sell; - -ALTER TABLE llx_product drop column stock_loc; -ALTER TABLE llx_product_stock add column location varchar(32); - -ALTER TABLE llx_expedition DROP FOREIGN KEY fk_expedition_fk_adresse_livraison; -ALTER TABLE llx_expedition DROP INDEX idx_expedition_fk_adresse_livraison; -ALTER TABLE llx_expedition ADD COLUMN ref_customer varchar(30) AFTER entity; -ALTER TABLE llx_expedition ADD COLUMN date_delivery date DEFAULT NULL AFTER date_expedition; -ALTER TABLE llx_expedition CHANGE COLUMN fk_adresse_livraison fk_address integer DEFAULT NULL; - -ALTER TABLE llx_livraison DROP FOREIGN KEY fk_livraison_fk_adresse_livraison; -ALTER TABLE llx_livraison DROP INDEX idx_livraison_fk_adresse_livraison; -ALTER TABLE llx_livraison change ref_client ref_customer varchar(30); -ALTER TABLE llx_livraison change date_livraison date_delivery date DEFAULT NULL; -ALTER TABLE llx_livraison CHANGE COLUMN fk_adresse_livraison fk_address integer DEFAULT NULL; - -ALTER TABLE llx_c_actioncomm MODIFY libelle varchar(48) NOT NULL; - -ALTER TABLE llx_facture MODIFY tva double(24,8) DEFAULT 0; -ALTER TABLE llx_facture MODIFY total double(24,8) DEFAULT 0; -ALTER TABLE llx_facture MODIFY total_ttc double(24,8) DEFAULT 0; -ALTER TABLE llx_facture MODIFY amount double(24,8) DEFAULT 0 NOT NULL; - -ALTER TABLE llx_facturedet MODIFY tva_tx double(6,3); -ALTER TABLE llx_facturedet MODIFY subprice double(24,8); -ALTER TABLE llx_facturedet MODIFY price double(24,8); -ALTER TABLE llx_facturedet MODIFY total_ht double(24,8); -ALTER TABLE llx_facturedet MODIFY total_tva double(24,8); -ALTER TABLE llx_facturedet MODIFY total_ttc double(24,8); - -ALTER TABLE llx_facture_rec MODIFY tva double(24,8) DEFAULT 0; -ALTER TABLE llx_facture_rec MODIFY total double(24,8) DEFAULT 0; -ALTER TABLE llx_facture_rec MODIFY total_ttc double(24,8) DEFAULT 0; -ALTER TABLE llx_facture_rec MODIFY amount double(24,8) DEFAULT 0 NOT NULL; - -ALTER TABLE llx_facturedet_rec MODIFY tva_tx double(6,3); -ALTER TABLE llx_facturedet_rec MODIFY subprice double(24,8); -ALTER TABLE llx_facturedet_rec MODIFY price double(24,8); -ALTER TABLE llx_facturedet_rec MODIFY total_ht double(24,8); -ALTER TABLE llx_facturedet_rec MODIFY total_tva double(24,8); -ALTER TABLE llx_facturedet_rec MODIFY total_ttc double(24,8); - - -ALTER TABLE llx_adherent ADD COLUMN civilite varchar(6) after entity; - -ALTER TABLE llx_deplacement ADD COLUMN fk_projet integer DEFAULT 0 after fk_soc; - --- Custom list -DROP TABLE llx_c_field_list; -create table llx_c_field_list -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp, - element varchar(64) NOT NULL, - entity integer DEFAULT 1 NOT NULL, - name varchar(32) NOT NULL, - alias varchar(32) NOT NULL, - title varchar(32) NOT NULL, - align varchar(6) DEFAULT 'left', - sort tinyint DEFAULT 1 NOT NULL, - search tinyint DEFAULT 0 NOT NULL, - enabled varchar(255) DEFAULT 1, - rang integer DEFAULT 0 -)ENGINE=innodb; - -INSERT INTO llx_c_field_list (rowid, element, entity, name, alias, title, align, sort, search, enabled, rang) VALUES -(1, 'product_default', 1, 'p.ref', 'ref', 'Ref', 'left', 1, 1, '1', 1), -(2, 'product_default', 1, 'p.label', 'label', 'Label', 'left', 1, 1, '1', 2), -(3, 'product_default', 1, 'p.barcode', 'barcode', 'BarCode', 'center', 1, 1, '$conf->barcode->enabled', 3), -(4, 'product_default', 1, 'p.tms', 'datem', 'DateModification', 'center', 1, 0, '1', 4), -(5, 'product_default', 1, 'p.price', 'price', 'SellingPriceHT', 'right', 1, 0, '1', 5), -(6, 'product_default', 1, 'p.price_ttc', 'price_ttc', 'SellingPriceTTC', 'right', 1, 0, '1', 6), -(7, 'product_default', 1, 'p.stock', 'stock', 'Stock', 'right', 0, 0, '$conf->stock->enabled', 7), -(8, 'product_default', 1, 'p.envente', 'status', 'Status', 'right', 1, 0, '1', 8); - - -UPDATE llx_adherent SET pays = null where pays <= '0' and pays != '0'; -ALTER table llx_adherent MODIFY pays integer; - --- Drop old tables -DROP TABLE llx_projet_milestone; -ALTER TABLE llx_projet drop column fk_milestone; - -ALTER TABLE llx_deplacement ADD COLUMN fk_statut INTEGER DEFAULT 1 NOT NULL after type; - -drop table llx_appro; - -ALTER TABLE llx_events MODIFY COLUMN user_agent varchar(255) NULL; - -create table llx_categorie_member -( - fk_categorie integer NOT NULL, - fk_member integer NOT NULL -)ENGINE=innodb; - -ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member); -ALTER TABLE llx_categorie_member ADD INDEX idx_categorie_member_fk_categorie (fk_categorie); -ALTER TABLE llx_categorie_member ADD INDEX idx_categorie_member_fk_member (fk_member); - -ALTER TABLE llx_categorie_member ADD CONSTRAINT fk_categorie_member_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid); -ALTER TABLE llx_categorie_member ADD CONSTRAINT fk_categorie_member_member_rowid FOREIGN KEY (fk_member) REFERENCES llx_adherent (rowid); - -ALTER TABLE llx_product ADD COLUMN canvas varchar(32) DEFAULT 'default@product'; -ALTER TABLE llx_product MODIFY COLUMN canvas varchar(32) DEFAULT 'default@product'; -UPDATE llx_product SET canvas = 'default@product' WHERE fk_product_type = 0 AND (canvas = '' OR canvas = 'default'); -UPDATE llx_product SET canvas = 'service@product' WHERE fk_product_type = 1 AND (canvas = '' OR canvas = 'service'); -UPDATE llx_product SET canvas = 'livre@droitpret' WHERE canvas = 'livre'; -UPDATE llx_product SET canvas = 'livrecontrat@droitpret' WHERE canvas = 'livrecontrat'; -UPDATE llx_product SET canvas = 'livrecouverture@droitpret' WHERE canvas = 'livrecouverture'; - - -ALTER TABLE llx_menu DROP INDEX idx_menu_uk_menu; - -ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, position, url, entity); - -UPDATE llx_const SET name = 'MAIN_MODULE_PRODUCT' WHERE name = 'MAIN_MODULE_PRODUIT'; - -UPDATE llx_expedition set ref_customer = NULL where ref_customer = ''; - --- Add more predefined action codes -- -insert into llx_c_actioncomm (id, code, type, libelle, module) values (30, 'AC_SUP_ORD', 'system', 'Send supplier order by email' ,'supplier_order'); -insert into llx_c_actioncomm (id, code, type, libelle, module) values (31, 'AC_SUP_INV', 'system', 'Send supplier invoice by email' ,'supplier_invoice'); - --- Rename llx_societe_adresse_livraison -ALTER TABLE llx_societe_adresse_livraison RENAME TO llx_societe_address; -ALTER TABLE llx_societe_address CHANGE COLUMN nom name varchar(60); -ALTER TABLE llx_societe_address CHANGE COLUMN fk_societe fk_soc integer DEFAULT 0; - --- Add new spanish VAT from July 2010 -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,note,active) values ( 45, 4, '18','0','4','VAT standard rate from July 2010',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,note,active) values ( 46, 4, '8','0','1','VAT reduced rate from July 2010',1); - --- Add Argentina Data --- Regions Argentina (id pays=23) -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2301, 23, 2301, '', 0, 'Norte', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2302, 23, 2302, '', 0, 'Litoral', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2303, 23, 2303, '', 0, 'Cuyana', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2304, 23, 2304, '', 0, 'Central', 1); -INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2305, 23, 2305, '', 0, 'Patagonia', 1); - --- Provinces Argentina -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2301', 2301, '', 01, 'CATAMARCA', 'Catamarca', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2302', 2301, '', 02, 'YUJUY', 'Yujuy', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2303', 2301, '', 03, 'TUCAMAN', 'Tucamán', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2304', 2301, '', 04, 'SANTIAGO DEL ESTERO', 'Santiago del Estero', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2305', 2301, '', 05, 'SALTA', 'Salta', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2306', 2302, '', 06, 'CHACO', 'Chaco', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2307', 2302, '', 07, 'CORRIENTES', 'Corrientes', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2308', 2302, '', 08, 'ENTRE RIOS', 'Entre Ríos', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2309', 2302, '', 09, 'FORMOSA MISIONES', 'Formosa Misiones', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2310', 2302, '', 10, 'SANTA FE', 'Santa Fe', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2311', 2303, '', 11, 'LA RIOJA', 'La Rioja', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2312', 2303, '', 12, 'MENDOZA', 'Mendoza', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2313', 2303, '', 13, 'SAN JUAN', 'San Juan', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2314', 2303, '', 14, 'SAN LUIS', 'San Luis', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2315', 2304, '', 15, 'CORDOBA', 'Córdoba', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2316', 2304, '', 16, 'BUENOS AIRES', 'Buenos Aires', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2317', 2304, '', 17, 'CABA', 'Caba', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2318', 2305, '', 18, 'LA PAMPA', 'La Pampa', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2319', 2305, '', 19, 'NEUQUEN', 'Neuquén', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2320', 2305, '', 20, 'RIO NEGRO', 'Río Negro', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2321', 2305, '', 21, 'CHUBUT', 'Chubut', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2322', 2305, '', 22, 'SANTA CRUZ', 'Santa Cruz', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2323', 2305, '', 23, 'TIERRA DEL FUEGO', 'Tierra del Fuego', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2324', 2305, '', 24, 'ISLAS MALVINAS', 'Islas Malvinas', 1); -INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2325', 2305, '', 25, 'ANTARTIDA', 'Antártida', 1); - --- Juridical status Argentina -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2301', 'Monotributista', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2302', 'Sociedad Civil', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2303', 'Sociedades Comerciales', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2304', 'Sociedades de Hecho', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2305', 'Sociedades Irregulares', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2306', 'Sociedad Colectiva', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2307', 'Sociedad en Comandita Simple', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2308', 'Sociedad de Capital e Industria', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2309', 'Sociedad Accidental o en participación', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2310', 'Sociedad de Responsabilidad Limitada', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2311', 'Sociedad Anónima', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2312', 'Sociedad Anónima con Participación Estatal Mayoritaria', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2313', 'Sociedad en Comandita por Acciones (arts. 315 a 324, LSC)', 1); - - -DELETE from llx_const where name='USER_PASSWORD_GENERATED' and value='default'; - - -ALTER TABLE llx_boxes_def DROP INDEX uk_boxes_def; -ALTER TABLE llx_boxes_def MODIFY file varchar(200) NOT NULL; -ALTER TABLE llx_boxes_def MODIFY note varchar(130); -ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity, note); - --- Fix bad old data -UPDATE llx_bank_url SET type='payment' WHERE type='?' AND label='(payment)' AND url LIKE '%compta/paiement/fiche.php%'; - - -update llx_const set value ='eldy' where name = 'MAIN_THEME' and (value= 'rodolphe' or value='dev' or value='bluelagoon'); -update llx_user_param set value ='eldy' where param = 'MAIN_THEME' and (value= 'rodolphe' or value='dev' or value='bluelagoon'); - - -ALTER TABLE llx_tmp_caisse MODIFY fk_article integer NOT NULL; diff --git a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql deleted file mode 100644 index b3fbcca8ed1..00000000000 --- a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql +++ /dev/null @@ -1,169 +0,0 @@ --- --- Be carefull to requests order. --- This file must be loaded by calling /install/index.php page --- when current version is 2.9.0 or higher. --- --- To add a column: ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol; --- To rename a column: ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60); --- To change type of field: ALTER TABLE llx_table MODIFY name varchar(60); --- To remove a column: ALTER TABLE llx_table DROP COLUMN colname; - -ALTER TABLE llx_paiement MODIFY amount double(24,8); -ALTER TABLE llx_paiement_facture MODIFY amount double(24,8); - --- Fix bad old data -UPDATE llx_bank_url SET type='payment' WHERE type='?' AND label='(payment)' AND url LIKE '%compta/paiement/fiche.php%'; - --- Add recuperableonly field -ALTER TABLE llx_product add COLUMN recuperableonly integer NOT NULL DEFAULT '0' after tva_tx; -ALTER TABLE llx_product_price add COLUMN recuperableonly integer NOT NULL DEFAULT '0' after tva_tx; - --- Rename envente into tosell and add tobuy -ALTER TABLE llx_product CHANGE COLUMN envente tosell tinyint DEFAULT 1; -ALTER TABLE llx_product add COLUMN tobuy tinyint DEFAULT 1 after tosell; -ALTER TABLE llx_product_price CHANGE COLUMN envente tosell tinyint DEFAULT 1; - -ALTER TABLE llx_bank MODIFY COLUMN fk_type varchar(6); - -ALTER TABLE llx_boxes_def DROP INDEX uk_boxes_def; -ALTER TABLE llx_boxes_def MODIFY file varchar(200) NOT NULL; -ALTER TABLE llx_boxes_def MODIFY note varchar(130); -ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity, note); - -ALTER TABLE llx_notify_def MODIFY fk_contact integer NULL; -ALTER TABLE llx_notify_def ADD COLUMN fk_user integer NULL after fk_contact; -ALTER TABLE llx_notify_def ADD COLUMN type varchar(16) DEFAULT 'email'; - -ALTER TABLE llx_notify MODIFY fk_contact integer NULL; -ALTER TABLE llx_notify ADD COLUMN fk_user integer NULL after fk_contact; -ALTER TABLE llx_notify ADD COLUMN type varchar(16) DEFAULT 'email'; - -ALTER TABLE llx_actioncomm MODIFY label varchar(128) NOT NULL; - -ALTER TABLE llx_expedition MODIFY date_expedition datetime; -ALTER TABLE llx_expedition MODIFY date_delivery datetime NULL; - -ALTER TABLE llx_societe ADD COLUMN canvas varchar(32) NULL AFTER default_lang; -ALTER TABLE llx_societe MODIFY canvas varchar(32) NULL; - -ALTER TABLE llx_cond_reglement RENAME TO llx_c_payment_term; -ALTER TABLE llx_expedition_methode RENAME TO llx_c_shipment_mode; - -ALTER TABLE llx_facturedet_rec ADD COLUMN special_code integer UNSIGNED DEFAULT 0 AFTER total_ttc; -ALTER TABLE llx_facturedet_rec ADD COLUMN rang integer DEFAULT 0 AFTER special_code; - -ALTER TABLE llx_actioncomm ADD COLUMN fk_supplier_order integer; -ALTER TABLE llx_actioncomm ADD COLUMN fk_supplier_invoice integer; - -ALTER TABLE llx_propaldet ADD COLUMN fk_parent_line integer NULL AFTER fk_propal; -ALTER TABLE llx_commandedet ADD COLUMN fk_parent_line integer NULL AFTER fk_commande; -ALTER TABLE llx_facturedet ADD COLUMN fk_parent_line integer NULL AFTER fk_facture; -ALTER TABLE llx_facturedet_rec ADD COLUMN fk_parent_line integer NULL AFTER fk_facture; - --- Remove old Spanish TVA -UPDATE llx_c_tva SET taux = '18' WHERE rowid = 41; -UPDATE llx_c_tva SET taux = '8' WHERE rowid = 42; -DELETE FROM llx_c_tva WHERE rowid = 45; -DELETE FROM llx_c_tva WHERE rowid = 46; - - -ALTER TABLE llx_adherent ADD COLUMN import_key varchar(14); -ALTER TABLE llx_categorie ADD COLUMN import_key varchar(14); - - -ALTER TABLE llx_product ADD COLUMN customcode varchar(32) after note; -ALTER TABLE llx_product ADD COLUMN fk_country integer after customcode; - - -ALTER TABLE llx_ecm_directories ADD UNIQUE INDEX idx_ecm_directories (label, fk_parent, entity); -ALTER TABLE llx_ecm_documents ADD UNIQUE INDEX idx_ecm_documents (fullpath_dol); - --- Add modules facture fournisseur -INSERT INTO llx_const (name, value, type, note, visible) values ('INVOICE_SUPPLIER_ADDON_PDF', 'canelle','chaine','',0); -ALTER TABLE llx_facture_fourn ADD COLUMN model_pdf varchar(50) after note_public; - -CREATE TABLE llx_c_ziptown -( - rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, - code varchar(5) DEFAULT NULL, - fk_county integer NOT NULL, - zip varchar(10) NOT NULL, - town varchar(255) NOT NULL, - active tinyint NOT NULL DEFAULT 1 -) ENGINE=innodb; - -ALTER TABLE llx_c_ziptown ADD INDEX idx_c_ziptown_fk_county (fk_county); -ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_county FOREIGN KEY (fk_county) REFERENCES llx_c_departements (rowid); - -ALTER TABLE llx_socpeople ADD COLUMN canvas varchar(32) NULL after default_lang; -ALTER TABLE llx_socpeople MODIFY canvas varchar(32) NULL; - -UPDATE llx_socpeople SET canvas = 'default' WHERE canvas = 'default@contact'; -UPDATE llx_societe SET canvas = 'default' WHERE canvas = 'default@thirdparty'; -UPDATE llx_societe SET canvas = 'individual' WHERE canvas = 'individual@thirdparty'; - -INSERT INTO llx_const (name, value, type, note, visible) values ('MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS','7','chaine','Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées',0); - -ALTER TABLE llx_actioncomm ADD COLUMN fulldayevent smallint NOT NULL default 0 after priority; - --- Enhance POS module -DROP TABLE llx_tmp_caisse; -CREATE TABLE llx_pos_tmp ( - id integer NOT NULL AUTO_INCREMENT PRIMARY KEY, - fk_article integer NOT NULL, - qte real NOT NULL, - fk_tva integer NOT NULL, - remise_percent real NOT NULL, - remise real NOT NULL, - total_ht double(24,8) NOT NULL, - total_tva double(24,8) NOT NULL, - total_ttc double(24,8) NOT NULL -) ENGINE=innodb; - --- Add external ref -ALTER TABLE llx_facture ADD COLUMN ref_ext varchar(30) after entity; -ALTER TABLE llx_commande ADD COLUMN ref_ext varchar(30) after entity; -ALTER TABLE llx_propal ADD COLUMN ref_ext varchar(30) after entity; -ALTER TABLE llx_user ADD COLUMN ref_ext varchar(30) after entity; -ALTER TABLE llx_societe ADD COLUMN ref_ext varchar(60) after entity; -ALTER TABLE llx_product ADD COLUMN ref_ext varchar(30) after entity; - - -ALTER TABLE llx_mailing_cibles CHANGE COLUMN url source_url integer; -ALTER TABLE llx_mailing_cibles MODIFY source_url varchar(160); -ALTER TABLE llx_mailing_cibles ADD COLUMN source_id integer after source_url; -ALTER TABLE llx_mailing_cibles ADD COLUMN source_type varchar(16) after source_id; - -ALTER TABLE llx_facture_rec DROP COLUMN frequency; -ALTER TABLE llx_facture_rec ADD COLUMN frequency integer; -ALTER TABLE llx_facture_rec ADD COLUMN unit_frequency varchar(2) DEFAULT 'd'; -ALTER TABLE llx_facture_rec ADD COLUMN date_when datetime DEFAULT NULL; -ALTER TABLE llx_facture_rec ADD COLUMN date_last_gen datetime DEFAULT NULL; -ALTER TABLE llx_facture_rec ADD COLUMN nb_gen_done integer DEFAULT NULL; -ALTER TABLE llx_facture_rec ADD COLUMN nb_gen_max integer DEFAULT NULL; - - -ALTER TABLE llx_user ADD COLUMN openid varchar(255); - --- Enhance Withdrawal module -INSERT INTO llx_action_def (rowid,code,titre,description,objet_type) values (7,'NOTIFY_TRN_WITHDRAW','Transmit withdraw','Executed when a withdrawal is transmited','withdraw'); -INSERT INTO llx_action_def (rowid,code,titre,description,objet_type) values (8,'NOTIFY_CRD_WITHDRAW','Credite withdraw','Executed when a withdrawal is credited','withdraw'); -INSERT INTO llx_action_def (rowid,code,titre,description,objet_type) values (9,'NOTIFY_EMT_WITHDRAW','Emit withdraw','Executed when a withdrawal is emited','withdraw'); - -ALTER TABLE llx_prelevement_notifications MODIFY action varchar(32); - -ALTER TABLE llx_c_tva ADD COLUMN accountancy_code varchar(15) DEFAULT NULL; - - -UPDATE llx_c_actioncomm set module='invoice_supplier' WHERE module='supplier_invoice'; -UPDATE llx_c_actioncomm set module='order_supplier' WHERE module='supplier_order'; -UPDATE llx_documentmodel set type='invoice_supplier' WHERE type='supplier_invoice'; -UPDATE llx_documentmodel set type='order_supplier' WHERE type='supplier_order'; -UPDATE llx_c_type_contact set element='invoice_supplier' WHERE element='facture_fourn'; -UPDATE llx_c_type_contact set module='invoice_supplier' WHERE module='supplier_invoice'; -UPDATE llx_c_type_contact set module='order_supplier' WHERE module='supplier_order'; - -ALTER TABLE llx_facturedet DROP INDEX uk_fk_remise_except; -ALTER TABLE llx_facturedet ADD UNIQUE INDEX uk_fk_remise_except (fk_remise_except, fk_facture); - -ALTER TABLE llx_societe_remise MODIFY remise_client double(6,3) DEFAULT 0 NOT NULL; diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 0ad0d3df04d..0c25049d7e2 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -19,6 +19,7 @@ -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); + ALTER TABLE llx_c_paiement ADD COLUMN accountancy_code varchar(32) DEFAULT NULL AFTER active; -- Defined only to have specific list for countries that can't use generic list (like argentina that need type A or B) @@ -68,10 +69,17 @@ ALTER TABLE llx_projet_task_time ADD COLUMN task_datehour datetime after task_da -- Localtaxes by thirds ALTER TABLE llx_c_tva MODIFY COLUMN localtax1 varchar(10); ALTER TABLE llx_c_tva MODIFY COLUMN localtax2 varchar(10); -ALTER TABLE llx_localtax ADD COLUMN localtaxtype tinyint(4) after entity; +ALTER TABLE llx_localtax ADD COLUMN localtaxtype tinyint after entity; ALTER TABLE llx_societe ADD COLUMN localtax1_value double(6,3) after localtax1_assuj; ALTER TABLE llx_societe ADD COLUMN localtax2_value double(6,3) after localtax2_assuj; +-- Change on table c_pays +ALTER TABLE llx_c_pays RENAME TO llx_c_country; + +ALTER TABLE llx_c_country CHANGE libelle label VARCHAR(50); + +ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_pays FOREIGN KEY (fk_pays) REFERENCES llx_c_country (rowid); +ALTER TABLE llx_c_regions ADD CONSTRAINT fk_c_regions_fk_pays FOREIGN KEY (fk_pays) REFERENCES llx_c_country (rowid); -- Added missing relations of llx_product @@ -81,7 +89,7 @@ ALTER TABLE llx_product MODIFY COLUMN fk_country INTEGER NULL DEFAULT NULL; -- VPGSQL8.2 ALTER TABLE llx_product ALTER COLUMN fk_country SET DEFAULT NULL; UPDATE llx_product SET fk_country = NULL WHERE fk_country = 0; ALTER TABLE llx_product ADD INDEX idx_product_fk_country (fk_country); -ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_country FOREIGN KEY (fk_country) REFERENCES llx_c_pays (rowid); +ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_country FOREIGN KEY (fk_country) REFERENCES llx_c_country (rowid); -- fk_user_author ALTER TABLE llx_product MODIFY COLUMN fk_user_author INTEGER NULL DEFAULT NULL; -- VPGSQL8.2 ALTER TABLE llx_product ALTER COLUMN fk_user_author DROP NOT NULL; @@ -125,6 +133,7 @@ create table llx_accounting_fiscalyear )ENGINE=innodb; ALTER TABLE llx_contrat ADD COLUMN ref_ext varchar(30) after ref; +ALTER TABLE llx_contrat ADD COLUMN ref_customer varchar(30) after ref_ext; ALTER TABLE llx_propal ADD COLUMN fk_shipping_method integer AFTER date_livraison; ALTER TABLE llx_commande ADD COLUMN fk_shipping_method integer AFTER date_livraison; @@ -939,25 +948,31 @@ create table llx_c_email_templates position smallint, -- Position topic text, -- Predefined topic content text -- Predefined text -)ENGINE=innodb; +) ENGINE=innodb; -UPDATE llx_c_regions SET rowid = 0 where rowid = 1; -DELETE FROM llx_c_departements WHERE fk_region NOT IN (select rowid from llx_c_regions) AND fk_region IS NOT NULL AND fk_region <> 0; -ALTER TABLE llx_c_departements ADD CONSTRAINT fk_departements_fk_region FOREIGN KEY (fk_region) REFERENCES llx_c_regions (rowid); +ALTER TABLE llx_c_departements DROP FOREIGN KEY fk_departements_fk_region; +--UPDATE llx_c_regions SET rowid = 0 where rowid = 1; + +ALTER TABLE llx_c_regions ADD UNIQUE INDEX uk_code_region (code_region); + +DELETE FROM llx_c_departements WHERE fk_region NOT IN (select code_region from llx_c_regions) AND fk_region IS NOT NULL AND fk_region <> 0; + +ALTER TABLE llx_c_departements ADD CONSTRAINT fk_departements_code_region FOREIGN KEY (fk_region) REFERENCES llx_c_regions (code_region); CREATE TABLE llx_holiday_types ( rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, label varchar(45) NOT NULL, description varchar(255) NOT NULL, - affect int(1) NOT NULL, - delay int(1) NOT NULL, + affect integer NOT NULL, + delay integer NOT NULL, insertAt DATETIME NOT NULL, updateAt DATETIME, deleteAt DATETIME, nbCongesDeducted varchar(255) NOT NULL, nbCongesEveryMonth varchar(255) NOT NULL +<<<<<<< HEAD ); -- Change on table c_civilite @@ -968,3 +983,17 @@ ALTER TABLE llx_c_civility ADD UNIQUE INDEX uk_c_civility(code); ALTER TABLE llx_adherent CHANGE civilite civility VARCHAR(6); ALTER TABLE llx_socpeople CHANGE civilite civility VARCHAR(6); ALTER TABLE llx_user CHANGE civilite civility VARCHAR(6); +======= +) ENGINE=innodb; + +ALTER TABLE llx_c_type_fees CHANGE libelle label VARCHAR(30); +ALTER TABLE llx_c_type_fees ADD COLUMN accountancy_code varchar(32) DEFAULT NULL AFTER label; + + +ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_fk_element (fk_element); + +ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_task (fk_task); +ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_date (task_date); +ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_datehour (task_datehour); + +>>>>>>> refs/remotes/Upstream/develop diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 9a48747c4da..1da34c65bab 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -22,3 +22,4 @@ ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_datea (datea); ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_fk_soc (fk_soc); ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_fk_contact (fk_contact); ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_code (code); +ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_fk_element (fk_element); diff --git a/htdocs/install/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_country.key.sql similarity index 79% rename from htdocs/install/mysql/tables/llx_c_pays.key.sql rename to htdocs/install/mysql/tables/llx_c_country.key.sql index 6714a0644b2..b65d78d559f 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.key.sql +++ b/htdocs/install/mysql/tables/llx_c_country.key.sql @@ -17,6 +17,6 @@ -- ======================================================================== -ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_country_code (code); -ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_country_code_iso (code_iso); -ALTER TABLE llx_c_pays ADD UNIQUE INDEX idx_c_pays_libelle (libelle); +ALTER TABLE llx_c_country ADD UNIQUE INDEX idx_c_country_code (code); +ALTER TABLE llx_c_country ADD UNIQUE INDEX idx_c_country_code_iso (code_iso); +ALTER TABLE llx_c_country ADD UNIQUE INDEX idx_c_country_label (label); diff --git a/htdocs/install/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_country.sql similarity index 94% rename from htdocs/install/mysql/tables/llx_c_pays.sql rename to htdocs/install/mysql/tables/llx_c_country.sql index 6f4401d5110..f9c69a5093b 100644 --- a/htdocs/install/mysql/tables/llx_c_pays.sql +++ b/htdocs/install/mysql/tables/llx_c_country.sql @@ -17,11 +17,11 @@ -- -- ======================================================================== -create table llx_c_pays +create table llx_c_country ( rowid integer PRIMARY KEY, code varchar(2) NOT NULL, code_iso varchar(3) , - libelle varchar(50) NOT NULL, + label varchar(50) NOT NULL, active tinyint DEFAULT 1 NOT NULL )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql index 4c8ceb42582..427d031a705 100644 --- a/htdocs/install/mysql/tables/llx_c_departements.key.sql +++ b/htdocs/install/mysql/tables/llx_c_departements.key.sql @@ -21,5 +21,5 @@ ALTER TABLE llx_c_departements ADD UNIQUE uk_departements (code_departement,fk_r ALTER TABLE llx_c_departements ADD INDEX idx_departements_fk_region (fk_region); -ALTER TABLE llx_c_departements ADD CONSTRAINT fk_departements_fk_region FOREIGN KEY (fk_region) REFERENCES llx_c_regions (rowid); +ALTER TABLE llx_c_departements ADD CONSTRAINT fk_departements_fk_region FOREIGN KEY (fk_region) REFERENCES llx_c_regions (code_region); diff --git a/htdocs/install/mysql/tables/llx_c_email_template.sql b/htdocs/install/mysql/tables/llx_c_email_template.sql index 875314bf4c8..532ecd995eb 100644 --- a/htdocs/install/mysql/tables/llx_c_email_template.sql +++ b/htdocs/install/mysql/tables/llx_c_email_template.sql @@ -17,7 +17,7 @@ -- Table with templates of emails -- =================================================================== -create table llx_c_email_templates +create table llx_c_email_template ( rowid integer AUTO_INCREMENT PRIMARY KEY, entity integer DEFAULT 1 NOT NULL, -- multi company id diff --git a/htdocs/install/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql index 838396d5d57..82295ba52b3 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.key.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.key.sql @@ -18,4 +18,5 @@ ALTER TABLE llx_c_regions ADD INDEX idx_c_regions_fk_pays (fk_pays); -ALTER TABLE llx_c_regions ADD CONSTRAINT fk_c_regions_fk_pays FOREIGN KEY (fk_pays) REFERENCES llx_c_pays (rowid); +ALTER TABLE llx_c_regions ADD UNIQUE INDEX uk_code_region (code_region); +ALTER TABLE llx_c_regions ADD CONSTRAINT fk_c_regions_fk_pays FOREIGN KEY (fk_pays) REFERENCES llx_c_country (rowid); diff --git a/htdocs/install/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql index c15c1e9b204..9c677ee44f7 100644 --- a/htdocs/install/mysql/tables/llx_c_regions.sql +++ b/htdocs/install/mysql/tables/llx_c_regions.sql @@ -20,7 +20,7 @@ create table llx_c_regions ( rowid integer AUTO_INCREMENT PRIMARY KEY, - code_region integer UNIQUE NOT NULL, + code_region integer NOT NULL, fk_pays integer NOT NULL, cheflieu varchar(50), tncc integer, diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql index b19aae75e5a..145330012eb 100644 --- a/htdocs/install/mysql/tables/llx_c_type_fees.sql +++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql @@ -1,6 +1,7 @@ -- ======================================================================== -- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville -- Copyright (C) 2004 Laurent Destailleur +-- Copyright (C) 2014 Alexandre Spangaro -- -- 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 @@ -19,9 +20,10 @@ create table llx_c_type_fees ( - id integer AUTO_INCREMENT PRIMARY KEY, - code varchar(12) NOT NULL, - libelle varchar(30), - active tinyint DEFAULT 1 NOT NULL, - module varchar(32) NULL + id integer AUTO_INCREMENT PRIMARY KEY, + code varchar(12) NOT NULL, + label varchar(30), + accountancy_code varchar(32) NULL, + active tinyint DEFAULT 1 NOT NULL, + module varchar(32) NULL )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql index 3bc138d8816..9d4ff705d04 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.key.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.key.sql @@ -23,6 +23,6 @@ ALTER TABLE llx_c_ziptown ADD INDEX idx_c_ziptown_fk_pays (fk_pays); ALTER TABLE llx_c_ziptown ADD INDEX idx_c_ziptown_zip (zip); ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_county FOREIGN KEY (fk_county) REFERENCES llx_c_departements (rowid); -ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_pays FOREIGN KEY (fk_pays) REFERENCES llx_c_pays(rowid); +ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_pays FOREIGN KEY (fk_pays) REFERENCES llx_c_country(rowid); ALTER TABLE llx_c_ziptown ADD UNIQUE INDEX uk_ziptown_fk_pays (zip, town, fk_pays); diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 11a0dfe0350..0eaab74af20 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.sql @@ -21,7 +21,7 @@ create table llx_c_ziptown rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, code varchar(5) DEFAULT NULL, -- ex: code insee pour la France fk_county integer, -- State id in llx_c_departements - fk_pays integer NOT NULL DEFAULT 0, -- Country id in llx_c_pays + fk_pays integer NOT NULL DEFAULT 0, -- Country id in llx_c_country zip varchar(10) NOT NULL, -- Zip code town varchar(255) NOT NULL, -- Town name active tinyint NOT NULL DEFAULT 1 diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql index 9cef8fddb42..496ecd4c97d 100644 --- a/htdocs/install/mysql/tables/llx_contrat.sql +++ b/htdocs/install/mysql/tables/llx_contrat.sql @@ -22,7 +22,7 @@ create table llx_contrat ( rowid integer AUTO_INCREMENT PRIMARY KEY, ref varchar(30), -- contrat reference - ref_ext varchar(30), -- external contract ref + ref_supplier varchar(30), -- suplier contract ref entity integer DEFAULT 1 NOT NULL, -- multi company id tms timestamp, datec datetime, -- creation date diff --git a/htdocs/install/mysql/tables/llx_holiday_types.sql b/htdocs/install/mysql/tables/llx_holiday_types.sql index 242483b5974..d49a79f5748 100755 --- a/htdocs/install/mysql/tables/llx_holiday_types.sql +++ b/htdocs/install/mysql/tables/llx_holiday_types.sql @@ -27,4 +27,4 @@ CREATE TABLE llx_holiday_types ( deleteAt DATETIME, nbCongesDeducted varchar(255) NOT NULL, nbCongesEveryMonth varchar(255) NOT NULL -); +) ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index 218bd40490e..fb471910230 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -32,5 +32,5 @@ ALTER TABLE llx_product ADD INDEX idx_product_fk_barcode_type (fk_barcode_type); ALTER TABLE llx_product ADD UNIQUE INDEX uk_product_barcode (barcode, fk_barcode_type, entity); -ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_country FOREIGN KEY (fk_country) REFERENCES llx_c_pays (rowid); +ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_country FOREIGN KEY (fk_country) REFERENCES llx_c_country (rowid); ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES llx_c_barcode_type (rowid); diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.key.sql b/htdocs/install/mysql/tables/llx_projet_task_time.key.sql new file mode 100644 index 00000000000..ad1433f8dca --- /dev/null +++ b/htdocs/install/mysql/tables/llx_projet_task_time.key.sql @@ -0,0 +1,22 @@ +-- =========================================================================== +-- Copyright (C) 2014 Laurent Destailleur +-- +-- 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 +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =========================================================================== + +ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_task (fk_task); +ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_date (task_date); +ALTER TABLE llx_projet_task_time ADD INDEX idx_projet_task_time_datehour (task_datehour); + diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql index 3275d589685..89395436c43 100644 --- a/htdocs/install/pgsql/functions/functions.sql +++ b/htdocs/install/pgsql/functions/functions.sql @@ -62,6 +62,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_adherent_type FOR EA CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bank FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bank_account FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_boxes_def FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); +CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_email_template FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_field_list FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_shipment_mode FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_chargesociales FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); @@ -111,7 +112,6 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_societe_rib FOR EACH CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_socpeople FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_socpeople_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_stock_mouvement FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); -CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_texts FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_tva FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); diff --git a/htdocs/langs/ar_SA/link.lang b/htdocs/langs/ar_SA/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/ar_SA/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang index 1fc7e6e5c37..6ae8506a43d 100644 --- a/htdocs/langs/bg_BG/companies.lang +++ b/htdocs/langs/bg_BG/companies.lang @@ -43,7 +43,7 @@ ThirdPartyCustomersStats=Клиенти ThirdPartyCustomersWithIdProf12=Клиентите с %s или %s ThirdPartySuppliers=Доставчици ThirdPartyType=Вид на Трета страна -Company/Fundation=Фирма / Организация +Company/Fundation=Фирма/Организация Individual=Частно лице ToCreateContactWithSameName=Автоматично ще създаде физически контакт с едни и същи данни ParentCompany=Фирмата майка @@ -67,9 +67,9 @@ Country=Държава CountryCode=Код на държавата CountryId=ID на държава Phone=Телефон -Skype=Skype +Skype=Скайп Call=Call -Chat=Chat +Chat=Чат PhonePro=Сл. телефон PhonePerso=Дом. телефон PhoneMobile=Моб. телефон diff --git a/htdocs/langs/bg_BG/languages.lang b/htdocs/langs/bg_BG/languages.lang index d906aac747d..10c04219ba2 100644 --- a/htdocs/langs/bg_BG/languages.lang +++ b/htdocs/langs/bg_BG/languages.lang @@ -61,7 +61,7 @@ Language_tr_TR=Турски Language_sl_SI=Словенски Language_sv_SV=Шведски Language_sv_SE=Шведски -Language_sq_AL=Albanian +Language_sq_AL=Албански Language_sk_SK=Словашки Language_th_TH=Thai Language_uk_UA=Украински diff --git a/htdocs/langs/bg_BG/link.lang b/htdocs/langs/bg_BG/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/bg_BG/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/bs_BA/link.lang b/htdocs/langs/bs_BA/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/bs_BA/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/ca_ES/link.lang b/htdocs/langs/ca_ES/link.lang index 688d7f4eda6..8b1efb75ef3 100644 --- a/htdocs/langs/ca_ES/link.lang +++ b/htdocs/langs/ca_ES/link.lang @@ -1,9 +1,8 @@ -CHARSET=UTF-8 -LinkANewFile=Enllaçar un nou arxiu/document -LinkedFiles=Arxius i documents enllaçats -NoLinkFound=No hi ha enllaços associats -LinkComplete=L'arxiu s'ha enllaçat correctament -ErrorFileNotLinked=L'arxiu no ha pogut ser enllaçat -LinkRemoved=Ha estat eliminat l'enllaç %s -ErrorFailedToDeleteLink=Impossible eliminar l'enllaç '%s' -ErrorFailedToUpdateLink=Impossible modificar l'enllaç '%s' +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/cs_CZ/link.lang b/htdocs/langs/cs_CZ/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/cs_CZ/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/da_DK/link.lang b/htdocs/langs/da_DK/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/da_DK/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/de_DE/link.lang b/htdocs/langs/de_DE/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/de_DE/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/el_GR/link.lang b/htdocs/langs/el_GR/link.lang new file mode 100644 index 00000000000..b2c136aed40 --- /dev/null +++ b/htdocs/langs/el_GR/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Συνδέσετε ένα νέο αρχείο / έγγραφο +LinkedFiles=Συνδεδεμένα αρχεία και έγγραφα +NoLinkFound=Δεν υπάρχουν εγγεγραμμένοι σύνδεσμοι +LinkComplete=Το αρχείο έχει συνδεθεί με επιτυχία +ErrorFileNotLinked=Το αρχείο δεν μπορεί να συνδεθεί +LinkRemoved=Ο σύνδεσμος %s έχει αφαιρεθεί +ErrorFailedToDeleteLink= Απέτυχε η αφαίρεση του συνδέσμου '%s' +ErrorFailedToUpdateLink= Απέτυχε η ενημέρωση του σύνδεσμο '%s' diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 1176a3ab7e9..f4a7aa0f5c6 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -517,12 +517,16 @@ Module6000Name=Workflow Module6000Desc=Workflow management Module20000Name=Holidays Module20000Desc=Declare and follow employees holidays +Module39000Name=Product batch +Module39000Desc=Batch number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50100Name=Point of sales Module50100Desc=Point of sales module Module50200Name= Paypal Module50200Desc= Module to offer an online payment page by credit card with Paypal +Module50400Name=Accounting (advanced) +Module50400Desc=Accounting management (double parties) Module54000Name=PrintIPP Module54000Desc=Print via Cups IPP Printer. Module55000Name=Open Poll diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 9f8353acfda..5490d496221 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -197,8 +197,8 @@ Rest=Pending AmountExpected=Amount claimed ExcessReceived=Excess received EscompteOffered=Discount offered (payment before term) -SendBillRef=Send invoice %s -SendReminderBillRef=Send invoice %s (reminder) +SendBillRef=Submission of invoice %s +SendReminderBillRef=Submission of invoice %s (reminder) StandingOrders=Standing orders StandingOrder=Standing order NoDraftBills=No draft invoices @@ -295,6 +295,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to ConfirmRemoveDiscount=Are you sure you want to remove this discount ? RelatedBill=Related invoice RelatedBills=Related invoices +LatestRelatedBill=Latest related invoice +WarningBillExist=Warning, one or more invoice already exist # PaymentConditions PaymentConditionShortRECEP=Immediate diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang index a7f2edfff22..73c399eb604 100644 --- a/htdocs/langs/en_US/commercial.lang +++ b/htdocs/langs/en_US/commercial.lang @@ -44,8 +44,8 @@ DoneActions=Completed events DoneActionsFor=Completed events for %s ToDoActions=Incomplete events ToDoActionsFor=Incomplete events for %s -SendPropalRef=Send commercial proposal %s -SendOrderRef=Send order %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Not applicable StatusActionToDo=To do StatusActionDone=Complete diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index b874ef58f07..89404614db5 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -136,6 +136,8 @@ ErrorBadFormat=Bad format! ErrorPaymentDateLowerThanInvoiceDate=Payment date (%s) cant' be before invoice date (%s) for invoice %s. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang index 58579a74276..266ce059d8b 100644 --- a/htdocs/langs/en_US/interventions.lang +++ b/htdocs/langs/en_US/interventions.lang @@ -25,9 +25,11 @@ NameAndSignatureOfExternalContact=Name and signature of customer : DocumentModelStandard=Standard document model for interventions InterventionCardsAndInterventionLines=Interventions and lines of interventions ClassifyBilled=Classify "Billed" +ClassifyUnBilled=Classify "Unbilled" StatusInterInvoiced=Billed RelatedInterventions=Related interventions ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention TypeContact_fichinter_internal_INTERVENING=Intervening diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index 039d47f6aa9..170f5984c4d 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. DateDeliveryPlanned=Planed date of delivery DateReceived=Date delivery received SendShippingByEMail=Send shipment by EMail -SendShippingRef=Send shipment %s +SendShippingRef=Submission of shipment %s ActionsOnShipping=Events on shipment LinkToTrackYourPackage=Link to track your package ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 141f4cedf56..12d3b0eedd6 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -47,7 +47,7 @@ DictionarySetup=Diccionarios Dictionary=Diccionarios ErrorReservedTypeSystemSystemAuto=El uso del tipo 'system' y 'systemauto' está reservado. Puede utilizar 'user' como valor para añadir su propio registro ErrorCodeCantContainZero=El código no puede contener el valor 0 -DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +DisableJavascript=Deshabilitar Javascript y funciones Ajax (Recomendado para personas ciegas o navegadores de texto) ConfirmAjax=Utilizar los diálogos de confirmación Ajax UseSearchToSelectCompanyTooltip=También si tiene un gran número de terceros (> 100 000), puede aumentar la velocidad mediante el establecimiento COMPANY_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena. UseSearchToSelectCompany=Utilice los campos de autocompletar para elegir terceros en lugar de utilizar un cuadro de lista @@ -928,14 +928,14 @@ EventsSetup=Configuración del registro de eventos LogEvents=Auditoría de la seguridad de eventos Audit=Auditoría InfoDolibarr=Info. Dolibarr -InfoBrowser=Infos Browser +InfoBrowser=Información del navegador InfoOS=Info. SO InfoWebServer=Info. servidor InfoDatabase=Info. base de datos InfoPHP=Info. PHP InfoPerf=Info. rendimiento -BrowserName=Browser name -BrowserOS=Browser OS +BrowserName=Nombre del navegador +BrowserOS=S.O. del navegador ListEvents=Auditoría de eventos ListOfSecurityEvents=Listado de eventos de seguridad Dolibarr SecurityEventsPurged=Eventos de seguridad purgados @@ -1444,8 +1444,8 @@ ConfirmDeleteLine=¿Está seguro de querer eliminar esta línea? ##### Tax ##### TaxSetup=Configuración del módulo Impuestos, cargas sociales y dividendos OptionVatMode=Opción de carga de IVA -OptionVATDefault=Cash basis -OptionVATDebitOption=Accrual basis +OptionVATDefault=Criterio de caja +OptionVATDebitOption=Criterio de devengo OptionVatDefaultDesc=La carga del IVA es:
-en el envío de los bienes (en la práctica se usa la fecha de la factura)
-sobre el pago por los servicios OptionVatDebitOptionDesc=La carga del IVA es:
-en el envío de los bienes (en la práctica se usa la fecha de la factura)
-sobre la facturación de los servicios SummaryOfVatExigibilityUsedByDefault=Tiempo de exigibilidad de IVA por defecto según la opción eligida diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang index ee602281186..9fc192ecbb1 100644 --- a/htdocs/langs/es_ES/compta.lang +++ b/htdocs/langs/es_ES/compta.lang @@ -124,11 +124,11 @@ CalcModeVATEngagement=Modo %sIVA sobre facturas cobradas%s. CalcModeDebt=Modo %sCréditos-Deudas%s llamada contabilidad de compromiso. CalcModeEngagement=Modo %sIngresos-Gastos%s llamada contabilidad de caja CalcModeLT1= Modo %sRE facturas a clientes - facturas de proveedores%s -CalcModeLT1Debt=Mode %sRE on customer invoices%s -CalcModeLT1Rec= Mode %sRE on suppliers invoices%s -CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s -CalcModeLT2Debt=Mode %sIRPF on customer invoices%s -CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s +CalcModeLT1Debt=Modo %sRE en facturas a clientes%s +CalcModeLT1Rec= Modo %sRE en facturas de proveedores%s +CalcModeLT2= Modo %sIRPF en facturas a clientes - facturas de proveedores%s +CalcModeLT2Debt=Modo %sIRPF en facturas a clientes%s +CalcModeLT2Rec= Modo %sIRPF en facturas de proveedores%s AnnualSummaryDueDebtMode=Resumen anual del balance de ingresos y gastos AnnualSummaryInputOutputMode=Resumen anual del balance de ingresos y gastos AnnualByCompaniesDueDebtMode=Balance de ingresos y gastos, desglosado por terceros, en modo%sCréditos-Deudas%s llamada contabilidad de compromiso. diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang index 69aa6e627e2..34c6c689043 100644 --- a/htdocs/langs/es_ES/errors.lang +++ b/htdocs/langs/es_ES/errors.lang @@ -134,8 +134,8 @@ ErrorOpenIDSetupNotComplete=Ha configurado Dolibarr para aceptar la autentificac ErrorWarehouseMustDiffers=El almacén de origen y destino deben de ser diferentes ErrorBadFormat=¡El formato es erróneo! ErrorPaymentDateLowerThanInvoiceDate=La fecha de pago (%s) no puede ser anterior a la fecha (%s) de la factura %s. -ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, este miembro aún no está enlazado un tercero. Enlace el miembro a un tercero existente o cree un tercero nuevo antes de crear la suscripción con la factura. -ErrorThereIsSomeDeliveries=Error, hay entregas vinculados a este envío. No se puede eliminar. +ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, este miembro aún no está enlazado a un tercero. Enlace el miembro a un tercero existente o cree un tercero nuevo antes de crear la suscripción con la factura. +ErrorThereIsSomeDeliveries=Error, hay entregas vinculadas a este envío. No se puede eliminar. # Warnings WarningMandatorySetupNotComplete=Los parámetros obligatorios de configuración no están todavía definidos @@ -153,4 +153,4 @@ WarningCloseAlways=Aviso, el cierre es realizado aunque la cantidad total difier WarningUsingThisBoxSlowDown=Atención, el uso de este panel provoca serias ralentizaciones en las páginas que muestran este panel. WarningClickToDialUserSetupNotComplete=La configuración de ClickToDial para su cuenta de usuario no está completa (vea la pestaña ClickToDial en su ficha de usuario) WarningNotRelevant=Operación irrelevante para este conjunto de datos -WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcionalidad desactivada cuando la configuración de visualización es optimizada para personas ciegas o navegadores de texto. diff --git a/htdocs/langs/es_ES/link.lang b/htdocs/langs/es_ES/link.lang index 305963a8ad8..f4141b7877a 100644 --- a/htdocs/langs/es_ES/link.lang +++ b/htdocs/langs/es_ES/link.lang @@ -1,9 +1,8 @@ -CHARSET=UTF-8 -LinkANewFile=Enlazar un nuevo archivo/documento -LinkedFiles=Archivos y documentos enlazados -NoLinkFound=No hay enlaces asociados -LinkComplete=El archivo se ha enlazado correctamente -ErrorFileNotLinked=El archivo no ha podido ser enlazado -LinkRemoved=Ha sido eliminado el enlace %s -ErrorFailedToDeleteLink=Imposible eliminar el enlace '%s' -ErrorFailedToUpdateLink=Imposible actualizar el enlace '%s' +LinkANewFile=Vincular un nuevo archivo/documento +LinkedFiles=Archivos y documentos vinculados +NoLinkFound=Sin enlaces registrados +LinkComplete=El archivo ha sido vinculado correctamente +ErrorFileNotLinked=El archivo no ha podido ser vinculado +LinkRemoved=El vínculo %s ha sido eliminado +ErrorFailedToDeleteLink= Error al eliminar el vínculo '%s' +ErrorFailedToUpdateLink= Error al actualizar el vínculo '%s' diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 7df5bcbed41..7764545ed0a 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -672,12 +672,12 @@ HelpCopyToClipboard=Use Ctrl+C para copiar al portapapeles SaveUploadedFileWithMask=Guardar el archivo con el nombre "%s" (sino "%s") OriginFileName=Nombre del archivo origen SetDemandReason=Definir origen -SetBankAccount=Define Bank Account -AccountCurrency=Account Currency +SetBankAccount=Definir cuenta bancaria +AccountCurrency=Divisa de la cuenta ViewPrivateNote=Ver notas XMoreLines=%s línea(s) ocultas PublicUrl=URL pública -AddBox=Add box +AddBox=Añadir caja # Week day Monday=Lunes diff --git a/htdocs/langs/et_EE/install.lang b/htdocs/langs/et_EE/install.lang index 31c4101e622..92902cbc4c8 100644 --- a/htdocs/langs/et_EE/install.lang +++ b/htdocs/langs/et_EE/install.lang @@ -10,8 +10,8 @@ ConfFileIsNotWritable=Seadistusfailil %s puudub kirjutamise õigus. Palun ConfFileIsWritable=Seadistusfail %s on kirjutatav. ConfFileReload=Lae kogu informatsioon seadistusfailist uuesti. PHPSupportSessions=Antud PHP toetab sessioone. -PHPSupportPOSTGETOk=Antud PHP toetab POST ja GET ja muutujaid. -PHPSupportPOSTGETKo=On võimalik, et antud PHP seadistus ei toeta POST ja/või GET muutujaid. Kontrolli php.ini failis parameetrit variables_order. +PHPSupportPOSTGETOk=Antud PHP toetab POST ja GET muutujaid. +PHPSupportPOSTGETKo=On võimalik, et antud PHP seadistus ei toeta POST ja/või GET muutujaid. Kontrolli php.ini failis parameetri variables_order väärtust. PHPSupportGD=Antud PHP toetab GD graafilisi funktsioone. PHPSupportUTF8=Antud PHP toetab UTF8 funktsioone. PHPMemoryOK=Antud PHP poolt kasutatav sessiooni maksimaalne mälu on %s. See peaks olema piisav. @@ -93,8 +93,8 @@ GoToSetupArea=Mine Dolibarri (seadistusala) MigrationNotFinished=Andmebaasi versioon ei ole täielikult ajakohane, seega pead uuendusprotsessi uuesti käivitama. GoToUpgradePage=Mine uuesti uuenduste lehele Examples=Näited -WithNoSlashAtTheEnd=Lõpus oleva kaldkriipsuta "/" -DirectoryRecommendation=Soovitav on kasutada kausta, mis asub väljaspool veebilehtede jaoks kasutatavat kausta. +WithNoSlashAtTheEnd=Lõpus oleva kaldkriipsuta "/" +DirectoryRecommendation=Soovitav on kasutada kausta, mis asub väljaspool veebilehtede säilitamise kausta. LoginAlreadyExists=On juba olemas DolibarrAdminLogin=Dolibarri administraatori kasutajanimi AdminLoginAlreadyExists=Dolibarri administraatori konto '%s' on juba olemas. Mine tagasi eelmisele lehele lisakasutaja loomiseks. @@ -106,9 +106,9 @@ ChoosedMigrateScript=Vali migratsiooni skript DataMigration=Andmete migratsioon DatabaseMigration=Andmebaasi struktuuri migratsioo ProcessMigrateScript=Skripti töötlemine -ChooseYourSetupMode=Vali paigalduse režiim ja klõpsa "Start" nupule... +ChooseYourSetupMode=Vali paigalduse režiim ja klõpsa "Start" nupule... FreshInstall=Värske paigaldus -FreshInstallDesc=Kasuta seda režiimi, kui tegu on esmapaigaldusega. Kui ei, siis selles režiimis saab parandada lõpuni viimata paigaldust. Versiooni uuendamiseks vali "Uuenda" režiim. +FreshInstallDesc=Esmapaigalduse puhul kasuta seda režiimi. Muul juhul saab antud režiimi abil parandada lõpuni viimata paigaldust. Versiooni uuendamiseks vali "Uuenda" režiim. Upgrade=Uuenda UpgradeDesc=Kasuta seda režiimi, kui tahad vanad Dolibarri failid asendada uuema versiooni failidega. See uuendab andmebaasi ja andmed. Start=Alusta diff --git a/htdocs/langs/et_EE/link.lang b/htdocs/langs/et_EE/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/et_EE/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/eu_ES/link.lang b/htdocs/langs/eu_ES/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/eu_ES/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index e36fb914b65..07fc523143f 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -1,53 +1,53 @@ # Dolibarr language file - Source file is en_US - admin -Foundation=پايه +Foundation=پایه Version=نسخه VersionProgram=برنامه نسخه -VersionLastInstall=نسخه اوليه نصب -VersionLastUpgrade=نسخه آخرين به روز رسانی -VersionExperimental=آزمايشی +VersionLastInstall=نسخه اولیه نصب +VersionLastUpgrade=نسخه آخرین به روز رسانی +VersionExperimental=تجربی VersionDevelopment=توسعه VersionUnknown=ناشناخته -VersionRecommanded=توصيه شده +VersionRecommanded=توصیه شده SessionId=جلسه ID -SessionSaveHandler=هندلر برای صرفه جويی در جلسات -SessionSavePath=محلی سازی را وارد نماييد و ذخيره سازی +SessionSaveHandler=هندلر برای صرفه جویی در جلسات +SessionSavePath=محلی سازی را وارد نمایید و ذخیره سازی PurgeSessions=پاکسازی جلسات -ConfirmPurgeSessions=آيا واقعاً می خواهيد تمام جلسات پاک شود؟ در اين حالت اتصال همه کاربران قطع می شود( بجز خودتان)\n -NoSessionListWithThisHandler=تنظيمات پی اچ پی شما برای ذخيره دوره های اتصال، اجازه ايجاد ليست از دوره های اتصال را نميدهد. -LockNewSessions=قفل کردن اتصالات جديد -ConfirmLockNewSessions=آيا برای محدود کردن هر اتصال جديد Dolibarr به خودتان مطمئن هستيد. تنها کاربر تا قادر به اتصال خواهد بود. +ConfirmPurgeSessions=آیا شما واقعا می خواهید برای پاکسازی تمام جلسات؟ این هر کاربر (به جز خودتان) قطع. +NoSessionListWithThisHandler=کنترل جویی در هزینه را وارد نمایید پیکربندی در PHP شما اجازه نمی دهد که لیست تمام جلسات در حال اجرا. +LockNewSessions=قفل کردن ارتباطات جدید +ConfirmLockNewSessions=آیا مطمئن هستید که می خواهید برای محدود کردن هر اتصال جدید Dolibarr به خودتان. تنها کاربر٪ s را قادر پس از آن برای اتصال خواهد بود. UnlockNewSessions=حذف قفل اتصال YourSession=نشست شما -Sessions=کاربران را وارد نماييد +Sessions=کاربران را وارد نمایید WebUserGroup=کاربر وب سرور / گروه -NoSessionFound=به نظر می رسد PHP شما به ليست جلسات فعال اجازه نمی دهد \nبرای صرفه جويی در جلسات از دايرکتوری استفاده می شود و ممکن است محافظت شده باشد (به عنوان مثال، با مجوز OS يا بخشنامهPHP open_basedir باشد). -HTMLCharset=مجموعه کاراکتر توليد شده برای صفحات HTML -DBStoringCharset=پايگاه داده مجموعه کاراکتر برای ذخيره داده ها -DBSortingCharset=پايگاه داده مجموعه کاراکتر مرتب سازی داده ها +NoSessionFound=PHP شما به نظر می رسد اجازه نمی دهد به لیست نمود. دایرکتوری استفاده می شود برای صرفه جویی در جلسات (٪ ها) ممکن است از آن محافظت شود (به عنوان مثال، با مجوز OS یا با PHP open_basedir باشد بخشنامه). +HTMLCharset=مجموعه کاراکتر برای صفحات HTML تولید +DBStoringCharset=پایگاه داده مجموعه کاراکتر برای ذخیره داده ها +DBSortingCharset=مجموعه نویسه پایگاه داده به مرتب سازی داده ها WarningModuleNotActive=بخش٪ s باید فعال باشد -WarningOnlyPermissionOfActivatedModules=تنها مجوز مربوط به ماژول های فعال در اينجا نشان داده شده است. شما می توانيد ماژول های ديگر را درقسمت صفحه اصلی-> راه اندازی-> ماژول ها فعال کنید. -DolibarrSetup=نصب يا بروزرسانی Dolibarr -DolibarrUser=کاربرDolibarr +WarningOnlyPermissionOfActivatedModules=تنها مجوز مربوط به ماژول های فعال در اینجا نشان داده شده است. شما می توانید ماژول های دیگر در صفحه صفحه اصلی> راه اندازی-> ماژول ها فعال کنید. +DolibarrSetup=Dolibarr نصب و یا ارتقا +DolibarrUser=Dolibarr کاربر InternalUser=کاربر داخلی ExternalUser=کاربر خارجی InternalUsers=کاربران داخلی ExternalUsers=کاربران خارجی GlobalSetup=راه اندازی جهانی -GUISetup=نمايش +GUISetup=نمایش SetupArea=منطقه راه اندازی -FormToTestFileUploadForm=فرم برای تست آپلود فايل (با توجه به راه اندازی) -IfModuleEnabled=ملاحظه: تنها در صورت فعال بودن ماژول ها موثر است -RemoveLock=حذف فايل در صورت مجوز از ابزار بروزرسانی صورت می گيرد. -RestoreLock=به هرکسی که استفاده از ابزار بروزرسانی را غير فعال کند، بازگرداندن فايل با مجوز فقط خواندن تعلق می گيرد. -SecuritySetup=تنظيمات امنيت -ErrorModuleRequirePHPVersion=خطا، اين ماژول نياز به PHP نسخه s ويا بالاتر را دارد -ErrorModuleRequireDolibarrVersion=خطا، اين ماژول نياز به Dolibarr نسخه s و يا بالاتر را دارد -ErrorDecimalLargerThanAreForbidden=خطا، دقت بالاتر ٪ s را پشتيبانی نمی شود. +FormToTestFileUploadForm=فرم برای تست آپلود فایل (با توجه به راه اندازی) +IfModuleEnabled=توجه داشته باشید: بله موثر است تنها در صورتی که بخش٪ s فعال است +RemoveLock=حذف فایل٪ s در صورت وجود اجازه می دهد تا استفاده از ابزار به روز رسانی. +RestoreLock=بازگرداندن فایل٪ s، با مجوز فقط خواندن، به هر استفاده از ابزار به روز رسانی را غیر فعال کنید. +SecuritySetup=راه اندازی امنیت +ErrorModuleRequirePHPVersion=خطا، این ماژول نیاز به PHP نسخه٪ s و یا بالاتر +ErrorModuleRequireDolibarrVersion=خطا، این ماژول نیاز به Dolibarr نسخه٪ s و یا بالاتر +ErrorDecimalLargerThanAreForbidden=خطا، دقت بالاتر از٪ s پشتیبانی نمی شود. DictionarySetup=راه اندازی فرهنگ لغت Dictionary=واژه نامه ها -ErrorReservedTypeSystemSystemAuto=ارزش 'سيستم' و برای نوع محفوظ است. شما می توانيد 'کاربر' به عنوان ارزش برای اضافه کردن رکورد خود استفاده کنيد +ErrorReservedTypeSystemSystemAuto=ارزش 'سیستم' و 'systemauto برای نوع محفوظ است. شما می توانید 'کاربر' به عنوان ارزش برای اضافه کردن رکورد خود استفاده کنید ErrorCodeCantContainZero=کد می تواند مقدار 0 را شامل نمی شود -DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +DisableJavascript=توابع غیر فعال کردن جاوا اسکریپت و آژاکس (توصیه شده برای فرد نابینا یا مرورگرهای متنی) ConfirmAjax=استفاده از popup ها به تایید آژاکس UseSearchToSelectCompanyTooltip=همچنین اگر شما تعداد زیادی از اشخاص ثالث (> 100 000)، شما می توانید سرعت با تنظیم COMPANY_DONOTSEARCH_ANYWHERE ثابت به 1 در راه اندازی-> دیگر افزایش دهد. جست و جو خواهد شد و سپس محدود به شروع از رشته است. UseSearchToSelectCompany=استفاده از رشته های تکمیل خودکار را انتخاب کنید اشخاص ثالث به جای استفاده از یک جعبه لیست. @@ -65,8 +65,8 @@ ShowPreview=نشان دادن پیش نمایش PreviewNotAvailable=پیش بازی در دسترس نیست ThemeCurrentlyActive=تم در حال حاضر فعال CurrentTimeZone=منطقه زمانی PHP (سرور) -MySQLTimeZone=TimeZone MySql (database) -TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered). +MySQLTimeZone=خروجی منطقه زمانی (پایگاه داده) +TZHasNoEffect=تاریخ های ذخیره شده و بازگردانده شده توسط سرور پایگاه داده به عنوان اگر آنها به عنوان رشته ارسال شده نگهداری شدند. منطقه زمانی اثر تنها زمانی که با استفاده از تابع UNIX_TIMESTAMP (که باید توسط Dolibarr استفاده نمی شود، بنابراین پایگاه داده TZ باید اثر ندارد حتی اگر پس از داده های وارد شده را تغییر داده اند،). Space=فضا Table=جدول Fields=زمینه @@ -118,7 +118,7 @@ LanguageBrowserParameter=پارامتر٪ بازدید کنندگان LocalisationDolibarrParameters=پارامترهای محلی سازی ClientTZ=کارفرما منطقه زمان (کاربر) ClientHour=زمان مشتری (کاربر) -OSTZ=Server OS Time Zone +OSTZ=سرور OS منطقه زمان PHPTZ=PHP سرور منطقه زمان PHPServerOffsetWithGreenwich=PHP سرور جبران عرض گرینویچ (ثانیه) ClientOffsetWithGreenwich=مشتری / مرورگر جبران عرض گرینویچ (ثانیه) @@ -235,8 +235,8 @@ OfficialWebSiteFr=وب سایت رسمی فرانسه OfficialWiki=Dolibarr مستندات در ویکی OfficialDemo=Dolibarr نسخه ی نمایشی آنلاین OfficialMarketPlace=بازار رسمی برای ماژول های خارجی / افزونه -OfficialWebHostingService=Referenced web hosting services (Cloud hosting) -ReferencedPreferredPartners=Preferred Partners +OfficialWebHostingService=خدمات وب اشاره میزبانی وب (ابر میزبانی وب) +ReferencedPreferredPartners=ترجیحی همکاران OtherResources=Autres ressources ForDocumentationSeeWiki=برای کاربر و یا اسناد و مدارک توسعه (دکتر، پرسش و ...)،
نگاهی به Dolibarr ویکی:
از٪ s ForAnswersSeeForum=برای هر گونه سوال / کمک های دیگر، شما می توانید انجمن Dolibarr استفاده کنید:
از٪ s @@ -296,7 +296,7 @@ CurrentVersion=نسخه فعلی Dolibarr CallUpdatePage=برو به صفحه ای که به روز رسانی ساختار بانک اطلاعاتی و دادهها:٪ است. LastStableVersion=آخرین نسخه پایدار GenericMaskCodes=شما می توانید ماسک شماره را وارد کنید. در این ماسک، تگ های زیر می تواند مورد استفاده قرار گیرد:
{000000} مربوط به تعداد خواهد شد که در هر یک از٪ s را افزایش مییابد. به عنوان بسیاری از صفر را وارد کنید به عنوان طول مورد نظر از ضد. شمارنده خواهد شد صفر از سمت چپ به منظور به صفر کرده اند و بسیاری از ماسک به پایان رسید.
{000.000 +000} همان قبلی است اما جبران مربوطه را به شماره در سمت راست علامت + شروع به کار رفته در اولین٪ است.
{000000 @ X} همان قبلی است اما شمارنده به صفر زمانی که ماه X برسد (x بین 1 و 12، و یا 0 به استفاده از ماه های اولیه سال مالی تعیین شده در تنظیمات خود را، و یا 99 به صفر هر ماه ). اگر این گزینه استفاده می شود و x است 2 یا بالاتر، و سپس دنباله {YY} {میلی متر} یا {تاریخ برای ورود yyyy} {میلی متر} نیز مورد نیاز است.
{تولد} روز (01 تا 31).
{میلی متر} ماه (01 تا 12).
{YY}، {تاریخ برای ورود yyyy} یا {Y} سال بیش از 2، 4 و یا 1 عدد.
-GenericMaskCodes2={cccc} the client code on n characters
{cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
{tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).
+GenericMaskCodes2={CCCC} کد مشتری در تعداد کاراکتر
{cccc000} کد مشتری در تعداد کاراکتر توسط شمارنده اختصاص داده شده برای مشتری است. این مبارزه اختصاص داده شده به مشتری است که در همان زمان از مبارزه جهانی بازنشانی کنید.
{TTTT} کد از نوع thirdparty در تعداد شخصیت (نگاه کنید به انواع فرهنگ لغت-thirdparty).
GenericMaskCodes3=تمام شخصیت های دیگر در ماسک دست نخورده باقی خواهد ماند.
فضاهای امکان پذیر نیست.
GenericMaskCodes4a=به عنوان مثال در 99٪ از TheCompany شخص ثالث انجام می شود 2007/1/31:
GenericMaskCodes4b=به عنوان مثال در شخص ثالث ایجاد شده در 2007/03/01:
@@ -373,9 +373,9 @@ ExtrafieldSelectList = انتخاب از جدول ExtrafieldSeparator=تفکیک کننده ExtrafieldCheckBox=جعبه ExtrafieldRadio=دکمه های رادیویی -ExtrafieldParamHelpselect=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key -ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... -ExtrafieldParamHelpradio=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... +ExtrafieldParamHelpselect=فهرست پارامترها را به مانند کلید، ارزش است

به عنوان مثال:
1، VALUE1
2، VALUE2
3، value3
...

به منظور داشتن لیست بسته به نوع دیگر:
1، VALUE1 | parent_list_code: parent_key
2، VALUE2 | parent_list_code: parent_key +ExtrafieldParamHelpcheckbox=فهرست پارامترها را به مانند کلید، ارزش است

به عنوان مثال:
1، VALUE1
2، VALUE2
3، value3
... +ExtrafieldParamHelpradio=فهرست پارامترها را به مانند کلید، ارزش است

به عنوان مثال:
1، VALUE1
2، VALUE2
3، value3
... ExtrafieldParamHelpsellist=لیست پارامترها می آید از یک جدول
نحو: table_name از: label_field: id_field :: فیلتر
به عنوان مثال: c_typent: libelle: شناسه :: فیلتر

فیلتر می تواند یک آزمون ساده است (به عنوان مثال فعال = 1) برای نمایش تنها ارزش فعال
اگر شما می خواهید برای فیلتر کردن در extrafields استفاده syntaxt extra.fieldcode = ... (که در آن کد رشته کد extrafield است)

به منظور داشتن لیست بسته به نوع دیگر:
c_typent: libelle: شناسه: parent_list_code | parent_column: فیلتر LibraryToBuildPDF=کتابخانه مورد استفاده برای ساخت PDF WarningUsingFPDF=اخطار: conf.php شما شامل dolibarr_pdf_force_fpdf بخشنامه = 1. این به این معنی شما استفاده از کتابخانه FPDF برای تولید فایل های PDF. این کتابخانه قدیمی است و بسیاری از ویژگی های (یونیکد، شفافیت تصویر، زبان سیریلیک، عربی و آسیایی، ...) را پشتیبانی نمی کند، بنابراین شما ممکن است خطا در PDF نسل را تجربه کنند.
برای حل این و دارای پشتیبانی کامل از PDF نسل، لطفا دانلود کنید کتابخانه TCPDF ، پس از آن اظهار نظر و یا حذف خط $ dolibarr_pdf_force_fpdf = 1، و اضافه کردن به جای $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir' @@ -439,7 +439,7 @@ Module56Name=تلفن Module56Desc=یکپارچه سازی تلفن Module57Name=سفارشات ایستاده Module57Desc=ایستاده سفارشات و مدیریت خروج -Module58Name=ClickToDial +Module58Name=کلیک برای تماس Module58Desc=یکپارچه سازی سیستم ClickToDial (ستاره، ...) Module59Name=Bookmark4u Module59Desc=اضافه کردن تابع برای ایجاد حساب کاربری Bookmark4u از یک حساب Dolibarr @@ -476,7 +476,7 @@ Module410Desc=ادغام Webcalendar Module500Name=هزینه های ویژه (مالیاتی، کمک های اجتماعی، سود سهام) Module500Desc=مدیریت هزینه های خاص مانند مالیات، مشارکت اجتماعی، سود سهام و حقوق Module510Name=حقوق -Module510Desc=Management of employees salaries and payments +Module510Desc=مدیریت کارکنان حقوق و پرداخت Module600Name=اطلاعیه ها Module600Desc=ارسال اطلاعیه ها از طریق ایمیل در برخی از وقایع کسب و کار Dolibarr به تماس با شخص ثالث Module700Name=کمک های مالی @@ -499,7 +499,7 @@ Module2400Name=دستور کار Module2400Desc=رویدادهای / وظایف و مدیریت برنامه Module2500Name=الکترونیکی مدیریت محتوا Module2500Desc=ذخیره و به اشتراک اسناد -Module2600Name=WebServices +Module2600Name=سرویس دهنده وب Module2600Desc=فعال کردن Dolibarr خدمات وب سرور Module2700Name=Gravatar در Module2700Desc=استفاده از سرویس آنلاین Gravatar در (www.gravatar.com) برای نشان دادن عکس از کاربران / کاربران (که با ایمیل های خود را). نیاز به دسترسی به اینترنت @@ -685,10 +685,10 @@ Permission401=خوانده شده تخفیف Permission402=ایجاد / اصلاح تخفیف Permission403=اعتبار تخفیف Permission404=حذف تخفیف -Permission510=Read Salaries -Permission512=Create/modify salaries -Permission514=Delete salaries -Permission517=Export salaries +Permission510=خوانده شده حقوق +Permission512=ایجاد / اصلاح حقوق +Permission514=حذف حقوق +Permission517=حقوق صادرات Permission531=خوانده شده خدمات Permission532=ایجاد / اصلاح خدمات Permission534=حذف خدمات @@ -785,7 +785,7 @@ VATIsNotUsedDesc=به طور پیش فرض مالیات بر ارزش افزود VATIsUsedExampleFR=در فرانسه، به این معنی شرکت و یا سازمان داشتن یک سیستم مالی واقعی (ساده شده واقعی یا عادی واقعی). یک سیستم است که در آن مالیات بر ارزش افزوده اعلام شده است. VATIsNotUsedExampleFR=در فرانسه، به این معنی انجمن هایی که بدون مالیات بر ارزش افزوده اعلام کرد و شرکت ها، سازمان ها و یا حرفه های لیبرال که انتخاب کرده اند سیستم میکرو به شرکت های مالی (مالیات بر ارزش افزوده در حق رای دادن) و بدون اعلان مالیات بر ارزش افزوده پرداخت مالیات بر ارزش افزوده حق رای دادن. در فاکتورها - این انتخاب خواهد شد مرجع "هنر 293B از CGI مالیات بر ارزش افزوده قابل اعمال غیر" نشان می دهد. ##### Local Taxes ##### -LTRate=Rate +LTRate=نرخ LocalTax1IsUsed=استفاده از مالیات دوم LocalTax1IsNotUsed=آیا مالیات دوم استفاده نکنید LocalTax1IsUsedDesc=استفاده از نوع دوم از مالیات (به غیر از مالیات بر ارزش افزوده) @@ -810,13 +810,13 @@ LocalTax2IsUsedDescES= نرخ RE به طور پیش فرض هنگام ایجاد LocalTax2IsNotUsedDescES= به طور پیش فرض IRPF پیشنهاد 0. پایان حکومت است. LocalTax2IsUsedExampleES= در اسپانیا، مترجمان آزاد و مستقل حرفه ای که ارائه خدمات و شرکت های که انتخاب کرده اند نظام مالیاتی از ماژول های. LocalTax2IsNotUsedExampleES= در اسپانیا آنها bussines به سیستم مالیاتی از ماژول های موضوع نیست. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases -CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases -CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales -CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales +CalcLocaltax=گزارش ها +CalcLocaltax1ES=فروش - خرید +CalcLocaltax1Desc=گزارش مالیات های محلی با تفاوت بین localtaxes فروش و localtaxes خرید محاسبه +CalcLocaltax2ES=خرید +CalcLocaltax2Desc=گزارش مالیات های محلی هستند که مجموع localtaxes خرید +CalcLocaltax3ES=فروش +CalcLocaltax3Desc=گزارش مالیات های محلی هستند که مجموع localtaxes فروش LabelUsedByDefault=برچسب استفاده می شود به طور پیش فرض اگر هیچ ترجمه ای برای کد یافت LabelOnDocuments=برچسب در اسناد NbOfDays=Nb در روز @@ -900,97 +900,97 @@ NoActiveBankAccountDefined=بدون حساب بانکی فعال تعریف OwnerOfBankAccount=صاحب حساب بانکی از٪ s BankModuleNotActive=ماژول حساب بانکی فعال نیست ShowBugTrackLink=نمایش لینک "گزارش خرابی" -ShowWorkBoard=وتظهر "طاولة العمل" على الصفحة الرئيسية -Alerts=تنبيهات -Delays=التأخير -DelayBeforeWarning=قبل التحذير من التأخير -DelaysBeforeWarning=محذرا من التأخير قبل -DelaysOfToleranceBeforeWarning=محذرا من التأخير قبل التسامح -DelaysOfToleranceDesc=تتيح لك هذه الشاشة لتحديد التأخير قبل السماح تنبيه يقال على الشاشة مع picto ٪ ق لكل عنصر في وقت متأخر. -Delays_MAIN_DELAY_ACTIONS_TODO=تأخير التسامح (أيام) قبل اتخاذ إجراءات في حالة تأهب على المخطط لم تتحقق -Delays_MAIN_DELAY_ORDERS_TO_PROCESS=تأخير التسامح (أيام) قبل تنبيه على أوامر لم +ShowWorkBoard=نمایش "میز کار" در صفحه اصلی +Alerts=تصویر، موسیقی +Delays=تاخیر +DelayBeforeWarning=تاخیر قبل از هشدار دهنده +DelaysBeforeWarning=تاخیر قبل از هشدار دهنده +DelaysOfToleranceBeforeWarning=تاخیر تحمل قبل از هشدار دهنده +DelaysOfToleranceDesc=این صفحه نمایش به شما اجازه تعریف تاخیر قابل تحمل قبل از یک هشدار بر روی صفحه نمایش با picto٪ برای هر یک از عناصر در اواخر گزارش شده است. +Delays_MAIN_DELAY_ACTIONS_TODO=تحمل (در روز) تاخیر قبل از آماده باش در مراسم برنامه ریزی شده هنوز متوجه شدم +Delays_MAIN_DELAY_ORDERS_TO_PROCESS=تحمل (در روز) تاخیر قبل از آماده باش در دستور هنوز پردازش نشده Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=تحمل (در روز) تاخیر قبل از آماده باش در تامین کنندگان سفارشات هنوز پردازش نشده -Delays_MAIN_DELAY_PROPALS_TO_CLOSE=التسامح التأخير (في يوم) في حالة تأهب على المقترحات المعروضة ليقفل -Delays_MAIN_DELAY_PROPALS_TO_BILL=تأخير التسامح (أيام) قبل تنبيه بشأن المقترحات لا توصف -Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=تأخير التسامح (في يوم) في حالة تأهب قبل يوم والخدمات لتفعيل -Delays_MAIN_DELAY_RUNNING_SERVICES=تأخير التسامح (في أيام) قبل انتهاء حالة التأهب على الخدمات -Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=تأخير التسامح (في يوم) في حالة تأهب قبل الموردين على الفواتير غير المدفوعة -Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=تأخير التسامح (في يوم) في حالة تأهب قبل العملاء على الفواتير غير المدفوعة -Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=تأخير التسامح (في يوم) في حالة تأهب قبل يوم في انتظار التسوية المصرفية -Delays_MAIN_DELAY_MEMBERS=تأخير التسامح (في يوم) في حالة تأهب قبل يوم تأخير رسوم العضوية -Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=تأخير التسامح (في يوم) في حالة تأهب قبل لإيداع الشيكات للقيام -SetupDescription1=جميع البارامترات المتاحة في مجال الإعداد تسمح لك قبل البدء في الإعداد Dolibarr استخدامه. -SetupDescription2=2 إن أهم الخطوات هي الإعداد 2 أول من غادر في إعداد القائمة ، وهذا يعني الشركة / المؤسسة صفحة إعداد صفحة إعداد وحدات : -SetupDescription3=البارامترات في إعداد القائمة --> الشركة / المؤسسة المطلوب لأن مدخلات تستخدم المعلومات عن Dolibarr عرض وتعديل السلوك Dolibarr (على سبيل المثال لخصائص تتعلق بلدكم). -SetupDescription4=البارامترات في إعداد القائمة --> الوحدات المطلوبة لأن Dolibarr ليست ثابتة تخطيط موارد المؤسسات وإدارة علاقات العملاء ولكن مبلغ من عدة وحدات ، وكلها مستقلة بشكل أو بآخر. انه فقط بعد تفعيل وحدات للاهتمام كنت في ذلك سترى ملامح وردت في القوائم. -SetupDescription5=القيود الأخرى القائمة في إدارة اختياري البارامترات. -EventsSetup=پیکربندی برای رویدادهای گزارشات -LogEvents=مراجعة الحسابات الأحداث الأمنية +Delays_MAIN_DELAY_PROPALS_TO_CLOSE=تحمل (در روز) تاخیر قبل از آماده باش در طرح به بستن +Delays_MAIN_DELAY_PROPALS_TO_BILL=تحمل (در روز) تاخیر قبل از آماده باش در طرح های ثبت شده در صورتحساب ندارد +Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=تاخیر تحمل (در روز) قبل از آماده باش در خدمات را به فعال +Delays_MAIN_DELAY_RUNNING_SERVICES=تاخیر تحمل (در روز) قبل از هشدار در مورد خدمات منقضی شده +Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=تاخیر تحمل (در روز) قبل از آماده باش در فاکتورها منبع پرداخت نشده +Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence تاخیر (در روز) قبل از آماده باش در صورت حساب مشتری پرداخت نشده +Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=تاخیر تحمل (در روز) قبل از آماده باش در انتظار آشتی بانکی +Delays_MAIN_DELAY_MEMBERS=تاخیر تحمل (در روز) قبل از آماده باش در حق عضویت به تاخیر افتاد +Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=تاخیر تحمل (در روز) قبل از آماده باش برای چک سپرده به انجام +SetupDescription1=تمام پارامترهای موجود در منطقه راه اندازی شما اجازه می دهد به راه اندازی Dolibarr قبل از شروع به استفاده از آن. +SetupDescription2=2 مهم ترین مراحل راه اندازی 2 برای اولین بار از آنهایی که در منوی تنظیمات سمت چپ است، این بدان معنی است صفحه راه اندازی شرکت / پایه و اساس و صفحه تنظیمات ماژول ها: +SetupDescription3=پارامترها در منوی تنظیمات -> شرکت / پایه مورد نیاز است، زیرا اطلاعات وارد شده بر روی صفحه نمایش Dolibarr استفاده می شود و برای تغییر رفتار Dolibarr (به عنوان مثال برای ویژگی های مربوط به کشور خود را). +SetupDescription4=پارامترها در منوی تنظیمات -> ماژول های مورد نیاز به دلیل Dolibarr است ERP / CRM ثابت اما مبلغ از ماژول های مختلف، همه مستقل بیشتر یا کمتر نیست. تنها پس از فعال کردن ماژول های شما جالب در آن خواهید دید ویژگی های در منوهای ظاهر شده است. +SetupDescription5=دیگر نوشته های منو مدیریت پارامتر اختیاری دارد. +EventsSetup=راه اندازی برای رویدادهای سیاهههای مربوط +LogEvents=رویدادهای ممیزی امنیت Audit=ممیزی InfoDolibarr=ساعات Dolibarr -InfoBrowser=Infos Browser +InfoBrowser=ساعات مرورگر InfoOS=ساعات OS InfoWebServer=ساعات وب سرور InfoDatabase=پایگاه داده ساعات روز InfoPHP=ساعات PHP InfoPerf=ساعات اجرای -BrowserName=Browser name -BrowserOS=Browser OS -ListEvents=مراجعة الأحداث -ListOfSecurityEvents=قائمة الأحداث الأمنية Dolibarr +BrowserName=نام مرورگر +BrowserOS=مرورگر OS +ListEvents=رویدادهای حسابرسی +ListOfSecurityEvents=فهرست حوادث امنیتی Dolibarr SecurityEventsPurged=رویدادهای امنیتی پاکسازی -LogEventDesc=هنا يمكنك تمكين قطع الأشجار لDolibarr الأحداث الأمنية. يمكن للمشرفين ثم انظر مضمونه عبر نظام القائمة أدوات -- لمراجعة الحسابات. محذرا من أن هذه الميزة يمكن أن تستهلك كمية كبيرة من البيانات في قاعدة البيانات. -AreaForAdminOnly=هذه الميزات يمكن أن تستخدم من قبل مدير المستخدمين فقط. -SystemInfoDesc=نظام المعلومات المتنوعة المعلومات التقنية تحصل في قراءة فقط وواضحة للمشرفين فقط. -SystemAreaForAdminOnly=هذا المجال المتاح لمدير المستخدمين فقط. أيا من Dolibarr أذونات يمكن أن تقلل من هذا الحد. -CompanyFundationDesc=تعديل على هذه الصفحة كل المعلومات المعروفة للشركة أو مؤسسة تحتاج لإدارة -DisplayDesc=يمكنك ان تختار كل معلمة إلى Dolibarr هنا الشكل والمظهر -AvailableModules=تتوفر وحدات -ToActivateModule=لتفعيل وحدات ، على الإعداد منطقة الصفحة الرئيسية> الإعداد -> الوحدات). -SessionTimeOut=للمرة الخمسين -SessionExplanation=تضمن هذا العدد أن الدورة لن ينتهي قبل هذا التأخير. PHP sessoin ولكن الإدارة لا الكفالة التي دائما تنتهي الدورة بعد هذا التأخير : ويحدث هذا إذا كان نظام لتنظيف مخبأ الدورة الجارية.
ملاحظة : مع أي نظام الداخلي PHP عملية تنظيف كل دورة حوالي ٪ ق / ق ٪ فقط ولكن وصول وصول أدلى به خلال دورات أخرى. -TriggersAvailable=محفزات متاحة -TriggersDesc=يطلق الملفات التي سوف يتم تعديل سلوك Dolibarr العمل نسخها مرة واحدة في الدليل htdocs / تضم / محفزات. ادركوا إجراءات جديدة ، وتفعيله على Dolibarr الأحداث (انشاء الشركة الجديدة ، والمصادقة على الفواتير ،...). -TriggerDisabledByName=يطلق في هذا الملف من قبل المعوقين لاحقة بين NORUN باسمهم. -TriggerDisabledAsModuleDisabled=يتسبب في تعطيل هذه الصورة هي وحدة قياسية ٪ ق معوقا. -TriggerAlwaysActive=يطلق في هذا الملف هي حركة دائمة ، وتفعيل ما هي وحدات Dolibarr. -TriggerActiveAsModuleActive=يطلق في هذا الملف كما ينشط حدة تمكين ٪ ق. -GeneratedPasswordDesc=هنا تعريف القاعدة التي تريد استخدامه لكلمة السر اذا كنت أسأل لصناعة السيارات ولدت كلمة السر +LogEventDesc=شما می توانید در اینجا قادر به ورود به سیستم برای رویدادهای امنیتی Dolibarr. حسابرسی - مدیران پس از آن می توانید مطالب خود را از طریق ابزارهای سیستم منو را ببینید. اخطار، این ویژگی می تواند مقدار زیادی از داده ها در پایگاه داده مصرف می کند. +AreaForAdminOnly=این ویژگی را می توان تنها کاربران مدیر استفاده می شود. +SystemInfoDesc=اطلاعات سیستم اطلاعات فنی موارد دیگر شما در حالت فقط خواندنی و قابل مشاهده فقط برای مدیران دریافت می باشد. +SystemAreaForAdminOnly=این منطقه در دسترس است فقط برای کاربران مدیر سیستم باشد. هیچ یک از مجوز Dolibarr می تواند از این حد کاهش دهد. +CompanyFundationDesc=ویرایش شده در این صفحه تمام اطلاعات شناخته شده از این شرکت و یا پایه شما نیاز به مدیریت (برای این کار، بر روی "اصلاح" را فشار دهید در پایین صفحه کلیک کنید) +DisplayDesc=شما می توانید هر پارامتر مربوط به نگاه Dolibarr را انتخاب کنید و احساس می کنید در اینجا +AvailableModules=ماژول های موجود +ToActivateModule=برای فعال کردن ماژول ها، رفتن در منطقه راه اندازی (صفحه اصلی> راه اندازی-> ماژول). +SessionTimeOut=وقت برای جلسه +SessionExplanation=این تضمین تعدادی است که در جلسه پیش از این هرگز این تاخیر منقضی خواهد شد، اگر پاک کن جلسه توسط داخلی PHP پاک کن را وارد نمایید (و هیچ چیز دیگری) انجام می شود. داخلی پاک کننده را وارد نمایید PHP می کند گارانتی نیست که جلسه درست بعد از این تاخیر به پایان می رسد. این منقضی خواهد شد، پس از این تاخیر، و هنگامی که پاک کن را وارد نمایید به این صورت اجرا می شود، بنابراین هر از٪ s /٪ دسترسی است، اما تنها در دسترسی ساخته شده توسط جلسات دیگر.
توجه: در برخی از سرویس دهنده با یک مکانیزم خارجی تمیز کردن را وارد نمایید (cron را تحت اوبونتو ...)، جلسات می تواند پس از یک دوره تعریف شده توسط session.gc_maxlifetime به طور پیش فرض از بین برده، بدون توجه به آنچه ارزش در اینجا وارد شده است. +TriggersAvailable=محرک های موجود +TriggersDesc=باعث فایل است که رفتار جریان کار Dolibarr یک بار به htdocs دایرکتوری / هسته / محرک های کپی شده تغییر می باشد. آنها اقدامات جدید، فعال در حوادث Dolibarr (خلق جدید شرکت، اعتبار صورتحساب، ...) متوجه شدم. +TriggerDisabledByName=راه اندازی در این فایل ها توسط-NORUN پسوند در نام آنها غیر فعال است. +TriggerDisabledAsModuleDisabled=راه اندازی در این فایل ها غیر فعال هستند به عنوان بخش٪ s غیر فعال است. +TriggerAlwaysActive=راه اندازی در این فایل همیشه فعال، هر آنچه که می ماژول های Dolibarr فعال می شود. +TriggerActiveAsModuleActive=محرک در این فایل فعال هستند به عنوان بخش٪ s را فعال کنید. +GeneratedPasswordDesc=تعریف اینجا که رد می خواهید استفاده کنید برای ایجاد رمز عبور جدید اگر شما بخواهید به تولید خودکار رمز عبور DictionaryDesc=تعریف در اینجا تمام دادهها مرجع. شما می توانید مقدار از پیش تعریف شده با شما کامل است. -ConstDesc=تسمح لك هذه الصفحة لتحرير جميع البارامترات الأخرى غير المتوفرة في الصفحات السابقة. فهي محفوظة لمعايير متقدمة للمطورين أو troubleshouting. -OnceSetupFinishedCreateUsers=تحذير فأنت Dolibarr مدير المستخدم. مدير المستخدمين تستخدم لإعداد Dolibarr. لالمعتاد استخدام Dolibarr ، يوصى باستخدام غير مستخدم مدير خلق مجموعات من المستخدمين & القائمة. -MiscellaneousDesc=هنا تعريف جميع البارامترات الأخرى ذات الصلة بالأمن. -LimitsSetup=حدود / الدقيقة الإعداد -LimitsDesc=يمكنك تحديد الحدود ، وoptimisations الايضاحات التي تستخدمها Dolibarr هنا -MAIN_MAX_DECIMALS_UNIT=ماكس عشرية لأسعار الوحدات -MAIN_MAX_DECIMALS_TOT=الحد الأقصى لمجموع أسعار عشرية -MAIN_MAX_DECIMALS_SHOWN=ماكس عشرية لأسعار تظهر على الشاشة (يضاف هذا العدد بعد... إذا كنت تريد أن ترى... عندما العدد مبتورة عندما تظهر على الشاشة) -MAIN_DISABLE_PDF_COMPRESSION=الاستخدام الشعبي للضغط الشعبي ولدت الملفات. -MAIN_ROUNDING_RULE_TOT= حجم التقريب مجموعة (لبلدان النادرة التي يتم التقريب على شيء آخر من قاعدة 10) -UnitPriceOfProduct=صافي سعر وحدة من المنتج -TotalPriceAfterRounding=إجمالي السعر الصافي / ضريبة القيمة المضافة / ضريبة مدفوع) بعد التقريب -ParameterActiveForNextInputOnly=معلمة فعالة للمساهمة المقبل فقط -NoEventOrNoAuditSetup=لا أمن الحدث وقد سجلت حتى الآن. هذا طبيعي ويمكن مراجعة الحسابات اذا لم يتم تمكين "الإعداد -- الأمن -- مراجعة" الصفحة. -NoEventFoundWithCriteria=لا أمن حال تم العثور على مثل هذا البحث criterias. -SeeLocalSendMailSetup=انظر المحلية الإعداد sendmail -BackupDesc=لتقديم دعم كامل للDolibarr ، يجب عليك : -BackupDesc2=* حفظ الوثائق محتوى الدليل (٪) والذي يحتوي على جميع وتحميل الملفات ولدت (هل يمكن أن تقدم على سبيل المثال والرمز البريدي). -BackupDesc3=* حفظ محتوى قاعدة البيانات مع نفايات. لهذا ، يمكنك استخدام التالية مساعد. -BackupDescX=الأرشيف دليل ينبغي أن تحفظ في مكان آمن. -BackupDescY=وقد ولدت وينبغي التخلص من الملفات المخزنة في مكان آمن. +ConstDesc=این صفحه به شما اجازه ویرایش تمام پارامترهای دیگر در دسترس نیست در صفحات قبل. آنها پارامتر ها را برای توسعه دهندگان پیشرفته و یا برای troubleshouting رزرو شده هستند. +OnceSetupFinishedCreateUsers=اخطار، شما یک کاربر مدیر Dolibarr می باشد. کاربران مدیر به راه اندازی Dolibarr استفاده می شود. برای استفاده معمول از Dolibarr، توصیه می شود به استفاده از یک کاربر غیر مدیر ایجاد شده از اعضا و منو گروه. +MiscellaneousDesc=تعریف در اینجا تمام پارامترهای دیگر مربوط به امنیت. +LimitsSetup=محدوده / راه اندازی دقیق +LimitsDesc=شما می توانید محدودیت، دقت و بهینه سازی استفاده شده توسط Dolibarr در اینجا تعریف +MAIN_MAX_DECIMALS_UNIT=حداکثر اعشار برای قیمت واحد +MAIN_MAX_DECIMALS_TOT=حداکثر اعشار برای کل قیمت +MAIN_MAX_DECIMALS_SHOWN=حداکثر اعشار برای قیمت نشان داده شده بر روی صفحه نمایش (اضافه کردن ... بعد از این شماره اگر شما می خواهید برای دیدن ... وقتی که تعداد ناقص است که بر روی صفحه نمایش نشان داده شده است) +MAIN_DISABLE_PDF_COMPRESSION=استفاده از PDF فشرده سازی برای فایل های PDF تولید شده است. +MAIN_ROUNDING_RULE_TOT= حجم از محدوده گرد کردن (برای کشورهای نادر که در آن گرد کردن بر روی چیز دیگری از پایه 10 انجام می شود) +UnitPriceOfProduct=قیمت واحد خالص محصول +TotalPriceAfterRounding=قیمت کل (خالص مالیاتی / مالیات بر ارزش افزوده / نرم) پس از گرد کردن +ParameterActiveForNextInputOnly=پارامتر برای ورودی بعدی موثر تنها +NoEventOrNoAuditSetup=هیچ رویداد امنیتی ثبت نشده است. این می تواند طبیعی اگر ممیزی شده است در "راه اندازی - امنیتی - حسابرسی" فعال نیست صفحه. +NoEventFoundWithCriteria=هیچ رویداد امنیتی شده است برای چنین معیارهای جستجو در بر داشت. +SeeLocalSendMailSetup=مشاهده راه اندازی از sendmail محلی خود +BackupDesc=برای ایجاد یک پشتیبان کامل از Dolibarr، شما باید: +BackupDesc2=* ذخیره محتوای دایرکتوری اسناد (٪) که شامل تمام فایل های آپلود و تولید (شما می توانید فایل های فشرده به عنوان مثال را). +BackupDesc3=* ذخیره محتوای پایگاه داده خود را به یک فایل روگرفت. برای این کار، شما می توانید زیر دستیار استفاده کنید. +BackupDescX=دایرکتوری آرشیو شده باید در یک مکان امن ذخیره می شود. +BackupDescY=فایل روگرفت تولید باید در یک مکان امن ذخیره می شود. BackupPHPWarning=پشتیبان گیری می توانید با این روش نمی توان guaranted. ترجیح می دهند قبل -RestoreDesc=Dolibarr لاستعادة النسخ الاحتياطي ، يجب عليك : -RestoreDesc2=* استعادة ارشيف ملف (ملف مضغوط على سبيل المثال) للوثائق ودليل لانتزاع شجرة الملفات في دليل وثائق جديدة أو Dolibarr تركيب هذه الوثائق الحالية directoy (٪). -RestoreDesc3=* استعادة البيانات ، احتياطية من إلقاء الملف في قاعدة البيانات من جديد Dolibarr تركيب أو في قاعدة البيانات الحالية لهذا التثبيت. تحذير ، بعد الانتهاء من اعادة ، يجب استخدام ادخل كلمة السر ، التي كانت موجودة عندما تم احتياطية ، لربط جديد. النسخ الاحتياطي لاستعادة قاعدة بيانات في هذا التركيب الحالي ، يمكنك اتباع هذه مساعدا. +RestoreDesc=برای بازگرداندن یک نسخه پشتیبان تهیه Dolibarr، شما باید: +RestoreDesc2=* بازگرداندن فایل آرشیو (فایل زیپ به عنوان مثال) از اسناد دایرکتوری برای استخراج درخت فایل در اسناد دایرکتوری از یک نصب جدید Dolibarr و یا به این directoy اسناد فعلی (از٪ s). +RestoreDesc3=* بازگرداندن داده ها، از یک فایل روگرفت پشتیبان گیری، به پایگاه داده از نصب جدید Dolibarr و یا به پایگاه داده از نصب در حال حاضر. اخطار، یک بار بازگرداندن به پایان رسید، شما باید وارد شوید / رمز عبور، که وجود داشته است هنگامی که پشتیبان گیری ساخته شده برای اتصال دوباره استفاده کنید. برای بازگرداندن پایگاه داده پشتیبان گیری به این نصب و راه اندازی در حال حاضر، شما می توانید این دستیار دنبال کنید. RestoreMySQL=واردات خروجی زیر -ForcedToByAModule= هذه القاعدة ق ٪ الى جانب تفعيل وحدة -PreviousDumpFiles=متاح تفريغ النسخ الاحتياطي ملفات قاعدة البيانات -WeekStartOnDay=اولین روز از هفته -RunningUpdateProcessMayBeRequired=تشغيل عملية الترقية ويبدو أن المطلوب (ليالي برامج الإصدار ٪ يختلف عن إصدار قاعدة بيانات ٪) -YouMustRunCommandFromCommandLineAfterLoginToUser=يجب تشغيل هذا الأمر من سطر الأوامر بعد الدخول إلى قذيفة مع المستخدم ٪ ق. -YourPHPDoesNotHaveSSLSupport=وظائف خدمة تصميم المواقع لا تتوفر في بي الخاص بك -DownloadMoreSkins=مزيد من جلود بتحميل -SimpleNumRefModelDesc=عودة الرقم المرجعي للتنسيق مع nnnn - ٪ syymm ث ث حيث هي السنة ، هو شهر ملم وnnnn هو تسلسل بدون ثقب ودون إعادة تعيين +ForcedToByAModule= این قانون توسط یک ماژول فعال به٪ s اجباری +PreviousDumpFiles=فایل روگرفت پایگاه داده پشتیبان گیری می کند +WeekStartOnDay=اولین روز هفته +RunningUpdateProcessMayBeRequired=در حال اجرا عملیات ارتقا، به نظر می رسد لازم باشد (برنامه نسخه٪ s از پایگاه داده نسخه٪ s متفاوت است) +YouMustRunCommandFromCommandLineAfterLoginToUser=شما باید این دستور از خط فرمان پس از ورود به یک پوسته با کاربر٪ s را اجرا کنید و یا شما باید گزینه در پایان خط فرمان افزودنی W٪ رمز عبور برای ارائه. +YourPHPDoesNotHaveSSLSupport=توابع SSL در PHP شما موجود نیست +DownloadMoreSkins=پوسته های بیشتر برای دانلود +SimpleNumRefModelDesc=بازگرداندن شماره مرجع با فرمت٪ syymm-NNNN که در آن YY سال است، میلی متر در ماه است و NNNN دنباله بدون سوراخ و بدون تنظیم مجدد است ShowProfIdInAddress=نمایش شناسه professionnal با آدرس در اسناد ShowVATIntaInAddress=مخفی کردن مالیات بر ارزش افزوده تعداد داخل با آدرس در اسناد TranslationUncomplete=ترجمه جزئی @@ -1018,7 +1018,7 @@ ExtraFieldsSupplierOrders=ویژگی های مکمل (سفارشات) ExtraFieldsSupplierInvoices=ویژگی های مکمل (فاکتورها) ExtraFieldsProject=ویژگی های مکمل (پروژه ها) ExtraFieldsProjectTask=ویژگی های مکمل (وظایف) -ExtraFieldHasWrongValue=Attribute %s has a wrong value. +ExtraFieldHasWrongValue=ویژگی٪ دارای ارزش اشتباه است. AlphaNumOnlyCharsAndNoSpace=فقط alphanumericals بی فضا AlphaNumOnlyLowerCharsAndNoSpace=فقط alphanumericals و شخصیت های حروف کوچک و بدون فضا SendingMailSetup=راه اندازی sendings توسط ایمیل @@ -1043,7 +1043,7 @@ SearchOptim=بهینه سازی جستجو YouHaveXProductUseSearchOptim=شما محصول٪ s را به پایگاه داده باشد. شما باید PRODUCT_DONOTSEARCH_ANYWHERE ثابت تا 1 را به خانه، راه اندازی، دیگر اضافه کنید، شما جستجو را محدود به ابتدای رشته های ساخت ممکن است برای پایگاه داده برای استفاده از شاخص و شما باید پاسخ فوری دریافت کنید. BrowserIsOK=شما با استفاده از مرورگر وب از٪ s. این مرورگر خوب برای امنیت و عملکرد است. BrowserIsKO=شما با استفاده از مرورگر وب از٪ s. این مرورگر شناخته شده است به یک انتخاب بد برای امنیت، عملکرد و قابلیت اطمینان. ما recommand شما را به استفاده از فایرفاکس، کروم، اپرا و یا سافاری. -XDebugInstalled=XDebug is loaded. +XDebugInstalled=XDebug بارگذاری شده است. XCacheInstalled=XCache بارگذاری شده است. AddRefInList=نمایش مشتری / تامین کننده کد عکس را به لیست (لیست و یا جعبهترکیب را انتخاب کنید) و بیشتر از لینک FieldEdition=نسخه فیلد٪ s @@ -1052,106 +1052,106 @@ FillThisOnlyIfRequired=به عنوان مثال: +2 (را پر کنید فقط GetBarCode=دریافت بارکد EmptyNumRefModelDesc=کد آزاد است. این کد را می توان در هر زمان تغییر یافتهاست. ##### Module password generation -PasswordGenerationStandard=عودة كلمة سر ولدت الداخلية وفقا لخوارزمية Dolibarr : 8 أحرف مشتركة تتضمن الأرقام والحروف في حرف صغير. -PasswordGenerationNone=لا توحي بأي كلمة المرور المتولدة. يجب أن تكون كلمة السر في نوع يدويا. +PasswordGenerationStandard=بازگشت یک کلمه عبور تولید شده با توجه به الگوریتم Dolibarr داخلی: 8 کاراکتر شامل اعداد مشترک و شخصیت در حروف کوچک. +PasswordGenerationNone=آیا هر کلمه عبوری که نشان می دهد نیست. رمز عبور باید در نوع دستی. ##### Users setup ##### -UserGroupSetup=مستخدمين والمجموعات وحدة الإعداد -GeneratePassword=وتشير ولدت كلمة السر -RuleForGeneratedPasswords=قاعدة لتوليد كلمات السر واقترح -DoNotSuggest=لا توحي بأي كلمة السر -EncryptedPasswordInDatabase=السماح للتشفير كلمات السر في قاعدة البيانات -DisableForgetPasswordLinkOnLogonPage=لا تظهر وصلة "نسيت كلمة المرور" على صفحة تسجيل الدخول -UsersSetup=شاهد الإعداد وحدة -UserMailRequired=مطلوب بريد إلكتروني لإنشاء مستخدم جديد +UserGroupSetup=کاربران و گروه های راه اندازی ماژول +GeneratePassword=پیشنهاد یک رمز عبور ایجاد شده +RuleForGeneratedPasswords=حکومت برای تولید کلمه عبور پیشنهادی و یا اعتبار کلمه عبور +DoNotSuggest=آیا هر گونه رمز عبور نشان می دهد نیست +EncryptedPasswordInDatabase=اجازه می دهد تا رمزنگاری کلمات عبور در پایگاه داده +DisableForgetPasswordLinkOnLogonPage=آیا لینک را نشان نمی دهد "فراموش کردن رمز عبور» در صفحه ورود +UsersSetup=راه اندازی ماژول کاربران +UserMailRequired=ایمیل مورد نیاز برای ایجاد یک کاربر جدید ##### Company setup ##### -CompanySetup=وحدة الإعداد للشركات -CompanyCodeChecker=نموذج للجيل الثالث لقانون الأحزاب ومراجعة (عميل أو مورد) -AccountCodeManager=رمز وحدة لتوليد المحاسبة (عميل أو مورد) +CompanySetup=راه اندازی ماژول شرکت +CompanyCodeChecker=ماژول برای نسل اشخاص ثالث کد و چک کردن (مشتری یا عرضه کننده کالا) +AccountCodeManager=ماژول برای تولید کد حسابداری (مشتری یا عرضه کننده کالا) ModuleCompanyCodeAquarium=بازگشت یک کد حسابداری ساخته شده توسط:
٪ s را به دنبال شخص ثالث کد منبع برای کد منبع حسابداری،
٪ s را پس از کد مشتری شخص ثالث برای یک کد حسابداری مشتری می باشد. -ModuleCompanyCodePanicum=العودة فارغة مدونة المحاسبة. -ModuleCompanyCodeDigitaria=قانون المحاسبة طرف ثالث يعتمد على الرمز. الشفرة تتكون من طابع "جيم" في المركز الأول يليه 5 الحروف الأولى من طرف ثالث المدونة. -UseNotifications=استخدام الإخطارات -NotificationsDesc=إشعارات البريد الإلكتروني ميزة تسمح لك صمت إرسال البريد الآلي ، وبالنسبة لبعض الأحداث Dolibarr ، لأطراف ثالثة (العملاء أو الموردين) التي هي لتهيئتها. اختيار نشط الاشعار الاتصالات واعتماد أهداف واحدة لطرف ثالث في الوقت المناسب. -ModelModules=وثائق قوالب +ModuleCompanyCodePanicum=بازگشت یک کد حسابداری خالی است. +ModuleCompanyCodeDigitaria=کد حسابداری بستگی به کد های شخص ثالث. کد از شخصیت "C" در مقام اول و پس از آن 5 حرف اول کد های شخص ثالث تشکیل شده است. +UseNotifications=استفاده از اطلاعیه +NotificationsDesc=ایمیل های اطلاعیه قابلیت اجازه می دهد تا شما را به سکوت، ارسال ایمیل به صورت خودکار، برای برخی از حوادث Dolibarr، به اشخاص ثالث (مشتریان یا تامین کنندگان) است که به پیکربندی شده است. انتخاب اطلاع رسانی و اهداف تماس با فعال یک حزب سوم در زمان ساخته شده است. +ModelModules=اسناد قالب DocumentModelOdt=تولید اسناد از OpenDocuments قالب (. ODT و یا فایل های ODS برای آفیس اپن سورس کنند، KOffice، TextEdit، ...) -WatermarkOnDraft=علامة مائية على مشروع الوثيقة +WatermarkOnDraft=تعیین میزان مد آب در پیش نویس سند CompanyIdProfChecker=قوانین در حرفه شناسه MustBeUnique=باید منحصر به فرد باشد؟ MustBeMandatory=اجباری برای ایجاد اشخاص ثالث؟ MustBeInvoiceMandatory=اجباری به اعتبار فاکتورها؟ -Miscellaneous=متفرقات +Miscellaneous=متفرقه ##### Webcal setup ##### -WebCalSetup=Webcalendar ربط الإعداد -WebCalSyncro=إضافة إلى Dolibarr الأحداث WebCalendar -WebCalAllways=دائما ، لا يسأل -WebCalYesByDefault=بناء على الطلب (نعم افتراضيا) -WebCalNoByDefault=على الطلب (أي افتراضي) -WebCalNever=أبدا -WebCalURL=عنوان الجدول الزمني للحصول -WebCalServer=خدمة استضافة قاعدة بيانات التقويم -WebCalDatabaseName=اسم قاعدة البيانات -WebCalUser=المستخدم من الوصول إلى قاعدة البيانات -WebCalSetupSaved=أنقذ Webcalendar الإعداد بنجاح. -WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful. -WebCalTestKo1=علاقة الخادم '٪ ق' تنجح ولكن قاعدة البيانات '٪ ق' لا يمكن التوصل إليها. -WebCalTestKo2=علاقة الخادم '٪ ق' مستخدم '٪ ق' فشلت. -WebCalErrorConnectOkButWrongDatabase=نجح الصدد ولكن قاعدة البيانات لا يبدو أن Webcalendar في قاعدة البيانات. -WebCalAddEventOnCreateActions=إضافة تقويم الحدث على خلق الأعمال -WebCalAddEventOnCreateCompany=إضافة جدول زمني بشأن إنشاء شركات -WebCalAddEventOnStatusPropal=إضافة تقويم الحدث على مركز تجاري مقترحات التغيير -WebCalAddEventOnStatusContract=إضافة تقويم حال تغير الوضع على العقود -WebCalAddEventOnStatusBill=إضافة على مشاريع القوانين المدرجة في جدول تغيير الوضع -WebCalAddEventOnStatusMember=إضافة تقويم الحدث على أعضاء مركز التغيير -WebCalUrlForVCalExport=تصدير صلة ق ٪ شكل متاح على الوصلة التالية : ٪ ق -WebCalCheckWebcalSetup=ربما Webcal نميطة الإعداد غير صحيح. +WebCalSetup=راه اندازی لینک Webcalendar +WebCalSyncro=اضافه کردن رویداد Dolibarr به WebCalendar +WebCalAllways=همیشه، بدون درخواست +WebCalYesByDefault=در خواست (بله به طور پیش فرض) +WebCalNoByDefault=در خواست (بدون پیش فرض) +WebCalNever=هرگز +WebCalURL=URL برای دسترسی تقویم +WebCalServer=سرور میزبانی وب پایگاه داده تقویم +WebCalDatabaseName=نام پایگاه داده +WebCalUser=کاربر برای دسترسی به پایگاه داده +WebCalSetupSaved=راه اندازی Webcalendar با موفقیت ذخیره شد. +WebCalTestOk=اتصال به سرور '٪ s' را در پایگاه داده '٪ s' را با کاربر '٪ s' موفقیت آمیز. +WebCalTestKo1=اتصال به کارگزار «٪ s 'موفق اما پایگاه داده'٪ s 'را نمی تواند رسید. +WebCalTestKo2=اتصال به کارگزار «٪ s 'با کاربر'٪ s 'شکست خورده است. +WebCalErrorConnectOkButWrongDatabase=اتصال موفق پایگاه داده اما به نظر نمی آید به یک پایگاه داده Webcalendar. +WebCalAddEventOnCreateActions=اضافه کردن رویداد تقویم در اقدامات ایجاد +WebCalAddEventOnCreateCompany=اضافه کردن رویداد تقویم در شرکت ایجاد +WebCalAddEventOnStatusPropal=اضافه کردن رویداد تقویم در تغییر وضعیت طرح های تجاری +WebCalAddEventOnStatusContract=اضافه کردن رویداد تقویم در تغییر وضعیت قرارداد +WebCalAddEventOnStatusBill=اضافه کردن رویداد تقویم در تغییر وضعیت صورت حساب +WebCalAddEventOnStatusMember=اضافه کردن رویداد تقویم در تغییر وضعیت کاربران +WebCalUrlForVCalExport=لینک صادرات به فرمت٪ s در لینک زیر موجود است:٪ s +WebCalCheckWebcalSetup=شاید راه اندازی ماژول Webcal صحیح نمی باشد. ##### Invoices ##### -BillsSetup=وحدة إعداد الفواتير -BillsDate=تاريخ الفواتير -BillsNumberingModule=الفواتير والقروض وتلاحظ وحدة الترقيم -BillsPDFModules=فاتورة نماذج الوثائق -CreditNoteSetup=علما الإعداد وحدة الائتمان -CreditNotePDFModules=المذكرة وثيقة من وثائق الائتمان النماذج -CreditNote=علما الائتمان -CreditNotes=ويلاحظ الائتمان -ForceInvoiceDate=قوة تاريخ الفاتورة تاريخ المصادقة على -DisableRepeatable=تعطيل تكرار الفواتير -SuggestedPaymentModesIfNotDefinedInInvoice=واقترح على طريقة دفع الفواتير تلقائيا اذا لم تعرف للفاتورة -EnableEditDeleteValidInvoice=تتيح إمكانية تعديل أو حذف صحيحة دون دفع الفاتورة -SuggestPaymentByRIBOnAccount=وتشير دفع سحب على حساب -SuggestPaymentByChequeToAddress=وتشير إلى دفع الشيكات -FreeLegalTextOnInvoices=نص حر على الفواتير +BillsSetup=راه اندازی ماژول فاکتورها +BillsDate=تاریخ فاکتورها +BillsNumberingModule=فاکتورها و یادداشت های اعتباری مدل شماره +BillsPDFModules=اسناد فاکتور مدل +CreditNoteSetup=راه اندازی ماژول توجه داشته باشید اعتباری +CreditNotePDFModules=مدل های سند توجه داشته باشید اعتباری +CreditNote=توجه داشته باشید اعتباری +CreditNotes=یادداشت های اعتباری +ForceInvoiceDate=تاریخ فاکتور نیروی به تاریخ اعتبار +DisableRepeatable=غیر فعال کردن فاکتورها تکرار +SuggestedPaymentModesIfNotDefinedInInvoice=حالت پرداخت های پیشنهادی در صورت حساب به طور پیش فرض اگر برای فاکتور تعریف نشده +EnableEditDeleteValidInvoice=فعال کردن امکان ویرایش / حذف فاکتور معتبر بدون پرداخت +SuggestPaymentByRIBOnAccount=پیشنهاد پرداخت برداشت در حساب +SuggestPaymentByChequeToAddress=پیشنهاد پرداخت با چک به +FreeLegalTextOnInvoices=متن رایگان در صورت حساب WatermarkOnDraftInvoices=تعیین میزان مد آب در پیش نویس فاکتورها (هیچ اگر خالی) ##### Proposals ##### -PropalSetup=وحدة إعداد مقترحات تجارية -CreateForm=خلق أشكال -NumberOfProductLines=عدد خطوط الإنتاج -ProposalsNumberingModules=اقتراح نماذج تجارية الترقيم -ProposalsPDFModules=اقتراح نماذج الوثائق التجارية -ClassifiedInvoiced=صنف في الفاتورة -HideTreadedPropal=إخفاء تعامل تجاري المقترحات الواردة في قائمة -AddShippingDateAbility=إضافة قدرة الشحن والتاريخ -AddDeliveryAddressAbility=إضافة قدرة تاريخ التسليم -UseOptionLineIfNoQuantity=خط من المنتجات / الخدمات ذات الصفر المبلغ يعتبر خيارا -FreeLegalTextOnProposal=نص تجارية حرة على مقترحات +PropalSetup=راه اندازی ماژول طرح های تجاری +CreateForm=ایجاد اشکال +NumberOfProductLines=تعدادی از خطوط تولید +ProposalsNumberingModules=مدل شماره طرح تجاری +ProposalsPDFModules=تجاری و مدل های اسناد پیشنهاد +ClassifiedInvoiced=صورتحساب طبقه بندی شده +HideTreadedPropal=مخفی کردن طرح تجاری تحت درمان در لیست +AddShippingDateAbility=توانایی اضافه کردن تاریخ حمل و نقل +AddDeliveryAddressAbility=توانایی اضافه کردن تاریخ تحویل +UseOptionLineIfNoQuantity=یک خط از محصول / خدمات با مقدار صفر به عنوان یک گزینه در نظر گرفته +FreeLegalTextOnProposal=متن رایگان در طرح های تجاری WatermarkOnDraftProposal=تعیین میزان مد آب در پیش نویس طرح تجاری (هیچ اگر خالی) ##### Orders ##### -OrdersSetup=أوامر إدارة الإعداد -OrdersNumberingModules=أوامر الترقيم نمائط -OrdersModelModule=وثائق من أجل النماذج -HideTreadedOrders=Hide the treated or cancelled orders in the list -ValidOrderAfterPropalClosed=للمصادقة على النظام بعد اقتراح أوثق ، لا يجعل من الممكن للخطوة من جانب النظام المؤقت -FreeLegalTextOnOrders=بناء على أوامر النص الحر +OrdersSetup=راه اندازی مدیریت سفارش +OrdersNumberingModules=سفارشات شماره مدل +OrdersModelModule=اسناد منظور مدل +HideTreadedOrders=مخفی کردن سفارشات درمان و یا لغو در فهرست +ValidOrderAfterPropalClosed=به اعتبار منظور پس از پیشنهاد نزدیک تر است، امکان به گام نیست به دستور موقت +FreeLegalTextOnOrders=متن رایگان در سفارشات WatermarkOnDraftOrders=تعیین میزان مد آب به دستور پیش نویس (هیچ اگر خالی) ##### Clicktodial ##### -ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي -ClickToDialUrlDesc=ودعا الموقع عندما تنقر على الهاتف picto ذلك. Dans l' رابط ، vous pouvez utiliser ليه balises
٪ ٪ 1 $ ق qui الأمصال remplacé قدم المساواة جنيه téléphone دي l' appelé
٪ ٪ 2 $ ق qui الأمصال remplacé لو قدم المساواة téléphone دي l' appelant جنيه مصري vôtre)
٪ ٪ ل 3 دولار qui الأمصال remplacé vôtre ادخل clicktodial الفقرة (défini سور vôtre فيشه utilisateur)
٪ ٪ 4 $ ق qui الأمصال remplacé الفقرة vôtre يذكره دي clicktodial عتيق (défini سور vôtre فيشه utilisateur). +ClickToDialSetup=کلیک کنید تا شماره گیری راه اندازی ماژول +ClickToDialUrlDesc=آدرس نامیده می شود که با کلیک بر روی picto تلفن انجام می شود. در URL، شما می توانید برچسب ها
__PHONETO__ خواهد شد که با شماره تلفن از فرد جایگزین را به تماس
__PHONEFROM__ خواهد شد که با شماره تلفن تماس شخص (شما) به جای
__LOGIN__ خواهد شد که با ورود clicktodial خود را جایگزین (تعریف شده در کارت کاربر شما)
__PASS__ خواهد شد که با رمز عبور clicktodial شما (تعریف شده در کارت کاربر خود را) جایگزین شده است. ##### Bookmark4u ##### -Bookmark4uSetup=إعداد وحدة Bookmark4u +Bookmark4uSetup=راه اندازی ماژول Bookmark4u ##### Interventions ##### -InterventionsSetup=وحدة التدخل الإعداد -FreeLegalTextOnInterventions=حرر النص على وثائق التدخل -FicheinterNumberingModules=الترقيم وحدات التدخل -TemplatePDFInterventions=تدخل بطاقة نماذج الوثائق +InterventionsSetup=راه اندازی ماژول مداخلات +FreeLegalTextOnInterventions=متن رایگان در اسناد مداخله +FicheinterNumberingModules=مداخله شماره مدل +TemplatePDFInterventions=اسناد کارت مداخله مدل WatermarkOnDraftInterventionCards=تعیین میزان مد آب در اسناد کارت مداخله (هیچ اگر خالی) ##### Contracts ##### ContractsSetup=راه اندازی ماژول قراردادها @@ -1160,110 +1160,110 @@ TemplatePDFContracts=اسناد قرارداد مدل FreeLegalTextOnContracts=متن رایگان در قرارداد WatermarkOnDraftContractCards=تعیین میزان مد آب در پیش نویس قرارداد (هیچ اگر خالی) ##### Members ##### -MembersSetup=أعضاء وحدة الإعداد -MemberMainOptions=الخيارات الرئيسية -AddSubscriptionIntoAccount=إضافة إلى الاشتراك في حساب مصرفي أو نقدا ، وحدة مصرفية +MembersSetup=راه اندازی ماژول کاربران +MemberMainOptions=گزینه های اصلی +AddSubscriptionIntoAccount=پیشنهاد به طور پیش فرض برای ایجاد یک تراکنش های بانکی، در ماژول بانک، که با اضافه کردن یک اشتراک غیر انتفایی جدید AdherentLoginRequired= مدیریت ورود برای هر عضو -AdherentMailRequired=البريد الإلكتروني المطلوب لإنشاء عضو جديد -MemberSendInformationByMailByDefault=مربع لإرسال الرسائل للأعضاء تأكيدا على افتراضي +AdherentMailRequired=ایمیل مورد نیاز برای ایجاد یک عضو جدید +MemberSendInformationByMailByDefault=جعبه برای ارسال از تایید پست الکترونیکی به کاربران (اعتبار سنجی و یا اشتراک جدید) است به صورت پیش فرض ##### LDAP setup ##### -LDAPSetup=LDAP الإعداد -LDAPGlobalParameters=المعايير العالمية -LDAPUsersSynchro=المستخدمين -LDAPGroupsSynchro=المجموعات -LDAPContactsSynchro=اتصالات +LDAPSetup=LDAP راه اندازی +LDAPGlobalParameters=پارامترهای جهانی +LDAPUsersSynchro=کاربران +LDAPGroupsSynchro=گروه +LDAPContactsSynchro=اطلاعات تماس LDAPMembersSynchro=کاربران -LDAPSynchronization=LDAP نمازتلا -LDAPFunctionsNotAvailableOnPHP=LDAP وظائف لا تتوفر على PHP +LDAPSynchronization=هماهنگ سازی LDAP +LDAPFunctionsNotAvailableOnPHP=توابع LDAP در PHP شما در دسترس نیست LDAPToDolibarr=LDAP --> Dolibarr DolibarrToLDAP=Dolibarr --> LDAP -LDAPNamingAttribute=الرئيسية في LDAP -LDAPSynchronizeUsers=تزامن Dolibarr المستخدمين LDAP -LDAPSynchronizeGroups=تزامن مع Dolibarr مجموعات LDAP -LDAPSynchronizeContacts=تزامن Dolibarr اتصالات مع LDAP -LDAPSynchronizeMembers=التزامن بين أعضاء المؤسسة وحدة Dolibarr مع LDAP -LDAPTypeExample=OpenLdap ، أو النشطة دليل Egroupware -LDAPPrimaryServer=الخادم الرئيسي -LDAPSecondaryServer=ثانوية الخادم -LDAPServerPort=خادم الميناء -LDAPServerPortExample=المنفذ الافتراضي : 389 -LDAPServerProtocolVersion=بروتوكول النسخة -LDAPServerUseTLS=استخدام TLS -LDAPServerUseTLSExample=خادم LDAP الخاص بك استخدام TLS -LDAPServerDn=خادم DN +LDAPNamingAttribute=کلیدی در LDAP +LDAPSynchronizeUsers=سازمان از کاربران در LDAP +LDAPSynchronizeGroups=سازمان از گروه های در LDAP +LDAPSynchronizeContacts=سازمان از اطلاعات تماس در LDAP +LDAPSynchronizeMembers=سازمان از اعضای بنیاد در LDAP +LDAPTypeExample=OpenLdap، گروه افزار یا دایرکتوری فعال +LDAPPrimaryServer=سرور اولیه +LDAPSecondaryServer=سرور دوم +LDAPServerPort=پورت سرور +LDAPServerPortExample=به طور پیش فرض پورت: 389 +LDAPServerProtocolVersion=نسخه پروتکل +LDAPServerUseTLS=استفاده از TLS +LDAPServerUseTLSExample=LDAP شما استفاده از سرور TLS +LDAPServerDn=سرور DN LDAPAdminDn=مدير DN -LDAPAdminDnExample=Complete DN (ex: cn=adminldap,dc=society,dc=DN الكامل (مثلا : cn= adminldap العاصمة= المجتمع ، العاصمة= كوم) -LDAPPassword=مدير البرنامج كلمة السر -LDAPUserDn=المستخدمين DN -LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=DN الكامل (مثلا : où= المستخدمين ، العاصمة= المجتمع ، العاصمة= كوم) -LDAPGroupDn=الجماعات DN -LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=society,dc=DN الكامل (مثلا : où= المجموعات العاصمة= المجتمع ، العاصمة= كوم) -LDAPServerExample=خادم معالجة (مثلا : localhost ، 192.168.0.2 ، ldaps : / / ldap.example.com /) -LDAPServerDnExample=Complete DN (ex: dc=company,dc=DN الكامل (مثلا : العاصمة= شركة العاصمة= كوم) -LDAPPasswordExample=كلمة السر الادارية -LDAPDnSynchroActive=مستخدمين والمجموعات التزامن -LDAPDnSynchroActiveExample=LDAP لDolibarr أو Dolibarr لتزامن LDAP -LDAPDnContactActive=اتصالات تزامن -LDAPDnContactActiveYes=تفعيل التزامن -LDAPDnContactActiveExample=تفعيل / Unactivated التزامن -LDAPDnMemberActive=أعضاء تزامن -LDAPDnMemberActiveExample=تفعيل / Unactivated التزامن -LDAPContactDn=Dolibarr اتصالات 'DN -LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=society,dc=DN الكامل (مثلا : où= اتصالات العاصمة= المجتمع ، العاصمة= كوم) -LDAPMemberDn=Dolibarr الأعضاء DN -LDAPMemberDnExample=Complete DN (ex: ou=members,dc=society,dc=DN الكامل (مثلا : où= أعضاء العاصمة= المجتمع ، العاصمة= كوم) -LDAPMemberObjectClassList=قائمة objectClass -LDAPMemberObjectClassListExample=قائمة objectClass سجل تحديد السمات (مثلا : قمة inetOrgPerson أو أعلى ، لالنشط دليل المستخدم) -LDAPUserObjectClassList=قائمة objectClass -LDAPUserObjectClassListExample=قائمة objectClass سجل تحديد السمات (مثلا : قمة inetOrgPerson أو أعلى ، لالنشط دليل المستخدم) -LDAPGroupObjectClassList=قائمة objectClass -LDAPGroupObjectClassListExample=قائمة objectClass سجل تحديد السمات (مثلا : قمة groupOfUniqueNames) -LDAPContactObjectClassList=قائمة objectClass -LDAPContactObjectClassListExample=قائمة objectClass سجل تحديد السمات (مثلا : قمة inetOrgPerson أو أعلى ، لالنشط دليل المستخدم) +LDAPAdminDnExample=کامل DN (سابق: CN = ADMIN، DC = عنوان مثال، DC = کام) +LDAPPassword=رمز عبور مدیر +LDAPUserDn=DN کاربران +LDAPUserDnExample=کامل DN (سابق: OU = کاربران، DC = عنوان مثال، DC = کام) +LDAPGroupDn=DN گروه ها +LDAPGroupDnExample=کامل DN (سابق: OU = گروه، DC = عنوان مثال، DC = کام) +LDAPServerExample=آدرس سرور (سابق: localhost را، 192.168.0.2، ldaps :/ / ldap.example.com /) +LDAPServerDnExample=کامل DN (سابق: DC = عنوان مثال، DC = کام) +LDAPPasswordExample=رمز عبور مدیریت +LDAPDnSynchroActive=کاربران و گروه های هماهنگ سازی +LDAPDnSynchroActiveExample=LDAP به Dolibarr یا Dolibarr به هماهنگ سازی LDAP +LDAPDnContactActive=هماهنگ سازی اطلاعات تماس ' +LDAPDnContactActiveYes=هماهنگ سازی فعال +LDAPDnContactActiveExample=فعال / هماهنگ سازی Unactivated +LDAPDnMemberActive=هماهنگ سازی کاربران ' +LDAPDnMemberActiveExample=فعال / هماهنگ سازی Unactivated +LDAPContactDn=DN Dolibarr تماس ' +LDAPContactDnExample=کامل DN (سابق: OU = مخاطبین، DC = عنوان مثال، DC = کام) +LDAPMemberDn=Dolibarr اعضای DN +LDAPMemberDnExample=کامل DN (سابق: OU = عضو، DC = عنوان مثال، DC = کام) +LDAPMemberObjectClassList=فهرست objectClass +LDAPMemberObjectClassListExample=فهرست objectClass رکورد تعریف ویژگی (سابق: بالا، inetOrgPerson و یا بالا، کاربر برای دایرکتوری فعال) +LDAPUserObjectClassList=فهرست objectClass +LDAPUserObjectClassListExample=فهرست objectClass رکورد تعریف ویژگی (سابق: بالا، inetOrgPerson و یا بالا، کاربر برای دایرکتوری فعال) +LDAPGroupObjectClassList=فهرست objectClass +LDAPGroupObjectClassListExample=فهرست objectClass رکورد تعریف ویژگی (سابق: بالا، groupOfUniqueNames) +LDAPContactObjectClassList=فهرست objectClass +LDAPContactObjectClassListExample=فهرست objectClass رکورد تعریف ویژگی (سابق: بالا، inetOrgPerson و یا بالا، کاربر برای دایرکتوری فعال) LDAPMemberTypeDn=Dolibarr عضو نوع DN -LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=society,dc=DN الكامل (مثلا : où= type_members العاصمة= المجتمع ، العاصمة= كوم) -LDAPTestConnect=اختبار LDAP الصدد -LDAPTestSynchroContact=اختبار الاتصال 'sالتزامن -LDAPTestSynchroUser=تجربة المستخدم التزامن -LDAPTestSynchroGroup=اختبار المجموعة التزامن -LDAPTestSynchroMember=اختبار العضو التزامن +LDAPMemberTypeDnExample=کامل DN (سابق: OU = type_members، DC = عنوان مثال، DC = کام) +LDAPTestConnect=اتصال LDAP تست +LDAPTestSynchroContact=تماس با ما آزمون هماهنگ سازی +LDAPTestSynchroUser=هماهنگ سازی کاربر تست +LDAPTestSynchroGroup=هماهنگ سازی گروه آزمون +LDAPTestSynchroMember=هماهنگ سازی عضو تست LDAPTestSearch= تست یک جستجوی LDAP -LDAPSynchroOK=تزامن اختبار ناجح -LDAPSynchroKO=فشل تزامن الاختبار -LDAPSynchroKOMayBePermissions=تزامن فشل الاختبار. تأكد من أن ارتباط لخادم تهيئتها بشكل صحيح ، ويسمح LDAP udpates -LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=ربط برنامج التعاون الفني لخادم LDAP ناجحة (٪ ق= خادم بورت= ٪) -LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=ربط برنامج التعاون الفني لخادم LDAP فشل (خادم ق= ٪ بورت= ٪) -LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) -LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=ربط / Authentificate لخادم LDAP فشل (خادم ق= ٪ بورت= ٪ ق ، ق= ٪ الادارية ، كلمة المرور= ٪) -LDAPUnbindSuccessfull=Disconnect successful -LDAPUnbindFailed=قطع فشل -LDAPConnectToDNSuccessfull=الاتحاد الافريقي بصدد DN (٪) ري ¿½ ussie -LDAPConnectToDNFailed=الاتحاد الافريقي بصدد DN (٪) ¿½ ï ¿½ ه chouï -LDAPSetupForVersion3=خادم LDAP تهيئتها للنسخة 3 -LDAPSetupForVersion2=خادم LDAP لتكوين نسخة 2 -LDAPDolibarrMapping=Dolibarr رسم الخرائط -LDAPLdapMapping=LDAP الخرائط -LDAPFieldLoginUnix=ادخل (يونكس) -LDAPFieldLoginExample=على سبيل المثال : رمز المستخدم -LDAPFilterConnection=البحث عن مرشح -LDAPFilterConnectionExample=Example : &(objectClass=مثال ذلك : & (objectClass= inetOrgPerson) -LDAPFieldLoginSamba=ادخل (سامبا ، activedirectory) -LDAPFieldLoginSambaExample=مثال ذلك : samaccountname -LDAPFieldFullname=Firstname الاسم -LDAPFieldFullnameExample=مثال ذلك : cn -LDAPFieldPassword=كلمة السر -LDAPFieldPasswordNotCrypted=كلمة السر لا crypted -LDAPFieldPasswordCrypted=كلمة السر crypted -LDAPFieldPasswordExample=مثال ذلك : userPassword -LDAPFieldCommonName=اسم عام -LDAPFieldCommonNameExample=مثال ذلك : cn -LDAPFieldName=اسم -LDAPFieldNameExample=مثال ذلك : كيشور -LDAPFieldFirstName=Firstname -LDAPFieldFirstNameExample=مثال ذلك : givenname -LDAPFieldMail=عنوان البريد الإلكتروني -LDAPFieldMailExample=على سبيل المثال : البريد الإلكتروني -LDAPFieldPhone=رقم الهاتف المهني +LDAPSynchroOK=آزمون موفقیت آمیز هماهنگ سازی +LDAPSynchroKO=آزمون هماهنگ سازی ناموفق +LDAPSynchroKOMayBePermissions=آزمون هماهنگ سازی شکست خورده است. بررسی کنید که اتصال به سرور به درستی پیکربندی شده و اجازه می دهد تا udpates LDAP +LDAPTCPConnectOK=TCP اتصال به سرور LDAP موفق (سرور =٪ S، بندر =٪ بازدید کنندگان) +LDAPTCPConnectKO=TCP اتصال به سرور LDAP شکست خورده (سرور =٪ S، بندر =٪ بازدید کنندگان) +LDAPBindOK=به سرور LDAP اتصال / Authentificate موفق (سرور =٪ S، بندر =٪ S، مدیر =٪ ثانیه، رمز عبور =٪ بازدید کنندگان) +LDAPBindKO=به سرور LDAP اتصال / Authentificate شکست خورده (سرور =٪ S، بندر =٪ S، مدیر =٪ ثانیه، رمز عبور =٪ بازدید کنندگان) +LDAPUnbindSuccessfull=قطع ارتباط موفق +LDAPUnbindFailed=قطع شکست خورده +LDAPConnectToDNSuccessfull=اتصال به DN (٪ بازدید کنندگان) موفق +LDAPConnectToDNFailed=اتصال به DN (از٪ s) شکست خورد +LDAPSetupForVersion3=سرور LDAP پیکربندی از نسخه 3 +LDAPSetupForVersion2=سرور LDAP پیکربندی شده برای نسخه 2 +LDAPDolibarrMapping=نقشه برداری Dolibarr +LDAPLdapMapping=نقشه برداری LDAP +LDAPFieldLoginUnix=ورود (unix) +LDAPFieldLoginExample=به عنوان مثال: UID +LDAPFilterConnection=جستجو فیلتر +LDAPFilterConnectionExample=به عنوان مثال: و (objectClass = inetOrgPerson) +LDAPFieldLoginSamba=ورود (سامبا، با Active Directory) +LDAPFieldLoginSambaExample=به عنوان مثال: samaccountname +LDAPFieldFullname=نام و نام خانوادگی +LDAPFieldFullnameExample=به عنوان مثال: را انتخاب نمایید: +LDAPFieldPassword=رمز عبور +LDAPFieldPasswordNotCrypted=رمز عبور crypted نمی +LDAPFieldPasswordCrypted=رمز عبور crypted +LDAPFieldPasswordExample=به عنوان مثال: userPassword +LDAPFieldCommonName=نام مشترک +LDAPFieldCommonNameExample=به عنوان مثال: را انتخاب نمایید: +LDAPFieldName=نام +LDAPFieldNameExample=به عنوان مثال: SN +LDAPFieldFirstName=نام کوچک +LDAPFieldFirstNameExample=مثال:لقب +LDAPFieldMail=آدرس پست الکترونیک +LDAPFieldMailExample=به عنوان مثال: پست الکترونیکی +LDAPFieldPhone=شماره تلفن های حرفه ای LDAPFieldPhoneExample=مثال ذلك : telephonenumber LDAPFieldHomePhone=رقم الهاتف الشخصي LDAPFieldHomePhoneExample=مثال ذلك : homephone @@ -1292,7 +1292,7 @@ LDAPFieldSidExample=به عنوان مثال: objectsid LDAPFieldEndLastSubscription=تاریخ پایان اشتراک LDAPFieldTitle=ارسال / تابع LDAPFieldTitleExample=به عنوان مثال: عنوان -LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class) +LDAPParametersAreStillHardCoded=پارامترهای LDAP هنوز هم HARDCODED (در کلاس در تماس) LDAPSetupNotComplete=راه اندازی LDAP کامل نیست (به به دیگران زبانه) LDAPNoUserOrPasswordProvidedAccessIsReadOnly=هیچ مدیر یا کلمه عبور ارائه شده است. دسترسی LDAP ناشناس و در حالت فقط خواندنی خواهد بود. LDAPDescContact=این صفحه به شما اجازه تعریف LDAP ویژگی نام در درخت LDAP برای هر یک از داده ها بر روی تماس های Dolibarr. @@ -1444,11 +1444,11 @@ ConfirmDeleteLine=آیا مطمئن هستید که می خواهید این خ ##### Tax ##### TaxSetup=مالیات، مشارکت اجتماعی و سود سهام راه اندازی ماژول OptionVatMode=مالیات بر ارزش افزوده به دلیل -OptionVATDefault=Cash basis -OptionVATDebitOption=Accrual basis +OptionVATDefault=مبنای نقدی +OptionVATDebitOption=مبنای تعهدی OptionVatDefaultDesc=مالیات بر ارزش افزوده است به دلیل:
- تحویل کالا (ما استفاده از تاریخ فاکتور)
- در پرداختهای مربوط به خدمات OptionVatDebitOptionDesc=مالیات بر ارزش افزوده است به دلیل:
- تحویل کالا (ما استفاده از تاریخ فاکتور)
- در فاکتور (بدهی) برای خدمات -SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option: +SummaryOfVatExigibilityUsedByDefault=زمان exigibility مالیات بر ارزش افزوده به طور پیش فرض با توجه به گزینه انتخاب شده: OnDelivery=در هنگام تحویل OnPayment=در پرداخت OnInvoice=در هنگام قبض @@ -1465,10 +1465,10 @@ AccountancyCodeBuy=خرید حساب. رمز AgendaSetup=رویدادها و برنامه راه اندازی ماژول PasswordTogetVCalExport=کلیدی به اجازه لینک صادرات PastDelayVCalExport=آیا رویداد صادرات و نه بزرگتر از -AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events) -AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view -AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view -AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda +AGENDA_USE_EVENT_TYPE=استفاده از انواع حوادث (مدیریت به منوی تنظیم -> واژه نامه -> نوع از رویدادهای دستور کار) +AGENDA_DEFAULT_FILTER_TYPE=تنظیم به صورت خودکار این نوع از رویداد را به فیلتر جستجو از نظر دستور کار +AGENDA_DEFAULT_FILTER_STATUS=تنظیم به صورت خودکار این وضعیت رویدادی به فیلتر جستجو از نظر دستور کار +AGENDA_DEFAULT_VIEW=کدام زبانه می خواهید برای باز کردن به طور پیش فرض هنگام انتخاب دستور کار منو ##### ClickToDial ##### ClickToDialDesc=این ماژول اجازه می دهد تا پس از شماره تلفن به اضافه کردن یک آیکون. با کلیک بر روی این آیکون به یک سرور با یک URL خاص زیر تعریف می کنید تماس بگیرید. این می تواند مورد استفاده قرار گیرد به تماس سیستم مرکز تماس از Dolibarr است که می تواند شماره تلفن را بر روی یک سیستم SIP به عنوان مثال تماس بگیرید. ##### Point Of Sales (CashDesk) ##### @@ -1520,16 +1520,16 @@ TaskModelModule=گزارش کارهای سند مدل ECMSetup = راه اندازی GED ECMAutoTree = پوشه درخت به صورت خودکار و سند ##### Fiscal Year ##### -FiscalYears=Fiscal years -FiscalYear=Fiscal year -FiscalYearCard=Fiscal year card -NewFiscalYear=New fiscal year -EditFiscalYear=Edit fiscal year -OpenFiscalYear=Open fiscal year -CloseFiscalYear=Close fiscal year -DeleteFiscalYear=Delete fiscal year -ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? -Opened=Opened -Closed=Closed +FiscalYears=سال مالی +FiscalYear=سال مالی +FiscalYearCard=کارت سال مالی +NewFiscalYear=سال مالی جدید +EditFiscalYear=ویرایش سال مالی +OpenFiscalYear=سال مالی گسترش +CloseFiscalYear=بستن سال مالی +DeleteFiscalYear=حذف سال مالی +ConfirmDeleteFiscalYear=آیا مطمئن هستید این سال مالی را حذف کنید؟ +Opened=افتتاح شد +Closed=بسته Format=قالب diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang index add371b2e5c..cca59fccaa2 100644 --- a/htdocs/langs/fa_IR/agenda.lang +++ b/htdocs/langs/fa_IR/agenda.lang @@ -25,15 +25,15 @@ ListOfEvents= فهرست وقایع Dolibarr ActionsAskedBy=رویدادهای گزارش شده توسط ActionsToDoBy=رویدادهای اختصاص یافته به ActionsDoneBy=رویدادهای انجام شده توسط -ActionsForUser=Events for user -ActionsForUsersGroup=Events for all users of group +ActionsForUser=رویدادهای ها برای کاربر +ActionsForUsersGroup=رویدادها برای همه کاربران گروه AllMyActions= همه رویدادها من / وظایف AllActions= همه رویدادها / وظایف ViewList=مشاهده لیست ViewCal=مشاهده ماه ViewDay=نمای روز ViewWeek=مشاهده هفته -ViewPerUser=Per user +ViewPerUser=در طول کاربر ViewWithPredefinedFilters= نمایش با فیلترهای از پیش تعریف شده AutoActions= پر کردن خودکار AgendaAutoActionDesc= تعریف اینجا رویدادی که می خواهید Dolibarr برای ایجاد به طور خودکار یک رویداد در دستور کار. اگر چیزی (به طور پیش فرض) انتخاب شود، فقط اقدامات تجاری خواهد شد در دستور کار گنجانده شده است. @@ -58,7 +58,7 @@ SupplierInvoiceSentByEMail=تامین کننده فاکتور٪ s ارسال ب ShippingSentByEMail=حمل و نقل٪ s ارسال با ایمیل ShippingValidated= حمل و نقل از٪ s معتبر InterventionSentByEMail=مداخله٪ s ارسال با ایمیل -InterventionClassifiedBilled=Intervention %s classified as Billed +InterventionClassifiedBilled=مداخله٪ s در طبقه بندی گونه که اعلام شده NewCompanyToDolibarr= شخص ثالث ایجاد شده DateActionPlannedStart= تاریخ شروع برنامه ریزی شده DateActionPlannedEnd= تاریخ پایان برنامه ریزی شده diff --git a/htdocs/langs/fa_IR/commercial.lang b/htdocs/langs/fa_IR/commercial.lang index e5833224dbc..46d83514095 100644 --- a/htdocs/langs/fa_IR/commercial.lang +++ b/htdocs/langs/fa_IR/commercial.lang @@ -71,7 +71,7 @@ ActionAC_FAX=ارسال فکس ActionAC_PROP=ارسال پیشنهاد از طریق پست ActionAC_EMAIL=ارسال ایمیل ActionAC_RDV=جلسات -ActionAC_INT=Intervention on site +ActionAC_INT=مداخله در سایت ActionAC_FAC=ارسال صورت حساب به مشتری از طریق پست ActionAC_REL=ارسال صورت حساب به مشتری از طریق پست (یادآوری) ActionAC_CLO=نزدیک diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang index f100f450ab6..538b392b4ea 100644 --- a/htdocs/langs/fa_IR/companies.lang +++ b/htdocs/langs/fa_IR/companies.lang @@ -1,32 +1,32 @@ # Dolibarr language file - Source file is en_US - companies -ErrorCompanyNameAlreadyExists=نام شرکت٪ s در حال حاضر وجود دارد. یکی دیگر را انتخاب کنید. +ErrorCompanyNameAlreadyExists=نام شرکت از٪ s از قبل وجود دارد. یکی دیگر را انتخاب کنید. ErrorPrefixAlreadyExists=پیشوند٪ s در حال حاضر وجود دارد. یکی دیگر را انتخاب کنید. -ErrorSetACountryFirst=مجموعه ای از کشور برای اولین بار +ErrorSetACountryFirst=تنظیم این کشور برای اولین بار SelectThirdParty=انتخاب شخص ثالث DeleteThirdParty=حذف شخص ثالث ConfirmDeleteCompany=آیا مطمئن هستید که می خواهید این شرکت و تمام اطلاعات به ارث برده را حذف کنید؟ DeleteContact=حذف یک تماس / آدرس ConfirmDeleteContact=آیا مطمئن هستید که می خواهید این مخاطب و تمام اطلاعات به ارث برده را حذف کنید؟ MenuNewThirdParty=شخص ثالث جدید -MenuNewCompany=شرکت های جدید +MenuNewCompany=شرکت جدید MenuNewCustomer=مشتری جدید MenuNewProspect=چشم انداز جدید MenuNewSupplier=منبع جدید -MenuNewPrivateIndividual=فرد خصوصی جدید +MenuNewPrivateIndividual=فردی خصوصی جدید MenuSocGroup=گروه NewCompany=شرکت جدید (چشم انداز، مشتری، عرضه کننده کالا) NewThirdParty=شخص ثالث جدید (چشم انداز، مشتری، عرضه کننده کالا) NewSocGroup=گروه شرکت های جدید -NewPrivateIndividual=فرد خصوصی جدید (چشم انداز، مشتری، عرضه کننده کالا) -CreateDolibarrThirdPartySupplier=ایجاد یک شخص ثالث (منبع) +NewPrivateIndividual=فردی خصوصی جدید (چشم انداز، مشتری، عرضه کننده کالا) +CreateDolibarrThirdPartySupplier=ایجاد یک حزب سوم (منبع) ProspectionArea=منطقه Prospection SocGroup=گروه شرکت های -IdThirdParty=شناسه شخص ثالث +IdThirdParty=کد های شخص ثالث IdCompany=شرکت آیدی IdContact=تماس با شناسه Contacts=تماس / آدرس -ThirdPartyContacts=اطلاعات تماس شخص ثالث -ThirdPartyContact=تماس با حزب سوم / آدرس +ThirdPartyContacts=تماس با ما شخص ثالث +ThirdPartyContact=شخص ثالث تماس با ما / آدرس StatusContactValidated=وضعیت تماس / آدرس Company=شرکت CompanyName=نام شرکت @@ -35,23 +35,23 @@ CountryIsInEEC=کشور است در داخل جامعه اقتصادی اروپ ThirdPartyName=نام و نام خانوادگی شخص ثالث ThirdParty=شخص ثالث ThirdParties=احزاب سوم -ThirdPartyAll=اشخاص ثالث (همه) +ThirdPartyAll=احزاب سوم (همه) ThirdPartyProspects=چشم انداز ThirdPartyProspectsStats=چشم انداز ThirdPartyCustomers=مشتریان ThirdPartyCustomersStats=مشتریان -ThirdPartyCustomersWithIdProf12=مشتریان با٪ s و یا٪ s را -ThirdPartySuppliers=تولید کنندگان +ThirdPartyCustomersWithIdProf12=مشتریان با٪ s یا٪ s +ThirdPartySuppliers=تامین کنندگان ThirdPartyType=نوع شخص ثالث -Company/Fundation=شرکت / موسسه -Individual=فرد خصوصی -ToCreateContactWithSameName=به طور خودکار ایجاد تماس فیزیکی با همان اطلاعات +Company/Fundation=شرکت / بنیاد +Individual=فردی خصوصی +ToCreateContactWithSameName=به طور خودکار ایجاد یک تماس فیزیکی با همان اطلاعات ParentCompany=شرکت مادر -Subsidiary=فرعی +Subsidiary=جانبی Subsidiaries=شرکتهای تابعه NoSubsidiary=بدون تابعه -ReportByCustomers=گزارش شده توسط مشتریان -ReportByQuarter=گزارش های سرعت +ReportByCustomers=گزارش های مشتریان +ReportByQuarter=گزارش های نرخ CivilityCode=کد تمدن RegisteredOffice=دفتر ثبت نام Name=نام @@ -68,21 +68,21 @@ CountryCode=کد کشور CountryId=شناسه کشور Phone=تلفن Skype=اسکایپ -Call=دعوت -Chat=چت -PhonePro=تلفن دکتر +Call=تماس +Chat=انجمن +PhonePro=تلفن پروفسور PhonePerso=شخصی سازی. تلفن -PhoneMobile=سیار +PhoneMobile=تلفن همراه No_Email=آیا توده ایمیلها ارسال کنید Fax=فکس Zip=کد پستی Town=شهرستان Web=وب سایت -Poste= موقعیت +Poste= درجه DefaultLang=زبان پیش فرض -VATIsUsed=مالیات بر ارزش افزوده استفاده می شود +VATIsUsed=مالیات بر ارزش افزوده استفاده شده است VATIsNotUsed=مالیات بر ارزش افزوده استفاده نمی شود -CopyAddressFromSoc=آدرس زیر را پر کنید با آدرس thirdparty +CopyAddressFromSoc=آدرس با آدرس thirdparty را پر کنید NoEmailDefined=هیچ ایمیل تعریف شده وجود دارد ##### Local Taxes ##### LocalTax1IsUsedES= RE استفاده شده است @@ -91,29 +91,29 @@ LocalTax2IsUsedES= IRPF استفاده شده است LocalTax2IsNotUsedES= IRPF استفاده نمی شود LocalTax1ES=RE LocalTax2ES=IRPF -TypeLocaltax1ES=RE Type -TypeLocaltax2ES=IRPF Type -TypeES=Type +TypeLocaltax1ES=نوع RE +TypeLocaltax2ES=IRPF نوع +TypeES=نوع ThirdPartyEMail=از٪ s WrongCustomerCode=کد مشتری نامعتبر است -WrongSupplierCode=کد منبع نامعتبر +WrongSupplierCode=کد تامین کننده نامعتبر است CustomerCodeModel=مدل کد مشتری SupplierCodeModel=مدل کد تامین کننده -Gencod=بارکد +Gencod=کد نوار ##### Professional ID ##### -ProfId1Short=شناسه پروفسور 1 -ProfId2Short=شناسه پروفسور 2 -ProfId3Short=شناسه پروفسور 3 -ProfId4Short=شناسه پروفسور 4 -ProfId5Short=شناسه پروفسور 5 -ProfId6Short=شناسه پروفسور 5 +ProfId1Short=پروفسور شناسه (شماره) 1 +ProfId2Short=پروفسور شناسه (شماره) 2 +ProfId3Short=پروفسور شناسه (شماره) 3 +ProfId4Short=پروفسور شناسه (شماره) 4 +ProfId5Short=پروفسور شناسه (شماره) 5 +ProfId6Short=پروفسور شناسه (شماره) 5 ProfId1=ID حرفه ای 1 ProfId2=ID حرفه ای 2 ProfId3=ID حرفه ای 3 ProfId4=ID حرفه ای 4 ProfId5=ID حرفه ای 5 ProfId6=ID حرفه ای 6 -ProfId1AR=پروفسور شناسه 1 (CUIT / Cuil در) +ProfId1AR=پروفسور شناسه 1 (مدار / CUIL) ProfId2AR=پروفسور کد 2 (متخصص Revenu) ProfId3AR=- ProfId4AR=- @@ -140,7 +140,7 @@ ProfId4BR=CPF ProfId1CH=- ProfId2CH=- ProfId3CH=پروفسور شناسه 1 (تعداد فدرال) -ProfId4CH=پروفسور کد 2 (شماره ثبت تجاری) +ProfId4CH=پروفسور کد 2 (تعداد رکورد های تجاری) ProfId5CH=- ProfId6CH=- ProfId1CL=پروفسور شناسه 1 (RUT) @@ -156,20 +156,20 @@ ProfId4CO=- ProfId5CO=- ProfId6CO=- ProfId1DE=پروفسور شناسه 1 (USt.-IdNr) -ProfId2DE=پروفسور کد 2 (USt.-NR) -ProfId3DE=پروفسور کد 3 (Handelsregister-Nr.) +ProfId2DE=پروفسور کد 2 (USt.-شماره) +ProfId3DE=پروفسور کد 3 (Handelsregister-شماره.) ProfId4DE=- ProfId5DE=- ProfId6DE=- ProfId1ES=پروفسور شناسه 1 (CIF / NIF) -ProfId2ES=پروفسور کد 2 (شماره تامین اجتماعی) +ProfId2ES=پروفسور کد 2 (شماره امنیت اجتماعی) ProfId3ES=پروفسور کد 3 (CNAE) ProfId4ES=پروفسور کد 4 (تعداد دانشگاهی) ProfId5ES=- ProfId6ES=- ProfId1FR=پروفسور شناسه 1 (SIREN) ProfId2FR=پروفسور کد 2 (SIRET) -ProfId3FR=پروفسور کد 3 (NAF، قدیمی APE) +ProfId3FR=پروفسور کد 3 (NAF، APE قدیمی) ProfId4FR=پروفسور کد 4 (RCS / RM) ProfId5FR=- ProfId6FR=- @@ -179,7 +179,7 @@ ProfId3GB=SIC ProfId4GB=- ProfId5GB=- ProfId6GB=- -ProfId1HN=پروفسور شناسه. 1 (RTN) +ProfId1HN=استاد آیدی. 1 (RTN) ProfId2HN=- ProfId3HN=- ProfId4HN=- @@ -187,19 +187,19 @@ ProfId5HN=- ProfId6HN=- ProfId1IN=پروفسور شناسه 1 (TIN) ProfId2IN=پروفسور کد 2 (PAN) -ProfId3IN=پروفسور کد 3 (SRVC TAX) +ProfId3IN=پروفسور کد 3 (TAX SRVC) ProfId4IN=پروفسور کد 4 ProfId5IN=پروفسور کد 5 ProfId6IN=- -ProfId1MA=پروفسور شناسه. 1 (RC) -ProfId2MA=پروفسور شناسه. 2 (Patente) -ProfId3MA=پروفسور شناسه. 3 (IF) -ProfId4MA=پروفسور شناسه. 4 (CNSS) +ProfId1MA=استاد آیدی. 1 (RC) +ProfId2MA=استاد آیدی. 2 (Patente) +ProfId3MA=استاد آیدی. 3 (IF) +ProfId4MA=استاد آیدی. 4 (CNSS) ProfId5MA=- ProfId6MA=- ProfId1MX=پروفسور شناسه 1 (RFC). -ProfId2MX=پروفسور کد 2 (R.. P. IMSS) -ProfId3MX=پروفسور کد 3 (حرفه ای منشور) +ProfId2MX=پروفسور کد 2 (R..P. IMSS) +ProfId3MX=پروفسور کد 3 (حرفه منشور) ProfId4MX=- ProfId5MX=- ProfId6MX=- @@ -209,9 +209,9 @@ ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) ProfId5NL=- ProfId6NL=- -ProfId1PT=پروفسور شناسه 1 (پتروشیمی) -ProfId2PT=پروفسور کد 2 (شماره تامین اجتماعی) -ProfId3PT=پروفسور کد 3 (شماره ثبت تجاری) +ProfId1PT=پروفسور شناسه 1 (NIPC) +ProfId2PT=پروفسور کد 2 (شماره امنیت اجتماعی) +ProfId3PT=پروفسور کد 3 (تعداد رکورد های تجاری) ProfId4PT=پروفسور کد 4 (هنرستان) ProfId5PT=- ProfId6PT=- @@ -237,37 +237,37 @@ VATIntra=تعداد مالیات بر ارزش افزوده VATIntraShort=تعداد مالیات بر ارزش افزوده VATIntraVeryShort=مالیات بر ارزش افزوده VATIntraSyntaxIsValid=نحو معتبر است -VATIntraValueIsValid=مقدار معتبر است +VATIntraValueIsValid=ارزش معتبر است ProspectCustomer=چشم انداز / مشتریان Prospect=چشم انداز -CustomerCard=کارت مشتری -Customer=مشتری -CustomerDiscount=تخفیف ویژه -CustomerRelativeDiscount=تخفیف ویژه نسبی -CustomerAbsoluteDiscount=تخفیف ویژه مطلق +CustomerCard=کارت به مشتری +Customer=مشتریان +CustomerDiscount=تخفیف به مشتری +CustomerRelativeDiscount=تخفیف به مشتریان نسبی +CustomerAbsoluteDiscount=تخفیف به مشتریان مطلق CustomerRelativeDiscountShort=تخفیف نسبی CustomerAbsoluteDiscountShort=تخفیف مطلق -CompanyHasRelativeDiscount=این مشتری تخفیف به طور پیش فرض از٪ S٪٪ -CompanyHasNoRelativeDiscount=این مشتری است تخفیف نسبی به طور پیش فرض +CompanyHasRelativeDiscount=این مشتری است تخفیف به طور پیش فرض از٪ s٪٪ +CompanyHasNoRelativeDiscount=این مشتری ندارد تخفیف نسبی به طور پیش فرض CompanyHasAbsoluteDiscount=این مشتری هنوز اعتبارات تخفیف و یا سپرده برای٪ s٪ s را CompanyHasCreditNote=این مشتری هنوز یادداشت های اعتباری برای٪ s٪ s را -CompanyHasNoAbsoluteDiscount=این مشتری هیچ اعتباری تخفیف در دسترس +CompanyHasNoAbsoluteDiscount=این مشتری است هیچ اعتباری تخفیف در دسترس CustomerAbsoluteDiscountAllUsers=تخفیف مطلق (اعطا شده توسط همه کاربران) CustomerAbsoluteDiscountMy=تخفیف مطلق (اعطا شده توسط خودتان) -DefaultDiscount=به طور پیش فرض از تخفیف -AvailableGlobalDiscounts=تخفیف مطلق دسترس +DefaultDiscount=پیش فرض تخفیف +AvailableGlobalDiscounts=تخفیف مطلق در دسترس DiscountNone=هیچ یک -Supplier=تهیه کننده +Supplier=تامین کننده CompanyList=لیست شرکت AddContact=اضافه کردن تماس AddContactAddress=اضافه کردن تماس / آدرس -EditContact=ویرایش تماس +EditContact=ویرایش مخاطب EditContactAddress=ویرایش مخاطب / آدرس -Contact=تماس +Contact=تماس با ContactsAddresses=تماس / آدرس NoContactDefinedForThirdParty=بدون تماس تعریف شده برای این حزب سوم -NoContactDefined=بدون تماس با تعریف -DefaultContact=به طور پیش فرض از تماس / آدرس +NoContactDefined=بدون تماس تعریف +DefaultContact=پیش فرض تماس با ما / آدرس AddCompany=اضافه کردن شرکت AddThirdParty=اضافه کردن شخص ثالث DeleteACompany=حذف یک شرکت @@ -279,50 +279,50 @@ CustomerAccount=حساب کاربری مشتری SupplierAccount=حساب تامین کننده CustomerCodeDesc=کد مشتری، منحصر به فرد برای همه مشتریان SupplierCodeDesc=کد تامین کننده، منحصر به فرد برای همه تامین کنندگان -RequiredIfCustomer=لازم اگر شخص ثالث مشتری یا چشم انداز است -RequiredIfSupplier=لازم است شخص ثالث یک تامین کننده است +RequiredIfCustomer=در صورتیکه شخص ثالث یک مشتری و یا چشم انداز است +RequiredIfSupplier=در صورتیکه شخص ثالث تامین کنندگان است ValidityControledByModule=اعتبار کنترل های ماژول ThisIsModuleRules=این قوانین برای این ماژول است -LastProspect=آخر -ProspectToContact=چشم انداز برای تماس با -CompanyDeleted=شرکت "٪ s" حذف از پایگاه داده باشد. +LastProspect=آخرین +ProspectToContact=چشم انداز تماس +CompanyDeleted=شرکت "٪ s" را حذف از پایگاه داده. ListOfContacts=لیست مخاطبین / آدرس ListOfContactsAddresses=لیست مخاطبین / آدرس ListOfProspectsContacts=لیست مخاطبین چشم انداز -ListOfCustomersContacts=فهرست مشتریان -ListOfSuppliersContacts=فهرست تماس های منبع -ListOfCompanies=فهرست شرکت ها +ListOfCustomersContacts=فهرست تماس مشتری +ListOfSuppliersContacts=لیست مخاطبین با عرضه کننده کالا +ListOfCompanies=فهرست شرکت ListOfThirdParties=فهرست اشخاص ثالث ShowCompany=نمایش شرکت ShowContact=نمایش تماس ContactsAllShort=همه (بدون فیلتر) ContactType=تماس با نوع ContactForOrders=تماس با سفارش -ContactForProposals=تماس با پیشنهاد است -ContactForContracts=تماس با قرارداد است -ContactForInvoices=تماس با فاکتور به -NoContactForAnyOrder=این تماس با یک تماس برای هر سفارش نمی -NoContactForAnyProposal=این تماس با یک تماس برای هر پیشنهاد تجاری -NoContactForAnyContract=این تماس با یک تماس برای هر قرارداد نیست -NoContactForAnyInvoice=این تماس با یک تماس برای هر فاکتور نمی +ContactForProposals=تماس پیشنهاد را +ContactForContracts=تماس قرارداد را +ContactForInvoices=تماس با فاکتور را +NoContactForAnyOrder=این تماس یک تماس برای هر سفارش نمی +NoContactForAnyProposal=این تماس یک تماس برای هر پیشنهاد تجاری +NoContactForAnyContract=این تماس یک تماس برای هر قرارداد +NoContactForAnyInvoice=این تماس یک تماس برای هر فاکتور نمی NewContact=تماس جدید NewContactAddress=تماس جدید / آدرس -LastContacts=تاریخ و زمان آخرین تماس -MyContacts=تماس با من +LastContacts=آخرین تماس +MyContacts=مخاطبین من Phones=تلفن Capital=سرمایه CapitalOf=سرمایه از٪ s EditCompany=ویرایش شرکت -EditDeliveryAddress=ویرایش آدرس تحویل +EditDeliveryAddress=ویرایش آدرس های تحویل ThisUserIsNot=این کاربر، چشم انداز، مشتری و نه عرضه کننده کالا نمی -VATIntraCheck=بررسی -VATIntraCheckDesc=لینک از٪ s اجازه می دهد تا به درخواست سرویس جستجوگر مالیات بر ارزش افزوده اروپا. دسترسی به اینترنت خارجی از سرور برای این سرویس لازم است به کار می کنند. +VATIntraCheck=تصفیه +VATIntraCheckDesc=لینک از٪ s اجازه می دهد تا به درخواست سرویس جستجوگر مالیات بر ارزش افزوده اروپا. دسترسی به اینترنت خارجی را از سرور مورد نیاز است برای این سرویس به کار می کنند. VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do -VATIntraCheckableOnEUSite=چک کردن مالیات بر ارزش افزوده Intracomunnautary در سایت کمیسیون اروپا -VATIntraManualCheck=شما همچنین می توانید به صورت دستی از وب سایت اروپا بررسی از٪ s -ErrorVATCheckMS_UNAVAILABLE=ممکن است بررسی کنید. خدمات ورود به توسط دولت عضو (٪ بازدید کنندگان) ارائه نشده است. +VATIntraCheckableOnEUSite=ورود به Intracomunnautary مالیات بر ارزش افزوده در سایت کمیسیون اروپا +VATIntraManualCheck=شما همچنین می توانید به صورت دستی از اروپا وب سایت بررسی از٪ s +ErrorVATCheckMS_UNAVAILABLE=ورود امکان پذیر نیست. خدمات تصفیه توسط دولت عضو (٪ بازدید کنندگان) ارائه نشده است. NorProspectNorCustomer=و نه چشم انداز، و نه مشتری -JuridicalStatus=وضع حقوقی +JuridicalStatus=وضعیت حقوقی Staff=کارکنان ProspectLevelShort=پتانسیل ProspectLevel=بالقوه چشم انداز @@ -333,29 +333,29 @@ OthersNotLinkedToThirdParty=دیگران، به شخص ثالث در ارتبا ProspectStatus=وضعیت چشم انداز PL_NONE=هیچ یک PL_UNKNOWN=ناشناخته -PL_LOW=کم +PL_LOW=پایین PL_MEDIUM=متوسط -PL_HIGH=زیاد +PL_HIGH=بالا TE_UNKNOWN=- TE_STARTUP=راه اندازی -TE_GROUP=شرکت بزرگ +TE_GROUP=شرکت های بزرگ TE_MEDIUM=شرکت متوسط TE_ADMIN=دولتی TE_SMALL=شرکت های کوچک TE_RETAIL=خرده فروش TE_WHOLE=Wholetailer -TE_PRIVATE=فرد خصوصی +TE_PRIVATE=فردی خصوصی TE_OTHER=دیگر StatusProspect-1=آیا تماس بگیرید StatusProspect0=هرگز تماس StatusProspect1=برای تماس با -StatusProspect2=تماس در فرایند +StatusProspect2=تماس با در فرآیند StatusProspect3=تماس با انجام -ChangeDoNotContact=تغییر وضعیت به 'آیا تماس نیست' +ChangeDoNotContact=تغییر وضعیت به "آیا تماس بگیرید ' ChangeNeverContacted=تغییر وضعیت به "هرگز تماس ' -ChangeToContact=تغییر وضعیت به 'برای ارتباط با " -ChangeContactInProcess=تغییر وضعیت به تماس در فرایند ' -ChangeContactDone=تغییر وضعیت به تماس انجام می شود ' +ChangeToContact=تغییر وضعیت به "برای تماس با ' +ChangeContactInProcess=تغییر وضعیت به "تماس با در فرآیند ' +ChangeContactDone=تغییر وضعیت به "تماس با انجام" ProspectsByStatus=چشم انداز های وضعیت BillingContact=تماس با حسابداری NbOfAttachedFiles=تعداد فایل های پیوست شده @@ -364,49 +364,49 @@ NoRIB=بدون BAN تعریف NoParentCompany=هیچ یک ExportImport=صادرات و واردات ExportCardToFormat=کارت صادرات به فرمت -ContactNotLinkedToCompany=تماس با اشخاص ثالث در ارتباط نیست +ContactNotLinkedToCompany=تماس با به هر شخص ثالث مرتبط نیست DolibarrLogin=ورود Dolibarr NoDolibarrAccess=بدون دسترسی Dolibarr ExportDataset_company_1=احزاب سوم (شرکت / پایه / مردم فیزیکی) و خواص ExportDataset_company_2=اطلاعات تماس و خواص ImportDataset_company_1=احزاب سوم (شرکت / پایه / مردم فیزیکی) و خواص ImportDataset_company_2=تماس / آدرس (از thirdparties یا نه) و ویژگی -ImportDataset_company_3=اطلاعات بانکی -PriceLevel=سطح قیمت ها -DeliveriesAddress=آدرس های تحویل +ImportDataset_company_3=جزئیات بانک +PriceLevel=سطح قیمت +DeliveriesAddress=آدرس تحویل DeliveryAddress=آدرس تحویل -DeliveryAddressLabel=آدرس تحویل برچسب -DeleteDeliveryAddress=حذف آدرس تحویل +DeliveryAddressLabel=تحویل برچسب آدرس +DeleteDeliveryAddress=حذف یک آدرس تحویل ConfirmDeleteDeliveryAddress=آیا مطمئن هستید که می خواهید این آدرس تحویل را حذف کنید؟ NewDeliveryAddress=آدرس تحویل جدید AddDeliveryAddress=اضافه کردن آدرس AddAddress=اضافه کردن آدرس -NoOtherDeliveryAddress=بدون آدرس تحویل جایگزین تعریف -SupplierCategory=گروه تامین کننده +NoOtherDeliveryAddress=بدون آدرس های تحویل جایگزین تعریف +SupplierCategory=طبقه بندی کننده JuridicalStatus200=مستقل DeleteFile=حذف فایل ConfirmDeleteFile=آیا مطمئن هستید که می خواهید این فایل را حذف کنید؟ -AllocateCommercial=واگذار شده به نماینده فروش +AllocateCommercial=واگذار شده به فروش نماینده SelectCountry=انتخاب کشور SelectCompany=انتخاب شخص ثالث Organization=سازمان -AutomaticallyGenerated=تولید به صورت خودکار +AutomaticallyGenerated=تولید شده بصورت خودکار FiscalYearInformation=اطلاعات در سال مالی FiscalMonthStart=شروع ماه از سال مالی -YouMustCreateContactFirst=شما باید ایمیل های تماس برای شخص ثالث برای اولین بار ایجاد می شود قادر به اضافه کردن اطلاعیه های ایمیل. -ListSuppliersShort=لیست تامین کنندگان -ListProspectsShort=لیست چشم انداز +YouMustCreateContactFirst=شما باید ایمیل تماس برای شخص ثالث برای اولین بار ایجاد می شود قادر به اضافه کردن اطلاعیه ها ایمیل. +ListSuppliersShort=فهرست تامین کنندگان +ListProspectsShort=فهرست چشم انداز ListCustomersShort=فهرست مشتریان ThirdPartiesArea=منطقه احزاب سوم -LastModifiedThirdParties=تاریخ و زمان آخرین٪ s به اشخاص ثالث اصلاح شده +LastModifiedThirdParties=تاریخ و زمان آخرین٪ بازدید کنندگان اشخاص ثالث اصلاح شده UniqueThirdParties=مجموع اشخاص ثالث منحصر به فرد InActivity=باز ActivityCeased=بسته ActivityStateFilter=وضعیت فعالیت -ProductsIntoElements=List of products into %s +ProductsIntoElements=لیست محصولات را به٪ s CurrentOutstandingBill=لایحه برجسته کنونی OutstandingBill=حداکثر. برای لایحه برجسته -OutstandingBillReached=حداکثر رسیده است. برای لایحه برجسته -MonkeyNumRefModelDesc=numero بازگشت با فرمت٪ syymm-NNNN برای کد مشتری و syymm-NNNN برای کد منبع که در آن YY سال است٪، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است. +OutstandingBillReached=رسیدم حداکثر. برای لایحه برجسته +MonkeyNumRefModelDesc=numero بازگشت با فرمت syymm-NNNN برای کد مشتری و٪ syymm-NNNN برای کد منبع که در آن YY سال است٪، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است. LeopardNumRefModelDesc=کد آزاد است. این کد را می توان در هر زمان تغییر یافتهاست. -ManagingDirectors=مدیریت (بازدید کنندگان) نام و نام خانوادگی (مدیر عامل، مدیر، رئيس جمهور ...) +ManagingDirectors=مدیر (بازدید کنندگان) نام (مدیر عامل شرکت، مدیر، رئيس جمهور ...) diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang index dfa8be48c63..f6bdd7dca9a 100644 --- a/htdocs/langs/fa_IR/compta.lang +++ b/htdocs/langs/fa_IR/compta.lang @@ -4,7 +4,7 @@ AccountancyCard=کارت حسابداری Treasury=خزانه داری MenuFinancial=مالی TaxModuleSetupToModifyRules=برو به نصب ماژول مالیات برای تغییر قوانین برای محاسبه -TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation +TaxModuleSetupToModifyRulesLT=برو به راه اندازی شرکت برای تغییر قوانین برای محاسبه OptionMode=انتخاب برای حسابداری OptionModeTrue=انتخاب درآمدها، هزینه های OptionModeVirtual=گزینه ادعا، بدهی @@ -12,7 +12,7 @@ OptionModeTrueDesc=در این زمینه، گردش مالی بیش از پرد OptionModeVirtualDesc=در این زمینه، گردش مالی بیش از فاکتورها (تاریخ اعتبار) محاسبه می شود. هنگامی که این فاکتورها به علت، آیا آنها پرداخت شده اند یا نه، آنها در خروجی گردش مالی ذکر شده است. FeatureIsSupportedInInOutModeOnly=ویژگی تنها در اعتبارات-بدهی حالت حسابداری موجود را ببینید (حسابداری پیکربندی ماژول) VATReportBuildWithOptionDefinedInModule=مقدار در اینجا نشان داده شده است با استفاده از قواعد تعریف شده توسط راه اندازی ماژول مالیات محاسبه می شود. -LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup. +LTReportBuildWithOptionDefinedInModule=مقدار در اینجا نشان داده شده است با استفاده از قواعد تعریف شده توسط راه اندازی شرکت محاسبه می شود. Param=برپایی RemainingAmountPayment=پرداخت مقدار باقی مانده: AmountToBeCharged=کل مبلغ پرداخت: @@ -42,15 +42,15 @@ VATReceived=مالیات بر ارزش افزوده دریافت VATToCollect=خرید مالیات بر ارزش افزوده VATSummary=موجودی مالیات بر ارزش افزوده LT2SummaryES=IRPF موجودی -LT1SummaryES=RE Balance +LT1SummaryES=RE موجودی VATPaid=مالیات بر ارزش افزوده پرداخت می شود SalaryPaid=حقوق و دستمزد پرداخت می شود LT2PaidES=IRPF پرداخت -LT1PaidES=RE Paid +LT1PaidES=RE پرداخت LT2CustomerES=فروش IRPF LT2SupplierES=خرید IRPF -LT1CustomerES=RE sales -LT1SupplierES=RE purchases +LT1CustomerES=RE فروش +LT1SupplierES=RE خرید VATCollected=مالیات بر ارزش افزوده جمع آوری ToPay=به پرداخت ToGet=به عقب بر گردیم @@ -83,11 +83,11 @@ DateStartPeriod=دوره تاریخ شروع DateEndPeriod=دوره تاریخ پایان NewVATPayment=پرداخت مالیات بر ارزش افزوده جدید newLT2PaymentES=پرداخت IRPF جدید -newLT1PaymentES=New RE payment +newLT1PaymentES=پرداخت RE جدید LT2PaymentES=پرداخت IRPF LT2PaymentsES=IRPF پرداخت -LT1PaymentES=RE Payment -LT1PaymentsES=RE Payments +LT1PaymentES=پرداخت RE +LT1PaymentsES=RE پرداخت VATPayment=مالیات بر ارزش افزوده پرداخت VATPayments=پرداخت مالیات بر ارزش افزوده SocialContributionsPayments=کمک های اجتماعی پرداخت @@ -123,12 +123,12 @@ CalcModeVATDebt=حالت٪ SVAT در تعهد حسابداری٪ است. CalcModeVATEngagement=حالت٪ SVAT در درآمد، هزینه٪ است. CalcModeDebt=حالت٪ sClaims-بدهی٪ گفت حسابداری تعهد. CalcModeEngagement=حالت٪ sIncomes، هزینه٪ گفت حسابداری نقدی -CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s -CalcModeLT1Debt=Mode %sRE on customer invoices%s -CalcModeLT1Rec= Mode %sRE on suppliers invoices%s -CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s -CalcModeLT2Debt=Mode %sIRPF on customer invoices%s -CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s +CalcModeLT1= حالت٪ SRE در صورت حساب مشتری - تامین کنندگان فاکتورها از٪ s +CalcModeLT1Debt=حالت٪ SRE در صورت حساب مشتری از٪ s +CalcModeLT1Rec= حالت٪ SRE در تامین کنندگان فاکتورها از٪ s +CalcModeLT2= حالت٪ sIRPF در صورت حساب مشتری - تامین کنندگان فاکتورها از٪ s +CalcModeLT2Debt=حالت٪ sIRPF در صورت حساب مشتری از٪ s +CalcModeLT2Rec= حالت٪ sIRPF در تامین کنندگان فاکتورها از٪ s AnnualSummaryDueDebtMode=تعادل درآمد و هزینه، خلاصه سالانه AnnualSummaryInputOutputMode=تعادل درآمد و هزینه، خلاصه سالانه AnnualByCompaniesDueDebtMode=تعادل درآمد و هزینه، با جزئیات توسط اشخاص ثالث، حالت٪ sClaims-بدهی٪ گفت حسابداری تعهد. @@ -143,15 +143,15 @@ RulesCAIn=- این شامل تمام پرداخت های موثر از فاکت DepositsAreNotIncluded=- صورت حساب های سپرده ها و نه شامل DepositsAreIncluded=- صورت حساب های سپرده را شامل می شوند LT2ReportByCustomersInInputOutputModeES=گزارش شده توسط شخص ثالث IRPF -LT1ReportByCustomersInInputOutputModeES=Report by third party RE +LT1ReportByCustomersInInputOutputModeES=گزارش شده توسط شخص ثالث RE VATReportByCustomersInInputOutputMode=گزارش های مالیات بر ارزش افزوده مشتری جمع آوری و پرداخت VATReportByCustomersInDueDebtMode=گزارش های مالیات بر ارزش افزوده مشتری جمع آوری و پرداخت VATReportByQuartersInInputOutputMode=گزارش های نرخ مالیات بر ارزش افزوده جمع آوری و پرداخت -LT1ReportByQuartersInInputOutputMode=Report by RE rate -LT2ReportByQuartersInInputOutputMode=Report by IRPF rate +LT1ReportByQuartersInInputOutputMode=گزارش های نرخ RE +LT2ReportByQuartersInInputOutputMode=گزارش های نرخ IRPF VATReportByQuartersInDueDebtMode=گزارش های نرخ مالیات بر ارزش افزوده جمع آوری و پرداخت -LT1ReportByQuartersInDueDebtMode=Report by RE rate -LT2ReportByQuartersInDueDebtMode=Report by IRPF rate +LT1ReportByQuartersInDueDebtMode=گزارش های نرخ RE +LT2ReportByQuartersInDueDebtMode=گزارش های نرخ IRPF SeeVATReportInInputOutputMode=گزارش٪ SVAT قفسه٪ برای محاسبه های استاندارد مشاهده SeeVATReportInDueDebtMode=گزارش٪ SVAT در جریان٪ برای محاسبه با گزینه ای در جریان مشاهده RulesVATInServices=- برای خدمات، این گزارش شامل مقررات مالیات بر ارزش افزوده در واقع دریافت و یا صادر شده بر اساس تاریخ پرداخت. @@ -195,7 +195,7 @@ CalculationRuleDesc=برای محاسبه مالیات بر ارزش افزود CalculationRuleDescSupplier=با توجه به منبع، انتخاب روش مناسب برای اعمال قانون محاسبه همان و گرفتن همان نتیجه انتظار می رود با عرضه کننده کالا خود را. TurnoverPerProductInCommitmentAccountingNotRelevant=گزارش گردش مالی در هر محصول، در هنگام استفاده از حالت حسابداری نقدی مربوط نیست. این گزارش که با استفاده از تعامل حالت حسابداری (راه اندازی ماژول حسابداری را مشاهده کنید) فقط در دسترس است. CalculationMode=حالت محاسبه -AccountancyJournal=Accountancy code journal +AccountancyJournal=کد حسابداری مجله COMPTA_PRODUCT_BUY_ACCOUNT=کد پیش فرض حسابداری برای خرید محصولات COMPTA_PRODUCT_SOLD_ACCOUNT=کد پیش فرض حسابداری برای فروش محصولات COMPTA_SERVICE_BUY_ACCOUNT=کد پیش فرض حسابداری برای خرید خدمات diff --git a/htdocs/langs/fa_IR/contracts.lang b/htdocs/langs/fa_IR/contracts.lang index 2951d988ee5..2e9740faffc 100644 --- a/htdocs/langs/fa_IR/contracts.lang +++ b/htdocs/langs/fa_IR/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=منطقه قرارداد ListOfContracts=فهرست قرارداد -LastContracts=تاریخ و زمان آخرین%s در قرارداد اصلاح شده +LastContracts=تاریخ و زمان آخرین٪ s در قرارداد اصلاح شده AllContracts=همه قراردادها ContractCard=کارت قرارداد ContractStatus=وضعیت قرارداد @@ -32,12 +32,12 @@ SearchAContract=جستجوی یک قرارداد DeleteAContract=حذف یک قرارداد CloseAContract=بستن یک قرارداد ConfirmDeleteAContract=آیا مطمئن هستید که می خواهید این قرارداد و تمام خدمات خود را حذف کنید؟ -ConfirmValidateContract=آیا مطمئن هستید که می خواهید به اعتبار این قرارداد با نام%s را؟ +ConfirmValidateContract=آیا مطمئن هستید که می خواهید به اعتبار این قرارداد با نام٪ s را؟ ConfirmCloseContract=این همه خدمات (فعال یا نه) نزدیک است. آیا مطمئن هستید که می خواهید برای بستن این قرارداد؟ -ConfirmCloseService=آیا مطمئن هستید که می خواهید برای بستن این سرویس با تاریخ از%s؟ +ConfirmCloseService=آیا مطمئن هستید که می خواهید برای بستن این سرویس با تاریخ از٪ s؟ ValidateAContract=اعتبار قرارداد ActivateService=فعال خدمات -ConfirmActivateService=آیا مطمئن هستید که می خواهید برای فعال سازی این سرویس با تاریخ از%s؟ +ConfirmActivateService=آیا مطمئن هستید که می خواهید برای فعال سازی این سرویس با تاریخ از٪ s؟ RefContract=قرارداد مرجع DateContract=تاریخ قرارداد DateServiceActivate=تاریخ فعال سازی سرویس @@ -53,8 +53,8 @@ ListOfRunningContractsLines=فهرست در حال اجرا خطوط قرارد ListOfRunningServices=لیست خدمات در حال اجرا NotActivatedServices=خدمات غیر فعال (در قرارداد اعتبار) BoardNotActivatedServices=خدمات برای فعال سازی در قرارداد اعتبار -LastContracts=تاریخ و زمان آخرین%s در قرارداد اصلاح شده -LastActivatedServices=تاریخ و زمان آخرین%s به خدمات فعال +LastContracts=تاریخ و زمان آخرین٪ s در قرارداد اصلاح شده +LastActivatedServices=تاریخ و زمان آخرین٪ s به خدمات فعال LastModifiedServices=تاریخ و زمان آخرین٪ بازدید کنندگان خدمات اصلاح شده EditServiceLine=خط ویرایش خدمات ContractStartDate=تاریخ شروع @@ -85,12 +85,12 @@ PaymentRenewContractId=تمدید قرارداد خط (تعداد٪ بازدید ExpiredSince=تاریخ انقضا RelatedContracts=قراردادهای مرتبط NoExpiredServices=بدون خدمات فعال منقضی شده -ListOfServicesToExpireWithDuration=فهرست خدمات به پایان می رسد در%s روز -ListOfServicesToExpireWithDurationNeg=فهرست خدمات تمام شده از بیش از%s روز +ListOfServicesToExpireWithDuration=فهرست خدمات به پایان می رسد در٪ s روز +ListOfServicesToExpireWithDurationNeg=فهرست خدمات تمام شده از بیش از٪ s روز ListOfServicesToExpire=فهرست خدمات دات کام NoteListOfYourExpiredServices=این لیست فقط شامل خدمات قرارداد برای اشخاص ثالث به شما به عنوان یک نماینده فروش مرتبط است. -StandardContractsTemplate=Standard contracts template -ContactNameAndSignature=For %s, name and signature: +StandardContractsTemplate=قراردادهای استاندارد قالب +ContactNameAndSignature=برای٪ s، نام و امضا: ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=نمایندگی فروش امضای قرارداد diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang index 581ab337b12..2b8a8c2fc35 100644 --- a/htdocs/langs/fa_IR/errors.lang +++ b/htdocs/langs/fa_IR/errors.lang @@ -153,4 +153,4 @@ WarningCloseAlways=هشدار، بسته شدن انجام می شود حتی ا WarningUsingThisBoxSlowDown=اخطار، با استفاده از این جعبه کاهش سرعت به طور جدی تمام صفحات نشان دادن جعبه. WarningClickToDialUserSetupNotComplete=راه اندازی از اطلاعات ClickToDial برای کاربر شما کامل نیست (ClickToDial زبانه دیدن بر روی کارت کاربر خود را). WarningNotRelevant=عملیات بی ربط برای این مجموعه داده -WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=قابلیت غیر فعال زمانی که راه اندازی صفحه نمایش برای فرد نابینا یا از مرورگرهای متن بهینه شده است. diff --git a/htdocs/langs/fa_IR/exports.lang b/htdocs/langs/fa_IR/exports.lang index 9ee85818d28..fd0c8a59a88 100644 --- a/htdocs/langs/fa_IR/exports.lang +++ b/htdocs/langs/fa_IR/exports.lang @@ -8,16 +8,16 @@ ImportableDatas=مجموعه داده های واردات SelectExportDataSet=انتخاب مجموعه داده های شما می خواهید به صادرات ... SelectImportDataSet=انتخاب مجموعه داده های شما می خواهید به واردات ... SelectExportFields=رشته های شما می خواهید به صادرات را انتخاب کنید، و یا یک پروفایل صادرات از پیش تعریف شده را انتخاب کنید -SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile: +SelectImportFields=انتخاب رشته های منبع فایل شما می خواهید به واردات و درست است هدف خود را در پایگاه داده های در حال حرکت آنها را به بالا و پایین با لنگر٪، یا یک پروفایل واردات از پیش تعریف شده را انتخاب کنید: NotImportedFields=زمینه های از فایل منبع وارد نشده SaveExportModel=ذخیره سازی این مشخصات صادرات اگر شما قصد دارید از آن استفاده مجدد بعد ... SaveImportModel=ذخیره سازی این مشخصات واردات اگر شما قصد دارید از آن استفاده مجدد بعد ... ExportModelName=پروفایل صادرات -ExportModelSaved=مشخصات صادرات تحت نام%s را نجات داد. +ExportModelSaved=مشخصات صادرات تحت نام٪ s را نجات داد. ExportableFields=زمینه های صادراتی ExportedFields=زمینه های صادراتی ImportModelName=پروفایل واردات -ImportModelSaved=مشخصات واردات تحت نام%s را نجات داد. +ImportModelSaved=مشخصات واردات تحت نام٪ s را نجات داد. ImportableFields=زمینه واردات ImportedFields=رشته های وارداتی DatasetToExport=مجموعه داده برای صادرات @@ -60,15 +60,15 @@ FileWithDataToImport=فایل با داده ها به واردات FileToImport=منبع فایل را به واردات FileMustHaveOneOfFollowingFormat=فایل به واردات باید یکی از فرمت های زیر را داشته DownloadEmptyExample=دانلود نمونه ای از فایل منبع خالی -ChooseFormatOfFileToImport=فرمت فایل را انتخاب کنید به عنوان فرمت فایل های واردات استفاده توسط کلیک کردن بر روی picto%s به آن را انتخاب کنید ... -ChooseFileToImport=آپلود فایل کلیک کنید و سپس در picto%s را برای انتخاب فایل به عنوان منبع فایل واردات ... +ChooseFormatOfFileToImport=فرمت فایل را انتخاب کنید به عنوان فرمت فایل های واردات استفاده توسط کلیک کردن بر روی picto٪ s به آن را انتخاب کنید ... +ChooseFileToImport=آپلود فایل کلیک کنید و سپس در picto٪ s را برای انتخاب فایل به عنوان منبع فایل واردات ... SourceFileFormat=فرمت فایل منبع FieldsInSourceFile=زمینه در فایل منبع FieldsInTargetDatabase=رشته های مورد نظر در پایگاه داده Dolibarr (با حروف درشت = اجباری) Field=رشته NoFields=بدون زمینه -MoveField=درست است حرکت شماره ستون از%s -ExampleOfImportFile=Example_of_import_file +MoveField=درست است حرکت شماره ستون از٪ s +ExampleOfImportFile=مثالی از فایل ورودی SaveImportProfile=ذخیره سازی این مشخصات واردات ErrorImportDuplicateProfil=برای صرفه جویی در این پروفایل واردات با این نام انجام نشد. مشخصات موجود در حال حاضر با این نام وجود دارد. ImportSummary=خلاصه راه اندازی واردات @@ -79,9 +79,9 @@ FieldTarget=درست هدفمند FieldSource=درست است منبع DoNotImportFirstLine=آیا خط اول از فایل منبع وارد نشده است NbOfSourceLines=تعداد خطوط در فایل منبع -NowClickToTestTheImport=پارامترهای واردات شما تعریف شده اند را بررسی کنید. اگر آنها درست هستند، بر روی دکمه کلیک کنید "%s" را برای راه اندازی یک شبیه سازی از روند واردات (هیچ داده ای را در پایگاه داده خود را تغییر، آن را تنها یک شبیه سازی برای لحظه ای) ... +NowClickToTestTheImport=پارامترهای واردات شما تعریف شده اند را بررسی کنید. اگر آنها درست هستند، بر روی دکمه کلیک کنید "٪ s" را برای راه اندازی یک شبیه سازی از روند واردات (هیچ داده ای را در پایگاه داده خود را تغییر، آن را تنها یک شبیه سازی برای لحظه ای) ... RunSimulateImportFile=راه اندازی شبیه سازی واردات -FieldNeedSource=This field requires data from the source file +FieldNeedSource=در این زمینه نیاز به داده ها از فایل منبع SomeMandatoryFieldHaveNoSource=برخی از موارد الزامی هیچ منبع از فایل داده InformationOnSourceFile=اطلاعات در فایل منبع InformationOnTargetTables=اطلاعات در زمینه های مورد نظر @@ -89,28 +89,28 @@ SelectAtLeastOneField=تغییر حداقل یکی از فیلد منبع در SelectFormat=را انتخاب کنید این فرمت فایل واردات RunImportFile=راه اندازی فایل واردات NowClickToRunTheImport=نتیجه شبیه سازی واردات را بررسی کنید. اگر همه چیز خوب است، راه اندازی واردات قطعی. -DataLoadedWithId=همه داده خواهد شد با شناسه (شماره) واردات زیر آپلود شده:%s را -ErrorMissingMandatoryValue=اطلاعات اجباری خالی در فایل منبع را برای فیلد%s است. -TooMuchErrors=هنوز هم وجود دارد از%s خط منبع دیگر با اشتباهات اما خروجی محدود بوده است. -TooMuchWarnings=هنوز هم وجود دارد از%s خط منبع دیگر با هشدارهای اما خروجی محدود بوده است. +DataLoadedWithId=همه داده خواهد شد با شناسه (شماره) واردات زیر آپلود شده:٪ s را +ErrorMissingMandatoryValue=اطلاعات اجباری خالی در فایل منبع را برای فیلد٪ s است. +TooMuchErrors=هنوز هم وجود دارد از٪ s خط منبع دیگر با اشتباهات اما خروجی محدود بوده است. +TooMuchWarnings=هنوز هم وجود دارد از٪ s خط منبع دیگر با هشدارهای اما خروجی محدود بوده است. EmptyLine=خط خالی (دور ریخته خواهد شد) CorrectErrorBeforeRunningImport=ابتدا باید، درست قبل از اجرای واردات قطعی تمام خطا است. -FileWasImported=فایل را با تعداد%s را وارد شد. -YouCanUseImportIdToFindRecord=شما می توانید تمام پرونده های وارد شده در پایگاه داده خود را از طریق فیلتر کردن در import_key درست پیدا = '%s' را. +FileWasImported=فایل را با تعداد٪ s را وارد شد. +YouCanUseImportIdToFindRecord=شما می توانید تمام پرونده های وارد شده در پایگاه داده خود را از طریق فیلتر کردن در import_key درست پیدا = '٪ s' را. NbOfLinesOK=تعداد خطوط بدون خطا و بدون اخطار:٪ است. -NbOfLinesImported=شماره خطوط با موفقیت وارد کنید:%s. +NbOfLinesImported=شماره خطوط با موفقیت وارد کنید:٪ s. DataComeFromNoWhere=ارزش برای وارد می آید از هیچ جا در فایل منبع. -DataComeFromFileFieldNb=ارزش برای وارد می آید از میدان تعداد%s را در فایل منبع. +DataComeFromFileFieldNb=ارزش برای وارد می آید از میدان تعداد٪ s را در فایل منبع. DataComeFromIdFoundFromRef=ارزش است که از میدان تعداد٪ از فایل منبع می آید استفاده می شود برای پیدا کردن شناسه (شماره) از جسم پدر و مادر به استفاده از (بنابراین ابژهی کوچک a٪ که دارای کد عکس. از فایل منبع باید به Dolibarr وجود دارد). -DataComeFromIdFoundFromCodeId=کد است که از تعدادی فیلد%s از فایل منبع می آید استفاده می شود برای پیدا کردن شناسه (شماره) از جسم پدر و مادر به استفاده از (بنابراین کد آن را از فایل منبع باید وجود داشته باشد به فرهنگ لغت٪ بازدید کنندگان). توجه داشته باشید که اگر شما می دانید شناسه، شما همچنین می توانید آن را در فایل منبع به جای کد استفاده کنید. واردات باید در هر دو مورد کار می کنند. +DataComeFromIdFoundFromCodeId=کد است که از تعدادی فیلد٪ s از فایل منبع می آید استفاده می شود برای پیدا کردن شناسه (شماره) از جسم پدر و مادر به استفاده از (بنابراین کد آن را از فایل منبع باید وجود داشته باشد به فرهنگ لغت٪ بازدید کنندگان). توجه داشته باشید که اگر شما می دانید شناسه، شما همچنین می توانید آن را در فایل منبع به جای کد استفاده کنید. واردات باید در هر دو مورد کار می کنند. DataIsInsertedInto=داده که از فایل منبع خواهد شد را به زمینه های زیر قرار داده شده: DataIDSourceIsInsertedInto=شناسه شی والدین مشاهده با استفاده از داده ها را در فایل منبع، خواهد شد را به زمینه های زیر قرار داده شده: DataCodeIDSourceIsInsertedInto=شناسه (شماره) خط پدر و مادر پیدا از کد، خواهد شد را در قسمت زیر قرار داده شده: SourceRequired=ارزش داده ها اجباری است SourceExample=نمونه ای از ارزش اطلاعات ممکن ExampleAnyRefFoundIntoElement=هر کد عکس برای عنصر٪ یافت -ExampleAnyCodeOrIdFoundIntoDictionary=هر گونه کد (یا شناسه) یافت به فرهنگ لغت از%s -CSVFormatDesc=کاما جدا فرمت فایل ارزش (CSV).
این فرمت یک فایل متنی که در آن زمینه های جداکننده [%s] را از هم جدا است. اگر جدا در داخل محتوای حوزه به دست آمد، درست است که شخصیت دور [%s] را گرد. شخصیت فرار برای فرار از شخصیت دور [%s] را است. +ExampleAnyCodeOrIdFoundIntoDictionary=هر گونه کد (یا شناسه) یافت به فرهنگ لغت از٪ s +CSVFormatDesc=کاما جدا فرمت فایل ارزش (CSV).
این فرمت یک فایل متنی که در آن زمینه های جداکننده [٪ s] را از هم جدا است. اگر جدا در داخل محتوای حوزه به دست آمد، درست است که شخصیت دور [٪ s] را گرد. شخصیت فرار برای فرار از شخصیت دور [٪ s] را است. Excel95FormatDesc=فرمت فایل اکسل (. XLS)
این مادری اکسل 95 فرمت (BIFF5) است. Excel2007FormatDesc=فرمت فایل اکسل (. XLSX)
این مادری اکسل 2007 فرمت (SpreadsheetML) است. TsvFormatDesc=فرمت تب فایل مقادیر جدا شده (. TSV)
این فرمت یک فایل متنی که در آن زمینه توسط یک جدول نویس [تب] از هم جدا شده است. diff --git a/htdocs/langs/fa_IR/languages.lang b/htdocs/langs/fa_IR/languages.lang index c8930b65757..d1affe9ccb2 100644 --- a/htdocs/langs/fa_IR/languages.lang +++ b/htdocs/langs/fa_IR/languages.lang @@ -10,7 +10,7 @@ Language_da_DA=دانمارکی Language_da_DK=دانمارکی Language_de_DE=آلمانی Language_de_AT=آلمانی (اتریش) -Language_de_CH=German (Switzerland) +Language_de_CH=آلمانی (سوییس) Language_el_GR=یونانی Language_en_AU=انگلیسی(استرالیا) Language_en_GB=انگلیسی بریتانیا @@ -20,7 +20,7 @@ Language_en_SA=انگلیسی عربستان سعودی Language_en_US=انگلیسی آمریکا Language_en_ZA=انگلیسی آفریقای جنوبی Language_es_ES=اسپانیایی -Language_es_DO=Spanish (Dominican Republic) +Language_es_DO=اسپانیایی (جمهوری دومینیکن) Language_es_AR=اسپانیایی آرژانتین Language_es_CL=اسپانیایی (شیلی) Language_es_HN=اسپانیایی (هندوراس) @@ -40,7 +40,7 @@ Language_fr_NC=فرانسه (کالدونیای جدید) Language_he_IL=عبری Language_hr_HR=کرواتی Language_hu_HU=مجارستانی -Language_id_ID=Indonesian +Language_id_ID=اندونزی Language_is_IS=ایسلندی Language_it_IT=ایتالیایی Language_ja_JP=ژاپنی diff --git a/htdocs/langs/fa_IR/link.lang b/htdocs/langs/fa_IR/link.lang new file mode 100644 index 00000000000..546a75210df --- /dev/null +++ b/htdocs/langs/fa_IR/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=لینک فایل جدید / سند +LinkedFiles=اسناد و فایل های مرتبط +NoLinkFound=بدون لینک ها +LinkComplete=فایل با موفقیت ربط داده شده است +ErrorFileNotLinked=فایل نمی تواند مرتبط شود +LinkRemoved=لینک٪ s را حذف شده +ErrorFailedToDeleteLink= برای حذف لینک «٪ s» شکست خورد +ErrorFailedToUpdateLink= برای به روز رسانی لینک «٪ s» شکست خورد diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang index 25b677d5dee..16ad7ea3af3 100644 --- a/htdocs/langs/fa_IR/mails.lang +++ b/htdocs/langs/fa_IR/mails.lang @@ -42,7 +42,7 @@ MailingStatusSentPartialy=قسمتی های ارسال شده MailingStatusSentCompletely=به طور کامل ارسال شد MailingStatusError=خطا MailingStatusNotSent=ارسال نشده -MailSuccessfulySent=ایمیل با موفقیت ارسال شد (از%s به%s) +MailSuccessfulySent=ایمیل با موفقیت ارسال شد (از٪ s به٪ s) MailingSuccessfullyValidated=ایمیل با موفقیت معتبر MailUnsubcribe=لغو اشتراک Unsuscribe=لغو اشتراک @@ -71,19 +71,19 @@ CloneContent=پیام کلون CloneReceivers=دریافت کنندگان Cloner به DateLastSend=تاریخ و زمان آخرین ارسال DateSending=تاریخ ارسال -SentTo=ارسال شده به%s +SentTo=ارسال شده به٪ s MailingStatusRead=خواندن CheckRead=خوانده شده رسید -YourMailUnsubcribeOK=ایمیل به%s درست را از لیست پستی unsubcribe است +YourMailUnsubcribeOK=ایمیل به٪ s درست را از لیست پستی unsubcribe است MailtoEMail=لینک بیش از حد به ایمیل ActivateCheckRead=اجازه به استفاده از "Unsubcribe" لینک ActivateCheckReadKey=استفاده از کلید برای رمزگذاری استفاده URL برای "خوانده شده دریافت" و "Unsubcribe" ویژگی -EMailSentToNRecipients=ارسال به%s را دریافت کنندگان ارسال می شود. -XTargetsAdded=%s recipients added into target list +EMailSentToNRecipients=ارسال به٪ s را دریافت کنندگان ارسال می شود. +XTargetsAdded=٪ s را دریافت کنندگان اضافه به لیست هدف EachInvoiceWillBeAttachedToEmail=یک سند با استفاده از پیش فرض فاکتور قالب سند ایجاد شده و متصل به هر یک از ایمیل. -MailTopicSendRemindUnpaidInvoices=یادآوری از فاکتور از%s (٪ بازدید کنندگان) +MailTopicSendRemindUnpaidInvoices=یادآوری از فاکتور از٪ s (٪ بازدید کنندگان) SendRemind=ارسال یادآور شده توسط ایمیل -RemindSent=%s را یادآور (بازدید کنندگان) ارسال می شود +RemindSent=٪ s را یادآور (بازدید کنندگان) ارسال می شود AllRecipientSelectedForRemind=همه thirdparties انتخاب شده و اگر یک ایمیل تنظیم شده است (توجه داشته باشید که یک پست الکترونیکی در صورتحساب ارسال خواهد شد) NoRemindSent=آدرس ایمیل یادآوری ارسال ResultOfMassSending=نتیجه شده از یادآوری ایمیل انبوه ارسال @@ -104,7 +104,7 @@ LineInFile=خط٪ در فایل RecipientSelectionModules=درخواست تعریف شده برای انتخاب گیرنده MailSelectedRecipients=دریافت کنندگان برگزیده MailingArea=منطقه EMailings -LastMailings=تاریخ و زمان آخرین%s را emailings +LastMailings=تاریخ و زمان آخرین٪ s را emailings TargetsStatistics=آمار اهداف NbOfCompaniesContacts=تماس با ما منحصر به فرد / آدرس MailNoChangePossible=دریافت کنندگان برای ایمیل معتبر نمی تواند تغییر کند @@ -115,7 +115,7 @@ SentBy=ارسال شده توسط MailingNeedCommand=برای دلیل امنیت، با ارسال یک ایمیل بهتر است زمانی که از خط فرمان انجام می شود. اگر شما یکی، مدیر سرور خود بخواهید برای راه اندازی از دستور زیر برای ارسال ایمیل به همه گیرندگان: MailingNeedCommand2=با این حال شما می توانید آنها را به صورت آنلاین ارسال شده توسط اضافه کردن MAILING_LIMIT_SENDBYWEB پارامتر با مقدار حداکثر تعداد ایمیل های شما می خواهید به جلسه ارسال کنید. برای این کار، در خانه به - راه اندازی - سایر. ConfirmSendingEmailing=اگر نمی توانید و یا ترجیح می دهند از ارسال آنها را با مرورگر وب خود، لطفا تایید شما مطمئن هستید که می خواهید برای ارسال ایمیل با شرکت از مرورگر خود هستند؟ -LimitSendingEmailing=توجه داشته باشید: در خط ارسال از emailings برای امنیت و فاصله دلایل به%s دریافت کنندگان با ارسال وارد نمایید محدود شده است. +LimitSendingEmailing=توجه داشته باشید: در خط ارسال از emailings برای امنیت و فاصله دلایل به٪ s دریافت کنندگان با ارسال وارد نمایید محدود شده است. TargetsReset=لیست پاک کردن ToClearAllRecipientsClickHere=برای پاک کردن لیست دریافت کننده این ایمیل اینجا را کلیک کنید ToAddRecipientsChooseHere=اضافه کردن گیرندگان با انتخاب از لیست diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang index 28143791d25..5f81a10f1a0 100644 --- a/htdocs/langs/fa_IR/main.lang +++ b/htdocs/langs/fa_IR/main.lang @@ -356,7 +356,7 @@ ActionNotApplicable=قابل اجرا نیست ActionRunningNotStarted=برای شروع ActionRunningShort=آغاز شده ActionDoneShort=در دست اجرا -ActionUncomplete=Uncomplete +ActionUncomplete=ناقص CompanyFoundation=شرکت / موسسه ContactsForCompany=اطلاعات تماس این شخص ثالث ContactsAddressesForCompany=تماس / آدرس برای این شخص ثالث @@ -552,7 +552,7 @@ MailSentBy=ایمیل های فرستاده شده توسط TextUsedInTheMessageBody=بدن ایمیل SendAcknowledgementByMail=ارسال ACK. از طریق ایمیل NoEMail=بدون پست الکترونیک -NoMobilePhone=No mobile phone +NoMobilePhone=موبایل ممنوع Owner=مالک DetectedVersion=نسخه یافت شد FollowingConstantsWillBeSubstituted=ثابت های زیر را با مقدار متناظر جایگزین شده است. @@ -672,12 +672,12 @@ HelpCopyToClipboard=استفاده از کلیدهای Ctrl + C برای کپی SaveUploadedFileWithMask=ذخیره فایل بر روی سرور با نام "٪ s" (در غیر این صورت "٪ s") OriginFileName=نام فایل اصلی SetDemandReason=تنظیم منبع -SetBankAccount=Define Bank Account -AccountCurrency=Account Currency +SetBankAccount=تعریف حساب های بانکی +AccountCurrency=حساب ارز ViewPrivateNote=مشاهده یادداشت XMoreLines=٪ خط (بازدید کنندگان) پنهان PublicUrl=URL عمومی -AddBox=Add box +AddBox=اضافه کردن جعبه # Week day Monday=دوشنبه diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang index 88e9afbc35b..da634d13a72 100644 --- a/htdocs/langs/fa_IR/projects.lang +++ b/htdocs/langs/fa_IR/projects.lang @@ -125,6 +125,6 @@ DocumentModelBaleine=مدل گزارش یک پروژه کامل (logo. ..) PlannedWorkload = حجم کار برنامه ریزی شده WorkloadOccupation= تظاهر حجم کار ProjectReferers=مراجعه اشیاء -SearchAProject=Search a project -ProjectMustBeValidatedFirst=Project must be validated first -ProjectDraft=Draft projects +SearchAProject=جستجوی یک پروژه +ProjectMustBeValidatedFirst=پروژه ابتدا باید معتبر باشد +ProjectDraft=پروژه های پیش نویس diff --git a/htdocs/langs/fa_IR/shop.lang b/htdocs/langs/fa_IR/shop.lang index 4127cac2321..72454575e51 100644 --- a/htdocs/langs/fa_IR/shop.lang +++ b/htdocs/langs/fa_IR/shop.lang @@ -1,11 +1,11 @@ # Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup -Shop=متجر -ShopWeb=تسوق على الإنترنت -LastOrders=أوامر الماضي -OnStandBy=على اهبة الاستعداد -TreatmentInProgress=التقدم في العلاج -LastCustomers=آخر الزبائن -OSCommerceShop=OSCommerce متجر -OSCommerce=OSCommerce -AddProd=بيع على الانترنت +FailedConnectDBCheckModuleSetup=برای اتصال به پایگاه داده با همکاری شکست خورد. بررسی کنید راه اندازی ماژول شما +Shop=فروشگاه +ShopWeb=وب سایت فروشگاه +LastOrders=آخرین سفارشات +OnStandBy=آماده به کار +TreatmentInProgress=درمان در حال پیشرفت است +LastCustomers=تاریخ و زمان آخرین مشتریان +OSCommerceShop=فروشگاه آهنگ تولد +OSCommerce=آهنگ تولد +AddProd=فروش آنلاین diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang index 2db41a620a4..059e4d06e2d 100644 --- a/htdocs/langs/fa_IR/stocks.lang +++ b/htdocs/langs/fa_IR/stocks.lang @@ -62,8 +62,8 @@ OrderStatusNotReadyToDispatch=منظور هنوز رتبهدهی نشده است StockDiffPhysicTeoric=دلیل سهام تفاوت های فیزیکی و نظری NoPredefinedProductToDispatch=محصولات از پیش تعریف شده برای این شی. بنابراین بدون اعزام در انبار مورد نیاز است. DispatchVerb=اعزام -StockLimitShort=Limit for alert -StockLimit=Stock limit for alert +StockLimitShort=محدود برای هشدار +StockLimit=محدود سهام برای هشدار PhysicalStock=سهام فیزیکی RealStock=سهام و مستغلات VirtualStock=سهام مجازی @@ -112,7 +112,7 @@ ReplenishmentOrdersDesc=این لیست از تمام سفارشات منبع ب Replenishments=پر کردن NbOfProductBeforePeriod=تعداد محصول٪ s را در انبار قبل از دوره (<٪) انتخاب NbOfProductAfterPeriod=تعداد محصول٪ s را در سهام بعد از دوره زمانی انتخاب شده (>٪ بازدید کنندگان) -MassMovement=Mass movement +MassMovement=جنبش توده ای MassStockMovement=جنبش سهام توده SelectProductInAndOutWareHouse=انتخاب محصول، مقدار، یک انبار منابع و انبار هدف، و سپس کلیک کنید "٪ s". به محض این که برای همه جنبش های مورد نیاز انجام می شود، بر روی "٪ s" را کلیک کنید. RecordMovement=رکورد ی انتقال diff --git a/htdocs/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang index 7cb574b2da9..45f1d1cd7ae 100644 --- a/htdocs/langs/fa_IR/users.lang +++ b/htdocs/langs/fa_IR/users.lang @@ -87,7 +87,7 @@ MyInformations=دیتای من ExportDataset_user_1=کاربران Dolibarr و خواص DomainUser=کاربر دامنه از٪ s Reactivate=دوباره فعال کردن -CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card. +CreateInternalUserDesc=این فرم اجازه می دهد تا به شما برای ایجاد یک کاربر داخلی به شرکت شما / پایه. برای ایجاد یک کاربر خارجی (مشتریان، تامین کننده، ...)، با استفاده از دکمه "ایجاد کاربر Dolibarr 'از کارت تماس با شخص ثالث است. InternalExternalDesc=داخلی یک کاربر است که بخشی از شرکت خود را / بنیاد است.
کاربر خارجی مشتری، عرضه کننده کالا یا دیگر است.

در هر دو مورد، مجوز حقوق در Dolibarr تعریف می کند، همچنین کاربر خارجی می تواند یک مدیر منو های مختلف از کاربر داخلی (صفحه اصلی - راه اندازی - نمایش) PermissionInheritedFromAGroup=اجازه چرا که از یک گروه کاربر را به ارث برده. Inherited=به ارث برده diff --git a/htdocs/langs/fi_FI/link.lang b/htdocs/langs/fi_FI/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/fi_FI/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 1624a8222bd..31996a4a74c 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -1075,6 +1075,7 @@ NotificationsDesc=La fonction des notifications par emails permet d'envoyer auto ModelModules=Modèle de documents DocumentModelOdt=Génération depuis des modèles OpenDocument (Fichier .ODT ou .ODS OpenOffice, KOffice, TextEdit…) WatermarkOnDraft=Filigrane sur les documents brouillons +JSOnPaimentBill=Ajout surcouche js CompanyIdProfChecker=Règles sur les Identifiants professionnels MustBeUnique=Doit être unique ? MustBeMandatory=Obligatoire pour creer tiers ? diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index c4bf33c56cc..aaea4122b22 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -295,6 +295,8 @@ TotalOfTwoDiscountMustEqualsOriginal=La somme du montant des 2 nouvelles réduct ConfirmRemoveDiscount=Êtes-vous sûr de vouloir supprimer cette réduction ? RelatedBill=Facture associée RelatedBills=Factures associées +LatestRelatedBill=Dernière facture associée +WarningBillExist=Attention, il existe déjà une ou plusieurs factures # PaymentConditions PaymentConditionShortRECEP=A réception diff --git a/htdocs/langs/fr_FR/link.lang b/htdocs/langs/fr_FR/link.lang index fb474eb7a59..efbc955c25b 100644 --- a/htdocs/langs/fr_FR/link.lang +++ b/htdocs/langs/fr_FR/link.lang @@ -1,4 +1,3 @@ -CHARSET=UTF-8 LinkANewFile=Lier un nouveau fichier/document LinkedFiles=Fichiers et documents liés NoLinkFound=Aucun lien associé diff --git a/htdocs/langs/he_IL/link.lang b/htdocs/langs/he_IL/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/he_IL/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/hr_HR/link.lang b/htdocs/langs/hr_HR/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/hr_HR/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/hu_HU/link.lang b/htdocs/langs/hu_HU/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/hu_HU/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/id_ID/link.lang b/htdocs/langs/id_ID/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/id_ID/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/is_IS/link.lang b/htdocs/langs/is_IS/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/is_IS/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index 500fa0392f8..8ade33331e8 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -47,7 +47,7 @@ DictionarySetup=Dictionary setup Dictionary=Dictionaries ErrorReservedTypeSystemSystemAuto=I valori 'system' e 'systemauto' sono riservati. Puoi usare 'user' come valore da aggiungere al tuo record. ErrorCodeCantContainZero=Il codice non può contenere il valore 0 -DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +DisableJavascript=Disabilita funzioni JavaScript and Ajax (Raccomandato per persone non vedenti o browser testuali) ConfirmAjax=Utilizzare popup di conferma Ajax UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectCompany=Per scegliere una terza parte usare i campi di auto-completamento invece di usare una lista di selezione. @@ -118,14 +118,14 @@ LanguageBrowserParameter=Parametro %s LocalisationDolibarrParameters=Parametri di localizzazione ClientTZ=Fuso orario client (utente) ClientHour=Orario client (utente) -OSTZ=Server OS Time Zone +OSTZ=Fuso orario dell'OS server PHPTZ=Fuso orario server PHP PHPServerOffsetWithGreenwich=Scostamento rispetto a Greenwich del server PHP (secondi) ClientOffsetWithGreenwich=Scostamento del Client/Browser da Greenwich (secondi) DaylingSavingTime=Ora legale (utente) -CurrentHour=PHP Time (server) -CompanyTZ=Company Time Zone (main company) -CompanyHour=Company Time (main company) +CurrentHour=Orario PHP (server) +CompanyTZ=Fuso orario società (Sede principale) +CompanyHour=Ora società (Sede principale) CurrentSessionTimeOut=Timeout sessione corrente YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris" OSEnv=Ambiente SO @@ -235,7 +235,7 @@ OfficialWebSiteFr=Sito ufficiale francese OfficialWiki=Dolibarr Wiki OfficialDemo=Dolibarr demo online OfficialMarketPlace=Market ufficiale per moduli esterni e addon -OfficialWebHostingService=Referenced web hosting services (Cloud hosting) +OfficialWebHostingService=Servizi di hosting web referenziati (Hosting Cloud) ReferencedPreferredPartners=Preferred Partners OtherResources=Autres ressources ForDocumentationSeeWiki=La documentazione per utenti e sviluppatori e le FAQ sono disponibili sul wiki di Dolibarr:
Dai un'occhiata a %s @@ -290,17 +290,17 @@ UnpackPackageInDolibarrRoot=Scompattare il pacchetto nella directory di root di SetupIsReadyForUse=Installazione completata. Dolibarr è pronto ad utilizzare questo nuovo componente. NotExistsDirect=La directory root alternativa non è stata definita.
InfDirAlt=A partire dalla versione 3 è possibile definire una directory root alternativa. Ciò permette di archiviare plugin e template personalizzati nello stesso posto.
Basta creare una directory nella root di Dolibarr ( per esempio custom).
-InfDirExample=
Then declare it in the file conf.php
$dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
*These lines are commented with "#", to uncomment only remove the character. +InfDirExample=
Poi dichiaralo nel file conf.php
$dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
*Queste righe sono commentate con il "#", per levare il commento basta rimuovere il cancelletto. YouCanSubmitFile=Seleziona modulo: CurrentVersion=Versione attuale di Dolibarr CallUpdatePage=Vai alla pagina che aggiorna la struttura del database e dati su %s. LastStableVersion=Ultima versione stabile GenericMaskCodes=Puoi inserire uno schema di numerazione. In questo schema, possono essere utilizzati i seguenti tag :
{000000} Corrisponde a un numero che sarà incrementato ad ogni aggiunta di %s. Inserisci il numero di zeri equivalente alla lunghezza desiderata per il contatore. Verranno aggiunti zeri a sinistra fino alla lunghezza impostata per il contatore.
{000000+000} Come il precedente, ma con un offset corrispondente al numero a destra del segno + che viene applicato al primo inserimento %s.
{000000@x} Come sopra, ma il contatore viene reimpostato a zero quando si raggiunge il mese x (x compreso tra 1 e 12). Se viene utilizzata questa opzione e x è maggiore o uguale a 2, diventa obbligatorio inserire anche la sequenza {yy}{mm} o {yyyy}{mm}.
{dd} giorno (da 01 a 31).
{mm} mese (da 01 a 12).
{yy} , {yyyy} o {y} anno con 2, 4 o 1 cifra.
-GenericMaskCodes2={cccc} the client code on n characters
{cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
{tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).
+GenericMaskCodes2={cccc}il codice cliente di n caratteri
{cccc000} il codice cliente di n caratteri è seguito da un contatore dedicato per cliente. Questo contatore dedicato per i clienti è azzerato allo stesso tempo di quello globale.
{tttt} Il codice di terze parti composto da n caratteri (vedi dizionario - tipi di terze parti).
GenericMaskCodes3=Tutti gli altri caratteri nello schema rimarranno inalterati.
Gli spazi non sono ammessi.
GenericMaskCodes4a=Esempio sulla novantanovesima %s del terzo TheCompany fatta il 31/01/2007:
GenericMaskCodes4b=Esempio : il 99esimo cliente/fornitore viene creato 31/01/2007:
-GenericMaskCodes4c=Example on product created on 2007-03-01:
+GenericMaskCodes4c=Esempio su prodotto creato il 2007-03-01:
GenericMaskCodes5=ABC{yy}{mm}-{000000} darà ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX darà 0199-ZZZ/31/XXX GenericNumRefModelDesc=Restituisce un numero personalizzabile in base allo schema definito dalla maschera. ServerAvailableOnIPOrPort=Il server è disponibile all'indirizzo %s sulla porta %s @@ -325,7 +325,7 @@ LanguageFilesCachedIntoShmopSharedMemory=File Lang caricati nella memoria cache ExamplesWithCurrentSetup=Esempi di funzionamento secondo la configurazione attuale ListOfDirectories=Elenco delle directory dei modelli OpenDocument ListOfDirectoriesForModelGenODT=Elenco di directory contenenti i modelli di file per il formato OpenDocument.
Inserisci il percorso completo della directory.

Vai a capo tra una directory e l'altra.

Per aggiungere una directory del modulo GED, aggiungi DOL_DATA_ROOT/ECM/nome directory

I file in queste directory devono avere l'estensione.odt. -NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories +NumberOfModelFilesFound=Numero di modelli per documenti ODT/ODS trovati in queste directory ExampleOfDirectoriesForModelGen=Esempi di sintassi:
c: dir \\
/Home/mydir
DOL_DATA_ROOT/ECM/ecmdir FollowingSubstitutionKeysCanBeUsed=
Per sapere come creare i modelli di documento odt, prima di salvarli in queste directory, leggere la documentazione wiki: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template @@ -346,17 +346,17 @@ PDFDesc=Si possono impostare tutte le opzioni globali relative alla generazione PDFAddressForging=Regole per il forge di caselle di indirizzi HideAnyVATInformationOnPDF=Nascondi tutte le informazioni relative all'IVA sui pdf generati. HideDescOnPDF=Nascondi le descrizioni dei prodotti nel pdf generato -HideRefOnPDF=Hide products ref. on generated PDF -HideDetailsOnPDF=Hide products lines details on generated PDF +HideRefOnPDF=Nascondi il ref. prodotto nei PDF generati +HideDetailsOnPDF=Nascondi dettagli linee prodotti sui PDF generati Library=Libreria UrlGenerationParameters=Parametri di generazione degli indirizzi SecurityTokenIsUnique=Utilizzare un unico parametro securekey per ogni URL EnterRefToBuildUrl=Inserisci la reference per l'oggetto %s GetSecuredUrl=Prendi URL calcolato -ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons +ButtonHideUnauthorized=Nasconti bottoni per azioni non autorizzate anziché mostrare bottoni disabilitati. OldVATRates=Vecchia aliquota IVA NewVATRates=Nuova aliquota IVA -PriceBaseTypeToChange=Modify on prices with base reference value defined on +PriceBaseTypeToChange=Modifica i prezzi con la valuta di base definita. MassConvert=Avvia conversione di massa String=String TextLong=Testo Lungo @@ -369,12 +369,12 @@ ExtrafieldPhone = Tel. ExtrafieldPrice = Prezzo ExtrafieldMail = Email ExtrafieldSelect = Lista di selezione -ExtrafieldSelectList = Select from table +ExtrafieldSelectList = Seleziona dalla tabella ExtrafieldSeparator=Separatore ExtrafieldCheckBox=Checkbox -ExtrafieldRadio=Radio button -ExtrafieldParamHelpselect=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key -ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... +ExtrafieldRadio=Bottone Radio +ExtrafieldParamHelpselect=I parametri della lista deveono avere una sintassi tipo chiave,valore

ad esempio:
1,valore1
2,valore2
3,valore3
...

In modo da avere una lista madre che dipenda da un altra:
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key +ExtrafieldParamHelpcheckbox=La lista dei parametri deve contenere chiave univoca e valore.

Per esempio:
1, valore1
2, valore2
3, valore3
... ExtrafieldParamHelpradio=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter LibraryToBuildPDF=Libreria utilizzata per generare PDF @@ -382,7 +382,7 @@ WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pd LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
1 : local tax apply on products and services without vat (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s -RefreshPhoneLink=Refresh link +RefreshPhoneLink=Link Aggiorna LinkToTest=Clickable link generated for user %s (click phone number to test) KeepEmptyToUseDefault=Lasciare vuoto per utilizzare il valore di default DefaultLink=Default link diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang index a74fc1fc817..6572a57b9d8 100644 --- a/htdocs/langs/it_IT/agenda.lang +++ b/htdocs/langs/it_IT/agenda.lang @@ -25,15 +25,15 @@ ListOfEvents= Lista degli eventi ActionsAskedBy=Azioni richieste da ActionsToDoBy=Eventi assegnati a ActionsDoneBy=Azioni fatte da -ActionsForUser=Events for user -ActionsForUsersGroup=Events for all users of group +ActionsForUser=Eventi per utente +ActionsForUsersGroup=Eventi per tutti gli utenti del gruppo AllMyActions= Tutte i miei compiti/azioni AllActions= Tutte i compiti/azioni ViewList=Vista elenco ViewCal=Vista mensile ViewDay=Vista giornaliera ViewWeek=Vista settimanale -ViewPerUser=Per user +ViewPerUser=Per utente ViewWithPredefinedFilters= Vista con filtri predefiniti AutoActions= Riempimento automatico AgendaAutoActionDesc= Definire qui gli eventi che devono essere creati automaticamente da Dolibarr. Se non è selezionato nulla (impostazione predefinita), nel calendario saranno visualizzate solo azioni inserite manualmente. @@ -46,7 +46,7 @@ InvoiceBackToDraftInDolibarr=Fattura %s riportata allo stato di bozza InvoiceDeleteDolibarr=La fattura %s è stata cancellata OrderValidatedInDolibarr= Ordine convalidato OrderApprovedInDolibarr=Ordine %s approvato -OrderRefusedInDolibarr=Order %s refused +OrderRefusedInDolibarr=Ordine %s rifiutato OrderBackToDraftInDolibarr=Ordine %s riportato allo stato di bozza OrderCanceledInDolibarr=ordine %s annullato InterventionValidatedInDolibarr=Intervento %s convalidato @@ -56,9 +56,9 @@ InvoiceSentByEMail=Fattura attiva %s inviata per email SupplierOrderSentByEMail=Ordine fornitore %s inviato per email SupplierInvoiceSentByEMail=Fornitore %s fattura inviata per email ShippingSentByEMail=%s spedizione inviata per email -ShippingValidated= Shipping %s validated +ShippingValidated= Spedizione %s confermata InterventionSentByEMail=Intervento %s inviato via email -InterventionClassifiedBilled=Intervention %s classified as Billed +InterventionClassifiedBilled=Interventi %s classificati come Fatturati NewCompanyToDolibarr= Soggetto terzo creato DateActionPlannedStart= Data di inizio prevista DateActionPlannedEnd= Data di fine prevista diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang index 526d19aa1d7..5656abca69d 100644 --- a/htdocs/langs/it_IT/bills.lang +++ b/htdocs/langs/it_IT/bills.lang @@ -23,13 +23,13 @@ InvoiceProFormaAsk=Fattura proforma InvoiceProFormaDesc=La fattura proforma è uguale ad una fattura vera, ma non ha valore contabile. InvoiceReplacement=Fattura sostitutiva InvoiceReplacementAsk=Sostituzione fattura per fattura -InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'. +InvoiceReplacementDesc=La sostituzione fattura è utilizzata per annullare e sostituire completamente una fattura non ancora pagata.

Nota: Solo le fatture non pagate possono essere sostituite. Se la fattura che vuoi sostituire non è già stata chiusa, questa verrà automaticamente chiusa come "abbandonata". InvoiceAvoir=Nota di credito a correzione InvoiceAvoirAsk=Nota di credito per correggere fattura InvoiceAvoirDesc=La nota di credito a correzione è una fattura con importo negativo utilizzata per risolvere il problema di una fattura emessa con importo diverso da quello realmente pagato (perché il cliente ha pagato troppo per errore, o non ha pagato completamente perché ad esempio ha restituito alcuni prodotti).

Nota: la fattura originale deve essere già chiusa ( "pagata" o "parzialmente pagata") per consentire la creazione di una nota di credito a correzione. -invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice -invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake -invoiceAvoirLineWithPaymentRestAmount=Credit Note amount of invoice payment's lake +invoiceAvoirWithLines=Crea una Nota Credito con le righe della fattura di origine. +invoiceAvoirWithPaymentRestAmount=Crea una Nota Credito con l'importo rimanente del pagamento della fattura di origine. +invoiceAvoirLineWithPaymentRestAmount=Importo Nota Credito della differenza del pagamento della fattura ReplaceInvoice=Sostituire fattura %s ReplacementInvoice=Sostituzione fattura ReplacedByInvoice=Sostituita dalla fattura %s @@ -66,7 +66,7 @@ ConfirmConvertToReduc=Vuoi trasformare questa nota di credito in uno sconto asso SupplierPayments=Pagamenti fornitori ReceivedPayments=Pagamenti ricevuti ReceivedCustomersPayments=Pagamenti ricevuti dai clienti -PayedSuppliersPayments=Payments payed to suppliers +PayedSuppliersPayments=Pagamenti effettuati ai fornitori ReceivedCustomersPaymentsToValid=Pagamenti ricevuti dai clienti da convalidare PaymentsReportsForYear=Report pagamenti per %s PaymentsReports=Report pagamenti @@ -80,7 +80,7 @@ PaymentAmount=Importo del pagamento ValidatePayment=Convalidare questo pagamento? PaymentHigherThanReminderToPay=Pagamento superiore alla rimanenza da pagare HelpPaymentHigherThanReminderToPay=Attenzione, l'importo del pagamento di una o più fatture è più elevato rispetto al dovuto.
Modifica l'importo, oppure conferma e crea una nota di credito per la differenza riscossa. -HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm. +HelpPaymentHigherThanReminderToPaySupplier=Attenzione, l'importo del pagamento di una o più fatture è più elevato rispetto al dovuto.
Modifica l'importo, altrimenti conferma. ClassifyPaid=Classifica come "pagata" ClassifyPaidPartially=Classifica come "parzialmente pagata" ClassifyCanceled=Classifica come "abbandonata" @@ -170,7 +170,7 @@ ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilizzare questa scelta se tutte le ConfirmClassifyAbandonReasonOther=Altro ConfirmClassifyAbandonReasonOtherDesc=Questa scelta sarà utilizzata in tutti gli altri casi. Perché, ad esempio, si prevede di creare una fattura in sostituzione. ConfirmCustomerPayment=Confermare riscossione per %s %s? -ConfirmSupplierPayment=Do you confirm this payment input for %s %s ? +ConfirmSupplierPayment=Confermare riscossione per %s %s? ConfirmValidatePayment=Vuoi davvero convalidare questo pagamento? Una volta convalidato non si potranno più operare modifiche. ValidateBill=Convalida fattura UnvalidateBill=Invalida fattura @@ -286,7 +286,7 @@ InvoiceNotChecked=Fattura non selezionata CloneInvoice=Clona fattura ConfirmCloneInvoice=Sei sicuro di voler clonare la fattura %s? DisabledBecauseReplacedInvoice=Disabilitata perché la fattura è stata sostituita -DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here. +DescTaxAndDividendsArea=Questa area riporta un riepilogo di tutti i pagamenti effettuati per spese straordinarie. Qui sono inclusi tutti i pagamenti registrati durante l'anno impostato. NbOfPayments=Numero pagamenti SplitDiscount=Dividi lo sconto in due ConfirmSplitDiscount=Vuoi davvero dividere questo sconto del %s %s in 2 sconti inferiori? @@ -396,7 +396,7 @@ ToMakePaymentBack=Rimborsa ListOfYourUnpaidInvoices=Elenco fatture non pagate NoteListOfYourUnpaidInvoices=Nota: questo elenco contiene solo fatture che hai collegato ad un rappresentante. RevenueStamp=Marca da bollo -YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty +YouMustCreateInvoiceFromThird=Questa opzione è disponibile quando crei fattura dalla scheda "cliente" di terze parti. PDFCrabeDescription=Modello di fattura Crabe. (Modello raccomandatoi) TerreNumRefModelDesc1=Restituisce un numero nel formato %syymm-nnnn per le fatture, %syymm-nnnn per le note di credito e %syymm-nnnn per i versamenti, dove yy è l'anno, mm è il mese e nnnn è una sequenza progressiva, senza salti e che non si azzera. MarsNumRefModelDesc1=Retituisce un numero nel formato %syymm-nnnn per le fatture standard, %syymm-nnnn per le fatture sostitutive, %syymm-nnnn %syymm-nnnn per le note di credito dove yy è l'anno, mm è il mese e nnnn è una sequenza progressiva che non si azzera. diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang index c134752c825..d2add20dc82 100644 --- a/htdocs/langs/it_IT/boxes.lang +++ b/htdocs/langs/it_IT/boxes.lang @@ -18,7 +18,7 @@ BoxLastContracts=Ultimi contratti BoxLastContacts=Ultimi contatti/indirizzi BoxLastMembers=Ultimi membri BoxFicheInter=Ultimi interventi -# BoxCurrentAccounts=Opened accounts balance +BoxCurrentAccounts=Bilancio conti aperti BoxSalesTurnover=Fatturato BoxTotalUnpaidCustomerBills=Totale fatture attive non pagate BoxTotalUnpaidSuppliersBills=Totale fatture passive non pagate @@ -43,7 +43,7 @@ BoxTitleLastModifiedMembers=Ultimi %s membri modificati BoxTitleLastFicheInter=Ultimi %s interventi modificati BoxTitleOldestUnpaidCustomerBills=%s fatture attive più vecchie non pagate BoxTitleOldestUnpaidSupplierBills=%s fatture passive più vecchie non pagate -# BoxTitleCurrentAccounts=Opened account's balances +BoxTitleCurrentAccounts=Bilancio dei conti aperti BoxTitleSalesTurnover=Fatturato BoxTitleTotalUnpaidCustomerBills=Fatture attive non pagate BoxTitleTotalUnpaidSuppliersBills=Fatture passive non pagate diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang index 4c83d1e4366..dc19b84c81b 100644 --- a/htdocs/langs/it_IT/cashdesk.lang +++ b/htdocs/langs/it_IT/cashdesk.lang @@ -37,4 +37,4 @@ ShowCompany=Mostra società ShowStock=Mostra magazzino DeleteArticle=Clicca per rimuovere l'articolo FilterRefOrLabelOrBC=Cerca (Rif/Etichetta) -# UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock. +UserNeedPermissionToEditStockToUsePos=Hai impostato di diminuire le scorte sulla creazione della fattura, quindi l'utente che usa il POS deve avere i permessi per modificare le scorte. diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang index 5e7bb7df71b..4aa4d3ce0d9 100644 --- a/htdocs/langs/it_IT/categories.lang +++ b/htdocs/langs/it_IT/categories.lang @@ -66,7 +66,7 @@ ReturnInCompany=Torna alla scheda cliente ContentsVisibleByAll=I contenuti saranno visibili a tutti gli utenti ContentsVisibleByAllShort=Contenuti visibili a tutti ContentsNotVisibleByAllShort=Contenuti non visibili a tutti -# CategoriesTree=Categories tree +CategoriesTree=Albero categorie DeleteCategory=Elimina categoria ConfirmDeleteCategory=Vuoi davvero eliminare questa categoria? RemoveFromCategory=Rimuovi collegamento con la categoria @@ -105,9 +105,9 @@ CatProdLinks=Collegamenti tra prodotti/servizi e categorie CatCusLinks=Collegamenti tra clienti/clienti potenziali e categorie CatSupLinks=Collegamenti tra fornitori e categorie DeleteFromCat=Elimina dalla categoria -# DeletePicture=Picture delete -# ConfirmDeletePicture=Confirm picture deletion? -# ExtraFieldsCategories=Complementary attributes -# CategoriesSetup=Categories setup -# CategorieRecursiv=Link with parent category automatically -# CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +DeletePicture=Foto cancellata +ConfirmDeletePicture=Confermi l'eliminazione della foto? +ExtraFieldsCategories=Campi extra +CategoriesSetup=Impostazioni categorie +CategorieRecursiv=Collega automaticamente con la categoria padre +CategorieRecursivHelp=Se attivata, il prodotto sarà inserito anche nella categoria padre quando lo aggiungi ad una sottocategoria diff --git a/htdocs/langs/it_IT/commercial.lang b/htdocs/langs/it_IT/commercial.lang index 5553f2bb769..a4d5cad6499 100644 --- a/htdocs/langs/it_IT/commercial.lang +++ b/htdocs/langs/it_IT/commercial.lang @@ -71,7 +71,7 @@ ActionAC_FAX=Invia fax ActionAC_PROP=Invia proposta ActionAC_EMAIL=Invia email ActionAC_RDV=Riunione -ActionAC_INT=Intervention on site +ActionAC_INT=Intervento presso cliente ActionAC_FAC=Invia fattura ActionAC_REL=Invia la fattura (promemoria) ActionAC_CLO=Chiudere diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang index 310e18bc58e..d537ab7ebc9 100644 --- a/htdocs/langs/it_IT/companies.lang +++ b/htdocs/langs/it_IT/companies.lang @@ -18,7 +18,7 @@ NewCompany=Nuova società (cliente, cliente potenziale, fornitore) NewThirdParty=Nuovo soggetto terzo (cliente, cliente potenziale, fornitore) NewSocGroup=Nuovo gruppo di società NewPrivateIndividual=Nuovo privato (cliente, cliente potenziale, fornitore) -CreateDolibarrThirdPartySupplier=Create a third party (supplier) +CreateDolibarrThirdPartySupplier=Crea una terza parte (fornitore) ProspectionArea=Area clienti potenziali SocGroup=Gruppo di società IdThirdParty=Id soggetto terzo @@ -83,7 +83,7 @@ DefaultLang=Lingua predefinita VATIsUsed=L'IVA viene utilizzata VATIsNotUsed=L'IVA non viene utilizzata CopyAddressFromSoc=Compila l'indirizzo con l'indirizzo del soggetto terzo -NoEmailDefined=There is no email defined +NoEmailDefined=Non c'è alcuna email impostata ##### Local Taxes ##### LocalTax1IsUsedES= RE previsto LocalTax1IsNotUsedES= RE non previsto @@ -91,9 +91,9 @@ LocalTax2IsUsedES= IRPF previsto LocalTax2IsNotUsedES= IRPF non previsto LocalTax1ES=RE LocalTax2ES=IRPF -TypeLocaltax1ES=RE Type -TypeLocaltax2ES=IRPF Type -TypeES=Type +TypeLocaltax1ES=Re-inserisci +TypeLocaltax2ES=Tipo IRPF +TypeES=Tipo ThirdPartyEMail=%s WrongCustomerCode=Codice cliente non valido WrongSupplierCode=Codice fornitore non valido @@ -367,10 +367,10 @@ ExportCardToFormat=Esportazione scheda nel formato ContactNotLinkedToCompany=Contatto non collegato ad alcuna società DolibarrLogin=Dolibarr login NoDolibarrAccess=Senza accesso a Dolibarr -ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties +ExportDataset_company_1=Terze parti (Aziende/fondazioni/persone fisiche) e proprietà ExportDataset_company_2=Contatti e attributi -ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties -ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes +ImportDataset_company_1=Terze parti (Aziende/fondazioni/persone fisiche) e proprietà +ImportDataset_company_2=Contatti/Indirizzi (per terze parti e non) e attributi ImportDataset_company_3=Informazioni bancarie PriceLevel=Livello dei prezzi DeliveriesAddress=Indirizzi di consegna @@ -403,10 +403,10 @@ UniqueThirdParties=Totale soggetti terzi InActivity=In attività ActivityCeased=Cessata attività ActivityStateFilter=Stato attività -ProductsIntoElements=List of products into %s +ProductsIntoElements=Lista dei prodotti in %s CurrentOutstandingBill=Fatture scadute OutstandingBill=Max. fattura in sospeso OutstandingBillReached=Raggiunto il massimo numero di fatture scadute MonkeyNumRefModelDesc=Restituisce un numero con formato %syymm-nnnn per codice cliente e %syymm-nnnn per il fornitore, in cui yy è l'anno, mm è il mese e nnnn è una sequenza progressiva che non ritorna a 0. LeopardNumRefModelDesc=Codice cliente/fornitore libero. Questo codice può essere modificato in qualsiasi momento. -ManagingDirectors=Manager(s) name (CEO, director, president...) +ManagingDirectors=Nome Manager(s) (CEO, direttore, presidente...) diff --git a/htdocs/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang index 71fc48cce2c..53cfa41e133 100644 --- a/htdocs/langs/it_IT/contracts.lang +++ b/htdocs/langs/it_IT/contracts.lang @@ -89,8 +89,8 @@ ListOfServicesToExpireWithDuration=Lista di servizi in scadenza entro %s giorni ListOfServicesToExpireWithDurationNeg=Lista di servizi scaduti da più di %s giorni ListOfServicesToExpire=Lista dei servizi in scadenza NoteListOfYourExpiredServices=Questa lista contiene i servizi relativi a contratti di terze parti per le quali siete collegati come rappresentanti commerciali. -StandardContractsTemplate=Standard contracts template -ContactNameAndSignature=For %s, name and signature: +StandardContractsTemplate=Template standard per i contratti +ContactNameAndSignature=Per %s, Nome e firma: ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Contatto interno per la firma del contratto diff --git a/htdocs/langs/it_IT/deliveries.lang b/htdocs/langs/it_IT/deliveries.lang index fda8bc806fe..2fc968650eb 100644 --- a/htdocs/langs/it_IT/deliveries.lang +++ b/htdocs/langs/it_IT/deliveries.lang @@ -23,4 +23,4 @@ GoodStatusDeclaration=Dichiaro di aver ricevuto le merci di cui sopra in buone c Deliverer=Chi consegna: Sender=Mittente Recipient=Destinatario -# ErrorStockIsNotEnough=There's not enough stock +ErrorStockIsNotEnough=Non ci sono sufficienti scorte diff --git a/htdocs/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang index 8180790547c..21aaa1609a7 100644 --- a/htdocs/langs/it_IT/ecm.lang +++ b/htdocs/langs/it_IT/ecm.lang @@ -23,10 +23,10 @@ ECMNewDocument=Nuovo documento ECMCreationDate=Data di creazione ECMNbOfFilesInDir=Numero di file nella directory ECMNbOfSubDir=Numero di sottodirectory -ECMNbOfFilesInSubDir=Number of files in sub-directories +ECMNbOfFilesInSubDir=Numero di file nelle sub-directory ECMCreationUser=Creatore ECMArea=EDM area -ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr. +ECMAreaDesc=L'area EDM (Gestione elettronica dei documenti) ti permette di salvare, condividere e cercare rapidamente tutti i tipi di documenti presenti. ECMAreaDesc2=* Le directory vengono riempite automaticamente quando si aggiungono dei documenti dalla scheda di un elemento.
* Per salvare documenti non legati ad un elemento si può usare l'aggiunta manuale. ECMSectionWasRemoved=La directory%s è stata eliminata. ECMDocumentsSection=Directory documenti diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang index 0873acf3356..7da4fe9ba42 100644 --- a/htdocs/langs/it_IT/install.lang +++ b/htdocs/langs/it_IT/install.lang @@ -207,5 +207,5 @@ MigrationActioncommElement=Aggiornare i dati sulle azioni MigrationPaymentMode=Migrazione dei dati delle modalità di pagamento MigrationCategorieAssociation=Migrazione delle categorie -ShowNotAvailableOptions=Show not available options -HideNotAvailableOptions=Hide not available options +ShowNotAvailableOptions=Mostra opzioni non disponibili +HideNotAvailableOptions=Nascondi opzioni non disponibili diff --git a/htdocs/langs/it_IT/interventions.lang b/htdocs/langs/it_IT/interventions.lang index 4525992255c..2b8f0a8aa3f 100644 --- a/htdocs/langs/it_IT/interventions.lang +++ b/htdocs/langs/it_IT/interventions.lang @@ -38,5 +38,5 @@ ArcticNumRefModelDesc1=Modello generico di numerazione ArcticNumRefModelError=Impossibile attivare PacificNumRefModelDesc1=Restituisce un numero nel formato %syymm-nnnn dove yy è l'anno, mm è il mese e nnnn è una sequenza senza pausa e che non ritorna a 0 PacificNumRefModelError=Un modello di numerazione degli interventi che inizia con $syymm è già esistente e non è compatibile con questo modello di sequenza. Rimuovere o rinominare per attivare questo modulo. -# PrintProductsOnFichinter=Print products on intervention card -# PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Stampa prodotti sulla scheda di intervento +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/it_IT/languages.lang b/htdocs/langs/it_IT/languages.lang index d9b1d17d07d..b895157f173 100644 --- a/htdocs/langs/it_IT/languages.lang +++ b/htdocs/langs/it_IT/languages.lang @@ -10,7 +10,7 @@ Language_da_DA=Danese Language_da_DK=Danese Language_de_DE=Tedesco Language_de_AT=Tedesco (Austria) -Language_de_CH=German (Switzerland) +Language_de_CH=Tedesco (Svizzera) Language_el_GR=Greco Language_en_AU=Inglese (Australia) Language_en_GB=English (Gran Bretagna) @@ -20,9 +20,9 @@ Language_en_SA=Inglese (Arabia Saudita) Language_en_US=Inglese (Stati Uniti) Language_en_ZA=Inglese (Sud Africa) Language_es_ES=Spagnolo -Language_es_DO=Spanish (Dominican Republic) +Language_es_DO=Spagnolo ( Repubblica Dominicana) Language_es_AR=Spagnolo (Argentina) -Language_es_CL=Spanish (Chile) +Language_es_CL=Spagnolo (Cile) Language_es_HN=Spagnolo (Honduras) Language_es_MX=Spagnolo (Messico) Language_es_PY=Spagnolo (Paraguay) @@ -40,7 +40,7 @@ Language_fr_NC=Francese (Nuova Caledonia) Language_he_IL=Ebraico Language_hr_HR=Croato Language_hu_HU=Ungherese -Language_id_ID=Indonesian +Language_id_ID=Indonesiano Language_is_IS=Islandese Language_it_IT=Italiano Language_ja_JP=Giapponese @@ -61,7 +61,7 @@ Language_tr_TR=Turco Language_sl_SI=Sloveno Language_sv_SV=Svedese Language_sv_SE=Svedese -Language_sq_AL=Albanian +Language_sq_AL=Albanese Language_sk_SK=Slovacco Language_th_TH=Thai Language_uk_UA=Ucraino diff --git a/htdocs/langs/it_IT/link.lang b/htdocs/langs/it_IT/link.lang new file mode 100644 index 00000000000..5c9463ceea8 --- /dev/null +++ b/htdocs/langs/it_IT/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Collega un nuovo file/documento +LinkedFiles=File e documenti collegati +NoLinkFound=Nessun collegamento registrato +LinkComplete=Il file è stato correttamente collegato +ErrorFileNotLinked=Il file non può essere collegato +LinkRemoved=Il collegamento %s è stato rimosso +ErrorFailedToDeleteLink= Impossibile rimuovere il collegamento '%s' +ErrorFailedToUpdateLink= Impossibile caricare il collegamento '%s' diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang index 50cdc435a9c..2d67e314cbb 100644 --- a/htdocs/langs/it_IT/mails.lang +++ b/htdocs/langs/it_IT/mails.lang @@ -43,7 +43,7 @@ MailingStatusSentCompletely=Inviato completamente MailingStatusError=Errore MailingStatusNotSent=Non inviato MailSuccessfulySent=Email inviata con successo (da %s a %s) -MailingSuccessfullyValidated=EMailing successfully validated +MailingSuccessfullyValidated=EMailing validata con successo MailUnsubcribe=Cancella sottoscrizione Unsuscribe=Cancella sottoscrizione MailingStatusNotContact=Non contattare più @@ -75,25 +75,25 @@ SentTo=Inviata a %s MailingStatusRead=Da leggere CheckRead=Conferma di lettura YourMailUnsubcribeOK=La mail %s è stata cancellata correttamente dalla lista di invio -MailtoEMail=Hyper link to email +MailtoEMail=Collegamento ipertestuale alla email ActivateCheckRead=Permetti l'utilizzo del link "Cancella sottoscrizione" -ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature -EMailSentToNRecipients=EMail sent to %s recipients. -XTargetsAdded=%s recipients added into target list -EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email. -MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s) -SendRemind=Send reminder by EMails -RemindSent=%s reminder(s) sent -AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent) -NoRemindSent=No EMail reminder sent -ResultOfMassSending=Result of mass EMail reminders sending +ActivateCheckReadKey=Chiave utilizzata per criptare l'URL usato per le funzioni "Leggere Ricevuta" e "Annulla Iscrizione" +EMailSentToNRecipients=Email inviata a %s destinatari +XTargetsAdded=%s destinatari aggiunti alla lista di invio +EachInvoiceWillBeAttachedToEmail=Un documento che usa il template di fattura di default sarà creato ed allegato ad ogni email. +MailTopicSendRemindUnpaidInvoices=Promemoria di fattura %s (%s) +SendRemind=Invia promemoria per Email +RemindSent=%s promemoria inviati. +AllRecipientSelectedForRemind=Tutte le terze parti sono selezionate e le mail dove inserite (nota che sarà inviata una mail per fattura) +NoRemindSent=Nessun promemoria email inviato +ResultOfMassSending=Risultato del mass Email di promemoria inviato # Libelle des modules de liste de destinataires mailing MailingModuleDescContactCompanies=Contatti di soggetti terzi (clienti, clienti potenziali, fornitori) MailingModuleDescDolibarrUsers=Tutti gli utenti Dolibarr con indirizzi email MailingModuleDescFundationMembers=Membri fondazione con indirizzi email MailingModuleDescEmailsFromFile=Email da un file (email;nome;cognome) -MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other) +MailingModuleDescEmailsFromUser=Emails da input dell'utente (email;cognome;nome;altro) MailingModuleDescContactsCategories=Contatti di tutti i soggetti terzi (per categoria) MailingModuleDescDolibarrContractsLinesExpired=Soggetti terzi con contratti scaduti MailingModuleDescContactsByCompanyCategory=Contatti di soggetti terzi (per categoria) @@ -114,19 +114,19 @@ SendMail=Invia una email SentBy=Inviato da MailingNeedCommand=Per motivi di sicurezza è preveribile inviare mail di massa da linea di comando. Se possibile chiedi all amministratore del server di eseguire il seguente comando per inivare le mail a tutti i destinatari: MailingNeedCommand2=Puoi inviare comunque online aggiungendo il parametro MAILING_LIMIT_SENDBYWEB impostato al valore massimo corrispondente al numero di email che si desidera inviare durante una sessione. -ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: On line sending of emailings are limited for security and timeout reasons to %s recipients by sending session. +ConfirmSendingEmailing=Se non puoi o preferisci inviarle dal tuo browser web, perfavore confermi che sei sicuro che vuoi inviare adesso le mail dal tuo browser? +LimitSendingEmailing=Nota: L'invio di email è soggetto a limitazioni per ragioni di sicurezza e di timeout a %s destinatari per ogni sessione di invio TargetsReset=Cancella elenco ToClearAllRecipientsClickHere=Per cancellare l'elenco destinatari per questa email, cliccare sul pulsante ToAddRecipientsChooseHere=Per aggiungere i destinatari, scegliere da questi elenchi NbOfEMailingsReceived=Numero di invii ricevuti -NbOfEMailingsSend=Mass emailings sent +NbOfEMailingsSend=Emailing di massa inviato IdRecord=ID record DeliveryReceipt=Ricevuta di consegna YouCanUseCommaSeparatorForSeveralRecipients=Utilizzare il separatore virgola(,) per specificare più destinatari. TagCheckMail=Traccia apertura mail TagUnsubscribe=Link di cancellazione alla mailing list -TagSignature=Signature sending user +TagSignature=Firma di invio per l'utente TagMailtoEmail=Mail destinatario # Module Notifications Notifications=Notifiche diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang index edda65c297c..2ec03c3a1e3 100644 --- a/htdocs/langs/it_IT/main.lang +++ b/htdocs/langs/it_IT/main.lang @@ -34,7 +34,7 @@ ErrorFailedToOpenFile=Impossibile aprire il file %s ErrorCanNotCreateDir=Impossibile creare la dir %s ErrorCanNotReadDir=Impossibile leggere la dir %s ErrorConstantNotDefined=Parametro %s non definito -ErrorUnknown=Unknown error +ErrorUnknown=Errore sconosciuto ErrorSQL=Errore di SQL ErrorLogoFileNotFound=Impossibile trovare il file %s per il logo ErrorGoToGlobalSetup=Vai alle impostazioni Società/Fondazione per risolvere il problema @@ -60,8 +60,8 @@ ErrorNoSocialContributionForSellerCountry=Errore, non sono stati definiti i tipi ErrorFailedToSaveFile=Errore, file non salvato. ErrorOnlyPngJpgSupported=Errore, sono supportati solo i formati png e jpg. ErrorImageFormatNotSupported=PHP non supporta funzioni per convertire immagini in questo formato. -SetDate=Set date -SelectDate=Select a date +SetDate=Imposta data +SelectDate=Seleziona una data SeeAlso=Vedi anche %s BackgroundColorByDefault=Colore di sfondo predefinito FileWasNotUploaded=Il file selezionato per l'upload non è stato ancora caricato. Clicca su Allega file per farlo @@ -94,7 +94,7 @@ InformationLastAccessInError=Informazioni sull'ultimo accesso errato al database DolibarrHasDetectedError=Dolibarr ha rilevato un errore tecnico InformationToHelpDiagnose=Si tratta di informazioni utili alla diagnostica MoreInformation=Maggiori informazioni -TechnicalInformation=Technical information +TechnicalInformation=Informazioni tecniche NotePublic=Nota (pubblica) NotePrivate=Nota (privata) PrecisionUnitIsLimitedToXDecimals=Dolibarr è stato configurato per limitare la precisione dei prezzi unitari a %s decimali. @@ -206,7 +206,7 @@ Limit=Limite Limits=Limiti DevelopmentTeam=Team di sviluppo Logout=Logout -NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s +NoLogoutProcessWithAuthMode=Nessuna funzione di disconnessione al programma con il metodo di autenticazione %s Connection=Connessione Setup=Impostazioni Alert=Avvertimento @@ -261,8 +261,8 @@ Seconds=Secondi Today=Oggi Yesterday=Ieri Tomorrow=Domani -Morning=Morning -Afternoon=Afternoon +Morning=Mattina +Afternoon=Pomeriggio Quadri=Trimestre MonthOfDay=Mese del giorno HourShort=Ora @@ -315,7 +315,7 @@ SubTotal=Totale parziale TotalHTShort=Totale imp. TotalTTCShort=Totale (IVA inc.) TotalHT=Totale imponibile -TotalHTforthispage=Total (net of tax) for this page +TotalHTforthispage=Totale (al netto delle tasse) per questa pagina TotalTTC=Totale (IVA inclusa) TotalTTCToYourCredit=Totale (IVA inclusa) a tuo credito TotalVAT=Totale IVA @@ -356,7 +356,7 @@ ActionNotApplicable=Non applicabile ActionRunningNotStarted=Non avviato ActionRunningShort=Avviato ActionDoneShort=Fatto -ActionUncomplete=Uncomplete +ActionUncomplete=Incompleto CompanyFoundation=Società/Fondazione ContactsForCompany=Contatti per il soggetto terzo ContactsAddressesForCompany=Contatti/indirizzi per questo soggetto terzo @@ -508,7 +508,7 @@ NbOfCustomers=Numero di clienti NbOfLines=Numero di righe NbOfObjects=Numero di oggetti NbOfReferers=Numero di riferimenti -Referers=Refering objects +Referers=Oggetto di riferimento TotalQuantity=Quantità totale DateFromTo=Da %s a %s DateFrom=Da %s @@ -552,7 +552,7 @@ MailSentBy=Email inviate da TextUsedInTheMessageBody=Testo dell'email SendAcknowledgementByMail=Invia ricevuta via email NoEMail=Nessuna email -NoMobilePhone=No mobile phone +NoMobilePhone=Nessun cellulare Owner=Proprietario DetectedVersion=Versione riconosciuta FollowingConstantsWillBeSubstituted=Le seguenti costanti saranno sostitute con i valori corrispondenti @@ -578,7 +578,7 @@ TotalWoman=Totale TotalMan=Totale NeverReceived=Mai ricevuto Canceled=Annullato -YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary +YouCanChangeValuesForThisListFromDictionarySetup=Puoi modificare i valori per questa lista dal menu setup - dizionario Color=Colore Documents=Documenti DocumentsNb=file collegati (%s) @@ -607,8 +607,8 @@ Notes=Note AddNewLine=Aggiungi una nuova riga AddFile=Aggiungi file ListOfFiles=Elenco dei file -FreeZone=Free entry -FreeLineOfType=Free entry of type +FreeZone=Libero inserimento +FreeLineOfType=Libero inserimento del tipo CloneMainAttributes=Clona oggetto con i suoi principali attributi PDFMerge=Unisci PDF Merge=Unisci @@ -672,12 +672,12 @@ HelpCopyToClipboard=Usa Ctrl+C per copiare negli appunti SaveUploadedFileWithMask=Salva il file sul server con il nome "%s" (oppure "%s") OriginFileName=Nome originale del file SetDemandReason=Imposta sorgente -SetBankAccount=Define Bank Account -AccountCurrency=Account Currency -ViewPrivateNote=View notes -XMoreLines=%s line(s) hidden -PublicUrl=Public URL -AddBox=Add box +SetBankAccount=Definisci un numero di Conto Corrente Bancario +AccountCurrency=Valuta del conto +ViewPrivateNote=Vedi note +XMoreLines=%s linea(e) nascoste +PublicUrl=URL pubblico +AddBox=Aggiungi box # Week day Monday=Lunedì diff --git a/htdocs/langs/it_IT/margins.lang b/htdocs/langs/it_IT/margins.lang index 89d86502a27..34437cd4d58 100644 --- a/htdocs/langs/it_IT/margins.lang +++ b/htdocs/langs/it_IT/margins.lang @@ -10,24 +10,18 @@ MarkRate=Percentuale di ricarico DisplayMarginRates=Visualizza i tassi di margine DisplayMarkRates=Mostra le percentuali di ricarico InputPrice=Prezzo di ingresso - margin=Gestione margini di profitto margesSetup=Configurazione gestione margini di profitto - MarginDetails=Specifiche del margine - ProductMargins=Margini per prodotto CustomerMargins=Margini per cliente -SalesRepresentativeMargins=Sales representative margins - +SalesRepresentativeMargins=Margini di vendita del rappresentante ProductService=Prodotto o servizio AllProducts=Tutti i prodotti e servizi ChooseProduct/Service=Scegli prodotto o servizio - StartDate=Data di avvio EndDate=Data di fine Launch=Avvio - ForceBuyingPriceIfNull=Forza il prezzo di acquisto se vuoto ForceBuyingPriceIfNullDetails=se "ON", il margine sarà zero (prezzo di acquisto=prezzo di vendita), nel caso contrario ("OFF"), il margine sarà uguale al prezzo di vendita (prezzo di acquisto=0) MARGIN_METHODE_FOR_DISCOUNT=Metodo di margine per sconti globali @@ -35,16 +29,13 @@ UseDiscountAsProduct=Come prodotto UseDiscountAsService=Come servizio UseDiscountOnTotal=Sul subtotale MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definisce se, ai fini del calcolo del margine, uno sconto globale debba essere trattato come un prodotto, un servizio o usato solo sul subtotale. - MARGIN_TYPE=Tipo di margine MargeBrute=Margine lordo MargeNette=Margine netto MARGIN_TYPE_DETAILS=Margine lordo = Prezzo di vendita - Prezzo di acquisto
Margine netto = Prezzo di vendita - Prezzo di costo - CostPrice=Prezzo di costo BuyingCost=Prezzo di costo UnitCharges=Carico unitario Charges=Carichi - AgentContactType=Tipo di contatto per i mandati di vendita AgentContactTypeDetails=Definisci che tipo di contatto (connesso alle fatture) associare agli agenti commerciali diff --git a/htdocs/langs/it_IT/opensurvey.lang b/htdocs/langs/it_IT/opensurvey.lang index a56063749db..adb0df096b5 100644 --- a/htdocs/langs/it_IT/opensurvey.lang +++ b/htdocs/langs/it_IT/opensurvey.lang @@ -1,18 +1,18 @@ # Dolibarr language file - Source file is en_US - opensurvey Survey=Sondaggio Surveys=Sondaggi -OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll... +OrganizeYourMeetingEasily=Organizza facilmente i tuoi meeting e i sondaggi. Comincia selezionando il tipo di sondaggio NewSurvey=Nuovo sondaggio -NoSurveysInDatabase=%s poll(s) into database. -OpenSurveyArea=Polls area -AddACommentForPoll=You can add a comment into poll... +NoSurveysInDatabase=%s sondaggio(i) nel database +OpenSurveyArea=Area sondaggi +AddACommentForPoll=Puoi aggiungere un commento al sondaggio AddComment=Aggiungi commento CreatePoll=Crea sondaggio PollTitle=Titolo del sondaggio -ToReceiveEMailForEachVote=Receive an email for each vote +ToReceiveEMailForEachVote=Ricevi una mail per ogni voto TypeDate=Tipo appuntamento TypeClassic=Tipo standard -OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it +OpenSurveyStep2=Scegli le date fra i giorni liberi (in verde). I giorni selezionati sono in blu. Puoi deselezionare un giorno precedentemente selezionato cliccandoci di nuovo sopra. RemoveAllDays=Elimina tutti i giorni CopyHoursOfFirstDay=Copia gli orari del primo giorno RemoveAllHours=Elimina tutti gli orari @@ -24,10 +24,10 @@ OpenSurveyHowTo=Se decidi di partecipare a questa indagine, devi inserire il tuo CommentsOfVoters=Commenti dei votanti ConfirmRemovalOfPoll=Vuoi davvero eliminare questo sondaggio (e tutti i suoi voti) RemovePoll=Elimina sondaggio -UrlForSurvey=URL to communicate to get a direct access to poll +UrlForSurvey=URL da comunicare per avere accesso diretto al sondaggio PollOnChoice=Stai creando una domanda a scelta multipla. Inserisci tutte le opzioni possibili: -CreateSurveyDate=Create a date poll -CreateSurveyStandard=Create a standard poll +CreateSurveyDate=Crea una data del sondaggio +CreateSurveyStandard=Crea un sondaggio standard CheckBox=Checkbox semplice YesNoList=Elenco (vuota/sì/no) PourContreList=Elenco (vuota/a favore/contro) @@ -35,7 +35,7 @@ AddNewColumn=Aggiungi una colonna TitleChoice=Etichetta ExportSpreadsheet=Esporta su foglio elettronico ExpireDate=Data limite -NbOfSurveys=Number of polls +NbOfSurveys=Numero di sondaggi NbOfVoters=Num votanti SurveyResults=Risultati PollAdminDesc=Sei autorizzato a cambiare tutte le righe del sondaggio con il tasto "Modifica". Puoi anche eliminare una colonna o una riga con %s e aggiungere una colonna con il tasto %s. diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang index 8db704e79b2..449d6c6d070 100644 --- a/htdocs/langs/it_IT/orders.lang +++ b/htdocs/langs/it_IT/orders.lang @@ -55,7 +55,7 @@ DraftOrWaitingShipped=In bozza o convalidato, ma non ancora spedito MenuOrdersToBill=Ordini spediti MenuOrdersToBill2=Ordini da fatturare SearchOrder=Ricerca ordine -SearchACustomerOrder=Search a customer order +SearchACustomerOrder=Cerca un ordine cliente ShipProduct=Spedisci prodotto Discount=Sconto CreateOrder=Crea ordine @@ -68,11 +68,11 @@ CancelOrder=Annulla ordine AddOrder=Aggiungi ordine AddToMyOrders=Aggiungi ai miei ordini AddToOtherOrders=Aggiungi ad altri ordini -AddToDraftOrders=Add to draft order +AddToDraftOrders=Aggiungi ad una bozza d'ordine ShowOrder=Visualizza ordine NoOpenedOrders=Nessun ordine aperto NoOtherOpenedOrders=Nessun altro ordine aperto -NoDraftOrders=No draft orders +NoDraftOrders=Nessuna bozza d'ordine OtherOrders=Altri ordini LastOrders=Ultimi %s ordini LastModifiedOrders=Ultimi %s ordini modificati @@ -82,7 +82,7 @@ NbOfOrders=Numero di ordini OrdersStatistics=Statistiche ordini OrdersStatisticsSuppliers=Statistiche ordini dei fornitori NumberOfOrdersByMonth=Numero di ordini per mese -AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +AmountOfOrdersByMonthHT=Importo ordini per mese (al netto delle imposte) ListOfOrders=Elenco degli ordini CloseOrder=Chiudi ordine ConfirmCloseOrder=Vuoi davvero chiudere questo ordine? Una volta chiuso, un ordine può solo essere fatturato. @@ -144,7 +144,7 @@ AddDeliveryCostLine=Aggiungi un prezzo di consegna alla riga contenente il peso # Documents models PDFEinsteinDescription=Un modello completo per gli ordini (logo,ecc...) PDFEdisonDescription=Un modello semplice per gli ordini -PDFProformaDescription=A complete proforma invoice (logo…) +PDFProformaDescription=Una fattura proforma completa (logo...) # Orders modes OrderByMail=Posta OrderByFax=Fax @@ -155,9 +155,9 @@ CreateInvoiceForThisCustomer=Ordini da fatturare NoOrdersToInvoice=Nessun ordine fatturabile CloseProcessedOrdersAutomatically=Classifica come "Lavorati" tutti gli ordini selezionati MenuOrdersToBill2=Ordini da fatturare -OrderCreation=Order creation +OrderCreation=Creazione di ordine Ordered=Ordinato -OrderCreated=Your orders have been created -OrderFail=An error happened during your orders creation -CreateOrders=Create orders -ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". +OrderCreated=I tuoi ordini sono stati creati +OrderFail=C'è stato un errore durante la creazione del tuo ordine +CreateOrders=Crea ordini +ToBillSeveralOrderSelectCustomer=Per creare una fattura per ordini multipli, clicca prima sul cliente, poi scegli "%s". diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang index 6c77a601c46..fa0495ebc9c 100644 --- a/htdocs/langs/it_IT/other.lang +++ b/htdocs/langs/it_IT/other.lang @@ -17,14 +17,14 @@ Notify_ORDER_SUPPLIER_APPROVE=Ordine fornitore approvato Notify_ORDER_SUPPLIER_REFUSE=Ordine fornitore rifiutato Notify_ORDER_VALIDATE=Ordine cliente convalidato Notify_PROPAL_VALIDATE=proposta convalidata -Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed -Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused +Notify_PROPAL_CLOSE_SIGNED=Proposta del cliente chiusa come firmata +Notify_PROPAL_CLOSE_REFUSED=Proposta del cliente chiusa come rifiutata Notify_WITHDRAW_TRANSMIT=Invia prelievo Notify_WITHDRAW_CREDIT=Accredita prelievo Notify_WITHDRAW_EMIT=Esegui prelievo Notify_ORDER_SENTBYMAIL=Ordine cliente inviato per email Notify_COMPANY_CREATE=Creato soggetto terzo -Notify_COMPANY_SENTBYMAIL=Mails sent from third party card +Notify_COMPANY_SENTBYMAIL=Email inviate dalla scheda soggetti terzi Notify_PROPAL_SENTBYMAIL=Proposta inviata per email Notify_BILL_PAYED=Fattura attiva pagata Notify_BILL_CANCEL=Fattura attiva annullata @@ -34,20 +34,20 @@ Notify_ORDER_SUPPLIER_SENTBYMAIL=Ordine fornitore inviato per email Notify_BILL_SUPPLIER_VALIDATE=Fattura fornitore convalidata Notify_BILL_SUPPLIER_PAYED=Fattura fornitore pagata Notify_BILL_SUPPLIER_SENTBYMAIL=Fattura fornitore inviata per email -Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled +Notify_BILL_SUPPLIER_CANCELED=Fattura fornitore cancellata Notify_CONTRACT_VALIDATE=Contratto convalidato Notify_FICHEINTER_VALIDATE=Intervento convalidato Notify_SHIPPING_VALIDATE=Spedizione convalidata Notify_SHIPPING_SENTBYMAIL=Spedizione inviata per email Notify_MEMBER_VALIDATE=Membro convalidato -Notify_MEMBER_MODIFY=Member modified +Notify_MEMBER_MODIFY=Membro modificato Notify_MEMBER_SUBSCRIPTION=Membro aggiunto Notify_MEMBER_RESILIATE=Membro revocato Notify_MEMBER_DELETE=Membro eliminato -Notify_PROJECT_CREATE=Project creation -Notify_TASK_CREATE=Task created -Notify_TASK_MODIFY=Task modified -Notify_TASK_DELETE=Task deleted +Notify_PROJECT_CREATE=Creazione del progetto +Notify_TASK_CREATE=Attività creata +Notify_TASK_MODIFY=Attività modificata +Notify_TASK_DELETE=Attività cancellata NbOfAttachedFiles=Numero di file/documenti allegati TotalSizeOfAttachedFiles=Dimensione totale dei file/documenti allegati MaxSize=La dimensione massima è @@ -57,14 +57,14 @@ Miscellaneous=Varie NbOfActiveNotifications=Numero di notifiche attive PredefinedMailTest=Questa è una mail di prova. \\NLe due linee sono separate da un a capo. PredefinedMailTestHtml=Questa è una mail di test (la parola test deve risultare in grassetto).
Le due linee sono separate da un a capo. -PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ -PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nAlleghiamo la fattura __FACREF__\n\n__PERSONALIZED__Cordiali saluti\n\n__SIGNATURE__ +PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \nVorremmo portare alla Vostra attenzione che la fattura __FACREF__ sembra non essere stata saldata. La fattura è allegata alla presente, come promemoria.\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__ +PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nAlleghiamo la proposta commerciale __PROPREF__ \n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__ +PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nAlleghiamo l'ordine __ORDERREF__\n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nAlleghiamo il nostro ordine __ORDERREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nAlleghiamo la fattura __FACREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__ +PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nAlleghiamo il documento di trasporto __SHIPPINGREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__ +PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nAlleghiamo l'intervento __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__ DemoDesc=Dolibarr è un ERP/CRM compatto composto di diversi moduli funzionali. Un demo comprendente tutti i moduli non ha alcun senso, perché un caso simile non esiste nella realtà. Sono dunque disponibili diversi profili demo. ChooseYourDemoProfil=Scegli il profilo demo che corrisponde alla tua attività ... @@ -147,12 +147,12 @@ StatsByNumberOfEntities=Statistiche per numero di entità NumberOfProposals=Numero di proposte degli ultimi 12 mesi NumberOfCustomerOrders=Numero di ordini dei clienti degli ultimi 12 mesi NumberOfCustomerInvoices=Numero di fatture attive degli ultimi 12 mesi -NumberOfSupplierOrders=Number of supplier orders on last 12 month +NumberOfSupplierOrders=Numero di ordini fornitori negli ultimi 12 mesi NumberOfSupplierInvoices=Numero di fatture fornitore degli ultimi 12 mesi NumberOfUnitsProposals=Numero di unità sulle proposte degli ultimi 12 mesi NumberOfUnitsCustomerOrders=Numero di unità sugli ordini dei clienti degli ultimi 12 mesi NumberOfUnitsCustomerInvoices=Numero di unità sulle fatture attive degli ultimi 12 mesi -NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month +NumberOfUnitsSupplierOrders=Numero di unità su ordini fornitore negli ultimi 12 mesi NumberOfUnitsSupplierInvoices=Numero di unità sulle fatture fornitore degli ultimi 12 mesi EMailTextInterventionValidated=Intervento %s convalidato EMailTextInvoiceValidated=Fattura %s convalidata @@ -184,12 +184,12 @@ StartUpload=Carica CancelUpload=Annulla caricamento FileIsTooBig=File troppo grande PleaseBePatient=Attendere, prego... -RequestToResetPasswordReceived=A request to change your Dolibarr password has been received -NewKeyIs=This is your new keys to login -NewKeyWillBe=Your new key to login to software will be -ClickHereToGoTo=Click here to go to %s -YouMustClickToChange=You must however first click on the following link to validate this password change -ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe. +RequestToResetPasswordReceived=Una richiesta di cambio della tua password è stata ricevuta +NewKeyIs=Queste sono le tue nuove credenziali di accesso +NewKeyWillBe=Le tue nuove credenziali per loggare al software sono +ClickHereToGoTo=Clicca qui per andare a %s +YouMustClickToChange=Devi cliccare sul seguente link per validare il cambio della password +ForgetIfNothing=Se non hai richiesto questo cambio, lascia perdere questa mail. Le tue credenziali sono mantenute al sicuro. ##### Calendar common ##### AddCalendarEntry=Aggiungi evento al calendario %s @@ -211,7 +211,7 @@ MemberResiliatedInDolibarr=Membro %s revocato su Dolibarr MemberDeletedInDolibarr=Membro eliminato da Dolibarr MemberSubscriptionAddedInDolibarr=Adesione membro %s aggiunta a Dolibarr ShipmentValidatedInDolibarr=%s spedizioni convalidate in Dolibarr -ShipmentDeletedInDolibarr=Shipment %s deleted from Dolibarr +ShipmentDeletedInDolibarr=Spedizione %s cancellate ##### Export ##### Export=Esportazione ExportsArea=Area esportazioni diff --git a/htdocs/langs/it_IT/paybox.lang b/htdocs/langs/it_IT/paybox.lang index 5223a8f29d4..d52755de120 100644 --- a/htdocs/langs/it_IT/paybox.lang +++ b/htdocs/langs/it_IT/paybox.lang @@ -32,6 +32,6 @@ VendorName=Nome del venditore CSSUrlForPaymentForm=URL del foglio di stile CSS per il modulo di pagamento MessageOK=Messaggio sulla pagina di pagamento convalidato MessageKO=Messaggio sulla pagina di pagamento annullato -# NewPayboxPaymentReceived=New Paybox payment received -# NewPayboxPaymentFailed=New Paybox payment tried but failed -# PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +NewPayboxPaymentReceived=Nuovo pagamento Paybox ricevuto +NewPayboxPaymentFailed=Nuovo tentativo di pagamento Paybox ma fallito +PAYBOX_PAYONLINE_SENDEMAIL=Email di avviso dopo il pagamento (a buon fine o no) diff --git a/htdocs/langs/it_IT/paypal.lang b/htdocs/langs/it_IT/paypal.lang index 31f2dfeeb65..3a72a2429c2 100644 --- a/htdocs/langs/it_IT/paypal.lang +++ b/htdocs/langs/it_IT/paypal.lang @@ -20,6 +20,6 @@ YouAreCurrentlyInSandboxMode=Attualmente sei in modalità sandbox NewPaypalPaymentReceived=Nuovo pagamento Paypal ricevuto NewPaypalPaymentFailed=Nuovo pagamento Paypal tentato ma fallito PAYPAL_PAYONLINE_SENDEMAIL=Email di avviso dopo un pagamento (a buon fine o no) -ReturnURLAfterPayment=Return URL after payment -ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed -PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed +ReturnURLAfterPayment=URL di ritorno dopo il pagamento +ValidationOfPaypalPaymentFailed=Conferma del pagamento fallito di Paypal +PaypalConfirmPaymentPageWasCalledButFailed=La pagina di conferma del pagamento è stata interrogata da Paypal ma la conferma è fallita. diff --git a/htdocs/langs/it_IT/shop.lang b/htdocs/langs/it_IT/shop.lang index 8e9b3a5e015..edcdd0c7478 100644 --- a/htdocs/langs/it_IT/shop.lang +++ b/htdocs/langs/it_IT/shop.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - shop -FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup +FailedConnectDBCheckModuleSetup=Connessione al database di oscommerce fallita. Controlla le impostazioni di setup del tuo modulo. Shop=Negozio ShopWeb=Negozio online LastOrders=Ultimi ordini diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang index 3dc850360db..d5dab356e12 100644 --- a/htdocs/langs/it_IT/stocks.lang +++ b/htdocs/langs/it_IT/stocks.lang @@ -62,8 +62,8 @@ OrderStatusNotReadyToDispatch=Lo stato dell'ordine non ne consente la spedizione StockDiffPhysicTeoric=Motivo della differenza tra scorta effettiva e teorica NoPredefinedProductToDispatch=Per l'oggetto non ci sono prodotti impostati. Quindi non è necessario alterare la scorta. DispatchVerb=Spedizione -StockLimitShort=Limit for alert -StockLimit=Stock limit for alert +StockLimitShort=Limite per segnalazioni +StockLimit=Limite minimo scorta per segnalazioni PhysicalStock=Scorta fisica RealStock=Scorta reale VirtualStock=Scorta virtuale @@ -94,32 +94,32 @@ DesiredStock=Scorta desiderata StockToBuy=Da ordinare Replenishment=Rifornimento ReplenishmentOrders=Ordini di rifornimento -VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs -UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature -UseVirtualStock=Use virtual stock -UsePhysicalStock=Use physical stock -CurentSelectionMode=Curent selection mode -CurentlyUsingVirtualStock=Virtual stock -CurentlyUsingPhysicalStock=Physical stock +VirtualDiffersFromPhysical=In accordo con le opzioni di giacenza incrementa/decrementa, le scorte fisiche e quelle virtuali (fisiche + ordini in corso) possono variare +UseVirtualStockByDefault=Utilizza scorte virtuali come default, invece delle scorte fisiche, per la funzione di rifornimento +UseVirtualStock=Usa scorta virtuale +UsePhysicalStock=Usa giacenza fisica +CurentSelectionMode=Modalità di selezione corrente +CurentlyUsingVirtualStock=Giacenza virtuale +CurentlyUsingPhysicalStock=Giacenza fisica RuleForStockReplenishment=Regola per il rifornimento delle scorte SelectProductWithNotNullQty=Selezionare almeno un prodotto disponibile e un fornitore AlertOnly= Solo avvisi WarehouseForStockDecrease=Il magazzino %s sarà usato per la diminuzione delle scorte WarehouseForStockIncrease=Il magazzino %s sarà usato per l'aumento delle scorte ForThisWarehouse=Per questo magazzino -ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. +ReplenishmentStatusDesc=Questa è una lista di tutti i prodotti con una giacenza inferiore a quella desiderata (o inferiore a quella del valore di allarme se la casella "solo allarmi" è spuntata) ReplenishmentOrdersDesc=Questa è una lista di tutti gli ordini di acquisto aperti Replenishments=Rifornimento NbOfProductBeforePeriod=Quantità del prodotto %s in magazzino prima del periodo selezionato (< %s) -NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) -MassMovement=Mass movement -MassStockMovement=Mass stock movement -SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s". -RecordMovement=Record transfert -ReceivingForSameOrder=Receivings for this order -StockMovementRecorded=Stock movements recorded -RuleForStockAvailability=Rules on stock requirements -StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice -StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order -StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment +NbOfProductAfterPeriod=Quantità del prodotto %s in magazzino dopo il periodo selezionato (< %s) +MassMovement=Movimentazione di massa +MassStockMovement=Movimentazione di massa delle giacenze +SelectProductInAndOutWareHouse=Seleziona un prodotto, una quantità, un magazzino di origine ed uno di destinazione, poi clicca "%s". Una volta terminato, per tutte le movimentazioni da effettuare, clicca su "%s". +RecordMovement=Registra trasferimento +ReceivingForSameOrder=Ricezione per questo ordine +StockMovementRecorded=Movimentazione di scorte registrata +RuleForStockAvailability=Regole sulla fornitura delle scorte +StockMustBeEnoughForInvoice=Il livello delle scorte deve essere sufficiente per aggiungere un prodotto/servizio alla fattura +StockMustBeEnoughForOrder=Il livello delle scorte deve essere sufficiente per aggiungere un prodotto/servizio all'ordine +StockMustBeEnoughForShipment= Il livello delle scorte deve essere sufficiente per aggiungere un prodotto/servizio alla spedizione diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang index 68888301e85..9a4c183cfca 100644 --- a/htdocs/langs/it_IT/users.lang +++ b/htdocs/langs/it_IT/users.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - users -HRMArea=HRM area +HRMArea=Area HRM UserCard=Scheda utente ContactCard=Scheda contatto GroupCard=Scheda gruppo @@ -87,7 +87,7 @@ MyInformations=I miei dati ExportDataset_user_1=Utenti e proprietà di Dolibarr DomainUser=Utente di dominio %s Reactivate=Riattiva -CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card. +CreateInternalUserDesc=Questo modulo ti permette di creare un utente interno alla tua azienda/fondazione. Per creare un utente esterno (clienti, fornitori, .. ) utilizza il bottone 'Crea utente' nella scheda soggetti terzi. InternalExternalDesc=Un utente interno è un utente che fa parte della vostra Azienda/Fondazione.
Un utente esterno è un cliente, un fornitore o altro.

In entrambi i casi, le autorizzazioni definiscono i diritti all'interno di Dolibarr. Ad un utente esterno si può assegnare un gestore dei menu diverso (vedi Home - Impostazioni - Visualizzazione). PermissionInheritedFromAGroup=Autorizzazioni ereditate dall'appartenenza al gruppo. Inherited=Ereditato diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang index 2bae33d0ff5..fd19170c5f4 100644 --- a/htdocs/langs/it_IT/withdrawals.lang +++ b/htdocs/langs/it_IT/withdrawals.lang @@ -18,8 +18,8 @@ RequestStandingOrderToTreat=Richiesta ordini permanenti da trattare RequestStandingOrderTreated=Richiesta ordini permanenti trattati CustomersStandingOrders=Ordini permanenti clienti CustomerStandingOrder=Ordine permanente cliente -NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request -NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information +NbOfInvoiceToWithdraw=Numero di fattura con richiesta di prelievo +NbOfInvoiceToWithdrawWithInfo=Numero di fattura con richiesta di prelievo per clienti che hanno inserito un conto corrente bancario InvoiceWaitingWithdraw=Fattura in attesa di domiciliazione AmountToWithdraw=Importo da prelevare WithdrawsRefused=Bonifico rifiutato diff --git a/htdocs/langs/ja_JP/link.lang b/htdocs/langs/ja_JP/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/ja_JP/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/ko_KR/link.lang b/htdocs/langs/ko_KR/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/ko_KR/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/lt_LT/link.lang b/htdocs/langs/lt_LT/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/lt_LT/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/lv_LV/link.lang b/htdocs/langs/lv_LV/link.lang index 65f81c8548d..bff8c1799da 100644 --- a/htdocs/langs/lv_LV/link.lang +++ b/htdocs/langs/lv_LV/link.lang @@ -1,18 +1,8 @@ -/* - * Language code: lv_LV - * Automatic generated via autotranslator.php tool - * Generation date 2013-11-08 23:35:59 - */ - - -// START - Lines generated via autotranslator.php tool (2013-11-09 12:40:15). -// Reference language: en_US -> lv_LV -LinkANewFile=Saite jaunu failu / dokumentu -LinkedFiles=Saistīts failus un dokumentus -NoLinkFound=Nav reģistrētu saites -LinkComplete=Fails ir saistīts veiksmīgi -ErrorFileNotLinked=Failu nevar saistīt -LinkRemoved=Saite %s ir noņemta -ErrorFailedToDeleteLink=Neizdevās noņemt saiti "%s" -ErrorFailedToUpdateLink=Neizdevās atjaunināt saikne "%s" -// STOP - Lines generated via autotranslator.php tool (2013-11-09 12:40:57). +LinkANewFile=Salinkot jaunu failu/dokumentu +LinkedFiles=Salinkotie faili un dokumenti +NoLinkFound=Nav reģistrētas saites +LinkComplete=Fails veiksmīgi salinkots +ErrorFileNotLinked=Failu nevar salinkot +LinkRemoved=Saite %s tika dzēsta +ErrorFailedToDeleteLink= Kļūda dzēšot saiti '%s' +ErrorFailedToUpdateLink= Kļūda atjaunojot saiti '%s' diff --git a/htdocs/langs/mk_MK/link.lang b/htdocs/langs/mk_MK/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/mk_MK/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/nb_NO/link.lang b/htdocs/langs/nb_NO/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/nb_NO/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/nl_NL/link.lang b/htdocs/langs/nl_NL/link.lang new file mode 100644 index 00000000000..3a57988a7ed --- /dev/null +++ b/htdocs/langs/nl_NL/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Koppel een nieuw bestand/document +LinkedFiles=Gekoppelde bestanden en documenten +NoLinkFound=Geen geregistreerde koppelingen +LinkComplete=Het bestand is succesvol gekoppeld +ErrorFileNotLinked=Het bestand kon niet gekoppeld worden +LinkRemoved=De koppeling %s is verwijderd +ErrorFailedToDeleteLink= Kon de verbinding '%s' niet verwijderen +ErrorFailedToUpdateLink= Kon verbinding '%s' niet bijwerken diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index 8b6c78a1e21..8a470228b6f 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -47,7 +47,7 @@ DictionarySetup=Dictionary setup Dictionary=Dictionaries ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Kod nie może zawierać wartości "0" -DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +DisableJavascript=Wyłącz funkcje JavaScript i Ajax (rekomendowane dla osób niewidomych oraz przeglądarek tekstowych) ConfirmAjax=Wykorzystanie Ajax potwierdzenie pop UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box. diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang index e3816d5f3de..b90c05248da 100644 --- a/htdocs/langs/pl_PL/errors.lang +++ b/htdocs/langs/pl_PL/errors.lang @@ -23,7 +23,7 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Ten kontakt jest już zdefiniowana ja ErrorCashAccountAcceptsOnlyCashMoney=To konto bankowe jest gotówką uwagę, dlatego akceptuje płatności typu cash only. ErrorFromToAccountsMustDiffers=Źródło i celów rachunków bankowych muszą być różne. ErrorBadThirdPartyName=Zła wartość w trzeciej imię -ErrorProdIdIsMandatory=The %s is mandatory +ErrorProdIdIsMandatory=%s jest obowiązkowy ErrorBadCustomerCodeSyntax=Bad składni kodu klienta ErrorBadBarCodeSyntax=Bad syntax for bar code ErrorCustomerCodeRequired=Klient kod wymagane diff --git a/htdocs/langs/pl_PL/link.lang b/htdocs/langs/pl_PL/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/pl_PL/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 6bdcaaf3386..d9c7953d06f 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -1,8 +1,13 @@ # Dolibarr language file - Source file is en_US - admin Foundation=Empresa/Instituição +Version=Versão VersionProgram=Versão do programa VersionLastInstall=Versão da instalação inicial VersionLastUpgrade=Versão da última atualização +VersionExperimental=Experimental +VersionDevelopment=Desenvolvimento +VersionUnknown=Desconhecida +VersionRecommanded=Recomendada SessionId=ID da sessao SessionSaveHandler=Manipulador para salvar sessões. SessionSavePath=Localizacao da sessao guardada @@ -27,60 +32,90 @@ InternalUser=Usuário Interno ExternalUser=Usuário Externo InternalUsers=Usuários Internos ExternalUsers=Usuários Externos +GlobalSetup=Geral +GUISetup=Layout SetupArea=Área Configuração FormToTestFileUploadForm=Formulário para testar upload de arquivo (de acordo com a configuração) IfModuleEnabled=Nota: Sim só é eficaz se o módulo %s estiver ativado RemoveLock=Exclua o arquivo %s se tem permissão da ferramenta de atualização. RestoreLock=Substituir o arquivo %s e apenas dar direito de ler a esse arquivo, a fim de proibir novas atualizações. +SecuritySetup=Configuração de Segurança +ErrorModuleRequirePHPVersion=Erro, este módulo requer uma versão %s ou superior de PHP ErrorModuleRequireDolibarrVersion=Erro, este módulo requer uma versão %s ou superior do ERP +ErrorDecimalLargerThanAreForbidden=Erro, as casas decimais superiores a %s não são suportadas. DictionarySetup=Configuração Dicionário +Dictionary=Dicionários ErrorReservedTypeSystemSystemAuto=Valores 'system' e 'systemauto' para o tipo é reservado. Você pode usar "usuário" como valor para adicionar seu próprio registro ErrorCodeCantContainZero=Código não pode conter valor 0 -DisableJavascript=Desativar as funções Javascript e AJax +DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) ConfirmAjax=Utilizar os popups de confirmação Ajax UseSearchToSelectCompanyTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo COMPANY_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string. UseSearchToSelectCompany=Use campos de completação automática para escolher terceiros em vez de usar uma caixa de listagem. -ActivityStateToSelectCompany=Adicionar uma opção de filtro para exibir / ocultar thirdparties que estão atualmente em atividade ou deixou de ativar +ActivityStateToSelectCompany= Adicionar uma opção de filtro para exibir / ocultar thirdparties que estão atualmente em atividade ou deixou de ativar UseSearchToSelectContactTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo CONTACT_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string. UseSearchToSelectContact=Use campos de completação automática para escolher de contato (em vez de usar uma caixa de lista). SearchFilter=Opções de filtro para pesquisa NumberOfKeyToSearch=Número de caracteres para iniciar a pesquisa: %s ViewFullDateActions=Ver as datas das ações na totalidade na ficha do fornecedor +NotAvailableWhenAjaxDisabled=Não está disponível quando o Ajax esta desativado +JavascriptDisabled=Javascript Desativado UsePopupCalendar=Utilizar popups para a introdução das datas UsePreviewTabs=Use guias de visualização ShowPreview=Ver Preview +PreviewNotAvailable=Visualização não disponível ThemeCurrentlyActive=Tema Atualmente Ativo CurrentTimeZone=Fuso horário PHP (servidor) MySQLTimeZone=Zona tempo MySql (banco de dados) TZHasNoEffect=Datas são guardadas e retornadas pelo servidor de banco de dados como se fosse guardados em formato de texto. A zona temporal tem effeito somente quando e usada a UNIX_TIMESTAMP função ( isso não deveria ser usado pelo Dolibarr, portanto o banco de dados TZ não deveria ter effeito, tambem se mudado apos que os dados foram inseridos). +Space=Área +Table=Tabela +Fields=Campos +Index=Índice +Mask=Máscara +NextValue=Próximo Valor NextValueForInvoices=Próximo Valor (Faturas) +NextValueForCreditNotes=Próximo Valor (Notas de Entregas) NextValueForDeposit=Próxima valor (depósito) NextValueForReplacements=Próxima valor (substituições) MustBeLowerThanPHPLimit=Observação: Parâmetros PHP limita o tamanho a %s %s de máximo, qualquer que seja o valor deste parâmetros NoMaxSizeByPHPLimit=Nota: Não há limite definido em sua configuração do PHP +MaxSizeForUploadedFiles=Tamanho máximo dos documentos a carregar (0 para proibir o carregamento) UseCaptchaCode=Utilização do Captcha no login UseAvToScanUploadedFiles=Utilização de um antivírus para scanear os arquivos enviados -AntiVirusCommandExample=Exemplo de Comando: c: \\ Program Files (x86) \\ ClamWin \\ bin \\ clamscan.exe
Exemplo de Mexilhão: / usr / bin / clamscan -AntiVirusParam=Mais parâmetros na linha de comando -AntiVirusParamExample=Exemplo de Parametro de Comando: - database = "C: \\ Program Files (x86) \\ lib ClamWin \\" +AntiVirusCommand= Caminho completo para o comando de antivírus +AntiVirusCommandExample= Exemplo de Comando: c: \\ Program Files (x86) \\ ClamWin \\ bin \\ clamscan.exe
Exemplo de Mexilhão: / usr / bin / clamscan +AntiVirusParam= Mais parâmetros na linha de comando +AntiVirusParamExample= Exemplo de Parametro de Comando: - database = "C: \\ Program Files (x86) \\ lib ClamWin \\" +ComptaSetup=Configuração do Módulo Contabilidade UserSetup=Configuração e Administração dos Usuário MenuSetup=Configuração do gerenciamento de menu MenuLimits=Limites e Precisão +MenuIdParent=Id do menu pai +DetailMenuIdParent=ID do menu pai (0 para um menu superior) DetailPosition=Número de ordem para a posição do menu PersonalizedMenusNotSupported=Menus personalizados não são suportados +AllMenus=Todos NotConfigured=Modulo nao configurado Setup=Configuração do Sistema Activation=Ativação Active=Ativo SetupShort=Configuracao +OtherOptions=Outras Opções OtherSetup=Outras configuracoes +CurrentValueSeparatorDecimal=Separador decimal CurrentValueSeparatorThousand=Separador milhar Destination=Destino IdModule=Módulo ID IdPermissions=Permissão ID +Modules=Módulos ModulesCommon=Módulos Principais +ModulesOther=Outros módulos ModulesInterfaces=Módulos de interface ModulesSpecial=Módulos muito específico +ParameterInDolibarr=Variável %s +LanguageParameter=Variável idioma %s +LanguageBrowserParameter=Variável %s +LocalisationDolibarrParameters=Parâmetros de localização ClientTZ=Fuso horário do cliente (usuário). ClientHour=Horário do cliente (usuário) OSTZ=Fuso horário do sistema operacional do servidor @@ -94,12 +129,16 @@ CompanyHour=Horário na empresa (empresa principal) CurrentSessionTimeOut=Tempo limite da sessão atual YouCanEditPHPTZ=Para definir um fuso horário diferente PHP (não obrigatório), você pode tentar adicionar um arquivo. Htacces com uma linha como esta "SetEnv TZ Europa / Paris" OSEnv=OS Ambiente +Box=Caixa +Boxes=Caixas MaxNbOfLinesForBoxes=Numero de linhas máximo para as caixas PositionByDefault=Posição por padrao +Position=Ordem MenusDesc=Os configuradores do menu definem o conteúdo das 2 barras de menus (a barra horizontal e a barra vertical). É possível atribuir configuradores diferentes segundo o usuário seja interno ou externo. MenusEditorDesc=O editor de menus permite definir entradas personalizadas nos menus. Deve utilizar com prudência sobe pena de colocar o ERP numa situação instável sendo necessário uma reinstalação para encontrar um menu coerente. MenuForUsers=menu para os usuarios LangFile=Arquivo .lang +System=Sistema SystemInfo=Informações de Sistema SystemTools=Ferramentas do Sistema SystemToolsArea=Área de ferramentas do sistema @@ -117,6 +156,7 @@ ConfirmPurgeAuditEvents=Tem a certeza que pretende limpar a lista de eventos de NewBackup=Novo Backup GenerateBackup=Gerar Backup Backup=Backup +Restore=Restaurar RunCommandSummary=A cópia será executada pelo seguinte comando RunCommandSummaryToLaunch=O backup pode ser executado com o seguinte comando WebServerMustHavePermissionForCommand=Seu servidor deve ter permissoes para executar esta ordem @@ -124,33 +164,50 @@ BackupResult=Resultado do Backup BackupFileSuccessfullyCreated=Arquivo de Backup gerado corretamente YouCanDownloadBackupFile=Pode ser feito o download dos arquivos gerados NoBackupFileAvailable=Nenhum Backup Disponivel +ExportMethod=Método de exportação +ImportMethod=Método de importação ToBuildBackupFileClickHere=Para criar uma cópia, clique here. ImportMySqlDesc=Para importar um backup, deve usar o mysql e na linha de comando seguinte: ImportPostgreSqlDesc=Para importar um arquivo de backup, você deve utilizar o pg_restore através do prompt de comando: ImportMySqlCommand=%s %s < meuArquivobackup.sql ImportPostgreSqlCommand=%s %s meuarquivodebackup.sql FileNameToGenerate=Nome do arquivo a gerar +Compression=Compressão CommandsToDisableForeignKeysForImport=Comando para desativar as chave estrangeira para a importação CommandsToDisableForeignKeysForImportWarning=Obrigatório se você quer ser capaz de restaurar o despejo sql mais tarde ExportCompatibility=Compatibilidade do arquivo de exportação gerado -PostgreSqlExportParameters=Parâmetros de exportação do PostgreSQL +MySqlExportParameters=Parâmetros da exportação MySql +PostgreSqlExportParameters= Parâmetros de exportação do PostgreSQL UseTransactionnalMode=Utilizar o modo transacional -FullPathToPostgreSQLdumpCommand=Caminho completo para o comando pg_dump +FullPathToMysqldumpCommand=Rota completa do comando mysqldump +FullPathToPostgreSQLdumpCommand=Caminho completo para o comando pg_dump +ExportOptions=Opções de exportação AddDropDatabase=Adicionar comando DROP DATABASE AddDropTable=Adicionar comando DROP TABLE +ExportStructure=Estrutura +Datas=Dados +NameColumn=Nome das colunas ExtendedInsert=Instruções INSERT estendidas NoLockBeforeInsert=Sem comandos de bloqueio em torno INSERIR +DelayedInsert=Adições com atraso EncodeBinariesInHexa=Codificar os campos binários em hexadecimal IgnoreDuplicateRecords=Ignorar erros de registros duplicados(INSERT IGNORE) +Yes=Sim +No=Não +AutoDetectLang=Autodetecção (navegador) FeatureDisabledInDemo=Opção desabilitada em mode demonstracao +Rights=Permissões BoxesDesc=As caixas são zonas de informação reduzidas que se mostram em algumas páginas. Voce pode escolher entre mostrar as caixas ou nao selecionando a opcao desejada e clicando em 'Ativar', ou clicando na lixeira para desativá-lo. OnlyActiveElementsAreShown=Somente elementos de habilitado módulos são mostrados. ModulesDesc=Os módulos do ERP definem as Funcionalidades disponíveis na aplicação. Alguns módulos requerem direitos que deverão indicar-se nos Usuários para que possam acessar ás suas Funcionalidades. +ModulesInterfaceDesc=Os módulos de interface são módulos que permitem vincular o ERP com sistemas, aplicações ou serviços externos. +ModulesSpecialDesc=Os módulos especiais são módulos de uso específico ou menos corrente que os módulos normais. ModulesJobDesc=Os módulos mpresariais permitem uma pré-configuração simplificada do ERP para um negocio especifico. ModulesMarketPlaceDesc=Voce pode encontrar mais modulos para download em sites externos na internet ModulesMarketPlaces=Mais módulos DoliStoreDesc=DoliStore, Pagina oficial para modulos externos do Dolibarr ERP/CRM. WebSiteDesc=Você pode pesquisar para encontrar mais módulos em Provedores de sites +URL=Link BoxesAvailable=Caixas disponíveis BoxesActivated=Caixas ativadas ActivateOn=Ative em @@ -159,6 +216,8 @@ SourceFile=Arquivo origem AutomaticIfJavascriptDisabled=Automático se Javascript está desativado AvailableOnlyIfJavascriptNotDisabled=Disponível somente se Javascript esta ativado AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponível somente se Javascript e Ajax estão ativados +Required=Requerido +Security=Segurança Passwords=Senhas DoNotStoreClearPassword=Nao salve senhas faceis no banco de dados mas salvar senhas criptografadas(Ativacao recomendada) MainDbPasswordFileConfEncrypted=Encriptar a senha da base em arquivo conf.php(Ativacao Recomendada) @@ -167,11 +226,13 @@ InstrucToClearPass=Para ter a senha codificada na conf.php file , subst ProtectAndEncryptPdfFiles=Proteção e encriptação dos pdf gerados(Ativado não recomendado, quebra geração pdf massa) ProtectAndEncryptPdfFilesDesc=A proteção de um documento pdf deixa o documento livre para leitura e para impressão a qualquer leitor de PDF. Ao contrário, a modificação e a cópia resultam impossível. Feature=Caracteristica +DolibarrLicense=Licença DolibarrProjectLeader=Lider de projeto Developpers=Programadores/contribuidores OtherDeveloppers=Outros Programadores/contribuidores OfficialWebSite=Site oficial do Dolibarr OfficialWebSiteFr=site web oficial falado/escrito em francês +OfficialWiki=Wiki ERP OfficialDemo=Demo online ERP OfficialMarketPlace=Loja Oficial para módulos / addons externos OfficialWebHostingService=Serviços de hospedagem web referenciados (Hospedagem em nuvem) @@ -185,31 +246,47 @@ CurrentTopMenuHandler=Manipulador de menu superior atual CurrentLeftMenuHandler=Manipulador de menu à esquerda atual CurrentMenuHandler=Manipulador do menu atual CurrentSmartphoneMenuHandler=Manipular do Menu Smartphone Atual +MeasuringUnit=Unidade de medida +Emails=E-Mails EMailsSetup=configuração E-Mails EMailsDesc=Esta página permite substituir os parâmetros PHP relacionados com o envio de correios eletrônicos. Na maioria dos casos como UNIX/Linux, os parâmetros PHP estão corretos e esta página é inútil. MAIN_MAIL_SMTP_PORT=Porta do servidor SMTP (Por default no php.ini: %s) MAIN_MAIL_SMTP_SERVER=Nome host ou ip do servidor SMTP (Por padrao em php.ini: %s) +MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta do servidor SMTP (Não definido em PHP em sistemas de tipo Unix) +MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nome servidor ou ip do servidor SMTP (Não definido em PHP em sistemas de tipo Unix) MAIN_MAIL_EMAIL_FROM=E-Mail do emissor para envios E-Mail automáticos (Por padrao no php.ini: %s) MAIN_MAIL_ERRORS_TO=Remetente de e-mail utilizado para retornar emails enviados com erros -MAIN_MAIL_AUTOCOPY_TO=Enviar sistematicamente uma cópia oculta de todos os emails enviados para +MAIN_MAIL_AUTOCOPY_TO= Enviar sistematicamente uma cópia oculta de todos os emails enviados para MAIN_DISABLE_ALL_MAILS=Desativar globalmente todo o envio de correios eletrônicos (para modo de testes) MAIN_MAIL_SENDMODE=Método de envio de e-mails -MAIN_MAIL_EMAIL_TLS=Usar encryptacao TLS(SSL) +MAIN_MAIL_SMTPS_ID=ID SMTP para autenticação SMTP +MAIN_MAIL_SMTPS_PW=Password SMTP para autenticação SMTP +MAIN_MAIL_EMAIL_TLS= Usar encryptacao TLS(SSL) MAIN_DISABLE_ALL_SMS=Desabilitar todos os envios de SMS(para testes ou demonstracoes) MAIN_SMS_SENDMODE=Método para envio de SMS MAIN_MAIL_SMS_FROM=Número padrão para envio de SMS FeatureNotAvailableOnLinux=Funcionalidade não disponível em sistemas Unix. Teste parâmetros sendmail localmente. SubmitTranslation=Se a tradução para esse idioma não estiver completa ou você encontrar erros, você pode corrigir isso através da edição de arquivos no diretório langs /% s e enviar arquivos modificados no forum www.dolibarr.org. +ModuleSetup=Configuração do módulo +ModulesSetup=Configuração dos módulos +ModuleFamilyBase=Sistema ModuleFamilyCrm=Administração cliente (CRM) ModuleFamilyProducts=Administração produtos +ModuleFamilyHr=Recursos Humanos ModuleFamilyProjects=Projetos/Trabalho cooperativo +ModuleFamilyOther=Outro +ModuleFamilyTechnic=Módulos ferramentas do sistema +ModuleFamilyExperimental=Módulos testes +ModuleFamilyFinancial=Módulos financeiros (Contabilidade/Tesouraria) ModuleFamilyECM=Gerenciamento de Conteúdo Eletrônico (ECM) MenuHandlers=Configuradores menu MenuAdmin=Editor menu DoNotUseInProduction=Não utilizar em produção ThisIsProcessToFollow=Está aqui o procedimento a seguir: +StepNb=Passo %s FindPackageFromWebSite=Encontre um pacote que oferece recurso desejado (por exemplo, no site oficial % s). DownloadPackageFromWebSite=Descarregar o pacote +UnpackPackageInDolibarrRoot=Descompactar o pacote na pasta raiz do ERP %s SetupIsReadyForUse=A Instalação está finalizada e o ERP está liberada para usar com o novo componente NotExistsDirect=O diretório alternativo para o root não foi definido InfDirAlt=Desde a versão 3, é possível definir um diretorio root alternativo. Esta funcoa permitepermite que você armazene, no mesmo lugar, plug-ins e templates personalizados
apenas crie um diretório na raiz do Dolibarr. (Por exemplo: custom)
@@ -228,6 +305,7 @@ GenericMaskCodes5=ABC {yy} {mm} - {000000} dará ABC0701-000099 %s na porta %s ServerNotAvailableOnIPOrPort=Servidor não disponível não endereço %s na Porta %s +DoTestServerAvailability=Teste de conectividade com o servidor DoTestSend=Teste envio DoTestSendHTML=Teste envio HTML ErrorCantUseRazIfNoYearInMask=Erro, não pode usar a opção para redefinir @ contador a cada ano se sequência {yy} ou {aaaa} não está na máscara. @@ -235,7 +313,7 @@ ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erro, não se pode usar opção UMask=Parâmetro UMask de novos arquivos em Unix/Linux/BSD. UMaskExplanation=Este parâmetro determina os direitos dos arquivos criados não servidor do ERP (durante o carregamento, por Exemplo).
Este deve ter o valor octal (por Exemplo, 0666 significa leitura / escrita para todos).
Este parâmetro não tem nenhum efeito sobre um servidor Windows. SeeWikiForAllTeam=Veja o wiki para mais detalhes de todos os autores e da sua organização -UseACacheDelay=Atraso para a resposta cache em segundos (0 ou vazio para nenhum cache) +UseACacheDelay= Atraso para a resposta cache em segundos (0 ou vazio para nenhum cache) DisableLinkToHelpCenter=Esconde link Precisa ajuda ou suporte " na página de login DisableLinkToHelp=Esconde link "%s Ajuda online " no menu esquerdo AddCRIfTooLong=Não há envolvimento automático, por isso, se linha está fora da página em documentos, porque por muito tempo, você deve adicionar-se os retornos de carro no testar área. @@ -250,6 +328,7 @@ ListOfDirectoriesForModelGenODT=Lista de diretórios contendo modelos de arquivo NumberOfModelFilesFound=Números de arquivos de modelos ODT/ODS encontrados neste diretório ExampleOfDirectoriesForModelGen=Exemplos de sintaxe:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=Para saber como criar seu documento seu modelo de documento odt, antes de armazená-lo naquele diretório, leia a documentação wiki +FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Posição do Nome/Sobrenome DescWeather=As imagens a seguir será mostrado no painel quando o número de ações final atingir os seguintes valores: KeyForWebServicesAccess=A chave para usar Web Services (parâmetro "dolibarrkey" em webservices) @@ -262,12 +341,14 @@ SmsTestMessage=Mensagem de teste a partir de __ para __ PHONEFROM__ PHONETO__ ModuleMustBeEnabledFirst=Módulo deve ser ativado antes de usar este recurso. SecurityToken=Chave para URLs seguras NoSmsEngine=No SMS gerente disponível remetente. Gerente de SMS do remetente não são instalados com a distribuição padrão (porque depende de um fornecedor externo), mas você pode encontrar em alguns. +PDF=PDF PDFDesc=Você pode definir cada uma das opções globais relacionadas com a geração de PDF PDFAddressForging=Regras de estabelecimento de caixas de endereço HideAnyVATInformationOnPDF=Esconder todas as informações relativas ao IVA em PDF gerados HideDescOnPDF=Esconder descrição dos produtos em PDF gerados HideRefOnPDF=Esconder ref. dos produtos em PDF gerados HideDetailsOnPDF=Ocultar artigos linhas detalhes sobre PDF gerado +Library=Biblioteca UrlGenerationParameters=Parâmetros para proteger URLs SecurityTokenIsUnique=Use um parâmetro SecureKey exclusivo para cada URL EnterRefToBuildUrl=Digite referência para o objeto @@ -276,22 +357,32 @@ ButtonHideUnauthorized=Ocultar botões para ações não autorizadas em vez de m OldVATRates=Taxa de VAt anterior NewVATRates=Nova taxa do VAT PriceBaseTypeToChange=Modificar sobre os preços com valor de referência de base definida em -MassConvert=Inicie a conversão em massa +MassConvert=Inicie a conversão em massa +String=Cadeia +TextLong=Texto longo +Int=Número inteiro Float=Flutuar +DateAndTime=Data e hora +Unique=Único Boolean=Booleano (Caixa de seleção) -ExtrafieldSelect =Selecionar lista -ExtrafieldSelectList =Selecione da tabela +ExtrafieldPhone = Telefone +ExtrafieldPrice = Preço +ExtrafieldMail = Email +ExtrafieldSelect = Selecionar lista +ExtrafieldSelectList = Selecione da tabela +ExtrafieldSeparator=Separador ExtrafieldCheckBox=Caixa de seleção ExtrafieldRadio=Botão de opção ExtrafieldParamHelpselect=Lista de parâmetros tem que ser como chave, valor por exemplo: 1, valor1 2, valor2 < 3, value3 ... A fim de ter a lista dependendo outro: 1, valor1 | parent_list_code: parent_key 2, valor2 | parent_list_code: parent_key ExtrafieldParamHelpcheckbox=Lista de parâmetros tem que ser como chave, valor

por exemplo:
1, valor1
2, valor2
3, value3
... -ExtrafieldParamHelpradio=Lista de parâmetros tem que ser como chave, valor por exemplo: 1, valor 2, valor2 1 3, value3 ... +ExtrafieldParamHelpradio=Lista de parâmetros tem que ser como chave, valor por exemplo: 1, valor 2, valor2 1 3, value3 ... ExtrafieldParamHelpsellist=Lista Parâmetros vem de uma tabela
Sintaxe: table_name: label_field: id_field :: filtro
Exemplo: c_typent: libelle: id :: filtro

filtro pode ser um teste simples (por exemplo, ativo = 1) para exibir apenas o valor ativo
se você deseja filtrar extrafields usar syntaxt extra.fieldcode = ... (onde código de campo é o código de extrafield)

A fim de ter a lista dependendo outro:
c_typent: libelle: id: parent_list_code | parent_column: Filtro LibraryToBuildPDF=Biblioteca utilizada para criar o PDF WarningUsingFPDF=Atenção: Seu conf.php contém dolibarr_pdf_force_fpdf directiva = 1. Isto significa que você usar a biblioteca FPDF para gerar arquivos PDF. Esta biblioteca é velho e não suporta um monte de recursos (Unicode, a transparência da imagem, cirílicos, árabes e asiáticos, ...), por isso podem ocorrer erros durante a geração de PDF.
Para resolver isso e ter um apoio total de geração de PDF, faça o download da biblioteca TCPDF , em seguida, comentar ou remover a linha $ dolibarr_pdf_force_fpdf = 1, e adicione ao invés $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir' LocalTaxDesc=Alguns países aplicam 2 ou 3 impostos sobre cada linha de nota fiscal. Se este for o caso, escolha o tipo de segundo e terceiro imposto e sua taxa. Tipos possíveis são:
1: impostos locais, aplicar sobre produtos e serviços, sem IVA (IVA não é aplicado sobre o imposto local)
2: impostos locais, aplicar sobre produtos e serviços antes de IVA (IVA é calculado sobre o montante + localtax)
3: impostos locais, aplicar em produtos sem IVA (IVA não é aplicado sobre o imposto local)
4: impostos locais, aplicadas aos produtos antes de IVA (IVA é calculado sobre o montante + localtax)
5: impostos locais, aplicar em serviços sem IVA (IVA não é aplicado sobre o imposto local)
6: impostos locais, aplicar em serviços antes de IVA (IVA é calculado sobre o montante + localtax) SMS=Mensagem de texto LinkToTestClickToDial=Digite um número de telefone para ligar para mostrar um link para testar a url ClickToDial para o usuário% s +RefreshPhoneLink=Atualizar link LinkToTest=Link clicável gerado para o usuário% s (clique número de telefone para testar) KeepEmptyToUseDefault=Manter em branco para usar o valor padrão DefaultLink=Link padrão @@ -306,26 +397,41 @@ ConfirmEraseAllCurrentBarCode=Tem certeza de que deseja apagar todos os valores AllBarcodeReset=Todos os valores de código de barras foram removidas NoBarcodeNumberingTemplateDefined=Nenhum modelo de numeração de código de barras habilitado para configuração do módulo de código de barras. NoRecordWithoutBarcodeDefined=Sem registro, sem valor de código de barras definido. + +# Modules Module0Name=Usuários e Grupos Module0Desc=Administração de Usuários e Grupos Module1Name=Fornecedores Module1Desc=Administração de Fornecedores (Empresas, Particulares) e Contatos +Module2Name=Comercial Module2Desc=Administração comercial +Module10Name=Contabilidade Module10Desc=Administração simples da Contabilidade (repartição das receitas e pagamentos) +Module20Name=Orçamentos Module20Desc=Administração de Orçamentos/Propostas comerciais +Module22Name=E-Mailings Module22Desc=Administração e envio de E-Mails massivos -Module23Desc=Acompanhamento do consumo de energias +Module23Name= Energia +Module23Desc= Acompanhamento do consumo de energias +Module25Name=Pedidos de clientes Module25Desc=Administração de pedidos de clientes Module30Name=Faturas e Recibos Module30Desc=Administração de faturas e recibos de clientes. Administração de faturas de Fornecedores +Module40Name=Fornecedores Module40Desc=Administração de Fornecedores +Module42Name=Syslog +Module42Desc=Utilização de logs (syslog) +Module49Name=Editores Module49Desc=Administração de Editores +Module50Name=Produtos Module50Desc=Administração de produtos Module51Name=Correspondência em massa Module51Desc=Gestão de correspondência do massa Module52Name=Estoques de produtos Module52Desc=Administração de estoques de produtos +Module53Name=Serviços Module53Desc=Administração de serviços +Module54Name=Contratos Module54Desc=Administração de contratos Module55Name=Códigos de barra Module55Desc=Administração dos códigos de barra @@ -333,29 +439,53 @@ Module56Name=Telefonia Module56Desc=Administração da telefonia Module57Name=Débitos Diretos Module57Desc=Administração de débitos diretos e créditos bancários +Module58Name=ClickToDial +Module58Desc=Integração com ClickToDial +Module59Name=Bookmark4u Module59Desc=Adicione função para gerar uma conta Bookmark4u desde uma conta do ERP +Module70Name=Intervenções Module70Desc=Administração de Intervenções Module75Name=Notas de despesas e deslocamentos Module75Desc=Administração das notas de despesas e deslocamentos +Module80Name=Expedições Module80Desc=Administração de Expedições e Recepções +Module85Name=Bancos e Caixas Module85Desc=Administração das contas financeiras de tipo contas bancarias, postais o efetivo Module100Name=Site externo Module100Desc=Este módulo inclui um web site ou página externa em menus Dolibarr e vê-lo em um quadro Dolibarr Module105Name=Mailman e SPIP Module105Desc=Mailman ou interface SPIP para o módulo membro +Module200Name=LDAP Module200Desc=sincronização com um anuário LDAP +Module210Name=PostNuke +Module210Desc=Integração com PostNuke +Module240Name=Exportações de dados +Module240Desc=Ferramenta de exportação de dados do ERP (com assistente) +Module250Name=Importação de dados +Module250Desc=Ferramenta de Importação de dados do ERP (com assistente) +Module310Name=Membros Module310Desc=Administração de Membros de uma associação +Module320Name=Ligações RSS +Module320Desc=Criação de ligações de informação RSS nas janelas do ERP +Module330Name=Favoritos Module330Desc=Administração de Favoritos Module400Name=Projetos Module400Desc=Administração dos projetos nos outros módulos +Module410Name=Webcalendar Module410Desc=Interface com calendário Webcalendar Module500Name=Despesas especiais (impostos, contribuições sociais, dividendos) Module500Desc=Gestão de despesas especiais, como impostos, contribuição social, dividendos e salários +Module510Name=Salários Module510Desc=Gestão de funcionários salários e pagamentos +Module600Name=Notificações Module600Desc=Envio de Notificações (por correio eletrônico) sobre os eventos de trabalho Dolibarr +Module700Name=Bolsas Module700Desc=Administração de Bolsas +Module800Name=OSCommerce 1 Module800Desc=Interface de visualização de uma loja OSCommerce mediante acesso direto à sua base de dados +Module900Name=OSCommerce 2 Module900Desc=Interface de visualização de uma loja OSCommerce mediante Web services.\nEste módulo requer instalar os arquivos de /oscommerce_ws/ws_server em OSCommerce. Leia o Arquivo README da pasta /oscommerce_ws/ws_server. +Module1200Name=Mantis Module1200Desc=Interface com o sistema de seguimento de incidências Mantis Module1400Name=Contabilidade Module1400Desc=Gestão de Contabilidade (partes duplas) @@ -363,30 +493,40 @@ Module1780Name=Categorias Module1780Desc=Administração de categorias (produtos, Fornecedores e clientes) Module2000Name=Editor WYSIWYG Module2000Desc=Permitir editar alguma área de texto usando um editor avançado +Module2300Name=Cron Module2300Desc=Gerenciamento de tarefas agendadas +Module2400Name=Agenda Module2400Desc=Administração da agenda e das ações Module2500Name=Administração Eletrônica de Documentos +Module2500Desc=Permite administrar uma base de documentos Module2600Name=Webservices Module2600Desc=Ativar o servidor de serviços web Dolibarr Module2700Name=Sobrescrito Module2700Desc=Usar o serviço on-line Gravatar (www.gravatar.com) para mostrar fotos de usuários / membros (que se encontra com os seus e-mails). Precisa de um acesso à Internet Module2800Desc=Cliente de FTP +Module2900Name=GeoIPMaxmind Module2900Desc=GeoIP Maxmind conversões capacidades +Module3100Name=Skype Module3100Desc=Adicionar um botão do Skype no cartão de adeptos / terceiros / contatos Module5000Name=Multi-Empresa Module5000Desc=Permite-lhe gerenciar várias empresas +Module6000Name=Fluxo de Trabalho Module6000Desc=Gestão de fluxo de trabalho Module20000Name=Ferias Module20000Desc=Declare e siga funcionários de férias Module50000Name=PayBox Module50000Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com PayBox +Module50100Name=Caixa Module50100Desc=Caixa registradora -Module50200Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com Paypal +Module50200Name= Paypal +Module50200Desc= Módulo para oferecer uma página de pagamento on-line por cartão de crédito com Paypal +Module54000Name=PrintIPP Module54000Desc=Imprimir via Cups IPP Impressora. Module55000Name=Abrir Enquete Module55000Desc=Módulo para fazer pesquisas on-line (como Doodle, Studs, Rdvz ...) Module59000Name=Margems Module59000Desc=Módulo para gerenciar as margens +Module60000Name=Comissões Module60000Desc=Módulo para gerenciar comissões Module150010Name=Número do lote, de comer por data e data de validade Module150010Desc=Número do lote, prazo de validade de venda gestão de data para o produto @@ -397,40 +537,107 @@ Permission14=Confirmar faturas Permission15=Enviar faturas por correio Permission16=Emitir pagamentos de faturas Permission19=Eliminar faturas +Permission21=Consultar Orçamentos +Permission22=Criar/Modificar Orçamentos +Permission24=Confirmar Orçamentos +Permission25=Enviar os Orçamentos +Permission26=Fechar Orçamentos +Permission27=Eliminar Orçamentos +Permission28=Exportação propostas comerciais +Permission31=Consultar produtos/serviços +Permission32=Criar/Modificar produtos/serviços +Permission34=Eliminar produtos/serviços +Permission36=Exportar produtos/serviços +Permission38=Exportar Produtos Permission41=Consultar projetos Permission42=Criar/Modificar projetos Permission44=Eliminar projetos +Permission61=Consultar Intervenções +Permission62=Criar/Modificar Intervenções +Permission64=Eliminar Intervenções +Permission67=Exportar Intervenções +Permission71=Consultar Membros +Permission72=Criar/Modificar Membros +Permission74=Eliminar Membros +Permission75=Configurar tipos e atributos dos Membros +Permission76=Exportar Bolsas +Permission78=Consultar honorários +Permission79=Criar/Modificar honorários +Permission81=Consultar pedidos de clientes +Permission82=Criar/Modificar pedidos de clientes +Permission84=Confirmar pedidos de clientes +Permission86=Enviar pedidos de clientes +Permission87=Fechar pedidos de clientes +Permission88=Anular pedidos de clientes +Permission89=Eliminar pedidos de clientes Permission91=Consultar Impostos e ICMS Permission92=Criar/Modificar Impostos e ICMS Permission93=Eliminar Impostos e ICMS +Permission94=Exportar Impostos Sociais +Permission95=Consultar balanços e resultados +Permission96=Parametrizar repartição Permission97=Ler linhas de faturas Permission98=Repartir linhas de faturas +Permission101=Consultar Expedições +Permission102=Criar/Modificar Expedições +Permission104=Confirmar Expedições Permission106=Envios de exportação +Permission109=Eliminar Expedições +Permission111=Consultar contas financeiras (contas bancarias, caixas) Permission112=Criar/Modificar quantidade/eliminar registros bancários Permission113=Configurar contas financeiras (criar, controlar as categorias) Permission114=Exportar transações e registros bancários Permission115=Exportar transações e extratos Permission116=Captar transferências entre contas Permission117=Gerenciar envio de cheques +Permission121=Consultar empresas +Permission122=Criar/Modificar empresas +Permission125=Eliminar empresas +Permission126=Exportar as empresas Permission141=Leia projetos (também privado não estou em contato para) Permission142=Criar / modificar projetos (também privado não estou em contato para) Permission144=Excluir projetos (também privado não estou em contato para) Permission146=Consultar Prestadores +Permission147=Consultar Estados Permission151=Consultar Débitos Diretos Permission152=Configurar Débitos Diretos Permission153=Consultar Débitos Diretos Permission154=Crédito / recusar ordens permanentes recibos +Permission161=Consultar contratos de serviço +Permission162=Criar/Modificar contratos de serviço Permission163=Ativar os serviços de um contrato Permission164=Desativar os serviços de um contrato +Permission165=Eliminar contratos Permission171=Criar/Modificar Deslocamento Permission172=Eliminar Deslocamento Permission173=apagar viagens Permission178=Exportar Deslocamento +Permission180=Consultar Fornecedores +Permission181=Consultar pedidos a Fornecedores +Permission182=Criar/Modificar pedidos a Fornecedores +Permission183=Confirmar pedidos a Fornecedores +Permission184=Aprovar pedidos a Fornecedores +Permission185=Enviar pedidos a Fornecedores +Permission186=Receber pedidos de Fornecedores +Permission187=Fechar pedidos a Fornecedores +Permission188=Anular pedidos a Fornecedores +Permission192=Criar Linhas +Permission193=Cancelar Linhas Permission194=Consultar Linhas da Lagura de Banda +Permission202=Criar Ligações ADSL +Permission203=Ordem das ligações encomendadas +Permission204=Comprar Ligações Permission205=Gerenciar Ligações +Permission206=Consultar Ligações +Permission211=Ler Telefone +Permission212=Comprar Linhas Permission213=Ativar Linha +Permission214=Configurar Telefone +Permission215=Configurar Fornecedores +Permission221=Consultar E-Mails Permission222=Criar/Modificar E-Mails (assunto, destinatários, etc.) Permission223=Confirmar E-Mails (permite o envio) +Permission229=Eliminar E-Mails Permission237=Exibir os destinatários e as informações Permission238=Envio manual de e-mails Permission239=Deletar e-mail após o envio @@ -439,6 +646,7 @@ Permission242=Criar/Modificar categorias Permission243=Eliminar categorias Permission244=Ver conteúdo de categorias ocultas Permission251=Consultar Outros Usuário, grupos e permissões +PermissionAdvanced251=Leia outros usuários Permission252=Criar/Modificar outros usuário, grupos e permissões Permission253=Modificar a senha de outros usuário PermissionAdvanced253=Criar ou modificar usuários internos ou externos e suas permissões @@ -446,16 +654,28 @@ Permission254=Eliminar ou desativar outros usuário Permission255=Criar/Modificar a sua propia informação de usuário Permission256=Modificar a sua propia senha Permission262=Consultar todas as empresas (somente Usuários internos. Os externos estão limitados a eles mesmos) +Permission271=Ler CA Permission272=Ler Faturas Permission273=Emitir Fatura Permission281=Consultar contatos Permission282=Criar/Modificar contatos Permission283=Eliminar contatos Permission286=Exportar os contatos +Permission291=Consultar Tarifas +Permission292=Permissões das Tarifas +Permission293=Modificar Fornecedor de Tarifas +Permission300=Consultar códigos de barra +Permission301=Criar/Modificar códigos de barra +Permission302=Eliminar código de barras +Permission311=Consultar Serviços Permission312=Assinalar Serviço ao Contrato +Permission331=Consultar Favoritos +Permission332=Criar/Modificar Favoritos +Permission333=Eliminar Favoritos Permission341=Ler suas próprias permissões Permission342=Criar ou modificar informações do próprio usuário Permission343=Modificar sua senha +Permission344=Modificar suas próprias permissões Permission351=Ler grupos Permission352=Ler permissões do grupo Permission353=Criar ou modificar grupos @@ -469,6 +689,7 @@ Permission510=Leia Salários Permission512=Criar / modificar salários Permission514=Excluir salários Permission517=Salários de exportação +Permission531=Ler serviços Permission532=Criar ou modificar serviços Permission534=Excluir serviços Permission536=Visualizar ou gerenciar serviços ocultos @@ -485,6 +706,16 @@ Permission1101=Consultar ordens de envio Permission1102=criar/modificar ordens de envio Permission1104=Confirmar ordem de envio Permission1109=Eliminar ordem de envio +Permission1181=Consultar Fornecedores +Permission1182=Consultar pedidos a Fornecedores +Permission1183=Criar pedidos a Fornecedores +Permission1184=Confirmar pedidos a Fornecedores +Permission1185=Aprovar pedidos a Fornecedores +Permission1186=Enviar pedidos a Fornecedores +Permission1187=Receber pedidos de Fornecedores +Permission1188=Fechar pedidos a Fornecedores +Permission1201=Obter resultado de uma exportação +Permission1202=Criar/Modificar Exportações Permission1231=Consultar faturas de Fornecedores Permission1232=Criar faturas de Fornecedores Permission1233=Confirmar faturas de Fornecedores @@ -495,9 +726,10 @@ Permission1237=Pedidos a fornecedores Export e seus detalhes Permission1251=Execute as importações em massa de dados externos para o banco de dados (carga de dados) Permission1321=Exportar faturas a clientes, atributos e cobranças Permission1421=Exportar faturas de clientes e atributos -Permission23001 =Ler tarefa agendada -Permission23002 =Criar/atualizar tarefa agendada -Permission23003 =Apagar tarefa agendada +Permission23001 = Ler tarefa agendada +Permission23002 = Criar/atualizar tarefa agendada +Permission23003 = Apagar tarefa agendada +Permission23004 = Executar tarefa agendada Permission2401=Ler ações (eventos ou tarefas) vinculadas na sua conta Permission2402=Criar/Modificar/Eliminar ações (eventos ou tarefas) vinculadas na sua conta Permission2403=Consultar ações (acontecimientos ou tarefas) de outros @@ -506,10 +738,12 @@ Permission2412=Criar / modificar ações (eventos ou tarefas) de outros Permission2413=Excluir ações (eventos ou tarefas) de outros Permission2501=Enviar ou eliminar documentos Permission2502=Baixar documentos +Permission2503=Enviar ou excluir documentos Permission2515=Configuração de diretorios de documentos Permission2801=Use cliente FTP em modo de leitura (navegar e baixar apenas) Permission2802=Use o cliente FTP no modo de escrita (apagar ou fazer upload de arquivos) Permission50101=Usar ponto de vendas +Permission50201=Leia transações Permission50202=Importar transacções Permission54001=Impressão Permission55001=Leia urnas @@ -520,6 +754,9 @@ DictionaryCompanyType=Tipo de clientes DictionaryCompanyJuridicalType=Tipos jurídicos de thirdparties DictionaryProspectLevel=Nível potencial Prospect DictionaryCanton=Estado / cantões +DictionaryRegion=Regiões +DictionaryCountry=Países +DictionaryCurrency=Moedas DictionaryCivility=Título Civilidade DictionaryActions=Tipo de eventos da agenda DictionarySocialContributions=Contribuições Sociais tipos @@ -530,13 +767,16 @@ DictionaryPaymentModes=Modos de pagamento DictionaryTypeContact=Tipos Contato / Endereço DictionaryEcotaxe=Ecotaxa (REEE) DictionaryPaperFormat=Formatos de papel +DictionaryFees=Tipo de taxas DictionarySendingMethods=Métodos do transporte DictionaryStaff=Pessoal +DictionaryAvailability=Atraso na entrega DictionaryOrderMethods=Métodos de compra DictionarySource=Origem das propostas / ordens DictionaryAccountancyplan=Plano de contas DictionaryAccountancysystem=Modelos para o plano de contas SetupSaved=configuração guardada +BackToModuleList=Voltar à lista de módulos BackToDictionaryList=Voltar para a lista de dicionários VATReceivedOnly=Impostos especiais não faturaveis VATManagement=Administração ICMS @@ -544,25 +784,32 @@ VATIsUsedDesc=o tipo de ICMS proposto por default em criações de Orçamentos, VATIsNotUsedDesc=o tipo de ICMS proposto por default é 0. Este é o caso de associações, particulares o algunas pequenhas sociedades. VATIsUsedExampleFR=em Francia, se trata das sociedades u organismos que eligen um regime fiscal general (General simplificado o General normal), regime ao qual se declara o ICMS. VATIsNotUsedExampleFR=em Francia, se trata de associações exentas de ICMS o sociedades, organismos o profesiones liberales que han eligedo o regime fiscal de módulos (ICMS em franquicia), pagando um ICMS em franquicia sem fazer declaração de ICMS. Esta elecção hace aparecer a anotação "IVA não aplicable - art-293B do CGI" em faturas. +##### Local Taxes ##### LTRate=Rata LocalTax1IsUsed=Utilize segundo imposto LocalTax1IsNotUsed=Não use o segundo imposto LocalTax1IsUsedDesc=Use um segundo tipo de impostos (excepto o IVA) LocalTax1IsNotUsedDesc=Não use outro tipo de impostos (excepto o IVA) LocalTax1Management=Segundo tipo de imposto +LocalTax1IsUsedExample= +LocalTax1IsNotUsedExample= LocalTax2IsUsed=Use terceiro imposto LocalTax2IsNotUsed=Não use terceiro imposto LocalTax2IsUsedDesc=Use um terceiro tipo de impostos (excepto o VAT) LocalTax2IsNotUsedDesc=Não use outro tipo de impostos (excepto o VAT) LocalTax2Management=Terceiro tipo de imposto -LocalTax1IsUsedDescES=A taxa de RE por padrão ao criar perspectivas, notas fiscais, ordens etc seguir a regra padrão ativo:
Se te comprador não está sujeito a RE, RP por default = 0. Fim da regra.
Se o comprador está sujeito a RE então o RE por padrão. Fim da regra.
-LocalTax1IsUsedExampleES=Na Espanha, eles são profissionais sujeitos a algumas seções específicas do IAE espanhol. -LocalTax1IsNotUsedExampleES=Na Espanha, eles são profissionais e sociedades e sujeito a determinadas seções do IAE espanhol. -LocalTax2ManagementES=Gestão IRPF -LocalTax2IsUsedDescES=A taxa de RE por padrão ao criar perspectivas, notas fiscais, ordens etc seguir a regra padrão ativo:
Se o vendedor não está sujeito a IRPF, então IRPF por default = 0. Fim da regra.
Se o vendedor é submetido a IRPF, em seguida, o IRPF por padrão. Fim da regra.
-LocalTax2IsNotUsedDescES=Por padrão, o IRPF proposta é 0. Fim da regra. -LocalTax2IsUsedExampleES=Na Espanha, freelancers e profissionais independentes que prestam serviços e empresas que escolheram o sistema fiscal de módulos. -LocalTax2IsNotUsedExampleES=Na Espanha, eles são bussines não sujeitas ao regime fiscal dos módulos. +LocalTax2IsUsedExample= +LocalTax2IsNotUsedExample= +LocalTax1ManagementES= RE Gestão +LocalTax1IsUsedDescES= A taxa de RE por padrão ao criar perspectivas, notas fiscais, ordens etc seguir a regra padrão ativo:
Se te comprador não está sujeito a RE, RP por default = 0. Fim da regra.
Se o comprador está sujeito a RE então o RE por padrão. Fim da regra.
+LocalTax1IsNotUsedDescES= Por padrão, o RE proposto é 0. Fim da regra. +LocalTax1IsUsedExampleES= Na Espanha, eles são profissionais sujeitos a algumas seções específicas do IAE espanhol. +LocalTax1IsNotUsedExampleES= Na Espanha, eles são profissionais e sociedades e sujeito a determinadas seções do IAE espanhol. +LocalTax2ManagementES= Gestão IRPF +LocalTax2IsUsedDescES= A taxa de RE por padrão ao criar perspectivas, notas fiscais, ordens etc seguir a regra padrão ativo:
Se o vendedor não está sujeito a IRPF, então IRPF por default = 0. Fim da regra.
Se o vendedor é submetido a IRPF, em seguida, o IRPF por padrão. Fim da regra.
+LocalTax2IsNotUsedDescES= Por padrão, o IRPF proposta é 0. Fim da regra. +LocalTax2IsUsedExampleES= Na Espanha, freelancers e profissionais independentes que prestam serviços e empresas que escolheram o sistema fiscal de módulos. +LocalTax2IsNotUsedExampleES= Na Espanha, eles são bussines não sujeitas ao regime fiscal dos módulos. CalcLocaltax=Relatorio CalcLocaltax1ES=Vendas - Compras CalcLocaltax1Desc=Relatorios de taxas locais são calculados pela differença entre taxas locais de venda e taxas locais de compra @@ -570,45 +817,92 @@ CalcLocaltax2ES=Compras CalcLocaltax2Desc=Relatorio de taxas locais e o total de taxas locais nas compras CalcLocaltax3ES=Vendas CalcLocaltax3Desc=Relatorio de taxas locais e o total de taxas locais de vendas +LabelUsedByDefault=Etiqueta que se utilizará se não se encontra tradução para este código +LabelOnDocuments=Etiqueta sobre documentos NbOfDays=N� de Dias +AtEndOfMonth=No Fim de Mês +Offset=Deslocado AlwaysActive=Sempre Ativo UpdateRequired=Parâmetros sistema necessita de uma atualização. Para atualizar click em Empresa/Instituição a administrar é requerida já que se utiliza a informação para a introdução de dados na maioria das janelas, em inserciones, ou para modificar o comportamento de Dolibarr (como, por Exemplo, das funções que dependem do seu país). SetupDescription4=A configuração Módulos é indispensável já que Dolibarr não é um ERP/CRM monolítico, é um conjunto de módulos mais ou menos independente. Depois de ativar os módulos que lhe interessem verificar as suas funcionalidades nos menus de Dolibarr. SetupDescription5=Outros itens do menu gerenciar parâmetros opcionais. +EventsSetup=Configuração do registo de eventos +LogEvents=Auditoría da segurança de eventos +Audit=Auditoría InfoDolibarr=Infos Dolibarr +InfoBrowser=Infos Browser InfoOS=Informações do sistema operacional InfoWebServer=Informações do Web Server InfoDatabase=Informações da base de dados InfoPHP=Informações do PHP InfoPerf=Infos performances +BrowserName=Browser name +BrowserOS=Browser OS +ListEvents=Auditoría de eventos ListOfSecurityEvents=Listado de eventos de segurança Dolibarr SecurityEventsPurged=Os eventos de segurança expurgados LogEventDesc=Pode ativar o registo de eventos de segurança Dolibarr aqui. os administradores podem ver o seu conteúdo a travé de menu ferramentas do sistema - Auditoria.Atenção, esta característica pode consumir uma gran quantidade de dados na base de dados. @@ -664,12 +966,13 @@ MAIN_MAX_DECIMALS_UNIT=Casas decimais máximas para os preços unitários MAIN_MAX_DECIMALS_TOT=Casas decimais máximas para os preços totais MAIN_MAX_DECIMALS_SHOWN=Casas decimais máximas para os valores mostrados em janela (Colocar ... depois do máximo quer ver ... quando o número se trunque à mostrar em janela) MAIN_DISABLE_PDF_COMPRESSION=Utilizar a compressão PDF para os Arquivos PDF gerados -MAIN_ROUNDING_RULE_TOT=Tamanho da faixa de arredondamento (para os países raros em que o arredondamento é feito em outra coisa do que base 10) +MAIN_ROUNDING_RULE_TOT= Tamanho da faixa de arredondamento (para os países raros em que o arredondamento é feito em outra coisa do que base 10) UnitPriceOfProduct=Preço líquido unitário de um produto TotalPriceAfterRounding=Preço total (imposto net / cuba / manhã) após arredondamento ParameterActiveForNextInputOnly=parâmetro efetivo somente a partir das próximas sessões NoEventOrNoAuditSetup=não são registrado eventos de segurança. Esto pode ser normal sim a auditoría não ha sido habilitado na página "configuração->segurança->auditoría". NoEventFoundWithCriteria=não são encontrado eventos de segurança para tais criterios de pesquisa. +SeeLocalSendMailSetup=Ver a configuração local de sendmail BackupDesc=Para realizar uma Cópia de segurança completa de Dolibarr, voçê deve: BackupDesc2=* Guardar o conteúdo da pasta de documentos (%s) que contém todos os Arquivos enviados o gerados (em um zip, por Exemplo). BackupDesc3=* Guardar o conteúdo de a sua base de dados em um Arquivo de despejo. Para ele pode utilizar o assistente a continuação. @@ -680,8 +983,9 @@ RestoreDesc=Para restaurar uma Cópia de segurança de Dolibarr, voçê deve: RestoreDesc2=* Tomar o Arquivo (Arquivo zip, por Exemplo) da pasta dos documentos e Descompactá-lo na pasta dos documentos de uma Nova Instalação de Dolibarr diretorio o na pasta dos documentos desta Instalação (%s). RestoreDesc3=* Recargar o Arquivo de despejo guardado na base de dados de uma Nova Instalação de Dolibarr o desta Instalação. Atenção, uma vez realizada a Restaurar, deverá utilizar um login/senha de administrador existente ao momento da Cópia de segurança para conectarse. Para restaurar a base de dados na Instalação atual, pode utilizar o assistente a continuação. RestoreMySQL=importar do MySQL -ForcedToByAModule=Esta regra é forçado a por um módulo ativado +ForcedToByAModule= Esta regra é forçado a por um módulo ativado PreviousDumpFiles=Arquivos de despejo de backup de banco de dados disponível +WeekStartOnDay=Primeiro dia da semana RunningUpdateProcessMayBeRequired=A execução do processo de atualização parece ser exigido (Programas versão difere da versão do banco de dado) YouMustRunCommandFromCommandLineAfterLoginToUser=Você deve executar este comando a partir da linha de comando após o login a um shell com o usuário ou você deve adicionar-W opção no final da linha de comando para fornece a senha. YourPHPDoesNotHaveSSLSupport=Funções SSL não disponíveis no seu PHP @@ -695,30 +999,43 @@ MenuUseLayout=Faça cardápio compativel vertical (opção javascript não deve MAIN_DISABLE_METEO=Desativar vista meteo TestLoginToAPI=Testar Acesso ao API ProxyDesc=Algumas características do Dolibarr precisa ter um acesso à Internet ao trabalho. Defina aqui os parâmetros para isso. Se o servidor Dolibarr está atrás de um servidor proxy, esses parâmetros diz Dolibarr como acessar Internet através dele. +ExternalAccess=Acesso externo MAIN_PROXY_USE=Usar um servidor proxy (caso contrário, o acesso direto a internet) MAIN_PROXY_HOST=Nome / Endereço do servidor proxy MAIN_PROXY_PORT=Porto de servidor proxy MAIN_PROXY_USER=Entre para usar o servidor proxy +MAIN_PROXY_PASS=Senha para usar o servidor proxy DefineHereComplementaryAttributes=Defina aqui todos os atributos, não já disponíveis por padrão, e que pretende ser apoiada por. +ExtraFields=Atributos complementares +ExtraFieldsLines=Atributos complementares (linhas) ExtraFieldsThirdParties=Atributos complementares (clientes) ExtraFieldsContacts=Atributos complementares (contato / endereço) +ExtraFieldsMember=Atributos complementares (membro) +ExtraFieldsMemberType=Atributos complementares (tipo de membro) ExtraFieldsCustomerOrders=Atributos complementares (ordens) +ExtraFieldsCustomerInvoices=Atributos complementares (faturas) ExtraFieldsSupplierOrders=Atributos complementares (ordens) +ExtraFieldsSupplierInvoices=Atributos complementares (faturas) +ExtraFieldsProject=Atributos complementares (projetos) +ExtraFieldsProjectTask=Atributos complementares (tarefas) ExtraFieldHasWrongValue=Atributo% s tem um valor errado. AlphaNumOnlyCharsAndNoSpace=apenas alfanuméricos caracteres sem espaço AlphaNumOnlyLowerCharsAndNoSpace=apenas alfanumérico e minúsculas, sem espaço SendingMailSetup=Configuração de envios por e-mail SendmailOptionNotComplete=Atenção, em alguns sistemas Linux, para enviar e-mail de seu e-mail, sendmail instalação execução must contém opção-ba (mail.force_extra_parameters parâmetros no seu arquivo php.ini). Se alguns destinatários não receber e-mails, tentar editar este parâmetro PHP com mail.force_extra_parameters =-ba). PathToDocuments=Rotas de acesso a documentos +PathDirectory=Catálogo SendmailOptionMayHurtBuggedMTA=Recurso para enviar e-mails usando o método "PHP mail direto" irá gerar uma mensagem de correio que pode não ser corretamente analisado por alguns servidores de correio de recepção. Resultado é que alguns e-mails não podem ser lidos por pessoas, alojadas pela thoose plataformas escutas. É caso para alguns provedores de Internet (Ex: Laranja na França). Este não é um problema em Dolibarr nem em PHP, mas para receber servidor de correio. No entanto, pode adicionar a opção MAIN_FIX_FOR_BUGGED_MTA a 1 no setup - outro para modificar Dolibarr para evitar isso. No entanto, você pode experimentar problemas com outros servidores que respeitem rigorosamente o padrão SMTP. A outra solução (recommanded) é usar o método de "biblioteca de tomada de SMTP" que não tem desvantagens. TranslationSetup=Configuração de tradução TranslationDesc=Escolha da língua visível na tela pode ser modificado: * A nível mundial a partir do menu strong Home - Setup - Exibição* Para o usuário apenas de guia de exibição do usuário de cartão de usuário (clique sobre o login no topo da tela). TotalNumberOfActivatedModules=Número total de módulos de recursos ativados: YouMustEnableOneModule=Você deve, pelo menos, permitir que um módulo ClassNotFoundIntoPathWarning=A classe não foi encontrado em caminho PHP +YesInSummer=Sim no verão OnlyFollowingModulesAreOpenedToExternalUsers=Note-se, apenas seguintes módulos são abertos a usuários externos (o que quer que sejam permissão desses usuários): SuhosinSessionEncrypt=Armazenamento de sessão criptografada pelo Suhosin ConditionIsCurrently=Condição é atualmente +TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível YouUseBestDriver=Você usa o driverque é o melhor driver disponível atualmente. YouDoNotUseBestDriver=Você usa drive mas recomendado. NbOfProductIsLowerThanNoPb=Você tem produtos / serviços somente no banco de dados. Isso não exigida qualquer otimização particular. @@ -732,9 +1049,12 @@ AddRefInList=Mostrar ao cliente / fornecedor ref em lista (lista ou combobox sel FieldEdition=Edição de campo FixTZ=Correção de fuso horário FillThisOnlyIfRequired=Exemplo: 2 (preencher somente se deslocamento de fuso horário problemas são experientes) +GetBarCode=Obter código de barras EmptyNumRefModelDesc=O código é livre. Este código pode ser modificado a qualquer momento. +##### Module password generation PasswordGenerationStandard=Devolve uma senha generada por o algoritmo interno Dolibarr: 8 caracteres, números e caracteres em minúsculas mescladas. PasswordGenerationNone=não oferece Senhas. a senha se introduce manualmente. +##### Users setup ##### UserGroupSetup=Configuração Módulo Usuários e Grupos GeneratePassword=Propor uma senha generada RuleForGeneratedPasswords=Norma para a geração das Senhas Propostas @@ -743,25 +1063,33 @@ EncryptedPasswordInDatabase=Permitir encriptação das Senhas na base de dados DisableForgetPasswordLinkOnLogonPage=não mostrar o link "senha esquecida" na página de login UsersSetup=Configuração do módulo Usuários UserMailRequired=EMail necessário para criar um novo usuário +##### Company setup ##### CompanySetup=configuração do módulo empresas CompanyCodeChecker=Módulo de geração e control dos códigos de Fornecedores (clientes/Fornecedores) AccountCodeManager=Módulo de geração dos códigos contabíls (clientes/Fornecedores) ModuleCompanyCodeAquarium=Devolve um código contabíl composto de %s seguido do código Fornecedor de provedor para o código contabíl de provedor, e %s seguido do código Fornecedor de cliente para o código contabíl de cliente. ModuleCompanyCodePanicum=Devolve um código contabíl vazio. ModuleCompanyCodeDigitaria=Devolve um código contabíl composto seguindo o código de Fornecedor. o código está formado por caracter0 ' C ' em primeiroa posição seguido dos 5 primeiroos caracteres do código Fornecedor. +UseNotifications=Usar Notificações NotificationsDesc=a função das Notificações permite enviar automaticamente um correio eletrônico para um determinado evento Dolibarr em empresas configuradas para ele ModelModules=Modelos de documentos DocumentModelOdt=Gere documentos a partir de modelos OpenDocuments (. ODT ou. Arquivos ODS para OpenOffice, KOffice, TextEdit, ...) WatermarkOnDraft=Marca d'água sobre o projeto de documento CompanyIdProfChecker=Regras sobre profissional Ids +MustBeUnique=Deve ser exclusivo? MustBeMandatory=Obrigatório para criar terceiros? MustBeInvoiceMandatory=Obrigatório para validar faturas? +Miscellaneous=Diversos +##### Webcal setup ##### WebCalSetup=configuração de link com o calendário Webcalendar WebCalSyncro=Integrar os eventos Dolibarr em WebCalendar +WebCalAllways=Sempre, sem consultar WebCalYesByDefault=Consultar (sim por default) WebCalNoByDefault=Consultar (não por default) +WebCalNever=Nunca WebCalURL=endereço (URL) de acesso ao calendário WebCalServer=Servidor da base de dados do calendário +WebCalDatabaseName=Nome da base de dados WebCalUser=Usuário com acesso e a base WebCalSetupSaved=os dados de link são guardado corretamente. WebCalTestOk=A ligação ao servidor no banco de dados com o usuário de sucesso. @@ -776,11 +1104,15 @@ WebCalAddEventOnStatusBill=Adicionar evento ao calendário ao alterar destado da WebCalAddEventOnStatusMember=Adicionar evento ao calendário ao alterar destado dos Membros WebCalUrlForVCalExport=um link de exportação do calendário em formato %s estará disponível na url: %s WebCalCheckWebcalSetup=a configuração do módulo Webcal pode ser incorreta +##### Invoices ##### BillsSetup=configuração do módulo Faturas BillsDate=Data das faturas BillsNumberingModule=Módulo de numeração de faturas e entregas BillsPDFModules=Modelo de documento de faturas CreditNoteSetup=configuração do módulo entregas +CreditNotePDFModules=Modelo de documento de entregas +CreditNote=Entrega +CreditNotes=Entregas ForceInvoiceDate=Forçar a data de fatura e a data de validação DisableRepeatable=Desativar as faturas Repetitivas SuggestedPaymentModesIfNotDefinedInInvoice=Formas de pagamento sugeridas para as faturas senão estão definidas explicitamente @@ -789,52 +1121,85 @@ SuggestPaymentByRIBOnAccount=Sugerenciar o pagamento por transfência em conta SuggestPaymentByChequeToAddress=Sugerenciar o pagamento por cheque a FreeLegalTextOnInvoices=Texto livre em faturas WatermarkOnDraftInvoices=Marca d'água sobre o projeto de faturas (nenhum se estiver vazio) +##### Proposals ##### PropalSetup=configuração do módulo Orçamentos CreateForm=criação formulário +NumberOfProductLines=Numero de linhas de produtos +ProposalsNumberingModules=Módulos de numeração de Orçamentos +ProposalsPDFModules=Modelos de documentos de Orçamentos ClassifiedInvoiced=Classificar faturado HideTreadedPropal=Ocultar os Orçamentos processados do listado AddShippingDateAbility=possibilidade de determinar uma data de entregas AddDeliveryAddressAbility=possibilidade de selecionar uma endereço de envio UseOptionLineIfNoQuantity=uma linha de produto/serviço que tem uma quantidade nula se considera como uma Opção +FreeLegalTextOnProposal=Texto livre em Orçamentos WatermarkOnDraftProposal=Marca d'água em projetos de propostas comerciais (nenhum se estiver vazio) +##### Orders ##### OrdersSetup=configuração do módulo pedidos +OrdersNumberingModules=Módulos de numeração dos pedidos OrdersModelModule=Modelos de documentos de pedidos HideTreadedOrders=Esconder as ordens tratados ou cancelados na lista +ValidOrderAfterPropalClosed=Confirmar o pedido depois de fechar o orçamento, permite não passar por um pedido provisório +FreeLegalTextOnOrders=Texto livre em pedidos WatermarkOnDraftOrders=Marca d'água em projetos de ordem (nenhum se estiver vazio) +##### Clicktodial ##### ClickToDialSetup=configuração do módulo Click To Dial ClickToDialUrlDesc=Url de chamada fazendo click ao ícone telefone.
a 'url completa chamada será: URL?login +##### Bookmark4u ##### Bookmark4uSetup=configuração do módulo Bookmark4u +##### Interventions ##### InterventionsSetup=configuração do módulo Intervenções FreeLegalTextOnInterventions=Texto livre em documentos de intervenção +FicheinterNumberingModules=Módulos de numeração das fichas de intervenção +TemplatePDFInterventions=Modelo de documentos das fichas de intervenção WatermarkOnDraftInterventionCards=Marca d'água em documentos de cartão de intervenção (nenhum se estiver vazio) +##### Contracts ##### ContractsSetup=Configuração do módulo Contratos ContractsNumberingModules=Contratos numeração módulos TemplatePDFContracts=Modelos de documentos Contratos FreeLegalTextOnContracts=Texto livre em contratos WatermarkOnDraftContractCards=Marca d'água em projetos de contratos (nenhum se estiver vazio) +##### Members ##### MembersSetup=configuração do módulo associações MemberMainOptions=opções principales AddSubscriptionIntoAccount=Registar honorários em conta bancaria ou Caixa do módulo bancario +AdherentLoginRequired= Gerenciar um login para cada membro AdherentMailRequired=E-Mail obrigatório para criar um membro novo MemberSendInformationByMailByDefault=Caixa de verificação para enviar o correio de confirmação a os Membros é por default "sí" +##### LDAP setup ##### LDAPSetup=Configuracón do módulo LDAP +LDAPGlobalParameters=parâmetros globais LDAPUsersSynchro=Usuário +LDAPGroupsSynchro=Grupos LDAPContactsSynchro=Contatos +LDAPMembersSynchro=Membros LDAPSynchronization=sincronização LDAP LDAPFunctionsNotAvailableOnPHP=as funções LDAP não estão disponíveis na sua PHP LDAPToDolibarr=LDAP -> Dolibarr DolibarrToLDAP=Dolibarr -> LDAP +LDAPNamingAttribute=Chave em LDAP LDAPSynchronizeUsers=sincronização dos Usuários Dolibarr com LDAP LDAPSynchronizeGroups=sincronização dos grupos de Usuários Dolibarr com LDAP LDAPSynchronizeContacts=sincronização dos contatos Dolibarr com LDAP LDAPSynchronizeMembers=sincronização dos Membros do módulo associações de Dolibarr com LDAP LDAPTypeExample=OpenLdap, Egroupware o Active Diretory +LDAPPrimaryServer=Servidor primario +LDAPSecondaryServer=Servidor secundario +LDAPServerPort=Porta do servidor LDAPServerPortExample=Porta por default : 389 +LDAPServerProtocolVersion=Versão de protocolo LDAPServerUseTLS=Usuário TLS LDAPServerUseTLSExample=a sua servidor utiliza TLS +LDAPServerDn=DN do servidor +LDAPAdminDn=DN do administrador +LDAPAdminDnExample=DN completo (ej: cn LDAPPassword=senha do administrador LDAPUserDn=DN dos Usuário +LDAPUserDnExample=DN completo (ej: ou +LDAPGroupDn=DN dos grupos +LDAPGroupDnExample=DN completo (ej: ou LDAPServerExample=endereço do servidor (ej: localhost, 192.168.0.2, ldaps://ldap.example.com/) +LDAPServerDnExample=DN completo (ej: dc LDAPPasswordExample=senha do administrador LDAPDnSynchroActive=Sincronização de Usuários e Grupos LDAPDnSynchroActiveExample=sincronização LDAP vers Dolibarr ó Dolibarr vers LDAP @@ -844,13 +1209,25 @@ LDAPDnContactActiveExample=sincronização ativada/desativada LDAPDnMemberActive=sincronização dos Membros LDAPDnMemberActiveExample=sincronização ativada/desativada LDAPContactDn=DN dos contatos Dolibarr +LDAPContactDnExample=DN completo (ej: ou +LDAPMemberDn=DN dos Membros +LDAPMemberDnExample=DN completo (ex: ou +LDAPMemberObjectClassList=Lista de objectClass LDAPMemberObjectClassListExample=Lista de ObjectClass que definem os atributos de um registo (ej: top,inetOrgPerson o top,user for active diretory) +LDAPUserObjectClassList=Lista de objectClass LDAPUserObjectClassListExample=Lista de ObjectClass que definem os atributos de um registo (ej: top,inetOrgPerson o top,user for active diretory) +LDAPGroupObjectClassList=Lista de objectClass +LDAPGroupObjectClassListExample=Lista de ObjectClass que definem os atributos de um registo (ej: top,groupOfUniqueNames) +LDAPContactObjectClassList=Lista de objectClass LDAPContactObjectClassListExample=Lista de objectClass que definem os atributos de um registo (ej: top,inetOrgPerson o top,user for active diretory) +LDAPMemberTypeDn=DN dos tipos de Membros +LDAPMemberTypeDnExample=DN complet (ej: ou LDAPTestConnect=Teste a login LDAP LDAPTestSynchroContact=Teste a sincronização de contatos LDAPTestSynchroUser=Teste a sincronização de Usuário -LDAPTestSearch=Teste uma pesquisa LDAP +LDAPTestSynchroGroup=Teste a sincronização de grupos +LDAPTestSynchroMember=Teste a sincronização de Membros +LDAPTestSearch= Teste uma pesquisa LDAP LDAPSynchroOK=Prueba de sincronização realizada corretamente LDAPSynchroKO=Prueba de sincronização errada LDAPSynchroKOMayBePermissions=Error da prueba de sincronização. verifique que a login à servidor sea correta e que permite as atualizaciones LDAP @@ -859,31 +1236,62 @@ LDAPTCPConnectKO=Fallo de login TCP à servidor LDAP (Servidor LDAPBindOK=Ligue / authentificate ao servidor LDAP sucesso (Server =% s, Port =% s, Admin =% s, Password =% s) LDAPBindKO=Fallo de login/autentificação à servidor LDAP (Servidor LDAPUnbindSuccessfull=Desconecte sucesso +LDAPUnbindFailed=Saida falhada LDAPConnectToDNSuccessfull=login a DN (%s) realizada LDAPConnectToDNFailed=Connexión a DN (%s) falhada +LDAPSetupForVersion3=Servidor LDAP configurado em Versão 3 +LDAPSetupForVersion2=Servidor LDAP configurado em Versão 2 LDAPDolibarrMapping=Mapping Dolibarr +LDAPLdapMapping=Mapping LDAP +LDAPFieldLoginUnix=Login (unix) +LDAPFieldLoginExample=Exemplo : uid +LDAPFilterConnection=Filtro de pesquisa +LDAPFilterConnectionExample=Exemplo : &(objectClass +LDAPFieldLoginSamba=Login (samba, activedirectory) LDAPFieldLoginSambaExample=Exemplo : samaccountname +LDAPFieldFullname=Nome completo +LDAPFieldFullnameExample=Exemplo : cn LDAPFieldPassword=senha LDAPFieldPasswordNotCrypted=senha não encriptada LDAPFieldPasswordCrypted=senha encriptada +LDAPFieldPasswordExample=Exemplo : userPassword +LDAPFieldCommonName=Nome comun +LDAPFieldCommonNameExample=Exemplo : cn +LDAPFieldName=Nome +LDAPFieldNameExample=Exemplo : sn +LDAPFieldFirstName=Nome LDAPFieldFirstNameExample=Exemplo : givenname +LDAPFieldMail=E-Mail +LDAPFieldMailExample=Exemplo : mail LDAPFieldPhone=telefone Trabalho LDAPFieldPhoneExample=Exemplo : telephonenumber LDAPFieldHomePhone=telefone personal LDAPFieldHomePhoneExample=Exemplo : homephone LDAPFieldMobile=telefone móvil LDAPFieldMobileExample=Exemplo : mobile +LDAPFieldFax=Fax LDAPFieldFaxExample=Exemplo : facsimiletelephonenumber LDAPFieldAddress=endereço LDAPFieldAddressExample=Exemplo : street LDAPFieldZip=Código Postal LDAPFieldZipExample=Exemplo : postalcode LDAPFieldTown=Município +LDAPFieldTownExample=Exemplo : l +LDAPFieldCountry=País +LDAPFieldCountryExample=Exemplo : c +LDAPFieldDescription=Descrição LDAPFieldDescriptionExample=Exemplo : description -LDAPFieldGroupMembersExample=Exemplo: uniqueMember +LDAPFieldGroupMembers= Os membros do grupo +LDAPFieldGroupMembersExample= Exemplo: uniqueMember LDAPFieldBirthdate=data de nascimento +LDAPFieldBirthdateExample=Exemplo : +LDAPFieldCompany=Empresa +LDAPFieldCompanyExample=Exemplo : o +LDAPFieldSid=SID LDAPFieldSidExample=Exemplo : objectsid LDAPFieldEndLastSubscription=data finalização como membro +LDAPFieldTitle=Posto/Função +LDAPFieldTitleExample=Exemplo: título LDAPParametersAreStillHardCoded=Parâmetros LDAP ainda são codificados (na classe de contato) LDAPSetupNotComplete=configuração LDAP incompleta (a completar em Outras pestanhas) LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador o senha não indicados. os acessos LDAP serão anônimos e em só leitura. @@ -892,6 +1300,7 @@ LDAPDescUsers=Esta página permite definir o Nome dos atributos da árvore LDAP LDAPDescGroups=Esta página permite definir o Nome dos atributos da árvore LDAP para cada informação dos grupos Usuários Dolibarr. LDAPDescMembers=Esta página permite definir o Nome dos atributos da árvore LDAP para cada informação dos Membros do módulo associações Dolibarr. LDAPDescValues=os valores de Exemplos se adaptan a OpenLDAP com os schemas carregados: core.schema, cosine.schema, inetorgperson.schema). sim voçê utiliza os a valores sugeridos e OpenLDAP, modifique a sua arquivo de configuração LDAP slapd.conf para tener todos estos schemas ativos. +ForANonAnonymousAccess=Para um acesso autentificado PerfDolibarr=Relatório de configuração Desempenho / otimização YouMayFindPerfAdviceHere=Você vai encontrar nesta página algumas verificações ou conselhos relacionados com o desempenho. NotInstalled=Não instalado, por que o seu servidor não está mais lento por isso. @@ -909,6 +1318,8 @@ FilesOfTypeNotCompressed=Arquivos do tipo não são compactados pelo servidor HT CacheByServer=Cache por servidor CacheByClient=Cache pelo navegador CompressionOfResources=A compressão das respostas HTTP +TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível +##### Products ##### ProductSetup=configuração do módulo produtos ServiceSetup=Configuração do módulo Serviços ProductServiceSetup=Configuração de Produtos e Serviços módulos @@ -922,54 +1333,95 @@ UseSearchToSelectProduct=Use um formulário de pesquisa para escolher um produto UseEcoTaxeAbility=Asumir ecotaxa (DEEE) SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por default para os produtos SetDefaultBarcodeTypeThirdParties=Tipo de código de barras utilizado por default para os Fornecedores -ProductCodeChecker=Módulo para geração de código do produto e verificação (produto ou serviço) -ProductOtherConf=A configuração do produto / serviço +ProductCodeChecker= Módulo para geração de código do produto e verificação (produto ou serviço) +ProductOtherConf= A configuração do produto / serviço +##### Syslog ##### +SyslogSetup=configuração do módulo Syslog SyslogOutput=Saída do log +SyslogSyslog=Syslog +SyslogFacility=Facilidade SyslogLevel=Nível SyslogSimpleFile=Arquivo SyslogFilename=Nome e Rota do Arquivo YouCanUseDOL_DATA_ROOT=pode utilizar DOL_DATA_ROOT/dolibarr.log para um log na pasta 'documentos' de Dolibarr. ErrorUnknownSyslogConstant=a constante %s não é uma constante syslog conhecida OnlyWindowsLOG_USER=Somente para Windows suporta LOG_USER +##### Donations ##### DonationsSetup=configuração do módulo Bolsas +DonationsReceiptModel=Modelo de recibo de doação +##### Barcode ##### BarcodeSetup=configuração dos códigos de barra +PaperFormatModule=Módulos de formatos de impressão BarcodeEncodeModule=Módulos de codificação dos códigos de barra +UseBarcodeInProductModule=Utilizar os códigos de barra nos produtos CodeBarGenerator=gerador do código ChooseABarCode=nenhum gerador selecionado +FormatNotSupportedByGenerator=Formato não gerado por este gerador BarcodeDescEAN8=Códigos de barra tipo EAN8 BarcodeDescEAN13=Códigos de barra tipo EAN13 BarcodeDescUPC=Códigos de barra tipo UPC BarcodeDescISBN=Códigos de barra tipo ISBN BarcodeDescC39=Códigos de barra tipo C39 BarcodeDescC128=Códigos de barra tipo C128 +GenbarcodeLocation=Ferramenta de geração de código de barras em linha de pedido (utilizado por o motor phpbar para determinados tipos de códigos barra) +BarcodeInternalEngine=Motor interno BarCodeNumberManager=Gerente de auto definir números de código de barras +##### Prelevements ##### WithdrawalsSetup=configuração do módulo Débitos Diretos +##### ExternalRSS ##### ExternalRSSSetup=configuração das importações do fluxos RSS NewRSS=Sindicação de um Novo fluxos RSS RSSUrl=RSS URL +RSSUrlExample=Um feed RSS interessante +##### Mailing ##### +MailingSetup=configuração do módulo E-Mailing +MailingEMailFrom=E-Mail emissor (From) dos correios enviados por E-Mailing MailingEMailError=Voltar E-mail (Erros-to) para e-mails com erros +##### Notification ##### NotificationSetup=configuração do módulo Notificações +NotificationEMailFrom=E-Mail emissor (From) dos correios enviados a traves de Notificações +ListOfAvailableNotifications=Lista de notificações disponíveis (Esta lista depende módulos ativados) +##### Sendings ##### SendingsSetup=configuração do módulos envios +SendingsReceiptModel=Modelo da ficha de expedição SendingsNumberingModules=Expedição de numeração de módulos SendingsAbility=Fretes pagos pelo cliente NoNeedForDeliveryReceipts=na maioria dos casos, as entregas utilizam como nota de entregas ao cliente (lista de produtos a enviar), se recebem e assinam por o cliente. Por o tanto, a hoja de entregas de produtos é uma característica duplicada e rara vez é ativada. +FreeLegalTextOnShippings=Texto livre em embarques +##### Deliveries ##### +DeliveryOrderNumberingModules=Módulo de numeração dos envios a clientes DeliveryOrderModel=Modelo de ordem de envio DeliveriesOrderAbility=Fretes pagos por o cliente +FreeLegalTextOnDeliveryReceipts=Texto livre em notas de entregas. +##### FCKeditor ##### AdvancedEditor=Formatação avançada ActivateFCKeditor=Ativar FCKeditor para : FCKeditorForCompany=Criação/Edição WYSIWIG da descrição e notas dos Fornecedores +FCKeditorForProduct=Criação/Edição WYSIWIG da descrição e notas dos produtos/serviços FCKeditorForProductDetails=Criação/Edição WYSIWIG das linhas de detalhe dos produtos (em pedidos, Orçamentos, faturas, etc.) +FCKeditorForMailing= Criação/Edição WYSIWIG dos E-Mails FCKeditorForUserSignature=WYSIWIG criação / edição da assinatura do usuário FCKeditorForMail=Criação WYSIWIG / edição para todos os emails (exceto Outils-> e-mail) +##### OSCommerce 1 ##### OSCommerceErrorConnectOkButWrongDatabase=a login se ha estabelecido, mas a base de dados não parece de OSCommerce. OSCommerceTestOk=a login à servidor '%s' sobre a base '%s' por o Usuário '%s' é correta. OSCommerceTestKo1=a login à servidor '%s' sobre a base '%s' por o Usuário '%s' não se pode efetuar. OSCommerceTestKo2=a login à servidor '%s' por o Usuário '%s' ha falhado. +##### Stock ##### StockSetup=configuração do módulo Estoque UserWarehouse=Utilizar os estoques personais de Usuário +##### Menu ##### +MenuDeleted=Menu Eliminado +TreeMenu=Estructura dos menus +Menus=Menus +TreeMenuPersonalized=Menus personalizados +NewMenu=Novo Menu +MenuConf=Configuração dos menus Menu=Seleção dos menus MenuHandler=Gerente de menus -HideUnauthorizedMenu=Esconder menus não autorizadas (cinza) +MenuModule=Módulo origem +HideUnauthorizedMenu= Esconder menus não autorizadas (cinza) +DetailId=Identificador do menu DetailMenuHandler=Nome do gerente de menus DetailMenuModule=Nome do módulo sim a entrada do menu é resultante de um módulo DetailType=Tipo de menu (superior o izquierdp) @@ -980,23 +1432,36 @@ DetailLeftmenu=Condição de visualização o não (obsoleto) DetailEnabled=Condição para mostrar ou não entrada DetailRight=Condição de visualização completa o cristálida DetailLangs=Arquivo langs para a tradução do título +DetailUser=Interno / Externo / Todos +Target=Alvo DetailTarget=Objetivo DetailLevel=Nível (-1:menu superior, 0:principal, >0 menu e submenú) +ModifMenu=Modificação do menu +DeleteMenu=Eliminar entrada de menu ConfirmDeleteMenu=Tem certeza que quer eliminar a entrada de menu %s ? DeleteLine=Apagar a Linha ConfirmDeleteLine=Tem certeza que quer eliminar esta linha? +##### Tax ##### +TaxSetup=Configuração do Módulo Impostos, Cargas Sociais e Dividendos OptionVatMode=Opção de carga de ICMS +OptionVATDefault=Cash basis +OptionVATDebitOption=Accrual basis OptionVatDefaultDesc=a carga do ICMS é:
-ao envio dos bens
-sobre o pagamento por os serviços OptionVatDebitOptionDesc=a carga do ICMS é:
-ao envio dos bens
-sobre o faturamento dos serviços SummaryOfVatExigibilityUsedByDefault=Hora do VTA exigibilidade por padrão de acordo com a opção escolhida: +OnDelivery=Na entrega OnPayment=Mediante o pagamento OnInvoice=Na fatura SupposedToBePaymentDate=Data de pagamento usado SupposedToBeInvoiceDate=Data da fatura usado +Buy=Comprar +Sell=Vender InvoiceDateUsed=Data da fatura usado YourCompanyDoesNotUseVAT=Sua empresa foi definido para não usar de IVA (Home - Configuração - Empresa / Fundação), então não há nenhuma opção de VAT a configuração. +AccountancyCode=Código de Contabilidade AccountancyCodeSell=Conta Venda. código AccountancyCodeBuy=Compre conta. código +##### Agenda ##### AgendaSetup=Módulo configuração de ações e agenda PasswordTogetVCalExport=Chave de autorização vcal export link PastDelayVCalExport=Não exportar evento mais antigo que @@ -1004,44 +1469,57 @@ AGENDA_USE_EVENT_TYPE=Use eventos tipos (geridos em Setup Menu -> Dicionário -> AGENDA_DEFAULT_FILTER_TYPE=Use automaticamente este tipo de evento no filtro de busca da agenda AGENDA_DEFAULT_FILTER_STATUS=Use automaticamente este estado no filtro das buscas da agenda AGENDA_DEFAULT_VIEW=Qual aba voçê quer abrir por padrão quando o menu Agenda e selecionado +##### ClickToDial ##### ClickToDialDesc=Este módulo permite agregar um ícone depois do número de telefone de contatos Dolibarr. um clic neste ícone, Chama a um servidor com uma URL que se indica a continuação. Esto pode ser usado para Chamar à sistema call center de Dolibarr que pode Chamar à número de telefone em um sistema SIP, por Exemplo. +##### Point Of Sales (CashDesk) ##### +CashDesk=Caixa CashDeskSetup=configuração do módulo de Caixa registradora CashDeskThirdPartyForSell=Fornecedor genérico a usar para a venda CashDeskBankAccountForSell=conta de efetivo que se utilizará para as vendas -CashDeskBankAccountForCheque=Padrão conta para usar a receber pagamentos por cheque -CashDeskBankAccountForCB=Padrão conta para usar a receber pagamentos por cartões de crédito +CashDeskBankAccountForCheque= Padrão conta para usar a receber pagamentos por cheque +CashDeskBankAccountForCB= Padrão conta para usar a receber pagamentos por cartões de crédito CashDeskIdWareHouse=Almoxarifado que se utiliza para as vendas +##### Bookmark ##### BookmarkSetup=Configuração do Módulo de Favoritos BookmarkDesc=Este módulo lhe permite Gerenciar os links e acessos diretos. também permite Adicionar qualquer página de Dolibarr o link web ao menu de acesso rápido da esquerda. NbOfBoomarkToShow=Número máximo de marcadores que se mostrará ao menu +##### WebServices ##### WebServicesSetup=Configuração do módulo Webservices WebServicesDesc=Ao habilitar este módulo, Dolibarr se tornar um servidor web service para fornecer serviços web diversos. WSDLCanBeDownloadedHere=Arquivos descritores WSDL dos serviços prestados pode ser baixado aqui EndPointIs=Clientes SOAP devem enviar seus pedidos para o terminal Dolibarr Disponível em URL +##### Bank ##### BankSetupModule=Configuração do módulo Banco FreeLegalTextOnChequeReceipts=Texto livre em recibos de verificação BankOrderShow=Ordem de apresentação das contas bancárias para os países usando o "número do banco detalhada" BankOrderGlobal=General +BankOrderGlobalDesc=Ordem de exibição Geral BankOrderES=Espanhol BankOrderESDesc=Ordem de exibição Espanhol +##### Multicompany ##### MultiCompanySetup=Configuração do módulo Multi-empresa +##### Suppliers ##### SuppliersSetup=Configuração Módulo Fornecedor SuppliersCommandModel=Modelo completo de ordem fornecedor (logo. ..) SuppliersInvoiceModel=Modelo completo da fatura do fornecedor (logo. ..) SuppliersInvoiceNumberingModel=Faturas de fornecedores de numeração modelos +##### GeoIPMaxmind ##### GeoIPMaxmindSetup=Configuração do módulo GeoIP Maxmind PathToGeoIPMaxmindCountryDataFile=Caminho para o arquivo que contém a tradução Maxmind ip país. Exemplos: / Usr / local / share / GeoIP / GeoIP.dat / Usr / share / GeoIP / GeoIP.dat NoteOnPathLocation=Note-se que o seu ip para o arquivo de dados do país devem estar dentro de um diretório do seu PHP pode ler (Verifique se o seu PHP open_basedir configuração e as permissões do sistema de arquivos). YouCanDownloadFreeDatFileTo=Você pode baixar uma versão demo gratuita do arquivo país Maxmind GeoIP em. YouCanDownloadAdvancedDatFileTo=Você também pode baixar uma versão,mais completa, com atualizações, do arquivo país em Maxmind GeoIP. TestGeoIPResult=Teste de um IP de conversão -> país +##### Projects ##### ProjectsNumberingModules=Projetos de numeração módulo ProjectsSetup=Configuração do módulo de Projetos ProjectsModelModule=Os relatórios do projeto modelo de documento TasksNumberingModules=Módulo de numeração de Tarefas TaskModelModule=Relatórios Tarefas modelo de documento -ECMSetup =Instalar GED -ECMAutoTree =Pasta árvore automática e documento +##### ECM (GED) ##### +ECMSetup = Instalar GED +ECMAutoTree = Pasta árvore automática e documento +##### Fiscal Year ##### FiscalYears=Anos fiscais FiscalYear=Ano fiscal FiscalYearCard=Ficha ano fiscal @@ -1053,4 +1531,5 @@ DeleteFiscalYear=Remover ano fiscal ConfirmDeleteFiscalYear=Voçê tem certeza que quer deleitar este ano fical ? Opened=Aberto Closed=Fechado + Format=Formato diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang index b1f1c1d8107..360b037d5e2 100644 --- a/htdocs/langs/pt_BR/agenda.lang +++ b/htdocs/langs/pt_BR/agenda.lang @@ -2,55 +2,70 @@ IdAgenda=ID evento Actions=Eventos ActionsArea=Área de eventos (Atividades e Tarefas) -DoneBy=Concluído por +Agenda= Agenda +Agendas= Agendas +Calendar= Calendário +Calendars= Calendários +LocalAgenda=Calendário local +AffectedTo= Atribuído à +DoneBy= Concluído por +Events= Eventos EventsNb=Numero de eventos +MyEvents=Meus eventos +OtherEvents=Outros eventos +ListOfActions=Lista de Eventos +Location=Localização EventOnFullDay=Evento durante todo o dia (s) -SearchAnAction=Procurar um evento/tarefa -MenuToDoActions=Todos os eventos incompletos -MenuDoneActions=Todas os eventos completos -MenuToDoMyActions=Os meus eventos incompletas -MenuDoneMyActions=Os meus eventos completos -ListOfEvents=Lista de eventos Dolibarr +SearchAnAction= Procurar um evento/tarefa +MenuToDoActions= Todos os eventos incompletos +MenuDoneActions= Todas os eventos completos +MenuToDoMyActions= Os meus eventos incompletas +MenuDoneMyActions= Os meus eventos completos +ListOfEvents= Lista de eventos Dolibarr ActionsAskedBy=Eventos registrados por ActionsToDoBy=Eventos atribuídos à ActionsDoneBy=Eventos concluído por ActionsForUser=Eventos para o usuário ActionsForUsersGroup=Eventos para todos os usuários do grupo -AllMyActions=Todos meus eventos/tarefas -AllActions=Todas os eventos/tarefas +AllMyActions= Todos meus eventos/tarefas +AllActions= Todas os eventos/tarefas ViewList=Exibir lista ViewCal=Exibir Calendário ViewDay=Exibir dia ViewWeek=Exibir semana ViewPerUser=Por usuario -ViewWithPredefinedFilters=Exibir com filtros predefinidos -AgendaAutoActionDesc=Defina aqui quais os eventos que deseja que o Dolibarr adicione automaticamente na sua agenda. Se nada estiver marcado (por padrão), sera incluído só eventos manualmente na agenda. -AgendaSetupOtherDesc=Esta página fornece opções para permitir a exportação de seus eventos do Dolibarr para um calendário externo (thunderbird, google agenda, ...) +ViewWithPredefinedFilters= Exibir com filtros predefinidos +AutoActions= Preenchimento automático +AgendaAutoActionDesc= Defina aqui quais os eventos que deseja que o Dolibarr adicione automaticamente na sua agenda. Se nada estiver marcado (por padrão), sera incluído só eventos manualmente na agenda. +AgendaSetupOtherDesc= Esta página fornece opções para permitir a exportação de seus eventos do Dolibarr para um calendário externo (thunderbird, google agenda, ...) AgendaExtSitesDesc=Esta página permite importar calendários de fontes externas para sua agenda de eventos no Dolibarr. -ActionsEvents=Para qual eventos o Dolibarr irá criar uma atividade na agenda automaticamente -PropalValidatedInDolibarr=Proposta %s validada -InvoiceValidatedInDolibarr=Fatura %s validada +ActionsEvents= Para qual eventos o Dolibarr irá criar uma atividade na agenda automaticamente +PropalValidatedInDolibarr= Proposta %s validada +InvoiceValidatedInDolibarr= Fatura %s validada InvoiceBackToDraftInDolibarr=Fatura %s volta ao estado de rascunho -OrderValidatedInDolibarr=Pedido %s validado +InvoiceDeleteDolibarr=Fatura %s apagada +OrderValidatedInDolibarr= Pedido %s validado OrderApprovedInDolibarr=Pedido %s aprovado OrderRefusedInDolibarr=Pedido %s recusado OrderBackToDraftInDolibarr=Pedido %s volta ao estado de rascunho OrderCanceledInDolibarr=Pedido %s cancelado +InterventionValidatedInDolibarr=Intervenção %s validada ProposalSentByEMail=Proposta comercial %s enviada por e-mail OrderSentByEMail=Pedido do cliente %s enviado por e-mail InvoiceSentByEMail=Fatura do cliente %s enviada por e-mail SupplierOrderSentByEMail=Pedido do fornecedor %s enviado por e-mail SupplierInvoiceSentByEMail=Fatura do fornecedor %s enviada por e-mail ShippingSentByEMail=Entrega %s enviado por e-mail -ShippingValidated=Envio %s validado +ShippingValidated= Envio %s validado InterventionSentByEMail=Intervenção %s enviada por e-mail InterventionClassifiedBilled=Intervenção %s classificada como Faturada -NewCompanyToDolibarr=Fornecedor criado -DateActionPlannedStart=Data de início do planejamento -DateActionPlannedEnd=Data final do planejamento -DateActionDoneStart=Data real de início -DateActionDoneEnd=Data real de fim -DateActionEnd=Data de término +NewCompanyToDolibarr= Fornecedor criado +DateActionPlannedStart= Data de início do planejamento +DateActionPlannedEnd= Data final do planejamento +DateActionDoneStart= Data real de início +DateActionDoneEnd= Data real de fim +DateActionStart= Data de Início +DateActionEnd= Data de término AgendaUrlOptions1=Você também pode adicionar os seguintes parâmetros para filtrar o resultado: AgendaUrlOptions2=Usuário=%s permitir apenas resultados para atividades atribuídas, criadas ou concluídas pelo usuário %s. AgendaUrlOptions3=Usuário=%s permitir resultados apenas para atividades criadas pelo usuário %s @@ -58,8 +73,14 @@ AgendaUrlOptions4=Usuário=%s permitir apenas resultados para atividades AgendaUrlOptions5=Usuário=%s não permitir resultados para atividades concluídas pelo usuário %s. AgendaShowBirthdayEvents=Visualizar aniversários dos contatos AgendaHideBirthdayEvents=Esconder aniversários dos contatos +Busy=Ocupado ExportDataset_event1=Lista de eventos na agenda + +# External Sites ical +ExportCal=Exportar calendário +ExtSites=Importar calendários externos ExtSitesEnableThisTool=Visualizar calendários externos na agenda +ExtSitesNbOfAgenda=Número de calendários AgendaExtNb=Calendário nr. %s ExtSiteUrlAgenda=URL para acessar arquivos .ical ExtSiteNoLabel=Sem descrição diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang index f667a2813df..f66ea39964d 100644 --- a/htdocs/langs/pt_BR/banks.lang +++ b/htdocs/langs/pt_BR/banks.lang @@ -1,7 +1,11 @@ # Dolibarr language file - Source file is en_US - banks +Bank=Banco +Banks=Bancos MenuBankCash=Banco/Caixa MenuSetupBank=Configuração Banco/Caixa BankName=Nome do Banco +FinancialAccount=Conta +FinancialAccounts=Contas BankAccount=Conta Bancaria BankAccounts=Contas Bancarias AccountRef=Ref. Conta Financeira @@ -14,36 +18,59 @@ CurrentAccounts=Contas Correntes SavingAccount=Conta a Prazo SavingAccounts=Contas a Prazo ErrorBankLabelAlreadyExists=Etiqueta de Conta Financeira já existente +BankBalance=Saldo BankBalanceBefore=Sldo anterior BankBalanceAfter=Saldo depois +BalanceMinimalAllowed=Saldo Máximo Autorizado +BalanceMinimalDesired=Saldo Mínimo Desejado +InitialBankBalance=Saldo Inicial +EndBankBalance=Saldo Final CurrentBalance=Saldo atual +FutureBalance=Saldo Previsto ShowAllTimeBalance=Mostrar Balanço Desde do Inicio AllTime=Do inicio +Reconciliation=Conciliação RIB=Conta Bancaria +IBAN=Identificador IBAN +BIC=Identificador BIC/SWIFT +StandingOrders=Débitos Diretos +StandingOrder=Domicilio +Withdrawals=Reembolsos +Withdrawal=Reembolso AccountStatement=Extrato da Conta AccountStatementShort=Extrato AccountStatements=Extratos das Contas LastAccountStatements=�ltimos Extratos Bancários +Rapprochement=Conciliação IOMonthlyReporting=Relatório Mensal E/S BankAccountDomiciliation=Domicilio de Conta BankAccountCountry=Conta do pais BankAccountOwner=Nome do Proprietário da Conta BankAccountOwnerAddress=Endereço do Proprietário da Conta RIBControlError=Se a integridade das verificações de valores falhar. Isto significa que informações para este número de conta não estão completos ou errados (verifique País, números e IBAN). +CreateAccount=Criar Conta +NewAccount=Nova Conta NewBankAccount=Nova Conta Bancaria NewFinancialAccount=Nova Conta Financeira MenuNewFinancialAccount=Nova Conta Financeira NewCurrentAccount=Nova Conta Corrente NewSavingAccount=Nova Conta de a Prazo +NewCashAccount=Nova Conta de Caixa +EditFinancialAccount=Edição Conta +AccountSetup=Configuração das Contas financeiras SearchBankMovement=Procurar Registo Bancario +Debts=Dívidas LabelBankCashAccount=Etiqueta da Conta ou Caixa +AccountType=Tipo de Conta BankType0=Conta Bancaria a Prazo BankType1=Conta Bancaria Corrente BankType2=Conta Caixa/Efetivo IfBankAccount=Se a Conta Bancária AccountsArea=Área das Contas AccountCard=Ficha da Conta +DeleteAccount=Apagar Conta ConfirmDeleteAccount=Tem certeza que quer eliminar esta Conta? +Account=Conta ByCategories=Por Categorias ByRubriques=Por Rúbricas BankTransactionByCategories=Registros bancários por rúbricas @@ -57,15 +84,25 @@ SearchTransaction=Procurar Registo ListTransactions=Lista Transações ListTransactionsByCategory=Lista Transações/Categoria TransactionsToConciliate=Registros a Conciliar +Conciliable=Conciliável +Conciliate=Conciliar +Conciliation=Conciliação +ConciliationForAccount=Conciliações nesta Conta IncludeClosedAccount=Incluir Contas Fechadas OnlyOpenedAccount=Somente Contas Abertas AccountToCredit=Conta de Crédito AccountToDebit=Conta de Débito DisableConciliation=Desativar a função de Conciliação para esta Conta ConciliationDisabled=Função de Conciliação Desativada +StatusAccountOpened=Aberta +StatusAccountClosed=Fechada +AccountIdShort=Número EditBankRecord=Editar Registo +LineRecord=Registo AddBankRecord=Adicionar Registo AddBankRecordLong=Realizar um registo manual fora de uma fatura +ConciliatedBy=Conciliado por +DateConciliating=Data Conciliação BankLineConciliated=Registo Conciliado CustomerInvoicePayment=Pagamento de Cliente CustomerInvoicePaymentBack=Pagamento do cliente de volta @@ -76,17 +113,22 @@ FinancialAccountJournal=Diário de Tesouraria da Conta BankTransfer=Transferencia Bancaria BankTransfers=Transferências Bancarias TransferDesc=Ao criar uma transferencia de uma das suas contas bancarias fazia outra, Dolibarr cria os registros contabeis (um de débito em uma Conta e outro de crédito, do mesmo valor, na outra Conta. Se utiliza para os dois registros a mesma etiqueta de transferencia e a mesma data) +TransferFrom=De +TransferTo=Para TransferFromToDone=A transferencia de %s fazia %s de %s %s foi criado. +CheckTransmitter=Emissor ValidateCheckReceipt=Validar esta ficha de entregas? ConfirmValidateCheckReceipt=Tem certeza que quer Confirmar esta ficha (Nenhuma modificação será possível uma vez a ficha este validada)? DeleteCheckReceipt=Eliminar esta ficha de entregas? ConfirmDeleteCheckReceipt=Tem certeza que quer eliminar esta ficha? +BankChecks=Cheques BankChecksToReceipt=Cheques a Depositar ShowCheckReceipt=Mostra recibos do deposito com cheque. NumberOfCheques=N� de Cheques DeleteTransaction=Eliminar a Transação ConfirmDeleteTransaction=Tem certeza que quer eliminar esta transação? ThisWillAlsoDeleteBankRecord=Esto eliminará também os registros bancários gerados +BankMovements=Movimentos CashBudget=Orçamento de Tesouraria PlannedTransactions=Transações Previstas Graph=Graficos @@ -96,11 +138,13 @@ TransactionOnTheOtherAccount=Transação Sobre Outra Conta TransactionWithOtherAccount=Transferencia de Conta PaymentNumberUpdateSucceeded=Numero de pagamento modificado PaymentNumberUpdateFailed=Numero de pagamento não foi possível modificar +PaymentDateUpdateSucceeded=Data de pagamento modificada PaymentDateUpdateFailed=Data de pagamento não pode ser modificada Transactions=Transações BankTransactionLine=Transação Bancária AllAccounts=Todas as Contas bancarias/de Caixa BackToAccount=Voltar e a Conta +ShowAllAccounts=Mostrar para todas as Contas FutureTransaction=Transação futura. Impossivel conciliar. SelectChequeTransactionAndGenerate=Selecionar/filtrar cheques a se incluir no recibo de deposito e clickar no "Criar" InputReceiptNumber=Escolha o relatorio bancario relativo a conciliação. Use um valor numerico (como AAAAMM) diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang index 94e728aede4..76381b66dfa 100644 --- a/htdocs/langs/pt_BR/bills.lang +++ b/htdocs/langs/pt_BR/bills.lang @@ -24,11 +24,12 @@ InvoiceProFormaDesc=Fatura Pro-Forma é uma verdadeira imagem de uma fatu InvoiceReplacement=Substituição da Fatura InvoiceReplacementAsk=Substituição da Fatura para Fatura InvoiceReplacementDesc=A fatura retificada serve para cancelar e para substituir uma fatura existente em que ainda não existe pagamentos.

Nota: só uma fatura sem nenhum pagamento pode retificar se. Sim esta última não está fechada, passará automaticamente ao estado 'abandonada'. +InvoiceAvoir=Nota de Crédito InvoiceAvoirAsk=Nota de Crédito para Corrigir a Fatura InvoiceAvoirDesc=A Nota de Crédito é uma fatura negativa destinada a compensar um valor de uma fatura que difere do valor realmente pago (por ter pago a mais ou por devolução de produtos, por Exemplo).

Nota: Tenha em conta que a fatura original a corrigir deve ter sido fechada (' paga' ou ' paga parcialmente ') para poder realizar uma nota de crédito. invoiceAvoirWithLines=Criar Nota de Crédito conforme a fatura original invoiceAvoirWithPaymentRestAmount=Criar Nota de Crédito com o montante dos pagamentos da fatura de origem -invoiceAvoirLineWithPaymentRestAmount=Nota de Crédito de pagamentos fatura +invoiceAvoirLineWithPaymentRestAmount= Nota de Crédito de pagamentos fatura ReplaceInvoice=Retificar a Fatura %s ReplacementInvoice=Substituição da Fatura ReplacedByInvoice=Substituído por Fatura %s @@ -36,9 +37,11 @@ ReplacementByInvoice=Substituído por Fatura CorrectInvoice=Correção de Fatura %s CorrectionInvoice=Correção de Fatura UsedByInvoice=Aplicar sobre a fatura %s +ConsumedBy=Consumida por NotConsumed=Sem Consumo NoReplacableInvoice=Sem Faturas Retificáveis NoInvoiceToCorrect=Sem Faturas a Corrigir +InvoiceHasAvoir=Corrigida por um ou mais recibos CardBill=Ficha Fatura PredefinedInvoices=Fatura Predefinida Invoice=Fatura @@ -52,12 +55,15 @@ SuppliersInvoices=Faturas de Fornecedores SupplierBill=Fatura de Fornecedor SupplierBills=Faturas de Fornecedores Payment=Pagamento +PaymentBack=Reembolso Payments=Pagamentos +PaymentsBack=Reembolsos PaidBack=Reembolso DatePayment=Data de Pagamento DeletePayment=Eliminar o Pagamento ConfirmDeletePayment=Tem certeza que quer eliminar este pagamento? ConfirmConvertToReduc=Quer converter este deposito numa redução futura?
O valor deste deposito ficará guardado para este cliente. Poderá utiliza-lo para reduzir o valor de uma próxima fatura do cliente. +SupplierPayments=Pagamentos a Fornecedores ReceivedPayments=Pagamentos Recebidos ReceivedCustomersPayments=Pagamentos Recebidos de Cliente PayedSuppliersPayments=Pagamentos pago ao fornecedores @@ -67,8 +73,12 @@ PaymentsReports=Relatórios de Pagamentos PaymentsAlreadyDone=Pagamentos Efetuados PaymentsBackAlreadyDone=Reembolsos já efetuados PaymentRule=Regra de pagamento +PaymentMode=Forma de Pagamento +PaymentConditions=Tipo de Pagamento +PaymentConditionsShort=Tipo de Pagamento PaymentAmount=Valor a Pagar ValidatePayment=Validar Pagamento +PaymentHigherThanReminderToPay=Pagamento superior ao resto a pagar HelpPaymentHigherThanReminderToPay=Atenção, o valor de uma fatura ou mais faturas e maior do que o que resta a pagar.
Editar a sua entrada ou confirme e pense em criar uma nota de credito para o excesso recebido por cada fatura paga alem do valor da mesma. HelpPaymentHigherThanReminderToPaySupplier=Atenção, o valor do pagamento de uma ou mais contas é maior do que o resto a pagar.
Edite sua entrada, caso contrário, confirmar. ClassifyPaid=Clasificar 'pago' @@ -86,6 +96,7 @@ SendRemindByMail=Enviar Lembrete DoPayment=Emitir Pagamento DoPaymentBack=Emitir Reembolso ConvertToReduc=Converter em Redução Futura +EnterPaymentReceivedFromCustomer=Adicionar pagamento recebido de cliente EnterPaymentDueToCustomer=Realizar pagamento de recibos ao cliente DisabledBecauseRemainderToPayIsZero=Desativar já que o resto a pagar é 0 Amount=Valor @@ -95,14 +106,19 @@ BillStatusDraft=Rascunho (A Confirmar) BillStatusPaid=Pago BillStatusPaidBackOrConverted=Pago ou convertido para o desconto BillStatusConverted=Pago (pronto para fatura final) +BillStatusCanceled=Abandonada BillStatusValidated=Validada (A Pagar) BillStatusStarted=Paga Parcialmente BillStatusNotPaid=Não paga BillStatusClosedUnpaid=Fechado (não pago) BillStatusClosedPaidPartially=Pago (parcialmente) +BillShortStatusDraft=Rascunho BillShortStatusPaid=Pago BillShortStatusPaidBackOrConverted=Processado BillShortStatusConverted=Tratada +BillShortStatusCanceled=Abandonada +BillShortStatusValidated=Validada +BillShortStatusStarted=Iniciada BillShortStatusNotPaid=Nao pago BillShortStatusClosedUnpaid=Fechado BillShortStatusClosedPaidPartially=Pago (parcialmente) @@ -116,9 +132,12 @@ ErrorDiscountAlreadyUsed=Erro, desconto já utilizado ErrorInvoiceAvoirMustBeNegative=Erro, uma fatura de tipo deposito deve ter um valor negativo ErrorInvoiceOfThisTypeMustBePositive=Erro, uma fatura deste tipo deve ter um valor positivo ErrorCantCancelIfReplacementInvoiceNotValidated=Erro, não pode cancelar uma fatura que tenha sido substituída por uma outra fatura e que está status rascunho +BillFrom=Emissor +BillTo=Enviar a ActionsOnBill=Ações Sobre a fatura NewBill=Nova Fatura Prélèvements=Débito Direto +Prélèvements=Débito Direto LastBills=As %s últimas faturas LastCustomersBills=As %s últimas faturas a clientes LastSuppliersBills=As %s últimas faturas de Fornecedores @@ -148,7 +167,9 @@ ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use esta opção se todos os outros ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Um mau cliente, é um cliente que se recusa a pagar a sua dívida. ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Esta escolha é utilizado quando o pagamento não está completo, porque alguns dos produtos foram devolvidos ConfirmClassifyPaidPartiallyReasonOtherDesc=Use esta opção se todos os outros não se adequar, por exemplo, na seguinte situação:
- pagamento não está completo porque alguns produtos foram enviados de volta
- montante reclamado muito importante porque um desconto foi esquecido
Em todos os casos, a quantidade deve ser corrigido no sistema de contabilidade, criando uma nota de crédito. +ConfirmClassifyAbandonReasonOther=Outro ConfirmClassifyAbandonReasonOtherDesc=Esta eleição será para qualquer outro caso. Por Exemplo a raíz da intenção de Criar uma fatura retificativa. +ConfirmCustomerPayment=Confirma o processo deste pagamento de %s %s ? ConfirmSupplierPayment=Confirma o processo deste pagamento de %s %s ? ConfirmValidatePayment=Tem certeza que quer Confirmar este pagamento (Nenhuma modificação é possível uma vez o pagamento este validado)? ValidateBill=Confirmar Fatura @@ -168,9 +189,11 @@ File=Arquivo AlreadyPaid=Pago AlreadyPaidBack=Pagamento voltou AlreadyPaidNoCreditNotesNoDeposits=Já pago (sem notas de crédito e depósitos) +Abandoned=Abandonada RemainderToPay=Falta a Pagar RemainderToTake=Falta Cobrar RemainderToPayBack=Restante a pagar +Rest=Pendente AmountExpected=Valor Reclamado ExcessReceived=Recebido em Excesso EscompteOffered=Desconto (Pagamento antecipado) @@ -185,14 +208,18 @@ RefBill=Ref. Fatura ToBill=A Faturar RemainderToBill=Falta Faturar SendBillByMail=Enviar a fatura por E-Mail +SendReminderBillByMail=Enviar um lembrete por E-Mail RelatedCommercialProposals=Orçamentos Associados +MenuToValid=A Confirmar DateMaxPayment=Data limite de Pagamento +DateEcheance=Data Vencimento DateInvoice=Data da fatura NoInvoice=Nenhuma Fatura ClassifyBill=Classificar a Fatura SupplierBillsToPay=Faturas de Fornecedores a Pagar CustomerBillsUnpaid=Faturas de Clientes Pendentes de Cobrança DispenseMontantLettres=Faturas preparadas por processos mecânicos estão isentas da ordem em letras +DispenseMontantLettres=Faturas preparadas por processos mecânicos estão isentas da ordem em letras NonPercuRecuperable=Sem Recuperação SetConditions=Definir Condições de Pagamento SetMode=Definir Modo de Pagamento @@ -209,20 +236,37 @@ CustomersInvoicesAndPayments=Faturas a clientes e pagamentos ExportDataset_invoice_1=Faturas a clientes e linhas de fatura ExportDataset_invoice_2=Faturas a clientes e pagamentos ProformaBill=Fatura Pro-Forma: +Reduction=Redução ReductionShort=Desc. +Reductions=Descontos ReductionsShort=Desc. +Discount=Desconto +Discounts=Descontos +AddDiscount=Adicionar Desconto +AddRelativeDiscount=Criar desconto relativo EditRelativeDiscount=Alterar Desconto Relativo AddGlobalDiscount=Adicionar Desconto Fixo EditGlobalDiscounts=Alterar Descontos Globais +AddCreditNote=Criar nota de crédito ShowDiscount=Ver o Desconto ShowReduc=Mostrar a dedução RelativeDiscount=Desconto Relativo GlobalDiscount=Desconto Fixo CreditNote=Depósito +CreditNotes=Recibos +Deposit=Depósito +Deposits=Depósitos +DiscountFromCreditNote=Desconto resultante do deposito %s DiscountFromDeposit=Pagamentos a partir de depósito na fatura %s AbsoluteDiscountUse=Este tipo de crédito não pode ser usado em um projeto antes da sua validação CreditNoteDepositUse=O projeto deve ser validado para utilizar este tipo de crédito +NewGlobalDiscount=Novo Desconto fixo NewRelativeDiscount=Novo desconto relacionado +NoteReason=Nota/Motivo +ReasonDiscount=Motivo +DiscountOfferedBy=Acordado por +DiscountStillRemaining=Descontos fixos Pendentes +DiscountAlreadyCounted=Descontos fixos já aplicados BillAddress=Endereço de Faturamento HelpEscompte=Um Desconto é um desconto acordado sobre uma fatura dada, a um cliente que realizou o seu pagamento muito antes do vencimiento. HelpAbandonBadCustomer=Este valor foi esquecido (cliente classificado como devedor) e considera-se como uma perda excepcional. @@ -236,6 +280,7 @@ InvoiceStatus=Status da Fatura InvoiceNote=Nota Fatura InvoicePaid=Fatura paga PaymentNumber=Número de Pagamento +RemoveDiscount=Eliminar Desconto WatermarkOnDraftBill=Marca de água em faturas rascunho (nada se está vazia) InvoiceNotChecked=Não há notas fiscais selecionadas CloneInvoice=Clonar Fatura @@ -250,6 +295,10 @@ TotalOfTwoDiscountMustEqualsOriginal=Total de dois novos desconto deve ser igual ConfirmRemoveDiscount=Você tem certeza que deseja remover este desconto? RelatedBill=Fatura Anexo RelatedBills=Faturas Anexos + +# PaymentConditions +PaymentConditionShortRECEP=Pronto Pagamento +PaymentConditionRECEP=Pronto Pagamento PaymentConditionShort30D=30 Dias PaymentCondition30D=Pagamento a 30 Dias PaymentConditionShort30DENDMONTH=30 Dias Fim do Mês @@ -258,24 +307,43 @@ PaymentConditionShort60D=60 Dias PaymentCondition60D=Pagamento a 60 Dias PaymentConditionShort60DENDMONTH=60 Dias Fim de Mês PaymentCondition60DENDMONTH=Pagamento a 60 Dias até ao Fim do Mês +PaymentConditionShortPT_DELIVERY=Envio +PaymentConditionPT_DELIVERY=Na entrega PaymentConditionShortPT_ORDER=Em ordem PaymentConditionPT_ORDER=Em ordem +PaymentConditionShortPT_5050=50-50 PaymentConditionPT_5050=50 por cento adiantado, 50 por cento na entrega FixAmount=Quantidade fixa VarAmount=Quantidade variável +# PaymentType PaymentTypeVIR=Transferência Bancaria +PaymentTypeShortVIR=Transferência PaymentTypePRE=Débito Direto Bancario PaymentTypeShortPRE=Débito Direto PaymentTypeLIQ=Espécie +PaymentTypeShortLIQ=Espécies +PaymentTypeCB=Cartão +PaymentTypeShortCB=Cartão +PaymentTypeCHQ=Cheque +PaymentTypeShortCHQ=Cheque PaymentTypeTIP=Em Dinheiro PaymentTypeShortTIP=Em Dinheiro +PaymentTypeVAD=Pagamento On Line +PaymentTypeShortVAD=Pagamento On Line PaymentTypeTRA=Letra +PaymentTypeShortTRA=Letra BankDetails=Dados Bancários BankCode=Código Banco DeskCode=Código Balcão BankAccountNumber=Número Conta +BankAccountNumberKey=Dígito Control Residence=Domicilio +IBANNumber=Código IBAN +IBAN=IBAN +BIC=BIC/SWIFT +BICNumber=Código BIC/SWIFT ExtraInfos=Informações Complementares +RegulatedOn=Pagar o ChequeNumber=Cheque N� ChequeOrTransferNumber=Cheque/Transferência n� ChequeMaker=Emissor do Cheque @@ -283,22 +351,31 @@ ChequeBank=Banco do Cheque NetToBePaid=Neto a Pagar PhoneNumber=Telf. FullPhoneNumber=Telefone +TeleFax=Fax PrettyLittleSentence=Aceito o pagamento mediante cheques a meu nome dos valores em divida, na qualidade de membro de uma empresa autorizada pela Administração Fiscal. IntracommunityVATNumber=Número de ICMS Intracomunitario +PaymentByChequeOrderedTo=Pagamento Mediante Cheque Nominativo a %s enviado a PaymentByChequeOrderedToShort=Pagamento Mediante Cheque Nominativo a SendTo=- A Enviar Para PaymentByTransferOnThisBankAccount=Pagamento Mediante Trasferência Sobre a Conta Bancária Seguinte VATIsNotUsedForInvoice=* ICMS não aplicável art-293B do CGI +LawApplicationPart1=Por aplicação da lei 80.335 de 12/05/80 LawApplicationPart2=As mercadoriias permanecem em propiedade de LawApplicationPart3=Vendedor até cobrança completa de LawApplicationPart4=Os Seus Preços +LimitedLiabilityCompanyCapital=SRL com capital de +UseLine=Aplicar +UseDiscount=Aplicar Desconto UseCredit=Utilizar Crédito UseCreditNoteInInvoicePayment=Reduzir o pagamento com este depósito +MenuChequeDeposits=Depósito de Cheques MenuCheques=Administração Cheques +MenuChequesReceipts=Fichas NewChequeDeposit=Novo Depósito ChequesReceipts=Ficha Emissão de Cheques ChequesArea=Área Emissão de Cheques ChequeDeposits=Depósito de Cheques +Cheques=Cheques CreditNoteConvertedIntoDiscount=Este depósito converteu-se em %s UsBillingContactAsIncoiveRecipientIfExist=Utilizar o endereço do contato de cliente de faturação da fatura em vez do endereço do Fornecedor como destinatário das faturas ShowUnpaidAll=Mostrar todas as faturas @@ -306,14 +383,17 @@ ShowUnpaidLateOnly=Mostrar apenas faturas em Atraso PaymentInvoiceRef=Pagamento Fatura %s ValidateInvoice=Validar a fatura Cash=em dinheiro +Reported=Atrasado DisabledBecausePayments=Não é possível uma vez já que existem alguns pagamentos CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento já que há pelo menos uma fatura classificada como pago ExpectedToPay=Esperando pagamento -PayedByThisPayment=Pago +PayedByThisPayment=Pago ClosePaidInvoicesAutomatically=Classifique "Paid" todas as faturas padrão ou a substituição inteiramente paga. ClosePaidCreditNotesAutomatically=Classificar "pagou" todas as notas de crédito totalmente pago de volta. AllCompletelyPayedInvoiceWillBeClosed=Todos fatura que permanecer sem pagar será automaticamente fechada ao status de "Paid". +ToMakePayment=Pagar ToMakePaymentBack=pagar tudo +ListOfYourUnpaidInvoices=Lista de faturas não pagas NoteListOfYourUnpaidInvoices=Atenção: Esta lista inclue somente faturas para terceiros para as quais voce esta conectado como vendedor. RevenueStamp=Selo da receita YouMustCreateInvoiceFromThird=Esta opção só está disponível ao criar fatura de terceiros @@ -321,6 +401,7 @@ PDFCrabeDescription=Modelo de fatura completo (ICMS, método de pagamento a most TerreNumRefModelDesc1=Mostrarr número com formato %syymm-nnnn padrão para faturas e %syymm-nnnn para notas de crédito onde yy é o ano, mm mês e nnnn é uma sequência, sem interrupção e não pode mostrar o valor 0 MarsNumRefModelDesc1=Mostrar número com formato %syymm-nnnn padrão para faturas e %syymm-nnnn para notas de crédito onde yy é o ano, mm mês e nnnn é uma sequência, sem interrupção e não pode mostrar o valor 0 TerreNumRefModelError=O projeto começa começado por $syymm já existe e não é compatível com este modelo de seq�ência. Remova-o ou renomei-o para ativar este módulo. +##### Types de contacts ##### TypeContact_facture_internal_SALESREPFOLL=Responsável do acompanhamento da fatura do cliente TypeContact_facture_external_BILLING=Contato fatura cliente TypeContact_facture_external_SHIPPING=Contato envio cliente diff --git a/htdocs/langs/pt_BR/bookmarks.lang b/htdocs/langs/pt_BR/bookmarks.lang index 2d4ff9f572e..90abb0ab323 100644 --- a/htdocs/langs/pt_BR/bookmarks.lang +++ b/htdocs/langs/pt_BR/bookmarks.lang @@ -1,9 +1,15 @@ -# Dolibarr language file - Source file is en_US - bookmarks +# Dolibarr language file - Source file is en_US - marque pages +AddThisPageToBookmarks=Adicionar esta página aos Favoritos +Bookmark=Favorito +Bookmarks=Favoritos +NewBookmark=Novo Favorito ShowBookmark=Visualizar Favorito OpenANewWindow=Abrir em uma nova janela +ReplaceWindow=Substituir a janela atual BookmarkTargetNewWindowShort=Uma nova janela BookmarkTargetReplaceWindowShort=Na janela atual BookmarkTitle=Título do favorito +UrlOrLink=URL BehaviourOnClick=Comportamento ao clicar em uma URL CreateBookmark=Criar favorito SetHereATitleForLink=Definir um título para ao favorito diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang index c1e1dde6f55..c8d45909f77 100644 --- a/htdocs/langs/pt_BR/boxes.lang +++ b/htdocs/langs/pt_BR/boxes.lang @@ -1,44 +1,70 @@ # Dolibarr language file - Source file is en_US - boxes +BoxLastRssInfos=Links de informação RSS +BoxLastProducts=Últimos produtos/serviços BoxProductsAlertStock=Produtos em alerta de estoque +BoxLastProductsInContract=Últimos produtos/serviços contratados BoxLastSupplierBills=Últimas faturas de Fornecedores BoxLastCustomerBills=Últimas faturas a Clientes BoxOldestUnpaidCustomerBills=Primeira fatura pendente do cliente BoxOldestUnpaidSupplierBills=Primeira fatura pendentes do fornecedor +BoxLastProposals=Últimos Orçamentos +BoxLastProspects=Últimos clientes potenciais +BoxLastCustomers=Últimos clientes +BoxLastSuppliers=Últimos Fornecedores +BoxLastCustomerOrders=Últimos pedidos +BoxLastBooks=Últimos books BoxLastActions=Últimas ações BoxLastContracts=Últimos contratos BoxLastContacts=Últimos contatos/endereços +BoxLastMembers=Últimos membros BoxFicheInter=Últimas intervenções BoxCurrentAccounts=Abrir saldo das contas -BoxTotalUnpaidCustomerBills=Total de faturas pendentes de clientes +BoxSalesTurnover=Volume de negocio +BoxTotalUnpaidCustomerBills=Total de faturas pendentes de clientes BoxTotalUnpaidSuppliersBills=Total de faturas pendentes de fornecedores +BoxTitleLastBooks=Os %s últimos Favoritos registados +BoxTitleNbOfCustomers=Número de clientes BoxTitleLastRssInfos=As %s últimas Infos de %s BoxTitleLastProducts=Os %s últimos Produtos/Serviços Registados BoxTitleProductsAlertStock=Produtos em alerta de estoque +BoxTitleLastCustomerOrders=Os %s últimos pedidos de clientes modificados +BoxTitleLastSuppliers=Os %s últimos Fornecedores modificados +BoxTitleLastCustomers=Os %s últimos clientes modificados BoxTitleLastModifiedSuppliers=Últimos %s fornecedores modificados BoxTitleLastModifiedCustomers=Últimos clientes +BoxTitleLastCustomersOrProspects=Os %s últimos clientes ou clientes potenciais registados +BoxTitleLastPropals=Os %s últimos Orçamentos registados BoxTitleLastCustomerBills=As %s últimas faturas a clientes registradas BoxTitleLastSupplierBills=As %s últimas faturas de Fornecedores registradas +BoxTitleLastProspects=Os %s últimos clientes potenciais modificados BoxTitleLastModifiedProspects=Últimos clientes potenciais modificados +BoxTitleLastProductsInContract=Os %s últimos produtos/serviços contratados BoxTitleLastModifiedMembers=os %s últimos Membros modificados BoxTitleLastFicheInter=As últimas % s intervenções modificadas BoxTitleOldestUnpaidCustomerBills=Primeira %s fatura pendente do cliente BoxTitleOldestUnpaidSupplierBills=Primeira %s fatura pendente do fornecedor BoxTitleCurrentAccounts=Abrir saldo das contas +BoxTitleSalesTurnover=Volume de negocio realizado BoxTitleTotalUnpaidCustomerBills=Faturas de Clientes Pendentes de Cobrança BoxTitleTotalUnpaidSuppliersBills=Faturas de Fornecedores Pendentes de Pagamento BoxTitleLastModifiedContacts=Últimos %s contatos/endereços BoxMyLastBookmarks=Os meus últimos Favoritos BoxOldestExpiredServices=Primeiro serviços expirados ativos -BoxLastExpiredServices=Últimos %s contatos com os serviços expirados ativos +BoxLastExpiredServices=Últimos %s contatos com os serviços expirados ativos BoxTitleLastActionsToDo=As %s últimas ações a realizar -BoxTitleLastModifiedDonations=As ultimas %s doações modificadaas +BoxTitleLastContracts=Últimos contratos +BoxTitleLastModifiedDonations=As ultimas %s doações modificadaas BoxTitleLastModifiedExpenses=Últimas despesas modificadas BoxGlobalActivity=Atividade geral (notas fiscais, propostas, ordens) FailedToRefreshDataInfoNotUpToDate=Erro na atualização do fluxos RSS. Data da última atualização: %s LastRefreshDate=Data da última atualização +NoRecordedBookmarks=Não existem favoritos pessoais. Click aqui para adicionar. ClickToAdd=Clique aqui para adicionar +NoRecordedCustomers=Nenhum cliente registado NoRecordedContacts=Nenhum contato registrado NoActionsToDo=Sem ações a realizar +NoRecordedOrders=Sem pedidos de clientes registados +NoRecordedProposals=Sem Orçamentos registados NoRecordedInvoices=Sem faturas a clientes registados NoUnpaidCustomerBills=Cliente sem faturas em aberto NoRecordedSupplierInvoices=Sem faturas de Fornecedores @@ -50,14 +76,16 @@ NoContractedProducts=Nenhum Produto/Serviço contratado NoRecordedContracts=Nenhum contrato registrado NoRecordedInterventions=Não há intervenções gravadas BoxLatestSupplierOrders=Últimos pedidos a forcecedores -BoxTitleLatestSupplierOrders=%s últimos pedidos a forcecedores +BoxTitleLatestSupplierOrders= %s últimos pedidos a forcecedores NoSupplierOrder=Nenhum pedido a fornecedor registrado BoxCustomersInvoicesPerMonth=Faturas de cliente por mês BoxSuppliersInvoicesPerMonth=Faturas de fornecedor por mês BoxCustomersOrdersPerMonth=Pedidos de clientes por mês BoxSuppliersOrdersPerMonth=Pedidos de fornecedor por mês +BoxProposalsPerMonth=Propostas por mês NoTooLowStockProducts=Nenhum produto abaixo do limite de estoque BoxProductDistribution=Produtos / Serviços e distribuição BoxProductDistributionFor=Distribuição de para ForCustomersInvoices=Faturas de Clientes ForCustomersOrders=Ordem de clientes +ForProposals=Orçamentos diff --git a/htdocs/langs/pt_BR/cashdesk.lang b/htdocs/langs/pt_BR/cashdesk.lang index f2098c9655c..83670dde415 100644 --- a/htdocs/langs/pt_BR/cashdesk.lang +++ b/htdocs/langs/pt_BR/cashdesk.lang @@ -1,18 +1,40 @@ -# Dolibarr language file - Source file is en_US - cashdesk +# Language file - Source file is en_US - cashdesk +CashDeskMenu=Ponto de venda +CashDesk=Ponto de venda CashDesks=Ponto de vendas CashDeskBank=Conta Bancaria +CashDeskBankCash=Conta bancária (dinheiro) +CashDeskBankCB=Conta bancária (cartão) +CashDeskBankCheque=Conta bancária (cheque) +CashDeskWarehouse=Armazém +CashdeskShowServices=Venda de serviços +CashDeskProducts=Produtos CashDeskStock=Estoque CashDeskOn=Ligado CashDeskThirdParty=Fornecedor CashdeskDashboard=Ponto de acesso de venda +ShoppingCart=Carrinho de compras NewSell=Nova venda +BackOffice=Back office AddThisArticle=Adicione este artigo RestartSelling=Volte para vendas SellFinished=Venda finalizada PrintTicket=Imprimir cupom +NoProductFound=Nenhum artigo encontrado +ProductFound=produto encontrado +ProductsFound=produtos encontrados +NoArticle=Nenhum artigo +Identification=Identificação +Article=Artigo +Difference=Diferença TotalTicket=Total do cupom +NoVAT=Sem IVA para esta venda Change=Recebido em Excesso +CalTip=Clique para ver o calendário CashDeskSetupStock=Você tentou retirar do estoque com a emissão da fatura, mas o usuário não tem permissão para usar o armazém
Altere a configuração do módulo de estoque, ou escolha outro armazém BankToPay=Carregar Conta ShowCompany=Exibir empresa +ShowStock=Mostrar armazém +DeleteArticle=Clique para remover este artigo FilterRefOrLabelOrBC=Busca (Ref/Etiqueta) +UserNeedPermissionToEditStockToUsePos=Você tentou retirar do estoque com a emissão da fatura, mas o usuário precisa ter permissão para editar estoque. diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang index 25d02e13de4..afc5bc8a79a 100644 --- a/htdocs/langs/pt_BR/categories.lang +++ b/htdocs/langs/pt_BR/categories.lang @@ -1,31 +1,85 @@ # Dolibarr language file - Source file is en_US - categories +Category=Categoria +Categories=Categorias Rubrique=Rubrica Rubriques=Rubricas categories=Categorias +TheCategorie=A Categoria +NoCategoryYet=Nenhuma Categoria Deste Tipo Criada In=Em +AddIn=Adicionar em +modify=Modificar +Classify=Classificar +CategoriesArea=Área Categorias +ProductsCategoriesArea=Área Categorias de Produtos e Serviços +SuppliersCategoriesArea=Área Categorias Fornecedores +CustomersCategoriesArea=Área Categorias Clientes ThirdPartyCategoriesArea=Área Categorias de Fornecedores MembersCategoriesArea=Área categorias membros ContactsCategoriesArea=Contatos area categorias +MainCats=Categorias Principais +SubCats=Sub-Categorias +CatStatistics=Estatísticas +CatList=Lista de Categorias +AllCats=Todas as Categorias +ViewCat=Ver Categoria +NewCat=Nova Categoria +NewCategory=Nova Categoria +ModifCat=Modificar uma Categoria +CatCreated=Categoria Criada +CreateCat=Adicionar uma Categoria +CreateThisCat=Adicionar esta Categoria +ValidateFields=Confirmar os campos NoSubCat=Esta categoria não contém Nenhuma subcategoria. +SubCatOf=Subcategoria +FoundCats=Categorias Encontradas +FoundCatsForName=Categorias Encontradas com o Nome: +FoundSubCatsIn=Subcategorias Encontradas na Categoria ErrSameCatSelected=Selecionou a mesma categoria varias vezes ErrForgotCat=Esqueceu de escolher a categoria ErrForgotField=Esqueceu de atribuir um campo ErrCatAlreadyExists=Este nome esta sendo utilizado +AddProductToCat=Adicionar este produto a uma categoria? ImpossibleAddCat=Impossível Adicionar a categoria +ImpossibleAssociateCategory=Impossível associar a categoria +WasAddedSuccessfully=Foi adicionado com êxito. ObjectAlreadyLinkedToCategory=O elemento já está associado a esta categoria +CategorySuccessfullyCreated=A Categoria %s foi inserida com sucesso +ProductIsInCategories=Este produto/serviço encontra-se nas seguintes categorias +SupplierIsInCategories=Este fornecedor encontra-se nas seguintes categorias +CompanyIsInCustomersCategories=Esta empresa encontra-se nas seguintes categorias +CompanyIsInSuppliersCategories=Esta empresa encontra-se nas seguintes categorias de Fornecedores MemberIsInCategories=Este membro deve as seguintes categorias de membros ContactIsInCategories=Este contato pertence as seguentes categorias contatos +ProductHasNoCategory=Este produto/serviço não se encontra em nenhuma categoria em particular +SupplierHasNoCategory=Este fornecedor não se encontra em Nenhuma categoria em particular CompanyHasNoCategory=Esta empresa não se encontra em Nenhuma categoria em particular MemberHasNoCategory=Este membro nao esta em nenhuma categoria ContactHasNoCategory=Este contato nao esta em nenhuma categoria ClassifyInCategory=Esta categoria não contém clientes +NoneCategory=Nenhuma +NotCategorized=Sem categoria +CategoryExistsAtSameLevel=Esta categoria já existe na mesma localização +ReturnInProduct=Voltar à ficha produto/serviço +ReturnInSupplier=Voltar à ficha fornecedor +ReturnInCompany=Voltar à ficha cliente/cliente potencial ContentsVisibleByAll=O Conteúdo Será Visivel por Todos? ContentsVisibleByAllShort=Conteúdo visivel por todos ContentsNotVisibleByAllShort=Conteúdo não visivel por todos CategoriesTree=Tipos de categoria +DeleteCategory=Eliminar Categoria ConfirmDeleteCategory=Tem certeza que quer eliminar esta categoria? +RemoveFromCategory=Eliminar link com categoria RemoveFromCategoryConfirm=Tem certeza que quer eliminar o link entre a transação e a categoria? +NoCategoriesDefined=Nenhuma Categoria Definida +SuppliersCategoryShort=Categoria Fornecedores +CustomersCategoryShort=Categoria Clientes +ProductsCategoryShort=Categoria Produtos MembersCategoryShort=Categoria de membros +SuppliersCategoriesShort=Categorias Fornecedores +CustomersCategoriesShort=Categorias Clientes +CustomersProspectsCategoriesShort=Cat. Clientes/Potenciais +ProductsCategoriesShort=Categorias Produtos MembersCategoriesShort=Categoria de membros ContactCategoriesShort=Categorias contatos ThisCategoryHasNoProduct=Esta categoria não contém nenhum produto. @@ -33,6 +87,11 @@ ThisCategoryHasNoSupplier=Esta categoria não contém a nenhum fornecedor. ThisCategoryHasNoCustomer=Esta categoria não contém a nenhum cliente. ThisCategoryHasNoMember=Esta categoria nao contem nenhum membro. ThisCategoryHasNoContact=Esta categoria nao contem nenhum contato. +AssignedToCustomer=Atribuir a um cliente +AssignedToTheCustomer=Atribuido a um cliente +InternalCategory=Categoria Interna +CategoryContents=Conteúdo da Categoria +CategId=Id Categoria CatSupList=Lista de categorias de fornecedores CatCusList=Lista de Categorias de Clientes/Perspectivas CatProdList=Lista de Categorias de Produtos @@ -42,7 +101,12 @@ CatSupLinks=Linkes entre fornecedores e catogorias CatCusLinks=Linkes entre clientes/prospetivas e categorias CatProdLinks=Linkes entre produtos/servicos e categorias CatMemberLinks=Linkes entre membros e categorias +CatProdLinks=Linkes entre produtos/servicos e categorias +CatCusLinks=Linkes entre clientes/prospetivas e categorias +CatSupLinks=Linkes entre fornecedores e catogorias DeleteFromCat=Excluir da categoria +DeletePicture=Apagar foto +ConfirmDeletePicture=Confirmar eliminação de fotografias ExtraFieldsCategories=atributos complementares CategoriesSetup=Configuração de categorias CategorieRecursiv=Ligação com a categoria automaticamente diff --git a/htdocs/langs/pt_BR/commercial.lang b/htdocs/langs/pt_BR/commercial.lang index 135bc2593d1..1fd54b255ec 100644 --- a/htdocs/langs/pt_BR/commercial.lang +++ b/htdocs/langs/pt_BR/commercial.lang @@ -1,15 +1,25 @@ # Dolibarr language file - Source file is en_US - commercial +Commercial=Comercial CommercialArea=Área Comercial +CommercialCard=Ficha Comercial +CustomerArea=Área de Clientes +Customer=Cliente +Customers=Clientes +Prospect=Cliente Potencial +Prospects=Clientes Potenciais DeleteAction=Eliminar um evento/tarefa NewAction=Novo evento/tarefa AddAction=Adicionar evento/tarefa AddAnAction=Adicionar um evento/tarefa AddActionRendezVous=Criar uma reunião +Rendez-Vous=Reunião ConfirmDeleteAction=Você tem certeza que deseja excluir este evento/tarefa? CardAction=Ficha de evento PercentDone=Percentual completo ActionOnCompany=Tarefa relativa à empresa ActionOnContact=Tarefa relativa a um contato +TaskRDV=Reunião +TaskRDVWith=Reunião com %s ShowTask=Visualizar tarefa ShowAction=Visualizar evento ActionsReport=Relatório de eventos @@ -23,6 +33,8 @@ ErrorWrongCode=Código Incorreto NoSalesRepresentativeAffected=Nenhum Comercial Afetado ShowCustomer=Ver Cliente ShowProspect=Ver Clientes Potenciais +ListOfProspects=Lista de Clientes Potenciais +ListOfCustomers=Lista de Clientes LastDoneTasks=As %s últimas Ações Efetuadas LastRecordedTasks=últimas Ações Registradas LastActionsToDo=As %s últimas Ações não Completadas @@ -36,6 +48,7 @@ SendPropalRef=Enviar Orçamento %s SendOrderRef=Enviar Pedido %s StatusNotApplicable=Não aplicavel StatusActionToDo=A Realizar +StatusActionDone=Realizado MyActionsAsked=Ações que Registei MyActionsToDo=Ações que tenho que fazer MyActionsDone=Ações que me afetam @@ -47,6 +60,7 @@ LastProspectToContact=A Contactar LastProspectContactInProcess=Contato em Curso LastProspectContactDone=Clientes Potenciais Contactados DateActionPlanned=Data Planificação +DateActionDone=Data realização ActionAskedBy=Ação Questionada por ActionAffectedTo=Ação associada a ActionDoneBy=Ação Realizada por @@ -55,14 +69,22 @@ ErrorStatusCantBeZeroIfStarted=Se o campo 'Ficha de Realização' tiver d ActionAC_TEL=Chamada Telefônica ActionAC_FAX=Envio Fax ActionAC_PROP=Envio Orçamento por Correio +ActionAC_EMAIL=Envio E-Mail +ActionAC_RDV=Reunião ActionAC_INT=Intervenção no lugar ActionAC_FAC=Envio Fatura por Correio ActionAC_REL=Lembrete fatura por correio +ActionAC_CLO=Fechar ActionAC_EMAILING=Envio mailing massivo ActionAC_COM=Envio Pedido por Correio ActionAC_SHIP=Enviar Por E-Mail ActionAC_SUP_ORD=Enviar pedido de fornecedor por e-mail ActionAC_SUP_INV=Enviar fatura de fornecedor por e-mail +ActionAC_OTH=Outro +ActionAC_OTH_AUTO=Outros (eventos inseridos automaticamente) +ActionAC_MANUAL=Eventos inseridos manualmente +ActionAC_AUTO=Eventos inseridos automaticamente +Stats=Estatisticas de Venda CAOrder=Ordem CA FromTo=A partir de %s até %s MargeOrder=Ordem da Margem diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang index 6570bdfaff2..4c604834236 100644 --- a/htdocs/langs/pt_BR/companies.lang +++ b/htdocs/langs/pt_BR/companies.lang @@ -7,87 +7,258 @@ DeleteThirdParty=Excluir um Terceiro ConfirmDeleteCompany=Tem certeza que quer excluir esta empresa e toda a informação dela pendente? DeleteContact=Excluir um contato ConfirmDeleteContact=Tem certeza que quer excluir este contato e toda a sua informação inerente? +MenuNewThirdParty=Novo Terceiro +MenuNewCompany=Nova Empresa +MenuNewCustomer=Novo Cliente +MenuNewProspect=Novo Cliente Potencial +MenuNewSupplier=Novo Fornecedor +MenuNewPrivateIndividual=Novo Particular +MenuSocGroup=Grupos +NewCompany=Nova Empresa (Cliente Potencial, Cliente, Fornecedor) +NewThirdParty=Novo Terceiro (Cliente Potencial, Cliente, Fornecedor) NewSocGroup=Novo grupo de empresas +NewPrivateIndividual=Novo Particular (Cliente Potencial, Cliente, Fornecedor) CreateDolibarrThirdPartySupplier=Criar um terceiro(Fornecedor) +ProspectionArea=Área de prospeção SocGroup=Agrupamento de empresas +IdThirdParty=ID Terceiro +IdCompany=Id Empresa IdContact=Id Contato Contacts=Contatos ThirdPartyContacts=Contatos de Fornecedores ThirdPartyContact=Contato de Fornecedor StatusContactValidated=Estado do Contato +Company=Empresa +CompanyName=Razão Social +Companies=Empresas CountryIsInEEC=País da Comunidadeee Económica Europeia ThirdPartyName=Nome do fornecedor ThirdParty=Fornecedor ThirdParties=Empresas ThirdPartyAll=Fornecedores (Todos) +ThirdPartyProspects=Clientes Potenciais +ThirdPartyProspectsStats=Clientes Potenciais +ThirdPartyCustomers=Clientes +ThirdPartyCustomersStats=Clientes +ThirdPartyCustomersWithIdProf12=Clientes com %s ó %s +ThirdPartySuppliers=Fornecedores ThirdPartyType=Tipo de Fornecedor +Company/Fundation=Empresa/Associação +Individual=Particular ToCreateContactWithSameName=Criar automaticamente um contato fisico com a mesma informação ParentCompany=Casa Mãe Subsidiary=Subsidiário Subsidiaries=Subsidiários NoSubsidiary=Sem subsidiário +ReportByCustomers=Relatório por cliente +ReportByQuarter=Relatório por trimestre +CivilityCode=Código cortesía RegisteredOffice=Domicilio Social +Name=Nome +Lastname=Apelidos +Firstname=Primeiro Nome +PostOrFunction=Posto/Função +UserTitle=Título +Surname=Pseudonimo Address=Endereço +State=Distrito +Region=Região +Country=País CountryCode=Código País CountryId=ID do país +Phone=Telefone +Skype=Skype Call=Ligar +Chat=Chat +PhonePro=Telef. Trabalho PhonePerso=Telef. Particular +PhoneMobile=Telemovel No_Email=Não envie e-mails em massa +Fax=Fax Zip=Código Postal Town=Município +Web=Web +Poste= Posição DefaultLang=Linguagem por padrão VATIsUsed=Sujeito a ICMS VATIsNotUsed=Não Sujeito a ICMS CopyAddressFromSoc=Preencha o endereço com o endereço do fornecedor NoEmailDefined=Não tem email definido -LocalTax1IsUsedES=Sujeito a RE -LocalTax1IsNotUsedES=Não sujeito a RE -LocalTax2IsUsedES=Sujeito a IRPF -LocalTax2IsNotUsedES=Não sujeito a IRPF +##### Local Taxes ##### +LocalTax1IsUsedES= Sujeito a RE +LocalTax1IsNotUsedES= Não sujeito a RE +LocalTax2IsUsedES= Sujeito a IRPF +LocalTax2IsNotUsedES= Não sujeito a IRPF +LocalTax1ES=RE +LocalTax2ES=IRPF TypeLocaltax1ES=RE Tipo TypeLocaltax2ES=IRPF Tipo TypeES=Tipo +ThirdPartyEMail=%s WrongCustomerCode=Código cliente incorreto WrongSupplierCode=Código fornecedor incorreto +CustomerCodeModel=Modelo de código cliente +SupplierCodeModel=Modelo de código fornecedor +Gencod=Código de barras +##### Professional ID ##### +ProfId1Short=Prof. id 1 +ProfId2Short=Prof. id 2 +ProfId3Short=Prof. id 3 +ProfId4Short=Prof. id 4 ProfId5Short=Prof. id 5 ProfId6Short=Prof. id 6 +ProfId1=ID profesional 1 +ProfId2=ID profesional 2 +ProfId3=ID profesional 3 +ProfId4=ID profesional 4 ProfId5=ID profesional 5 ProfId6=ID profesional 6 ProfId1AR=Prof Id 1 (CUIT/CUIL) ProfId2AR=Prof Id 2 (Receitas brutas) +ProfId3AR=- +ProfId4AR=- +ProfId5AR=- +ProfId6AR=- +ProfId1AU=ABN +ProfId2AU=- +ProfId3AU=- +ProfId4AU=- +ProfId5AU=- +ProfId6AU=- ProfId1BE=Núm da Ordem +ProfId2BE=- +ProfId3BE=- +ProfId4BE=- +ProfId5BE=- +ProfId6BE=- +ProfId1BR=- +ProfId2BR=IE (Inscricao Estadual) +ProfId3BR=IM (Inscricao Municipal) +ProfId4BR=CPF +#ProfId5BR=CNAE +#ProfId6BR=INSS +ProfId1CH=- +ProfId2CH=- +ProfId3CH=Número federado +ProfId4CH=Núm. Registo de Comércio +ProfId5CH=- +ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) +ProfId2CL=- +ProfId3CL=- +ProfId4CL=- +ProfId5CL=- +ProfId6CL=- ProfId1CO=Prof Id 1 (R.U.T.) +ProfId2CO=- +ProfId3CO=- +ProfId4CO=- +ProfId5CO=- +ProfId6CO=- +ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) +ProfId4DE=- +ProfId5DE=- +ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Número do seguro social) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) +ProfId5ES=- +ProfId6ES=- +ProfId1FR=SIREN +ProfId2FR=SIRET +ProfId3FR=NAF (Ex APE) +ProfId4FR=RCS/RM ProfId5FR=- +ProfId6FR=- +ProfId1GB=Número Registo +ProfId2GB=- +ProfId3GB=SIC +ProfId4GB=- +ProfId5GB=- +ProfId6GB=- +ProfId1HN=Id prof. 1 (RTN) +ProfId2HN=- +ProfId3HN=- +ProfId4HN=- +ProfId5HN=- +ProfId6HN=- +ProfId1IN=Prof Id 1 (TIN) ProfId2IN=Prof Id 2 (PAN) ProfId3IN=Prof Id 3 (Taxa de Serviço) +ProfId4IN=Prof Id 4 +ProfId5IN=Prof Id 5 +ProfId6IN=- ProfId1MA=Id prof. 1 (R.C.) +ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) +ProfId5MA=- +ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) ProfId3MX=Prof Id 3 (Carta Profissional) +ProfId4MX=- +ProfId5MX=- +ProfId6MX=- ProfId1NL=KVK nummer +ProfId2NL=- +ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) +ProfId5NL=- +ProfId6NL=- +ProfId1PT=NIPC +ProfId2PT=Núm. Segurança Social +ProfId3PT=Num. Reg. Comercial +ProfId4PT=Conservatória +ProfId5PT=- +ProfId6PT=- +ProfId1SN=RC +ProfId2SN=NINEA +ProfId3SN=- +ProfId4SN=- +ProfId5SN=- +ProfId6SN=- +ProfId1TN=RC +ProfId2TN=Matrícula Fiscal +ProfId3TN=Código na Alfandega +ProfId4TN=CCC +ProfId5TN=- +ProfId6TN=- ProfId1RU=Id prof 1 (I.E.) ProfId2RU=Id prof 2 (I.M.) ProfId3RU=Id prof. 3 (CGC) ProfId4RU=Id prof. 4 (Livre) +ProfId5RU=- +ProfId6RU=- VATIntra=Cadastro Nacional Pessoa Juridica - CNPJ +VATIntraShort=CNPJ +VATIntraVeryShort=CNPJ +VATIntraSyntaxIsValid=Sintaxe Válida +VATIntraValueIsValid=Valor Válido +ProspectCustomer=Cliente Potencial/Cliente +Prospect=Cliente Potencial +CustomerCard=Ficha de Cliente +Customer=Cliente +CustomerDiscount=Desconto Cliente +CustomerRelativeDiscount=Desconto Cliente Relativo +CustomerAbsoluteDiscount=Desconto Cliente Fixo +CustomerRelativeDiscountShort=Desconto Relativo +CustomerAbsoluteDiscountShort=Desconto Fixo CompanyHasRelativeDiscount=Este cliente tem um Desconto por default de %s%% CompanyHasNoRelativeDiscount=Este cliente não tem Descontos relativos por default CompanyHasAbsoluteDiscount=Este cliente tem %s %s Descontos fixos disponíveis CompanyHasCreditNote=Este cliente tem %s %s recibos disponíveis CompanyHasNoAbsoluteDiscount=Este cliente não tem mais Descontos fixos disponíveis CustomerAbsoluteDiscountAllUsers=Descontos fixos em curso (acordado por todos os Usuário) +CustomerAbsoluteDiscountMy=Descontos fixos em curso (acordados Pessoalmente) DefaultDiscount=Desconto por Fefeito AvailableGlobalDiscounts=Descontos Fixos Disponíveis +DiscountNone=Nenhuma +Supplier=Fornecedor +CompanyList=Lista de Empresas AddContact=Criar Contato AddContactAddress=Novo Contato/Endereço EditContact=Editar contato @@ -97,17 +268,34 @@ ContactsAddresses=Contatos/Enderecos NoContactDefinedForThirdParty=Nenhum contato definido para este terceiro NoContactDefined=Nenhum contato definido para este fornecedor DefaultContact=Contato por Padrao +AddCompany=Criar Empresa AddThirdParty=Criar Fornecedor +DeleteACompany=Eliminar uma Empresa +PersonalInformations=Informação Pessoal +AccountancyCode=Código Contabilidade +CustomerCode=Código Cliente +SupplierCode=Código Fornecedor +CustomerAccount=Conta Cliente +SupplierAccount=Conta Fornecedor +CustomerCodeDesc=Código único cliente para cada cliente +SupplierCodeDesc=Código único fornecedor para cada fornecedor RequiredIfCustomer=Requerida se o Fornecedor for Cliente ou Cliente Potencial RequiredIfSupplier=Requerida se o Fornecedor for Fornecedor +ValidityControledByModule=Validação Controlada pelo Módulo +ThisIsModuleRules=Esta é a regra para este módulo LastProspect=último Cliente Potencial +ProspectToContact=Cliente Potencial a Contactar +CompanyDeleted=A Empresa "%s" foi Eliminada ListOfContacts=Lista de Contatos/Endereços ListOfContactsAddresses=Lista de Contatos/Endereços ListOfProspectsContacts=Lista de Contatos Clientes Potenciais ListOfCustomersContacts=Lista de Contatos Clientes ListOfSuppliersContacts=Lista de Contatos Fornecedores +ListOfCompanies=Lista de Empresas ListOfThirdParties=Lista de Fornecedores +ShowCompany=Mostar Empresa ShowContact=Mostrar Contato +ContactsAllShort=Todos (sem filtro) ContactType=Tipo de Contato ContactForOrders=Contato para Pedidos ContactForProposals=Contato de Orçamentos @@ -121,25 +309,64 @@ NewContact=Novo Contato NewContactAddress=Novo Contato/Endereço LastContacts=Últimos contatos MyContacts=Meus Contatos +Phones=Telefones +Capital=Capital +CapitalOf=Capital Social de %s +EditCompany=Modificar Empresa EditDeliveryAddress=Modificar Endereço de Envio ThisUserIsNot=Este usuário nem é um cliente potencial, nem um cliente, nem um fornecedor +VATIntraCheck=Verificar VATIntraCheckDesc=o link %s permite consultar à serviço europeo de control de números de ICMS intracomunitario. Se requer acesso a internet para que o serviço funcione VATIntraCheckURL=http://www.receita.fazenda.gov.br/pessoajuridica/cnpj/cnpjreva/cnpjreva_solicitacao.asp VATIntraCheckableOnEUSite=Verificar na web da Comisión Europea VATIntraManualCheck=pode também realizar uma verificação manual na web europea configuração do módulo Impostos para modificar regras de cálculo TaxModuleSetupToModifyRulesLT=Ir para Configurações da Empresa para modificar as regras de calculação OptionMode=Opção de Administração Contabilidade OptionModeTrue=Opção Depositos/Despesas +OptionModeVirtual=Opção Créditos/Dividas OptionModeTrueDesc=Neste método, o balanço calcula-se sobre a base das faturas pagas.\nA validade dos valores não está garantida pois a Administração da Contabilidade pasa rigurosamente pelas entradas/saidas das contas mediante as faturas.\nNota : Nesta Versão, Dolibarr utiliza a data da fatura ao estado ' Validada ' e não a data do estado ' paga '. OptionModeVirtualDesc=neste método, o balanço se calcula sobre a base das faturas validadas. pagas o não, aparecen ao resultado em quanto sejam discolocaçãos. FeatureIsSupportedInInOutModeOnly=função disponível somente ao modo contas CREDITOS-dividas (Véase a configuração do módulo contas) VATReportBuildWithOptionDefinedInModule=Os valores aqui apresentados são calculados usando as regras definidas pela configuração do módulo Fiscal. LTReportBuildWithOptionDefinedInModule=Valores mostrados aqui são calculados usando as regras definidas nas configurações da empresa. +Param=Parametrização RemainingAmountPayment=Pagamento montante remanescente: AmountToBeCharged=O valor total a pagar: +AccountsGeneral=Contas Gerais +Account=Conta +Accounts=Contas Accountparent=Conta pai Accountsparent=Contas pai BillsForSuppliers=Faturas de Fornecedores Income=Depositos +Outcome=Despesas +ReportInOut=Resultado / Exercício +ReportTurnover=Volume de Negócios PaymentsNotLinkedToInvoice=pagamentos vinculados a Nenhuma fatura, por o que nenhum Fornecedor PaymentsNotLinkedToUser=pagamentos não vinculados a um usuário +Profit=Beneficio +Balance=Saldo +Debit=Débito +Credit=Crédito Piece=Contabilidade Doc. +Withdrawal=Levantamento +Withdrawals=Levantamentos +AmountHTVATRealReceived=Total Recebido AmountHTVATRealPaid=líquido pago VATToPay=ICMS a Pagar VATReceived=ICMS Recebido @@ -33,14 +52,33 @@ LT2SupplierES=IRPF de compras LT1CustomerES=RE vendas LT1SupplierES=RE compras VATCollected=ICMS Recuperado -ToGet=Para restituir +ToPay=A Pagar +ToGet=Para restituir SpecialExpensesArea=Área para todos os pagamentos especiais +TaxAndDividendsArea=Área Impostos, gastos sociais e dividendos +SocialContribution=Gasto social +SocialContributions=Gastos sociais MenuSpecialExpenses=Despesas especiais +MenuTaxAndDividends=Impostos e Dividas +MenuSalaries=Salários +MenuSocialContributions=Gastos sociais +MenuNewSocialContribution=Novo gasto +NewSocialContribution=Novo gasto social +ContributionsToPay=Gastos por pagar +AccountancyTreasuryArea=Área Contabilidade/Tesouraria +AccountancySetup=Configuração Contabilidade +NewPayment=Novo Pagamento +Payments=Pagamentos PaymentCustomerInvoice=Pagamento de fatura do cliente PaymentSupplierInvoice=Pagamento de fatura do fornecedor PaymentSocialContribution=pagamento gasto social PaymentVat=Pagamento ICMS PaymentSalary=Pagamento de salário +ListPayment=Lista de pagamentos +ListOfPayments=Lista de pagamentos +ListOfCustomerPayments=Lista de pagamentos de clientes +ListOfSupplierPayments=Lista de pagamentos a Fornecedores +DatePayment=Data de Pagamento DateStartPeriod=Período de início e data DateEndPeriod=Período e data final NewVATPayment=Novo Pagamento de ICMS @@ -54,26 +92,43 @@ VATPayment=Pagamento ICMS VATPayments=Pagamentos ICMS SocialContributionsPayments=Pagamento de contribuições sociais ShowVatPayment=Ver Pagamentos ICMS +TotalToPay=Total a Pagar TotalVATReceived=Total do ICMS Recebido +CustomerAccountancyCode=Código contabilidade cliente +SupplierAccountancyCode=Código contabilidade fornecedor +AccountNumberShort=Nº de conta AccountNumber=Nº de conta +NewAccount=Nova conta +SalesTurnover=Volume de Negócio SalesTurnoverMinimum=Volume de negócios mínimo de vendas ByThirdParties=Por Fornecedor ByUserAuthorOfInvoice=Por autor da fatura AccountancyExport=exportação Contabilidade ErrorWrongAccountancyCodeForCompany=Código contabilidade incorreto para %s +SuppliersProductsSellSalesTurnover=Volume de negócio gerado por venda de produtos aos Fornecedores +CheckReceipt=Ficha de cheques +CheckReceiptShort=Ficha +NewCheckReceipt=Novo Cheque +NewCheckDeposit=Novo Deposito +NewCheckDepositOn=Criar Novo deposito na conta: %s +NoWaitingChecks=Não existe cheque em espera para depositar. +DateChequeReceived=Data introdução de dados de recepção cheque NbOfCheques=N� de Cheques +PaySocialContribution=Pagar uma gasto social ConfirmPaySocialContribution=? Tem certeza que quer classificar esta gasto social como paga? +DeleteSocialContribution=Eliminar gasto social ConfirmDeleteSocialContribution=? Tem certeza que quer eliminar esta gasto social? +ExportDataset_tax_1=gastos sociais e pagamentos CalcModeVATDebt=Modo% S VAT compromisso da contabilidade% s. CalcModeVATEngagement=Modo% SVAT sobre os rendimentos e as despesas% s. CalcModeDebt=Modo % s declarações de dívidas% s diz Compromisso da contabilidade . CalcModeEngagement=Modo % s rendimentos e as despesas% s contabilidade do caixa > -CalcModeLT1=Modo %sRE nas faturas dos clientes - faturas dos fornecedores%s -CalcModeLT1Debt=Modo %RE nas faturas dos clientes%s -CalcModeLT1Rec=Modo %sRE nas faturas dos fornecedores%s -CalcModeLT2=Modo %sIRPF nas faturas dos clientes - faturas dos fornecedores%s -CalcModeLT2Debt=Modo %sIRPF nas faturas dos clientes%s -CalcModeLT2Rec=Modo %sIRPF nas faturas dos fornecedores%s +CalcModeLT1= Modo %sRE nas faturas dos clientes - faturas dos fornecedores%s +CalcModeLT1Debt=Mode %sRE on customer invoices%s +CalcModeLT1Rec= Mode %sRE on suppliers invoices%s +CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s +CalcModeLT2Debt=Mode %sIRPF on customer invoices%s +CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s AnnualSummaryDueDebtMode=Balanço de receitas e despesas, resumo anual AnnualSummaryInputOutputMode=Balanço de receitas e despesas, resumo anual AnnualByCompaniesDueDebtMode=balanço de depositos e despesas, desglosado por Fornecedores, em modo %sCréditos-dividas%s chamada Contabilidade de compromisso. @@ -97,6 +152,7 @@ LT2ReportByQuartersInInputOutputMode=Relatoriopor rata IRPF VATReportByQuartersInDueDebtMode=Relatório da taxa do IVA cobrado e pago LT1ReportByQuartersInDueDebtMode=Relatorio por rata RE LT2ReportByQuartersInDueDebtMode=Relatorio por rata IRPF +SeeVATReportInInputOutputMode=Ver o Relatório %sIVA pago%s para um modo de cálculo Standard SeeVATReportInDueDebtMode=Ver o Relatório %sIVA a dever%s para um modo de cálculo com a opção sobre a divida RulesVATInServices=- No caso dos serviços, o relatório inclui os regulamentos IVA efetivamente recebidas ou emitidas com base na data de pagamento. RulesVATInProducts=- Para os bens materiais, que inclui as notas fiscais de IVA com base na data da fatura. @@ -108,14 +164,18 @@ NotUsedForGoods=Bens não utilizados ProposalStats=As estatísticas sobre as propostas OrderStats=Estatísticas de comandos InvoiceStats=As estatísticas sobre as contas +Dispatch=Repartição +Dispatched=Repartições +ToDispatch=A Repartir ThirdPartyMustBeEditAsCustomer=Fornecedor deve ser definido como um cliente SellsJournal=Diário de Vendas PurchasesJournal=Diário de Compras DescSellsJournal=Diário de Vendas DescPurchasesJournal=Diário de Compras +InvoiceRef=Ref. Fatura CodeNotDef=Não Definida AddRemind=Exibir o valor disponível -RemainToDivide=Saldo disponível +RemainToDivide= Saldo disponível WarningDepositsNotIncluded=Depósitos faturas não estão incluídos nesta versão com este módulo de contabilidade. DatePaymentTermCantBeLowerThanObjectDate=Data Prazo de pagamento não pode ser inferior a data da compra ou aquisição Pcg_version=Versão Pcg @@ -128,9 +188,13 @@ ByProductsAndServices=Por produtos e serviços RefExt=Ref externo ToCreateAPredefinedInvoice=Para criar uma Fatura predefinida, criar uma fatura padrão, em seguida, sem validá-la, clique no botão "Converter para fatura pré-definida". LinkedOrder=ligado ao pedido +ReCalculate=Recalcular +Mode1=Método 1 +Mode2=Método 2 CalculationRuleDesc=Para calcular o total do VAT, há dois métodos:
Método 1 é arredondamento cuba em cada linha, em seguida, soma-los.
Método 2 é somando tudo cuba em cada linha, em seguida, o arredondamento resultado.
Resultado final pode difere de alguns centavos. O modo padrão é o modo% s. CalculationRuleDescSupplier=De acordo com o fornecedor, escolher o método adequado aplicar mesma regra de cálculo e obter mesmo resultado esperado pelo seu fornecedor. TurnoverPerProductInCommitmentAccountingNotRelevant=Relatório Volume de negócios por produto, quando se usa um modo de contabilidade de caixa não é relevante. Este relatório está disponível somente quando utilizar o modo de contabilidade engajamento (ver configuração do módulo de contabilidade). +CalculationMode=Modo de cálculo AccountancyJournal=Codigo do jornal fiscal COMPTA_PRODUCT_BUY_ACCOUNT=Código de contabilidade padrão para comprar produtos COMPTA_PRODUCT_SOLD_ACCOUNT=Código de contabilidade padrão para vender produtos diff --git a/htdocs/langs/pt_BR/contracts.lang b/htdocs/langs/pt_BR/contracts.lang index 5965f1174a4..6d8f0befe60 100644 --- a/htdocs/langs/pt_BR/contracts.lang +++ b/htdocs/langs/pt_BR/contracts.lang @@ -4,22 +4,38 @@ ListOfContracts=Lista de Contratos LastContracts=Os últimos %s contratos modificados AllContracts=Todos os Contratos ContractCard=Ficha Contrato +ContractStatus=Estado do Contrato ContractStatusNotRunning=Fora de Serviço +ContractStatusRunning=Em Serviço +ContractStatusDraft=Rascunho +ContractStatusValidated=Validado +ContractStatusClosed=Encerrado ServiceStatusInitial=Inativo ServiceStatusRunning=Em Serviço ServiceStatusNotLate=Rodando, nao vencido ServiceStatusNotLateShort=Nao vencido ServiceStatusLate=Em Serviço, Expirado +ServiceStatusLateShort=Expirado ServiceStatusClosed=Encerrado ServicesLegend=Legenda para os Serviços Contracts=Contratos +Contract=Contrato NoContracts=Sem Contratos +MenuServices=Serviços MenuInactiveServices=Serviços Inativos MenuRunningServices=Serviços Ativos +MenuExpiredServices=Serviços Expirados +MenuClosedServices=Serviços Fechados +NewContract=Novo Contrato +AddContract=Criar Contrato +SearchAContract=Procurar um Contrato +DeleteAContract=Eliminar um Contrato +CloseAContract=Fechar um Contrato ConfirmDeleteAContract=Tem certeza que quer eliminar este contrato? ConfirmValidateContract=Tem certeza que quer Confirmar este contrato? ConfirmCloseContract=Tem certeza que quer Fechar este contrato? ConfirmCloseService=Tem certeza que quer Fechar este serviço? +ValidateAContract=Confirmar um contrato ActivateService=Ativar o serviço ConfirmActivateService=Tem certeza que quer ativar este serviço em data %s? RefContract=Referencia contrato @@ -37,6 +53,7 @@ ListOfRunningContractsLines=Lista de Linhas de Contratos em Serviço ListOfRunningServices=Lista de Serviços Ativos NotActivatedServices=Serviços Desativados (Com os Contratos Validados) BoardNotActivatedServices=Serviços a Ativar (Com os Contratos Validados) +LastContracts=Os últimos %s contratos modificados LastActivatedServices=Os %s últimos Serviços Ativados LastModifiedServices=Os %s últimos Serviços Modificados EditServiceLine=Edição Linha do Serviço @@ -62,7 +79,10 @@ CloseAllContracts=Fechar Todos os Contratos DeleteContractLine=Eliminar a linha do contrato ConfirmDeleteContractLine=Voce tem certeza que deseja apagar esta linha de contrato ? MoveToAnotherContract=Mover o serviço a outro contrato deste Fornecedor. +ConfirmMoveToAnotherContract=Escolhi o contrato e confirmo o alterar de serviço ao presente contrato. ConfirmMoveToAnotherContractQuestion=Escolha qualquer outro contrato do mesmo Fornecedor, deseja mover este serviço? +PaymentRenewContractId=Renovação do Serviço (Numero %s) +ExpiredSince=Expirado desde RelatedContracts=Contratos relativos NoExpiredServices=Nao tem servicos ativos vencidos ListOfServicesToExpireWithDuration=Lista de servicos a vencer em %s dias @@ -71,6 +91,10 @@ ListOfServicesToExpire=Lista de servicos a vencer NoteListOfYourExpiredServices=Esta lista contém apenas contratos de serviços de terceiros as quais você está ligado como representante de vendas. StandardContractsTemplate=Modelo de contratos simples ContactNameAndSignature=Para %s, nome e assinatura: + +##### Types de contacts ##### +TypeContact_contrat_internal_SALESREPSIGN=Comercial assinante do contrato +TypeContact_contrat_internal_SALESREPFOLL=Comercial seguimento do contrato TypeContact_contrat_external_BILLING=Contato cliente de faturação do contrato TypeContact_contrat_external_CUSTOMER=Contato cliente seguimento do contrato TypeContact_contrat_external_SALESREPSIGN=Contato cliente assinante do contrato diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang index 802243bd4e1..5e6d6e4b967 100644 --- a/htdocs/langs/pt_BR/cron.lang +++ b/htdocs/langs/pt_BR/cron.lang @@ -1,30 +1,41 @@ # Dolibarr language file - Source file is en_US - cron -About =Sobre -CronAboutPage =Pagina sobre Cron -Permission23101 =Ler tarefa agendada -Permission23102 =Criar/atualizar tarefa agendada -Permission23103 =Apagar tarefa agendada -CronSetup=Configuração do gerenciamento de trabalho agendado -URLToLaunchCronJobs=URL para lançar tarefas cron -OrToLaunchASpecificJob=Ou lançar tarefa especifica +# About page +About = Sobre +CronAbout = Sobre Cron +CronAboutPage = Pagina sobre Cron +# Right +Permission23101 = Ler tarefa agendada +Permission23102 = Criar/atualizar tarefa agendada +Permission23103 = Apagar tarefa agendada +Permission23104 = Executar tarefa agendada +# Admin +CronSetup= Configuração do gerenciamento de trabalho agendado +URLToLaunchCronJobs=URL para checar e iniciar os cron se necessario +OrToLaunchASpecificJob=Ou checkar e iniciar um specifico trabalho KeyForCronAccess=Chave seguranca para URL que lanca tarefas cron FileToLaunchCronJobs=Linha de comando para iniciar tarefas agendadas CronExplainHowToRunUnix=No ambiente Unix você deve usar crontab para executar linha de comando a cada minuto CronExplainHowToRunWin=No ambiente Microsoft (tm) Windows você pode usar ferramentas tarefa agendada para executar a linha de comando cada minuto +# Menu CronJobs=Trabalhos programados -CronListInactive=Lista de trabalhos nao ativos +CronListActive= Lista de trabalhos ativos +CronListInactive= Lista de trabalhos nao ativos +CronListActive= Lista de trabalhos ativos +# Page list CronDateLastRun=Ultimo acionamento CronLastOutput=Saida do ultimo acionamento CronLastResult=Codigo do ultimo resultado -CronList=Lista tarefas -CronDelete=Apagar tarefas cron -CronConfirmDelete=Tem certeza que deseja apagar este trabalho cron ? +CronListOfCronJobs=Lista de tarefas agendadas +CronCommand=Comando +CronList=Lista trabalhos +CronDelete= Apagar tarefas cron +CronConfirmDelete= Tem certeza que deseja apagar este trabalho cron ? CronExecute=Lançar trabalho -CronConfirmExecute=Tem certeza que quer executar esta tarefa agora ? -CronInfo=Tarefas permitem de executar aòoes nao planejadas +CronConfirmExecute= Tem certeza que quer executar esta tarefa agora ? +CronInfo= Tarefas permitem de executar aòoes nao planejadas CronWaitingJobs=Trabalhos na espera CronTask=Trabalho -CronNone=Nenhum +CronNone= Nenhum CronDtStart=Data inicio CronDtEnd=Data fim CronDtNextLaunch=Proxima execuçao @@ -34,17 +45,20 @@ CronClass=Clase CronMethod=Metodo CronModule=Modulo CronAction=Açao +CronStatus=Estado CronStatusActive=Ativado CronStatusInactive=Desativado CronNoJobs=Nenhum trabalho registrado +CronPriority=Prioridade CronLabel=Descriçao CronNbRun=Nr. execuçao CronEach=Cada JobFinished=Trabalho iniciado e terminado -CronAdd=Adicionar trabalho -CronHourStart=Hora e data do inicio do trabalho -CronEvery=E execute cada tarefa -CronObject=Instancia/Objeto a se criar +#Page card +CronAdd= Adicionar trabalho +CronHourStart= Hora e data do inicio do trabalho +CronEvery= E execute cada tarefa +CronObject= Instancia/Objeto a se criar CronArgs=Parametros CronSaveSucess=Salvo corretamente CronNote=Comentario @@ -54,6 +68,7 @@ CronStatusActiveBtn=Ativar CronStatusInactiveBtn=Desativar CronTaskInactive=Este trabalho foi desativado CronDtLastResult=Data ultimo resultado +CronId=Id CronClassFile=Classe (nomearquivo.class.php) CronModuleHelp=Nome do diretório do módulo Dolibarr (também trabalha com módulo Dolibarr externo). Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produto/class/product.class.php, o valor do módulo é o produto CronClassFileHelp=O nome do arquivo a ser carregado.
Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/classe/product.class.php, o valor do nome do arquivo de classe é product.class.php @@ -61,9 +76,12 @@ CronObjectHelp=O nome do objeto a ser carregado. Por exemplo para buscar método CronMethodHelp=O método de objeto para o lançamento. Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/class/product.class.php, o valor do método é fecth CronArgsHelp=Os argumentos do método. Por exemplo para buscar método do objeto Product do Dolibarr /htdocs/produto/class/product.class.php, o valor de paramtetros pode ser 0, ProductRef CronCommandHelp=A linha de comando do sistema a se executar. +# Info CronInfoPage=Informaçao +# Common CronType=Tipo tarefa CronType_method=Chamar metodo da classe Dolibarr CronType_command=Comando Shell +CronMenu=Cron CronCannotLoadClass=Nao e possivel carregar a classe %s ou o objeto %s UseMenuModuleToolsToAddCronJobs=Vá ao menu "Principal - Módulo de ferramentas - Lista de trabalhos" para ver e editar a programação dos trabalhos. diff --git a/htdocs/langs/pt_BR/deliveries.lang b/htdocs/langs/pt_BR/deliveries.lang index 3c9465cd4b3..231eca9935d 100644 --- a/htdocs/langs/pt_BR/deliveries.lang +++ b/htdocs/langs/pt_BR/deliveries.lang @@ -1,9 +1,26 @@ # Dolibarr language file - Source file is en_US - deliveries +Delivery=Envio +Deliveries=Envios +DeliveryCard=Ficha Envio +DeliveryOrder=Ordem de Envio +DeliveryOrders=Ordens de Envio +DeliveryDate=Data de Envio +DeliveryDateShort=Data Envio +CreateDeliveryOrder=Gerar Ordem de Entrega +QtyDelivered=Quant. Enviada +SetDeliveryDate=Indicar a Data de Envio +ValidateDeliveryReceipt=Confirmar a Nota de Entrega ValidateDeliveryReceiptConfirm=Tem certeza de que deseja confirmar esta entrega? DeleteDeliveryReceipt=Apagar Recibo de Entrega DeleteDeliveryReceiptConfirm=Tem certeza de que deseja apagar o recibo de entrega %s ? +DeliveryMethod=Método de Envio TrackingNumber=Nr. de rastreamento DeliveryNotValidated=Entrega nao validada +# merou PDF model +NameAndSignature=Nome e assinatura: +ToAndDate=Em___________________________________ a ____/_____/__________ GoodStatusDeclaration=Recebi a mercadorias acima em bom estado, Deliverer=Destinatario: Sender=Remetente +Recipient=Destinatário +ErrorStockIsNotEnough=Não existe estoque suficiente diff --git a/htdocs/langs/pt_BR/dict.lang b/htdocs/langs/pt_BR/dict.lang index 20fff4ba5e1..0dddb4b8b74 100644 --- a/htdocs/langs/pt_BR/dict.lang +++ b/htdocs/langs/pt_BR/dict.lang @@ -1,30 +1,318 @@ # Dolibarr language file - Source file is en_US - dict +CountryFR=França +CountryBE=Belgica +CountryIT=Italia +CountryES=Espanha +CountryDE=Alemanha +CountryCH=Suiça +CountryGB=Grã-Bretanha +CountryUK=Reino Unido +CountryIE=Irlanda +CountryCN=China +CountryTN=Tunísia +CountryUS=Estados Unidos +CountryMA=Marrocos +CountryDZ=Algeria +CountryCA=Canada +CountryTG=Togo +CountryGA=Gabão +CountryNL=Holanda +CountryHU=Hungria +CountryRU=Russia +CountrySE=Suécia +CountryCI=Costa do Marfim +CountrySN=Senegal +CountryAR=Argentina +CountryCM=Camarões +CountryPT=Portugal +CountrySA=Arábia Saudita +CountryMC=Mônaco +CountryAU=Austrália +CountrySG=Singapura +CountryAF=Afeganistão +CountryAX=Terra Ilhas +CountryAL=Albânia +CountryAS=Samoa Americana +CountryAD=Andorra +CountryAO=Angola +CountryAI=Anguilla +CountryAQ=Antártica +CountryAG=Antígua e Barbuda +CountryAM=Armênia +CountryAW=Aruba +CountryAT=Áustria +CountryAZ=Azerbaijão +CountryBS=Bahamas +CountryBH=Barém +CountryBD=Bangladesh +CountryBB=Barbados +CountryBY=Bielorrússia +CountryBZ=Belize +CountryBJ=Benin +CountryBM=Bermudas +CountryBT=Butão +CountryBO=Bolívia +CountryBA=Bósnia e Herzegovina +CountryBW=Botsuana +CountryBV=Ilha Bouvet +CountryBR=Brasil +CountryIO=Território Britânico do Oceano Índico +CountryBN=Brunei Darussalam +CountryBG=Bulgaria +CountryBF=Burkina Faso +CountryBI=Burundi +CountryKH=Camboja +CountryCV=Cabo Verde +CountryKY=Ilhas Cayman +CountryCF=Central Africano República +CountryTD=Chade +CountryCL=Chile +CountryCX=Ilha Christmas +CountryCC=Ilhas Cocos (Keeling) +CountryCO=Colômbia +CountryKM=Comoros +CountryCG=Congo +CountryCD=Congo, República Democrática do +CountryCK=Ilhas Cook +CountryCR=Costa Rica +CountryHR=Croácia +CountryCU=Cuba +CountryCY=Chipre +CountryCZ=República Checa +CountryDK=Dinamarca +CountryDJ=Djibuti +CountryDM=Dominica +CountryDO=República Dominicana +CountryEC=Equador +CountryEG=Egito +CountrySV=El Salvador +CountryGQ=Guiné Equatorial +CountryER=Eritréia +CountryEE=Estônia +CountryET=Etiópia +CountryFK=Ilhas Malvinas +CountryFO=Ilhas Faroé +CountryFJ=Ilhas Fiji +CountryFI=Finlândia +CountryGF=Guiana Francesa CountryPF=Polinéia Francesa +CountryTF=Territórios Franceses do Sul +CountryGM=Gâmbia +CountryGE=Georgia +CountryGH=Gana +CountryGI=Gibraltar +CountryGR=Grécia +CountryGL=Gronelândia +CountryGD=Granada +CountryGP=Guadalupe +CountryGU=Guam +CountryGT=Guatemala +CountryGN=Guiné +CountryGW=Guiné-Bissau +CountryGY=Guiana +CountryHT=Hati +CountryHM=Ilha Heard e McDonald +CountryVA=Santa Sé (Vaticano) +CountryHN=Honduras +CountryHK=Hong Kong +CountryIS=Icelande +CountryIN=Índia CountryID=Indonéia +CountryIR=Irão +CountryIQ=Iraque +CountryIL=Israel +CountryJM=Jamaica +CountryJP=Japão +CountryJO=Jordânia +CountryKZ=Cazaquistão +CountryKE=Quênia +CountryKI=Kiribati +CountryKP=Coreia do Norte +CountryKR=Coréia do Sul +CountryKW=Kuwait +CountryKG=Kyrghyztan +CountryLA=Laociano +CountryLV=Letônia +CountryLB=Líbano +CountryLS=Lesoto +CountryLR=Libéria +CountryLY=Líbia +CountryLI=Lichtenstein +CountryLT=Lituania +CountryLU=Luxemburgo +CountryMO=Macau +CountryMK=Macedónia, antiga República Jugoslava da +CountryMG=Madagascar +CountryMW=Malauí +CountryMY=Malásia +CountryMV=Maldivas +CountryML=Mali +CountryMT=Malta +CountryMH=Ilhas Marshall +CountryMQ=Martinica +CountryMR=Mauritânia +CountryMU=Maurício +CountryYT=Mayotte +CountryMX=México CountryFM=Micronéia +CountryMD=Moldávia +CountryMN=Mongólia +CountryMS=Montserrat +CountryMZ=Moçambique +CountryMM=Birmania (Myanmar) +CountryNA=Namíbia +CountryNR=Nauruano +CountryNP=Nepal +CountryAN=Antilhas Holandesas +CountryNC=Nova Caledónia +CountryNZ=Nova Zelândia +CountryNI=Nicarágua +CountryNE=Níger +CountryNG=Nigéria +CountryNU=Niue +CountryNF=Ilha Norfolk +CountryMP=Ilhas Marianas do Norte +CountryNO=Noruega +CountryOM=Omã +CountryPK=Paquistão +CountryPW=Palau +CountryPS=Território Palestiniano, Ocupado +CountryPA=Panamá +CountryPG=Papuásia-Nova Guiné +CountryPY=Paraguai +CountryPE=Peru +CountryPH=Filipinas +CountryPN=Ilhas Pitcairn +CountryPL=Polônia +CountryPR=Porto Rico +CountryQA=Catar +CountryRE=Reunião +CountryRO=Romênia +CountryRW=Ruanda +CountrySH=Santa Helena +CountryKN=Saint Kitts e Nevis +CountryLC=Santa Lúcia +CountryPM=Saint-Pierre e Miquelon +CountryVC=São Vicente e Granadinas +CountryWS=Samoa +CountrySM=San Marino +CountryST=São Tomé e Príncipe +CountryRS=Sérvia +CountrySC=Seychelles +CountrySL=Serra Leoa +CountrySK=Eslováquia +CountrySI=Eslovênia +CountrySB=Ilhas Salomão +CountrySO=Somália +CountryZA=África do Sul +CountryGS=Geórgia do Sul e Ilhas Sandwich do Sul +CountryLK=Sri Lanka +CountrySD=Sudão +CountrySR=Suriname +CountrySJ=Svalbard e Jan Mayen +CountrySZ=Suazilândia +CountrySY=Síria +CountryTW=Taiwan +CountryTJ=Tajiquistão +CountryTZ=Tanzânia +CountryTH=Tailândia +CountryTL=Timor-Leste +CountryTK=Toquelau +CountryTO=Tonga +CountryTT=Trinidad e Tobago +CountryTR=Turquia +CountryTM=Turquemenistão +CountryTC=Ilhas Turcas e Cailos +CountryTV=Tuvaluano +CountryUG=Uganda +CountryUA=Ucrania +CountryAE=Emirados Árabes Unidos +CountryUM=Territórios Insulares dos Estados Unidos +CountryUY=Uruguai +CountryUZ=Uzbequistão +CountryVU=Vanuatu +CountryVE=Venezuela +CountryVN=Viet Nam +CountryVG=Ilhas Virgens Britânicas +CountryVI=Ilhas Virgens, E.U. +CountryWF=Wallis e Futuna +CountryEH=Sara Ocidental +CountryYE=Iêmen +CountryZM=Zâmbia +CountryZW=Zimbabué +CountryGG=Guernsey +CountryIM=Ilha de Man +CountryJE=Jersey +CountryME=Montenegro +CountryBL=Saint Barthelemy +CountryMF=Saint Martin + +##### Civilities ##### +CivilityMME=Sra. +CivilityMR=Sr. +CivilityMLE=Dr. +CivilityMTRE=Eng. +CivilityDR=Doutor +##### Currencies ##### +Currencyeuros=Euros CurrencyAUD=Dólaros Australianos CurrencySingAUD=Dólaro Australiano CurrencyCAD=Dólaros CAN CurrencySingCAD=Dolaro Canadense +CurrencyCHF=Francos suíços CurrencySingCHF=Franco Suico +CurrencyEUR=Euros +CurrencySingEUR=Euro +CurrencyFRF=Francos Franceses CurrencySingFRF=Franco Frances CurrencyGBP=Esterlinas Inglesas CurrencySingGBP=Esterlina Inglesa CurrencyINR=Rupias India CurrencySingINR=Rupia India +CurrencyMAD=Dirham +CurrencySingMAD=Dirham +CurrencyMGA=Ariary +CurrencySingMGA=Ariary CurrencyMUR=Mauritius rupias CurrencySingMUR=Mauritius rupia CurrencyNOK=Coroas Norwegas CurrencySingNOK=Coroa Norwega +CurrencyTND=TND CurrencySingTND=Dinaro Tunisino CurrencyUSD=Dólaros E.U. CurrencySingUSD=Dólar E.U. +CurrencyUAH=Hryvnia +CurrencySingUAH=Hryvnia +CurrencyXAF=Francos CFA BEAC +CurrencySingXAF=Franco CFA BEAC +CurrencyXOF=Francos CFA BCEAO +CurrencySingXOF=Franco CFA BCEAO CurrencyXPF=Francos CFP +CurrencySingXPF=Franco CFP +CurrencyCentSingEUR=centavo +CurrencyThousandthSingTND=mil +#### Input reasons ##### +DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_CAMP_MAIL=Campanha correio DemandReasonTypeSRC_CAMP_EMAIL=Campanha por E-mail DemandReasonTypeSRC_CAMP_PHO=Campanha Telefone +DemandReasonTypeSRC_CAMP_FAX=Campanha Fax +DemandReasonTypeSRC_COMM=Contato comercial DemandReasonTypeSRC_SHOP=Contato na loja +DemandReasonTypeSRC_WOM=Palavra da boca +DemandReasonTypeSRC_PARTNER=Parceiro +DemandReasonTypeSRC_EMPLOYEE=Empregado DemandReasonTypeSRC_SPONSORING=Sponsorizacao +#### Paper formats #### +PaperFormatEU4A0=Formato 4A0 +PaperFormatEU2A0=Formato 2A0 +PaperFormatEUA0=Formato A0 +PaperFormatEUA1=Formato A1 +PaperFormatEUA2=Formato A2 +PaperFormatEUA3=Formato A3 +PaperFormatEUA4=Formato A4 +PaperFormatEUA5=Formato A5 +PaperFormatEUA6=Formato A6 PaperFormatUSLETTER=Formato Carta E.U.A. PaperFormatUSLEGAL=Formato Legal E.U.A. PaperFormatUSEXECUTIVE=Formato Executivo E.U.A. diff --git a/htdocs/langs/pt_BR/donations.lang b/htdocs/langs/pt_BR/donations.lang index fa596cc9a03..22908e103a7 100644 --- a/htdocs/langs/pt_BR/donations.lang +++ b/htdocs/langs/pt_BR/donations.lang @@ -5,12 +5,28 @@ DonationRef=Doaçaõ ref. Donor=Dador Donors=Dadores AddDonation=Adicionar Doação +NewDonation=Nova Doação ShowDonation=Mostrar doaçaõ +DonationPromise=Promessa de Doação +PromisesNotValid=Promessas Não Validadas +PromisesValid=Promessas Validadas DonationsPaid=Doações pagas +DonationsReceived=Doações Recebidas +PublicDonation=Doação Pública +DonationsNumber=Número de Doações +DonationsArea=Área de Doações +DonationStatusPromiseNotValidated=Promessa Não Validada +DonationStatusPromiseValidated=Promessa Validada DonationStatusPaid=Doaçaõ recebida +DonationStatusPromiseNotValidatedShort=Não Validada +DonationStatusPromiseValidatedShort=Validada DonationStatusPaidShort=Recebido +ValidPromess=Validar promessa DonationReceipt=Recibo doaçaõ -LastModifiedDonations=As ultimas %s doações modificadaas +BuildDonationReceipt=Criar Recibo +DonationsModels=Modelo de documento de recepção de Doação +LastModifiedDonations=As ultimas %s doações modificadaas SearchADonation=Buscar doaçaõ DonationRecipient=Recipiente doaçaõ +ThankYou=Obrigado IConfirmDonationReception=Declaro o recebimento como doaçaõ, de seguinte montante. diff --git a/htdocs/langs/pt_BR/ecm.lang b/htdocs/langs/pt_BR/ecm.lang index 950e0e3cdc3..957a7778fef 100644 --- a/htdocs/langs/pt_BR/ecm.lang +++ b/htdocs/langs/pt_BR/ecm.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - ecm +MenuECM=Documentos DocsMine=Os meus documentos DocsGenerated=Documentos gerados DocsElements=Elementos dos documentos @@ -9,10 +10,13 @@ DocsOrders=Documentos de pedidos DocsInvoices=Documentos de faturas ECMNbOfDocs=Nr. de documentos ECMNbOfDocsSmall=Nr. de doc. +ECMSection=Pasta ECMSectionManual=Pasta manual ECMSectionAuto=Pasta automática ECMSectionsManual=Pastas manuais ECMSectionsAuto=Pastas automáticas +ECMSections=Pastas +ECMRoot=Raíz ECMNewSection=Criar pasta ECMAddSection=Adicionar pasta ECMNewDocument=Novo documento @@ -21,16 +25,25 @@ ECMNbOfFilesInDir=Número de arquivos na pasta ECMNbOfSubDir=Número de subpastas ECMNbOfFilesInSubDir=Numero de arquivos nos subpastas ECMCreationUser=Criado por +ECMArea=Área GED ECMAreaDesc=O GED (Gestão Eletrônica de Documentos) permite salvar, compartilhar e pesquisar rapidamente todos os tipos de documentos contidos no Dolibarr. ECMAreaDesc2=* As pastas automáticas são geradas automaticamente quando algum arquivo é adicionado a algum ficheiro do sistema.
* As pastas manuais podem ser usados ​​para guardar documentos sem ligação a um cadastro do sistema. +ECMSectionWasRemoved=A pasta %s foi eliminada ECMDocumentsSection=Documento da pasta ECMSearchByKeywords=Busca usando palavras chave ECMSearchByEntity=Busca por objeto ECMSectionOfDocuments=Pastas de documentos +ECMTypeManual=Manual +ECMTypeAuto=Automático +ECMDocsBySocialContributions=Documentos associados a contribuições sociais ECMDocsByThirdParties=Documentos associados a fornecedores ECMDocsByProposals=Documentos associados a orçamentos +ECMDocsByOrders=Documentos associados a pedidos +ECMDocsByContracts=Documentos associados a contratos ECMDocsByInvoices=Documentos associados a faturas do cliente +ECMDocsByProducts=Documentos associados a produtos ECMDocsByProjects=Documentos associados a projetos +ECMNoDirectoryYet=Nenhuma pasta criada ShowECMSection=Exibir pasta DeleteSection=Apagar pasta ConfirmDeleteSection=Você confirmar que quer apagar a pasta %s ? @@ -39,3 +52,4 @@ CannotRemoveDirectoryContainsFiles=Não foi possível apagar, porque contém alg ECMFileManager=Gerenciador de arquivos ECMSelectASection=Selecione uma pasta na árvore a esquerda... DirNotSynchronizedSyncFirst=Esta pasta parece que foi criada ou modificada fora do módulo GED. Você deve clicar no botão "Atualizar" para sincronizar as informações com o banco de dados e poder ver o conteúdo da pasta. + diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang index 501ddd1d734..3f9d535095b 100644 --- a/htdocs/langs/pt_BR/errors.lang +++ b/htdocs/langs/pt_BR/errors.lang @@ -1,5 +1,10 @@ # Dolibarr language file - Source file is en_US - errors + +# No errors NoErrorCommitIsDone=Nenhum erro, cometemos +# Errors +Error=Erro +Errors=Erros ErrorButCommitIsDone=Erros encontrados, mas que, apesar disso validar ErrorBadEMail=EMail% s está errado ErrorBadUrl=Url% s está errado @@ -11,20 +16,27 @@ ErrorFailToRenameFile=Falha ao renomear o arquivo '% s' para '% s'.%s'. ErrorFailToCreateFile=Erro ao criar o arquivo '' ErrorFailToRenameDir=Error à renombar a pasta '%s' a '%s'. +ErrorFailToCreateDir=Erro ao criar a pasta '%s' ErrorFailToDeleteDir=Error à eliminar a pasta '%s'. ErrorFailedToDeleteJoinedFiles=impossível eliminar a entidade já que tem Arquivos anexos. Elimine antes os Arquivos anexos ErrorThisContactIsAlreadyDefinedAsThisType=Este contato já está definido como contato para este tipo. +ErrorCashAccountAcceptsOnlyCashMoney=Esta conta bancaria é de tipo Caixa e só aceita o método de pagamento de tipo especie. ErrorFromToAccountsMustDiffers=a conta origem e destino devem ser diferentes. ErrorBadThirdPartyName=Nome de Fornecedor incorreto ErrorProdIdIsMandatory=Obrigatório ErrorBadCustomerCodeSyntax=a sintaxis do código cliente é incorreta ErrorBadBarCodeSyntax=A sintaxe do código de barras esta incorreta +ErrorCustomerCodeRequired=Código cliente obrigatório ErrorBarCodeRequired=Código de barras necessário +ErrorCustomerCodeAlreadyUsed=Código de cliente já utilizado ErrorBarCodeAlreadyUsed=Código de barras já utilizado +ErrorPrefixRequired=Prefixo obrigatório ErrorUrlNotValid=O Endereço do Site está incorreta ErrorBadSupplierCodeSyntax=a sintaxis do código fornecedor é incorreta +ErrorSupplierCodeRequired=Código fornecedor obrigatório +ErrorSupplierCodeAlreadyUsed=Código de fornecedor já utilizado ErrorBadParameters=parâmetros incorretos -ErrorBadValueForParameter=Valor errado, parâmetro incorreto +ErrorBadValueForParameter=Valor errado, parâmetro incorreto ErrorBadImageFormat=O arquivo de imagem não tem um formato suportado ErrorBadDateFormat=Valor tem o formato de data errada ErrorWrongDate=A data não está correta! @@ -60,25 +72,31 @@ ErrorLDAPSetupNotComplete=a configuração Dolibarr-LDAP é incompleta. ErrorLDAPMakeManualTest=foi criado unn Arquivo .ldif na pasta %s. Trate de gastor manualmente este Arquivo a partir da linha de comandos para Obter mais detalles acerca do error. ErrorCantSaveADoneUserWithZeroPercentage=No se pode cambiar uma acção ao estado no comenzada si tiene un usuario realizante de a acción. ErrorRefAlreadyExists=a referencia utilizada para a criação já existe +ErrorPleaseTypeBankTransactionReportName=Introduzca o Nome do registo bancario sobre a qual o escrito está constatado (formato AAAAMM ó AAAMMJJ) ErrorRecordHasChildren=não se pode eliminar o registo porque tem hijos. ErrorRecordIsUsedCantDelete=Não é possível excluir registro. Ele já é usado ou incluídos em outro objeto. ErrorModuleRequireJavascript=Javascript não deve ser desativado para ter esse recurso funcionando. Para ativar / desativar o Javascript, vá ao menu Home-> Configuração-> Display. +ErrorPasswordsMustMatch=Ambas as senhas digitadas devem corresponder entre si ErrorContactEMail=Um erro técnico ocorrido. Por favor, contate o administrador para seguinte e-mail% s en fornecer o código de erro% s em sua mensagem, ou ainda melhor, adicionando uma cópia de tela da página. ErrorWrongValueForField=Valor errado para o número do campo% s (valor '% s' não corresponde regra% s) ErrorFieldValueNotIn=Valor errado para o número do campo% s (valor '% s' não é um valor disponível no campo% s da tabela% s) ErrorFieldRefNotIn=Valor errado para o número do campo% s (valor '% s' não é um% s ref existente) ErrorsOnXLines=Erros no registro de origem% s (s) +ErrorFileIsInfectedWithAVirus=O programa antivírus não foi capaz de validar o arquivo (arquivo pode ser infectado por um vírus) ErrorSpecialCharNotAllowedForField=Os caracteres especiais não são permitidos para o campo "% s" ErrorDatabaseParameterWrong=Parâmetro de configuração do banco de dados '% s' tem um valor não é compatível para usar Dolibarr (deve ter o valor '% s'). ErrorNumRefModel=Uma referência existe no banco de dados (% s) e não é compatível com esta regra de numeração. Remover registro ou referência renomeado para ativar este módulo. ErrorQtyTooLowForThisSupplier=Quantidade insuficiente para este fornecedor ErrorModuleSetupNotComplete=Configuração do módulo parece ser incompleto. Vá em Setup - Módulos para ser concluído. +ErrorBadMask=Erro na máscara ErrorBadMaskFailedToLocatePosOfSequence=Erro, máscara sem número de sequência ErrorBadMaskBadRazMonth=Erro, valor de redefinição ruim +ErrorSelectAtLeastOne=Erro. Selecione pelo menos uma entrada. ErrorProductWithRefNotExist=O produto com referência não existem '% s' ErrorDeleteNotPossibleLineIsConsolidated=Não e possívelexcluir porque registro está ligada a uma transação bancária que está conciliada ErrorProdIdAlreadyExist=% S é atribuída a outro terço ErrorFailedToSendPassword=Erro ao enviar a senha +ErrorFailedToLoadRSSFile=Falha ao obter feed RSS. Tente adicionar MAIN_SIMPLEXMLLOAD_DEBUG constante se as mensagens de erro não fornecer informações suficientes. ErrorPasswordDiffers=As Senhas não são identicas, volte a introduzi-las ErrorForbidden=acesso não autorizado.
Tentando acessar a uma página, zona o função sem estar em uma Sessão autentificada o que não se autoriza para a sua conta de usuário. ErrorForbidden2=Os permissões para este usuário podem ser designados por o administrador Dolibarr mediante o menu %s-> %s. @@ -86,6 +104,7 @@ ErrorForbidden3=Dolibarr não parece funcionar em uma Sessão autentificada. Con ErrorNoImagickReadimage=a função imagick_readimage não está presente nesta Instalação de PHP. a resenha não está pois disponível. Os administradores podem desativar esta separador ao menu configuração - visualização. ErrorRecordAlreadyExists=registo já existente ErrorCantReadFile=Erro na leitura do arquivo '&s' +ErrorCantReadDir=Erro na leitura da pasta '%s' ErrorFailedToFindEntity=Error de leitura da entidade '%s' ErrorBadLoginPassword=Identificadores de usuário o senha incorretos ErrorLoginDisabled=a sua conta está desativada @@ -95,7 +114,8 @@ ErrorLoginDoesNotExists=a conta de usuário de %s não foi encontrado. ErrorLoginHasNoEmail=Este usuário não tem e-mail. impossível continuar. ErrorBadValueForCode=Valor incorreto para o código. volte a \ttentar com um Novo valor... ErrorBothFieldCantBeNegative=Campos% se% s não pode ser tanto negativo -ErrorWebServerUserHasNotPermission=Conta de usuário usado para executar servidor não tem permissão +ErrorWebServerUserHasNotPermission=Conta de usuário usado para executar servidor não tem permissão +ErrorNoActivatedBarcode=Nenhum tipo de código de barras ativado ErrUnzipFails=Falha ao descompactar com ZipArchive ErrNoZipEngine=Não esta instaladoo programa para descompactar o arquivo% s neste PHP ErrorFileMustBeADolibarrPackage=O arquivo deve ser um pacote zip Dolibarr @@ -106,6 +126,7 @@ ErrorFailedToRemoveToMailmanList=Falha ao remover registro% s para% s Mailman li ErrorNewValueCantMatchOldValue=O novo valor não pode ser igual ao anterior ErrorFailedToValidatePasswordReset=Falha ao reinicializar senha. Pode ser o reinit já foi feito (este link pode ser usado apenas uma vez). Se não, tente reiniciar o processo reinit. ErrorToConnectToMysqlCheckInstance=Conecte-se ao banco de dados falhar. Verifique servidor MySQL está rodando (na maioria dos casos, você pode iniciá-lo a partir de linha de comando com o "sudo / etc / init.d / mysql start '). +ErrorFailedToAddContact=Falha ao adicionar contato ErrorDateMustBeBeforeToday=A data não pode ser maior do que hoje ErrorPaymentModeDefinedToWithoutSetup=A modalidade de pagamento foi definido para tipo% s mas a configuração do módulo de fatura não foi concluída para definir as informações para mostrar para esta modalidade de pagamento. ErrorPHPNeedModule=Erro, o PHP deve ter módulo% s instalado para usar este recurso. @@ -115,6 +136,8 @@ ErrorBadFormat=Formato ruim! ErrorPaymentDateLowerThanInvoiceDate=Data de Pagamento (% s) não pode "ser antes da data da fatura para faturar. ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erro, esse membro ainda não está vinculado a qualquer fornecedor. Fazer a ligação membro a um terceiro existente ou criar uma novo fornecedor antes de criar assinatura com nota fiscal. ErrorThereIsSomeDeliveries=Erro, há algumas entregas ligados a este envio. Supressão recusou. + +# Warnings WarningMandatorySetupNotComplete=Parâmetros de configuração obrigatórios ainda não estão definidos WarningSafeModeOnCheckExecDir=Atenção, a opção PHP safe_mode está em modo de comando devem ser armazenados dentro de um diretório declarado pelo php parâmetro safe_mode_exec_dir. WarningAllowUrlFopenMustBeOn=o parâmetro allow_url_fopen deve ser especificado a on ao Arquivo php.ini para discolocar deste módulo completamente ativo. deve modificar este Arquivo manualmente @@ -130,3 +153,4 @@ WarningCloseAlways=Atenção, o fechamento é feito mesmo se o valor difere entr WarningUsingThisBoxSlowDown=Atenção, utilizando esta caixa de abrandar a sério todas as páginas que mostram a caixa. WarningClickToDialUserSetupNotComplete=Configuração de informações ClickToDial para o usuário não são completas (ver guia ClickToDial no seu cartão de usuário). WarningNotRelevant=Operação irrelevante para este conjunto de dados +WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. diff --git a/htdocs/langs/pt_BR/exports.lang b/htdocs/langs/pt_BR/exports.lang index d680c4d1145..51eeab11ac9 100644 --- a/htdocs/langs/pt_BR/exports.lang +++ b/htdocs/langs/pt_BR/exports.lang @@ -1,23 +1,49 @@ # Dolibarr language file - Source file is en_US - exports ExportsArea=Área Exportações +ImportArea=Área de Importação +NewExport=Nova Exportação +NewImport=Nova Importação +ExportableDatas=Conjunto de dados exportáveis ImportableDatas=Conjunto de dados importaveis SelectExportDataSet=Escolha um conjunto predefinido de dados que deseja exportar... SelectImportDataSet=Escolha um conjunto predefinido de dados que deseja importar... +SelectExportFields=Escolha os campos que devem exportar-se, ou escolha um perfil de exportação predefinido SelectImportFields=Escolha campos de arquivo de fonte que você deseja importar e seu campo de destino no banco de dados, movendo-os para cima e para baixo com a seta, ou selecione um perfil de importação pré-definido: NotImportedFields=Os campos de arquivo de origem não importado +SaveExportModel=Guardar este perfil de exportação assim pode reutiliza-lo posteriormente... SaveImportModel=Guardar este perfil de importação assim pode reutiliza-lo posteriormente... +ExportModelName=Nome do perfil de exportação +ExportModelSaved=Perfil de exportação guardado com o nome de %s. +ExportableFields=Campos Exportáveis +ExportedFields=Campos a Exportar ImportModelName=Nome do perfil de importação ImportModelSaved=Perfil de importação guardado com o nome de %s. ImportableFields=Campos Importáveis ImportedFields=Campos a Importar +DatasetToExport=Conjunto de dados a exportar DatasetToImport=Conjunto de dados a importar NoDiscardedFields=Não há campos em arquivo de origem são descartados +Dataset=Conjunto de Dados +ChooseFieldsOrdersAndTitle=Escolha a ordem dos campos... +FieldsOrder=Ordem dos Campos +FieldsTitle=Título Campos FieldOrder=Ordem de campo +FieldTitle=Campo título +ChooseExportFormat=Escolha o formato de exportação NowClickToGenerateToBuildExportFile=Agora, faça click em "Gerar" para gerar o arquivo exportação... +AvailableFormats=Formatos Disponíveis +LibraryShort=Biblioteca LibraryUsed=Bibliotéca Utilizada +LibraryVersion=Versão +Step=Passo +FormatedImport=Assistente de Importação +FormatedImportDesc1=Esta área permite realizar importações personalizadas de dados mediante um ajudante que evita ter conhecimentos técnicos de Dolibarr. 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 +FormatedExportDesc1=Esta área permite realizar exportações personalizadas dos dados mediante um ajudante que evita ter conhecimentos técnicos de Dolibarr. FormatedExportDesc2=O primeiro passo consiste em escolher um dos conjuntos de dados predefinidos, a continuação escolher os campos que quer exportar para o arquivo e em que ordem. FormatedExportDesc3=Uma vez selecionados os dados, é possível escolher o formato do arquivo de exportação gerado. +Sheet=Folha NoImportableData=Não existe tipo de dados importavel (não existe nenhum módulo com definições de dados importavel ativado) FileSuccessfullyBuilt=Arquivo de exportação gerado SQLUsedForExport=Pedido de SQL usado para construir exportação de arquivo @@ -30,13 +56,17 @@ LineTotalHT=Valor do HT por linha LineTotalTTC=Acrescido de ICMS da linha LineTotalVAT=Valor ICMS por Linha TypeOfLineServiceOrProduct=Tipo de Linha (0 +FileWithDataToImport=Arquivo com os dados de importação FileToImport=Arquivo de origem de importação FileMustHaveOneOfFollowingFormat=Arquivo para importação deve ter um dos seguinte formato DownloadEmptyExample=Baixar exemplo de arquivo de origem vazio ChooseFormatOfFileToImport=Escolha o formato de arquivo a ser usado como formato de arquivo de importação clicando no para selecioná-lo ... ChooseFileToImport=Carregar arquivo e clique no picto% s para selecionar o arquivo como arquivo de importação de fonte ... +SourceFileFormat=Formato de arquivo de origem FieldsInSourceFile=Campos em arquivo de origem FieldsInTargetDatabase=Campos de destino no banco de dados Dolibarr (negrito = obrigatório) +Field=Campo +NoFields=Nenhum campo MoveField=Mover campo número da colunas ExampleOfImportFile=Exemplo de arquivo de importação SaveImportProfile=Guardar este perfil de importação @@ -48,10 +78,13 @@ TableTarget=Alvo FieldTarget=Campo de destino FieldSource=Campo Fonte DoNotImportFirstLine=Não importar primeira linha de arquivo de origem +NbOfSourceLines=Número de linhas no arquivo de origem NowClickToTestTheImport=Verifique os parâmetros de importação que você definiu. Se eles estiverem corretos, clique no botão "% s" para iniciar uma simulação do processo de importação (os dados não serão alterados em seu banco de dados, é apenas uma simulação para o momento) ... +RunSimulateImportFile=Inicie a simulação de importação FieldNeedSource=Este campo requer dados do arquivo de origem SomeMandatoryFieldHaveNoSource=Alguns campos obrigatórios não têm nenhuma fonte de arquivo de dados InformationOnSourceFile=Informações sobre arquivo de origem +InformationOnTargetTables=Informações sobre os campos de destino SelectAtLeastOneField=Mude pelo menos um campo de origem na coluna de campos para exportar SelectFormat=Escolha este formato de arquivo de importação RunImportFile=Arquivo de importação de lançamento @@ -61,6 +94,7 @@ ErrorMissingMandatoryValue=Dados obrigatórios esta vazio no arquivo de origem p TooMuchErrors=Há ainda outras linhas de origem com erros mas a produção tem sido limitado. TooMuchWarnings=Há ainda outras linhas de origem com avisos, mas a produção tem sido limitado. EmptyLine=Linha vazia (serão descartados) +CorrectErrorBeforeRunningImport=Primeiro, você deve corrigir todos os erros antes de executar a importação definitiva. FileWasImported=O arquivo foi importado com o números. YouCanUseImportIdToFindRecord=Você pode encontrar todos os registros importados em seu banco de dados, filtrando em campo import_key. NbOfLinesOK=Número de linhas sem erros e sem avisos: @@ -72,21 +106,29 @@ DataComeFromIdFoundFromCodeId=O código que vem de número do campo do arquivo d DataIsInsertedInto=Dados provenientes do arquivo de origem será inserido o seguinte campo: DataIDSourceIsInsertedInto=O id do objeto pai encontrado usando os dados em arquivo de origem, será inserido o seguinte campo: DataCodeIDSourceIsInsertedInto=O ID da linha pai encontrado a partir do código, será inserido no campo a seguir: +SourceRequired=Valor dos dados é obrigatória SourceExample=Exemplo de possível valor dos dados ExampleAnyRefFoundIntoElement=Qualquer ref encontrada para o elemento ExampleAnyCodeOrIdFoundIntoDictionary=Qualquer código (ou id) encontrado em dicionário -CSVFormatDesc=Formato de arquivo de valores separados por vírgulas . Este é um formato de arquivo de texto, onde os campos são separados pelo separador. Se separador é encontrado dentro de um conteúdo de campo, o campo é arredondado pelo caráter rodada . Fuja personagem para escapar caráter rodada é +CSVFormatDesc=Formato de arquivo de valores separados por vírgulas . Este é um formato de arquivo de texto, onde os campos são separados pelo separador. Se separador é encontrado dentro de um conteúdo de campo, o campo é arredondado pelo caráter rodada . Fuja personagem para escapar caráter rodada é Excel95FormatDesc=Formato de arquivo do Excel. (Xls) Este é o formato Excel 95 nativa (BIFF5). Excel2007FormatDesc=Formato de arquivo do Excel (. Xlsx) Este é o formato Excel 2007 nativo (SpreadsheetML). TsvFormatDesc=Formato de arquivo Tab Separated Value (. TSV) Este é um formato de arquivo de texto, onde os campos são separados por um tabulador [Tab]. ExportFieldAutomaticallyAdded=O campo foi adicionado automaticamente. Ele vai evitar que você tenha linhas semelhantes a serem tratados como registros duplicados (com este campo adicionado, todas as linhas serão possuem seu próprio ID e será diferente). CsvOptions=Opções csv +Separator=Separador Enclosure=Recinto SuppliersProducts=Fornecedores Produtos +BankCode=Código Banco +DeskCode=Código Balcão +BankAccountNumber=Número de conta +BankAccountNumberKey=Dígito Control SpecialCode=Código especial ExportStringFilter=Permite substituir um ou mais caracteres no texto ExportDateFilter='AAAA' YYYYMM 'AAAAMMDD': filtros em um ano / mês / dia
'AAAA + AAAA' YYYYMM + YYYYMM 'AAAAMMDD + AAAAMMDD': filtros mais uma série de anos / meses / dias
> AAAA ''> YYYYMM ''> AAAAMMDD ': filtros nos seguintes anos / meses / dias
' filtros "NNNNN + NNNNN 'mais de uma faixa de valores
'> NNNNN' filtros por valores mais baixos
'> NNNNN' filtros por valores mais elevados +## filters SelectFilterFields=Se você deseja filtrar alguns valores, apenas os valores de entrada aqui. +FilterableFields=Champs Filtrables FilteredFields=Campos filtrados FilteredFieldsValues=Valor para o filtro diff --git a/htdocs/langs/pt_BR/externalsite.lang b/htdocs/langs/pt_BR/externalsite.lang index f0669dcd138..6999e5d2f56 100644 --- a/htdocs/langs/pt_BR/externalsite.lang +++ b/htdocs/langs/pt_BR/externalsite.lang @@ -1,4 +1,4 @@ # Dolibarr language file - Source file is en_US - externalsite -ExternalSiteSetup=Link configuraçao ao site externo +ExternalSiteSetup=Link configuraçao ao site externo ExternalSiteURL=URL site externo ExternalSiteModuleNotComplete=Modulo SiteExterno nao foi configurado corretamente. diff --git a/htdocs/langs/pt_BR/ftp.lang b/htdocs/langs/pt_BR/ftp.lang index b388a7474cb..50e84ff872f 100644 --- a/htdocs/langs/pt_BR/ftp.lang +++ b/htdocs/langs/pt_BR/ftp.lang @@ -9,3 +9,4 @@ FailedToConnectToFTPServer=Falha na conexão ao servidor FTP (server% s, porta% FailedToConnectToFTPServerWithCredentials=Falha ao efetuar login no servidor FTP com login/senha FTPFailedToRemoveFile=Falha ao remover o arquivo %s. FTPFailedToRemoveDir=Falha ao remover diretório %s (verifique as permissões e se o diretório está vazio). +FTPPassiveMode=Modo passivo diff --git a/htdocs/langs/pt_BR/help.lang b/htdocs/langs/pt_BR/help.lang index 6e92cbfd935..ac681075712 100644 --- a/htdocs/langs/pt_BR/help.lang +++ b/htdocs/langs/pt_BR/help.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - help -CommunitySupport=Fórum/Wiki suporte +CommunitySupport=Fórum/Wiki suporte EMailSupport=E-mails de suporte RemoteControlSupport=Suporte em tempo real / remoto OtherSupport=Outros suportes @@ -9,12 +9,15 @@ HelpCenter=Central de ajuda DolibarrHelpCenter=Centro de suporte e ajuda Dolibarr ToGoBackToDolibarr=Caso contrário, clique aqui para usar Dolibarr TypeOfSupport=Fonte de suporte +TypeSupportCommunauty=Comunidade (grátis) +TypeSupportCommercial=Comercial +TypeOfHelp=Tipo NeedHelpCenter=Precisa de ajuda ou suporte ? Efficiency=eficiência TypeHelpOnly=Somente ajuda TypeHelpDev=Ajuda+Desenvolvimento TypeHelpDevForm=Ajuda+Desenvolvimento+Formação -ToGetHelpGoOnSparkAngels1=Algumas empresas podem prover um suporte online rápido (às vezes imediato) e mais eficiente ao assumirem o controle de seu computador. Tais ajudantes podem ser encontrados na página %s: +ToGetHelpGoOnSparkAngels1=Algumas empresas podem prover um suporte online rápido (às vezes imediato) e mais eficiente ao assumirem o controle de seu computador. Tais ajudantes podem ser encontrados na página %s: ToGetHelpGoOnSparkAngels3=Você também pode acessar a lista de todos os treinadores disponíveis para o Dolibarr, para isto clique no botão ToGetHelpGoOnSparkAngels2=Às vezes, não há nenhuma empresa disponível no momento de fazer sua pesquisa, por isso acho que para mudar o filtro para procurar "tudo disponibilidade". Você será capaz de enviar mais pedidos. BackToHelpCenter=Caso contrário, clique aqui para ir para trás para ajudar a home page . diff --git a/htdocs/langs/pt_BR/holiday.lang b/htdocs/langs/pt_BR/holiday.lang index f38f71b6a06..bd3f3d02f2f 100644 --- a/htdocs/langs/pt_BR/holiday.lang +++ b/htdocs/langs/pt_BR/holiday.lang @@ -8,14 +8,19 @@ NotActiveModCP=Vocẽ tem que habilitar o modulo de ferias para ver esta pagina. NotConfigModCP=Você precisa configurar o modulo de ferias para ver esta pagina. Para faze-lo, clickque aqui . NoCPforUser=Voce nao tem demandado as ferias. AddCP=Aplique-se para as ferias. +Employe=Empregado DateDebCP=Data inicio DateFinCP=Data fim DateCreateCP=Data criacão +DraftCP=Rascunho ToReviewCP=Aguardando aprovação +ApprovedCP=Aprovado +CancelCP=Cancelado RefuseCP=Negado ValidatorCP=Aprovador ListeCP=Lista de feriados ReviewedByCP=Sera revisado por +DescCP=Descrição SendRequestCP=Criando demanda para ferias DelayToRequestCP=Demandas para ferias teram que ser feitas no minimo %s dias antes. MenuConfCP=Editar balancete das ferias @@ -29,10 +34,15 @@ ErrorUserViewCP=Você não está autorizado a ler essa requisição de férias. InfosCP=Informações da demanda das férias InfosWorkflowCP=Fluxo de Trabalho de Informação RequestByCP=Requisitado por +TitreRequestCP=Folha de férias NbUseDaysCP=Número de dias utilizados das férias +EditCP=Editar DeleteCP=Eliminar ActionValidCP=Confirmar ActionRefuseCP=Não autorizar +ActionCancelCP=Cancelar +StatutCP=Estado +SendToValidationCP=Enviar para validação TitleDeleteCP=Apagar a requisição de férias ConfirmDeleteCP=Confirme a eliminação deste pedido para férias? ErrorCantDeleteCP=Você não tem privilégios para apanhar essa requisição de férias @@ -45,6 +55,7 @@ NoDateFin=Você deve selecionar uma data final. ErrorDureeCP=O seu pedido de férias não contém dia de trabalho. TitleValidCP=Aprovar a requisição de férias ConfirmValidCP=Você tem certeza que deseja aprovar a requisição de férias? +DateValidCP=Data aprovada TitleToValidCP=Enviar requisição de férias ConfirmToValidCP=Você tem certeza que deseja enviar a requisição de férias? TitleRefuseCP=Não autorizar a requisição de férias @@ -64,13 +75,19 @@ AddEventToUserOkCP=A adição da licença excepcional tenha sido concluída. MenuLogCP=Ver registos de ferias LogCP=Calculo de atualizações de ferias ActionByCP=Interpretada por +UserUpdateCP=Para o utilizador PrevSoldeCP=Balanço anterior NewSoldeCP=Novo Balanco alreadyCPexist=Um pedido de ferias já foi feito neste período. UserName=Apelidos +Employee=Empregado +FirstDayOfHoliday=Primeiro dia de férias +LastDayOfHoliday=Último dia de férias HolidaysMonthlyUpdate=A atualização mensal ManualUpdate=Atualização manual HolidaysCancelation=Feriados cancelados + +## Configuration du Module ## ConfCP=A configuração do módulo de ferias DescOptionCP=Descrição da opção ValueOptionCP=Valor @@ -87,12 +104,13 @@ AlertValidorSoldeCP=Impedir a aprovador se o pedido de férias exceder o equilí nbUserCP=Número de usuários suportados nas férias de módulo nbHolidayDeductedCP=Número de feriados a ser deduzido por dia de feriado tomado nbHolidayEveryMonthCP=Número de feriados adicionados a cada mês -Module27130Name=Gestão das férias -Module27130Desc=Gestão das férias +Module27130Name= Gestão das férias +Module27130Desc= Gestão das férias TitleOptionMainCP=Principais configurações de ferias TitleOptionEventCP=Configurações de feriados relacionados a eventos ValidEventCP=Confirmar UpdateEventCP=Eventos de atualização +CreateEventCP=Criar NameEventCP=Nome do evento OkCreateEventCP=A adição do evento correu bem. ErrorCreateEventCP=Erro ao criar o evento. @@ -109,6 +127,9 @@ UpdateEventOptionCP=Modificar ErrorMailNotSend=Ocorreu um erro durante o envio de e-mail: NoCPforMonth=Não deixe este mês. nbJours=Número de dias +TitleAdminCP=Configuração de Férias +#Messages +Hello=Olá HolidaysToValidate=Validar feriados HolidaysToValidateBody=Abaixo está um pedido de férias para validar HolidaysToValidateDelay=Este pedido de ferias terá lugar dentro de um período de menos dias. @@ -118,7 +139,7 @@ HolidaysValidatedBody=O seu pedido de ferias foi validado. HolidaysRefused=Feriados negados HolidaysRefusedBody=O seu pedido de ferias foi negado pelo seguinte motivo: HolidaysCanceled=Feriados cancelados -HolidaysCanceledBody=O seu pedido de ferias foi cancelada. +HolidaysCanceledBody=O seu pedido de ferias foi cancelada. Permission20000=Leia você próprios feriados Permission20001=Criar / modificar as suas férias Permission20002=Criar / modificar feriados para todos diff --git a/htdocs/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang index 18726415589..216b5905732 100644 --- a/htdocs/langs/pt_BR/install.lang +++ b/htdocs/langs/pt_BR/install.lang @@ -1,6 +1,7 @@ # Dolibarr language file - Source file is en_US - install InstallEasy=Tentámos tornar a instalação do Dolibarr o mais fácil possível. É favor seguir as instruções passo-a-passo. MiscellaneousChecks=Checkando pré-requisitos +DolibarrWelcome=Bem-vindo ao Dolibarr ConfFileExists=O arquivo de configuração conf.php existe. ConfFileDoesNotExists=Arquivo de configuração %s não existe! ConfFileDoesNotExistsAndCouldNotBeCreated=Arquivo de configuração %s não existe e não poderia ser criado! @@ -11,7 +12,13 @@ ConfFileReload=Recarregar todas as informaçoes do arquivo de configuraçao. PHPSupportSessions=Esta PHP suporta sessões. PHPSupportPOSTGETOk=Esta PHP suporta variáveis GET e POST. PHPSupportPOSTGETKo=É possível configurar o PHP não suporta variáveis POST e / ou GET. Verifique se o seu parâmetro variables_order em php.ini. +PHPSupportGD=Este suporte PHP GD gráfica funções. +PHPSupportUTF8=Este suporte PHP UTF8 funções. +PHPMemoryOK=Seu PHP max sessão memória está definido para %s. Isto deve ser suficiente. PHPMemoryTooLow=Seu PHP max sessão memória está definido para %s bytes. Isto deve ser muito baixo. Alterar o seu php.inem memory_limit para definir parâmetro para pelo menos %s bytes. +Recheck=Clique aqui para um teste mais significativo +ErrorPHPDoesNotSupportSessions=Sua instalação não suporta PHP sessões. Esta característica é necessária para tornar Dolibarr trabalho. Verifique a sua configuração do PHP. +ErrorPHPDoesNotSupportGD=Sua instalação PHP não suporta gráficos função GD. Não gráfico estarão disponíveis. ErrorPHPDoesNotSupportUTF8=Sua instalação PHP não suporta UTF8 funções. Dolibarr pode não funcionar corretamente. Resolva este antes de instalar Dolibarr. ErrorDirDoesNotExists=Diretório %s não existe. ErrorGoBackAndCorrectParameters=Ir para trás e corrigir errado parâmetros. @@ -26,14 +33,25 @@ ErrorDatabaseAlreadyExists=Base de dados' %s' já existe. IfDatabaseNotExistsGoBackAndUncheckCreate=Se não existe base de dados, volte e verifique a opção "Criar uma base de dados". IfDatabaseExistsGoBackAndCheckCreate=Caso dados já existe, volte e desmarque "Criar uma base de dados" opção. WarningBrowserTooOld=Navegador antigo. Faça a atualizaçao do seu navegador para uma versao mais recente de Firefox, Chrome ou Opera, e altamente recomendado. +PHPVersion=Versão PHP YouCanContinue=Pode continuar... +PleaseBePatient=Por favor, seja paciente ... License=A usar licença ConfigurationFile=Arquivo de configuração WebPagesDirectory=Directoria onde armazenar as páginas web DocumentsDirectory=Directoria onde armazenar documentos enviados e/ou gerados +URLRoot=URL de raiz ForceHttps=Forcar conexoes seguras (https) CheckToForceHttps=Escolha esta opcao para forcar conexoes seguras (https).
Isto requere que o servidor web esta configurado para uso com certificado SSL. DolibarrDatabase=Base de dados Dolibarr +DatabaseChoice=Escolha de base de dados +DatabaseType=Tipo de base de dados +DriverType=Driver tipo +Server=Servidor +ServerAddressDescription=Nome ou endereço IP para o servidor de dados, normalmente 'localhost' ao banco de dados está hospedado no mesmo servidor que servidor web +ServerPortDescription=Database server port. Mantenha vazio se desconhecido. +DatabaseServer=Database server +DatabaseName=Nome da base de dados DatabasePrefix=Prefixo tabela banco de dados Login=Login AdminLogin=Login para o administrador da base de dados Dolibarr. Deixar em branco se a conexão é feita com anônimo @@ -41,8 +59,12 @@ Password=Password PasswordAgain=Introduza a password uma segunda vez AdminPassword=Password para o administrador da base de dados Dolibarr. Deixar em branco se a conexão é feita com anônimo CreateDatabase=Criar uma base de dados +CreateUser=Criar usuário DatabaseSuperUserAccess=Base de dados - Acesso Superuser +CheckToCreateDatabase=Verifique se caixa de dados não existe e deve ser criado.
Neste caso, você deve preencher o login / senha para o superusuário em conta, na parte inferior desta página. +CheckToCreateUser=Caixa de login, se não existe e deve ser criado.
Neste caso, você deve preencher o login / senha para o superusuário em conta, na parte inferior desta página. Experimental=(experimental, não operacional) +DatabaseRootLoginDescription=Login do usuário permissão para criar novas bases de dados ou de novos usuários, inútil se o seu banco de dados e seu banco de dados já existe login (como quando você está hospedado por um provedor de hospedagem da web). KeepEmptyIfNoPassword=Deixar em branco se o usuário não tiver password SaveConfigurationFile=Gravar configuração ConfigurationSaving=A gravar... @@ -51,35 +73,72 @@ DatabaseConnection=Conexão à base de dados DatabaseCreation=Database criação UserCreation=Usuário criação CreateDatabaseObjects=Criação dos objetos na base de dados... +ReferenceDataLoading=Dados de base a carregar... TablesAndPrimaryKeysCreation=Tabelas e chaves primárias criação +CreateTableAndPrimaryKey=Criar tabela %s +CreateOtherKeysForTable=Crie chaves estrangeiras e índices para a tabela %s +OtherKeysCreation=Chaves estrangeiras e índices criação +FunctionsCreation=Funções criação AdminAccountCreation=A criar login do Administradore PleaseTypePassword=Por favor escreva uma password, passwords vazias não são permitidas ! PleaseTypeALogin=Por favor escreva um login ! PasswordsMismatch=As passwords diferem, tente novamente sff ! +SetupEnd=Fim da Configuração SystemIsInstalled=Instalação completa. SystemIsUpgraded=Dolibarr foi atualizado com êxito. +YouNeedToPersonalizeSetup=Agora necessita de configurar o Dolibarr por forma a corresponder às suas necessidades (aspecto, funcionalidades, ...). Para tal clique no seguinte link: AdminLoginCreatedSuccessfuly=Login de Administrador criado com sucesso. GoToDolibarr=Vai para Dolibarr GoToSetupArea=Prosseguir para a área de configuração MigrationNotFinished=A versao do banco de dados nao e competamente atualizada, voce tera que aviar o processo de atualizacao novamente. GoToUpgradePage=Vai para a pagina de atualizaçao novamente +Examples=Exemplos +WithNoSlashAtTheEnd=Sem a barra "/" no final DirectoryRecommendation=É recomendado que você ponha esta directry das páginas da web diretório. +LoginAlreadyExists=Já existe DolibarrAdminLogin=Dolibarr admin login AdminLoginAlreadyExists=Dolibarr conta administrador ' %s' já existe. WarningRemoveInstallDir=Atenção, por razões de segurança, uma vez que a instalação ou atualização estiver completa, você deve remover o diretório de instalação ou renomeá-lo para install.lock a fim de evitar o seu uso malicioso. ThisPHPDoesNotSupportTypeBase=PHP Este sistema não suporta qualquer tipo de interface para acesso de dados %s +FunctionNotAvailableInThisPHP=Não disponível neste PHP +MigrateScript=Migrar script +ChoosedMigrateScript=Escolhido migrar script +DataMigration=Migração de dados DatabaseMigration=Estrutura migração de dados +ProcessMigrateScript=Script transformação +ChooseYourSetupMode=Escolha o seu modo de configuração e clique em "Iniciar" ... FreshInstall=Fresh instalar +FreshInstallDesc=Utilize este modo, se esta for a primeira instalação. Se não, este modo pode reparar uma instalação anterior incompleto, mas se você deseja atualizar sua versão, selecione "Atualizar" modo. +Upgrade=Upgrade UpgradeDesc=Use este modo se você tiver substituído Dolibarr antigos arquivos com arquivos de uma versão mais recente. Isto irá atualizar o seu banco de dados e dados. +Start=Iniciar InstallNotAllowed=Instalação não permitidas pela conf.php permissões +NotAvailable=Não disponível YouMustCreateWithPermission=Você deve criar o arquivo %s e definir permissões escrever sobre ele para instalar o servidor web durante o processo. CorrectProblemAndReloadPage=Corrija o problema e pressione a tecla F5 para recarregar página. +AlreadyDone=Já migrou DatabaseVersion=Database versão ServerVersion=Database server version YouMustCreateItAndAllowServerToWrite=Você deve criar este diretório e para permitir que o servidor da web para escrever nela. CharsetChoice=Conjunto de caracteres escolha +CharacterSetClient=Conjunto de caracteres utilizados para páginas HTML geradas +CharacterSetClientComment=Escolher conjunto de caracteres para exibir na web.
Padrão proposto um conjunto de caracteres é o do seu banco de dados. +DBSortingCollation=Caracteres triagem fim +DBSortingCollationComment=Escolha página código que define o caráter triagem fim utilizado por base de dados. Este parâmetro é também chamado de "recolha" por alguns bancos de dados.
Esse parâmetro não pode ser definido se de dados já existe. +CharacterSetDatabase=Conjunto de caracteres para o banco de dados +CharacterSetDatabaseComment=Escolher conjunto de caracteres queria para o banco de dados criação.
Esse parâmetro não pode ser definido se de dados já existe. +YouAskDatabaseCreationSoDolibarrNeedToConnect=Você pergunta para criar base de dados %s, mas, para isso, Dolibarr necessidade de se conectar ao servidor com o super-usuário %s %s permissões. +YouAskLoginCreationSoDolibarrNeedToConnect=Você pergunta para criar base de dados login %s, mas, para isso, Dolibarr necessidade de se conectar ao servidor com o super-usuário %s %s permissões. +BecauseConnectionFailedParametersMayBeWrong=Como conexão falhou, de acolhimento ou super usuário parâmetros devem ser errado. +OrphelinsPaymentsDetectedByMethod=Orphelins pagamento detectado pelo método %s +RemoveItManuallyAndPressF5ToContinue=Removê-lo manualmente e pressione F5 para continuar. +KeepDefaultValuesWamp=Você usa o DoliWamp Setup Wizard, para valores propostos aqui já estão otimizados. Alterá-los apenas se souber o que você faz. KeepDefaultValuesDeb=Voce esta usando o assistente de configuração do Dolibarr do pacote Linux (Ubuntu, Debian, Fedora...), portanto os valores propostos aqui estao ja optimizados. O unico parametro a se completar e a senha do administrador de banco de dados. Mude outros parametros somente se voce sabe o que esta fazendo. +KeepDefaultValuesMamp=Você usa o DoliMamp Setup Wizard, para valores propostos aqui já estão otimizados. Alterá-los apenas se souber o que você faz. KeepDefaultValuesProxmox=Voçê esta usando o asistente de configuração do Dolibarr da Proxmox aplicação virtual, portanto os valores propostos aqui estão ja otimizados. Mude-os somente se voçê sabe o que esta fazendo. +FieldRenamed=Campo renomeado +IfLoginDoesNotExistsCheckCreateUser=Se login não existe ainda, você deve verificar a opção "Criar usuário" +ErrorConnection=Servidor " %s", nome do banco de dados " %s", login " %s", ou banco de dados senha pode estar errado ou PHP versão cliente pode ser muito velho para comparação de dados versão. InstallChoiceRecommanded=Versao recomendada para instalação %s da sua versao corrente %s InstallChoiceSuggested=Escolha sugerida pelo sistema de installação MigrateIsDoneStepByStep=A versão (%s) alvo tem uma lacuna de varias versões, portanto o asistente de instalação retornara com a sugestão seguinte apos terminado esta instalação. @@ -96,26 +155,47 @@ MigrationFinished=Migração terminada LastStepDesc=Ultimo passo: Defina aqui o usuario e a senha que voce planeja usar para conectar-se ao software. Nao perca estas credenciais, pois sao da conta que administra todas as outras contas. ActivateModule=Ativar modulo %s ShowEditTechnicalParameters=Clique aqui para mostrar/editar parametros avançados (modo avançado) + +######### +# upgrade MigrationFixData=Correção para dados não normalizados +MigrationOrder=Migração de dados para os clientes "ordens +MigrationSupplierOrder=Migração de dados de Fornecedores' ordens MigrationProposal=Migração de dados de propostas comerciais MigrationInvoice=Migração de dados para os clientes "faturas +MigrationContract=Migração de dados para os contratos +MigrationSuccessfullUpdate=Atualização bem sucedida MigrationUpdateFailed=Falied atualizar processo MigrationRelationshipTables=Migração de dados para as tabelas de relação (%s) +MigrationPaymentsUpdate=Pagamento correção de dados +MigrationPaymentsNumberToUpdate=%s pagamento (s) para atualizar +MigrationProcessPaymentUpdate=Atualização pagamento (s) %s +MigrationPaymentsNothingToUpdate=Não há mais coisas para fazer MigrationPaymentsNothingUpdatable=Não mais pagamentos que podem ser corrigidos MigrationContractsUpdate=Contrato correção de dados +MigrationContractsNumberToUpdate=%s contrato (s) para atualizar +MigrationContractsLineCreation=Criar uma linha de contrato contrato ref %s +MigrationContractsNothingToUpdate=Não há mais coisas para fazer +MigrationContractsFieldDontExist=Campo fk_facture não existe mais. Nada a fazer. MigrationContractsEmptyDatesUpdate=Contrato vazio data correção MigrationContractsEmptyDatesUpdateSuccess=Contrato emtpy data correção feita com sucesso MigrationContractsEmptyDatesNothingToUpdate=Nenhum contrato vazio data para corrigir +MigrationContractsEmptyCreationDatesNothingToUpdate=Nenhum contrato data de criação para corrigir MigrationContractsInvalidDatesUpdate=Bad data valor contrato correção MigrationContractsInvalidDateFix=Corret contrato %s (Contrato date +MigrationContractsInvalidDatesNumber=%s contratos modificados MigrationContractsInvalidDatesNothingToUpdate=Não data com valor negativo para corrigir MigrationContractsIncoherentCreationDateUpdate=Bad valor contrato data de criação correção MigrationContractsIncoherentCreationDateUpdateSuccess=Bad valor contrato data de criação correção feita com sucesso MigrationContractsIncoherentCreationDateNothingToUpdate=Não mau contrato data de criação de valor para corrigir MigrationReopeningContracts=Abrir contrato encerrado pelo erro +MigrationReopenThisContract=Reabra contrato %s +MigrationReopenedContractsNumber=%s contratos modificados MigrationReopeningContractsNothingToUpdate=Não encerrado contrato para abrir MigrationBankTransfertsUpdate=Atualizar vínculos entre banco e uma transação bancária transferência +MigrationBankTransfertsNothingToUpdate=Todas as ligações são até à data MigrationShipmentOrderMatching=Sendings recepção atualização +MigrationDeliveryOrderMatching=Entrega recepção atualização MigrationDeliveryDetail=Entraga atualizada MigrationStockDetail=Atualizar valores do estoque dos produtos MigrationMenusDetail=Atualize menus das tabelas dinâmicas @@ -125,5 +205,7 @@ MigrationProjectUserResp=Dados da migração do campo fk_user_resp de llx_projet MigrationProjectTaskTime=Atualizar tempo gasto em sgundos MigrationActioncommElement=Atualizar dados nas ações MigrationPaymentMode=Migração de dados para o modo de pagamento +MigrationCategorieAssociation=Migração de categorias + ShowNotAvailableOptions=Mostrar as opções não disponíveis HideNotAvailableOptions=Esconder as opção não disponível diff --git a/htdocs/langs/pt_BR/interventions.lang b/htdocs/langs/pt_BR/interventions.lang index bfd7757fb23..2019b1645c0 100644 --- a/htdocs/langs/pt_BR/interventions.lang +++ b/htdocs/langs/pt_BR/interventions.lang @@ -1,18 +1,40 @@ # Dolibarr language file - Source file is en_US - interventions +Intervention=Intervenção +Interventions=Intervenções +InterventionCard=Ficha de Intervenção +NewIntervention=Nova Intervenção +AddIntervention=Criar Intervenção +ListOfInterventions=Lista de Intervenções +EditIntervention=Editar ActionsOnFicheInter=Açoes na intervençao +LastInterventions=As %s últimas Intervenções +AllInterventions=Todas as Intervenções +CreateDraftIntervention=Criar Rascunho CustomerDoesNotHavePrefix=O cliente não tem prefixoo de definido InterventionContact=Contato Intervenção +DeleteIntervention=Eliminar Intervenção +ValidateIntervention=Confirmar Intervenção ModifyIntervention=Modificar intervençao +DeleteInterventionLine=Eliminar Linha de Intervenção ConfirmDeleteIntervention=Tem certeza que quer eliminar esta intervenção? ConfirmValidateIntervention=Tem certeza que quer Confirmar esta intervenção? ConfirmModifyIntervention=Tem certeza que quer modificar esta intervenção? ConfirmDeleteInterventionLine=Tem certeza que quer eliminar esta linha? +NameAndSignatureOfInternalContact=Nome e Assinatura do Participante: +NameAndSignatureOfExternalContact=Nome e Assinatura do Cliente: +DocumentModelStandard=Modelo da Norma Intervenção +InterventionCardsAndInterventionLines=Fichas e Linhas de Intervenção +ClassifyBilled=Clasificar "Faturado" StatusInterInvoiced=Faturado RelatedInterventions=Intervençoes relativas ShowIntervention=Mostrar intervençao +##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Responsável do Seguimento da Intervenção +TypeContact_fichinter_internal_INTERVENING=Interveniente TypeContact_fichinter_external_BILLING=Contato do cliente da faturação da intervenção TypeContact_fichinter_external_CUSTOMER=Contato do cliente do seguimento da intervenção +# Modele numérotation +ArcticNumRefModelDesc1=Modelo de numeração genérico ArcticNumRefModelError=Ativação Impossível PacificNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn onde yy é o ano, mm. O mês e nnnn um contador seq�êncial sem ruptura e sem ficar a 0 PacificNumRefModelError=Uma fatura que começa por # $$syymm existe na base e é incompativel com esta numeração. Eliminia ou renomea-la para ativar este módulo. diff --git a/htdocs/langs/pt_BR/languages.lang b/htdocs/langs/pt_BR/languages.lang index b6de66e3bb3..c237b9e8daf 100644 --- a/htdocs/langs/pt_BR/languages.lang +++ b/htdocs/langs/pt_BR/languages.lang @@ -1,7 +1,9 @@ # Dolibarr language file - Source file is en_US - languages + Language_ar_AR=Arabe Language_ar_SA=Arabe Language_bg_BG=Bulgaro +Language_bs_BA=Bósnio Language_ca_ES=Catalao Language_cs_CZ=Tcheco Language_da_DA=Danes @@ -9,33 +11,61 @@ Language_da_DK=Danes Language_de_DE=Alemao Language_de_AT=Alemao (Austria) Language_de_CH=Alemão (Suíça) +Language_el_GR=Grego Language_en_AU=Ingles (Australia) Language_en_GB=Ingles (Renho Unido) Language_en_IN=Ingles (India) Language_en_NZ=Ingles (Nova Zelandia) Language_en_SA=Ingles (Arabia Saudita) Language_en_US=Ingles (Estados Unidos) +Language_en_ZA=Inglês (África do Sul) +Language_es_ES=Espanhol Language_es_DO=Espanhol (República Dominicana) +Language_es_AR=Espanhol (Argentina) Language_es_CL=Espanhol (Chile) +Language_es_HN=Espanhol (Honduras) Language_es_MX=Espanhol (Mexico) +Language_es_PY=Espanhol (Paraguai) +Language_es_PE=Espanhol (Peru) +Language_es_PR=Espanhol (Porto Rico) Language_et_EE=Estone +Language_eu_ES=Basco Language_fa_IR=Persio Language_fi_FI=Finlandes Language_fr_BE=Fançes (Belgica) Language_fr_CA=Françes (Canada) Language_fr_CH=Françes (Suiça) Language_fr_FR=Françes +Language_fr_NC=Francês (Nova Caledónia) Language_he_IL=Ebreo +Language_hr_HR=Croata Language_hu_HU=Ungeres Language_id_ID=Indonésio Language_is_IS=Islandes +Language_it_IT=Italiano Language_ja_JP=Japones +Language_ko_KR=Coreano +Language_lt_LT=Lituano +Language_lv_LV=Letão +Language_mk_MK=Macedónio Language_nb_NO=Norveges (Bokmal) +Language_nl_BE=Holandês (Bélgica) Language_nl_NL=Holandês (Holanda) Language_pl_PL=Polones Language_pt_BR=Portugues (Brasil) Language_pt_PT=Portugues +Language_ro_RO=Romeno +Language_ru_RU=Russo Language_ru_UA=Russo (Ukrania) +Language_tr_TR=Turco +Language_sl_SI=Esloveno +Language_sv_SV=Sueco +Language_sv_SE=Sueco +Language_sq_AL=Albanês +Language_sk_SK=Eslovaco Language_th_TH=Thai +Language_uk_UA=Ucraniano +Language_uz_UZ=Uzbeque +Language_vi_VN=Vietnamita Language_zh_CN=Chines Language_zh_TW=Chines (Tradicional) diff --git a/htdocs/langs/pt_BR/ldap.lang b/htdocs/langs/pt_BR/ldap.lang index 53e5d6957a5..bad6ddd0bba 100644 --- a/htdocs/langs/pt_BR/ldap.lang +++ b/htdocs/langs/pt_BR/ldap.lang @@ -7,10 +7,23 @@ LdapUacf_DONT_EXPIRE_PASSWORD=A senha não caduca LdapUacf_ACCOUNTDISABLE=A conta está desativada ao domínio LDAPInformationsForThisContact=Informação da base de dados LDAP deste contato LDAPInformationsForThisUser=Informação da base de dados LDAP deste usuário +LDAPInformationsForThisGroup=Informação da base de dados LDAP deste grupo +LDAPInformationsForThisMember=Informação da base de dados LDAP deste membro +LDAPAttribute=Atributo LDAP +LDAPAttributes=Atributos LDAP +LDAPCard=Ficha LDAP +LDAPRecordNotFound=Registo não encontrado na base de dados LDAP LDAPUsers=Usuário na base de dados LDAP +LDAPGroups=Grupos na base de dados LDAP +LDAPFieldStatus=Estatuto +LDAPFieldFirstSubscriptionDate=Data primeira adesão LDAPFieldFirstSubscriptionAmount=Valor da Primeira Adesão LDAPFieldLastSubscriptionDate=Data da Última Adesão LDAPFieldLastSubscriptionAmount=Valor Última Adesão SynchronizeDolibarr2Ldap=Sincronizar usuário (Dolibarr -> LDAP) UserSynchronized=Usuário Sincronizado +GroupSynchronized=Grupo sincronizado +MemberSynchronized=Membro sincronizado +ContactSynchronized=Contato sincronizado +ForceSynchronize=forçar sincronização Dolibarr -> LDAP ErrorFailedToReadLDAP=Erro na leitura do anuário LDAP. Verificar a configuração do módulo LDAP e a acessibilidade do anuário. diff --git a/htdocs/langs/pt_BR/link.lang b/htdocs/langs/pt_BR/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/pt_BR/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/pt_BR/mailmanspip.lang b/htdocs/langs/pt_BR/mailmanspip.lang index c557e757950..f19d9b79984 100644 --- a/htdocs/langs/pt_BR/mailmanspip.lang +++ b/htdocs/langs/pt_BR/mailmanspip.lang @@ -1,14 +1,27 @@ # Dolibarr language file - Source file is en_US - mailmanspip -MailmanCreationSuccess=Teste de inscriçao executado com sucesso +MailmanSpipSetup=Configuração do módulo Mailman e SPIP +MailmanTitle=Sistema de envio em massa Mailman +TestSubscribe=Para testar a inscriçao nas listas Mailman +TestUnSubscribe=Para testa a desenscriçao das listas do Mailman +MailmanCreationSuccess=Teste de inscriçao executado com sucesso MailmanDeletionSuccess=Teste de desenscriçao executado com sucesso +SynchroMailManEnabled=O Mailman sera atualizado SynchroSpipEnabled=O SPIP sera atualizado +DescADHERENT_MAILMAN_ADMINPW=Senha do administrador Mailman +DescADHERENT_MAILMAN_URL=URL para inscriçoes Mailman +DescADHERENT_MAILMAN_UNSUB_URL=URL para desenscriçoes Mailman DescADHERENT_MAILMAN_LISTS=Lista(s) para inscriçao automatica de novos membros (separado por virgula) +SPIPTitle=Gerenciamento do conteudo do sistema SPIP +DescADHERENT_SPIP_SERVEUR=Servidor SPIP DescADHERENT_SPIP_DB=Nome do banco de dados SPIP DescADHERENT_SPIP_USER=Login do banco de dados SPIP DescADHERENT_SPIP_PASS=Senha do banco de dados SPIP AddIntoSpip=Adicionar no SPIP AddIntoSpipConfirmation=Tem certeza que quer adicionar este membro no SPIP ? AddIntoSpipError=Falha em adicionar o usuario no SPIP +DeleteIntoSpip=Remover do SPIP DeleteIntoSpipConfirmation=Tem certeza que quer remover este membro do SPIP ? DeleteIntoSpipError=Falha no suprimir o usuario do SPIP SPIPConnectionFailed=Falha na conexao com o SPIP +SuccessToAddToMailmanList=Adicao de %s na lista Mailman %s ou SPIP banco de dados completado +SuccessToRemoveToMailmanList=Remoçao de %s na lista Mailman %s ou SPIP banco de dados completado diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang index c70135df930..a411c0a72da 100644 --- a/htdocs/langs/pt_BR/mails.lang +++ b/htdocs/langs/pt_BR/mails.lang @@ -1,10 +1,47 @@ # Dolibarr language file - Source file is en_US - mails +Mailing=Mailing +EMailing=Mailing +Mailings=Mailings +EMailings=Mailings +AllEMailings=Todos os E-Mailings +MailCard=Ficha de Mailing MailTargets=Destinatários +MailRecipients=Dsetinatarios MailRecipient=Destinatário +MailTitle=Titulo +MailFrom=Remetente +MailErrorsTo=Erros a +MailReply=Responder a MailTo=Destinatário(s) +MailCC=Cópia a +MailCCC=Adicionar Cópia a +MailTopic=Assunto do e-mail +MailText=Mensagem MailFile=Arquivo +MailMessage=Mensagem do e-mail +ShowEMailing=Mostrar E-Mailing +ListOfEMailings=Lista de mailings +NewMailing=Novo Mailing +EditMailing=Editar Mailing ResetMailing=Limpar Mailing +DeleteMailing=Eliminar Mailing +DeleteAMailing=Eliminar um Mailing +PreviewMailing=Previsualizar um Mailing +PrepareMailing=Preparar Mailing +CreateMailing=Criar E-Mailing +MailingDesc=Esta página permite enviar e-mails a um grupo de pessoas. MailingResult=Resultado do envio de e-mails +TestMailing=Teste mailing +ValidMailing=Confirmar Mailing +ApproveMailing=Aprovar Mailing +MailingStatusDraft=Rascunho +MailingStatusValidated=Validado +MailingStatusApproved=Aprovado +MailingStatusSent=Enviado +MailingStatusSentPartialy=Enviado Parcialmente +MailingStatusSentCompletely=Enviado Completamente +MailingStatusError=Erro +MailingStatusNotSent=Não Enviado MailSuccessfulySent=E-mail enviado corretamente (de %s a %s) MailingSuccessfullyValidated=Emailins validado com sucesso MailUnsubcribe=Desenscrever @@ -12,13 +49,19 @@ Unsuscribe=Desenscrever MailingStatusNotContact=Nao contactar mais ErrorMailRecipientIsEmpty=A endereço do destinatário está vazia WarningNoEMailsAdded=nenhum Novo e-mail a Adicionar à lista destinatários. +ConfirmValidMailing=Confirma a validação do mailing? +ConfirmResetMailing=Confirma a limpeza do mailing? +ConfirmDeleteMailing=Confirma a eliminação do mailing? +NbOfRecipients=Número de destinatários NbOfUniqueEMails=N� de e-mails únicos NbOfEMails=N� de E-mails TotalNbOfDistinctRecipients=Número de destinatários únicos NoTargetYet=Nenhum destinatário definido AddRecipients=Adicionar destinatários RemoveRecipient=Eliminar destinatário +CommonSubstitutions=Substituições comuns YouCanAddYourOwnPredefindedListHere=Para Criar o seu módulo de seleção e-mails, tem que ir a htdocs/core/modules/mailings/README. +EMailTestSubstitutionReplacedByGenericValues=Em modo teste, as Variávels de substituição são sustituidas por valores genéricos MailingAddFile=Adicionar este Arquivo NoAttachedFiles=Sem arquivos anexos BadEMail=Valor errado para e-mail @@ -28,6 +71,8 @@ CloneContent=Clonar mensagem CloneReceivers=Clonar recebidores DateLastSend=Data ultimo envio DateSending=Data envio +SentTo=Enviado para %s +MailingStatusRead=Ler CheckRead=Ler recebidor YourMailUnsubcribeOK=O e-mail %s foi removido com sucesso da lista MailtoEMail=Hyper-link ao e-mail @@ -42,8 +87,11 @@ RemindSent=%s lembrete(s) de envio AllRecipientSelectedForRemind=Todos os endereços de e-mails dos representantes selecionados (note que será enviada uma mensagem por fatura) NoRemindSent=Sem lembrete de e-mail enviado ResultOfMassSending=Resultado do lembretes de envio em massa de e-mails + +# Libelle des modules de liste de destinataires mailing MailingModuleDescContactCompanies=Contatos de Fornecedores (clientes potenciais, clientes, Fornecedores...) MailingModuleDescDolibarrUsers=Usuários de Dolibarr que tem e-mail +MailingModuleDescFundationMembers=Membros que tem e-mail MailingModuleDescEmailsFromFile=E-Mails de um Arquivo (e-mail;Nome;Vários) MailingModuleDescEmailsFromUser=Entrar e-mails de usuario (email;sobrenome;nome;outro) MailingModuleDescContactsCategories=Fornecedores com e-mail (por categoria) @@ -55,22 +103,36 @@ MailingModuleDescContactsByFunction=Contatos/Enderecos de terceiros (por posiç LineInFile=Linha %s em arquivo RecipientSelectionModules=Módulos de seleção dos destinatários MailSelectedRecipients=Destinatários selecionados +MailingArea=Área mailings +LastMailings=Os %s últimos mailings TargetsStatistics=Estatísticas destinatários NbOfCompaniesContacts=Contatos únicos de empresas MailNoChangePossible=Destinatários de um mailing validado não modificaveis +SearchAMailing=Procurar um mailing +SendMailing=Enviar mailing +SendMail=Enviar e-mail +SentBy=Enviado por MailingNeedCommand=Para razões de segurança, o envio de um mailing em massa e melhor quando feito da linha de comando. Se voce tem uma, pergunte ao seu administrador de serviço de executar o comando seguinte para enviar o mailing em massa a todos os destinatarios: MailingNeedCommand2=Pode enviar em linha adicionando o parâmetro MAILING_LIMIT_SENDBYWEB com um valor número que indica o máximo n� de e-mails enviados por Sessão. ConfirmSendingEmailing=Caso voçê não pode ou prefere envia-los do seu www navegador, por favor confirme que voce tem certeza que quer enviar um mailing em massa do seu navegador ? LimitSendingEmailing=Observação: Envios online de mailings em massa são limitados por causa de segurança e tempo limite a n.%s destinatarios por sessão de envio. +TargetsReset=Limpar lista ToClearAllRecipientsClickHere=Para limpar a lista dos destinatários deste mailing, faça click ao botão ToAddRecipientsChooseHere=Para Adicionar destinatários, escoja os que figuran em listas a continuação NbOfEMailingsReceived=Mailings em massa recebidos NbOfEMailingsSend=E-mails em massa enviados +IdRecord=ID registo +DeliveryReceipt=Recibo de recpção YouCanUseCommaSeparatorForSeveralRecipients=Pode usar o caracter0 de separação coma para especificar multiplos destinatários. TagCheckMail=Seguir quando o e-mail sera lido TagUnsubscribe=Atalho para se desenscrever TagSignature=Assinatura do remetente TagMailtoEmail=E-mail destinatario +# Module Notifications +Notifications=Notificações +NoNotificationsWillBeSent=Nenhuma notificação por e-mail está prevista para este evento e empresa +ANotificationsWillBeSent=1 notificação vai a ser enviada por e-mail +SomeNotificationsWillBeSent=%s Notificações vão ser enviadas por e-mail AddNewNotification=Ativar uma Nova pedido de notificação ListOfActiveNotifications=Lista das pedidos de Notificações ativas ListOfNotificationsDone=Listar todas as notificações de e-mail enviadas diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang index 8ae72937960..662ace989a3 100644 --- a/htdocs/langs/pt_BR/main.lang +++ b/htdocs/langs/pt_BR/main.lang @@ -1,5 +1,9 @@ # Dolibarr language file - Source file is en_US - main DIRECTION=ltr +# Note for Chinese: +# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader) +# stsongstdlight or cid0cs are for simplified Chinese +# To read Chinese pdf with Linux: sudo apt-get install poppler-data FONTFORPDF=helvetica FONTSIZEFORPDF=10 SeparatorDecimal=, @@ -18,25 +22,45 @@ FormatDateHourShort=%d/%m/%Y %I:%M %p FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p FormatDateHourTextShort=%d %b, %Y, %I:%M %p FormatDateHourText=%d %B, %Y, %I:%M %p +DatabaseConnection=Login à Base de Dados +NoTranslation=Sem tradução NoRecordFound=Registro nao encontrado NoError=Sem erro +Error=Erro +ErrorFieldRequired=O campo '%s' é obrigatório ErrorFieldFormat=O campo '%s' tem um valor incorreto ErrorFileDoesNotExists=O Arquivo %s não existe ErrorFailedToOpenFile=Impossível abrir o arquivo %s +ErrorCanNotCreateDir=Impossível criar a pasta %s +ErrorCanNotReadDir=Impossível ler a pasta %s +ErrorConstantNotDefined=Parâmetro %s não definido +ErrorUnknown=Erro desconhecido +ErrorSQL=Erro de SQL ErrorLogoFileNotFound=O arquivo logo '%s' não se encontra +ErrorGoToGlobalSetup=Ir á configuração ' Empresa/Instituição ' para corrigir +ErrorGoToModuleSetup=Ir á configuração do módulo para corrigir ErrorFailedToSendMail=Erro ao envio do e-mail (emissor ErrorAttachedFilesDisabled=A Administração dos arquivos associados está desativada neste servidor ErrorFileNotUploaded=O arquivo não foi possível transferir +ErrorInternalErrorDetected=Erro detectado +ErrorNoRequestRan=Nenhuma petição realizada +ErrorWrongHostParameter=Parâmetro Servidor inválido ErrorYourCountryIsNotDefined=O seu país não está definido. corrija indo a Configuração-Geral-Editar ErrorRecordIsUsedByChild=Impossível de suprimir este registo. Esta sendo utilizado como pai pelo menos em um registo filho. ErrorWrongValue=Valor incorreto ErrorWrongValueForParameterX=Valor incorreto do parâmetro %s +ErrorNoRequestInError=Nenhuma petição em erro ErrorServiceUnavailableTryLater=Serviço não disponível atualmente. Volte a execução mais tarde. +ErrorDuplicateField=Duplicado num campo único +ErrorSomeErrorWereFoundRollbackIsDone=Encontraram-se alguns erros. Modificações desfeitas. ErrorConfigParameterNotDefined=O parâmetro %s não está definido ao arquivo de configuração Dolibarr conf.php. ErrorCantLoadUserFromDolibarrDatabase=Impossível encontrar o usuário %s na base de dados do Dolibarr. ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de ICMS definido para o país '%s'. ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição social definido para o pais '%s'. ErrorFailedToSaveFile=Erro, o registo do arquivo falhou. +ErrorOnlyPngJpgSupported=Erro, somente suportam os formatos de imagem jpg e png. +ErrorImageFormatNotSupported=A sua versão PHP não suporta as funções de conVersão deste formato de imagen. +SetDate=Definir data SelectDate=Selecionar uma data SeeAlso=Ver tambem %s BackgroundColorByDefault=Cor do fundo padrão @@ -44,79 +68,230 @@ FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique NbOfEntries=Nr. de entradas GoToWikiHelpPage=Ler ajuda online ( necesita de acosso a internet) GoToHelpPage=Consulte a ajuda (pode necessitar de acesso à internet) +RecordSaved=Registo Guardado RecordDeleted=Registro apagado LevelOfFeature=Nível de funções +NotDefined=Não Definida DefinedAndHasThisValue=Definido e valor para +IsNotDefined=indefinido DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr está configurado em modo de autenticação %s ao arquivo de configuração conf.php.
Eso significa que a base de dados das Senhas é externa a Dolibarr, por eso toda modificação deste campo pode resultar sem efeito alguno. +Administrator=Administrador +Undefined=Não Definido PasswordForgotten=Esqueceu de da sua senha? +SeeAbove=Mencionar anteriormente +HomeArea=Área Principal LastConnexion=último login PreviousConnexion=último login ConnectedOnMultiCompany=Conectado no ambiente +ConnectedSince=Conectado desde +AuthenticationMode=Modo autenticação +RequestedUrl=Url solicitada DatabaseTypeManager=Tipo de gerente de base de dados RequestLastAccess=Petição último acesso e a base de dados RequestLastAccessInError=Petição último acesso e a base de dados errado ReturnCodeLastAccessInError=Código devolvido último acesso e a base de dados errado InformationLastAccessInError=informação sobre o último acesso e a base de dados errado +DolibarrHasDetectedError=O Dolibarr detectou um erro técnico +InformationToHelpDiagnose=É aqui que a informação pode ajudar no diagnóstico +MoreInformation=Mais Informação +TechnicalInformation=Informação técnica +NotePublic=Nota (pública) +NotePrivate=Nota (privada) PrecisionUnitIsLimitedToXDecimals=Dolibarr está configurado para limitar a precisão dos preços unitários a %s Decimais. +DoTest=Teste +ToFilter=Filtrar WarningYouHaveAtLeastOneTaskLate=Atenção, tem um elemento a menos que passou a data de tolerância. yes=sim +Yes=Sim no=não +No=Não +All=Tudo +Home=Inicio +Help=Ajuda OnlineHelp=Ajuda online PageWiki=Pagina wiki +Always=Sempre +Never=Nunca +Under=Baixo +Period=Periodo PeriodEndDate=Data final periodo Activate=Ativar Activated=Ativado +Closed=Encerrado Closed2=Encerrado Enabled=Ativado Deprecated=Obsoleto Disable=Desativar Disabled=Desativado +Add=Adicionar +AddLink=Adicionar link +Update=Modificar AddActionToDo=Adicionar ação a realizar AddActionDone=Adicionar ação realizada +Close=Fechar +Close2=Fechar +Confirm=Confirmar +ConfirmSendCardByMail=Quer enviar esta ficha por e-mail? +Delete=Eliminar +Remove=Retirar +Resiliate=Cancelar +Cancel=Cancelar +Modify=Modificar +Edit=Editar +Validate=Confirmar +ToValidate=A Confirmar +Save=Guardar +SaveAs=Guardar como TestConnection=Teste a login +ToClone=Cópiar ConfirmClone=Selecciones dados que deseja Cópiar. +NoCloneOptionsSpecified=Não existem dados definidos para copiar +Of=de Go=Ir Run=Attivo +CopyOf=Cópia de +Show=Ver +ShowCardHere=Mostrar cartão +Search=Procurar SearchOf=Procurar +Valid=Confirmar +Approve=Aprovar +ReOpen=Reabrir Upload=Enviar Arquivo +ToLink=Link Select=Selecionar +Choose=Escolher +ChooseLangage=Escolher o seu idioma Resize=Modificar tamanho Recenter=Recolocar no centro +Author=Autor User=Usuário Users=Usuário +Group=Grupo +Groups=Grupos +Password=Senha PasswordRetype=Repetir Senha NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo +Name=Nome +Person=Pessoa +Parameter=Parâmetro +Parameters=Parâmetros +Value=Valor +GlobalValue=Valor global +PersonalValue=Valor Personalizado +NewValue=Novo valor CurrentValue=Valor atual +Code=Código +Type=Tipo +Language=Idioma +MultiLanguage=Multi Idioma +Note=Nota CurrentNote=Nota atual +Title=Título +Label=Etiqueta +RefOrLabel=Ref. da etiqueta +Info=Log +Family=Familia +Description=Descrição +Designation=Designação +Model=Modelo DefaultModel=Modelo Padrão Action=Ação +About=Acerca de +Number=Número NumberByMonth=Numero por mes +AmountByMonth=Valor por mês +Numero=Número Limit=Límite +Limits=Limites DevelopmentTeam=Equipe de Desenvolvimento Logout=Sair NoLogoutProcessWithAuthMode=No recurso de desconexão aplicativo com modo de autenticação Connection=Login +Setup=Configuração +Alert=Alerta +Previous=Anterior +Next=Seguinte +Cards=Fichas +Card=Ficha Now=Agora +Date=Data DateStart=Data Inicio DateEnd=Data Fim +DateCreation=Data de Criação +DateModification=Data Modificação +DateModificationShort=Data Modif. DateLastModification=Data última Modificação DateValidation=Data Validação +DateClosing=Data de Encerramento +DateDue=Data Vencimento +DateValue=Data Valor +DateValueShort=Data Valor +DateOperation=Data Operação +DateOperationShort=Data Op. DateLimit=Data Límite +DateRequest=Data Consulta +DateProcess=Data Processo +DatePlanShort=Data Planif. +DateRealShort=Data Real +DateBuild=Data da geração do Relatório +DatePayment=Data de pagamento +DurationYear=Ano +DurationMonth=Mês +DurationWeek=Semana DurationDay=Día +DurationYears=Anos +DurationMonths=Meses +DurationWeeks=Semanas +DurationDays=Dias +Year=Ano +Month=Mês +Week=Semana Day=Día +Hour=Hora +Minute=Minuto +Second=Segundo +Years=Anos +Months=Meses +Days=Dias days=Dias +Hours=Horas +Minutes=Minutos +Seconds=Segundos +Today=Hoje +Yesterday=Ontem +Tomorrow=Amanhã Morning=Manha +Afternoon=Tarde Quadri=Trimistre +MonthOfDay=Dia do mês +HourShort=H +Rate=Tipo UseLocalTax=Incluindo taxa +Bytes=Bytes +KiloBytes=Kilobytes +MegaBytes=Megabytes +GigaBytes=Gigabytes +TeraBytes=Terabytes +b=b. +Kb=Kb +Mb=Mb +Gb=Gb Tb=Tb +Cut=Cortar Copy=Cópiar +Paste=Colar Default=Padrao DefaultValue=Valor por default +DefaultGlobalValue=Valor global +Price=Preço UnitPrice=Preço Unit. +UnitPriceHT=Preço Base UnitPriceTTC=Preço Unit. Total PriceU=Preço Unit. PriceUHT=Preço Unit. PriceUTTC=Preço Unit. Total +Amount=Valor AmountInvoice=Valor Fatura AmountPayment=Valor Pagamento AmountHTShort=Valor (neto) @@ -130,49 +305,147 @@ AmountLT1ES=Valor RE AmountLT2ES=Valor IRPF AmountTotal=Valor Total AmountAverage=Valor médio +PriceQtyHT=Preço para a quantidade total +PriceQtyMinHT=Preço quantidade min total +PriceQtyTTC=Preço total para a quantidade +PriceQtyMinTTC=Preço quantidade min. total +Percentage=Percentagem +Total=Total +SubTotal=Subtotal TotalHTShort=Total (neto) TotalTTCShort=Total (incl. taxas) TotalHT=Valor TotalHTforthispage=Total (sem impostos) desta pagina TotalTTC=Total +TotalTTCToYourCredit=Total a crédito TotalVAT=Total do ICMS TotalLT1=Total taxa 2 TotalLT2=Total taxa 3 TotalLT1ES=Total RE +TotalLT2ES=Total IRPF IncludedVAT=ICMS incluido HT=Sem ICMS TTC=ICMS Incluido VAT=ICMS +LT1ES=RE +LT2ES=IRPF VATRate=Taxa ICMS +Average=Média +Sum=Soma +Delta=Divergencia +Module=Módulo +Option=Opção +List=Lista FullList=Lista Completa +Statistics=Estatísticas OtherStatistics=Outras estatisticas +Status=Estado ShortInfo=Info. +Ref=Ref. RefSupplier=Ref. Fornecedor RefPayment=Ref. Pagamento +CommercialProposalsShort=Orçamentos Comment=Comentario Comments=Comentarios ActionsToDo=Ações a realizar ActionsDone=Ações realizadas +ActionsToDoShort=A realizar ActionsRunningshort=Iniciada +ActionsDoneShort=Realizadas ActionNotApplicable=Não aplicavel ActionRunningNotStarted=A Iniciar +ActionRunningShort=Iniciado +ActionDoneShort=Terminado ActionUncomplete=Imcompleto CompanyFoundation=Companhia/Fundação ContactsForCompany=Contatos desta empresa ContactsAddressesForCompany=Contatos/Endereços do Cliente ou Fornecedor +AddressesForCompany=Endereços para este terceiro ActionsOnCompany=Ações nesta sociedade ActionsOnMember=Eventos deste membro NActions=%s ações +NActionsLate=%s em atraso +Filter=Filtro +RemoveFilter=Eliminar filtro +ChartGenerated=Gráficos gerados +ChartNotGenerated=Gráfico não gerado GeneratedOn=Gerado a %s +Generate=Gerar +Duration=Duração +TotalDuration=Duração total +Summary=Resumo +MyBookmarks=Os Meus Favoritos +OtherInformationsBoxes=Outras Caixas de informação +DolibarrBoard=Indicadores +DolibarrStateBoard=Estatísticas +DolibarrWorkBoard=Indicadores de Trabalho Available=Disponivel NotYetAvailable=Ainda não disponível +NotAvailable=Não disponível +Popularity=Popularidade +Categories=Categorias +Category=Categoria +By=Por +From=De to=para +and=e +or=ou +Other=Outro +Others=Outros +OtherInformations=Outras Informações +Quantity=quantidade +Qty=Quant. +ChangedBy=Modificado por +ReCalculate=Recalcular +ResultOk=Éxito +ResultKo=Erro +Reporting=Relatório +Reportings=Relatórios +Draft=Rascunho Drafts=Drafts +Validated=Validado +Opened=Aberto +New=Novo +Discount=Desconto +Unknown=Desconhecido +General=General +Size=Tamanho +Received=Recebido +Paid=Pago +Topic=Assunto +ByCompanies=Por empresa ByUsers=Por usuário +Links=Links +Link=Link +Receipts=Recibos +Rejects=Reprovado Preview=Preview +NextStep=Passo Seguinte +PreviousStep=Passo Anterior +Datas=Dados +None=Nenhum +NoneF=Nenhuma +Late=Atraso +Photo=Foto +Photos=Fotos +AddPhoto=Adicionar foto +Login=Login CurrentLogin=Login atual +January=Janeiro +February=Fevereiro +March=Março +April=Abril +May=Maio +June=Junho +July=Julho +August=Agosto +September=Setembro +October=Outubro +November=Novembro +December=Dezembro JanuaryMin=Jan FebruaryMin=Fev +MarchMin=Mar AprilMin=Abr MayMin=Mai JuneMin=Jun @@ -182,6 +455,18 @@ SeptemberMin=Set OctoberMin=Out NovemberMin=Nov DecemberMin=Dez +Month01=Janeiro +Month02=Fevereiro +Month03=Março +Month04=Abril +Month05=Maio +Month06=Junho +Month07=Julho +Month08=Agosto +Month09=Setembro +Month10=Outubro +Month11=Novembro +Month12=Dezembro MonthShort01=Jan MonthShort02=Fev MonthShort03=Mar @@ -196,18 +481,52 @@ MonthShort11=Nov MonthShort12=Dez AttachedFiles=Arquivos e Documentos Anexos FileTransferComplete=Foi transferido corretamente o Arquivo +DateFormatYYYYMM=YYYY-MM +DateFormatYYYYMMDD=YYYY-MM-DD +DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS +ReportName=Nome do Relatório ReportPeriod=Periodo de Análise +ReportDescription=Descrição +Report=Relatório +Keyword=Chave +Legend=Legenda FillTownFromZip=Indicar Município Fill=Preencher Reset=Resetar ShowLog=Ver Histórico +File=Arquivo Files=Arquivos +NotAllowed=Não Autorizado +ReadPermissionNotAllowed=Leitura não Autorizada AmountInCurrency=Valores Apresentados em %s +Example=Exemplo +Examples=Exemplos +NoExample=Sem Exemplo +FindBug=Sinalizar um bug NbOfThirdParties=Numero de Fornecedores +NbOfCustomers=Numero de Clientes +NbOfLines=Numeros de Linhas NbOfObjects=Numero de Objetos NbOfReferers=Numero de Referencias Referers=Referindo-se objetos +TotalQuantity=Quantidade Total +DateFromTo=De %s a %s +DateFrom=A partir de %s +DateUntil=Até %s +Check=Verificar +Internal=Interno +External=Externo +Internals=Internos +Externals=Externos +Warning=Alerta +Warnings=Alertas +BuildPDF=Gerar o PDF +RebuildPDF=Recriar o PDF +BuildDoc=Gerar o doc +RebuildDoc=Recriar o doc +Entity=Entidade Entities=Entidadees +EventLogs=Log CustomerPreview=Historico Cliente SupplierPreview=Historico Fornecedor AccountancyPreview=Historico Contabilidade @@ -215,24 +534,77 @@ ShowCustomerPreview=Ver Historico Cliente ShowSupplierPreview=Ver Historico Fornecedor ShowAccountancyPreview=Ver Historico Contabilidade ShowProspectPreview=Ver Historico Cliente Potencial +RefCustomer=Ref. Cliente +Currency=Moeda +InfoAdmin=Informação para os administradores +Undo=Desfazer +Redo=Refazer +ExpandAll=Expandir tudo +UndoExpandAll=Anular Expansão +Reason=Razão +FeatureNotYetSupported=Funcionalidade ainda não suportada +CloseWindow=Fechar Janela +Question=Pregunta +Response=Resposta +Priority=Prioridade SendByMail=Enviado por e-mail +MailSentBy=Mail enviado por +TextUsedInTheMessageBody=Texto utilizado no corpo da mensagem +SendAcknowledgementByMail=Envio rec. por e-mail +NoEMail=Sem e-mail NoMobilePhone=Sem celular Owner=Proprietário +DetectedVersion=Versão Detectada +FollowingConstantsWillBeSubstituted=As seguintes constantes serão substituidas pelo seu valor correspondente. Refresh=Atualizar +BackToList=Mostar Lista +GoBack=Voltar CanBeModifiedIfOk=Pode modificarse se é valido CanBeModifiedIfKo=Pode modificarse senão é valido +RecordModifiedSuccessfully=Registo modificado com êxito RecordsModified=%s registros modificados +AutomaticCode=Criação automática de código +NotManaged=Não gerado FeatureDisabled=Função Desativada +MoveBox=Mover a Caixa %s +Offered=Oferta NotEnoughPermissions=Não tem permissões para esta ação +SessionName=Nome Sessão +Method=Método +Receive=Recepção +PartialWoman=Parcial +PartialMan=Parcial +TotalWoman=Total +TotalMan=Total +NeverReceived=Nunca Recebido +Canceled=Cancelado YouCanChangeValuesForThisListFromDictionarySetup=Voce pode modificar os valores para esta lista no menu Configuração - dicionario +Color=Cor +Documents=Documentos DocumentsNb=Arquivos conectados (%s) +Documents2=Documentos +BuildDocuments=Documentos Gerados UploadDisabled=Carregamento Desativada +MenuECM=Documentos +MenuAWStats=Estatisticas +MenuMembers=Membros +MenuAgendaGoogle=Agenda Google +ThisLimitIsDefinedInSetup=Límite Dolibarr (menu inicio-configuração-segurança): %s Kb, PHP limit: %s Kb +NoFileFound=Não existem documentos guardados nesta pasta CurrentUserLanguage=Idioma atual CurrentTheme=Tema atual CurrentMenuManager=Administração do menu atual DisabledModules=Módulos desativados +For=Para +ForCustomer=Para cliente +Signature=Assinatura HidePassword=Mostrar comando com senha oculta UnHidePassword=Mostrar comando com senha e a vista +Root=Raíz +Informations=Informação +Page=Página +Notes=Notas +AddNewLine=Adicionar nova linha AddFile=Adicionar arquivo ListOfFiles=Lista de arquivos disponiveis FreeZone=Entrada livre @@ -241,46 +613,98 @@ CloneMainAttributes=Clonar o objeto com estes atributos PDFMerge=Fusão de PDF Merge=Fusão PrintContentArea=Mostrar pagina a se imprimir na area principal +MenuManager=Administração do menu NoMenu=Sem sub-menu WarningYouAreInMaintenanceMode=Atenção, voce esta no modo de manutenção, somente o login %s tem permissões para uso da aplicação no momento. -CoreErrorMessage=Occoreu erro. Verifique os arquivos de log ou contate seu administrador de sistema. +CoreErrorTitle=Erro de sistema +CoreErrorMessage=Occoreu erro. Verifique os arquivos de log ou contate seu administrador de sistema. CreditCard=Cartão de credito FieldsWithAreMandatory=Campos com %s são obrigatorios FieldsWithIsForPublic=Campos com %s são mostrados na lista publica de membros. Se não deseja isto, deselecione a caixa "publico". AccordingToGeoIPDatabase=(conforme a convenção GeoIP) +Line=Linha NotSupported=Não suportado RequiredField=Campo obrigatorio +Result=Resultado +ToTest=Teste ValidateBefore=Precisa de um cartão valido antes de usar esta função +Visibility=Visibilidade +Private=Privado Hidden=Escondido Resources=Resorsas +Source=Fonte +Prefix=Prefixo +Before=Antes +After=Depois IPAddress=endereco IP Frequency=Frequencia IM=Mensagems instantaneas +NewAttribute=Novo atributo AttributeCode=Codigo do atributo OptionalFieldsSetup=Configuração dos atributos extra URLPhoto=URL da photo/logo +SetLinkToThirdParty=Atalho para outro terceiro CreateDraft=Criar RascunhoCriar rascunho +ClickToEdit=Clique para editar ObjectDeleted=Objeto %s apagado +ByCountry=Por país +ByTown=Por cidade +ByDate=Por data ByMonthYear=Por mes/ano ByYear=Por ano ByMonth=Por mes ByDay=Por día BySalesRepresentative=Por vendedor representante -LinkedToSpecificUsers=Conectado com um contato particular do usuario +LinkedToSpecificUsers=Conectado com um contato particular do usuario DeleteAFile=Apagar arquivo -ConfirmDeleteAFile=Voce tem certeza que quer apagar este arquivo +ConfirmDeleteAFile=Voce tem certeza que quer apagar este arquivo +NoResults=Sem resultados ModulesSystemTools=Ferramentas de modulos +Test=Teste +Element=Elemento NoPhotoYet=Sem fotos disponiveis no momento HomeDashboard=Resumo de inicio Deductible=Deduzivel from=de toward=para +Access=Acesso HelpCopyToClipboard=Use Ctrl+C para copiar para o clipboard SaveUploadedFileWithMask=Salvar arquivo no servidor com nome "%s" (alternativamente "%s") OriginFileName=Nome original do arquivo SetDemandReason=Escolher fonte +SetBankAccount=Define Bank Account +AccountCurrency=Account Currency ViewPrivateNote=Ver anotaçoes XMoreLines=%s linha(s) escondidas PublicUrl=URL pública +AddBox=Add box + +# Week day +Monday=Segunda-feira +Tuesday=Terça-feira +Wednesday=Quarta-feira +Thursday=Quinta-feira +Friday=Sexta-feira Saturday=Sabado +Sunday=Domingo +MondayMin=Seg +TuesdayMin=Ter +WednesdayMin=Qua +ThursdayMin=Qui +FridayMin=Sex SaturdayMin=Sab +SundayMin=Dom +Day1=Segunda-Feira +Day2=Terça-Feira +Day3=Quarta-Feira +Day4=Quinta-Feira +Day5=Sexta-Feria +Day6=Sábado +Day0=Domingo +ShortMonday=Seg +ShortTuesday=Ter +ShortWednesday=Qua +ShortThursday=Qui +ShortFriday=Sex +ShortSaturday=Sab +ShortSunday=Dom diff --git a/htdocs/langs/pt_BR/margins.lang b/htdocs/langs/pt_BR/margins.lang index 56a1e83753d..093c530bbec 100644 --- a/htdocs/langs/pt_BR/margins.lang +++ b/htdocs/langs/pt_BR/margins.lang @@ -1,6 +1,11 @@ -# Dolibarr language file - Source file is en_US - margins +# Dolibarr language file - Source file is en_US - marges + +Margin=Margem Margins=Margems TotalMargin=Total margem +MarginOnProducts=Margem / Produtos +MarginOnServices=Margem / Serviços +MarginRate=Taxa de margem MarkRate=Taxa de marca DisplayMarginRates=Visualizar taxas de margem DisplayMarkRates=Visualizar taxas de aumento @@ -12,6 +17,8 @@ ProductMargins=Margem de produtos CustomerMargins=Margems de clientes SalesRepresentativeMargins=Tolerância aos representante de vendas ProductService=Produto ou serviço +AllProducts=Todos os produtos e serviços +ChooseProduct/Service=Escolher produto ou serviço StartDate=Data inicio EndDate=Data fim Launch=Inicio @@ -22,9 +29,12 @@ UseDiscountAsProduct=Como o produto UseDiscountAsService=Como serviço UseDiscountOnTotal=Em sub-total MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define se um desconto global e tratado como o produto, serviço, ou somente sob o sub-total na margem. +MARGIN_TYPE=Tipo de margem MargeBrute=Margem grosa MargeNette=Mergem neta -MARGIN_TYPE_DETAILS=Margem grosa: Preço de venda - Preço de compra
Margem neta: Preço de venda - Preço de custo +MARGIN_TYPE_DETAILS=Margem grosa: Preço de venda - Preço de compra
Margem neta: Preço de venda - Preço de custo +CostPrice=Preço de custo +BuyingCost=Preço de custo UnitCharges=Taxas unitárias Charges=Despesas AgentContactType=Tipo contato do agente comercial diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang index b28258b6e95..bd6c5e7969e 100644 --- a/htdocs/langs/pt_BR/members.lang +++ b/htdocs/langs/pt_BR/members.lang @@ -11,15 +11,31 @@ UserNotLinkedToMember=Usuário não vinculado a um associado ThirdpartyNotLinkedToMember=Fornecedores não ligados a um membro MembersTickets=Etiquetas de associado FundationMembers=Membros da fundação +Attributs=Atributos +ErrorMemberTypeNotDefined=Não foi indicado o tipo de membro +ListOfPublicMembers=Lista de Membros públicos +ListOfValidatedPublicMembers=Lista de Membros públicos validados +ErrorThisMemberIsNotPublic=Este membro não é público ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro já está vinculado a um terceiro. Remover este link em primeiro lugar porque um terceiro não pode ser ligado a apenas um membro (e vice-versa). ErrorUserPermissionAllowsToLinksToItselfOnly=Por razões de segurança, você deve ter permissões para editar todos os usuários sejam capazes de ligar um membro a um usuário que não é seu. ThisIsContentOfYourCard=Este é os detalhes do seu cartão CardContent=Conteúdo da sua ficha de membro +SetLinkToUser=Link para um usuário Dolibarr SetLinkToThirdParty=Link para um fornecedor Dolibarr +MembersCards=Cartões de Membros +MembersList=Lista de Membros +MembersListToValid=Lista de Membros rascunho (a Confirmar) +MembersListValid=Lista de Membros validados +MembersListUpToDate=Lista dos Membros válidos ao día de adesão +MembersListNotUpToDate=Lista dos Membros válidos não ao día de adesão MembersListResiliated=Lista dos Membros cancelados +MembersListQualified=Lista dos Membros qualificados +MenuMembersToValidate=Membros rascunho +MenuMembersValidated=Membros validados MenuMembersUpToDate=Membros ao día MenuMembersNotUpToDate=Membros não ao día MenuMembersResiliated=Membros cancelados +MembersWithSubscriptionToReceive=Membros com assinatura para receber DateAbonment=data filiação DateSubscription=data filiação DateNextSubscription=data próxima filiação @@ -27,70 +43,136 @@ DateEndSubscription=data final filiação EndSubscription=fim filiação SubscriptionId=Id adesão MemberId=Id adesão +NewMember=Novo membro +NewType=Novo tipo de membro +MemberType=Tipo de Membro +MemberTypeId=ID tipo de membro +MemberTypeLabel=Etiqueta tipo de membro +MembersTypes=Tipos de Membros MembersAttributes=Atributos Membros SearchAMember=procurar um membro MemberStatusDraft=rascunho (a Confirmar) +MemberStatusDraftShort=A Confirmar +MemberStatusActive=Validado (em espera de filiação ) +MemberStatusActiveShort=Validado MemberStatusActiveLate=filiação não à día MemberStatusActiveLateShort=não à día MemberStatusPaid=Assinatura em dia MemberStatusPaidShort=Até à data MemberStatusResiliated=membro dado de baixa +MemberStatusResiliatedShort=De baixa +MembersStatusToValid=Membros rascunho +MembersStatusToValidShort=Membros rascunho +MembersStatusValidated=Membros validados MembersStatusPaid=Assinatura em dia MembersStatusPaidShort=Até à data MembersStatusNotPaid=Assinatura desatualizado MembersStatusNotPaidShort=Expirada MembersStatusResiliated=Membros cancelados MembersStatusResiliatedShort=Membros cancelados +NewCotisation=Nova filiação PaymentSubscription=Subscrição de Pagamento EditMember=edição membro SubscriptionEndDate=data final filiação +MembersTypeSetup=configuração dos tipos de Membros +NewSubscription=Nova filiação NewSubscriptionDesc=Este formulário permite que você grave a sua assinatura como um novo membro da fundação. Se você quiser renovar a sua assinatura (se já for membro), por favor, entre em contato com Conselho de Fundadores não por e-mail. +Subscription=Filiação Subscriptions=Filiações SubscriptionLate=Em Atraso SubscriptionNotReceived=filiação não recibida SubscriptionLateShort=em atraso SubscriptionNotReceivedShort=não recibida ListOfSubscriptions=Lista de Filiações +SendCardByMail=Enviar ficha +AddMember=Adicionar membro NoTypeDefinedGoToSetup=nenhum tipo de membro definido. ir a configuração -> Tipos de Membros +NewMemberType=Novo tipo de membro +WelcomeEMail=E-mail +SubscriptionRequired=Sujeito a cotação EditType=edição do tipo de membro +DeleteType=Eliminar +VoteAllowed=Voto autorizado +Physical=Físico +Moral=Moral +MorPhy=Moral/Físico Reenable=Reativar ResiliateMember=Baixar um membro ConfirmResiliateMember=Tem certeza que quer cancelar este membro? +DeleteMember=Eliminar um membro ConfirmDeleteMember=Tem certeza que quer eliminar este membro (Eliminar um membro elimina também todas as suas honorários)? +DeleteSubscription=Eliminar uma filiação ConfirmDeleteSubscription=Tem certeza que quer eliminar esta filiação? Filehtpasswd=Arquivo htpasswd +ValidateMember=Confirmar um membro ConfirmValidateMember=Tem certeza que quer Confirmar a este membro? FollowingLinksArePublic=os vínculos seguintes são páginas acessiveis a todos e não protegidas por Nenhuma habilitação Dolibarr. PublicMemberList=Lista público de Membros BlankSubscriptionForm=Formulário de inscrição BlankSubscriptionFormDesc=Dolibarr pode fornecer uma URL pública para permitir que os visitantes externos de pedir para se inscrever para a fundação. Se um módulo de pagamento on-line estiver ativado, uma forma de pagamento também será fornecido automaticamente. EnablePublicSubscriptionForm=Habilite a forma pública auto-assinatura +MemberPublicLinks=Likns/páginas publicas ExportDataset_member_1=Membros e Filiações +ImportDataset_member_1=Membros +LastMembers=os %s últimos Membros +LastMembersModified=os %s últimos Membros modificados LastSubscriptionsModified=Assinaturas Últimas modificadas +AttributeName=Nome do atributo +String=Cadeia +Text=Texto largo +Int=Numérico Date=Data +DateAndTime=data e hora +PublicMemberCard=Ficha pública membro MemberNotOrNoMoreExpectedToSubscribe=não submetida a cotação +AddSubscription=Adicionar filiação +ShowSubscription=Mostrar filiação MemberModifiedInDolibarr=membro modificado em Dolibarr +SendAnEMailToMember=Enviar e-mail de informação à membro (E-mail: %s) +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Assunto do e-mail recebido em caso de auto-inscrição de um convidado +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail recebido em caso de auto-inscrição de um convidado DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Assunto do email em caso de inscrição automática DescADHERENT_AUTOREGISTER_MAIL=Email a enviar em caso de convite para inscrição automática +DescADHERENT_MAIL_VALID_SUBJECT=assunto do e-mail de validação de membro +DescADHERENT_MAIL_VALID=E-mail de validação de membro +DescADHERENT_MAIL_COTIS_SUBJECT=assunto do e-mail de validação de cotação +DescADHERENT_MAIL_COTIS=E-mail de validação de uma filiação +DescADHERENT_MAIL_RESIL_SUBJECT=assunto de e-mail de baixa +DescADHERENT_MAIL_RESIL=E-mail de baixa +DescADHERENT_MAIL_FROM=E-mail emissor para os e-mails automáticos +DescADHERENT_ETIQUETTE_TYPE=Formato etiquetas DescADHERENT_ETIQUETTE_TEXT=Texto impresso em folhas de endereço de membros DescADHERENT_CARD_TYPE=Formato da página fichas +DescADHERENT_CARD_HEADER_TEXT=Texto a imprimir na parte superior do cartão de membro +DescADHERENT_CARD_TEXT=Texto a imprimir ao cartão de membro DescADHERENT_CARD_TEXT_RIGHT=Texto impresso em cartões de membros (alinhar à direita) +DescADHERENT_CARD_FOOTER_TEXT=Texto a imprimir na parte inferior do cartão de membro GlobalConfigUsedIfNotDefined=Texto definido na configuração do módulo fundação será usada se não for definido aqui MayBeOverwrited=Este texto pode ser sobrescrito pelo valor definido para o tipo de membro +ShowTypeCard=Ver tipo '%s' HTPasswordExport=geração Arquivo htpassword NoThirdPartyAssociatedToMember=nenhum Fornecedor associado a este membro ThirdPartyDolibarr=Fornecedores Dolibarr -MembersAndSubscriptions=Membros e Subscrições +MembersAndSubscriptions= Membros e Subscrições MoreActions=Ação complementar em gravação MoreActionsOnSubscription=Ação complementar, sugerido por padrão durante a gravação de uma assinatura +MoreActionBankDirect=Criar um registro de transação direto na conta +MoreActionBankViaInvoice=Criar uma fatura e pagamento por conta +MoreActionInvoiceOnly=Criar uma fatura sem pagamento LinkToGeneratedPages=Gerar cartões de visitas LinkToGeneratedPagesDesc=Esta tela permite gerar arquivos PDF com cartões de visita para todos os seus membros ou um membro particular. DocForAllMembersCards=Gerar cartões de visita para todos os membros DocForOneMemberCards=Gerar cartões de visita para um determinado membro DocForLabels=Gerar folhas de endereço +SubscriptionPayment=Pagamento Assinatura LastSubscriptionDate=Data da Última Adesão LastSubscriptionAmount=Valor Última Adesão +MembersStatisticsByCountries=Membros estatísticas por país +MembersStatisticsByState=Membros estatísticas por estado / província +MembersStatisticsByTown=Membros estatísticas por cidade MembersStatisticsByRegion=Membros por região estatísticas +MemberByRegion=Membros por região +NbOfMembers=Número de membros NoValidatedMemberYet=Nenhum membro validados encontrado MembersByCountryDesc=Esta tela mostrará estatísticas sobre usuários por países. Gráfico depende, contudo, do Google serviço gráfico on-line e está disponível apenas se uma conexão à Internet é está funcionando. MembersByStateDesc=Esta tela mostrará estatísticas sobre usuários por estado / província / cantão. @@ -100,12 +182,20 @@ MenuMembersStats=Estatísticas LastMemberDate=Data do membro Nature=Tipo de produto Public=Informações são públicas +Exports=Exportações NewMemberbyWeb=Novo membro adicionado. Aguardando aprovação NewMemberForm=Formulário para novo membro +SubscriptionsStatistics=Estatísticas sobre assinaturas NbOfSubscriptions=Número de inscrições +AmountOfSubscriptions=Quantidade de assinaturas TurnoverOrBudget=Volume de negócios (para uma empresa) ou de orçamento (para uma fundação) +DefaultAmount=Quantidade padrão de assinatura CanEditAmount=Visitante pode escolher/editar quantidade da sua subscrição MEMBER_NEWFORM_PAYONLINE=Ir na página de pagamento online integrado +Associations=Fundações +Collectivités=Organizações +Particuliers=Pessoal +Entreprises=Empresas DOLIBARRFOUNDATION_PAYMENT_FORM=Para fazer o seu pagamento de assinatura usando uma transferência bancária, consulte a página http://wiki.dolibarr.org/index.php/Subscribe .
Para pagar utilizando um cartão de crédito ou Paypal, clique no botão na parte inferior desta página.
ByProperties=Por características MembersStatisticsByProperties=Membros estatísticas por características diff --git a/htdocs/langs/pt_BR/opensurvey.lang b/htdocs/langs/pt_BR/opensurvey.lang index c595c56280f..3b8473f8874 100644 --- a/htdocs/langs/pt_BR/opensurvey.lang +++ b/htdocs/langs/pt_BR/opensurvey.lang @@ -1,27 +1,66 @@ # Dolibarr language file - Source file is en_US - opensurvey +Survey=Enquete +Surveys=Enquetes +OrganizeYourMeetingEasily=Organize suas reuniões e enquetes facilmente. Em primeiro lugar selecione o tipo de enquete... +NewSurvey=Nova enquete +NoSurveysInDatabase=%s enquete(s) na base de dados. +OpenSurveyArea=Área de enquetes +AddACommentForPoll=Você pode adicionar um comentário na enquete... +AddComment=Adicionar comentário CreatePoll=Criar uma enquete PollTitle=Titulo da enquete +ToReceiveEMailForEachVote=Receba um e-mail a cada novo voto TypeDate=Modelo para datas TypeClassic=Modelo padrão +OpenSurveyStep2=Selecione os dias livres (cinza). Os dias escolhidos são verdes. Você pode desmarcar um dia previamente selecionado, clicando novamente sobre ele RemoveAllDays=Remova todos os dias +CopyHoursOfFirstDay=Copiar horários do primeiro dia +RemoveAllHours=Apagar todos os horários +SelectedDays=Dias selecionados TheBestChoice=A melhor escolha no momento é TheBestChoices=As melhores escolhas no momento são +with=com +OpenSurveyHowTo=Se você quiser votar nesta enquete, você tem que preencher o seu nome, escolha as opções que se encaixam melhor para você e confirme com o botão de mais no final da linha. +CommentsOfVoters=Comentários dos votantes ConfirmRemovalOfPoll=Você tem certeza que deseja remover esta enquete (e todos os votos) RemovePoll=Remover enquete +UrlForSurvey=URL para obter um acesso direto à pesquisa +PollOnChoice=Você está criando uma enquete e se quiser ainda pode optar por votos multi escolhas em cada item. Basta entrar com o tipo de resposta para o voto: +CreateSurveyDate=Criar uma enquete para datas +CreateSurveyStandard=Criar uma enquete padrão CheckBox=Caixa de resposta simples YesNoList=Escolher (nulo/sim/não) PourContreList=Escolher (nulo/a favor/contra) +AddNewColumn=Adicionar nova coluna +TitleChoice= Escolha a resposta ExportSpreadsheet=Exportar resultado para planilha +ExpireDate=Data Limite +NbOfSurveys=Número de enquetes NbOfVoters=Nr. de eleitores SurveyResults=Resultado +PollAdminDesc=Você está autorizado a alterar todas as linhas da votação desta enquete, com o botão "Editar". Você pode, também remover uma coluna ou uma linha com o %s. Você também pode adicionar uma nova coluna com o %s. +5MoreChoices=Mais 5 opções +Abstention=Abstenção +Against=Contra YouAreInivitedToVote=Você foi convidado para votar nesta enquete +VoteNameAlreadyExists=Este nome já foi usada na enquete ErrorPollDoesNotExists=Erro, enquete %s não existe. +OpenSurveyNothingToSetup=Não há nenhuma configuração específica a fazer. +PollWillExpire=Sua votação expira automaticamente em %s dias após a última data preenchida na enquete. +AddADate=Adicionar uma data +AddStartHour=Adicionar hora de início AddEndHour=Adicionar hora final votes=voto(s) NoCommentYet=Nenhum comentário foi publicado para este voto ainda CanEditVotes=É possível alterar voto dos demais CanComment=Os eleitores podem comentar na enquete CanSeeOthersVote=Os eleitores podem ver os votos de outras pessoas +SelectDayDesc=Em cada dia selecionado, você pode escolher ou não preencher os horários com o seguinte formato:
- vazio,
- "8h", "8H" ou "08:00" horário de início da reunião,
- "8-11", "8h-11h", "8H-11H" ou "8:00-11:00" horário de início da reunião e do termino,
- "8h15-11h15", "8h15-11H15 " ou " 8:15-11:15 " mesma funcionalidade, mas com preenchimento dos minutos. +BackToCurrentMonth=Voltar para o mês atual +ErrorOpenSurveyFillFirstSection=Você não preencheu o primeiro passo para criação da enquete ErrorOpenSurveyOneChoice=Digite pelo menos uma opção ErrorOpenSurveyDateFormat=A data deve ter o formato YYYY-MM-DD +ErrorInsertingComment=Houve um erro ao inserir o seu comentário +MoreChoices=Digite mais opções para os votos SurveyExpiredInfo=O período de votação da enquete expirou. +EmailSomeoneVoted=%s preencheu uma linha.\nVocê pode encontrar sua enquete no link:\n%s diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang index 0aa1fdc97e7..9e85157ef44 100644 --- a/htdocs/langs/pt_BR/orders.lang +++ b/htdocs/langs/pt_BR/orders.lang @@ -1,27 +1,90 @@ # Dolibarr language file - Source file is en_US - orders OrdersArea=Área de Pedidos de Clientes +SuppliersOrdersArea=Área de Pedidos a Fornecedores +OrderCard=Ficha Pedido OrderId=ID Pedido +Order=Pedido +Orders=Pedidos OrderLine=Linha de Comando +OrderFollow=Seguimento +OrderDate=Data Pedido OrderToProcess=Pedido a se processar +NewOrder=Novo Pedido +ToOrder=Realizar Pedido +MakeOrder=Realizar Pedido +SupplierOrder=Pedido a Fornecedor +SuppliersOrders=Pedidos a Fornecedores +SuppliersOrdersRunning=Pedidos a Fornecedores em Curso CustomerOrder=Pedido de Cliente +CustomersOrders=Pedidos de Clientes +CustomersOrdersRunning=Pedidos de Clientes em Curso +CustomersOrdersAndOrdersLines=Pedidos de Clientes e Linhas de Pedido +OrdersToValid=Pedidos a Confirmar OrdersToBill=Pedidos por Faturar +OrdersInProcess=Pedidos em Processo +OrdersToProcess=Pedidos a Processar SuppliersOrdersToProcess=Pedidos de fornecedor a se processar +StatusOrderCanceledShort=Anulado +StatusOrderDraftShort=Rascunho +StatusOrderValidatedShort=Validado StatusOrderSentShort=Em processo StatusOrderSent=Envio em processo +StatusOrderOnProcessShort=Em curso +StatusOrderProcessedShort=Processado StatusOrderToBillShort=Entregue StatusOrderToBill2Short=A se faturar +StatusOrderApprovedShort=Aprovado +StatusOrderRefusedShort=Reprovado +StatusOrderToProcessShort=A Processar +StatusOrderReceivedPartiallyShort=Recebido Parcialmente +StatusOrderReceivedAllShort=Recebido +StatusOrderCanceled=Anulado +StatusOrderDraft=Rascunho (a Confirmar) +StatusOrderValidated=Validado +StatusOrderOnProcess=Em processo +StatusOrderProcessed=Processado StatusOrderToBill=A Faturar StatusOrderToBill2=A Faturar +StatusOrderApproved=Aprovado +StatusOrderRefused=Reprovado +StatusOrderReceivedPartially=Recebido Parcialmente +StatusOrderReceivedAll=Recebido ShippingExist=Existe envio DraftOrWaitingApproved=Rascunho aprovado mas ainda não controlado +DraftOrWaitingShipped=Rascunho o validado mas ainda não expedido MenuOrdersToBill=Pedidos por Faturar MenuOrdersToBill2=Pedidos a se faturar +SearchOrder=Procurar um Pedido SearchACustomerOrder=Procure um pedido do cliente +ShipProduct=Enviar Produto +Discount=Desconto +CreateOrder=Criar Pedido +RefuseOrder=Rejeitar o Pedido +ApproveOrder=Aceitar o Pedido +ValidateOrder=Confirmar o Pedido UnvalidateOrder=Desaprovar pedido +DeleteOrder=Eliminar o pedido +CancelOrder=Anular o Pedido +AddOrder=Criar Pedido +AddToMyOrders=Adicionar os meus Pedidos +AddToOtherOrders=Adicionar a outros pedidos AddToDraftOrders=Adicionar a projeto de pedido +ShowOrder=Mostrar Pedido +NoOpenedOrders=Nenhum pedido em aberto +NoOtherOpenedOrders=Nenhum outro pedido aberto NoDraftOrders=Não há projetos de pedidos +OtherOrders=Outros Pedidos +LastOrders=Os %s últimos pedidos +LastModifiedOrders=Os %s últimos pedidos modificados LastClosedOrders=Os últimos %s Pedidos +AllOrders=Todos os Pedidos +NbOfOrders=Número de Pedidos +OrdersStatistics=Estatísticas de pedidos +OrdersStatisticsSuppliers=Estatísticas de Pedidos a Fornecedores +NumberOfOrdersByMonth=Número de Pedidos por Mês AmountOfOrdersByMonthHT=Numero de pedidos por mes (sem impostos) +ListOfOrders=Lista de Pedidos +CloseOrder=Fechar Pedido ConfirmCloseOrder=Tem certeza de que deseja fechar este pedido? Quando um pedido é fechado, ele só pode ser cobrado. ConfirmCloseOrderIfSending=Tem certeza de que deseja fechar este pedido? Veve fechar no somente quando todos os transfretes marítimos são feitos. ConfirmDeleteOrder=Tem certeza que quer eliminar este pedido? @@ -32,13 +95,26 @@ ConfirmMakeOrder=Tem certeza que quer confirmar este pedido em data de%s GenerateBill=Faturar ClassifyShipped=Clasificar entregue ClassifyBilled=Classificar "Faturado" +ComptaCard=Ficha Contabilidade +DraftOrders=Rascunhos de Pedidos +RelatedOrders=Pedidos Anexos +OnProcessOrders=Pedidos em Processo +RefOrder=Ref. Pedido +RefCustomerOrder=Ref. Pedido Cliente +RefCustomerOrderShort=Ref. Ped. Cliente +SendOrderByMail=Enviar pedido por e-mail ActionsOnOrder=Ações sobre o pedido NoArticleOfTypeProduct=Não existe artigos de tipo 'produto' e por tanto expedidos neste pedido +OrderMode=Método de pedido +AuthorRequest=Autor/Solicitante UseCustomerContactAsOrderRecipientIfExist=Utilizar endereço do contato do cliente de seguimento cliente se está definido em vez do Fornecedor como destinatário dos pedidos +RunningOrders=Pedidos em Curso UserWithApproveOrderGrant=Usuários autorizados a aprovar os pedidos. +PaymentOrderRef=Pagamento de Pedido %s CloneOrder=Copiar o Pedido ConfirmCloneOrder=Tem certeza de que deseja clonar este%s ? DispatchSupplierOrder=Receber pedido de fornecedor %s +##### Types de contacts ##### TypeContact_commande_internal_SALESREPFOLL=Responsável do seguimento do pedido do cliente TypeContact_commande_internal_SHIPPING=Representante seguindo o envio TypeContact_commande_external_BILLING=Contato fatura cliente @@ -49,19 +125,36 @@ TypeContact_order_supplier_internal_SHIPPING=Representante seguindo o envio TypeContact_order_supplier_external_BILLING=Contato fatura fornecedor TypeContact_order_supplier_external_SHIPPING=Contato envio fornecedor TypeContact_order_supplier_external_CUSTOMER=Contato fornecedor seguindo o pedido + +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constante COMMANDE_SUPPLIER_ADDON não definida +Error_COMMANDE_ADDON_NotDefined=Constante COMMANDE_ADDON não definida Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Erro na carga do Arquivo módulo '%s' Error_FailedToLoad_COMMANDE_ADDON_File=Erro na carga de arquivo módulo '%s' Error_OrderNotChecked=Nenhum pedido seleçionado para se faturar +# Sources +OrderSource0=Orçamento Proposto +OrderSource1=Internet +OrderSource2=Campanha por correio OrderSource3=Campanha telefônica +OrderSource4=Campanha por fax +OrderSource5=Comercial +OrderSource6=Revistas +QtyOrdered=Quant. Pedida AddDeliveryCostLine=Adicionar uma linha de despesas de fretes indicando o peso do pedido +# Documents models PDFEinsteinDescription=Modelo de pedido completo (logo...) PDFEdisonDescription=O modelo simplificado do pedido PDFProformaDescription=A proforma fatura completa (logomarca...) +# Orders modes +OrderByMail=Correio +OrderByFax=Fax OrderByEMail=E-mail OrderByWWW=Online +OrderByPhone=Telefone CreateInvoiceForThisCustomer=Faturar pedidos NoOrdersToInvoice=Nenhum pedido faturavel CloseProcessedOrdersAutomatically=Clasificar "processados" os pedidos selecionados. +MenuOrdersToBill2=Pedidos a se faturar OrderCreation=Criação de pedidos Ordered=Pedido OrderCreated=Seus pedidos foram criados diff --git a/htdocs/langs/pt_BR/oscommerce.lang b/htdocs/langs/pt_BR/oscommerce.lang index 68f62ec9615..3df1b087212 100644 --- a/htdocs/langs/pt_BR/oscommerce.lang +++ b/htdocs/langs/pt_BR/oscommerce.lang @@ -1,2 +1,8 @@ # Dolibarr language file - Source file is en_US - oscommerce +OSCommerce=OS Commerce +OSCommerceSetup=Configuração do módulo OS Commerce +OSCommerceSetupSaved=Configuração OS Commerce guardada +OSCommerceServer=Nome/IP servidor da base de dados OS commerce +OSCommerceDatabaseName=Nome da base de dados OS Commerce +OSCommercePrefix=Prefixo Tabelas OS Commerce OSCommerceUser=Usuário da base de dados OS Commerce diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang index f5f3effde9c..76796886a59 100644 --- a/htdocs/langs/pt_BR/other.lang +++ b/htdocs/langs/pt_BR/other.lang @@ -1,12 +1,14 @@ # Dolibarr language file - Source file is en_US - other SecurityCode=Código Segurança +Calendar=Calendário AddTrip=Criar Deslocamento -ToolsDesc=Esta area e dedicada para o grupo de ferramentas varias não disponivel em outros menus.

Estas ferramentas podem se acionar atraves do menu ao lado. +Tools=Utilidades +ToolsDesc=Esta area e dedicada para o grupo de ferramentas varias não disponivel em outros menus.

Estas ferramentas podem se acionar atraves do menu ao lado. Birthday=Aniversário BirthdayDate=Data de aniversário DateToBirth=Data de nascimento -BirthdayAlertOn=Alerta de aniversário ativo -BirthdayAlertOff=Alerta de aniversário desativado +BirthdayAlertOn= Alerta de aniversário ativo +BirthdayAlertOff= Alerta de aniversário desativado Notify_FICHINTER_VALIDATE=Intervenção validada Notify_FICHINTER_SENTBYMAIL=Intervenção enviada por e-mail Notify_BILL_VALIDATE=Fatura cliente validada @@ -21,6 +23,7 @@ Notify_WITHDRAW_TRANSMIT=Revogação de transmissão Notify_WITHDRAW_CREDIT=Revogação de credito Notify_WITHDRAW_EMIT=Revogação de performance Notify_ORDER_SENTBYMAIL=Pedido cliente enviado por e-mail +Notify_COMPANY_CREATE=Terceiro criado Notify_COMPANY_SENTBYMAIL=E-mails enviados a partir do cartão de terceiros Notify_PROPAL_SENTBYMAIL=Proposta comercial enviada por e-mail Notify_BILL_PAYED=Fatura cliente paga @@ -32,9 +35,12 @@ Notify_BILL_SUPPLIER_VALIDATE=Fatura fornecedor validada Notify_BILL_SUPPLIER_PAYED=Fatura fornecedor paga Notify_BILL_SUPPLIER_SENTBYMAIL=Fatura fornecedor enviada por e-mail Notify_BILL_SUPPLIER_CANCELED=Fornecedor fatura cancelada +Notify_CONTRACT_VALIDATE=Contrato validado Notify_FICHEINTER_VALIDATE=Intervenção validada Notify_SHIPPING_VALIDATE=Envio validado Notify_SHIPPING_SENTBYMAIL=Envio enviado por e-mail +Notify_MEMBER_VALIDATE=Membro validado +Notify_MEMBER_MODIFY=Membro modificado Notify_MEMBER_SUBSCRIPTION=Membro inscrito Notify_MEMBER_RESILIATE=Membro resiliado Notify_MEMBER_DELETE=Membro apagado @@ -42,8 +48,13 @@ Notify_PROJECT_CREATE=criação de projeto Notify_TASK_CREATE=Tarefa criada Notify_TASK_MODIFY=Tarefa alterada Notify_TASK_DELETE=Tarefa excluída +NbOfAttachedFiles=Número Arquivos/Documentos Anexos TotalSizeOfAttachedFiles=Tamanho Total dos Arquivos/Documentos Anexos +MaxSize=Tamanho Máximo +AttachANewFile=Adicionar Novo Arquivo/Documento LinkedObject=Arquivo Anexo +Miscellaneous=Diversos +NbOfActiveNotifications=Número Notificações PredefinedMailTest=Esse e um teste de envio.⏎\nAs duas linhas estao separadas por retono de linha.⏎\n⏎\n__SIGNATURE__ PredefinedMailTestHtml=Esse e um email de teste (a palavra test deve ser em bold).
As duas linhas estao separadas por retorno de linha.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Você vai encontrar aqui a factura __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ @@ -64,6 +75,10 @@ DemoCompanyShopWithCashDesk=Administração de uma loja com Caixa DemoCompanyProductAndStocks=Administração de uma PYME com venda de produtos DemoCompanyAll=Administração de uma PYME com Atividades multiplos (todos Os módulos principais) GoToDemo=Acessar ao demo +CreatedBy=Criado por %s +ModifiedBy=Modificado por %s +ValidatedBy=Validado por %s +CanceledBy=Anulado por %s ClosedBy=Encerrado por %s FileWasRemoved=o Arquivo foi eliminado DirWasRemoved=a pasta foi eliminado @@ -71,13 +86,54 @@ FeatureNotYetAvailableShort=Disponível numa próxima versão FeatureNotYetAvailable=Funcionalidade não disponível nesta versão FeatureExperimental=Funcionalidade experimental. não é estável nesta versão FeatureDevelopment=Funcionalidade em Desenvolvimento. não estável nesta versão +FeaturesSupported=Funcionalidades suportadas +Width=Largura +Height=Altura +Depth=Fundo +Top=Topo +Bottom=Fundo Left=Esquerda Right=Direita +CalculatedWeight=Peso calculado +CalculatedVolume=Volume calculado +Weight=Peso +TotalWeight=Peso total +WeightUnitton=Toneladas +WeightUnitkg=kg +WeightUnitg=g +WeightUnitmg=mg +WeightUnitpound=libra +Length=Comprimento +LengthUnitm=m +LengthUnitdm=dm LengthUnitcm=cm LengthUnitmm=mm Surface=Area +SurfaceUnitm2=m2 +SurfaceUnitdm2=dm2 +SurfaceUnitcm2=cm2 +SurfaceUnitmm2=mm2 +SurfaceUnitfoot2=ft2 +SurfaceUnitinch2=in2 +Volume=Volume +TotalVolume=Volume total +VolumeUnitm3=m3 +VolumeUnitdm3=dm3 +VolumeUnitcm3=cm3 +VolumeUnitmm3=mm3 +VolumeUnitfoot3=ft3 +VolumeUnitinch3=in3 +VolumeUnitounce=onça +VolumeUnitlitre=litro VolumeUnitgallon=gallão +Size=Tamanho +SizeUnitm=m +SizeUnitdm=dm +SizeUnitcm=cm +SizeUnitmm=mm +SizeUnitinch=polegada SizeUnitfoot=pe +SizeUnitpoint=ponto BugTracker=Incidências SendNewPasswordDesc=Este formulário permite enviar uma Nova senha. Será enviado ao e-mail do usuário
a modificação da senha não será efetiva até que o usuário click no link de confirmação neste e-mail.
Verifique sua caixa de correio. BackToLoginPage=Voltar e a página de login @@ -85,9 +141,16 @@ AuthenticationDoesNotAllowSendNewPassword=o modo de autentificação de Dolibarr EnableGDLibraryDesc=deve ativar o instalar a Bibliotéca GD na sua PHP para poder ativar esta Opção EnablePhpAVModuleDesc=deve instalar um módulo PHP compatible com a sua antivírus. (Clamav : php4-clamavlib ó php5-clamavlib) ProfIdShortDesc=Prof Id %s é uma informação dePendente do país do Fornecedor.
Por Exemplo, para o país %s, é o código %s. +DolibarrDemo=Demo de Dolibarr ERP/CRM +StatsByNumberOfUnits=Estatísticas em número de unidades de produto/serviço +StatsByNumberOfEntities=Estatísticas em número de identidadees referentes +NumberOfProposals=Número de Orçamentos nos últimos 12 meses +NumberOfCustomerOrders=Número de pedidos de clientes nos últimos 12 meses NumberOfCustomerInvoices=Número de faturas a clientes nos últimos 12 meses NumberOfSupplierOrders=Numero de pedidos dos fornecedores nos ultimos 12 meses NumberOfSupplierInvoices=Número de faturas de Fornecedores nos últimos 12 meses +NumberOfUnitsProposals=Número de unidades nos Orçamentos nos últimos 12 meses +NumberOfUnitsCustomerOrders=Número de unidades nos pedidos de clientes nos últimos 12 meses NumberOfUnitsCustomerInvoices=Número de unidades em faturas a clientes nos últimos 12 meses NumberOfUnitsSupplierOrders=Numero de unidades nos pedidos a fornecedor nos ultimos 12 meses NumberOfUnitsSupplierInvoices=Número de unidades em faturas de Fornecedores nos últimos 12 meses @@ -95,9 +158,15 @@ EMailTextInterventionValidated=A intervenção %s foi validada EMailTextInvoiceValidated=A fatura %s foi validada. EMailTextProposalValidated=A proposta %s foi validada. EMailTextOrderValidated=O pedido %s foi validado. +EMailTextOrderApproved=Pedido %s Aprovado +EMailTextOrderApprovedBy=Pedido %s Aprovado por %s +EMailTextOrderRefused=Pedido %s Reprovado +EMailTextOrderRefusedBy=Pedido %s Reprovado por %s +EMailTextExpeditionValidated=O envio %s foi validado. ImportedWithSet=Data importacao DolibarrNotification=Notificação automatica ResizeDesc=Insira a nova largura OU o novo peso. A proporção sera mantida durante a transformacao... +NewLength=Nova largura NewHeight=Nova altrua NewSizeAfterCropping=Nova dimensao depois do recorte DefineNewAreaToPick=Definir nova area na imagem para escolher ( click esquerdo na imagem e depois arastar ate o canto oposto) @@ -106,24 +175,32 @@ ImageEditor=Editor de imagems YouReceiveMailBecauseOfNotification=Voce recebeu esta mensagem porque o seu endereco de e-mail foi adicionado a lista de alvos a ser informados de algums eventos no %s software de %s. YouReceiveMailBecauseOfNotification2=Este evento e o seguinte: ThisIsListOfModules=Esta e a lista de modulos pre-seleçionados pelo profilo demo escolhido (somente os modulos mais comums são visiveis nesta demo). Para uma demo mais pesoalizada editar aqui e presionar "Inicio". +ClickHere=Clickque aqui UseAdvancedPerms=Use as permissões avançadas de algums modulos FileFormat=Arquivo formato SelectAColor=Escolha a cor +AddFiles=Adicionar arquivos StartUpload=Iniciar o "upload" CancelUpload=Cancelar o "upload" FileIsTooBig=Tamanho do arquivo grande de mais +PleaseBePatient=Por favor aguarde.... RequestToResetPasswordReceived=Recebemos a pedido de mudar a sua senha do Dolibarr NewKeyIs=Estas sao as suas novas chaves de acesso NewKeyWillBe=Sua nova chave de acesso do software sera ClickHereToGoTo=Clickar aqui para ir a %s YouMustClickToChange=Voce tem que clickar no seguinte atalho para validar a sua troca de senha ForgetIfNothing=Se voce nao pediu esta mudanca, simplismente esquece deste email. Suas credenciais estao seguras. + +##### Calendar common ##### AddCalendarEntry=Adicionar entrada ao calendário +NewCompanyToDolibarr=Empresa %s Cadastrada ContractValidatedInDolibarr=Contrato %s Confirmado ContractCanceledInDolibarr=Contrato %s Cancelado ContractClosedInDolibarr=Contrato %s Encerrado PropalClosedSignedInDolibarr=Orçamento %s Assinado PropalClosedRefusedInDolibarr=Orçamento %s rejeitado +PropalValidatedInDolibarr=Orçamento %s Validado +InvoiceValidatedInDolibarr=Fatura %s Confirmada InvoicePaidInDolibarr=Fatura %s modificada em paga in Dolibarr InvoiceCanceledInDolibarr=Fatura %s Cancelada PaymentDoneInDolibarr=Pagamento %s Realizado @@ -135,5 +212,15 @@ MemberDeletedInDolibarr=Membro %s Excluido MemberSubscriptionAddedInDolibarr=Inscrição do membro % adicionada ShipmentValidatedInDolibarr=Envio %s validado em Dolibarr ShipmentDeletedInDolibarr=Envio %s cancelado de Dolibarr +##### Export ##### Export=Exportar +ExportsArea=Área de Exportações +AvailableFormats=Formatos disponíveis +LibraryUsed=Bibliotéca utilizada +LibraryVersion=Versão +ExportableDatas=dados exportáveis NoExportableData=não existe dados exportáveis (sem módulos com dados exportáveis gastodos, necessitam de permissões) +ToExport=Exportar +NewExport=Nova Exportação +##### External sites ##### +ExternalSites=Sites externos diff --git a/htdocs/langs/pt_BR/paybox.lang b/htdocs/langs/pt_BR/paybox.lang index 5f572f80e53..95d125d8fdd 100644 --- a/htdocs/langs/pt_BR/paybox.lang +++ b/htdocs/langs/pt_BR/paybox.lang @@ -1,13 +1,19 @@ # Dolibarr language file - Source file is en_US - paybox +PayBoxSetup=Configuração do módulo PayBox PayBoxDesc=Este módulo oferece uma página de pagamento atravé do fornecedor %s PAYPAL_ADD_PAYMENT_URL=Adicionar URL do pagamento Paypal quando se envia o documento por e-mail -PAYPAL_IPN_MAIL_ADDRESS=Endereço e-mail para notificaçao instantanea do pagamento (IPN) +PAYPAL_IPN_MAIL_ADDRESS=Endereço e-mail para notificaçao instantanea do pagamento (IPN) PredefinedMailContentLink=Clique no link seguro abaixo para fazer o pagamento (PayPal) se nao esta ainda effetuado.⏎\n⏎\n%s⏎\n⏎\n YouAreCurrentlyInSandboxMode=No momento esta no modo "caixa de areia" +NewPaypalPaymentReceived=Novo pagamento Paypal recebido NewPaypalPaymentFailed=Tentado novo pagamento Paypal mas sem hesito. PAYPAL_PAYONLINE_SENDEMAIL=Endereço e-mail para aviso apos o pagamento (positivo ou nao) ReturnURLAfterPayment=Retornar URL após o pagamento ValidationOfPaypalPaymentFailed=Validação do pagamento do Paypal falhou -PaypalConfirmPaymentPageWasCalledButFailed=Pagamento completo mas nenhum pagamento foi recebido no PayPal +PaypalConfirmPaymentPageWasCalledButFailed= Pagamento completo mas nenhum pagamento foi recebido no PayPal diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang index 30771083e0d..9384b6dd0f3 100644 --- a/htdocs/langs/pt_BR/products.lang +++ b/htdocs/langs/pt_BR/products.lang @@ -1,73 +1,173 @@ # Dolibarr language file - Source file is en_US - products ProductRef=Ref produto. ProductLabel=Nome do Produto +ProductServiceCard=Ficha Produto/Serviço +Products=Produtos +Services=Serviços +Product=Produto +Service=Serviço +ProductId=ID Produto/Serviço +Create=Criar +Reference=Referencia +NewProduct=Novo Produto +NewService=Novo Serviço +ProductCode=Código Produto +ServiceCode=Código Serviço ProductVatMassChange=Mudança VAT Massa ProductVatMassChangeDesc=Esta página pode ser utilizado para modificar uma taxa VAT definido em produtos ou serviços a partir de um valor para outro. Atenção, esta mudança é feita em todos os banco de dados. -MassBarcodeInit=Inicialização de código de barras. +MassBarcodeInit=Inicialização de código de barras. MassBarcodeInitDesc=Esta página pode ser usado para inicializar um código de barras em objetos que não têm código de barras definidas. Verifique antes que a instalação do módulo de código de barras é completa. ProductAccountancyBuyCode=Codigo contabilidade (compras) ProductAccountancySellCode=Codigo contabilidade (vendas) +ProductOrService=Produto ou Serviço +ProductsAndServices=Produtos e Serviços +ProductsOrServices=Produtos ou Serviços +ProductsAndServicesOnSell=Produtos e Serviços de Venda +ProductsAndServicesNotOnSell=Produtos e Serviços Fora de Venda +ProductsAndServicesStatistics=Estatísticas Produtos e Serviços +ProductsStatistics=Estatísticas Produtos +ProductsOnSell=Produtos em Venda +ProductsNotOnSell=Produtos Fora de Venda ProductsOnSellAndOnBuy=Produtos não para venda ou compra +ServicesOnSell=Serviços em Venda +ServicesNotOnSell=Serviços Fora de Venda ServicesOnSellAndOnBuy=Serviços não para venda ou compra +InternalRef=Referencia Interna LastRecorded=últimos Produtos/Serviços em Venda Registados LastRecordedProductsAndServices=Os %s últimos Produtos/Perviços Registados LastModifiedProductsAndServices=Os %s últimos Produtos/Serviços Registados LastRecordedProducts=Os %s últimos Produtos Registados LastRecordedServices=Os %s últimos Serviços Registados LastProducts=últimos Produtos +CardProduct0=Ficha do Produto +CardProduct1=Ficha do Serviço +CardContract=Ficha do Contrato +Warehouse=Armazém +Warehouses=Armazens +WarehouseOpened=Armazém Aberto +WarehouseClosed=Armazém Encerrado +Stock=Estoque +Stocks=Estoques +Movement=Movimento +Movements=Movimentos +Sell=Vendas +Buy=Compras OnSell=Para Venda OnBuy=Para compra +NotOnSell=Fora de Venda ProductStatusOnSell=Para Venda +ProductStatusNotOnSell=Fora de Venda ProductStatusOnSellShort=Para Venda +ProductStatusNotOnSellShort=Fora de venda ProductStatusOnBuy=Para compra ProductStatusNotOnBuy=Não para-se comprar ProductStatusOnBuyShort=Para compra ProductStatusNotOnBuyShort=Não para-se comprar +UpdatePrice=Alterar preço +AppliedPricesFrom=Preço de venda válido a partir de SellingPrice=Preço de Venda SellingPriceHT=Preço de venda (sem taxas) SellingPriceTTC=Preço de venda (incl. taxas) +PublicPrice=Preço público CurrentPrice=Preço atual NewPrice=Novo Preço MinPrice=Preço mínimo de venda MinPriceHT=Minimo preço de venda (líquido de imposto) MinPriceTTC=Minimo preço de venda (inc. taxa) CantBeLessThanMinPrice=O preço de venda não deve ser inferior ao mínimo para este produto (%s ICMS) +ContractStatus=Estado de contrato ContractStatusClosed=Encerrado +ContractStatusRunning=Em Serviço +ContractStatusExpired=Expirado +ContractStatusOnHold=Fora de serviço +ContractStatusToRun=A colocar em serviço +ContractNotRunning=Este contrato não está em serviço +ErrorProductAlreadyExists=Um produto com a referencia %s já existe. ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorreto ErrorProductClone=Aconteceu um problema durante a clonação do produto ou serviço. +Suppliers=Fornecedores +SupplierRef=Ref. fornecedor +ShowProduct=Mostrar produto +ShowService=Mostrar serviço +ProductsAndServicesArea=Área de Produtos e Serviços +ProductsArea=Área de Produtos +ServicesArea=Área de Serviços +AddToMyProposals=Adicionar aos meus Orçamentos +AddToOtherProposals=Adicionar a Outros Orçamentos AddToMyBills=Adicionar às minhas faturas AddToOtherBills=Adicionar a Outras faturas +CorrectStock=Corrigir estoque +AddPhoto=Adicionar uma foto +ListOfStockMovements=Lista de movimentos de estoque +BuyingPrice=Preço de compra +SupplierCard=Ficha fornecedor +CommercialCard=Ficha comercial AllWays=Rota para encontrar o sua produto ao estoque NoCat=O sua produto não pertence a nenhuma categoria +PrimaryWay=Rota Primaria: +PriceRemoved=Preço eliminado +BarCode=Código de barras +BarcodeType=Tipo de código de barras +SetDefaultBarcodeType=Defina o tipo de código de barras +BarcodeValue=Valor do código de barras NoteNotVisibleOnBill=Nota (Não é visivel as faturas, orçamentos, etc.) +CreateCopy=Criar Cópia +ServiceLimitedDuration=Sim o serviço é de Duração limitada : MultiPricesAbility=Vários preços por produto / serviço MultiPricesNumPrices=Numero de preços MultiPriceLevelsName=Categoria de preços AssociatedProductsAbility=Ativar produtos associados +AssociatedProducts=Produtos associados AssociatedProductsNumber=N� de produtos associados ParentProductsNumber=Numero de produto virtual pai IfZeroItIsNotAVirtualProduct=Se 0, este produto não e produto virtual IfZeroItIsNotUsedByVirtualProduct=Se 0, este produto nao e usado por nenhum produto virtual +EditAssociate=Associar +Translation=Tradução +KeywordFilter=Filtro por Chave CategoryFilter=Filtro por categoria +ProductToAddSearch=Procurar produtos a Adicionar +AddDel=Adicionar/Retirar +Quantity=Quantidade +NoMatchFound=Não foram encontrados resultados ProductAssociationList=Lista de produtos/serviços associados : Nome do produto/servisio (quantidade afetada) ProductParentList=Lista de produtos/servicos virtuais com este produto como componente ErrorAssociationIsFatherOfThis=Um dos produtos selecionados é pai do produto em curso +DeleteProduct=Eliminar um produto/serviço ConfirmDeleteProduct=? Tem certeza que quer eliminar este produto/serviço? +ProductDeleted=O produto/serviço "%s" foi eliminado da base de dados. +DeletePicture=Eliminar uma foto ConfirmDeletePicture=? Tem certeza que quer eliminar esta foto? +ExportDataset_produit_1=Produtos e Serviços +ExportDataset_service_1=Serviços +ImportDataset_produit_1=Produtos +ImportDataset_service_1=Serviços +DeleteProductLine=Eliminar linha de produto ConfirmDeleteProductLine=Tem certeza que quer eliminar esta linha de produto? +NoProductMatching=Nenhum produto/serviço responde à criterio +MatchingProducts=Produtos/Serviços encontrados NoStockForThisProduct=Não existe estoque deste produto NoStock=Sem estoque +Restock=Recolocar +ProductSpecial=Especial QtyMin=Quantidade min +PriceQty=Preço para a quantidade PriceQtyMin=Preco para esta qtd min. (sem desconto) VATRateForSupplierProduct=Percentual ICMS (para este fornecedor/produto) DiscountQtyMin=Desconto padrao para qtd +NoPriceDefinedForThisSupplier=Nenhum Preço/Quant. definido para este fornecedor/produto +NoSupplierPriceDefinedForThisProduct=Nenhum Preço/Quant. Fornecedor definida para este produto +RecordedProducts=Produtos em venda RecordedServices=Serviços gravados +RecordedProductsAndServices=Produtos/Serviços para Venda PredefinedProductsToSell=Produtos pré-definidas para vender PredefinedServicesToSell=Serviços predefinidos para vender PredefinedProductsAndServicesToSell=Produtos / serviços pré-definidas para vender PredefinedProductsToPurchase=Produto pré-definidas para compra PredefinedServicesToPurchase=Serviços pré-definidos para compra PredefinedProductsAndServicesToPurchase=Produtos / serviços predefinidos para compra. +GenerateThumb=Gerar a etiqueta +ProductCanvasAbility=Usar as extensões especiais "canvas" ServiceNb=Serviço n� %s ListProductServiceByPopularity=Lista de produtos/serviços por popularidade ListProductByPopularity=Lista de produtos por popularidade @@ -78,7 +178,7 @@ CloneProduct=Clonar produto ou serviço ConfirmCloneProduct=Voce tem certeza que deseja clonar o produto ou servico %s ? CloneContentProduct=Clonar todas as principais informações de um produto/serviço ClonePricesProduct=Clonar principais informações e preços -CloneCompositionProduct=Produtos / serviços copias virtuais +CloneCompositionProduct=Produtos / serviços copias virtuais ProductIsUsed=Este produto é usado NewRefForClone=Ref. do novo produto/serviço CustomerPrices=Preços de clientes @@ -87,18 +187,23 @@ SuppliersPricesOfProductsOrServices=Preços (de produtos ou serviços) Fornecedo CustomCode=Codigo NCM CountryOrigin=Pais de origem HiddenIntoCombo=Escondido nas listas de seleções +Nature=Tipo de produto ProductCodeModel=Modelo de ref. de produto ServiceCodeModel=Modelo de ref. de serviço AddThisProductCard=Criar ficha produto HelpAddThisProductCard=Esta opção permite de criar ou clonar um produto caso nao exista. AddThisServiceCard=Criar ficha serviço HelpAddThisServiceCard=Esta opção permite de criar ou clonar um serviço caso o mesmo não existe. +CurrentProductPrice=Preço atual AlwaysUseNewPrice=Usar sempre preço atual do produto/serviço AlwaysUseFixedPrice=Usar preço fixo +PriceByQuantity=Preço por quantidade PriceByQuantityRange=Intervalo de quantidade ProductsDashboard=Resumo de produtos/serviços +UpdateOriginalProductLabel=Modificar etiqueta original HelpUpdateOriginalProductLabel=Permite editar o nome do produto -Building=Produção e despacho de items +### composition fabrication +Building=Produção e despacho de items Build=Produzir BuildIt=Produzir & Enviar BuildindListInfo=Quantidade disponivel para produção por cada estoque (coloque 0 para nenhuma ação) @@ -107,6 +212,7 @@ UnitPmp=Unidades VWAP CostPmpHT=Total unidades VWAP ProductUsedForBuild=Automaticamente consumidos pela produção ProductBuilded=Produção completada +ProductsMultiPrice=Produto multi-preço ProductsOrServiceMultiPrice=Preços Clientes (de produtos ou serviços, multi-preços) ProductSellByQuarterHT=Total de produtos vendidos no trimestre ServiceSellByQuarterHT=Total de servicos vendidos no trimestre @@ -127,6 +233,7 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definição do código ou valor do c BarCodeDataForProduct=Informações de código de barras do produto% s: BarCodeDataForThirdparty=Informações de código de barras do fornecedor: ResetBarcodeForAllRecords=Definir o valor de código de barras para todos os registros (isto também irá repor valor de código de barras já definido com novos valores) +PriceByCustomer=Preço por cliente PriceCatalogue=Preço único por produto / serviço PricingRule=As regras de tarifação AddCustomerPrice=Adicione preço por parte dos clientes diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang index cd0c9dc294b..b6a3119b993 100644 --- a/htdocs/langs/pt_BR/projects.lang +++ b/htdocs/langs/pt_BR/projects.lang @@ -1,5 +1,8 @@ # Dolibarr language file - Source file is en_US - projects +RefProject=Ref. do projeto ProjectId=Id do projeto +Project=Projeto +Projects=Projetos SharedProject=A todos PrivateProject=Contatos do projeto MyProjectsDesc=Exibe apenas os projetos que você for um contato (independente do tipo). @@ -9,50 +12,83 @@ MyTasksDesc=Esta exibição é limitado a projetos ou tarefas que você é um co TasksPublicDesc=Essa exibição apresenta todos os projetos e tarefas que você tem permissão para ler. TasksDesc=Essa exibição apresenta todos os projetos e tarefas (suas permissões de usuário concede-lhe ver tudo). Myprojects=Os Meus Projetos +ProjectsArea=Área de Projetos +NewProject=Novo Projeto AddProject=Criar Projeto +DeleteAProject=Eliminar um Projeto +DeleteATask=Eliminar uma Tarefa ConfirmDeleteAProject=Tem certeza que quer eliminar este projeto? ConfirmDeleteATask=Tem certeza que quer eliminar esta tarefa? OfficerProject=Responsável do Projeto LastProjects=Os %s últimos Projetos +AllProjects=Todos os Projetos +ProjectsList=Lista de Projetos ShowProject=Adicionar Projeto +SetProject=Definir Projeto +NoProject=Nenhum Projeto Definido NbOpenTasks=No Tarefas Abertas NbOfProjects=No de Projetos TimeSpent=Tempo Dedicado TimesSpent=Tempo gasto RefTask=Ref. Tarefa +LabelTask=Etiqueta de Tarefa TaskTimeSpent=O tempo gasto nas tarefas TaskTimeUser=Usuário +TaskTimeNote=Nota +TaskTimeDate=Data NewTimeSpent=Novo Tempo Dedicado MyTimeSpent=O Meu Tempo Dedicado MyTasks=As minhas Tarefas +Tasks=Tarefas +Task=Tarefa TaskDateStart=Data de início da tarefa TaskDateEnd=Data final da tarefa +TaskDescription=Descrição da tarefa +NewTask=Nova Tarefa +AddTask=Adicionar Tarefa AddDuration=Indicar Duração +Activity=Atividade +Activities=Tarefas/Atividades MyActivity=A Minha Atividade MyActivities=Minhas Tarefas/Atividades MyProjects=Os Meus Projetos +DurationEffective=Duração Efetiva +Progress=Progresso ProgressDeclared=o progresso declarado ProgressCalculated=calculado do progresso +Time=Tempo +ListProposalsAssociatedProject=Lista de Orçamentos Associados ao Projeto ListOrdersAssociatedProject=Lista de Pedidos Associados ao Projeto +ListInvoicesAssociatedProject=Lista de Faturas Associadas ao Projeto +ListPredefinedInvoicesAssociatedProject=Lista de Faturas a Clientes Predefinidas Associadas ao Projeto +ListSupplierOrdersAssociatedProject=Lista de Pedidos a Fornecedores Associados ao Projeto ListSupplierInvoicesAssociatedProject=Lista de Faturas de Fornecedor Associados ao Projeto +ListContractAssociatedProject=Lista de Contratos Associados ao Projeto +ListFichinterAssociatedProject=Lista de intervenções associadas ao projeto ListTripAssociatedProject=Lista de viagens e despesas associadas com o projeto +ListActionsAssociatedProject=Lista de eventos associados ao projeto ActivityOnProjectThisWeek=Atividade ao Projeto esta Semana ActivityOnProjectThisMonth=Atividade ao Projeto este Mês ActivityOnProjectThisYear=Atividade ao Projeto este Ano ChildOfTask=Link da Tarefa NotOwnerOfProject=Não é responsável deste projeto privado +AffectedTo=Atribuido a CantRemoveProject=Este projeto não pode ser eliminado porque está referenciado por muito objetos (facturas, pedidos e outros). ver a lista no separador referencias. ValidateProject=Validar projeto ConfirmValidateProject=Você tem certeza que deseja validar esse projeto? +CloseAProject=Fechar projeto ConfirmCloseAProject=Tem certeza de que quer encerrar esse projeto? ReOpenAProject=Abrir projeto ConfirmReOpenAProject=Tem certeza de que quer voltar a abrir este projeto? ProjectContact=Contatos do projeto ActionsOnProject=Eventos do projeto YouAreNotContactOfProject=Você não é um contato deste projeto privado +DeleteATimeSpent=Excluir o tempo gasto ConfirmDeleteATimeSpent=Tem certeza de que deseja excluir este tempo? DoNotShowMyTasksOnly=Veja também as tarefas não alocada para mim ShowMyTasksOnly=Ver apenas tarefas que me forem atribuídos +TaskRessourceLinks=Recursos +ProjectsDedicatedToThisThirdParty=Projetos dedicados a este terceiro NoTasks=Não há tarefas para este projeto LinkedToAnotherCompany=Ligado a outros terceiros TaskIsNotAffectedToYou=Tarefa não alocado para você @@ -68,9 +104,12 @@ CloneTaskFiles=Copia(s) do(s) arquivo(s) do projeto(s) finalizado ConfirmCloneProject=Tem certeza que deseja copiar este projeto? ProjectReportDate=Alterar a data da tarefa de acordo com a data de início do projeto ErrorShiftTaskDate=Impossível mudar data da tarefa de acordo com a nova data de início do projeto +ProjectsAndTasksLines=Projetos e tarefas +ProjectCreatedInDolibarr=Projeto %s criado TaskCreatedInDolibarr=Tarefa %s criada TaskModifiedInDolibarr=Tarefa %s alterada TaskDeletedInDolibarr=Tarefa %s excluída +##### Types de contacts ##### TypeContact_project_internal_PROJECTLEADER=Chefe de projeto TypeContact_project_external_PROJECTLEADER=Chefe de projeto TypeContact_project_internal_PROJECTCONTRIBUTOR=Colaborador @@ -81,9 +120,10 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Colaborador TypeContact_project_task_external_TASKCONTRIBUTOR=Colaborador SelectElement=Selecionar componente AddElement=Link para componente +# Documents models DocumentModelBaleine=Modelo de relatório de um projeto completo (logo. ..) -PlannedWorkload =carga horária planejada -WorkloadOccupation=Carga horária empregada +PlannedWorkload = carga horária planejada +WorkloadOccupation= Carga horária empregada ProjectReferers=Fazendo referência a objetos SearchAProject=Buscar um projeto ProjectMustBeValidatedFirst=O projeto tem que primeiramente ser validado diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang index e2107cb3c87..7b11b13a198 100644 --- a/htdocs/langs/pt_BR/propal.lang +++ b/htdocs/langs/pt_BR/propal.lang @@ -1,27 +1,78 @@ # Dolibarr language file - Source file is en_US - propal +Proposals=Orçamentos +Proposal=Orçamento +ProposalShort=Proposta +ProposalsDraft=Orçamentos Rascunho +ProposalDraft=Orçamento Rascunho +ProposalsOpened=Orçamentos Abertos +Prop=Orçamentos +CommercialProposal=Orçamento +CommercialProposals=Orçamentos ProposalCard=Cartao de proposta +NewProp=Novo Orçamento +NewProposal=Novo Orçamento +NewPropal=Novo Orçamento +Prospect=Cliente Potencial +ProspectList=Lista de Clientes Potenciais +DeleteProp=Eliminar Orçamento +ValidateProp=Confirmar Orçamento +AddProp=Criar Orçamento ConfirmDeleteProp=Tem certeza que quer eliminar este orçamento? ConfirmValidateProp=Tem certeza que quer Confirmar este orçamento? LastPropals=Os %s últimos Orçamentos LastClosedProposals=Os últimos Orçamentos Encerrados LastModifiedProposals=As últimas %s propostas modificadas +AllPropals=Todos Os Orçamentos LastProposals=últimos Orçamentos +SearchAProposal=Procurar um Orçamento +ProposalsStatistics=Estatísticas de Orçamentos +NumberOfProposalsByMonth=Número por Mês AmountOfProposalsByMonthHT=Valor por Mês (sem ICMS) +NbOfProposals=Número Orçamentos +ShowPropal=Ver Orçamento +PropalsDraft=Rascunho +PropalsOpened=Abertos PropalsNotBilled=Não Faturados +PropalStatusDraft=Rascunho (a Confirmar) +PropalStatusValidated=Validado (Orçamento Aberto) +PropalStatusOpened=Validado (Orçamento Aberto) +PropalStatusClosed=Encerrado PropalStatusSigned=Assinado (A Faturar) PropalStatusNotSigned=Sem Assinar (Encerrado) PropalStatusBilled=Faturado +PropalStatusDraftShort=Rascunho +PropalStatusValidatedShort=Validado +PropalStatusOpenedShort=Aberto PropalStatusClosedShort=Encerrado +PropalStatusSignedShort=Assinado +PropalStatusNotSignedShort=Sem Assinar PropalStatusBilledShort=Faturado PropalsToClose=Orçamentos a Fechar PropalsToBill=Orçamentos Assinados a Faturar +ListOfProposals=Lista de Orçamentos ActionsOnPropal=Ações sobre o Orçamento +NoOpenedPropals=Sem Orçamentos Abertos +NoOtherOpenedPropals=Nenhum outro orçamento aberto +RefProposal=Ref. Orçamento +SendPropalByMail=Enviar Orçamento por E-mail FileNotUploaded=Não foi Carregado o Arquivo FileUploaded=O Arquivo foi carregado corretamente +AssociatedDocuments=Documentos Associados ao Orçamento : ErrorCantOpenDir=Impossível Abrir a Pasta DatePropal=Data da Proposta +DateEndPropal=Válido até +DateEndPropalShort=Data Fim +ValidityDuration=Duração da Validade CloseAs=Fechado como +ClassifyBilled=Classificar Faturado BuildBill=Criar Fatura +ErrorPropalNotFound=Orçamento %s Inexistente +Estimate=Orçamento: +EstimateShort=Orç. +OtherPropals=Outros Orçamentos +AddToDraftProposals=Adicionar a projeto de proposta +NoDraftProposals=Não há projetos de propostas +CopyPropalFrom=Criar orçamento por Cópia de um existente CreateEmptyPropal=Criar orçamento a partir da Lista de produtos predefinidos DefaultProposalDurationValidity=Prazo de validez por default (em dias) UseCustomerContactAsPropalRecipientIfExist=Utilizar endereço contato de seguimento de cliente definido em vez do endereço do Fornecedor como destinatário dos Orçamentos @@ -33,10 +84,19 @@ ProposalLine=Linha da Proposta AvailabilityPeriod=Data de aprontamento SetAvailability=Atrazo de entrega AfterOrder=Apos o pedido +##### Availability ##### +AvailabilityTypeAV_NOW=Imediato +AvailabilityTypeAV_1W=1 semana +AvailabilityTypeAV_2W=2 semanas +AvailabilityTypeAV_3W=3 semanas AvailabilityTypeAV_1M=1 mes +##### Types de contacts ##### TypeContact_propal_internal_SALESREPFOLL=Representante seguindo a proposta TypeContact_propal_external_BILLING=Contato da fatura cliente -TypeContact_propal_external_CUSTOMER=Contato cliente seguindo a proposta +TypeContact_propal_external_CUSTOMER=Contato cliente seguindo a proposta +# Document models +DocModelAzurDescription=Modelo de orçamento completo (logo...) +DocModelJauneDescription=Modelo de Orçamento Jaune DefaultModelPropalCreate=Criaçao modelo padrao DefaultModelPropalToBill=Modelo padrao no fechamento da proposta comercial ( a se faturar) DefaultModelPropalClosed=Modelo padrao no fechamento da proposta comercial (nao faturada) diff --git a/htdocs/langs/pt_BR/salaries.lang b/htdocs/langs/pt_BR/salaries.lang index ae54678cc61..6a69041ef30 100644 --- a/htdocs/langs/pt_BR/salaries.lang +++ b/htdocs/langs/pt_BR/salaries.lang @@ -1,4 +1,8 @@ -# Dolibarr language file - Source file is en_US - salaries +# Dolibarr language file - Source file is en_US - users +Salary=Salário +Salaries=Salários +Employee=Empregado NewSalaryPayment=Novo pagamento de salário SalaryPayment=Pagamento de salário SalariesPayments=Pagamentos de salários +ShowSalaryPayment=Mostrar pagamento de salário diff --git a/htdocs/langs/pt_BR/sendings.lang b/htdocs/langs/pt_BR/sendings.lang index 11a90222d68..91ca6e88639 100644 --- a/htdocs/langs/pt_BR/sendings.lang +++ b/htdocs/langs/pt_BR/sendings.lang @@ -1,10 +1,43 @@ # Dolibarr language file - Source file is en_US - sendings RefSending=Ref. Envio +Sending=Envio +Sendings=Envios +Shipment=Envio +Shipments=Envios +Receivings=Recepções SendingsArea=Área Envios +ListOfSendings=Lista de Envios +SendingMethod=Método de Envio +SendingReceipt=Entrega LastSendings=Os %s últimos Envios +SearchASending=Procurar Envio +StatisticsOfSendings=Estatísticas de Envios +NbOfSendings=Número de Envios +NumberOfShipmentsByMonth=Número de envios por mês +SendingCard=Ficha de Envio +NewSending=Novo Envio +CreateASending=Criar um Envio +CreateSending=Criar Envio +QtyOrdered=Quant. Pedida +QtyShipped=Quant. Enviada +QtyToShip=Quant. a Enviar QtyReceived=Quant. Recibida KeepToShip=Fica por Enviar +OtherSendingsForSameOrder=Outros Envios deste Pedido +DateSending=Data de Expedição +DateSendingShort=Data de Expedição +SendingsForSameOrder=Expedições deste Pedido +SendingsAndReceivingForSameOrder=Envios e Recepções deste pedido +SendingsToValidate=Envios a Confirmar +StatusSendingCanceled=Cancelado +StatusSendingDraft=Rascunho StatusSendingValidated=Validado (produtos a enviar o enviados) +StatusSendingProcessed=Processado +StatusSendingCanceledShort=Cancelado +StatusSendingDraftShort=Rascunho +StatusSendingValidatedShort=Validado +StatusSendingProcessedShort=Processado +SendingSheet=Ficha de envio Carriers=Transportadoras Carrier=Transportadora CarriersArea=Área Transportadoras @@ -12,8 +45,12 @@ NewCarrier=Novo Transportadora ConfirmDeleteSending=Tem certeza que quer eliminar esta expedição? ConfirmValidateSending=Tem certeza que quer Confirmar esta expedição? ConfirmCancelSending=Tem certeza que quer anular esta expedição? +GenericTransport=Transporte Genérico +Enlevement=Pick-up por o Cliente +DocumentModelSimple=Modelo Simples DocumentModelMerou=Modelo A5 Merou WarningNoQtyLeftToSend=Atenção, nenhum produto à espera de ser enviado. +StatsOnShipmentsOnlyValidated=Estatisticas referentes os envios , mas somente validados. Data usada e data da validacao do envio ( a data planejada da entrega nao e sempre conhecida). DateDeliveryPlanned=Data de entrega planejada DateReceived=Data de entrega recebida SendShippingByEMail=Envio enviado por e-mail @@ -22,10 +59,14 @@ ActionsOnShipping=Eventos no envio LinkToTrackYourPackage=Atalho para rastreamento do pacote ShipmentCreationIsDoneFromOrder=No momento a criaçao de um novo envio e feito da ficha de pedido. RelatedShippings=Envios relativos +ShipmentLine=Linha de envio CarrierList=Lista de transportadoras + +# Sending methods SendingMethodCATCH=Remoção pelo cliente SendingMethodTRANS=Transportadora SendingMethodCOLSUI=Acompanhamento +# ModelDocument DocumentModelSirocco=Modelo de Documento Sirocco DocumentModelTyphon=Modelo de Documento Typhon Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constante EXPEDITION_ADDON_NUMBER nao definida diff --git a/htdocs/langs/pt_BR/shop.lang b/htdocs/langs/pt_BR/shop.lang index 82aed1ab666..f9084688bf0 100644 --- a/htdocs/langs/pt_BR/shop.lang +++ b/htdocs/langs/pt_BR/shop.lang @@ -1,3 +1,11 @@ # Dolibarr language file - Source file is en_US - shop FailedConnectDBCheckModuleSetup=Falha na conexão com banco de dados do osCommerce. Verifique a configuração do módulo +Shop=Loja +ShopWeb=Loja web +LastOrders=últimos pedidos +OnStandBy=Em espera +TreatmentInProgress=Em progresso LastCustomers=últimos clientes +OSCommerceShop=Loja OS Commerce +OSCommerce=OSCommerce +AddProd=Venda em linha diff --git a/htdocs/langs/pt_BR/sms.lang b/htdocs/langs/pt_BR/sms.lang index 31c96c5a8fa..6143de38322 100644 --- a/htdocs/langs/pt_BR/sms.lang +++ b/htdocs/langs/pt_BR/sms.lang @@ -1,12 +1,18 @@ # Dolibarr language file - Source file is en_US - sms +Sms=Sms SmsSetup=Configuraçao sms SmsDesc=Esta pagina permite definir as opçoes globais para os SMS SmsCard=Cartao SMS AllSms=Todas as campnhas SMS SmsTargets=Alvos SmsRecipients=Alvos +SmsRecipient=Alvo SmsTitle=Descriçao +SmsFrom=Remetente +SmsTo=Alvo SmsTopic=Topico do SMS +SmsText=Mensagem +SmsMessage=Mensagem SMS ShowSms=Mostrar SMS ListOfSms=Listar campanhas SMS NewSms=Nova campanha SMS @@ -21,6 +27,13 @@ SmsResult=Resultado do envio SMS TestSms=Testar SMS ValidSms=Validar SMS ApproveSms=Aprovar SMS +SmsStatusDraft=Rascunho +SmsStatusValidated=Validado +SmsStatusApproved=Aprovado +SmsStatusSent=Enviado +SmsStatusSentPartialy=Enviado parcialmente +SmsStatusSentCompletely=Enviado completamente +SmsStatusError=Erro SmsStatusNotSent=Nao enviado SmsSuccessfulySent=SMS enviado coretamente (de %s a %s) ErrorSmsRecipientIsEmpty=Numero de alvos vazio @@ -32,5 +45,9 @@ NbOfRecipients=Numero de alvos NbOfUniqueSms=Nr. de numeros telefonicos unicos NbOfSms=Numero de numeros telefonicos ThisIsATestMessage=Isto e uma mensagem de teste +SendSms=Enviar SMS SmsInfoCharRemain=Nr de caracteres restantes -SmsInfoNumero=(formato internacional ex: +33899701761) +SmsInfoNumero= (formato internacional ex: +33899701761) +DelayBeforeSending=Atraso antes de enviar (minutos) +SmsNoPossibleRecipientFound=Nenhum alvo disponível. Verifique a configuração do seu provedor de SMS. + diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang index d6ba81ce550..c0183f790da 100644 --- a/htdocs/langs/pt_BR/stocks.lang +++ b/htdocs/langs/pt_BR/stocks.lang @@ -9,28 +9,45 @@ WarehouseOpened=Armazém Aberto WarehouseClosed=Armazém Encerrado WarehouseSource=Armazém Origem WarehouseSourceNotDefined=Sem armazém definido, -WarehouseTarget=Destino do armazenamento +AddOne=Adicionar um +WarehouseTarget= Destino do armazenamento ValidateSending=Confirmar Envio CancelSending=Cancelar Envio DeleteSending=Eliminar Envio Stock=Estoque Stocks=Estoques +Movement=Movimento +Movements=Movimentos ErrorWarehouseRefRequired=Nome de referência do armazenamento é necessária ErrorWarehouseLabelRequired=A etiqueta do armazenamento é obrigatória CorrectStock=Corrigir Estoque ListOfWarehouses=Lista de armazenamento +ListOfStockMovements=Lista de movimentos de stock StocksArea=Área estoques +Location=Localização +LocationSummary=Nome abreviado da localização NumberOfDifferentProducts=Número de produtos diferentes +NumberOfProducts=Numero total de produtos +LastMovement=Último movimento +LastMovements=Últimos movimentos +Units=Unidades +Unit=Unidade StockCorrection=Correção estoque StockTransfer=Banco de transferência +StockMovement=Transferencia StockMovements=Movimentos de estoque LabelMovement=Etiqueta Movimento +NumberOfUnit=Número de peças UnitPurchaseValue=Preço de compra da unidade TotalStock=Total em estoque StockTooLow=Estoque insuficiente StockLowerThanLimit=Da ação inferior limite de alerta +EnhancedValue=Valor +PMPValue=Valor (PMP) +PMPValueShort=PMP EnhancedValueOfWarehouses=Valor de estoques UserWarehouseAutoCreate=Criar existencias automaticamente na criação de um usuário +QtyDispatched=Quantidade desagregada OrderDispatch=Recepção de estoques RuleForStockManagementDecrease=Regra de Administração de decrementos de estoque RuleForStockManagementIncrease=Regra de Administração de incrementos de estoque @@ -42,7 +59,9 @@ ReStockOnValidateOrder=Incrementar os estoques físicos sobre os pedidos ReStockOnDispatchOrder=Aumentar os estoques reais no envio manual para armazenamento, depois de receber ordem fornecedor ReStockOnDeleteInvoice=Aumentar os estoques reais sobre exclusão fatura OrderStatusNotReadyToDispatch=Não tem ordem ainda não ou nato tem um status que permite envio de produtos em para armazenamento. +StockDiffPhysicTeoric=Motivo da diferença entre valores físicos e teóricos NoPredefinedProductToDispatch=Não há produtos pré-definidos para este objeto. Portanto, não envio em estoque é necessária. +DispatchVerb=Expedição StockLimitShort=Limite para alerta StockLimit=Limite de estoque para alerta PhysicalStock=Estoque físico @@ -59,6 +78,8 @@ WarehousesAndProducts=Armazenamento de produtos AverageUnitPricePMPShort=Preço médio de entrada AverageUnitPricePMP=Preço médio de entrada SellPriceMin=Venda Preço unitário +EstimatedStockValueSellShort=Valor para vender +EstimatedStockValueSell=Valor para vender EstimatedStockValueShort=O valor das ações de entrada EstimatedStockValue=O valor das ações de entrada DeleteAWarehouse=Excluir um arquivo @@ -82,6 +103,7 @@ CurentlyUsingVirtualStock=Estoque virtual CurentlyUsingPhysicalStock=Estoque físico RuleForStockReplenishment=Regra para as ações de reposição SelectProductWithNotNullQty=Selecione pelo menos um produto com um qty não nulo e um fornecedor +AlertOnly= Só Alertas WarehouseForStockDecrease=Os arquivos serão utilizados para redução estoque WarehouseForStockIncrease=O arquivos serão utilizados para aumento de ForThisWarehouse=Para este armazenamento @@ -89,7 +111,7 @@ ReplenishmentStatusDesc=Esta lista de todos os produtos com um estoque menor do ReplenishmentOrdersDesc=Esta lista de todos os pedidos de fornecedores esta aberto Replenishments=Reconstituições NbOfProductBeforePeriod=Quantidade de produtos em estoque antes do período selecionado -NbOfProductAfterPeriod=Quantidade de produtos em estoque período selecionado depois +NbOfProductAfterPeriod=Quantidade de produtos em estoque período selecionado depois MassMovement=Movimento de massas MassStockMovement=Movimento de estoque em massa SelectProductInAndOutWareHouse=Selecione um produto, uma quantidade, um armazém de origem e um armazém de destino e clique em "% s". Uma vez feito isso para todos os movimentos necessários, clique em "% s". @@ -99,4 +121,5 @@ StockMovementRecorded=Movimentos de estoque gravados RuleForStockAvailability=Regras sobre os requisitos de ações StockMustBeEnoughForInvoice=Banco de nível deve ser o suficiente para adicionar o produto / serviço em fatura StockMustBeEnoughForOrder=Banco de nível deve ser o suficiente para adicionar o produto / serviço em ordem -StockMustBeEnoughForShipment=Banco de nível deve ser o suficiente para adicionar o produto / serviço no transporte +StockMustBeEnoughForShipment= Banco de nível deve ser o suficiente para adicionar o produto / serviço no transporte + diff --git a/htdocs/langs/pt_BR/suppliers.lang b/htdocs/langs/pt_BR/suppliers.lang index 7529b15a1d6..566987d55a2 100644 --- a/htdocs/langs/pt_BR/suppliers.lang +++ b/htdocs/langs/pt_BR/suppliers.lang @@ -1,17 +1,42 @@ # Dolibarr language file - Source file is en_US - suppliers +Suppliers=Fornecedores +Supplier=Fornecedor +AddSupplier=Adicionar Fornecedor +SupplierRemoved=Fornecedor Eliminado SuppliersInvoice=Faturas do Fornecedor +NewSupplier=Novo Fornecedor +History=Histórico +ListOfSuppliers=Lista de Fornecedores +ShowSupplier=Mostrar Fornecedor +OrderDate=Data Pedido +BuyingPrice=Preço de Compra BuyingPriceMin=Preco de compra minimo BuyingPriceMinShort=Preco de compra min +TotalBuyingPriceMin=Total de precos de compra dos subprodutos +SomeSubProductHaveNoPrices=Algums dos sub-produtos nao tem um preco definido +AddSupplierPrice=Adicionar Preço de Fornecedor +ChangeSupplierPrice=Modificar Preço de Fornecedor +ErrorQtyTooLowForThisSupplier=Quantidade insuficiente para este fornecedor +ErrorSupplierCountryIsNotDefined=O país deste fornecedor não está definido, corrija na sua ficha ProductHasAlreadyReferenceInThisSupplier=Este produto já tem uma referencia neste fornecedor ReferenceSupplierIsAlreadyAssociatedWithAProduct=Esta referencia de fornecedor ja esta asociada com a referenca: %s +NoRecordedSuppliers=Sem Fornecedores Registados +SupplierPayment=Pagamento a Fornecedor +SuppliersArea=Área Fornecedores +RefSupplierShort=Ref. Fornecedor Availability=Entrega ExportDataset_fournisseur_1=Faturas de Fornecedores e Linhas de Fatura ExportDataset_fournisseur_2=Faturas Fornecedores e Pagamentos ExportDataset_fournisseur_3=Ordems de fornecedor e linhas de ordem +ApproveThisOrder=Aprovar este Pedido ConfirmApproveThisOrder=Tem certeza que quer aprovar este pedido? +DenyingThisOrder=Negar este Pedido ConfirmDenyingThisOrder=Tem certeza que quer negar este pedido? ConfirmCancelThisOrder=Tem certeza que quer cancelar este pedido? +AddCustomerOrder=Criar Pedido do Cliente AddCustomerInvoice=Criar Fatura para o Cliente +AddSupplierOrder=Criar Pedido a Fornecedor AddSupplierInvoice=Criar Fatura do Fornecedor +ListOfSupplierProductForSupplier=Lista de produtos e preços do fornecedor %s NoneOrBatchFileNeverRan=Nenhum lote ou %s não foi executado recentemente SentToSuppliers=Enviado para fornecedores diff --git a/htdocs/langs/pt_BR/trips.lang b/htdocs/langs/pt_BR/trips.lang index 67ab59d05c1..c236b55cb3c 100644 --- a/htdocs/langs/pt_BR/trips.lang +++ b/htdocs/langs/pt_BR/trips.lang @@ -2,13 +2,20 @@ Trip=Deslocamento Trips=Deslocamentos TripsAndExpenses=Deslocamentos e Despesas -TripsAndExpensesStatistics=Estatisticas de viagems e despesas +TripsAndExpensesStatistics=Estatisticas de viagems e despesas TripCard=Ficha de Deslocamento +AddTrip=Adicionar Deslocamento ListOfTrips=Lista de Deslocamentos +ListOfFees=Lista de Taxas NewTrip=Nova Deslocamento +CompanyVisited=Empresa/Instituição Visitada Kilometers=Kilometros FeesKilometersOrAmout=Quantidade de Kilometros DeleteTrip=Eliminar Deslocamento ConfirmDeleteTrip=Tem certeza que quer eliminar esta deslocamento? +TF_OTHER=Outro +TF_LUNCH=Alimentação +TF_TRIP=Viagem +ListTripsAndExpenses=Lista de viagens e despesas ExpensesArea=Area de viagems e despesas SearchATripAndExpense=Buscar para uma viagem ou despesa diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang index c4111cf8677..6f403983441 100644 --- a/htdocs/langs/pt_BR/users.lang +++ b/htdocs/langs/pt_BR/users.lang @@ -2,7 +2,10 @@ HRMArea=área de gestão de recursos humanos UserCard=Ficha de Usuário ContactCard=Ficha de Contato +GroupCard=Ficha de Grupo NoContactCard=Nenhum cartão para os contatos +Permission=Permissão +Permissions=Permissões EditPassword=Alterar senha SendNewPassword=Enviar nova senha ReinitPassword=Gerar nova senha @@ -38,6 +41,8 @@ SearchAUser=Buscar um usuário LoginNotDefined=O usuário não está definido NameNotDefined=O nome não está definido ListOfUsers=Lista de usuário +Administrator=Administrador +SuperAdministrator=Super Administrador SuperAdministratorDesc=Administrador geral AdministratorDesc=Entidade do administrador DefaultRights=Permissões por Padrao @@ -52,6 +57,7 @@ RemoveFromGroup=Remover do grupo PasswordChangedAndSentTo=Senha alterada e enviada a %s. PasswordChangeRequestSent=Solicitação para alterar a senha para %s enviada a %s. MenuUsersAndGroups=Usuários e Grupos +LastGroupsCreated=Os %s últimos grupos criados LastUsersCreated=Os %s últimos usuários criados ShowGroup=Visualizar grupo ShowUser=Visualizar usuário @@ -74,14 +80,20 @@ CreateDolibarrThirdParty=Criar um fornecedor LoginAccountDisable=A conta está desativada, indique um Novo login para a ativar. LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr LoginAccountDisableInLdap=A conta está desativada ao domínio +UsePersonalValue=Utilizar valores personalizados +GuiLanguage=Idioma do Interface +InternalUser=Usuário Interno +MyInformations=A Minha Informação ExportDataset_user_1=Usuários e Atributos DomainUser=Usuário de Domínio Reactivate=Reativar CreateInternalUserDesc=Este formulario permite criar um usuario interno a sua compania/fundação. Para criar um usuario externo (cliente, fornecedor, ...), use o botão 'Criar usuario Dolibarr' da ficha de contatos dos terceiro.. InternalExternalDesc=Um usuário interno é um usuário que pertence à sua Empresa/Instituição.
Um usuário externo é um usuário cliente, fornecedor ou outro.

Nos 2 casos, as permissões de Usuários definem os direitos de acesso, mas o usuário externo pode além disso ter um gerente de menus diferente do usuário interno (ver Inicio - configuração - visualização) PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertence o usuário. +Inherited=Herdado UserWillBeInternalUser=Usuario criado sera um usuario interno (porque nao esta conectado a um particular terceiro) UserWillBeExternalUser=Usuario criado sera um usuario externo (porque esta conectado a um particular terceiro) +IdPhoneCaller=ID chamador (telefone) UserLogged=Usuário %s Conectado UserLogoff=Usuario %s desconectou NewUserCreated=Usuário %s Criado @@ -90,13 +102,17 @@ EventUserModified=Usuário %s Modificado UserDisabled=Usuário %s Desativado UserEnabled=Usuário %s Ativado UserDeleted=Usuário %s Eliminado +NewGroupCreated=Grupo %s Criado +GroupModified=Grupo modificado com sucesso +GroupDeleted=Grupo %s Eliminado ConfirmCreateContact=Tem certeza que quer criar uma conta para este contato? ConfirmCreateLogin=Tem certeza de que deseja criar uma conta para este membro? ConfirmCreateThirdParty=Tem certeza que quer criar um Fornecedor para este membro? +LoginToCreate=Login a Criar NameToCreate=Nome do Fornecedor a Criar YourRole=Suas funções YourQuotaOfUsersIsReached=Sua cota de usuarios ativos atingida ! -NbOfUsers=N. de usuarios +NbOfUsers=N. de usuarios DontDowngradeSuperAdmin=Somente um Super Administrador pode rebaixar um Super Administrador HierarchicalResponsible=Responsabilidade hierárquica HierarchicView=Visão hierárquica diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang index 5e456d79df7..e288e999d4e 100644 --- a/htdocs/langs/pt_BR/withdrawals.lang +++ b/htdocs/langs/pt_BR/withdrawals.lang @@ -1,9 +1,19 @@ # Dolibarr language file - Source file is en_US - withdrawals StandingOrdersArea=Área ordens permanentes CustomersStandingOrdersArea=Área de Débitos Diretos de Clientes +StandingOrders=Débitos Diretos +StandingOrder=Débitos Diretos NewStandingOrder=Novo Débito Direto StandingOrderToProcess=A Processar +StandingOrderProcessed=Processado +Withdrawals=Levantamentos +Withdrawal=Levantamento +WithdrawalsReceipts=Ordens de Levantamento +WithdrawalReceipt=Ordem de Levantamento +WithdrawalReceiptShort=Ordem +LastWithdrawalReceipts=As %s últimas ordens de levantamento WithdrawedBills=Faturas de Levantamentos +WithdrawalsLines=Linhas de Levantamento RequestStandingOrderToTreat=Pedidos de Débitos Diretos a Tratar RequestStandingOrderTreated=Pedidos de Débitos Diretos Processados CustomersStandingOrders=Débitos Diretos de Clientes @@ -11,9 +21,11 @@ CustomerStandingOrder=Débito Direto de Cliente NbOfInvoiceToWithdraw=Nb. da fatura para realizar pedido NbOfInvoiceToWithdrawWithInfo=Nb. da fatura para realizar pedido para os clientes com informações de conta bancária definida InvoiceWaitingWithdraw=Faturas em Espera de Levantamento +AmountToWithdraw=Quantidade a Levantar WithdrawsRefused=Débitos Diretos Rejeitados NoInvoiceToWithdraw=Nenhuma fatura a cliente com modo de pagamento 'Débito Directo' em espera. Ir ao separador 'Débito Directo' na ficha da fatura para fazer um pedido. ResponsibleUser=Usuário Responsável dos Débitos Diretos +WithdrawalsSetup=Configuração dos Débitos Diretos WithdrawStatistics=Estatísticas de Débitos Diretos WithdrawRejectStatistics=Estatísticas de Débitos Diretos Rejeitados LastWithdrawalReceipt=Os %s últimos Débitos Diretos Recebidos @@ -25,14 +37,22 @@ ClassCredited=Classificar Acreditados ClassCreditedConfirm=Você tem certeza que querer marcar este pagamento como realizado em a sua conta bancaria? TransData=Data da transferência TransMetod=Método de transferência +Send=Enviar +Lines=Linhas StandingOrderReject=Emitir uma recusa InvoiceRefused=Nota Fiscal recusada WithdrawalRefused=Retirada recusada WithdrawalRefusedConfirm=Você tem certeza que quer entrar com uma rejeição de retirada para a sociedade +RefusedData=Data de rejeição +RefusedReason=Motivo da rejeição RefusedInvoicing=Cobrança da rejeição NoInvoiceRefused=Não carregue a rejeição +InvoiceRefused=Nota Fiscal recusada +Status=Estado +StatusUnknown=Desconhecido StatusWaiting=Aguardando StatusTrans=Enviado +StatusCredited=Creditado StatusRefused=Negado StatusMotif0=Não especificado StatusMotif1=Saldo insuficiente @@ -40,14 +60,20 @@ StatusMotif2=Solicitação contestada StatusMotif3=Não há pedido de retirada StatusMotif4=Pedido do Cliente StatusMotif5=RIB inutilizável +StatusMotif6=Conta sem saldo +StatusMotif7=Decisão Judicial StatusMotif8=Outras razões CreateAll=Retirar tudo CreateGuichet=Apenas do escritório +CreateBanque=Apenas banco OrderWaiting=Aguardando resolução NotifyTransmision=Retirada de Transmissão -NotifyEmision=Emissões de retirada +NotifyEmision=Emissões de retirada NotifyCredit=Revogação de crédito NumeroNationalEmetter=Nacional Número Transmissor +PleaseSelectCustomerBankBANToWithdraw=Selecione informações sobre conta bancária do cliente para retirar +WithBankUsingRIB=Para contas bancárias usando RIB +WithBankUsingBANBIC=Para contas bancárias usando IBAN / BIC / SWIFT BankToReceiveWithdraw=Conta bancária para receber saques CreditDate=A crédito WithdrawalFileNotCapable=Não foi possível gerar arquivo recibo de retirada para o seu país @@ -57,6 +83,8 @@ DoStandingOrdersBeforePayments=Essa guia permite que você solicite uma ordem pe WithdrawalFile=Arquivo Retirada SetToStatusSent=Defina o status "arquivo enviado" ThisWillAlsoAddPaymentOnInvoice=Isto também se aplica aos pagamentos de faturas e classificá-los como "Paid" + +### Notifications InfoCreditSubject=Pagamento pendente pelo banco InfoCreditMessage=O pedido pendente foi pago pelo banco
Dados de pagamento:% s InfoTransSubject=Transmissão de pedido pendente para o banco diff --git a/htdocs/langs/pt_BR/workflow.lang b/htdocs/langs/pt_BR/workflow.lang index af6256d403a..f90ce09f782 100644 --- a/htdocs/langs/pt_BR/workflow.lang +++ b/htdocs/langs/pt_BR/workflow.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - Source file is en_US - workflow +# Dolibarr language file - Source file is en_US - admin WorkflowSetup=Configuração do módulo de Fluxo de Trabalho WorkflowDesc=Este módulo foi projetado para modificar o comportamento de ações automáticas dentro a aplicação. Por padrão, o fluxo de trabalho e abilitado (você faz as coisas em ordem que você quiser). Você pode habilitar ações automáticas que são de seu interesse. ThereIsNoWorkflowToModify=Não há fluxo de trabalho que você pode modificar para o módulo que você ativou. @@ -6,3 +6,6 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar uma ordem do cliente automaticamente, descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Criar uma factura de cliente automaticamente após um proposta comercial é assinado descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Criar uma factura de cliente automaticamente depois de um contrato de é validado descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Criar uma fatura de cliente automaticamente após um pedido do cliente está fechado +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classificar proposta fonte ligada ao bico quando a ordem do cliente é definido como pago +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifique os pedido do cliente vinculado as fonte(s) das faturas quando a fatura do cliente ainda não foi paga +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifique os pedidos do cliente vinculado as fonte(s) das faturas quando a fatura do cliente for paga. diff --git a/htdocs/langs/pt_PT/link.lang b/htdocs/langs/pt_PT/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/pt_PT/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang index bdcae1f7378..7653c4fc5e4 100644 --- a/htdocs/langs/ro_RO/agenda.lang +++ b/htdocs/langs/ro_RO/agenda.lang @@ -25,15 +25,15 @@ ListOfEvents= Lista evenimente Dolibarr ActionsAskedBy=Evenimente înregistarte de ActionsToDoBy=Evenimente atribuite lui ActionsDoneBy=Evenimente efectuate de -ActionsForUser=Events for user -ActionsForUsersGroup=Events for all users of group +ActionsForUser=Evenimente pentru utilizator +ActionsForUsersGroup=Evenimente pentru toți utilizatorii din grup AllMyActions= Toate evenimentele / sarcinile mele AllActions= Toate evenimentele / sarcini ViewList=Vezi listă ViewCal=Vezi lunar ViewDay=Vezi zilnic ViewWeek=Vezi săptămânal -ViewPerUser=Per user +ViewPerUser=Pe utilizator ViewWithPredefinedFilters= Vezi cu filtre predefinite AutoActions= Completarea automată AgendaAutoActionDesc= Definiți aici evenimentele pentru care doriți ca Dolibarr să creeze automat un eveniment în agendă. În cazul în care nimic nu este bifat(implicit), doar acțiunile manuale vor fi incluse în agendă. @@ -46,7 +46,7 @@ InvoiceBackToDraftInDolibarr=Factura %s revenită de statutul nevalidată InvoiceDeleteDolibarr=Factura %s ştearsă OrderValidatedInDolibarr= Comanda %s validată OrderApprovedInDolibarr=Comanda %s aprobată -OrderRefusedInDolibarr=Order %s refused +OrderRefusedInDolibarr=Comanda %s refuzată OrderBackToDraftInDolibarr=Comanda %s revenită de statutul nevalidată OrderCanceledInDolibarr=Comanda %s anulată InterventionValidatedInDolibarr=Intervenţie %s validată @@ -58,7 +58,7 @@ SupplierInvoiceSentByEMail=Factura furnizor %s trimise prin e-mail ShippingSentByEMail=Avizul de expediţie %s trimis prin e-mail ShippingValidated= Livrarea %s validata InterventionSentByEMail=Intervenţia %s trimisă prin e-mail -InterventionClassifiedBilled=Intervention %s classified as Billed +InterventionClassifiedBilled=Intervenția %s clasificat Facturat NewCompanyToDolibarr= Terţ creat DateActionPlannedStart= Data planificată a începerii DateActionPlannedEnd= Data planificată a terminării diff --git a/htdocs/langs/ro_RO/link.lang b/htdocs/langs/ro_RO/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/ro_RO/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/ru_RU/link.lang b/htdocs/langs/ru_RU/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/ru_RU/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/sk_SK/link.lang b/htdocs/langs/sk_SK/link.lang index abfa69d7e2a..8b1efb75ef3 100644 --- a/htdocs/langs/sk_SK/link.lang +++ b/htdocs/langs/sk_SK/link.lang @@ -1,18 +1,8 @@ -/* - * Language code: sk_SK - * Automatic generated via autotranslator.php tool - * Generation date 2013-11-08 23:25:26 - */ - - -// START - Lines generated via autotranslator.php tool (2013-11-08 23:25:26). -// Reference language: en_US -> sk_SK -LinkANewFile=Prepojenie nový súbor / dokument -LinkedFiles=Prepojené súbory a dokumenty -NoLinkFound=Žiadny registrovaný odkazy -LinkComplete=Súbor bol úspešne pripojil -ErrorFileNotLinked=Súbor nemohol byť spojená -LinkRemoved=Odkaz %s bol odstránený -ErrorFailedToDeleteLink=Nepodarilo sa odstrániť odkaz "%s" -ErrorFailedToUpdateLink=Nepodarilo sa aktualizovať odkaz "%s" -// STOP - Lines generated via autotranslator.php tool (2013-11-08 23:35:10). +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/sl_SI/link.lang b/htdocs/langs/sl_SI/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/sl_SI/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/sq_AL/link.lang b/htdocs/langs/sq_AL/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/sq_AL/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/sv_SE/link.lang b/htdocs/langs/sv_SE/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/sv_SE/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/th_TH/link.lang b/htdocs/langs/th_TH/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/th_TH/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index cb138e3554d..690b1d80c69 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -47,7 +47,7 @@ DictionarySetup=Sözlük ayarları Dictionary=Sözlükler ErrorReservedTypeSystemSystemAuto='system' ve 'systemauto' değerleri tür için ayrılmıştır. 'kullanıcı'yı kendi kayıtlarınıza eklemek için değer olarak kullanabilirsiniz ErrorCodeCantContainZero=Kod 0 değeri içeremez -DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +DisableJavascript=Javascript ve Ajax fonksiyonlarını engelle (Görme engelli kişiler ve metin tarayıcılar için önerilir) ConfirmAjax=Açılır Ajax onay pencereleri kullanın UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectCompany=Üçüncü parti seçimi için liste kutusu kullanmak yerine oto tamamlamalı alan kullanın @@ -296,7 +296,7 @@ CurrentVersion=Dolibarr geçerli sürümü CallUpdatePage=Veritabanı yapısını ve verileri güncelleyen sayfaya git: %s. LastStableVersion=Son kararlı sürüm GenericMaskCodes=Herhangi bir numaralandırma maskesi girebilirsiniz. Bu maskede alttaki etiketler kullanılabilir:
{000000} her %s te artırılacak bir numaraya karşılık gelir. Sayacın istenilen uzunluğu kadar çok sıfır girin. Sayaç, maskedeki kadar çok sayıda sıfır olacak şekilde soldan sıfırlarla tamamlanacaktır.
{000000+000} önceki ile aynıdır fakat + işaretinin sağındaki sayıya denk gelen bir sapma ilk %s ten itibaren uygulanır.
{000000@x} önceki ile aynıdır fakat sayaç x aya ulaşıldığında sıfırlanır (x= 1 ve 12 arasındadır veya yapılandırmada tanımlanan mali yılın ilk aylarını kullanmak için 0 dır). Bu seçenek kullanılırsa ve x= 2 veya daha yüksekse, {yyyy}{mm} veya {yyyy}{mm} dizisi de gereklidir.
{dd} gün (01 ila 31).
{mm} ay (01 ila 12).
{yy}, {yyyy} veya {y} yıl 2, 4 veya 1 sayıları üzerindedir.
-GenericMaskCodes2={cccc} the client code on n characters
{cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
{tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).
+GenericMaskCodes2=b>cccc{}n Karakterdeki istemci kodu
cccc000{}n Karakterdeki istemci kodu müşteri için özel bir sayaç tarafından takip edilmektedir. Müşteriye ayrılan bu sayaç, genel sayaçla aynı anda sıfırlanır.
tttt{} n Karakterdeki firma türü kodu (bakınız sözlük-şirket türleri).
GenericMaskCodes3=Maskede diğer tüm karakterler olduğu gibi kalır.
Boşluklara izin verilmez.
GenericMaskCodes4a=Üçüncü partinin 99 uncu %s örneği Firma 2007/01/31 de yapıldı:
GenericMaskCodes4b=2007/03/01 tarihinde oluşturulan üçüncü parti örneği:
@@ -373,9 +373,9 @@ ExtrafieldSelectList = Tablodan seç ExtrafieldSeparator=Ayırıcı ExtrafieldCheckBox=Onay kutusu ExtrafieldRadio=Onay düğmesi -ExtrafieldParamHelpselect=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key -ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... -ExtrafieldParamHelpradio=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... +ExtrafieldParamHelpselect=Parametre listesi anahtar.değer gibi olmalı, örneğin

:
1,değer1
2,değer2
3,değer3
...

Başka bir listeye bağlı bir liste elde etmek için :
1,değer1|parent_list_code:parent_key
2,değer2|parent_list_code:parent_key +ExtrafieldParamHelpcheckbox=Parametre listesi anahtar.değer gibi olmalı, örneğin

:
1,değer1
2,değer2
3,değer3
... +ExtrafieldParamHelpradio=Parametre listesi anahtar.değer gibi olmalı, örneğin

:
1,değer1
2,değer2
3,değer3
... ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter LibraryToBuildPDF=PDF oluşturmada kullanılan kütüphane WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' @@ -1092,7 +1092,7 @@ WebCalServer=Takvim veritabanını barındıran sunucu WebCalDatabaseName=Veritabanı ismi WebCalUser=Veritabanına erişecek kullanıcı WebCalSetupSaved=WebTakvimi kurulumu başarıyla kaydedildi. -WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful. +WebCalTestOk='%s' sunucusuna '%s' veritabanında kullanıcı '%s' ile bağlantı başarılı. WebCalTestKo1=%s Sunucusuna bağlantısı başarıldı ama %s veritabanına ulaşılamadı. WebCalTestKo2=Sunucusu 'Bağlantısı%' user '% s s' başarısız oldu. WebCalErrorConnectOkButWrongDatabase=Bağlantı başarılı ama veritabanı WebTakvimi veritabanı olarak görünmüyor. @@ -1138,7 +1138,7 @@ WatermarkOnDraftProposal=Taslak tekliflerde filigran (boşsa yoktur) OrdersSetup=Sipariş yönetimi kurulumu OrdersNumberingModules=Sipariş numaralandırma modülü OrdersModelModule=Sipariş belgesi modelleri -HideTreadedOrders=Hide the treated or cancelled orders in the list +HideTreadedOrders=İşlem görmüş ya da iptal edilmiş siprişleri listede gizle ValidOrderAfterPropalClosed=Teklifin kapatılmasından sonra siparişi doğrulamak için geçici teklifin izlenmemesini sağlar FreeLegalTextOnOrders=Siparişte serbest metin WatermarkOnDraftOrders=Taslak siparişlerde filigran (boşsa yoktur) @@ -1233,7 +1233,7 @@ LDAPSynchroKO=Başarısız senkronizasyon testi LDAPSynchroKOMayBePermissions=Başarısız senkronizasyon testi. Bu sunucuya bağlantının düzgün yapılandırılmış olduğunu ve LDAP güncellemesi sağladığını kontrol edin LDAPTCPConnectOK=LDAP sunucusu için TCP bağlantı başarılı (Sunucu =%s, Port =%s) LDAPTCPConnectKO=LDAP sunucusuna TCP bağlantısı başarısız (Server =%s başarısız, Port =% s) -LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPBindOK=LDAP sunucusuna bağlantı/kimlik doğrulama başarılı (Server=%s, Port=%s, Yönetici=%s, Parola=%s) LDAPBindKO=LDAP sunucusuna bağlantı/kimlik doğrulama başarısız (Server=%s, Port=%s, Yönetici=%s, Parola=%s LDAPUnbindSuccessfull=Bağlantı keme başarılı LDAPUnbindFailed=Bağlantı kesme başarısız @@ -1292,7 +1292,7 @@ LDAPFieldSidExample=Örnek: objectsid LDAPFieldEndLastSubscription=Abonelik tarihi sonu LDAPFieldTitle=Görev/İşlev LDAPFieldTitleExample=Örnek: unvan -LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class) +LDAPParametersAreStillHardCoded=LDAP parametreleri hala sabit kodludur (iletişim sınıfında) LDAPSetupNotComplete=LDAP kurulumu tamamlanmamış (diğer sekmelere git) LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Hiçbir yönetici veya parola verilmiştir. LDAP erişimi anonim ve salt okunur modunda olacaktır. LDAPDescContact=Bu sayfa Dolibarr kişileri üzerinde bulunan her bir veri için LDAP ağacındaki LDAP öznitelikleri adını tanımlamanızı sağlar. @@ -1329,7 +1329,7 @@ ModifyProductDescAbility=Formlarda ürün tanımlamalarının kişiselleştirilm ViewProductDescInFormAbility=Formlarda ürün tanımlarının görselleştirilmesi (aksi durumda açılır araç ipucu olarak) ViewProductDescInThirdpartyLanguageAbility=Ürün açıklamalarının üçüncü partilerin dilinde gösterilmesi UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. -UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list). +UseSearchToSelectProduct=Bir ürün seçmek için arama formu kullanın (liste kutusu yerine). UseEcoTaxeAbility=Eko-Vergi Desteği (WEEE) SetDefaultBarcodeTypeProducts=Ürünler için kullanılacak varsayılan barkod türü SetDefaultBarcodeTypeThirdParties=Üçüncü partiler için kullanılacak varsayılan barkod tipi @@ -1444,8 +1444,8 @@ ConfirmDeleteLine=Bu satırı silmek istediğinizden emin misiniz? ##### Tax ##### TaxSetup=Vergi, sosyal güvenlik primi ve temettü modülü kurulumu OptionVatMode=KDV nedeniyle -OptionVATDefault=Cash basis -OptionVATDebitOption=Accrual basis +OptionVATDefault=Nakit temelli +OptionVATDebitOption=Tahakkuk temelli OptionVatDefaultDesc=KDV nedeniyle:
- malların tesliminde ( fatura tarihini kullanırız)
- hizmet ödemelerinde (borç) OptionVatDebitOptionDesc=KDV nedeniyle:
- malların tesliminde ( fatura tarihini kullanırız)
- hizmet faturalarında (borç) SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option: @@ -1465,7 +1465,7 @@ AccountancyCodeBuy=Alış hesap. kodu AgendaSetup=Eylem ve gündem modülü kurulumu PasswordTogetVCalExport=Verme bağlantısı yetki anahtarı PastDelayVCalExport=Daha büyük eylemi dışaaktarma -AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events) +AGENDA_USE_EVENT_TYPE=Etkinlik türlerini kullan (Ayarlar -> Sözlük -> Gündem etkinlik türleri) menüsünden yönetilir AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang index 45cdb1dd9c5..d0cf0f860b2 100644 --- a/htdocs/langs/tr_TR/bills.lang +++ b/htdocs/langs/tr_TR/bills.lang @@ -237,9 +237,9 @@ ExportDataset_invoice_1=Müşteri faturaları listesi ve fatura satırları ExportDataset_invoice_2=Müşteri faturaları ve ödemeleri ProformaBill=Proforma Fatura: Reduction=Kesinti -ReductionShort=Kes. +ReductionShort=İnd. Reductions=Kesintiler -ReductionsShort=Kes. +ReductionsShort=İnd. Discount=İndirim Discounts=İndirimler AddDiscount=İndirim oluştur diff --git a/htdocs/langs/tr_TR/link.lang b/htdocs/langs/tr_TR/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/tr_TR/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang index 848d5ebc6ac..8682cdc2452 100644 --- a/htdocs/langs/tr_TR/propal.lang +++ b/htdocs/langs/tr_TR/propal.lang @@ -14,8 +14,8 @@ NewProposal=Yeni teklif NewPropal=Yeni teklif Prospect=Aday ProspectList=Aday listesi -DeleteProp=Ticari teklif sil -ValidateProp=Ticari teklif doğrula +DeleteProp=Teklif sil +ValidateProp=Teklif doğrula AddProp=Teklif ekle ConfirmDeleteProp=Bu teklifi silmek istediğinizden emin misiniz? ConfirmValidateProp=Bu teklifi doğrulamak istediğinizden emin misiniz? @@ -49,7 +49,7 @@ PropalStatusNotSignedShort=İmzalanmamış PropalStatusBilledShort=Faturalanmış PropalsToClose=Kapatılacak teklifler PropalsToBill=Faturalandırılacak imzalı teklifler -ListOfProposals=Ticari teklif listesi +ListOfProposals=Teklif listesi ActionsOnPropal=Tekliler için yapılan eylemler NoOpenedPropals=Açık teklif yok NoOtherOpenedPropals=Başka hiçbir açık teklif yok @@ -61,13 +61,13 @@ AssociatedDocuments=Bu teklif ile ilişkili belgeler: ErrorCantOpenDir=Dizin açılamıyor DatePropal=Teklif tarihi DateEndPropal=Son geçerlilik tarihi -DateEndPropalShort=Son tarih +DateEndPropalShort=Bitiş tarihi ValidityDuration=Geçerlilik süresi CloseAs=Durumu kapalı ClassifyBilled=Faturalanmış olarak sınıflandır BuildBill=Fatura oluştur ErrorPropalNotFound=%s teklifi bulunamadı -Estimate=Tahmin: +Estimate=Tahmini: EstimateShort=Tahmin OtherPropals=Diğer teklifler AddToDraftProposals=Taslak teklife ekle @@ -81,8 +81,8 @@ ConfirmClonePropal=Bu teklifi %s klonlamak istediğinizden emin misiniz? ConfirmReOpenProp=Bu teklifi %s yeniden açmak istediğinizden emin misiniz? ProposalsAndProposalsLines=Teklif ve satırları ProposalLine=Teklif satırı -AvailabilityPeriod=Kabul edilebilir süre -SetAvailability=Kabul edilebilir süreyi ayarla +AvailabilityPeriod=Teslim süresi +SetAvailability=Teslim süresi ayarla AfterOrder=siparişten sonra ##### Availability ##### AvailabilityTypeAV_NOW=İvedi @@ -98,5 +98,5 @@ TypeContact_propal_external_CUSTOMER=Müşteri teklif izleme ilgilisi DocModelAzurDescription=Eksiksiz bir teklif modeli (logo. ..) DocModelJauneDescription=Jaune teklif modeli DefaultModelPropalCreate=Varsayılan model oluşturma -DefaultModelPropalToBill=Bir iş teklifi kapatma sırasında varsayılan şablon (faturalanacak) -DefaultModelPropalClosed=Bir iş teklifi kapatma sırasında varsayılan şablon (faturalanmamış) +DefaultModelPropalToBill=Bir teklifi kapatma sırasında varsayılan şablon (faturalanacak) +DefaultModelPropalClosed=Bir teklifi kapatma sırasında varsayılan şablon (faturalanmamış) diff --git a/htdocs/langs/uk_UA/link.lang b/htdocs/langs/uk_UA/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/uk_UA/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/vi_VN/link.lang b/htdocs/langs/vi_VN/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/vi_VN/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/zh_CN/link.lang b/htdocs/langs/zh_CN/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/zh_CN/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/zh_TW/link.lang b/htdocs/langs/zh_TW/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/zh_TW/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 83771d2e157..dea52ae6ef9 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -729,7 +729,8 @@ if (! empty($conf->browser->phone) { $conf->dol_optimize_smallscreen=1; } - +// If we force to use jmobile, then we reenable javascript +if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1; // Disabled bugged themes if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo'))) { diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 3c2424ed88a..7c0000bedea 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -9,6 +9,7 @@ * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2010 Juanjo Menent * Copyright (C) 2011 Philippe Grand + * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com> * * 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 @@ -244,8 +245,6 @@ $hookmanager=new HookManager($db); if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR','NPR'); -// We force feature to help debug -//$conf->global->MAIN_JS_ON_PAYMENT=0; // We force FPDF if (! empty($dolibarr_pdf_force_fpdf)) $conf->global->MAIN_USE_FPDF=$dolibarr_pdf_force_fpdf; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index f88b61967a7..134f65b8ff6 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -766,6 +766,7 @@ class Product extends CommonObject function delete($id=0) { global $conf,$user,$langs; + require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; $error=0; diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 7499e8b0f2a..f69d5fa879f 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -1075,7 +1075,7 @@ else $type = $langs->trans('Product'); if ($object->isservice()) $type = $langs->trans('Service'); - print_fiche_titre($langs->trans('Modify').' '.$type.' : '.$object->ref, ""); + print_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), ""); // Main official, simple, and not duplicated code print '
'."\n"; diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 7b7441ba570..3279221d0c4 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -1,5 +1,4 @@ * Copyright (C) 2005-2012 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin @@ -741,7 +740,7 @@ class Project extends CommonObject * * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul * @param string $option Variant ('', 'nolink') - * @param int $addlabel 0=Default, 1=Add label into string + * @param int $addlabel 0=Default, 1=Add label into string, >1=Add first chars into string * @return string Chaine avec URL */ function getNomUrl($withpicto=0, $option='', $addlabel=0) @@ -773,7 +772,7 @@ class Project extends CommonObject if ($withpicto) $result.=($lien . img_object($label, $picto) . $lienfin); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien . $this->ref . $lienfin . (($addlabel && $this->title) ? ' - ' . $this->title : ''); + if ($withpicto != 2) $result.=$lien . $this->ref . $lienfin . (($addlabel && $this->title) ? ' - ' . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : ''); return $result; } @@ -886,7 +885,7 @@ class Project extends CommonObject $projects = array(); $temp = array(); - $sql = "SELECT DISTINCT p.rowid, p.ref"; + $sql = "SELECT ".(($mode == 0 || $mode == 1) ? "DISTINCT " : "")."p.rowid, p.ref"; $sql.= " FROM " . MAIN_DB_PREFIX . "projet as p"; if ($mode == 0 || $mode == 1) { diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 2dacbc1a718..e5385766b46 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -349,6 +349,7 @@ class Task extends CommonObject { global $conf, $langs; + require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; $error=0; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 7ea2a0af1e9..9622f4fa480 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -156,7 +156,7 @@ print ''; // Tasks for all resources of all opened projects and time spent for each task/resource print '
'; -$sql = "SELECT p.title, p.rowid as projectid, t.label, t.rowid as taskid, u.rowid as userid, t.planned_workload, t.dateo, t.datee, SUM(tasktime.task_duration) as timespent"; +$sql = "SELECT p.ref, p.title, p.rowid as projectid, t.label, t.rowid as taskid, u.rowid as userid, t.planned_workload, t.dateo, t.datee, SUM(tasktime.task_duration) as timespent"; $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid"; $sql.= " INNER JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid"; @@ -216,7 +216,13 @@ if ( $resql ) print "
"; print ''; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/societe/ajaxcountries.php b/htdocs/societe/ajaxcountries.php index 78018a22035..7eb22035d6b 100644 --- a/htdocs/societe/ajaxcountries.php +++ b/htdocs/societe/ajaxcountries.php @@ -31,7 +31,7 @@ if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); require '../main.inc.php'; -$country=GETPOST('pays', 'alpha'); +$country=GETPOST('country', 'alpha'); /* @@ -49,16 +49,16 @@ print '
'.$langs->trans('Ref').''.$langs->trans('RefSupplier').''.price($objp->total_ttc - $objp->am).''; $namef = 'amount_'.$objp->facid; + if(!empty($conf->global->FAC_AUTO_FILLJS)) + print img_picto("Auto fill",'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($objp->total_ttc - $objp->am)."'"); print ''; - print "
'.$username.''.$obj->title.''; + $projectstatic->id=$obj->projectid; + $projectstatic->ref=$obj->ref; + $projectstatic->title=$obj->title; + print $projectstatic->getNomUrl(1,'',16); + //print ''.$obj->title.''; + print ''.$obj->label.''.dol_print_date($db->jdate($obj->dateo)).''.dol_print_date($db->jdate($obj->datee)).'