[Dolibarr-git] [Dolibarr/dolibarr] 79d835: NEW Extrafields on salaries

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 79d8351dda16bf83a7aece6683238cc6d056ccb5
      
https://github.com/Dolibarr/dolibarr/commit/79d8351dda16bf83a7aece6683238cc6d056ccb5
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2019-07-17 (Wed, 17 Jul 2019)

  Changed paths:
    A htdocs/admin/salaries_extrafields.php
    M htdocs/core/lib/salaries.lib.php
    M htdocs/core/modules/modSalaries.class.php
    A htdocs/install/mysql/tables/llx_payment_salary_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql

  Log Message:
  -----------
  NEW Extrafields on salaries


  Commit: 21bd46fc15f55715386cb01d22d38e2ba9da510b
      
https://github.com/Dolibarr/dolibarr/commit/21bd46fc15f55715386cb01d22d38e2ba9da510b
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2019-07-17 (Wed, 17 Jul 2019)

  Changed paths:
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/adherents/card.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/subscription/list.php
    M htdocs/adherents/type.php
    M htdocs/admin/dict.php
    M htdocs/admin/ihm.php
    M htdocs/admin/mails_templates.php
    M htdocs/admin/supplier_proposal.php
    M htdocs/admin/ticket_public.php
    M htdocs/admin/tools/listevents.php
    M htdocs/bom/class/bom.class.php
    M htdocs/comm/action/card.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/customer.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/bank/bankentries_list.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/clients.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/invoicetemplate_list.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/paiement/cheque/list.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/class/ligneprelevement.class.php
    M htdocs/compta/prelevement/create.php
    M htdocs/compta/stats/byratecountry.php
    M htdocs/compta/tva/quadri_detail.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/boxes/box_graph_invoices_permonth.php
    M htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
    M htdocs/core/boxes/box_graph_orders_permonth.php
    M htdocs/core/boxes/box_graph_orders_supplier_permonth.php
    M htdocs/core/boxes/box_graph_product_distribution.php
    M htdocs/core/boxes/box_graph_propales_permonth.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/commonstickergenerator.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/fileupload.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/html.formticket.class.php
    M htdocs/core/extrafieldsinexport.inc.php
    M htdocs/core/lib/accounting.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/ticket.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
    M htdocs/core/modules/export/export_csv.modules.php
    M htdocs/core/modules/export/export_excel.modules.php
    M htdocs/core/modules/export/export_excel2007new.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/facture/doc/pdf_sponge.modules.php
    M htdocs/core/modules/modBanque.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/product/doc/pdf_standard.modules.php
    M htdocs/core/modules/reception/doc/pdf_squille.modules.php
    M htdocs/core/modules/stock/doc/pdf_standard.modules.php
    M htdocs/core/tpl/admin_extrafields_add.tpl.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/core/tpl/extrafields_list_print_fields.tpl.php
    M htdocs/debugbar/class/DataCollector/DolLogsCollector.php
    M htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
    M htdocs/don/card.php
    M htdocs/don/class/don.class.php
    M htdocs/expedition/contact.php
    M htdocs/expedition/list.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/commande/orderstoinvoice.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/product/list.php
    M htdocs/install/mysql/data/llx_c_email_templates.sql
    M htdocs/install/mysql/migration/10.0.0-11.0.0.sql
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/migration/9.0.0-10.0.0.sql
    M htdocs/install/mysql/tables/llx_bom_bomline.sql
    M htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql
    M htdocs/install/mysql/tables/llx_events.sql
    M htdocs/install/mysql/tables/llx_expensereport_det.sql
    M htdocs/install/mysql/tables/llx_facture_fourn_det.sql
    M htdocs/install/mysql/tables/llx_facturedet_rec.sql
    M htdocs/install/step2.php
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/main.inc.php
    M htdocs/modulebuilder/template/class/myobject.class.php
    M htdocs/modulebuilder/template/myobject_card.php
    M htdocs/product/admin/product.php
    M htdocs/product/canvas/product/actions_card_product.class.php
    M htdocs/product/canvas/product/tpl/card_view.tpl.php
    M htdocs/product/canvas/service/actions_card_service.class.php
    M htdocs/product/canvas/service/tpl/card_view.tpl.php
    M htdocs/product/class/product.class.php
    M htdocs/product/price.php
    M htdocs/product/reassort.php
    M htdocs/product/reassortlot.php
    M htdocs/product/stock/list.php
    M htdocs/product/stock/movement_card.php
    M htdocs/product/stock/movement_list.php
    M htdocs/product/stock/replenish.php
    M htdocs/projet/element.php
    M htdocs/public/demo/index.php
    M htdocs/public/stripe/confirm_payment.php
    M htdocs/public/ticket/create_ticket.php
    M htdocs/public/ticket/index.php
    M htdocs/public/ticket/list.php
    M htdocs/public/ticket/view.php
    M htdocs/reception/contact.php
    M htdocs/reception/list.php
    M htdocs/societe/class/api_contacts.class.php
    M htdocs/societe/class/api_thirdparties.class.php
    M htdocs/societe/paymentmodes.php
    M htdocs/stripe/class/stripe.class.php
    M htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
    M htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/supplier_proposal/list.php
    M htdocs/theme/eldy/global.inc.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/hierarchy.php
    M htdocs/user/list.php
    M test/phpunit/ActionCommTest.php
    M test/phpunit/AdherentTest.php
    M test/phpunit/AdminLibTest.php
    M test/phpunit/BOMTest.php
    M test/phpunit/BankAccountTest.php
    M test/phpunit/BonPrelevementTest.php
    M test/phpunit/BuildDocTest.php
    M test/phpunit/CMailFileTest.php
    M test/phpunit/CategorieTest.php
    M test/phpunit/ChargeSocialesTest.php
    M test/phpunit/CodingPhpTest.php
    M test/phpunit/CommandeFournisseurTest.php
    M test/phpunit/CommandeTest.php
    M test/phpunit/CommonObjectTest.php
    M test/phpunit/CompanyBankAccountTest.php
    M test/phpunit/CompanyLibTest.php
    M test/phpunit/ContactTest.php
    M test/phpunit/ContratTest.php
    M test/phpunit/CoreTest.php
    M test/phpunit/DateLibTest.php
    M test/phpunit/DateLibTzFranceTest.php
    M test/phpunit/DiscountTest.php
    M test/phpunit/EntrepotTest.php
    M test/phpunit/ExpenseReportTest.php
    M test/phpunit/ExportTest.php
    M test/phpunit/FactureFournisseurTest.php
    M test/phpunit/FactureRecTest.php
    M test/phpunit/FactureTest.php
    M test/phpunit/FactureTestRounding.php
    M test/phpunit/FichinterTest.php
    M test/phpunit/FilesLibTest.php
    M test/phpunit/FormAdminTest.php
    M test/phpunit/Functions2LibTest.php
    M test/phpunit/HolidayTest.php
    M test/phpunit/ImagesLibTest.php
    M test/phpunit/ImportTest.php
    M test/phpunit/JsonLibTest.php
    M test/phpunit/LangTest.php
    M test/phpunit/LoanTest.php
    M test/phpunit/MarginsLibTest.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/MouvementStockTest.php
    M test/phpunit/NumberingModulesTest.php
    M test/phpunit/PaypalTest.php
    M test/phpunit/PdfDocTest.php
    M test/phpunit/PgsqlTest.php
    M test/phpunit/PricesTest.php
    M test/phpunit/ProductTest.php
    M test/phpunit/ProjectTest.php
    M test/phpunit/PropalTest.php
    M test/phpunit/RestAPIDocumentTest.php
    M test/phpunit/RestAPIUserTest.php
    M test/phpunit/ScriptsTest.php
    M test/phpunit/SecurityTest.php
    M test/phpunit/SocieteTest.php
    M test/phpunit/SupplierProposalTest.php
    M test/phpunit/TicketTest.php
    M test/phpunit/UserGroupTest.php
    M test/phpunit/UserTest.php
    M test/phpunit/UtilsTest.php
    M test/phpunit/WebservicesInvoicesTest.php
    M test/phpunit/WebservicesOrdersTest.php
    M test/phpunit/WebservicesOtherTest.php
    M test/phpunit/WebservicesProductsTest.php
    M test/phpunit/WebservicesThirdpartyTest.php
    M test/phpunit/WebservicesUserTest.php
    M test/phpunit/XCalLibTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/develop' into 11.0_salaries


  Commit: 9ab07344153bea1ef843f71eb462077432a63884
      
