[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 99fb9b: Merge remote-tracking branch
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 99fb9b: Merge remote-tracking branch 'refs/remotes/Dolibar... |
|
Date: |
Fri, 10 Feb 2017 08:34:42 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 99fb9b7e0e9f18134a4db56ac0121c1a9de515e2
https://github.com/Dolibarr/dolibarr/commit/99fb9b7e0e9f18134a4db56ac0121c1a9de515e2
Author: fappels <address@hidden>
Date: 2017-01-25 (Wed, 25 Jan 2017)
Changed paths:
M htdocs/cashdesk/tpl/facturation1.tpl.php
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0
Commit: 76bd5e009adab4167031ae7b982d225e07b6103d
https://github.com/Dolibarr/dolibarr/commit/76bd5e009adab4167031ae7b982d225e07b6103d
Author: fappels <address@hidden>
Date: 2017-02-03 (Fri, 03 Feb 2017)
Changed paths:
M ChangeLog
M dev/initdemo/initdemo.sh
M htdocs/accountancy/journal/expensereportsjournal.php
M htdocs/bookmarks/card.php
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/mailing/list.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/bankentries.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/fiche-rec.php
M htdocs/compta/prelevement/demandes.php
M htdocs/contact/agenda.php
M htdocs/contact/card.php
M htdocs/contact/list.php
M htdocs/contrat/class/contrat.class.php
M htdocs/contrat/list.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/discount.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/lib/pdf.lib.php
M htdocs/core/lib/security.lib.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/mailings/advthirdparties.modules.php
M htdocs/core/modules/mailings/contacts1.modules.php
M htdocs/core/modules/mailings/contacts2.modules.php
M htdocs/core/modules/mailings/contacts3.modules.php
M htdocs/core/modules/mailings/contacts4.modules.php
M htdocs/core/modules/mailings/example.modules.php
M htdocs/core/modules/mailings/fraise.modules.php
M htdocs/core/modules/mailings/framboise.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/modExpenseReport.class.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/product/mod_codeproduct_elephant.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/expensereport/card.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/expensereport/class/paymentexpensereport.class.php
M htdocs/expensereport/list.php
M htdocs/exports/export.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/commande/info.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
M htdocs/index.php
M htdocs/install/mysql/tables/llx_expensereport.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/en_US/products.lang
M htdocs/langs/en_US/projects.lang
M htdocs/main.inc.php
M htdocs/margin/agentMargins.php
M htdocs/margin/checkMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/lib/margins.lib.php
M htdocs/margin/productMargins.php
M htdocs/product/card.php
M htdocs/product/fournisseurs.php
M htdocs/product/stock/massstockmove.php
M htdocs/product/stock/replenishorders.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/card.php
M htdocs/projet/class/project.class.php
M htdocs/projet/element.php
M htdocs/projet/info.php
M htdocs/public/demo/index.php
M htdocs/resource/class/dolresource.class.php
M htdocs/resource/list.php
M htdocs/societe/agenda.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/list.php
M htdocs/societe/soc.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
M htdocs/user/card.php
M htdocs/user/class/user.class.php
M htdocs/user/document.php
M htdocs/user/group/index.php
M htdocs/user/index.php
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0
Commit: ea7a2b1e2af1184ed0c6f303bf6f7084d5e7e927
https://github.com/Dolibarr/dolibarr/commit/ea7a2b1e2af1184ed0c6f303bf6f7084d5e7e927
Author: Alexandre SPANGARO <address@hidden>
Date: 2017-02-07 (Tue, 07 Feb 2017)
Changed paths:
M htdocs/accountancy/admin/journal.php
Log Message:
-----------
Fix : Bank account ref not show in accountancy journal. Complete informations
for tooltip
Commit: d5978a5092b36b3669fd019174d89da533ec52c2
https://github.com/Dolibarr/dolibarr/commit/d5978a5092b36b3669fd019174d89da533ec52c2
Author: fmarcet <address@hidden>
Date: 2017-02-07 (Tue, 07 Feb 2017)
Changed paths:
M htdocs/comm/remx.php
Log Message:
-----------
Fix: Wrong vat calculation when split discounts
Commit: 882423f93508f67d1cb05994029b3fc0b9236b6f
https://github.com/Dolibarr/dolibarr/commit/882423f93508f67d1cb05994029b3fc0b9236b6f
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-08 (Wed, 08 Feb 2017)
Changed paths:
M htdocs/comm/remx.php
Log Message:
-----------
Merge pull request #6390 from fmarcet/3.9
Fix: Wrong vat calculation when split discounts
Commit: 104c8ae2435d66298593ce8ceed4533ecee62af4
https://github.com/Dolibarr/dolibarr/commit/104c8ae2435d66298593ce8ceed4533ecee62af4
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-08 (Wed, 08 Feb 2017)
Changed paths:
M htdocs/accountancy/admin/journal.php
Log Message:
-----------
Merge pull request #6387 from aspangaro/5.0
Fix : Bank account ref not show in page accountancy admin journal. Complete
informations for tooltip
Commit: a84c6f9b454e43c8261cfa42ffbc7907834f45db
https://github.com/Dolibarr/dolibarr/commit/a84c6f9b454e43c8261cfa42ffbc7907834f45db
Author: fappels <address@hidden>
Date: 2017-02-08 (Wed, 08 Feb 2017)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/product/fournisseurs.php
Log Message:
-----------
Qual reputation for price supplier
Move available reputation constants from view-controller to class
Commit: b1fe8e3f2bb1718315145273bed80b0dc60329b3
https://github.com/Dolibarr/dolibarr/commit/b1fe8e3f2bb1718315145273bed80b0dc60329b3
Author: fappels <address@hidden>
Date: 2017-02-08 (Wed, 08 Feb 2017)
Changed paths:
M htdocs/product/fournisseurs.php
Log Message:
-----------
fix merge
Commit: e0850b29cd4356ea3d09edf374c1d046aa6f329a
https://github.com/Dolibarr/dolibarr/commit/e0850b29cd4356ea3d09edf374c1d046aa6f329a
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-08 (Wed, 08 Feb 2017)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/product/fournisseurs.php
Log Message:
-----------
Merge pull request #6399 from fappels/5.0
Qual reputation for price supplier
Commit: ab0783edcc90b6316ed40f315e5233a5293ddf16
https://github.com/Dolibarr/dolibarr/commit/ab0783edcc90b6316ed40f315e5233a5293ddf16
Author: florian HENRY <address@hidden>
Date: 2017-02-08 (Wed, 08 Feb 2017)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
FIX #6234
Commit: 6db0e909d6187c40fe958b7dacd45726878c2874
https://github.com/Dolibarr/dolibarr/commit/6db0e909d6187c40fe958b7dacd45726878c2874
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-08 (Wed, 08 Feb 2017)
Changed paths:
M htdocs/adherents/type.php
Log Message:
-----------
Fix pagination
Commit: e74927a54c6ac4242dd1b9a783fb9a4352fd7e94
https://github.com/Dolibarr/dolibarr/commit/e74927a54c6ac4242dd1b9a783fb9a4352fd7e94
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-08 (Wed, 08 Feb 2017)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge pull request #6400 from atm-florian/4.0
FIX #6234
Commit: 366df59658b9f279a03d64589b2b16d4253f0a77
https://github.com/Dolibarr/dolibarr/commit/366df59658b9f279a03d64589b2b16d4253f0a77
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-08 (Wed, 08 Feb 2017)
Changed paths:
M htdocs/accountancy/admin/journal.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/product/fournisseurs.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: 04d73668cc80fa8636e101345dbdcf00a73c8ab0
https://github.com/Dolibarr/dolibarr/commit/04d73668cc80fa8636e101345dbdcf00a73c8ab0
Author: De Coninck Laurent <address@hidden>
Date: 2017-02-08 (Wed, 08 Feb 2017)
Changed paths:
M htdocs/expensereport/list.php
Log Message:
-----------
fix correct url for expense report note in expense report list
Commit: ad308e33ccbcd313499ca5c71a976848c9b11126
https://github.com/Dolibarr/dolibarr/commit/ad308e33ccbcd313499ca5c71a976848c9b11126
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-09 (Thu, 09 Feb 2017)
Changed paths:
M htdocs/product/list.php
Log Message:
-----------
Fix scrutinizer warning
Commit: 66542b63675e7f608a23306b911fafd89d5fc0d9
https://github.com/Dolibarr/dolibarr/commit/66542b63675e7f608a23306b911fafd89d5fc0d9
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-10 (Fri, 10 Feb 2017)
Changed paths:
M htdocs/compta/facture.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/withdrawals.lang
Log Message:
-----------
Fix translation and link to direct debit payment
Commit: d461c0dfa4581cbecdd1664f030a0bf0c360a676
https://github.com/Dolibarr/dolibarr/commit/d461c0dfa4581cbecdd1664f030a0bf0c360a676
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-10 (Fri, 10 Feb 2017)
Changed paths:
M htdocs/compta/prelevement/create.php
Log Message:
-----------
Fix left align
Commit: d463511cffc222dc86f2246bd3e7945c65322923
https://github.com/Dolibarr/dolibarr/commit/d463511cffc222dc86f2246bd3e7945c65322923
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-10 (Fri, 10 Feb 2017)
Changed paths:
M htdocs/core/modules/modFacture.class.php
Log Message:
-----------
Fix: no way to know type of invoice.
Commit: a4d9f7dbbe1606a7d4d797a2149e54ae38718051
https://github.com/Dolibarr/dolibarr/commit/a4d9f7dbbe1606a7d4d797a2149e54ae38718051
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-10 (Fri, 10 Feb 2017)
Changed paths:
M htdocs/compta/facture/list.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: a4f2325902a40e1b6116a4e6db955538ea9ed768
https://github.com/Dolibarr/dolibarr/commit/a4f2325902a40e1b6116a4e6db955538ea9ed768
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-10 (Fri, 10 Feb 2017)
Changed paths:
M htdocs/comm/remx.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: ca67917e80a66ee200e8fec2d6d5a20867f5b5df
https://github.com/Dolibarr/dolibarr/commit/ca67917e80a66ee200e8fec2d6d5a20867f5b5df
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-10 (Fri, 10 Feb 2017)
Changed paths:
M htdocs/comm/remx.php
M htdocs/compta/facture/list.php
M htdocs/core/modules/modFacture.class.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/modules/modFacture.class.php
Commit: d72e5a36467cf5ed89b513fcba98f04820c4412c
https://github.com/Dolibarr/dolibarr/commit/d72e5a36467cf5ed89b513fcba98f04820c4412c
Author: Laurent Destailleur <address@hidden>
Date: 2017-02-10 (Fri, 10 Feb 2017)
Changed paths:
M htdocs/accountancy/admin/journal.php
M htdocs/adherents/type.php
M htdocs/comm/remx.php
M htdocs/compta/facture.php
M htdocs/compta/facture/list.php
M htdocs/compta/prelevement/create.php
M htdocs/core/modules/modFacture.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/withdrawals.lang
M htdocs/product/fournisseurs.php
M htdocs/product/list.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/97eebe164cc8...d72e5a36467c