[Dolibarr-git] [Dolibarr/dolibarr] a6ec22: FIX: dont lose supplier ref i

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] a6ec22: FIX: dont lose supplier ref i

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] a6ec22: FIX: dont lose supplier ref if no supplier price i...
Date:	Tue, 11 Apr 2017 02:44:16 -0700
  Branch: refs/heads/5.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a6ec22d7fee41c954b37249909271c6370047eff
      
https://github.com/Dolibarr/dolibarr/commit/a6ec22d7fee41c954b37249909271c6370047eff
  Author: altatof <address@hidden>
  Date:   2017-04-07 (Fri, 07 Apr 2017)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  FIX: dont lose supplier ref if no supplier price in database


  Commit: 919633b2beb65208d4b9c309b3dbf28a4ffd8d36
      
https://github.com/Dolibarr/dolibarr/commit/919633b2beb65208d4b9c309b3dbf28a4ffd8d36
  Author: altatof <address@hidden>
  Date:   2017-04-07 (Fri, 07 Apr 2017)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  escape supplier ref


  Commit: d892a89f453e7a1be99d0a8fa3b620d8fa04c0bf
      
https://github.com/Dolibarr/dolibarr/commit/d892a89f453e7a1be99d0a8fa3b620d8fa04c0bf
  Author: altatof <address@hidden>
  Date:   2017-04-07 (Fri, 07 Apr 2017)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  FIX: dont get empty "Incoterms : - " string if no incoterm


  Commit: 74f0ae5bbb8a3a8660b7e6fbfff50605153d42e8
      
https://github.com/Dolibarr/dolibarr/commit/74f0ae5bbb8a3a8660b7e6fbfff50605153d42e8
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M htdocs/user/agenda_extsites.php
    M htdocs/user/bank.php
    M htdocs/user/card.php
    M htdocs/user/clicktodial.php
    M htdocs/user/document.php
    M htdocs/user/info.php
    M htdocs/user/ldap.php
    M htdocs/user/note.php
    M htdocs/user/param_ihm.php
    M htdocs/user/perms.php

  Log Message:
  -----------
  FIX #6623 User card shows "Return to list" link even if the user has no 
rights to list users

Close #6623


  Commit: a8da0776132cb31314a13f83093939dbf96ac65e
      
https://github.com/Dolibarr/dolibarr/commit/a8da0776132cb31314a13f83093939dbf96ac65e
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M htdocs/supplier_proposal/card.php

  Log Message:
  -----------
  FIX #6613 Default subject for Supplier proposal emails is filled with a 
non-existing key

Close #6613


  Commit: 411d276ed2dea990fee8d6e5266b02f569b4fe71
      
https://github.com/Dolibarr/dolibarr/commit/411d276ed2dea990fee8d6e5266b02f569b4fe71
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  FIX #6669 User with no permission to edit customer invoices can see a edit 
button in project entry

Close #6669


  Commit: da0af36086ab39407da9b3fdaee47ff68487a69b
      
https://github.com/Dolibarr/dolibarr/commit/da0af36086ab39407da9b3fdaee47ff68487a69b
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  FIX #6671 Cannot remove thirdparty type with "#" in its name

Close #6671


  Commit: 2d83efc7e303778a595e6cfe31979bdbe0ee07f9
      
https://github.com/Dolibarr/dolibarr/commit/2d83efc7e303778a595e6cfe31979bdbe0ee07f9
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M htdocs/societe/list.php

  Log Message:
  -----------
  FIX #6673 Missing "nature" table header in thirdparty list

Close #6673


  Commit: 2057613ad91bed05e3843151baedb1b6b656b95c
      
https://github.com/Dolibarr/dolibarr/commit/2057613ad91bed05e3843151baedb1b6b656b95c
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M htdocs/contact/list.php

  Log Message:
  -----------
  FIX #6675 Restricted user with no agenda permissions can see a button to 
create appointment in thirdparty contact list

Close #6675


  Commit: 59fa5c2fe69d42ac84d545068c4b2ea2ae88590f
      
https://github.com/Dolibarr/dolibarr/commit/59fa5c2fe69d42ac84d545068c4b2ea2ae88590f
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  FIX #6680 User with restricted supplier invoice permissions sees "reopen" 
button even if he has no permission to do it

Close #6680


  Commit: 12df7b6ab904bdcb11dcf5b818528fcfc3e3a7a0
      