https://github.com/Dolibarr/dolibarr/commit/9ab07344153bea1ef843f71eb462077432a63884
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2019-07-19 (Fri, 19 Jul 2019)

  Changed paths:
    M ChangeLog
    M htdocs/.gitignore
    M htdocs/accountancy/journal/bankjournal.php
    R htdocs/admin/salaries.php
    R htdocs/admin/salaries_extrafields.php
    M htdocs/compta/accounting-files.php
    M htdocs/compta/bank/bankentries_list.php
    M htdocs/compta/bank/ligne.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/charges/index.php
    M htdocs/compta/resultat/clientfourn.php
    R htdocs/compta/salaries/card.php
    R htdocs/compta/salaries/class/index.html
    R htdocs/compta/salaries/class/paymentsalary.class.php
    R htdocs/compta/salaries/class/salariesstats.class.php
    R htdocs/compta/salaries/document.php
    R htdocs/compta/salaries/info.php
    R htdocs/compta/salaries/list.php
    R htdocs/compta/salaries/stats/index.php
    M htdocs/compta/sociales/payments.php
    M htdocs/core/lib/salaries.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modSalaries.class.php
    M htdocs/install/mysql/migration/10.0.0-11.0.0.sql
    M htdocs/install/mysql/tables/llx_payment_salary_extrafields.key.sql
    M htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/projet/element.php
    A htdocs/salaries/admin/salaries.php
    A htdocs/salaries/admin/salaries_extrafields.php
    A htdocs/salaries/card.php
    A htdocs/salaries/class/index.html
    A htdocs/salaries/class/paymentsalary.class.php
    A htdocs/salaries/class/salariesstats.class.php
    A htdocs/salaries/document.php
    A htdocs/salaries/info.php
    A htdocs/salaries/list.php
    A htdocs/salaries/stats/index.php
    M htdocs/user/bank.php

  Log Message:
  -----------
  NEW Extrafields on salaries


  Commit: 0af120689227b1ff89730edb468185aa091c3f7c
      
