From 71b42338d12f2e8836096f287bed4182af0b20d9 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Mon, 12 Nov 2018 11:24:07 +0100 Subject: [PATCH 01/11] Fix SQL migration --- htdocs/install/mysql/migration/8.0.0-9.0.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql index 996fdb79b17..865f2b5988c 100644 --- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql +++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql @@ -55,7 +55,7 @@ ALTER TABLE llx_product_fournisseur_price ADD COLUMN desc_fourn text after ref_f ALTER TABLE llx_user ADD COLUMN dateemploymentend date after dateemployment; ALTER TABLE llx_stock_mouvement ADD COLUMN fk_project integer; -Alter tABLE llx_c_action_trigger MODIFY COLUMN elementtype varchar(32) +Alter tABLE llx_c_action_trigger MODIFY COLUMN elementtype varchar(32); ALTER TABLE llx_c_field_list ADD COLUMN visible tinyint DEFAULT 1 NOT NULL AFTER search; From ceae6ac376d3c2b8157af5bf3e04c88b52b44d38 Mon Sep 17 00:00:00 2001 From: Tobias Elbert Date: Mon, 12 Nov 2018 16:21:20 +0100 Subject: [PATCH 02/11] fixed sql query error --- ...p conf.php.example index.html from societe | 285 ++++++++++++++++++ htdocs/projet/class/projectstats.class.php | 4 +- 2 files changed, 287 insertions(+), 2 deletions(-) create mode 100644 htdocs/conf/elect conf.php conf.php.example index.html from societe diff --git a/htdocs/conf/elect conf.php conf.php.example index.html from societe b/htdocs/conf/elect conf.php conf.php.example index.html from societe new file mode 100644 index 00000000000..490058ac324 --- /dev/null +++ b/htdocs/conf/elect conf.php conf.php.example index.html from societe @@ -0,0 +1,285 @@ + List of relations + Schema | Name | Type | Owner +--------+-----------------------------------------+-------+-------------- + public | llx_accounting_account | table | dolibarr_dev + public | llx_accounting_bookkeeping | table | dolibarr_dev + public | llx_accounting_bookkeeping_tmp | table | dolibarr_dev + public | llx_accounting_fiscalyear | table | dolibarr_dev + public | llx_accounting_journal | table | dolibarr_dev + public | llx_accounting_system | table | dolibarr_dev + public | llx_actioncomm | table | dolibarr_dev + public | llx_actioncomm_extrafields | table | dolibarr_dev + public | llx_actioncomm_reminder | table | dolibarr_dev + public | llx_actioncomm_resources | table | dolibarr_dev + public | llx_adherent | table | dolibarr_dev + public | llx_adherent_extrafields | table | dolibarr_dev + public | llx_adherent_type | table | dolibarr_dev + public | llx_adherent_type_extrafields | table | dolibarr_dev + public | llx_advtargetemailing | table | dolibarr_dev + public | llx_asset | table | dolibarr_dev + public | llx_asset_extrafields | table | dolibarr_dev + public | llx_asset_type | table | dolibarr_dev + public | llx_asset_type_extrafields | table | dolibarr_dev + public | llx_bank | table | dolibarr_dev + public | llx_bank_account | table | dolibarr_dev + public | llx_bank_account_extrafields | table | dolibarr_dev + public | llx_bank_categ | table | dolibarr_dev + public | llx_bank_class | table | dolibarr_dev + public | llx_bank_url | table | dolibarr_dev + public | llx_blockedlog | table | dolibarr_dev + public | llx_blockedlog_authority | table | dolibarr_dev + public | llx_bookmark | table | dolibarr_dev + public | llx_bordereau_cheque | table | dolibarr_dev + public | llx_boxes | table | dolibarr_dev + public | llx_boxes_def | table | dolibarr_dev + public | llx_budget | table | dolibarr_dev + public | llx_budget_lines | table | dolibarr_dev + public | llx_c_accounting_category | table | dolibarr_dev + public | llx_c_action_trigger | table | dolibarr_dev + public | llx_c_actioncomm | table | dolibarr_dev + public | llx_c_availability | table | dolibarr_dev + public | llx_c_barcode_type | table | dolibarr_dev + public | llx_c_chargesociales | table | dolibarr_dev + public | llx_c_civility | table | dolibarr_dev + public | llx_c_country | table | dolibarr_dev + public | llx_c_currencies | table | dolibarr_dev + public | llx_c_departements | table | dolibarr_dev + public | llx_c_ecotaxe | table | dolibarr_dev + public | llx_c_effectif | table | dolibarr_dev + public | llx_c_email_senderprofile | table | dolibarr_dev + public | llx_c_email_templates | table | dolibarr_dev + public | llx_c_exp_tax_cat | table | dolibarr_dev + public | llx_c_exp_tax_range | table | dolibarr_dev + public | llx_c_field_list | table | dolibarr_dev + public | llx_c_format_cards | table | dolibarr_dev + public | llx_c_forme_juridique | table | dolibarr_dev + public | llx_c_holiday_types | table | dolibarr_dev + public | llx_c_hrm_department | table | dolibarr_dev + public | llx_c_hrm_function | table | dolibarr_dev + public | llx_c_incoterms | table | dolibarr_dev + public | llx_c_input_method | table | dolibarr_dev + public | llx_c_input_reason | table | dolibarr_dev + public | llx_c_lead_status | table | dolibarr_dev + public | llx_c_paiement | table | dolibarr_dev + public | llx_c_paiement_temp | table | dolibarr_dev + public | llx_c_paper_format | table | dolibarr_dev + public | llx_c_payment_term | table | dolibarr_dev + public | llx_c_price_expression | table | dolibarr_dev + public | llx_c_price_global_variable | table | dolibarr_dev + public | llx_c_price_global_variable_updater | table | dolibarr_dev + public | llx_c_propalst | table | dolibarr_dev + public | llx_c_prospectlevel | table | dolibarr_dev + public | llx_c_regions | table | dolibarr_dev + public | llx_c_revenuestamp | table | dolibarr_dev + public | llx_c_shipment_mode | table | dolibarr_dev + public | llx_c_stcomm | table | dolibarr_dev + public | llx_c_ticket_category | table | dolibarr_dev + public | llx_c_ticket_severity | table | dolibarr_dev + public | llx_c_ticket_type | table | dolibarr_dev + public | llx_c_tva | table | dolibarr_dev + public | llx_c_type_contact | table | dolibarr_dev + public | llx_c_type_container | table | dolibarr_dev + public | llx_c_type_fees | table | dolibarr_dev + public | llx_c_type_resource | table | dolibarr_dev + public | llx_c_typent | table | dolibarr_dev + public | llx_c_units | table | dolibarr_dev + public | llx_c_ziptown | table | dolibarr_dev + public | llx_categorie | table | dolibarr_dev + public | llx_categorie_account | table | dolibarr_dev + public | llx_categorie_contact | table | dolibarr_dev + public | llx_categorie_fournisseur | table | dolibarr_dev + public | llx_categorie_lang | table | dolibarr_dev + public | llx_categorie_member | table | dolibarr_dev + public | llx_categorie_product | table | dolibarr_dev + public | llx_categorie_project | table | dolibarr_dev + public | llx_categorie_societe | table | dolibarr_dev + public | llx_categorie_user | table | dolibarr_dev + public | llx_categories_extrafields | table | dolibarr_dev + public | llx_chargesociales | table | dolibarr_dev + public | llx_commande | table | dolibarr_dev + public | llx_commande_extrafields | table | dolibarr_dev + public | llx_commande_fournisseur | table | dolibarr_dev + public | llx_commande_fournisseur_dispatch | table | dolibarr_dev + public | llx_commande_fournisseur_extrafields | table | dolibarr_dev + public | llx_commande_fournisseur_log | table | dolibarr_dev + public | llx_commande_fournisseurdet | table | dolibarr_dev + public | llx_commande_fournisseurdet_extrafields | table | dolibarr_dev + public | llx_commandedet | table | dolibarr_dev + public | llx_commandedet_extrafields | table | dolibarr_dev + public | llx_comment | table | dolibarr_dev + public | llx_const | table | dolibarr_dev + public | llx_contrat | table | dolibarr_dev + public | llx_contrat_extrafields | table | dolibarr_dev + public | llx_contratdet | table | dolibarr_dev + public | llx_contratdet_extrafields | table | dolibarr_dev + public | llx_contratdet_log | table | dolibarr_dev + public | llx_cronjob | table | dolibarr_dev + public | llx_default_values | table | dolibarr_dev + public | llx_deplacement | table | dolibarr_dev + public | llx_document_model | table | dolibarr_dev + public | llx_don | table | dolibarr_dev + public | llx_don_extrafields | table | dolibarr_dev + public | llx_ecm_directories | table | dolibarr_dev + public | llx_ecm_files | table | dolibarr_dev + public | llx_element_contact | table | dolibarr_dev + public | llx_element_element | table | dolibarr_dev + public | llx_element_lock | table | dolibarr_dev + public | llx_element_resources | table | dolibarr_dev + public | llx_element_tag | table | dolibarr_dev + public | llx_entrepot | table | dolibarr_dev + public | llx_establishment | table | dolibarr_dev + public | llx_event_element | table | dolibarr_dev + public | llx_events | table | dolibarr_dev + public | llx_expedition | table | dolibarr_dev + public | llx_expedition_extrafields | table | dolibarr_dev + public | llx_expeditiondet | table | dolibarr_dev + public | llx_expeditiondet_batch | table | dolibarr_dev + public | llx_expeditiondet_extrafields | table | dolibarr_dev + public | llx_expensereport | table | dolibarr_dev + public | llx_expensereport_det | table | dolibarr_dev + public | llx_expensereport_extrafields | table | dolibarr_dev + public | llx_expensereport_ik | table | dolibarr_dev + public | llx_expensereport_rules | table | dolibarr_dev + public | llx_export_compta | table | dolibarr_dev + public | llx_export_model | table | dolibarr_dev + public | llx_extrafields | table | dolibarr_dev + public | llx_facture | table | dolibarr_dev + public | llx_facture_extrafields | table | dolibarr_dev + public | llx_facture_fourn | table | dolibarr_dev + public | llx_facture_fourn_det | table | dolibarr_dev + public | llx_facture_fourn_det_extrafields | table | dolibarr_dev + public | llx_facture_fourn_extrafields | table | dolibarr_dev + public | llx_facture_rec | table | dolibarr_dev + public | llx_facture_rec_extrafields | table | dolibarr_dev + public | llx_facturedet | table | dolibarr_dev + public | llx_facturedet_extrafields | table | dolibarr_dev + public | llx_facturedet_rec | table | dolibarr_dev + public | llx_fichinter | table | dolibarr_dev + public | llx_fichinter_extrafields | table | dolibarr_dev + public | llx_fichinterdet | table | dolibarr_dev + public | llx_fichinterdet_extrafields | table | dolibarr_dev + public | llx_holiday | table | dolibarr_dev + public | llx_holiday_config | table | dolibarr_dev + public | llx_holiday_logs | table | dolibarr_dev + public | llx_holiday_users | table | dolibarr_dev + public | llx_import_model | table | dolibarr_dev + public | llx_inventory | table | dolibarr_dev + public | llx_inventorydet | table | dolibarr_dev + public | llx_links | table | dolibarr_dev + public | llx_livraison | table | dolibarr_dev + public | llx_livraison_extrafields | table | dolibarr_dev + public | llx_livraisondet | table | dolibarr_dev + public | llx_livraisondet_extrafields | table | dolibarr_dev + public | llx_loan | table | dolibarr_dev + public | llx_loan_schedule | table | dolibarr_dev + public | llx_localtax | table | dolibarr_dev + public | llx_mailing | table | dolibarr_dev + public | llx_mailing_cibles | table | dolibarr_dev + public | llx_menu | table | dolibarr_dev + public | llx_multicurrency | table | dolibarr_dev + public | llx_multicurrency_rate | table | dolibarr_dev + public | llx_notify | table | dolibarr_dev + public | llx_notify_def | table | dolibarr_dev + public | llx_notify_def_object | table | dolibarr_dev + public | llx_oauth_state | table | dolibarr_dev + public | llx_oauth_token | table | dolibarr_dev + public | llx_onlinesignature | table | dolibarr_dev + public | llx_opensurvey_comments | table | dolibarr_dev + public | llx_opensurvey_formquestions | table | dolibarr_dev + public | llx_opensurvey_sondage | table | dolibarr_dev + public | llx_opensurvey_user_formanswers | table | dolibarr_dev + public | llx_opensurvey_user_studs | table | dolibarr_dev + public | llx_overwrite_trans | table | dolibarr_dev + public | llx_paiement | table | dolibarr_dev + public | llx_paiement_facture | table | dolibarr_dev + public | llx_paiementcharge | table | dolibarr_dev + public | llx_paiementfourn | table | dolibarr_dev + public | llx_paiementfourn_facturefourn | table | dolibarr_dev + public | llx_payment_donation | table | dolibarr_dev + public | llx_payment_expensereport | table | dolibarr_dev + public | llx_payment_loan | table | dolibarr_dev + public | llx_payment_salary | table | dolibarr_dev + public | llx_payment_various | table | dolibarr_dev + public | llx_prelevement_bons | table | dolibarr_dev + public | llx_prelevement_facture | table | dolibarr_dev + public | llx_prelevement_facture_demande | table | dolibarr_dev + public | llx_prelevement_lignes | table | dolibarr_dev + public | llx_prelevement_rejet | table | dolibarr_dev + public | llx_printing | table | dolibarr_dev + public | llx_product | table | dolibarr_dev + public | llx_product_association | table | dolibarr_dev + public | llx_product_attribute | table | dolibarr_dev + public | llx_product_attribute_combination | table | dolibarr_dev + public | llx_product_attribute_combination2val | table | dolibarr_dev + public | llx_product_attribute_value | table | dolibarr_dev + public | llx_product_batch | table | dolibarr_dev + public | llx_product_customer_price | table | dolibarr_dev + public | llx_product_customer_price_log | table | dolibarr_dev + public | llx_product_extrafields | table | dolibarr_dev + public | llx_product_fournisseur_price | table | dolibarr_dev + public | llx_product_fournisseur_price_log | table | dolibarr_dev + public | llx_product_lang | table | dolibarr_dev + public | llx_product_lot | table | dolibarr_dev + public | llx_product_lot_extrafields | table | dolibarr_dev + public | llx_product_price | table | dolibarr_dev + public | llx_product_price_by_qty | table | dolibarr_dev + public | llx_product_pricerules | table | dolibarr_dev + public | llx_product_stock | table | dolibarr_dev + public | llx_product_warehouse_properties | table | dolibarr_dev + public | llx_projet | table | dolibarr_dev + public | llx_projet_extrafields | table | dolibarr_dev + public | llx_projet_task | table | dolibarr_dev + public | llx_projet_task_extrafields | table | dolibarr_dev + public | llx_projet_task_time | table | dolibarr_dev + public | llx_propal | table | dolibarr_dev + public | llx_propal_extrafields | table | dolibarr_dev + public | llx_propal_merge_pdf_product | table | dolibarr_dev + public | llx_propaldet | table | dolibarr_dev + public | llx_propaldet_extrafields | table | dolibarr_dev + public | llx_resource | table | dolibarr_dev + public | llx_resource_extrafields | table | dolibarr_dev + public | llx_rights_def | table | dolibarr_dev + public | llx_societe | table | dolibarr_dev + public | llx_societe_account | table | dolibarr_dev + public | llx_societe_address | table | dolibarr_dev + public | llx_societe_commerciaux | table | dolibarr_dev + public | llx_societe_extrafields | table | dolibarr_dev + public | llx_societe_log | table | dolibarr_dev + public | llx_societe_prices | table | dolibarr_dev + public | llx_societe_remise | table | dolibarr_dev + public | llx_societe_remise_except | table | dolibarr_dev + public | llx_societe_remise_supplier | table | dolibarr_dev + public | llx_societe_rib | table | dolibarr_dev + public | llx_socpeople | table | dolibarr_dev + public | llx_socpeople_extrafields | table | dolibarr_dev + public | llx_stock_lotserial | table | dolibarr_dev + public | llx_stock_mouvement | table | dolibarr_dev + public | llx_subscription | table | dolibarr_dev + public | llx_supplier_proposal | table | dolibarr_dev + public | llx_supplier_proposal_extrafields | table | dolibarr_dev + public | llx_supplier_proposaldet | table | dolibarr_dev + public | llx_supplier_proposaldet_extrafields | table | dolibarr_dev + public | llx_ticket | table | dolibarr_dev + public | llx_ticket_extrafields | table | dolibarr_dev + public | llx_ticket_logs | table | dolibarr_dev + public | llx_ticket_msg | table | dolibarr_dev + public | llx_tva | table | dolibarr_dev + public | llx_user | table | dolibarr_dev + public | llx_user_alert | table | dolibarr_dev + public | llx_user_clicktodial | table | dolibarr_dev + public | llx_user_employment | table | dolibarr_dev + public | llx_user_extrafields | table | dolibarr_dev + public | llx_user_param | table | dolibarr_dev + public | llx_user_rib | table | dolibarr_dev + public | llx_user_rights | table | dolibarr_dev + public | llx_usergroup | table | dolibarr_dev + public | llx_usergroup_extrafields | table | dolibarr_dev + public | llx_usergroup_rights | table | dolibarr_dev + public | llx_usergroup_user | table | dolibarr_dev + public | llx_website | table | dolibarr_dev + public | llx_website_extrafields | table | dolibarr_dev + public | llx_website_page | table | dolibarr_dev + public | llx_wsactivateproducts | table | dolibarr_dev + public | llx_wsactivateserials | table | dolibarr_dev +(280 rows) + diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php index 22793fd844e..cf586f8c96c 100644 --- a/htdocs/projet/class/projectstats.class.php +++ b/htdocs/projet/class/projectstats.class.php @@ -171,8 +171,8 @@ class ProjectStats extends Stats if (! empty($this->status)) $sqlwhere[] = " t.fk_opp_status IN (" . $this->status . ")"; - - if (! $user->rights->projet->all->lire) $sqlwhere[] = " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users + // TE: changed table alias "p" to "t" + if (! $user->rights->projet->all->lire) $sqlwhere[] = " t.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users if (count($sqlwhere) > 0) { $sqlwhere_str = ' WHERE ' . implode(' AND ', $sqlwhere); From fceaae7a8d2fa8ef20e22157702530af6c031d61 Mon Sep 17 00:00:00 2001 From: Tobias Elbert Date: Mon, 12 Nov 2018 16:22:42 +0100 Subject: [PATCH 03/11] fixed sql query error --- ...p conf.php.example index.html from societe | 285 ------------------ 1 file changed, 285 deletions(-) delete mode 100644 htdocs/conf/elect conf.php conf.php.example index.html from societe diff --git a/htdocs/conf/elect conf.php conf.php.example index.html from societe b/htdocs/conf/elect conf.php conf.php.example index.html from societe deleted file mode 100644 index 490058ac324..00000000000 --- a/htdocs/conf/elect conf.php conf.php.example index.html from societe +++ /dev/null @@ -1,285 +0,0 @@ - List of relations - Schema | Name | Type | Owner ---------+-----------------------------------------+-------+-------------- - public | llx_accounting_account | table | dolibarr_dev - public | llx_accounting_bookkeeping | table | dolibarr_dev - public | llx_accounting_bookkeeping_tmp | table | dolibarr_dev - public | llx_accounting_fiscalyear | table | dolibarr_dev - public | llx_accounting_journal | table | dolibarr_dev - public | llx_accounting_system | table | dolibarr_dev - public | llx_actioncomm | table | dolibarr_dev - public | llx_actioncomm_extrafields | table | dolibarr_dev - public | llx_actioncomm_reminder | table | dolibarr_dev - public | llx_actioncomm_resources | table | dolibarr_dev - public | llx_adherent | table | dolibarr_dev - public | llx_adherent_extrafields | table | dolibarr_dev - public | llx_adherent_type | table | dolibarr_dev - public | llx_adherent_type_extrafields | table | dolibarr_dev - public | llx_advtargetemailing | table | dolibarr_dev - public | llx_asset | table | dolibarr_dev - public | llx_asset_extrafields | table | dolibarr_dev - public | llx_asset_type | table | dolibarr_dev - public | llx_asset_type_extrafields | table | dolibarr_dev - public | llx_bank | table | dolibarr_dev - public | llx_bank_account | table | dolibarr_dev - public | llx_bank_account_extrafields | table | dolibarr_dev - public | llx_bank_categ | table | dolibarr_dev - public | llx_bank_class | table | dolibarr_dev - public | llx_bank_url | table | dolibarr_dev - public | llx_blockedlog | table | dolibarr_dev - public | llx_blockedlog_authority | table | dolibarr_dev - public | llx_bookmark | table | dolibarr_dev - public | llx_bordereau_cheque | table | dolibarr_dev - public | llx_boxes | table | dolibarr_dev - public | llx_boxes_def | table | dolibarr_dev - public | llx_budget | table | dolibarr_dev - public | llx_budget_lines | table | dolibarr_dev - public | llx_c_accounting_category | table | dolibarr_dev - public | llx_c_action_trigger | table | dolibarr_dev - public | llx_c_actioncomm | table | dolibarr_dev - public | llx_c_availability | table | dolibarr_dev - public | llx_c_barcode_type | table | dolibarr_dev - public | llx_c_chargesociales | table | dolibarr_dev - public | llx_c_civility | table | dolibarr_dev - public | llx_c_country | table | dolibarr_dev - public | llx_c_currencies | table | dolibarr_dev - public | llx_c_departements | table | dolibarr_dev - public | llx_c_ecotaxe | table | dolibarr_dev - public | llx_c_effectif | table | dolibarr_dev - public | llx_c_email_senderprofile | table | dolibarr_dev - public | llx_c_email_templates | table | dolibarr_dev - public | llx_c_exp_tax_cat | table | dolibarr_dev - public | llx_c_exp_tax_range | table | dolibarr_dev - public | llx_c_field_list | table | dolibarr_dev - public | llx_c_format_cards | table | dolibarr_dev - public | llx_c_forme_juridique | table | dolibarr_dev - public | llx_c_holiday_types | table | dolibarr_dev - public | llx_c_hrm_department | table | dolibarr_dev - public | llx_c_hrm_function | table | dolibarr_dev - public | llx_c_incoterms | table | dolibarr_dev - public | llx_c_input_method | table | dolibarr_dev - public | llx_c_input_reason | table | dolibarr_dev - public | llx_c_lead_status | table | dolibarr_dev - public | llx_c_paiement | table | dolibarr_dev - public | llx_c_paiement_temp | table | dolibarr_dev - public | llx_c_paper_format | table | dolibarr_dev - public | llx_c_payment_term | table | dolibarr_dev - public | llx_c_price_expression | table | dolibarr_dev - public | llx_c_price_global_variable | table | dolibarr_dev - public | llx_c_price_global_variable_updater | table | dolibarr_dev - public | llx_c_propalst | table | dolibarr_dev - public | llx_c_prospectlevel | table | dolibarr_dev - public | llx_c_regions | table | dolibarr_dev - public | llx_c_revenuestamp | table | dolibarr_dev - public | llx_c_shipment_mode | table | dolibarr_dev - public | llx_c_stcomm | table | dolibarr_dev - public | llx_c_ticket_category | table | dolibarr_dev - public | llx_c_ticket_severity | table | dolibarr_dev - public | llx_c_ticket_type | table | dolibarr_dev - public | llx_c_tva | table | dolibarr_dev - public | llx_c_type_contact | table | dolibarr_dev - public | llx_c_type_container | table | dolibarr_dev - public | llx_c_type_fees | table | dolibarr_dev - public | llx_c_type_resource | table | dolibarr_dev - public | llx_c_typent | table | dolibarr_dev - public | llx_c_units | table | dolibarr_dev - public | llx_c_ziptown | table | dolibarr_dev - public | llx_categorie | table | dolibarr_dev - public | llx_categorie_account | table | dolibarr_dev - public | llx_categorie_contact | table | dolibarr_dev - public | llx_categorie_fournisseur | table | dolibarr_dev - public | llx_categorie_lang | table | dolibarr_dev - public | llx_categorie_member | table | dolibarr_dev - public | llx_categorie_product | table | dolibarr_dev - public | llx_categorie_project | table | dolibarr_dev - public | llx_categorie_societe | table | dolibarr_dev - public | llx_categorie_user | table | dolibarr_dev - public | llx_categories_extrafields | table | dolibarr_dev - public | llx_chargesociales | table | dolibarr_dev - public | llx_commande | table | dolibarr_dev - public | llx_commande_extrafields | table | dolibarr_dev - public | llx_commande_fournisseur | table | dolibarr_dev - public | llx_commande_fournisseur_dispatch | table | dolibarr_dev - public | llx_commande_fournisseur_extrafields | table | dolibarr_dev - public | llx_commande_fournisseur_log | table | dolibarr_dev - public | llx_commande_fournisseurdet | table | dolibarr_dev - public | llx_commande_fournisseurdet_extrafields | table | dolibarr_dev - public | llx_commandedet | table | dolibarr_dev - public | llx_commandedet_extrafields | table | dolibarr_dev - public | llx_comment | table | dolibarr_dev - public | llx_const | table | dolibarr_dev - public | llx_contrat | table | dolibarr_dev - public | llx_contrat_extrafields | table | dolibarr_dev - public | llx_contratdet | table | dolibarr_dev - public | llx_contratdet_extrafields | table | dolibarr_dev - public | llx_contratdet_log | table | dolibarr_dev - public | llx_cronjob | table | dolibarr_dev - public | llx_default_values | table | dolibarr_dev - public | llx_deplacement | table | dolibarr_dev - public | llx_document_model | table | dolibarr_dev - public | llx_don | table | dolibarr_dev - public | llx_don_extrafields | table | dolibarr_dev - public | llx_ecm_directories | table | dolibarr_dev - public | llx_ecm_files | table | dolibarr_dev - public | llx_element_contact | table | dolibarr_dev - public | llx_element_element | table | dolibarr_dev - public | llx_element_lock | table | dolibarr_dev - public | llx_element_resources | table | dolibarr_dev - public | llx_element_tag | table | dolibarr_dev - public | llx_entrepot | table | dolibarr_dev - public | llx_establishment | table | dolibarr_dev - public | llx_event_element | table | dolibarr_dev - public | llx_events | table | dolibarr_dev - public | llx_expedition | table | dolibarr_dev - public | llx_expedition_extrafields | table | dolibarr_dev - public | llx_expeditiondet | table | dolibarr_dev - public | llx_expeditiondet_batch | table | dolibarr_dev - public | llx_expeditiondet_extrafields | table | dolibarr_dev - public | llx_expensereport | table | dolibarr_dev - public | llx_expensereport_det | table | dolibarr_dev - public | llx_expensereport_extrafields | table | dolibarr_dev - public | llx_expensereport_ik | table | dolibarr_dev - public | llx_expensereport_rules | table | dolibarr_dev - public | llx_export_compta | table | dolibarr_dev - public | llx_export_model | table | dolibarr_dev - public | llx_extrafields | table | dolibarr_dev - public | llx_facture | table | dolibarr_dev - public | llx_facture_extrafields | table | dolibarr_dev - public | llx_facture_fourn | table | dolibarr_dev - public | llx_facture_fourn_det | table | dolibarr_dev - public | llx_facture_fourn_det_extrafields | table | dolibarr_dev - public | llx_facture_fourn_extrafields | table | dolibarr_dev - public | llx_facture_rec | table | dolibarr_dev - public | llx_facture_rec_extrafields | table | dolibarr_dev - public | llx_facturedet | table | dolibarr_dev - public | llx_facturedet_extrafields | table | dolibarr_dev - public | llx_facturedet_rec | table | dolibarr_dev - public | llx_fichinter | table | dolibarr_dev - public | llx_fichinter_extrafields | table | dolibarr_dev - public | llx_fichinterdet | table | dolibarr_dev - public | llx_fichinterdet_extrafields | table | dolibarr_dev - public | llx_holiday | table | dolibarr_dev - public | llx_holiday_config | table | dolibarr_dev - public | llx_holiday_logs | table | dolibarr_dev - public | llx_holiday_users | table | dolibarr_dev - public | llx_import_model | table | dolibarr_dev - public | llx_inventory | table | dolibarr_dev - public | llx_inventorydet | table | dolibarr_dev - public | llx_links | table | dolibarr_dev - public | llx_livraison | table | dolibarr_dev - public | llx_livraison_extrafields | table | dolibarr_dev - public | llx_livraisondet | table | dolibarr_dev - public | llx_livraisondet_extrafields | table | dolibarr_dev - public | llx_loan | table | dolibarr_dev - public | llx_loan_schedule | table | dolibarr_dev - public | llx_localtax | table | dolibarr_dev - public | llx_mailing | table | dolibarr_dev - public | llx_mailing_cibles | table | dolibarr_dev - public | llx_menu | table | dolibarr_dev - public | llx_multicurrency | table | dolibarr_dev - public | llx_multicurrency_rate | table | dolibarr_dev - public | llx_notify | table | dolibarr_dev - public | llx_notify_def | table | dolibarr_dev - public | llx_notify_def_object | table | dolibarr_dev - public | llx_oauth_state | table | dolibarr_dev - public | llx_oauth_token | table | dolibarr_dev - public | llx_onlinesignature | table | dolibarr_dev - public | llx_opensurvey_comments | table | dolibarr_dev - public | llx_opensurvey_formquestions | table | dolibarr_dev - public | llx_opensurvey_sondage | table | dolibarr_dev - public | llx_opensurvey_user_formanswers | table | dolibarr_dev - public | llx_opensurvey_user_studs | table | dolibarr_dev - public | llx_overwrite_trans | table | dolibarr_dev - public | llx_paiement | table | dolibarr_dev - public | llx_paiement_facture | table | dolibarr_dev - public | llx_paiementcharge | table | dolibarr_dev - public | llx_paiementfourn | table | dolibarr_dev - public | llx_paiementfourn_facturefourn | table | dolibarr_dev - public | llx_payment_donation | table | dolibarr_dev - public | llx_payment_expensereport | table | dolibarr_dev - public | llx_payment_loan | table | dolibarr_dev - public | llx_payment_salary | table | dolibarr_dev - public | llx_payment_various | table | dolibarr_dev - public | llx_prelevement_bons | table | dolibarr_dev - public | llx_prelevement_facture | table | dolibarr_dev - public | llx_prelevement_facture_demande | table | dolibarr_dev - public | llx_prelevement_lignes | table | dolibarr_dev - public | llx_prelevement_rejet | table | dolibarr_dev - public | llx_printing | table | dolibarr_dev - public | llx_product | table | dolibarr_dev - public | llx_product_association | table | dolibarr_dev - public | llx_product_attribute | table | dolibarr_dev - public | llx_product_attribute_combination | table | dolibarr_dev - public | llx_product_attribute_combination2val | table | dolibarr_dev - public | llx_product_attribute_value | table | dolibarr_dev - public | llx_product_batch | table | dolibarr_dev - public | llx_product_customer_price | table | dolibarr_dev - public | llx_product_customer_price_log | table | dolibarr_dev - public | llx_product_extrafields | table | dolibarr_dev - public | llx_product_fournisseur_price | table | dolibarr_dev - public | llx_product_fournisseur_price_log | table | dolibarr_dev - public | llx_product_lang | table | dolibarr_dev - public | llx_product_lot | table | dolibarr_dev - public | llx_product_lot_extrafields | table | dolibarr_dev - public | llx_product_price | table | dolibarr_dev - public | llx_product_price_by_qty | table | dolibarr_dev - public | llx_product_pricerules | table | dolibarr_dev - public | llx_product_stock | table | dolibarr_dev - public | llx_product_warehouse_properties | table | dolibarr_dev - public | llx_projet | table | dolibarr_dev - public | llx_projet_extrafields | table | dolibarr_dev - public | llx_projet_task | table | dolibarr_dev - public | llx_projet_task_extrafields | table | dolibarr_dev - public | llx_projet_task_time | table | dolibarr_dev - public | llx_propal | table | dolibarr_dev - public | llx_propal_extrafields | table | dolibarr_dev - public | llx_propal_merge_pdf_product | table | dolibarr_dev - public | llx_propaldet | table | dolibarr_dev - public | llx_propaldet_extrafields | table | dolibarr_dev - public | llx_resource | table | dolibarr_dev - public | llx_resource_extrafields | table | dolibarr_dev - public | llx_rights_def | table | dolibarr_dev - public | llx_societe | table | dolibarr_dev - public | llx_societe_account | table | dolibarr_dev - public | llx_societe_address | table | dolibarr_dev - public | llx_societe_commerciaux | table | dolibarr_dev - public | llx_societe_extrafields | table | dolibarr_dev - public | llx_societe_log | table | dolibarr_dev - public | llx_societe_prices | table | dolibarr_dev - public | llx_societe_remise | table | dolibarr_dev - public | llx_societe_remise_except | table | dolibarr_dev - public | llx_societe_remise_supplier | table | dolibarr_dev - public | llx_societe_rib | table | dolibarr_dev - public | llx_socpeople | table | dolibarr_dev - public | llx_socpeople_extrafields | table | dolibarr_dev - public | llx_stock_lotserial | table | dolibarr_dev - public | llx_stock_mouvement | table | dolibarr_dev - public | llx_subscription | table | dolibarr_dev - public | llx_supplier_proposal | table | dolibarr_dev - public | llx_supplier_proposal_extrafields | table | dolibarr_dev - public | llx_supplier_proposaldet | table | dolibarr_dev - public | llx_supplier_proposaldet_extrafields | table | dolibarr_dev - public | llx_ticket | table | dolibarr_dev - public | llx_ticket_extrafields | table | dolibarr_dev - public | llx_ticket_logs | table | dolibarr_dev - public | llx_ticket_msg | table | dolibarr_dev - public | llx_tva | table | dolibarr_dev - public | llx_user | table | dolibarr_dev - public | llx_user_alert | table | dolibarr_dev - public | llx_user_clicktodial | table | dolibarr_dev - public | llx_user_employment | table | dolibarr_dev - public | llx_user_extrafields | table | dolibarr_dev - public | llx_user_param | table | dolibarr_dev - public | llx_user_rib | table | dolibarr_dev - public | llx_user_rights | table | dolibarr_dev - public | llx_usergroup | table | dolibarr_dev - public | llx_usergroup_extrafields | table | dolibarr_dev - public | llx_usergroup_rights | table | dolibarr_dev - public | llx_usergroup_user | table | dolibarr_dev - public | llx_website | table | dolibarr_dev - public | llx_website_extrafields | table | dolibarr_dev - public | llx_website_page | table | dolibarr_dev - public | llx_wsactivateproducts | table | dolibarr_dev - public | llx_wsactivateserials | table | dolibarr_dev -(280 rows) - From 35c43683b65b9ba65ca318cbd78389bfb9840e58 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 13 Nov 2018 09:45:47 +0100 Subject: [PATCH 04/11] fix Erreur DB_ERROR_SYNTAX --- htdocs/install/mysql/migration/8.0.0-9.0.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql index 996fdb79b17..64811b0a034 100644 --- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql +++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql @@ -55,7 +55,7 @@ ALTER TABLE llx_product_fournisseur_price ADD COLUMN desc_fourn text after ref_f ALTER TABLE llx_user ADD COLUMN dateemploymentend date after dateemployment; ALTER TABLE llx_stock_mouvement ADD COLUMN fk_project integer; -Alter tABLE llx_c_action_trigger MODIFY COLUMN elementtype varchar(32) +Alter TABLE llx_c_action_trigger MODIFY COLUMN elementtype varchar(32); ALTER TABLE llx_c_field_list ADD COLUMN visible tinyint DEFAULT 1 NOT NULL AFTER search; From 2ed060a07083672d271d9ca81bbf0e4dcf60f529 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 13 Nov 2018 10:07:04 +0100 Subject: [PATCH 05/11] fix: Invalid argument supplied for foreach() --- htdocs/core/tpl/extrafields_list_search_sql.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php index b0c97265682..f3c5a10e95b 100644 --- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php +++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php @@ -10,7 +10,7 @@ if (empty($conf) || ! is_object($conf)) if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element; // Loop to complete the sql search criterias from extrafields -if (! empty($extrafieldsobjectkey) && ! empty($search_array_options)) // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ... +if (! empty($extrafieldsobjectkey) && ! empty($search_array_options) && is_array($search_array_options)) // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ... { foreach ($search_array_options as $key => $val) { From 4909e3afc47e2acd1dd735e664628263cfab0c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 14 Nov 2018 08:28:20 +0100 Subject: [PATCH 06/11] doc bookkeeping class --- .../accountancy/class/bookkeeping.class.php | 39 +++++++++++++++++-- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php index b07f76a22df..6074a49f537 100644 --- a/htdocs/accountancy/class/bookkeeping.class.php +++ b/htdocs/accountancy/class/bookkeeping.class.php @@ -69,7 +69,15 @@ class BookKeeping extends CommonObject public $doc_date; public $date_lim_reglement; - public $doc_type; + + /** + * @var string doc_type + */ + public $doc_type; + + /** + * @var string doc_ref + */ public $doc_ref; /** @@ -82,12 +90,35 @@ class BookKeeping extends CommonObject */ public $fk_docdet; - public $thirdparty_code; + /** + * @var string thirdparty code + */ + public $thirdparty_code; + + /** + * @var string subledger account + */ public $subledger_account; + + /** + * @var string subledger label + */ public $subledger_label; + + /** + * @var string doc_type + */ public $numero_compte; - public $label_compte; - public $label_operation; + + /** + * @var string label compte + */ + public $label_compte; + + /** + * @var string label operation + */ + public $label_operation; public $debit; public $credit; public $montant; From bcc83408e09370c7d9e260152dcd1e97563beb85 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 14 Nov 2018 18:10:41 +0100 Subject: [PATCH 07/11] FIX avoid error if $object->fk_account =< 0 for getNomUrl --- htdocs/compta/paiement/card.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php index 656d6c673f2..70a08416cea 100644 --- a/htdocs/compta/paiement/card.php +++ b/htdocs/compta/paiement/card.php @@ -233,9 +233,10 @@ $disable_delete = 0; // Bank account if (! empty($conf->banque->enabled)) { + $bankline=new AccountLine($db); + if ($object->fk_account > 0) { - $bankline=new AccountLine($db); $bankline->fetch($object->bank_line); if ($bankline->rappro) { From 01947288fb9e840639ee74514ea18609710bfdb1 Mon Sep 17 00:00:00 2001 From: David Beniamine Date: Wed, 14 Nov 2018 18:29:15 +0100 Subject: [PATCH 08/11] Fix issue #9956 User can edit some of their data without permissons --- htdocs/user/card.php | 74 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 64 insertions(+), 10 deletions(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index c8cb474b12d..3fb95d7d3f3 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -14,6 +14,7 @@ * Copyright (C) 2015-2018 Charlene Benke * Copyright (C) 2016 Raphaël Doursenaud * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018 David Beniamine * * 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 @@ -2137,7 +2138,16 @@ else // Employee print ''; print ''.fieldLabel('Employee','employee',0).''; - print $form->selectyesno("employee",$object->employee,1); + if ($caneditfield) + { + print $form->selectyesno("employee",$object->employee,1); + }else{ + if ($object->employee){ + print $langs->trans("Yes"); + }else{ + print $langs->trans("No"); + } + } print ''; // Hierarchy @@ -2341,7 +2351,12 @@ else { print ''.$langs->trans("ColorUser").''; print ''; - print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset'); + if ($caneditfield) + { + print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', null, 1, '', 'hideifnotset'); + }else{ + print $formother->showColor($object->color, ''); + } print ''; } @@ -2364,7 +2379,12 @@ else foreach ($cats as $cat) { $arrayselected[] = $cat->id; } - print $form->multiselectarray( 'usercats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%' ); + if ($caneditfield) + { + print $form->multiselectarray( 'usercats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%' ); + }else{ + print $form->showCategories( $object->id, 'user', 1 ); + } print ""; } @@ -2447,7 +2467,12 @@ else print $hookmanager->resPrint; if (empty($reshook)) { - print $object->showOptionals($extrafields,'edit'); + if ($caneditfield) + { + print $object->showOptionals($extrafields,'edit'); + }else{ + print $object->showOptionals($extrafields,'view'); + } } // Signature @@ -2496,7 +2521,11 @@ else print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm'); print ''; print ''; - print ''; + if($caneditfield){ + print ''; + }else{ + print ($object->thm!=''?price($object->thm,'',$langs,1,-1,-1,$conf->currency):''); + } print ''; print "\n"; @@ -2506,7 +2535,12 @@ else print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classthm'); print ''; print ''; - print ''; + if($caneditfield) + { + print ''; + }else{ + print ($object->tjm!=''?price($object->tjm,'',$langs,1,-1,-1,$conf->currency):''); + } print ''; print "\n"; @@ -2521,21 +2555,36 @@ else // Weeklyhours print ''.$langs->trans("WeeklyHours").''; print ''; - print ''; + if($caneditfield) + { + print ''; + }else{ + print price2num($object->weeklyhours); + } print ''; print "\n"; // Date employment print ''.$langs->trans("DateEmployment").''; print ''; - print $form->selectDate(GETPOST('dateemployment')?GETPOST('dateemployment'):$object->dateemployment, 'dateemployment', 0, 0, 1, 'formdateemployment', 1, 0); + if($caneditfield) + { + print $form->selectDate(GETPOST('dateemployment')?GETPOST('dateemployment'):$object->dateemployment, 'dateemployment', 0, 0, 1, 'formdateemployment', 1, 0); + }else{ + print dol_print_date($object->dateemployment, 'day'); + } print ''; print "\n"; // Date employmentEnd print ''.$langs->trans("DateEmploymentEnd").''; print ''; - print $form->selectDate(GETPOST('dateemploymentend')?GETPOST('dateemploymentend'):$object->dateemploymentend, 'dateemploymentend', 0, 0, 1, 'formdateemploymentend', 1, 0); + if($caneditfield) + { + print $form->selectDate(GETPOST('dateemploymentend')?GETPOST('dateemploymentend'):$object->dateemploymentend, 'dateemploymentend', 0, 0, 1, 'formdateemploymentend', 1, 0); + }else{ + print dol_print_date($object->dateemploymentend, 'day'); + } print ''; print "\n"; @@ -2543,7 +2592,12 @@ else // Date birth print ''.$langs->trans("DateToBirth").''; print ''; - print $form->selectDate(GETPOST('birth')?GETPOST('birth'):$object->birth, 'birth', 0, 0, 1, 'updateuser', 1, 0); + if($caneditfield) + { + echo $form->select_date(GETPOST('birth')?GETPOST('birth'):$object->birth,'birth',0,0,1,'updateuser',1,0,1); + }else{ + print dol_print_date($object->birth, 'day'); + } print ''; print "\n"; From ac0f46f9e5d9fc35b1d7ed70ca7ec6229bcb6cb5 Mon Sep 17 00:00:00 2001 From: markus Date: Thu, 15 Nov 2018 11:10:54 +0100 Subject: [PATCH 09/11] for Denmark: forme_jurisdisque additions --- .../mysql/data/llx_c_forme_juridique.sql | 24 +++++-- .../install/mysql/migration/8.0.0-9.0.0.sql | 68 +++++++++++-------- 2 files changed, 57 insertions(+), 35 deletions(-) diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql index 08d7eded1ad..ec8e687203f 100644 --- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql +++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql @@ -89,9 +89,9 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'29','Group insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'31','Personne morale de droit étranger, immatriculée au RCS'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'32','Personne morale de droit étranger, non immatriculée au RCS'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'35','Régime auto-entrepreneur'); - + insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'41','Etablissement public ou régie à caractère industriel ou commercial'); - + insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'51','Société coopérative commerciale particulière'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'52','Société en nom collectif'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'53','Société en commandite'); @@ -108,18 +108,18 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'63','Soci insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'64','Société non commerciale d assurances'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'65','Société civile'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'69','Personnes de droit privé inscrites au RCS'); - + insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'71','Administration de l état'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'72','Collectivité territoriale'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'73','Etablissement public administratif'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'74','Personne morale de droit public administratif'); - + insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'81','Organisme gérant régime de protection social à adhésion obligatoire'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'82','Organisme mutualiste'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'83','Comité d entreprise'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'84','Organisme professionnel'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'85','Organisme de retraite à adhésion non obligatoire'); - + insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'91','Syndicat de propriétaires'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'92','Association loi 1901 ou assimilé'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'93','Fondation'); @@ -159,6 +159,17 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (5, '506', 'KG insert into llx_c_forme_juridique (fk_pays, code, libelle) values (5, '507', 'Ltd. - Limited Company'); insert into llx_c_forme_juridique (fk_pays, code, libelle) values (5, '508', 'OHG - Offene Handelsgesellschaft'); +-- Denmark +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8001', 'Aktieselvskab A/S'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8002', 'Anparts Selvskab ApS'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8003', 'Personlig ejet selvskab'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8004', 'Iværksætterselvskab IVS'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8005', 'Interessentskab I/S'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8006', 'Holdingselskab'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8007', 'Selskab Med Begrænset Hæftelse SMBA'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8008', 'Kommanditselskab K/S'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8009', 'SPE-selskab'); + -- Greece INSERT INTO llx_c_forme_juridique (code,fk_pays,libelle,isvatexempted,active) VALUES ('10201',102,'Ατομική επιχείρηση',0,1); INSERT INTO llx_c_forme_juridique (code,fk_pays,libelle,isvatexempted,active) VALUES ('10202',102,'Εταιρική επιχείρηση',0,1); @@ -313,4 +324,5 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (178, INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (178, '17802', 'Asociación General', 1); INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (178, '17803', 'Sociedad de Responsabilidad Limitada', 1); INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (178, '17804', 'Sociedad Civil', 1); -INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (178, '17805', 'Sociedad Anónima', 1); \ No newline at end of file +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (178, '17805', 'Sociedad Anónima', 1); + diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql index 0c9498fb594..123badcd901 100644 --- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql +++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql @@ -72,6 +72,16 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8001', 'Aktieselvskab A/S'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8002', 'Anparts Selvskab ApS'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8003', 'Personlig ejet selvskab'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8004', 'Iværksætterselvskab IVS'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8005', 'Interessentskab I/S'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8006', 'Holdingselskab'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8007', 'Selskab Med Begrænset Hæftelse SMBA'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8008', 'Kommanditselskab K/S'); +INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (80, '8009', 'SPE-selskab'); + ALTER TABLE llx_payment_salary ADD COLUMN ref varchar(30) NULL after rowid; ALTER TABLE llx_payment_salary ADD COLUMN fk_projet integer DEFAULT NULL after amount; @@ -142,26 +152,26 @@ UPDATE llx_holiday SET ref = rowid WHERE ref IS NULL; CREATE TABLE llx_emailcollector_emailcollector( -- BEGIN MODULEBUILDER FIELDS - rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, - entity integer DEFAULT 1 NOT NULL, + rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, + entity integer DEFAULT 1 NOT NULL, ref varchar(128) NOT NULL, - label varchar(255), + label varchar(255), description text, - host varchar(255), - user varchar(128), + host varchar(255), + user varchar(128), password varchar(128), source_directory varchar(255) NOT NULL, target_directory varchar(255), - datelastresult datetime, - codelastresult varchar(16), + datelastresult datetime, + codelastresult varchar(16), lastresult varchar(255), - note_public text, - note_private text, - date_creation datetime NOT NULL, - tms timestamp NOT NULL, - fk_user_creat integer NOT NULL, - fk_user_modif integer, - import_key varchar(14), + note_public text, + note_private text, + date_creation datetime NOT NULL, + tms timestamp NOT NULL, + fk_user_creat integer NOT NULL, + fk_user_modif integer, + import_key varchar(14), status integer NOT NULL -- END MODULEBUILDER FIELDS ) ENGINE=innodb; @@ -174,28 +184,28 @@ CREATE TABLE llx_emailcollector_emailcollectoraction( -- BEGIN MODULEBUILDER FIELDS rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, fk_emailcollector INTEGER NOT NULL, - type varchar(128) NOT NULL, - actionparam varchar(255) NULL, - date_creation datetime NOT NULL, - tms timestamp NOT NULL, - fk_user_creat integer NOT NULL, - fk_user_modif integer, - import_key varchar(14), + type varchar(128) NOT NULL, + actionparam varchar(255) NULL, + date_creation datetime NOT NULL, + tms timestamp NOT NULL, + fk_user_creat integer NOT NULL, + fk_user_modif integer, + import_key varchar(14), status integer NOT NULL -- END MODULEBUILDER FIELDS ) ENGINE=innodb; CREATE TABLE llx_emailcollector_emailcollectorfilter( -- BEGIN MODULEBUILDER FIELDS - rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, + rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, fk_emailcollector INTEGER NOT NULL, - type varchar(128) NOT NULL, - rulevalue varchar(255) NULL, - date_creation datetime NOT NULL, - tms timestamp NOT NULL, - fk_user_creat integer NOT NULL, - fk_user_modif integer, - import_key varchar(14), + type varchar(128) NOT NULL, + rulevalue varchar(255) NULL, + date_creation datetime NOT NULL, + tms timestamp NOT NULL, + fk_user_creat integer NOT NULL, + fk_user_modif integer, + import_key varchar(14), status integer NOT NULL -- END MODULEBUILDER FIELDS ) ENGINE=innodb; From 6ffd63c965a250e3ebdca987e77d2f650aee7d80 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 15 Nov 2018 16:47:40 +0100 Subject: [PATCH 10/11] Update projectstats.class.php --- htdocs/projet/class/projectstats.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php index cf586f8c96c..ceee66075fa 100644 --- a/htdocs/projet/class/projectstats.class.php +++ b/htdocs/projet/class/projectstats.class.php @@ -171,7 +171,7 @@ class ProjectStats extends Stats if (! empty($this->status)) $sqlwhere[] = " t.fk_opp_status IN (" . $this->status . ")"; - // TE: changed table alias "p" to "t" + if (! $user->rights->projet->all->lire) $sqlwhere[] = " t.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users if (count($sqlwhere) > 0) { From 8a97ba4ba9fac77e9e6b5637a28db253674803c2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 15 Nov 2018 16:56:12 +0100 Subject: [PATCH 11/11] Update card.php --- htdocs/user/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 3fb95d7d3f3..6b83bf28ba5 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -2594,7 +2594,7 @@ else print ''; if($caneditfield) { - echo $form->select_date(GETPOST('birth')?GETPOST('birth'):$object->birth,'birth',0,0,1,'updateuser',1,0,1); + echo $form->selectDate(GETPOST('birth')?GETPOST('birth'):$object->birth, 'birth', 0, 0, 1, 'updateuser', 1, 0); }else{ print dol_print_date($object->birth, 'day'); }