dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 351274: 1) Standardization of use of


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 351274: 1) Standardization of use of "third party"
Date: Fri, 14 Dec 2018 02:09:37 -0800

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 351274d85d5726db083fdfff9b786b13d5ef93f2
      
https://github.com/Dolibarr/dolibarr/commit/351274d85d5726db083fdfff9b786b13d5ef93f2
  Author: torvista <address@hidden>
  Date:   2018-12-11 (Tue, 11 Dec 2018)

  Changed paths:
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/bookmarks.lang
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/cashdesk.lang
    M htdocs/langs/en_US/commercial.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/deliveries.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/exports.lang
    M htdocs/langs/en_US/ftp.lang
    M htdocs/langs/en_US/help.lang
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/en_US/install.lang
    M htdocs/langs/en_US/interventions.lang
    M htdocs/langs/en_US/ldap.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/langs/en_US/members.lang
    M htdocs/langs/en_US/opensurvey.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/paybox.lang
    M htdocs/langs/en_US/paypal.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/salaries.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/sms.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/en_US/stripe.lang
    M htdocs/langs/en_US/supplier_proposal.lang
    M htdocs/langs/en_US/suppliers.lang
    M htdocs/langs/en_US/ticket.lang
    M htdocs/langs/en_US/users.lang
    M htdocs/langs/en_US/website.lang
    M htdocs/langs/en_US/withdrawals.lang
    M htdocs/langs/en_US/workflow.lang

  Log Message:
  -----------
  1) Standardization of use of "third party"
as a noun : third party
as an modifier: third-party contact
2) use of colons: no space before
3) Use of supplier/vendor was mixed.
Vendor is B2B or B2C, supplier is B2B. Changed all references to supplier.
4) Many minor grammar changes.


  Commit: 1226868bd9123c46ff1b58ec2d0a612870d83c98
      
https://github.com/Dolibarr/dolibarr/commit/1226868bd9123c46ff1b58ec2d0a612870d83c98
  Author: torvista <address@hidden>
  Date:   2018-12-11 (Tue, 11 Dec 2018)

  Changed paths:
    M htdocs/langs/en_US/companies.lang

  Log Message:
  -----------
  missed one


  Commit: 2abb2f054dcb9639d1dd46e702f8409aa4a55583
      
https://github.com/Dolibarr/dolibarr/commit/2abb2f054dcb9639d1dd46e702f8409aa4a55583
  Author: torvista <address@hidden>
  Date:   2018-12-11 (Tue, 11 Dec 2018)

  Changed paths:
    M htdocs/langs/en_US/errors.lang

  Log Message:
  -----------
  Fix conflict


  Commit: 1c7189ed4061710eef62f8b742de3276a6c74b26
      
https://github.com/Dolibarr/dolibarr/commit/1c7189ed4061710eef62f8b742de3276a6c74b26
  Author: torvista <address@hidden>
  Date:   2018-12-13 (Thu, 13 Dec 2018)

  Changed paths:
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/stripe.lang
    M htdocs/langs/en_US/suppliers.lang

  Log Message:
  -----------
  supplier->vendor
suppliers->vendors


  Commit: 55487da03ed1ddffb9890599427f7429bd429bb5
      