https://github.com/Dolibarr/dolibarr/commit/0af120689227b1ff89730edb468185aa091c3f7c
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2019-07-19 (Fri, 19 Jul 2019)

  Changed paths:
    M ChangeLog
    M dev/dolibarr_changes.txt
    M htdocs/accountancy/admin/journals_list.php
    M htdocs/admin/dict.php
    M htdocs/admin/holiday.php
    M htdocs/admin/menus/edit.php
    M htdocs/admin/menus/index.php
    M htdocs/admin/system/perf.php
    M htdocs/blockedlog/admin/blockedlog_list.php
    M htdocs/comm/action/list.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/card.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/invoicetemplate_list.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/create.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/menubase.class.php
    M htdocs/core/lib/website.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/tpl/object_discounts.tpl.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/card-rec.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/product/list.php
    M htdocs/includes/mike42/escpos-php/Escpos.php
    M htdocs/install/mysql/migration/10.0.0-11.0.0.sql
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/fr_FR/sendings.lang
    A htdocs/opcachepreload.php
    M htdocs/opensurvey/index.php
    M htdocs/product/price.php
    M htdocs/projet/class/api_projects.class.php
    M htdocs/projet/class/project.class.php
    M htdocs/public/payment/newpayment.php
    M htdocs/societe/agenda.php
    M htdocs/societe/card.php
    A htdocs/societe/notify/index.html
    R htdocs/societe/notify/index.php
    M htdocs/stripe/class/stripe.class.php
    M htdocs/ticket/index.php
    M htdocs/ticket/list.php
    M htdocs/user/list.php

  Log Message:
  -----------
  Merge branch 'develop' into 11.0_salaries


  Commit: f5afc500674db7795ea06a02ad21e47299a23653
      
