[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] fc2bd4: Fix: [ bug #1380 ] Customer i
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] fc2bd4: Fix: [ bug #1380 ] Customer invoices are not group... |
|
Date: |
Wed, 06 Aug 2014 01:29:17 -0700 |
Branch: refs/heads/3.6
Home: https://github.com/Dolibarr/dolibarr
Commit: fc2bd4ab4e1e8f7af0cced341374c5c8c1b000e8
https://github.com/Dolibarr/dolibarr/commit/fc2bd4ab4e1e8f7af0cced341374c5c8c1b000e8
Author: Laurent Destailleur <address@hidden>
Date: 2014-06-02 (Mon, 02 Jun 2014)
Changed paths:
M ChangeLog
M htdocs/compta/resultat/clientfourn.php
Log Message:
-----------
Fix: [ bug #1380 ] Customer invoices are not grouped in company results
report
(cherry picked from commit bd061f4)
Commit: 1dc3412bbd4c4f30d734d2b831c566e6d2ac1070
https://github.com/Dolibarr/dolibarr/commit/1dc3412bbd4c4f30d734d2b831c566e6d2ac1070
Author: Laurent Destailleur <address@hidden>
Date: 2014-06-03 (Tue, 03 Jun 2014)
Changed paths:
M ChangeLog
M htdocs/compta/resultat/clientfourn.php
Log Message:
-----------
Merge pull request #1636 from marcosgdf/cp-1380
Fix: [ bug #1380 ] Customer invoices are not grouped in company results report
(cherry picked from commit bd061f4)
Commit: 0e2de546609286237b7c4f50c0da01407fef5bda
https://github.com/Dolibarr/dolibarr/commit/0e2de546609286237b7c4f50c0da01407fef5bda
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Fix: Clean data init
Commit: 069cf61d728cb628e48f646dd071539146fe1281
https://github.com/Dolibarr/dolibarr/commit/069cf61d728cb628e48f646dd071539146fe1281
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M ChangeLog
M htdocs/compta/resultat/clientfourn.php
Log Message:
-----------
Merge branch '3.4' of address@hidden:Dolibarr/dolibarr.git into 3.4
Commit: 86c6709d02efda868e794107153287fcfc25c7bc
https://github.com/Dolibarr/dolibarr/commit/86c6709d02efda868e794107153287fcfc25c7bc
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M ChangeLog
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Commit: bb201010e5538758a1dfc6b3b26167ef3ead3f8d
https://github.com/Dolibarr/dolibarr/commit/bb201010e5538758a1dfc6b3b26167ef3ead3f8d
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Fix: Clean data init
Commit: 7f0baa3d6503431d87efc0b357726b8cf3779d6d
https://github.com/Dolibarr/dolibarr/commit/7f0baa3d6503431d87efc0b357726b8cf3779d6d
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Commit: 86f4b874ebaccec4010dca31a65dd3ff71ffe17a
https://github.com/Dolibarr/dolibarr/commit/86f4b874ebaccec4010dca31a65dd3ff71ffe17a
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.1.0.sql
M dev/initdata/mysqldump_dolibarr_3.2.0.sql
M dev/initdata/mysqldump_dolibarr_3.3.0.sql
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Fix: Clean data init
Commit: 8c25fdfd2c3ea9076ff7b74fc4e27639b4061407
https://github.com/Dolibarr/dolibarr/commit/8c25fdfd2c3ea9076ff7b74fc4e27639b4061407
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.1.0.sql
M dev/initdata/mysqldump_dolibarr_3.2.0.sql
M dev/initdata/mysqldump_dolibarr_3.3.0.sql
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Commit: 65b7f3d74429723532c86c2d9ac401eb3bce1d1b
https://github.com/Dolibarr/dolibarr/commit/65b7f3d74429723532c86c2d9ac401eb3bce1d1b
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
Log Message:
-----------
Fix: Clean data init
Commit: a430534768df2f75c870e4a4398f308bb5ac8058
https://github.com/Dolibarr/dolibarr/commit/a430534768df2f75c870e4a4398f308bb5ac8058
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
A .gitattributes
M .gitignore
M .travis.yml
A .tx/config
M COPYRIGHT
M ChangeLog
M README-FR
M README.md
M build.xml
M build/aps/Limitations of APS Support in the Panel_fichiers/highlight.js
M build/aps/Limitations of APS Support in the Panel_fichiers/prettify.js
M build/debian/README.howto
R build/debian/apache.conf
A build/debian/apache/.htaccess
A build/debian/apache/dolibarr.conf
M build/debian/changelog
M build/debian/control
M build/debian/dolibarr.install
M build/debian/dolibarr.lintian-overrides
M build/debian/dolibarr.postinst
M build/debian/dolibarr.postrm
M build/debian/install.forced.php.install
R build/debian/lighttpd.conf
R build/debian/lighttpd.conf
A build/debian/lighttpd/50-dolibarr.conf
A build/debian/lighttpd/50-dolibarr.conf
R build/debian/patches/00list
R build/debian/patches/install.dpatch
A build/debian/patches/series
A build/debian/patches/use-etc-dolibarr-conf.patch
M build/debian/po/fr.po
M build/debian/rules
M build/debian/source/format
M build/doxygen/dolibarr-doxygen-build.pl
M build/doxygen/dolibarr-doxygen.doxyfile
M build/doxygen/doxygen_header.html
R build/doxygen/jenkins_doxygen.doxyfile
M build/exe/doliwamp/UsedPort.cpp
M build/exe/doliwamp/doliwamp.iss
M build/exe/doliwamp/httpd.conf.install
M build/exe/doliwamp/php.ini.install
M build/makepack-dolibarr.pl
M build/makepack-dolibarrmodule.pl
M build/makepack-howto.txt
M build/obs/README
M build/pad/DoliWamp.pml
M build/pad/Dolibarr developpers.cml
M build/pad/Dolibarr.pml
M build/pad/NLTechno.cml
M build/pad/pad_dolibarr.xml
M build/pad/pad_doliwamp.xml
M build/perl/virtualmin/dolibarr.pl
M build/rpm/README
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
A build/sitemap/README
A build/sitemap/config-bing.xml
A build/sitemap/urllist-wiki.txt
M build/tgz/tar_exclude.txt
M build/zip/zip_exclude.txt
R dev/codesniffer/jenkins_ruleset.xml
M dev/codesniffer/ruleset.xml
M dev/dolibarr_changes.txt
R dev/findutf8bomincludes.sh
M dev/fixdosfiles.sh
A dev/fixnotabfiles.sh
M dev/initdata/generate-commande.php
M dev/initdata/generate-facture.php
M dev/initdata/generate-propale.php
M dev/initdata/generate-societe.php
A dev/initdata/mysqldump_dolibarr_3.5.0.sql
M dev/initdata/savedemo.sh
M dev/iso-normes/countries_iso-3166_en.txt
M dev/iso-normes/countries_iso-3166_fr.txt
M dev/iso-normes/currencies_iso-4217.txt
M dev/iso-normes/locales.txt
A dev/iso-normes/vat_number_names.txt
M dev/resize_window.sh
M dev/skeletons/modMyModule.class.php
M dev/skeletons/skeleton_page.php
M dev/skeletons/skeleton_script.php
M dev/translation/autotranslator.class.php
A dev/translation/txpull.sh
A dev/translation/txpush.sh
A doc/images/dolibarr_screenshot1_300x188.png
A doc/images/dolibarr_screenshot1_300x188.png
A doc/images/dolibarr_screenshot1_640x400.png
A doc/images/dolibarr_screenshot1_640x400.png
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/admin/adherent_extrafields.php
M htdocs/adherents/admin/adherent_type_extrafields.php
R htdocs/adherents/admin/mailman.php
R htdocs/adherents/admin/spip.php
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/cartes/carte.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/cotisation.class.php
M htdocs/adherents/cotisations.php
M htdocs/adherents/document.php
M htdocs/adherents/fiche.php
M htdocs/adherents/fiche_subscription.php
M htdocs/adherents/index.php
M htdocs/adherents/liste.php
M htdocs/adherents/note.php
M htdocs/adherents/stats/index.php
M htdocs/adherents/type.php
M htdocs/admin/accounting.php
M htdocs/admin/agenda.php
M htdocs/admin/agenda_extrafields.php
M htdocs/admin/agenda_extsites.php
M htdocs/admin/agenda_other.php
M htdocs/admin/agenda_xcal.php
M htdocs/admin/bank.php
M htdocs/admin/barcode.php
M htdocs/admin/boxes.php
M htdocs/admin/clicktodial.php
M htdocs/admin/commande.php
M htdocs/admin/company.php
M htdocs/admin/compta.php
M htdocs/admin/confexped.php
M htdocs/admin/const.php
M htdocs/admin/contract.php
M htdocs/admin/delais.php
M htdocs/admin/dict.php
M htdocs/admin/dons.php
M htdocs/admin/events.php
M htdocs/admin/expedition.php
M htdocs/admin/facture.php
M htdocs/admin/fckeditor.php
M htdocs/admin/fichinter.php
M htdocs/admin/geoipmaxmind.php
M htdocs/admin/ihm.php
M htdocs/admin/index.php
M htdocs/admin/ldap.php
M htdocs/admin/ldap_contacts.php
M htdocs/admin/ldap_groups.php
M htdocs/admin/ldap_members.php
M htdocs/admin/ldap_users.php
M htdocs/admin/livraison.php
M htdocs/admin/mailing.php
A htdocs/admin/mailman.php
M htdocs/admin/mails.php
M htdocs/admin/menus/index.php
M htdocs/admin/modules.php
M htdocs/admin/notification.php
M htdocs/admin/order_extrafields.php
A htdocs/admin/orderdet_extrafields.php
M htdocs/admin/osc-languages.php
M htdocs/admin/prelevement.php
M htdocs/admin/propal.php
M htdocs/admin/proxy.php
M htdocs/admin/security.php
M htdocs/admin/security_other.php
M htdocs/admin/sms.php
A htdocs/admin/spip.php
M htdocs/admin/stock.php
M htdocs/admin/supplier_invoice.php
M htdocs/admin/supplier_order.php
M htdocs/admin/supplierinvoice_extrafields.php
M htdocs/admin/supplierorder_extrafields.php
M htdocs/admin/syslog.php
M htdocs/admin/system/about.php
M htdocs/admin/system/constall.php
M htdocs/admin/system/database-tables.php
M htdocs/admin/system/database.php
M htdocs/admin/system/dbtable.php
M htdocs/admin/system/dolibarr.php
M htdocs/admin/system/modules.php
A htdocs/admin/system/perf.php
M htdocs/admin/system/xdebug.php
M htdocs/admin/taxes.php
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/export.php
M htdocs/admin/tools/index.php
M htdocs/admin/tools/listevents.php
M htdocs/admin/tools/listsessions.php
M htdocs/admin/tools/update.php
M htdocs/admin/triggers.php
M htdocs/admin/user.php
M htdocs/admin/workflow.php
M htdocs/bookmarks/liste.php
M htdocs/boutique/client/fiche.php
M htdocs/boutique/client/index.php
M htdocs/boutique/commande/ca.php
M htdocs/boutique/commande/class/boutiquecommande.class.php
M htdocs/boutique/commande/fiche.php
M htdocs/boutique/commande/index.php
M htdocs/boutique/critiques/bestproduct.php
M htdocs/boutique/critiques/index.php
M htdocs/boutique/index.php
M htdocs/boutique/notification/index.php
M htdocs/boutique/notification/produits.php
M htdocs/boutique/produits/index.php
M htdocs/boutique/produits/osc-liste.php
M htdocs/boutique/promotion/index.php
A htdocs/cache.manifest
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/cashdesk/css/style.css
M htdocs/cashdesk/index.php
M htdocs/cashdesk/index_verif.php
M htdocs/cashdesk/tpl/liste_articles.tpl.php
M htdocs/cashdesk/tpl/ticket.tpl.php
M htdocs/cashdesk/tpl/validation1.tpl.php
M htdocs/cashdesk/validation_verif.php
A htdocs/categories/admin/categorie.php
M htdocs/categories/categorie.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/fiche.php
M htdocs/categories/index.php
M htdocs/categories/photos.php
M htdocs/categories/viewcat.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/action/class/ical.class.php
M htdocs/comm/action/contact.php
M htdocs/comm/action/document.php
M htdocs/comm/action/fiche.php
M htdocs/comm/action/index.php
M htdocs/comm/action/listactions.php
M htdocs/comm/address.php
M htdocs/comm/admin/propal_extrafields.php
A htdocs/comm/admin/propaldet_extrafields.php
M htdocs/comm/bookmark.php
M htdocs/comm/contact.php
M htdocs/comm/fiche.php
M htdocs/comm/index.php
M htdocs/comm/list.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/fiche.php
M htdocs/comm/mailing/index.php
M htdocs/comm/mailing/liste.php
M htdocs/comm/propal.php
M htdocs/comm/propal/apercu.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/class/propalestats.class.php
M htdocs/comm/propal/contact.php
M htdocs/comm/propal/document.php
M htdocs/comm/propal/index.php
M htdocs/comm/propal/list.php
M htdocs/comm/propal/note.php
M htdocs/comm/propal/stats/index.php
M htdocs/comm/prospect/class/prospect.class.php
M htdocs/comm/prospect/index.php
M htdocs/comm/prospect/list.php
M htdocs/comm/remise.php
M htdocs/comm/remx.php
M htdocs/commande/apercu.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/class/commandestats.class.php
M htdocs/commande/contact.php
M htdocs/commande/customer.php
M htdocs/commande/document.php
M htdocs/commande/fiche.php
M htdocs/commande/index.php
M htdocs/commande/liste.php
M htdocs/commande/note.php
M htdocs/commande/orderstoinvoice.php
M htdocs/commande/stats/index.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/annuel.php
M htdocs/compta/bank/bankid_fr.php
M htdocs/compta/bank/bilan.php
M htdocs/compta/bank/categ.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/fiche.php
M htdocs/compta/bank/graph.php
M htdocs/compta/bank/index.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/bank/releve.php
M htdocs/compta/bank/search.php
M htdocs/compta/bank/treso.php
M htdocs/compta/charges/index.php
M htdocs/compta/clients.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/deplacement/document.php
M htdocs/compta/deplacement/fiche.php
M htdocs/compta/deplacement/index.php
M htdocs/compta/deplacement/list.php
M htdocs/compta/deplacement/stats/index.php
M htdocs/compta/dons/fiche.php
M htdocs/compta/dons/liste.php
M htdocs/compta/dons/stats.php
M htdocs/compta/facture.php
A htdocs/compta/facture/admin/facturedet_cust_extrafields.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Commit: 230b1d4bb8527df852aec02077c3f0ca9f691485
https://github.com/Dolibarr/dolibarr/commit/230b1d4bb8527df852aec02077c3f0ca9f691485
Author: Laurent Destailleur <address@hidden>
Date: 2014-08-06 (Wed, 06 Aug 2014)
Changed paths:
M ChangeLog
M dev/initdata/mysqldump_dolibarr_3.1.0.sql
M dev/initdata/mysqldump_dolibarr_3.2.0.sql
M dev/initdata/mysqldump_dolibarr_3.3.0.sql
M dev/initdata/mysqldump_dolibarr_3.4.0.sql
M dev/initdata/mysqldump_dolibarr_3.5.0.sql
M dev/initdata/mysqldump_dolibarr_3.6.0.sql
M test/phpunit/SqlTest.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
test/phpunit/SqlTest.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/238bd76eb6a9...230b1d4bb852