[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] dc930d: FIX: Bad name alias showing i
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] dc930d: FIX: Bad name alias showing in name of third colum... |
|
Date: |
Tue, 16 Jan 2018 11:23:51 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: dc930dd6c54e43dcc290a0341d15c1ebc35df8f4
https://github.com/Dolibarr/dolibarr/commit/dc930dd6c54e43dcc290a0341d15c1ebc35df8f4
Author: Juanjo Menent <address@hidden>
Date: 2017-12-20 (Wed, 20 Dec 2017)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
FIX: Bad name alias showing in name of third column
Commit: b650ba21c486932a4708b10dd0089c063371865a
https://github.com/Dolibarr/dolibarr/commit/b650ba21c486932a4708b10dd0089c063371865a
Author: Juanjo Menent <address@hidden>
Date: 2017-12-26 (Tue, 26 Dec 2017)
Changed paths:
M htdocs/accountancy/tpl/export_journal.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
M htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
M htdocs/adherents/subscription/info.php
M htdocs/adherents/tpl/linkedobjectblock.tpl.php
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/cashdesk/tpl/liste_articles.tpl.php
M htdocs/cashdesk/tpl/menu.tpl.php
M htdocs/cashdesk/tpl/ticket.tpl.php
M htdocs/cashdesk/tpl/validation1.tpl.php
M htdocs/cashdesk/tpl/validation2.tpl.php
M htdocs/comm/multiprix.php
M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
M htdocs/commande/tpl/linkedobjectblock.tpl.php
M htdocs/compta/facture/card.php
M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
M htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
M htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
M htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
M htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
M htdocs/contrat/tpl/linkedobjectblock.tpl.php
M htdocs/core/actions_builddoc.inc.php
M htdocs/core/tpl/admin_extrafields_add.tpl.php
M htdocs/core/tpl/admin_extrafields_edit.tpl.php
M htdocs/core/tpl/admin_extrafields_view.tpl.php
M htdocs/core/tpl/ajax/fileupload_main.tpl.php
M htdocs/core/tpl/ajax/fileupload_view.tpl.php
M htdocs/core/tpl/ajaxrow.tpl.php
M htdocs/core/tpl/bloc_showhide.tpl.php
M htdocs/core/tpl/contacts.tpl.php
M htdocs/core/tpl/document_actions_post_headers.tpl.php
M htdocs/core/tpl/extrafields_view.tpl.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/notes.tpl.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/core/tpl/originproductline.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/core/tpl/resource_add.tpl.php
M htdocs/core/tpl/resource_view.tpl.php
M htdocs/ecm/tpl/enablefiletreeajax.tpl.php
M htdocs/expedition/tpl/linkedobjectblock.tpl.php
M htdocs/expensereport/tpl/linkedobjectblock.tpl.php
M htdocs/fichinter/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
M htdocs/fourn/index.php
M htdocs/main.inc.php
M htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php
M htdocs/product/canvas/product/tpl/card_create.tpl.php
M htdocs/product/canvas/product/tpl/card_edit.tpl.php
M htdocs/product/canvas/product/tpl/card_view.tpl.php
M htdocs/product/canvas/product/tpl/list.tpl.php
M htdocs/product/canvas/service/tpl/card_create.tpl.php
M htdocs/product/canvas/service/tpl/card_edit.tpl.php
M htdocs/product/canvas/service/tpl/card_view.tpl.php
M htdocs/product/canvas/service/tpl/list.tpl.php
M htdocs/product/inventory/tpl/inventory.tpl.php
M htdocs/product/stock/tpl/stockcorrection.tpl.php
M htdocs/product/stock/tpl/stocktransfer.tpl.php
M htdocs/societe/canvas/company/tpl/card_create.tpl.php
M htdocs/societe/canvas/company/tpl/card_edit.tpl.php
M htdocs/societe/canvas/company/tpl/card_view.tpl.php
M htdocs/societe/canvas/individual/tpl/card_create.tpl.php
M htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
M htdocs/societe/tpl/linesalesrepresentative.tpl.php
M htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/6.0' into 6.0
Commit: 9471495dca26e363f2f808b4183a7fd201c8149c
https://github.com/Dolibarr/dolibarr/commit/9471495dca26e363f2f808b4183a7fd201c8149c
Author: Juanjo Menent <address@hidden>
Date: 2018-01-04 (Thu, 04 Jan 2018)
Changed paths:
M htdocs/comm/propal/document.php
M htdocs/comm/propal/info.php
M htdocs/comm/propal/note.php
M htdocs/commande/document.php
M htdocs/commande/info.php
M htdocs/commande/note.php
M htdocs/compta/facture/contact.php
M htdocs/compta/facture/document.php
M htdocs/compta/facture/info.php
M htdocs/compta/facture/note.php
M htdocs/compta/facture/prelevement.php
M htdocs/compta/paiement.php
M htdocs/contact/list.php
M htdocs/contrat/card.php
M htdocs/contrat/contact.php
M htdocs/contrat/document.php
M htdocs/contrat/info.php
M htdocs/contrat/note.php
M htdocs/core/lib/ajax.lib.php
M htdocs/fichinter/document.php
M htdocs/fichinter/info.php
M htdocs/fichinter/note.php
M htdocs/fourn/commande/contact.php
M htdocs/fourn/commande/document.php
M htdocs/fourn/commande/info.php
M htdocs/fourn/commande/note.php
M htdocs/fourn/facture/contact.php
M htdocs/fourn/facture/document.php
M htdocs/fourn/facture/info.php
M htdocs/fourn/facture/note.php
M htdocs/langs/fr_FR/other.lang
M htdocs/loan/document.php
M htdocs/loan/info.php
M htdocs/loan/note.php
M htdocs/product/admin/product.php
M htdocs/supplier_proposal/document.php
M htdocs/supplier_proposal/info.php
M htdocs/supplier_proposal/note.php
Log Message:
-----------
Merge remote-tracking branch 'upstream/6.0' into 6.0
Commit: 762ab74940603d5491bea80320704dac62bee271
https://github.com/Dolibarr/dolibarr/commit/762ab74940603d5491bea80320704dac62bee271
Author: Juanjo Menent <address@hidden>
Date: 2018-01-04 (Thu, 04 Jan 2018)
Changed paths:
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/cashdesk/index.php
M htdocs/cashdesk/tpl/menu.tpl.php
Log Message:
-----------
FIX: Cashdesk should not sell to inactive third parties
Commit: 3b9aee7d4c09a2c762f979b619cfcbd8977dce20
https://github.com/Dolibarr/dolibarr/commit/3b9aee7d4c09a2c762f979b619cfcbd8977dce20
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-15 (Mon, 15 Jan 2018)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Update list.php
Commit: b154357683bdf18ef3f22183f7bb86c7ccb665d5
https://github.com/Dolibarr/dolibarr/commit/b154357683bdf18ef3f22183f7bb86c7ccb665d5
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-15 (Mon, 15 Jan 2018)
Changed paths:
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/cashdesk/index.php
M htdocs/cashdesk/tpl/menu.tpl.php
M htdocs/societe/list.php
Log Message:
-----------
Merge pull request #7982 from simnandez/6.0
FIX: Bad name alias showing in name of third column
Commit: 4c8af0ff500188123da328b65180a2ca697019d3
https://github.com/Dolibarr/dolibarr/commit/4c8af0ff500188123da328b65180a2ca697019d3
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-15 (Mon, 15 Jan 2018)
Changed paths:
M htdocs/societe/list.php
Log Message:
-----------
Fix name alias on list
Commit: 6feacab4f59d4e464a97e1aacc1289b9ed36678e
https://github.com/Dolibarr/dolibarr/commit/6feacab4f59d4e464a97e1aacc1289b9ed36678e
Author: atm-quentin <address@hidden>
Date: 2018-01-15 (Mon, 15 Jan 2018)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
FIX missing hook invoice index
Commit: f307fecaf6b231aa749b9cf268aa1fa2a2a012fb
https://github.com/Dolibarr/dolibarr/commit/f307fecaf6b231aa749b9cf268aa1fa2a2a012fb
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-16 (Tue, 16 Jan 2018)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Merge pull request #8064 from atm-quentin/6.0
FIX missing hook invoice index
Commit: 94b1d59f2b41998c37635e573c0c3fd24242c98c
https://github.com/Dolibarr/dolibarr/commit/94b1d59f2b41998c37635e573c0c3fd24242c98c
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-16 (Tue, 16 Jan 2018)
Changed paths:
M htdocs/core/lib/security.lib.php
Log Message:
-----------
Fix missing check on object entity
Commit: 5d4eda68e05dc48df2a7ca97d3bd0da64b144d36
https://github.com/Dolibarr/dolibarr/commit/5d4eda68e05dc48df2a7ca97d3bd0da64b144d36
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-16 (Tue, 16 Jan 2018)
Changed paths:
M htdocs/compta/index.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 6.0
Commit: 26ba0a9ec2e92149368ec8fe2cf0d20b2a7b7f52
https://github.com/Dolibarr/dolibarr/commit/26ba0a9ec2e92149368ec8fe2cf0d20b2a7b7f52
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-16 (Tue, 16 Jan 2018)
Changed paths:
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/cashdesk/index.php
M htdocs/cashdesk/tpl/menu.tpl.php
M htdocs/compta/index.php
M htdocs/core/lib/security.lib.php
M htdocs/societe/list.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/cashdesk/index.php
htdocs/compta/index.php
htdocs/core/lib/security.lib.php
htdocs/societe/list.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/59eefa46e639...26ba0a9ec2e9