https://github.com/Dolibarr/dolibarr/commit/12df7b6ab904bdcb11dcf5b818528fcfc3e3a7a0
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  FIX #6679 User with restricted supplier invoice permissions can edit project, 
payment conditions, payment mode

Close #6679


  Commit: 996b5e9f874e47f68a46e34886df06c6eefb01ee
      
https://github.com/Dolibarr/dolibarr/commit/996b5e9f874e47f68a46e34886df06c6eefb01ee
  Author: Marcos García de La Fuente <address@hidden>
  Date:   2017-04-09 (Sun, 09 Apr 2017)

  Changed paths:
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Corrected translation errors and little bug showing a non-available button to 
a restricted user


  Commit: a6b7c812f2e0a9c0e9e9ce53bdaf767e0ddf077f
      
https://github.com/Dolibarr/dolibarr/commit/a6b7c812f2e0a9c0e9e9ce53bdaf767e0ddf077f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Merge pull request #6684 from marcosgdf/recurring

Corrected translation errors and little bug showing a non-available button to a 
restricted user


  Commit: abf87a6946263aa80597ba11c81c72d201d7d8a0
      
https://github.com/Dolibarr/dolibarr/commit/abf87a6946263aa80597ba11c81c72d201d7d8a0
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M ChangeLog
    M dev/initdemo/initdemo.sh
    M htdocs/admin/external_rss.php
    M htdocs/admin/modules.php
    M htdocs/admin/tools/update.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/index.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/remx.php
    M htdocs/commande/class/api_commande.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/categ.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/class/bankcateg.class.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/paiement.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/boxes/box_factures_imp.php
    M htdocs/core/boxes/box_services_contracts.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmargin.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/treeview.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/core/modules/product/mod_codeproduct_elephant.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/expensereport/class/paymentexpensereport.class.php
    M htdocs/expensereport/payment/payment.php
    M htdocs/fichinter/card.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/main.inc.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/margin/productMargins.php
    M htdocs/product/admin/price_rules.php
    M htdocs/product/class/product.class.php
    M htdocs/product/stats/card.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/contact.php
    M htdocs/projet/document.php
    M htdocs/projet/element.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/index.php
    M htdocs/projet/info.php
    M htdocs/projet/list.php
    M htdocs/projet/note.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/contact.php
    M htdocs/projet/tasks/document.php
    M htdocs/projet/tasks/list.php
    M htdocs/projet/tasks/note.php
    M htdocs/projet/tasks/task.php
    M htdocs/projet/tasks/time.php
    M htdocs/societe/class/api_contact.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/class/user.class.php
    M htdocs/user/hierarchy.php

  Log Message:
  -----------
  Merge branch '4.0' into fix_reffourn


  Commit: e357aed3e181b7faa0eebfb50acc221389e99d1b
      
https://github.com/Dolibarr/dolibarr/commit/e357aed3e181b7faa0eebfb50acc221389e99d1b
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php

  Log Message:
  -----------
  Merge pull request #6655 from altatof/fix_reffourn

FIX: dont lose supplier ref if no supplier price in database


  Commit: d4de81ed6dd669ab84f6822c7bad7ea7f8d2b634
      
https://github.com/Dolibarr/dolibarr/commit/d4de81ed6dd669ab84f6822c7bad7ea7f8d2b634
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Merge pull request #6659 from altatof/fix_incoterm

FIX: dont get empty "Incoterms : - " string if no incoterm


  Commit: cd90dcb1e1eefe6f0faf9ab4067945610dc58afd
      
https://github.com/Dolibarr/dolibarr/commit/cd90dcb1e1eefe6f0faf9ab4067945610dc58afd
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M htdocs/user/agenda_extsites.php
    M htdocs/user/bank.php
    M htdocs/user/card.php
    M htdocs/user/clicktodial.php
    M htdocs/user/document.php
    M htdocs/user/info.php
    M htdocs/user/ldap.php
    M htdocs/user/note.php
    M htdocs/user/param_ihm.php
    M htdocs/user/perms.php

  Log Message:
  -----------
  Merge pull request #6667 from marcosgdf/bug-6623

FIX #6623 User card shows "Return to list" link even if the user has no rights 
to list users


  Commit: 50dbe39cda3e4a6c47e80326c0614d297e51d4b0
      