https://github.com/Dolibarr/dolibarr/commit/55487da03ed1ddffb9890599427f7429bd429bb5
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-12-14 (Fri, 14 Dec 2018)

  Changed paths:
    M .travis.yml
    R dev/resources/dbmodel/dolibarr.uml
    R dev/resources/dbmodel/dolibarr.umldi
    M dev/resources/dbmodel/dolibarr_schema.mwb
    M doc/install/README
    A doc/install/README-DE
    M htdocs/accountancy/customer/card.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/accountancy/supplier/card.php
    M htdocs/admin/mails_templates.php
    M htdocs/admin/menus/edit.php
    M htdocs/admin/socialnetworks.php
    M htdocs/blockedlog/class/blockedlog.class.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/card.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/class/advtargetemailing.class.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/remx.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/compta-files.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/contact.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/info.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/facture/note.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/index.php
    M htdocs/compta/journal/sellsjournal.php
    M htdocs/compta/paiement.php
    M htdocs/compta/paiement/card.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/create.php
    M htdocs/compta/prelevement/demandes.php
    M htdocs/compta/prelevement/factures.php
    M htdocs/compta/prelevement/index.php
    M htdocs/compta/prelevement/ligne.php
    M htdocs/compta/prelevement/list.php
    M htdocs/compta/recap-compta.php
    M htdocs/compta/stats/index.php
    M htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
    M htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
    M htdocs/contact/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/list.php
    M htdocs/contrat/card.php
    M htdocs/core/boxes/box_factures.php
    M htdocs/core/boxes/box_factures_imp.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/class/events.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/class/menubase.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/invoice2.lib.php
    M htdocs/core/lib/loan.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/core/modules/facture/mod_facture_mars.php
    M htdocs/core/modules/facture/mod_facture_mercure.php
    M htdocs/core/modules/facture/mod_facture_terre.php
    M htdocs/core/modules/mailings/contacts1.modules.php
    M htdocs/core/modules/mailings/example.modules.php
    M htdocs/core/modules/mailings/fraise.modules.php
    M htdocs/core/modules/mailings/modules_mailings.php
    M htdocs/core/modules/mailings/pomme.modules.php
    M htdocs/core/modules/mailings/thirdparties.modules.php
    M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
    M htdocs/core/modules/mailings/xinputfile.modules.php
    M htdocs/core/modules/mailings/xinputuser.modules.php
    M htdocs/core/modules/modApi.class.php
    M htdocs/core/modules/modBanque.class.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modGravatar.class.php
    M htdocs/core/modules/modHoliday.class.php
    M htdocs/core/modules/modMultiCurrency.class.php
    M htdocs/core/modules/modPaybox.class.php
    M htdocs/core/modules/modPaypal.class.php
    M htdocs/core/modules/rapport/pdf_paiement.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/triggers/interface_20_all_Logevents.class.php
    M htdocs/cron/class/cronjob.class.php
    M htdocs/cron/list.php
    M htdocs/exports/export.php
    M htdocs/externalsite/frames.php
    M htdocs/fourn/commande/orderstoinvoice.php
    M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
    M htdocs/install/mysql/migration/9.0.0-10.0.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/install/mysql/tables/llx_facture.key.sql
    M htdocs/install/mysql/tables/llx_facture.sql
    M htdocs/install/mysql/tables/llx_links.sql
    M htdocs/install/mysql/tables/llx_loan.sql
    M htdocs/install/mysql/tables/llx_socpeople.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/loan/card.php
    M htdocs/loan/class/loan.class.php
    M htdocs/loan/class/paymentloan.class.php
    M htdocs/loan/createschedule.php
    M htdocs/loan/payment/card.php
    M htdocs/loan/payment/payment.php
    A htdocs/loan/schedule.php
    M htdocs/main.inc.php
    M htdocs/margin/checkMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M 
htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
    M htdocs/opensurvey/results.php
    M htdocs/product/class/product.class.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stock/movement_list.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/contact.php
    M htdocs/public/emailing/mailing-unsubscribe.php
    M htdocs/public/opensurvey/studs.php
    M htdocs/societe/class/api_thirdparties.class.php
    M htdocs/societe/consumption.php
    M htdocs/stripe/payment.php
    M htdocs/takepos/customers.php
    M htdocs/takepos/invoice.php
    M htdocs/takepos/pay.php
    M htdocs/takepos/receipt.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/img/menus/generic1.png
    A htdocs/theme/md/img/menus/generic1_over.png
    M htdocs/theme/md/img/menus/generic2.png
    A htdocs/theme/md/img/menus/generic2_over.png
    M htdocs/theme/md/img/menus/generic3.png
    A htdocs/theme/md/img/menus/generic3_over.png
    M htdocs/theme/md/img/menus/generic4.png
    A htdocs/theme/md/img/menus/generic4_over.png
    M htdocs/theme/md/style.css.php
    M htdocs/ticket/class/ticket.class.php
    M htdocs/user/logout.php
    M htdocs/webservices/server_contact.php
    M htdocs/webservices/server_invoice.php
    M scripts/invoices/email_unpaid_invoices_to_customers.php
    M scripts/invoices/email_unpaid_invoices_to_representatives.php
    M test/phpunit/ExportTest.php
    M test/phpunit/FactureTest.php

  Log Message:
  -----------
  Merge branch 'develop' into langs_en_US


  Commit: 0d6863ebb07e47577cbfebb1767ec1495eb2a95b
      
https://github.com/Dolibarr/dolibarr/commit/0d6863ebb07e47577cbfebb1767ec1495eb2a95b
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-12-14 (Fri, 14 Dec 2018)

  Changed paths:
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/banks.lang
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/bookmarks.lang
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/cashdesk.lang
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/commercial.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/cron.lang
    M htdocs/langs/en_US/deliveries.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/exports.lang
    M htdocs/langs/en_US/ftp.lang
    M htdocs/langs/en_US/help.lang
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/en_US/install.lang
    M htdocs/langs/en_US/interventions.lang
    M htdocs/langs/en_US/ldap.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/langs/en_US/members.lang
    M htdocs/langs/en_US/opensurvey.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/paybox.lang
    M htdocs/langs/en_US/paypal.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/salaries.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/sms.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/en_US/stripe.lang
    M htdocs/langs/en_US/supplier_proposal.lang
    M htdocs/langs/en_US/suppliers.lang
    M htdocs/langs/en_US/ticket.lang
    M htdocs/langs/en_US/users.lang
    M htdocs/langs/en_US/website.lang
    M htdocs/langs/en_US/withdrawals.lang
    M htdocs/langs/en_US/workflow.lang

  Log Message:
  -----------
  Merge pull request #10217 from torvista/langs_en_US

various en_US changes


Compare: 
https://github.com/Dolibarr/dolibarr/compare/dc4a12269717...0d6863ebb07e
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]