https://github.com/Dolibarr/dolibarr/commit/f5afc500674db7795ea06a02ad21e47299a23653
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-07-22 (Mon, 22 Jul 2019)

  Changed paths:
    M ChangeLog
    M htdocs/.gitignore
    M htdocs/accountancy/journal/bankjournal.php
    R htdocs/admin/salaries.php
    M htdocs/compta/accounting-files.php
    M htdocs/compta/bank/bankentries_list.php
    M htdocs/compta/bank/ligne.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/charges/index.php
    M htdocs/compta/resultat/clientfourn.php
    R htdocs/compta/salaries/card.php
    R htdocs/compta/salaries/class/index.html
    R htdocs/compta/salaries/class/paymentsalary.class.php
    R htdocs/compta/salaries/class/salariesstats.class.php
    R htdocs/compta/salaries/document.php
    R htdocs/compta/salaries/info.php
    R htdocs/compta/salaries/list.php
    R htdocs/compta/salaries/stats/index.php
    M htdocs/compta/sociales/payments.php
    M htdocs/core/lib/salaries.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modSalaries.class.php
    M htdocs/install/mysql/migration/10.0.0-11.0.0.sql
    A htdocs/install/mysql/tables/llx_payment_salary_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/projet/element.php
    A htdocs/salaries/admin/salaries.php
    A htdocs/salaries/admin/salaries_extrafields.php
    A htdocs/salaries/card.php
    A htdocs/salaries/class/index.html
    A htdocs/salaries/class/paymentsalary.class.php
    A htdocs/salaries/class/salariesstats.class.php
    A htdocs/salaries/document.php
    A htdocs/salaries/info.php
    A htdocs/salaries/list.php
    A htdocs/salaries/stats/index.php
    M htdocs/user/bank.php

  Log Message:
  -----------
  Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into 
aspangaro-11.0_salaries


  Commit: 438254480311a1b96f5ee7c1f7ccab6e16ae754b
      
https://github.com/Dolibarr/dolibarr/commit/438254480311a1b96f5ee7c1f7ccab6e16ae754b
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-07-22 (Mon, 22 Jul 2019)

  Changed paths:
    M ChangeLog
    M htdocs/.gitignore
    M htdocs/accountancy/journal/bankjournal.php
    R htdocs/admin/salaries.php
    M htdocs/compta/accounting-files.php
    M htdocs/compta/bank/bankentries_list.php
    M htdocs/compta/bank/ligne.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/charges/index.php
    M htdocs/compta/resultat/clientfourn.php
    R htdocs/compta/salaries/card.php
    R htdocs/compta/salaries/class/index.html
    R htdocs/compta/salaries/class/paymentsalary.class.php
    R htdocs/compta/salaries/class/salariesstats.class.php
    R htdocs/compta/salaries/document.php
    R htdocs/compta/salaries/info.php
    R htdocs/compta/salaries/list.php
    R htdocs/compta/salaries/stats/index.php
    M htdocs/compta/sociales/payments.php
    M htdocs/core/lib/salaries.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modSalaries.class.php
    M htdocs/install/mysql/migration/10.0.0-11.0.0.sql
    A htdocs/install/mysql/tables/llx_payment_salary_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/projet/element.php
    A htdocs/salaries/admin/salaries.php
    A htdocs/salaries/admin/salaries_extrafields.php
    A htdocs/salaries/card.php
    A htdocs/salaries/class/index.html
    A htdocs/salaries/class/paymentsalary.class.php
    A htdocs/salaries/class/salariesstats.class.php
    A htdocs/salaries/document.php
    A htdocs/salaries/info.php
    A htdocs/salaries/list.php
    A htdocs/salaries/stats/index.php
    M htdocs/user/bank.php

  Log Message:
  -----------
  Merge branch 'aspangaro-11.0_salaries' into develop


  Commit: 4833c2bf49d751733c090b929525e41e2df9dfa3
      
https://github.com/Dolibarr/dolibarr/commit/4833c2bf49d751733c090b929525e41e2df9dfa3
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-07-22 (Mon, 22 Jul 2019)

  Changed paths:
    M htdocs/compta/bank/bankentries_list.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/info.php
    R htdocs/compta/bank/ligne.php
    A htdocs/compta/bank/line.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/bank/transfer.php
    M htdocs/compta/prelevement/card.php
    M htdocs/compta/prelevement/fiche-rejet.php
    R htdocs/compta/prelevement/ligne.php
    A htdocs/compta/prelevement/line.php
    M htdocs/compta/prelevement/list.php
    M htdocs/compta/prelevement/rejets.php
    M htdocs/contrat/index.php
    M htdocs/core/class/cunits.class.php
    M htdocs/install/upgrade2.php
    M htdocs/public/stripe/ipn.php
    M htdocs/societe/class/api_contacts.class.php

  Log Message:
  -----------
  Merge


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a379d7804c5e...4833c2bf49d7