https://github.com/Dolibarr/dolibarr/commit/50dbe39cda3e4a6c47e80326c0614d297e51d4b0
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M htdocs/supplier_proposal/card.php

  Log Message:
  -----------
  Merge pull request #6668 from marcosgdf/bug-6613

FIX #6613 Default subject for Supplier proposal emails is filled with a 
non-existing key


  Commit: eb4236011b81aaddc629f585a182099c48f47205
      
https://github.com/Dolibarr/dolibarr/commit/eb4236011b81aaddc629f585a182099c48f47205
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Merge pull request #6670 from marcosgdf/bug-6669

FIX #6669 User with no permission to edit customer invoices can see a edit 
button in project entry


  Commit: fc735eaa4fd3d740fb6081777947887ffeefdd37
      
https://github.com/Dolibarr/dolibarr/commit/fc735eaa4fd3d740fb6081777947887ffeefdd37
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Merge pull request #6672 from marcosgdf/bug-6671

FIX #6671 Cannot remove thirdparty type with "#" in its name


  Commit: 5ae1b5457b8531c2ef490b8fe412f4dd3a77960a
      
https://github.com/Dolibarr/dolibarr/commit/5ae1b5457b8531c2ef490b8fe412f4dd3a77960a
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M htdocs/societe/list.php

  Log Message:
  -----------
  Merge pull request #6674 from marcosgdf/bug-6673

FIX #6673 Missing "nature" table header in thirdparty list


  Commit: a7ccb175e566218e523bc2e9d73acab138400256
      
https://github.com/Dolibarr/dolibarr/commit/a7ccb175e566218e523bc2e9d73acab138400256
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M htdocs/contact/list.php

  Log Message:
  -----------
  Merge pull request #6676 from marcosgdf/bug-6675

FIX #6675 Restricted user with no agenda permissions can see a button to create 
appointment in thirdparty contact list


  Commit: 4d721652882394d51380344c72042cad86397883
      
https://github.com/Dolibarr/dolibarr/commit/4d721652882394d51380344c72042cad86397883
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  Merge pull request #6681 from marcosgdf/bug-6680

FIX #6680 User with restricted supplier invoice permissions sees "reopen" 
button even if he has no permission to do it


  Commit: 17da4f64a7fb81404b3e2ece29e489aa2e2379aa
      
https://github.com/Dolibarr/dolibarr/commit/17da4f64a7fb81404b3e2ece29e489aa2e2379aa
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  Merge pull request #6683 from marcosgdf/bug-6679

FIX #6679 User with restricted supplier invoice permissions can edit project, 
payment conditions, payment mode


  Commit: 2446cb5431d00298745005096bcf9fe3ff3c2ffb
      
https://github.com/Dolibarr/dolibarr/commit/2446cb5431d00298745005096bcf9fe3ff3c2ffb
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M htdocs/admin/dict.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/contact/list.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/fourn/facture/card.php
    M htdocs/societe/list.php
    M htdocs/supplier_proposal/card.php
    M htdocs/user/agenda_extsites.php
    M htdocs/user/bank.php
    M htdocs/user/card.php
    M htdocs/user/clicktodial.php
    M htdocs/user/document.php
    M htdocs/user/info.php
    M htdocs/user/ldap.php
    M htdocs/user/note.php
    M htdocs/user/param_ihm.php
    M htdocs/user/perms.php

  Log Message:
  -----------
  Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0

Conflicts:
        htdocs/compta/facture.php
        htdocs/compta/facture/fiche-rec.php
        htdocs/contact/list.php
        htdocs/fourn/class/fournisseur.commande.class.php
        htdocs/fourn/facture/card.php
        htdocs/societe/list.php
        htdocs/user/document.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2af3f010bf86...2446cb5431d0
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] a6ec22: FIX: dont lose supplier ref if no supplier price i..., Laurent Destailleur, 2017/04/11
- [Dolibarr-git] [Dolibarr/dolibarr] a6ec22: FIX: dont lose supplier ref if no supplier price i..., Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 2af3f0: expedition->dir_output is used by livraison
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] 423ffe: NEW Add hidden option THIRDPARTY_INCLUDE_PARENT_IN...
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] a6ec22: FIX: dont lose supplier ref if no supplier price i...
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] d3719a: Update code using new css class
Index(es):
- Date
- Thread