[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 0e4a20: Fix normalize color settings
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 0e4a20: Fix normalize color settings |
|
Date: |
Fri, 12 May 2017 07:55:43 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 0e4a209dd8d0f2250ce3cebbff47c4470c5c8f8a
https://github.com/Dolibarr/dolibarr/commit/0e4a209dd8d0f2250ce3cebbff47c4470c5c8f8a
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-11 (Thu, 11 May 2017)
Changed paths:
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Fix normalize color settings
Commit: eb4cfc11cb93cf7dd61fffd8ac5514b071fce450
https://github.com/Dolibarr/dolibarr/commit/eb4cfc11cb93cf7dd61fffd8ac5514b071fce450
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-11 (Thu, 11 May 2017)
Changed paths:
M htdocs/compta/bank/class/account.class.php
Log Message:
-----------
Fix syntax error
Commit: 74af1223de2ee82d35d9913635cec63e0579f839
https://github.com/Dolibarr/dolibarr/commit/74af1223de2ee82d35d9913635cec63e0579f839
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-12 (Fri, 12 May 2017)
Changed paths:
M htdocs/langs/en_US/companies.lang
Log Message:
-----------
Fix company id for US
Commit: 80b0d911547375346ba2a29b560644d21dfd7548
https://github.com/Dolibarr/dolibarr/commit/80b0d911547375346ba2a29b560644d21dfd7548
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-12 (Fri, 12 May 2017)
Changed paths:
A
dev/initdemo/documents_demo/societe/contact/11/photos/ldestailleur_200x200.png
A
dev/initdemo/documents_demo/societe/contact/11/photos/thumbs/ldestailleur_200x200_mini.png
A
dev/initdemo/documents_demo/societe/contact/11/photos/thumbs/ldestailleur_200x200_small.png
A dev/initdemo/documents_demo/societe/contact/12/photos/Einstein.jpg
A
dev/initdemo/documents_demo/societe/contact/12/photos/thumbs/Einstein_mini.jpg
A
dev/initdemo/documents_demo/societe/contact/12/photos/thumbs/Einstein_small.jpg
M dev/initdemo/mysqldump_dolibarr_5.0.0.sql
Log Message:
-----------
More complete demo
Commit: 245ef7a188dc2fbfa3fe1834d9fc210bdf4fd996
https://github.com/Dolibarr/dolibarr/commit/245ef7a188dc2fbfa3fe1834d9fc210bdf4fd996
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-12 (Fri, 12 May 2017)
Changed paths:
A doc/images/dolibarr_screenshot11_1280x800.png
Log Message:
-----------
Add screenshot
Commit: 5581e5da7289803ce19aab3fde0a5368a407634c
https://github.com/Dolibarr/dolibarr/commit/5581e5da7289803ce19aab3fde0a5368a407634c
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-12 (Fri, 12 May 2017)
Changed paths:
M htdocs/comm/propal/card.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/tables/llx_product_customer_price.sql
M htdocs/install/mysql/tables/llx_product_customer_price_log.sql
M htdocs/product/class/productcustomerprice.class.php
M htdocs/product/price.php
Log Message:
-----------
FIX New vat code not correctly implemented if "1 price per customer".
Commit: 419c15ee8efd6b7554ff084c3e4f5acb3c62f324
https://github.com/Dolibarr/dolibarr/commit/419c15ee8efd6b7554ff084c3e4f5acb3c62f324
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-12 (Fri, 12 May 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/salaries/class/paymentsalary.class.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix escaping class
Commit: b81de3570309989fabbfac6ee1208ea960678b89
https://github.com/Dolibarr/dolibarr/commit/b81de3570309989fabbfac6ee1208ea960678b89
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-12 (Fri, 12 May 2017)
Changed paths:
M htdocs/adherents/class/adherent.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/salaries/class/paymentsalary.class.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/contrat/class/contrat.class.php
Commit: 88e7d54915feac7e61256c9a7f00731393ab8928
https://github.com/Dolibarr/dolibarr/commit/88e7d54915feac7e61256c9a7f00731393ab8928
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-12 (Fri, 12 May 2017)
Changed paths:
A test/phpunit/CodingPHPTest.php
Log Message:
-----------
Add phpunit to detect SQL not escaped string.
Commit: 0d11fce834538c6407d3a92230ae6173ecb0d56e
https://github.com/Dolibarr/dolibarr/commit/0d11fce834538c6407d3a92230ae6173ecb0d56e
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-12 (Fri, 12 May 2017)
Changed paths:
A
dev/initdemo/documents_demo/societe/contact/11/photos/ldestailleur_200x200.png
A
dev/initdemo/documents_demo/societe/contact/11/photos/thumbs/ldestailleur_200x200_mini.png
A
dev/initdemo/documents_demo/societe/contact/11/photos/thumbs/ldestailleur_200x200_small.png
A dev/initdemo/documents_demo/societe/contact/12/photos/Einstein.jpg
A
dev/initdemo/documents_demo/societe/contact/12/photos/thumbs/Einstein_mini.jpg
A
dev/initdemo/documents_demo/societe/contact/12/photos/thumbs/Einstein_small.jpg
M dev/initdemo/mysqldump_dolibarr_5.0.0.sql
M htdocs/adherents/class/adherent.class.php
M htdocs/comm/propal/card.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/salaries/class/paymentsalary.class.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
M htdocs/install/mysql/tables/llx_product_customer_price.sql
M htdocs/install/mysql/tables/llx_product_customer_price_log.sql
M htdocs/langs/en_US/companies.lang
M htdocs/product/class/productcustomerprice.class.php
M htdocs/product/price.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: fa290c34fad108ec7c0751c0372ae9c4b4f63b06
https://github.com/Dolibarr/dolibarr/commit/fa290c34fad108ec7c0751c0372ae9c4b4f63b06
Author: Laurent Destailleur <address@hidden>
Date: 2017-05-12 (Fri, 12 May 2017)
Changed paths:
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/bookmarks/class/bookmark.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/class/paymentvarious.class.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/events.class.php
M htdocs/core/class/fiscalyear.class.php
M htdocs/core/class/link.class.php
M htdocs/core/class/menubase.class.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modDon.class.php
M htdocs/core/modules/modExpedition.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modFicheinter.class.php
M htdocs/core/modules/modFournisseur.class.php
M htdocs/core/modules/modPrelevement.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/modPropale.class.php
M htdocs/core/modules/modSupplierProposal.class.php
M htdocs/don/class/don.class.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/class/ecmfiles.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expensereport/class/expensereport.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/holiday/class/holiday.class.php
M htdocs/hrm/class/establishment.class.php
M htdocs/livraison/class/livraison.class.php
M htdocs/loan/class/loan.class.php
M htdocs/product/canvas/product/actions_card_product.class.php
M htdocs/product/canvas/service/actions_card_service.class.php
M htdocs/product/class/product.class.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/projectstats.class.php
M htdocs/societe/class/companybankaccount.class.php
M htdocs/societe/class/societe.class.php
M htdocs/supplier_proposal/class/supplier_proposal.class.php
M htdocs/user/class/userbankaccount.class.php
M test/phpunit/AllTests.php
R test/phpunit/CodingPHPTest.php
A test/phpunit/CodingPhpTest.php
A test/phpunit/CodingSqlTest.php
R test/phpunit/SqlTest.php
Log Message:
-----------
Fix against SQL injection. Add phpunit to detect missing escapement.
Compare:
https://github.com/Dolibarr/dolibarr/compare/bccfa3dbedd8...fa290c34fad1